gunnar: server/php-kolab/Kolab_Storage Kolab_Storage_0.4.0_p2.patch, NONE, 1.1 ChangeLog, 1.5, 1.6 Kolab_Storage.spec, 1.8, 1.9

[cvs at kolab.org]

Author: gunnar

Update of /kolabrepository/server/php-kolab/Kolab_Storage
In directory doto:/tmp/cvs-serv25404

Modified Files:
	ChangeLog Kolab_Storage.spec 
Added Files:
	Kolab_Storage_0.4.0_p2.patch 
Log Message:
Add another patch from upstream that fixes testing in the Kolab_FreeBusy package.

--- NEW FILE: Kolab_Storage_0.4.0_p2.patch ---
From: Gunnar Wrobel <wrobel at pardus.de>
Subject: [PATCH] Kolab_Storage_0.4.0_p2.patch

Fixes unit testing in Kolab_FreeBusy.

STATUS: MERGED

http://lists.horde.org/archives/cvs/Week-of-Mon-20090420/087649.html
http://lists.horde.org/archives/cvs/Week-of-Mon-20090420/087650.html

Signed-off-by: Gunnar Wrobel <wrobel at pardus.de>

Index: lib/Horde/Kolab/Storage/Folder.php
===================================================================
RCS file: /repository/framework/Kolab_Storage/lib/Horde/Kolab/Storage/Folder.php,v
retrieving revision 1.7.2.19
diff -u -B -r1.7.2.19 Folder.php
--- lib/Horde/Kolab/Storage/Folder.php	24 Feb 2009 07:40:40 -0000	1.7.2.19
+++ lib/Horde/Kolab/Storage/Folder.php	25 Apr 2009 18:41:09 -0000
@@ -1422,6 +1422,11 @@
             return $iresult;
         }
 
+        if (!empty($this->_perms)) {
+            /** Refresh the cache after changing the permissions */
+            $this->_perms->getPerm();
+        }
+
         $result = $this->trigger();
         if (is_a($result, 'PEAR_Error')) {
             Horde::logMessage(sprintf('Failed triggering folder %s! Error was: %s',
Index: lib/Horde/Kolab/Storage/List.php
===================================================================
RCS file: /repository/framework/Kolab_Storage/lib/Horde/Kolab/Storage/List.php,v
retrieving revision 1.3.2.7
diff -u -B -r1.3.2.7 List.php
--- lib/Horde/Kolab/Storage/List.php	23 Feb 2009 21:33:19 -0000	1.3.2.7
+++ lib/Horde/Kolab/Storage/List.php	25 Apr 2009 18:41:10 -0000
@@ -96,7 +96,7 @@
      *
      * @return Kolab_Folders_List  The concrete List reference.
      */
-    function &singleton()
+    function &singleton($destruct = false)
     {
         static $list;
 
@@ -107,7 +107,7 @@
             $list = $session->query('kolab_folderlist');
         }
 
-        if (empty($list[Auth::getAuth()])) {
+        if (empty($list[Auth::getAuth()]) || $destruct) {
             $list[Auth::getAuth()] = new Kolab_List();
         }
 
Index: lib/Horde/Kolab/Test/Storage.php
===================================================================
RCS file: /repository/framework/Kolab_Storage/lib/Horde/Kolab/Test/Storage.php,v
retrieving revision 1.1.2.4
diff -u -B -r1.1.2.4 Storage.php
--- lib/Horde/Kolab/Test/Storage.php	24 Feb 2009 07:40:40 -0000	1.1.2.4
+++ lib/Horde/Kolab/Test/Storage.php	25 Apr 2009 18:41:10 -0000
@@ -92,6 +92,11 @@
             $folder->setName($arguments[0]);
             $world['folder_creation'] = $folder->save(array('type' => 'event',
                                                             'default' => true));
+            $folder->setACL(Auth::getAuth(), 'alrid');
+            break;
+        case 'allow a group full access to a folder':
+            $folder = $world['storage']->getFolder($arguments[1]);
+            $folder->setACL($arguments[0], 'alrid');
             break;
         case 'retrieving the list of shares for the application':
             require_once 'Horde/Share.php';
@@ -100,6 +105,11 @@
 
             $world['list'] = $shares->listShares(Auth::getAuth());
             break;
+        case 'logging in as a user with a password':
+            $world['login'] = $world['auth']->authenticate($arguments[0],
+                                                           array('password' => $arguments[1]));
+            $world['storage'] = &$this->prepareEmptyKolabStorage();
+            return parent::runWhen($world, $action, $arguments);
         default:
             return parent::runWhen($world, $action, $arguments);
         }
@@ -153,7 +163,7 @@
         $GLOBALS['KOLAB_TESTING'] = array();
 
         /** Prepare a Kolab test storage */
-        $storage = Kolab_List::singleton();
+        $storage = Kolab_List::singleton(true);
         return $storage;
     }
 

Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/php-kolab/Kolab_Storage/ChangeLog,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- ChangeLog	24 Apr 2009 09:08:12 -0000	1.5
+++ ChangeLog	25 Apr 2009 18:56:46 -0000	1.6
@@ -1,3 +1,8 @@
+2009-04-25  Gunnar Wrobel  <p at rdus.de>
+
+	* Kolab_Storage_0.4.0_p2.patch: Fixes unit testing in
+	Kolab_FreeBusy.
+
 2009-04-24  Gunnar Wrobel  <p at rdus.de>
 
 	* Kolab_Storage.spec: Fixed unit testing.

Index: Kolab_Storage.spec
===================================================================
RCS file: /kolabrepository/server/php-kolab/Kolab_Storage/Kolab_Storage.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- Kolab_Storage.spec	24 Apr 2009 09:08:12 -0000	1.8
+++ Kolab_Storage.spec	25 Apr 2009 18:56:46 -0000	1.9
@@ -20,6 +20,7 @@
 
 # List of patches
 Patch0:    Kolab_Storage_0.4.0_p1.patch
+Patch1:    Kolab_Storage_0.4.0_p2.patch
 
 # Build Info
 Prefix:	   %{l_prefix}
@@ -55,6 +56,7 @@
 	%setup -n %{V_package}-%{V_version}
 
         %patch -p0 -P 0
+        %patch -p0 -P 1
 
 	cat ../package.xml | sed -e 's/md5sum="[^"]*"//' > package.xml