replacing admins own openwindow with egw_openWindowCentered2

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');

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);

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();
 

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();

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();
 		}

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');

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();
 				

admin/js/jscode/openwindow.js

@@ -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;
-	}
-}

admin/templates/default/index.tpl

@@ -1,25 +1,4 @@
 <!-- BEGIN list -->
-<script language="javascript" type="text/javascript">
-	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;
-		}
-	}
-</script>
-
 <table width="100%" border="0" cellspacing="0" cellpadding="0">
  {rows}
 </table>