diff --git a/importexport/inc/class.importexport_definitions_ui.inc.php b/importexport/inc/class.importexport_definitions_ui.inc.php index 23dd8189f2..cdf2c90879 100644 --- a/importexport/inc/class.importexport_definitions_ui.inc.php +++ b/importexport/inc/class.importexport_definitions_ui.inc.php @@ -52,13 +52,6 @@ class importexport_definitions_ui */ var $plugin; - /** - * xajax response object - * - * @var object - */ - var $response = true; - function __construct() { // we cant deal with notice and warnings, as we are on ajax! diff --git a/importexport/inc/class.importexport_export_ui.inc.php b/importexport/inc/class.importexport_export_ui.inc.php index cc0ab21cc2..c231e74b98 100644 --- a/importexport/inc/class.importexport_export_ui.inc.php +++ b/importexport/inc/class.importexport_export_ui.inc.php @@ -40,7 +40,6 @@ class importexport_export_ui { Framework::includeJS('.','importexport','importexport'); $this->user = $GLOBALS['egw_info']['user']['user_id']; $this->export_plugins = importexport_helper_functions::get_plugins('all','export'); - $GLOBALS['egw_info']['flags']['include_xajax'] = true; } @@ -402,38 +401,6 @@ class importexport_export_ui { return $et->exec(self::_appname. '.importexport_export_ui.export_dialog',$content,$sel_options,$readonlys,$preserv,2); } - public function ajax_get_definitions($_appname, xajaxResponse &$response = null) { - if(is_null($response)) { - $response = new xajaxResponse(); - } else { - $no_return = true; - } - if (!$_appname) { - $response->jquery('tr.select_definition','hide'); - return $no_return ? '' : $response->getXML(); - } - - $definitions = new importexport_definitions_bo(array( - 'type' => 'export', - 'application' => $_appname - )); - foreach ((array)$definitions->get_definitions() as $identifier) { - try { - $definition = new importexport_definition($identifier); - } catch (Exception $e) { - // Permission error - continue; - } - if ($title = $definition->get_title()) { - if (!$selected_plugin) $selected_plugin = $title; - $response->addScript("selectbox_add_option('exec[definition]','$title', '$value',".($selected_plugin == $title ? 'true' : 'false').");"); - } - unset($definition); - } - unset($definitions); - $response->addScript("selectbox_add_option('exec[definition]','" . lang('Expert options') . "', 'expert',".($selected_plugin == $title ? 'true' : 'false').");"); - } - public function ajax_get_definition_description($_definition) { $_response = Api\Json\Response::get(); diff --git a/importexport/inc/class.importexport_import_ui.inc.php b/importexport/inc/class.importexport_import_ui.inc.php index a84c0c5948..ccd6844318 100644 --- a/importexport/inc/class.importexport_import_ui.inc.php +++ b/importexport/inc/class.importexport_import_ui.inc.php @@ -37,7 +37,6 @@ use EGroupware\Api\Etemplate; public function __construct() { $this->plugins = importexport_helper_functions::get_plugins('all','import'); - $GLOBALS['egw_info']['flags']['include_xajax'] = true; } /** @@ -273,21 +272,6 @@ use EGroupware\Api\Etemplate; return $options; } - /** - * Get definitions via ajax - */ - public function ajax_get_definitions($appname, $file=null) { - $options = self::get_select_options(array('appname'=>$appname, 'file'=>$file)); - $response = new xajaxResponse(); - $response->addScript("clear_options('exec[definition]');"); - if(is_array($options['definition'])) { - foreach ($options['definition'] as $value => $title) { - $response->addScript("selectbox_add_option('exec[definition]','$title', '$value',false);"); - } - } - return $response->getXML(); - } - /** * Return an interpretation of the file for dry runs *