Kolab Groupware OBS

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

@@ -173,7 +173,6 @@
     else if ($args['task'] == 'mail') {
       // hooks to catch event invitations on incoming mails
       if ($args['action'] == 'show' || $args['action'] == 'preview') {
-        $this->add_hook('message_load', array($this, 'mail_message_load'));
         $this->add_hook('template_object_messagebody', array($this, 'mail_messagebody_html'));
       }
 
@@ -979,7 +978,7 @@
         $data = $this->driver->get_event_changelog($event);
         if (is_array($data) && !empty($data)) {
           $lib = $this->lib;
-          array_walk($data, function($change) use ($lib) {
+          array_walk($data, function(&$change) use ($lib) {
             if ($change['date']) {
               $dt = $lib->adjust_timezone($change['date']);
               if ($dt instanceof DateTime)
@@ -1132,9 +1131,9 @@
 
     foreach ($this->driver->list_calendars(true) as $cal) {
       $events = $this->driver->load_events(
-        get_input_value('start', RCUBE_INPUT_GET),
-        get_input_value('end', RCUBE_INPUT_GET),
-        get_input_value('q', RCUBE_INPUT_GET),
+        get_input_value('start', RCUBE_INPUT_GPC),
+        get_input_value('end', RCUBE_INPUT_GPC),
+        get_input_value('q', RCUBE_INPUT_GPC),
         $cal['id'],
         1,
         $attr['last']
@@ -1721,6 +1720,8 @@
           $owner = $i;
         else if (!isset($attendee['rsvp']))
           $event['attendees'][$i]['rsvp'] = true;
+        else if (is_string($attendee['rsvp']))
+          $event['attendees'][$i]['rsvp'] = $attendee['rsvp'] == 'true' || $attendee['rsvp'] == '1';
       }
 
       // set new organizer identity
@@ -2156,9 +2157,10 @@
     $response = $itip->get_itip_status($data, $existing);
 
     // get a list of writeable calendars to save new events to
-    if (!$existing && $response['action'] == 'rsvp' || $response['action'] == 'import') {
+    if (!$existing && !$data['nosave'] && $response['action'] == 'rsvp' || $response['action'] == 'import') {
       $calendars = $this->driver->list_calendars(false, true);
       $calendar_select = new html_select(array('name' => 'calendar', 'id' => 'itip-saveto', 'is_escaped' => true));
+      $calendar_select->add('--', '');
       $numcals = 0;
       foreach ($calendars as $calendar) {
         if (!$calendar['readonly']) {
@@ -2175,6 +2177,9 @@
       $response['select'] = html::span('folder-select', $this->gettext('saveincalendar') . '&nbsp;' .
         $calendar_select->show($this->rc->config->get('calendar_default_calendar', $default_calendar['id'])));
     }
+    else if ($data['nosave']) {
+      $response['select'] = html::tag('input', array('type' => 'hidden', 'name' => 'calendar', 'id' => 'itip-saveto', 'value' => ''));
+    }
 
     $this->rc->output->command('plugin.update_itip_object_status', $response);
   }
@@ -2287,7 +2292,7 @@
       foreach ($p['messages'] as $i => $header) {
         $part = new StdClass;
         $part->mimetype = $header->ctype;
-        if ($this->is_vcalendar($part)) {
+        if (libcalendaring::part_is_vcalendar($part)) {
           $header->list_flags['attachmentClass'] = 'ical';
         }
         else if (in_array($header->ctype, array('multipart/alternative', 'multipart/mixed'))) {
@@ -2295,7 +2300,7 @@
 
           if (!empty($header->structure) && is_array($header->structure->parts)) {
             foreach ($header->structure->parts as $part) {
-              if ($this->is_vcalendar($part) && !empty($part->ctype_parameters['method'])) {
+              if (libcalendaring::part_is_vcalendar($part) && !empty($part->ctype_parameters['method'])) {
                 $header->list_flags['attachmentClass'] = 'ical';
                 break;
               }
@@ -2305,29 +2310,6 @@
       }
     }
   }
-  
-  /**
-   * Check mail message structure of there are .ics files attached
-   */
-  public function mail_message_load($p)
-  {
-    $this->message = $p['object'];
-    $itip_part = null;
-
-    // check all message parts for .ics files
-    foreach ((array)$this->message->mime_parts as $part) {
-      if ($this->is_vcalendar($part)) {
-        if ($part->ctype_parameters['method'])
-          $itip_part = $part->mime_id;
-        else
-          $this->ics_parts[] = $part->mime_id;
-      }
-    }
-    
-    // priorize part with method parameter
-    if ($itip_part)
-      $this->ics_parts = array($itip_part);
-  }
 
   /**
    * Add UI element to copy event invitations or updates to the calendar
@@ -2335,42 +2317,38 @@
   public function mail_messagebody_html($p)
   {
     // load iCalendar functions (if necessary)
-    if (!empty($this->ics_parts)) {
+    if (!empty($this->lib->ical_parts)) {
       $this->get_ical();
       $this->load_itip();
     }
 
     $html = '';
-    foreach ($this->ics_parts as $mime_id) {
-      $part    = $this->message->mime_parts[$mime_id];
-      $charset = $part->ctype_parameters['charset'] ? $part->ctype_parameters['charset'] : RCMAIL_CHARSET;
-      $events  = $this->ical->import($this->message->get_part_content($mime_id), $charset);
-      $title   = $this->gettext('title');
-
-      // successfully parsed events?
-      if (empty($events))
-          continue;
-
-      // show a box for every event in the file
-      foreach ($events as $idx => $event) {
-        if ($event['_type'] != 'event')  // skip non-event objects (#2928)
-          continue;
+    $has_events = false;
+    $ical_objects = $this->lib->get_mail_ical_objects();
 
-        // get prepared inline UI for this event object
+    // show a box for every event in the file
+    foreach ($ical_objects as $idx => $event) {
+      if ($event['_type'] != 'event')  // skip non-event objects (#2928)
+        continue;
+
+      $has_events = true;
+
+      // get prepared inline UI for this event object
+      if ($ical_objects->method) {
         $html .= html::div('calendar-invitebox',
           $this->itip->mail_itip_inline_ui(
             $event,
-            $this->ical->method,
-            $mime_id.':'.$idx,
+            $ical_objects->method,
+            $ical_objects->mime_id . ':' . $idx,
             'calendar',
-            rcube_utils::anytodatetime($this->message->headers->date)
+            rcube_utils::anytodatetime($ical_objects->message_date)
           )
         );
-
-        // limit listing
-        if ($idx >= 3)
-          break;
       }
+
+      // limit listing
+      if ($idx >= 3)
+        break;
     }
 
     // prepend event boxes to message body
@@ -2381,7 +2359,7 @@
     }
 
     // add "Save to calendar" button into attachment menu
-    if (!empty($this->ics_parts)) {
+    if ($has_events) {
       $this->add_button(array(
         'id'         => 'attachmentsavecal',
         'name'       => 'attachmentsavecal',
@@ -2398,40 +2376,6 @@
     return $p;
   }
 
-  /**
-   * Read the given mime message from IMAP and parse ical data
-   */
-  private function mail_get_itip_event($mbox, $uid, $mime_id)
-  {
-    $charset = RCMAIL_CHARSET;
-
-    // establish imap connection
-    $imap = $this->rc->get_storage();
-    $imap->set_mailbox($mbox);
-
-    if ($uid && $mime_id) {
-      list($mime_id, $index) = explode(':', $mime_id);
-      $part = $imap->get_message_part($uid, $mime_id);
-      if ($part->ctype_parameters['charset'])
-        $charset = $part->ctype_parameters['charset'];

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

@@ -396,6 +396,12 @@
       if ($dialog.is(':ui-dialog'))
         $dialog.dialog('close');
 
+      // remove status-* classes
+      $dialog.removeClass(function(i, oldclass) {
+          var oldies = String(oldclass).split(' ');
+          return $.grep(oldies, function(cls) { return cls.indexOf('status-') === 0 || cls.indexOf('sensitivity-') === 0 }).join(' ');
+      });
+
       // convert start/end dates if not done yet by fullcalendar
       if (typeof event.start == 'string')
         event.start = parseISO8601(event.start);
@@ -528,9 +534,13 @@
             .html(Q(rcmail.gettext('itip' + mystatus, 'libcalendaring')));
         }
 
-        $('#event-rsvp')[(rsvp && !is_organizer(event) && event.status != 'CANCELLED' ? 'show' : 'hide')]();
+        var show_rsvp = rsvp && !is_organizer(event) && event.status != 'CANCELLED';
+        $('#event-rsvp')[(show_rsvp ? 'show' : 'hide')]();
         $('#event-rsvp .rsvp-buttons input').prop('disabled', false).filter('input[rel='+mystatus+']').prop('disabled', true);
 
+        if (show_rsvp && event.comment)
+          $('#event-rsvp-comment').show().children('.event-text').html(Q(event.comment));
+
         $('#event-rsvp a.reply-comment-toggle').show();
         $('#event-rsvp .itip-reply-comment textarea').hide().val('');
       }
@@ -609,7 +619,7 @@
       var dispname = Q(data.name || data.email), tooltip = '';
 
       if (data.email) {
-        tooltip = data.email;
+        tooltip = data.email + '; ' + data.status;
         dispname = '<a href="mailto:' + data.email + '" class="mailtolink" data-cutype="' + data.cutype + '">' + dispname + '</a>';
       }
 
@@ -826,7 +836,7 @@
         if (allow_invitations) {
           $.each(data.attendees, function (i, v) {
             if (v.role != 'ORGANIZER') {
-              if ($('input.edit-attendee-reply[value="' + v.email + '"]').prop('checked')) {
+              if ($('input.edit-attendee-reply[value="' + v.email + '"]').prop('checked') || v.cutype == 'RESOURCE') {
                 need_invitation = true;
                 delete data.attendees[i]['noreply'];
               }
@@ -1050,7 +1060,7 @@
           op_append = '';
         }
 
-        $('<tr class="' + (i == last ? 'last' : (i == first ? 'first' : '')) + (accessible ? '' : 'undisclosed') + '">')
+        $('<tr class="' + (i == first ? 'first' : (i == last ? 'last' : '')) + (accessible ? '' : 'undisclosed') + '">')
           .append('<td class="diff">' + (accessible && change.op != 'DELETE' ? 
             '<input type="radio" name="rev1" class="diff-rev1" value="' + change.rev + '" title="" '+ (i == last ? 'checked="checked"' : '') +' /> '+
             '<input type="radio" name="rev2" class="diff-rev2" value="' + change.rev + '" title="" '+ (i == first ? 'checked="checked"' : '') +' /></td>'
@@ -1063,7 +1073,8 @@
           .appendTo(tbody);
       }
 
-      $('#eventhistory .compare-button').fadeIn(200);
+      if (first > 0)
+        $('#eventhistory .compare-button').fadeIn(200);
 
       // set dialog size according to content
       me.dialog_resize($dialog.get(0), $dialog.height(), 600);
@@ -2310,7 +2321,6 @@
             delete data.rsvp;  // unset RSVP flag
           }
         }
-        event_show_dialog(me.selected_event);
 
         // submit status change to server
         var submit_data = $.extend({}, me.selected_event, { source:null, comment:$('#reply-comment-event-rsvp').val() }),
@@ -2323,6 +2333,8 @@
           me.saving_lock = rcmail.set_busy(true, 'calendar.savingdata');
           rcmail.http_post('event', { action:'rsvp', e:submit_data, status:response, noreply:noreply });
         }
+
+        event_show_dialog(me.selected_event);
       }
     };
     
@@ -2564,6 +2576,7 @@
           }
         })
         .fullCalendar($.extend({}, fullcalendar_defaults, {
+          defaultView: 'agendaDay',
           header: { left: '', center: '', right: '' },
           height: h - 50,
           date: date.getDate(),
@@ -3015,6 +3028,10 @@
         // update main view
         event.editable = source.editable;
         update_view(fc, event, source);
+
+        // update the currently displayed event dialog
+        if ($('#eventshow').is(':visible') && me.selected_event && me.selected_event.id == event.id)
+          event_show_dialog(event)
       }
       // refetch all calendars
       else if (p.refetch) {
@@ -3368,6 +3385,11 @@
           me.calendars[id].active = false;
         }
 
+        // adjust checked state of original list item
+        if (calendars_list.is_search()) {
+          calendars_list.container.find('input[value="'+id+'"]').prop('checked', this.checked);
+        }
+
         // add/remove event source
         fc.fullCalendar(action, me.calendars[id]);
         rcmail.http_post('calendar', { action:'subscribe', c:{ id:id, active:me.calendars[id].active?1:0 } });
@@ -3385,8 +3407,13 @@
     // init (delegate) event handler on quickview links
     .on('click', 'a.quickview', function(e) {
       var id = $(this).closest('li').attr('id').replace(/^rcmlical/, '');
+
+      if (calendars_list.is_search())
+        id = id.replace(/--xsR$/, '');
+
       if (me.calendars[id])
         me.quickview(id);
+
       e.stopPropagation();
       return false;
     });
@@ -3636,7 +3663,7 @@
       })) // set event handler for clicks on calendar week cell of the datepicker widget
         .on('click', 'td.ui-datepicker-week-col', function(e) {
           var cell = $(e.target);
-          if (e.target.tagName == 'TD' && cell.hasClass('')) {
+          if (e.target.tagName == 'TD') {
             var base_date = minical.datepicker('getDate');
             if (minical.data('month'))
               base_date.setMonth(minical.data('month')-1);

roundcubemail-plugins-kolab-3.2.tar.gz/plugins/calendar/composer.json Added

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

@@ -563,7 +563,11 @@
             $birthyear = $bday->format('Y');
           }
           catch (Exception $e) {
-            console('BIRTHDAY PARSE ERROR: ' . $e);
+            rcube::raise_error(array(
+                'code' => 600, 'type' => 'php',
+                'file' => __FILE__, 'line' => __LINE__,
+                'message' => 'BIRTHDAY PARSE ERROR: ' . $e),
+              true, false);
             continue;
           }
 
@@ -598,7 +602,7 @@
           if ($bday <= $end && $bday >= $start) {
             $age = $year - $birthyear;
             $event = array(
-              'id'          => md5('bday_' . $contact['ID'] . $year),
+              'id'          => rcube_ldap::dn_encode('bday:' . $source . ':' . $contact['ID'] . ':' . $year),
               'calendar'    => self::BIRTHDAY_CALENDAR_ID,
               'title'       => $event_title,
               'description' => $rcmail->gettext(array('name' => 'birthdayage', 'vars' => array('age' => $age)), 'calendar'),
@@ -625,6 +629,62 @@
   }
 
   /**
+   * Get a single birthday calendar event
+   */
+  public function get_birthday_event($id)
+  {
+    // decode $id
+    list(,$source,$contact_id,$year) = explode(':', rcube_ldap::dn_decode($id));
+
+    $rcmail = rcmail::get_instance();
+
+    if ($source && $contact_id && ($abook = $rcmail->get_address_book($source))) {
+      $contact = $abook->get_record($contact_id, true);
+
+      if (is_array($contact) && !empty($contact['birthday'])) {
+        try {
+          if (is_array($contact['birthday']))
+            $contact['birthday'] = reset($contact['birthday']);
+
+          $bday = $contact['birthday'] instanceof DateTime ? $contact['birthday'] :
+                    new DateTime($contact['birthday'], new DateTimezone('UTC'));
+          $birthyear = $bday->format('Y');
+        }
+        catch (Exception $e) {
+          rcube::raise_error(array(
+              'code' => 600, 'type' => 'php',
+              'file' => __FILE__, 'line' => __LINE__,
+              'message' => 'BIRTHDAY PARSE ERROR: ' . $e),
+            true, false);
+
+          return null;
+        }
+
+        $display_name = rcube_addressbook::compose_display_name($contact);
+        $event_title = $rcmail->gettext(array('name' => 'birthdayeventtitle', 'vars' => array('name' => $display_name)), 'calendar');
+
+        $event = array(
+          'id'          => rcube_ldap::dn_encode('bday:' . $source . ':' . $contact['ID'] . ':' . $year),
+          'uid'         => rcube_ldap::dn_encode('bday:' . $source . ':' . $contact['ID'] . ':' . $birthyear),
+          'calendar'    => self::BIRTHDAY_CALENDAR_ID,
+          'title'       => $event_title,
+          'description' => '',
+          'allday'      => true,
+          'start'       => $bday,
+          'recurrence'  => array('FREQ' => 'YEARLY', 'INTERVAL' => 1),
+          'free_busy'   => 'free',
+        );
+        $event['end'] = clone $bday;
+        $event['end']->add(new DateInterval('PT1H'));
+
+        return $event;
+      }
+    }
+
+    return null;
+  }
+
+  /**
    * Handler for user_delete plugin hook
    *
    * @param array Hash array with hook arguments

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

@@ -107,7 +107,7 @@
   {
     // attempt to create a default calendar for this user
     if (empty($this->calendars)) {
-      if ($this->create_calendar(array('name' => 'Default', 'color' => 'cc0000')))
+      if ($this->create_calendar(array('name' => 'Default', 'color' => 'cc0000', 'showalarms' => true)))
         $this->_read_calendars();
     }
 
@@ -744,11 +744,17 @@
   public function get_event($event, $writeable = false, $active = false, $personal = false)
   {
     $id = is_array($event) ? ($event['id'] ? $event['id'] : $event['uid']) : $event;
+    $cal = is_array($event) ? $event['calendar'] : null;
     $col = is_array($event) && is_numeric($id) ? 'event_id' : 'uid';
 
     if ($this->cache[$id])
       return $this->cache[$id];
 
+    // get event from the address books birthday calendar
+    if ($cal == self::BIRTHDAY_CALENDAR_ID) {
+      return $this->get_birthday_event($id);
+    }
+
     if ($active) {
       $calendars = $this->calendars;
       foreach ($calendars as $idx => $cal) {

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

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

@@ -23,11 +23,6 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-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';
@@ -56,6 +51,11 @@
   {
     $cal->require_plugin('libkolab');
 
+    // load helper classes *after* libkolab has been loaded (#3248)
+    require_once(dirname(__FILE__) . '/kolab_calendar.php');
+    require_once(dirname(__FILE__) . '/kolab_user_calendar.php');
+    require_once(dirname(__FILE__) . '/kolab_invitation_calendar.php');
+
     $this->cal = $cal;
     $this->rc = $cal->rc;
     $this->_read_calendars();
@@ -253,8 +253,8 @@
           'id'         => $id,
           'name'       => $this->cal->gettext('birthdays'),
           'listname'   => $this->cal->gettext('birthdays'),
-          'color'      => $prefs[$id]['color'],
-          'active'     => $prefs[$id]['active'],
+          'color'      => $prefs[$id]['color'] ?: '87CEFA',
+          'active'     => (bool)$prefs[$id]['active'],
           'showalarms' => (bool)$this->rc->config->get('calendar_birthdays_alarm_type'),
           'group'      => 'x-birthdays',
           'readonly'   => true,
@@ -524,6 +524,10 @@
       if ($storage = $this->get_calendar($cal)) {
         return $storage->get_event($id);
       }
+      // get event from the address books birthday calendar
+      else if ($cal == self::BIRTHDAY_CALENDAR_ID) {
+        return $this->get_birthday_event($id);
+      }
     }
     // iterate over all calendar folders and search for the event ID
     else {
@@ -1322,6 +1326,17 @@
       $record['attachments'] = $attachments;
     }
 
+    if (!empty($record['attendees'])) {
+      foreach ((array)$record['attendees'] as $i => $attendee) {
+        if (is_array($attendee['delegated-from'])) {
+          $record['attendees'][$i]['delegated-from'] = join(', ', $attendee['delegated-from']);
+        }
+        if (is_array($attendee['delegated-to'])) {
+          $record['attendees'][$i]['delegated-to'] = join(', ', $attendee['delegated-to']);
+        }
+      }
+    }
+
     // Roundcube only supports one category assignment
     if (is_array($record['categories']))
       $record['categories'] = $record['categories'][0];
@@ -1539,11 +1554,6 @@
       $uid = $event;
     }
 
-    // FIXME: hard-code UID for static Bonnie API demo
-    $demo_uids = $this->rc->config->get('kolab_static_bonnie_uids', array('0015c5fe-9baf-0561-11e3-d584fa2894b7'));
-    if (!in_array($uid, $demo_uids))
-      $uid = reset($demo_uids);
-
     return array($uid, $mailbox);
   }

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

@@ -418,7 +418,8 @@
     $select = new html_select($attrib);
     $select->add($this->cal->gettext('free'), 'free');
     $select->add($this->cal->gettext('busy'), 'busy');
-    $select->add($this->cal->gettext('outofoffice'), 'outofoffice');
+    // out-of-office is not supported by libkolabxml (#3220)
+    // $select->add($this->cal->gettext('outofoffice'), 'outofoffice');
     $select->add($this->cal->gettext('tentative'), 'tentative');
     return $select->show(null);
   }
@@ -874,22 +875,7 @@
 
   function event_rsvp_buttons($attrib = array())
   {
-    $attrib += array('type' => 'button');
-    foreach (array('accepted','tentative','declined') as $method) {
-      $buttons .= html::tag('input', array(
-        'type' => $attrib['type'],
-        'name' => $attrib['iname'],
-        'class' => 'button',
-        'rel' => $method,
-        '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));
+    return $this->cal->itip->itip_rsvp_buttons($attrib, array('accepted','tentative','declined'));
   }
 
 }

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

roundcubemail-plugins-kolab-3.2.tar.gz/plugins/calendar/package.xml Deleted

@@ -1,177 +0,0 @@
-<?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>calendar</name>
-    <uri>http://git.kolab.org/roundcubemail-plugins-kolab/</uri>
-	<summary>Calendar plugin</summary>
-	<description>-</description>
-	<lead>
-		<name>Thomas Bruederli</name>
-		<user>bruederli</user>
-		<email>bruederli@kolabsys.com</email>
-		<active>yes</active>
-	</lead>
-	<developer>
-		<name>Alensader Machniak</name>
-		<user>machniak</user>
-		<email>machniak@kolabsys.com</email>
-		<active>yes</active>
-	</developer>
-	<date>2013-05-16</date>
-	<version>
-		<release>0.9.1</release>
-		<api>0.9.1</api>
-	</version>
-	<stability>
-		<release>stable</release>
-		<api>stable</api>
-	</stability>
-	<license uri="http://www.gnu.org/licenses/agpl.html">GNU AGPLv3</license>
-	<notes>-</notes>
-	<contents>
-		<dir baseinstalldir="/" name="/">
-			<file name="calendar.php" role="php">
-				<tasks:replace from="@name@" to="name" type="package-info"/>
-				<tasks:replace from="@package_version@" to="version" type="package-info"/>
-			</file>
-			<file name="calendar_base.js" role="data">
-				<tasks:replace from="@name@" to="name" type="package-info"/>
-				<tasks:replace from="@package_version@" to="version" type="package-info"/>
-			</file>
-			<file name="calendar_ui.js" role="data">
-				<tasks:replace from="@name@" to="name" type="package-info"/>
-				<tasks:replace from="@package_version@" to="version" type="package-info"/>
-			</file>
-			<file name="print.js" role="data">
-				<tasks:replace from="@name@" to="name" type="package-info"/>
-				<tasks:replace from="@package_version@" to="version" type="package-info"/>
-			</file>
-			<file name="lib/calendar_ical.php" role="php">
-				<tasks:replace from="@name@" to="name" type="package-info"/>
-				<tasks:replace from="@package_version@" to="version" type="package-info"/>
-			</file>
-			<file name="lib/calendar_itip.php" role="php">
-				<tasks:replace from="@name@" to="name" type="package-info"/>
-				<tasks:replace from="@package_version@" to="version" type="package-info"/>
-			</file>
-			<file name="lib/calendar_ui.php" role="php">
-				<tasks:replace from="@name@" to="name" type="package-info"/>
-				<tasks:replace from="@package_version@" to="version" type="package-info"/>
-			</file>
-			<file name="lib/fullcalendar-rc.patch" role="data">
-				<tasks:replace from="@name@" to="name" type="package-info"/>
-				<tasks:replace from="@package_version@" to="version" type="package-info"/>
-			</file>
-			<file name="lib/js/fullcalendar.js" role="data">
-				<tasks:replace from="@name@" to="name" type="package-info"/>
-				<tasks:replace from="@package_version@" to="version" type="package-info"/>
-			</file>
-			<file name="drivers/calendar_driver.php" role="php">
-				<tasks:replace from="@name@" to="name" type="package-info"/>
-				<tasks:replace from="@package_version@" to="version" type="package-info"/>
-			</file>
-			<file name="drivers/kolab/kolab_calendar.php" role="php">
-				<tasks:replace from="@name@" to="name" type="package-info"/>
-				<tasks:replace from="@package_version@" to="version" type="package-info"/>
-			</file>
-			<file name="drivers/kolab/kolab_driver.php" role="php">
-				<tasks:replace from="@name@" to="name" type="package-info"/>
-				<tasks:replace from="@package_version@" to="version" type="package-info"/>
-			</file>
-			<file name="drivers/database/database_driver.php" role="php">
-				<tasks:replace from="@name@" to="name" type="package-info"/>
-				<tasks:replace from="@package_version@" to="version" type="package-info"/>
-			</file>
-			<file name="drivers/database/SQL/mysql.sql" role="data">
-				<tasks:replace from="@name@" to="name" type="package-info"/>
-				<tasks:replace from="@package_version@" to="version" type="package-info"/>
-			</file>
-			<file name="drivers/database/SQL/postgresql.sql" role="data">
-				<tasks:replace from="@name@" to="name" type="package-info"/>
-				<tasks:replace from="@package_version@" to="version" type="package-info"/>
-			</file>
-			<file name="drivers/database/SQL/sqlite.sql" role="data">
-				<tasks:replace from="@name@" to="name" type="package-info"/>
-				<tasks:replace from="@package_version@" to="version" type="package-info"/>
-			</file>
-			<file name="drivers/kolab/SQL/mysql.sql" role="data">
-				<tasks:replace from="@name@" to="name" type="package-info"/>
-				<tasks:replace from="@package_version@" to="version" type="package-info"/>
-			</file>
-
-			<file name="skins/classic/calendar.css" role="data"></file>
-			<file name="skins/classic/fullcalendar.css" role="data"></file>
-			<file name="skins/classic/fullcalendar.print.css" role="data"></file>
-			<file name="skins/classic/iehacks.css" role="data"></file>
-			<file name="skins/classic/jquery.miniColors.css" role="data"></file>
-			<file name="skins/classic/print.css" role="data"></file>
-			<file name="skins/classic/print.iehacks.css" role="data"></file>
-			<file name="skins/classic/images/attendee-status.gif" role="data"></file>
-			<file name="skins/classic/images/badge_confidential.gif" role="data"></file>
-			<file name="skins/classic/images/badge_confidential.png" role="data"></file>
-			<file name="skins/classic/images/badge_private.gif" role="data"></file>
-			<file name="skins/classic/images/badge_private.png" role="data"></file>
-			<file name="skins/classic/images/calendar-blue.png" role="data"></file>
-			<file name="skins/classic/images/calendar.gif" role="data"></file>
-			<file name="skins/classic/images/calendar.png" role="data"></file>
-			<file name="skins/classic/images/calendars.gif" role="data"></file>
-			<file name="skins/classic/images/calendars.png" role="data"></file>
-			<file name="skins/classic/images/eventicons.gif" role="data"></file>
-			<file name="skins/classic/images/export.png" role="data"></file>
-			<file name="skins/classic/images/freebusy-colors.gif" role="data"></file>
-			<file name="skins/classic/images/freebusy-colors.png" role="data"></file>
-			<file name="skins/classic/images/invitation.png" role="data"></file>
-			<file name="skins/classic/images/listheader.gif" role="data"></file>
-			<file name="skins/classic/images/loading_blue.gif" role="data"></file>
-			<file name="skins/classic/images/minicolors-all.png" role="data"></file>
-			<file name="skins/classic/images/minicolors-handles.gif" role="data"></file>
-			<file name="skins/classic/images/preview.png" role="data"></file>
-			<file name="skins/classic/images/print.png" role="data"></file>
-			<file name="skins/classic/images/spacer.gif" role="data"></file>
-			<file name="skins/classic/images/toggle.gif" role="data"></file>
-			<file name="skins/classic/images/toolbar.gif" role="data"></file>
-			<file name="skins/classic/images/toolbar.png" role="data"></file>
-			<file name="skins/classic/templates/attachment.html" role="data"></file>
-			<file name="skins/classic/templates/calendar.html" role="data"></file>
-			<file name="skins/classic/templates/eventedit.html" role="data"></file>
-			<file name="skins/classic/templates/freebusylegend.html" role="data"></file>
-			<file name="skins/classic/templates/itipattend.html" role="data"></file>
-			<file name="skins/classic/templates/kolabacl.html" role="data"></file>
-			<file name="skins/classic/templates/kolabform.html" role="data"></file>
-			<file name="skins/classic/templates/print.html" role="data"></file>
-
-			<file name="config.inc.php.dist" role="data"></file>
-			<file name="LICENSE" role="data"></file>
-			<file name="README" role="data"></file>
-			<file name="TODO" role="data"></file>
-
-			<file name="localization/bg_BG.inc" role="data"></file>
-			<file name="localization/cs_CZ.inc" role="data"></file>
-			<file name="localization/de_CH.inc" role="data"></file>
-			<file name="localization/de_DE.inc" role="data"></file>
-			<file name="localization/en_US.inc" role="data"></file>
-			<file name="localization/es_ES.inc" role="data"></file>
-			<file name="localization/fr_FR.inc" role="data"></file>
-			<file name="localization/hu_HU.inc" role="data"></file>
-			<file name="localization/it_IT.inc" role="data"></file>
-			<file name="localization/nl_NL.inc" role="data"></file>
-			<file name="localization/pl_PL.inc" role="data"></file>
-			<file name="localization/pt_BR.inc" role="data"></file>
-			<file name="localization/ru_RU.inc" role="data"></file>
-		</dir>
-		
-	</contents>
-	<dependencies>
-		<required>
-			<php>
-				<min>5.3.1</min>
-			</php>
-			<pearinstaller>
-				<min>1.7.0</min>
-			</pearinstaller>
-		</required>
-	</dependencies>
-	<phprelease/>
-</package>

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

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

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

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

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

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

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

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

@@ -31,10 +31,11 @@
     public $task = 'utils';
 
     private $enabled;
-    private $default;
-    private $folders;
+    private $config;
     private $dicts = array();
 
+    const O_TYPE = 'dictionary';
+
     /**
      * Required startup method of a Roundcube plugin
      */
@@ -54,6 +55,8 @@
         $this->add_hook('saved_search_list', array($this, 'saved_search_list'));
         $this->add_hook('saved_search_get', array($this, 'saved_search_get'));
 */
+
+        // @TODO: responses (snippets)
     }
 
     /**
@@ -61,28 +64,14 @@
      */
     private function load()
     {
-        // nothing to be done here
-        if (isset($this->folders))
+        if ($this->loaded) {
             return;
-
-        $this->require_plugin('libkolab');
-
-        $this->folders = kolab_storage::get_folders('configuration');
-        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);
+        $this->require_plugin('libkolab');
 
-        // check if configuration folder exist
-        if ($this->default && $this->default->name) {
-            $this->enabled = true;
-        }
+        $this->config = kolab_storage_config::get_instance();
+        $this->loaded = true;
     }
 
     /**
@@ -96,24 +85,23 @@
     {
         $this->load();
 
-        if (!$this->enabled) {
+        if (!$this->config->is_enabled()) {
             return $args;
         }
 
         $lang = $args['language'];
         $dict = $this->read_dictionary($lang, true);
 
-        $dict['type']     = 'dictionary';
         $dict['language'] = $args['language'];
         $dict['e']        = $args['dictionary'];
 
         if (empty($dict['e'])) {
             // Delete the object
-            $this->default->delete($dict);
+            $this->config->delete($dict['uid']);
         }
         else {
             // Update the object
-            $this->default->save($dict, 'configuration.dictionary', $dict['uid']);
+            $this->config->save($dict, self::O_TYPE, $dict['uid']);
         }
 
         $args['abort'] = true;
@@ -132,7 +120,7 @@
     {
         $this->load();
 
-        if (!$this->enabled) {
+        if (!$this->config->is_enabled()) {
             return $args;
         }
 
@@ -153,33 +141,30 @@
      *
      * @param string The language (2 chars) to load
      * @param boolean Only load objects from default folder
+     *
      * @return array Dictionary object as hash array
      */
     private function read_dictionary($lang, $default = false)
     {
-        if (isset($this->dicts[$lang]))
+        if (isset($this->dicts[$lang])) {
             return $this->dicts[$lang];
+        }
 
-        $query = array(array('type','=','dictionary'), array('tags','=',$lang));
-
-        foreach ($this->folders as $folder) {
-            // we only want to read from default folder
-            if ($default && !$folder->default)
-                continue;
-
-            foreach ($folder->select($query) as $object) {
-                if ($object['type'] == 'dictionary' && ($object['language'] == $lang || $object['language'] == 'XX')) {
-                    if (is_array($this->dicts[$lang]))
-                        $this->dicts[$lang]['e'] = array_merge((array)$this->dicts[$lang]['e'], $object['e']);
-                    else
-                        $this->dicts[$lang] = $object;
-
-                    // make sure the default object is cached
-                    if ($folder->default && $object['language'] != 'XX') {
-                        $object['e'] = $this->dicts[$lang]['e'];
-                        $this->dicts[$lang] = $object;
-                    }
+        $query = array(array('type','=',self::O_TYPE), array('tags','=',$lang));
+
+        foreach ($this->config->get_objects($query, $default, null, 100) as $object) {
+            if ($object['language'] == $lang || $object['language'] == 'XX') {
+                if (is_array($this->dicts[$lang]))
+                    $this->dicts[$lang]['e'] = array_merge((array)$this->dicts[$lang]['e'], $object['e']);
+                else
+                    $this->dicts[$lang] = $object;
+/*
+                // make sure the default object is cached
+                if ($folder->default && $object['language'] != 'XX') {
+                    $object['e'] = $this->dicts[$lang]['e'];
+                    $this->dicts[$lang] = $object;
                 }
+*/
             }
         }

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

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

@@ -25,7 +25,31 @@
  * for the JavaScript code in this file.
  */
 
-$(document).ready(function() {
+window.rcmail && rcmail.env.action == 'folders' && rcmail.addEventListener('init', function() {
+    var filter = $(rcmail.gui_objects.foldersfilter),
+        optgroup = $('<optgroup>').attr('label', rcmail.gettext('kolab_folders.folderctype'));
+
+    // remove disabled namespaces
+    filter.children('option').each(function(i, opt) {
+        $.each(rcmail.env.skip_roots || [], function() {
+            if (opt.value == this) {
+                $(opt).remove();
+            }
+        });
+    });
+
+    // add type options to the filter
+    $.each(rcmail.env.foldertypes, function() {
+        optgroup.append($('<option>').attr('value', 'type-' + this).text(rcmail.gettext('kolab_folders.foldertype' + this)));
+    });
+
+    // overwrite default onchange handler
+    filter.attr('onchange', '')
+        .on('change', function() { return kolab_folders_filter(this.value); })
+        .append(optgroup);
+});
+
+window.rcmail && rcmail.env.action != 'folders' && $(document).ready(function() {
     // IE doesn't allow setting OPTION's display/visibility
     // We'll need to remove SELECT's options, see below
     if (bw.ie) {
@@ -68,3 +92,58 @@
         }
     }).change();
 });
+
+function kolab_folders_filter(filter)
+{
+    var type = filter.match(/^type-([a-z]+)$/) ? RegExp.$1 : null;
+
+    rcmail.subscription_list.reset_search();
+
+    if (!type) {
+        // clear type filter
+        if (rcmail.folder_filter_type) {
+            $('li', rcmail.subscription_list.container).removeData('filtered').show();
+            rcmail.folder_filter_type = null;
+        }
+
+        // apply namespace filter
+        rcmail.folder_filter(filter);
+    }
+    else {
+        rcmail.folder_filter_type = type;
+        rcmail.subscription_list.container.children('li').each(function() {
+            kolab_folder_filter_match(this, type);
+        });
+    }
+
+    return false;
+}
+
+function kolab_folder_filter_match(elem, type)
+{
+    var found = 0, cl = elem.className || '',
+        $elem = $(elem),
+        children = $('ul', elem).children('li');
+
+    // subfolders...
+    children.each(function() {
+        found += kolab_folder_filter_match(this, type);
+    });
+
+    if (found || cl.match(new RegExp('type-' + type))
+        || (type == 'mail' && !children.length && !cl.match(/(^| )type-([a-z]+)/))
+    ) {
+        if (found || !$elem.is('.virtual')) {
+            found++;
+        }
+    }
+
+    if (found) {
+        $elem.removeData('filtered').show();
+    }
+    else {
+        $elem.data('filtered', true).hide();
+    }
+
+    return found;
+}

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

@@ -104,6 +104,32 @@
             return $args;
         }
 
+        // load translations
+        $this->add_texts('localization/', false);
+
+        // Add javascript script to the client
+        $this->include_script('kolab_folders.js');
+
+        $this->add_label('folderctype');
+        foreach ($this->types as $type) {
+            $this->add_label('foldertype' . $type);
+        }
+
+        $skip_namespace = (array)$this->rc->config->get('kolab_skip_namespace');
+        $skip_roots     = array();
+
+        if (!empty($skip_namespace)) {
+            $storage = $this->rc->get_storage();
+            foreach ($skip_namespace as $ns) {
+                foreach((array)$storage->get_namespace($ns) as $root) {
+                    $skip_roots[] = rtrim($root[0], $root[1]);
+                }
+            }
+        }
+
+        $this->rc->output->set_env('skip_roots', $skip_roots);
+        $this->rc->output->set_env('foldertypes', $this->types);
+
         // get folders types
         $folderdata = kolab_storage::folders_typedata();

roundcubemail-plugins-kolab-3.2.tar.gz/plugins/kolab_notes/composer.json Added

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

@@ -488,7 +488,7 @@
     public function note_record()
     {
         $data = $this->get_note(array(
-            'uid' => rcube_utils::get_input_value('_id', RCUBE_INPUT_GPC),
+            'uid'  => rcube_utils::get_input_value('_id', RCUBE_INPUT_GPC),
             'list' => rcube_utils::get_input_value('_list', RCUBE_INPUT_GPC),
         ));
 
@@ -562,12 +562,10 @@
         }
 
         // resolve message links
-        if (is_array($note['links'])) {
-            $me = $this;
-            $note['links'] = array_map(function($link) use ($me, $resolve){
+        $me = $this;
+        $note['links'] = array_map(function($link) use ($me, $resolve) {
                 return $me->get_message_reference($link, $resolve) ?: array('uri' => $link);
-            }, $note['links']);
-        }
+            }, $this->get_links($note['uid']));
 
         return $note;
     }
@@ -622,7 +620,7 @@
         else {
             $this->rc->output->show_message('errorsaving', 'error');
         }
- 
+
         // unlock client
         $this->rc->output->command('plugin.unlock_saving');
 
@@ -666,6 +664,11 @@
 
         // generate new note object from input
         $object = $this->_write_preprocess($note, $old);
+
+        // email links are handled separately
+        $links = $object['links'];
+        unset($object['links']);
+
         $saved = $folder->save($object, 'note', $note['uid']);
 
         if (!$saved) {
@@ -677,7 +680,10 @@
             $saved = false;
         }
         else {
-            $note = $object;
+            // save links in configuration.relation object
+            $this->save_links($object['uid'], $links);
+
+            $note         = $object;
             $note['list'] = $list_id;
 
             // cache this in memory for later read
@@ -716,10 +722,17 @@
         $this->_read_lists();
 
         $list_id = $note['list'];
-        if (!$list_id || !($folder = $this->get_folder($list_id)))
+        if (!$list_id || !($folder = $this->get_folder($list_id))) {
             return false;
+        }
+
+        $status = $folder->delete($note['uid'], $force);
 
-        return $folder->delete($note['uid'], $force);
+        if ($status) {
+            $this->save_links($note['uid'], null);
+        }
+
+        return $status;
     }
 
     /**
@@ -873,23 +886,12 @@
     }
 
     /**
-     * Lookup backend storage and find notes tagged with the given message-ID
+     * Lookup backend storage and find notes associated with the given message
      */
     public function mail_message_load($p)
     {
-        $this->message = $p['object'];
-        $this->message_notes = array();
-
-        // TODO: only query for notes if message was flagged with $KolabNotes ?
-
-        $message_id = trim($p['object']->headers->messageID, '<> ');
-        if ($message_id && $p['object']->uid) {
-            $query = array(array('tags','=','ref:' . $message_id));
-            foreach (kolab_storage::select($query, 'note') as $record) {
-                $record['list'] = kolab_storage::folder_id($record['_mailbox']);
-                $this->message_notes[] = $record;
-            }
-        }
+        $this->message       = $p['object'];
+        $this->message_notes = $this->get_message_notes($this->message->headers, $this->message->folder);
     }
 
     /**
@@ -964,76 +966,183 @@
         return $message->getMessage();
     }
 
-    /**
-     * Build a URI representing the given message reference
-     */
-    private function get_message_uri($headers, $folder)
+    private function save_links($uid, $links)
     {
-        return sprintf('imap://%s/%s?message-id=%s&subject=%s',
-            $headers->folder ?: $folder,
-            $headers->uid,
-            urlencode($headers->messageID),
-            urlencode($headers->get('subject'))
-        );
+        $config    = kolab_storage_config::get_instance();
+        $search    = kolab_storage_config::build_member_url($uid);
+        $relations = $this->get_relations($uid);
+
+        // @TODO: here we support only one-way relations, i.e.
+        // such relation can contain only note and mail members
+        // So, when we remove a note member the whole relation
+        // will be removed
+
+        foreach ($relations as $relation) {
+            if (empty($links)) {
+                $config->delete($relation['uid']);
+                $this->relations = null; // clear in-memory cache
+            }
+            else {
+                // make relation members up-to-date
+                kolab_storage_config::resolve_members($relation);
+
+                // assign all links to one relation, others will be removed
+                $members = array_merge($links, array($search));
+                $diff1   = array_diff($members, $relation['members']);
+                $diff1   = array_diff($relation['members'], $members);
+
+                if (count($diff1) || count($diff2)) {
+                    $relation['members'] = $members;
+                    $config->save($relation, 'relation');
+                    $this->relations = null; // clear in-memory cache
+                }
+
+                $links = null;
+            }
+        }
+
+        // create a new relation
+        if (!empty($links)) {
+            $relation = array(
+                'members'  => array_merge($links, array($search)),
+                'category' => 'generic',
+            );
+
+            $config->save($relation, 'relation');
+            $this->relations = null; // clear in-memory cache
+        }
     }
 
     /**
-     * Extract message reference components from the given URI
+     * Find messages assigned to specified note
      */
-    private function parse_message_uri($uri)
+    private function get_links($uid)
     {
-        $url = parse_url($uri);
-        if ($url['scheme'] == 'imap') {
-            parse_str($url['query'], $param);
-            $linkref = array(
-                'uri' => $uri,
-                'message_id' => $param['message-id'] ?: urldecode($url['fragment']),
-                'subject' => $param['subject'],
-            );
+        $result = array();
+        $search = kolab_storage_config::build_member_url($uid);
 
-            $path = explode('/', $url['host'] . $url['path']);
-            $linkref['msguid'] = array_pop($path);
-            $linkref['folder'] = join('/', $path);
+        foreach ($this->get_relations($uid) as $relation) {
+            if (in_array($search, (array) $relation['members'])) {
+                // make relation members up-to-date
+                kolab_storage_config::resolve_members($relation);
 
-            return $linkref;
+                foreach ($relation['members'] as $member) {
+                    if ($member != $search) {
+                        $result[] = $member;
+                    }
+                }
+            }
         }

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

@@ -757,7 +757,6 @@
             noteslist.select(me.selected_note.id);
         }
         else if (!data.data.length) {
-            console.log(data);
             rcmail.display_message(rcmail.gettext('norecordsfound','kolab_notes'), 'info');
         }
     }
@@ -812,13 +811,13 @@
         });
 
         if (data.links) {
-            $.each(data.links, function(i, link){
+            $.each(data.links, function(i, link) {
                 var li = $('<li>').addClass('link')
                     .addClass('message eml')
                     .append($('<a>')
                         .attr('href', link.mailurl)
                         .addClass('messagelink')
-                        .html(Q(link.subject || link.message_id || link.uri))
+                        .text(link.subject || link.uri)
                     )
                     .appendTo(attachmentslist);
 /*
@@ -849,7 +848,7 @@
         var html = data.html || data.description;
 
         // convert plain text to HTML and make URLs clickable
-        if (!data.html || !html.match(/<(html|body)/)) {
+        if (html != '' && (!data.html || !html.match(/<(html|body)/))) {
             html = text2html(html);
         }
 
@@ -869,7 +868,7 @@
                 $('.notetitle', rcmail.gui_objects.noteviewtitle).focus().select();
 
             // read possibly re-formatted content back from editor for later comparison
-            me.selected_note.description = editor.getContent({ format:'html' });
+            me.selected_note.description = editor.getContent({ format:'html' }).replace(/^<p><\/p>/, '');
             is_html = true;
         }
         else {
@@ -1136,7 +1135,7 @@
             listselect = $('option:selected', rcmail.gui_objects.notebooks);
         var savedata = {
             title: trim($('.notetitle', rcmail.gui_objects.noteviewtitle).val()),
-            description: editor ? editor.getContent({ format:'html' }) : $('#notecontent').val(),
+            description: editor ? editor.getContent({ format:'html' }).replace(/^<p><\/p>/, '') : $('#notecontent').val(),
             list: listselect.length ? listselect.val() : me.selected_note.list || me.selected_list,
             uid: me.selected_note.uid,
             categories: []

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

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/templates/dialogview.html Changed

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

@@ -388,6 +388,9 @@
         message_list_select(list);
     }
 
+    // reset tag selector popup
+    tag_selector_element = null;
+
     // @TODO: sort tags by name/prio
 }
 
@@ -521,6 +524,11 @@
 // adds _tags argument to http search request
 function search_request(url)
 {
+    // remove old tags filter
+    if (url._filter) {
+        url._filter = url._filter.replace(/^kolab_tags_[0-9]+:[^:]+:/, '');
+    }
+
     if (tagsfilter.length) {
         url._filter = 'kolab_tags_' + (new Date).getTime() + ':' + tagsfilter.join(',') + ':' + (url._filter || 'ALL');
 
@@ -596,7 +604,7 @@
 // create and return tag box element
 function tag_box_element(tag, del_btn)
 {
-    var span = $('<span class="tagbox"></span>')
+    var span = $('<span class="tagbox skip-on-drag"></span>')
         .text(tag.name).data('tag', tag.uid);
 
     tag_set_color(span, tag);
@@ -615,18 +623,19 @@
 // set color style on tag box
 function tag_set_color(obj, tag)
 {
-    var style = {backgroundColor: tag.color};
-
     if (obj && tag.color) {
+        var style = 'background-color: ' + tag.color + ' !important';
+
         // choose black text color when background is bright, white otherwise
         if (/^#([a-f0-9]{2})([a-f0-9]{2})([a-f0-9]{2})$/i.test(tag.color)) {
             // use information about brightness calculation found at
             // http://javascriptrules.com/2009/08/05/css-color-brightness-contrast-using-javascript/
             var brightness = (parseInt(RegExp.$1, 16) * 299 + parseInt(RegExp.$2, 16) * 587 + parseInt(RegExp.$3, 16) * 114) / 1000;
-            style.color = brightness > 125 ? 'black' : 'white';
+            style += '; color: ' + (brightness > 125 ? 'black' : 'white') + ' !important';
         }
 
-        $(obj).css(style);
+        // don't use css() it does not work with "!important" flag
+        $(obj).attr('style', style);
     }
 }

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

@@ -23,52 +23,13 @@
 
 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';
+    const O_TYPE     = 'relation';
+    const O_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
@@ -77,27 +38,14 @@
      */
     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;
-                }
-            }
-        }
+        $config     = kolab_storage_config::get_instance();
+        $default    = true;
+        $filter[]   = array('type', '=', self::O_TYPE);
+        $cat_filter = array('category' => self::O_CATEGORY);
+
+        // for performance reasons assume there will be no more than 100 tags (per-folder)
 
-        return $taglist;
+        return $config->get_objects($filter, $default, $cat_filter, 100);
     }
 
     /**
@@ -109,18 +57,12 @@
      */
     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;
+        $config = kolab_storage_config::get_instance();
+        $tag    = array_intersect_key($tag, array_combine($this->tag_cols, $this->tag_cols));
+        $tag['category'] = self::O_CATEGORY;
 
         // Create the object
-        $result = $this->default->save($tag, self::FOLDER_TYPE . '.' . self::OBJECT_TYPE);
+        $result = $config->save($tag, self::O_TYPE);
 
         return $result ? $tag : false;
     }
@@ -142,18 +84,12 @@
             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;
-            }
-        }
+        $config = kolab_storage_config::get_instance();
+        $tag    = array_intersect_key($tag, array_combine($this->tag_cols, $this->tag_cols));
+        $tag    = array_merge($old_tag, $tag);
 
         // Update the object
-        $result = $folder->save($tag, self::FOLDER_TYPE . '.' . self::OBJECT_TYPE, $tag['uid']);
+        $result = $config->save($tag, self::O_TYPE, $tag['uid']);
 
         return $result ? $tag : false;
     }
@@ -167,21 +103,8 @@
      */
     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;
-            }
-        }
+        $config = kolab_storage_config::get_instance();
 
-        return $folder->delete($uid);
+        return $config->delete($uid);
     }
 }

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

@@ -220,12 +220,6 @@
 
         // for every tag...
         foreach ($taglist as $tag) {
-            $updated = false;
-
-            // make sure members list is up-to-date (UIDs are up-to-date)
-            // @todo: maybe there's a faster way?
-            $this->get_tag_messages($tag);
-
             $tag['members'] = array_unique(array_merge((array) $tag['members'], $members));
 
             // update tag object
@@ -429,91 +423,9 @@
      *
      * @return array Folder/UID list
      */
-    protected function get_tag_messages(&$tag)
+    protected function get_tag_messages(&$tag, $force = true)
     {
-        $result = array();
-
-        foreach ((array) $tag['members'] as $member) {
-            if ($url = $this->parse_member_url($member)) {
-                $folder                      = $url['folder'];
-                $result[$folder]['uid'][]    = $url['uid'];
-                $result[$folder]['params'][] = $url['params'];
-                $result[$folder]['member'][] = $member;
-            }
-        }
-
-        if (empty($result)) {
-            return array();
-        }
-
-        // @TODO: caching?
-
-        $rcube   = rcube::get_instance();
-        $storage = $rcube->get_storage();
-
-        foreach ($result as $folder => $data) {
-            // first, we search messages by UID
-            // @FIXME: maybe better use index() which is cached?
-            // @TODO: consider skip_deleted option
-            $index = $storage->search_once($folder, 'UID ' . rcube_imap_generic::compressMessageSet($data['uid']));
-            $uids  = $index->get();
-
-            // search by search parameters
-            $not_found = array_diff($data['uid'], $uids);
-            if (!empty($not_found)) {
-                $params      = array();
-                $old_members = array();
-                $new_members = array();
-
-                foreach ($not_found as $uid) {
-                    $idx = array_search($uid, $data['uid']);
-
-                    if ($p = $data['params'][$idx]) {
-                        $params[$idx] = $p;
-                    }
-
-                    $old_members[] = $data['member'][$idx];
-                }
-
-                if (!empty($params)) {
-                    // @TODO: do this search in chunks (for e.g. 10 messages)?
-                    $search_str = '';
-
-                    foreach ($params as $p) {
-                        $search = array();
-                        foreach ($p as $key => $val) {
-                            $search[] = 'HEADER ' . strtoupper($key) . ' ' . rcube_imap_generic::escape($val);
-                        }
-
-                        $search_str .= ' (' . implode(' ', $search) . ')';
-                    }
-
-                    $search_str = str_repeat(' OR', count($params)-1) . $search_str;
-
-                    // @TODO: we should search all folders
-                    $index = $storage->search_once($folder, $search_str);
-                    $_uids = $index->get();
-
-                    if (!empty($_uids)) {
-                        $uids = array_merge($uids, $_uids);
-                        $msgs = $storage->fetch_headers($folder, $_uids, false);
-
-                        $new_members = array_merge($new_members, $this->build_members($folder, $msgs));
-                    }
-                }
-
-                // merge members
-                $tag['members'] = array_diff($tag['members'], $old_members);
-                $tag['members'] = array_unique(array_merge($tag['members'], $new_members));
-
-                // update tag object with new members list
-                $this->backend->update($tag);
-            }
-
-            $result[$folder] = array_unique($uids);
-        }
-
-        return $result;
+        return kolab_storage_config::resolve_members($tag, $force);
     }
 
     /**
@@ -521,26 +433,7 @@
      */
     protected function build_members($folder, $messages)
     {
-        $members = array();
-
-        foreach ((array) $messages as $msg) {
-            $params = array(
-                'folder' => $folder,
-                'uid'    => $msg->uid,
-            );
-
-            // add search parameters
-            // we don't want to build "invalid" searches e.g. that
-            // will return false positives (more or wrong messages)
-            if (($messageid = $msg->get('message-id', false)) && ($date = $msg->get('date', false))) {
-                $params['message-id'] = $messageid;
-                $params['date']       = $date;
-            }
-
-            $members[] = $this->build_member_url($params);
-        }
-
-        return $members;
+        return kolab_storage_config::build_members($folder, $messages);
     }
 
     /**
@@ -552,57 +445,7 @@
      */
     protected function parse_member_url($url)
     {
-        // Look for IMAP URI:
-        // imap:///(user/username@domain|shared)/<folder>/<UID>?<search_params>
-        if (strpos($url, 'imap:///') === 0) {
-            $rcube   = rcube::get_instance();
-            $storage = $rcube->get_storage();
-
-            // parse_url does not work with imap:/// prefix
-            $url   = parse_url(substr($url, 8));
-            $path  = explode('/', $url['path']);
-            parse_str($url['query'], $params);
-
-            $uid  = array_pop($path);
-            $ns   = array_shift($path);
-            $path = array_map('rawurldecode', $path);
-
-            // resolve folder name
-            if ($ns == 'shared') {
-                $folder = implode('/', $path);
-                // Note: this assumes there's only one shared namespace root
-                if ($ns = $storage->get_namespace('shared')) {
-                    if ($prefix = $ns[0][0]) {
-                        $folder = $prefix . '/' . $folder;
-                    }
-                }
-            }
-            else if ($ns == 'user') {
-                $username = array_shift($path);
-                $folder   = implode('/', $path);
-
-                if ($username != $rcube->get_user_name()) {
-                    // Note: this assumes there's only one other users namespace root
-                    if ($ns = $storage->get_namespace('other')) {
-                        if ($prefix = $ns[0][0]) {
-                            $folder = $prefix . '/' . $username . '/' . $folder;
-                        }
-                    }
-                }
-                else if (!strlen($folder)) {
-                    $folder = 'INBOX';
-                }
-            }
-            else {
-                return;
-            }
-
-            return array(
-                'folder' => $folder,
-                'uid'    => $uid,
-                'params' => $params,
-            );
-        }
+        return kolab_storage_config::parse_member_url($url);
     }
 
     /**
@@ -614,57 +457,6 @@
      */
     protected function build_member_url($params)
     {
-        if (empty($params) || !strlen($params['folder'])) {
-            return null;

roundcubemail-plugins-kolab-3.2.tar.gz/plugins/libcalendaring/composer.json Added

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

@@ -60,6 +60,11 @@
         $this->rsvp_status = array_merge($this->rsvp_actions, array('delegated'));
     }
 
+    public function set_rsvp_status($status)
+    {
+        $this->rsvp_status = $status;
+    }
+
     /**
      * Wrapper for rcube_plugin::gettext()
      * Checking for a label in different domains
@@ -213,6 +218,14 @@
                 $event['attendees'] = $reply_attendees;
             }
         }
+        // set RSVP=TRUE for every attendee if not set
+        else if ($method == 'REQUEST') {
+            foreach ($event['attendees'] as $i => $attendee) {
+                if (!isset($attendee['rsvp'])) {
+                    $event['attendees'][$i]['rsvp']= true;
+                }
+            }
+        }
 
         // compose multipart message using PEAR:Mail_Mime
         $message = new Mail_mime("\r\n");
@@ -236,9 +249,10 @@
         $message->headers($headers);
 
         // attach ics file for this event
-        $ical = $this->plugin->get_ical();
+        $ical = libcalendaring::get_ical();
         $ics = $ical->export(array($event), $method, false, $method == 'REQUEST' && $this->plugin->driver ? array($this->plugin->driver, 'get_attachment_body') : false);
-        $message->addAttachment($ics, 'text/calendar', 'event.ics', false, '8bit', '', RCMAIL_CHARSET . "; method=" . $method);
+        $filename = $event['_type'] == 'task' ? 'todo.ics' : 'event.ics';
+        $message->addAttachment($ics, 'text/calendar', $filename, false, '8bit', '', RCMAIL_CHARSET . "; method=" . $method);
 
         return $message;
     }
@@ -313,9 +327,10 @@
           $listed = false;
           foreach ($existing['attendees'] as $attendee) {
             if ($attendee['role'] != 'ORGANIZER' && strcasecmp($attendee['email'], $event['attendee']) == 0) {
-              if (in_array($status, array('ACCEPTED','TENTATIVE','DECLINED','DELEGATED'))) {
-                $html = html::div('rsvp-status ' . strtolower($status), $this->gettext(array(
-                    'name' => 'attendee'.strtolower($status),
+              $status_lc = strtolower($status);
+              if (in_array($status_lc, $this->rsvp_status)) {
+                $html = html::div('rsvp-status ' . $status_lc, $this->gettext(array(
+                    'name' => 'attendee' . $status_lc,
                     'vars' => array(
                         'delegatedto' => Q($attendee['delegated-to'] ?: '?'),
                     )
@@ -419,6 +434,12 @@
             $title = $event['sequence'] > 0 ? $this->gettext('itipupdate') : $this->gettext('itipinvitation');
             $metadata['rsvp'] = true;
 
+            // check for X-KOLAB-INVITATIONTYPE property and only show accept/decline buttons
+            if (self::get_custom_property($event, 'X-KOLAB-INVITATIONTYPE') == 'CONFIRMATION') {
+                $this->rsvp_actions = array('accepted','declined');
+                $metadata['nosave'] = true;
+            }
+
             // 1. display RSVP buttons (if the user was invited)
             foreach ($this->rsvp_actions as $method) {
                 $rsvp_buttons .= html::tag('input', array(
@@ -456,7 +477,7 @@
             }
 
             // add itip reply message controls
-            $rsvp_buttons .= html::div('itip-reply-controls', $this->itip_rsvp_options_ui($dom_id));
+            $rsvp_buttons .= html::div('itip-reply-controls', $this->itip_rsvp_options_ui($dom_id, $metadata['nosave']));
 
             $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);
@@ -492,7 +513,6 @@
             $buttons[] = html::div(array('id' => 'import-'.$dom_id, 'style' => 'display:none'), $import_button);
         }
 
-        // TODO: add field for COMMENT on iTip replies
         // TODO: add option/checkbox to delete this message after update
 
         // pass some metadata about the event and trigger the asynchronous status check
@@ -512,13 +532,40 @@
     }
 
     /**
+     * Render an RSVP UI widget with buttons to respond on iTip invitations
+     */
+    function itip_rsvp_buttons($attrib = array(), $actions = null)
+    {
+        $attrib += array('type' => 'button');
+
+        if (!$actions)
+            $actions = $this->rsvp_actions;
+
+        foreach ($actions as $method) {
+            $buttons .= html::tag('input', array(
+                'type'  => $attrib['type'],
+                'name'  => $attrib['iname'],
+                'class' => 'button',
+                'rel'   => $method,
+                'value' => $this->gettext('itip' . $method),
+            ));
+        }
+
+        $buttons .= html::div('itip-reply-controls', $this->itip_rsvp_options_ui($attrib['id']));
+
+        return html::div($attrib,
+            html::div('label', $this->gettext('acceptinvitation')) .
+            html::div('rsvp-buttons', $buttons));
+    }
+
+    /**
      * Render UI elements to control iTip reply message sending
      */
-    public function itip_rsvp_options_ui($dom_id)
+    public function itip_rsvp_options_ui($dom_id, $disable = false)
     {
         // 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))
+            html::tag('input', array('type' => 'checkbox', 'id' => 'noreply-'.$dom_id, 'value' => 1, 'disabled' => $disable))
             . ' ' . $this->gettext('itipsuppressreply')
         );
 
@@ -532,15 +579,21 @@
     }
 
     /**
-     * Render event details in a table
+     * Render event/task details in a table
      */
     function itip_object_details_table($event, $title)
     {
         $table = new html_table(array('cols' => 2, 'border' => 0, 'class' => 'calendar-eventdetails'));
         $table->add('ititle', $title);
         $table->add('title', Q($event['title']));
-        $table->add('label', $this->plugin->gettext('date'), $this->domain);
-        $table->add('date', Q($this->lib->event_date_text($event)));
+        if ($event['start'] && $event['end']) {
+            $table->add('label', $this->plugin->gettext('date'), $this->domain);
+            $table->add('date', Q($this->lib->event_date_text($event)));
+        }
+        else if ($event['due'] && $event['_type'] == 'task') {
+            $table->add('label', $this->plugin->gettext('date'), $this->domain);
+            $table->add('date', Q($this->lib->event_date_text($event)));
+        }
         if ($event['location']) {
             $table->add('label', $this->plugin->gettext('location'), $this->domain);
             $table->add('location', Q($event['location']));
@@ -578,4 +631,22 @@
         return false;
     }
 
+    /**
+     * Utility function to get the value of a custom property
+     */
+    public static function get_custom_property($event, $name)
+    {
+      $ret = false;
+
+      if (is_array($event['x-custom'])) {
+          array_walk($event['x-custom'], function($prop, $i) use ($name, &$ret) {
+              if (strcasecmp($prop[0], $name) === 0) {
+                  $ret = $prop[1];
+              }
+          });
+      }
+
+      return $ret;
+    }
+
 }

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

@@ -6,13 +6,14 @@
  * Provides utility functions for calendar-related modules such as
  * - alarms display and dismissal
  * - attachment handling
- * - recurrence computation and UI elements (TODO)
+ * - recurrence computation and UI elements
  * - ical parsing and exporting
+ * - itip scheduling protocol
  *
  * @version @package_version@
  * @author Thomas Bruederli <bruederli@kolabsys.com>
  *
- * Copyright (C) 2012, Kolab Systems AG <contact@kolabsys.com>
+ * Copyright (C) 2012-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
@@ -35,6 +36,8 @@
     public $gmt_offset;
     public $dst_active;
     public $timezone_offset;
+    public $ical_parts = array();
+    public $ical_message;
 
     public $defaults = array(
       'calendar_date_format'  => "yyyy-MM-dd",
@@ -57,6 +60,8 @@
 
     private static $instance;
 
+    private $mail_ical_parser;
+
     /**
      * Singleton getter to allow direct access from other plugins
      */
@@ -102,6 +107,21 @@
             $this->add_hook('refresh', array($this, 'refresh'));
             $this->register_action('plugin.alarms', array($this, 'alarms_action'));
         }
+
+        // proceed initialization in startup hook
+        $this->add_hook('startup', array($this, 'startup'));
+    }
+
+    /**
+     * Startup hook
+     */
+    public function startup($args)
+    {
+        if ($args['task'] == 'mail') {
+            if ($args['action'] == 'show' || $args['action'] == 'preview') {
+                $this->add_hook('message_load', array($this, 'mail_message_load'));
+            }
+        }
     }
 
     /**
@@ -247,11 +267,25 @@
      */
     public function event_date_text($event, $tzinfo = false)
     {
-        $fromto = '';
+        $fromto = '--';
+
+        // handle task objects
+        if ($event['_type'] == 'task' && is_object($event['due'])) {
+            $date_format = $event['due']->_dateonly ? self::to_php_date_format($this->rc->config->get('calendar_date_format', $this->defaults['calendar_date_format'])) : null;
+            $fromto = $this->rc->format_date($event['due'], $date_format, false);
+
+            // add timezone information
+            if ($fromto && $tzinfo && ($tzname = $this->timezone->getName())) {
+                $fromto .= ' (' . strtr($tzname, '_', ' ') . ')';
+            }
+
+            return $fromto;
+        }
 
         // abort if no valid event dates are given
-        if (!is_object($event['start']) || !is_a($event['start'], 'DateTime') || !is_object($event['end']) || !is_a($event['end'], 'DateTime'))
+        if (!is_object($event['start']) || !is_a($event['start'], 'DateTime') || !is_object($event['end']) || !is_a($event['end'], 'DateTime')) {
             return $fromto;
+        }
 
         $duration = $event['start']->diff($event['end'])->format('s');
 
@@ -411,7 +445,7 @@
             if ($alarm['trigger'] instanceof DateTime) {
                 $alarm['trigger'] = '@' . $alarm['trigger']->format('U');
             }
-            else if ($trigger = self::parse_alaram_value($alarm['trigger'])) {
+            else if ($trigger = libcalendaring::parse_alaram_value($alarm['trigger'])) {
                 $alarm['trigger'] = $trigger[2];
             }
             return $alarm;
@@ -1206,6 +1240,125 @@
     }
 
 
+    /*********  iTip message detection  *********/
+
+    /**
+     * Check mail message structure of there are .ics files attached
+     */
+    public function mail_message_load($p)
+    {
+        $this->ical_message = $p['object'];
+        $itip_part     = null;
+
+        // check all message parts for .ics files
+        foreach ((array)$this->ical_message->mime_parts as $part) {
+            if (self::part_is_vcalendar($part)) {
+                if ($part->ctype_parameters['method'])
+                    $itip_part = $part->mime_id;
+                else
+                    $this->ical_parts[] = $part->mime_id;
+            }
+        }
+
+        // priorize part with method parameter
+        if ($itip_part) {
+            $this->ical_parts = array($itip_part);
+        }
+    }
+
+    /**
+     * Getter for the parsed iCal objects attached to the current email message
+     *
+     * @return object libvcalendar parser instance with the parsed objects
+     */
+    public function get_mail_ical_objects()
+    {
+        // create parser and load ical objects
+        if (!$this->mail_ical_parser) {
+            $this->mail_ical_parser = $this->get_ical();
+
+            foreach ($this->ical_parts as $mime_id) {
+                $part    = $this->ical_message->mime_parts[$mime_id];
+                $charset = $part->ctype_parameters['charset'] ?: RCMAIL_CHARSET;
+                $this->mail_ical_parser->import($this->ical_message->get_part_content($mime_id), $charset);
+
+                // stop on the part that has an iTip method specified
+                if (count($this->mail_ical_parser->objects) && $this->mail_ical_parser->method) {
+                    $this->mail_ical_parser->message_date = $this->ical_message->headers->date;
+                    $this->mail_ical_parser->mime_id = $mime_id;
+                    break;
+                }
+            }
+        }
+
+        return $this->mail_ical_parser;
+    }
+
+    /**
+     * Read the given mime message from IMAP and parse ical data
+     *
+     * @param string Mailbox name
+     * @param string Message UID
+     * @param string Message part ID and object index (e.g. '1.2:0')
+     * @param string Object type filter (optional)
+     *
+     * @return array Hash array with the parsed iCal 
+     */
+    public function mail_get_itip_object($mbox, $uid, $mime_id, $type = null)
+    {
+        $charset = RCMAIL_CHARSET;
+
+        // establish imap connection
+        $imap = $this->rc->get_storage();
+        $imap->set_mailbox($mbox);
+
+        if ($uid && $mime_id) {
+            list($mime_id, $index) = explode(':', $mime_id);
+
+            $part    = $imap->get_message_part($uid, $mime_id);
+            $headers = $imap->get_message_headers($uid);
+            $parser  = $this->get_ical();
+
+            if ($part->ctype_parameters['charset']) {
+                $charset = $part->ctype_parameters['charset'];
+            }
+
+            if ($part) {
+                $objects = $parser->import($part, $charset);
+            }
+        }
+
+        // successfully parsed events/tasks?
+        if (!empty($objects) && ($object = $objects[$index]) && (!$type || $object['_type'] == $type)) {
+            if ($parser->method)
+                $object['_method'] = $parser->method;
+
+            // store the message's sender address for comparisons
+            $object['_sender'] = preg_match('/([a-z0-9][a-z0-9\-\.\+\_]*@[^&@"\'.][^@&"\']*\\.([^\\x00-\\x40\\x5b-\\x60\\x7b-\\x7f]{2,}|xn--[a-z0-9]{2,}))/', $headers->from, $m) ? $m[1] : '';
+            $object['_sender_utf'] = rcube_idn_to_utf8($object['_sender']);
+
+            return $object;
+        }
+
+        return null;
+    }

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

@@ -87,6 +87,8 @@
 $labels['itipsubjectaccepted'] = '"$title" has been accepted by $name';
 $labels['itipsubjecttentative'] = '"$title" has been tentatively accepted by $name';
 $labels['itipsubjectdeclined'] = '"$title" has been declined by $name';
+$labels['itipsubjectin-process'] = '"$title" is in-process by $name';
+$labels['itipsubjectcompleted'] = '"$title" was completed by $name';
 $labels['itipsubjectcancel'] = 'Your participation in "$title" has been cancelled';
 
 $labels['itipnewattendee'] = 'This is a reply from a new participant';
@@ -100,18 +102,24 @@
 $labels['youhavetentative'] = 'You have tentatively accepted this invitation';
 $labels['youhavedeclined'] = 'You have declined this invitation';
 $labels['youhavedelegated'] = 'You have delegated this invitation';
+$labels['youhavein-process'] = 'You are working on this assignment';
+$labels['youhavecompleted'] = 'You have completed this assignment';
 $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['youhavepreviouslyin-process'] = 'You have previously reported to work on this assignment';
+$labels['youhavepreviouslycompleted'] = 'You have previously completed this assignment';
 $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['attendeein-process'] = 'Participant is in-process';
+$labels['attendeecompleted'] = 'Participant has completed';
 $labels['notanattendee'] = 'You\'re not listed as an attendee of this object';
 $labels['outdatedinvitation'] = 'This invitation has been replaced by a newer version';

roundcubemail-plugins-kolab-3.2.tar.gz/plugins/libkolab/composer.json Added

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

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

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,7 +29,8 @@
     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');
+
+    public $scheduling_properties = array('start', 'end', 'location');
 
     protected $sensitivity_map = array(
         'public'       => kolabformat::ClassPublic,
@@ -126,6 +127,10 @@
             'start'       => self::php_datetime($this->obj->start()),
         );
 
+        if (method_exists($this->obj, 'comment')) {
+            $object['comment'] = $this->obj->comment();
+        }
+
         // read organizer and attendees
         if (($organizer = $this->obj->organizer()) && ($organizer->email() || $organizer->name())) {
             $object['organizer'] = array(
@@ -299,6 +304,8 @@
         $this->init();
 
         $is_new = !$this->obj->uid();
+        $old_sequence = $this->obj->sequence();
+        $reschedule = $is_new;
 
         // set common object properties
         parent::set($object);
@@ -309,13 +316,13 @@
                 $object['sequence'] = 0;
             }
             else {
-                $object['sequence'] = $this->obj->sequence();
+                $object['sequence'] = $old_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) {
+                foreach ($this->scheduling_properties as $prop) {
                     $a = $old[$prop];
                     $b = $object[$prop];
                     if ($object['allday'] && ($prop == 'start' || $prop == 'end') && $a instanceof DateTime && $b instanceof DateTime) {
@@ -331,6 +338,10 @@
         }
         $this->obj->setSequence(intval($object['sequence']));
 
+        if ($object['sequence'] > $old_sequence) {
+            $reschedule = true;
+        }
+
         $this->obj->setSummary($object['title']);
         $this->obj->setLocation($object['location']);
         $this->obj->setDescription($object['description']);
@@ -339,9 +350,13 @@
         $this->obj->setCategories(self::array2vector($object['categories']));
         $this->obj->setUrl(strval($object['url']));
 
+        if (method_exists($this->obj, 'setComment')) {
+            $this->obj->setComment($object['comment']);
+        }
+
         // process event attendees
         $attendees = new vectorattendee;
-        foreach ((array)$object['attendees'] as $attendee) {
+        foreach ((array)$object['attendees'] as $i => $attendee) {
             if ($attendee['role'] == 'ORGANIZER') {
                 $object['organizer'] = $attendee;
             }
@@ -354,7 +369,9 @@
                 $att->setPartStat($this->part_status_map[$attendee['status']]);
                 $att->setRole($this->role_map[$attendee['role']] ? $this->role_map[$attendee['role']] : kolabformat::Required);
                 $att->setCutype($this->cutype_map[$attendee['cutype']] ? $this->cutype_map[$attendee['cutype']] : kolabformat::CutypeIndividual);
-                $att->setRSVP((bool)$attendee['rsvp']);
+                $att->setRSVP((bool)$attendee['rsvp'] || $reschedule);
+
+                $object['attendees'][$i]['rsvp'] = $attendee['rsvp'] || $reschedule;
 
                 if (!empty($attendee['delegated-from'])) {
                     $vdelegators = new vectorcontactref;

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

@@ -672,8 +672,17 @@
             $name = $c_folder->name;
 
             // skip current folder and it's subfolders
-            if ($len && ($name == $current || strpos($name, $current.$delim) === 0)) {
-                continue;
+            if ($len) {
+                if ($name == $current) {
+                    // Make sure parent folder is listed (might be skipped e.g. if it's namespace root)
+                    if ($p_len && !isset($names[$parent])) {
+                        $names[$parent] = self::object_name($parent);
+                    }
+                    continue;
+                }
+                if (strpos($name, $current.$delim) === 0) {
+                    continue;
+                }
             }
 
             // always show the parent of current folder
@@ -687,11 +696,6 @@
                 }
             }
 
-            // Make sure parent folder is listed (might be skipped e.g. if it's namespace root)
-            if ($p_len && !isset($names[$parent]) && strpos($name, $parent.$delim) === 0) {
-                $names[$parent] = self::object_name($parent);
-            }
-
             $names[$name] = self::object_name($name);
         }

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

@@ -0,0 +1,508 @@
+<?php
+
+/**
+ * Kolab storage class providing access to configuration objects on a Kolab server.
+ *
+ * @version @package_version@
+ * @author Thomas Bruederli <bruederli@kolabsys.com>
+ * @author Aleksander Machniak <machniak@kolabsys.com>
+ *
+ * Copyright (C) 2012-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_storage_config
+{
+    const FOLDER_TYPE = 'configuration';
+
+
+    /**
+     * Singleton instace of kolab_storage_config
+     *
+     * @var kolab_storage_config
+     */
+    static protected $instance;
+
+    private $folders;
+    private $default;
+    private $enabled;
+
+
+    /**
+     * This implements the 'singleton' design pattern
+     *
+     * @return kolab_storage_config The one and only instance
+     */
+    static function get_instance()
+    {
+        if (!self::$instance) {
+            self::$instance = new kolab_storage_config();
+        }
+
+        return self::$instance;
+    }
+
+    /**
+     * Private constructor
+     */
+    private function __construct()
+    {
+        $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;
+        }
+    }
+
+    /**
+     * Check wether any configuration storage (folder) exists
+     *
+     * @return bool
+     */
+    public function is_enabled()
+    {
+        return $this->enabled;
+    }
+
+    /**
+     * Get configuration objects
+     *
+     * @param array $filter      Search filter
+     * @param bool  $default     Enable to get objects only from default folder
+     * @param array $data_filter Additional object data filter
+     * @param int   $limit       Max. number of records (per-folder)
+     *
+     * @return array List of objects
+     */
+    public function get_objects($filter = array(), $default = false, $data_filter = array(), $limit = 0)
+    {
+        $list = array();
+
+        foreach ($this->folders as $folder) {
+            // we only want to read from default folder
+            if ($default && !$folder->default) {
+                continue;
+            }
+
+            // for better performance it's good to assume max. number of records
+            if ($limit) {
+                $folder->set_order_and_limit(null, $limit);
+            }
+
+            foreach ($folder->select($filter) as $object) {
+                foreach ($data_filter as $key => $val) {
+                    if ($object[$key] != $val) {
+                        continue 2;
+                    }
+                }
+
+                $list[] = $object;
+            }
+        }
+
+        return $list;
+    }
+
+    /**
+     * Get configuration object
+     *
+     * @param string $uid     Object UID
+     * @param bool   $default Enable to get objects only from default folder
+     *
+     * @return array Object data
+     */
+    public function get_object($uid, $default = false)
+    {
+        foreach ($this->folders as $folder) {
+            // we only want to read from default folder
+            if ($default && !$folder->default) {
+                continue;
+            }
+
+            if ($object = $folder->get_object($uid)) {
+                return $object;
+            }
+        }
+    }
+
+    /**
+     * Create/update configuration object
+     *
+     * @param array  $object Object data
+     * @param string $type   Object type
+     *
+     * @return bool True on success, False on failure
+     */
+    public function save(&$object, $type)
+    {
+        if (!$this->enabled) {
+            return false;
+        }
+
+        $folder = $this->find_folder($object);
+
+        if ($type) {
+            $object['type'] = $type;
+        }
+
+        return $folder->save($object, self::FOLDER_TYPE . '.' . $object['type'], $object['uid']);
+    }
+
+    /**
+     * Remove configuration object
+     *
+     * @param string $uid Object UID
+     *
+     * @return bool True on success, False on failure
+     */
+    public function delete($uid)
+    {
+        if (!$this->enabled) {
+            return false;
+        }
+
+        // fetch the object to find folder
+        $list   = $this->get_object($uid);
+        $object = $list[0];
+
+        if (!$object) {
+            return false;
+        }
+
+        $folder = $this->find_folder($object);
+
+        return $folder->delete($uid);

roundcubemail-plugins-kolab-3.2.tar.gz/plugins/libkolab/package.xml Deleted

@@ -1,101 +0,0 @@
-<?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>libkolab</name>
-	<uri>http://git.kolab.org/roundcubemail-plugins-kolab/</uri>
-	<summary>Kolab core library</summary>
-	<description>Plugin to setup a basic environment for the interaction with a Kolab server.</description>
-	<lead>
-		<name>Thomas Bruederli</name>
-		<user>bruederli</user>
-		<email>bruederli@kolabsys.com</email>
-		<active>yes</active>
-	</lead>
-	<developer>
-		<name>Alensader Machniak</name>
-		<user>machniak</user>
-		<email>machniak@kolabsys.com</email>
-		<active>yes</active>
-	</developer>
-	<date>2013-04-19</date>
-	<version>
-		<release>0.9</release>
-		<api>0.9</api>
-	</version>
-	<stability>
-		<release>stable</release>
-		<api>stable</api>
-	</stability>
-	<license uri="http://www.gnu.org/licenses/agpl.html">GNU AGPLv3</license>
-	<notes>-</notes>
-	<contents>
-		<dir baseinstalldir="/" name="/">
-			<file name="libkolab.php" role="php">
-				<tasks:replace from="@package_version@" to="version" type="package-info"/>
-			</file>
-			<file name="lib/kolab_format.php" role="php">
-				<tasks:replace from="@package_version@" to="version" type="package-info"/>
-			</file>
-			<file name="lib/kolab_format_configuration.php" role="php">
-				<tasks:replace from="@package_version@" to="version" type="package-info"/>
-			</file>
-			<file name="lib/kolab_format_contact.php" role="php">
-				<tasks:replace from="@package_version@" to="version" type="package-info"/>
-			</file>
-			<file name="lib/kolab_format_distributionlist.php" role="php">
-				<tasks:replace from="@package_version@" to="version" type="package-info"/>
-			</file>
-			<file name="lib/kolab_format_event.php" role="php">
-				<tasks:replace from="@package_version@" to="version" type="package-info"/>
-			</file>
-			<file name="lib/kolab_format_file.php" role="php">
-				<tasks:replace from="@package_version@" to="version" type="package-info"/>
-			</file>
-			<file name="lib/kolab_format_journal.php" role="php">
-				<tasks:replace from="@package_version@" to="version" type="package-info"/>
-			</file>
-			<file name="lib/kolab_format_note.php" role="php">
-				<tasks:replace from="@package_version@" to="version" type="package-info"/>
-			</file>
-			<file name="lib/kolab_format_task.php" role="php">
-				<tasks:replace from="@package_version@" to="version" type="package-info"/>
-			</file>
-			<file name="lib/kolab_format_xcal.php" role="php">
-				<tasks:replace from="@package_version@" to="version" type="package-info"/>
-			</file>
-			<file name="lib/kolab_storage.php" role="php">
-				<tasks:replace from="@package_version@" to="version" type="package-info"/>
-			</file>
-			<file name="lib/kolab_storage_cache.php" role="php">
-				<tasks:replace from="@package_version@" to="version" type="package-info"/>
-			</file>
-			<file name="lib/kolab_storage_folder.php" role="php">
-				<tasks:replace from="@package_version@" to="version" type="package-info"/>
-			</file>
-			<file name="lib/kolab_date_recurrence.php" role="php">
-				<tasks:replace from="@package_version@" to="version" type="package-info"/>
-			</file>
-
-			<file name="bin/modcache.php" role="php"></file>
-
-			<file name="config.inc.php.dist" role="data"></file>
-			<file name="LICENSE" role="data"></file>
-			<file name="README" role="data"></file>
-			<file name="UPGRADING" role="data"></file>
-		</dir>
-		
-	</contents>
-	<dependencies>
-		<required>
-			<php>
-				<min>5.3.1</min>
-			</php>
-			<pearinstaller>
-				<min>1.7.0</min>
-			</pearinstaller>
-		</required>
-	</dependencies>
-	<phprelease/>
-</package>

roundcubemail-plugins-kolab-3.2.tar.gz/plugins/tasklist/composer.json Added

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

@@ -25,16 +25,17 @@
 class tasklist_kolab_driver extends tasklist_driver
 {
     // features supported by the backend
-    public $alarms = false;
+    public $alarms      = false;
     public $attachments = true;
-    public $undelete = false; // task undelete action
+    public $attendees   = true;
+    public $undelete    = false; // task undelete action
     public $alarm_types = array('DISPLAY','AUDIO');
 
     private $rc;
     private $plugin;
     private $lists;
     private $folders = array();
-    private $tasks = array();
+    private $tasks   = array();
 
 
     /**
@@ -456,7 +457,7 @@
         $tomorrow_date = new DateTime('now + 1 day', $this->plugin->timezone);
         $tomorrow = $tomorrow_date->format('Y-m-d');
 
-        $counts = array('all' => 0, 'flagged' => 0, 'today' => 0, 'tomorrow' => 0, 'overdue' => 0, 'nodate' => 0);
+        $counts = array('all' => 0, 'flagged' => 0, 'today' => 0, 'tomorrow' => 0, 'overdue' => 0, 'nodate' => 0, 'mytasks' => 0);
         foreach ($lists as $list_id) {
             if (!$folder = $this->get_folder($list_id)) {
                 continue;
@@ -478,6 +479,8 @@
                     $counts['tomorrow']++;
                 else if ($rec['date'] < $today)
                     $counts['overdue']++;
+                if ($this->plugin->is_attendee($rec) !== false)
+                    $counts['mytasks']++;
             }
         }
 
@@ -772,6 +775,9 @@
             'status' => $record['status'],
             'parent_id' => $record['parent_id'],
             'recurrence' => $record['recurrence'],
+            'attendees' => $record['attendees'],
+            'organizer' => $record['organizer'],
+            'sequence' => $record['sequence'],
         );
 
         // convert from DateTime to internal date format
@@ -815,8 +821,8 @@
     }
 
     /**
-    * Convert the given task record into a data structure that can be passed to kolab_storage backend for saving
-    * (opposite of self::_to_rcube_event())
+     * Convert the given task record into a data structure that can be passed to kolab_storage backend for saving
+     * (opposite of self::_to_rcube_event())
      */
     private function _from_rcube_task($task, $old = array())
     {
@@ -824,14 +830,14 @@
         $object['categories'] = (array)$task['tags'];
 
         if (!empty($task['date'])) {
-            $object['due'] = new DateTime($task['date'].' '.$task['time'], $this->plugin->timezone);
+            $object['due'] = rcube_utils::anytodatetime($task['date'].' '.$task['time'], $this->plugin->timezone);
             if (empty($task['time']))
                 $object['due']->_dateonly = true;
             unset($object['date']);
         }
 
         if (!empty($task['startdate'])) {
-            $object['start'] = new DateTime($task['startdate'].' '.$task['starttime'], $this->plugin->timezone);
+            $object['start'] = rcube_utils::anytodatetime($task['startdate'].' '.$task['starttime'], $this->plugin->timezone);
             if (empty($task['starttime']))
                 $object['start']->_dateonly = true;
             unset($object['startdate']);
@@ -875,7 +881,7 @@
             foreach ($task['attachments'] as $idx => $attachment) {
                 $key = null;
                 // Roundcube ID has nothing to do with the storage ID, remove it
-                if ($attachment['content']) {
+                if ($attachment['content'] || $attachment['path']) {
                     unset($attachment['id']);
                 }
                 else {
@@ -898,6 +904,14 @@
             unset($object['attachments']);
         }
 
+        // allow sequence increments if I'm the organizer
+        if ($this->plugin->is_organizer($object)) {
+            unset($object['sequence']);
+        }
+        else if (isset($old['sequence'])) {
+            $object['sequence'] = $old['sequence'];
+        }
+
         unset($object['tempid'], $object['raw'], $object['list'], $object['flagged'], $object['tags']);
         return $object;
     }

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

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

@@ -33,6 +33,7 @@
 $labels['status-in-process'] = 'In process';
 $labels['status-completed'] = 'Completed';
 $labels['status-cancelled'] = 'Cancelled';
+$labels['assignedto'] = 'Assigned to';
 
 $labels['all'] = 'All';
 $labels['flagged'] = 'Flagged';
@@ -42,6 +43,10 @@
 $labels['tomorrow'] = 'Tomorrow';
 $labels['next7days'] = 'Next 7 days';
 $labels['later'] = 'Later';
+$labels['assigned'] = 'Assigned';
+$labels['assignedtitle'] = 'Tasks you assigned to others';
+$labels['mytasks'] = 'My tasks';
+$labels['mytaskstitle'] = 'Tasks assigned to you';
 $labels['nodate'] = 'no date';
 $labels['removetag'] = 'Remove';
 
@@ -50,6 +55,7 @@
 $labels['edittask'] = 'Edit Task';
 $labels['save'] = 'Save';
 $labels['cancel'] = 'Cancel';
+$labels['saveandnotify'] = 'Save and Notify';
 $labels['addsubtask'] = 'Add subtask';
 $labels['deletetask'] = 'Delete task';
 $labels['deletethisonly'] = 'Delete this task only';
@@ -58,6 +64,7 @@
 
 $labels['tabsummary'] = 'Summary';
 $labels['tabrecurrence'] = 'Recurrence';
+$labels['tabassignments'] = 'Assignments';
 $labels['tabattachments'] = 'Attachments';
 $labels['tabsharing'] = 'Sharing';
 
@@ -76,7 +83,7 @@
 $labels['this'] = 'this';
 $labels['next'] = 'next';
 
-// mesages
+// messages
 $labels['savingdata'] = 'Saving data...';
 $labels['errorsaving'] = 'Failed to save data.';
 $labels['notasksfound'] = 'No tasks found for the given criteria';
@@ -86,6 +93,9 @@
 $labels['deletelistconfirm'] = 'Do you really want to delete this list with all its tasks?';
 $labels['deletelistconfirmrecursive'] = 'Do you really want to delete this list with all its sub-lists and tasks?';
 $labels['aclnorights'] = 'You do not have administrator rights on this task list.';
+$labels['changetaskconfirm'] = 'Update task';
+$labels['changeconfirmnotifications'] = 'Do you want to notify the attendees about the modification?';
+$labels['partstatupdatenotification'] = 'Do you want to notify the organizer about the status change?';
 
 // (hidden) titles and labels for accessibility annotations
 $labels['quickaddinput'] = 'New task date and title';
@@ -96,3 +106,69 @@
 $labels['arialabeltaskselector'] = 'List mode';
 $labels['arialabeltasklisting'] = 'Tasks listing';
 
+// attendees
+$labels['attendee'] = 'Assignee';
+$labels['role'] = 'Role';
+$labels['availability'] = 'Avail.';
+$labels['confirmstate'] = 'Status';
+$labels['addattendee'] = 'Add assignee';
+$labels['roleorganizer'] = 'Organizer';
+$labels['rolerequired'] = 'Required';
+$labels['roleoptional'] = 'Optional';
+$labels['rolechair'] = 'Chair';
+$labels['rolenonparticipant'] = 'Observer';
+$labels['sendinvitations'] = 'Send invitations';
+$labels['sendnotifications'] = 'Notify assignees about modifications';
+$labels['sendcancellation'] = 'Notify assignees about task cancellation';
+$labels['invitationsubject'] = 'You\'ve been assigned to "$title"';
+$labels['invitationmailbody'] = "*\$title*\n\nDue: \$date\n\nAssignees: \$attendees\n\nPlease find attached an iCalendar file with all the task details which you can import to your tasks application.";
+$labels['itipupdatesubject'] = '"$title" has been updated';
+$labels['itipupdatesubjectempty'] = 'A task that concerns you has been updated';
+$labels['itipupdatemailbody'] = "*\$title*\n\nDue: \$date\n\nAssignees: \$attendees\n\nPlease find attached an iCalendar file with the updated task details which you can import to your tasks application.";
+$labels['itipcancelsubject'] = '"$title" has been canceled';
+$labels['itipcancelmailbody'] = "*\$title*\n\nDue: \$date\n\nAssignees: \$attendees\n\nThe task has been cancelled by \$organizer.\n\nPlease find attached an iCalendar file with the updated task details.";
+$labels['saveintasklist'] = 'save in ';
+
+// invitation handling (overrides labels from libcalendaring)
+$labels['itipobjectnotfound'] = 'The task referred by this message was not found in your tasks list.';
+
+$labels['itipmailbodyaccepted'] = "\$sender has accepted the assignment to the following task:\n\n*\$title*\n\nDue: \$date\n\nAssignees: \$attendees";
+$labels['itipmailbodytentative'] = "\$sender has tentatively accepted the assignment to the following task:\n\n*\$title*\n\nDue: \$date\n\nAssignees: \$attendees";
+$labels['itipmailbodydeclined'] = "\$sender has declined the assignment to the following task:\n\n*\$title*\n\nDue: \$date\n\nAssignees: \$attendees";
+$labels['itipmailbodycancel'] = "\$sender has rejected your assignment to the following task:\n\n*\$title*\n\nDue: \$date";
+$labels['itipmailbodyin-process'] = "\$sender has set the status of the following task to in-process:\n\n*\$title*\n\nDue: \$date";
+$labels['itipmailbodycompleted'] = "\$sender has completed the following task:\n\n*\$title*\n\nDue: \$date";
+
+$labels['attendeeaccepted'] = 'Assignee has accepted';
+$labels['attendeetentative'] = 'Assignee has tentatively accepted';
+$labels['attendeedeclined'] = 'Assignee has declined';
+$labels['attendeedelegated'] = 'Assignee has delegated to $delegatedto';
+$labels['attendeein-process'] = 'Assignee is in-process';
+$labels['attendeecompleted'] = 'Assignee has completed';
+
+$labels['acceptinvitation'] = 'Do you accept this assignment?';
+$labels['itipdeclinetask'] = 'Decline your assignment to this task to the organizer';
+$labels['declinedeleteconfirm'] = 'Do you also want to delete this declined task from your tasks list?';
+$labels['itipcomment'] = 'Invitation/notification comment';
+$labels['itipcommenttitle'] = 'This comment will be attached to the invitation/notification message sent to assignees';
+$labels['itipsendsuccess'] = 'Invitation sent to assignees';
+$labels['errornotifying'] = 'Failed to send notifications to task assignees';
+$labels['removefromcalendar'] = 'Remove from my tasks';
+
+$labels['andnmore'] = '$nr more...';
+$labels['delegatedto'] = 'Delegated to: ';
+$labels['delegatedfrom'] = 'Delegated from: ';
+$labels['savetotasklist'] = 'Save to tasks';
+$labels['comment'] = 'Comment';
+$labels['errorimportingtask'] = 'Failed to import task(s)';
+$labels['importwarningexists'] = 'A copy of this task already exists in your tasklist.';
+$labels['importsuccess'] = 'Successfully imported $nr tasks';
+$labels['newerversionexists'] = 'A newer version of this task already exists! Aborted.';
+$labels['nowritetasklistfound'] = 'No tasklist found to save the task';
+$labels['importedsuccessfully'] = 'The task was successfully added to \'$list\'';
+$labels['updatedsuccessfully'] = 'The task was successfully updated in \'$list\'';
+$labels['attendeupdateesuccess'] = 'Successfully updated the participant\'s status';
+$labels['itipresponseerror'] = 'Failed to send the response to this task assignment';
+$labels['itipinvalidrequest'] = 'This invitation is no longer valid';
+$labels['sentresponseto'] = 'Successfully sent assignment response to $mailto';
+$labels['successremoval'] = 'The task has been deleted successfully.';

roundcubemail-plugins-kolab-3.2.tar.gz/plugins/tasklist/package.xml Deleted

@@ -1,92 +0,0 @@
-<?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>tasklist</name>
-    <uri>http://git.kolab.org/roundcubemail-plugins-kolab/</uri>
-	<summary>Task management plugin</summary>
-	<description>-</description>
-	<lead>
-		<name>Thomas Bruederli</name>
-		<user>bruederli</user>
-		<email>bruederli@kolabsys.com</email>
-		<active>yes</active>
-	</lead>
-	<date>2012-11-21</date>
-	<version>
-		<release>0.9-beta</release>
-		<api>0.9-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="tasklist.php" role="php">
-				<tasks:replace from="@package_version@" to="version" type="package-info"/>
-			</file>
-			<file name="tasklist_ui.php" role="php">
-				<tasks:replace from="@package_version@" to="version" type="package-info"/>
-			</file>
-			<file name="tasklist_base.js" role="data">
-				<tasks:replace from="@package_version@" to="version" type="package-info"/>
-			</file>
-			<file name="tasklist.js" role="data">
-				<tasks:replace from="@package_version@" to="version" type="package-info"/>
-			</file>
-			<file name="jquery.tagedit.js" role="data">
-				<tasks:replace from="@package_version@" to="version" type="package-info"/>
-			</file>
-			<file name="drivers/tasklist_driver.php" role="php">
-				<tasks:replace from="@package_version@" to="version" type="package-info"/>
-			</file>
-			<file name="drivers/kolab/tasklist_kolab_driver.php" role="php">
-				<tasks:replace from="@package_version@" to="version" type="package-info"/>
-			</file>
-			<file name="drivers/database/tasklist_database_driver.php" role="php">
-				<tasks:replace from="@package_version@" to="version" type="package-info"/>
-			</file>
-			<file name="drivers/database/SQL/mysql.sql" role="data">
-				<tasks:replace from="@package_version@" to="version" type="package-info"/>
-			</file>
-
-			<file name="config.inc.php.dist" role="data"></file>
-			<file name="LICENSE" role="data"></file>
-
-			<file name="localization/de_CH.inc" role="data"></file>
-			<file name="localization/en_US.inc" role="data"></file>
-			
-			<file name="skins/larry/tasklist.css" role="data"></file>
-			<file name="skins/larry/iehacks.css" role="data"></file>
-			<file name="skins/larry/buttons.png" role="data"></file>
-			<file name="skins/larry/sprites.png" role="data"></file>
-			<file name="skins/larry/templates/mainview.html" role="data"></file>
-			<file name="skins/larry/templates/taskedit.html" role="data"></file>
-			<file name="skins/larry/templates/attachment.html" 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>
-			<package>
-				<name>libcalendaring</name>
-				<uri>http://git.kolab.org/roundcubemail-plugins-kolab/tree/plugins/libcalendaring</uri>
-			</package>
-		</required>
-	</dependencies>
-	<phprelease/>
-</package>

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

roundcubemail-plugins-kolab-3.2.tar.gz/plugins/tasklist/skins/larry/images/attendee-status.png Added

roundcubemail-plugins-kolab-3.2.tar.gz/plugins/tasklist/skins/larry/images/badge_cancelled.png Added

roundcubemail-plugins-kolab-3.2.tar.gz/plugins/tasklist/skins/larry/images/loading_blue.gif Added

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

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

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

@@ -20,21 +20,18 @@
 	background-position: 0 -26px;
 }
 
-ul.toolbarmenu li span.icon.taskadd {
+ul.toolbarmenu li span.icon.taskadd,
+#attachmentmenu li a.tasklistlink span.icon.taskadd {
 	background-image: url(buttons.png);
 	background-position: -4px -90px;
 }
 
-div.uidialog {
+.tasklistview div.uidialog {
 	display: none;
 }
 
-body.attachmentwin #mainscreen {
-	top: 60px;
-}
-
-body.attachmentwin #topnav .topright {
-	margin-top: 20px;
+body.tasklist.attachmentwin #mainscreen {
+	top: 32px;
 }
 
 .tasklistview #mainscreen {
@@ -814,6 +811,10 @@
 	color: #999;
 }
 
+#taskshow.status-cancelled {
+	background: url(images/badge_cancelled.png) top right no-repeat;
+}
+
 #task-parent-title {
 	position: relative;
 	top: -0.6em;
@@ -849,6 +850,93 @@
 	border-bottom: 2px solid #fafafa;
 }
 
+.edit-attendees-table {
+	width: 100%;
+	margin-top: 0.5em;
+}
+
+.edit-attendees-table tbody td {
+	padding: 4px 7px;
+}
+
+.edit-attendees-table tbody tr:last-child td {
+	border-bottom: 0;
+}
+
+.edit-attendees-table th.role,
+.edit-attendees-table td.role {
+	width: 9em;
+}
+
+.edit-attendees-table th.availability,
+.edit-attendees-table td.availability,
+.edit-attendees-table th.confirmstate,
+.edit-attendees-table td.confirmstate {
+	width: 6em;
+}
+
+.edit-attendees-table th.options,
+.edit-attendees-table td.options {
+	width: 24px;
+	padding: 2px 4px;
+	text-align: right;
+}
+
+.edit-attendees-table th.sendmail,
+.edit-attendees-table td.sendmail {
+	width: 48px;
+	padding: 2px;
+}
+
+.edit-attendees-table th.sendmail label {
+	display: inline-block;
+	position: relative;
+	top: 4px;
+	width: 24px;
+	height: 18px;
+	min-width: 24px;
+	padding: 0;
+	overflow: hidden;
+	text-indent: -5000px;
+	white-space: nowrap;
+	background: url(images/sendinvitation.png) 1px 0 no-repeat;
+}
+
+.edit-attendees-table th.name,
+.edit-attendees-table td.name {
+	width: auto;
+	white-space: nowrap;
+	overflow: hidden;
+	text-overflow: ellipsis;
+}
+
+.edit-attendees-table td.name select {
+	width: 100%;
+}
+
+.edit-attendees-table a.deletelink {
+	display: inline-block;
+	width: 17px;
+	height: 17px;
+	padding: 0;
+	overflow: hidden;
+	text-indent: 1000px;
+}
+
+#edit-attendees-form {
+	position: relative;
+	margin-top: 15px;
+}
+
+#edit-attendees-form .attendees-invitebox {
+	text-align: right;
+	margin: 0;
+}
+
+#edit-attendees-form .attendees-invitebox label {
+	padding-right: 3px;
+}
+
 #taskedit-attachments {
 	margin: 0.6em 0;
 }
@@ -857,10 +945,11 @@
 	display: block;
 	color: #333;
 	font-weight: bold;
-	padding: 8px 4px 3px 30px;
+	padding: 3px 4px 3px 30px;
 	text-shadow: 0px 1px 1px #fff;
 	text-decoration: none;
 	white-space: nowrap;
+	line-height: 20px;
 }
 
 #taskedit-attachments ul li a.file {
@@ -876,7 +965,7 @@
 div.form-section {
 	position: relative;
 	margin-top: 0.2em;
-	margin-bottom: 0.8em;
+	margin-bottom: 0.5em;
 }
 
 .form-section label {
@@ -891,6 +980,10 @@
 	margin-bottom: 0.3em;
 }
 
+#task-description {
+	margin-bottom: 1em;
+}
+
 #taskedit-completeness-slider {
 	display: inline-block;
 	margin-left: 2em;
@@ -935,6 +1028,57 @@
 	outline: none;
 }
 
+.task-attendees span.attendee {
+	padding-right: 18px;
+	margin-right: 0.5em;
+	background: url(images/attendee-status.png) right 0 no-repeat;
+}
+
+.task-attendees span.attendee a.mailtolink {
+	text-decoration: none;
+	white-space: nowrap;
+	outline: none;
+}
+
+.task-attendees span.attendee a.mailtolink:hover {
+	text-decoration: underline;
+}
+
+.task-attendees span.completed {
+	background-position: right -20px;
+}
+
+.task-attendees span.declined {
+	background-position: right -40px;
+}
+
+.task-attendees span.tentative {
+	background-position: right -60px;
+}
+
+.task-attendees span.delegated {
+	background-position: right -180px;
+}

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

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

@@ -84,9 +84,15 @@
 				<li class="flagged" role="radio" aria-checked="false" aria-labelledby="aria-radio-flagged"><a href="#flagged" id="aria-radio-flagged"><roundcube:label name="tasklist.flagged" /><span class="count"></span></a></li>
 				<li class="today" role="radio" aria-checked="false" aria-labelledby="aria-radio-today"><a href="#today" id="aria-radio-today"><roundcube:label name="tasklist.today" /><span class="count"></span></a></li>
 				<li class="tomorrow" role="radio" aria-checked="false" aria-labelledby="aria-radio-tomorrow"><a href="#tomorrow" id="aria-radio-tomorrow"><roundcube:label name="tasklist.tomorrow" /><span class="count"></span></a></li>
+				<roundcube:if condition="env:tasklist_driver != 'kolab'" />
 				<li class="week" role="radio" aria-checked="false" aria-labelledby="aria-radio-week"><a href="#week" id="aria-radio-week"><roundcube:label name="tasklist.next7days" /></a></li>
+				<roundcube:endif />
 				<li class="later" role="radio" aria-checked="false" aria-labelledby="aria-radio-later"><a href="#later" id="aria-radio-later"><roundcube:label name="tasklist.later" /></a></li>
 				<li class="nodate" role="radio" aria-checked="false" aria-labelledby="aria-radio-nodate"><a href="#nodate" id="aria-radio-nodate"><roundcube:label name="tasklist.nodate" ucfirst="true" /></a></li>
+				<roundcube:if condition="env:tasklist_driver == 'kolab'" />
+				<li class="mytasks" role="radio" aria-checked="false" aria-labelledby="aria-radio-mytasks"><a href="#mytasks" id="aria-radio-mytasks" title="<roundcube:label name='tasklist.mytaskstitle'/>"><roundcube:label name="tasklist.mytasks" /><span class="count"></span></a></li>
+				<li class="assigned" role="radio" aria-checked="false" aria-labelledby="aria-radio-assigned"><a href="#assigned" id="aria-radio-assigned" title="<roundcube:label name='tasklist.assignedtitle'/>"><roundcube:label name="tasklist.assigned" /></a></li>
+				<roundcube:endif />
 				<li class="complete" role="radio" aria-checked="false" aria-labelledby="aria-radio-complete"><a href="#complete" id="aria-radio-complete"><roundcube:label name="tasklist.complete" /><span class="count"></span></a></li>
 			</ul>
 
@@ -156,6 +162,23 @@
 		<label><roundcube:label name="tasklist.alarms" /></label>
 		<span class="task-text"></span>
 	</div>
+	<div id="task-attendees" class="form-section task-attendees">
+		<label><roundcube:label name="tasklist.assignedto" /></label>
+		<span class="task-text"></span>
+	</div>
+	<div id="task-organizer" class="form-section task-attendees">
+		<label><roundcube:label name="tasklist.roleorganizer" /></label>
+		<span class="task-text"></span>
+	</div>
+
 	<div id="task-list" class="form-section">
 		<label><roundcube:label name="tasklist.list" /></label>
 		<span class="task-text"></span>
@@ -172,6 +195,18 @@
 		<label><roundcube:label name="attachments" /></label>
 		<div class="task-text"></div>
 	</div>
+	<div id="task-created-changed" class="form-section">
+		<label><roundcube:label name="tasklist.created" /></label>
+		<span class="task-text task-created"></span>
+		<label><roundcube:label name="tasklist.changed" /></label>
+		<span class="task-text task-changed"></span>
+	</div>
+	<div id="task-rsvp-comment" class="form-section">
+		<label><roundcube:label name="tasklist.rsvpcomment" /></label>
+		<span class="task-text"></span>
+	</div>
+
+	<roundcube:object name="plugin.task_rsvp_buttons" id="task-rsvp" class="task-dialog-message" style="display:none" />
 </div>
 
 <roundcube:include file="/templates/taskedit.html" />

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

@@ -1,7 +1,7 @@
 <div id="taskedit" class="uidialog uidialog-tabbed">
 	<form id="taskeditform" action="#" method="post" enctype="multipart/form-data">
 		<ul>
-			<li><a href="#taskedit-panel-main"><roundcube:label name="tasklist.tabsummary" /></a></li><li><a href="#taskedit-panel-recurrence"><roundcube:label name="tasklist.tabrecurrence" /></a></li><li id="taskedit-tab-attachments"><a href="#taskedit-panel-attachments"><roundcube:label name="tasklist.tabattachments" /></a></li>
+			<li><a href="#taskedit-panel-main"><roundcube:label name="tasklist.tabsummary" /></a></li><li><a href="#taskedit-panel-recurrence"><roundcube:label name="tasklist.tabrecurrence" /></a></li><li id="edit-tab-attendees"><a href="#taskedit-panel-attendees"><roundcube:label name="tasklist.tabassignments" /></a></li><li id="taskedit-tab-attachments"><a href="#taskedit-panel-attachments"><roundcube:label name="tasklist.tabattachments" /></a></li>
 		</ul>
 		
 		<div id="taskedit-panel-main">
@@ -79,6 +79,17 @@
 				<roundcube:object name="plugin.recurrence_form" part="rdate" class="form-section" />
 			</div>
 		</div>
+		
+		<div id="taskedit-panel-attendees">
+			<div class="form-section" id="taskedit-organizer">
+				<label for="edit-identities-list"><roundcube:label name="tasklist.roleorganizer" /></label>
+				<roundcube:object name="plugin.identity_select" id="edit-identities-list" />
+			</div>
+			<h3 id="aria-label-attendeestable" class="voice"><roundcube:label name="tasklist.arialabeleventassignments" /></h3>
+			<roundcube:object name="plugin.attendees_list" id="edit-attendees-table" class="records-table edit-attendees-table" coltitle="attendee" aria-labelledby="aria-label-attendeestable" />
+			<roundcube:object name="plugin.attendees_form" id="edit-attendees-form" />
+			<roundcube:include file="/templates/freebusylegend.html" />
+		</div>
 		
 		<div id="taskedit-panel-attachments">
 			<div id="taskedit-attachments">
@@ -88,7 +99,8 @@
 				<h3 id="aria-label-attachmentuploadform" class="voice"><roundcube:label name="arialabelattachmentuploadform" /></h3>
 				<roundcube:object name="plugin.attachments_form" id="taskedit-attachment-form" attachmentFieldSize="30" />
 			</div>
-			<roundcube:object name="plugin.filedroparea" id="taskedit-tab-2" />
+			<roundcube:object name="plugin.filedroparea" id="taskedit-panel-attachments" />
 		</div>
 	</form>
+	<roundcube:object name="plugin.edit_attendees_notify" id="edit-attendees-notify" class="task-dialog-message" style="display:none" />
 </div>

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

@@ -40,6 +40,8 @@
     var FILTER_MASK_OVERDUE = 32;
     var FILTER_MASK_FLAGGED = 64;
     var FILTER_MASK_COMPLETE = 128;
+    var FILTER_MASK_ASSIGNED = 256;
+    var FILTER_MASK_MYTASKS = 512;
 
     var filter_masks = {
         all:      FILTER_MASK_ALL,
@@ -50,11 +52,12 @@
         nodate:   FILTER_MASK_NODATE,
         overdue:  FILTER_MASK_OVERDUE,
         flagged:  FILTER_MASK_FLAGGED,
-        complete: FILTER_MASK_COMPLETE
+        complete: FILTER_MASK_COMPLETE,
+        assigned: FILTER_MASK_ASSIGNED,
+        mytasks:  FILTER_MASK_MYTASKS
     };
 
     /*  private vars  */
-    var selector = 'all';
     var tagsfilter = [];
     var filtermask = FILTER_MASK_ALL;
     var loadstate = { filter:-1, lists:'', search:null };
@@ -82,6 +85,8 @@
     var tasklists_widget;
     var focused_task;
     var focused_subclass;
+    var task_attendees = [];
+    var attendees_list;
     var me = this;
 
     // general datepicker settings
@@ -192,6 +197,11 @@
                 if (!this.checked && focusview == id) {
                     set_focusview(null);
                 }
+
+                // adjust checked state of original list item
+                if (tasklists_widget.is_search()) {
+                  tasklists_widget.container.find('input[value="'+id+'"]').prop('checked', this.checked);
+                }
             }
             e.stopPropagation();
         })
@@ -207,6 +217,10 @@
         // handler for clicks on quickview buttons
         tasklists_widget.container.on('click', '.quickview', function(e){
             var id = $(this).closest('li').attr('id').replace(/^rcmlitasklist/, '');
+
+            if (tasklists_widget.is_search())
+              id = id.replace(/--xsR$/, '');
+
             set_focusview(focusview == id ? null : id);
             e.stopPropagation();
             return false;
@@ -215,6 +229,10 @@
         // register dbl-click handler to open calendar edit dialog
         tasklists_widget.container.on('dblclick', ':not(.virtual) > .tasklist', function(e){
             var id = $(this).closest('li').attr('id').replace(/^rcmlitasklist/, '');
+
+            if (tasklists_widget.is_search())
+              id = id.replace(/--xsR$/, '');
+
             list_edit_dialog(id);
         });
 
@@ -243,9 +261,21 @@
         list_tasks();
 
         // register event handlers for UI elements
-        $('#taskselector a').click(function(e){
-            if (!$(this).parent().hasClass('inactive'))
-                list_tasks(this.href.replace(/^.*#/, ''));
+        $('#taskselector a').click(function(e) {
+            if (!$(this).parent().hasClass('inactive')) {
+                var selector = this.href.replace(/^.*#/, ''),
+                    mask = filter_masks[selector],
+                    shift = e.shiftKey || e.ctrlKey || e.metaKey;
+
+                if (!shift)
+                    filtermask = mask;  // reset selection on regular clicks
+                else if (filtermask & mask)
+                    filtermask -= mask;
+                else
+                    filtermask |= mask;
+
+                list_tasks();
+            }
             return false;
         });
 
@@ -351,9 +381,8 @@
                     if (rcmail.busy)
                         return false;
 
-                    rec.status = e.target.checked ? 'COMPLETED' : (rec.complete == 1 ? 'NEEDS-ACTION' : '');
-                    li.toggleClass('complete');
-                    save_task(rec, 'edit');
+                    save_task_confirm(rec, 'edit', { _status_before:rec.status + '', status:e.target.checked ? 'COMPLETED' : (rec.complete > 0 ? 'IN-PROCESS' : 'NEEDS-ACTION') });
+                    item.toggleClass('complete');
                     return true;
 
                 case 'flagged':
@@ -361,7 +390,7 @@
                         return false;
 
                     rec.flagged = rec.flagged ? 0 : 1;
-                    li.toggleClass('flagged').find('.flagged:first').attr('aria-checked', (rec.flagged ? 'true' : 'false'));
+                    item.toggleClass('flagged').find('.flagged:first').attr('aria-checked', (rec.flagged ? 'true' : 'false'));
                     save_task(rec, 'edit');
                     break;
 
@@ -375,8 +404,7 @@
                     input.datepicker($.extend({
                         onClose: function(dateText, inst) {
                             if (dateText != (rec.date || '')) {
-                                rec.date = dateText;
-                                save_task(rec, 'edit');
+                                save_task_confirm(rec, 'edit', { date:dateText });
                             }
                             input.datepicker('destroy').remove();
                             link.html(dateText || rcmail.gettext('nodate','tasklist'));
@@ -487,6 +515,35 @@
             }
         });
 
+        // init RSVP widget
+        $('#task-rsvp input.button').click(function(e) {
+            var response = $(this).attr('rel');
+
+            if (me.selected_task && me.selected_task.attendees && response) {
+                // update attendee status
+                for (var data, i=0; i < me.selected_task.attendees.length; i++) {
+                    data = me.selected_task.attendees[i];
+                    if (settings.identity.emails.indexOf(';'+String(data.email).toLowerCase()) >= 0) {
+                        data.status = response.toUpperCase();
+                        delete data.rsvp;  // unset RSVP flag
+                    }
+                }
+
+                // submit status change to server
+                saving_lock = rcmail.set_busy(true, 'tasklist.savingdata');
+                rcmail.http_post('tasks/task', {
+                    action: 'rsvp',
+                    t: me.selected_task,
+                    filter: filtermask,
+                    status: response,
+                    noreply: $('#noreply-task-rsvp').prop('checked') ? 1 : 0,
+                    comment: $('#reply-comment-task-rsvp').val()
+                });
+
+                task_show_dialog(me.selected_task.id);
+            }
+        });
+
         // handle global document clicks: close popup menus
         $(document.body).click(clear_popups);
 
@@ -541,6 +598,47 @@
             if (sel) $(sel).val('');
             return false;
         });
+
+      // init attendees autocompletion
+      var ac_props;
+      // parallel autocompletion
+      if (rcmail.env.autocomplete_threads > 0) {
+        ac_props = {
+          threads: rcmail.env.autocomplete_threads,
+          sources: rcmail.env.autocomplete_sources
+        };
+      }
+      rcmail.init_address_input_events($('#edit-attendee-name'), ac_props);
+      rcmail.addEventListener('autocomplete_insert', function(e){
+        if (e.field.name == 'participant') {
+          $('#edit-attendee-add').click();
+        }
+//        else if (e.field.name == 'resource' && e.data && e.data.email) {
+//          add_attendee($.extend(e.data, { role:'REQ-PARTICIPANT', status:'NEEDS-ACTION', cutype:'RESOURCE' }));
+//          e.field.value = '';
+//        }
+      });
+
+      $('#edit-attendee-add').click(function(){
+        var input = $('#edit-attendee-name');
+        rcmail.ksearch_blur();
+        if (add_attendees(input.val(), { role:'REQ-PARTICIPANT', status:'NEEDS-ACTION', cutype:'INDIVIDUAL' })) {
+          input.val('');
+        }
+      });
+
+      // handle change of "send invitations" checkbox
+      $('#edit-attendees-invite').change(function() {
+        $('#edit-attendees-donotify,input.edit-attendee-reply').prop('checked', this.checked);
+        // hide/show comment field
+        $('.attendees-commentbox')[this.checked ? 'show' : 'hide']();
+      });
+
+      // delegate change task to "send invitations" checkbox

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

@@ -32,6 +32,8 @@
     const FILTER_MASK_OVERDUE = 32;
     const FILTER_MASK_FLAGGED = 64;
     const FILTER_MASK_COMPLETE = 128;
+    const FILTER_MASK_ASSIGNED = 256;
+    const FILTER_MASK_MYTASKS = 512;
 
     const SESSION_KEY = 'tasklist_temp';
 
@@ -44,6 +46,8 @@
         'overdue'  => self::FILTER_MASK_OVERDUE,
         'flagged'  => self::FILTER_MASK_FLAGGED,
         'complete' => self::FILTER_MASK_COMPLETE,
+        'assigned' => self::FILTER_MASK_ASSIGNED,
+        'mytasks'  => self::FILTER_MASK_MYTASKS,
     );
 
     public $task = '?(?!login|logout).*';
@@ -55,6 +59,8 @@
     public $home;  // declare public to be used in other classes
 
     private $collapsed_tasks = array();
+    private $itip;
+    private $ical;
 
 
     /**
@@ -64,7 +70,7 @@
     {
         $this->require_plugin('libcalendaring');
 
-        $this->rc = rcube::get_instance();
+        $this->rc  = rcube::get_instance();
         $this->lib = libcalendaring::get_instance();
 
         $this->register_task('tasks', 'tasklist');
@@ -106,15 +112,18 @@
             $this->register_action('mail2task', array($this, 'mail_message2task'));
             $this->register_action('get-attachment', array($this, 'attachment_get'));
             $this->register_action('upload', array($this, 'attachment_upload'));
+            $this->register_action('mailimportitip', array($this, 'mail_import_itip'));
+            $this->register_action('mailimportattach', array($this, 'mail_import_attachment'));
+            $this->register_action('itip-status', array($this, 'task_itip_status'));
+            $this->register_action('itip-remove', array($this, 'task_itip_remove'));
+            $this->register_action('itip-decline-reply', array($this, 'mail_itip_decline_reply'));
             $this->add_hook('refresh', array($this, 'refresh'));
 
             $this->collapsed_tasks = array_filter(explode(',', $this->rc->config->get('tasklist_collapsed_tasks', '')));
         }
         else if ($args['task'] == 'mail') {
-            // TODO: register hooks to catch ical/vtodo email attachments
             if ($args['action'] == 'show' || $args['action'] == 'preview') {
-                // $this->add_hook('message_load', array($this, 'mail_message_load'));
-                // $this->add_hook('template_object_messagebody', array($this, 'mail_messagebody_html'));
+                $this->add_hook('template_object_messagebody', array($this, 'mail_messagebody_html'));
             }
 
             // add 'Create event' item to message menu
@@ -188,7 +197,7 @@
     {
         $filter = intval(get_input_value('filter', RCUBE_INPUT_GPC));
         $action = get_input_value('action', RCUBE_INPUT_GPC);
-        $rec  = get_input_value('t', RCUBE_INPUT_POST, true);
+        $rec    = get_input_value('t', RCUBE_INPUT_POST, true);
         $oldrec = $rec;
         $success = $refresh = false;
 
@@ -312,14 +321,67 @@
 
             $this->rc->user->save_prefs(array('tasklist_collapsed_tasks' => join(',', array_unique($this->collapsed_tasks))));
             return;  // avoid further actions
+
+        case 'rsvp':
+            $status = get_input_value('status', RCUBE_INPUT_GPC);
+            $task = $this->driver->get_task($rec);
+            $task['attendees'] = $rec['attendees'];
+            $rec = $task;
+
+            if ($success = $this->driver->edit_task($rec)) {
+                $noreply = intval(get_input_value('noreply', RCUBE_INPUT_GPC)) || $status == 'needs-action';
+
+                if (!$noreply) {
+                    // let the reply clause further down send the iTip message
+                    $rec['_reportpartstat'] = $status;
+                }
+            }
+            break;
         }
 
         if ($success) {
             $this->rc->output->show_message('successfullysaved', 'confirmation');
             $this->update_counts($oldrec, $refresh);
         }
-        else
+        else {
             $this->rc->output->show_message('tasklist.errorsaving', 'error');
+        }
+
+        // send out notifications
+        if ($success && $rec['_notify'] && ($rec['attendees'] || $oldrec['attendees'])) {
+            // make sure we have the complete record
+            $task = $action == 'delete' ? $oldrec : $this->driver->get_task($rec);
+
+            // only notify if data really changed (TODO: do diff check on client already)
+            if (!$oldrec || $action == 'delete' || self::task_diff($task, $oldrec)) {
+                $sent = $this->notify_attendees($task, $oldrec, $action, $rec['_comment']);
+                if ($sent > 0)
+                    $this->rc->output->show_message('tasklist.itipsendsuccess', 'confirmation');
+                else if ($sent < 0)
+                    $this->rc->output->show_message('tasklist.errornotifying', 'error');
+            }
+        }
+        else if ($success && $rec['_reportpartstat'] && $rec['_reportpartstat'] != 'NEEDS-ACTION') {
+            // get the full record after update
+            $task = $this->driver->get_task($rec);
+
+            // send iTip REPLY with the updated partstat
+            if ($task['organizer'] && ($idx = $this->is_attendee($task)) !== false) {
+                $sender = $task['attendees'][$idx];
+                $status = strtolower($sender['status']);
+
+                if (!empty($_POST['comment']))
+                    $task['comment'] = get_input_value('comment', RCUBE_INPUT_POST);
+
+                $itip = $this->load_itip();
+                $itip->set_sender_email($sender['email']);
+
+                if ($itip->send_itip_message($this->to_libcal($task), 'REPLY', $task['organizer'], 'itipsubject' . $status, 'itipmailbody' . $status))
+                    $this->rc->output->command('display_message', $this->gettext(array('name' => 'sentresponseto', 'vars' => array('mailto' => $task['organizer']['name'] ?: $task['organizer']['email']))), 'confirmation');
+                else
+                    $this->rc->output->command('display_message', $this->gettext('itipresponseerror'), 'error');
+            }
+        }
 
         // unlock client
         $this->rc->output->command('plugin.unlock_saving');
@@ -337,6 +399,21 @@
     }
 
     /**
+     * Load iTIP functions
+     */
+    private function load_itip()
+    {
+        if (!$this->itip) {
+            require_once realpath(__DIR__ . '/../libcalendaring/lib/libcalendaring_itip.php');
+            $this->itip = new libcalendaring_itip($this, 'tasklist');
+            $this->itip->set_rsvp_actions(array('accepted','declined'));
+            $this->itip->set_rsvp_status(array('accepted','tentative','declined','delegated','in-process','completed'));
+        }
+
+        return $this->itip;
+    }
+
+    /**
      * repares new/edited task properties before save
      */
     private function prepare_task($rec)
@@ -481,6 +558,25 @@
 
         $rec['attachments'] = $attachments;
 
+        // convert invalid data
+        if (isset($rec['attendees']) && !is_array($rec['attendees']))
+            $rec['attendees'] = array();
+
+        // copy the task status to my attendee partstat
+        if (!empty($rec['_reportpartstat'])) {
+            if (($idx = $this->is_attendee($rec)) !== false) {
+                if (!($rec['_reportpartstat'] == 'NEEDS-ACTION' && $rec['attendees'][$idx]['status'] == 'ACCEPTED'))
+                    $rec['attendees'][$idx]['status'] = $rec['_reportpartstat'];
+                else
+                    unset($rec['_reportpartstat']);
+            }
+        }
+
+        // set organizer from identity selector
+        if (isset($rec['_identity']) && ($identity = $this->rc->user->get_identity($rec['_identity']))) {
+            $rec['organizer'] = array('name' => $identity['name'], 'email' => $identity['email']);
+        }
+
         if (is_numeric($rec['id']) && $rec['id'] < 0)
             unset($rec['id']);
 
@@ -587,6 +683,107 @@
     }
 
     /**
+     * Send out an invitation/notification to all task attendees
+     */
+    private function notify_attendees($task, $old, $action = 'edit', $comment = null)
+    {
+        if ($action == 'delete' || ($task['status'] == 'CANCELLED' && $old['status'] != $task['status'])) {
+            $task['cancelled'] = true;
+            $is_cancelled      = true;
+        }
+
+        $itip   = $this->load_itip();
+        $emails = $this->lib->get_user_emails();
+

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

@@ -37,6 +37,7 @@
     /* public methods */
     this.create_from_mail = create_from_mail;
     this.mail2taskdialog = mail2task_dialog;
+    this.save_to_tasklist = save_to_tasklist;
 
 
     /**
@@ -56,7 +57,7 @@
                     // rcmail.gui_object('attachmentlist', 'attachmentlist');
 
                     ui_loaded = true;
-                    me.ui = new rcube_tasklist_ui(settings);
+                    me.ui = new rcube_tasklist_ui($.extend(rcmail.env.tasklist_settings, settings));
                     create_from_mail(uid);  // start over
                 });
                 return;
@@ -80,21 +81,46 @@
         this.ui.edit_task(null, 'new', prop);
     }
 
+    // handler for attachment-save-tasklist commands
+    function save_to_tasklist()
+    {
+      // TODO: show dialog to select the tasklist for importing
+      if (this.selected_attachment && window.rcube_libcalendaring) {
+        rcmail.http_post('tasks/mailimportattach', {
+            _uid: rcmail.env.uid,
+            _mbox: rcmail.env.mailbox,
+            _part: this.selected_attachment,
+            // _list: $('#tasklist-attachment-saveto').val(),
+          }, rcmail.set_busy(true, 'itip.savingdata'));
+      }
+    }
+
 }
 
 /* tasklist plugin initialization (for email task) */
 window.rcmail && rcmail.env.task == 'mail' && rcmail.addEventListener('init', function(evt) {
     var tasks = new rcube_tasklist(rcmail.env.libcal_settings);
 
-    rcmail.register_command('tasklist-create-from-mail', function() { tasks.create_from_mail() });
-    rcmail.addEventListener('plugin.mail2taskdialog', function(p){ tasks.mail2taskdialog(p) });
-    rcmail.addEventListener('plugin.unlock_saving', function(p){ tasks.ui && tasks.ui.unlock_saving(); });
+    rcmail.register_command('tasklist-create-from-mail', function() { tasks.create_from_mail(); });
+    rcmail.register_command('attachment-save-task', function() { tasks.save_to_tasklist(); });
+    rcmail.addEventListener('plugin.mail2taskdialog', function(p) { tasks.mail2taskdialog(p); });
+    rcmail.addEventListener('plugin.unlock_saving', function(p) { tasks.ui && tasks.ui.unlock_saving(); });
 
     if (rcmail.env.action != 'show')
         rcmail.env.message_commands.push('tasklist-create-from-mail');
     else
         rcmail.enable_command('tasklist-create-from-mail', true);
 
+    rcmail.addEventListener('beforemenu-open', function(p) {
+        if (p.menu == 'attachmentmenu') {
+            tasks.selected_attachment = p.id;
+            var mimetype = rcmail.env.attachments[p.id],
+                is_ics = mimetype == 'text/calendar' || mimetype == 'text/x-vcalendar' || mimetype == 'application/ics';
+
+            rcmail.enable_command('attachment-save-task', is_ics);
+        }
+    });
+
     // add contextmenu item
     if (window.rcm_contextmenu_register_command) {
         rcm_contextmenu_register_command(
@@ -104,4 +130,3 @@
             'moveto');
         }
 });
-

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

@@ -55,10 +55,57 @@
         $this->plugin->include_script('tasklist_base.js');
 
         // copy config to client
-        // $this->rc->output->set_env('tasklist_settings', $settings);
+        $this->rc->output->set_env('tasklist_settings', $this->load_settings());
+
+        // initialize attendees autocompletion
+        $this->rc->autocomplete_init();
 
         $this->ready = true;
-  }
+    }
+
+    /**
+     *
+     */
+    function load_settings()
+    {
+        $settings = array();
+
+        $settings['invite_shared'] = (int)$this->rc->config->get('calendar_allow_invite_shared', 0);
+
+        // get user identity to create default attendee
+        foreach ($this->rc->user->list_identities() as $rec) {
+            if (!$identity)
+                $identity = $rec;
+
+            $identity['emails'][] = $rec['email'];
+            $settings['identities'][$rec['identity_id']] = $rec['email'];
+        }
+
+        $identity['emails'][] = $this->rc->user->get_username();
+        $settings['identity'] = array(
+            'name'   => $identity['name'],
+            'email'  => strtolower($identity['email']),
+            'emails' => ';' . strtolower(join(';', $identity['emails']))
+        );
+
+        return $settings;
+    }
+
+    /**
+     * Render a HTML select box for user identity selection
+     */
+    function identity_select($attrib = array())
+    {
+        $attrib['name'] = 'identity';
+        $select         = new html_select($attrib);
+        $identities     = $this->rc->user->list_identities();
+
+        foreach ($identities as $ident) {
+            $select->add(format_email_recipient($ident['email'], $ident['name']), $ident['identity_id']);
+        }
+
+        return $select->show(null);
+    }
 
     /**
     * Register handler methods for the template engine
@@ -78,6 +125,11 @@
         $this->plugin->register_handler('plugin.attachments_form', array($this, 'attachments_form'));
         $this->plugin->register_handler('plugin.attachments_list', array($this, 'attachments_list'));
         $this->plugin->register_handler('plugin.filedroparea', array($this, 'file_drop_area'));
+        $this->plugin->register_handler('plugin.attendees_list', array($this, 'attendees_list'));
+        $this->plugin->register_handler('plugin.attendees_form', array($this, 'attendees_form'));
+        $this->plugin->register_handler('plugin.identity_select', array($this, 'identity_select'));
+        $this->plugin->register_handler('plugin.edit_attendees_notify', array($this, 'edit_attendees_notify'));
+        $this->plugin->register_handler('plugin.task_rsvp_buttons', array($this->plugin->itip, 'itip_rsvp_buttons'));
 
         $this->plugin->include_script('jquery.tagedit.js');
         $this->plugin->include_script('tasklist.js');
@@ -166,10 +218,11 @@
         // enrich list properties with settings from the driver
         if (!$prop['virtual']) {
             unset($prop['user_id']);
-            $prop['alarms'] = $this->plugin->driver->alarms;
-            $prop['undelete'] = $this->plugin->driver->undelete;
-            $prop['sortable'] = $this->plugin->driver->sortable;
+            $prop['alarms']      = $this->plugin->driver->alarms;
+            $prop['undelete']    = $this->plugin->driver->undelete;
+            $prop['sortable']    = $this->plugin->driver->sortable;
             $prop['attachments'] = $this->plugin->driver->attachments;
+            $prop['attendees']   = $this->plugin->driver->attendees;
             $jsenv[$id] = $prop;
         }
 
@@ -375,4 +428,53 @@
         }
     }
 
+    /**
+     *
+     */
+    function attendees_list($attrib = array())
+    {
+        // 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' => 4 + intval($invitations), 'border' => 0, 'cellpadding' => 0, 'class' => 'rectable'));
+
+//      $table->add_header('role', $this->plugin->gettext('role'));
+        $table->add_header('name', $this->plugin->gettext($attrib['coltitle'] ?: 'attendee'));
+        $table->add_header('confirmstate', $this->plugin->gettext('confirmstate'));
+        if ($invitations) {
+            $table->add_header(array('class' => 'sendmail', 'title' => $this->plugin->gettext('sendinvitations')),
+                $invite->show(1) . html::label('edit-attendees-invite', $this->plugin->gettext('sendinvitations')));
+        }
+        $table->add_header('options', '');
+
+        return $table->show($attrib);
+    }
+
+    /**
+     *
+     */
+    function attendees_form($attrib = array())
+    {
+        $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->plugin->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->plugin->gettext('addattendee')))
+                // . " " . html::tag('input', array('type' => 'button', 'class' => 'button', 'id' => 'edit-attendee-schedule', 'value' => $this->plugin->gettext('scheduletime').'...'))
+                ) .
+            html::p('attendees-commentbox', html::label(null, $this->plugin->gettext('itipcomment') . $textarea->show()))
+        );
+    }
+
+    /**
+     *
+     */
+    function edit_attendees_notify($attrib = array())
+    {
+        $checkbox = new html_checkbox(array('name' => '_notify', 'id' => 'edit-attendees-donotify', 'value' => 1));
+        return html::div($attrib, html::label(null, $checkbox->show(1) . ' ' . $this->plugin->gettext('sendnotifications')));
+    }
 }

Changes of Revision 49