4 commits - plugins/libcalendaring plugins/libkolab

Thomas Brüderli bruederli at kolabsys.com
Thu Sep 26 11:38:23 CEST 2013


 plugins/libcalendaring/libcalendaring.php     |    2 ++
 plugins/libkolab/lib/kolab_storage.php        |    6 ++++++
 plugins/libkolab/lib/kolab_storage_cache.php  |   17 +++++++++++++++++
 plugins/libkolab/lib/kolab_storage_folder.php |    4 ++--
 4 files changed, 27 insertions(+), 2 deletions(-)

New commits:
commit 83edac179ad73323fbd3058695ba1fb2c8b64666
Author: Thomas Bruederli <bruederli at kolabsys.com>
Date:   Thu Sep 26 11:33:24 2013 +0200

    Fix date format translation for fullcalendar (#2140)

diff --git a/plugins/libcalendaring/libcalendaring.php b/plugins/libcalendaring/libcalendaring.php
index 3016e51..9df9e00 100644
--- a/plugins/libcalendaring/libcalendaring.php
+++ b/plugins/libcalendaring/libcalendaring.php
@@ -769,6 +769,7 @@ class libcalendaring extends rcube_plugin
             'dddd' => 'l',
             'ddd'  => 'D',
             'dd'   => 'd',
+            'd'    => 'j',
             'HH'   => '**',
             'hh'   => '%%',
             'H'    => 'G',
@@ -799,6 +800,7 @@ class libcalendaring extends rcube_plugin
             'F' => 'MMMM',
             'm' => 'MM',
             'n' => 'M',
+            'j' => 'd',
             'd' => 'dd',
             'D' => 'ddd',
             'l' => 'dddd',


commit 57d6faf4603ed42e4510ab661b1c2e50a793b6ce
Merge: 1a95782 fac41ff
Author: Thomas Bruederli <bruederli at kolabsys.com>
Date:   Thu Sep 26 10:48:13 2013 +0200

    Merge branch 'master' of ssh://git.kolab.org/git/roundcubemail-plugins-kolab



commit 1a957820c41a0dac240f27ac4d5229743a2b6fa2
Author: Thomas Bruederli <bruederli at kolabsys.com>
Date:   Thu Sep 26 10:47:21 2013 +0200

    Update resource URI of cache entries when renaming a folder (#2269)

diff --git a/plugins/libkolab/lib/kolab_storage.php b/plugins/libkolab/lib/kolab_storage.php
index ebfddcb..0f81cec 100644
--- a/plugins/libkolab/lib/kolab_storage.php
+++ b/plugins/libkolab/lib/kolab_storage.php
@@ -276,6 +276,7 @@ class kolab_storage
     {
         self::setup();
 
+        $oldfolder = self::get_folder($oldname);
         $active = self::folder_is_active($oldname);
         $success = self::$imap->rename_folder($oldname, $newname);
         self::$last_error = self::$imap->get_error_str();
@@ -286,6 +287,11 @@ class kolab_storage
             self::set_state($newname, true);
         }
 
+        // assign existing cache entries to new resource uri
+        if ($success && $oldfolder) {
+            $oldfolder->cache->rename($newname);
+        }
+
         return $success;
     }
 
diff --git a/plugins/libkolab/lib/kolab_storage_cache.php b/plugins/libkolab/lib/kolab_storage_cache.php
index ba6c106..a23fbaa 100644
--- a/plugins/libkolab/lib/kolab_storage_cache.php
+++ b/plugins/libkolab/lib/kolab_storage_cache.php
@@ -316,6 +316,23 @@ class kolab_storage_cache
         return $this->db->affected_rows($result);
     }
 
+    /**
+     * Update resource URI for existing cache entries
+     *
+     * @param string Target IMAP folder to move it to
+     */
+    public function rename($new_folder)
+    {
+        $target = kolab_storage::get_folder($new_folder);
+
+        // resolve new message UID in target folder
+        $this->db->query(
+            "UPDATE kolab_cache SET resource=? ".
+            "WHERE resource=?",
+            $target->get_resource_uri(),
+            $this->resource_uri
+        );
+    }
 
     /**
      * Select Kolab objects filtered by the given query


commit a2883e9402ef439f63bc0622c7ddaf5b9a2aa2df
Author: Thomas Bruederli <bruederli at kolabsys.com>
Date:   Thu Sep 26 10:46:13 2013 +0200

    Fix phpdoc

diff --git a/plugins/libkolab/lib/kolab_storage_folder.php b/plugins/libkolab/lib/kolab_storage_folder.php
index 294755b..ddb5b3c 100644
--- a/plugins/libkolab/lib/kolab_storage_folder.php
+++ b/plugins/libkolab/lib/kolab_storage_folder.php
@@ -43,8 +43,8 @@ class kolab_storage_folder
     public $default = false;
 
     /**
-     * Is this folder set to be default
-     * @var boolean
+     * The kolab_storage_cache instance for caching operations
+     * @var object
      */
     public $cache;
 




More information about the commits mailing list