[Phpgroupware-cvs] api/class.acl_mgr.php, 1.1.2.8

[nomail]

Update of /api
Modified Files:
        Branch: proposal-branch
          class.acl_mgr.php

date: 2004/05/08 07:43:24;  author: jengo;  state: Exp;  lines: +15 -4

Log Message:
View account is now showing the proper permissions for the account
=====================================================================
Index: api/class.acl_mgr.php
diff -u api/class.acl_mgr.php:1.1.2.7 api/class.acl_mgr.php:1.1.2.8
--- api/class.acl_mgr.php:1.1.2.7       Sat May  8 05:08:51 2004
+++ api/class.acl_mgr.php       Sat May  8 07:43:24 2004
@@ -307,14 +307,25 @@
                {
                        $args = new safe_args();
                        $args->set('account_id',NOTSET,'any');
-                       $args->set('acl_check',true,'any');
+                       $args->set('acl_check',true,'boolean');
                        $args = $args->get(func_get_args());
 
-                       $dbresult = $GLOBALS['phpgw']->db->execute("select * 
from phpgw_acl_locations where loc_op not like '%.%.%' order by loc_title");
+                       $dbresult = $GLOBALS['phpgw']->db->execute("
+                               SELECT
+                                       loc_op,
+                                       loc_title,
+                                       loc_value
+                               FROM
+                                       phpgw_acl_locations
+                               WHERE
+                                       loc_op NOT LIKE '%.%.%'
+                               ORDER BY
+                                       loc_title");
+
                        while (! $dbresult->EOF)
                        {
                                $has_access = false;
-                               if (! $args['account_id'])
+                               if ($args['account_id'] != NOTSET)
                                {
                                        if 
($GLOBALS['phpgw']->acl->check($dbresult->fields['loc_op'],$dbresult->fields['loc_value'],1))
                                        {