From ba1b8238aa3705427c27326bab0572329f7381e6 Mon Sep 17 00:00:00 2001 From: Aleksander Machniak Date: Thu, 20 Feb 2014 09:35:58 +0100 Subject: [PATCH 1/3] Update version number in initial DDL file (Bug #2867) --- plugins/libkolab/SQL/mysql.initial.sql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/libkolab/SQL/mysql.initial.sql b/plugins/libkolab/SQL/mysql.initial.sql index 40b86316..6677a51f 100644 --- a/plugins/libkolab/SQL/mysql.initial.sql +++ b/plugins/libkolab/SQL/mysql.initial.sql @@ -172,4 +172,4 @@ CREATE TABLE `kolab_cache_freebusy` ( ) /*!40000 ENGINE=INNODB */ /*!40101 CHARACTER SET utf8 COLLATE utf8_general_ci */; -INSERT INTO `system` (`name`, `value`) VALUES ('libkolab-version', '2013121100'); +INSERT INTO `system` (`name`, `value`) VALUES ('libkolab-version', '2014021000'); From 71c66461d5cbbb57a333eb38569929bf1d9dbfb8 Mon Sep 17 00:00:00 2001 From: Aleksander Machniak Date: Thu, 20 Feb 2014 15:41:12 +0100 Subject: [PATCH 2/3] Load per-user settings/plugins also just after log in --- plugins/kolab_auth/kolab_auth.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/plugins/kolab_auth/kolab_auth.php b/plugins/kolab_auth/kolab_auth.php index a4d15e65..0183d4d7 100644 --- a/plugins/kolab_auth/kolab_auth.php +++ b/plugins/kolab_auth/kolab_auth.php @@ -538,6 +538,9 @@ class kolab_auth extends rcube_plugin $args['user'], $origname, rcube_utils::remote_ip())); } + // load per-user settings/plugins + $this->load_user_role_plugins_and_settings(); + return $args; } From 0a79c185edc835a27a76e35a34272116cfbf478c Mon Sep 17 00:00:00 2001 From: Aleksander Machniak Date: Thu, 20 Feb 2014 17:32:30 +0100 Subject: [PATCH 3/3] Add missing columns in initial.sql file (Bug #2867) --- plugins/libkolab/SQL/mysql.initial.sql | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/plugins/libkolab/SQL/mysql.initial.sql b/plugins/libkolab/SQL/mysql.initial.sql index 6677a51f..89b7244d 100644 --- a/plugins/libkolab/SQL/mysql.initial.sql +++ b/plugins/libkolab/SQL/mysql.initial.sql @@ -34,6 +34,10 @@ CREATE TABLE `kolab_cache_contact` ( `tags` VARCHAR(255) NOT NULL, `words` TEXT NOT NULL, `type` VARCHAR(32) CHARACTER SET ascii NOT NULL, + `name` VARCHAR(255) NOT NULL, + `firstname` VARCHAR(255) NOT NULL, + `surname` VARCHAR(255) NOT NULL, + `email` VARCHAR(255) NOT NULL, CONSTRAINT `fk_kolab_cache_contact_folder` FOREIGN KEY (`folder_id`) REFERENCES `kolab_folders`(`folder_id`) ON DELETE CASCADE ON UPDATE CASCADE, PRIMARY KEY(`folder_id`,`msguid`),