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

[Sigurd Nes]

CVSROOT:        /sources/phpgwapi
Module name:    phpgwapi
Changes by:     Sigurd Nes <sigurdne>   06/06/18 18:50:57

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

Log message:
        Fix for inheritance when removing rights

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

Patches:
Index: class.acl.inc.php
===================================================================
RCS file: /sources/phpgwapi/phpgwapi/inc/class.acl.inc.php,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -b -r1.76 -r1.77
--- class.acl.inc.php   21 Apr 2006 16:09:34 -0000      1.76
+++ class.acl.inc.php   18 Jun 2006 18:50:57 -0000      1.77
@@ -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.76 2006/04/21 16:09:34 sigurdne 
Exp $
+       * @version $Id: class.acl.inc.php,v 1.77 2006/06/18 18:50:57 sigurdne 
Exp $
        */
 
        /**
@@ -272,7 +272,7 @@
                        reset ($this->data);
                        while(list($idx,$value) = each($this->data))
                        {
-                               if ($this->data[$idx]['appname'] == $appname && 
$this->data[$idx]['location'] == $location && $this->data[$idx]['account'] == 
$this->account_id && $this->data[$idx]['grantor'] == $grantor && 
$this->data[$idx]['type'] == $type)
+                               if ($this->data[$idx]['appname'] == $appname && 
(strpos($this->data[$idx]['location'],$location) === 0) && 
$this->data[$idx]['account'] == $this->account_id && 
$this->data[$idx]['grantor'] == $grantor && $this->data[$idx]['type'] == $type)
                                {
                                        $this->data[$idx] = Array();
                                }