[Phpgroupware-cvs] CVS: property/inc class.acl2.inc.php,1.15,1.16

[Sigurd Nes <address@hidden>]

Update of /cvsroot/phpgroupware/property/inc
In directory subversions:/tmp/cvs-serv24013/inc

Modified Files:
        class.acl2.inc.php 
Log Message:
no message

Index: class.acl2.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.acl2.inc.php,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -r1.15 -r1.16
*** class.acl2.inc.php  27 Jul 2003 15:53:24 -0000      1.15
--- class.acl2.inc.php  5 Aug 2003 08:24:16 -0000       1.16
***************
*** 440,447 ****
                        {
                                $this->db->next_record();
- //echo '$args[rights] = '.$args['rights'].'<br>';
- //echo '$this->db->f(acl_rights) = '.$this->db->f('acl_rights').'<br>';
                                $newrights = 
$this->bit_mask((int)$this->db->f('acl_rights'),$args['rights']);
- //echo 'newrights = '.$newrights.'<br>';
                                if ($newrights != 0)
                                {
--- 440,444 ----
***************
*** 550,554 ****
                        $app_id = 
$GLOBALS['phpgw']->applications->data[$app]['id'];
  
!                       $sql = "select owner_id as acl_account, acl_rights from 
fm_acl2  where acl_appid = $app_id AND  acl_type=0  and acl_location = 
'$location' AND owner_id is NOT NULL AND"
                                . " fm_acl2.acl_account in ";
                        $security = "(". $this->account_id ."";
--- 547,551 ----
                        $app_id = 
$GLOBALS['phpgw']->applications->data[$app]['id'];
  
!                       $sql = "select owner_id as grantor, acl_rights from 
fm_acl2  where acl_appid = $app_id AND  acl_type=0  and acl_location = 
'$location' AND owner_id is NOT NULL AND"
                                . " fm_acl2.acl_account in ";
                        $security = "(". $this->account_id ."";
***************
*** 573,582 ****
                        while ($this->db2->next_record())
                        {
!                               $grantor = $this->db2->f('acl_account');
                                $rights = $this->db2->f('acl_rights');
  
                                $accounts[$grantor] = Array($grantor);
  
!                               while(list($nul,$grantors) = 
each($accounts[$grantor]))
                                {
                                        if(!isset($grants[$grantors]))
--- 570,579 ----
                        while ($this->db2->next_record())
                        {
!                               $grantor = $this->db2->f('grantor');
                                $rights = $this->db2->f('acl_rights');
  
                                $accounts[$grantor] = Array($grantor);
  
!                               foreach($accounts[$grantor] as $grantors)
                                {
                                        if(!isset($grants[$grantors]))
***************
*** 588,591 ****
--- 585,589 ----
                                reset($accounts[$grantor]);
                        }
+ 
                        $grants[$GLOBALS['phpgw_info']['user']['account_id']] = 
31;
                        return $grants;