2 commits - plugins/libkolab plugins/tasklist

[Thomas Brüderli]

 plugins/libkolab/lib/kolab_storage_cache.php            |   11 ++++++-
 plugins/tasklist/README                                 |   23 ++++++++++++++++
 plugins/tasklist/drivers/database/SQL/mysql.initial.sql |    6 ++--
 3 files changed, 36 insertions(+), 4 deletions(-)

New commits:
commit 158fa06a3cc926abffe1cbd9fabaa90638d4d082
Author: Thomas Bruederli <bruederli at kolabsys.com>
Date:   Wed Nov 20 17:17:31 2013 +0100

    Fix moving of Kolab objects to other folders in cache (#2564)

diff --git a/plugins/libkolab/lib/kolab_storage_cache.php b/plugins/libkolab/lib/kolab_storage_cache.php
index 84cb2b0..e8ceed1 100644
--- a/plugins/libkolab/lib/kolab_storage_cache.php
+++ b/plugins/libkolab/lib/kolab_storage_cache.php
@@ -117,6 +117,15 @@ class kolab_storage_cache
     }
 
     /**
+     * Getter for the numeric ID used in cache tables
+     */
+    public function get_folder_id()
+    {
+        $this->_read_folder_data();
+        return $this->folder_id;
+    }
+
+    /**
      * Synchronize local cache data with remote
      */
     public function synchronize()
@@ -349,7 +358,7 @@ class kolab_storage_cache
             $this->db->query(
                 "UPDATE $this->cache_table SET folder_id=?, msguid=? ".
                 "WHERE folder_id=? AND msguid=?",
-                $target->folder_id,
+                $target->cache->get_folder_id(),
                 $new_msguid,
                 $this->folder_id,
                 $msguid


commit 76ad5e921e8de8538c72b09d6b7ba8e0318756cf
Author: Thomas Bruederli <bruederli at kolabsys.com>
Date:   Wed Nov 20 17:00:50 2013 +0100

    Describe dependencies and installation for tasklist module

diff --git a/plugins/tasklist/README b/plugins/tasklist/README
new file mode 100644
index 0000000..4b326e7
--- /dev/null
+++ b/plugins/tasklist/README
@@ -0,0 +1,23 @@
+A task management module for Roundcube
+--------------------------------------
+
+This plugin currently supports a local database as well as a Kolab groupware
+server as backends for tasklists and todo items storage.
+
+INSTALLATION
+------------
+
+When usigng the database driver, some initialization of the local database is
+necessary. To do so, execute the SQL commands in
+drivers/database/SQL/<yourdatabase>.initial.sql
+
+For some general calendar-based operations such as alarms handling, this
+plugin requires the `libcalendaring` plugin which is also part of the
+Kolab Roundcube Plugins repository. Make sure that plugin is installed
+and configured correctly.
+
+IMPORTANT
+---------
+
+This plugin doesn't work with the classic skin of Roundcube because no
+templates are available for that skin.
diff --git a/plugins/tasklist/drivers/database/SQL/mysql.initial.sql b/plugins/tasklist/drivers/database/SQL/mysql.initial.sql
index 5e71788..2746ca4 100644
--- a/plugins/tasklist/drivers/database/SQL/mysql.initial.sql
+++ b/plugins/tasklist/drivers/database/SQL/mysql.initial.sql
@@ -7,7 +7,7 @@
  * @copyright (C) 2012, Kolab Systems AG
  */
 
-CREATE TABLE `tasklists` (
+CREATE TABLE IF NOT EXISTS `tasklists` (
   `tasklist_id` int(10) unsigned NOT NULL AUTO_INCREMENT,
   `user_id` int(10) unsigned NOT NULL,
   `name` varchar(255) NOT NULL,
@@ -19,7 +19,7 @@ CREATE TABLE `tasklists` (
     REFERENCES `users`(`user_id`) ON DELETE CASCADE ON UPDATE CASCADE
 ) /*!40000 ENGINE=InnoDB CHARACTER SET utf8 COLLATE utf8_general_ci */;
 
-CREATE TABLE `tasks` (
+CREATE TABLE IF NOT EXISTS `tasks` (
   `task_id` int(10) unsigned NOT NULL AUTO_INCREMENT,
   `tasklist_id` int(10) unsigned NOT NULL,
   `parent_id` int(10) unsigned DEFAULT NULL,
@@ -48,4 +48,4 @@ CREATE TABLE `tasks` (
     REFERENCES `tasklists`(`tasklist_id`) ON DELETE CASCADE ON UPDATE CASCADE
 ) /*!40000 ENGINE=InnoDB CHARACTER SET utf8 COLLATE utf8_general_ci */;
 
-INSERT INTO `system` (`name`, `value`) VALUES ('tasklist-database-version', '2013011000');
+REPLACE INTO `system` (`name`, `value`) VALUES ('tasklist-database-version', '2013011000');