steffen: server/kolab-resource-handlers/kolab-resource-handlers/resmgr resmgr.php, 1.7, 1.8

[cvs at intevation.de]

Author: steffen

Update of /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/resmgr
In directory doto:/tmp/cvs-serv30662/kolab-resource-handlers/kolab-resource-handlers/resmgr

Modified Files:
	resmgr.php 
Log Message:
bugfixes to make things work again

Index: resmgr.php
===================================================================
RCS file: /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/resmgr/resmgr.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- resmgr.php	15 Jul 2004 23:46:49 -0000	1.7
+++ resmgr.php	16 Jul 2004 12:40:14 -0000	1.8
@@ -133,8 +133,15 @@
     $connected = false;
 }
 
+$is_shutting_down = false;
+
 function shutdown($return = 1)
 {
+    global $is_shutting_down;
+
+    //Guard against recursion(!)
+    if( $is_shutting_down ) return;
+    $is_shutting_down = true;
     myLog("Shutting down ($return)", RM_LOG_SUPER);
 
     // Get the resource's free/busy list
@@ -301,7 +308,7 @@
 
     $uri .= empty($parsed['user']) ? '' :
         urlencode($parsed['user']) .
-        (empty($parsed['pass']) ? '' : urlencode($parsed['pass']))
+        (empty($parsed['pass']) ? '' : ':'.urlencode($parsed['pass']))
         . '@';
 
     $uri .= empty($parsed['host']) ? '' :
@@ -331,8 +338,6 @@
     $parsed['pass'] = $params['calendar_pass'];
     $url = assembleUri($parsed);
 
-    myLog("Using f/b URL $url", RM_LOG_DEBUG);
-
     $text = @file_get_contents($url);
     if ($text == false || empty($text)) {
         myLog("Unable to retrieve free/busy information for $resource", RM_LOG_ERROR);
@@ -344,8 +349,9 @@
     $vfb = &$iCalendar->findComponent('VFREEBUSY');
 
     if ($vfb === false) {
-        myLog("Invalid or no free/busy information available for $resource", RM_LOG_ERROR);
-        shutdown();
+        myLog("Invalid or no free/busy information available for $resource", RM_LOG_ERROR);	
+        //shutdown();
+	return false;
     }
 
     $vfb->simplify();