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

[Sigurd Nes]

CVSROOT:        /sources/phpgwapi
Module name:    phpgwapi
Changes by:     Sigurd Nes <sigurdne>   06/10/11 10:40:30

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

Log message:
        E_NOTICES

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

Patches:
Index: class.acl.inc.php
===================================================================
RCS file: /sources/phpgwapi/phpgwapi/inc/class.acl.inc.php,v
retrieving revision 1.93
retrieving revision 1.94
diff -u -b -r1.93 -r1.94
--- class.acl.inc.php   11 Oct 2006 08:45:18 -0000      1.93
+++ class.acl.inc.php   11 Oct 2006 10:40:29 -0000      1.94
@@ -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.93 2006/10/11 08:45:18 sigurdne 
Exp $
+       * @version $Id: class.acl.inc.php,v 1.94 2006/10/11 10:40:29 sigurdne 
Exp $
        */
 
        /**
@@ -278,16 +278,19 @@
                                settype($appname,'string');
                                $appname = 
$GLOBALS['phpgw_info']['flags']['currentapp'];
                        }
+                       if(isset($this->data[$this->account_id]) && 
is_array($this->data[$this->account_id]))
+                       {
                        $count = count($this->data[$this->account_id]);
                        reset ($this->data[$this->account_id]);
                        while(list($idx,$value) = 
each($this->data[$this->account_id]))
                        {
-                               if 
($this->data[$this->account_id][$idx]['appname'] == $appname && 
(strpos($this->data[$this->account_id][$idx]['location'],$location) === 0) && 
$this->data[$this->account_id][$idx]['account'] == $this->account_id && 
$this->data[$this->account_id][$idx]['grantor'] == $grantor && 
$this->data[$this->account_id][$idx]['type'] == $type)
+                                       if 
((isset($this->data[$this->account_id][$idx]['appname']) && 
$this->data[$this->account_id][$idx]['appname'] == $appname) && 
(strpos($this->data[$this->account_id][$idx]['location'],$location) === 0) && 
$this->data[$this->account_id][$idx]['account'] == $this->account_id && 
$this->data[$this->account_id][$idx]['grantor'] == $grantor && 
$this->data[$this->account_id][$idx]['type'] == $type)
                                {
                                        $this->data[$this->account_id][$idx] = 
Array();
                                }
                        }
                        reset($this->data[$this->account_id]);
+                       }
                        return $this->data;
                }
 
@@ -304,9 +307,11 @@
                        $sql = 'DELETE FROM phpgw_acl WHERE acl_account = '. 
(int) $this->account_id;
                        $this->db->query($sql ,__LINE__,__FILE__);
 
+                       $inherit_data = array();
+                       if(isset($this->data[$this->account_id]) && 
is_array($this->data[$this->account_id]))
+                       {
                        reset ($this->data[$this->account_id]);
 
-                       $inherit_data = array();
                        while(list($idx,$value) = 
each($this->data[$this->account_id]))
                        {
                                if ( 
is_array($this->data[$this->account_id][$idx]) && 
count($this->data[$this->account_id][$idx]) )
@@ -330,7 +335,7 @@
                        }
 
                        reset ($this->data[$this->account_id]);
-                       if(is_array($inherit_data))
+                               if(count($inherit_data)>0)
                        {
                                $this->data[$this->account_id] = 
array_merge($this->data[$this->account_id], $inherit_data);
                        }
@@ -354,7 +359,7 @@
                                        $this->db->query($sql 
,__LINE__,__FILE__);
                                }
                        }
-                       
+                       }
                        /*remove duplicates*/
 
                        $sql = "SELECT * FROM phpgw_acl WHERE acl_account='" . 
$this->account_id . "' GROUP BY acl_appname, acl_location, acl_account, 
acl_rights,acl_grantor,acl_type";