thomas: server/kolab-resource-handlers/kolab-resource-handlers/freebusy freebusy.class.php.in, 1.13, 1.14

[cvs at kolab.org]

Author: thomas

Update of /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/freebusy
In directory doto:/tmp/cvs-serv14347/kolab-resource-handlers/kolab-resource-handlers/freebusy

Modified Files:
	freebusy.class.php.in 
Log Message:
add php5 compatibility code for domxml
(imported patch "php5-domxml-compat" from 2.2-beta1 release)


Index: freebusy.class.php.in
===================================================================
RCS file: /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/freebusy/freebusy.class.php.in,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- freebusy.class.php.in	5 Jun 2007 09:46:49 -0000	1.13
+++ freebusy.class.php.in	17 Jul 2007 15:09:34 -0000	1.14
@@ -34,6 +34,9 @@
 require_once '@kolab_php_module_prefix at freebusy/freebusyimapcache.class.php';
 require_once '@kolab_php_module_prefix at freebusy/recurrence.class.php';
 
+if (version_compare(PHP_VERSION,'5', '>='))
+  require_once('@kolab_php_module_prefix at freebusy/domxml-php4-to-php5.php');
+
 class FreeBusyRecurrence extends Recurrence {
   function FreeBusyRecurrence( &$imapcache, &$imapuid, &$vfb, &$extra ) {
     $this->imapcache =& $imapcache;
@@ -395,7 +398,7 @@
   }
 
   function getEventHash($xml_text) {
-    $xmldoc = @domxml_open_mem($xml_text, DOMXML_LOAD_PARSING +
+    $xmldoc = domxml_open_mem($xml_text, DOMXML_LOAD_PARSING +
 			       DOMXML_LOAD_COMPLETE_ATTRS + DOMXML_LOAD_SUBSTITUTE_ENTITIES +
 			       DOMXML_LOAD_DONT_KEEP_BLANKS, $error);