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

[Bettina Gille <address@hidden>]

Update of /cvsroot/phpgroupware/phpgwapi/inc
In directory subversions:/tmp/cvs-serv6566

Modified Files:
      Tag: Version-0_9_16-branch
        class.acl.inc.php 
Log Message:
finished addressmaster

Index: class.acl.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/phpgwapi/inc/class.acl.inc.php,v
retrieving revision 1.65.4.8
retrieving revision 1.65.4.9
diff -C2 -d -r1.65.4.8 -r1.65.4.9
*** class.acl.inc.php   23 Oct 2003 15:24:23 -0000      1.65.4.8
--- class.acl.inc.php   4 Nov 2003 14:36:42 -0000       1.65.4.9
***************
*** 63,67 ****
                {
                        $this->db       = $GLOBALS['phpgw']->db;
-                       $this->db2      = $this->db;
  
                        if (!($this->account_id = intval($account_id)))
--- 63,66 ----
***************
*** 157,161 ****
                                        'appname' => 
$this->db->f('acl_appname'),
                                        'location' => 
$this->db->f('acl_location'), 
!                                       'account' => 
$this->db->f('acl_account'), 
                                        'rights' => $this->db->f('acl_rights')
                                );
--- 156,160 ----
                                        'appname' => 
$this->db->f('acl_appname'),
                                        'location' => 
$this->db->f('acl_location'), 
!                                       'account' => 
$this->db->f('acl_account'),
                                        'rights' => $this->db->f('acl_rights')
                                );
***************
*** 183,214 ****
                }
  
-               function read_specific($data)
-               {
-                       $type           = 
(isset($data['type'])?$data['type']:'location');
-                       $acl_app        = 
(isset($data['acl_app'])?$data['acl_app']:$GLOBALS['phpgw_info']['user']['currentapp']);
- 
-                       switch($type)
-                       {
-                               case 'location':                        $select 
= "acl_location='" . $data['acl_location'] . "'"; break;
-                               case 'applocation':                     $select 
= "acl_location='" . $data['acl_location'] . "' AND acl_appname='" . $acl_app . 
"'"; break;
-                       }
- 
-                       $sql = 'select acl_account from phpgw_acl where ' . 
$select; 
- 
-                       $this->db2->query($sql,__LINE__,__FILE__);
-                       $this->total = $this->db2->num_rows();
- 
-                       $this->db->query($sql,__LINE__,__FILE__);
- 
-                       while ($this->db->next_record())
-                       {
-                               $acc[] = array
-                               (
-                                       'account' => $this->db->f(0)
-                               );
-                       }
-                       return $acc;
-               }
- 
                /*!
                @function add
--- 182,185 ----
***************
*** 526,541 ****
                        static $cache_accountid;
  
!                       if(isset($cache_accountid[$accountid]) && 
$cache_accountid[$accountid])
!                       {
!                               $account_id = $cache_accountid[$accountid];
!                       }
!                       else
                        {
!                               $account_id = 
get_account_id($accountid,$this->account_id);
!                               $cache_accountid[$accountid] = $account_id;
                        }
!                       $sql = "delete from phpgw_acl where acl_appname like 
'".$app."'"
!                               . " and acl_location like '".$location."' and "
!                               . " acl_account = ".$account_id;
                        $this->db->query($sql ,__LINE__,__FILE__);
                        return $this->db->num_rows();
--- 497,515 ----
                        static $cache_accountid;
  
!                       if ($accountid != False)
                        {
!                               if(isset($cache_accountid[$accountid]) && 
$cache_accountid[$accountid])
!                               {
!                                       $account_id = 
$cache_accountid[$accountid];
!                               }
!                               else
!                               {
!                                       $account_id = 
get_account_id($accountid,$this->account_id);
!                                       $cache_accountid[$accountid] = 
$account_id;
!                               }
!                               $account_sel = ' and acl_account=' . 
$account_id;
                        }
! 
!                       $sql = "delete from phpgw_acl where acl_appname like '" 
. $app . "' and acl_location like '" . $location . "'" . $account_sel; 
                        $this->db->query($sql ,__LINE__,__FILE__);
                        return $this->db->num_rows();