Kolab Groupware OBS

We truncated the diff of some files because they were too big. If you want to see the full diff for every file, click here.

Changes of Revision 9

buildroundcubemailtarball.sh Changed

roundcubemail-1.5.3.tar.gz/CHANGELOG.md Changed

roundcubemail-1.5.3.tar.gz/composer.lock Changed

@@ -4112,16 +4112,16 @@
         },
         {
             "name": "symfony/polyfill-ctype",
-            "version": "v1.26.0",
+            "version": "v1.27.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-ctype.git",
-                "reference": "6fd1b9a79f6e3cf65f9e679b23af304cd9e010d4"
+                "reference": "5bbc823adecdae860bb64756d639ecfec17b050a"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/6fd1b9a79f6e3cf65f9e679b23af304cd9e010d4",
-                "reference": "6fd1b9a79f6e3cf65f9e679b23af304cd9e010d4",
+                "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/5bbc823adecdae860bb64756d639ecfec17b050a",
+                "reference": "5bbc823adecdae860bb64756d639ecfec17b050a",
                 "shasum": ""
             },
             "require": {
@@ -4136,7 +4136,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-main": "1.26-dev"
+                    "dev-main": "1.27-dev"
                 },
                 "thanks": {
                     "name": "symfony/polyfill",
@@ -4174,7 +4174,7 @@
                 "portable"
             ,
             "support": {
-                "source": "https://github.com/symfony/polyfill-ctype/tree/v1.26.0"
+                "source": "https://github.com/symfony/polyfill-ctype/tree/v1.27.0"
             },
             "funding": 
                 {
@@ -4190,7 +4190,7 @@
                     "type": "tidelift"
                 }
             ,
-            "time": "2022-05-24T11:49:31+00:00"
+            "time": "2022-11-03T14:55:06+00:00"
         },
         {
             "name": "symfony/yaml",

roundcubemail-1.5.3.tar.gz/logs/errors.log Added

@@ -0,0 +1,136 @@
+30-Nov-2022 08:21:18 UTC PHP Deprecated:  substr(): Passing null to parameter #1 ($string) of type string is deprecated in /tmp/roundcubemail-1.5.3/roundcubemail-1.5.3/program/lib/Roundcube/rcube.php on line 837
+30-Nov-2022 08:21:18 UTC PHP Stack trace:
+30-Nov-2022 08:21:18 UTC PHP   1. {main}() /tmp/roundcubemail-1.5.3/roundcubemail-1.5.3/vendor/roundcube/plugin-installer/src/bin/rcubeinitdb.sh:0
+30-Nov-2022 08:21:18 UTC PHP   2. require_once() /tmp/roundcubemail-1.5.3/roundcubemail-1.5.3/vendor/roundcube/plugin-installer/src/bin/rcubeinitdb.sh:6
+30-Nov-2022 08:21:18 UTC PHP   3. rcmail::get_instance($mode = *uninitialized*, $env = *uninitialized*) /tmp/roundcubemail-1.5.3/roundcubemail-1.5.3/program/include/clisetup.php:30
+30-Nov-2022 08:21:18 UTC PHP   4. rcmail->startup() /tmp/roundcubemail-1.5.3/roundcubemail-1.5.3/program/include/rcmail.php:86
+30-Nov-2022 08:21:18 UTC PHP   5. rcmail->set_user($user = class rcube_user { public $ID = NULL; public $data = NULL; public $language = NULL; public $prefs = ; private $db = class rcube_db_mysql { public $db_provider = 'mysql'; protected $db_dsnw = 'mysql://roundcube:@localhost/roundcubemail'; protected $db_dsnr = 'mysql://roundcube:@localhost/roundcubemail'; protected $db_dsnw_array = ...; protected $db_dsnr_array = ...; protected $db_connected = FALSE; protected $db_mode = NULL; protected $db_pconn = FALSE; protected $dbh = NULL; protected $dbhs = ...; protected $table_connections = ...; protected $db_error = FALSE; protected $db_error_msg = ''; protected $conn_failure = FALSE; protected $db_index = 0; protected $last_result = NULL; protected $tables = NULL; protected $variables = NULL; protected $options = ... }; private $rc = class rcmail { public $config = class rcube_config { ... }; public $db = class rcube_db_mysql { ... }; public $memcache = NULL; public $memcached = NULL; public $redis = NULL; public $session = NULL; public $smtp = NULL; public $storage = NULL; public $output = NULL; public $plugins = class rcube_plugin_api { ... }; public $user = ...; public $request_status = 0; protected $texts = NULL; protected $caches = ...; protected $shutdown_functions = ...; public $task = NULL; public $action = ''; public $comm_path = './'; public $filename = 'rcubeinitdb.sh'; public $default_skin = 'elastic'; public $login_error = NULL; public $oauth = NULL; private $address_books = ...; private $action_map = ...; private $action_args = ... }; private $identities = ; private $emails = NULL }) /tmp/roundcubemail-1.5.3/roundcubemail-1.5.3/program/include/rcmail.php:117
+30-Nov-2022 08:21:18 UTC PHP   6. rcube->language_prop($lang = NULL) /tmp/roundcubemail-1.5.3/roundcubemail-1.5.3/program/include/rcmail.php:201
+30-Nov-2022 08:21:18 UTC PHP   7. substr($string = NULL, $offset = 0, $length = 2) /tmp/roundcubemail-1.5.3/roundcubemail-1.5.3/program/lib/Roundcube/rcube.php:837
+30-Nov-2022 08:21:18 UTC PHP Deprecated:  preg_replace(): Passing null to parameter #3 ($subject) of type array|string is deprecated in /tmp/roundcubemail-1.5.3/roundcubemail-1.5.3/program/lib/Roundcube/bootstrap.php on line 329
+30-Nov-2022 08:21:18 UTC PHP Stack trace:
+30-Nov-2022 08:21:18 UTC PHP   1. {main}() /tmp/roundcubemail-1.5.3/roundcubemail-1.5.3/vendor/roundcube/plugin-installer/src/bin/rcubeinitdb.sh:0
+30-Nov-2022 08:21:18 UTC PHP   2. require_once() /tmp/roundcubemail-1.5.3/roundcubemail-1.5.3/vendor/roundcube/plugin-installer/src/bin/rcubeinitdb.sh:6
+30-Nov-2022 08:21:18 UTC PHP   3. rcmail::get_instance($mode = *uninitialized*, $env = *uninitialized*) /tmp/roundcubemail-1.5.3/roundcubemail-1.5.3/program/include/clisetup.php:30
+30-Nov-2022 08:21:18 UTC PHP   4. rcmail->startup() /tmp/roundcubemail-1.5.3/roundcubemail-1.5.3/program/include/rcmail.php:86
+30-Nov-2022 08:21:18 UTC PHP   5. asciiwords($str = NULL, $css_id = *uninitialized*, $replace_with = *uninitialized*) /tmp/roundcubemail-1.5.3/roundcubemail-1.5.3/program/include/rcmail.php:121
+30-Nov-2022 08:21:18 UTC PHP   6. preg_replace($pattern = '/^a-z0-9\\_\\-\\.+/i', $replacement = '', $subject = NULL) /tmp/roundcubemail-1.5.3/roundcubemail-1.5.3/program/lib/Roundcube/bootstrap.php:329
+30-Nov-2022 08:21:19 UTC PHP Deprecated:  substr(): Passing null to parameter #1 ($string) of type string is deprecated in /tmp/roundcubemail-1.5.3/roundcubemail-1.5.3/program/lib/Roundcube/rcube.php on line 837
+30-Nov-2022 08:21:19 UTC PHP Stack trace:
+30-Nov-2022 08:21:19 UTC PHP   1. {main}() /tmp/roundcubemail-1.5.3/roundcubemail-1.5.3/vendor/roundcube/plugin-installer/src/bin/rcubeinitdb.sh:0
+30-Nov-2022 08:21:19 UTC PHP   2. require_once() /tmp/roundcubemail-1.5.3/roundcubemail-1.5.3/vendor/roundcube/plugin-installer/src/bin/rcubeinitdb.sh:6
+30-Nov-2022 08:21:19 UTC PHP   3. rcmail::get_instance($mode = *uninitialized*, $env = *uninitialized*) /tmp/roundcubemail-1.5.3/roundcubemail-1.5.3/program/include/clisetup.php:30
+30-Nov-2022 08:21:19 UTC PHP   4. rcmail->startup() /tmp/roundcubemail-1.5.3/roundcubemail-1.5.3/program/include/rcmail.php:86
+30-Nov-2022 08:21:19 UTC PHP   5. rcmail->set_user($user = class rcube_user { public $ID = NULL; public $data = NULL; public $language = NULL; public $prefs = ; private $db = class rcube_db_mysql { public $db_provider = 'mysql'; protected $db_dsnw = 'mysql://roundcube:@localhost/roundcubemail'; protected $db_dsnr = 'mysql://roundcube:@localhost/roundcubemail'; protected $db_dsnw_array = ...; protected $db_dsnr_array = ...; protected $db_connected = FALSE; protected $db_mode = NULL; protected $db_pconn = FALSE; protected $dbh = NULL; protected $dbhs = ...; protected $table_connections = ...; protected $db_error = FALSE; protected $db_error_msg = ''; protected $conn_failure = FALSE; protected $db_index = 0; protected $last_result = NULL; protected $tables = NULL; protected $variables = NULL; protected $options = ... }; private $rc = class rcmail { public $config = class rcube_config { ... }; public $db = class rcube_db_mysql { ... }; public $memcache = NULL; public $memcached = NULL; public $redis = NULL; public $session = NULL; public $smtp = NULL; public $storage = NULL; public $output = NULL; public $plugins = class rcube_plugin_api { ... }; public $user = ...; public $request_status = 0; protected $texts = NULL; protected $caches = ...; protected $shutdown_functions = ...; public $task = NULL; public $action = ''; public $comm_path = './'; public $filename = 'rcubeinitdb.sh'; public $default_skin = 'elastic'; public $login_error = NULL; public $oauth = NULL; private $address_books = ...; private $action_map = ...; private $action_args = ... }; private $identities = ; private $emails = NULL }) /tmp/roundcubemail-1.5.3/roundcubemail-1.5.3/program/include/rcmail.php:117
+30-Nov-2022 08:21:19 UTC PHP   6. rcube->language_prop($lang = NULL) /tmp/roundcubemail-1.5.3/roundcubemail-1.5.3/program/include/rcmail.php:201
+30-Nov-2022 08:21:19 UTC PHP   7. substr($string = NULL, $offset = 0, $length = 2) /tmp/roundcubemail-1.5.3/roundcubemail-1.5.3/program/lib/Roundcube/rcube.php:837
+30-Nov-2022 08:21:19 UTC PHP Deprecated:  preg_replace(): Passing null to parameter #3 ($subject) of type array|string is deprecated in /tmp/roundcubemail-1.5.3/roundcubemail-1.5.3/program/lib/Roundcube/bootstrap.php on line 329
+30-Nov-2022 08:21:19 UTC PHP Stack trace:
+30-Nov-2022 08:21:19 UTC PHP   1. {main}() /tmp/roundcubemail-1.5.3/roundcubemail-1.5.3/vendor/roundcube/plugin-installer/src/bin/rcubeinitdb.sh:0
+30-Nov-2022 08:21:19 UTC PHP   2. require_once() /tmp/roundcubemail-1.5.3/roundcubemail-1.5.3/vendor/roundcube/plugin-installer/src/bin/rcubeinitdb.sh:6
+30-Nov-2022 08:21:19 UTC PHP   3. rcmail::get_instance($mode = *uninitialized*, $env = *uninitialized*) /tmp/roundcubemail-1.5.3/roundcubemail-1.5.3/program/include/clisetup.php:30
+30-Nov-2022 08:21:19 UTC PHP   4. rcmail->startup() /tmp/roundcubemail-1.5.3/roundcubemail-1.5.3/program/include/rcmail.php:86
+30-Nov-2022 08:21:19 UTC PHP   5. asciiwords($str = NULL, $css_id = *uninitialized*, $replace_with = *uninitialized*) /tmp/roundcubemail-1.5.3/roundcubemail-1.5.3/program/include/rcmail.php:121
+30-Nov-2022 08:21:19 UTC PHP   6. preg_replace($pattern = '/^a-z0-9\\_\\-\\.+/i', $replacement = '', $subject = NULL) /tmp/roundcubemail-1.5.3/roundcubemail-1.5.3/program/lib/Roundcube/bootstrap.php:329
+30-Nov-2022 08:21:19 UTC PHP Deprecated:  substr(): Passing null to parameter #1 ($string) of type string is deprecated in /tmp/roundcubemail-1.5.3/roundcubemail-1.5.3/program/lib/Roundcube/rcube.php on line 837
+30-Nov-2022 08:21:19 UTC PHP Stack trace:
+30-Nov-2022 08:21:19 UTC PHP   1. {main}() /tmp/roundcubemail-1.5.3/roundcubemail-1.5.3/bin/install-jsdeps.sh:0
+30-Nov-2022 08:21:19 UTC PHP   2. require_once() /tmp/roundcubemail-1.5.3/roundcubemail-1.5.3/bin/install-jsdeps.sh:23
+30-Nov-2022 08:21:19 UTC PHP   3. rcmail::get_instance($mode = *uninitialized*, $env = *uninitialized*) /tmp/roundcubemail-1.5.3/roundcubemail-1.5.3/program/include/clisetup.php:30
+30-Nov-2022 08:21:19 UTC PHP   4. rcmail->startup() /tmp/roundcubemail-1.5.3/roundcubemail-1.5.3/program/include/rcmail.php:86
+30-Nov-2022 08:21:19 UTC PHP   5. rcmail->set_user($user = class rcube_user { public $ID = NULL; public $data = NULL; public $language = NULL; public $prefs = ; private $db = class rcube_db_mysql { public $db_provider = 'mysql'; protected $db_dsnw = 'mysql://roundcube:@localhost/roundcubemail'; protected $db_dsnr = 'mysql://roundcube:@localhost/roundcubemail'; protected $db_dsnw_array = ...; protected $db_dsnr_array = ...; protected $db_connected = FALSE; protected $db_mode = NULL; protected $db_pconn = FALSE; protected $dbh = NULL; protected $dbhs = ...; protected $table_connections = ...; protected $db_error = FALSE; protected $db_error_msg = ''; protected $conn_failure = FALSE; protected $db_index = 0; protected $last_result = NULL; protected $tables = NULL; protected $variables = NULL; protected $options = ... }; private $rc = class rcmail { public $config = class rcube_config { ... }; public $db = class rcube_db_mysql { ... }; public $memcache = NULL; public $memcached = NULL; public $redis = NULL; public $session = NULL; public $smtp = NULL; public $storage = NULL; public $output = NULL; public $plugins = class rcube_plugin_api { ... }; public $user = ...; public $request_status = 0; protected $texts = NULL; protected $caches = ...; protected $shutdown_functions = ...; public $task = NULL; public $action = ''; public $comm_path = './'; public $filename = 'install-jsdeps.sh'; public $default_skin = 'elastic'; public $login_error = NULL; public $oauth = NULL; private $address_books = ...; private $action_map = ...; private $action_args = ... }; private $identities = ; private $emails = NULL }) /tmp/roundcubemail-1.5.3/roundcubemail-1.5.3/program/include/rcmail.php:117
+30-Nov-2022 08:21:19 UTC PHP   6. rcube->language_prop($lang = NULL) /tmp/roundcubemail-1.5.3/roundcubemail-1.5.3/program/include/rcmail.php:201
+30-Nov-2022 08:21:19 UTC PHP   7. substr($string = NULL, $offset = 0, $length = 2) /tmp/roundcubemail-1.5.3/roundcubemail-1.5.3/program/lib/Roundcube/rcube.php:837
+30-Nov-2022 08:21:19 UTC PHP Deprecated:  preg_replace(): Passing null to parameter #3 ($subject) of type array|string is deprecated in /tmp/roundcubemail-1.5.3/roundcubemail-1.5.3/program/lib/Roundcube/bootstrap.php on line 329
+30-Nov-2022 08:21:19 UTC PHP Stack trace:
+30-Nov-2022 08:21:19 UTC PHP   1. {main}() /tmp/roundcubemail-1.5.3/roundcubemail-1.5.3/bin/install-jsdeps.sh:0
+30-Nov-2022 08:21:19 UTC PHP   2. require_once() /tmp/roundcubemail-1.5.3/roundcubemail-1.5.3/bin/install-jsdeps.sh:23
+30-Nov-2022 08:21:19 UTC PHP   3. rcmail::get_instance($mode = *uninitialized*, $env = *uninitialized*) /tmp/roundcubemail-1.5.3/roundcubemail-1.5.3/program/include/clisetup.php:30
+30-Nov-2022 08:21:19 UTC PHP   4. rcmail->startup() /tmp/roundcubemail-1.5.3/roundcubemail-1.5.3/program/include/rcmail.php:86
+30-Nov-2022 08:21:19 UTC PHP   5. asciiwords($str = NULL, $css_id = *uninitialized*, $replace_with = *uninitialized*) /tmp/roundcubemail-1.5.3/roundcubemail-1.5.3/program/include/rcmail.php:121
+30-Nov-2022 08:21:19 UTC PHP   6. preg_replace($pattern = '/^a-z0-9\\_\\-\\.+/i', $replacement = '', $subject = NULL) /tmp/roundcubemail-1.5.3/roundcubemail-1.5.3/program/lib/Roundcube/bootstrap.php:329
+30-Nov-2022 08:21:40 UTC PHP Deprecated:  substr(): Passing null to parameter #1 ($string) of type string is deprecated in /tmp/roundcubemail-1.5.3/roundcubemail-1.5.3/program/lib/Roundcube/rcube.php on line 837
+30-Nov-2022 08:21:40 UTC PHP Stack trace:
+30-Nov-2022 08:21:40 UTC PHP   1. {main}() /tmp/roundcubemail-1.5.3/roundcubemail-1.5.3/bin/updatecss.sh:0
+30-Nov-2022 08:21:40 UTC PHP   2. require_once() /tmp/roundcubemail-1.5.3/roundcubemail-1.5.3/bin/updatecss.sh:22
+30-Nov-2022 08:21:40 UTC PHP   3. rcmail::get_instance($mode = *uninitialized*, $env = *uninitialized*) /tmp/roundcubemail-1.5.3/roundcubemail-1.5.3/program/include/clisetup.php:30
+30-Nov-2022 08:21:40 UTC PHP   4. rcmail->startup() /tmp/roundcubemail-1.5.3/roundcubemail-1.5.3/program/include/rcmail.php:86
+30-Nov-2022 08:21:40 UTC PHP   5. rcmail->set_user($user = class rcube_user { public $ID = NULL; public $data = NULL; public $language = NULL; public $prefs = ; private $db = class rcube_db_mysql { public $db_provider = 'mysql'; protected $db_dsnw = 'mysql://roundcube:@localhost/roundcubemail'; protected $db_dsnr = 'mysql://roundcube:@localhost/roundcubemail'; protected $db_dsnw_array = ...; protected $db_dsnr_array = ...; protected $db_connected = FALSE; protected $db_mode = NULL; protected $db_pconn = FALSE; protected $dbh = NULL; protected $dbhs = ...; protected $table_connections = ...; protected $db_error = FALSE; protected $db_error_msg = ''; protected $conn_failure = FALSE; protected $db_index = 0; protected $last_result = NULL; protected $tables = NULL; protected $variables = NULL; protected $options = ... }; private $rc = class rcmail { public $config = class rcube_config { ... }; public $db = class rcube_db_mysql { ... }; public $memcache = NULL; public $memcached = NULL; public $redis = NULL; public $session = NULL; public $smtp = NULL; public $storage = NULL; public $output = NULL; public $plugins = class rcube_plugin_api { ... }; public $user = ...; public $request_status = 0; protected $texts = NULL; protected $caches = ...; protected $shutdown_functions = ...; public $task = NULL; public $action = ''; public $comm_path = './'; public $filename = 'updatecss.sh'; public $default_skin = 'elastic'; public $login_error = NULL; public $oauth = NULL; private $address_books = ...; private $action_map = ...; private $action_args = ... }; private $identities = ; private $emails = NULL }) /tmp/roundcubemail-1.5.3/roundcubemail-1.5.3/program/include/rcmail.php:117
+30-Nov-2022 08:21:40 UTC PHP   6. rcube->language_prop($lang = NULL) /tmp/roundcubemail-1.5.3/roundcubemail-1.5.3/program/include/rcmail.php:201
+30-Nov-2022 08:21:40 UTC PHP   7. substr($string = NULL, $offset = 0, $length = 2) /tmp/roundcubemail-1.5.3/roundcubemail-1.5.3/program/lib/Roundcube/rcube.php:837
+30-Nov-2022 08:21:40 UTC PHP Deprecated:  preg_replace(): Passing null to parameter #3 ($subject) of type array|string is deprecated in /tmp/roundcubemail-1.5.3/roundcubemail-1.5.3/program/lib/Roundcube/bootstrap.php on line 329
+30-Nov-2022 08:21:40 UTC PHP Stack trace:
+30-Nov-2022 08:21:40 UTC PHP   1. {main}() /tmp/roundcubemail-1.5.3/roundcubemail-1.5.3/bin/updatecss.sh:0
+30-Nov-2022 08:21:40 UTC PHP   2. require_once() /tmp/roundcubemail-1.5.3/roundcubemail-1.5.3/bin/updatecss.sh:22
+30-Nov-2022 08:21:40 UTC PHP   3. rcmail::get_instance($mode = *uninitialized*, $env = *uninitialized*) /tmp/roundcubemail-1.5.3/roundcubemail-1.5.3/program/include/clisetup.php:30
+30-Nov-2022 08:21:40 UTC PHP   4. rcmail->startup() /tmp/roundcubemail-1.5.3/roundcubemail-1.5.3/program/include/rcmail.php:86
+30-Nov-2022 08:21:40 UTC PHP   5. asciiwords($str = NULL, $css_id = *uninitialized*, $replace_with = *uninitialized*) /tmp/roundcubemail-1.5.3/roundcubemail-1.5.3/program/include/rcmail.php:121
+30-Nov-2022 08:21:40 UTC PHP   6. preg_replace($pattern = '/^a-z0-9\\_\\-\\.+/i', $replacement = '', $subject = NULL) /tmp/roundcubemail-1.5.3/roundcubemail-1.5.3/program/lib/Roundcube/bootstrap.php:329
+30-Nov-2022 08:21:42 UTC PHP Deprecated:  substr(): Passing null to parameter #1 ($string) of type string is deprecated in /tmp/roundcubemail-1.5.3/roundcubemail-1.5.3/program/lib/Roundcube/rcube.php on line 837
+30-Nov-2022 08:21:42 UTC PHP Stack trace:
+30-Nov-2022 08:21:42 UTC PHP   1. {main}() /tmp/roundcubemail-1.5.3/roundcubemail-1.5.3/bin/updatecss.sh:0
+30-Nov-2022 08:21:42 UTC PHP   2. require_once() /tmp/roundcubemail-1.5.3/roundcubemail-1.5.3/bin/updatecss.sh:22
+30-Nov-2022 08:21:42 UTC PHP   3. rcmail::get_instance($mode = *uninitialized*, $env = *uninitialized*) /tmp/roundcubemail-1.5.3/roundcubemail-1.5.3/program/include/clisetup.php:30
+30-Nov-2022 08:21:42 UTC PHP   4. rcmail->startup() /tmp/roundcubemail-1.5.3/roundcubemail-1.5.3/program/include/rcmail.php:86
+30-Nov-2022 08:21:42 UTC PHP   5. rcmail->set_user($user = class rcube_user { public $ID = NULL; public $data = NULL; public $language = NULL; public $prefs = ; private $db = class rcube_db_mysql { public $db_provider = 'mysql'; protected $db_dsnw = 'mysql://roundcube:@localhost/roundcubemail'; protected $db_dsnr = 'mysql://roundcube:@localhost/roundcubemail'; protected $db_dsnw_array = ...; protected $db_dsnr_array = ...; protected $db_connected = FALSE; protected $db_mode = NULL; protected $db_pconn = FALSE; protected $dbh = NULL; protected $dbhs = ...; protected $table_connections = ...; protected $db_error = FALSE; protected $db_error_msg = ''; protected $conn_failure = FALSE; protected $db_index = 0; protected $last_result = NULL; protected $tables = NULL; protected $variables = NULL; protected $options = ... }; private $rc = class rcmail { public $config = class rcube_config { ... }; public $db = class rcube_db_mysql { ... }; public $memcache = NULL; public $memcached = NULL; public $redis = NULL; public $session = NULL; public $smtp = NULL; public $storage = NULL; public $output = NULL; public $plugins = class rcube_plugin_api { ... }; public $user = ...; public $request_status = 0; protected $texts = NULL; protected $caches = ...; protected $shutdown_functions = ...; public $task = NULL; public $action = ''; public $comm_path = './'; public $filename = 'updatecss.sh'; public $default_skin = 'elastic'; public $login_error = NULL; public $oauth = NULL; private $address_books = ...; private $action_map = ...; private $action_args = ... }; private $identities = ; private $emails = NULL }) /tmp/roundcubemail-1.5.3/roundcubemail-1.5.3/program/include/rcmail.php:117
+30-Nov-2022 08:21:42 UTC PHP   6. rcube->language_prop($lang = NULL) /tmp/roundcubemail-1.5.3/roundcubemail-1.5.3/program/include/rcmail.php:201
+30-Nov-2022 08:21:42 UTC PHP   7. substr($string = NULL, $offset = 0, $length = 2) /tmp/roundcubemail-1.5.3/roundcubemail-1.5.3/program/lib/Roundcube/rcube.php:837
+30-Nov-2022 08:21:42 UTC PHP Deprecated:  preg_replace(): Passing null to parameter #3 ($subject) of type array|string is deprecated in /tmp/roundcubemail-1.5.3/roundcubemail-1.5.3/program/lib/Roundcube/bootstrap.php on line 329
+30-Nov-2022 08:21:42 UTC PHP Stack trace:
+30-Nov-2022 08:21:42 UTC PHP   1. {main}() /tmp/roundcubemail-1.5.3/roundcubemail-1.5.3/bin/updatecss.sh:0
+30-Nov-2022 08:21:42 UTC PHP   2. require_once() /tmp/roundcubemail-1.5.3/roundcubemail-1.5.3/bin/updatecss.sh:22
+30-Nov-2022 08:21:42 UTC PHP   3. rcmail::get_instance($mode = *uninitialized*, $env = *uninitialized*) /tmp/roundcubemail-1.5.3/roundcubemail-1.5.3/program/include/clisetup.php:30
+30-Nov-2022 08:21:42 UTC PHP   4. rcmail->startup() /tmp/roundcubemail-1.5.3/roundcubemail-1.5.3/program/include/rcmail.php:86
+30-Nov-2022 08:21:42 UTC PHP   5. asciiwords($str = NULL, $css_id = *uninitialized*, $replace_with = *uninitialized*) /tmp/roundcubemail-1.5.3/roundcubemail-1.5.3/program/include/rcmail.php:121
+30-Nov-2022 08:21:42 UTC PHP   6. preg_replace($pattern = '/^a-z0-9\\_\\-\\.+/i', $replacement = '', $subject = NULL) /tmp/roundcubemail-1.5.3/roundcubemail-1.5.3/program/lib/Roundcube/bootstrap.php:329
+30-Nov-2022 08:21:45 UTC PHP Deprecated:  substr(): Passing null to parameter #1 ($string) of type string is deprecated in /tmp/roundcubemail-1.5.3/roundcubemail-1.5.3/program/lib/Roundcube/rcube.php on line 837
+30-Nov-2022 08:21:45 UTC PHP Stack trace:
+30-Nov-2022 08:21:45 UTC PHP   1. {main}() /tmp/roundcubemail-1.5.3/roundcubemail-1.5.3/bin/updatecss.sh:0
+30-Nov-2022 08:21:45 UTC PHP   2. require_once() /tmp/roundcubemail-1.5.3/roundcubemail-1.5.3/bin/updatecss.sh:22
+30-Nov-2022 08:21:45 UTC PHP   3. rcmail::get_instance($mode = *uninitialized*, $env = *uninitialized*) /tmp/roundcubemail-1.5.3/roundcubemail-1.5.3/program/include/clisetup.php:30
+30-Nov-2022 08:21:45 UTC PHP   4. rcmail->startup() /tmp/roundcubemail-1.5.3/roundcubemail-1.5.3/program/include/rcmail.php:86
+30-Nov-2022 08:21:45 UTC PHP   5. rcmail->set_user($user = class rcube_user { public $ID = NULL; public $data = NULL; public $language = NULL; public $prefs = ; private $db = class rcube_db_mysql { public $db_provider = 'mysql'; protected $db_dsnw = 'mysql://roundcube:@localhost/roundcubemail'; protected $db_dsnr = 'mysql://roundcube:@localhost/roundcubemail'; protected $db_dsnw_array = ...; protected $db_dsnr_array = ...; protected $db_connected = FALSE; protected $db_mode = NULL; protected $db_pconn = FALSE; protected $dbh = NULL; protected $dbhs = ...; protected $table_connections = ...; protected $db_error = FALSE; protected $db_error_msg = ''; protected $conn_failure = FALSE; protected $db_index = 0; protected $last_result = NULL; protected $tables = NULL; protected $variables = NULL; protected $options = ... }; private $rc = class rcmail { public $config = class rcube_config { ... }; public $db = class rcube_db_mysql { ... }; public $memcache = NULL; public $memcached = NULL; public $redis = NULL; public $session = NULL; public $smtp = NULL; public $storage = NULL; public $output = NULL; public $plugins = class rcube_plugin_api { ... }; public $user = ...; public $request_status = 0; protected $texts = NULL; protected $caches = ...; protected $shutdown_functions = ...; public $task = NULL; public $action = ''; public $comm_path = './'; public $filename = 'updatecss.sh'; public $default_skin = 'elastic'; public $login_error = NULL; public $oauth = NULL; private $address_books = ...; private $action_map = ...; private $action_args = ... }; private $identities = ; private $emails = NULL }) /tmp/roundcubemail-1.5.3/roundcubemail-1.5.3/program/include/rcmail.php:117
+30-Nov-2022 08:21:45 UTC PHP   6. rcube->language_prop($lang = NULL) /tmp/roundcubemail-1.5.3/roundcubemail-1.5.3/program/include/rcmail.php:201
+30-Nov-2022 08:21:45 UTC PHP   7. substr($string = NULL, $offset = 0, $length = 2) /tmp/roundcubemail-1.5.3/roundcubemail-1.5.3/program/lib/Roundcube/rcube.php:837
+30-Nov-2022 08:21:45 UTC PHP Deprecated:  preg_replace(): Passing null to parameter #3 ($subject) of type array|string is deprecated in /tmp/roundcubemail-1.5.3/roundcubemail-1.5.3/program/lib/Roundcube/bootstrap.php on line 329
+30-Nov-2022 08:21:45 UTC PHP Stack trace:
+30-Nov-2022 08:21:45 UTC PHP   1. {main}() /tmp/roundcubemail-1.5.3/roundcubemail-1.5.3/bin/updatecss.sh:0
+30-Nov-2022 08:21:45 UTC PHP   2. require_once() /tmp/roundcubemail-1.5.3/roundcubemail-1.5.3/bin/updatecss.sh:22
+30-Nov-2022 08:21:45 UTC PHP   3. rcmail::get_instance($mode = *uninitialized*, $env = *uninitialized*) /tmp/roundcubemail-1.5.3/roundcubemail-1.5.3/program/include/clisetup.php:30
+30-Nov-2022 08:21:45 UTC PHP   4. rcmail->startup() /tmp/roundcubemail-1.5.3/roundcubemail-1.5.3/program/include/rcmail.php:86
+30-Nov-2022 08:21:45 UTC PHP   5. asciiwords($str = NULL, $css_id = *uninitialized*, $replace_with = *uninitialized*) /tmp/roundcubemail-1.5.3/roundcubemail-1.5.3/program/include/rcmail.php:121
+30-Nov-2022 08:21:45 UTC PHP   6. preg_replace($pattern = '/^a-z0-9\\_\\-\\.+/i', $replacement = '', $subject = NULL) /tmp/roundcubemail-1.5.3/roundcubemail-1.5.3/program/lib/Roundcube/bootstrap.php:329
+30-Nov-2022 08:21:47 UTC PHP Deprecated:  substr(): Passing null to parameter #1 ($string) of type string is deprecated in /tmp/roundcubemail-1.5.3/roundcubemail-1.5.3/program/lib/Roundcube/rcube.php on line 837
+30-Nov-2022 08:21:47 UTC PHP Stack trace:
+30-Nov-2022 08:21:47 UTC PHP   1. {main}() /tmp/roundcubemail-1.5.3/roundcubemail-1.5.3/bin/updatecss.sh:0
+30-Nov-2022 08:21:47 UTC PHP   2. require_once() /tmp/roundcubemail-1.5.3/roundcubemail-1.5.3/bin/updatecss.sh:22
+30-Nov-2022 08:21:47 UTC PHP   3. rcmail::get_instance($mode = *uninitialized*, $env = *uninitialized*) /tmp/roundcubemail-1.5.3/roundcubemail-1.5.3/program/include/clisetup.php:30
+30-Nov-2022 08:21:47 UTC PHP   4. rcmail->startup() /tmp/roundcubemail-1.5.3/roundcubemail-1.5.3/program/include/rcmail.php:86
+30-Nov-2022 08:21:47 UTC PHP   5. rcmail->set_user($user = class rcube_user { public $ID = NULL; public $data = NULL; public $language = NULL; public $prefs = ; private $db = class rcube_db_mysql { public $db_provider = 'mysql'; protected $db_dsnw = 'mysql://roundcube:@localhost/roundcubemail'; protected $db_dsnr = 'mysql://roundcube:@localhost/roundcubemail'; protected $db_dsnw_array = ...; protected $db_dsnr_array = ...; protected $db_connected = FALSE; protected $db_mode = NULL; protected $db_pconn = FALSE; protected $dbh = NULL; protected $dbhs = ...; protected $table_connections = ...; protected $db_error = FALSE; protected $db_error_msg = ''; protected $conn_failure = FALSE; protected $db_index = 0; protected $last_result = NULL; protected $tables = NULL; protected $variables = NULL; protected $options = ... }; private $rc = class rcmail { public $config = class rcube_config { ... }; public $db = class rcube_db_mysql { ... }; public $memcache = NULL; public $memcached = NULL; public $redis = NULL; public $session = NULL; public $smtp = NULL; public $storage = NULL; public $output = NULL; public $plugins = class rcube_plugin_api { ... }; public $user = ...; public $request_status = 0; protected $texts = NULL; protected $caches = ...; protected $shutdown_functions = ...; public $task = NULL; public $action = ''; public $comm_path = './'; public $filename = 'updatecss.sh'; public $default_skin = 'elastic'; public $login_error = NULL; public $oauth = NULL; private $address_books = ...; private $action_map = ...; private $action_args = ... }; private $identities = ; private $emails = NULL }) /tmp/roundcubemail-1.5.3/roundcubemail-1.5.3/program/include/rcmail.php:117
+30-Nov-2022 08:21:47 UTC PHP   6. rcube->language_prop($lang = NULL) /tmp/roundcubemail-1.5.3/roundcubemail-1.5.3/program/include/rcmail.php:201
+30-Nov-2022 08:21:47 UTC PHP   7. substr($string = NULL, $offset = 0, $length = 2) /tmp/roundcubemail-1.5.3/roundcubemail-1.5.3/program/lib/Roundcube/rcube.php:837
+30-Nov-2022 08:21:47 UTC PHP Deprecated:  preg_replace(): Passing null to parameter #3 ($subject) of type array|string is deprecated in /tmp/roundcubemail-1.5.3/roundcubemail-1.5.3/program/lib/Roundcube/bootstrap.php on line 329
+30-Nov-2022 08:21:47 UTC PHP Stack trace:
+30-Nov-2022 08:21:47 UTC PHP   1. {main}() /tmp/roundcubemail-1.5.3/roundcubemail-1.5.3/bin/updatecss.sh:0
+30-Nov-2022 08:21:47 UTC PHP   2. require_once() /tmp/roundcubemail-1.5.3/roundcubemail-1.5.3/bin/updatecss.sh:22
+30-Nov-2022 08:21:47 UTC PHP   3. rcmail::get_instance($mode = *uninitialized*, $env = *uninitialized*) /tmp/roundcubemail-1.5.3/roundcubemail-1.5.3/program/include/clisetup.php:30
+30-Nov-2022 08:21:47 UTC PHP   4. rcmail->startup() /tmp/roundcubemail-1.5.3/roundcubemail-1.5.3/program/include/rcmail.php:86
+30-Nov-2022 08:21:47 UTC PHP   5. asciiwords($str = NULL, $css_id = *uninitialized*, $replace_with = *uninitialized*) /tmp/roundcubemail-1.5.3/roundcubemail-1.5.3/program/include/rcmail.php:121
+30-Nov-2022 08:21:47 UTC PHP   6. preg_replace($pattern = '/^a-z0-9\\_\\-\\.+/i', $replacement = '', $subject = NULL) /tmp/roundcubemail-1.5.3/roundcubemail-1.5.3/program/lib/Roundcube/bootstrap.php:329
+30-Nov-2022 08:21:50 UTC PHP Deprecated:  substr(): Passing null to parameter #1 ($string) of type string is deprecated in /tmp/roundcubemail-1.5.3/roundcubemail-1.5.3/program/lib/Roundcube/rcube.php on line 837
+30-Nov-2022 08:21:50 UTC PHP Stack trace:
+30-Nov-2022 08:21:50 UTC PHP   1. {main}() /tmp/roundcubemail-1.5.3/roundcubemail-1.5.3/bin/updatecss.sh:0
+30-Nov-2022 08:21:50 UTC PHP   2. require_once() /tmp/roundcubemail-1.5.3/roundcubemail-1.5.3/bin/updatecss.sh:22
+30-Nov-2022 08:21:50 UTC PHP   3. rcmail::get_instance($mode = *uninitialized*, $env = *uninitialized*) /tmp/roundcubemail-1.5.3/roundcubemail-1.5.3/program/include/clisetup.php:30
+30-Nov-2022 08:21:50 UTC PHP   4. rcmail->startup() /tmp/roundcubemail-1.5.3/roundcubemail-1.5.3/program/include/rcmail.php:86
+30-Nov-2022 08:21:50 UTC PHP   5. rcmail->set_user($user = class rcube_user { public $ID = NULL; public $data = NULL; public $language = NULL; public $prefs = ; private $db = class rcube_db_mysql { public $db_provider = 'mysql'; protected $db_dsnw = 'mysql://roundcube:@localhost/roundcubemail'; protected $db_dsnr = 'mysql://roundcube:@localhost/roundcubemail'; protected $db_dsnw_array = ...; protected $db_dsnr_array = ...; protected $db_connected = FALSE; protected $db_mode = NULL; protected $db_pconn = FALSE; protected $dbh = NULL; protected $dbhs = ...; protected $table_connections = ...; protected $db_error = FALSE; protected $db_error_msg = ''; protected $conn_failure = FALSE; protected $db_index = 0; protected $last_result = NULL; protected $tables = NULL; protected $variables = NULL; protected $options = ... }; private $rc = class rcmail { public $config = class rcube_config { ... }; public $db = class rcube_db_mysql { ... }; public $memcache = NULL; public $memcached = NULL; public $redis = NULL; public $session = NULL; public $smtp = NULL; public $storage = NULL; public $output = NULL; public $plugins = class rcube_plugin_api { ... }; public $user = ...; public $request_status = 0; protected $texts = NULL; protected $caches = ...; protected $shutdown_functions = ...; public $task = NULL; public $action = ''; public $comm_path = './'; public $filename = 'updatecss.sh'; public $default_skin = 'elastic'; public $login_error = NULL; public $oauth = NULL; private $address_books = ...; private $action_map = ...; private $action_args = ... }; private $identities = ; private $emails = NULL }) /tmp/roundcubemail-1.5.3/roundcubemail-1.5.3/program/include/rcmail.php:117
+30-Nov-2022 08:21:50 UTC PHP   6. rcube->language_prop($lang = NULL) /tmp/roundcubemail-1.5.3/roundcubemail-1.5.3/program/include/rcmail.php:201
+30-Nov-2022 08:21:50 UTC PHP   7. substr($string = NULL, $offset = 0, $length = 2) /tmp/roundcubemail-1.5.3/roundcubemail-1.5.3/program/lib/Roundcube/rcube.php:837
+30-Nov-2022 08:21:50 UTC PHP Deprecated:  preg_replace(): Passing null to parameter #3 ($subject) of type array|string is deprecated in /tmp/roundcubemail-1.5.3/roundcubemail-1.5.3/program/lib/Roundcube/bootstrap.php on line 329
+30-Nov-2022 08:21:50 UTC PHP Stack trace:
+30-Nov-2022 08:21:50 UTC PHP   1. {main}() /tmp/roundcubemail-1.5.3/roundcubemail-1.5.3/bin/updatecss.sh:0
+30-Nov-2022 08:21:50 UTC PHP   2. require_once() /tmp/roundcubemail-1.5.3/roundcubemail-1.5.3/bin/updatecss.sh:22
+30-Nov-2022 08:21:50 UTC PHP   3. rcmail::get_instance($mode = *uninitialized*, $env = *uninitialized*) /tmp/roundcubemail-1.5.3/roundcubemail-1.5.3/program/include/clisetup.php:30
+30-Nov-2022 08:21:50 UTC PHP   4. rcmail->startup() /tmp/roundcubemail-1.5.3/roundcubemail-1.5.3/program/include/rcmail.php:86
+30-Nov-2022 08:21:50 UTC PHP   5. asciiwords($str = NULL, $css_id = *uninitialized*, $replace_with = *uninitialized*) /tmp/roundcubemail-1.5.3/roundcubemail-1.5.3/program/include/rcmail.php:121
+30-Nov-2022 08:21:50 UTC PHP   6. preg_replace($pattern = '/^a-z0-9\\_\\-\\.+/i', $replacement = '', $subject = NULL) /tmp/roundcubemail-1.5.3/roundcubemail-1.5.3/program/lib/Roundcube/bootstrap.php:329

roundcubemail-1.5.3.tar.gz/plugins/calendar/calendar_ui.js Changed

roundcubemail-1.5.3.tar.gz/plugins/calendar/drivers/caldav/caldav_calendar.php Changed

@@ -61,36 +61,30 @@
             $this->storage = $folder_or_id;
         }
         else {
-        //    $this->storage = kolab_storage_dav::get_folder($folder_or_id);
+            // $this->storage = kolab_storage_dav::get_folder($folder_or_id, 'event');
         }
 
         $this->cal        = $calendar;
         $this->id         = $this->storage->id;
         $this->attributes = $this->storage->attributes;
         $this->ready      = true;
+        $this->alarms     = !isset($this->storage->attributes'alarms') || $this->storage->attributes'alarms';
 
         // Set writeable and alarms flags according to folder permissions
         if ($this->ready) {
             if ($this->storage->get_namespace() == 'personal') {
                 $this->editable = true;
                 $this->rights = 'lrswikxteav';
-                $this->alarms = true;
             }
             else {
                 $rights = $this->storage->get_myrights();
-                if ($rights && !PEAR::isError($rights)) {
+                if ($rights) {
                     $this->rights = $rights;
                     if (strpos($rights, 't') !== false || strpos($rights, 'd') !== false) {
                         $this->editable = strpos($rights, 'i');;
                     }
                 }
             }
-
-            // user-specific alarms settings win
-            $prefs = $this->cal->rc->config->get('kolab_calendars', );
-            if (isset($prefs$this->id'showalarms')) {
-                $this->alarms = $prefs$this->id'showalarms';
-            }
         }
 
         $this->default = $this->storage->default;
@@ -144,8 +138,7 @@
      */
     public function update(&$prop)
     {
-        // TODO
-        return null;
+        return false; // NOP
     }
 
     /**
@@ -375,8 +368,8 @@
         // $config = kolab_storage_config::get_instance();
         // $config->apply_links($events);
 
-        // avoid session race conditions that will loose temporary subscriptions
-        $this->cal->rc->session->nowrite = true;
+        // Avoid session race conditions that will loose temporary subscriptions
+        // $this->cal->rc->session->nowrite = true;
 
         return $events;
     }

roundcubemail-1.5.3.tar.gz/plugins/calendar/drivers/caldav/caldav_driver.php Changed

@@ -125,6 +125,7 @@
 
         $folders   = $this->filter_calendars($filter);
         $calendars = ;
+        $prefs     = $this->rc->config->get('kolab_calendars', );
 
         // include virtual folders for a full folder tree
 /*
@@ -181,11 +182,11 @@
                     'color'     => $cal->get_color(),
                     'editable'  => $cal->editable,
                     'group'     => $is_user ? 'other user' : $cal->get_namespace(),
-                    'active'    => $cal->is_active(),
+                    'active'    => !isset($prefs$cal->id'active') || !empty($prefs$cal->id'active'),
                     'owner'     => $cal->get_owner(),
                     'removable' => !$cal->default,
                     // extras to hide some elements in the UI
-                    'subscriptions' => false,
+                    'subscriptions' => $cal->subscriptions,
                     'driver' => 'caldav',
                 ;
 
@@ -296,6 +297,113 @@
     }
 
     /**
+     * Create a new calendar assigned to the current user
+     *
+     * @param array Hash array with calendar properties
+     *    name: Calendar name
+     *   color: The color of the calendar
+     *
+     * @return mixed ID of the calendar on success, False on error
+     */
+    public function create_calendar($prop)
+    {
+        $prop'type'   = 'event';
+        $prop'alarms' = !empty($prop'showalarms');
+
+        $id = $this->storage->folder_update($prop);
+
+        if ($id === false) {
+            return false;
+        }
+
+        $prefs'kolab_calendars' = $this->rc->config->get('kolab_calendars', );
+        $prefs'kolab_calendars'$id'active' = true;
+
+        $this->rc->user->save_prefs($prefs);
+
+        return $id;
+    }
+
+    /**
+     * Update properties of an existing calendar
+     *
+     * @see calendar_driver::edit_calendar()
+     */
+    public function edit_calendar($prop)
+    {
+        $id = $prop'id';
+
+        if (!in_array($id, self::BIRTHDAY_CALENDAR_ID, self::INVITATIONS_CALENDAR_PENDING, self::INVITATIONS_CALENDAR_DECLINED)) {
+            $prop'type'   = 'event';
+            $prop'alarms' = !empty($prop'showalarms');
+
+            return $this->storage->folder_update($prop) !== false;
+        }
+
+        // fallback to local prefs for special calendars
+        $prefs'kolab_calendars' = $this->rc->config->get('kolab_calendars', );
+        unset($prefs'kolab_calendars'$id'showalarms');
+
+        if (isset($prop'showalarms') && $id == self::BIRTHDAY_CALENDAR_ID) {
+            $prefs'calendar_birthdays_alarm_type' = $prop'showalarms' ? $this->alarm_types0 : '';
+        }
+        else if (isset($prop'showalarms')) {
+            $prefs'kolab_calendars'$id'showalarms' = !empty($prop'showalarms');
+        }
+
+        if (!empty($prefs'kolab_calendars'$id)) {
+            $this->rc->user->save_prefs($prefs);
+        }
+
+        return true;
+    }
+
+    /**
+     * Set active/subscribed state of a calendar
+     *
+     * @see calendar_driver::subscribe_calendar()
+     */
+    public function subscribe_calendar($prop)
+    {
+        if (empty($prop'id')) {
+            return false;
+        }
+
+        // save state in local prefs
+        if (isset($prop'active')) {
+            $prefs'kolab_calendars' = $this->rc->config->get('kolab_calendars', );
+            $prefs'kolab_calendars'$prop'id''active' = !empty($prop'active');
+
+            $this->rc->user->save_prefs($prefs);
+        }
+
+        return true;
+    }
+
+    /**
+     * Delete the given calendar with all its contents
+     *
+     * @see calendar_driver::delete_calendar()
+     */
+    public function delete_calendar($prop)
+    {
+        if (!empty($prop'id')) {
+            if ($this->storage->folder_delete($prop'id', 'event')) {
+                // remove folder from user prefs
+                $prefs'kolab_calendars' = $this->rc->config->get('kolab_calendars', );
+                if (isset($prefs'kolab_calendars'$prop'id')) {
+                    unset($prefs'kolab_calendars'$prop'id');
+                    $this->rc->user->save_prefs($prefs);
+                }
+
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    /**
      * Search for shared or otherwise not listed calendars the user has access
      *
      * @param string Search string
@@ -481,50 +589,15 @@
             return kolab_utils::folder_form($form, '', 'calendar');
         }
 
-        $this->_read_calendars();
-
-        if (!empty($calendar'id') && ($cal = $this->calendars$calendar'id')) {
-            $folder = $cal->get_realname(); // UTF7
-            $color  = $cal->get_color();
-        }
-        else {
-            $folder = '';
-            $color  = '';
-        }
-
-        $hidden_fields = 'name' => 'oldname', 'value' => $folder;
-
-        $form      = ;
-        $protected = false; // TODO
-
-        // Disable folder name input
-        if ($protected) {
-            $input_name = new html_hiddenfield('name' => 'name', 'id' => 'calendar-name');
-            $formfields'name''value' = $this->storage->object_name($folder)
-                . $input_name->show($folder);
-        }
-
-        // calendar name (default field)
-        $form'props''fields''location' = $formfields'name';
-
-        if ($protected) {
-            // prevent user from moving folder
-            $hidden_fields = 'name' => 'parent', 'value' => ''; // TODO
-        }
-        else {
-            $select = $this->storage->folder_selector('event', 'name' => 'parent', 'id' => 'calendar-parent', $folder);
-
-            $form'props''fields''path' = 
-                'id'    => 'calendar-parent',
-                'label' => $this->cal->gettext('parentcalendar'),
-                'value' => $select->show(strlen($folder) ? '' : ''), // TODO
-            ;
-        }
-
-        // calendar color (default field)
-        $form'props''fields''color'  = $formfields'color';
-        $form'props''fields''alarms' = $formfields'showalarms';
+        $form'props' = 
+            'name'   => $this->rc->gettext('properties'),
+            'fields' => 
+                'location' => $formfields'name',
+                'color'    => $formfields'color',
+                'alarms'   => $formfields'showalarms',
+            ,
+        ;
 
-        return kolab_utils::folder_form($form, $folder, 'calendar', $hidden_fields);
+        return kolab_utils::folder_form($form, $folder, 'calendar', , true);
     }
 }

roundcubemail-1.5.3.tar.gz/plugins/calendar/lib/calendar_ui.php Changed

@@ -352,7 +352,7 @@
                 $color   = !empty($prop'color') ? $prop'color' : 'f00';
                 $actions = '';
 
-                if (!EMPTY($prop'removable')) {
+                if (!empty($prop'removable')) {
                     $actions .= html::a(
                             'href'  => '#',
                             'class' => 'remove',
@@ -370,28 +370,28 @@
                     , ''
                 );
 
-                if (!empty($prop'subscribed')) {
-                    $actions .= html::a(
-                            'href'  => '#',
-                            'class' => 'subscribed',
-                            'title' => $this->cal->gettext('calendarsubscribe'),
-                            'role'  => 'checkbox',
-                            'aria-checked' => !empty($prop'subscribed') ? 'true' : 'false'
-                        , ' '
-                    );
-                }
-
                 if (!isset($prop'subscriptions') || $prop'subscriptions' !== false) {
-                    $content .= html::tag('input', 
-                            'type'    => 'checkbox',
-                            'name'    => '_cal',
-                            'value'   => $id,
-                            'checked' => !empty($prop'active'),
-                            'aria-labelledby' => $label_id
-                        )
-                        . html::span('actions', $actions)
-                        . html::span('class' => 'handle', 'style' => "background-color: #$color", '&nbsp;');
+                    if (!empty($prop'subscribed')) {
+                        $actions .= html::a(
+                                'href'  => '#',
+                                'class' => 'subscribed',
+                                'title' => $this->cal->gettext('calendarsubscribe'),
+                                'role'  => 'checkbox',
+                                'aria-checked' => !empty($prop'subscribed') ? 'true' : 'false'
+                            , ' '
+                        );
+                    }
                 }
+
+                $content .= html::tag('input', 
+                        'type'    => 'checkbox',
+                        'name'    => '_cal',
+                        'value'   => $id,
+                        'checked' => !empty($prop'active'),
+                        'aria-labelledby' => $label_id
+                    )
+                    . html::span('actions', $actions)
+                    . html::span('class' => 'handle', 'style' => "background-color: #$color", '&nbsp;');
             }
 
             $content = html::div(join(' ', $classes), $content);

roundcubemail-1.5.3.tar.gz/plugins/calendar/skins/elastic/templates/calendar.html Changed

@@ -8,11 +8,9 @@
 	<div class="header">
 		<a class="button icon back-content-button" href="#back" data-hidden="big"><span class="inner"><roundcube:label name="back" /></span></a>
 		<span id="aria-label-calendars" class="header-title"><roundcube:label name="calendar.calendars" /></span>
-		<roundcube:if condition="env:calendar_driver != 'caldav'" />
 		<roundcube:button name="calendaractionsmenu" id="calendaroptionsmenulink" type="link"
 			title="calendar.calendaractions" class="button icon sidebar-menu" data-popup="calendaractions-menu"
 			innerClass="inner" label="actions" />
-		<roundcube:endif />
 	</div>
 	<roundcube:object name="libkolab.folder_search_form" id="calendarlistsearch" wrapper="searchbar menu"
 		ariatag="h2" label="calsearchform" label-domain="calendar" buttontitle="findcalendars" />
@@ -149,7 +147,9 @@
 		<roundcube:if condition="env:calendar_driver == 'kolab'" />
 			<roundcube:button type="link-menuitem" command="calendar-remove" label="calendar.removelist" class="remove disabled" classAct="remove active" />
 		<roundcube:endif />
-		<roundcube:button type="link-menuitem" command="calendar-showurl" label="calendar.showurl" class="showurl disabled" classAct="showurl active" />
+		<roundcube:if condition="env:calendar_driver != 'caldav'" />
+			<roundcube:button type="link-menuitem" command="calendar-showurl" label="calendar.showurl" class="showurl disabled" classAct="showurl active" />
+		<roundcube:endif />
 		<roundcube:if condition="!empty(env:calendar_settings'freebusy_url')" />
 			<roundcube:button type="link-menuitem" command="calendar-showfburl" label="calendar.showfburl" class="showurl disabled" classAct="showurl active" />
 		<roundcube:endif />

roundcubemail-1.5.3.tar.gz/plugins/kolab_addressbook/drivers Added

roundcubemail-1.5.3.tar.gz/plugins/kolab_addressbook/drivers/carddav Added

roundcubemail-1.5.3.tar.gz/plugins/kolab_addressbook/drivers/carddav/carddav_contacts.php Added

@@ -0,0 +1,1269 @@
+<?php
+
+/**
+ * Backend class for a custom address book using CardDAV service.
+ *
+ * This part of the Roundcube+Kolab integration and connects the
+ * rcube_addressbook interface with the kolab_storage_dav wrapper from libkolab
+ *
+ * @author Thomas Bruederli <bruederli@kolabsys.com>
+ * @author Aleksander Machniak <machniak@apheleia-it.chm>
+ *
+ * Copyright (C) 2011-2022, Kolab Systems AG <contact@apheleia-it.ch>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * @see rcube_addressbook
+ */
+class carddav_contacts extends rcube_addressbook
+{
+    public $primary_key = 'ID';
+    public $rights   = 'lrs';
+    public $readonly = true;
+    public $undelete = false;
+    public $groups   = true;
+
+    public $coltypes = 
+        'name'         => 'limit' => 1,
+        'firstname'    => 'limit' => 1,
+        'surname'      => 'limit' => 1,
+        'middlename'   => 'limit' => 1,
+        'prefix'       => 'limit' => 1,
+        'suffix'       => 'limit' => 1,
+        'nickname'     => 'limit' => 1,
+        'jobtitle'     => 'limit' => 1,
+        'organization' => 'limit' => 1,
+        'department'   => 'limit' => 1,
+        'email'        => 'subtypes' => 'home','work','other',
+        'phone'        => ,
+        'address'      => 'subtypes' => 'home','work','office',
+        'website'      => 'subtypes' => 'homepage','blog',
+        'im'           => 'subtypes' => null,
+        'gender'       => 'limit' => 1,
+        'birthday'     => 'limit' => 1,
+        'anniversary'  => 'limit' => 1,
+        'manager'      => 'limit' => null,
+        'assistant'    => 'limit' => null,
+        'spouse'       => 'limit' => 1,
+        'notes'        => 'limit' => 1,
+        'photo'        => 'limit' => 1,
+    ;
+
+    public $vcard_map = 
+    //    'profession'     => 'X-PROFESSION',
+    //    'officelocation' => 'X-OFFICE-LOCATION',
+    //    'initials'       => 'X-INITIALS',
+    //    'children'       => 'X-CHILDREN',
+    //    'freebusyurl'    => 'X-FREEBUSY-URL',
+    //    'pgppublickey'   => 'KEY',
+        'uid'            => 'UID',
+    ;
+
+    /**
+     * List of date type fields
+     */
+    public $date_cols = 'birthday', 'anniversary';
+
+    public $fulltext_cols  = 'name', 'firstname', 'surname', 'middlename', 'email';
+
+    private $gid;
+    private $storage;
+    private $dataset;
+    private $sortindex;
+    private $contacts;
+    private $distlists;
+    private $groupmembers;
+    private $filter;
+    private $result;
+    private $namespace;
+    private $action;
+
+    // list of fields used for searching in "All fields" mode
+    private $search_fields = 
+        'name',
+        'firstname',
+        'surname',
+        'middlename',
+        'prefix',
+        'suffix',
+        'nickname',
+        'jobtitle',
+        'organization',
+        'department',
+        'email',
+        'phone',
+        'address',
+//        'profession',
+        'manager',
+        'assistant',
+        'spouse',
+//        'children',
+        'notes',
+    ;
+
+
+    /**
+     * Object constructor
+     */
+    public function __construct($dav_folder = null)
+    {
+        $this->storage = $dav_folder;
+        $this->ready   = !empty($this->storage);
+
+        // Set readonly and rights flags according to folder permissions
+        if ($this->ready) {
+            if ($this->storage->get_owner() == $_SESSION'username') {
+                $this->readonly = false;
+                $this->rights = 'lrswikxtea';
+            }
+            else {
+                $rights = $this->storage->get_myrights();
+                if ($rights && !PEAR::isError($rights)) {
+                    $this->rights = $rights;
+                    if (strpos($rights, 'i') !== false && strpos($rights, 't') !== false) {
+                        $this->readonly = false;
+                    }
+                }
+            }
+        }
+
+        $this->action = rcube::get_instance()->action;
+    }
+
+    /**
+     * Getter for the address book name to be displayed
+     *
+     * @return string Name of this address book
+     */
+    public function get_name()
+    {
+        return $this->storage->get_name();
+    }
+
+    /**
+     * Wrapper for kolab_storage_folder::get_foldername()
+     */
+    public function get_foldername()
+    {
+        return $this->storage->get_foldername();
+    }
+
+    /**
+     * Getter for the folder name
+     *
+     * @return string Name of the folder
+     */
+    public function get_realname()
+    {
+        return $this->get_name();
+    }
+
+    /**
+     * Getter for the name of the namespace to which the IMAP folder belongs
+     *
+     * @return string Name of the namespace (personal, other, shared)
+     */
+    public function get_namespace()
+    {
+        if ($this->namespace === null && $this->ready) {
+            $this->namespace = $this->storage->get_namespace();
+        }
+
+        return $this->namespace;
+    }
+
+    /**
+     * Getter for parent folder path
+     *
+     * @return string Full path to parent folder
+     */
+    public function get_parent()
+    {
+        return $this->storage->get_parent();
+    }
+
+    /**
+     * Check subscription status of this folder
+     *
+     * @return boolean True if subscribed, false if not

roundcubemail-1.5.3.tar.gz/plugins/kolab_addressbook/drivers/carddav/carddav_contacts_driver.php Added

@@ -0,0 +1,214 @@
+<?php
+
+/**
+ * Backend class for a custom address book using CardDAV service.
+ *
+ * @author Aleksander Machniak <machniak@apheleia-it.chm>
+ *
+ * Copyright (C) 2011-2022, Apheleia IT AG <contact@apheleia-it.ch>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * @see rcube_addressbook
+ */
+
+class carddav_contacts_driver
+{
+    protected $plugin;
+    protected $rc;
+    protected $sources;
+
+    public function __construct($plugin)
+    {
+        $this->plugin = $plugin;
+        $this->rc     = rcube::get_instance();
+    }
+
+    /**
+     * List addressbook sources (folders)
+     */
+    public function list_folders()
+    {
+        if (isset($this->sources)) {
+            return $this->sources;
+        }
+
+        $storage = self::get_storage();
+        $this->sources = ;
+
+        // get all folders that have "contact" type
+        foreach ($storage->get_folders('contact') as $folder) {
+            $this->sources$folder->id = new carddav_contacts($folder);
+        }
+
+        return $this->sources;
+    }
+
+    /**
+     * Getter for the rcube_addressbook instance
+     *
+     * @param string $id Addressbook (folder) ID
+     *
+     * @return ?carddav_contacts
+     */
+    public function get_address_book($id)
+    {
+        if (isset($this->sources$id)) {
+            return $this->sources$id;
+        }
+
+        $storage = self::get_storage();
+        $folder = $storage->get_folder($id, 'contact');
+
+        if ($folder) {
+            return new carddav_contacts($folder);
+        }
+    }
+
+    /**
+     * Initialize kolab_storage_dav instance
+     */
+    protected static function get_storage()
+    {
+        $rcube = rcube::get_instance();
+        $url   = $rcube->config->get('kolab_addressbook_carddav_server', 'http://localhost');
+
+        return new kolab_storage_dav($url);
+    }
+
+    /**
+     * Delete address book folder
+     *
+     * @param string $source Addressbook identifier
+     *
+     * @return bool
+     */
+    public function folder_delete($folder)
+    {
+        $storage = self::get_storage();
+
+        $this->sources = null;
+
+        return $storage->folder_delete($folder, 'contact');
+    }
+
+    /**
+     * Address book folder form content for book create/edit
+     *
+     * @param string $action Action name (edit, create)
+     * @param string $source Addressbook identifier
+     *
+     * @return string HTML output
+     */
+    public function folder_form($action, $source)
+    {
+        $name = '';
+
+        if ($source && ($book = $this->get_address_book($source))) {
+            $name = $book->get_name();
+        }
+
+        $foldername = new html_inputfield('name' => '_name', 'id' => '_name', 'size' => 30);
+        $foldername = $foldername->show($name);
+
+        // General tab
+        $form = 
+            'properties' => 
+                'name'   => $this->rc->gettext('properties'),
+                'fields' => 
+                    'name' => 
+                        'label' => $this->plugin->gettext('bookname'),
+                        'value' => $foldername,
+                        'id'    => '_name',
+                    ,
+                ,
+            ,
+        ;
+
+        $hidden_fields = 'name' => '_source', 'value' => $source;
+
+        return kolab_utils::folder_form($form, '', 'contacts', $hidden_fields, false);
+    }
+
+    /**
+     * Handler for address book create/edit form submit
+     */
+    public function folder_save()
+    {
+        $storage = self::get_storage();
+
+        $prop  = 
+            'id'   => trim(rcube_utils::get_input_value('_source', rcube_utils::INPUT_POST)),
+            'name' => trim(rcube_utils::get_input_value('_name', rcube_utils::INPUT_POST)),
+            'type' => 'contact',
+            'subscribed' => true,
+        ;
+
+        $type = !empty($prop'id') ? 'update' : 'create';
+
+        $this->sources = null;
+
+        $result = $storage->folder_update($prop);
+
+        if ($result && ($abook = $this->get_address_book($prop'id' ?: $result))) {
+            $abook->id = $prop'id' ?: $result;
+            $props = $this->abook_prop($abook->id, $abook);
+
+            $this->rc->output->show_message('kolab_addressbook.book'.$type.'d', 'confirmation');
+            $this->rc->output->command('book_update', $props, $prop'id');
+        }
+        else {
+            $this->rc->output->show_message('kolab_addressbook.book'.$type.'error', 'error');
+        }
+    }
+
+    /**
+     * Helper method to build a hash array of address book properties
+     */
+    public function abook_prop($id, $abook)
+    {
+/*
+        if ($abook->virtual) {
+            return 
+                'id'       => $id,
+                'name'     => $abook->get_name(),
+                'listname' => $abook->get_foldername(),
+                'group'    => $abook instanceof kolab_storage_folder_user ? 'user' : $abook->get_namespace(),
+                'readonly' => true,
+                'rights'   => 'l',
+                'kolab'    => true,
+                'virtual'  => true,
+                'carddav'  => true,
+            ;
+        }
+*/
+        return 
+            'id'         => $id,
+            'name'       => $abook->get_name(),
+            'listname'   => $abook->get_foldername(),

roundcubemail-1.5.3.tar.gz/plugins/kolab_addressbook/drivers/kolab Added

roundcubemail-1.5.3.tar.gz/plugins/kolab_addressbook/drivers/kolab/kolab_contacts.php Added

@@ -0,0 +1,1400 @@
+<?php
+
+/**
+ * Backend class for a custom address book
+ *
+ * This part of the Roundcube+Kolab integration and connects the
+ * rcube_addressbook interface with the kolab_storage wrapper from libkolab
+ *
+ * @author Thomas Bruederli <bruederli@kolabsys.com>
+ * @author Aleksander Machniak <machniak@kolabsys.com>
+ *
+ * Copyright (C) 2011, Kolab Systems AG <contact@kolabsys.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * @see rcube_addressbook
+ */
+class kolab_contacts extends rcube_addressbook
+{
+    public $primary_key = 'ID';
+    public $rights   = 'lrs';
+    public $readonly = true;
+    public $undelete = true;
+    public $groups = true;
+    public $coltypes = array(
+        'name'         => array('limit' => 1),
+        'firstname'    => array('limit' => 1),
+        'surname'      => array('limit' => 1),
+        'middlename'   => array('limit' => 1),
+        'prefix'       => array('limit' => 1),
+        'suffix'       => array('limit' => 1),
+        'nickname'     => array('limit' => 1),
+        'jobtitle'     => array('limit' => 1),
+        'organization' => array('limit' => 1),
+        'department'   => array('limit' => 1),
+        'email'        => array('subtypes' => array('home','work','other')),
+        'phone'        => array(),
+        'address'      => array('subtypes' => array('home','work','office')),
+        'website'      => array('subtypes' => array('homepage','blog')),
+        'im'           => array('subtypes' => null),
+        'gender'       => array('limit' => 1),
+        'birthday'     => array('limit' => 1),
+        'anniversary'  => array('limit' => 1),
+        'profession'   => array(
+            'type'      => 'text',
+            'size'      => 40,
+            'maxlength' => 80,
+            'limit'     => 1,
+            'label'     => 'kolab_addressbook.profession',
+            'category'  => 'personal'
+        ),
+        'manager'      => array('limit' => null),
+        'assistant'    => array('limit' => null),
+        'spouse'       => array('limit' => 1),
+        'children'     => array(
+            'type'      => 'text',
+            'size'      => 40,
+            'maxlength' => 80,
+            'limit'     => null,
+            'label'     => 'kolab_addressbook.children',
+            'category'  => 'personal'
+        ),
+        'freebusyurl'  => array(
+            'type'  => 'text',
+            'size'  => 40,
+            'limit' => 1,
+            'label' => 'kolab_addressbook.freebusyurl'
+        ),
+        'pgppublickey' => array(
+            'type' => 'textarea',
+            'size' => 70,
+            'rows' => 10,
+            'limit' => 1,
+            'label' => 'kolab_addressbook.pgppublickey'
+        ),
+        'pkcs7publickey' => array(
+            'type' => 'textarea',
+            'size' => 70,
+            'rows' => 10,
+            'limit' => 1,
+            'label' => 'kolab_addressbook.pkcs7publickey'
+        ),
+        'notes'        => array('limit' => 1),
+        'photo'        => array('limit' => 1),
+        // TODO: define more Kolab-specific fields such as: language, latitude, longitude, crypto settings
+    );
+
+    /**
+     * vCard additional fields mapping
+     */
+    public $vcard_map = array(
+        'profession'     => 'X-PROFESSION',
+        'officelocation' => 'X-OFFICE-LOCATION',
+        'initials'       => 'X-INITIALS',
+        'children'       => 'X-CHILDREN',
+        'freebusyurl'    => 'X-FREEBUSY-URL',
+        'pgppublickey'   => 'KEY',
+    );
+
+    /**
+     * List of date type fields
+     */
+    public $date_cols = array('birthday', 'anniversary');
+
+    private $gid;
+    private $storagefolder;
+    private $dataset;
+    private $sortindex;
+    private $contacts;
+    private $distlists;
+    private $groupmembers;
+    private $filter;
+    private $result;
+    private $namespace;
+    private $imap_folder = 'INBOX/Contacts';
+    private $action;
+
+    // list of fields used for searching in "All fields" mode
+    private $search_fields = array(
+        'name',
+        'firstname',
+        'surname',
+        'middlename',
+        'prefix',
+        'suffix',
+        'nickname',
+        'jobtitle',
+        'organization',
+        'department',
+        'email',
+        'phone',
+        'address',
+        'profession',
+        'manager',
+        'assistant',
+        'spouse',
+        'children',
+        'notes',
+    );
+
+
+    public function __construct($imap_folder = null)
+    {
+        if ($imap_folder) {
+            $this->imap_folder = $imap_folder;
+        }
+
+        // extend coltypes configuration 
+        $format = kolab_format::factory('contact');
+
+        $this->coltypes'phone''subtypes'   = array_keys($format->phonetypes);
+        $this->coltypes'address''subtypes' = array_keys($format->addresstypes);
+
+        $rcube = rcube::get_instance();
+
+        // set localized labels for proprietary cols
+        foreach ($this->coltypes as $col => $prop) {
+            if (is_string($prop'label')) {
+                $this->coltypes$col'label' = $rcube->gettext($prop'label');
+            }
+        }
+
+        // fetch objects from the given IMAP folder
+        $this->storagefolder = kolab_storage::get_folder($this->imap_folder);
+        $this->ready = $this->storagefolder && !PEAR::isError($this->storagefolder);
+
+        // Set readonly and rights flags according to folder permissions
+        if ($this->ready) {
+            if ($this->storagefolder->get_owner() == $_SESSION'username') {
+                $this->readonly = false;
+                $this->rights = 'lrswikxtea';
+            }
+            else {
+                $rights = $this->storagefolder->get_myrights();
+                if ($rights && !PEAR::isError($rights)) {
+                    $this->rights = $rights;
+                    if (strpos($rights, 'i') !== false && strpos($rights, 't') !== false) {
+                        $this->readonly = false;
+                    }
+                }
+            }
+        }
+
+        $this->action = rcube::get_instance()->action;
+    }
+
+    /**
+     * Getter for the address book name to be displayed

roundcubemail-1.5.3.tar.gz/plugins/kolab_addressbook/drivers/kolab/kolab_contacts_driver.php Added

@@ -0,0 +1,275 @@
+<?php
+
+/**
+ * Backend class for a custom address book
+ *
+ * @author Thomas Bruederli <bruederli@kolabsys.com>
+ * @author Aleksander Machniak <machniak@apheleia-it.ch>
+ *
+ * Copyright (C) 2011-2022, Apheleia IT AG <contact@apheleia-it.ch>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * @see rcube_addressbook
+ */
+class kolab_contacts_driver
+{
+    protected $plugin;
+    protected $rc;
+
+    public function __construct($plugin)
+    {
+        $this->plugin = $plugin;
+        $this->rc     = rcube::get_instance();
+    }
+ 
+    /**
+     * List addressbook sources (folders)
+     */
+    public static function list_folders()
+    {
+        kolab_storage::$encode_ids = true;
+
+        // get all folders that have "contact" type
+        $folders = kolab_storage::sort_folders(kolab_storage::get_folders('contact'));
+
+        if (PEAR::isError($folders)) {
+            rcube::raise_error(
+                    'code' => 600, 'file' => __FILE__, 'line' => __LINE__,
+                    'message' => "Failed to list contact folders from Kolab server:" . $folders->getMessage()
+                ,
+                true, false);
+
+            return ;
+        }
+
+        // we need at least one folder to prevent from errors in Roundcube core
+        // when there's also no sql nor ldap addressbook (Bug #2086)
+        if (empty($folders)) {
+            if ($folder = kolab_storage::create_default_folder('contact')) {
+                $folders = new kolab_storage_folder($folder, 'contact');
+            }
+        }
+
+        $sources = ;
+        foreach ($folders as $folder) {
+            $sources$folder->id = new kolab_contacts($folder->name);
+        }
+
+        return $sources;
+    }
+
+    /**
+     * Getter for the rcube_addressbook instance
+     *
+     * @param string $id Addressbook (folder) ID
+     *
+     * @return ?kolab_contacts
+     */
+    public static function get_address_book($id)
+    {
+        $folderId = kolab_storage::id_decode($id);
+        $folder   = kolab_storage::get_folder($folderId);
+
+        // try with unencoded (old-style) identifier
+        if ((!$folder || $folder->type != 'contact') && $folderId != $id) {
+            $folder = kolab_storage::get_folder($id);
+        }
+
+        if ($folder && $folder->type == 'contact') {
+            return new kolab_contacts($folder->name);
+        }
+    }
+
+    /**
+     * Delete address book folder
+     *
+     * @param string $source Addressbook identifier
+     *
+     * @return bool
+     */
+    public function folder_delete($folder)
+    {
+        $folderId = kolab_storage::id_decode($folder);
+        $folder   = kolab_storage::get_folder($folderId);
+
+        if ($folder && kolab_storage::folder_delete($folder->name)) {
+            return $folderId;
+        }
+
+        return false;
+    }
+
+    /**
+     * Address book folder form content for book create/edit
+     *
+     * @param string $action Action name (edit, create)
+     * @param string $source Addressbook identifier
+     *
+     * @return string HTML output
+     */
+    public function folder_form($action, $source)
+    {
+        $hidden_fields = 'name' => '_source', 'value' => $source;
+
+        $rcube   = rcube::get_instance();
+        $folder  = rcube_charset::convert($source, RCUBE_CHARSET, 'UTF7-IMAP');
+        $storage = $rcube->get_storage();
+        $delim   = $storage->get_hierarchy_delimiter();
+
+        if ($action == 'edit') {
+            $path_imap = explode($delim, $folder);
+            $name      = rcube_charset::convert(array_pop($path_imap), 'UTF7-IMAP');
+            $path_imap = implode($delim, $path_imap);
+        }
+        else { // create
+            $path_imap = $folder;
+            $name      = '';
+            $folder    = '';
+        }
+
+        // Store old name, get folder options
+        if (strlen($folder)) {
+            $hidden_fields = array('name' => '_oldname', 'value' => $folder);
+
+            $options = $storage->folder_info($folder);
+        }
+
+        $form = array();
+
+        // General tab
+        $form'properties' = array(
+            'name'   => $rcube->gettext('properties'),
+            'fields' => array(),
+        );
+
+        if (!empty($options) && ($options'norename' || $options'protected')) {
+            $foldername = rcube::Q(str_replace($delim, ' &raquo; ', kolab_storage::object_name($folder)));
+        }
+        else {
+            $foldername = new html_inputfield(array('name' => '_name', 'id' => '_name', 'size' => 30));
+            $foldername = $foldername->show($name);
+        }
+
+        $form'properties''fields''name' = array(
+            'label' => $rcube->gettext('bookname', 'kolab_addressbook'),
+            'value' => $foldername,
+            'id'    => '_name',
+        );
+
+        if (!empty($options) && ($options'norename' || $options'protected')) {
+            // prevent user from moving folder
+            $hidden_fields = array('name' => '_parent', 'value' => $path_imap);
+        }
+        else {
+            $prop   = array('name' => '_parent', 'id' => '_parent');
+            $select = kolab_storage::folder_selector('contact', $prop, $folder);
+
+            $form'properties''fields''parent' = array(
+                'label' => $rcube->gettext('parentbook', 'kolab_addressbook'),
+                'value' => $select->show(strlen($folder) ? $path_imap : ''),
+                'id'    => '_parent',
+            );
+        }
+
+        return kolab_utils::folder_form($form, $folder, 'calendar', $hidden_fields);
+    }
+
+    /**
+     * Handler for address book create/edit form submit
+     */
+    public function folder_save()
+    {
+        $prop  = 
+            'name'    => trim(rcube_utils::get_input_value('_name', rcube_utils::INPUT_POST)),
+            'oldname' => trim(rcube_utils::get_input_value('_oldname', rcube_utils::INPUT_POST, true)), // UTF7-IMAP
+            'parent'  => trim(rcube_utils::get_input_value('_parent', rcube_utils::INPUT_POST, true)), // UTF7-IMAP
+            'type'    => 'contact',
+            'subscribed' => true,

roundcubemail-1.5.3.tar.gz/plugins/kolab_addressbook/kolab_addressbook.js Changed

@@ -144,7 +144,7 @@
 rcube_webmail.prototype.book_dialog = function(action)
 {
     var title = rcmail.gettext('kolab_addressbook.book' + action),
-        params = {_act: action, _source: this.book_realname(), _framed: 1},
+        params = {_act: action, _framed: 1, _source: action == 'edit' ? this.env.source : ''},
         dialog = $('<iframe>').attr('src', rcmail.url('plugin.book', params)),
         save_func = function() {
             var data,
@@ -188,9 +188,10 @@
 rcube_webmail.prototype.book_delete = function()
 {
     if (this.env.source != '') {
+        var source = urlencode(this.env.source);
         this.confirm_dialog(this.get_label('kolab_addressbook.bookdeleteconfirm'), 'delete', function() {
             var lock = rcmail.set_busy(true, 'kolab_addressbook.bookdeleting');
-            rcmail.http_request('plugin.book', '_act=delete&_source='+urlencode(rcmail.book_realname()), lock);
+            rcmail.http_request('plugin.book', '_act=delete&_source=' + source, lock);
         });
     }
 };
@@ -226,25 +227,34 @@
 
     this.treelist.remove(id);
 
-    for (n in groups)
+    for (n in groups) {
         if (groupsn.source == id) {
             delete this.env.contactgroupsn;
             delete this.env.contactfoldersn;
         }
+    }
 
     delete this.env.address_sourcesid;
     delete this.env.contactfoldersid;
 
-    if (recur)
+    if (this.env.last_source == id ) {
+        this.env.last_source = Object.keys(this.env.address_sources)0;
+        this.env.last_group = '';
+    }
+
+    if (recur) {
         return;
+    }
 
     this.enable_command('group-create', 'book-edit', 'book-delete', false);
 
     // remove subfolders
     olddata.realname += this.env.delimiter;
-    for (n in sources)
-        if (sourcesn.realname && sourcesn.realname.indexOf(olddata.realname) == 0)
+    for (n in sources) {
+        if (sourcesn.realname && sourcesn.realname.indexOf(olddata.realname) == 0) {
             this.book_delete_done(n, true);
+        }
+    }
 };
 
 // action executed after book create/update
@@ -257,15 +267,18 @@
                 id: 'kabt:' + data.id,
                 rel: data.id,
                 onclick: "return rcmail.command('list', '" + data.id + "', this)"
-            }),
-            $('<span>').attr({
-                'class': 'subscribed',
-                role: 'checkbox',
-                'aria-checked': true,
-                title: this.gettext('kolab_addressbook.foldersubscribe')
             })
         );
 
+    if (!data.carddav) {
+        content.append($('<span>').attr({
+            'class': 'subscribed',
+            role: 'checkbox',
+            'aria-checked': true,
+            title: this.gettext('kolab_addressbook.foldersubscribe')
+        }));
+    }
+
     // set row attributes
     if (data.readonly)
         classes.push('readonly');
@@ -297,13 +310,6 @@
     kolab_addressbook_contextmenu();
 };
 
-// returns real IMAP folder name
-rcube_webmail.prototype.book_realname = function()
-{
-    var source = this.env.source, sources = this.env.address_sources;
-    return source != '' && sourcessource && sourcessource.realname ? sourcessource.realname : '';
-};
-
 // open dialog to show the current contact's changelog
 rcube_webmail.prototype.contact_history_dialog = function()
 {

roundcubemail-1.5.3.tar.gz/plugins/kolab_addressbook/kolab_addressbook.php Changed

@@ -55,9 +55,13 @@
 
         $this->load_config();
 
-        $this->driver = $this->rc->config->get('kolab_addressbook_driver') ?: 'kolab';
-        $driver_class = 'rcube_' . $this->driver . '_contacts';
-        require_once(dirname(__FILE__) . '/lib/' . $driver_class . '.php');
+        $driver       = $this->rc->config->get('kolab_addressbook_driver') ?: 'kolab';
+        $driver_class = "{$driver}_contacts_driver";
+
+        require_once dirname(__FILE__) . "/drivers/{$driver}/{$driver}_contacts_driver.php";
+        require_once dirname(__FILE__) . "/drivers/{$driver}/{$driver}_contacts.php";
+
+        $this->driver = new $driver_class($this);
 
         // register hooks
         $this->add_hook('addressbooks_list', array($this, 'address_sources'));
@@ -66,8 +70,12 @@
 
         if ($this->rc->task == 'addressbook') {
             $this->add_texts('localization');
-            $this->add_hook('contact_form', array($this, 'contact_form'));
-            $this->add_hook('contact_photo', array($this, 'contact_photo'));
+
+            if ($this->driver instanceof kolab_contacts_driver) {
+                $this->add_hook('contact_form', array($this, 'contact_form'));
+                $this->add_hook('contact_photo', array($this, 'contact_photo'));
+            }
+
             $this->add_hook('template_object_directorylist', array($this, 'directorylist_html'));
 
             // Plugin actions
@@ -85,7 +93,7 @@
 
             // Load UI elements
             if ($this->api->output->type == 'html') {
-                require_once($this->home . '/lib/kolab_addressbook_ui.php');
+                require_once $this->home . '/lib/kolab_addressbook_ui.php';
                 $this->ui = new kolab_addressbook_ui($this);
 
                 if ($this->bonnie_api) {
@@ -106,7 +114,7 @@
             $this->add_hook('preferences_save', array($this, 'prefs_save'));
         }
 
-        if ($this->driver == 'kolab') {
+        if ($this->driver instanceof kolab_contacts_driver) {
             $this->add_hook('folder_delete', array($this, 'prefs_folder_delete'));
             $this->add_hook('folder_rename', array($this, 'prefs_folder_rename'));
             $this->add_hook('folder_update', array($this, 'prefs_folder_update'));
@@ -137,7 +145,7 @@
         $sources = array();
         foreach ($this->_list_sources() as $abook_id => $abook) {
             // register this address source
-            $sources$abook_id = $this->abook_prop($abook_id, $abook);
+            $sources$abook_id = $this->driver->abook_prop($abook_id, $abook);
 
             // flag folders with 'i' right as writeable
             if ($this->rc->action == 'add' && strpos($abook->rights, 'i') !== false) {
@@ -166,43 +174,6 @@
     }
 
     /**
-     * Helper method to build a hash array of address book properties
-     */
-    protected function abook_prop($id, $abook)
-    {
-        if ($abook->virtual) {
-            return array(
-                'id'       => $id,
-                'name'     => $abook->get_name(),
-                'listname' => $abook->get_foldername(),
-                'group'    => $abook instanceof kolab_storage_folder_user ? 'user' : $abook->get_namespace(),
-                'readonly' => true,
-                'rights'   => 'l',
-                'kolab'    => true,
-                'virtual'  => true,
-            );
-        }
-        else {
-            return array(
-                'id'       => $id,
-                'name'     => $abook->get_name(),
-                'listname' => $abook->get_foldername(),
-                'readonly' => $abook->readonly,
-                'rights'   => $abook->rights,
-                'groups'   => $abook->groups,
-                'undelete' => $abook->undelete && $this->rc->config->get('undo_timeout'),
-                'realname' => rcube_charset::convert($abook->get_realname(), 'UTF7-IMAP'), // IMAP folder name
-                'group'    => $abook->get_namespace(),
-                'subscribed' => $abook->is_subscribed(),
-                'carddavurl' => $abook->get_carddav_url(),
-                'removable'  => true,
-                'kolab'      => true,
-                'audittrail' => !empty($this->bonnie_api),
-            );
-        }
-    }
-
-    /**
      *
      */
     public function directorylist_html($args)
@@ -233,7 +204,7 @@
 
         // render a hierarchical list of kolab contact folders
         // TODO: Move this to the drivers
-        if ($this->driver == 'kolab') {
+        if ($this->driver instanceof kolab_contacts_driver) {
             $folders = kolab_storage::sort_folders(kolab_storage::get_folders('contact'));
             kolab_storage::folder_hierarchy($folders, $tree);
             if ($tree && !empty($tree->children)) {
@@ -260,7 +231,7 @@
     /**
      * Return html for a structured list <ul> for the folder tree
      */
-    public function folder_tree_html($node, $data, &$jsdata)
+    protected function folder_tree_html($node, $data, &$jsdata)
     {
         $out = '';
         foreach ($node->children as $folder) {
@@ -269,11 +240,11 @@
             $is_collapsed = strpos($this->rc->config->get('collapsed_abooks',''), '&'.rawurlencode($id).'&') !== false;
 
             if ($folder->virtual) {
-                $source = $this->abook_prop($folder->id, $folder);
+                $source = $this->driver->abook_prop($folder->id, $folder);
             }
             else if (empty($source)) {
-                $this->sources$id = new rcube_kolab_contacts($folder->name);
-                $source = $this->abook_prop($id, $this->sources$id);
+                $this->sources$id = new kolab_contacts($folder->name);
+                $source = $this->driver->abook_prop($id, $this->sources$id);
             }
 
             $content = $this->addressbook_list_item($id, $source, $jsdata);
@@ -335,7 +306,7 @@
                 ), $name)
         );
 
-        if ($this->driver == 'kolab' && isset($source'subscribed')) {
+        if ($this->driver instanceof kolab_contacts_driver && isset($source'subscribed')) {
             $inner .= html::span(array(
                 'class' => 'subscribed',
                 'title' => $this->gettext('foldersubscribe'),
@@ -369,8 +340,14 @@
         );
 
         $groupdata = array('out' => '', 'jsdata' => $jsdata, 'source' => $id);
-        if ($source'groups' && function_exists('rcmail_contact_groups')) {
-            $groupdata = rcmail_contact_groups($groupdata);
+        if ($source'groups') {
+            if (function_exists('rcmail_contact_groups')) {
+                $groupdata = rcmail_contact_groups($groupdata);
+            }
+            else {
+                // Roundcube >= 1.5
+                $groupdata = rcmail_action_contacts_index::contact_groups($groupdata);
+            }
         }
 
         $jsdata = $groupdata'jsdata';
@@ -438,14 +415,7 @@
     public function get_address_book($p)
     {
         if ($p'id') {
-            if ($this->driver == 'carddav') {
-                $source = rcube_carddav_contacts::get_address_book($p'id');
-            }
-            else {
-                $source = rcube_kolab_contacts::get_address_book($p'id');
-            }
-
-            if ($source) {
+            if ($source = $this->driver->get_address_book($p'id')) {
                 $p'instance' = $source;
 
                 // flag source as writeable if 'i' right is given
@@ -480,12 +450,7 @@
             return $this->sources;
         }
 
-        if ($this->driver == 'carddav') {
-            $folders = rcube_carddav_contacts::list_folders();
-        }
-        else {
-            $folders = rcube_kolab_contacts::list_folders();
-        }
+        $folders = $this->driver->list_folders();
 
         // get all folders that have "contact" type
         foreach ($folders as $id => $source) {
@@ -505,8 +470,9 @@
     public function contact_form($p)
     {
         // none of our business
-        if (!is_object($GLOBALS'CONTACTS') || !is_a($GLOBALS'CONTACTS', 'rcube_kolab_contacts'))
+        if (!is_object($GLOBALS'CONTACTS') || !is_a($GLOBALS'CONTACTS', 'kolab_contacts')) {
             return $p;
+        }

roundcubemail-1.5.3.tar.gz/plugins/kolab_addressbook/lib/kolab_addressbook_ui.php Changed

@@ -54,10 +54,6 @@
             // Include stylesheet (for directorylist)
             $this->plugin->include_stylesheet($this->plugin->local_skin_path().'/kolab_addressbook.css');
 
-            if ($this->plugin->driver != 'kolab') {
-                return;
-            }
-
             // include kolab folderlist widget if available
             if (in_array('libkolab', $this->plugin->api->loaded_plugins())) {
                 $this->plugin->api->include_script('libkolab/libkolab.js');
@@ -66,10 +62,12 @@
             $this->rc->output->add_footer($this->rc->output->parse('kolab_addressbook.search_addon', false, false));
 
             // Add actions on address books
-            $options = array('book-create', 'book-edit', 'book-delete', 'book-remove');
-            $idx     = 0;
+            $options = 'book-create', 'book-edit', 'book-delete';
+            if ($this->plugin->driver instanceof kolab_contacts_driver) {
+                $options = 'book-remove';
+            }
 
-            if ($dav_url = $this->rc->config->get('kolab_addressbook_carddav_url')) {
+            if ($this->plugin->driver instanceof kolab_contacts_driver && ($dav_url = $this->rc->config->get('kolab_addressbook_carddav_url'))) {
                 $options = 'book-showurl';
                 $this->rc->output->set_env('kolab_addressbook_carddav_url', true);
 
@@ -86,6 +84,7 @@
                 }
             }
 
+            $idx = 0;
             foreach ($options as $command) {
                 $content = html::tag('li', $idx ? null : array('class' => 'separator_above'),
                     $this->plugin->api->output->button(array(
@@ -101,16 +100,19 @@
             }
 
             // Link to Settings/Folders
-            $content = html::tag('li', array('class' => 'separator_above'),
-                $this->plugin->api->output->button(array(
-                    'label'    => 'managefolders',
-                    'type'     => 'link',
-                    'class'    => 'folders disabled',
-                    'classact' => 'folders active',
-                    'command'  => 'folders',
-                    'task'     => 'settings',
-            )));
-            $this->plugin->api->add_content($content, 'groupoptions');
+            if ($this->plugin->driver instanceof kolab_contacts_driver) {
+                $content = html::tag('li', 'class' => 'separator_above',
+                    $this->plugin->api->output->button(
+                            'label'    => 'managefolders',
+                            'type'     => 'link',
+                            'class'    => 'folders disabled',
+                            'classact' => 'folders active',
+                            'command'  => 'folders',
+                            'task'     => 'settings',
+                    ));
+
+                $this->plugin->api->add_content($content, 'groupoptions');
+            }
 
             $this->rc->output->add_label(
                 'kolab_addressbook.bookdeleteconfirm',
@@ -162,7 +164,7 @@
     public function book_edit()
     {
         $this->rc->output->set_env('pagetitle', $this->plugin->gettext('bookproperties'));
-        $this->rc->output->add_handler('folderform', array($this, 'book_form'));
+        $this->rc->output->add_handler('folderform', $this, 'book_form');
         $this->rc->output->send('libkolab.folderform');
     }
 
@@ -178,70 +180,11 @@
         $action = trim(rcube_utils::get_input_value('_act', rcube_utils::INPUT_GPC));
         $folder = trim(rcube_utils::get_input_value('_source', rcube_utils::INPUT_GPC, true)); // UTF8
 
-        $hidden_fields = array('name' => '_source', 'value' => $folder);
-
-        $folder  = rcube_charset::convert($folder, RCUBE_CHARSET, 'UTF7-IMAP');
-        $storage = $this->rc->get_storage();
-        $delim   = $storage->get_hierarchy_delimiter();
-
-        if ($action == 'edit') {
-            $path_imap = explode($delim, $folder);
-            $name      = rcube_charset::convert(array_pop($path_imap), 'UTF7-IMAP');
-            $path_imap = implode($delim, $path_imap);
-        }
-        else { // create
-            $path_imap = $folder;
-            $name      = '';
-            $folder    = '';
-        }
-
-        // Store old name, get folder options
-        if (strlen($folder)) {
-            $hidden_fields = array('name' => '_oldname', 'value' => $folder);
-
-            $options = $storage->folder_info($folder);
-        }
-
-        $form = array();
-
-        // General tab
-        $form'properties' = array(
-            'name'   => $this->rc->gettext('properties'),
-            'fields' => array(),
-        );
-
-        if (!empty($options) && ($options'norename' || $options'protected')) {
-            $foldername = rcube::Q(str_replace($delim, ' &raquo; ', kolab_storage::object_name($folder)));
-        }
-        else {
-            $foldername = new html_inputfield(array('name' => '_name', 'id' => '_name', 'size' => 30));
-            $foldername = $foldername->show($name);
-        }
-
-        $form'properties''fields''name' = array(
-            'label' => $this->plugin->gettext('bookname'),
-            'value' => $foldername,
-            'id'    => '_name',
-        );
-
-        if (!empty($options) && ($options'norename' || $options'protected')) {
-            // prevent user from moving folder
-            $hidden_fields = array('name' => '_parent', 'value' => $path_imap);
-        }
-        else {
-            $prop   = array('name' => '_parent', 'id' => '_parent');
-            $select = kolab_storage::folder_selector('contact', $prop, $folder);
-
-            $form'properties''fields''parent' = array(
-                'label' => $this->plugin->gettext('parentbook'),
-                'value' => $select->show(strlen($folder) ? $path_imap : ''),
-                'id'    => '_parent',
-            );
-        }
+        $form_html = $this->plugin->driver->folder_form($action, $folder);
 
-        $form_html = kolab_utils::folder_form($form, $folder, 'calendar', $hidden_fields);
+        $attrib += 'action' => 'plugin.book-save', 'method' => 'post', 'id' => 'bookpropform';
 
-        return html::tag('form', $attrib + array('action' => 'plugin.book-save', 'method' => 'post', 'id' => 'bookpropform'), $form_html);
+        return html::tag('form', $attrib, $form_html);
     }
 
     /**

roundcubemail-1.5.3.tar.gz/plugins/kolab_addressbook/lib/rcube_carddav_contacts.php Deleted

@@ -1,1285 +0,0 @@
-<?php
-
-/**
- * Backend class for a custom address book using CardDAV service.
- *
- * This part of the Roundcube+Kolab integration and connects the
- * rcube_addressbook interface with the kolab_storage_dav wrapper from libkolab
- *
- * @author Thomas Bruederli <bruederli@kolabsys.com>
- * @author Aleksander Machniak <machniak@apheleia-it.chm>
- *
- * Copyright (C) 2011-2022, Kolab Systems AG <contact@apheleia-it.ch>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
- * @see rcube_addressbook
- */
-class rcube_carddav_contacts extends rcube_addressbook
-{
-    public $primary_key = 'ID';
-    public $rights   = 'lrs';
-    public $readonly = true;
-    public $undelete = false;
-    public $groups = false; // TODO
-
-    public $coltypes = 
-        'name'         => 'limit' => 1,
-        'firstname'    => 'limit' => 1,
-        'surname'      => 'limit' => 1,
-        'middlename'   => 'limit' => 1,
-        'prefix'       => 'limit' => 1,
-        'suffix'       => 'limit' => 1,
-        'nickname'     => 'limit' => 1,
-        'jobtitle'     => 'limit' => 1,
-        'organization' => 'limit' => 1,
-        'department'   => 'limit' => 1,
-        'email'        => 'subtypes' => 'home','work','other',
-        'phone'        => ,
-        'address'      => 'subtypes' => 'home','work','office',
-        'website'      => 'subtypes' => 'homepage','blog',
-        'im'           => 'subtypes' => null,
-        'gender'       => 'limit' => 1,
-        'birthday'     => 'limit' => 1,
-        'anniversary'  => 'limit' => 1,
-        'manager'      => 'limit' => null,
-        'assistant'    => 'limit' => null,
-        'spouse'       => 'limit' => 1,
-        'notes'        => 'limit' => 1,
-        'photo'        => 'limit' => 1,
-    ;
-
-    public $vcard_map = 
-    //    'profession'     => 'X-PROFESSION',
-    //    'officelocation' => 'X-OFFICE-LOCATION',
-    //    'initials'       => 'X-INITIALS',
-    //    'children'       => 'X-CHILDREN',
-    //    'freebusyurl'    => 'X-FREEBUSY-URL',
-    //    'pgppublickey'   => 'KEY',
-        'uid'            => 'UID',
-    ;
-
-    /**
-     * List of date type fields
-     */
-    public $date_cols = 'birthday', 'anniversary';
-
-    public $fulltext_cols  = 'name', 'firstname', 'surname', 'middlename', 'email';
-
-    private $gid;
-    private $storage;
-    private $dataset;
-    private $sortindex;
-    private $contacts;
-    private $distlists;
-    private $groupmembers;
-    private $filter;
-    private $result;
-    private $namespace;
-    private $action;
-
-    // list of fields used for searching in "All fields" mode
-    private $search_fields = 
-        'name',
-        'firstname',
-        'surname',
-        'middlename',
-        'prefix',
-        'suffix',
-        'nickname',
-        'jobtitle',
-        'organization',
-        'department',
-        'email',
-        'phone',
-        'address',
-//        'profession',
-        'manager',
-        'assistant',
-        'spouse',
-        'children',
-        'notes',
-    ;
-
-
-    /**
-     * Object constructor
-     */
-    public function __construct($dav_folder = null)
-    {
-        $this->storage = $dav_folder;
-        $this->ready   = !empty($this->storage);
-
-        // Set readonly and rights flags according to folder permissions
-        if ($this->ready) {
-            if ($this->storage->get_owner() == $_SESSION'username') {
-                $this->readonly = false;
-                $this->rights = 'lrswikxtea';
-            }
-            else {
-                $rights = $this->storage->get_myrights();
-                if ($rights && !PEAR::isError($rights)) {
-                    $this->rights = $rights;
-                    if (strpos($rights, 'i') !== false && strpos($rights, 't') !== false) {
-                        $this->readonly = false;
-                    }
-                }
-            }
-        }
-
-        $this->action = rcube::get_instance()->action;
-    }
-
-    /**
-     * Getter for the address book name to be displayed
-     *
-     * @return string Name of this address book
-     */
-    public function get_name()
-    {
-        return $this->storage->get_name();
-    }
-
-    /**
-     * Wrapper for kolab_storage_folder::get_foldername()
-     */
-    public function get_foldername()
-    {
-        return $this->storage->get_foldername();
-    }
-
-    /**
-     * Getter for the folder name
-     *
-     * @return string Name of the folder
-     */
-    public function get_realname()
-    {
-        return $this->get_name();
-    }
-
-    /**
-     * Getter for the name of the namespace to which the IMAP folder belongs
-     *
-     * @return string Name of the namespace (personal, other, shared)
-     */
-    public function get_namespace()
-    {
-        if ($this->namespace === null && $this->ready) {
-            $this->namespace = $this->storage->get_namespace();
-        }
-
-        return $this->namespace;
-    }
-
-    /**
-     * Getter for parent folder path
-     *
-     * @return string Full path to parent folder
-     */
-    public function get_parent()
-    {
-        return $this->storage->get_parent();
-    }
-
-    /**
-     * Check subscription status of this folder
-     *
-     * @return boolean True if subscribed, false if not

roundcubemail-1.5.3.tar.gz/plugins/kolab_addressbook/lib/rcube_kolab_contacts.php Deleted

@@ -1,1458 +0,0 @@
-<?php
-
-/**
- * Backend class for a custom address book
- *
- * This part of the Roundcube+Kolab integration and connects the
- * rcube_addressbook interface with the kolab_storage wrapper from libkolab
- *
- * @author Thomas Bruederli <bruederli@kolabsys.com>
- * @author Aleksander Machniak <machniak@kolabsys.com>
- *
- * Copyright (C) 2011, Kolab Systems AG <contact@kolabsys.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
- * @see rcube_addressbook
- */
-class rcube_kolab_contacts extends rcube_addressbook
-{
-    public $primary_key = 'ID';
-    public $rights   = 'lrs';
-    public $readonly = true;
-    public $undelete = true;
-    public $groups = true;
-    public $coltypes = array(
-        'name'         => array('limit' => 1),
-        'firstname'    => array('limit' => 1),
-        'surname'      => array('limit' => 1),
-        'middlename'   => array('limit' => 1),
-        'prefix'       => array('limit' => 1),
-        'suffix'       => array('limit' => 1),
-        'nickname'     => array('limit' => 1),
-        'jobtitle'     => array('limit' => 1),
-        'organization' => array('limit' => 1),
-        'department'   => array('limit' => 1),
-        'email'        => array('subtypes' => array('home','work','other')),
-        'phone'        => array(),
-        'address'      => array('subtypes' => array('home','work','office')),
-        'website'      => array('subtypes' => array('homepage','blog')),
-        'im'           => array('subtypes' => null),
-        'gender'       => array('limit' => 1),
-        'birthday'     => array('limit' => 1),
-        'anniversary'  => array('limit' => 1),
-        'profession'   => array(
-            'type'      => 'text',
-            'size'      => 40,
-            'maxlength' => 80,
-            'limit'     => 1,
-            'label'     => 'kolab_addressbook.profession',
-            'category'  => 'personal'
-        ),
-        'manager'      => array('limit' => null),
-        'assistant'    => array('limit' => null),
-        'spouse'       => array('limit' => 1),
-        'children'     => array(
-            'type'      => 'text',
-            'size'      => 40,
-            'maxlength' => 80,
-            'limit'     => null,
-            'label'     => 'kolab_addressbook.children',
-            'category'  => 'personal'
-        ),
-        'freebusyurl'  => array(
-            'type'  => 'text',
-            'size'  => 40,
-            'limit' => 1,
-            'label' => 'kolab_addressbook.freebusyurl'
-        ),
-        'pgppublickey' => array(
-            'type' => 'textarea',
-            'size' => 70,
-            'rows' => 10,
-            'limit' => 1,
-            'label' => 'kolab_addressbook.pgppublickey'
-        ),
-        'pkcs7publickey' => array(
-            'type' => 'textarea',
-            'size' => 70,
-            'rows' => 10,
-            'limit' => 1,
-            'label' => 'kolab_addressbook.pkcs7publickey'
-        ),
-        'notes'        => array('limit' => 1),
-        'photo'        => array('limit' => 1),
-        // TODO: define more Kolab-specific fields such as: language, latitude, longitude, crypto settings
-    );
-
-    /**
-     * vCard additional fields mapping
-     */
-    public $vcard_map = array(
-        'profession'     => 'X-PROFESSION',
-        'officelocation' => 'X-OFFICE-LOCATION',
-        'initials'       => 'X-INITIALS',
-        'children'       => 'X-CHILDREN',
-        'freebusyurl'    => 'X-FREEBUSY-URL',
-        'pgppublickey'   => 'KEY',
-    );
-
-    /**
-     * List of date type fields
-     */
-    public $date_cols = array('birthday', 'anniversary');
-
-    private $gid;
-    private $storagefolder;
-    private $dataset;
-    private $sortindex;
-    private $contacts;
-    private $distlists;
-    private $groupmembers;
-    private $filter;
-    private $result;
-    private $namespace;
-    private $imap_folder = 'INBOX/Contacts';
-    private $action;
-
-    // list of fields used for searching in "All fields" mode
-    private $search_fields = array(
-        'name',
-        'firstname',
-        'surname',
-        'middlename',
-        'prefix',
-        'suffix',
-        'nickname',
-        'jobtitle',
-        'organization',
-        'department',
-        'email',
-        'phone',
-        'address',
-        'profession',
-        'manager',
-        'assistant',
-        'spouse',
-        'children',
-        'notes',
-    );
-
-
-    public function __construct($imap_folder = null)
-    {
-        if ($imap_folder) {
-            $this->imap_folder = $imap_folder;
-        }
-
-        // extend coltypes configuration 
-        $format = kolab_format::factory('contact');
-
-        $this->coltypes'phone''subtypes'   = array_keys($format->phonetypes);
-        $this->coltypes'address''subtypes' = array_keys($format->addresstypes);
-
-        $rcube = rcube::get_instance();
-
-        // set localized labels for proprietary cols
-        foreach ($this->coltypes as $col => $prop) {
-            if (is_string($prop'label')) {
-                $this->coltypes$col'label' = $rcube->gettext($prop'label');
-            }
-        }
-
-        // fetch objects from the given IMAP folder
-        $this->storagefolder = kolab_storage::get_folder($this->imap_folder);
-        $this->ready = $this->storagefolder && !PEAR::isError($this->storagefolder);
-
-        // Set readonly and rights flags according to folder permissions
-        if ($this->ready) {
-            if ($this->storagefolder->get_owner() == $_SESSION'username') {
-                $this->readonly = false;
-                $this->rights = 'lrswikxtea';
-            }
-            else {
-                $rights = $this->storagefolder->get_myrights();
-                if ($rights && !PEAR::isError($rights)) {
-                    $this->rights = $rights;
-                    if (strpos($rights, 'i') !== false && strpos($rights, 't') !== false) {
-                        $this->readonly = false;
-                    }
-                }
-            }
-        }
-
-        $this->action = rcube::get_instance()->action;
-    }
-
-    /**
-     * Getter for the address book name to be displayed

roundcubemail-1.5.3.tar.gz/plugins/libkolab/lib/kolab_dav_client.php Changed

@@ -115,14 +115,22 @@
     }
 
     /**
-     * Discover DAV folders of specified type on the server
+     * Discover DAV home (root) collection of specified type.
      *
      * @param string $component Component to filter by (VEVENT, VTODO, VCARD)
      *
-     * @return false|array List of folders' metadata or False on error
+     * @return string|false Home collection location or False on error
      */
     public function discover($component = 'VEVENT')
     {
+        if ($cache = $this->get_cache()) {
+            $cache_key = "discover.{$component}." . md5($this->url);
+
+            if ($response = $cache->get($cache_key)) {
+                return $response;
+            }
+        }
+
         $roots = 
             'VEVENT' => 'calendars',
             'VTODO' => 'calendars',
@@ -148,7 +156,7 @@
         $elements = $response->getElementsByTagName('response');
 
         foreach ($elements as $element) {
-            foreach ($element->getElementsByTagName('prop') as $prop) {
+            foreach ($element->getElementsByTagName('current-user-principal') as $prop) {
                 $principal_href = $prop->nodeValue;
                 break;
             }
@@ -186,7 +194,7 @@
         $elements = $response->getElementsByTagName('response');
 
         foreach ($elements as $element) {
-            foreach ($element->getElementsByTagName('prop') as $prop) {
+            foreach ($element->getElementsByTagName($homes$component) as $prop) {
                 $root_href = $prop->nodeValue;
                 break;
             }
@@ -202,23 +210,46 @@
             $root_href = '/' . $roots$component . '/' . rawurlencode($this->user);
         }
 
-        if ($component == 'VCARD') {
-            $add_ns = '';
-            $add_props = '';
+        if ($cache) {
+            $cache->set($cache_key, $root_href);
         }
-        else {
-            $add_ns = ' xmlns:c="urn:ietf:params:xml:ns:caldav" xmlns:a="http://apple.com/ns/ical/"';
-            $add_props = '<c:supported-calendar-component-set /><a:calendar-color />';
+
+        return $root_href;
+    }
+
+    /**
+     * Get list of folders of specified type.
+     *
+     * @param string $component Component to filter by (VEVENT, VTODO, VCARD)
+     *
+     * @return false|array List of folders' metadata or False on error
+     */
+    public function listFolders($component = 'VEVENT')
+    {
+        $root_href = $this->discover($component);
+
+        if ($root_href === false) {
+            return false;
+        }
+
+        $ns    = 'xmlns:d="DAV:" xmlns:cs="http://calendarserver.org/ns/"';
+        $props = '';
+
+        if ($component != 'VCARD') {
+            $ns .= ' xmlns:c="urn:ietf:params:xml:ns:caldav" xmlns:a="http://apple.com/ns/ical/" xmlns:k="Kolab:"';
+            $props = '<c:supported-calendar-component-set />'
+                . '<a:calendar-color />'
+                . '<k:alarms />';
         }
 
         $body = '<?xml version="1.0" encoding="utf-8"?>'
-            . '<d:propfind xmlns:d="DAV:" xmlns:cs="http://calendarserver.org/ns/"' . $add_ns . '>'
+            . '<d:propfind ' . $ns . '>'
                 . '<d:prop>'
                     . '<d:resourcetype />'
                     . '<d:displayname />'
                     // . '<d:sync-token />'
                     . '<cs:getctag />'
-                    . $add_props
+                    . $props
                 . '</d:prop>'
             . '</d:propfind>';
 
@@ -266,9 +297,10 @@
         $response = $this->request($location, 'PUT', $content, $headers);
 
         if ($response !== false) {
-            $etag = $this->responseHeaders'etag';
+            // Note: ETag is not always returned, e.g. https://github.com/cyrusimap/cyrus-imapd/issues/2456
+            $etag = isset($this->responseHeaders'etag') ? $this->responseHeaders'etag' : null;
 
-            if (preg_match('|^".*"$|', $etag)) {
+            if (is_string($etag) && preg_match('|^".*"$|', $etag)) {
                 $etag = substr($etag, 1, -1);
             }
 
@@ -307,6 +339,143 @@
     }
 
     /**
+     * Get folder properties.
+     *
+     * @param string $location Object location
+     *
+     * @return false|array Folder metadata or False on error
+     */
+    public function folderInfo($location)
+    {
+        $body = '<?xml version="1.0" encoding="utf-8"?>'
+            . '<d:propfind xmlns:d="DAV:">'
+                . '<d:allprop/>'
+            . '</d:propfind>';
+
+        // Note: Cyrus CardDAV service requires Depth:1 (CalDAV works without it)
+        $response = $this->request($location, 'PROPFIND', $body, 'Depth' => 1, 'Prefer' => 'return-minimal');
+
+        if (!empty($response)
+            && ($element = $response->getElementsByTagName('response'))
+            && ($folder = $this->getFolderPropertiesFromResponse($element))
+        ) {
+            return $folder;
+        }
+
+        return false;
+    }
+
+    /**
+     * Create a DAV folder
+     *
+     * @param string $location   Object location (relative to the user home)
+     * @param string $component  Content type (VEVENT, VTODO, VCARD)
+     * @param array  $properties Object content
+     *
+     * @return bool True on success, False on error
+     */
+    public function folderCreate($location, $component, $properties = )
+    {
+        // Create the collection
+        $response = $this->request($location, 'MKCOL');
+
+        if (empty($response)) {
+            return false;
+        }
+
+        // Update collection properties
+        return $this->folderUpdate($location, $component, $properties);
+    }
+
+    /**
+     * Delete a DAV folder
+     *
+     * @param string $location Folder location
+     *
+     * @return bool True on success, False on error
+     */
+    public function folderDelete($location)
+    {
+        $response = $this->request($location, 'DELETE');
+
+        return $response !== false;
+    }
+
+    /**
+     * Update a DAV folder
+     *
+     * @param string $location   Object location
+     * @param string $component  Content type (VEVENT, VTODO, VCARD)
+     * @param array  $properties Object content
+     *
+     * @return bool True on success, False on error
+     */
+    public function folderUpdate($location, $component, $properties = )
+    {
+        $ns    = 'xmlns:d="DAV:"';
+        $props = '';
+
+        if ($component == 'VCARD') {
+            $ns .= ' xmlns:c="urn:ietf:params:xml:ns:carddav"';
+            // Resourcetype property is protected
+            // $props = '<d:resourcetype><d:collection/><c:addressbook/></d:resourcetype>';
+        }
+        else {
+            $ns .= ' xmlns:c="urn:ietf:params:xml:ns:caldav"';
+            // Resourcetype property is protected
+            // $props = '<d:resourcetype><d:collection/><c:calendar/></d:resourcetype>';

roundcubemail-1.5.3.tar.gz/plugins/libkolab/lib/kolab_storage_dataset.php Changed

@@ -26,13 +26,16 @@
 
 class kolab_storage_dataset implements Iterator, ArrayAccess, Countable
 {
+    const CHUNK_SIZE = 25;
+
     private $cache;  // kolab_storage_cache instance to use for fetching data
     private $memlimit = 0;
     private $buffer = false;
-    private $index = array();
-    private $data = array();
+    private $index = ;
+    private $data = ;
     private $iteratorkey = 0;
     private $error = null;
+    private $chunk = ;
 
     /**
      * Default constructor
@@ -79,7 +82,12 @@
 
     public function offsetSet($offset, $value)
     {
-        $uid = !empty($value'_msguid') ? $value'_msguid' : $value'uid';
+        if (is_string($value)) {
+            $uid = $value;
+        }
+        else {
+            $uid = !empty($value'_msguid') ? $value'_msguid' : $value'uid';
+        }
 
         if (is_null($offset)) {
             $offset = count($this->index);
@@ -110,6 +118,37 @@
 
     public function offsetGet($offset)
     {
+        if (isset($this->chunk$offset)) {
+            return $this->chunk$offset ?: null;
+        }
+
+        // The item is a string (object's UID), use multiget method to pre-fetch
+        // multiple objects from the server in one request
+        if (isset($this->data$offset) && is_string($this->data$offset) && method_exists($this->cache, 'multiget')) {
+            $idx  = $offset;
+            $uids = ;
+
+            while (isset($this->index$idx) && count($uids) < self::CHUNK_SIZE) {
+                if (isset($this->data$idx) && !is_string($this->data$idx)) {
+                    // skip objects that had the raw content in the cache (are not empty)
+                    continue;
+                }
+
+                $uids$idx = $this->index$idx;
+                $idx++;
+            }
+
+            if (!empty($uids)) {
+                $this->chunk = $this->cache->multiget($uids);
+            }
+
+            if (isset($this->chunk$offset)) {
+                return $this->chunk$offset ?: null;
+            }
+
+            return null;
+        }
+
         if (isset($this->data$offset)) {
             return $this->data$offset;
         }

roundcubemail-1.5.3.tar.gz/plugins/libkolab/lib/kolab_storage_dav.php Changed

@@ -55,20 +55,14 @@
     /**
      * Get a list of storage folders for the given data type
      *
-     * @param string Data type to list folders for (contact,distribution-list,event,task,note)
+     * @param string Data type to list folders for (contact,event,task,note)
      *
      * @return array List of kolab_storage_dav_folder objects
      */
     public function get_folders($type)
     {
-        $davTypes = 
-            'event' => 'VEVENT',
-            'task'  => 'VTODO',
-            'contact' => 'VCARD',
-        ;
-
         // TODO: This should be cached
-        $folders = $this->dav->discover($davTypes$type);
+        $folders = $this->dav->listFolders($this->get_dav_type($type));
 
         if (is_array($folders)) {
             foreach ($folders as $idx => $folder) {
@@ -80,6 +74,11 @@
 
                 $folders$idx = new kolab_storage_dav_folder($this->dav, $folder, $type);
             }
+
+
+            usort($folders, function ($a, $b) {
+                return strcoll($a->get_foldername(), $b->get_foldername());
+            });
         }
 
         return $folders ?: ;
@@ -88,7 +87,7 @@
     /**
      * Getter for the storage folder for the given type
      *
-     * @param string Data type to list folders for (contact,distribution-list,event,task,note)
+     * @param string Data type to list folders for (contact,event,task,note)
      *
      * @return object kolab_storage_dav_folder The folder object
      */
@@ -105,7 +104,7 @@
      *
      * @return ?object kolab_storage_folder The folder object
      */
-    public function get_folder($id, $type = null)
+    public function get_folder($id, $type)
     {
         foreach ($this->get_folders($type) as $folder) {
             if ($folder->id == $id) {
@@ -172,13 +171,18 @@
     /**
      * Deletes a folder
      *
-     * @param string $name Folder name
+     * @param string $id   Folder ID
+     * @param string $type Folder type (contact,event,task,journal,file,note,configuration)
      *
      * @return bool True on success, false on failure
      */
-    public function folder_delete($name)
+    public function folder_delete($id, $type)
     {
-        // TODO
+        if ($folder = $this->get_folder($id, $type)) {
+            return $this->dav->folderDelete($folder->href);
+        }
+
+        return false;
     }
 
     /**
@@ -206,11 +210,11 @@
      */
     public function folder_rename($oldname, $newname)
     {
-        // TODO
+        // TODO ??
     }
 
     /**
-     * Rename or Create a new folder.
+     * Update or Create a new folder.
      *
      * Does additional checks for permissions and folder name restrictions
      *
@@ -222,11 +226,49 @@
      *  - subscribed: Subscribed flag (IMAP subscription)
      *  - active:     Activation flag (client-side subscription)
      *
-     * @return string|false New folder name or False on failure
+     * @return string|false New folder ID or False on failure
      */
     public function folder_update(&$prop)
     {
-        // TODO
+        // TODO: Folder hierarchies, active and subscribed state
+
+        // sanity checks
+        if (!isset($prop'name') || !is_string($prop'name') || !strlen($prop'name')) {
+            self::$last_error = 'cannotbeempty';
+            return false;
+        }
+        else if (strlen($prop'name') > 256) {
+            self::$last_error = 'nametoolong';
+            return false;
+        }
+
+        if (!empty($prop'id')) {
+            if ($folder = $this->get_folder($prop'id', $prop'type')) {
+                $result = $this->dav->folderUpdate($folder->href, $folder->get_dav_type(), $prop);
+            }
+            else {
+                $result = false;
+            }
+        }
+        else {
+            $rcube = rcube::get_instance();
+            $uid   = rtrim(chunk_split(md5($prop'name' . $rcube->get_user_name() . uniqid('-', true)), 12, '-'), '-');
+            $type  = $this->get_dav_type($prop'type');
+            $home  = $this->dav->discover($type);
+
+            if ($home === false) {
+                return false;
+            }
+
+            $location = unslashify($home) . '/' . $uid;
+            $result   = $this->dav->folderCreate($location, $type, $prop);
+
+            if ($result !== false) {
+                $result = md5($this->dav->url . '/' . $location);
+            }
+        }
+
+        return $result;
     }
 
     /**
@@ -393,8 +435,7 @@
      */
     public function folder_is_active($folder)
     {
-        // TODO
-        return true;
+        return true; // TODO
     }
 
     /**
@@ -406,7 +447,7 @@
      */
     public function folder_activate($folder)
     {
-        return true;
+        return true; // TODO
     }
 
     /**
@@ -418,7 +459,7 @@
      */
     public function folder_deactivate($folder)
     {
-        return false;
+        return false; // TODO
     }
 
     /**
@@ -489,4 +530,18 @@
         // TODO ?
         return ;
     }
+
+    /**
+     * Get a folder DAV content type
+     */
+    public static function get_dav_type($type)
+    {
+        $types = 
+            'event' => 'VEVENT',
+            'task'  => 'VTODO',
+            'contact' => 'VCARD',
+        ;
+
+        return $types$type;
+    }
 }

roundcubemail-1.5.3.tar.gz/plugins/libkolab/lib/kolab_storage_dav_cache.php Changed

@@ -170,9 +170,11 @@
                     return false;
                 }
 
-                foreach ($objects as $object) {
-                    if ($object = $this->folder->from_dav($object)) {
+                foreach ($objects as $dav_object) {
+                    if ($object = $this->folder->from_dav($dav_object)) {
+                        $object'_raw' = $dav_object'data';
                         $this->_extended_insert(false, $object);
+                        unset($object'_raw');
                     }
                 }
 
@@ -198,9 +200,11 @@
                     return false;
                 }
 
-                foreach ($objects as $object) {
-                    if ($object = $this->folder->from_dav($object)) {
+                foreach ($objects as $dav_object) {
+                    if ($object = $this->folder->from_dav($dav_object)) {
+                        $object'_raw' = $dav_object'data';
                         $this->save($object, $object'uid');
+                        unset($object'_raw');
                     }
                 }
 
@@ -252,6 +256,8 @@
      * @param string Object UID
      * @param string Object type to read
      * @param string Unused (kept for compat. with the parent class)
+     *
+     * @return null|array An array of objects, NULL if not found
      */
     public function get($uid, $type = null, $unused = null)
     {
@@ -280,6 +286,18 @@
     }
 
     /**
+     * Read multiple entries from the server directly
+     *
+     * @param array Object UIDs
+     *
+     * @return false|array An array of objects, False on error
+     */
+    public function multiget($uids)
+    {
+        return $this->folder->read_objects($uids);
+    }
+
+    /**
      * Insert/Update a cache entry
      *
      * @param string      Object UID
@@ -424,18 +442,18 @@
         }
 
         while ($sql_arr = $this->db->fetch_assoc($sql_result)) {
-            if ($fast) {
-                $sql_arr'fast-mode' = true;
-            }
             if ($uids) {
                 $result = $sql_arr'uid';
             }
-            else if ($fetchall && ($object = $this->_unserialize($sql_arr))) {
-                $result = $object;
-            }
             else if (!$fetchall) {
                 $result = $sql_arr;
             }
+            else if (($object = $this->_unserialize($sql_arr, true, $fast))) {
+                $result = $object;
+            }
+            else {
+                $result = $sql_arr'uid';
+            }
         }
 
         return $result;
@@ -587,11 +605,61 @@
     }
 
     /**
+     * Helper method to convert the given Kolab object into a dataset to be written to cache
+     */
+    protected function _serialize($object)
+    {
+        static $threshold;
+
+        if ($threshold === null) {
+            $rcube     = rcube::get_instance();
+            $threshold = parse_bytes(rcube::get_instance()->config->get('dav_cache_threshold', 0));
+        }
+
+        $data     = ;
+        $sql_data = 'changed' => null, 'tags' => '', 'words' => '';
+
+        if (!empty($object'changed')) {
+            $sql_data'changed' = date(self::DB_DATE_FORMAT, is_object($object'changed') ? $object'changed'->format('U') : $object'changed');
+        }
+
+        // Store only minimal set of object properties
+        foreach ($this->data_props as $prop) {
+            if (isset($object$prop)) {
+                $data$prop = $object$prop;
+                if ($data$prop instanceof DateTime) {
+                    $data$prop = array(
+                        'cl' => 'DateTime',
+                        'dt' => $data$prop->format('Y-m-d H:i:s'),
+                        'tz' => $data$prop->getTimezone()->getName(),
+                    );
+                }
+            }
+        }
+
+        if (!empty($object'_raw') && $threshold > 0 && strlen($object'_raw') <= $threshold) {
+            $data'_raw' = $object'_raw';
+        }
+
+        $sql_data'data' = json_encode(rcube_charset::clean($data));
+
+        return $sql_data;
+    }
+
+    /**
      * Helper method to turn stored cache data into a valid storage object
      */
-    protected function _unserialize($sql_arr)
+    protected function _unserialize($sql_arr, $noread = false, $fast_mode = false)
     {
-        if ($sql_arr'fast-mode' && !empty($sql_arr'data') && ($object = json_decode($sql_arr'data', true))) {
+        if (!empty($sql_arr'data')) {
+            if ($object = json_decode($sql_arr'data', true)) {
+                $object'_type' = $sql_arr'type' ?: $this->folder->type;
+                $object'uid'   = $sql_arr'uid';
+                $object'etag'  = $sql_arr'etag';
+            }
+        }
+
+        if (!empty($fast_mode) && !empty($object)) {
             foreach ($this->data_props as $prop) {
                 if (isset($object$prop) && is_array($object$prop) && $object$prop'cl' == 'DateTime') {
                     $object$prop = new DateTime($object$prop'dt', new DateTimeZone($object$prop'tz'));
@@ -609,13 +677,21 @@
                 $object'changed' = new DateTime($sql_arr'changed');
             }
 
-            $object'_type' = $sql_arr'type' ?: $this->folder->type;
-            $object'uid'   = $sql_arr'uid';
-            $object'etag'  = $sql_arr'etag';
+            unset($object'_raw');
+        }
+        else if ($noread) {
+            // We have the raw content already, parse it
+            if (!empty($object'_raw')) {
+                $object'data' = $object'_raw';
+                if ($object = $this->folder->from_dav($object)) {
+                    return $object;
+                }
+            }
+
+            return null;
         }
-        // Fetch a complete object from the server
         else {
-            // TODO: Fetching objects one-by-one from DAV server is slow
+            // Fetch a complete object from the server
             $object = $this->folder->read_object($sql_arr'uid', '*');
         }

roundcubemail-1.5.3.tar.gz/plugins/libkolab/lib/kolab_storage_dav_cache_contact.php Changed

roundcubemail-1.5.3.tar.gz/plugins/libkolab/lib/kolab_storage_dav_folder.php Changed

@@ -34,7 +34,7 @@
         $this->attributes = $attributes;
 
         $this->href  = $this->attributes'href';
-        $this->id    = md5($this->href);
+        $this->id    = md5($this->dav->url . '/' . $this->href);
         $this->dav   = $dav;
         $this->valid = true;
 
@@ -200,8 +200,7 @@
      */
     public function is_active()
     {
-        // TODO
-        return true;
+        return true; // Unused
     }
 
     /**
@@ -213,8 +212,7 @@
      */
     public function activate($active)
     {
-        // TODO
-        return true;
+        return true; // Unused
     }
 
     /**
@@ -224,8 +222,7 @@
      */
     public function is_subscribed()
     {
-        // TODO
-        return true;
+        return true; // TODO
     }
 
     /**
@@ -237,8 +234,7 @@
      */
     public function subscribe($subscribed)
     {
-        // TODO
-        return true;
+        return true; // TODO
     }
 
     /**
@@ -426,8 +422,10 @@
             if ($result !== false) {
                 // insert/update object in the cache
                 $object'etag' = $result;
+                $object'_raw' = $content;
                 $this->cache->save($object, $uid);
                 $result = true;
+                unset($object'_raw');
             }
         }
 
@@ -464,6 +462,54 @@
     }
 
     /**
+     * Fetch multiple objects from the DAV server and convert to internal format
+     *
+     * @param array The object UIDs to fetch
+     *
+     * @return mixed Hash array representing the Kolab objects
+     */
+    public function read_objects($uids)
+    {
+        if (!$this->valid) {
+            return false;
+        }
+
+        if (empty($uids)) {
+            return ;
+        }
+
+        foreach ($uids as $uid) {
+            $hrefs = $this->object_location($uid);
+        }
+
+        $objects = $this->dav->getData($this->href, $this->get_dav_type(), $hrefs);
+
+        if (!is_array($objects)) {
+            rcube::raise_error(
+                    'code' => 900,
+                    'message' => "Failed to fetch {$href}"
+                , true);
+            return false;
+        }
+
+        $objects = array_map($this, 'from_dav', $objects);
+
+        foreach ($uids as $idx => $uid) {
+            foreach ($objects as $oidx => $object) {
+                if ($object && $object'uid' == $uid) {
+                    $uids$idx = $object;
+                    unset($objects$oidx);
+                    continue 2;
+                }
+            }
+
+            $uids$idx = false;
+        }
+
+        return $uids;
+    }
+
+    /**
      * Convert DAV object into PHP array
      *
      * @param array Object data in kolab_dav_client::fetchData() format
@@ -487,10 +533,52 @@
                 return false;
             }
 
-            $vcard = new rcube_vcard($object'data', RCUBE_CHARSET, false);
+            // vCard properties not supported by rcube_vcard
+            $map = 
+                'uid'      => 'UID',
+                'kind'     => 'KIND',
+                'member'   => 'MEMBER',
+                'x-kind'   => 'X-ADDRESSBOOKSERVER-KIND',
+                'x-member' => 'X-ADDRESSBOOKSERVER-MEMBER',
+            ;
+
+            // TODO: We should probably use Sabre/Vobject to parse the vCard
+
+            $vcard = new rcube_vcard($object'data', RCUBE_CHARSET, false, $map);
 
             if (!empty($vcard->displayname) || !empty($vcard->surname) || !empty($vcard->firstname) || !empty($vcard->email)) {
                 $result = $vcard->get_assoc();
+
+                // Contact groups
+                if (!empty($result'x-kind') && implode($result'x-kind') == 'group') {
+                    $result'_type' = 'group';
+                    $members = isset($result'x-member') ? $result'x-member' : ;
+                    unset($result'x-kind', $result'x-member');
+                }
+                else if (!empty($result'kind') && implode($result'kind') == 'group') {
+                    $result'_type' = 'group';
+                    $members = isset($result'member') ? $result'member' : ;
+                    unset($result'kind', $result'member');
+                }
+
+                if (isset($members)) {
+                    $result'member' = ;
+                    foreach ($members as $member) {
+                        if (strpos($member, 'urn:uuid:') === 0) {
+                            $result'member' = 'uid' => substr($member, 9);
+                        }
+                        else if (strpos($member, 'mailto:') === 0) {
+                            $member = reset(rcube_mime::decode_address_list(urldecode(substr($member, 7))));
+                            if (!empty($member'mailto')) {
+                                $result'member' = 'email' => $member'mailto', 'name' => $member'name';
+                            }
+                        }
+                    }
+                }
+
+                if (!empty($result'uid')) {
+                    $result'uid' = preg_replace('/^urn:uuid:/', '', implode($result'uid'));
+                }
             }
             else {
                 return false;
@@ -498,8 +586,8 @@
         }
 
         $result'etag' = $object'etag';
-        $result'href' = $object'href';
-        $result'uid'  = $object'uid' ?: $result'uid';
+        $result'href' = !empty($object'href') ? $object'href' : null;
+        $result'uid'  = !empty($object'uid') ? $object'uid' : $result'uid';
 
         return $result;
     }
@@ -521,9 +609,17 @@
         }
         else if ($this->type == 'contact') {
             // copy values into vcard object
-            $vcard = new rcube_vcard('', RCUBE_CHARSET, false, 'uid' => 'UID');
+            // TODO: We should probably use Sabre/Vobject to create the vCard
+
+            // vCard properties not supported by rcube_vcard
+            $map   = 'uid' => 'UID', 'kind' => 'KIND';
+            $vcard = new rcube_vcard('', RCUBE_CHARSET, false, $map);
 
-            $vcard->set('groups', null);
+            if ((!empty($object'_type') && $object'_type' == 'group')
+                || (!empty($object'type') && $object'type' == 'group')
+            ) {
+                $object'kind' = 'group';
+            }
 
             foreach ($object as $key => $values) {
                 list($field, $section) = rcube_utils::explode(':', $key);

roundcubemail-1.5.3.tar.gz/plugins/libkolab/lib/kolab_utils.php Changed

roundcubemail-1.5.3.tar.gz/program/js/app.js Changed

roundcubemail-1.5.3.tar.gz/program/lib/Roundcube/rcube_db.php Changed

roundcubemail-1.5.3.tar.gz/program/lib/Roundcube/rcube_vcard.php Changed

@@ -839,17 +839,22 @@
     {
         $vcard = '';
 
-        foreach ((array)$data as $type => $entries) {
-            // valid N has 5 properties
-            while ($type == "N" && is_array($entries0) && count($entries0) < 5) {
-                $entries0 = "";
-            }
+        // Make sure FN is not empty (required by RFC2426)
+        if (empty($data'FN')) {
+            $data'FN' = !empty($data'EMAIL'00) ? $data'EMAIL'00 : '';
+        }
 
-            // make sure FN is not empty (required by RFC2426)
-            if ($type == "FN" && empty($entries) && !empty($data'EMAIL'00)) {
-                $entries0 = $data'EMAIL'00;
-            }
+        // Make sure N is not empty (required by RFC2426)
+        if (empty($data'N')) {
+            $data'N' = '', '', '', '', '';
+        }
+
+        // Valid N has 5 properties
+        while (isset($data'N'0) && is_array($data'N'0) && count($data'N'0) < 5) {
+            $data'N'0 = '';
+        }
 
+        foreach ((array)$data as $type => $entries) {
             foreach ((array)$entries as $entry) {
                 $attr = '';
                 if (is_array($entry)) {
@@ -884,8 +889,8 @@
                     $value = $entry;
                 }
 
-                // skip empty entries
-                if (self::is_empty($value)) {
+                // Skip empty entries that aren't required by vCard v3 format
+                if (!in_array($type, 'N', 'FN') && self::is_empty($value)) {
                     continue;
                 }

roundcubemail-1.5.3.tar.gz/temp/js_cache/tinymce-langs-5.8.2.zip Changed

roundcubemail-1.5.3.tar.gz/tests/Framework/VCard.php Changed

roundcubemail-1.5.3.tar.gz/tests/src/Csv2vcard/email.vcf Changed

roundcubemail-1.5.3.tar.gz/tests/src/Csv2vcard/outlook.vcf Changed

roundcubemail-1.5.3.tar.gz/vendor/autoload.php Changed

roundcubemail-1.5.3.tar.gz/vendor/composer/autoload_real.php Changed

@@ -2,7 +2,7 @@
 
 // autoload_real.php @generated by Composer
 
-class ComposerAutoloaderInita4fccfe37f552e3f881e03bf511252ca
+class ComposerAutoloaderInit66b748a75363877b0961a1e44a4414b7
 {
     private static $loader;
 
@@ -24,9 +24,9 @@
 
         require __DIR__ . '/platform_check.php';
 
-        spl_autoload_register(array('ComposerAutoloaderInita4fccfe37f552e3f881e03bf511252ca', 'loadClassLoader'), true, true);
+        spl_autoload_register(array('ComposerAutoloaderInit66b748a75363877b0961a1e44a4414b7', 'loadClassLoader'), true, true);
         self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(\dirname(__FILE__)));
-        spl_autoload_unregister(array('ComposerAutoloaderInita4fccfe37f552e3f881e03bf511252ca', 'loadClassLoader'));
+        spl_autoload_unregister(array('ComposerAutoloaderInit66b748a75363877b0961a1e44a4414b7', 'loadClassLoader'));
 
         $includePaths = require __DIR__ . '/include_paths.php';
         $includePaths = get_include_path();
@@ -36,7 +36,7 @@
         if ($useStaticLoader) {
             require __DIR__ . '/autoload_static.php';
 
-            call_user_func(\Composer\Autoload\ComposerStaticInita4fccfe37f552e3f881e03bf511252ca::getInitializer($loader));
+            call_user_func(\Composer\Autoload\ComposerStaticInit66b748a75363877b0961a1e44a4414b7::getInitializer($loader));
         } else {
             $map = require __DIR__ . '/autoload_namespaces.php';
             foreach ($map as $namespace => $path) {
@@ -57,19 +57,19 @@
         $loader->register(true);
 
         if ($useStaticLoader) {
-            $includeFiles = Composer\Autoload\ComposerStaticInita4fccfe37f552e3f881e03bf511252ca::$files;
+            $includeFiles = Composer\Autoload\ComposerStaticInit66b748a75363877b0961a1e44a4414b7::$files;
         } else {
             $includeFiles = require __DIR__ . '/autoload_files.php';
         }
         foreach ($includeFiles as $fileIdentifier => $file) {
-            composerRequirea4fccfe37f552e3f881e03bf511252ca($fileIdentifier, $file);
+            composerRequire66b748a75363877b0961a1e44a4414b7($fileIdentifier, $file);
         }
 
         return $loader;
     }
 }
 
-function composerRequirea4fccfe37f552e3f881e03bf511252ca($fileIdentifier, $file)
+function composerRequire66b748a75363877b0961a1e44a4414b7($fileIdentifier, $file)
 {
     if (empty($GLOBALS'__composer_autoload_files'$fileIdentifier)) {
         require $file;

roundcubemail-1.5.3.tar.gz/vendor/composer/autoload_static.php Changed

@@ -4,7 +4,7 @@
 
 namespace Composer\Autoload;
 
-class ComposerStaticInita4fccfe37f552e3f881e03bf511252ca
+class ComposerStaticInit66b748a75363877b0961a1e44a4414b7
 {
     public static $files = array (
         '320cde22f66dd4f5d3fd621d3e88b98f' => __DIR__ . '/..' . '/symfony/polyfill-ctype/bootstrap.php',
@@ -931,11 +931,11 @@
     public static function getInitializer(ClassLoader $loader)
     {
         return \Closure::bind(function () use ($loader) {
-            $loader->prefixLengthsPsr4 = ComposerStaticInita4fccfe37f552e3f881e03bf511252ca::$prefixLengthsPsr4;
-            $loader->prefixDirsPsr4 = ComposerStaticInita4fccfe37f552e3f881e03bf511252ca::$prefixDirsPsr4;
-            $loader->prefixesPsr0 = ComposerStaticInita4fccfe37f552e3f881e03bf511252ca::$prefixesPsr0;
-            $loader->fallbackDirsPsr0 = ComposerStaticInita4fccfe37f552e3f881e03bf511252ca::$fallbackDirsPsr0;
-            $loader->classMap = ComposerStaticInita4fccfe37f552e3f881e03bf511252ca::$classMap;
+            $loader->prefixLengthsPsr4 = ComposerStaticInit66b748a75363877b0961a1e44a4414b7::$prefixLengthsPsr4;
+            $loader->prefixDirsPsr4 = ComposerStaticInit66b748a75363877b0961a1e44a4414b7::$prefixDirsPsr4;
+            $loader->prefixesPsr0 = ComposerStaticInit66b748a75363877b0961a1e44a4414b7::$prefixesPsr0;
+            $loader->fallbackDirsPsr0 = ComposerStaticInit66b748a75363877b0961a1e44a4414b7::$fallbackDirsPsr0;
+            $loader->classMap = ComposerStaticInit66b748a75363877b0961a1e44a4414b7::$classMap;
 
         }, null, ClassLoader::class);
     }

roundcubemail-1.5.3.tar.gz/vendor/composer/installed.json Changed

@@ -3675,17 +3675,17 @@
         },
         {
             "name": "symfony/polyfill-ctype",
-            "version": "v1.26.0",
-            "version_normalized": "1.26.0.0",
+            "version": "v1.27.0",
+            "version_normalized": "1.27.0.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-ctype.git",
-                "reference": "6fd1b9a79f6e3cf65f9e679b23af304cd9e010d4"
+                "reference": "5bbc823adecdae860bb64756d639ecfec17b050a"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/6fd1b9a79f6e3cf65f9e679b23af304cd9e010d4",
-                "reference": "6fd1b9a79f6e3cf65f9e679b23af304cd9e010d4",
+                "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/5bbc823adecdae860bb64756d639ecfec17b050a",
+                "reference": "5bbc823adecdae860bb64756d639ecfec17b050a",
                 "shasum": ""
             },
             "require": {
@@ -3697,11 +3697,11 @@
             "suggest": {
                 "ext-ctype": "For best performance"
             },
-            "time": "2022-05-24T11:49:31+00:00",
+            "time": "2022-11-03T14:55:06+00:00",
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-main": "1.26-dev"
+                    "dev-main": "1.27-dev"
                 },
                 "thanks": {
                     "name": "symfony/polyfill",
@@ -3740,7 +3740,7 @@
                 "portable"
             ,
             "support": {
-                "source": "https://github.com/symfony/polyfill-ctype/tree/v1.26.0"
+                "source": "https://github.com/symfony/polyfill-ctype/tree/v1.27.0"
             },
             "funding": 
                 {

roundcubemail-1.5.3.tar.gz/vendor/composer/installed.php Changed

@@ -5,7 +5,7 @@
         'type' => 'library',
         'install_path' => __DIR__ . '/../../',
         'aliases' => array(),
-        'reference' => '0121082842400ce1919ff4b4d36c991630b6988c',
+        'reference' => '278633b1501b02905bf9f5b2ba7e908592fbfed9',
         'name' => 'roundcube/roundcubemail',
         'dev' => true,
     ),
@@ -475,7 +475,7 @@
             'type' => 'library',
             'install_path' => __DIR__ . '/../../',
             'aliases' => array(),
-            'reference' => '0121082842400ce1919ff4b4d36c991630b6988c',
+            'reference' => '278633b1501b02905bf9f5b2ba7e908592fbfed9',
             'dev_requirement' => false,
         ),
         'rsky/pear-core-min' => array(
@@ -620,12 +620,12 @@
             'dev_requirement' => false,
         ),
         'symfony/polyfill-ctype' => array(
-            'pretty_version' => 'v1.26.0',
-            'version' => '1.26.0.0',
+            'pretty_version' => 'v1.27.0',
+            'version' => '1.27.0.0',
             'type' => 'library',
             'install_path' => __DIR__ . '/../symfony/polyfill-ctype',
             'aliases' => array(),
-            'reference' => '6fd1b9a79f6e3cf65f9e679b23af304cd9e010d4',
+            'reference' => '5bbc823adecdae860bb64756d639ecfec17b050a',
             'dev_requirement' => true,
         ),
         'symfony/yaml' => array(

roundcubemail-1.5.3.tar.gz/vendor/symfony/polyfill-ctype/composer.json Changed