[Phpgroupware-cvs] [19002] Fix read_repository -> read or set_account_id

[Caeies]

Revision: 19002
          
http://svn.sv.gnu.org/viewvc/?view=rev&root=phpgroupware&revision=19002
Author:   Caeies
Date:     2008-11-19 18:06:31 +0000 (Wed, 19 Nov 2008)

Log Message:
-----------
Fix read_repository -> read or set_account_id

Modified Paths:
--------------
    core/trunk/preferences/inc/class.boadmin_acl.inc.php
    core/trunk/preferences/inc/class.uiaclprefs.inc.php

Modified: core/trunk/preferences/inc/class.boadmin_acl.inc.php
===================================================================
--- core/trunk/preferences/inc/class.boadmin_acl.inc.php        2008-11-19 
18:05:38 UTC (rev 19001)
+++ core/trunk/preferences/inc/class.boadmin_acl.inc.php        2008-11-19 
18:06:31 UTC (rev 19002)
@@ -245,8 +245,7 @@
                        {
                                $user_checked[] = $user_id;
 
-                               $this->acl->account_id = $user_id;
-                               $this->acl->read_repository();
+                               $this->acl->set_account_id($user_id);
                                $this->acl->delete($this->acl_app, 
$this->location, $grantor, $type);
                                $this->acl->add($this->acl_app, 
$this->location, $rights, $grantor, $type);
                                $this->acl->save_repository($this->acl_app, 
$this->location);
@@ -269,8 +268,7 @@
                                {
                                        if(isset($users_at_location[$user_id]) 
&& $users_at_location[$user_id])
                                        {
-                                               $this->acl->account_id = 
$user_id;
-                                               $this->acl->read_repository();
+                                               
$this->acl->set_account_id($user_id);
                                                
$this->acl->delete($this->acl_app, $this->location, $grantor, $type);
                                                
$this->acl->save_repository($this->acl_app, $this->location);
                                        }
@@ -366,10 +364,8 @@
                                        $user_list[$j]['account_firstname']     
= $account['account_firstname'];
                                        $user_list[$j]['account_lastname']      
= $account['account_lastname'];
 
-                                       
$this->acl->account_id=$account['account_id'];
+                                       
$this->acl->set_account_id($account['account_id']);
 
-                                       $this->acl->read_repository();
-
                                        $count_right=count($right);
                                        for ( $i = 0; $i < $count_right; ++$i )
                                        {

Modified: core/trunk/preferences/inc/class.uiaclprefs.inc.php
===================================================================
--- core/trunk/preferences/inc/class.uiaclprefs.inc.php 2008-11-19 18:05:38 UTC 
(rev 19001)
+++ core/trunk/preferences/inc/class.uiaclprefs.inc.php 2008-11-19 18:06:31 UTC 
(rev 19002)
@@ -114,7 +114,7 @@
                        }
                        unset($acct);
                        $this->acl = 
CreateObject('phpgwapi.acl',intval($owner));
-                       $this->acl->read_repository();
+                       $this->acl->read();
 
                        if (phpgw::get_var('submit', 'bool', 'POST'))
                        {