gunnar: server/horde-turba lib-Turba.php.patch, 1.1, 1.2 horde-turba-kolab.spec, 1.2, 1.3 ChangeLog, 1.1, 1.2

[cvs at kolab.org]

Author: gunnar

Update of /kolabrepository/server/horde-turba
In directory doto:/tmp/cvs-serv19599/horde-turba

Modified Files:
	lib-Turba.php.patch horde-turba-kolab.spec ChangeLog 
Log Message:
	* lib-Turba.php.patch: 

	Add support for renaming shares within Turba.


Index: lib-Turba.php.patch
===================================================================
RCS file: /kolabrepository/server/horde-turba/lib-Turba.php.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- lib-Turba.php.patch	25 May 2007 12:07:17 -0000	1.1
+++ lib-Turba.php.patch	31 May 2007 14:09:14 -0000	1.2
@@ -4,7 +4,7 @@
 retrieving revision 1.121
 diff -u -B -r1.121 Turba.php
 --- lib/Turba.php	12 May 2007 14:58:12 -0000	1.121
-+++ lib/Turba.php	25 May 2007 11:01:42 -0000
++++ lib/Turba.php	31 May 2007 14:02:13 -0000
 @@ -332,14 +332,13 @@
              } else {
                  $source = $in;
@@ -21,3 +21,20 @@
                        ($source === $in)) {
                  // Using Horde_Perms AND checking source level permsissions
                  return $perms->hasPermission('turba:sources:' . $in, $userID,
+@@ -580,6 +579,7 @@
+     function updateShare($name, $params)
+     {
+         $share = &$GLOBALS['turba_shares']->getShare($name);
++        $old_id = $share->getId();
+         if (is_a($share, 'PEAR_Error')) {
+             return $share;
+         }
+@@ -590,6 +590,8 @@
+         if (is_a($result, 'PEAR_Error')) {
+             return $result;
+         } else {
++            unset($GLOBALS['cfgSources'][$old_id]);
++            Turba::addSourceFromShare($share);
+             return $share->get('name');
+         }
+     }

Index: horde-turba-kolab.spec
===================================================================
RCS file: /kolabrepository/server/horde-turba/horde-turba-kolab.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- horde-turba-kolab.spec	29 May 2007 20:35:18 -0000	1.2
+++ horde-turba-kolab.spec	31 May 2007 14:09:14 -0000	1.3
@@ -29,6 +29,9 @@
 # PATCH COMMENT
 #
 #   Check if this can be integrated upstream
+#
+#   The second part of the patch allows to rename 
+#   shares
 Patch0:         lib-Turba.php.patch
 
 ##################################################

Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/horde-turba/ChangeLog,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- ChangeLog	29 May 2007 20:34:37 -0000	1.1
+++ ChangeLog	31 May 2007 14:09:14 -0000	1.2
@@ -1,3 +1,9 @@
+2007-05-31  Gunnar Wrobel  <p at rdus.de>
+
+	* lib-Turba.php.patch: 
+
+	Add support for renaming shares within Turba.
+
 2007-05-29  Gunnar Wrobel  <p at rdus.de>
 
 	* horde-turba-kolab.spec: Added package to Kolab CVS.