extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-11-22 07:53:39 +01:00
Code Issues Packages Projects Releases Wiki Activity

remove ancient CreateObject('phpgwapi.javascript'), replace it with egw_framework::validate_file, which is availabe from 1.8 on I believe

Browse Source
This commit is contained in:
Ralf Becker 2016-04-08 08:58:23 +00:00
parent c0bc4dc9de
commit 23f4bd5d17
1 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
importexport/inc/class.importexport_export_ui.inc.php
View File

@ -22,7 +22,6 @@ class importexport_export_ui {
'download' => true, 'download' => true,
); );
private $js;
private $user; private $user;
/** /**
@ -33,9 +32,8 @@ class importexport_export_ui {
private $export_plugins; private $export_plugins;
public function __construct() { public function __construct() {
$this->js = $GLOBALS['egw']->js = is_object($GLOBALS['egw']->js) ? $GLOBALS['egw']->js : CreateObject('phpgwapi.javascript'); egw_framework::validate_file('.','export_dialog','importexport');
$this->js->validate_file('.','export_dialog','importexport'); egw_framework::validate_file('.','importexport','importexport');
$this->js->validate_file('.','importexport','importexport');
$this->user = $GLOBALS['egw_info']['user']['user_id']; $this->user = $GLOBALS['egw_info']['user']['user_id'];
$this->export_plugins = importexport_helper_functions::get_plugins('all','export'); $this->export_plugins = importexport_helper_functions::get_plugins('all','export');
$GLOBALS['egw_info']['flags']['include_xajax'] = true; $GLOBALS['egw_info']['flags']['include_xajax'] = true;
@ -123,7 +121,6 @@ class importexport_export_ui {
$sel_options['plugin'] = $plugins; $sel_options['plugin'] = $plugins;
*/ */
} }
//$this->js->set_onload("set_style_by_class('tr','select_definition','display','none');");
} }
else { else {
$readonlys['plugin'] = true; $readonlys['plugin'] = true;
@ -183,7 +180,7 @@ class importexport_export_ui {
if($definition && is_array($definition->plugin_options) && $definition->plugin_options['selection'] && !$content['selection_passed']) { if($definition && is_array($definition->plugin_options) && $definition->plugin_options['selection'] && !$content['selection_passed']) {
$_selection = $definition->plugin_options['selection']; $_selection = $definition->plugin_options['selection'];
} }
if ($_selection && ($content['old_definition'] == $content['definition'] || $content['selection_passed'])) { if ($_selection && ($content['old_definition'] == $content['definition'] || $content['selection_passed'])) {
$readonlys[$tabs]['selection_tab'] = true; $readonlys[$tabs]['selection_tab'] = true;
$content['selection'] = $_selection; $content['selection'] = $_selection;
@ -387,7 +384,7 @@ class importexport_export_ui {
); );
$preview = "<div class='header'>".lang('Preview') . "<span class='count'>".(int)$record_count."</span></div>".$preview; $preview = "<div class='header'>".lang('Preview') . "<span class='count'>".(int)$record_count."</span></div>".$preview;
$et->setElementAttribute('preview-box', 'value', nl2br($preview)); $et->setElementAttribute('preview-box', 'value', nl2br($preview));
return; return;
} }
@ -456,7 +453,7 @@ class importexport_export_ui {
$description = $plugin_object->get_description(); $description = $plugin_object->get_description();
} }
$_response->addAssign('importexport-export_dialog_plugin_description','innerHTML',$description); $_response->addAssign('importexport-export_dialog_plugin_description','innerHTML',$description);
unset ($plugin_object); unset ($plugin_object);
} }