mirror of
https://github.com/EGroupware/egroupware.git
synced 2024-11-26 18:03:39 +01:00
fix for bug [ 892893 ] "phpinfo" sometimes doesn't work
This commit is contained in:
parent
f94019a0c3
commit
28d5293d6e
@ -46,6 +46,11 @@
|
|||||||
$order = get_var('order',array('POST'),0);
|
$order = get_var('order',array('POST'),0);
|
||||||
|
|
||||||
$GLOBALS['phpgw_info']['flags']['app_header'] = lang('Admin').' - '.lang('View access log');
|
$GLOBALS['phpgw_info']['flags']['app_header'] = lang('Admin').' - '.lang('View access log');
|
||||||
|
if(!@is_object($GLOBALS['phpgw']->js))
|
||||||
|
{
|
||||||
|
$GLOBALS['phpgw']->js = CreateObject('phpgwapi.javascript');
|
||||||
|
}
|
||||||
|
$GLOBALS['phpgw']->js->validate_file('jscode','openwindow','admin');
|
||||||
$GLOBALS['phpgw']->common->phpgw_header();
|
$GLOBALS['phpgw']->common->phpgw_header();
|
||||||
echo parse_navbar();
|
echo parse_navbar();
|
||||||
|
|
||||||
|
@ -60,6 +60,11 @@
|
|||||||
|
|
||||||
unset($GLOBALS['phpgw_info']['flags']['noheader']);
|
unset($GLOBALS['phpgw_info']['flags']['noheader']);
|
||||||
unset($GLOBALS['phpgw_info']['flags']['nonavbar']);
|
unset($GLOBALS['phpgw_info']['flags']['nonavbar']);
|
||||||
|
if(!@is_object($GLOBALS['phpgw']->js))
|
||||||
|
{
|
||||||
|
$GLOBALS['phpgw']->js = CreateObject('phpgwapi.javascript');
|
||||||
|
}
|
||||||
|
$GLOBALS['phpgw']->js->validate_file('jscode','openwindow','admin');
|
||||||
$GLOBALS['phpgw']->common->phpgw_header();
|
$GLOBALS['phpgw']->common->phpgw_header();
|
||||||
|
|
||||||
$p = CreateObject('phpgwapi.Template',PHPGW_APP_TPL);
|
$p = CreateObject('phpgwapi.Template',PHPGW_APP_TPL);
|
||||||
@ -215,6 +220,11 @@
|
|||||||
|
|
||||||
unset($GLOBALS['phpgw_info']['flags']['noheader']);
|
unset($GLOBALS['phpgw_info']['flags']['noheader']);
|
||||||
unset($GLOBALS['phpgw_info']['flags']['nonavbar']);
|
unset($GLOBALS['phpgw_info']['flags']['nonavbar']);
|
||||||
|
if(!@is_object($GLOBALS['phpgw']->js))
|
||||||
|
{
|
||||||
|
$GLOBALS['phpgw']->js = CreateObject('phpgwapi.javascript');
|
||||||
|
}
|
||||||
|
$GLOBALS['phpgw']->js->validate_file('jscode','openwindow','admin');
|
||||||
$GLOBALS['phpgw']->common->phpgw_header();
|
$GLOBALS['phpgw']->common->phpgw_header();
|
||||||
|
|
||||||
$p = CreateObject('phpgwapi.Template',PHPGW_APP_TPL);
|
$p = CreateObject('phpgwapi.Template',PHPGW_APP_TPL);
|
||||||
@ -377,6 +387,11 @@
|
|||||||
|
|
||||||
unset($GLOBALS['phpgw_info']['flags']['noheader']);
|
unset($GLOBALS['phpgw_info']['flags']['noheader']);
|
||||||
unset($GLOBALS['phpgw_info']['flags']['nonavbar']);
|
unset($GLOBALS['phpgw_info']['flags']['nonavbar']);
|
||||||
|
if(!@is_object($GLOBALS['phpgw']->js))
|
||||||
|
{
|
||||||
|
$GLOBALS['phpgw']->js = CreateObject('phpgwapi.javascript');
|
||||||
|
}
|
||||||
|
$GLOBALS['phpgw']->js->validate_file('jscode','openwindow','admin');
|
||||||
$GLOBALS['phpgw']->common->phpgw_header();
|
$GLOBALS['phpgw']->common->phpgw_header();
|
||||||
|
|
||||||
$p = CreateObject('phpgwapi.Template',PHPGW_APP_TPL);
|
$p = CreateObject('phpgwapi.Template',PHPGW_APP_TPL);
|
||||||
@ -451,6 +466,11 @@
|
|||||||
|
|
||||||
unset($GLOBALS['phpgw_info']['flags']['noheader']);
|
unset($GLOBALS['phpgw_info']['flags']['noheader']);
|
||||||
unset($GLOBALS['phpgw_info']['flags']['nonavbar']);
|
unset($GLOBALS['phpgw_info']['flags']['nonavbar']);
|
||||||
|
if(!@is_object($GLOBALS['phpgw']->js))
|
||||||
|
{
|
||||||
|
$GLOBALS['phpgw']->js = CreateObject('phpgwapi.javascript');
|
||||||
|
}
|
||||||
|
$GLOBALS['phpgw']->js->validate_file('jscode','openwindow','admin');
|
||||||
$GLOBALS['phpgw']->common->phpgw_header();
|
$GLOBALS['phpgw']->common->phpgw_header();
|
||||||
|
|
||||||
$t = CreateObject('phpgwapi.Template',PHPGW_APP_TPL);
|
$t = CreateObject('phpgwapi.Template',PHPGW_APP_TPL);
|
||||||
@ -578,6 +598,11 @@
|
|||||||
}
|
}
|
||||||
unset($GLOBALS['phpgw_info']['flags']['noheader']);
|
unset($GLOBALS['phpgw_info']['flags']['noheader']);
|
||||||
unset($GLOBALS['phpgw_info']['flags']['nonavbar']);
|
unset($GLOBALS['phpgw_info']['flags']['nonavbar']);
|
||||||
|
if(!@is_object($GLOBALS['phpgw']->js))
|
||||||
|
{
|
||||||
|
$GLOBALS['phpgw']->js = CreateObject('phpgwapi.javascript');
|
||||||
|
}
|
||||||
|
$GLOBALS['phpgw']->js->validate_file('jscode','openwindow','admin');
|
||||||
$GLOBALS['phpgw']->common->phpgw_header();
|
$GLOBALS['phpgw']->common->phpgw_header();
|
||||||
|
|
||||||
$t = CreateObject('phpgwapi.Template',PHPGW_APP_TPL);
|
$t = CreateObject('phpgwapi.Template',PHPGW_APP_TPL);
|
||||||
@ -797,6 +822,11 @@
|
|||||||
|
|
||||||
unset($GLOBALS['phpgw_info']['flags']['noheader']);
|
unset($GLOBALS['phpgw_info']['flags']['noheader']);
|
||||||
unset($GLOBALS['phpgw_info']['flags']['nonavbar']);
|
unset($GLOBALS['phpgw_info']['flags']['nonavbar']);
|
||||||
|
if(!@is_object($GLOBALS['phpgw']->js))
|
||||||
|
{
|
||||||
|
$GLOBALS['phpgw']->js = CreateObject('phpgwapi.javascript');
|
||||||
|
}
|
||||||
|
$GLOBALS['phpgw']->js->validate_file('jscode','openwindow','admin');
|
||||||
$GLOBALS['phpgw']->common->phpgw_header();
|
$GLOBALS['phpgw']->common->phpgw_header();
|
||||||
|
|
||||||
$p = CreateObject('phpgwapi.Template',PHPGW_APP_TPL);
|
$p = CreateObject('phpgwapi.Template',PHPGW_APP_TPL);
|
||||||
@ -935,6 +965,11 @@
|
|||||||
|
|
||||||
unset($GLOBALS['phpgw_info']['flags']['noheader']);
|
unset($GLOBALS['phpgw_info']['flags']['noheader']);
|
||||||
unset($GLOBALS['phpgw_info']['flags']['nonavbar']);
|
unset($GLOBALS['phpgw_info']['flags']['nonavbar']);
|
||||||
|
if(!@is_object($GLOBALS['phpgw']->js))
|
||||||
|
{
|
||||||
|
$GLOBALS['phpgw']->js = CreateObject('phpgwapi.javascript');
|
||||||
|
}
|
||||||
|
$GLOBALS['phpgw']->js->validate_file('jscode','openwindow','admin');
|
||||||
$GLOBALS['phpgw']->common->phpgw_header();
|
$GLOBALS['phpgw']->common->phpgw_header();
|
||||||
|
|
||||||
$t = CreateObject('phpgwapi.Template',PHPGW_APP_TPL);
|
$t = CreateObject('phpgwapi.Template',PHPGW_APP_TPL);
|
||||||
@ -1212,6 +1247,11 @@
|
|||||||
|
|
||||||
unset($GLOBALS['phpgw_info']['flags']['noheader']);
|
unset($GLOBALS['phpgw_info']['flags']['noheader']);
|
||||||
unset($GLOBALS['phpgw_info']['flags']['nonavbar']);
|
unset($GLOBALS['phpgw_info']['flags']['nonavbar']);
|
||||||
|
if(!@is_object($GLOBALS['phpgw']->js))
|
||||||
|
{
|
||||||
|
$GLOBALS['phpgw']->js = CreateObject('phpgwapi.javascript');
|
||||||
|
}
|
||||||
|
$GLOBALS['phpgw']->js->validate_file('jscode','openwindow','admin');
|
||||||
$GLOBALS['phpgw']->common->phpgw_header();
|
$GLOBALS['phpgw']->common->phpgw_header();
|
||||||
|
|
||||||
$t = CreateObject('phpgwapi.Template',PHPGW_APP_TPL);
|
$t = CreateObject('phpgwapi.Template',PHPGW_APP_TPL);
|
||||||
|
@ -41,6 +41,11 @@
|
|||||||
$can_delete = !$GLOBALS['phpgw']->acl->check('applications_access',8,'admin');
|
$can_delete = !$GLOBALS['phpgw']->acl->check('applications_access',8,'admin');
|
||||||
|
|
||||||
$GLOBALS['phpgw_info']['flags']['app_header'] = lang('Admin').' - '.lang('Installed applications');
|
$GLOBALS['phpgw_info']['flags']['app_header'] = lang('Admin').' - '.lang('Installed applications');
|
||||||
|
if(!@is_object($GLOBALS['phpgw']->js))
|
||||||
|
{
|
||||||
|
$GLOBALS['phpgw']->js = CreateObject('phpgwapi.javascript');
|
||||||
|
}
|
||||||
|
$GLOBALS['phpgw']->js->validate_file('jscode','openwindow','admin');
|
||||||
$GLOBALS['phpgw']->common->phpgw_header();
|
$GLOBALS['phpgw']->common->phpgw_header();
|
||||||
echo parse_navbar();
|
echo parse_navbar();
|
||||||
|
|
||||||
@ -215,6 +220,11 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
$GLOBALS['phpgw_info']['flags']['app_header'] = lang('Admin').' - '.lang('Add new application');
|
$GLOBALS['phpgw_info']['flags']['app_header'] = lang('Admin').' - '.lang('Add new application');
|
||||||
|
if(!@is_object($GLOBALS['phpgw']->js))
|
||||||
|
{
|
||||||
|
$GLOBALS['phpgw']->js = CreateObject('phpgwapi.javascript');
|
||||||
|
}
|
||||||
|
$GLOBALS['phpgw']->js->validate_file('jscode','openwindow','admin');
|
||||||
$GLOBALS['phpgw']->common->phpgw_header();
|
$GLOBALS['phpgw']->common->phpgw_header();
|
||||||
echo parse_navbar();
|
echo parse_navbar();
|
||||||
|
|
||||||
@ -306,6 +316,11 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
$GLOBALS['phpgw_info']['flags']['app_header'] = lang('Admin').' - '.lang('Edit application');
|
$GLOBALS['phpgw_info']['flags']['app_header'] = lang('Admin').' - '.lang('Edit application');
|
||||||
|
if(!@is_object($GLOBALS['phpgw']->js))
|
||||||
|
{
|
||||||
|
$GLOBALS['phpgw']->js = CreateObject('phpgwapi.javascript');
|
||||||
|
}
|
||||||
|
$GLOBALS['phpgw']->js->validate_file('jscode','openwindow','admin');
|
||||||
$GLOBALS['phpgw']->common->phpgw_header();
|
$GLOBALS['phpgw']->common->phpgw_header();
|
||||||
echo parse_navbar();
|
echo parse_navbar();
|
||||||
|
|
||||||
@ -362,6 +377,11 @@
|
|||||||
|
|
||||||
$GLOBALS['phpgw']->template->set_file(array('body' => 'delete_common.tpl'));
|
$GLOBALS['phpgw']->template->set_file(array('body' => 'delete_common.tpl'));
|
||||||
|
|
||||||
|
if(!@is_object($GLOBALS['phpgw']->js))
|
||||||
|
{
|
||||||
|
$GLOBALS['phpgw']->js = CreateObject('phpgwapi.javascript');
|
||||||
|
}
|
||||||
|
$GLOBALS['phpgw']->js->validate_file('jscode','openwindow','admin');
|
||||||
$GLOBALS['phpgw']->common->phpgw_header();
|
$GLOBALS['phpgw']->common->phpgw_header();
|
||||||
echo parse_navbar();
|
echo parse_navbar();
|
||||||
|
|
||||||
|
@ -42,6 +42,11 @@
|
|||||||
$GLOBALS['phpgw']->redirect_link('/index.php');
|
$GLOBALS['phpgw']->redirect_link('/index.php');
|
||||||
}
|
}
|
||||||
$GLOBALS['phpgw_info']['flags']['app_header'] = lang('Admin').' - '.lang('Asynchronous timed services');
|
$GLOBALS['phpgw_info']['flags']['app_header'] = lang('Admin').' - '.lang('Asynchronous timed services');
|
||||||
|
if(!@is_object($GLOBALS['phpgw']->js))
|
||||||
|
{
|
||||||
|
$GLOBALS['phpgw']->js = CreateObject('phpgwapi.javascript');
|
||||||
|
}
|
||||||
|
$GLOBALS['phpgw']->js->validate_file('jscode','openwindow','admin');
|
||||||
$GLOBALS['phpgw']->common->phpgw_header();
|
$GLOBALS['phpgw']->common->phpgw_header();
|
||||||
echo parse_navbar();
|
echo parse_navbar();
|
||||||
|
|
||||||
|
@ -53,6 +53,11 @@
|
|||||||
$this->acl_add_sub= !$GLOBALS['phpgw']->acl->check('global_categories_access',64,'admin');
|
$this->acl_add_sub= !$GLOBALS['phpgw']->acl->check('global_categories_access',64,'admin');
|
||||||
|
|
||||||
$this->appname = get_var('appname',array('GET','POST'));
|
$this->appname = get_var('appname',array('GET','POST'));
|
||||||
|
if(!@is_object($GLOBALS['phpgw']->js))
|
||||||
|
{
|
||||||
|
$GLOBALS['phpgw']->js = CreateObject('phpgwapi.javascript');
|
||||||
|
}
|
||||||
|
$GLOBALS['phpgw']->js->validate_file('jscode','openwindow','admin');
|
||||||
$GLOBALS['phpgw_info']['flags']['app_header'] = $GLOBALS['phpgw_info']['apps'][$this->appname ? $this->appname : 'admin']['title'];
|
$GLOBALS['phpgw_info']['flags']['app_header'] = $GLOBALS['phpgw_info']['apps'][$this->appname ? $this->appname : 'admin']['title'];
|
||||||
|
|
||||||
$this->start = $this->bo->start;
|
$this->start = $this->bo->start;
|
||||||
@ -143,6 +148,11 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
$GLOBALS['phpgw_info']['flags']['app_header'] .= ' - '.lang('Global categories');
|
$GLOBALS['phpgw_info']['flags']['app_header'] .= ' - '.lang('Global categories');
|
||||||
|
if(!@is_object($GLOBALS['phpgw']->js))
|
||||||
|
{
|
||||||
|
$GLOBALS['phpgw']->js = CreateObject('phpgwapi.javascript');
|
||||||
|
}
|
||||||
|
$GLOBALS['phpgw']->js->validate_file('jscode','openwindow','admin');
|
||||||
$GLOBALS['phpgw']->common->phpgw_header();
|
$GLOBALS['phpgw']->common->phpgw_header();
|
||||||
echo parse_navbar();
|
echo parse_navbar();
|
||||||
$this->set_langs();
|
$this->set_langs();
|
||||||
@ -308,6 +318,11 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
$GLOBALS['phpgw_info']['flags']['app_header'] .= ' - '.lang('Add global category');
|
$GLOBALS['phpgw_info']['flags']['app_header'] .= ' - '.lang('Add global category');
|
||||||
|
if(!@is_object($GLOBALS['phpgw']->js))
|
||||||
|
{
|
||||||
|
$GLOBALS['phpgw']->js = CreateObject('phpgwapi.javascript');
|
||||||
|
}
|
||||||
|
$GLOBALS['phpgw']->js->validate_file('jscode','openwindow','admin');
|
||||||
$GLOBALS['phpgw']->common->phpgw_header();
|
$GLOBALS['phpgw']->common->phpgw_header();
|
||||||
echo parse_navbar();
|
echo parse_navbar();
|
||||||
|
|
||||||
@ -375,6 +390,11 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
$GLOBALS['phpgw_info']['flags']['app_header'] .= ' - '.lang('Edit global category');
|
$GLOBALS['phpgw_info']['flags']['app_header'] .= ' - '.lang('Edit global category');
|
||||||
|
if(!@is_object($GLOBALS['phpgw']->js))
|
||||||
|
{
|
||||||
|
$GLOBALS['phpgw']->js = CreateObject('phpgwapi.javascript');
|
||||||
|
}
|
||||||
|
$GLOBALS['phpgw']->js->validate_file('jscode','openwindow','admin');
|
||||||
$GLOBALS['phpgw']->common->phpgw_header();
|
$GLOBALS['phpgw']->common->phpgw_header();
|
||||||
echo parse_navbar();
|
echo parse_navbar();
|
||||||
|
|
||||||
@ -446,6 +466,11 @@
|
|||||||
));
|
));
|
||||||
|
|
||||||
$GLOBALS['phpgw_info']['flags']['app_header'] .= ' - '.lang('Delete category');
|
$GLOBALS['phpgw_info']['flags']['app_header'] .= ' - '.lang('Delete category');
|
||||||
|
if(!@is_object($GLOBALS['phpgw']->js))
|
||||||
|
{
|
||||||
|
$GLOBALS['phpgw']->js = CreateObject('phpgwapi.javascript');
|
||||||
|
}
|
||||||
|
$GLOBALS['phpgw']->js->validate_file('jscode','openwindow','admin');
|
||||||
$GLOBALS['phpgw']->common->phpgw_header();
|
$GLOBALS['phpgw']->common->phpgw_header();
|
||||||
echo parse_navbar();
|
echo parse_navbar();
|
||||||
|
|
||||||
|
@ -141,6 +141,12 @@
|
|||||||
$t->set_var('th_err',$GLOBALS['phpgw_info']['theme']['th_bg']);
|
$t->set_var('th_err',$GLOBALS['phpgw_info']['theme']['th_bg']);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if(!@is_object($GLOBALS['phpgw']->js))
|
||||||
|
{
|
||||||
|
$GLOBALS['phpgw']->js = CreateObject('phpgwapi.javascript');
|
||||||
|
}
|
||||||
|
$GLOBALS['phpgw']->js->validate_file('jscode','openwindow','admin');
|
||||||
|
|
||||||
$GLOBALS['phpgw']->common->phpgw_header();
|
$GLOBALS['phpgw']->common->phpgw_header();
|
||||||
echo parse_navbar();
|
echo parse_navbar();
|
||||||
|
|
||||||
|
@ -34,6 +34,11 @@
|
|||||||
|
|
||||||
function header()
|
function header()
|
||||||
{
|
{
|
||||||
|
if(!@is_object($GLOBALS['phpgw']->js))
|
||||||
|
{
|
||||||
|
$GLOBALS['phpgw']->js = CreateObject('phpgwapi.javascript');
|
||||||
|
}
|
||||||
|
$GLOBALS['phpgw']->js->validate_file('jscode','openwindow','admin');
|
||||||
$GLOBALS['phpgw']->common->phpgw_header();
|
$GLOBALS['phpgw']->common->phpgw_header();
|
||||||
echo parse_navbar();
|
echo parse_navbar();
|
||||||
}
|
}
|
||||||
|
@ -261,6 +261,11 @@
|
|||||||
$this->t->set_var('event_list',$table);
|
$this->t->set_var('event_list',$table);
|
||||||
|
|
||||||
$GLOBALS['phpgw_info']['flags']['app_header'] = lang('Admin').' - '.($this->editmode?lang('Edit Table format') : lang('View error log'));
|
$GLOBALS['phpgw_info']['flags']['app_header'] = lang('Admin').' - '.($this->editmode?lang('Edit Table format') : lang('View error log'));
|
||||||
|
if(!@is_object($GLOBALS['phpgw']->js))
|
||||||
|
{
|
||||||
|
$GLOBALS['phpgw']->js = CreateObject('phpgwapi.javascript');
|
||||||
|
}
|
||||||
|
$GLOBALS['phpgw']->js->validate_file('jscode','openwindow','admin');
|
||||||
$GLOBALS['phpgw']->common->phpgw_header();
|
$GLOBALS['phpgw']->common->phpgw_header();
|
||||||
echo parse_navbar();
|
echo parse_navbar();
|
||||||
$this->t->pfp('out','log_list_t');
|
$this->t->pfp('out','log_list_t');
|
||||||
|
@ -72,6 +72,11 @@
|
|||||||
$GLOBALS['phpgw_info']['flags']['app_header'] = lang('Admin').' - '.lang('Main screen message');
|
$GLOBALS['phpgw_info']['flags']['app_header'] = lang('Admin').' - '.lang('Main screen message');
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
if(!@is_object($GLOBALS['phpgw']->js))
|
||||||
|
{
|
||||||
|
$GLOBALS['phpgw']->js = CreateObject('phpgwapi.javascript');
|
||||||
|
}
|
||||||
|
$GLOBALS['phpgw']->js->validate_file('jscode','openwindow','admin');
|
||||||
$GLOBALS['phpgw']->common->phpgw_header();
|
$GLOBALS['phpgw']->common->phpgw_header();
|
||||||
echo parse_navbar();
|
echo parse_navbar();
|
||||||
|
|
||||||
|
@ -1,24 +1,4 @@
|
|||||||
<!-- BEGIN list -->
|
<!-- 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="75%" border="0" cellspacing="0" cellpadding="0">
|
<table width="75%" border="0" cellspacing="0" cellpadding="0">
|
||||||
{rows}
|
{rows}
|
||||||
|
Loading…
Reference in New Issue
Block a user