From 13ff6543cfda258faa27b6530d7fc3a530023211 Mon Sep 17 00:00:00 2001 From: Ralf Becker Date: Wed, 2 Jun 2010 18:28:27 +0000 Subject: [PATCH] replacing admins own openwindow with egw_openWindowCentered2 --- .../class.admin_prefs_sidebox_hooks.inc.php | 2 +- admin/inc/class.uiaccounts.inc.php | 8 ------- admin/inc/class.uiasyncservice.inc.php | 1 - admin/inc/class.uiconfig.inc.php | 3 --- admin/inc/class.uicurrentsessions.inc.php | 1 - admin/inc/class.uilog.inc.php | 1 - admin/inc/class.uimainscreen.inc.php | 4 ---- admin/js/jscode/openwindow.js | 18 ---------------- admin/templates/default/index.tpl | 21 ------------------- 9 files changed, 1 insertion(+), 58 deletions(-) delete mode 100644 admin/js/jscode/openwindow.js diff --git a/admin/inc/class.admin_prefs_sidebox_hooks.inc.php b/admin/inc/class.admin_prefs_sidebox_hooks.inc.php index ab84430d7d..3087ac48f3 100644 --- a/admin/inc/class.admin_prefs_sidebox_hooks.inc.php +++ b/admin/inc/class.admin_prefs_sidebox_hooks.inc.php @@ -104,7 +104,7 @@ class admin_prefs_sidebox_hooks if (! $GLOBALS['egw']->acl->check('info_access',1,'admin')) { - $file['phpInfo'] = "javascript:openwindow('" . egw::link('/admin/phpinfo.php') . "')"; //egw::link('/admin/phpinfo.php'); + $file['phpInfo'] = "javascript:egw_openWindowCentered2('" . egw::link('/admin/phpinfo.php','',false) . "','phpinfoWindow',700,600,'yes')"; } $file['Admin queue and history'] = egw::link('/index.php','menuaction=admin.admin_cmds.index'); $file['Remote administration instances'] = egw::link('/index.php','menuaction=admin.admin_cmds.remotes'); diff --git a/admin/inc/class.uiaccounts.inc.php b/admin/inc/class.uiaccounts.inc.php index 0c96aee799..8e569db5c4 100755 --- a/admin/inc/class.uiaccounts.inc.php +++ b/admin/inc/class.uiaccounts.inc.php @@ -129,7 +129,6 @@ unset($GLOBALS['egw_info']['flags']['noheader']); unset($GLOBALS['egw_info']['flags']['nonavbar']); - $GLOBALS['egw']->js->validate_file('jscode','openwindow','admin'); $GLOBALS['egw_info']['flags']['app_header'] = $GLOBALS['egw_info']['apps']['admin']['title'].' - '. lang('User groups'); $GLOBALS['egw']->common->egw_header(); @@ -332,7 +331,6 @@ unset($GLOBALS['egw_info']['flags']['noheader']); unset($GLOBALS['egw_info']['flags']['nonavbar']); - $GLOBALS['egw']->js->validate_file('jscode','openwindow','admin'); $GLOBALS['egw_info']['flags']['app_header'] = $GLOBALS['egw_info']['apps']['admin']['title'].' - '. lang('User accounts'); $GLOBALS['egw']->common->egw_header(); @@ -618,7 +616,6 @@ unset($GLOBALS['egw_info']['flags']['noheader']); unset($GLOBALS['egw_info']['flags']['nonavbar']); - $GLOBALS['egw']->js->validate_file('jscode','openwindow','admin'); $GLOBALS['egw']->common->egw_header(); $p =& CreateObject('phpgwapi.Template',EGW_APP_TPL); @@ -696,7 +693,6 @@ unset($GLOBALS['egw_info']['flags']['noheader']); unset($GLOBALS['egw_info']['flags']['nonavbar']); - $GLOBALS['egw']->js->validate_file('jscode','openwindow','admin'); $GLOBALS['egw']->common->egw_header(); $t =& CreateObject('phpgwapi.Template',EGW_APP_TPL); @@ -946,7 +942,6 @@ } unset($GLOBALS['egw_info']['flags']['noheader']); unset($GLOBALS['egw_info']['flags']['nonavbar']); - $GLOBALS['egw']->js->validate_file('jscode','openwindow','admin'); $GLOBALS['egw']->common->egw_header(); $t =& CreateObject('phpgwapi.Template',EGW_APP_TPL); @@ -1150,7 +1145,6 @@ { unset($GLOBALS['egw_info']['flags']['noheader']); unset($GLOBALS['egw_info']['flags']['nonavbar']); - $GLOBALS['egw']->js->validate_file('jscode','openwindow','admin'); $GLOBALS['egw']->common->egw_header(); $p =& CreateObject('phpgwapi.Template',EGW_APP_TPL); @@ -1298,7 +1292,6 @@ unset($GLOBALS['egw_info']['flags']['noheader']); unset($GLOBALS['egw_info']['flags']['nonavbar']); - $GLOBALS['egw']->js->validate_file('jscode','openwindow','admin'); $GLOBALS['egw']->common->egw_header(); @@ -1631,7 +1624,6 @@ unset($GLOBALS['egw_info']['flags']['noheader']); unset($GLOBALS['egw_info']['flags']['nonavbar']); - $GLOBALS['egw']->js->validate_file('jscode','openwindow','admin'); $GLOBALS['egw']->common->egw_header(); $t =& CreateObject('phpgwapi.Template',EGW_APP_TPL); diff --git a/admin/inc/class.uiasyncservice.inc.php b/admin/inc/class.uiasyncservice.inc.php index 0818bdaf60..40a206fd8e 100644 --- a/admin/inc/class.uiasyncservice.inc.php +++ b/admin/inc/class.uiasyncservice.inc.php @@ -26,7 +26,6 @@ class uiasyncservice } $GLOBALS['egw_info']['flags']['app_header'] = lang('Admin').' - '.lang('Asynchronous timed services'); - $GLOBALS['egw']->js->validate_file('jscode','openwindow','admin'); $GLOBALS['egw']->common->egw_header(); echo parse_navbar(); diff --git a/admin/inc/class.uiconfig.inc.php b/admin/inc/class.uiconfig.inc.php index e1fa2d966f..9e958182e8 100644 --- a/admin/inc/class.uiconfig.inc.php +++ b/admin/inc/class.uiconfig.inc.php @@ -144,9 +144,6 @@ $t->set_var('error',''); $t->set_var('th_err',$GLOBALS['egw_info']['theme']['th_bg']); } - - $GLOBALS['egw']->js->validate_file('jscode','openwindow','admin'); - // set currentapp to our calling app, to show the right sidebox-menu $GLOBALS['egw_info']['flags']['currentapp'] = $show_app; $GLOBALS['egw']->common->egw_header(); diff --git a/admin/inc/class.uicurrentsessions.inc.php b/admin/inc/class.uicurrentsessions.inc.php index ee06d025b7..7b2e7271c0 100644 --- a/admin/inc/class.uicurrentsessions.inc.php +++ b/admin/inc/class.uicurrentsessions.inc.php @@ -34,7 +34,6 @@ function header() { - $GLOBALS['egw']->js->validate_file('jscode','openwindow','admin'); $GLOBALS['egw']->common->egw_header(); echo parse_navbar(); } diff --git a/admin/inc/class.uilog.inc.php b/admin/inc/class.uilog.inc.php index fdbd78d5c4..a10eaa5a89 100644 --- a/admin/inc/class.uilog.inc.php +++ b/admin/inc/class.uilog.inc.php @@ -261,7 +261,6 @@ $this->t->set_var('event_list',$table); $GLOBALS['egw_info']['flags']['app_header'] = lang('Admin').' - '.($this->editmode?lang('Edit Table format') : lang('View error log')); - $GLOBALS['egw']->js->validate_file('jscode','openwindow','admin'); $GLOBALS['egw']->common->egw_header(); echo parse_navbar(); $this->t->pfp('out','log_list_t'); diff --git a/admin/inc/class.uimainscreen.inc.php b/admin/inc/class.uimainscreen.inc.php index fecba8e894..a0b4f5f7cb 100644 --- a/admin/inc/class.uimainscreen.inc.php +++ b/admin/inc/class.uimainscreen.inc.php @@ -66,8 +66,6 @@ } if (empty($section)) { - - $GLOBALS['egw']->js->validate_file('jscode','openwindow','admin'); $GLOBALS['egw']->common->egw_header(); echo parse_navbar(); @@ -131,8 +129,6 @@ lang('activate WYSIWYG-editor').'">'; } - - $GLOBALS['egw']->js->validate_file('jscode','openwindow','admin'); $GLOBALS['egw']->common->egw_header(); echo parse_navbar(); diff --git a/admin/js/jscode/openwindow.js b/admin/js/jscode/openwindow.js deleted file mode 100644 index 1f47e9c1ce..0000000000 --- a/admin/js/jscode/openwindow.js +++ /dev/null @@ -1,18 +0,0 @@ -var phpinfo; - -function openwindow(url) -{ - if (phpinfo) - { - if (phpinfo.closed) - { - phpinfo.stop; - phpinfo.close; - } - } - phpinfo = window.open(url, "phpinfoWindow","width=700,height=600,location=no,menubar=no,directories=no,toolbar=no,scrollbars=yes,resizable=yes,status=no"); - if (phpinfo.opener == null) - { - phpinfo.opener = window; - } -} diff --git a/admin/templates/default/index.tpl b/admin/templates/default/index.tpl index 552839f2d0..f9ef65681b 100755 --- a/admin/templates/default/index.tpl +++ b/admin/templates/default/index.tpl @@ -1,25 +1,4 @@ - - {rows}