gunnar: server/php-kolab/Kolab_Server/patches/Kolab_Server-0.5.0 issue3983.patch, 1.1, 1.2

[cvs at kolab.org]

Author: gunnar

Update of /kolabrepository/server/php-kolab/Kolab_Server/patches/Kolab_Server-0.5.0
In directory doto:/tmp/cvs-serv13203/php-kolab/Kolab_Server/patches/Kolab_Server-0.5.0

Modified Files:
	issue3983.patch 
Log Message:
kolab/issue3983 (Phpunit testsuite fails on OpenPKG Kolab 2.2.2)

Index: issue3983.patch
===================================================================
RCS file: /kolabrepository/server/php-kolab/Kolab_Server/patches/Kolab_Server-0.5.0/issue3983.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- issue3983.patch	24 Mar 2010 17:33:57 -0000	1.1
+++ issue3983.patch	25 Mar 2010 13:58:15 -0000	1.2
@@ -1,4 +1,15 @@
-diff -Naur /kolab/lib/php/Horde/Kolab/IMAP.orig/test.php /kolab/lib/php/Horde/Kolab/IMAP/test.php
+From: Gunnar Wrobel <wrobel at pardus.de>
+Subject: [PATCH] issue3983.patch
+
+Fixes unit testing for PHP 5.3.*.
+
+STATUS: UNMERGED
+
+REF: http://issues.kolab.org/issue3983
+
+Signed-off-by: Gunnar Wrobel <wrobel at pardus.de>
+
+diff -Naur a/framework/Kolab_Server/lib/Horde/Kolab/IMAP/test.php b/framework/Kolab_Server/lib/Horde/Kolab/IMAP/test.php
 --- a/framework/Kolab_Server/lib/Horde/Kolab/IMAP/test.php	2010-03-24 18:00:45.675755281 +0100
 +++ b/framework/Kolab_Server/lib/Horde/Kolab/IMAP/test.php	2010-03-24 18:01:16.512484657 +0100
 @@ -93,7 +93,7 @@
@@ -19,3 +30,27 @@
          $pattern = '#^user/' . $user[0] . '#';
          $result = array();
          foreach ($mboxes as $mbox) {
+diff -Naur --exclude='*~' a/framework/Kolab_Server/lib/Horde/Kolab/Server/Object/adminrole.php b/framework/Kolab_Server/lib/Horde/Kolab/Server/Object/adminrole.php
+--- a/framework/Kolab_Server/lib/Horde/Kolab/Server/Object/adminrole.php	2010-03-25 14:06:52.000000000 +0100
++++ b/framework/Kolab_Server/lib/Horde/Kolab/Server/Object/adminrole.php	2010-03-25 14:19:04.000000000 +0100
+@@ -151,7 +151,7 @@
+             $members = array($this->_uid);
+ 
+             //FIXME: This is not okay and also contains too much LDAP knowledge
+-            $parts = split(',', $this->required_group);
++            $parts = explode(',', $this->required_group);
+             list($groupname) = sscanf($parts[0], 'cn=%s');
+ 
+             $result = $this->_db->add(array(KOLAB_ATTR_CN => $groupname,
+diff -Naur --exclude='*~' a/framework/Kolab_Server/lib/Horde/Kolab/Server/Object.php b/framework/Kolab_Server/lib/Horde/Kolab/Server/Object.php
+--- a/framework/Kolab_Server/lib/Horde/Kolab/Server/Object.php	2010-03-25 14:06:52.000000000 +0100
++++ b/framework/Kolab_Server/lib/Horde/Kolab/Server/Object.php	2010-03-25 14:19:12.000000000 +0100
+@@ -359,7 +359,7 @@
+     {
+         switch ($attr) {
+         case KOLAB_ATTR_ID:
+-            $result = split(',', $this->_uid);
++            $result = explode(',', $this->_uid);
+             if (substr($result[0], 0, 3) == 'cn=') {
+                 return substr($result[0], 3);
+             } else {