[Phpgroupware-cvs] [18989] fix the read_repository things, to set_account_id

[Caeies]

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

Log Message:
-----------
fix the read_repository things, to set_account_id

Modified Paths:
--------------
    core/trunk/setup/ldapimport.php
    core/trunk/setup/ldapmodify.php

Modified: core/trunk/setup/ldapimport.php
===================================================================
--- core/trunk/setup/ldapimport.php     2008-11-19 17:49:01 UTC (rev 18988)
+++ core/trunk/setup/ldapimport.php     2008-11-19 17:49:47 UTC (rev 18989)
@@ -265,7 +265,7 @@
                                                        if($tmpid)
                                                        {
                                                                
$GLOBALS['phpgw']->acl->acl($tmpid);
-                                                               
$GLOBALS['phpgw']->acl->read_repository();
+                                                               
$GLOBALS['phpgw']->acl->read();
 
                                                                
$GLOBALS['phpgw']->acl->delete('phpgw_group',$thisacctid,1);
                                                                
$GLOBALS['phpgw']->acl->add('phpgw_group',$thisacctid,1);
@@ -282,7 +282,7 @@
                                                                $pref = 
CreateObject('phpgwapi.preferences',$tmpid);
                                                                $pref->db = 
$GLOBALS['phpgw_setup']->db;
                                                                
$pref->account_id = intval($tmpid);
-                                                               
$pref->read_repository();
+                                                               $pref->read();
                                                                
@reset($_POST['s_apps']);
                                                                while 
(list($key,$app) = each($_POST['s_apps']))
                                                                {
@@ -293,7 +293,7 @@
                                                }
                                                /* Now give this group some 
rights */
                                                
$GLOBALS['phpgw']->acl->acl($thisacctid);
-                                               
$GLOBALS['phpgw']->acl->read_repository();
+                                               $GLOBALS['phpgw']->acl->read();
                                                @reset($_POST['s_apps']);
                                                while (list($key,$app) = 
each($_POST['s_apps']))
                                                {
@@ -341,8 +341,7 @@
 
                                $acl = 
CreateObject('phpgwapi.acl',$defaultgroupid);
                                $acl->db = $GLOBALS['phpgw_setup']->db;
-                               $acl->account_id = intval($defaultgroupid);
-                               $acl->read_repository();
+                               $acl->set_account_id(intval($defaultgroupid));
                                foreach ( $_POST['s_apps'] as $app )
                                {
                                        $acl->delete($app,'run',1);
@@ -400,7 +399,7 @@
                                        //  these rights.  Instead, we make the 
user a member of the Default group
                                        //  below.
                                        
$GLOBALS['phpgw']->acl->acl($thisacctid);
-                                       
$GLOBALS['phpgw']->acl->read_repository();
+                                       $GLOBALS['phpgw']->acl->read();
 
                                        // Only give them admin if we asked for 
them to have it.
                                        // This is typically an exception to 
apps for run rights

Modified: core/trunk/setup/ldapmodify.php
===================================================================
--- core/trunk/setup/ldapmodify.php     2008-11-19 17:49:01 UTC (rev 18988)
+++ core/trunk/setup/ldapmodify.php     2008-11-19 17:49:47 UTC (rev 18989)
@@ -233,8 +233,7 @@
                                                // these rights.  Instead, we 
maintain group membership here.
                                                if($tmpid)
                                                {
-                                                       $acl->account_id = 
intval($tmpid);
-                                                       $acl->read_repository();
+                                                       
$acl->set_account_id(intval($tmpid));
 
                                                        
$acl->delete('phpgw_group',$thisacctid,1);
                                                        
$acl->add('phpgw_group',$thisacctid,1);
@@ -248,8 +247,7 @@
                                        }
                                        // Now give this group some rights
                                        
$GLOBALS['phpgw_info']['user']['account_id'] = $thisacctid;
-                                       $acl->account_id = intval($thisacctid);
-                                       $acl->read_repository();
+                                       
$acl->set_account_id(intval($thisacctid));
                                        @reset($s_apps);
                                        while (list($key,$app) = @each($s_apps))
                                        {
@@ -336,8 +334,7 @@
                                        Since the group has app rights, we 
don't need to give users
                                        these rights.
                                        */
-                                       $acl->account_id = intval($thisacctid);
-                                       $acl->read_repository();
+                                       
$acl->set_account_id(intval($thisacctid));
 
                                        /*
                                        However, if no groups were imported, we 
do need to give each user