steffen: server/kolab-resource-handlers/kolab-resource-handlers/resmgr kolabfilter.php, 1.14, 1.15 resmgr.php, 1.59, 1.60

[cvs at intevation.de]

Author: steffen

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

Modified Files:
	kolabfilter.php resmgr.php 
Log Message:
Fix for Issue593 (incidences-for default) + some path tweaks to allow our code to coexist with the webclient

Index: kolabfilter.php
===================================================================
RCS file: /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/resmgr/kolabfilter.php,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- kolabfilter.php	21 Dec 2004 13:30:46 -0000	1.14
+++ kolabfilter.php	7 Jan 2005 22:24:16 -0000	1.15
@@ -19,6 +19,11 @@
  *  Project's homepage; see <http://www.gnu.org/licenses/gpl.html>.
  */
 
+/* Fix include_path to pick up our modified Horde classes */
+$include_path = ini_get('include_path');
+ini_set( 'include_path', 
+	 '.:@l_prefix@/var/kolab/php:@l_prefix@/var/kolab/php/pear:'.$include_path);
+
 require_once 'PEAR.php';
 require_once 'kolabfilter/misc.php';
 require_once 'kolabfilter/smtp.php';

Index: resmgr.php
===================================================================
RCS file: /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/resmgr/resmgr.php,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -d -r1.59 -r1.60
--- resmgr.php	17 Dec 2004 21:42:47 -0000	1.59
+++ resmgr.php	7 Jan 2005 22:24:16 -0000	1.60
@@ -653,10 +653,13 @@
     if( !$calmbox ) {
       // No default calendar, try to create one
       $calmbox = "user/$prefix/" . $params['calendar_store'] . "$suffix";
-      $rc = $imap->createMailBox( $calmbox );
-      if( PEAR::isError($rc) ) {
-	myLog('IMAP Errors from createMailBox: ' . $rc->getMessage(), RM_LOG_ERROR );
-	return false;
+      if( !in_array( $calmbox, $mailboxes ) ) {
+	// Create mailbox
+	$rc = $imap->createMailBox( $calmbox );
+	if( PEAR::isError($rc) ) {
+	  myLog('IMAP Errors from createMailBox: ' . $rc->getMessage(), RM_LOG_ERROR );
+	  return false;
+	}
       }
       $rc = $imap->setAnnotation('/vendor/kolab/folder-type',
 				 array('value.shared' => 'event.default'),