[Phpgroupware-cvs] [18997] Fix read_repository -> set_account_id things

[Caeies]

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

Log Message:
-----------
Fix read_repository -> set_account_id things

Modified Paths:
--------------
    core/trunk/phpgwapi/inc/class.vfs_dav.inc.php
    core/trunk/phpgwapi/inc/class.vfs_sql.inc.php

Modified: core/trunk/phpgwapi/inc/class.vfs_dav.inc.php
===================================================================
--- core/trunk/phpgwapi/inc/class.vfs_dav.inc.php       2008-11-19 17:59:33 UTC 
(rev 18996)
+++ core/trunk/phpgwapi/inc/class.vfs_dav.inc.php       2008-11-19 18:00:29 UTC 
(rev 18997)
@@ -514,8 +514,7 @@
                        }
 
                        $acl = CreateObject ('phpgwapi.acl', $owner_id);
-                       $acl->account_id = $owner_id;
-                       $acl->read_repository ();
+                       $acl->set_account_id($owner_id);
 
                        $rights = $acl->get_rights ($user_id);
 
@@ -536,7 +535,7 @@
                        elseif (!$rights && $group_ok)
                        {
                                $conf = CreateObject('phpgwapi.config', 
'phpgwapi');
-                               $conf->read_repository();
+                               $conf->read();
                                if ($conf->config_data['acl_default'] == 
'grant')
                                {
                                        return True;
@@ -1563,7 +1562,7 @@
                                if ( substr($p->fake_leading_dirs, 0, 
strlen($homedir)) == $homedir)
                                { 
                                        $conf = CreateObject('phpgwapi.config', 
'phpgwapi');
-                                       $conf->read_repository();
+                                       $conf->read();
                                        if ($conf->config_data['acl_default'] 
!= 'grant')
                                        {
                                                $htaccess = 'require user 
'.$GLOBALS['phpgw_info']['user']['account_lid'];

Modified: core/trunk/phpgwapi/inc/class.vfs_sql.inc.php
===================================================================
--- core/trunk/phpgwapi/inc/class.vfs_sql.inc.php       2008-11-19 17:59:33 UTC 
(rev 18996)
+++ core/trunk/phpgwapi/inc/class.vfs_sql.inc.php       2008-11-19 18:00:29 UTC 
(rev 18997)
@@ -78,7 +78,7 @@
                           in the database.
                        */
                        $conf = CreateObject('phpgwapi.config', 'phpgwapi');
-                       $conf->read_repository();
+                       $conf->read();
                        if ($conf->config_data['file_store_contents'] == 
'filesystem' || !$conf->config_data['file_store_contents'])
                        {
                                $this->file_actions = 1;
@@ -744,8 +744,7 @@
                        }
 
                        $acl = CreateObject ('phpgwapi.acl', $owner_id);
-                       $acl->account_id = $owner_id;
-                       $acl->read_repository ();
+                       $acl->set_account_id($owner_id);
 
                        $rights = $acl->get_rights ($user_id);
 
@@ -766,7 +765,7 @@
                        elseif (!$rights && $group_ok)
                        {
                                $conf = CreateObject('phpgwapi.config', 
'phpgwapi');
-                               $conf->read_repository();
+                               $conf->read();
                                if ($conf->config_data['acl_default'] == 
'grant')
                                {
                                        return True;
@@ -816,7 +815,7 @@
                        }
 
                        $conf = CreateObject('phpgwapi.config', 'phpgwapi');
-                       $conf->read_repository();
+                       $conf->read();
                        if ($this->file_actions || $p->outside)
                        {
                                if (filesize ($p->real_full_path) > 0 && $fp = 
fopen ($p->real_full_path, 'rb'))
@@ -904,7 +903,7 @@
                        );
 
                        $conf = CreateObject('phpgwapi.config', 'phpgwapi');
-                       $conf->read_repository();
+                       $conf->read();
                        if ($this->file_actions)
                        {
                                if ($fp = fopen ($p->real_full_path, 'wb'))