[Fmsystem-commits] [17634]

[nelson . guerra]

Revision: 17634
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=17634
Author:   nelson224
Date:     2018-01-18 18:20:33 -0500 (Thu, 18 Jan 2018)
Log Message:
-----------


Modified Paths:
--------------
    branches/dev-syncromind/admin/inc/class.uiaclmanager.inc.php

Modified: branches/dev-syncromind/admin/inc/class.uiaclmanager.inc.php
===================================================================
--- branches/dev-syncromind/admin/inc/class.uiaclmanager.inc.php        
2018-01-18 23:20:17 UTC (rev 17633)
+++ branches/dev-syncromind/admin/inc/class.uiaclmanager.inc.php        
2018-01-18 23:20:33 UTC (rev 17634)
@@ -111,8 +111,11 @@
 
                        $this->_template->set_var('lang_header', lang('ACL 
Manager'));
 
-                       while (is_array($GLOBALS['acl_manager']) && list($app, 
$locations) = each($GLOBALS['acl_manager']))
-                       {
+                       //while (is_array($GLOBALS['acl_manager']) && 
list($app, $locations) = each($GLOBALS['acl_manager']))
+                        if (is_array($GLOBALS['acl_manager']))
+                        {
+                            foreach($GLOBALS['acl_manager'] as $app => 
$locations)
+                            {
                                $icon = $GLOBALS['phpgw']->common->image($app, 
array('navbar.gif', $app.'.gif'));
                                $this->_template->set_var('icon_backcolor', 
$GLOBALS['phpgw_info']['theme']['row_off']);
                                $this->_template->set_var('link_backcolor', 
$GLOBALS['phpgw_info']['theme']['row_off']);
@@ -129,13 +132,20 @@
                                        $this->_template->fp('rows', 
'app_row_noicon', true);
                                }
 
-                               while (is_array($locations) && list($loc, 
$value) = each($locations))
-                               {
+                               //while (is_array($locations) && list($loc, 
$value) = each($locations))
+                                if (is_array($locations))
+                                {
+                                    foreach($locations as $loc => $value)
+                                    {
                                        $total_rights = 0;
-                                       while (list($k, $v) = 
each($value['rights']))
-                                       {
+                                       //while (list($k, $v) = 
each($value['rights']))
+                                        if (is_array($value['rights']))
+                                        {
+                                            foreach($value['rights'] as $k => 
$v)
+                                            {
                                                $total_rights += $v;
-                                       }
+                                            }
+                                        }
                                        reset($value['rights']);
 
                                        // If all of there rights are denied, 
then they shouldn't even see the option
@@ -153,10 +163,12 @@
                                                
$this->_template->set_var('lang_location', lang($value['name']));
                                                $this->_template->fp('rows', 
'link_row', true);
                                        }
-                               }
+                                    }
+                                }
 
                                $this->_template->parse('rows', 'spacer_row', 
true);
-                       }
+                            }
+                        }
                        $this->_template->pfp('out', 'list');
                }