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 47

roundcubemail-plugins-kolab-3.2.tar.gz/plugins/calendar/calendar.php Changed

@@ -3,12 +3,11 @@
 /**
  * Calendar plugin for Roundcube webmail
  *
- * @version @package_version@
  * @author Lazlo Westerhof <hello@lazlo.me>
  * @author Thomas Bruederli <bruederli@kolabsys.com>
  *
  * Copyright (C) 2010, Lazlo Westerhof <hello@lazlo.me>
- * Copyright (C) 2012, Kolab Systems AG <contact@kolabsys.com>
+ * Copyright (C) 2014, 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
@@ -55,6 +54,7 @@
     'calendar_event_coloring'  => 0,
     'calendar_time_indicator'  => true,
     'calendar_allow_invite_shared' => false,
+    'calendar_itip_after_action'   => 0,
   );
 
   private $ical;
@@ -194,6 +194,7 @@
       }
 
       $this->add_hook('messages_list', array($this, 'mail_messages_list'));
+      $this->add_hook('message_compose', array($this, 'mail_message_compose'));
     }
     else if ($args['task'] == 'addressbook') {
       if ($this->rc->config->get('calendar_contact_birthdays')) {
@@ -235,6 +236,9 @@
     if (!$this->itip) {
       require_once($this->home . '/lib/calendar_itip.php');
       $this->itip = new calendar_itip($this);
+      
+      if ($this->rc->config->get('kolab_invitation_calendars'))
+        $this->itip->set_rsvp_actions(array('accepted','tentative','declined','needs-action'));
     }
 
     return $this->itip;
@@ -291,6 +295,7 @@
 
     $this->ui->init_templates();
     $this->rc->output->add_label('lowest','low','normal','high','highest','delete','cancel','uploading','noemailwarning','close');
+    $this->rc->output->add_label('libcalendaring.itipaccepted','libcalendaring.itiptentative','libcalendaring.itipdeclined','libcalendaring.itipdelegated');
 
     // initialize attendees autocompletion
     rcube_autocomplete_init();
@@ -509,6 +514,46 @@
       );
     }
 
+    $p['blocks']['itip']['name'] = $this->gettext('itipoptions');
+
+    // Invitations handling
+    if (!isset($no_override['calendar_itip_after_action'])) {
+      if (!$p['current']) {
+        $p['blocks']['itip']['content'] = true;
+        return $p;
+      }
+
+      $field_id = 'rcmfd_after_action';
+      $select   = new html_select(array('name' => '_after_action', 'id' => $field_id,
+        'onchange' => "\$('#{$field_id}_select')[this.value == 4 ? 'show' : 'hide']()"));
+
+      $select->add($this->gettext('afternothing'), '');
+      $select->add($this->gettext('aftertrash'), 1);
+      $select->add($this->gettext('afterdelete'), 2);
+      $select->add($this->gettext('afterflagdeleted'), 3);
+      $select->add($this->gettext('aftermoveto'), 4);
+
+      $val = $this->rc->config->get('calendar_itip_after_action', $this->defaults['calendar_itip_after_action']);
+      if ($val !== null && $val !== '' && !is_int($val)) {
+        $folder = $val;
+        $val    = 4;
+      }
+
+      $folders = $this->rc->folder_selector(array(
+          'id'            => $field_id . '_select',
+          'name'          => '_after_action_folder',
+          'maxlength'     => 30,
+          'folder_filter' => 'mail',
+          'folder_rights' => 'w',
+          'style'         => $val !== 4 ? 'display:none' : '',
+      ));
+
+      $p['blocks']['itip']['options']['after_action'] = array(
+        'title'   => html::label($field_id, Q($this->gettext('afteraction'))),
+        'content' => $select->show($val) . $folders->show($folder),
+      );
+    }
+
     // category definitions
     if (!$this->driver->nocategories && !isset($no_override['calendar_categories'])) {
         $p['blocks']['categories']['name'] = $this->gettext('categories');
@@ -657,8 +702,13 @@
         'calendar_birthday_adressbooks' => (array)get_input_value('_birthday_adressbooks', RCUBE_INPUT_POST),
         'calendar_birthdays_alarm_type'   => get_input_value('_birthdays_alarm_type', RCUBE_INPUT_POST),
         'calendar_birthdays_alarm_offset' => $birthdays_alarm_value ?: null,
+        'calendar_itip_after_action'      => intval(get_input_value('_after_action', RCUBE_INPUT_POST)),
       );
 
+      if ($p['prefs']['calendar_itip_after_action'] == 4) {
+        $p['prefs']['calendar_itip_after_action'] = get_input_value('_after_action_folder', RCUBE_INPUT_POST, true);
+      }
+
       // categories
       if (!$this->driver->nocategories) {
         $old_categories = $new_categories = array();
@@ -884,24 +934,34 @@
         break;
 
       case "rsvp":
+        $status = get_input_value('status', RCUBE_INPUT_GPC);
+        $reply_comment = $event['comment'];
         $ev = $this->driver->get_event($event);
         $ev['attendees'] = $event['attendees'];
         $event = $ev;
 
-        if ($success = $this->driver->edit_event($event)) {
-          $status = get_input_value('status', RCUBE_INPUT_GPC);
+        if ($success = $this->driver->edit_rsvp($event, $status)) {
+          $noreply = intval(get_input_value('noreply', RCUBE_INPUT_GPC)) || $status == 'needs-action';
+          $reload = $event['calendar'] != $ev['calendar'] ? 2 : 1;
           $organizer = null;
+          $emails = $this->get_user_emails();
           foreach ($event['attendees'] as $i => $attendee) {
             if ($attendee['role'] == 'ORGANIZER') {
               $organizer = $attendee;
-              break;
+            }
+            else if ($attendee['email'] && in_array(strtolower($attendee['email']), $emails)) {
+              $reply_sender = $attendee['email'];
             }
           }
-          $itip = $this->load_itip();
-          if ($organizer && $itip->send_itip_message($event, 'REPLY', $organizer, 'itipsubject' . $status, 'itipmailbody' . $status))
-            $this->rc->output->command('display_message', $this->gettext(array('name' => 'sentresponseto', 'vars' => array('mailto' => $organizer['name'] ? $organizer['name'] : $organizer['email']))), 'confirmation');
-          else
-            $this->rc->output->command('display_message', $this->gettext('itipresponseerror'), 'error');
+          if (!$noreply) {
+            $itip = $this->load_itip();
+            $itip->set_sender_email($reply_sender);
+            $event['comment'] = $reply_comment;
+            if ($organizer && $itip->send_itip_message($event, 'REPLY', $organizer, 'itipsubject' . $status, 'itipmailbody' . $status))
+              $this->rc->output->command('display_message', $this->gettext(array('name' => 'sentresponseto', 'vars' => array('mailto' => $organizer['name'] ? $organizer['name'] : $organizer['email']))), 'confirmation');
+            else
+              $this->rc->output->command('display_message', $this->gettext('itipresponseerror'), 'error');
+          }
         }
         break;
 
@@ -914,6 +974,95 @@
                 $success |= $this->driver->dismiss_alarm(substr($id, 4), $event['snooze']);
         }
         break;
+
+      case "changelog":
+        $data = $this->driver->get_event_changelog($event);
+        if (is_array($data) && !empty($data)) {
+          $lib = $this->lib;
+          array_walk($data, function($change) use ($lib) {
+            if ($change['date']) {
+              $dt = $lib->adjust_timezone($change['date']);
+              if ($dt instanceof DateTime)
+                $change['date'] = $dt->format('c');
+            }
+          });
+          $this->rc->output->command('plugin.render_event_changelog', $data);
+        }
+        else {
+          $this->rc->output->command('plugin.render_event_changelog', false);
+          $this->rc->output->command('display_message', $this->gettext('eventchangelognotavailable'), 'error');
+        }
+        $got_msg = true;
+        $reload = false;
+        break;
+
+      case "diff":
+        $data = $this->driver->get_event_diff($event, $event['rev']);
+        if (is_array($data)) {
+          // convert some properties, similar to self::_client_event()
+          $lib = $this->lib;
+          array_walk($data['changes'], function(&$change, $i) use ($event, $lib) {
+            // convert date cols
+            foreach (array('start','end','created','changed') as $col) {
+              if ($change['property'] == $col) {
+                $change['old'] = $this->lib->adjust_timezone($change['old'], strlen($change['old']) == 10)->format('c');
+                $change['new'] = $this->lib->adjust_timezone($change['new'], strlen($change['new']) == 10)->format('c');
+              }
+            }
+            // create textual representation for alarms and recurrence
+            if ($change['property'] == 'alarms') {
+              if (is_array($change['old']))
+                $change['old_'] = libcalendaring::alarm_text($change['old']);
+              if (is_array($change['new']))
+                $change['new_'] = libcalendaring::alarm_text(array_merge((array)$change['old'], $change['new']));
+            }
+            if ($change['property'] == 'recurrence') {
+              if (is_array($change['old']))

roundcubemail-plugins-kolab-3.2.tar.gz/plugins/calendar/calendar_ui.js Changed

@@ -8,7 +8,7 @@
  * JavaScript code in this file.
  *
  * Copyright (C) 2010, Lazlo Westerhof <hello@lazlo.me>
- * Copyright (C) 2012, Kolab Systems AG <contact@kolabsys.com>
+ * Copyright (C) 2014, 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
@@ -66,6 +66,7 @@
     var freebusy_ui = { workinhoursonly:false, needsupdate:false };
     var freebusy_data = {};
     var current_view = null;
+    var quickview_calendar;
     var exec_deferred = bw.ie6 ? 5 : 1;
     var sensitivitylabels = { 'public':rcmail.gettext('public','calendar'), 'private':rcmail.gettext('private','calendar'), 'confidential':rcmail.gettext('confidential','calendar') };
     var ui_loading = rcmail.set_busy(true, 'loading');
@@ -83,6 +84,99 @@
       selectOtherMonths: true
     };
 
+    // global fullcalendar settings
+    var fullcalendar_defaults = {
+      aspectRatio: 1,
+      ignoreTimezone: true,  // will treat the given date strings as in local (browser's) timezone
+      monthNames : settings.months,
+      monthNamesShort : settings.months_short,
+      dayNames : settings.days,
+      dayNamesShort : settings.days_short,
+      firstDay : settings.first_day,
+      firstHour : settings.first_hour,
+      slotMinutes : 60/settings.timeslots,
+      timeFormat: {
+        '': settings.time_format,
+        agenda: settings.time_format + '{ - ' + settings.time_format + '}',
+        list: settings.time_format + '{ - ' + settings.time_format + '}',
+        table: settings.time_format + '{ - ' + settings.time_format + '}'
+      },
+      axisFormat : settings.time_format,
+      columnFormat: {
+        month: 'ddd', // Mon
+        week: 'ddd ' + settings.date_short, // Mon 9/7
+        day: 'dddd ' + settings.date_short,  // Monday 9/7
+        table: settings.date_agenda
+      },
+      titleFormat: {
+        month: 'MMMM yyyy',
+        week: settings.dates_long,
+        day: 'dddd ' + settings['date_long'],
+        table: settings.dates_long
+      },
+      listPage: 7,  // advance one week in agenda view
+      listRange: settings.agenda_range,
+      listSections: settings.agenda_sections,
+      tableCols: ['handle', 'date', 'time', 'title', 'location'],
+      defaultView: rcmail.env.view || settings.default_view,
+      allDayText: rcmail.gettext('all-day', 'calendar'),
+      buttonText: {
+        prev: '&nbsp;&#9668;&nbsp;',
+        next: '&nbsp;&#9658;&nbsp;',
+        today: settings['today'],
+        day: rcmail.gettext('day', 'calendar'),
+        week: rcmail.gettext('week', 'calendar'),
+        month: rcmail.gettext('month', 'calendar'),
+        table: rcmail.gettext('agenda', 'calendar')
+      },
+      listTexts: {
+        until: rcmail.gettext('until', 'calendar'),
+        past: rcmail.gettext('pastevents', 'calendar'),
+        today: rcmail.gettext('today', 'calendar'),
+        tomorrow: rcmail.gettext('tomorrow', 'calendar'),
+        thisWeek: rcmail.gettext('thisweek', 'calendar'),
+        nextWeek: rcmail.gettext('nextweek', 'calendar'),
+        thisMonth: rcmail.gettext('thismonth', 'calendar'),
+        nextMonth: rcmail.gettext('nextmonth', 'calendar'),
+        future: rcmail.gettext('futureevents', 'calendar'),
+        week: rcmail.gettext('weekofyear', 'calendar')
+      },
+      currentTimeIndicator: settings.time_indicator,
+      // event rendering
+      eventRender: function(event, element, view) {
+        if (view.name != 'list' && view.name != 'table') {
+          var prefix = event.sensitivity && event.sensitivity != 'public' ? String(sensitivitylabels[event.sensitivity]).toUpperCase()+': ' : '';
+          element.attr('title', prefix + event.title);
+        }
+        if (view.name != 'month') {
+          if (event.location) {
+            element.find('div.fc-event-title').after('<div class="fc-event-location">@&nbsp;' + Q(event.location) + '</div>');
+          }
+          if (event.sensitivity && event.sensitivity != 'public')
+            element.find('div.fc-event-time').append('<i class="fc-icon-sensitive"></i>');
+          if (event.recurrence)
+            element.find('div.fc-event-time').append('<i class="fc-icon-recurring"></i>');
+          if (event.alarms)
+            element.find('div.fc-event-time').append('<i class="fc-icon-alarms"></i>');
+        }
+        if (event.status) {
+          element.addClass('cal-event-status-' + String(event.status).toLowerCase());
+        }
+
+        element.attr('aria-label', event.title + ', ' + me.event_date_text(event, true));
+      },
+      // render element indicating more (invisible) events
+      overflowRender: function(data, element) {
+        element.html(rcmail.gettext('andnmore', 'calendar').replace('$nr', data.count))
+          .click(function(e){ me.fisheye_view(data.date); });
+      },
+      // callback when a specific event is clicked
+      eventClick: function(event, ev, view) {
+        if (!event.temp && String(event.className).indexOf('fc-type-freebusy') < 0)
+          event_show_dialog(event, ev);
+      }
+    };
+
     /***  imports  ***/
     var Q = this.quote_html;
     var text2html = this.text2html;
@@ -158,6 +252,11 @@
       return date2servertime(date).replace(/[^0-9]/g, '').substr(0, (dateonly ? 8 : 14));
     }
 
+    var format_datetime = function(date, mode, voice)
+    {
+      return me.format_datetime(date, mode, voice);
+    }
+
     var render_link = function(url)
     {
       var islink = false, href = url;
@@ -210,11 +309,13 @@
 
     var load_attachment = function(event, att)
     {
-      var qstring = '_id='+urlencode(att.id)+'&_event='+urlencode(event.recurrence_id||event.id)+'&_cal='+urlencode(event.calendar);
+      var query = { _id: att.id, _event: event.recurrence_id || event.id, _cal:event.calendar, _frame: 1 };
+      if (event.rev)
+        query._rev = event.rev;
 
       // open attachment in frame if it's of a supported mimetype
       if (id && att.mimetype && $.inArray(att.mimetype, settings.mimetypes)>=0) {
-        if (rcmail.open_window(rcmail.env.comm_path+'&_action=get-attachment&'+qstring+'&_frame=1', true, true)) {
+        if (rcmail.open_window(rcmail.url('get-attachment', query), true, true)) {
           return;
         }
       }
@@ -284,11 +385,22 @@
     };
 
     // event details dialog (show only)
-    var event_show_dialog = function(event, ev)
+    var event_show_dialog = function(event, ev, temp)
     {
-      var $dialog = $("#eventshow").attr('class', 'uidialog');
+      var $dialog = $("#eventshow");
       var calendar = event.calendar && me.calendars[event.calendar] ? me.calendars[event.calendar] : { editable:false };
-      me.selected_event = event;
+
+      if (!temp)
+        me.selected_event = event;
+
+      if ($dialog.is(':ui-dialog'))
+        $dialog.dialog('close');
+
+      // convert start/end dates if not done yet by fullcalendar
+      if (typeof event.start == 'string')
+        event.start = parseISO8601(event.start);
+      if (typeof event.end == 'string')
+        event.end = parseISO8601(event.end);
 
       // allow other plugins to do actions when event form is opened
       rcmail.triggerEvent('calendar-event-init', {o: event});
@@ -314,7 +426,7 @@
         $('#event-alarm').show().children('.event-text').html(Q(event.alarms_text));
       
       if (calendar.name)
-        $('#event-calendar').show().children('.event-text').html(Q(calendar.name)).attr('class', 'event-text').addClass('cal-'+calendar.id);
+        $('#event-calendar').show().children('.event-text').html(Q(calendar.name)).attr('class', 'event-text cal-'+calendar.id).css('color', calendar.textColor || calendar.color || '');
       if (event.categories)
         $('#event-category').show().children('.event-text').html(Q(event.categories)).attr('class', 'event-text cat-'+String(event.categories).toLowerCase().replace(rcmail.identifier_expr, ''));
       if (event.free_busy)
@@ -333,6 +445,13 @@
         $('#event-sensitivity').show().children('.event-text').html(Q(sensitivitylabels[event.sensitivity]));
         $dialog.addClass('sensitivity-'+event.sensitivity);
       }
+      if (event.created || event.changed) {
+        var created = parseISO8601(event.created),
+          changed = parseISO8601(event.changed)
+        $('#event-created-changed .event-created').html(Q(created ? format_datetime(created) : rcmail.gettext('unknown','calendar')))
+        $('#event-created-changed .event-changed').html(Q(changed ? format_datetime(changed) : rcmail.gettext('unknown','calendar')))
+        $('#event-created-changed').show()
+      }
 
       // create attachments list
       if ($.isArray(event.attachments)) {
@@ -354,31 +473,26 @@
           return (j - k);
         });
 
-        var data, dispname, tooltip, organizer = false, rsvp = false, line,  morelink, html = '',overflow = '';
+        var data, mystatus = null, rsvp, line, morelink, html = '', overflow = '';

roundcubemail-plugins-kolab-3.2.tar.gz/plugins/calendar/config.inc.php.dist Changed

@@ -127,6 +127,9 @@
 // SMTP password used to send (anonymous) itip messages
 $rcmail_config['calendar_itip_smtp_pass'] = '123456';
 
+// show virtual invitation calendars (Kolab driver only)
+$rcmail_config['kolab_invitation_calendars'] = true;
+
 // Base URL to build fully qualified URIs to access calendars via CALDAV
 // The following replacement variables are supported:
 // %h - Current HTTP host
@@ -140,6 +143,14 @@
 // $rcmail_config['calendar_resources_driver'] = 'ldap';
 
 // LDAP directory configuration to find avilable resources for events
-// $rcmail_config['calendar_resources_directory'] = array(/* ldap_public-like address book configuration */)
+// $rcmail_config['calendar_resources_directory'] = array(/* ldap_public-like address book configuration */);
+
+// Action taken after iTip request is handled. Possible values:
+// 0 - no action
+// 1 - move to Trash
+// 2 - delete the message
+// 3 - flag as deleted
+// folder_name - move the message to the specified folder
+$rcmail_config['calendar_itip_after_action'] = 0;
 
 ?>

roundcubemail-plugins-kolab-3.2.tar.gz/plugins/calendar/drivers/calendar_driver.php Changed

@@ -100,7 +100,8 @@
   public $attendees = false;
   public $freebusy = false;
   public $attachments = false;
-  public $undelete = false; // event undelete action
+  public $undelete = false;
+  public $history = false;
   public $categoriesimmutable = false;
   public $alarm_types = array('DISPLAY');
   public $alarm_absolute = true;
@@ -191,6 +192,18 @@
   abstract function edit_event($event);
 
   /**
+   * Extended event editing with possible changes to the argument
+   *
+   * @param array  Hash array with event properties
+   * @param string New participant status
+   * @return boolean True on success, False on error
+   */
+  public function edit_rsvp(&$event, $status)
+  {
+    return $this->edit_event($event);
+  }
+
+  /**
    * Move a single event
    *
    * @param array Hash array with event properties:
@@ -394,6 +407,77 @@
   }
 
   /**
+   * Provide a list of revisions for the given event
+   *
+   * @param array  $event Hash array with event properties:
+   *         id: Event identifier
+   *   calendar: Calendar identifier
+   *
+   * @return array List of changes, each as a hash array:
+   *         rev: Revision number
+   *        type: Type of the change (create, update, move, delete)
+   *        date: Change date
+   *        user: The user who executed the change
+   *          ip: Client IP
+   * destination: Destination calendar for 'move' type
+   */
+  public function get_event_changelog($event)
+  {
+    return false;
+  }
+
+  /**
+   * Get a list of property changes beteen two revisions of an event
+   *
+   * @param array  $event Hash array with event properties:
+   *         id: Event identifier
+   *   calendar: Calendar identifier
+   * @param mixed  $rev   Revisions: "from:to"
+   *
+   * @return array List of property changes, each as a hash array:
+   *    property: Revision number
+   *         old: Old property value
+   *         new: Updated property value
+   */
+  public function get_event_diff($event, $rev)
+  {
+    return false;
+  }
+
+  /**
+   * Return full data of a specific revision of an event
+   *
+   * @param mixed  UID string or hash array with event properties:
+   *        id: Event identifier
+   *  calendar: Calendar identifier
+   * @param mixed  $rev Revision number
+   *
+   * @return array Event object as hash array
+   * @see self::get_event()
+   */
+  public function get_event_revison($event, $rev)
+  {
+    return false;
+  }
+
+  /**
+   * Command the backend to restore a certain revision of an event.
+   * This shall replace the current event with an older version.
+   *
+   * @param mixed  UID string or hash array with event properties:
+   *        id: Event identifier
+   *  calendar: Calendar identifier
+   * @param mixed  $rev Revision number
+   *
+   * @return boolean True on success, False on failure
+   */
+  public function restore_event_revision($event, $rev)
+  {
+    return false;
+  }
+
+
+  /**
    * Callback function to produce driver-specific calendar create/edit form
    *
    * @param string Request action 'form-edit|form-new'

roundcubemail-plugins-kolab-3.2.tar.gz/plugins/calendar/drivers/database/database_driver.php Changed

roundcubemail-plugins-kolab-3.2.tar.gz/plugins/calendar/drivers/kolab/kolab_calendar.php Changed

@@ -30,6 +30,7 @@
   public $readonly = true;
   public $attachments = true;
   public $alarms = false;
+  public $history = false;
   public $subscriptions = true;
   public $categories = array();
   public $storage;
@@ -209,9 +210,10 @@
    * @param  string  Search query (optional)
    * @param  boolean Include virtual events (optional)
    * @param  array   Additional parameters to query storage
+   * @param  array   Additional query to filter events
    * @return array A list of event records
    */
-  public function list_events($start, $end, $search = null, $virtual = 1, $query = array())
+  public function list_events($start, $end, $search = null, $virtual = 1, $query = array(), $filter_query = null)
   {
     // convert to DateTime for comparisons
     try {
@@ -227,10 +229,24 @@
       $end = new DateTime('today +10 years');
     }
 
+    // get email addresses of the current user
+    $user_emails = $this->cal->get_user_emails();
+
     // query Kolab storage
     $query[] = array('dtstart', '<=', $end);
     $query[] = array('dtend',   '>=', $start);
 
+    // add query to exclude pending/declined invitations
+    if (empty($filter_query)) {
+      foreach ($user_emails as $email) {
+        $query[] = array('tags', '!=', 'x-partstat:' . $email . ':needs-action');
+        $query[] = array('tags', '!=', 'x-partstat:' . $email . ':declined');
+      }
+    }
+    else if (is_array($filter_query)) {
+      $query = array_merge($query, $filter_query);
+    }
+
     if (!empty($search)) {
         $search = mb_strtolower($search);
         foreach (rcube_utils::normalize_string($search, true) as $word) {
@@ -240,6 +256,15 @@
 
     $events = array();
     foreach ($this->storage->select($query) as $record) {
+      // post-filter events to skip pending and declined invitations
+      if (empty($filter_query) && is_array($record['attendees'])) {
+        foreach ($record['attendees'] as $attendee) {
+          if (in_array($attendee['email'], $user_emails) && in_array($attendee['status'], array('NEEDS-ACTION','DECLINED'))) {
+            continue 2;
+          }
+        }
+      }
+
       $event = $this->_to_rcube_event($record);
       $this->events[$event['id']] = $event;
 
@@ -565,53 +590,8 @@
   {
     $record['id'] = $record['uid'];
     $record['calendar'] = $this->id;
-/*
-    // convert from DateTime to unix timestamp
-    if (is_a($record['start'], 'DateTime'))
-      $record['start'] = $record['start']->format('U');
-    if (is_a($record['end'], 'DateTime'))
-      $record['end'] = $record['end']->format('U');
-*/
-    // all-day events go from 12:00 - 13:00
-    if ($record['end'] <= $record['start'] && $record['allday']) {
-      $record['end'] = clone $record['start'];
-      $record['end']->add(new DateInterval('PT1H'));
-    }
-
-    if (!empty($record['_attachments'])) {
-      foreach ($record['_attachments'] as $key => $attachment) {
-        if ($attachment !== false) {
-          if (!$attachment['name'])
-            $attachment['name'] = $key;
-
-          unset($attachment['path'], $attachment['content']);
-          $attachments[] = $attachment;
-        }
-      }
-
-      $record['attachments'] = $attachments;
-    }
-
-    // Roundcube only supports one category assignment
-    if (is_array($record['categories']))
-      $record['categories'] = $record['categories'][0];
-
-    // the cancelled flag transltes into status=CANCELLED
-    if ($record['cancelled'])
-      $record['status'] = 'CANCELLED';
-
-    // The web client only supports DISPLAY type of alarms
-    if (!empty($record['alarms']))
-      $record['alarms'] = preg_replace('/:[A-Z]+$/', ':DISPLAY', $record['alarms']);
-
-    // remove empty recurrence array
-    if (empty($record['recurrence']))
-      unset($record['recurrence']);
-
-    // remove internals
-    unset($record['_mailbox'], $record['_msguid'], $record['_formatobj'], $record['_attachments'], $record['x-custom']);
 
-    return $record;
+    return kolab_driver::to_rcube_event($record);
   }
 
    /**
@@ -671,7 +651,7 @@
     }
 
     // remove some internal properties which should not be saved
-    unset($event['_savemode'], $event['_fromcalendar'], $event['_identity']);
+    unset($event['_savemode'], $event['_fromcalendar'], $event['_identity'], $event['_folder_id'], $event['className']);
 
     // copy meta data (starting with _) from old object
     foreach ((array)$old as $key => $val) {

roundcubemail-plugins-kolab-3.2.tar.gz/plugins/calendar/drivers/kolab/kolab_driver.php Changed

@@ -25,9 +25,14 @@
 
 require_once(dirname(__FILE__) . '/kolab_calendar.php');
 require_once(dirname(__FILE__) . '/kolab_user_calendar.php');
+require_once(dirname(__FILE__) . '/kolab_invitation_calendar.php');
+
 
 class kolab_driver extends calendar_driver
 {
+  const INVITATIONS_CALENDAR_PENDING  = '--invitation--pending';
+  const INVITATIONS_CALENDAR_DECLINED = '--invitation--declined';
+
   // features this backend supports
   public $alarms = true;
   public $attendees = true;
@@ -42,6 +47,7 @@
   private $calendars;
   private $has_writeable = false;
   private $freebusy_trigger = false;
+  private $bonnie_api = false;
 
   /**
    * Default constructor
@@ -64,6 +70,10 @@
         $this->alarm_absolute = false;
     }
 
+    // get configuration for the Bonnie API
+    if ($bonnie_config = $this->cal->rc->config->get('kolab_bonnie_api', false))
+      $this->bonnie_api = new kolab_bonnie_api($bonnie_config);
+
     // calendar uses fully encoded identifiers
     kolab_storage::$encode_ids = true;
   }
@@ -159,6 +169,7 @@
           'active'   => $cal->is_active(),
           'title'    => $cal->get_owner(),
           'owner'    => $cal->get_owner(),
+          'history'  => false,
           'virtual'  => false,
           'readonly' => true,
           'group'    => 'other',
@@ -187,6 +198,7 @@
           'color'    => $cal->get_color(),
           'readonly' => $cal->readonly,
           'showalarms' => $cal->alarms,
+          'history'  => !empty($this->bonnie_api),
           'group'    => $cal->get_namespace(),
           'default'  => $cal->default,
           'active'   => $cal->is_active(),
@@ -202,6 +214,36 @@
       }
     }
 
+    // list virtual calendars showing invitations
+    if ($this->rc->config->get('kolab_invitation_calendars')) {
+      foreach (array(self::INVITATIONS_CALENDAR_PENDING, self::INVITATIONS_CALENDAR_DECLINED) as $id) {
+        $cal = new kolab_invitation_calendar($id, $this->cal);
+        $this->calendars[$cal->id] = $cal;
+        if (!$active || $cal->is_active()) {
+          $calendars[$id] = array(
+            'id'       => $cal->id,
+            'name'     => $cal->get_name(),
+            'listname' => $cal->get_name(),
+            'editname' => $cal->get_foldername(),
+            'title'    => $cal->get_title(),
+            'color'    => $cal->get_color(),
+            'readonly' => $cal->readonly,
+            'showalarms' => $cal->alarms,
+            'history'  => !empty($this->bonnie_api),
+            'group'    => 'x-invitations',
+            'default'  => false,
+            'active'   => $cal->is_active(),
+            'owner'    => $cal->get_owner(),
+            'children' => false,
+          );
+
+          if (is_object($tree)) {
+            $tree->children[] = $cal;
+          }
+        }
+      }
+    }
+
     // append the virtual birthdays calendar
     if ($this->rc->config->get('calendar_contact_birthdays', false)) {
       $id = self::BIRTHDAY_CALENDAR_ID;
@@ -214,10 +256,11 @@
           'color'      => $prefs[$id]['color'],
           'active'     => $prefs[$id]['active'],
           'showalarms' => (bool)$this->rc->config->get('calendar_birthdays_alarm_type'),
-          'group'      => 'birthdays',
+          'group'      => 'x-birthdays',
           'readonly'   => true,
           'default'    => false,
           'children'   => false,
+          'history'    => false,
         );
       }
     }
@@ -273,10 +316,13 @@
    * @param string Calendar identifier (encoded imap folder name)
    * @return object kolab_calendar Object nor null if calendar doesn't exist
    */
-  protected function get_calendar($id)
+  public function get_calendar($id)
   {
     // create calendar object if necesary
-    if (!$this->calendars[$id] && $id !== self::BIRTHDAY_CALENDAR_ID) {
+    if (!$this->calendars[$id] && in_array($id, array(self::INVITATIONS_CALENDAR_PENDING, self::INVITATIONS_CALENDAR_DECLINED))) {
+      $this->calendars[$id] = new kolab_invitation_calendar($id, $this->cal);
+    }
+    else if (!$this->calendars[$id] && $id !== self::BIRTHDAY_CALENDAR_ID) {
       $calendar = kolab_calendar::factory($id, $this->cal);
       if ($calendar->ready)
         $this->calendars[$calendar->id] = $calendar;
@@ -363,7 +409,7 @@
    */
   public function subscribe_calendar($prop)
   {
-    if ($prop['id'] && ($cal = $this->get_calendar($prop['id']))) {
+    if ($prop['id'] && ($cal = $this->get_calendar($prop['id'])) && is_object($cal->storage)) {
       $ret = false;
       if (isset($prop['permanent']))
         $ret |= $cal->storage->subscribe(intval($prop['permanent']));
@@ -452,6 +498,7 @@
 
     // don't list the birthday calendar
     $this->rc->config->set('calendar_contact_birthdays', false);
+    $this->rc->config->set('kolab_invitation_calendars', false);
 
     return $this->list_calendars();
   }
@@ -536,6 +583,29 @@
   }
 
   /**
+   * Extended event editing with possible changes to the argument
+   *
+   * @param array  Hash array with event properties
+   * @param string New participant status
+   * @return boolean True on success, False on error
+   */
+  public function edit_rsvp(&$event, $status)
+  {
+    if (($ret = $this->update_event($event)) && $this->rc->config->get('kolab_invitation_calendars')) {
+      // re-assign to the according (virtual) calendar
+      if (strtoupper($status) == 'DECLINED')
+        $event['calendar'] = self::INVITATIONS_CALENDAR_DECLINED;
+      else if (strtoupper($status) == 'NEEDS-ACTION')
+        $event['calendar'] = self::INVITATIONS_CALENDAR_PENDING;
+      else if ($event['_folder_id'])
+        $event['calendar'] = $event['_folder_id'];
+    }
+
+    return $ret;
+  }
+
+
+  /**
    * Move a single event
    *
    * @see calendar_driver::move_event()
@@ -580,6 +650,7 @@
   {
     $success = false;
     $savemode = $event['_savemode'];
+    $decline  = $event['decline'];
 
     if (($storage = $this->get_calendar($event['calendar'])) && ($event = $storage->get_event($event['id']))) {
       $event['_savemode'] = $savemode;
@@ -664,7 +735,15 @@
           }
 
         default:  // 'all' is default
-          $success = $storage->delete_event($master, $force);
+          if ($decline && $this->rc->config->get('kolab_invitation_calendars')) {
+            // don't delete but set PARTSTAT=DECLINED
+            if ($this->cal->lib->set_partstat($master, 'DECLINED')) {
+              $success = $storage->update_event($master);
+            }
+          }
+
+          if (!$success)
+            $success = $storage->delete_event($master, $force);
           break;
       }
     }
@@ -1215,6 +1294,259 @@
     exit;
   }
 
+
+  /**
+   * Convert from Kolab_Format to internal representation
+   */
+  public static function to_rcube_event($record)
+  {
+    $record['id'] = $record['uid'];
+

roundcubemail-plugins-kolab-3.2.tar.gz/plugins/calendar/drivers/kolab/kolab_invitation_calendar.php Added

@@ -0,0 +1,338 @@
+<?php
+
+/**
+ * Kolab calendar storage class simulating a virtual calendar listing pedning/declined invitations
+ *
+ * @author Thomas Bruederli <bruederli@kolabsys.com>
+ *
+ * Copyright (C) 2014, 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/>.
+ */
+
+class kolab_invitation_calendar
+{
+  public $id = '__invitation__';
+  public $ready = true;
+  public $alarms = false;
+  public $readonly = true;
+  public $attachments = false;
+  public $subscriptions = false;
+  public $partstats = array('unknown');
+  public $categories = array();
+  public $name = 'Invitations';
+
+  /**
+   * Default constructor
+   */
+  public function __construct($id, $calendar)
+  {
+    $this->cal = $calendar;
+    $this->id = $id;
+
+    switch ($this->id) {
+      case kolab_driver::INVITATIONS_CALENDAR_PENDING:
+        $this->partstats = array('NEEDS-ACTION');
+        $this->name = $this->cal->gettext('invitationspending');
+        if (!empty($_REQUEST['_quickview']))
+          $this->partstats[] = 'TENTATIVE';
+        break;
+
+      case kolab_driver::INVITATIONS_CALENDAR_DECLINED:
+        $this->partstats = array('DECLINED');
+        $this->name = $this->cal->gettext('invitationsdeclined');
+        break;
+    }
+
+    // user-specific alarms settings win
+    $prefs = $this->cal->rc->config->get('kolab_calendars', array());
+    if (isset($prefs[$this->id]['showalarms']))
+      $this->alarms = $prefs[$this->id]['showalarms'];
+  }
+
+
+  /**
+   * Getter for a nice and human readable name for this calendar
+   *
+   * @return string Name of this calendar
+   */
+  public function get_name()
+  {
+    return $this->name;
+  }
+
+
+  /**
+   * Getter for the IMAP folder owner
+   *
+   * @return string Name of the folder owner
+   */
+  public function get_owner()
+  {
+    return $this->cal->rc->get_user_name();
+  }
+
+
+  /**
+   *
+   */
+  public function get_title()
+  {
+    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()
+  {
+    return 'x-special';
+  }
+
+
+  /**
+   * Getter for the top-end calendar folder name (not the entire path)
+   *
+   * @return string Name of this calendar
+   */
+  public function get_foldername()
+  {
+    return $this->get_name();
+  }
+
+  /**
+   * Getter for the Cyrus mailbox identifier corresponding to this folder
+   *
+   * @return string Mailbox ID
+   */
+  public function get_mailbox_id()
+  {
+    // this is a virtual collection and has no concrete mailbox ID
+    return null;
+  }
+
+  /**
+   * Return color to display this calendar
+   */
+  public function get_color()
+  {
+    // calendar color is stored in local user prefs
+    $prefs = $this->cal->rc->config->get('kolab_calendars', array());
+
+    if (!empty($prefs[$this->id]) && !empty($prefs[$this->id]['color']))
+      return $prefs[$this->id]['color'];
+
+    return 'ffffff';
+  }
+
+  /**
+   * Compose an URL for CalDAV access to this calendar (if configured)
+   */
+  public function get_caldav_url()
+  {
+    return false;
+  }
+
+  /**
+   * Check activation status of this folder
+   *
+   * @return boolean True if enabled, false if not
+   */
+  public function is_active()
+  {
+    $prefs = $this->cal->rc->config->get('kolab_calendars', array());  // read local prefs
+    return (bool)$prefs[$this->id]['active'];
+  }
+
+  /**
+   * Update properties of this calendar folder
+   *
+   * @see calendar_driver::edit_calendar()
+   */
+  public function update(&$prop)
+  {
+    // don't change anything.
+    // let kolab_driver save props in local prefs
+    return $prop['id'];
+  }
+
+
+  /**
+   * Getter for a single event object
+   */
+  public function get_event($id)
+  {
+    // redirect call to kolab_driver::get_event()
+    $event = $this->cal->driver->get_event($id, true);
+
+    if (is_array($event)) {
+      // add pointer to original calendar folder
+      $event['_folder_id'] = $event['calendar'];
+      $event = $this->_mod_event($event);
+    }
+
+    return $event;
+  }
+
+
+  /**
+   * @param  integer Event's new start (unix timestamp)
+   * @param  integer Event's new end (unix timestamp)
+   * @param  string  Search query (optional)
+   * @param  boolean Include virtual events (optional)
+   * @param  array   Additional parameters to query storage
+   * @return array A list of event records
+   */

roundcubemail-plugins-kolab-3.2.tar.gz/plugins/calendar/drivers/kolab/kolab_user_calendar.php Changed

@@ -210,8 +210,10 @@
       }
     }
 
-    // get events from the user's free/busy feed
-    $this->fetch_freebusy($limit_changed);
+    // get events from the user's free/busy feed (for quickview only)
+    if (!empty($_REQUEST['_quickview']) && empty($search)) {
+      $this->fetch_freebusy($limit_changed);
+    }
 
     $events = array();
     foreach ($this->events as $id => $event) {
@@ -281,7 +283,7 @@
 
     // console('_fetch_freebusy', kolab_storage::get_freebusy_url($this->userdata['mail']), $fbdata);
 
-    // parse free-busy information using Horde classes
+    // parse free-busy information
     $count = 0;
     if ($fbdata) {
       $ical = $this->cal->get_ical();
@@ -304,6 +306,7 @@
             'start'     => $from,
             'end'       => $to,
             'free_busy' => $statusmap[$type] ?: 'busy',
+            'className' => 'fc-type-freebusy',
             'organizer' => array(
               'email' => $this->userdata['mail'],
               'name'  => $this->userdata['displayname'],
@@ -388,9 +391,7 @@
     $record['id'] = $record['uid'];
     $record['calendar'] = $this->id;
 
-    // TODO: implement this
-
-    return $record;
+    return kolab_driver::to_rcube_event($record);
   }
 
 }

roundcubemail-plugins-kolab-3.2.tar.gz/plugins/calendar/lib/calendar_itip.php Changed

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

@@ -97,6 +97,7 @@
     $this->cal->register_handler('plugin.angenda_options', array($this, 'angenda_options'));
     $this->cal->register_handler('plugin.events_import_form', array($this, 'events_import_form'));
     $this->cal->register_handler('plugin.events_export_form', array($this, 'events_export_form'));
+    $this->cal->register_handler('plugin.event_changelog_table', array($this, 'event_changelog_table'));
     $this->cal->register_handler('plugin.searchform', array($this->rc->output, 'search_form'));  // use generic method from rcube_template
   }
 
@@ -308,6 +309,7 @@
         html::span(array('class' => 'calname', 'id' => $label_id, 'title' => $title), $prop['editname'] ? Q($prop['editname']) : $prop['listname']) .
         ($prop['virtual'] ? '' :
           html::tag('input', array('type' => 'checkbox', 'name' => '_cal[]', 'value' => $id, 'checked' => $prop['active'], 'aria-labelledby' => $label_id), '') .
+          html::a(array('href' => '#', 'class' => 'quickview', 'title' => $this->cal->gettext('quickview'), 'role' => 'button'), '') .
           (isset($prop['subscribed']) ? html::a(array('href' => '#', 'class' => 'subscribed', 'title' => $this->cal->gettext('calendarsubscribe'), 'role' => 'checkbox', 'aria-checked' => $prop['subscribed'] ? 'true' : 'false'), ' ') : '') .
           html::span(array('class' => 'handle', 'style' => "background-color: #" . ($prop['color'] ?: 'f00')), '&nbsp;')
         )
@@ -692,13 +694,22 @@
    */
   function attendees_list($attrib = array())
   {
-    $table = new html_table(array('cols' => 5, 'border' => 0, 'cellpadding' => 0, 'class' => 'rectable'));
+    // add "noreply" checkbox to attendees table only
+    $invitations = strpos($attrib['id'], 'attend') !== false;
+
+    $invite = new html_checkbox(array('value' => 1, 'id' => 'edit-attendees-invite'));
+    $table  = new html_table(array('cols' => 5 + intval($invitations), 'border' => 0, 'cellpadding' => 0, 'class' => 'rectable'));
+
     $table->add_header('role', $this->cal->gettext('role'));
     $table->add_header('name', $this->cal->gettext($attrib['coltitle'] ?: 'attendee'));
     $table->add_header('availability', $this->cal->gettext('availability'));
     $table->add_header('confirmstate', $this->cal->gettext('confirmstate'));
+    if ($invitations) {
+      $table->add_header(array('class' => 'sendmail', 'title' => $this->cal->gettext('sendinvitations')),
+        $invite->show(1) . html::label('edit-attendees-invite', $this->cal->gettext('sendinvitations')));
+    }
     $table->add_header('options', '');
-    
+
     return $table->show($attrib);
   }
 
@@ -707,15 +718,16 @@
    */
   function attendees_form($attrib = array())
   {
-    $input = new html_inputfield(array('name' => 'participant', 'id' => 'edit-attendee-name', 'size' => 30));
-    $checkbox = new html_checkbox(array('name' => 'invite', 'id' => 'edit-attendees-invite', 'value' => 1));
-    
+    $input    = new html_inputfield(array('name' => 'participant', 'id' => 'edit-attendee-name', 'size' => 30));
+    $textarea = new html_textarea(array('name' => 'comment', 'id' => 'edit-attendees-comment',
+        'rows' => 4, 'cols' => 55, 'title' => $this->cal->gettext('itipcommenttitle')));
+
     return html::div($attrib,
       html::div(null, $input->show() . " " .
         html::tag('input', array('type' => 'button', 'class' => 'button', 'id' => 'edit-attendee-add', 'value' => $this->cal->gettext('addattendee'))) . " " .
         html::tag('input', array('type' => 'button', 'class' => 'button', 'id' => 'edit-attendee-schedule', 'value' => $this->cal->gettext('scheduletime').'...'))) .
-      html::p('attendees-invitebox', html::label(null, $checkbox->show(1) . $this->cal->gettext('sendinvitations')))
-      );
+      html::p('attendees-commentbox', html::label(null, $this->cal->gettext('itipcomment') . $textarea->show()))
+    );
   }
 
   /**
@@ -830,6 +842,22 @@
   }
 
   /**
+   * Table oultine for event changelog display
+   */
+  function event_changelog_table($attrib = array())
+  {
+    $table = new html_table(array('cols' => 5, 'border' => 0, 'cellspacing' => 0));
+    $table->add_header('diff', '');
+    $table->add_header('revision', $this->cal->gettext('revision'));
+    $table->add_header('date', $this->cal->gettext('date'));
+    $table->add_header('user', $this->cal->gettext('user'));
+    $table->add_header('operation', $this->cal->gettext('operation'));
+    $table->add_header('actions', '&nbsp;');
+
+    return $table->show($attrib);
+  }
+
+  /**
    *
    */
   function event_invitebox($attrib = array())
@@ -856,7 +884,9 @@
         'value' => $this->cal->itip->gettext('itip' . $method),
       ));
     }
-    
+
+    $buttons .= html::div('itip-reply-controls', $this->cal->itip->itip_rsvp_options_ui($attrib['id']));
+
     return html::div($attrib,
       html::div('label', $this->cal->itip->gettext('acceptinvitation')) .
       html::div('rsvp-buttons', $buttons));

roundcubemail-plugins-kolab-3.2.tar.gz/plugins/calendar/lib/js/fullcalendar.js Changed

@@ -509,9 +509,9 @@
 	// TODO: going forward, most of this stuff should be directly handled by the view
 
 
-	function refetchEvents() { // can be called as an API method
+	function refetchEvents(source) { // can be called as an API method
 		clearEvents();
-		fetchAndRenderEvents();
+		fetchAndRenderEvents(source);
 	}
 
 
@@ -547,18 +547,13 @@
 	}
 
 
-	function fetchAndRenderEvents() {
-		fetchEvents(currentView.visStart, currentView.visEnd);
+	function fetchAndRenderEvents(source) {
+		fetchEvents(currentView.visStart, currentView.visEnd, source);
 			// ... will call reportEvents
 			// ... which will call renderEvents
 	}
 
 
-	function refetchEvents(source) {
-		fetchEvents(currentView.visStart, currentView.visEnd, source); // will call reportEvents
-	}
-
-	
 	// called when event data arrives
 	function reportEvents(_events) {
 		events = _events;
@@ -4763,6 +4758,7 @@
 	
 	function renderEvents(events, modifiedEventId) {
 		events.sort(sortCmp);
+		clearEvents();
 		renderSegs(compileSegs(events), modifiedEventId);
 	}
 	
@@ -5100,6 +5096,7 @@
 	
 	function renderEvents(events, modifiedEventId) {
 		events.sort(sortCmp);
+		clearEvents();
 		renderSegs(compileSegs(events), modifiedEventId);
 		getListContainer().removeClass('fc-list-smart fc-list-day fc-list-month fc-list-week').addClass('fc-list-' + opt('listSections'));
 	}
@@ -5131,7 +5128,7 @@
 				if (event.source && event.source.className) {
 					skinClasses = skinClasses.concat(event.source.className);
 				}
-				rowClasses = ['fc-event', 'fc-event-row', 'fc-'+dayIDs[event.start.getDay()]];
+				rowClasses = ['fc-event', 'fc-event-row', 'fc-'+dayIDs[event.start.getDay()]].concat(event.className);
 				if (seg.daydiff == 0) {
 					rowClasses.push('fc-today');
 				}

roundcubemail-plugins-kolab-3.2.tar.gz/plugins/calendar/localization/en_US.inc Changed

@@ -17,6 +17,13 @@
 $labels['coloringmode1'] = 'According to category';
 $labels['coloringmode2'] = 'Calendar for outline, category for content';
 $labels['coloringmode3'] = 'Category for outline, calendar for content';
+$labels['afternothing'] = 'Do nothing';
+$labels['aftertrash'] = 'Move to Trash';
+$labels['afterdelete'] = 'Delete the message';
+$labels['afterflagdeleted'] = 'Flag as deleted';
+$labels['aftermoveto'] = 'Move to...';
+$labels['itipoptions'] = 'Event Invitations';
+$labels['afteraction'] = 'After an invitation or update message is processed';
 
 // calendar
 $labels['calendar'] = 'Calendar';
@@ -63,6 +70,7 @@
 $labels['busy'] = 'Busy';
 $labels['outofoffice'] = 'Out of Office';
 $labels['tentative'] = 'Tentative';
+$labels['mystatus'] = 'My status';
 $labels['status'] = 'Status';
 $labels['confirmed'] = 'Confirmed';
 $labels['cancelled'] = 'Cancelled';
@@ -73,7 +81,12 @@
 $labels['confidential'] = 'confidential';
 $labels['alarms'] = 'Reminder';
 $labels['comment'] = 'Comment';
+$labels['created'] = 'Created';
+$labels['changed'] = 'Last Modified';
+$labels['unknown'] = 'Unknown';
+$labels['eventoptions'] = 'Options';
 $labels['generated'] = 'generated at';
+$labels['eventhistory'] = 'History';
 $labels['printdescriptions'] = 'Print descriptions';
 $labels['parentcalendar'] = 'Insert inside';
 $labels['searchearlierdates'] = '« Search for earlier events';
@@ -94,6 +107,10 @@
 $labels['calendarsubscribe'] = 'List permanently';
 $labels['nocalendarsfound'] = 'No calendars found';
 $labels['nrcalendarsfound'] = '$nr calendars found';
+$labels['quickview'] = 'View only this calendar';
+$labels['invitationspending'] = 'Pending invitations';
+$labels['invitationsdeclined'] = 'Declined invitations';
+$labels['changepartstat'] = 'Change participant status';
 
 // agenda view
 $labels['listrange'] = 'Range to display:';
@@ -167,6 +184,8 @@
 
 $labels['itipdeclineevent'] = 'Do you want to decline your invitation to this event?';
 $labels['declinedeleteconfirm'] = 'Do you also want to delete this declined event from your calendar?';
+$labels['itipcomment'] = 'Invitation/notification comment';
+$labels['itipcommenttitle'] = 'This comment will be attached to the invitation/notification message sent to participants';
 
 $labels['notanattendee'] = 'You\'re not listed as an attendee of this event';
 $labels['eventcancelled'] = 'The event has been cancelled';
@@ -239,6 +258,24 @@
 $labels['birthdayeventtitle'] = '$name\'s Birthday';
 $labels['birthdayage'] = 'Age $age';
 
+// history dialog
+$labels['eventchangelog'] = 'Change History';
+$labels['eventdiff'] = 'Changes from revisions $rev';
+$labels['revision'] = 'Revision';
+$labels['user'] = 'User';
+$labels['operation'] = 'Action';
+$labels['actionappend'] = 'Saved';
+$labels['actionmove'] = 'Moved';
+$labels['actiondelete'] = 'Deleted';
+$labels['compare'] = 'Compare';
+$labels['showrevision'] = 'Show this version';
+$labels['restore'] = 'Restore this version';
+$labels['eventnotfound'] = 'Failed to load event data';
+$labels['eventchangelognotavailable'] = 'Change history is not available for this event';
+$labels['eventdiffnotavailable'] = 'No comparison possible for the selected revisions';
+$labels['eventrestoreconfirm'] = 'Do you really want to restore revision $rev of this event? This will replace the current event with the old version.';
+
+
 // (hidden) titles and labels for accessibility annotations
 $labels['arialabelminical'] = 'Calendar date selection';
 $labels['arialabelcalendarview'] = 'Calendar view';

roundcubemail-plugins-kolab-3.2.tar.gz/plugins/calendar/skins/classic/calendar.css Changed

@@ -526,6 +526,10 @@
 
 /* jQuery UI overrides */
 
+.calendarmain .ui-dialog .ui-dialog-buttonpane .ui-dialog-buttonset {
+	float: left;
+}
+
 #eventshow h1 {
 	font-size: 20px;
 	margin: 0.1em 0 0.4em 0;
@@ -568,6 +572,41 @@
 	margin-bottom: 0.3em;
 }
 
+#event-rsvp .itip-reply-controls {
+	margin-top: 0.5em;
+}
+
+#eventshow .itip-reply-controls label {
+	font-size: 1em;
+	color: #333;
+}
+
+#event-partstat .changersvp {
+	cursor: pointer;
+	color: #333;
+	text-decoration: none;
+}
+
+#event-partstat:hover .changersvp {
+	text-decoration: underline;
+}
+
+#event-partstat .changersvp.accepted {
+	color: #589b1e;
+}
+
+#event-partstat .changersvp.tentative {
+	color: #f0bb1d;
+}
+
+#event-partstat .changersvp.declined {
+	color: #ea0000;
+}
+
+#event-partstat .changersvp.delegated {
+	color: #018be9;
+}
+
 #eventedit {
 	position: relative;
 	padding: 0.5em 0.1em;
@@ -771,26 +810,46 @@
 	border: 1px solid #ccc;
 }
 
+.edit-attendees-table th,
 .edit-attendees-table td {
 	padding: 3px;
 	border-bottom: 1px solid #ccc;
+	text-align: left;
 }
 
+.edit-attendees-table th.role,
 .edit-attendees-table td.role {
 	width: 8em;
 }
 
+.edit-attendees-table th.availability,
+.edit-attendees-table th.confirmstate,
 .edit-attendees-table td.availability,
 .edit-attendees-table td.confirmstate {
 	width: 4em;
 }
 
+.edit-attendees-table th.options,
 .edit-attendees-table td.options {
-	width: 3em;
+	width: 2em;
 	text-align: right;
 	padding-right: 4px;
 }
 
+.edit-attendees-table th.sendmail,
+.edit-attendees-table td.sendmail {
+	width: 24px;
+	padding: 2px;
+	white-space: nowrap;
+	overflow: hidden;
+	text-overflow: hidden;
+}
+
+#eventedit .edit-attendees-table th.sendmail label {
+	display: none;
+}
+
+.edit-attendees-table th.name,
 .edit-attendees-table td.name {
 	width: auto;
 	white-space: nowrap;
@@ -798,6 +857,7 @@
 	text-overflow: ellipsis;
 }
 
+.edit-attendees-table thead th,
 .edit-attendees-table thead td {
 	background: url(images/listheader.gif) top left repeat-x #CCC;
 }
@@ -1412,6 +1472,21 @@
 	padding-right: 0.6em;
 }
 
+.fc-event-vert.fc-invitation-needs-action,
+.fc-event-hori.fc-invitation-needs-action {
+	border: 1px dashed #5757c7 !important;
+}
+
+.fc-event-vert.fc-invitation-tentative,
+.fc-event-hori.fc-invitation-tentative {
+	border: 1px dashed #eb8900 !important;
+}
+
+.fc-event-vert.fc-invitation-declined,
+.fc-event-hori.fc-invitation-declined {
+	border: 1px dashed #c00 !important;
+}
+
 .fc-grid .fc-event-time {
 	font-weight: normal !important;
 	padding-right: 0.3em;

roundcubemail-plugins-kolab-3.2.tar.gz/plugins/calendar/skins/classic/templates/calendar.html Changed

@@ -81,6 +81,12 @@
     <h5 class="label"><roundcube:label name="calendar.tabattendees" /></h5>
     <div class="event-text"></div>
   </div>
+  <div class="event-line" id="event-partstat">
+    <label><roundcube:label name="calendar.mystatus" /></label>
+    <a href="#change" class="changersvp" title="<roundcube:label name='calendar.changepartstat' />">
+      <span class="event-text"></span>
+    </a>
+  </div>
   <div class="event-line" id="event-calendar">
     <label><roundcube:label name="calendar.calendar" /></label>
     <span class="event-text">Default</span>
@@ -109,6 +115,13 @@
   <roundcube:object name="plugin.event_rsvp_buttons" id="event-rsvp" style="display:none" />
 </div>
 
+<div id="eventoptionsmenu" class="popupmenu">
+  <ul>
+    <li><roundcube:button command="event-download" label="download" classAct="active" /></li>
+    <li><roundcube:button command="event-sendbymail" label="send" classAct="active" /></li>
+  </ul>
+</div>
+
 <roundcube:include file="/templates/eventedit.html" />
 
 <div id="eventresourcesdialog" class="uidialog">

roundcubemail-plugins-kolab-3.2.tar.gz/plugins/calendar/skins/larry/calendar.css Changed

@@ -216,14 +216,13 @@
 	height: 22px;
 }
 
-
 #calendars .treelist li span.calname {
 	display: block;
-	padding: 0px 30px 2px 2px;
+	padding: 0px 18px 2px 2px;
 	position: absolute;
 	top: 7px;
 	left: 38px;
-	right: 40px;
+	right: 60px;
 	cursor: default;
 	background: url(images/calendars.png) right 20px no-repeat;
 	overflow: hidden;
@@ -238,9 +237,14 @@
 	left: 20px;
 }
 
+#calendars .treelist li.x-birthdays span.calname,
+#calendars .treelist li.x-invitations span.calname {
+	font-style: italic;
+}
+
 #calendars .treelist.flat li span.calname {
 	left: 24px;
-	right: 22px;
+	right: 42px;
 }
 
 #calendars .treelist li span.handle {
@@ -273,6 +277,7 @@
 	cursor: pointer;
 }
 
+#calendars .treelist div > a.quickview:focus,
 #calendars .treelist div > a.subscribed:focus {
 	border-radius: 3px;
 	outline: 2px solid rgba(30,150,192, 0.5);
@@ -288,6 +293,29 @@
 	background-position: -16px -110px;
 }
 
+#calendars .treelist li a.quickview {
+	display: inline-block;
+	position: absolute;
+	top: 6px;
+	right: 42px;
+	width: 16px;
+	height: 16px;
+	padding: 0;
+	background: url(images/calendars.png) -100px 0 no-repeat;
+	overflow: hidden;
+	text-indent: -5000px;
+	cursor: pointer;
+}
+
+#calendars .treelist div > a.quickview:focus,
+#calendars .treelist li div:hover > a.quickview {
+	background-position: 0 -128px;
+}
+
+#calendars .treelist li div.focusview > a.quickview {
+	background-position: -18px -128px;
+}
+
 #calendars .treelist li input {
 	position: absolute;
 	top: 5px;
@@ -321,7 +349,7 @@
 	margin-left: 48px;
 }
 
-#calendars .treelist li.selected {
+#calendars .treelist li.selected > div.calendar {
 	background-color: #c7e3ef;
 }
 
@@ -635,48 +663,179 @@
 
 /* jQuery UI overrides */
 
-#eventshow h1 {
+.calendarmain .eventdialog h1 {
 	font-size: 18px;
 	margin: -0.3em 0 0.4em 0;
 }
 
-#eventshow label,
-#eventshow h5.label {
+.calendarmain .eventdialog label,
+.calendarmain .eventdialog h5.label {
 	font-weight: normal;
 	font-size: 1em;
 	color: #999;
 	margin: 0 0 0.2em 0;
 }
 
-#eventshow {
+.calendarmain .eventdialog label span.index,
+.calendarmain .eventdialog h5.label .index {
+	vertical-align: inherit;
+	margin-left: 0.6em;
+}
+
+.calendarmain .eventdialog {
 	margin: 0 -0.2em;
 }
 
-#eventshow.status-cancelled {
+.calendarmain .eventdialog.status-cancelled {
 	background: url(images/badge_cancelled.png) top right no-repeat;
 }
 
-#eventshow.sensitivity-private {
+.calendarmain .eventdialog.sensitivity-private {
 	background: url(images/badge_private.png) top right no-repeat;
 }
 
-#eventshow.sensitivity-confidential {
+.calendarmain .eventdialog.sensitivity-confidential {
 	background: url(images/badge_confidential.png) top right no-repeat;
 }
 
-.sensitivity-private #event-title {
+.calendarmain .sensitivity-private #event-title {
 	margin-right: 50px;
 }
 
-.sensitivity-confidential #event-title {
+.calendarmain .sensitivity-confidential #event-title {
 	margin-right: 60px;
 }
 
-#eventshow div.event-line {
+.calendarmain .eventdialog div.event-line {
 	margin-top: 0.1em;
 	margin-bottom: 0.3em;
 }
 
+.calendarmain .eventdialog div.event-line a.iconbutton {
+	margin-left: 0.5em;
+	line-height: 17px;
+}
+
+.calendarmain .eventdialog div.event-line span.event-text + label {
+	margin-left: 2em;
+}
+
+.calendarmain .eventdialog #event-created-changed {
+	margin-top: 0.6em;
+}
+
+.eventdialog .event-text-old,
+.eventdialog .event-text-new,
+.eventdialog .event-text-diff {
+	padding: 2px;
+}
+
+.eventdialog .event-text-diff del,
+.eventdialog .event-text-diff ins {
+	text-decoration: none;
+	color: inherit;
+}
+
+.eventdialog .event-text-old,
+.eventdialog .event-text-diff del {
+	background-color: #fdd;
+	/* text-decoration: line-through; */
+}
+
+.eventdialog .event-text-new,
+.eventdialog .event-text-diff ins {
+	background-color: #dfd;
+}
+
+#eventdiff .attachmentslist li a,
+#eventdiff .attachmentslist li a:hover {
+	cursor: default;
+	text-decoration: none;
+}
+
+#eventhistory .loading {
+	color: #666;
+	margin: 1em 0;
+	padding: 1px 0 2px 24px;
+	background: url(images/loading_blue.gif) top left no-repeat;
+}
+
+#eventhistory .compare-button {
+	margin: 4px 0;
+}
+
+#event-changelog-table tbody td {
+	padding: 4px 7px;
+	vertical-align: middle;
+}
+

roundcubemail-plugins-kolab-3.2.tar.gz/plugins/calendar/skins/larry/images/calendars.png Changed

roundcubemail-plugins-kolab-3.2.tar.gz/plugins/calendar/skins/larry/images/sendinvitation.png Added

roundcubemail-plugins-kolab-3.2.tar.gz/plugins/calendar/skins/larry/templates/calendar.html Changed

@@ -77,7 +77,7 @@
 	</ul>
 </div>
 
-<div id="eventshow" class="uidialog" aria-hidden="true">
+<div id="eventshow" class="uidialog eventdialog" aria-hidden="true">
 	<h1 id="event-title">Event Title</h1>
 	<div class="event-section" id="event-location">Location</div>
 	<div class="event-section" id="event-date">From-To</div>
@@ -101,6 +101,13 @@
 		<h5 class="label"><roundcube:label name="calendar.tabattendees" /></h5>
 		<div class="event-text"></div>
 	</div>
+	<div class="event-line" id="event-partstat">
+		<label><roundcube:label name="calendar.mystatus" /></label>
+		<span class="changersvp" role="button" tabindex="0" title="<roundcube:label name='calendar.changepartstat' />">
+			<span class="event-text"></span>
+			<a class="iconbutton edit"><roundcube:label name='calendar.changepartstat' /></a>
+		</span>
+	</div>
 	<div class="event-line" id="event-calendar">
 		<label><roundcube:label name="calendar.calendar" /></label>
 		<span class="event-text">Default</span>
@@ -129,8 +136,107 @@
 		<label><roundcube:label name="attachments" /></label>
 		<div class="event-text"></div>
 	</div>
+	<div class="event-line" id="event-created-changed">
+		<label><roundcube:label name="calendar.created" /></label>
+		<span class="event-text event-created"></span>
+		<label><roundcube:label name="calendar.changed" /></label>
+		<span class="event-text event-changed"></span>
+	</div>
 
-	<roundcube:object name="plugin.event_rsvp_buttons" id="event-rsvp" style="display:none" />
+	<roundcube:object name="plugin.event_rsvp_buttons" id="event-rsvp" class="event-dialog-message" style="display:none" />
+</div>
+
+<div id="eventoptionsmenu" class="popupmenu" aria-hidden="true">
+	<h3 id="aria-label-eventoptions" class="voice"><roundcube:label name="calendar.eventoptions" /></h3>
+	<ul id="eventoptionsmenu-menu" class="toolbarmenu" role="menu" aria-labelledby="aria-label-eventoptions">
+		<li role="menuitem"><roundcube:button command="event-download" label="download" classAct="active" /></li>
+		<li role="menuitem"><roundcube:button command="event-sendbymail" label="send" classAct="active" /></li>
+		<roundcube:if condition="env:calendar_driver == 'kolab' && config:kolab_bonnie_api" />
+		<li role="menuitem"><roundcube:button command="event-history" type="link" label="calendar.eventhistory" classAct="active" /></li>
+		<roundcube:endif />
+	</ul>
+</div>
+
+<div id="eventdiff" class="uidialog eventdialog" aria-hidden="true">
+	<h1 class="event-title">Event Title</h1>
+	<h1 class="event-title-new event-text-new"></h1>
+	<div class="event-section event-date"></div>
+	<div class="event-section event-location">
+		<h5 class="label"><roundcube:label name="calendar.location" /></h5>
+		<div class="event-text-old"></div>
+		<div class="event-text-new"></div>
+	</div>
+	<div class="event-section event-description">
+		<h5 class="label"><roundcube:label name="calendar.description" /></h5>
+		<div class="event-text-diff" style="white-space:pre-wrap"></div>
+		<div class="event-text-old"></div>
+		<div class="event-text-new"></div>
+	</div>
+	<div class="event-section event-url">
+		<h5 class="label"><roundcube:label name="calendar.url" /></h5>
+		<div class="event-text-old"></div>
+		<div class="event-text-new"></div>
+	</div>
+	<div class="event-section event-recurrence">
+		<h5 class="label"><roundcube:label name="calendar.repeat" /></h5>
+		<div class="event-text-old"></div>
+		<div class="event-text-new"></div>
+	</div>
+	<div class="event-section event-alarms">
+		<h5 class="label"><roundcube:label name="calendar.alarms" /><span class="index"></span></h5>
+		<div class="event-text-old"></div>
+		<div class="event-text-new"></div>
+	</div>
+	<div class="event-line event-start">
+		<label><roundcube:label name="calendar.start" /></label>
+		<span class="event-text-old"></span> &#8674;
+		<span class="event-text-new"></span>
+	</div>
+	<div class="event-line event-end">
+		<label><roundcube:label name="calendar.end" /></label>
+		<span class="event-text-old"></span> &#8674;
+		<span class="event-text-new"></span>
+	</div>
+	<div class="event-line event-attendees">
+		<label><roundcube:label name="calendar.tabattendees" /><span class="index"></span></label>
+		<span class="event-text-old"></span> &#8674;
+		<span class="event-text-new"></span>
+	</div>
+	<div class="event-line event-calendar">
+		<label><roundcube:label name="calendar.calendar" /></label>
+		<span class="event-text-old"></span> &#8674;
+		<span class="event-text-new"></span>
+	</div>
+	<div class="event-line event-categories">
+		<label><roundcube:label name="calendar.category" /></label>
+		<span class="event-text-old"></span> &#8674;
+		<span class="event-text-new"></span>
+	</div>
+	<div class="event-line event-status">
+		<label><roundcube:label name="calendar.status" /></label>
+		<span class="event-text-old"></span> &#8674;
+		<span class="event-text-new"></span>
+	</div>
+	<div class="event-line event-free_busy">
+		<label><roundcube:label name="calendar.freebusy" /></label>
+		<span class="event-text-old"></span> &#8674;
+		<span class="event-text-new"></span>
+	</div>
+	<div class="event-line event-priority">
+		<label><roundcube:label name="calendar.priority" /></label>
+		<span class="event-text-old"></span> &#8674;
+		<span class="event-text-new"></span>
+	</div>
+	<div class="event-line event-sensitivity">
+		<label><roundcube:label name="calendar.sensitivity" /></label>
+		<span class="event-text-old"></span> &#8674;
+		<span class="event-text-new"></span>
+	</div>
+	<div class="event-section event-attachments">
+		<label><roundcube:label name="attachments" /><span class="index"></span></label>
+		<div class="event-text-old"></div>
+		<div class="event-text-new"></div>
+	</div>
 </div>
 
 <roundcube:include file="/templates/eventedit.html" />
@@ -216,6 +322,11 @@
 	</div>
 </div>
 
+<div id="eventhistory" class="uidialog" aria-hidden="true">
+    <roundcube:object name="plugin.event_changelog_table" id="event-changelog-table" class="records-table" />
+    <div class="compare-button"><input type="button" class="button" value="↳ <roundcube:label name='calendar.compare' />" /></div>
+</div>
+
 <div id="calendarform" class="uidialog" aria-hidden="true">
 	<roundcube:label name="loading" />
 </div>
@@ -255,14 +366,15 @@
 
 	// animation to unfold list search box
 	$('#calendars .boxtitle a.search').click(function(e){
-		var box = $('#calendars .listsearchbox'),
+		var title = $('#calendars .boxtitle'),
+			box = $('#calendars .listsearchbox'),
 			dir = box.is(':visible') ? -1 : 1;
 
 		box.slideToggle({
 			duration: 160,
 			progress: function(animation, progress) {
 				if (dir < 0) progress = 1 - progress;
-				$('#calendars .scroller').css('top', (34 + 34 * progress) + 'px');
+				$('#calendars .scroller').css('top', (title.outerHeight() + 34 * progress) + 'px');
 			},
 			complete: function() {
 				box.toggleClass('expanded');

roundcubemail-plugins-kolab-3.2.tar.gz/plugins/kolab_addressbook/kolab_addressbook.js Changed

@@ -87,6 +87,92 @@
                 }
             });
         }
+
+        // append search form for address books
+        if (rcmail.gui_objects.folderlist) {
+            var container = $(rcmail.gui_objects.folderlist);
+            $('<div class="listsearchbox" style="display:none">' +
+                '<div class="searchbox" role="search" aria-labelledby="aria-labelfoldersearchform" aria-controls="' + rcmail.gui_objects.folderlist.id + '">' +
+                    '<h3 id="aria-label-labelfoldersearchform" class="voice">' + rcmail.gettext('foldersearchform', 'kolab_addressbook') + '" /></h3>' +
+                    '<label for="addressbooksearch" class="voice">' + rcmail.gettext('searchterms', 'kolab_addressbook') + '</label>' +
+                    '<input type="text" name="q" id="addressbooksearch" placeholder="' + rcmail.gettext('findaddressbooks', 'kolab_addressbook') + '" />' +
+                    '<a class="iconbutton searchicon"></a>' +
+                    '<a href="#reset" onclick="return rcmail.command(\'reset-listsearch\',null,this,event)" id="directorylistsearch-reset" class="iconbutton reset" title="' + rcmail.gettext('resetsearch') + '">' +
+                        rcmail.gettext('resetsearch') + '</a>' +
+                '</div>' +
+            '</div>')
+            .insertBefore(container.parent());
+
+            $('<a href="#search" class="iconbutton search" title="' + rcmail.gettext('findaddressbooks', 'kolab_addressbook') + '" tabindex="0">' +
+                rcmail.gettext('findaddressbooks', 'kolab_addressbook') + '</a>')
+                .appendTo('#directorylistbox h2.boxtitle')
+                .click(function(e){
+                    var title = $('#directorylistbox .boxtitle'),
+                        box = $('#directorylistbox .listsearchbox'),
+                        dir = box.is(':visible') ? -1 : 1;
+
+                    box.slideToggle({
+                        duration: 160,
+                        progress: function(animation, progress) {
+                            if (dir < 0) progress = 1 - progress;
+                            $('#directorylistbox .scroller').css('top', (title.outerHeight() + 34 * progress) + 'px');
+                        },
+                        complete: function() {
+                            box.toggleClass('expanded');
+                            if (box.is(':visible')) {
+                                box.find('input[type=text]').focus();
+                            }
+                            else {
+                                $('#directorylistsearch-reset').click();
+                            }
+                        }
+                    });
+                });
+
+
+            // remove event handlers set by the regular treelist widget
+            rcmail.treelist.container.off('click mousedown focusin focusout');
+
+            // re-initialize folderlist widget
+            // copy form app.js with additional parameters
+            var widget_class = window.kolab_folderlist || rcube_treelist_widget;
+            rcmail.treelist = new widget_class(rcmail.gui_objects.folderlist, {
+                selectable: true,
+                id_prefix: 'rcmli',
+                id_encode: rcmail.html_identifier_encode,
+                id_decode: rcmail.html_identifier_decode,
+                searchbox: '#addressbooksearch',
+                search_action: 'plugin.book-search',
+                search_sources: [ 'folders', 'users' ],
+                search_title: rcmail.gettext('listsearchresults','kolab_addressbook'),
+                check_droptarget: function(node) { return !node.virtual && rcmail.check_droptarget(node.id) }
+            });
+
+            rcmail.treelist
+                .addEventListener('collapse',  function(node) { rcmail.folder_collapsed(node) })
+                .addEventListener('expand',    function(node) { rcmail.folder_collapsed(node) })
+                .addEventListener('select',    function(node) { rcmail.triggerEvent('selectfolder', { folder:node.id, prefix:'rcmli' }) })
+                .addEventListener('subscribe', function(node) {
+                    var source;
+                    if ((source = rcmail.env.address_sources[node.id])) {
+                        source.subscribed = node.subscribed || false;
+                        rcmail.http_post('plugin.book-subscribe', { _source:node.id, _permanent:source.subscribed?1:0 });
+                    }
+                })
+                .addEventListener('insert-item', function(data) {
+                    // register new address source
+                    rcmail.env.address_sources[data.id] = rcmail.env.contactfolders[data.id] = data.data;
+                    // subscribe folder and load groups to add them to the list
+                    if (!data.data.virtual)
+                      rcmail.http_post('plugin.book-subscribe', { _source:data.id, _permanent:data.data.subscribed?1:0, _groups:1 });
+                })
+                .addEventListener('search-complete', function(data) {
+                    if (data.length)
+                        rcmail.display_message(rcmail.gettext('nraddressbooksfound','kolab_addressbook').replace('$nr', data.length), 'voice');
+                    else
+                        rcmail.display_message(rcmail.gettext('noaddressbooksfound','kolab_addressbook'), 'info');
+                });
+        }
     });
     rcmail.addEventListener('listupdate', function() {
         rcmail.set_book_actions();

roundcubemail-plugins-kolab-3.2.tar.gz/plugins/kolab_addressbook/kolab_addressbook.php Changed

@@ -66,6 +66,8 @@
             // Plugin actions
             $this->register_action('plugin.book', array($this, 'book_actions'));
             $this->register_action('plugin.book-save', array($this, 'book_save'));
+            $this->register_action('plugin.book-search', array($this, 'book_search'));
+            $this->register_action('plugin.book-subscribe', array($this, 'book_subscribe'));
 
             // Load UI elements
             if ($this->api->output->type == 'html') {
@@ -133,19 +135,34 @@
      */
     protected function abook_prop($id, $abook)
     {
-        return array(
-            'id'       => $id,
-            'name'     => $abook->get_name(),
-            'listname' => $abook->get_foldername(),
-            'readonly' => $abook->readonly,
-            'editable' => $abook->editable,
-            '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(),
-            'carddavurl' => $abook->get_carddav_url(),
-            'kolab'    => true,
-        );
+        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,
+                'editable' => false,
+                'kolab'    => true,
+                'virtual'  => true,
+            );
+        }
+        else {
+            return array(
+                'id'       => $id,
+                'name'     => $abook->get_name(),
+                'listname' => $abook->get_foldername(),
+                'readonly' => $abook->readonly,
+                'editable' => $abook->editable,
+                '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(),
+                'kolab'    => true,
+            );
+        }
     }
 
     /**
@@ -167,7 +184,8 @@
         kolab_storage::folder_hierarchy($this->folders, $tree);
         $out .= $this->folder_tree_html($tree, $sources, $jsdata);
 
-        $this->rc->output->set_env('contactgroups', $jsdata);
+        $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'; }));
 
         $args['content'] = html::tag('ul', $args, $out, html::$common_attrib);
         return $args;
@@ -185,16 +203,11 @@
             $is_collapsed = strpos($this->rc->config->get('collapsed_abooks',''), '&'.rawurlencode($id).'&') !== false;
 
             if ($folder->virtual) {
-                $source = array(
-                    'id'       => $folder->id,
-                    'name'     => $folder->get_name(),
-                    'listname' => $folder->get_foldername(),
-                    'group'    => $folder->get_namespace(),
-                    'readonly' => true,
-                    'editable' => false,
-                    'kolab'    => true,
-                    'virtual'  => true,
-                );
+                $source = $this->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]);
             }
 
             $content = $this->addressbook_list_item($id, $source, $jsdata);
@@ -219,11 +232,15 @@
     /**
      *
      */
-    protected function addressbook_list_item($id, $source, &$jsdata, $checkbox = false)
+    protected function addressbook_list_item($id, $source, &$jsdata, $search_mode = false)
     {
         $folder = $this->folders[$id];
         $current = rcube_utils::get_input_value('_source', rcube_utils::INPUT_GPC);
 
+        if (!$source['virtual']) {
+            $jsdata[$id] = $source;
+        }
+
         // set class name(s)
         $classes = array($source['group'] ?: '000', 'addressbook');
         if ($current === $id)
@@ -236,19 +253,48 @@
             $classes[] = $source['class_name'];
 
         $name = !empty($source['listname']) ? $source['listname'] : (!empty($source['name']) ? $source['name'] : $id);
+        $label_id = 'kabt:' . $id;
+        $inner = ($source['virtual'] ?
+            html::a(array('tabindex' => '0'), $name) :
+            html::a(array(
+                    'href' => $this->rc->url(array('_source' => $id)),
+                    'rel' => $source['id'],
+                    'id' => $label_id,
+                    'onclick' => "return " . rcmail_output::JS_OBJECT_NAME.".command('list','" . rcube::JQ($id) . "',this)",
+                ), $name)
+        );
+
+        if (isset($source['subscribed'])) {
+            $inner .= html::span(array(
+                'class' => 'subscribed',
+                'title' => $this->gettext('foldersubscribe'),
+                'role' => 'checkbox',
+                'aria-checked' => $source['subscribed'] ? 'true' : 'false',
+            ), '');
+        }
+
+        // don't wrap in <li> but add a checkbox for search results listing
+        if ($search_mode) {
+            $jsdata[$id]['group'] = join(' ', $classes);
+
+            if (!$source['virtual']) {
+                $inner .= html::tag('input', array(
+                    'type' => 'checkbox',
+                    'name' => '_source[]',
+                    'value' => $id,
+                    'checked' => $prop['active'],
+                    'aria-labelledby' => $label_id,
+                ));
+            }
+            return html::div(null, $inner);
+        }
+
         $out .= html::tag('li', array(
                 'id' => 'rcmli' . rcube_utils::html_identifier($id, true),
                 'class' => join(' ', $classes), 
                 'noclose' => true,
             ),
-            ($source['virtual'] ?
-                html::a(array('tabindex' => '0'), $name) :
-                html::a(array(
-                        'href' => $this->rc->url(array('_source' => $id)),
-                        'rel' => $source['id'],
-                        'onclick' => "return " . rcmail_output::JS_OBJECT_NAME.".command('list','" . rcube::JQ($id) . "',this)",
-                    ), $name)
-            )
+            html::div($source['subscribed'] ? 'subscribed' : null, $inner)
         );
 
         $groupdata = array('out' => '', 'jsdata' => $jsdata, 'source' => $id);
@@ -324,9 +370,12 @@
                 $p['instance'] = $this->sources[$p['id']];
             }
             else {
-                $folder = kolab_storage::get_folder(kolab_storage::id_decode($p['id']));
-                if ($folder->type) {  // try with unencoded (old-style) identifier
-                    $folder = kolab_storage::get_folder(kolab_storage::id_decode($p['id'], false));
+                $id = kolab_storage::id_decode($p['id']);
+                if (preg_match('![^A-Za-z0-9=/+&._ -]!', $id))  // check for falsely base64 decoded identifier
+                    $id = $p['id'];
+                $folder = kolab_storage::get_folder($id);
+                if ($folder->type != 'contact' && $id != $p['id']) {  // try with unencoded (old-style) identifier
+                    $folder = kolab_storage::get_folder($p['id']);
                 }
                 if ($folder->type) {
                     $this->sources[$p['id']] = new rcube_kolab_contacts($folder->name);
@@ -596,6 +645,130 @@
         $this->ui->book_edit();
     }
 
+    /**
+     *
+     */
+    public function book_search()
+    {
+        $results = array();
+        $query = rcube_utils::get_input_value('q', RCUBE_INPUT_GPC);
+        $source = rcube_utils::get_input_value('source', RCUBE_INPUT_GPC);
+
+        kolab_storage::$encode_ids = true;
+        $search_more_results = false;
+        $this->sources = array();
+        $this->folders = array();
+    
+        // find unsubscribed IMAP folders that have "event" type
+        if ($source == 'folders') {
+            foreach ((array)kolab_storage::search_folders('contact', $query, array('other')) as $folder) {

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

@@ -54,6 +54,11 @@
             // Include stylesheet (for directorylist)
             $this->plugin->include_stylesheet($this->plugin->local_skin_path().'/kolab_addressbook.css');
 
+            // include kolab folderlist widget if available
+            if (is_readable($this->plugin->api->dir . 'libkolab/js/folderlist.js')) {
+                $this->plugin->api->include_script('libkolab/js/folderlist.js');
+            }
+
             // Add actions on address books
             $options = array('book-create', 'book-edit', 'book-delete');
             $idx     = 0;
@@ -91,7 +96,14 @@
                 'kolab_addressbook.carddavurldescription',
                 'kolab_addressbook.bookedit',
                 'kolab_addressbook.bookdelete',
-                'kolab_addressbook.bookshowurl');
+                'kolab_addressbook.bookshowurl',
+                'kolab_addressbook.findaddressbooks',
+                'kolab_addressbook.searchterms',
+                'kolab_addressbook.foldersearchform',
+                'kolab_addressbook.listsearchresults',
+                'kolab_addressbook.nraddressbooksfound',
+                'kolab_addressbook.noaddressbooksfound',
+                'resetsearch');
         }
         // book create/edit form
         else {

roundcubemail-plugins-kolab-3.2.tar.gz/plugins/kolab_addressbook/lib/rcube_kolab_contacts.php Changed

roundcubemail-plugins-kolab-3.2.tar.gz/plugins/kolab_addressbook/localization/en_US.inc Changed

roundcubemail-plugins-kolab-3.2.tar.gz/plugins/kolab_addressbook/skins/classic/kolab_addressbook.css Changed

roundcubemail-plugins-kolab-3.2.tar.gz/plugins/kolab_addressbook/skins/larry/folder_icons.png Changed

roundcubemail-plugins-kolab-3.2.tar.gz/plugins/kolab_addressbook/skins/larry/kolab_addressbook.css Changed

@@ -1,4 +1,99 @@
 
+#directorylistbox .listsearchbox + .scroller {
+	top: 34px;
+}
+
+#directorylistbox .listsearchbox.expanded + .scroller {
+	top: 68px;
+}
+
+#directorylistbox .boxtitle a.iconbutton.search {
+	position: absolute;
+	top: 8px;
+	right: 8px;
+	width: 16px;
+	cursor: pointer;
+	background-position: -2px -317px;
+}
+
+#directorylist li.addressbook.selected > div a {
+	background-position: 6px -791px;
+}
+
+#directorylist ul li.addressbook.selected > div a {
+	background-position: 32px -791px;
+}
+
+#directorylist ul ul li.addressbook.selected > div a {
+	background-position: 58px -791px;
+}
+
+#directorylist ul ul ul li.addressbook.selected > div a {
+	background-position: 84px -791px;
+}
+
+#directorylistbox ul.treelist li.virtual {
+	background-image: none !important;
+}
+
+#directorylistbox ul.treelist li.virtual > div a {
+	color: #aaa;
+	background-image: none;
+	height: 16px;
+	padding-top: 3px;
+	padding-bottom: 3px;
+}
+
+#directorylistbox ul.treelist li.virtual > .treetoggle {
+	top: 6px !important;
+}
+
+#directorylistbox ul.treelist li input[type='checkbox'] {
+	position: absolute;
+	top: 4px;
+	left: 10px;
+}
+
+#directorylistbox ul.treelist ul li input[type='checkbox'] {
+	left: 36px;
+}
+
+#directorylist li input[type='checkbox'] {
+	display: none;
+}
+
+#directorylistbox ul.treelist div span.subscribed {
+	display: inline-block;
+	position: absolute;
+	top: 4px;
+	right: 5px;
+	height: 16px;
+	width: 16px;
+	padding: 0;
+	background: url(folder_icons.png) -100px 0 no-repeat;
+	overflow: hidden;
+	text-indent: -5000px;
+	cursor: pointer;
+}
+
+#directorylistbox ul.treelist div > span.subscribed:focus,
+#directorylistbox ul.treelist div:hover > span.subscribed {
+	background-position: 2px -160px;
+}
+
+#directorylistbox ul.treelist div.subscribed span.subscribed {
+	background-position: -16px -160px;
+}
+
+#directorylistbox ul.treelist div span.subscribed:focus {
+	border-radius: 3px;
+	outline: 2px solid rgba(30,150,192, 0.5);
+}
+
+#directorylistbox .searchresults .listing li {
+	background-color: #c7e3ef;
+}
+
 #directorylist li.addressbook.readonly,
 #directorylist li.addressbook.shared,
 #directorylist li.addressbook.other {
@@ -11,10 +106,7 @@
 	background-position: 98% -21px;
 }
 
-#directorylist li.addressbook.other {
-	background-position: 98% -52px;
-}
-
+#directorylist li.addressbook.personal.readonly,
 #directorylist li.addressbook.other.readonly {
 	background-position: 98% -77px;
 }
@@ -27,6 +119,11 @@
 	background-position: 98% -130px;
 }
 
+#directorylist li.addressbook.virtual.user {
+	background-image: url(folder_icons.png) !important;
+	background-position: 98% -52px;
+}
+
 #directorylist li.addressbook.readonly a,
 #directorylist li.addressbook.shared a,
 #directorylist li.addressbook.other a {

roundcubemail-plugins-kolab-3.2.tar.gz/plugins/kolab_auth/kolab_auth.php Changed

roundcubemail-plugins-kolab-3.2.tar.gz/plugins/kolab_delegation/kolab_delegation_engine.php Changed

@@ -423,6 +423,7 @@
         $mode   = (int) $this->rc->config->get('addressbook_search_mode');
         $fields = array_unique(array_filter(array_merge((array)$this->ldap_name_field, (array)$this->ldap_login_field)));
         $users  = array();
+        $keys   = array();
 
         $result = $ldap->dosearch($fields, $search, $mode, (array)$this->ldap_login_field, $max);
 
@@ -434,12 +435,23 @@
 
             $user = $this->parse_ldap_record($record);
 
-            if ($user['name']) {
-                $users[] = $user['name'];
+            if ($user['uid']) {
+                $display = rcube_addressbook::compose_search_name($record);
+                $user    = array('name' => $user['uid'], 'display' => $display);
+                $users[] = $user;
+                $keys[]  = $display ?: $user['uid'];
             }
         }
 
-        sort($users, SORT_LOCALE_STRING);
+        if (count($users)) {
+            // sort users index
+            asort($keys, SORT_LOCALE_STRING);
+            // re-sort users according to index
+            foreach ($keys as $idx => $val) {
+                $keys[$idx] = $users[$idx];
+            }
+            $users = array_values($keys);
+        }
 
         return $users;
     }

roundcubemail-plugins-kolab-3.2.tar.gz/plugins/kolab_delegation/package.xml Changed

roundcubemail-plugins-kolab-3.2.tar.gz/plugins/kolab_files/kolab_files.js Changed

@@ -705,6 +705,13 @@
 
   rcmail.enable_command('files-print', (rcmail.file_editor && rcmail.file_editor.printable) ||
     (rcmail.env.file_data && /^image\//i.test(rcmail.env.file_data.type)));
+
+  // detect Print button and check if it can be accessed
+  try {
+    if ($('#fileframe').contents().find('#print').length)
+      rcmail.enable_command('files-print', true);
+  }
+  catch(e) {};
 };
 
 
@@ -828,6 +835,26 @@
   if (!this.file_editor)
     return;
 
+  // binary files like ODF need to be updated using FormData
+  if (this.file_editor.getContentCallback) {
+    if (!file_api.file_uploader_support())
+      return;
+
+    file_api.req = file_api.set_busy(true, 'saving');
+//    this.file_editor.disable();
+    this.file_editor.getContentCallback(function(content, filename) {
+      file_api.file_uploader([content], {
+        action: 'file_update',
+        params: {file: rcmail.env.file, info: 1, token: file_api.env.token},
+        response_handler: 'file_save_response',
+        fieldname: 'content',
+        single: true
+      });
+    });
+
+    return;
+  }
+
   var content = this.file_editor.getContent();
 
   file_api.file_save(this.env.file, content);
@@ -846,6 +873,13 @@
       win.print();
     }
   }
+  else {
+    // e.g. Print button in PDF viewer
+    try {
+      $('#fileframe').contents().find('#print').click();
+    }
+    catch(e) {};
+  }
 };
 
 rcube_webmail.prototype.files_set_quota = function(p)

roundcubemail-plugins-kolab-3.2.tar.gz/plugins/kolab_files/lib/kolab_files_engine.php Changed

roundcubemail-plugins-kolab-3.2.tar.gz/plugins/kolab_folders/kolab_folders.php Changed

@@ -111,23 +111,37 @@
             return $args;
         }
 
-        $table = $args['table'];
-
         // Add type-based style for table rows
         // See kolab_folders::folder_class_name()
-        for ($i=1, $cnt=$table->size(); $i<=$cnt; $i++) {
-            $attrib = $table->get_row_attribs($i);
-            $folder = $attrib['foldername']; // UTF7-IMAP
-            $type   = $folderdata[$folder];
+        if ($table = $args['table']) {
+            for ($i=1, $cnt=$table->size(); $i<=$cnt; $i++) {
+                $attrib = $table->get_row_attribs($i);
+                $folder = $attrib['foldername']; // UTF7-IMAP
+                $type   = $folderdata[$folder];
+
+                if (!$type) {
+                    $type = 'mail';
+                }
 
-            if (!$type) {
-                $type = 'mail';
+                $class_name = self::folder_class_name($type);
+                $attrib['class'] = trim($attrib['class'] . ' ' . $class_name);
+                $table->set_row_attribs($attrib, $i);
             }
+        }
 
-            $class_name = self::folder_class_name($type);
+        // Add type-based class for list items
+        if (is_array($args['list'])) {
+            foreach ((array)$args['list'] as $k => $item) {
+                $folder = $item['folder_imap']; // UTF7-IMAP
+                $type   = $folderdata[$folder];
 
-            $attrib['class'] = trim($attrib['class'] . ' ' . $class_name);
-            $table->set_row_attribs($attrib, $i);
+                if (!$type) {
+                    $type = 'mail';
+                }
+
+                $class_name = self::folder_class_name($type);
+                $args['list'][$k]['class'] = trim($item['class'] . ' ' . $class_name);
+            }
         }
 
         return $args;

roundcubemail-plugins-kolab-3.2.tar.gz/plugins/kolab_notes/kolab_notes.php Changed

@@ -157,10 +157,8 @@
             array_unshift($folders, $default_folder);
         }
 
-        $delim = $this->rc->get_storage()->get_hierarchy_delimiter();
-
         foreach ($folders as $folder) {
-            $item = $this->folder_props($folder, $delim);
+            $item = $this->folder_props($folder);
             $this->lists[$item['id']] = $item;
             $this->folders[$item['id']] = $folder;
             $this->folders[$folder->name] = $folder;
@@ -243,7 +241,7 @@
             }
             else {
                 if (!$this->lists[$list_id]) {
-                    $this->lists[$list_id] = $this->folder_props($folder, $delim);
+                    $this->lists[$list_id] = $this->folder_props($folder);
                     $this->folders[$list_id] = $folder;
                 }
                 $this->lists[$list_id]['parent'] = $parent_id;
@@ -270,13 +268,11 @@
         $this->search_more_results = false;
         $this->lists = $this->folders = array();
 
-        $delim = $this->rc->get_storage()->get_hierarchy_delimiter();
-
         // find unsubscribed IMAP folders that have "event" type
         if ($source == 'folders') {
             foreach ((array)kolab_storage::search_folders('note', $query, array('other')) as $folder) {
                 $this->folders[$folder->id] = $folder;
-                $this->lists[$folder->id] = $this->folder_props($folder, $delim);
+                $this->lists[$folder->id] = $this->folder_props($folder);
             }
         }
         // search other user's namespace via LDAP
@@ -284,7 +280,7 @@
             $limit = $this->rc->config->get('autocomplete_max', 15) * 2;  // we have slightly more space, so display twice the number
             foreach (kolab_storage::search_users($query, 0, array(), $limit * 10) as $user) {
                 $folders = array();
-                // search for tasks folders shared by this user
+                // search for note folders shared by this user
                 foreach (kolab_storage::list_user_folders($user, 'note', false) as $foldername) {
                     $folders[] = new kolab_storage_folder($foldername, 'note');
                 }
@@ -292,11 +288,11 @@
                 if (count($folders)) {
                     $userfolder = new kolab_storage_folder_user($user['kolabtargetfolder'], '', $user);
                     $this->folders[$userfolder->id] = $userfolder;
-                    $this->lists[$userfolder->id] = $this->folder_props($userfolder, $delim, array());
+                    $this->lists[$userfolder->id] = $this->folder_props($userfolder);
 
                     foreach ($folders as $folder) {
                         $this->folders[$folder->id] = $folder;
-                        $this->lists[$folder->id] = $this->folder_props($folder, $delim, array());
+                        $this->lists[$folder->id] = $this->folder_props($folder);
                         $count++;
                     }
                 }
@@ -315,7 +311,7 @@
     /**
      * Derive list properties from the given kolab_storage_folder object
      */
-    protected function folder_props($folder, $delim)
+    protected function folder_props($folder)
     {
         if ($folder->get_namespace() == 'personal') {
             $norename = false;
@@ -362,7 +358,7 @@
             $folder = kolab_storage::get_folder(kolab_storage::id_decode($id));
             if ($folder->type) {
                 $this->folders[$id] = $folder;
-                $this->lists[$id] = $this->folder_props($folder, $this->rc->get_storage()->get_hierarchy_delimiter());
+                $this->lists[$id] = $this->folder_props($folder);
             }
         }

roundcubemail-plugins-kolab-3.2.tar.gz/plugins/kolab_notes/notes.js Changed

@@ -84,8 +84,10 @@
         });
 
         // initialize folder selectors
-        var li, id;
-        for (id in me.notebooks) {
+        if (settings.selected_list && !me.notebooks[settings.selected_list]) {
+            settings.selected_list = null;
+        }
+        for (var id in me.notebooks) {
             if (me.notebooks[id].editable && !settings.selected_list) {
                 settings.selected_list = id;
             }
@@ -130,11 +132,14 @@
             var list = p.data;
             if (list && list.id && !list.virtual) {
                 me.notebooks[list.id] = list;
-                var prop = { id:p.id, active:list.active?1:0 };
-                if (list.subscribed) prop.permanent = 1;
-                rcmail.http_post('list', { _do:'subscribe', _list:prop });
+                if (list.subscribed)
+                    rcmail.http_post('list', { _do:'subscribe', _list:{ id:p.id, permanent:1 } });
             }
         });
+        notebookslist.addEventListener('click-item', function(p) {
+            // avoid link execution
+            return false;
+        });
         notebookslist.addEventListener('search-complete', function(data) {
             if (data.length)
                 rcmail.display_message(rcmail.gettext('nrnotebooksfound','kolab_notes').replace('$nr', data.length), 'voice');
@@ -905,9 +910,19 @@
      */
     function print_note()
     {
-        var printwin, data;
+        var printwin, data, list;
         if (me.selected_note && (printwin = rcmail.open_window(settings.print_template))) {
+            list = me.notebooks[me.selected_note.list] || me.notebooks[me.selected_list] || {};
             data = get_save_data();
+
+            // for read-only notes, get_save_data() won't return the content
+            if (me.selected_note.readonly || !list.editable) {
+                data.description = me.selected_note.html || me.selected_note.description;
+                if (!me.selected_note.html || !data.description.match(/<(html|body)/)) {
+                    data.description = text2html(data.description);
+                }
+            }
+
             $(printwin).load(function(){
                 printwin.document.title = data.title;
                 $('#notetitle', printwin.document).html(Q(data.title));

roundcubemail-plugins-kolab-3.2.tar.gz/plugins/kolab_notes/skins/larry/notes.css Changed

roundcubemail-plugins-kolab-3.2.tar.gz/plugins/kolab_notes/skins/larry/print.css Changed

roundcubemail-plugins-kolab-3.2.tar.gz/plugins/kolab_notes/skins/larry/templates/notes.html Changed

roundcubemail-plugins-kolab-3.2.tar.gz/plugins/kolab_notes/skins/larry/templates/print.html Changed

roundcubemail-plugins-kolab-3.2.tar.gz/plugins/kolab_tags Added

roundcubemail-plugins-kolab-3.2.tar.gz/plugins/kolab_tags/LICENSE Added

@@ -0,0 +1,661 @@
+                    GNU AFFERO GENERAL PUBLIC LICENSE
+                       Version 3, 19 November 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+                            Preamble
+
+  The GNU Affero General Public License is a free, copyleft license for
+software and other kinds of works, specifically designed to ensure
+cooperation with the community in the case of network server software.
+
+  The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works.  By contrast,
+our General Public Licenses are intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
+
+  Developers that use our General Public Licenses protect your rights
+with two steps: (1) assert copyright on the software, and (2) offer
+you this License which gives you legal permission to copy, distribute
+and/or modify the software.
+
+  A secondary benefit of defending all users' freedom is that
+improvements made in alternate versions of the program, if they
+receive widespread use, become available for other developers to
+incorporate.  Many developers of free software are heartened and
+encouraged by the resulting cooperation.  However, in the case of
+software used on network servers, this result may fail to come about.
+The GNU General Public License permits making a modified version and
+letting the public access it on a server without ever releasing its
+source code to the public.
+
+  The GNU Affero General Public License is designed specifically to
+ensure that, in such cases, the modified source code becomes available
+to the community.  It requires the operator of a network server to
+provide the source code of the modified version running there to the
+users of that server.  Therefore, public use of a modified version, on
+a publicly accessible server, gives the public access to the source
+code of the modified version.
+
+  An older license, called the Affero General Public License and
+published by Affero, was designed to accomplish similar goals.  This is
+a different license, not a version of the Affero GPL, but Affero has
+released a new version of the Affero GPL which permits relicensing under
+this license.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+                       TERMS AND CONDITIONS
+
+  0. Definitions.
+
+  "This License" refers to version 3 of the GNU Affero General Public License.
+
+  "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+
+  "The Program" refers to any copyrightable work licensed under this
+License.  Each licensee is addressed as "you".  "Licensees" and
+"recipients" may be individuals or organizations.
+
+  To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy.  The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
+
+  A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+  To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy.  Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+  To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies.  Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
+
+  An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License.  If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+  1. Source Code.
+
+  The "source code" for a work means the preferred form of the work
+for making modifications to it.  "Object code" means any non-source
+form of a work.
+
+  A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+  The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form.  A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+  The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities.  However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work.  For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+  The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
+
+  The Corresponding Source for a work in source code form is that
+same work.
+
+  2. Basic Permissions.
+
+  All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met.  This License explicitly affirms your unlimited
+permission to run the unmodified Program.  The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work.  This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+  You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force.  You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright.  Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+
+  Conveying under any other circumstances is permitted solely under
+the conditions stated below.  Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+  No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+  When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+  4. Conveying Verbatim Copies.
+
+  You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+  You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+  5. Conveying Modified Source Versions.
+
+  You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the

roundcubemail-plugins-kolab-3.2.tar.gz/plugins/kolab_tags/kolab_tags.js Added

@@ -0,0 +1,683 @@
+/**
+ * Kolab Tags plugin
+ *
+ * @author Aleksander Machniak <machniak@kolabsys.com>
+ *
+ * @licstart  The following is the entire license notice for the
+ * JavaScript code in this file.
+ *
+ * Copyright (C) 2014, 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/>.
+ *
+ * @licend  The above is the entire license notice
+ * for the JavaScript code in this file.
+ */
+
+window.rcmail && rcmail.addEventListener('init', function() {
+    if (rcmail.task == 'mail') {
+        var msg_view = rcmail.env.action == 'show' || rcmail.env.action == 'preview';
+
+        if (!msg_view && rcmail.env.action) {
+            return;
+        }
+
+        // load tags cloud
+        if (rcmail.gui_objects.taglist) {
+            load_tags();
+        }
+
+        // display tags in message subject (message window)
+        if (msg_view) {
+            rcmail.enable_command('tag-add', 'tag-remove', 'tag-remove-all', rcmail.env.tags.length);
+            message_tags(rcmail.env.message_tags);
+        }
+
+        // register events related to messages list
+        if (rcmail.message_list) {
+            rcmail.addEventListener('listupdate', message_list_update_tags);
+            rcmail.addEventListener('requestsearch', search_request);
+            rcmail.addEventListener('requestlist', search_request);
+            rcmail.message_list.addEventListener('select', function(o) { message_list_select(o); });
+        }
+
+        // register commands
+        rcmail.register_command('manage-tags', function() { manage_tags(); }, true);
+        rcmail.register_command('reset-tags', function() { reset_tags(); });
+        rcmail.register_command('tag-add', function(props, obj, event) { tag_add(props, obj, event); });
+        rcmail.register_command('tag-remove', function(props, obj, event) { tag_remove(props, obj, event); });
+        rcmail.register_command('tag-remove-all', function() { tag_remove('*'); });
+
+        // ajax response handler
+        rcmail.addEventListener('plugin.kolab_tags', update_tags);
+
+        // select current messages list filter, this need to be done here
+        // because we modify $_SESSION['search_filter']
+        if (rcmail.env.search_filter_selected && rcmail.gui_objects.search_filter) {
+            $(rcmail.gui_objects.search_filter).val(rcmail.env.search_filter_selected)
+                // update selection in decorated select
+                .filter('.decorated').each(function() {
+                    var title = $('option:selected', this).text();
+                    $('a.menuselector span', $(this).parent()).text(title);
+                });
+        }
+    }
+});
+
+var tagsfilter = [], tag_selector_element, tag_form_data,
+    reset_css = {color: '', backgroundColor: ''};
+
+// fills tag cloud with tags list
+function load_tags()
+{
+    var ul = $('#taglist'), clickable = rcmail.message_list;
+
+    $.each(rcmail.env.tags, function(i, tag) {
+        var li = add_tag_element(ul, tag, clickable);
+
+        // remember default color/bg of unselected tag element
+        if (!i)
+            tag_css = li.css(['color', 'background-color']);
+
+        if (rcmail.env.selected_tags && $.inArray(String(tag.uid), rcmail.env.selected_tags) > -1) {
+            li.addClass('selected');
+            tag_set_color(li, tag);
+            tagsfilter.push(String(tag.uid));
+        }
+    });
+
+    rcmail.enable_command('reset-tags', tagsfilter.length && clickable);
+}
+
+function add_tag_element(list, tag, clickable)
+{
+    // @todo: .append('<span class="count"></span>')
+    var element = $('<li>').text(tag.name).data('tag', tag.uid).appendTo(list);
+
+    if (clickable) {
+        element.click(function(e) {
+            var item = $(this),
+                tagid = item.data('tag');
+
+            if (!tagid)
+                return false;
+
+            // reset selection on regular clicks
+            var index = $.inArray(tagid, tagsfilter),
+                shift = e.shiftKey || e.ctrlKey || e.metaKey,
+                t = tag_find(tagid);
+
+            if (!shift) {
+                if (tagsfilter.length > 1)
+                    index = -1;
+
+                $('li', list).removeClass('selected').css(reset_css);
+                tagsfilter = [];
+            }
+
+            // add tag to the filter
+            if (index < 0) {
+                item.addClass('selected');
+                tag_set_color(item, t);
+                tagsfilter.push(tagid);
+            }
+            else if (shift) {
+                item.removeClass('selected').css(reset_css);
+                tagsfilter.splice(index, 1);
+            }
+
+            apply_tags_filter();
+
+            // clear text selection in IE after shift+click
+            if (shift && document.selection)
+                document.selection.empty();
+
+            e.preventDefault();
+            return false;
+        })
+    }
+
+    return element;
+}
+
+function manage_tags()
+{
+    // display it as popup
+    rcmail.tags_popup = rcmail.show_popup_dialog(
+        '<div id="tagsform"><select size="8" multiple="multiple"></select><div class="buttons"></div></div>',
+        rcmail.gettext('kolab_tags.tags'),
+        [{
+            text: rcmail.gettext('save'),
+            click: function() { $(this).dialog('close'); tag_form_save(); }
+        },
+        {
+            text: rcmail.gettext('cancel'),
+            click: function() { $(this).dialog('close'); }
+        }],
+        {
+            width: 400,
+            modal: true,
+            closeOnEscape: true,
+            close: function(e, ui) {
+                $(this).remove();
+            }
+        }
+    );
+
+    tag_form_data = {add: {}, 'delete': [], update: {}};
+
+    var form = $('#tagsform'),
+        select = $('select', form),
+        buttons = [
+            $('<input type="button" />').val(rcmail.gettext('kolab_tags.add'))
+                .click(function() { tag_form_dialog(); }),
+            $('<input type="button" />').val(rcmail.gettext('kolab_tags.edit'))
+                .attr('disabled', true)
+                .click(function() { tag_form_dialog((select.val())[0]); }),
+            $('<input type="button" />').val(rcmail.gettext('kolab_tags.delete'))
+                .attr('disabled', true)
+                .click(function() {
+                    $.each(select.val() || [], function(i, v) {
+                        $('option[value="' + v + '"]', select).remove();
+                        delete tag_form_data.update[v];
+                        delete tag_form_data.add[v];
+                        if (!/^temp/.test(v))
+                            tag_form_data['delete'].push(v);
+                    });
+                    $(this).prop('disabled', true);
+                })

roundcubemail-plugins-kolab-3.2.tar.gz/plugins/kolab_tags/kolab_tags.php Added

@@ -0,0 +1,150 @@
+<?php
+
+/**
+ * Kolab Tags
+ *
+ * @author Aleksander Machniak <machniak@kolabsys.com>
+ *
+ * Copyright (C) 2014, 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/>.
+ */
+
+class kolab_tags extends rcube_plugin
+{
+    public $task = 'mail';
+    public $rc;
+    public $home;
+
+    private $engine;
+
+    public function init()
+    {
+        $this->rc = rcube::get_instance();
+
+        // Register hooks to display tags in message subject
+        $this->add_hook('messages_list', array($this, 'messages_list'));
+        $this->add_hook('message_headers_output', array($this, 'message_headers_output'));
+
+        // Searching by tags
+        $this->add_hook('imap_search_before', array($this, 'imap_search_before'));
+
+        // Plugin actions for tag management
+        $this->register_action('plugin.kolab_tags', array($this, 'actions'));
+
+        // Load UI from startup hook
+        $this->add_hook('startup', array($this, 'startup'));
+    }
+
+    /**
+     * Creates kolab_files_engine instance
+     */
+    private function engine()
+    {
+        if ($this->engine === null) {
+            // the files module can be enabled/disabled by the kolab_auth plugin
+            if ($this->rc->config->get('kolab_tags_disabled') || !$this->rc->config->get('kolab_tags_enabled', true)) {
+                return $this->engine = false;
+            }
+
+//            $this->load_config();
+
+            require_once $this->home . DIRECTORY_SEPARATOR . 'lib' . DIRECTORY_SEPARATOR . 'kolab_tags_engine.php';
+
+            $this->engine = new kolab_tags_engine($this);
+        }
+
+        return $this->engine;
+    }
+
+    /**
+     * Startup hook handler, initializes/enables Files UI
+     */
+    public function startup($args)
+    {
+        // call this from startup to give a chance to set
+        // kolab_files_enabled/disabled in kolab_auth plugin
+        if ($this->rc->output->type != 'html') {
+            return;
+        }
+
+        if ($engine = $this->engine()) {
+            $engine->ui();
+        }
+    }
+
+    /**
+     * Engine actions handler
+     */
+    public function actions()
+    {
+        if ($engine = $this->engine()) {
+            $engine->actions();
+        }
+    }
+
+    /**
+     * Handler for messages list
+     */
+    public function messages_list($args)
+    {
+        if ($engine = $this->engine()) {
+            $args = $engine->messages_list_handler($args);
+        }
+
+        return $args;
+    }
+
+    /**
+     * Handler for message headers
+     */
+    public function message_headers_output($args)
+    {
+        // this hook can be executed many times
+        if ($this->mail_headers_done) {
+            return $args;
+        }
+
+        $this->mail_headers_done = true;
+
+        if ($engine = $this->engine()) {
+            $args = $engine->message_headers_handler($args);
+        }
+
+        return $args;
+    }
+
+    /**
+     * Handler for messages searching
+     */
+    public function imap_search_before($args)
+    {
+        // if search filter contains tag mark
+        if (preg_match('/^(kolab_tags_[0-9]{10,}:([^:]+):)/', $args['search'], $m) && ($engine = $this->engine())) {
+            $this->current_tags   = $args['search_tags'] = explode(',', $m[2]);
+            $this->current_filter = $args['search']      = substr($args['search'], strlen($m[1]));
+
+            // modify search arguments
+            $args = $engine->imap_search_handler($args);
+
+            unset($args['search_tags']);
+
+            // send current search properties to the browser
+            $this->rc->output->set_env('search_filter_selected', $this->current_filter);
+            $this->rc->output->set_env('selected_tags', $this->current_tags);
+        }
+
+        return $args;
+    }
+}

roundcubemail-plugins-kolab-3.2.tar.gz/plugins/kolab_tags/lib Added

roundcubemail-plugins-kolab-3.2.tar.gz/plugins/kolab_tags/lib/kolab_tags_backend.php Added

@@ -0,0 +1,187 @@
+<?php
+
+/**
+ * Kolab Tags backend
+ *
+ * @author Aleksander Machniak <machniak@kolabsys.com>
+ *
+ * Copyright (C) 2014, 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/>.
+ */
+
+class kolab_tags_backend
+{
+    private $folders;
+    private $tag_cols = array('name', 'category', 'color', 'parent', 'iconName', 'priority', 'members');
+
+    const FOLDER_TYPE  = 'configuration';
+    const OBJECT_TYPE  = 'relation';
+    const CATEGORY     = 'tag';
+
+
+    /**
+     * Class constructor
+     */
+    public function __construct()
+    {
+    }
+
+    /**
+     * Initializes config object and dependencies
+     */
+    private function load()
+    {
+        // nothing to be done here
+        if (isset($this->folders)) {
+            return;
+        }
+
+        $this->folders = kolab_storage::get_folders(self::FOLDER_TYPE);
+
+        foreach ($this->folders as $folder) {
+            if ($folder->default) {
+                $this->default = $folder;
+                break;
+            }
+        }
+
+        // if no folder is set as default, choose the first one
+        if (!$this->default) {
+            $this->default = reset($this->folders);
+        }
+
+        // check if configuration folder exist
+        if ($this->default && $this->default->name) {
+            $this->enabled = true;
+        }
+    }
+
+    /**
+     * Tags list
+     *
+     * @param array $filter Search filter
+     *
+     * @return array List of tags
+     */
+    public function list_tags($filter = array())
+    {
+        $this->load();
+
+        $default  = true;
+        $taglist  = array();
+        $filter[] = array('type', '=', self::OBJECT_TYPE);
+
+        foreach ($this->folders as $folder) {
+            // we only want to read from default folder
+            if ($default && !$folder->default) {
+                continue;
+            }
+
+            foreach ($folder->select($filter) as $object) {
+                if ($object['category'] == self::CATEGORY) {
+                    // @TODO: we need uid, name, color and members only?
+                    $taglist[] = $object;
+                }
+            }
+        }
+
+        return $taglist;
+    }
+
+    /**
+     * Create tag object
+     *
+     * @param array $tag Tag data
+     *
+     * @return boolean|array Tag data on success, False on failure
+     */
+    public function create($tag)
+    {
+        $this->load();
+
+        if (!$this->default) {
+            return false;
+        }
+
+        $tag = array_intersect_key($tag, array_combine($this->tag_cols, $this->tag_cols));
+        $tag['type']     = 'relation';
+        $tag['category'] = self::CATEGORY;
+
+        // Create the object
+        $result = $this->default->save($tag, self::FOLDER_TYPE . '.' . self::OBJECT_TYPE);
+
+        return $result ? $tag : false;
+    }
+
+    /**
+     * Update tag object
+     *
+     * @param array $tag Tag data
+     *
+     * @return boolean|array Tag data on success, False on failure
+     */
+    public function update($tag)
+    {
+        // get tag object data, we need _mailbox
+        $list    = $this->list_tags(array(array('uid', '=', $tag['uid'])));
+        $old_tag = $list[0];
+
+        if (!$old_tag) {
+            return false;
+        }
+
+        $tag = array_intersect_key($tag, array_combine($this->tag_cols, $this->tag_cols));
+        $tag = array_merge($old_tag, $tag);
+
+        // find folder object
+        foreach ($this->folders as $folder) {
+            if ($folder->name == $tag['_mailbox']) {
+                break;
+            }
+        }
+
+        // Update the object
+        $result = $folder->save($tag, self::FOLDER_TYPE . '.' . self::OBJECT_TYPE, $tag['uid']);
+
+        return $result ? $tag : false;
+    }
+
+    /**
+     * Remove tag object
+     *
+     * @param string $uid Object unique identifier
+     *
+     * @return boolean True on success, False on failure
+     */
+    public function remove($uid)
+    {
+        // get tag object data, we need _mailbox
+        $list = $this->list_tags(array(array('uid', '=', $uid)));
+        $tag  = $list[0];
+
+        if (!$tag) {
+            return false;
+        }
+
+        // find folder object
+        foreach ($this->folders as $folder) {
+            if ($folder->name == $tag['_mailbox']) {
+                break;
+            }
+        }
+
+        return $folder->delete($uid);
+    }
+}

roundcubemail-plugins-kolab-3.2.tar.gz/plugins/kolab_tags/lib/kolab_tags_engine.php Added

@@ -0,0 +1,670 @@
+<?php
+
+/**
+ * Kolab Tags engine
+ *
+ * @author Aleksander Machniak <machniak@kolabsys.com>
+ *
+ * Copyright (C) 2014, 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/>.
+ */
+
+class kolab_tags_engine
+{
+    private $backend;
+    private $plugin;
+    private $rc;
+
+    /**
+     * Class constructor
+     */
+    public function __construct($plugin)
+    {
+        $plugin->require_plugin('libkolab');
+
+        require_once $plugin->home . DIRECTORY_SEPARATOR . 'lib' . DIRECTORY_SEPARATOR . 'kolab_tags_backend.php';
+
+        $this->backend = new kolab_tags_backend;
+        $this->plugin  = $plugin;
+        $this->rc      = $plugin->rc;
+    }
+
+    /**
+     * User interface initialization
+     */
+    public function ui()
+    {
+        // set templates of Files UI and widgets
+        if ($this->rc->task == 'mail') {
+            $this->plugin->add_texts('localization/');
+
+            $this->plugin->include_stylesheet($this->plugin->local_skin_path().'/style.css');
+            $this->plugin->include_script('kolab_tags.js');
+            $this->rc->output->add_label('cancel', 'save');
+            $this->plugin->add_label('tags', 'add', 'edit', 'delete', 'saving',
+                'nameempty', 'nameexists', 'colorinvalid', 'untag');
+
+            $this->rc->output->add_handlers(array(
+                'plugin.taglist' => array($this, 'taglist'),
+            ));
+
+            $ui = $this->rc->output->parse('kolab_tags.ui', false, false);
+            $this->rc->output->add_footer($ui);
+
+            // load miniColors
+            jqueryui::miniColors();
+        }
+    }
+
+    /**
+     * Engine actions handler (managing tag objects)
+     */
+    public function actions()
+    {
+        $this->plugin->add_texts('localization/');
+
+        $action = rcube_utils::get_input_value('_act', rcube_utils::INPUT_POST);
+
+        if ($action) {
+            $this->{'action_' . $action}();
+        }
+        // manage tag objects
+        else {
+            $delete   = (array) rcube_utils::get_input_value('delete', rcube_utils::INPUT_POST);
+            $update   = (array) rcube_utils::get_input_value('update', rcube_utils::INPUT_POST, true);
+            $add      = (array) rcube_utils::get_input_value('add', rcube_utils::INPUT_POST, true);
+            $response = array();
+
+            // tags deletion
+            foreach ($delete as $uid) {
+                if ($this->backend->remove($uid)) {
+                    $response['delete'][] = $uid;
+                }
+            }
+
+            // tags creation
+            foreach ($add as $tag) {
+                if ($tag = $this->backend->create($tag)) {
+                    $response['add'][] = $this->parse_tag($tag);
+                }
+            }
+
+            // tags update
+            foreach ($update as $tag) {
+                if ($this->backend->update($tag)) {
+                    $response['update'][] = $this->parse_tag($tag);
+                }
+            }
+
+            if (!empty($error)) {
+                $this->rc->output->show_message($this->plugin->gettext('updateerror'), 'error');
+            }
+            else {
+                $this->rc->output->show_message($this->plugin->gettext('updatesuccess'), 'confirmation');
+            }
+
+            $this->rc->output->command('plugin.kolab_tags', $response);
+        }
+
+
+        $this->rc->output->send();
+    }
+
+    /**
+     * Remove tag from message(s)
+     */
+    public function action_remove()
+    {
+        $tag     = rcube_utils::get_input_value('_tag', rcube_utils::INPUT_POST);
+        $filter  = $tag == '*' ? array() : array(array('uid', '=', explode(',', $tag)));
+        $taglist = $this->backend->list_tags($filter);
+        $filter  = array();
+
+        foreach (rcmail::get_uids() as $mbox => $uids) {
+            if ($uids === '*') {
+                $filter[$mbox] = $this->build_member_url(array('folder' => $mbox));
+            }
+            else {
+                foreach ((array)$uids as $uid) {
+                    $filter[$mbox][] = $this->build_member_url(array(
+                            'folder' => $mbox,
+                            'uid'    => $uid
+                    ));
+                }
+            }
+        }
+
+        // for every tag...
+        foreach ($taglist as $tag) {
+            $updated = false;
+
+            // @todo: make sure members list is up-to-date (UIDs are up-to-date)
+
+            // ...filter members by folder/uid prefix
+            foreach ((array) $tag['members'] as $idx => $member) {
+                foreach ($filter as $folder => $members) {
+                    // list of prefixes
+                    if (is_array($members)) {
+                        foreach ($members as $message) {
+                            if ($member == $message || strpos($member, $message . '?') === 0) {
+                                unset($tag['members'][$idx]);
+                                $updated = true;
+                            }
+                        }
+                    }
+                    // one prefix (all messages in a folder)
+                    else {
+                        if (preg_match('/^' . preg_quote($members, '/') . '\/[0-9]+(\?|$)/', $member)) {
+                            unset($tag['members'][$idx]);
+                            $updated = true;
+                        }
+                    }
+                }
+            }
+
+            // update tag object
+            if ($updated) {
+                if (!$this->backend->update($tag)) {
+                    $error = true;
+                }
+            }
+        }
+
+        if ($error) {
+            if ($_POST['_from'] != 'show') {
+                $this->rc->output->show_message($this->plugin->gettext('untaggingerror'), 'error');
+                $this->rc->output->command('list_mailbox');
+            }
+        }
+        else {
+            $this->rc->output->show_message($this->plugin->gettext('untaggingsuccess'), 'confirmation');
+        }
+    }
+
+    /**
+     * Add tag to message(s)
+     */
+    public function action_add()

roundcubemail-plugins-kolab-3.2.tar.gz/plugins/kolab_tags/localization Added

roundcubemail-plugins-kolab-3.2.tar.gz/plugins/kolab_tags/localization/en_US.inc Added

@@ -0,0 +1,23 @@
+<?php
+
+$labels['tags'] = 'Tags';
+$labels['unset'] = 'Unselect all';
+$labels['manage'] = 'Manage tags...';
+$labels['tagactions'] = 'Tag actions...';
+$labels['tagadd'] = 'Tag as...';
+$labels['tagremove'] = 'Remove tag...';
+$labels['untag'] = 'Remove tag';
+$labels['tagremoveall'] = 'Remove all tags';
+$labels['add'] = 'Add';
+$labels['edit'] = 'Edit';
+$labels['delete'] = 'Delete';
+$labels['nameempty'] = 'Tag name cannot be empty!';
+$labels['nameexists'] = 'Tag with specified name already exists!';
+$labels['colorinvalid'] = 'Invalid color specification!';
+$labels['saving'] = 'Saving data...';
+$labels['updatesuccess'] = 'Tags have beed updated successfully.';
+$labels['updateerror'] = 'Failed to update tags information.';
+$labels['taggingsuccess'] = 'Tags have beed assigned successfully.';
+$labels['taggingerror'] = 'Failed to assign tags.';
+$labels['untaggingsuccess'] = 'Tag(s) have beed removed successfully.';
+$labels['untaggingerror'] = 'Failed to remove tag assignments.';

roundcubemail-plugins-kolab-3.2.tar.gz/plugins/kolab_tags/package.xml Added

@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<package xmlns="http://pear.php.net/dtd/package-2.0" xmlns:tasks="http://pear.php.net/dtd/tasks-1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" packagerversion="1.9.0" version="2.0" xsi:schemaLocation="http://pear.php.net/dtd/tasks-1.0
+    http://pear.php.net/dtd/tasks-1.0.xsd
+    http://pear.php.net/dtd/package-2.0
+    http://pear.php.net/dtd/package-2.0.xsd">
+	<name>kolab_tags</name>
+    <uri>http://git.kolab.org/roundcubemail-plugins-kolab/</uri>
+	<summary>Email tags plugin</summary>
+	<description>-</description>
+	<lead>
+		<name>Aleksander Machniak</name>
+		<user>machniak</user>
+		<email>machniak@kolabsys.com</email>
+		<active>yes</active>
+	</lead>
+	<date>2013-07-30</date>
+	<version>
+		<release>0.1-beta</release>
+		<api>0.1-beta</api>
+	</version>
+	<stability>
+		<release>beta</release>
+		<api>beta</api>
+	</stability>
+	<license uri="http://www.gnu.org/licenses/agpl.html">GNU AGPLv3</license>
+	<notes>-</notes>
+	<contents>
+		<dir baseinstalldir="/" name="/">
+			<file name="kolab_tags.php" role="php">
+				<tasks:replace from="@package_version@" to="version" type="package-info"/>
+			</file>
+			<file name="kolab_tags.js" role="data">
+				<tasks:replace from="@package_version@" to="version" type="package-info"/>
+			</file>
+			<file name="lib/kolab_tags_backend.php" role="data">
+				<tasks:replace from="@package_version@" to="version" type="package-info"/>
+			</file>
+			<file name="lib/kolab_tags_engine.php" role="data">
+				<tasks:replace from="@package_version@" to="version" type="package-info"/>
+			</file>
+
+			<file name="LICENSE" role="data"></file>
+
+			<file name="localization/en_US.inc" role="data"></file>
+			
+			<file name="skins/larry/images/icons.png" role="data"></file>
+			<file name="skins/larry/templates/ui.html" role="data"></file>
+			<file name="skins/larry/style.css" role="data"></file>
+		</dir>
+		
+	</contents>
+	<dependencies>
+		<required>
+			<php>
+				<min>5.3.1</min>
+			</php>
+			<pearinstaller>
+				<min>1.7.0</min>
+			</pearinstaller>
+			<package>
+			<name>libkolab</name>
+				<uri>http://git.kolab.org/roundcubemail-plugins-kolab/tree/plugins/libkolab</uri>
+			</package>
+		</required>
+	</dependencies>
+	<phprelease/>
+</package>

roundcubemail-plugins-kolab-3.2.tar.gz/plugins/kolab_tags/skins Added

roundcubemail-plugins-kolab-3.2.tar.gz/plugins/kolab_tags/skins/larry Added

roundcubemail-plugins-kolab-3.2.tar.gz/plugins/kolab_tags/skins/larry/images Added

roundcubemail-plugins-kolab-3.2.tar.gz/plugins/kolab_tags/skins/larry/images/icons.png Added

roundcubemail-plugins-kolab-3.2.tar.gz/plugins/kolab_tags/skins/larry/style.css Added

@@ -0,0 +1,124 @@
+ul.toolbarmenu li span.icon.tagadd {
+    background-image: url("images/icons.png");
+    background-position: 2px 2px;
+}
+
+ul.toolbarmenu li span.icon.tagremove {
+    background-image: url("images/icons.png");
+    background-position: 2px -18px;
+}
+
+ul.toolbarmenu li span.icon.tagremoveall {
+    background-image: url("images/icons.png");
+    background-position: 2px -39px;
+}
+
+#tagcloud {
+	position: absolute;
+	left: 0;
+	bottom: 0;
+	top: 0;
+	width: 100%;
+}
+
+#taglist {
+	padding: 0;
+	margin: 6px;
+	list-style: none;
+}
+
+#taglist li {
+	display: inline-block;
+	color: #004458;
+	padding: 2px 6px;
+	margin-right: 3px;
+	margin-bottom: 2px;
+	text-align: center;
+	text-decoration: none;
+	min-width: 2em;
+	cursor: pointer;
+	font-weight: bold;
+}
+
+#taglist li.selected {
+	color: #fff;
+	border-radius: 8px;
+	background-color: #6A939F;
+}
+
+#taglist li.inactive {
+	color: #89b3be;
+	padding-right: 0.6em;
+	font-size: 80%;
+}
+
+#taglist li .count {
+	position: relative;
+	top: -1px;
+	margin-left: 5px;
+	padding: 0.15em 0.5em;
+	font-size: 80%;
+	font-weight: bold;
+	color: #59838e;
+	background: #c7e3ef;
+	box-shadow: inset 0 1px 1px 0 #b0ccd7;
+	-o-box-shadow: inset 0 1px 1px 0 #b0ccd7;
+	-webkit-box-shadow: inset 0 1px 1px 0 #b0ccd7;
+	-moz-box-shadow: inset 0 1px 1px 0 #b0ccd7;
+	border-color: #b0ccd7;
+	border-radius: 8px;
+}
+
+.tag-draghelper .tag .count,
+#taglist li.inactive .count {
+	display: none;
+}
+
+#tagsform,
+#tageditform {
+	width: 400px;
+	height: 130px;
+	margin-top: 5px;
+}
+
+#tagsform div.buttons {
+	width: 80px;
+	float: left;
+	margin-left: 10px;
+}
+
+#tagsform div.buttons input {
+	display: block;
+	width: 80px;
+}
+
+#tagsform select {
+	width: 300px;
+	float: left;
+}
+
+#tageditform input[type=button] {
+	display: inline-block;
+	width: 80px;
+	margin-top: 10px;
+}
+
+.tagbox {
+	color: #fff;
+	border-radius: 8px;
+	background-color: #6A939F;
+	max-width: 4em;
+	line-height:15px;
+	padding: 2px 6px;
+	margin-right: 3px;
+	font-size: 11px;
+	font-weight: bold;
+}
+
+.tagbox a {
+	color: inherit;
+	padding-left: 3px;
+	padding-bottom: 3px;
+	cursor: pointer;
+	text-decoration: none;
+}

roundcubemail-plugins-kolab-3.2.tar.gz/plugins/kolab_tags/skins/larry/templates Added

roundcubemail-plugins-kolab-3.2.tar.gz/plugins/kolab_tags/skins/larry/templates/ui.html Added

@@ -0,0 +1,45 @@
+<div id="tagcloud" class="uibox listbox" style="display:none">
+	<h2 class="boxtitle"><roundcube:label name="kolab_tags.tags" id="taglist" /></h2>
+	<div class="scroller withfooter">
+		<roundcube:object name="plugin.taglist" id="taglist" />
+	</div>
+	<div class="boxfooter">
+		<roundcube:button name="tagsmenulink" id="tagsmenulink" type="link" title="kolab_tags.tagactions" class="listbutton groupactions" onclick="UI.toggle_popup('tagsmenu', event)" innerClass="inner" content="&#9881;" />
+	</div>
+</div>
+
+<div id="tagsmenu" class="popupmenu" aria-hidden="true">
+	<h3 id="aria-label-tagsmenu" class="voice"><roundcube:label name="kolab_tags.arialabelmoretagactions" /></h3>
+	<ul class="toolbarmenu" id="tagoptionsmenu" role="menu" aria-labelledby="aria-label-tagsmenu">
+		<li role="menuitem"><roundcube:button command="reset-tags" type="link" label="kolab_tags.unset" classAct="active" /></li>
+		<li role="menuitem"><roundcube:button command="manage-tags" type="link" label="kolab_tags.manage" classAct="active" /></li>
+		<roundcube:container name="tagoptions" id="tagoptionsmenu" />
+	</ul>
+</div>
+
+<div id="tagmessagemenu" class="popupmenu" aria-hidden="true">
+	<ul class="toolbarmenu iconized">
+		<li class="separator"><label><roundcube:label name="kolab_tags.tags" /></label></li>
+		<li role="menuitem"><roundcube:button command="tag-add" label="kolab_tags.tagadd" classAct="icon active" class="icon" innerclass="icon tagadd folder-selector-link" /></li>
+		<li role="menuitem"><roundcube:button command="tag-remove" label="kolab_tags.tagremove" classAct="icon active" class="icon" innerclass="icon tagremove folder-selector-link" /></li>
+		<li role="menuitem"><roundcube:button command="tag-remove-all" label="kolab_tags.tagremoveall" classAct="icon active" class="icon" innerclass="icon tagremoveall" /></li>
+	</ul>
+</div>
+
+
+<script type="text/javascript">
+
+$(document).ready(function(e) {
+    // put tags cloud under folders list
+    var tagcloud = $('#tagcloud').detach();
+    $('#mailview-left').append(tagcloud.show());
+
+    new rcube_splitter({ id:'mailtagsplitter', p1:'#mailboxcontainer', p2:'#tagcloud',
+        orientation:'h', relative:true, start:242, min:120, size:12, offset:4 }).init();
+
+    // add tag message menu positions to Mark menu
+    var menu = $('#tagmessagemenu li').detach();
+    $('#markmessagemenu ul').append(menu);
+});
+
+</script>

roundcubemail-plugins-kolab-3.2.tar.gz/plugins/libcalendaring/lib/libcalendaring_itip.php Changed

@@ -30,6 +30,8 @@
     protected $sender;
     protected $domain;
     protected $itip_send = false;
+    protected $rsvp_actions = array('accepted','tentative','declined');
+    protected $rsvp_status  = array('accepted','tentative','declined','delegated');
 
     function __construct($plugin, $domain = 'libcalendaring')
     {
@@ -52,6 +54,12 @@
             $this->sender['email'] = $email;
     }
 
+    public function set_rsvp_actions($actions)
+    {
+        $this->rsvp_actions = (array)$actions;
+        $this->rsvp_status = array_merge($this->rsvp_actions, array('delegated'));
+    }
+
     /**
      * Wrapper for rcube_plugin::gettext()
      * Checking for a label in different domains
@@ -118,10 +126,9 @@
             )
         ));
 
-        // append sender's comment
-        if (!empty($event['comment'])) {
-            $mailbody .= "\n\n" . $this->gettext('itipsendercomment') . $event['comment'];
-        }
+        // if (!empty($event['comment'])) {
+        //     $mailbody .= "\n\n" . $this->gettext('itipsendercomment') . $event['comment'];
+        // }
 
         // append links for direct invitation replies
         if ($method == 'REQUEST' && ($token = $this->store_invitation($event, $recipient['email']))) {
@@ -198,6 +205,7 @@
                 }
                 else if (strcasecmp($attedee['email'], $from) == 0 || strcasecmp($attendee['email'], $from_utf) == 0) {
                     $replying_attendee = $attendee;
+                    unset($replying_attendee['rsvp']);  // unset the RSVP attribute
                 }
             }
             if ($replying_attendee) {
@@ -251,8 +259,8 @@
 
       // check if the given itip object matches the last state
       if ($existing) {
-        $latest = ($event['sequence'] && $existing['sequence'] == $event['sequence']) ||
-                  (!$event['sequence'] && $existing['changed'] && $existing['changed'] >= $event['changed']);
+        $latest = (isset($event['sequence']) && $existing['sequence'] == $event['sequence']) ||
+                  (!isset($event['sequence']) && $existing['changed'] && $existing['changed'] >= $event['changed']);
       }
 
       // determine action for REQUEST
@@ -273,19 +281,28 @@
           $rsvp = $event['rsvp'] && $this->rc->config->get('calendar_allow_itip_uninvited', true);
         }
 
-        if ($status == 'unknown' && !$this->rc->config->get('calendar_allow_itip_uninvited', true)) {
+        $status_lc = strtolower($status);
+
+        if ($status_lc == 'unknown' && !$this->rc->config->get('calendar_allow_itip_uninvited', true)) {
           $html = html::div('rsvp-status', $this->gettext('notanattendee'));
           $action = 'import';
         }
-        else if (in_array($status, array('ACCEPTED','TENTATIVE','DECLINED','DELEGATED'))) {
-          $html = html::div('rsvp-status ' . strtolower($status), $this->gettext('youhave'.strtolower($status)));
+        else if (in_array($status_lc, $this->rsvp_status)) {
+          $status_text = $this->gettext(($latest ? 'youhave' : 'youhavepreviously') . $status_lc);
 
-          if ($existing && ($existing['sequence'] > $event['sequence'] || (!$event['sequence'] && $existing['changed'] && $existing['changed'] > $event['changed']))) {
+          if ($existing && ($existing['sequence'] > $event['sequence'] || (!isset($event['sequence']) && $existing['changed'] && $existing['changed'] > $event['changed']))) {
             $action = '';  // nothing to do here, outdated invitation
+            if ($status_lc == 'needs-action')
+              $status_text = $this->gettext('outdatedinvitation');
           }
           else if (!$existing && !$rsvp) {
             $action = 'import';
           }
+          else if ($latest && $status_lc != 'needs-action') {
+            $action = 'update';
+          }
+
+          $html = html::div('rsvp-status ' . $status_lc, $status_text);
         }
       }
       // determine action for REPLY
@@ -304,7 +321,7 @@
                     )
                 )));
               }
-              $action = $attendee['status'] == $status ? '' : 'update';
+              $action = $attendee['status'] == $status || !$latest ? '' : 'update';
               $listed = true;
               break;
             }
@@ -403,7 +420,7 @@
             $metadata['rsvp'] = true;
 
             // 1. display RSVP buttons (if the user was invited)
-            foreach (array('accepted','tentative','declined') as $method) {
+            foreach ($this->rsvp_actions as $method) {
                 $rsvp_buttons .= html::tag('input', array(
                     'type' => 'button',
                     'class' => "button $method",
@@ -412,7 +429,15 @@
                 ));
             }
 
-            // 2. Simply import the event without replying
+            // 2. update the local copy with minor changes
+            $update_button = html::tag('input', array(
+                'type' => 'button',
+                'class' => 'button',
+                'onclick' => "rcube_libcalendaring.add_from_itip_mail('" . JQ($mime_id) . "', '$task')",
+                'value' => $this->gettext('updatemycopy'),
+            ));
+
+            // 3. Simply import the event without replying
             $import_button = html::tag('input', array(
                 'type' => 'button',
                 'class' => 'button',
@@ -430,13 +455,11 @@
                 }
             }
 
-            // add input field for reply comment
-            $rsvp_buttons .= html::a(array('href' => '#toggle', 'class' => 'reply-comment-toggle'), $this->gettext('itipeditresponse'));
-            $rsvp_buttons .= html::div('itip-reply-comment',
-                html::tag('textarea', array('id' => 'reply-comment-'.$dom_id, 'cols' => 40, 'rows' => 6, 'style' => 'display:none', 'placeholder' => $this->gettext('itipcomment')), '')
-            );
+            // add itip reply message controls
+            $rsvp_buttons .= html::div('itip-reply-controls', $this->itip_rsvp_options_ui($dom_id));
 
             $buttons[] = html::div(array('id' => 'rsvp-'.$dom_id, 'class' => 'rsvp-buttons', 'style' => 'display:none'), $rsvp_buttons);
+            $buttons[] = html::div(array('id' => 'update-'.$dom_id, 'style' => 'display:none'), $update_button);
         }
         // for CANCEL messages, we can:
         else if ($method == 'CANCEL') {
@@ -489,6 +512,26 @@
     }
 
     /**
+     * Render UI elements to control iTip reply message sending
+     */
+    public function itip_rsvp_options_ui($dom_id)
+    {
+        // add checkbox to suppress itip reply message
+        $rsvp_additions = html::label(array('class' => 'noreply-toggle'),
+            html::tag('input', array('type' => 'checkbox', 'id' => 'noreply-'.$dom_id, 'value' => 1))
+            . ' ' . $this->gettext('itipsuppressreply')
+        );
+
+        // add input field for reply comment
+        $rsvp_additions .= html::a(array('href' => '#toggle', 'class' => 'reply-comment-toggle'), $this->gettext('itipeditresponse'));
+        $rsvp_additions .= html::div('itip-reply-comment',
+            html::tag('textarea', array('id' => 'reply-comment-'.$dom_id, 'cols' => 40, 'rows' => 6, 'style' => 'display:none', 'placeholder' => $this->gettext('itipcomment')), '')
+        );
+
+        return $rsvp_additions;
+    }
+
+    /**
      * Render event details in a table
      */
     function itip_object_details_table($event, $title)

roundcubemail-plugins-kolab-3.2.tar.gz/plugins/libcalendaring/libcalendaring.js Changed

@@ -406,7 +406,7 @@
     {
         var valarms = [];
 
-        $(prefix + ':visible .edit-alarm-item').each(function(i, elem){
+        $(prefix + ' .edit-alarm-item').each(function(i, elem) {
             var val, offset, alarm = { action: $('select.edit-alarm-type', elem).val() };
             if (alarm.action) {
                 offset = $('select.edit-alarm-offset', elem).val();
@@ -434,12 +434,12 @@
     {
         // clear old alert first
         if (this.alarm_dialog)
-            this.alarm_dialog.dialog('destroy');
+            this.alarm_dialog.dialog('destroy').remove();
 
         this.alarm_dialog = $('<div>').attr('id', 'alarm-display');
 
-        var actions, adismiss, asnooze, alarm, html, event_ids = [];
-        for (var i=0; i < alarms.length; i++) {
+        var i, actions, adismiss, asnooze, alarm, html, event_ids = [], buttons = {};
+        for (i=0; i < alarms.length; i++) {
             alarm = alarms[i];
             alarm.start = this.parseISO8601(alarm.start);
             alarm.end = this.parseISO8601(alarm.end);
@@ -454,7 +454,7 @@
                 me.dismiss_alarm(me.dismiss_link.data('id'), 0);
             });
             asnooze = $('<a href="#" class="alarm-action-snooze"></a>').html(rcmail.gettext('snooze','libcalendaring')).click(function(e){
-                me.snooze_dropdown($(this));
+                me.snooze_dropdown($(this), e);
                 e.stopPropagation();
                 return false;
             });
@@ -463,7 +463,10 @@
             $('<div>').addClass('alarm-item').html(html).append(actions).appendTo(this.alarm_dialog);
         }
 
-        var buttons = {};
+        buttons[rcmail.gettext('close')] = function() {
+            $(this).dialog('close');
+        };
+
         buttons[rcmail.gettext('dismissall','libcalendaring')] = function() {
             // submit dismissed event_ids to server
             me.dismiss_alarm(me.alarm_ids.join(','), 0);
@@ -474,9 +477,14 @@
             modal: false,
             resizable: true,
             closeOnEscape: false,
-            dialogClass: 'alarm',
-            title: '<span class="ui-icon ui-icon-alarms" style="float:left; margin:0 4px 0 0"></span>' + rcmail.gettext('alarmtitle','libcalendaring'),
+            dialogClass: 'alarms',
+            title: rcmail.gettext('alarmtitle','libcalendaring'),
             buttons: buttons,
+            open: function() {
+              setTimeout(function() {
+                me.alarm_dialog.parent().find('.ui-button:not(.ui-dialog-titlebar-close)').first().focus();
+              }, 5);
+            },
             close: function() {
               $('#alarm-snooze-dropdown').hide();
               $(this).dialog('destroy').remove();
@@ -488,13 +496,15 @@
             }
         });
 
+        this.alarm_dialog.closest('div[role=dialog]').attr('role', 'alertdialog');
+
         this.alarm_ids = event_ids;
     };
 
     /**
      * Show a drop-down menu with a selection of snooze times
      */
-    this.snooze_dropdown = function(link)
+    this.snooze_dropdown = function(link, event)
     {
         if (!this.snooze_popup) {
             this.snooze_popup = $('#alarm-snooze-dropdown');
@@ -512,13 +522,12 @@
 
         // hide visible popup
         if (this.snooze_popup.is(':visible') && this.snooze_popup.data('id') == link.data('id')) {
-            this.snooze_popup.hide();
+            rcmail.command('menu-close', 'alarm-snooze-dropdown');
             this.dismiss_link = null;
         }
         else {  // open popup below the clicked link
-            var pos = link.offset();
-            pos.top += link.height() + 2;
-            this.snooze_popup.data('id', link.data('id')).css({ top:Math.floor(pos.top)+'px', left:Math.floor(pos.left)+'px' }).show();
+            rcmail.command('menu-open', 'alarm-snooze-dropdown', link.get(0), event);
+            this.snooze_popup.data('id', link.data('id'));
             this.dismiss_link = link;
         }
     };
@@ -528,7 +537,7 @@
      */
     this.dismiss_alarm = function(id, snooze)
     {
-        $('#alarm-snooze-dropdown').hide();
+        rcmail.command('menu-close', 'alarm-snooze-dropdown');
         rcmail.http_post('utils/plugin.alarms', { action:'dismiss', data:{ id:id, snooze:snooze } });
 
         // remove dismissed alarm from list
@@ -735,9 +744,11 @@
         del = confirm(rcmail.gettext('itip.declinedeleteconfirm'));
     }
 
-    var comment = '';
+    var noreply = 0, comment = '';
     if (dom_id) {
-      comment = $('#reply-comment-'+dom_id).val();
+      noreply = $('#noreply-'+dom_id).prop('checked') ? 1 : 0;
+      if (!noreply)
+        comment = $('#reply-comment-'+dom_id).val();
     }
 
     rcmail.http_post(task + '/mailimportitip', {
@@ -747,6 +758,7 @@
         _folder: $('#itip-saveto').val(),
         _status: status,
         _del: del?1:0,
+        _noreply: noreply,
         _comment: comment
       }, rcmail.set_busy(true, 'itip.savingdata'));
 
@@ -842,6 +854,46 @@
   $('#'+p.action+'-'+p.id).show().find('input.button').last().after(p.select);
 };
 
+/**
+ * Callback from server after an iTip message has been processed
+ */
+rcube_libcalendaring.itip_message_processed = function(metadata)
+{
+  if (metadata.after_action) {
+    setTimeout(function(){ rcube_libcalendaring.itip_after_action(metadata.after_action); }, 1200);
+  }
+  else {
+    rcube_libcalendaring.fetch_itip_object_status(metadata);
+  }
+};
+
+/**
+ * After-action on iTip request message. Action types:
+ *     0 - no action
+ *     1 - move to Trash
+ *     2 - delete the message
+ *     3 - flag as deleted
+ *     folder_name - move the message to the specified folder
+ */
+rcube_libcalendaring.itip_after_action = function(action)
+{
+  if (!action) {
+    return;
+  }
+
+  var rc = rcmail.is_framed() ? parent.rcmail : rcmail;
+
+  if (action === 2) {
+    rc.permanently_remove_messages();
+  }
+  else if (action === 3) {
+    rc.mark_message('delete');
+  }
+  else {
+    rc.move_messages(action === 1 ? rc.env.trash_mailbox : action);
+  }
+};
+
 
 // extend jQuery
 (function($){
@@ -862,8 +914,9 @@
     rcmail.addEventListener('plugin.display_alarms', function(alarms){ libcal.display_alarms(alarms); });
   }
 
-  rcmail.addEventListener('plugin.update_itip_object_status', rcube_libcalendaring.update_itip_object_status);
-  rcmail.addEventListener('plugin.fetch_itip_object_status', rcube_libcalendaring.fetch_itip_object_status);
+  rcmail.addEventListener('plugin.update_itip_object_status', rcube_libcalendaring.update_itip_object_status)
+    .addEventListener('plugin.fetch_itip_object_status', rcube_libcalendaring.fetch_itip_object_status)
+    .addEventListener('plugin.itip_message_processed', rcube_libcalendaring.itip_message_processed);
 
   $('.rsvp-buttons').on('click', 'a.reply-comment-toggle', function(e){
     $(this).hide().parent().find('textarea').show().focus();

roundcubemail-plugins-kolab-3.2.tar.gz/plugins/libcalendaring/libcalendaring.php Changed

@@ -145,7 +145,7 @@
         if (is_numeric($dt))
             $dt = new DateTime('@'.$dt);
         else if (is_string($dt))
-            $dt = new DateTime($dt);
+            $dt = rcube_utils::anytodatetime($dt);
 
         if ($dt instanceof DateTime && !($dt->_dateonly || $dateonly)) {
             $dt->setTimezone($this->timezone);
@@ -329,6 +329,13 @@
      */
     public function get_user_emails()
     {
+        static $emails;
+
+        // return cached result
+        if (is_array($emails)) {
+            return $emails;
+        }
+
         $emails = array();
         $plugin = $this->rc->plugins->exec_hook('calendar_user_emails', array('emails' => $emails));
         $emails = array_map('strtolower', $plugin['emails']);
@@ -342,7 +349,28 @@
             $emails[] = strtolower($identity['email']);
         }
 
-        return array_unique($emails);
+        $emails = array_unique($emails);
+        return $emails;
+    }
+
+    /**
+     * Set the given participant status to the attendee matching the current user's identities
+     *
+     * @param array   Hash array with event struct
+     * @param string  The PARTSTAT value to set
+     * @return mixed  Email address of the updated attendee or False if none matching found
+     */
+    public function set_partstat(&$event, $status)
+    {
+        $emails = $this->get_user_emails();
+        foreach ((array)$event['attendees'] as $i => $attendee) {
+            if ($attendee['email'] && in_array(strtolower($attendee['email']), $emails)) {
+                $event['attendees'][$i]['status'] = strtoupper($status);
+                return $attendee['email'];
+            }
+        }
+
+        return false;
     }
 
 
@@ -580,6 +608,7 @@
         if (!$plugin['abort'] && !empty($plugin['alarms'])) {
             // make sure texts and env vars are available on client
             $this->add_texts('localization/', true);
+            $this->rc->output->add_label('close');
             $this->rc->output->set_env('snooze_select', $this->snooze_select());
             $this->rc->output->command('plugin.display_alarms', $this->_alarms_output($plugin['alarms']));
         }
@@ -717,7 +746,17 @@
             $until = $this->gettext('forever');
         }
 
-        return rtrim($freq . $details . ', ' . $until);
+        $except = '';
+        if (is_array($rrule['EXDATE']) && !empty($rrule['EXDATE'])) {
+          $format = self::to_php_date_format($this->rc->config->get('calendar_date_format', $this->defaults['calendar_date_format']));
+          $exdates = array_map(
+            function($dt) use ($format) { return format_date($dt, $format); },
+            array_slice($rrule['EXDATE'], 0, 10)
+          );
+          $except = '; ' . $this->gettext('except') . ' ' . join(', ', $exdates);
+        }
+
+        return rtrim($freq . $details . ', ' . $until . $except);
     }
 
     /**

roundcubemail-plugins-kolab-3.2.tar.gz/plugins/libcalendaring/libvcalendar.php Changed

roundcubemail-plugins-kolab-3.2.tar.gz/plugins/libcalendaring/localization/en_US.inc Changed

@@ -66,6 +66,7 @@
 $labels['last'] = 'last';
 $labels['dayofmonth'] = 'Day of month';
 $labels['addrdate'] = 'Add repeat date';
+$labels['except'] = 'except';
 
 // itip related labels
 $labels['itipinvitation'] = 'Invitation to';
@@ -75,9 +76,12 @@
 $labels['itipaccepted'] = 'Accept';
 $labels['itiptentative'] = 'Maybe';
 $labels['itipdeclined'] = 'Decline';
+$labels['itipdelegated'] = 'Delegate';
+$labels['itipneeds-action'] = 'Postpone';
 $labels['itipcomment'] = 'Your response';
 $labels['itipeditresponse'] = 'Enter a response text';
 $labels['itipsendercomment'] = 'Sender\'s comment: ';
+$labels['itipsuppressreply'] = 'Do not send a response';
 
 $labels['itipobjectnotfound'] = 'The object referred by this message was not found in your account.';
 $labels['itipsubjectaccepted'] = '"$title" has been accepted by $name';
@@ -96,11 +100,20 @@
 $labels['youhavetentative'] = 'You have tentatively accepted this invitation';
 $labels['youhavedeclined'] = 'You have declined this invitation';
 $labels['youhavedelegated'] = 'You have delegated this invitation';
+$labels['youhaveneeds-action'] = 'Your response to this invitation is still pending';
+
+$labels['youhavepreviouslyaccepted'] = 'You have previously accepted this invitation';
+$labels['youhavepreviouslytentative'] = 'You have previously accepted this invitation tentatively';
+$labels['youhavepreviouslydeclined'] = 'You have previously declined this invitation';
+$labels['youhavepreviouslydelegated'] = 'You have previously delegated this invitation';
+$labels['youhavepreviouslyneeds-action'] = 'Your response to this invitation is still pending';
+
 $labels['attendeeaccepted'] = 'Participant has accepted';
 $labels['attendeetentative'] = 'Participant has tentatively accepted';
 $labels['attendeedeclined'] = 'Participant has declined';
 $labels['attendeedelegated'] = 'Participant has delegated to $delegatedto';
 $labels['notanattendee'] = 'You\'re not listed as an attendee of this object';
+$labels['outdatedinvitation'] = 'This invitation has been replaced by a newer version';
 
 $labels['importtocalendar'] = 'Save to my calendar';
 $labels['removefromcalendar'] = 'Remove from my calendar';

roundcubemail-plugins-kolab-3.2.tar.gz/plugins/libcalendaring/skins/larry/libcal.css Changed

roundcubemail-plugins-kolab-3.2.tar.gz/plugins/libkolab/config.inc.php.dist Changed

roundcubemail-plugins-kolab-3.2.tar.gz/plugins/libkolab/js/folderlist.js Changed

@@ -53,6 +53,8 @@
 
               search_results_widget = new rcube_treelist_widget('<ul>', {
                   id_prefix: p.id_prefix,
+                  id_encode: p.id_encode,
+                  id_decode: p.id_decode,
                   selectable: false
               });
               // copy classes from main list
@@ -61,11 +63,16 @@
               // register click handler on search result's checkboxes to select the given item for listing
               search_results_widget.container
                   .appendTo(search_results_container)
-                  .on('click', 'input[type=checkbox], a.subscribed', function(e) {
-                      var li = $(this).closest('li'),
-                          id = li.attr('id').replace(new RegExp('^'+p.id_prefix), '')
-                          node = search_results_widget.get_node(id),
-                          has_children = node.children && node.children.length;
+                  .on('click', 'input[type=checkbox], a.subscribed, span.subscribed', function(e) {
+                      var node, has_children, li = $(this).closest('li'),
+                          id = li.attr('id').replace(new RegExp('^'+p.id_prefix), '');
+                      if (p.id_decode)
+                          id = p.id_decode(id);
+                      node = search_results_widget.get_node(id),
+                      has_children = node.children && node.children.length;
+
+                      e.stopPropagation();
+                      e.bubbles = false;
 
                       // activate + subscribe
                       if ($(e.target).hasClass('subscribed')) {
@@ -83,8 +90,8 @@
                       add_result2list(id, li, true);
 
                       if (has_children) {
-                          li.find('input[type=checkbox]').first().prop('disabled', true).get(0).checked = true;
-                          li.find('a.subscribed').first().hide();
+                          li.find('input[type=checkbox]').first().prop('disabled', true).prop('checked', true);
+                          li.find('a.subscribed, span.subscribed').first().hide();
                       }
                       else {
                           li.remove();
@@ -94,6 +101,20 @@
                       if (rcube_event.is_keyboard(e)) {
                         $(me.get_item(id, true)).find('input[type=checkbox]').first().focus();
                       }
+                  })
+                  .on('click', function(e) {
+                      var prop, id = String($(e.target).closest('li').attr('id')).replace(new RegExp('^'+p.id_prefix), '');
+                      if (p.id_decode)
+                          id = p.id_decode(id);
+
+                      // forward event
+                      if (prop = search_results[id]) {
+                        e.data = prop;
+                        if (me.triggerEvent('click-item', e) === false) {
+                          e.stopPropagation();
+                          return false;
+                        }
+                      }
                   });
           }
 
@@ -106,13 +127,14 @@
                   id: prop.id,
                   classes: [ prop.group || '' ],
                   html: item,
-                  collapsed: true
+                  collapsed: true,
+                  virtual: prop.virtual
               }, prop.parent);
 
               // disable checkbox if item already exists in main list
               if (me.get_node(prop.id) && !me.get_node(prop.id).virtual) {
-                  item.find('input[type=checkbox]').first().prop('disabled', true).get(0).checked = true;
-                  item.find('a.subscribed').hide();
+                  item.find('input[type=checkbox]').first().prop('disabled', true).prop('checked', true);
+                  item.find('a.subscribed, span.subscribed').hide();
               }
           }
 
@@ -131,7 +153,7 @@
 
         // find parent node and insert at the right place
         if (parent_id && me.get_node(parent_id)) {
-            dom_node.children('span,a').first().html(Q(prop.editname));
+            dom_node.children('span,a').first().html(Q(prop.editname || prop.listname));
         }
         else if (parent_id && search_results[parent_id]) {
             // copy parent tree from search results
@@ -178,7 +200,7 @@
         // send search request(s) to server
         if (search.query && search.execute) {
             // require a minimum length for the search string
-            if (rcmail.env.autocomplete_min_length && search.query.length < rcmail.env.autocomplete_min_length) {
+            if (rcmail.env.autocomplete_min_length && search.query.length < rcmail.env.autocomplete_min_length && search.query != '*') {
                 search_messagebox = rcmail.display_message(
                     rcmail.get_label('autocompletechars').replace('$min', rcmail.env.autocomplete_min_length));
                 return;
@@ -217,11 +239,14 @@
         }
     });
 
-    this.container.on('click', 'a.subscribed', function(e){
+    this.container.on('click', 'a.subscribed, span.subscribed', function(e){
         var li = $(this).closest('li'),
             id = li.attr('id').replace(new RegExp('^'+p.id_prefix), ''),
             div = li.children().first();
 
+        if (p.id_decode)
+            id = p.id_decode(id);
+
         div.toggleClass('subscribed');
         $(this).attr('aria-checked', div.hasClass('subscribed') ? 'true' : 'false');
         me.triggerEvent('subscribe', { id: id, subscribed: div.hasClass('subscribed'), item: li });

roundcubemail-plugins-kolab-3.2.tar.gz/plugins/libkolab/lib/kolab_bonnie_api.php Added

@@ -0,0 +1,82 @@
+<?php
+
+/**
+ * Provider class for accessing historic groupware object data through the Bonnie service
+ *
+ * API Specification at https://wiki.kolabsys.com/User:Bruederli/Draft:Bonnie_Client_API
+ *
+ * @author Thomas Bruederli <bruederli@kolabsys.com>
+ *
+ * Copyright (C) 2014, 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/>.
+ */
+
+class kolab_bonnie_api
+{
+    public $ready = false;
+
+    private $config = array();
+    private $client = null;
+
+
+    /**
+     * Default constructor
+     */
+    public function __construct($config)
+    {
+        $this->config = $confg;
+
+        $this->client = new kolab_bonnie_api_client($config['uri'], $config['timeout'] ?: 5, (bool)$config['debug']);
+
+        $this->client->set_secret($config['secret']);
+        $this->client->set_authentication($config['user'], $config['pass']);
+        $this->client->set_request_user(rcube::get_instance()->get_user_name());
+
+        $this->ready = !empty($config['secret']) && !empty($config['user']) && !empty($config['pass']);
+    }
+
+    /**
+     * Wrapper function for <object>.changelog() API call
+     */
+    public function changelog($type, $uid, $mailbox=null)
+    {
+        return $this->client->execute($type.'.changelog', array('uid' => $uid, 'mailbox' => $mailbox));
+    }
+
+    /**
+     * Wrapper function for <object>.diff() API call
+     */
+    public function diff($type, $uid, $rev, $mailbox=null)
+    {
+        return $this->client->execute($type.'.diff', array('uid' => $uid, 'rev' => $rev, 'mailbox' => $mailbox));
+    }
+
+    /**
+     * Wrapper function for <object>.get() API call
+     */
+    public function get($type, $uid, $rev, $mailbox=null)
+    {
+      return $this->client->execute($type.'.get', array('uid' => $uid, 'rev' => intval($rev), 'mailbox' => $mailbox));
+    }
+
+    /**
+     * Generic wrapper for direct API calls
+     */
+    public function _execute($method, $params = array())
+    {
+        return $this->client->execute($method, $params);
+    }
+
+}
\ No newline at end of file

roundcubemail-plugins-kolab-3.2.tar.gz/plugins/libkolab/lib/kolab_bonnie_api_client.php Added

@@ -0,0 +1,239 @@
+<?php
+
+/**
+ * JSON-RPC client class with some extra features for communicating with the Bonnie API service.
+ *
+ * @author Thomas Bruederli <bruederli@kolabsys.com>
+ *
+ * Copyright (C) 2014, 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/>.
+ */
+
+class kolab_bonnie_api_client
+{
+    /**
+     * URL of the RPC endpoint
+     * @var string
+     */
+    protected $url;
+
+    /**
+     * HTTP client timeout in seconds
+     * @var integer
+     */
+    protected $timeout;
+
+    /**
+     * Debug flag
+     * @var bool
+     */
+    protected $debug;
+
+    /**
+     * Username for authentication
+     * @var string
+     */
+    protected $username;
+
+    /**
+     * Password for authentication
+     * @var string
+     */
+    protected $password;
+
+    /**
+     * Secret key for request signing
+     * @var string
+     */
+    protected $secret;
+
+    /**
+     * Default HTTP headers to send to the server
+     * @var array
+     */
+    protected $headers = array(
+        'Connection' => 'close',
+        'Content-Type' => 'application/json',
+        'Accept' => 'application/json',
+    );
+
+    /**
+     * Constructor
+     *
+     * @param  string  $url      Server URL
+     * @param  integer $timeout  Request timeout
+     * @param  bool    $debug    Enabled debug logging
+     * @param  array   $headers  Custom HTTP headers
+     */
+    public function __construct($url, $timeout = 5, $debug = false, $headers = array())
+    {
+        $this->url = $url;
+        $this->timeout = $timeout;
+        $this->debug = $debug;
+        $this->headers = array_merge($this->headers, $headers);
+    }
+
+    /**
+     * Setter for secret key for request signing
+     */
+    public function set_secret($secret)
+    {
+        $this->secret = $secret;
+    }
+
+    /**
+     * Setter for the X-Request-User header
+     */
+    public function set_request_user($username)
+    {
+        $this->headers['X-Request-User'] = $username;
+    }
+
+    /**
+     * Set authentication parameters
+     *
+     * @param  string $username  Username
+     * @param  string $password  Password
+     */
+    public function set_authentication($username, $password)
+    {
+        $this->username = $username;
+        $this->password = $password;
+    }
+
+    /**
+     * Automatic mapping of procedures
+     *
+     * @param  string $method  Procedure name
+     * @param  array  $params  Procedure arguments
+     * @return mixed
+     */
+    public function __call($method, $params)
+    {
+        return $this->execute($method, $params);
+    }
+
+    /**
+     * Execute an RPC command
+     *
+     * @param  string $method  Procedure name
+     * @param  array  $params  Procedure arguments
+     * @return mixed
+     */
+    public function execute($method, array $params = array())
+    {
+        $id = mt_rand();
+
+        $payload = array(
+            'jsonrpc' => '2.0',
+            'method' => $method,
+            'id' => $id,
+        );
+
+        if (!empty($params)) {
+            $payload['params'] = $params;
+        }
+
+        $result = $this->send_request($payload, $method != 'system.keygen');
+
+        if (isset($result['id']) && $result['id'] == $id && array_key_exists('result', $result)) {
+            return $result['result'];
+        }
+        else if (isset($result['error'])) {
+            $this->_debug('ERROR', $result);
+        }
+
+        return null;
+    }
+
+    /**
+     * Do the HTTP request
+     *
+     * @param  string  $payload  Data to send
+     */
+    protected function send_request($payload, $sign = true)
+    {
+        try {
+            $payload_ = json_encode($payload);
+
+            // add request signature
+            if ($sign && !empty($this->secret)) {
+                $this->headers['X-Request-Sign'] = $this->request_signature($payload_);
+            }
+            else if ($this->headers['X-Request-Sign']) {
+                unset($this->headers['X-Request-Sign']);
+            }
+
+            $this->_debug('REQUEST', $payload, $this->headers);
+            $request = libkolab::http_request($this->url, 'POST', array('timeout' => $this->timeout));
+            $request->setHeader($this->headers);
+            $request->setAuth($this->username, $this->password);
+            $request->setBody($payload_);
+
+            $response = $request->send();
+
+            if ($response->getStatus() == 200) {
+                $result = json_decode($response->getBody(), true);
+                $this->_debug('RESPONSE', $result);
+            }
+            else {
+                throw new Exception(sprintf("HTTP %d %s", $response->getStatus(), $response->getReasonPhrase()));
+            }
+        }
+        catch (Exception $e) {
+            rcube::raise_error(array(
+                'code' => 500,
+                'type' => 'php',
+                'message' => "Bonnie API request failed: " . $e->getMessage(),

roundcubemail-plugins-kolab-3.2.tar.gz/plugins/libkolab/lib/kolab_format.php Changed

@@ -510,8 +510,10 @@
      *
      * @param array Hash array reference to append attachment data into
      */
-    protected function get_attachments(&$object)
+    public function get_attachments(&$object)
     {
+        $this->init();
+
         // handle attachments
         $vattach = $this->obj->attachments();
         for ($i=0; $i < $vattach->size(); $i++) {
@@ -520,8 +522,10 @@
             // skip cid: attachments which are mime message parts handled by kolab_storage_folder
             if (substr($attach->uri(), 0, 4) != 'cid:' && $attach->label()) {
                 $name    = $attach->label();
+                $key     = $name . (isset($object['_attachments'][$name]) ? '.'.$i : '');
                 $content = $attach->data();
-                $object['_attachments'][$name] = array(
+                $object['_attachments'][$key] = array(
+                    'id'       => 'i:'.$i,
                     'name'     => $name,
                     'mimetype' => $attach->mimetype(),
                     'size'     => strlen($content),

roundcubemail-plugins-kolab-3.2.tar.gz/plugins/libkolab/lib/kolab_format_event.php Changed

roundcubemail-plugins-kolab-3.2.tar.gz/plugins/libkolab/lib/kolab_format_task.php Changed

roundcubemail-plugins-kolab-3.2.tar.gz/plugins/libkolab/lib/kolab_format_xcal.php Changed

@@ -29,6 +29,7 @@
     public $CTYPE = 'application/calendar+xml';
 
     public static $fulltext_cols = array('title', 'description', 'location', 'attendees:name', 'attendees:email', 'categories');
+    public static $scheduling_properties = array('start', 'end', 'location');
 
     protected $sensitivity_map = array(
         'public'       => kolabformat::ClassPublic,
@@ -302,10 +303,33 @@
         // set common object properties
         parent::set($object);
 
-        // increment sequence on updates
-        if (empty($object['sequence']))
-            $object['sequence'] = !$is_new ? $this->obj->sequence()+1 : 0;
-        $this->obj->setSequence($object['sequence']);
+        // set sequence value
+        if (!isset($object['sequence'])) {
+            if ($is_new) {
+                $object['sequence'] = 0;
+            }
+            else {
+                $object['sequence'] = $this->obj->sequence();
+                $old = $this->data['uid'] ? $this->data : $this->to_array();
+
+                // increment sequence when updating properties relevant for scheduling.
+                // RFC 5545: "It is incremented [...] each time the Organizer makes a significant revision to the calendar component."
+                // TODO: make the list of properties considered 'significant' for scheduling configurable
+                foreach (self::$scheduling_properties as $prop) {
+                    $a = $old[$prop];
+                    $b = $object[$prop];
+                    if ($object['allday'] && ($prop == 'start' || $prop == 'end') && $a instanceof DateTime && $b instanceof DateTime) {
+                        $a = $a->format('Y-m-d');
+                        $b = $b->format('Y-m-d');
+                    }
+                    if ($a != $b) {
+                        $object['sequence']++;
+                        break;
+                    }
+                }
+            }
+        }
+        $this->obj->setSequence(intval($object['sequence']));
 
         $this->obj->setSummary($object['title']);
         $this->obj->setLocation($object['location']);
@@ -560,4 +584,27 @@
         return array_unique(rcube_utils::normalize_string($data, true));
     }
 
+    /**
+     * Callback for kolab_storage_cache to get object specific tags to cache
+     *
+     * @return array List of tags to save in cache
+     */
+    public function get_tags()
+    {
+        $tags = array();
+
+        if (!empty($this->data['valarms'])) {
+            $tags[] = 'x-has-alarms';
+        }
+
+        // create tags reflecting participant status
+        if (is_array($this->data['attendees'])) {
+            foreach ($this->data['attendees'] as $attendee) {
+                if (!empty($attendee['email']) && !empty($attendee['status']))
+                    $tags[] = 'x-partstat:' . $attendee['email'] . ':' . strtolower($attendee['status']);
+            }
+        }
+
+        return $tags;
+    }
 }
\ No newline at end of file

roundcubemail-plugins-kolab-3.2.tar.gz/plugins/libkolab/lib/kolab_storage.php Changed

@@ -874,12 +874,13 @@
         }
 
         $folders = array();
+        $query = str_replace('*', '', $query);
 
         // find unsubscribed IMAP folders of the given type
         foreach ((array)self::list_folders('', '*', $type, false, $folderdata) as $foldername) {
             // FIXME: only consider the last part of the folder path for searching?
             $realname = strtolower(rcube_charset::convert($foldername, 'UTF7-IMAP'));
-            if (strpos($realname, $query) !== false &&
+            if (($query == '' || strpos($realname, $query) !== false) &&
                 !self::folder_is_subscribed($foldername, true) &&
                 !in_array(self::$imap->folder_namespace($foldername), (array)$exclude_ns)
               ) {
@@ -1423,8 +1424,10 @@
      */
     public static function search_users($query, $mode = 1, $required = array(), $limit = 0, &$count = 0)
     {
+        $query = str_replace('*', '', $query);
+
         // requires a working LDAP setup
-        if (!self::ldap()) {
+        if (!self::ldap() || strlen($query) == 0) {
             return array();
         }

roundcubemail-plugins-kolab-3.2.tar.gz/plugins/libkolab/lib/kolab_storage_cache.php Changed

@@ -761,12 +761,15 @@
             }
         }
 
+        $object_type = $sql_arr['type'] ?: $this->folder->type;
+        $format_type = $this->folder->type == 'configuration' ? 'configuration' : $object_type;
+
         // add meta data
-        $object['_type']      = $sql_arr['type'] ?: $this->folder->type;
+        $object['_type']      = $object_type;
         $object['_msguid']    = $sql_arr['msguid'];
         $object['_mailbox']   = $this->folder->name;
         $object['_size']      = strlen($sql_arr['xml']);
-        $object['_formatobj'] = kolab_format::factory($object['_type'], 3.0, $sql_arr['xml']);
+        $object['_formatobj'] = kolab_format::factory($format_type, 3.0, $sql_arr['xml']);
 
         return $object;
     }
@@ -917,7 +920,7 @@
 
             $sql_result = $this->db->query(
                 "SELECT msguid FROM $this->cache_table ".
-                "WHERE folder_id=? AND uid=?",
+                "WHERE folder_id=? AND uid=? ORDER BY msguid DESC",
                 $this->folder_id,
                 $uid
             );
@@ -932,7 +935,7 @@
             $index = $this->imap->search_once($this->folder->name, ($deleted ? '' : 'UNDELETED ') .
                 'HEADER SUBJECT ' . rcube_imap_generic::escape($uid));
             $results = $index->get();
-            $this->uid2msg[$uid] = $results[0];
+            $this->uid2msg[$uid] = end($results);
         }
 
         return $this->uid2msg[$uid];

roundcubemail-plugins-kolab-3.2.tar.gz/plugins/libkolab/lib/kolab_storage_folder.php Changed

@@ -59,9 +59,11 @@
         list($this->type, $suffix) = explode('.', $this->type_annotation);
         $this->default      = $suffix == 'default';
         $this->name         = $name;
-        $this->resource_uri = null;
         $this->id           = kolab_storage::folder_id($name);
 
+        // reset cached object properties
+        $this->owner = $this->namespace = $this->resource_uri = $this->info = $this->idata = null;
+
         // get a new cache instance of folder type changed
         if (!$this->cache || $type != $oldtype)
             $this->cache = kolab_storage_cache::factory($this);
@@ -344,7 +346,30 @@
     {
         if ($msguid = ($mailbox ? $uid : $this->cache->uid2msguid($uid))) {
             $this->imap->set_folder($mailbox ? $mailbox : $this->name);
-            return $this->imap->get_message_part($msguid, $part, null, $print, $fp, $skip_charset_conv);
+
+            if (substr($part, 0, 2) == 'i:') {
+                // attachment data is stored in XML
+                if ($object = $this->cache->get($msguid)) {
+                    // load data from XML (attachment content is not stored in cache)
+                    if ($object['_formatobj'] && isset($object['_size'])) {
+                        $object['_attachments'] = array();
+                        $object['_formatobj']->get_attachments($object);
+                    }
+
+                    foreach ($object['_attachments'] as $k => $attach) {
+                        if ($attach['id'] == $part) {
+                            if ($print)   echo $attach['content'];
+                            else if ($fp) fwrite($fp, $attach['content']);
+                            else          return $attach['content'];
+                            return true;
+                        }
+                    }
+                }
+            }
+            else {
+                // return message part from IMAP directly
+                return $this->imap->get_message_part($msguid, $part, null, $print, $fp, $skip_charset_conv);
+            }
         }
 
         return null;

roundcubemail-plugins-kolab-3.2.tar.gz/plugins/libkolab/lib/kolab_storage_folder_api.php Changed

@@ -167,6 +167,38 @@
         return join('/', $path);
     }
 
+    /**
+     * Getter for the Cyrus mailbox identifier corresponding to this folder
+     * (e.g. user/john.doe/Calendar/Personal@example.org)
+     *
+     * @return string Mailbox ID
+     */
+    public function get_mailbox_id()
+    {
+        $info = $this->get_folder_info();
+        $owner = $this->get_owner();
+        list($user, $domain) = explode('@', $owner);
+
+        switch ($info['namespace']) {
+        case 'personal':
+            return sprintf('user/%s/%s@%s', $user, $this->name, $domain);
+
+        case 'shared':
+            $ns = $this->imap->get_namespace('shared');
+            $prefix = is_array($ns) ? $ns[0][0] : '';
+            list(, $domain) = explode('@', rcube::get_instance()->get_user_name());
+            return substr($this->name, strlen($prefix)) . '@' . $domain;
+
+        default:
+            $ns = $this->imap->get_namespace('other');
+            $prefix = is_array($ns) ? $ns[0][0] : '';
+            list($user, $folder) = explode($this->imap->get_hierarchy_delimiter(), substr($info['name'], strlen($prefix)), 2);
+            if (strpos($user, '@')) {
+                list($user, $domain) = explode('@', $user);
+            }
+            return sprintf('user/%s/%s@%s', $user, $folder, $domain);
+        }
+    }
 
     /**
      * Get the color value stored in metadata

roundcubemail-plugins-kolab-3.2.tar.gz/plugins/libkolab/libkolab.php Changed

roundcubemail-plugins-kolab-3.2.tar.gz/plugins/libkolab/vendor Added

roundcubemail-plugins-kolab-3.2.tar.gz/plugins/libkolab/vendor/finediff.php Added

@@ -0,0 +1,688 @@
+<?php
+/**
+* FINE granularity DIFF
+*
+* Computes a set of instructions to convert the content of
+* one string into another.
+*
+* Copyright (c) 2011 Raymond Hill (http://raymondhill.net/blog/?p=441)
+*
+* Licensed under The MIT License
+* 
+* Permission is hereby granted, free of charge, to any person obtaining a copy
+* of this software and associated documentation files (the "Software"), to deal
+* in the Software without restriction, including without limitation the rights
+* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+* copies of the Software, and to permit persons to whom the Software is
+* furnished to do so, subject to the following conditions:
+*
+* The above copyright notice and this permission notice shall be included in
+* all copies or substantial portions of the Software.
+*
+* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+* THE SOFTWARE.
+*
+* @copyright Copyright 2011 (c) Raymond Hill (http://raymondhill.net/blog/?p=441)
+* @link http://www.raymondhill.net/finediff/
+* @version 0.6
+* @license MIT License (http://www.opensource.org/licenses/mit-license.php)
+*/
+
+/**
+* Usage (simplest):
+*
+*   include 'finediff.php';
+*
+*   // for the stock stack, granularity values are:
+*   // FineDiff::$paragraphGranularity = paragraph/line level
+*   // FineDiff::$sentenceGranularity = sentence level
+*   // FineDiff::$wordGranularity = word level
+*   // FineDiff::$characterGranularity = character level [default]
+*
+*   $opcodes = FineDiff::getDiffOpcodes($from_text, $to_text [, $granularityStack = null] );
+*   // store opcodes for later use...
+*
+*   ...
+*
+*   // restore $to_text from $from_text + $opcodes
+*   include 'finediff.php';
+*   $to_text = FineDiff::renderToTextFromOpcodes($from_text, $opcodes);
+*
+*   ...
+*/
+
+/**
+* Persisted opcodes (string) are a sequence of atomic opcode.
+* A single opcode can be one of the following:
+*   c | c{n} | d | d{n} | i:{c} | i{length}:{s}
+*   'c'        = copy one character from source
+*   'c{n}'     = copy n characters from source
+*   'd'        = skip one character from source
+*   'd{n}'     = skip n characters from source
+*   'i:{c}     = insert character 'c'
+*   'i{n}:{s}' = insert string s, which is of length n
+*
+* Do not exist as of now, under consideration:
+*   'm{n}:{o}  = move n characters from source o characters ahead.
+*   It would be essentially a shortcut for a delete->copy->insert
+*   command (swap) for when the inserted segment is exactly the same
+*   as the deleted one, and with only a copy operation in between.
+*   TODO: How often this case occurs? Is it worth it? Can only
+*   be done as a postprocessing method (->optimize()?)
+*/
+abstract class FineDiffOp {
+	abstract public function getFromLen();
+	abstract public function getToLen();
+	abstract public function getOpcode();
+	}
+
+class FineDiffDeleteOp extends FineDiffOp {
+	public function __construct($len) {
+		$this->fromLen = $len;
+		}
+	public function getFromLen() {
+		return $this->fromLen;
+		}
+	public function getToLen() {
+		return 0;
+		}
+	public function getOpcode() {
+		if ( $this->fromLen === 1 ) {
+			return 'd';
+			}
+		return "d{$this->fromLen}";
+		}
+	}
+
+class FineDiffInsertOp extends FineDiffOp {
+	public function __construct($text) {
+		$this->text = $text;
+		}
+	public function getFromLen() {
+		return 0;
+		}
+	public function getToLen() {
+		return strlen($this->text);
+		}
+	public function getText() {
+		return $this->text;
+		}
+	public function getOpcode() {
+		$to_len = strlen($this->text);
+		if ( $to_len === 1 ) {
+			return "i:{$this->text}";
+			}
+		return "i{$to_len}:{$this->text}";
+		}
+	}
+
+class FineDiffReplaceOp extends FineDiffOp {
+	public function __construct($fromLen, $text) {
+		$this->fromLen = $fromLen;
+		$this->text = $text;
+		}
+	public function getFromLen() {
+		return $this->fromLen;
+		}
+	public function getToLen() {
+		return strlen($this->text);
+		}
+	public function getText() {
+		return $this->text;
+		}
+	public function getOpcode() {
+		if ( $this->fromLen === 1 ) {
+			$del_opcode = 'd';
+			}
+		else {
+			$del_opcode = "d{$this->fromLen}";
+			}
+		$to_len = strlen($this->text);
+		if ( $to_len === 1 ) {
+			return "{$del_opcode}i:{$this->text}";
+			}
+		return "{$del_opcode}i{$to_len}:{$this->text}";
+		}
+	}
+
+class FineDiffCopyOp extends FineDiffOp {
+	public function __construct($len) {
+		$this->len = $len;
+		}
+	public function getFromLen() {
+		return $this->len;
+		}
+	public function getToLen() {
+		return $this->len;
+		}
+	public function getOpcode() {
+		if ( $this->len === 1 ) {
+			return 'c';
+			}
+		return "c{$this->len}";
+		}
+	public function increase($size) {
+		return $this->len += $size;
+		}
+	}
+
+/**
+* FineDiff ops
+*
+* Collection of ops
+*/
+class FineDiffOps {
+	public function appendOpcode($opcode, $from, $from_offset, $from_len) {
+		if ( $opcode === 'c' ) {
+			$edits[] = new FineDiffCopyOp($from_len);
+			}
+		else if ( $opcode === 'd' ) {
+			$edits[] = new FineDiffDeleteOp($from_len);
+			}
+		else /* if ( $opcode === 'i' ) */ {
+			$edits[] = new FineDiffInsertOp(substr($from, $from_offset, $from_len));
+			}
+		}
+	public $edits = array();
+	}
+
+/**
+* FineDiff class
+*
+* TODO: Document
+*
+*/

roundcubemail-plugins-kolab-3.2.tar.gz/plugins/libkolab/vendor/finediff_modifications.diff Added

@@ -0,0 +1,121 @@
+--- finediff.php.orig	2014-07-29 14:24:10.000000000 +0200
++++ finediff.php	2014-07-29 14:30:38.000000000 +0200
+@@ -234,25 +234,25 @@
+ 
+ 	public function renderDiffToHTML() {
+ 		$in_offset = 0;
+-		ob_start();
++		$html = '';
+ 		foreach ( $this->edits as $edit ) {
+ 			$n = $edit->getFromLen();
+ 			if ( $edit instanceof FineDiffCopyOp ) {
+-				FineDiff::renderDiffToHTMLFromOpcode('c', $this->from_text, $in_offset, $n);
++				$html .= FineDiff::renderDiffToHTMLFromOpcode('c', $this->from_text, $in_offset, $n);
+ 				}
+ 			else if ( $edit instanceof FineDiffDeleteOp ) {
+-				FineDiff::renderDiffToHTMLFromOpcode('d', $this->from_text, $in_offset, $n);
++				$html .= FineDiff::renderDiffToHTMLFromOpcode('d', $this->from_text, $in_offset, $n);
+ 				}
+ 			else if ( $edit instanceof FineDiffInsertOp ) {
+-				FineDiff::renderDiffToHTMLFromOpcode('i', $edit->getText(), 0, $edit->getToLen());
++				$html .= FineDiff::renderDiffToHTMLFromOpcode('i', $edit->getText(), 0, $edit->getToLen());
+ 				}
+ 			else /* if ( $edit instanceof FineDiffReplaceOp ) */ {
+-				FineDiff::renderDiffToHTMLFromOpcode('d', $this->from_text, $in_offset, $n);
+-				FineDiff::renderDiffToHTMLFromOpcode('i', $edit->getText(), 0, $edit->getToLen());
++				$html .= FineDiff::renderDiffToHTMLFromOpcode('d', $this->from_text, $in_offset, $n);
++				$html .= FineDiff::renderDiffToHTMLFromOpcode('i', $edit->getText(), 0, $edit->getToLen());
+ 				}
+ 			$in_offset += $n;
+ 			}
+-		return ob_get_clean();
++		return $html;
+ 		}
+ 
+ 	/**------------------------------------------------------------------------
+@@ -277,18 +277,14 @@
+ 	* Re-create the "To" string from the "From" string and an "Opcodes" string
+ 	*/
+ 	public static function renderToTextFromOpcodes($from, $opcodes) {
+-		ob_start();
+-		FineDiff::renderFromOpcodes($from, $opcodes, array('FineDiff','renderToTextFromOpcode'));
+-		return ob_get_clean();
++		return FineDiff::renderFromOpcodes($from, $opcodes, array('FineDiff','renderToTextFromOpcode'));
+ 		}
+ 
+ 	/**------------------------------------------------------------------------
+ 	* Render the diff to an HTML string
+ 	*/
+ 	public static function renderDiffToHTMLFromOpcodes($from, $opcodes) {
+-		ob_start();
+-		FineDiff::renderFromOpcodes($from, $opcodes, array('FineDiff','renderDiffToHTMLFromOpcode'));
+-		return ob_get_clean();
++		return FineDiff::renderFromOpcodes($from, $opcodes, array('FineDiff','renderDiffToHTMLFromOpcode'));
+ 		}
+ 
+ 	/**------------------------------------------------------------------------
+@@ -297,8 +293,9 @@
+ 	*/
+ 	public static function renderFromOpcodes($from, $opcodes, $callback) {
+ 		if ( !is_callable($callback) ) {
+-			return;
++			return '';
+ 			}
++		$out = '';
+ 		$opcodes_len = strlen($opcodes);
+ 		$from_offset = $opcodes_offset = 0;
+ 		while ( $opcodes_offset <  $opcodes_len ) {
+@@ -312,18 +309,19 @@
+ 				$n = 1;
+ 				}
+ 			if ( $opcode === 'c' ) { // copy n characters from source
+-				call_user_func($callback, 'c', $from, $from_offset, $n, '');
++				$out .= call_user_func($callback, 'c', $from, $from_offset, $n, '');
+ 				$from_offset += $n;
+ 				}
+ 			else if ( $opcode === 'd' ) { // delete n characters from source
+-				call_user_func($callback, 'd', $from, $from_offset, $n, '');
++				$out .= call_user_func($callback, 'd', $from, $from_offset, $n, '');
+ 				$from_offset += $n;
+ 				}
+ 			else /* if ( $opcode === 'i' ) */ { // insert n characters from opcodes
+-				call_user_func($callback, 'i', $opcodes, $opcodes_offset + 1, $n);
++				$out .= call_user_func($callback, 'i', $opcodes, $opcodes_offset + 1, $n);
+ 				$opcodes_offset += 1 + $n;
+ 				}
+ 			}
++		return $out;
+ 		}
+ 
+ 	/**
+@@ -665,24 +663,26 @@
+ 	*/
+ 	private static function renderToTextFromOpcode($opcode, $from, $from_offset, $from_len) {
+ 		if ( $opcode === 'c' || $opcode === 'i' ) {
+-			echo substr($from, $from_offset, $from_len);
++			return substr($from, $from_offset, $from_len);
+ 			}
++		return '';
+ 		}
+ 
+ 	private static function renderDiffToHTMLFromOpcode($opcode, $from, $from_offset, $from_len) {
+ 		if ( $opcode === 'c' ) {
+-			echo htmlentities(substr($from, $from_offset, $from_len));
++			return htmlentities(substr($from, $from_offset, $from_len));
+ 			}
+ 		else if ( $opcode === 'd' ) {
+ 			$deletion = substr($from, $from_offset, $from_len);
+ 			if ( strcspn($deletion, " \n\r") === 0 ) {
+ 				$deletion = str_replace(array("\n","\r"), array('\n','\r'), $deletion);
+ 				}
+-			echo '<del>', htmlentities($deletion), '</del>';
++			return '<del>' . htmlentities($deletion) . '</del>';
+ 			}
+ 		else /* if ( $opcode === 'i' ) */ {
+- 			echo '<ins>', htmlentities(substr($from, $from_offset, $from_len)), '</ins>';
++ 			return '<ins>' . htmlentities(substr($from, $from_offset, $from_len)) . '</ins>';
+ 			}
++		return '';
+ 		}
+ 	}
+

roundcubemail-plugins-kolab-3.2.tar.gz/plugins/tasklist/helpdocs/en_US/_static/kolab Added

roundcubemail-plugins-kolab-3.2.tar.gz/plugins/tasklist/skins/larry/templates/mainview.html Changed

roundcubemail-plugins-kolab-3.2.tar.gz/plugins/tasklist/skins/larry/templates/taskedit.html Changed

roundcubemail-plugins-kolab-3.2.tar.gz/plugins/tasklist/tasklist.js Changed

roundcubemail-plugins-kolab-3.2.tar.gz/plugins/tasklist/tasklist.php Changed