steffen: server/kolab-resource-handlers/kolab-resource-handlers/resmgr resmgr.php, 1.31, 1.32

[cvs at intevation.de]

Author: steffen

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

Modified Files:
	resmgr.php 
Log Message:
Fix for issue360 (wrong encoding of ical replies from server)

Index: resmgr.php
===================================================================
RCS file: /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/resmgr/resmgr.php,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -d -r1.31 -r1.32
--- resmgr.php	11 Oct 2004 13:05:53 -0000	1.31
+++ resmgr.php	11 Oct 2004 19:10:22 -0000	1.32
@@ -133,7 +133,7 @@
 
 $is_shutting_down = false;
 
-function shutdown($return = 1, $errormsg = "" )
+function shutdown($return = 1, $errormsg = "", $updatefb = true )
 {
     global $is_shutting_down;
 
@@ -144,8 +144,10 @@
 
     // Get the resource's free/busy list
     // once more so it is up to date
-    if( !triggerFreeBusy(false) ) {
-      myLog("Error updating fblist", RM_LOG_SUPER );
+    if( $updatefb ) {
+      if( !triggerFreeBusy(false) ) {
+	myLog("Error updating fblist", RM_LOG_SUPER );
+      }
     }
 
     imapClose();
@@ -611,7 +613,7 @@
     //$mime = &new MIME_Part('multipart/alternative');
     //$body = &new MIME_Part('text/plain', Text::wrap($message, 76, "\n"));
 
-    $ics = &new MIME_Part('text/calendar', $vCal->exportvCalendar());
+    $ics = &new MIME_Part('text/calendar', $vCal->exportvCalendar(), 'UTF-8' );
     //$ics->setName('event-reply.ics');
     $ics->setContentTypeParameter('method', 'REPLY');
 
@@ -624,6 +626,7 @@
     // responses, i.e. double-clicking a reply will automatically update your
     // meetings, showing different status icons in the UI, etc.
     $mime = &MIME_Message::convertMimePart($ics);
+    $mime->setCharset('UTF-8');
     $mime->setTransferEncoding('quoted-printable');
     $mime->transferEncodeContents();
 
@@ -1182,6 +1185,6 @@
 // Pass the message through to the group's mailbox
 myLog("Passing through $method method to $resource");
 sendSMTP($sender, $resource, $requestText);
-shutdown(0);
+shutdown(0, "", false);
 
 ?>