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

[Sigurd Nes]

CVSROOT:        /sources/phpgwapi
Module name:    phpgwapi
Branch:         
Changes by:     Sigurd Nes <address@hidden>     06/05/28 07:39:04

Modified files:
        inc            : functions.inc.php 

Log message:
        Use ACL to verify users session

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/phpgwapi/inc/functions.inc.php.diff?tr1=1.187&tr2=1.188&r1=text&r2=text

Patches:
Index: phpgwapi/inc/functions.inc.php
diff -u phpgwapi/inc/functions.inc.php:1.187 
phpgwapi/inc/functions.inc.php:1.188
--- phpgwapi/inc/functions.inc.php:1.187        Mon May 15 07:22:18 2006
+++ phpgwapi/inc/functions.inc.php      Sun May 28 07:39:04 2006
@@ -7,7 +7,7 @@
        * @license http://www.fsf.org/licenses/lgpl.html GNU Lesser General 
Public License
        * @package phpgwapi
        * @subpackage utilities
-       * @version $Id: functions.inc.php,v 1.187 2006/05/15 07:22:18 skwashd 
Exp $
+       * @version $Id: functions.inc.php,v 1.188 2006/05/28 07:39:04 sigurdne 
Exp $
        */
        
        
@@ -429,9 +429,7 @@
                
\*************************************************************************/
                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']->acl->check('run', 
PHPGW_ACL_READ,$GLOBALS['phpgw_info']['flags']['currentapp']))
                        {
                                
$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']));