@@ -41,7 +41,7 @@

 %global dash_rel_suffix %{?rc_rel_suffix:-%{rc_rel_suffix}}

 Name:           roundcubemail-plugins-kolab

-Version:        3.5.2

+Version:        3.5.3

 Release:        1%{?dot_rel_suffix}%{?dist}

@@ -2792,6 +2792,9 @@

 %defattr(-,root,root,-)

 %changelog

+* Thu Dec  5 2019 Jeroen van Meeuwen <vanmeeuwen@kolabsys.com> - 3.5.3-1

+- Release of version 3.5.3

+

 * Sat Oct 19 2019 Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com> - 3.5.2-1

 - Release of version 3.5.2

​

@@ -1,3 +1,9 @@

+roundcubemail-plugins-kolab (1:3.5.3-0~kolab1) unstable; urgency=low

+

+  * Release version 3.5.3

+

+ -- Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>  Thu,  5 Dec 2019 11:11:11 +0200

+

 roundcubemail-plugins-kolab (1:3.5.2-0~kolab2) unstable; urgency=low

   * Release version 3.5.2

​

@@ -22,8 +22,8 @@

 library plugins. Thus in order to run the calendar plugin, you also need the

 following plugins installed:

-* libcalendaring [1]

-* libkolab [1]

+* kolab/libcalendaring [1]

+* kolab/libkolab [1]

 INSTALLATION

​

@@ -563,6 +563,11 @@

         }

       });

+      var close_func = function(e) {

+          rcmail.command('menu-close', 'eventoptionsmenu', null, e);

+          $('.libcal-rsvp-replymode').hide();

+        };

+

       // open jquery UI dialog

       $dialog.dialog({

         modal: true,

@@ -575,21 +580,12 @@

             $dialog.parent().find('button:not(.ui-dialog-titlebar-close,.delete)').first().focus();

           }, 5);

         },

-        beforeClose: function(e) {

-          rcmail.command('menu-close', 'eventoptionsmenu', null, e);

-        },

         close: function(e) {

-          $dialog.dialog('destroy').attr('aria-hidden', 'true').hide();

-          $('.libcal-rsvp-replymode').hide();

-        },

-        dragStart: function(e) {

-          rcmail.command('menu-close', 'eventoptionsmenu', null, e);

-          $('.libcal-rsvp-replymode').hide();

-        },

-        resizeStart: function(e) {

-          rcmail.command('menu-close', 'eventoptionsmenu', null, e);

-          $('.libcal-rsvp-replymode').hide();

+          close_func(e);

+          $dialog.dialog('close');

         },

+        dragStart: close_func,

+        resizeStart: close_func,

         buttons: buttons,

         minWidth: 320,

         width: 420

@@ -611,12 +607,12 @@

           .attr({href: '#', 'class': 'dropdown-link btn btn-link options', 'data-popup-pos': 'top'})

           .text(rcmail.gettext('eventoptions','calendar'))

           .click(function(e) {

-            return rcmail.command('menu-open','eventoptionsmenu', this, e)

+            return rcmail.command('menu-open','eventoptionsmenu', this, e);

           })

           .appendTo($dialog.parent().find('.ui-dialog-buttonset'));

       }

-      rcmail.enable_command('event-history', calendar.history)

+      rcmail.enable_command('event-history', calendar.history);

       rcmail.triggerEvent('calendar-event-dialog', {dialog: $dialog});

     };

@@ -626,12 +622,14 @@

     {

       var cutype = $(this).attr('data-cutype'),

         mailto = this.href.substr(7);

+

       if (rcmail.env.calendar_resources && cutype == 'RESOURCE') {

         event_resources_dialog(mailto);

       }

       else {

         rcmail.command('compose', mailto, e ? e.target : null, e);

       }

+

       return false;

     };

@@ -3179,9 +3177,9 @@

           if (v.role != 'ORGANIZER') {

             v.status = 'NEEDS-ACTION';

           }

-        })

+        });

-        event_edit_dialog('new', copy);

+        setTimeout(function() { event_edit_dialog('new', copy); }, 50);

       }

     };

​

@@ -4,7 +4,7 @@

     "description": "Calendar plugin",

     "homepage": "https://git.kolab.org/diffusion/RPK/",

     "license": "AGPLv3",

-    "version": "3.5.2",

+    "version": "3.5.3",

     "authors": [

         {

             "name": "Thomas Bruederli",

​

@@ -61,3 +61,4 @@

 INSERT INTO events (event_id, calendar_id, recurrence_id, uid, created, changed, sequence, start, end, recurrence, title, description, location, categories, all_day, free_busy, priority, sensitivity, alarms, attendees, notifyat)

     SELECT event_id, calendar_id, recurrence_id, uid, created, changed, sequence, start, end, recurrence, title, description, location, categories, all_day, free_busy, priority, sensitivity, alarms, attendees, notifyat FROM temp_events;

+DROP TABLE temp_events;

​

@@ -65,3 +65,4 @@

              SELECT event_id, calendar_id, recurrence_id, uid, created, changed, sequence, start, end, recurrence, title, description, location, categories, url, all_day, free_busy, priority, sensitivity, alarms, attendees, notifyat

              FROM temp_events;

+DROP TABLE temp_events;

​

@@ -4,7 +4,7 @@

     "description": "Kolab authentication",

     "homepage": "https://git.kolab.org/diffusion/RPK/",

     "license": "AGPLv3",

-    "version": "3.5.2",

+    "version": "3.5.3",

     "authors": [

         {

             "name": "Thomas Bruederli",

​

@@ -559,8 +559,11 @@

                     $effective_rights = (array)$ldap->effective_rights($target_entry['dn']);

                     if (!empty($effective_rights)) {

-                        $effective_rights['attrib'] = $effective_rights['attributeLevelRights'];

-                        $effective_rights['entry']  = $effective_rights['entryLevelRights'];

+                        // compat with out of date Net_LDAP3

+                        $effective_rights = array_change_key_case($effective_rights, CASE_LOWER);

+

+                        $effective_rights['attrib'] = $effective_rights['attributelevelrights'];

+                        $effective_rights['entry']  = $effective_rights['entrylevelrights'];

                         // compare the rights with the permissions mapping

                         $allowed_tasks = array();

​

@@ -283,7 +283,7 @@

                         $key = $keyid;

                     }

                     else {

-                        throw new Exception("Failed to extract public key");

+                        throw new Exception("Failed to extract public key. " . openssl_error_string());

                     }

                 }

@@ -311,7 +311,7 @@

      */

     protected function validate_token_payload($payload)

     {

-        $items = $this->get_maram('validate_items');

+        $items = $this->get_param('validate_items');

         $email = $this->config['debug_email'] ?: $payload->{$this->get_param('user_field')};

         if (empty($email)) {

​

@@ -4,7 +4,7 @@

     "description": "Plugin to setup a basic environment for the interaction with a Kolab server.",

     "homepage": "https://git.kolab.org/diffusion/RPK/",

     "license": "AGPLv3",

-    "version": "3.5.2",

+    "version": "3.5.3",

     "authors": [

         {

             "name": "Thomas Bruederli",

​

@@ -78,6 +78,8 @@

 $config['kolab_users_cache_ttl'] = '10d';

 // JSON-RPC endpoint configuration of the Bonnie web service providing historic data for groupware objects

+$config['kolab_bonnie_api'] = null;

+/*

 $config['kolab_bonnie_api'] = array(

     'uri'    => 'https://<kolab-hostname>:8080/api/rpc',

     'user'   => 'webclient',

@@ -86,3 +88,4 @@

     'debug'  => true,   // logs requests/responses to <log-dir>/bonnie

     'timeout' => 30,

 );

+*/

​

@@ -203,7 +203,7 @@

                 for ($i=0; $i < $byday->size(); $i++) {

                     $daypos = $byday->get($i);

                     $prefix = $daypos->occurence();

-                    $weekdays[] = ($prefix ? $prefix : '') . $weekday_map[$daypos->weekday()];

+                    $weekdays[] = ($prefix ?: '') . $weekday_map[$daypos->weekday()];

                 }

                 $object['recurrence']['BYDAY'] = join(',', $weekdays);

             }

@@ -382,8 +382,8 @@

                 $att = new Attendee;

                 $att->setContact($cr);

                 $att->setPartStat($this->part_status_map[$attendee['status']]);

-                $att->setRole($this->role_map[$attendee['role']] ? $this->role_map[$attendee['role']] : kolabformat::Required);

-                $att->setCutype($this->cutype_map[$attendee['cutype']] ? $this->cutype_map[$attendee['cutype']] : kolabformat::CutypeIndividual);

+                $att->setRole($this->role_map[$attendee['role']] ?: kolabformat::Required);

+                $att->setCutype($this->cutype_map[$attendee['cutype']] ?: kolabformat::CutypeIndividual);

                 $att->setRSVP((bool)$attendee['rsvp']);

                 if (!empty($attendee['delegated-from'])) {

​

@@ -659,8 +659,10 @@

                     // get username part and map it to user name

                     $pos = strpos($folder, $delim);

                     $fid = $pos ? substr($folder, 0, $pos) : $folder;

-                    $fid = self::folder_id2user($fid, true);

-                    $fid = str_replace($delim, '', $fid);

+

+                    if ($user = self::folder_id2user($fid, true)) {

+                        $fid = str_replace($delim, '', $user);

+                    }

                     $prefix = "($fid)";

                     $folder = $pos ? substr($folder, $pos + 1) : '';

​

@@ -12,8 +12,8 @@

 library plugins. Thus in order to run the tasklist plugin, you also need the

 following plugins installed:

-* libcalendaring [1]

-* libkolab [1]

+* kolab/libcalendaring [1]

+* kolab/libkolab [1]

 INSTALLATION

@@ -67,3 +67,5 @@

 Use Roundcube `skins_allowed` option to limit skins available to the user

 or remove incompatible skins from the skins folder.

+

+[1] https://git.kolab.org/diffusion/RPK/

​

@@ -4,7 +4,7 @@

     "description": "Task management plugin",

     "homepage": "https://git.kolab.org/diffusion/RPK/",

     "license": "AGPLv3",

-    "version": "3.5.2",

+    "version": "3.5.3",

     "authors": [

         {

             "name": "Thomas Bruederli",

​

@@ -0,0 +1,51 @@

+/**

+ * Roundcube Tasklist plugin database

+ *

+ * @author Thomas Bruederli

+ * @licence GNU AGPL

+ * @copyright (C) 2014, Kolab Systems AG

+ */

+

+CREATE TABLE tasklists (

+    tasklist_id integer NOT NULL PRIMARY KEY,

+    user_id integer NOT NULL,

+    name varchar(255) NOT NULL,

+    color varchar(8) NOT NULL,

+    showalarms tinyint NOT NULL DEFAULT '0',

+    CONSTRAINT fk_tasklists_user_id FOREIGN KEY (user_id)

+        REFERENCES users (user_id) ON UPDATE CASCADE ON DELETE CASCADE

+);

+

+CREATE INDEX ix_tasklists_user_id ON tasklists (user_id, name);

+

+CREATE TABLE tasks (

+    task_id integer NOT NULL PRIMARY KEY,

+    tasklist_id integer NOT NULL,

+    parent_id integer DEFAULT NULL,

+    uid varchar(255) NOT NULL,

+    created datetime NOT NULL DEFAULT (datetime('now', 'localtime')),

+    changed datetime NOT NULL DEFAULT (datetime('now', 'localtime')),

+    del tinyint NOT NULL DEFAULT '0',

+    title varchar(255) NOT NULL,

+    description text,

+    tags text,

+    "date" varchar(10) DEFAULT NULL,

+    "time" varchar(5) DEFAULT NULL,

+    startdate varchar(10) DEFAULT NULL,

+    starttime varchar(5) DEFAULT NULL,

+    flagged tinyint NOT NULL DEFAULT '0',

+    complete real NOT NULL DEFAULT '0',

+    status varchar(16) NOT NULL DEFAULT '',

+    alarms varchar(255) DEFAULT NULL,

+    recurrence varchar(255) DEFAULT NULL,

+    organizer varchar(255) DEFAULT NULL,

+    attendees text,

+    notify datetime DEFAULT NULL,

+    CONSTRAINT fk_tasks_tasklist_id FOREIGN KEY (tasklist_id)

+        REFERENCES tasklists (tasklist_id) ON UPDATE CASCADE ON DELETE CASCADE

+);

+

+CREATE INDEX ix_tasks_tasklisting ON tasks (tasklist_id, del, date);

+CREATE INDEX ix_tasks_uid ON tasks (uid);

+

+INSERT INTO system (name, value) VALUES ('tasklist-database-version', '2014051900');

​

@@ -332,7 +332,7 @@

             foreach (array('title', 'description', 'organizer', 'attendees') as $col) {

                 $sql_query[] = $this->rc->db->ilike($col, '%' . $filter['search'] . '%');

             }

-            $sql_add = "AND (" . join(" OR ", $sql_query) . ")";

+            $sql_add = " AND (" . join(" OR ", $sql_query) . ")";

         }

         if ($filter['since'] && is_numeric($filter['since'])) {

@@ -421,7 +421,7 @@

                 "SELECT `task_id` AS id FROM " . $this->db_tasks

                 . " WHERE `tasklist_id` IN (" . $this->list_ids . ")"

                     . " AND `parent_id` IN (" . join(',', array_map(array($this->rc->db, 'quote'), $task_ids)) . ")"

-                    . " AND `del` = 0",

+                    . " AND `del` = 0"

             );

             $task_ids = array();

@@ -470,7 +470,7 @@

             $result = $this->rc->db->query("SELECT * FROM " . $this->db_tasks

                 . " WHERE `tasklist_id` IN (" . join(',', $list_ids) . ")"

                     . " AND `notify` <= " . $this->rc->db->fromunixtime($time)

-                    . " AND NOT " . self::IS_COMPLETE_SQL,

+                    . " AND NOT " . self::IS_COMPLETE_SQL

             );

             while ($result && ($rec = $this->rc->db->fetch_assoc($result))) {

@@ -597,7 +597,7 @@

             strval($prop['description']),

             join(',', (array)$prop['tags']),

             $prop['flagged'] ? 1 : 0,

-            $prop['complete'],

+            $prop['complete'] ?: 0,

             strval($prop['status']),

             $prop['alarms'],

             $prop['recurrence'],

​

@@ -2,7 +2,7 @@

 Source: roundcubemail-plugins-kolab

 Binary: roundcubemail-plugins-kolab

 Architecture: all

-Version: 1:3.5.2-0~kolab2

+Version: 1:3.5.3-0~kolab1

 Maintainer: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>

 Uploaders: Paul Klos <kolab@klos2day.nl>

 Standards-Version: 3.9.3

@@ -37,5 +37,5 @@

  roundcubemail-plugin-tinymce-config deb web extra

  roundcubemail-plugin-wap-client deb web extra

 Files:

- 00000000000000000000000000000000 0 roundcubemail-plugins-kolab-3.5.2.tar.gz

+ 00000000000000000000000000000000 0 roundcubemail-plugins-kolab-3.5.3.tar.gz

  00000000000000000000000000000000 0 debian.tar.gz

​