[Phpgroupware-cvs] phpgwapi/inc class.acl.inc.php

[Dave Hall]

CVSROOT:        /sources/phpgwapi
Module name:    phpgwapi
Changes by:     Dave Hall <skwashd>     06/10/04 05:21:10

Modified files:
        inc            : class.acl.inc.php 

Log message:
        notces

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/inc/class.acl.inc.php?cvsroot=phpgwapi&r1=1.87&r2=1.88

Patches:
Index: class.acl.inc.php
===================================================================
RCS file: /sources/phpgwapi/phpgwapi/inc/class.acl.inc.php,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -b -r1.87 -r1.88
--- class.acl.inc.php   2 Oct 2006 10:26:17 -0000       1.87
+++ class.acl.inc.php   4 Oct 2006 05:21:10 -0000       1.88
@@ -6,7 +6,7 @@
        * @license http://www.gnu.org/licenses/lgpl.html GNU Lesser General 
Public License
        * @package phpgwapi
        * @subpackage accounts
-       * @version $Id: class.acl.inc.php,v 1.87 2006/10/02 10:26:17 Caeies Exp 
$
+       * @version $Id: class.acl.inc.php,v 1.88 2006/10/04 05:21:10 skwashd 
Exp $
        */
 
        /**
@@ -263,15 +263,17 @@
 
                        reset ($this->data);
 
+                       $inherit_data = array();
                        while(list($idx,$value) = each($this->data))
                        {
-                               if(is_array($this->data[$idx]))
+                               if ( is_array($this->data[$idx]) && 
count($this->data[$idx]) )
                                {
                                        $sql = "SELECT id as location FROM 
phpgw_acl_location WHERE id $this->like '".$this->data[$idx]['location']."%' 
AND appname='" . $this->data[$idx]['appname'] . "' AND id != 
'".$this->data[$idx]['location'] . "'";
                                        
$this->db->query($sql,__LINE__,__FILE__);
                                        while($this->db->next_record())
                                        {
-                                               $inherit_data[]= array(
+                                               $inherit_data[] = array
+                                               (
                                                        'appname' => 
$this->data[$idx]['appname'],
                                                                'location' => 
$this->db->f('location'),
                                                        'account' => 
$this->account_id,
@@ -294,7 +296,8 @@
 
                        while(list($idx,$value) = each($this->data))
                        {
-                               if ($this->data[$idx]['account'] == 
$this->account_id)
+                               if ( isset($this->data[$idx]['account'])
+                                       && $this->data[$idx]['account'] == 
$this->account_id)
                                {
                                        $sql = 'insert into phpgw_acl 
(acl_appname, acl_location, acl_account, acl_rights,acl_grantor,acl_type)';
                                        $sql .= " 
values('".$this->data[$idx]['appname']."', '"