gunnar: server/php-kolab/Kolab_Freebusy/Freebusy Cache.php, 1.4, 1.5 Page.php, 1.1, 1.2

[cvs at kolab.org]

Author: gunnar

Update of /kolabrepository/server/php-kolab/Kolab_Freebusy/Freebusy
In directory doto:/tmp/cvs-serv28686/Kolab_Freebusy/Freebusy

Modified Files:
	Cache.php Page.php 
Log Message:
Some fixes required for the cache regeneration script. See ChangeLog.

Index: Cache.php
===================================================================
RCS file: /kolabrepository/server/php-kolab/Kolab_Freebusy/Freebusy/Cache.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- Cache.php	8 Dec 2007 07:32:25 -0000	1.4
+++ Cache.php	5 Feb 2008 17:04:13 -0000	1.5
@@ -294,11 +294,16 @@
             // Regular user
             $user = $regs[1];
             $userdom  = $regs[2];
+        } else {
+            $user = $access->user;
         }
+        
         if(ereg( '(.*)@(.*)', $access->owner, $regs)) {      
             // Regular owner
             $owner = $regs[1];
             $ownerdom = $regs[2];
+        } else {
+            $owner = $access->owner;
         }
 
         $fldrcomp = array();

Index: Page.php
===================================================================
RCS file: /kolabrepository/server/php-kolab/Kolab_Freebusy/Freebusy/Page.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- Page.php	22 Nov 2007 16:53:05 -0000	1.1
+++ Page.php	5 Feb 2008 17:04:13 -0000	1.2
@@ -233,9 +233,14 @@
      */
     var $fbfuture = 60;
 
-    function FolderAccess()
+    function FolderAccess($user = null, $pass = null)
     {
-        $this->_parseUser();
+        if (isset($user) && isset($pass)) {
+            $this->user = $user;
+            $this->pass = $pass;
+        } else {
+            $this->_parseUser();
+        }
     }
     
     function parseFolder($req_folder = '')
@@ -322,7 +327,7 @@
             return PEAR::raiseError(sprintf(_("Invalid Kolab authentication for user %s!"), 
                                             $this->user));
         }
-        session_start();
+        @session_start();
         $_SESSION['__auth'] = array(
             'authenticated' => true,
             'userId' => $this->user,