Kolab Groupware OBS

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

@@ -417,12 +417,12 @@
                 return $p;
             }
 
-            $field_id  = 'rcmfd_timeslot';
+            $field_id  = 'rcmfd_timeslots';
             $choices   = '1', '2', '3', '4', '6';
             $timeslots = $this->rc->config->get('calendar_timeslots', $this->defaults'calendar_timeslots');
 
             $select = new html_select('name' => '_timeslots', 'id' => $field_id);
-            $select->add($choices);
+            $select->add($choices, $choices);
 
             $p'blocks''view''options''timeslots' = 
                 'title' => html::label($field_id, rcube::Q($this->gettext('timeslots'))),
@@ -777,6 +777,13 @@
             $checkbox = new html_checkbox('name' => '_birthday_adressbooks' + $input_attrib);
 
             foreach ($this->rc->get_address_sources(false, true) as $source) {
+                // Roundcube >= 1.5, Ignore Collected Recipients and Trusted Senders sources
+                if ((defined('rcube_addressbook::TYPE_RECIPIENT') && $source'id' == (string) rcube_addressbook::TYPE_RECIPIENT)
+                    || (defined('rcube_addressbook::TYPE_TRUSTED_SENDER') && $source'id' == (string) rcube_addressbook::TYPE_TRUSTED_SENDER)
+                ) {
+                    continue;
+                }
+
                 $active = in_array($source'id', (array) $this->rc->config->get('calendar_birthday_adressbooks')) ? $source'id' : '';
                 $sources = html::tag('li', null,
                     html::label(null,

roundcubemail-1.5.3.tar.gz/plugins/calendar/drivers/caldav/SQL Added

roundcubemail-1.5.3.tar.gz/plugins/calendar/drivers/caldav/SQL/mysql.initial.sql Added

@@ -0,0 +1,28 @@
+DROP TABLE `kolab_alarms` IF EXISTS;
+
+CREATE TABLE IF NOT EXISTS `kolab_alarms` (
+  `alarm_id` VARCHAR(255) NOT NULL,
+  `user_id` int(10) UNSIGNED NOT NULL,
+  `notifyat` DATETIME DEFAULT NULL,
+  `dismissed` TINYINT(3) UNSIGNED NOT NULL DEFAULT '0',
+  PRIMARY KEY(`alarm_id`,`user_id`),
+  CONSTRAINT `fk_kolab_alarms_user_id` FOREIGN KEY (`user_id`)
+    REFERENCES `users`(`user_id`) ON DELETE CASCADE ON UPDATE CASCADE
+) ROW_FORMAT=DYNAMIC ENGINE=INNODB CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;
+
+DROP TABLE `itipinvitations` IF EXISTS;
+
+CREATE TABLE IF NOT EXISTS `itipinvitations` (
+  `token` VARCHAR(64) NOT NULL,
+  `event_uid` VARCHAR(255) NOT NULL,
+  `user_id` int(10) UNSIGNED NOT NULL DEFAULT '0',
+  `event` TEXT NOT NULL,
+  `expires` DATETIME DEFAULT NULL,
+  `cancelled` TINYINT(3) UNSIGNED NOT NULL DEFAULT '0',
+  PRIMARY KEY(`token`),
+  INDEX `uid_idx` (`event_uid`,`user_id`),
+  CONSTRAINT `fk_itipinvitations_user_id` FOREIGN KEY (`user_id`)
+    REFERENCES `users`(`user_id`) ON DELETE CASCADE ON UPDATE CASCADE
+) ROW_FORMAT=DYNAMIC ENGINE=INNODB CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;
+
+REPLACE INTO `system` (`name`, `value`) VALUES ('calendar-caldav-version', '2021102600');

roundcubemail-1.5.3.tar.gz/plugins/calendar/drivers/caldav/SQL/oracle.initial.sql Added

roundcubemail-1.5.3.tar.gz/plugins/calendar/drivers/caldav/SQL/postgres.initial.sql Added

roundcubemail-1.5.3.tar.gz/plugins/calendar/drivers/caldav/SQL/sqlite.initial.sql Added

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

@@ -150,14 +150,16 @@
             // $p'sources' = array_merge($sources, $p'sources');
             // Don't use array_merge(), because if you have folders name
             // that resolve to numeric identifier it will break output array keys
-            foreach ($p'sources' as $idx => $value)
+            foreach ($p'sources' as $idx => $value) {
                 $sources$idx = $value;
+            }
             $p'sources' = $sources;
         }
         else {
             // $p'sources' = array_merge($p'sources', $sources);
-            foreach ($sources as $idx => $value)
+            foreach ($sources as $idx => $value) {
                 $p'sources'$idx = $value;
+            }
         }
 
         return $p;
@@ -205,19 +207,29 @@
      */
     public function directorylist_html($args)
     {
-        $out = '';
-        $jsdata = array();
-        $sources = (array)$this->rc->get_address_sources();
-
-        // list all non-kolab sources first (also exclude hidden sources)
-        $filter = function($source){ return empty($source'kolab') && empty($source'hidden'); };
-        foreach (array_filter($sources, $filter)  as $j => $source) {
+        $out     = '';
+        $spec    = '';
+        $kolab   = '';
+        $jsdata  = ;
+        $sources = (array) $this->rc->get_address_sources();
+
+        // list all non-kolab sources first (also exclude hidden sources), special folders will go last
+        foreach ($sources  as $j => $source) {
             $id = strval(strlen($source'id') ? $source'id' : $j);
-            $out .= $this->addressbook_list_item($id, $source, $jsdata) . '</li>';
-        }
+            if (!empty($source'kolab') || !empty($source'hidden')) {
+                continue;
+            }
 
-        $filter  = function($source) { return !empty($source'kolab') && empty($source'hidden'); };
-        $folders = array_filter($sources, $filter);
+            // Roundcube >= 1.5, Collected Recipients and Trusted Senders sources will be listed at the end
+            if ((defined('rcube_addressbook::TYPE_RECIPIENT') && $source'id' == (string) rcube_addressbook::TYPE_RECIPIENT)
+                || (defined('rcube_addressbook::TYPE_TRUSTED_SENDER') && $source'id' == (string) rcube_addressbook::TYPE_TRUSTED_SENDER)
+            ) {
+                $spec .= $this->addressbook_list_item($id, $source, $jsdata) . '</li>';
+            }
+            else {
+                $out .= $this->addressbook_list_item($id, $source, $jsdata) . '</li>';
+            }
+        }
 
         // render a hierarchical list of kolab contact folders
         // TODO: Move this to the drivers
@@ -225,16 +237,19 @@
             $folders = kolab_storage::sort_folders(kolab_storage::get_folders('contact'));
             kolab_storage::folder_hierarchy($folders, $tree);
             if ($tree && !empty($tree->children)) {
-                $out .= $this->folder_tree_html($tree, $sources, $jsdata);
+                $kolab .= $this->folder_tree_html($tree, $sources, $jsdata);
             }
         }
         else {
-            foreach ($folders as $j => $source) {
+            $filter = function($source) { return !empty($source'kolab') && empty($source'hidden'); };
+            foreach (array_filter($sources, $filter) as $j => $source) {
                 $id = strval(strlen($source'id') ? $source'id' : $j);
-                $out .= $this->addressbook_list_item($id, $source, $jsdata) . '</li>';
+                $kolab .= $this->addressbook_list_item($id, $source, $jsdata) . '</li>';
             }
         }
 
+        $out .= $kolab . $spec;
+
         $this->rc->output->set_env('contactgroups', array_filter($jsdata, function($src){ return $src'type' == 'group'; }));
         $this->rc->output->set_env('address_sources', array_filter($jsdata, function($src){ return $src'type' != 'group'; }));

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

@@ -116,6 +116,10 @@
 
     /**
      * Discover DAV folders of specified type on the server
+     *
+     * @param string $component Component to filter by (VEVENT, VTODO, VCARD)
+     *
+     * @return false|array List of folders' metadata or False on error
      */
     public function discover($component = 'VEVENT')
     {
@@ -137,6 +141,10 @@
         // Note: Cyrus CardDAV service requires Depth:1 (CalDAV works without it)
         $response = $this->request('/' . $roots$component, 'PROPFIND', $body, 'Depth' => 1, 'Prefer' => 'return-minimal');
 
+        if (empty($response)) {
+            return false;
+        }
+
         $elements = $response->getElementsByTagName('response');
 
         foreach ($elements as $element) {
@@ -171,6 +179,10 @@
 
         $response = $this->request($principal_href, 'PROPFIND', $body);
 
+        if (empty($response)) {
+            return false;
+        }
+
         $elements = $response->getElementsByTagName('response');
 
         foreach ($elements as $element) {
@@ -234,6 +246,12 @@
 
     /**
      * Create a DAV object in a folder
+     *
+     * @param string $location  Object location
+     * @param string $content   Object content
+     * @param string $component Content type (VEVENT, VTODO, VCARD)
+     *
+     * @return false|string|null ETag string (or NULL) on success, False on error
      */
     public function create($location, $content, $component = 'VEVENT')
     {
@@ -262,6 +280,12 @@
 
     /**
      * Update a DAV object in a folder
+     *
+     * @param string $location  Object location
+     * @param string $content   Object content
+     * @param string $component Content type (VEVENT, VTODO, VCARD)
+     *
+     * @return false|string|null ETag string (or NULL) on success, False on error
      */
     public function update($location, $content, $component = 'VEVENT')
     {
@@ -270,6 +294,10 @@
 
     /**
      * Delete a DAV object from a folder
+     *
+     * @param string $location Object location
+     *
+     * @return bool True on success, False on error
      */
     public function delete($location)
     {
@@ -280,6 +308,11 @@
 
     /**
      * Fetch DAV objects metadata (ETag, href) a folder
+     *
+     * @param string $location  Folder location
+     * @param string $component Object type (VEVENT, VTODO, VCARD)
+     *
+     * @return false|array Objects metadata on success, False on error
      */
     public function getIndex($location, $component = 'VEVENT')
     {
@@ -327,6 +360,12 @@
 
     /**
      * Fetch DAV objects data from a folder
+     *
+     * @param string $location  Folder location
+     * @param string $component Object type (VEVENT, VTODO, VCARD)
+     * @param array  $hrefs     List of objects' locations to fetch (empty for all objects)
+     *
+     * @return false|array Objects metadata on success, False on error
      */
     public function getData($location, $component = 'VEVENT', $hrefs = )
     {

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

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

@@ -257,7 +257,7 @@
 
         $uid = is_array($object) ? $object'uid' : $object;
 
-        $success = $this->dav->delete($this->object_location($uid), $content);
+        $success = $this->dav->delete($this->object_location($uid));
 
         if ($success) {
             $this->cache->set($uid, false);
@@ -267,7 +267,11 @@
     }
 
     /**
+     * Delete all objects in a folder.
      *
+     * Note: This method is used by kolab_addressbook plugin only
+     *
+     * @return bool True if successful, false on error
      */
     public function delete_all()
     {
@@ -275,10 +279,18 @@
             return false;
         }
 
-        // TODO: This method is used by kolab_addressbook plugin only
-        // $this->cache->purge();
+        // TODO: Maybe just deleting and re-creating a folder would be
+        //       better, but probably might not always work (ACL)
 
-        return false;
+        $this->cache->synchronize();
+
+        foreach (array_keys($this->cache->folder_index()) as $uid) {
+            $this->dav->delete($this->object_location($uid));
+        }
+
+        $this->cache->purge();
+
+        return true;
     }
 
     /**

roundcubemail-1.5.3.tar.gz/skins/apostrophy/templates/includes/menu.html Changed

roundcubemail-1.5.3.tar.gz/skins/apostrophy/templates/login.html Changed

roundcubemail-1.5.3.tar.gz/skins/apostrophy/watermark.html Changed

roundcubemail-1.5.3.tar.gz/temp/js_cache/tinymce-langs-5.8.2.zip 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 ComposerAutoloaderInit2d63d1baaa346936e29de4a7fd860062
+class ComposerAutoloaderInitceea4947afc4b93e29b1d29d8af721c1
 {
     private static $loader;
 
@@ -24,9 +24,9 @@
 
         require __DIR__ . '/platform_check.php';
 
-        spl_autoload_register(array('ComposerAutoloaderInit2d63d1baaa346936e29de4a7fd860062', 'loadClassLoader'), true, true);
+        spl_autoload_register(array('ComposerAutoloaderInitceea4947afc4b93e29b1d29d8af721c1', 'loadClassLoader'), true, true);
         self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(\dirname(__FILE__)));
-        spl_autoload_unregister(array('ComposerAutoloaderInit2d63d1baaa346936e29de4a7fd860062', 'loadClassLoader'));
+        spl_autoload_unregister(array('ComposerAutoloaderInitceea4947afc4b93e29b1d29d8af721c1', '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\ComposerStaticInit2d63d1baaa346936e29de4a7fd860062::getInitializer($loader));
+            call_user_func(\Composer\Autoload\ComposerStaticInitceea4947afc4b93e29b1d29d8af721c1::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\ComposerStaticInit2d63d1baaa346936e29de4a7fd860062::$files;
+            $includeFiles = Composer\Autoload\ComposerStaticInitceea4947afc4b93e29b1d29d8af721c1::$files;
         } else {
             $includeFiles = require __DIR__ . '/autoload_files.php';
         }
         foreach ($includeFiles as $fileIdentifier => $file) {
-            composerRequire2d63d1baaa346936e29de4a7fd860062($fileIdentifier, $file);
+            composerRequireceea4947afc4b93e29b1d29d8af721c1($fileIdentifier, $file);
         }
 
         return $loader;
     }
 }
 
-function composerRequire2d63d1baaa346936e29de4a7fd860062($fileIdentifier, $file)
+function composerRequireceea4947afc4b93e29b1d29d8af721c1($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 ComposerStaticInit2d63d1baaa346936e29de4a7fd860062
+class ComposerStaticInitceea4947afc4b93e29b1d29d8af721c1
 {
     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 = ComposerStaticInit2d63d1baaa346936e29de4a7fd860062::$prefixLengthsPsr4;
-            $loader->prefixDirsPsr4 = ComposerStaticInit2d63d1baaa346936e29de4a7fd860062::$prefixDirsPsr4;
-            $loader->prefixesPsr0 = ComposerStaticInit2d63d1baaa346936e29de4a7fd860062::$prefixesPsr0;
-            $loader->fallbackDirsPsr0 = ComposerStaticInit2d63d1baaa346936e29de4a7fd860062::$fallbackDirsPsr0;
-            $loader->classMap = ComposerStaticInit2d63d1baaa346936e29de4a7fd860062::$classMap;
+            $loader->prefixLengthsPsr4 = ComposerStaticInitceea4947afc4b93e29b1d29d8af721c1::$prefixLengthsPsr4;
+            $loader->prefixDirsPsr4 = ComposerStaticInitceea4947afc4b93e29b1d29d8af721c1::$prefixDirsPsr4;
+            $loader->prefixesPsr0 = ComposerStaticInitceea4947afc4b93e29b1d29d8af721c1::$prefixesPsr0;
+            $loader->fallbackDirsPsr0 = ComposerStaticInitceea4947afc4b93e29b1d29d8af721c1::$fallbackDirsPsr0;
+            $loader->classMap = ComposerStaticInitceea4947afc4b93e29b1d29d8af721c1::$classMap;
 
         }, null, ClassLoader::class);
     }

Changes of Revision 6