Request 850 (accepted)

roundcubemail-plugins-kolab.spec Changed

@@ -23,7 +23,7 @@
 %global tmpdir %{_var}/lib/roundcubemail
 
 Name:           roundcubemail-plugins-kolab
-Version:        3.2.6
+Version:        3.2.7
 Release:        1%{?dist}
 Summary:        Kolab Groupware plugins for Roundcube Webmail
 
@@ -148,6 +148,8 @@
 Requires:       roundcubemail(plugin-kolab_files-assets) = %{?epoch:%{epoch}:}%{version}-%{release}
 Requires:       roundcubemail(plugin-kolab_files-skin) = %{?epoch:%{epoch}:}%{version}-%{release}
 Requires:       roundcubemail(plugin-libkolab) = %{?epoch:%{epoch}:}%{version}-%{release}
+# Already a part of php-common in rpm packaging
+Requires:       php-curl
 Provides:       roundcubemail(plugin-kolab_files) = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description -n roundcubemail-plugin-kolab_files
@@ -878,6 +880,10 @@
             fi
         done
 
+        if [ "$(basename ${plugin})" == "kolab_files" ]; then
+            echo "Requires:       php-curl"
+        fi
+
         echo "Provides:       roundcubemail(plugin-$(basename ${plugin})) = %%{?epoch:%%{epoch}:}%%{version}-%%{release}"
         echo ""
         echo "%description -n roundcubemail-plugin-$(basename ${plugin})"
@@ -1925,6 +1931,9 @@
 %defattr(-,root,root,-)
 
 %changelog
+* Wed Feb 25 2015 Jeroen van Meeuwen <vanmeeuwen@kolabsys.com> - 3.2.7-1
+- Release of version 3.2.7
+
 * Sun Feb 15 2015 Daniel Hoffend <dh@dotlan.net> - 3.2.5-2
 - Removed tmpdir+symlink for odfviewer

debian.changelog Changed

roundcubemail-plugins-kolab-3.2.6.tar.gz/plugins/calendar/calendar.php -> roundcubemail-plugins-kolab-3.2.7.tar.gz/plugins/calendar/calendar.php Changed

roundcubemail-plugins-kolab-3.2.6.tar.gz/plugins/calendar/composer.json -> roundcubemail-plugins-kolab-3.2.7.tar.gz/plugins/calendar/composer.json Changed

roundcubemail-plugins-kolab-3.2.6.tar.gz/plugins/calendar/drivers/kolab/kolab_calendar.php -> roundcubemail-plugins-kolab-3.2.7.tar.gz/plugins/calendar/drivers/kolab/kolab_calendar.php Changed

@@ -207,6 +207,14 @@
     return $this->events[$id];
   }
 
+  /**
+   * Get attachment body
+   * @see calendar_driver::get_attachment_body()
+   */
+  public function get_attachment_body($id, $event)
+  {
+    return $this->ready ? $this->storage->get_attachment($event['id'], $id): false;
+  }
 
   /**
    * @param  integer Event's new start (unix timestamp)
@@ -319,7 +327,7 @@
       if (count($words)) {
         $hits = 0;
         foreach ($words as $word) {
-          $hits += $me->_fulltext_match($event, $word, false);
+          $hits += $me->fulltext_match($event, $word, false);
         }
         if ($hits < count($words)) {
           return false;
@@ -727,7 +735,7 @@
   /**
    * Match the given word in the event contents
    */
-  private function _fulltext_match($event, $word, $recursive = true)
+  public function fulltext_match($event, $word, $recursive = true)
   {
     $hits = 0;
     foreach ($this->search_fields as $col) {
@@ -746,7 +754,7 @@
     // search in recurrence exceptions
     if (!$hits && $recursive && !empty($event['recurrence']['EXCEPTIONS'])) {
       foreach ($event['recurrence']['EXCEPTIONS'] as $exception) {
-        $hits = $this->_fulltext_match($exception, $word, false);
+        $hits = $this->fulltext_match($exception, $word, false);
         if ($hits) break;
       }
     }

roundcubemail-plugins-kolab-3.2.6.tar.gz/plugins/calendar/drivers/kolab/kolab_driver.php -> roundcubemail-plugins-kolab-3.2.7.tar.gz/plugins/calendar/drivers/kolab/kolab_driver.php Changed

roundcubemail-plugins-kolab-3.2.6.tar.gz/plugins/calendar/drivers/kolab/kolab_invitation_calendar.php -> roundcubemail-plugins-kolab-3.2.7.tar.gz/plugins/calendar/drivers/kolab/kolab_invitation_calendar.php Changed

roundcubemail-plugins-kolab-3.2.6.tar.gz/plugins/calendar/drivers/kolab/kolab_user_calendar.php -> roundcubemail-plugins-kolab-3.2.7.tar.gz/plugins/calendar/drivers/kolab/kolab_user_calendar.php Changed

roundcubemail-plugins-kolab-3.2.6.tar.gz/plugins/calendar/lib/calendar_itip.php -> roundcubemail-plugins-kolab-3.2.7.tar.gz/plugins/calendar/lib/calendar_itip.php Changed

@@ -152,12 +152,14 @@
     // delete old entry
     $this->rc->db->query("DELETE FROM $this->db_itipinvitations WHERE `token` = ?", $base);
 
+    $event_uid = $event['uid'] . ($event['_instance'] ? '-' . $event['_instance'] : '');
+
     $query = $this->rc->db->query(
       "INSERT INTO $this->db_itipinvitations
        (`token`, `event_uid`, `user_id`, `event`, `expires`)
        VALUES(?, ?, ?, ?, ?)",
       $base,
-      $event['uid'],
+      $event_uid,
       $this->rc->user->ID,
       self::serialize_event($event),
       date('Y-m-d H:i:s', $event['end']->format('U') + 86400 * 2)
@@ -178,12 +180,14 @@
    */
   public function cancel_itip_invitation($event)
   {
+    $event_uid = $event['uid'] . ($event['_instance'] ? '-' . $event['_instance'] : '');
+
     // flag invitation record as cancelled
     $this->rc->db->query(
       "UPDATE $this->db_itipinvitations
        SET `cancelled` = 1
        WHERE `event_uid` = ? AND `user_id` = ?",
-       $event['uid'],
+       $event_uid,
        $this->rc->user->ID
     );
   }
@@ -196,7 +200,8 @@
    */
   public function generate_token($event, $attendee)
   {
-    $base = sha1($event['uid'] . ';' . $this->rc->user->ID);
+    $event_uid = $event['uid'] . ($event['_instance'] ? '-' . $event['_instance'] : '');
+    $base = sha1($event_uid . ';' . $this->rc->user->ID);
     $mail = base64_encode($attendee);
     $hash = substr(md5($base . $mail . $this->rc->config->get('des_key')), 0, 6);

roundcubemail-plugins-kolab-3.2.6.tar.gz/plugins/calendar/skins/larry/calendar.css -> roundcubemail-plugins-kolab-3.2.7.tar.gz/plugins/calendar/skins/larry/calendar.css Changed

roundcubemail-plugins-kolab-3.2.6.tar.gz/plugins/kolab_activesync/composer.json -> roundcubemail-plugins-kolab-3.2.7.tar.gz/plugins/kolab_activesync/composer.json Changed

roundcubemail-plugins-kolab-3.2.6.tar.gz/plugins/kolab_addressbook/composer.json -> roundcubemail-plugins-kolab-3.2.7.tar.gz/plugins/kolab_addressbook/composer.json Changed

roundcubemail-plugins-kolab-3.2.6.tar.gz/plugins/kolab_addressbook/kolab_addressbook.php -> roundcubemail-plugins-kolab-3.2.7.tar.gz/plugins/kolab_addressbook/kolab_addressbook.php Changed

roundcubemail-plugins-kolab-3.2.6.tar.gz/plugins/kolab_addressbook/lib/rcube_kolab_contacts.php -> roundcubemail-plugins-kolab-3.2.7.tar.gz/plugins/kolab_addressbook/lib/rcube_kolab_contacts.php Changed

roundcubemail-plugins-kolab-3.2.6.tar.gz/plugins/kolab_config/composer.json -> roundcubemail-plugins-kolab-3.2.7.tar.gz/plugins/kolab_config/composer.json Changed

roundcubemail-plugins-kolab-3.2.6.tar.gz/plugins/kolab_delegation/composer.json -> roundcubemail-plugins-kolab-3.2.7.tar.gz/plugins/kolab_delegation/composer.json Changed

roundcubemail-plugins-kolab-3.2.6.tar.gz/plugins/kolab_files/composer.json -> roundcubemail-plugins-kolab-3.2.7.tar.gz/plugins/kolab_files/composer.json Changed

roundcubemail-plugins-kolab-3.2.6.tar.gz/plugins/kolab_folders/composer.json -> roundcubemail-plugins-kolab-3.2.7.tar.gz/plugins/kolab_folders/composer.json Changed

roundcubemail-plugins-kolab-3.2.6.tar.gz/plugins/kolab_notes/composer.json -> roundcubemail-plugins-kolab-3.2.7.tar.gz/plugins/kolab_notes/composer.json Changed

roundcubemail-plugins-kolab-3.2.6.tar.gz/plugins/kolab_tags/composer.json -> roundcubemail-plugins-kolab-3.2.7.tar.gz/plugins/kolab_tags/composer.json Changed

roundcubemail-plugins-kolab-3.2.6.tar.gz/plugins/libkolab/composer.json -> roundcubemail-plugins-kolab-3.2.7.tar.gz/plugins/libkolab/composer.json Changed

roundcubemail-plugins-kolab-3.2.6.tar.gz/plugins/libkolab/config.inc.php.dist -> roundcubemail-plugins-kolab-3.2.7.tar.gz/plugins/libkolab/config.inc.php.dist Changed

roundcubemail-plugins-kolab-3.2.6.tar.gz/plugins/libkolab/lib/kolab_storage_cache_contact.php -> roundcubemail-plugins-kolab-3.2.7.tar.gz/plugins/libkolab/lib/kolab_storage_cache_contact.php Changed

roundcubemail-plugins-kolab-3.2.6.tar.gz/plugins/tasklist/composer.json -> roundcubemail-plugins-kolab-3.2.7.tar.gz/plugins/tasklist/composer.json Changed

roundcubemail-plugins-kolab-3.2.6.tar.gz/plugins/tasklist/drivers/kolab/tasklist_kolab_driver.php -> roundcubemail-plugins-kolab-3.2.7.tar.gz/plugins/tasklist/drivers/kolab/tasklist_kolab_driver.php Changed

roundcubemail-plugins-kolab-3.2.6.tar.gz/plugins/tasklist/localization/en_US.inc -> roundcubemail-plugins-kolab-3.2.7.tar.gz/plugins/tasklist/localization/en_US.inc Changed

@@ -25,6 +25,8 @@
 $labels['createtask'] = 'Create Task <Enter>';
 $labels['createnewtask'] = 'Create new Task (e.g. Saturday, Mow the lawn)';
 $labels['createfrommail'] = 'Save as task';
+$labels['printtitle'] = 'Print tasks';
+$labels['printdescriptions'] = 'Print descriptions';
 $labels['mark'] = 'Mark';
 $labels['unmark'] = 'Unmark';
 $labels['edit'] = 'Edit';
@@ -103,6 +105,8 @@
 $labels['errorsaving'] = 'Failed to save data.';
 $labels['notasksfound'] = 'No tasks found for the given criteria';
 $labels['invalidstartduedates'] = 'Start date must not be greater than due date.';
+$labels['invalidstartduetimes'] = 'Start and due dates must either both or none specify a time.';
+$labels['recurrencerequiresdate'] = 'Recurring tasks require either a start or due date.';
 $labels['deletetasktconfirm'] = 'Do you really want to delete this task?';
 $labels['deleteparenttasktconfirm'] = 'Do you really want to delete this task and all its subtasks?';
 $labels['deletelistconfirm'] = 'Do you really want to delete this list with all its tasks?';

roundcubemail-plugins-kolab-3.2.6.tar.gz/plugins/tasklist/tasklist.js -> roundcubemail-plugins-kolab-3.2.7.tar.gz/plugins/tasklist/tasklist.js Changed

roundcubemail-plugins-kolab.dsc Changed

Overview

Request 850 (accepted)

Request History