mirror of
https://github.com/EGroupware/egroupware.git
synced 2024-12-26 16:48:49 +01:00
Fix setting of $phpgw_info flag in createobject, formatting
This commit is contained in:
parent
632ebd0950
commit
5110bf226a
@ -46,6 +46,8 @@ function CreateObject($class,
|
||||
$p9='_UNDEF_',$p10='_UNDEF_',$p11='_UNDEF_',$p12='_UNDEF_',
|
||||
$p13='_UNDEF_',$p14='_UNDEF_',$p15='_UNDEF_',$p16='_UNDEF_')
|
||||
{
|
||||
global $phpgw_info;
|
||||
|
||||
/* error_reporting(0); */
|
||||
list($appname,$classname) = explode(".", $class);
|
||||
if (!isset($GLOBALS['phpgw_info']['flags']['included_classes'][$classname]) ||
|
||||
@ -223,7 +225,11 @@ function lang($key,$m1='',$m2='',$m3='',$m4='',$m5='',$m6='',$m7='',$m8='',$m9='
|
||||
|
||||
function print_debug($text='')
|
||||
{
|
||||
if (isset($GLOBALS['debugme']) && $GLOBALS['debugme'] == 'on') { echo 'debug: '.$text.'<br>'; }
|
||||
if (isset($GLOBALS['debugme']) &&
|
||||
$GLOBALS['debugme'] == 'on')
|
||||
{
|
||||
echo 'debug: '.$text.'<br>';
|
||||
}
|
||||
}
|
||||
|
||||
// print_debug('core functions are done');
|
||||
@ -544,7 +550,9 @@ if ($GLOBALS['phpgw_info']['flags']['currentapp'] == 'login' || $GLOBALS['phpgw_
|
||||
$GLOBALS['phpgw_info']['flags']['currentapp'] != 'about')
|
||||
{
|
||||
// This will need to use ACL in the future
|
||||
if (! $GLOBALS['phpgw_info']['user']['apps'][$GLOBALS['phpgw_info']['flags']['currentapp']] || (@$GLOBALS['phpgw_info']['flags']['admin_only'] && ! $GLOBALS['phpgw_info']['user']['apps']['admin']))
|
||||
if (! $GLOBALS['phpgw_info']['user']['apps'][$GLOBALS['phpgw_info']['flags']['currentapp']] ||
|
||||
(@$GLOBALS['phpgw_info']['flags']['admin_only'] &&
|
||||
! $GLOBALS['phpgw_info']['user']['apps']['admin']))
|
||||
{
|
||||
$GLOBALS['phpgw']->common->phpgw_header();
|
||||
if ($GLOBALS['phpgw_info']['flags']['noheader'])
|
||||
|
Loading…
Reference in New Issue
Block a user