steffen: server/kolab-resource-handlers/kolab-resource-handlers/resmgr resmgr.php, 1.3, 1.4

[cvs at intevation.de]

Author: steffen

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

Modified Files:
	resmgr.php 
Log Message:
fb and resources

Index: resmgr.php
===================================================================
RCS file: /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/resmgr/resmgr.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- resmgr.php	13 Jul 2004 01:15:14 -0000	1.3
+++ resmgr.php	13 Jul 2004 03:28:27 -0000	1.4
@@ -223,7 +223,6 @@
     myLog("More than one object returned for $resource");
     return false;    
   }
-  myLog("encrypted password is ".$entries[0]['encryptedpassword'][0]);
   $encpw = base64_decode($entries[0]['encryptedpassword'][0]);
   ldap_close($ldap);
   
@@ -306,9 +305,11 @@
 
     $parsed = parse_url($url);
     $parsed['user'] = $params['calendar_user'];
-    $parsed['user'] = $params['calendar_pass'];
+    $parsed['pass'] = $params['calendar_pass'];
     $url = glue_url($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);
@@ -465,24 +466,29 @@
     } else {
         $mailbox = "user/$prefix/" . $params['calendar_store'] . "$suffix";
     }
-    #$fullmbox = $server . $mailbox;
-
-    $mailbox = "INBOX/Calendar";
+    #$mailbox = "INBOX/Calendar";
     $fullmbox = $server . $mailbox;
 
     myLog("Opening connection to $server for ".$params['calendar_user'], RM_LOG_DEBUG);
     // Open an IMAP connection to the requested users' calendar
-    $imap = @imap_open($fullmbox, $params['calendar_user'], $params['calendar_pass'], CL_EXPUNGE|OP_HALFOPEN);
+    $imap = @imap_open($fullmbox, $params['calendar_user'], $params['calendar_pass'], OP_HALFOPEN);
     testIMAPError();
     @imap_reopen( $imap, $fullmbox, CL_EXPUNGE );
     $errors = imap_errors();
-    myLog( "IMAP Errors from reopen: ".join(", ", $errors ) );
+    if( $errors ) myLog( "IMAP Errors from reopen: ".join(", ", $errors ) );
     if( !empty($errors) ) {
       // slurp up errors
       // Create Calendar folder
       @imap_createmailbox( $imap, $fullmbox );
       myLog( "IMAP Errors from createmailbox: ".join(", ", imap_errors() ) );
+
+      $status = @imap_status($imap, $fullmbox, SA_ALL);
+      myLog( "Info about new folder: ".print_r($status,true));
+
       @imap_reopen( $imap, $fullmbox, CL_EXPUNGE );
+      if( imap_last_error() ) {
+	myLog( "IMAP Error from imap_reopen on new mailbox $fullmbox: ".imap_last_error());
+      }
     }
     testIMAPError();