[Phpgroupware-cvs] phpgwapi/inc functions.inc.php,1.179

[ceb]

Update of phpgwapi/inc

Modified Files:
     Branch: MAIN
            functions.inc.php lines: +6 -13

Log Message:
update for xslt

====================================================
Index: phpgwapi/inc/functions.inc.php
diff -u phpgwapi/inc/functions.inc.php:1.178 
phpgwapi/inc/functions.inc.php:1.179
--- phpgwapi/inc/functions.inc.php:1.178        Tue Jan 18 01:51:20 2005
+++ phpgwapi/inc/functions.inc.php      Tue Jan 18 23:51:53 2005
@@ -394,20 +394,13 @@
                
/*************************************************************************\
                * Verify that the users session is still active otherwise kick 
them out   *
                
\*************************************************************************/
-               if ($GLOBALS['phpgw_info']['flags']['currentapp'] != 'home' &&
-                       $GLOBALS['phpgw_info']['flags']['currentapp'] != 
'about')
+               if ($GLOBALS['phpgw_info']['flags']['currentapp'] != 'home' && 
$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'])
-                               {
-                                       echo parse_navbar();
-                               }
-
+                               
$GLOBALS['phpgw']->common->phpgw_header($GLOBALS['phpgw_info']['flags']['nonavbar']?False:True);
                                
$GLOBALS['phpgw']->log->write(array('text'=>'W-Permissions, Attempted to access 
%1','p1'=>$GLOBALS['phpgw_info']['flags']['currentapp']));

                                echo '<p><center><b>'.lang('Access not 
permitted').'</b></center>';
@@ -444,5 +437,5 @@
                        include_once(PHPGW_APP_INC . '/header.inc.php');
                }
        }
-
+
        error_reporting(E_ERROR | E_WARNING | E_PARSE);