diff --git a/calendar/inc/class.calendar_hooks.inc.php b/calendar/inc/class.calendar_hooks.inc.php index ec1666d821..8145a64b2a 100644 --- a/calendar/inc/class.calendar_hooks.inc.php +++ b/calendar/inc/class.calendar_hooks.inc.php @@ -657,47 +657,7 @@ class calendar_hooks 'default' => '/templates/calendar', ); } - // Import / Export for nextmatch - if ($GLOBALS['egw_info']['user']['apps']['importexport']) - { - $definitions = new importexport_definitions_bo(array( - 'type' => 'export', - 'application' => 'calendar' - )); - $options = array( - '~nextmatch~' => lang('Old fixed definition') - ); - foreach ((array)$definitions->get_definitions() as $identifier) - { - try - { - $definition = new importexport_definition($identifier); - } - catch (Exception $e) - { - unset($e); // not used - // permission error - continue; - } - if (($title = $definition->get_title())) - { - $options[$title] = $title; - } - unset($definition); - } - $default_def = 'export-calendar-csv'; - $settings['nextmatch-export-definition'] = array( - 'type' => 'select', - 'values' => $options, - 'label' => 'Export definition to use for nextmatch export', - 'name' => 'nextmatch-export-definition', - 'help' => lang('If you specify an export definition, it will be used when you export'), - 'run_lang' => false, - 'xmlrpc' => True, - 'admin' => False, - 'default'=> isset($options[$default_def]) ? $default_def : false, - ); - } + $settings += array( 'export_timezone' => array( 'type' => 'select', diff --git a/filemanager/inc/class.filemanager_hooks.inc.php b/filemanager/inc/class.filemanager_hooks.inc.php index f1126b8004..2dfe969648 100644 --- a/filemanager/inc/class.filemanager_hooks.inc.php +++ b/filemanager/inc/class.filemanager_hooks.inc.php @@ -197,41 +197,6 @@ class filemanager_hooks 'default' => '/templates/filemanager', ); - // Import / Export for nextmatch - if ($GLOBALS['egw_info']['user']['apps']['importexport']) - { - $definitions = new importexport_definitions_bo(array( - 'type' => 'export', - 'application' => 'filemanager' - )); - $options = array(); - foreach ((array)$definitions->get_definitions() as $identifier) - { - try { - $definition = new importexport_definition($identifier); - } - catch (Exception $e) { - unset($e); - // permission error - continue; - } - if (($title = $definition->get_title())) - { - $options[$title] = $title; - } - unset($definition); - } - $settings['nextmatch-export-definition'] = array( - 'type' => 'select', - 'values' => $options, - 'label' => 'Export definition to use for nextmatch export', - 'name' => 'nextmatch-export-definition', - 'help' => lang('If you specify an export definition, it will be used when you export'), - 'run_lang' => false, - 'xmlrpc' => True, - 'admin' => False, - ); - } $editorLink = self::getEditorLink(); $mimes = array(); diff --git a/importexport/inc/class.importexport_export_ui.inc.php b/importexport/inc/class.importexport_export_ui.inc.php index dfac720810..4f1d994dd4 100644 --- a/importexport/inc/class.importexport_export_ui.inc.php +++ b/importexport/inc/class.importexport_export_ui.inc.php @@ -74,10 +74,6 @@ class importexport_export_ui { $et->setElementAttribute('select_definition','disabled',true); } - // Check for preferred definition - if(!$_definition && $_appname) { - $_definition = $GLOBALS['egw_info']['user']['preferences'][$_appname]['nextmatch-export-definition']; - } // fill definitions $sel_options['definition'] = array('' => lang('Select')); $definitions = new importexport_definitions_bo(array( diff --git a/infolog/inc/class.infolog_hooks.inc.php b/infolog/inc/class.infolog_hooks.inc.php index 9143766897..e73c428a11 100644 --- a/infolog/inc/class.infolog_hooks.inc.php +++ b/infolog/inc/class.infolog_hooks.inc.php @@ -420,47 +420,6 @@ class infolog_hooks ); } - // Import / Export for nextmatch - if ($GLOBALS['egw_info']['user']['apps']['importexport']) - { - $definitions = new importexport_definitions_bo(array( - 'type' => 'export', - 'application' => 'infolog' - )); - $options = array( - '~nextmatch~' => lang('Old fixed definition') - ); - foreach ((array)$definitions->get_definitions() as $identifier) - { - try - { - $definition = new importexport_definition($identifier); - } - catch (Exception $e) - { - unset($e); - // permission error - continue; - } - if (($title = $definition->get_title())) - { - $options[$title] = $title; - } - unset($definition); - } - $default_def = 'export-infolog'; - $settings['nextmatch-export-definition'] = array( - 'type' => 'select', - 'values' => $options, - 'label' => 'Export definition to use for nextmatch export', - 'name' => 'nextmatch-export-definition', - 'help' => lang('If you specify an export definition, it will be used when you export'), - 'run_lang' => false, - 'xmlrpc' => True, - 'admin' => False, - 'default'=> isset($options[$default_def]) ? $default_def : false, - ); - } if ($GLOBALS['egw_info']['user']['apps']['calendar']) { $settings['cal_show'] = array( diff --git a/timesheet/inc/class.timesheet_hooks.inc.php b/timesheet/inc/class.timesheet_hooks.inc.php index 19494e274e..d3d795b69c 100644 --- a/timesheet/inc/class.timesheet_hooks.inc.php +++ b/timesheet/inc/class.timesheet_hooks.inc.php @@ -202,47 +202,6 @@ class timesheet_hooks 'default' => '/templates/timesheet', ); } - // Import / Export for nextmatch - if ($GLOBALS['egw_info']['user']['apps']['importexport']) - { - $definitions = new importexport_definitions_bo(array( - 'type' => 'export', - 'application' => 'timesheet' - )); - $options = array( - '~nextmatch~' => lang('Old fixed definition') - ); - foreach ((array)$definitions->get_definitions() as $identifier) - { - try - { - $definition = new importexport_definition($identifier); - } - catch (Exception $e) - { - unset($e); - // permission error - continue; - } - if (($title = $definition->get_title())) - { - $options[$title] = $title; - } - unset($definition); - } - $default_def = 'export-timesheet'; - $settings['nextmatch-export-definition'] = array( - 'type' => 'select', - 'values' => $options, - 'label' => 'Export definition to use for nextmatch export', - 'name' => 'nextmatch-export-definition', - 'help' => lang('If you specify an export definition, it will be used when you export'), - 'run_lang' => false, - 'xmlrpc' => True, - 'admin' => False, - 'default'=> isset($options[$default_def]) ? $default_def : false, - ); - } return $settings; }