Micke/roundcubemail-plugins-kolab
0
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
Thomas Bruederli 2014-02-21 16:35:03 +01:00
commit f6a381c72f
2 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
plugins/kolab_auth/kolab_auth.php
View file

@ -538,6 +538,9 @@ class kolab_auth extends rcube_plugin
$args['user'], $origname, rcube_utils::remote_ip())); $args['user'], $origname, rcube_utils::remote_ip()));
} }
// load per-user settings/plugins
$this->load_user_role_plugins_and_settings();
return $args; return $args;
} }

6
plugins/libkolab/SQL/mysql.initial.sql
View file

@ -34,6 +34,10 @@ CREATE TABLE `kolab_cache_contact` (
`tags` VARCHAR(255) NOT NULL, `tags` VARCHAR(255) NOT NULL,
`words` TEXT NOT NULL, `words` TEXT NOT NULL,
`type` VARCHAR(32) CHARACTER SET ascii 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`) CONSTRAINT `fk_kolab_cache_contact_folder` FOREIGN KEY (`folder_id`)
REFERENCES `kolab_folders`(`folder_id`) ON DELETE CASCADE ON UPDATE CASCADE, REFERENCES `kolab_folders`(`folder_id`) ON DELETE CASCADE ON UPDATE CASCADE,
PRIMARY KEY(`folder_id`,`msguid`), PRIMARY KEY(`folder_id`,`msguid`),
@ -172,4 +176,4 @@ CREATE TABLE `kolab_cache_freebusy` (
) /*!40000 ENGINE=INNODB */ /*!40101 CHARACTER SET utf8 COLLATE utf8_general_ci */; ) /*!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');