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

[Bettina Gille <address@hidden>]

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

Modified Files:
      Tag: Version-0_9_16-branch
        class.acl.inc.php 
Log Message:
update for accountmaster

Index: class.acl.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/phpgwapi/inc/class.acl.inc.php,v
retrieving revision 1.65.4.6
retrieving revision 1.65.4.7
diff -C2 -d -r1.65.4.6 -r1.65.4.7
*** class.acl.inc.php   8 Sep 2003 10:20:15 -0000       1.65.4.6
--- class.acl.inc.php   23 Oct 2003 15:21:17 -0000      1.65.4.7
***************
*** 62,66 ****
                function acl($account_id = '')
                {
!                       $this->db = $GLOBALS['phpgw']->db;
                        if (!($this->account_id = intval($account_id)))
                        {
--- 62,68 ----
                function acl($account_id = '')
                {
!                       $this->db       = $GLOBALS['phpgw']->db;
!                       $this->db2      = $this->db;
! 
                        if (!($this->account_id = intval($account_id)))
                        {
***************
*** 179,182 ****
--- 181,212 ----
                        reset ($this->data);
                        return $this->data;
+               }
+ 
+               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;
                }