From 459e6be4d2b328d1f69516879cdbbd5601efea31 Mon Sep 17 00:00:00 2001 From: Nathan Gray Date: Mon, 11 Apr 2011 15:21:10 +0000 Subject: [PATCH] Blacklist calendar CSV import because it doesn't work the same as the others, and you should use iCal. If someone needs it, they can put it back in. --- calendar/inc/class.calendar_import_csv.inc.php | 3 +++ .../inc/class.importexport_helper_functions.inc.php | 6 ++++++ 2 files changed, 9 insertions(+) diff --git a/calendar/inc/class.calendar_import_csv.inc.php b/calendar/inc/class.calendar_import_csv.inc.php index 6ea5d1f84a..82cdbae763 100644 --- a/calendar/inc/class.calendar_import_csv.inc.php +++ b/calendar/inc/class.calendar_import_csv.inc.php @@ -2,6 +2,9 @@ /** * eGroupWare * + * This plugin is blacklisted in importexport_helper_functions. You should use iCal, + * but if you need to import CSV, you can remove the blacklist. + * * @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License * @package calendar * @subpackage importexport diff --git a/importexport/inc/class.importexport_helper_functions.inc.php b/importexport/inc/class.importexport_helper_functions.inc.php index be7c17ccb3..3004d87d7e 100755 --- a/importexport/inc/class.importexport_helper_functions.inc.php +++ b/importexport/inc/class.importexport_helper_functions.inc.php @@ -29,6 +29,9 @@ class importexport_helper_functions { 'news_admin' => array( 'class.news_admin_import.inc.php', ), + 'calendar' => array( + 'class.calendar_import_csv.inc.php' + ), ); /** @@ -460,6 +463,9 @@ class importexport_helper_functions { $appnames = $_appname == 'all' ? array_keys($GLOBALS['egw_info']['apps']) : (array)$_appname; $types = $_type == 'all' ? array('import','export') : (array)$_type; + // Testing: Comment out cache call above, use this + //$definitions = self::_has_definitions($appnames, $types); + foreach($definitions as $appname => $_types) { if(!in_array($appname, $appnames)) unset($definitions[$appname]); }