bh: server/kolab-resource-handlers/kolab-resource-handlers/resmgr resmgr.php.in, 1.4, 1.5 olhacks.php.in, 1.3, 1.4

[cvs at intevation.de]

Author: bh

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

Modified Files:
	resmgr.php.in olhacks.php.in 
Log Message:
revert the horde dependecy changes introduced in rev. 1.3 of
olhacks.php.in and resmgr.php.in.  They don't work with the Horde
version included in Kolab at the moment.


Index: resmgr.php.in
===================================================================
RCS file: /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/resmgr/resmgr.php.in,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- resmgr.php.in	10 Apr 2006 13:14:19 -0000	1.4
+++ resmgr.php.in	13 Apr 2006 14:17:54 -0000	1.5
@@ -33,13 +33,16 @@
 define('RM_ITIP_TENTATIVE',                 3);
 
 require_once 'Net/IMAP.php';
+require_once 'Horde/Auth.php';
 require_once 'Horde/iCalendar.php';
+require_once 'Horde/NLS.php';
 require_once 'Horde/MIME.php';
 require_once 'Horde/MIME/Message.php';
 require_once 'Horde/MIME/Headers.php';
 require_once 'Horde/MIME/Part.php';
 require_once 'Horde/MIME/Structure.php';
-require_once 'Horde/String.php';
+//include_once 'Horde/Kolab.php';
+require_once 'Horde/Text.php';
 require_once '@kolab_php_module_prefix at freebusy/recurrence.class.php';
 
 // Globals
@@ -542,7 +545,7 @@
     $vCal->addComponent($itip_reply);
 
     //$mime = &new MIME_Part('multipart/alternative');
-    //$body = &new MIME_Part('text/plain', String::wrap($message, 76, "\n"));
+    //$body = &new MIME_Part('text/plain', Text::wrap($message, 76, "\n"));
 
     $ics = &new MIME_Part('text/calendar', $vCal->exportvCalendar(), 'UTF-8' );
     //$ics->setName('event-reply.ics');
@@ -1278,7 +1281,7 @@
 
     $kolabinfo = 'This is a Kolab Groupware object. To view this object you will need a client that understands the Kolab Groupware format. For a list of such clients please visit http://www.kolab.org/kolab2-clients.html';
 
-    $body = &new MIME_Part('text/plain', String::wrap($kolabinfo, 76, "\n"));
+    $body = &new MIME_Part('text/plain', Text::wrap($kolabinfo, 76, "\n"));
 
     $part = &new MIME_Part('application/x-vnd.kolab.event', $kolab_xml->dump_mem(true));
     $part->setName('kolab.event');
@@ -1380,7 +1383,7 @@
     }
 
     myLog("Sending confirmation of cancelation to $organiser");
-    $body = &new MIME_Part('text/plain', String::wrap($body, 76, "\n"));
+    $body = &new MIME_Part('text/plain', Text::wrap($body, 76, "\n"));
     $mime = &MIME_Message::convertMimePart($body);
     $mime->setTransferEncoding('quoted-printable');
     $mime->transferEncodeContents();

Index: olhacks.php.in
===================================================================
RCS file: /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/resmgr/olhacks.php.in,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- olhacks.php.in	10 Apr 2006 03:35:04 -0000	1.3
+++ olhacks.php.in	13 Apr 2006 14:17:54 -0000	1.4
@@ -19,7 +19,9 @@
  */
 
 require_once '@kolab_php_module_prefix at kolabfilter/misc.php';
+require_once HORDE_BASE . '/lib/core.php';
 require_once 'Horde/iCalendar.php';
+require_once 'Horde/NLS.php';
 require_once 'Horde/MIME.php';
 require_once 'Horde/MIME/Message.php';
 require_once 'Horde/MIME/Headers.php';