[Fmsystem-commits] [8081] acl-check

[Sigurd Nes]

Revision: 8081
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=8081
Author:   sigurdne
Date:     2011-11-11 08:04:10 +0000 (Fri, 11 Nov 2011)
Log Message:
-----------
acl-check

Modified Paths:
--------------
    trunk/controller/inc/class.menu.inc.php

Modified: trunk/controller/inc/class.menu.inc.php
===================================================================
--- trunk/controller/inc/class.menu.inc.php     2011-11-11 08:01:51 UTC (rev 
8080)
+++ trunk/controller/inc/class.menu.inc.php     2011-11-11 08:04:10 UTC (rev 
8081)
@@ -68,8 +68,9 @@
                                );
                        }*/
                        
-//                     
if($GLOBALS['phpgw']->acl->check(controller_uicommon::LOCATION_SUPERUSER,PHPGW_ACL_ADD,'controller'))
-//                     {
+                       if ( $GLOBALS['phpgw']->acl->check('run', 
phpgwapi_acl::READ, 'admin')
+                               || $GLOBALS['phpgw']->acl->check('admin', 
phpgwapi_acl::ADD, 'controller'))
+                       {
                                $menus['admin'] = array
                                (
                                        'acl'   => array
@@ -78,7 +79,7 @@
                                                'url'   => 
$GLOBALS['phpgw']->link('/index.php', array('menuaction' => 
'preferences.uiadmin_acl.list_acl', 'acl_app' => 'controller') )
                                        )
                                );
-//                     }
+                       }
                        
                        $menus['folders'] = 
phpgwapi_menu::get_categories('bergen');