gunnar: server/kolab-webclient/patches/1.2.0/KOLAB t_Kolab__Storage_HK_GW_TestingFixes.diff, NONE, 1.1 series, 1.4, 1.5

[cvs at kolab.org]

Author: gunnar

Update of /kolabrepository/server/kolab-webclient/patches/1.2.0/KOLAB
In directory doto:/tmp/cvs-serv26716/patches/1.2.0/KOLAB

Modified Files:
	series 
Added Files:
	t_Kolab__Storage_HK_GW_TestingFixes.diff 
Log Message:
Bring Kolab_Storage closer to the library installed in /kolab/lib/php.

--- NEW FILE: t_Kolab__Storage_HK_GW_TestingFixes.diff ---
From: Gunnar Wrobel <p at rdus.de>
Subject: [PATCH] t/Kolab_Storage/HK/GW/TestingFixes

Fix the permission object in case we use setACL() directly.

Also allows complex testing scenarios within FreeBusy. While this
patch is irrelevant for the kolab-webclient it syncs the Kolab_Storage
library.

STATUS: MERGED

REF: http://lists.horde.org/archives/cvs/Week-of-Mon-20090420/087647.html
REF: http://lists.horde.org/archives/cvs/Week-of-Mon-20090420/087648.html

Signed-off-by: Gunnar Wrobel <p at rdus.de>

---
 horde-webmail/lib/Horde/Kolab/Storage/Folder.php |    5 +++++
 horde-webmail/lib/Horde/Kolab/Storage/List.php   |    4 ++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/horde-webmail/lib/Horde/Kolab/Storage/Folder.php b/horde-webmail/lib/Horde/Kolab/Storage/Folder.php
index 4d3e0f3..7eb97d5 100644
--- a/horde-webmail/lib/Horde/Kolab/Storage/Folder.php
+++ b/horde-webmail/lib/Horde/Kolab/Storage/Folder.php
@@ -1422,6 +1422,11 @@ class Kolab_Folder {
             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',
diff --git a/horde-webmail/lib/Horde/Kolab/Storage/List.php b/horde-webmail/lib/Horde/Kolab/Storage/List.php
index 583f41f..a9bff36 100644
--- a/horde-webmail/lib/Horde/Kolab/Storage/List.php
+++ b/horde-webmail/lib/Horde/Kolab/Storage/List.php
@@ -96,7 +96,7 @@ class Kolab_List {
      *
      * @return Kolab_Folders_List  The concrete List reference.
      */
-    function &singleton()
+    function &singleton($destruct = false)
     {
         static $list;
 
@@ -107,7 +107,7 @@ class Kolab_List {
             $list = $session->query('kolab_folderlist');
         }
 
-        if (empty($list[Auth::getAuth()])) {
+        if (empty($list[Auth::getAuth()]) || $destruct) {
             $list[Auth::getAuth()] = new Kolab_List();
         }
 
-- 
tg: (98296a8..) t/Kolab_Storage/HK/GW/TestingFixes (depends on: t/Kolab_Server/HK/GW/MappableAttributes_)
-- 
TOPGIT patch commit log
=======================

commit 0f2720ba809d71ff40332b0477a23aca4b90b17e
Author: Gunnar Wrobel <p at rdus.de>
Date:   Sun Apr 26 10:22:03 2009 +0200

    Fix the permission object in case we use setACL() directly.
    
    Also allows complex testing scenarios within FreeBusy. While this
    patch is irrelevant for the kolab-webclient it syncs the Kolab_Storage
    library.
    
    STATUS: MERGED
    
    REF: http://lists.horde.org/archives/cvs/Week-of-Mon-20090420/087647.html
    REF: http://lists.horde.org/archives/cvs/Week-of-Mon-20090420/087648.html

Index: series
===================================================================
RCS file: /kolabrepository/server/kolab-webclient/patches/1.2.0/KOLAB/series,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- series	26 Apr 2009 07:53:45 -0000	1.4
+++ series	26 Apr 2009 08:34:50 -0000	1.5
@@ -81,3 +81,4 @@
 t_Kolab__Format_HK_GW_HandleEmptyXmlParserReturn.diff
 t_pear_HK_GW_AddNetLDAP2__.diff
 t_Kolab__Server_HK_GW_MappableAttributes__.diff
+t_Kolab__Storage_HK_GW_TestingFixes.diff