Kolab Groupware OBS

We truncated the diff of some files because they were too big. If you want to see the full diff for every file, click here.

Changes of Revision 77

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

@@ -259,17 +259,22 @@
   /**
    * Get properties of the calendar this user has specified as default
    */
-  public function get_default_calendar($writeable = false)
+  public function get_default_calendar($writeable = false, $confidential = false)
   {
     $default_id = $this->rc->config->get('calendar_default_calendar');
     $calendars = $this->driver->list_calendars(false, true);
     $calendar = $calendars[$default_id] ?: null;
-    if (!$calendar || ($writeable && $calendar['readonly'])) {
+    if (!$calendar || $confidential || ($writeable && $calendar['readonly'])) {
       foreach ($calendars as $cal) {
-        if ($cal['default']) {
+        if ($confidential && $cal['subtype'] == 'confidential') {
           $calendar = $cal;
           break;
         }
+        if ($cal['default']) {
+          $calendar = $cal;
+          if (!$confidential)
+            break;
+        }
         if (!$writeable || !$cal['readonly']) {
           $first = $cal;
         }
@@ -309,10 +314,13 @@
     $view = get_input_value('view', RCUBE_INPUT_GPC);
     if (in_array($view, array('agendaWeek', 'agendaDay', 'month', 'table')))
       $this->rc->output->set_env('view', $view);
-    
+
     if ($date = get_input_value('date', RCUBE_INPUT_GPC))
       $this->rc->output->set_env('date', $date);
 
+    if ($msgref = get_input_value('itip', RCUBE_INPUT_GPC))
+      $this->rc->output->set_env('itip_events', $this->itip_events($msgref));
+
     $this->rc->output->send("calendar.calendar");
   }
 
@@ -770,8 +778,8 @@
         $success = $this->driver->edit_calendar($cal);
         $reload = true;
         break;
-      case "remove":
-        if ($success = $this->driver->remove_calendar($cal))
+      case "delete":
+        if ($success = $this->driver->delete_calendar($cal))
           $this->rc->output->command('plugin.destroy_source', array('id' => $cal['id']));
         break;
       case "subscribe":
@@ -1123,6 +1131,43 @@
   }
 
   /**
+   * Load event data from an iTip message attachment
+   */
+  public function itip_events($msgref)
+  {
+    $path = explode('/', $msgref);
+    $msg = array_pop($path);
+    $mbox = join('/', $path);
+    list($uid, $mime_id) = explode('#', $msg);
+    $events = array();
+
+    if ($event = $this->lib->mail_get_itip_object($mbox, $uid, $mime_id, 'event')) {
+      $partstat = 'NEEDS-ACTION';
+/*
+      $user_emails = $this->lib->get_user_emails();
+      foreach ($event['attendees'] as $attendee) {
+        if (in_array($attendee['email'], $user_emails)) {
+          $partstat = $attendee['status'];
+          break;
+        }
+      }
+*/
+      $event['id'] = $event['uid'];
+      $event['temporary'] = true;
+      $event['readonly'] = true;
+      $event['calendar'] = '--invitation--itip';
+      $event['className'] = 'fc-invitation-' . strtolower($partstat);
+      $event['_mbox'] = $mbox;
+      $event['_uid']  = $uid;
+      $event['_part'] = $mime_id;
+
+      $events[] = $this->_client_event($event, true);
+    }
+
+    return $events;
+  }
+
+  /**
    * Handler for keep-alive requests
    * This will check for updated data in active calendars and sync them to the client
    */
@@ -2189,14 +2234,45 @@
     }
 
     if ($calendar_select) {
-      $default_calendar = $this->get_default_calendar(true);
+      $default_calendar = $this->get_default_calendar(true, $data['sensitivity'] == 'confidential');
       $response['select'] = html::span('folder-select', $this->gettext('saveincalendar') . '&nbsp;' .
-        $calendar_select->show($this->rc->config->get('calendar_default_calendar', $default_calendar['id'])));
+        $calendar_select->show($default_calendar['id']));
     }
     else if ($data['nosave']) {
       $response['select'] = html::tag('input', array('type' => 'hidden', 'name' => 'calendar', 'id' => 'itip-saveto', 'value' => ''));
     }
 
+    // render small agenda view for the respective day
+    if ($data['method'] == 'REQUEST' && !empty($data['date']) && $response['action'] == 'rsvp') {
+      $event_start = rcube_utils::anytodatetime($data['date']);
+      $day_start = new Datetime(gmdate('Y-m-d 00:00', $data['date']), $this->lib->timezone);
+      $day_end = new Datetime(gmdate('Y-m-d 23:59', $data['date']), $this->lib->timezone);
+
+      // get events on that day from the user's personal calendars
+      $calendars = $this->driver->list_calendars(false, true);
+      $events = $this->driver->load_events($day_start->format('U'), $day_end->format('U'), null, array_keys($calendars));
+      usort($events, function($a, $b) { return $a['start'] > $b['start'] ? 1 : -1; });
+
+      $before = $after = array();
+      foreach ($events as $event) {
+        // TODO: skip events with free_busy == 'free' ?
+        if ($event['uid'] == $data['uid'] || $event['end'] < $day_start || $event['start'] > $day_end)
+          continue;
+        else if ($event['start'] < $event_start)
+          $before[] = $this->mail_agenda_event_row($event);
+        else
+          $after[] = $this->mail_agenda_event_row($event);
+      }
+
+      $response['append'] = array(
+        'selector' => '.calendar-agenda-preview',
+        'replacements' => array(
+          '%before%' => !empty($before) ? join("\n", array_slice($before,  -3)) : html::div('event-row no-event', $this->gettext('noearlierevents')),
+          '%after%'  => !empty($after)  ? join("\n", array_slice($after, 0, 3)) : html::div('event-row no-event', $this->gettext('nolaterevents')),
+        ),
+      );
+    }
+
     $this->rc->output->command('plugin.update_itip_object_status', $response);
   }
 
@@ -2267,7 +2343,7 @@
             $invitation = $itip->get_invitation($token);
 
             // save the event to his/her default calendar if not yet present
-            if (!$this->driver->get_event($this->event) && ($calendar = $this->get_default_calendar(true))) {
+            if (!$this->driver->get_event($this->event) && ($calendar = $this->get_default_calendar(true, $invitation['event']['sensitivity'] == 'confidential'))) {
               $invitation['event']['calendar'] = $calendar['id'];
               if ($this->driver->new_event($invitation['event']))
                 $this->rc->output->command('display_message', $this->gettext(array('name' => 'importedsuccessfully', 'vars' => array('calendar' => $calendar['name']))), 'confirmation');
@@ -2298,6 +2374,21 @@
     $hidden = new html_hiddenfield(array('name' => "_t", 'value' => $this->token));
     return html::tag('form', array('action' => $this->rc->url(array('task' => 'calendar', 'action' => 'attend')), 'method' => 'post', 'noclose' => true) + $attrib) . $hidden->show();
   }
+
+  /**
+   * 
+   */
+  private function mail_agenda_event_row($event, $class = '')
+  {
+    $time = $event['all-day'] ? $this->gettext('allday') :
+      $this->rc->format_date($event['start'], $this->rc->config->get('time_format')) . ' - ' .
+        $this->rc->format_date($event['end'], $this->rc->config->get('time_format'));
+
+    return html::div(rtrim('event-row ' . $class),
+      html::span('event-date', $time) .
+      html::span('event-title', Q($event['title']))
+    );
+  }
   
   /**
    * 
@@ -2351,14 +2442,25 @@
 
       // get prepared inline UI for this event object
       if ($ical_objects->method) {
+        $append = '';
+
+        // prepare a small agenda preview to be filled with actual event data on async request
+        if ($ical_objects->method == 'REQUEST') {
+          $append = html::div('calendar-agenda-preview',
+            html::tag('h3', 'preview-title', $this->gettext('agenda') . ' ' .
+              html::span('date', $this->rc->format_date($event['start'], $this->rc->config->get('date_format')))
+            ) . '%before%' . $this->mail_agenda_event_row($event, 'current') . '%after%');
+        }
+
         $html .= html::div('calendar-invitebox',
           $this->itip->mail_itip_inline_ui(
             $event,
             $ical_objects->method,
             $ical_objects->mime_id . ':' . $idx,
             'calendar',
-            rcube_utils::anytodatetime($ical_objects->message_date)
-          )
+            rcube_utils::anytodatetime($ical_objects->message_date),
+            $this->rc->url(array('task' => 'calendar')) . '&view=agendaDay&date=' . $event['start']->format('U')
+          ) . $append

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

@@ -40,6 +40,7 @@
     this.search_request = null;
     this.saving_lock;
     this.calendars = {};
+    this.quickview_sources = [];
 
 
     /***  private vars  ***/
@@ -66,7 +67,6 @@
     var freebusy_ui = { workinhoursonly:false, needsupdate:false };
     var freebusy_data = {};
     var current_view = null;
-    var quickview_calendar;
     var exec_deferred = bw.ie6 ? 5 : 1;
     var sensitivitylabels = { 'public':rcmail.gettext('public','calendar'), 'private':rcmail.gettext('private','calendar'), 'confidential':rcmail.gettext('confidential','calendar') };
     var ui_loading = rcmail.set_busy(true, 'loading');
@@ -550,7 +550,7 @@
         buttons[rcmail.gettext('edit', 'calendar')] = function() {
           event_edit_dialog('edit', event);
         };
-        buttons[rcmail.gettext('remove', 'calendar')] = function() {
+        buttons[rcmail.gettext('delete', 'calendar')] = function() {
           me.delete_event(event);
           $dialog.dialog('close');
         };
@@ -599,7 +599,7 @@
       me.dialog_resize($dialog.get(0), $dialog.height(), 420);
 
       // add link for "more options" drop-down
-      if (!temp) {
+      if (!temp && !event.temporary) {
         $('<a>')
           .attr('href', '#')
           .html(rcmail.gettext('eventoptions','calendar'))
@@ -726,7 +726,7 @@
       event_attendees = [];
       attendees_list = $('#edit-attendees-table > tbody').html('');
       resources_list = $('#edit-resources-table > tbody').html('');
-      $('#edit-attendees-notify')[(allow_invitations && (settings.itip_notify & 2) ? 'show' : 'hide')]();
+      $('#edit-attendees-notify')[(allow_invitations && has_attendees(event) && (settings.itip_notify & 2) ? 'show' : 'hide')]();
       $('#edit-localchanges-warning')[(has_attendees(event) && !(allow_invitations || (calendar.owner && is_organizer(event, calendar.owner))) ? 'show' : 'hide')]();
 
       var load_attendees_tab = function()
@@ -2339,7 +2339,19 @@
         var submit_data = $.extend({}, me.selected_event, { source:null, comment:$('#reply-comment-event-rsvp').val() }),
           noreply = $('#noreply-event-rsvp:checked').length ? 1 : 0;
 
-        if (settings.invitation_calendars) {
+        // import event from mail (temporary iTip event)
+        if (submit_data._mbox && submit_data._uid) {
+          me.saving_lock = rcmail.set_busy(true, 'calendar.savingdata');
+          rcmail.http_post('mailimportitip', {
+            _mbox: submit_data._mbox,
+            _uid:  submit_data._uid,
+            _part: submit_data._part,
+            _status:  response,
+            _noreply: noreply,
+            _comment: submit_data.comment
+          });
+        }
+        else if (settings.invitation_calendars) {
           update_event('rsvp', submit_data, { status:response, noreply:noreply });
         }
         else {
@@ -2398,10 +2410,6 @@
         event.temp = true;
         event.className = 'fc-event-cal-'+data.calendar+' fc-event-temp';
         fc.fullCalendar(data.id ? 'updateEvent' : 'renderEvent', event);
-
-        if (data.id && me.quickview_active && me.quickview_active == data.calendar) {
-          quickview_calendar.fullCalendar('updateEvent', $.extend(quickview_calendar.fullCalendar('clientEvents', event._id)[0] || {}, event));
-        }
       }
     };
 
@@ -2487,7 +2495,7 @@
 
         if (!event.recurrence) {
           buttons.push({
-            text: rcmail.gettext((action == 'remove' ? 'remove' : 'save'), 'calendar'),
+            text: rcmail.gettext((action == 'remove' ? 'delete' : 'save'), 'calendar'),
             click: function() {
               data._notify = notify && $dialog.find('input.confirm-attendees-donotify:checked').length ? 1 : 0;
               data.decline = decline && $dialog.find('input.confirm-attendees-decline:checked').length ? 1 : 0;
@@ -2609,55 +2617,114 @@
     };
 
     // opens the given calendar in a popup dialog
-    this.quickview = function(id)
+    this.quickview = function(id, shift)
     {
-      $('#quickview-calendar:ui-dialog').dialog('close');
+      var src, in_quickview = false;
+      $.each(this.quickview_sources, function(i,cal) {
+        if (cal.id == id) {
+          in_quickview = true;
+          src = cal;
+        }
+      });
 
-      var src, cal = this.calendars[id], date = fc.fullCalendar('getDate'),
-        h = $(window).height() - 50,
-        me = this;
+      // remove source from quickview
+      if (in_quickview && shift) {
+        this.quickview_sources = $.grep(this.quickview_sources, function(src) { return src.id != id; });
+      }
+      else {
+        if (!shift) {
+          // remove all current quickview event sources
+          if (this.quickview_active) {
+            fc.fullCalendar('removeEventSources');
+          }
 
-      // clone and modify calendar properties
-      src = $.extend({}, cal);
-      src.editable = false;
-      src.url += '&_quickview=1';
+          this.quickview_sources = [];
 
-      quickview_calendar = $('<div>')
-        .attr('id', 'quickview-calendar')
-        .dialog({
-          modal: true,
-          width: Math.min(1000, $(window).width() - 100),
-          height: h,
-          title: cal.name.replace('&raquo;', '»').replace('&nbsp;', ' '),
-          open: function() {
-            setTimeout(function() { quickview_calendar.find('.fc-button-next').first().focus(); }, 10);
-          },
-          close: function() {
-            quickview_calendar.dialog('destroy').fullCalendar('destroy').remove();
-            me.quickview_active = null;
-          },
-          resize: function(e) {
-            // adjust height when dialog resizes
-            quickview_calendar.fullCalendar('option', 'height', quickview_calendar.height() + 8);
-          }
-        })
-        .fullCalendar($.extend({}, fullcalendar_defaults, {
-          header: {
-            left: 'agendaDay,agendaWeek,month,table',
-            center: 'title',
-            right: 'prev,next today'
-          },
-          height: h - 50,
-          defaultView: fc.fullCalendar('getView').name || fullcalendar_defaults.defaultView,
-          listRange: fc.fullCalendar('option', 'listRange'),
-          listSections: fc.fullCalendar('option', 'listSections'),
-          date: date.getDate(),
-          month: date.getMonth(),
-          year: date.getFullYear(),
-          eventSources: [ src ]
-        }));
+          // uncheck all active quickview icons
+          calendars_list.container.find('div.focusview')
+            .add('#calendars .searchresults div.focusview')
+            .removeClass('focusview')
+              .find('a.quickview').attr('aria-checked', 'false');
+        }
+
+        if (!in_quickview) {
+          // clone and modify calendar properties
+          src = $.extend({}, this.calendars[id]);
+          src.url += '&_quickview=1';
+          this.quickview_sources.push(src);
+        }
+      }
+
+      // disable quickview
+      if (this.quickview_active && !this.quickview_sources.length) {
+        // register regular calendar event sources
+        $.each(this.calendars, function(k, cal) {
+          if (cal.active)
+            fc.fullCalendar('addEventSource', cal);
+        });
 
-        me.quickview_active = id;
+        this.quickview_active = false;
+        $('body').removeClass('quickview-active');
+
+        // uncheck all active quickview icons
+        calendars_list.container.find('div.focusview')
+          .add('#calendars .searchresults div.focusview')
+          .removeClass('focusview')
+            .find('a.quickview').attr('aria-checked', 'false');
+      }
+      // activate quickview
+      else if (!this.quickview_active) {
+        // remove regular calendar event sources
+        fc.fullCalendar('removeEventSources');
+
+        // register quickview event sources
+        $.each(this.quickview_sources, function(i, src) {
+          fc.fullCalendar('addEventSource', src);
+        });
+
+        this.quickview_active = true;
+        $('body').addClass('quickview-active');
+      }

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

@@ -164,7 +164,7 @@
    *      id: Calendar Identifier
    * @return boolean True on success, Fales on failure
    */
-  abstract function remove_calendar($prop);
+  abstract function delete_calendar($prop);
 
   /**
    * Search for shared or otherwise not listed calendars the user has access
@@ -685,6 +685,25 @@
   }
 
   /**
+   * Store alarm dismissal for birtual birthay events
+   *
+   * @param  string  Event identifier
+   * @param  integer Suspend the alarm for this number of seconds
+   */
+  public function dismiss_birthday_alarm($event_id, $snooze = 0)
+  {
+    $rcmail = rcmail::get_instance();
+    $cache  = $rcmail->get_cache('calendar.birthdayalarms', 'db', 86400 * 30);
+    $cache->remove($event_id);
+
+    // compute new notification time or disable if not snoozed
+    $notifyat = $snooze > 0 ? time() + $snooze : null;
+    $cache->set($event_id, array('snooze' => $snooze, 'notifyat' => $notifyat));
+
+    return true;
+  }
+
+  /**
    * 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

roundcubemail-plugins-kolab-3.2.tar.gz/plugins/calendar/drivers/kolab/SQL/oracle.initial.sql Added

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

@@ -93,10 +93,13 @@
     $this->calendars = array();
 
     foreach ($folders as $folder) {
-      if ($folder instanceof kolab_storage_folder_user)
+      if ($folder instanceof kolab_storage_folder_user) {
         $calendar = new kolab_user_calendar($folder->name, $this->cal);
-      else
+        $calendar->subscriptions = count($folder->children) > 0;
+      }
+      else {
         $calendar = new kolab_calendar($folder->name, $this->cal);
+      }
 
       if ($calendar->ready) {
         $this->calendars[$calendar->id] = $calendar;
@@ -174,6 +177,7 @@
           'readonly' => true,
           'group'    => 'other',
           'class'    => 'user',
+          'removable' => true,
         );
       }
       else if ($cal->virtual) {
@@ -205,12 +209,14 @@
           'owner'    => $cal->get_owner(),
           'children' => true,  // TODO: determine if that folder indeed has child folders
           'parent'   => $parent_id,
+          'subtype'  => $cal->subtype,
           'caldavurl' => $cal->get_caldav_url(),
+          'removable' => !$cal->default,
         );
       }
 
       if ($cal->subscriptions) {
-        $calendars[$cal->id]['subscribed'] = (bool)$cal->is_subscribed();
+        $calendars[$cal->id]['subscribed'] = $cal->is_subscribed();
       }
     }
 
@@ -415,6 +421,16 @@
         $ret |= $cal->storage->subscribe(intval($prop['permanent']));
       if (isset($prop['active']))
         $ret |= $cal->storage->activate(intval($prop['active']));
+
+      // apply to child folders, too
+      if ($prop['recursive']) {
+        foreach ((array)kolab_storage::list_folders($cal->storage->name, '*', 'event') as $subfolder) {
+          if (isset($prop['permanent']))
+            ($prop['permanent'] ? kolab_storage::folder_subscribe($subfolder) : kolab_storage::folder_unsubscribe($subfolder));
+          if (isset($prop['active']))
+            ($prop['active'] ? kolab_storage::folder_activate($subfolder) : kolab_storage::folder_deactivate($subfolder));
+        }
+      }
       return $ret;
     }
     else {
@@ -432,9 +448,9 @@
   /**
    * Delete the given calendar with all its contents
    *
-   * @see calendar_driver::remove_calendar()
+   * @see calendar_driver::delete_calendar()
    */
-  public function remove_calendar($prop)
+  public function delete_calendar($prop)
   {
     if ($prop['id'] && ($cal = $this->get_calendar($prop['id']))) {
       $folder = $cal->get_realname();
@@ -488,6 +504,7 @@
         foreach (kolab_storage::list_user_folders($user, 'event', false) as $foldername) {
           $cal = new kolab_calendar($foldername, $this->cal);
           $this->calendars[$cal->id] = $cal;
+          $calendar->subscriptions = true;
         }
       }
 
@@ -1065,14 +1082,12 @@
     // get alarm information stored in local database
     if (!empty($candidates)) {
       $alarm_ids = array_map(array($this->rc->db, 'quote'), array_keys($candidates));
-      $result = $this->rc->db->query(sprintf(
-          "SELECT * FROM " . $this->rc->db->table_name('kolab_alarms') . "
-           WHERE alarm_id IN (%s) AND user_id=?",
-           join(',', $alarm_ids),
-           $this->rc->db->now()
-          ),
-          $this->rc->user->ID
-       );
+      $result = $this->rc->db->query("SELECT *"
+        . " FROM " . $this->rc->db->table_name('kolab_alarms', true)
+        . " WHERE `alarm_id` IN (" . join(',', $alarm_ids) . ")"
+          . " AND `user_id` = ?",
+        $this->rc->user->ID
+      );
 
       while ($result && ($e = $this->rc->db->fetch_assoc($result))) {
         $dbdata[$e['alarm_id']] = $e;
@@ -1101,27 +1116,26 @@
    */
   public function dismiss_alarm($alarm_id, $snooze = 0)
   {
+    $alarms_table = $this->rc->db->table_name('kolab_alarms', true);
     // delete old alarm entry
-    $this->rc->db->query(
-      "DELETE FROM " . $this->rc->db->table_name('kolab_alarms') . "
-       WHERE alarm_id=? AND user_id=?",
-       $alarm_id,
-       $this->rc->user->ID
+    $this->rc->db->query("DELETE FROM $alarms_table"
+      . " WHERE `alarm_id` = ? AND `user_id` = ?",
+      $alarm_id,
+      $this->rc->user->ID
     );
 
     // set new notifyat time or unset if not snoozed
     $notifyat = $snooze > 0 ? date('Y-m-d H:i:s', time() + $snooze) : null;
 
-    $query = $this->rc->db->query(
-      "INSERT INTO " . $this->rc->db->table_name('kolab_alarms') . "
-       (alarm_id, user_id, dismissed, notifyat)
-       VALUES(?, ?, ?, ?)",
+    $query = $this->rc->db->query("INSERT INTO $alarms_table"
+      . " (`alarm_id`, `user_id`, `dismissed`, `notifyat`)"
+      . " VALUES (?, ?, ?, ?)",
       $alarm_id,
       $this->rc->user->ID,
       $snooze > 0 ? 0 : 1,
       $notifyat
     );
-    
+
     return $this->rc->db->affected_rows($query);
   }
 
@@ -1776,7 +1790,8 @@
   {
     $db = $this->rc->get_dbh();
     foreach (array('kolab_alarms', 'itipinvitations') as $table) {
-      $db->query("DELETE FROM " . $this->rc->db->table_name($table) . " WHERE user_id=?", $args['user']->ID);
+      $db->query("DELETE FROM " . $this->rc->db->table_name($table, true)
+        . " WHERE `user_id` = ?", $args['user']->ID);
     }
   }
 }

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

@@ -51,6 +51,7 @@
     }
 
     $this->ready = !empty($this->userdata['kolabtargetfolder']);
+    $this->storage->type = 'event';
 
     if ($this->ready) {
       // ID is derrived from the user's kolabtargetfolder attribute
@@ -141,6 +142,15 @@
     return false;
   }
 
+  /**
+   * Check subscription status of this folder
+   *
+   * @return boolean True if subscribed, false if not
+   */
+  public function is_subscribed()
+  {
+    return $this->storage->is_subscribed();
+  }
 
   /**
    * Update properties of this calendar folder
@@ -201,7 +211,7 @@
 
     // aggregate all calendar folders the user shares (but are not subscribed)
     foreach (kolab_storage::list_user_folders($this->userdata, 'event', false) as $foldername) {
-      if (!kolab_storage::folder_is_subscribed($foldername, true)) {
+      if (!empty($_REQUEST['_quickview']) || !kolab_storage::folder_is_active($foldername)) {
         $cal = new kolab_calendar($foldername, $this->cal);
         foreach ($cal->list_events($start, $end, $search, 1) as $event) {
           $this->events[$event['id']] = $event;
@@ -302,7 +312,7 @@
             'id'        => md5($this->id . $from->format('U') . '/' . $to->format('U')),
             'calendar'  => $this->id,
             'changed'   => $fb['created'] ?: new DateTime(),
-            'title'     => $titlemap[$type] ?: $type,
+            'title'     => $this->get_name() . ' ' . ($titlemap[$type] ?: $type),
             'start'     => $from,
             'end'       => $to,
             'free_busy' => $statusmap[$type] ?: 'busy',

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

@@ -35,7 +35,7 @@
   {
     parent::__construct($plugin, $domain);
 
-    $this->db_itipinvitations = $this->rc->db->table_name('itipinvitations');
+    $this->db_itipinvitations = $this->rc->db->table_name('itipinvitations', true);
   }
 
   /**
@@ -61,7 +61,7 @@
   public function get_invitation($token)
   {
     if ($parts = $this->decode_token($token)) {
-      $result = $this->rc->db->query("SELECT * FROM $this->db_itipinvitations WHERE token=?", $parts['base']);
+      $result = $this->rc->db->query("SELECT * FROM $this->db_itipinvitations WHERE `token` = ?", $parts['base']);
       if ($result && ($rec = $this->rc->db->fetch_assoc($result))) {
         $rec['event'] = unserialize($rec['event']);
         $rec['attendee'] = $parts['attendee'];
@@ -113,8 +113,8 @@
       // update record in DB
       $query = $this->rc->db->query(
         "UPDATE $this->db_itipinvitations
-         SET event=?
-         WHERE token=?",
+         SET `event` = ?
+         WHERE `token` = ?",
         self::serialize_event($invitation['event']),
         $invitation['token']
       );
@@ -150,11 +150,11 @@
       return $token;
 
     // delete old entry
-    $this->rc->db->query("DELETE FROM $this->db_itipinvitations WHERE token=?", $base);
+    $this->rc->db->query("DELETE FROM $this->db_itipinvitations WHERE `token` = ?", $base);
 
     $query = $this->rc->db->query(
       "INSERT INTO $this->db_itipinvitations
-       (token, event_uid, user_id, event, expires)
+       (`token`, `event_uid`, `user_id`, `event`, `expires`)
        VALUES(?, ?, ?, ?, ?)",
       $base,
       $event['uid'],
@@ -181,8 +181,8 @@
     // flag invitation record as cancelled
     $this->rc->db->query(
       "UPDATE $this->db_itipinvitations
-       SET cancelled=1
-       WHERE event_uid=? AND user_id=?",
+       SET `cancelled` = 1
+       WHERE `event_uid` = ? AND `user_id` = ?",
        $event['uid'],
        $this->rc->user->ID
     );

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

@@ -298,6 +298,8 @@
       $classes[] = 'readonly';
     if ($prop['subscribed'])
       $classes[] = 'subscribed';
+    if ($prop['subscribed'] === 2)
+      $classes[] = 'partial';
     if ($prop['class'])
       $classes[] = $prop['class'];
 
@@ -308,8 +310,11 @@
         html::span(array('class' => 'calname', 'id' => $label_id, 'title' => $title), $prop['editname'] ? Q($prop['editname']) : $prop['listname']) .
         ($prop['virtual'] ? '' :
           html::tag('input', array('type' => 'checkbox', 'name' => '_cal[]', 'value' => $id, 'checked' => $prop['active'], 'aria-labelledby' => $label_id), '') .
-          html::a(array('href' => '#', 'class' => 'quickview', 'title' => $this->cal->gettext('quickview'), 'role' => 'button'), '') .
-          (isset($prop['subscribed']) ? html::a(array('href' => '#', 'class' => 'subscribed', 'title' => $this->cal->gettext('calendarsubscribe'), 'role' => 'checkbox', 'aria-checked' => $prop['subscribed'] ? 'true' : 'false'), ' ') : '') .
+          html::span('actions', 
+            ($prop['removable'] ? html::a(array('href' => '#', 'class' => 'remove', 'title' => $this->cal->gettext('removelist')), ' ') : '') .
+            html::a(array('href' => '#', 'class' => 'quickview', 'title' => $this->cal->gettext('quickview'), 'role' => 'checkbox', 'aria-checked' => 'false'), '') .
+            (isset($prop['subscribed']) ? html::a(array('href' => '#', 'class' => 'subscribed', 'title' => $this->cal->gettext('calendarsubscribe'), 'role' => 'checkbox', 'aria-checked' => $prop['subscribed'] ? 'true' : 'false'), ' ') : '')
+          ) .
           html::span(array('class' => 'handle', 'style' => "background-color: #" . ($prop['color'] ?: 'f00')), '&nbsp;')
         )
       );

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

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

@@ -51,7 +51,7 @@
 $labels['edit_event'] = 'Edit event';
 $labels['edit'] = 'Edit';
 $labels['save'] = 'Save';
-$labels['remove'] = 'Remove';
+$labels['removelist'] = 'Remove from list';
 $labels['cancel'] = 'Cancel';
 $labels['select'] = 'Select';
 $labels['print'] = 'Print';
@@ -201,6 +201,9 @@
 $labels['saveincalendar'] = 'save in';
 $labels['updatemycopy'] = 'Update in my calendar';
 $labels['savetocalendar'] = 'Save to calendar';
+$labels['openpreview'] = 'Check Calendar';
+$labels['noearlierevents'] = 'No earlier events';
+$labels['nolaterevents'] = 'No later events';
 
 // resources
 $labels['resource'] = 'Resource';
@@ -251,9 +254,9 @@
 $labels['aclnorights'] = 'You do not have administrator rights on this calendar.';
 
 $labels['changeeventconfirm'] = 'Change event';
-$labels['removeeventconfirm'] = 'Remove event';
+$labels['removeeventconfirm'] = 'Delete event';
 $labels['changerecurringeventwarning'] = 'This is a recurring event. Would you like to edit the current event only, this and all future occurences, all occurences or save it as a new event?';
-$labels['removerecurringeventwarning'] = 'This is a recurring event. Would you like to remove the current event only, this and all future occurences or all occurences of this event?';
+$labels['removerecurringeventwarning'] = 'This is a recurring event. Would you like to delete the current event only, this and all future occurences or all occurences of this event?';
 $labels['currentevent'] = 'Current';
 $labels['futurevents'] = 'Future';
 $labels['allevents'] = 'All';

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

@@ -572,6 +572,12 @@
 	margin-bottom: 0.3em;
 }
 
+#eventshow #event-url .event-text {
+	overflow: hidden;
+	white-space: nowrap;
+	text-overflow: ellipsis;
+}
+
 #event-rsvp .itip-reply-controls {
 	margin-top: 0.5em;
 }
@@ -1682,6 +1688,42 @@
 	background-position: 2px -180px;
 }
 
+div.calendar-invitebox .calendar-agenda-preview {
+	display: none;
+	border-top: 1px solid #dfdfdf;
+	margin-top: 1em;
+	padding-top: 0.6em;
+}
+
+div.calendar-invitebox .calendar-agenda-preview h3.preview-title {
+	margin: 0 0 0.5em 0;
+	font-size: 12px;
+}
+
+div.calendar-invitebox .calendar-agenda-preview .event-row {
+	color: #777;
+	padding: 2px 0;
+	white-space: nowrap;
+	overflow: hidden;
+	text-overflow: ellipsis;
+}
+
+div.calendar-invitebox .calendar-agenda-preview .event-row.current {
+	color: #000;
+	font-weight: bold;
+}
+
+div.calendar-invitebox .calendar-agenda-preview .event-row.no-event {
+	font-style: italic;
+}
+
+div.calendar-invitebox .calendar-agenda-preview .event-date {
+	display: inline-block;
+	min-width: 8em;
+	margin-right: 1em;
+	white-space: nowrap;
+}
+
 /* iTIP attend reply page */
 
 .calendaritipattend .centerbox {

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

@@ -6,7 +6,7 @@
 <script type="text/javascript" src="/functions.js"></script>
 
 </head>
-<body class="calendarmain">
+<roundcube:if condition="env:extwin" /><body class="calendarmain extwin"><roundcube:else /><body class="calendarmain"><roundcube:endif />
 
 <roundcube:include file="/includes/taskbar.html" />
 <roundcube:include file="/includes/header.html" />
@@ -49,7 +49,10 @@
 <div id="calendaroptionsmenu" class="popupmenu">
   <ul>
     <li><roundcube:button command="calendar-edit" label="calendar.edit" classAct="active" /></li>
+    <li><roundcube:button command="calendar-delete" label="delete" classAct="active" /></li>
+    <roundcube:if condition="env:calendar_driver == 'kolab'" />
     <li><roundcube:button command="calendar-remove" label="calendar.remove" classAct="active" /></li>
+    <roundcube:endif />
     <li><roundcube:button command="calendar-showurl" label="calendar.showurl" classAct="active" /></li>
     <roundcube:if condition="env:calendar_driver == 'kolab'" />
     <li class="separator_above"><roundcube:button command="folders" task="settings" type="link" label="managefolders" classAct="active" /></li>

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

@@ -1,7 +1,7 @@
 /**
  * Roundcube Calendar plugin styles for skin "Larry"
  *
- * Copyright (c) 2012, Kolab Systems AG <contact@kolabsys.com>
+ * Copyright (c) 2012-2014, Kolab Systems AG <contact@kolabsys.com>
  * Screendesign by FLINT / Büro für Gestaltung, bueroflint.com
  *
  * The contents are subject to the Creative Commons Attribution-ShareAlike
@@ -218,7 +218,7 @@
 	position: absolute;
 	top: 7px;
 	left: 38px;
-	right: 60px;
+	right: 45px;
 	cursor: default;
 	background: url(images/calendars.png) right 20px no-repeat;
 	overflow: hidden;
@@ -227,6 +227,16 @@
 	color: #004458;
 }
 
+.quickview-active #calendars .treelist div input,
+.quickview-active #calendars .treelist div .calname {
+	opacity: 0.35;
+}
+
+.quickview-active #calendars .treelist div.focusview .calname {
+	opacity: 1.0;
+	background-image: none;
+}
+
 #calendars .treelist li div.virtual > span.calname {
 	color: #aaa;
 	top: 4px;
@@ -259,11 +269,36 @@
 	box-shadow: inset 0px 0 1px 1px rgba(0, 0, 0, 0.3);
 }
 
+#calendars .treelist div span.actions {
+	display: inline-block;
+	position: absolute;
+	top: 2px;
+	right: 22px;
+	padding: 5px 20px 0 6px;
+	min-width: 40px;
+	height: 19px;
+	text-align: right;
+}
+
+#calendars .treelist div:hover span.actions {
+	top: 1px;
+	right: 21px;
+	border: 1px solid #c6c6c6;
+	border-radius: 4px;
+	background: #f7f7f7;
+	background: -moz-linear-gradient(top, #f9f9f9 0%, #e6e6e6 100%);
+	background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#f9f9f9), color-stop(100%,#e6e6e6));
+	background: -o-linear-gradient(top, #f9f9f9 0%, #e6e6e6 100%);
+	background: -ms-linear-gradient(top, #f9f9f9 0%, #e6e6e6 100%);
+	background: linear-gradient(top, #f9f9f9 0%, #e6e6e6 100%);
+	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#f9f9f9', endColorstr='#e6e6e6', GradientType=0);
+}
+
 #calendars .treelist li a.subscribed {
 	display: inline-block;
 	position: absolute;
-	top: 7px;
-	right: 24px;
+	top: 5px;
+	right: 3px;
 	height: 16px;
 	width: 16px;
 	padding: 0;
@@ -273,14 +308,8 @@
 	cursor: pointer;
 }
 
-#calendars .treelist div > a.quickview:focus,
-#calendars .treelist div > a.subscribed:focus {
-	border-radius: 3px;
-	outline: 2px solid rgba(30,150,192, 0.5);
-}
-
-#calendars .treelist div:hover > a.subscribed,
-#calendars .treelist div > a.subscribed:focus {
+#calendars .treelist div:hover a.subscribed,
+#calendars .treelist div a.subscribed:focus {
 	background-position: 0 -110px;
 }
 
@@ -289,13 +318,24 @@
 	background-position: -16px -110px;
 }
 
-#calendars .treelist li a.quickview {
+#calendars .treelist div.subscribed.partial a.subscribed,
+#calendars .treelist div.subscribed.partial a.subscribed:focus {
+	background-position: -16px -148px;
+}
+
+#calendars .treelist div a.remove:focus,
+#calendars .treelist div a.quickview:focus,
+#calendars .treelist div a.subscribed:focus {
+	border-radius: 3px;
+	outline: 2px solid rgba(30,150,192, 0.5);
+}
+
+#calendars .treelist div a.remove,
+#calendars .treelist div a.quickview {
 	display: inline-block;
-	position: absolute;
-	top: 6px;
-	right: 42px;
 	width: 16px;
 	height: 16px;
+	margin-right: 4px;
 	padding: 0;
 	background: url(images/calendars.png) -100px 0 no-repeat;
 	overflow: hidden;
@@ -303,13 +343,24 @@
 	cursor: pointer;
 }
 
-#calendars .treelist div > a.quickview:focus,
-#calendars .treelist li div:hover > a.quickview {
+#calendars .treelist div a.quickview:focus,
+#calendars .treelist div:hover a.quickview {
 	background-position: 0 -128px;
+	background-color: transparent !important;
 }
 
-#calendars .treelist li div.focusview > a.quickview {
-	background-position: -18px -128px;
+#calendars .treelist div.focusview a.quickview {
+	background-position: -16px -128px;
+}
+
+#calendars .treelist div a.remove:focus,
+#calendars .treelist div:hover a.remove {
+	background-position: -16px -168px;
+	background-color: transparent !important;
+}
+
+#calendars .searchresults .treelist div a.remove {
+	display: none;
 }
 
 #calendars .treelist li input {
@@ -874,6 +925,12 @@
 	padding-right: 0.5em;
 }
 
+.calendarmain .eventdialog #event-url .event-text {
+	overflow: hidden;
+	white-space: nowrap;
+	text-overflow: ellipsis;
+}
+
 #eventedit .formtable td.label {
 	min-width: 6em;
 }
@@ -1547,6 +1604,12 @@
 	background: #fff;
 }
 
+.calendarmain.quickview-active .fc-content {
+	background-image: url('images/focusview.png');
+	background-position: center;
+	background-repeat: no-repeat;
+}
+
 #fish-eye-view .fc-content {
 	top: 2px;
 	bottom: 2px;
@@ -1698,7 +1761,8 @@
 	font-size: 1em !important;
 }
 
-.fc-type-freebusy {
+.fc-event-hori.fc-type-freebusy,
+.fc-event-vert.fc-type-freebusy {
 	opacity: 0.55;
 	color: #fff !important;
 
@@ -1719,15 +1783,22 @@
 	cursor: default !important;
 }
 
-.fc-type-freebusy .fc-event-skin,
-.fc-type-freebusy .fc-event-inner {
+.fc-event-row.fc-type-freebusy td {
+	color: #999;
+}
+
+.fc-event-hori.fc-type-freebusy .fc-event-skin,
+.fc-event-hori.fc-type-freebusy .fc-event-inner,
+.fc-event-vert.fc-type-freebusy .fc-event-skin,
+.fc-event-vert.fc-type-freebusy .fc-event-inner {
 	background-color: transparent !important;

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

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

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

@@ -5,7 +5,7 @@
 <roundcube:include file="/includes/links.html" />
 
 </head>
-<body class="calendarmain">
+<roundcube:if condition="env:extwin" /><body class="calendarmain extwin"><roundcube:else /><body class="calendarmain"><roundcube:endif />
 
 <roundcube:include file="/includes/header.html" />
 
@@ -69,7 +69,10 @@
 	<h3 id="aria-label-calendaroptions" class="voice"><roundcube:label name="calendar.calendaractions" /></h3>
 	<ul id="calendaroptionsmenu-menu" class="toolbarmenu" role="menu" aria-labelledby="aria-label-calendaroptions">
 		<li role="menuitem"><roundcube:button command="calendar-edit" label="calendar.edit" classAct="active" /></li>
-		<li role="menuitem"><roundcube:button command="calendar-remove" label="calendar.remove" classAct="active" /></li>
+		<li role="menuitem"><roundcube:button command="calendar-delete" label="delete" classAct="active" /></li>
+		<roundcube:if condition="env:calendar_driver == 'kolab'" />
+		<li role="menuitem"><roundcube:button command="calendar-remove" label="calendar.removelist" classAct="active" /></li>
+		<roundcube:endif />
 		<li role="menuitem"><roundcube:button command="calendar-showurl" label="calendar.showurl" classAct="active" /></li>
 		<roundcube:if condition="env:calendar_driver == 'kolab'" />
 		<li role="menuitem"><roundcube:button command="folders" task="settings" type="link" label="managefolders" classAct="active" /></li>

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

@@ -107,6 +107,11 @@
                         rcmail.http_post('plugin.book-subscribe', { _source:node.id, _permanent:source.subscribed?1:0 });
                     }
                 })
+                .addEventListener('remove', function(node) {
+                    if (rcmail.env.address_sources[node.id]) {
+                        rcmail.book_remove(node.id);
+                    }
+                })
                 .addEventListener('insert-item', function(data) {
                     // register new address source
                     rcmail.env.address_sources[data.id] = rcmail.env.contactfolders[data.id] = data.data;
@@ -131,11 +136,12 @@
 // (De-)activates address book management commands
 rcube_webmail.prototype.set_book_actions = function()
 {
-    var source = this.env.source,
+    var source = !this.env.group ? this.env.source : null,
         sources = this.env.address_sources;
 
     this.enable_command('book-create', true);
     this.enable_command('book-edit', 'book-delete', source && sources[source] && sources[source].kolab && sources[source].editable);
+    this.enable_command('book-remove', source && sources[source] && sources[source].kolab && sources[source].removable);
     this.enable_command('book-showurl', source && sources[source] && sources[source].carddavurl);
 };
 
@@ -149,6 +155,15 @@
     this.book_show_contentframe('edit');
 };
 
+rcube_webmail.prototype.book_remove = function(id)
+{
+    if (!id) id = this.env.source;
+    if (id != '' && rcmail.env.address_sources[id]) {
+        rcmail.book_delete_done(id, true);
+        rcmail.http_post('plugin.book-subscribe', { _source:id, _permanent:0, _recursive:1 });
+    }
+};
+
 rcube_webmail.prototype.book_delete = function()
 {
     if (this.env.source != '' && confirm(this.get_label('kolab_addressbook.bookdeleteconfirm'))) {
@@ -343,7 +358,7 @@
             menu_source: ['#directorylist-footer', '#groupoptionsmenu']
         }, {
             'activate': function(p) {
-                var source = rcmail.env.source,
+                var source = !rcmail.env.group ? rcmail.env.source : null,
                     sources = rcmail.env.address_sources;
 
                 if (p.command == 'book-create') {
@@ -354,10 +369,18 @@
                     return !!(source && sources[source] && sources[source].kolab && sources[source].editable);
                 }
 
+                if (p.command == 'book-remove') {
+                    return !!(source && sources[source] && sources[source].kolab && sources[source].removable);
+                }
+
                 if (p.command == 'book-showurl') {
                     return !!(source && sources[source] && sources[source].carddavurl);
                 }
 
+                if (p.command == 'group-rename' || p.command == 'group-delete') {
+                    return !!(rcmail.env.group && sources[rcmail.env.source] && sources[rcmail.env.source].editable);
+                }
+
                 return false;
             },
             'beforeactivate': function(p) {
@@ -367,11 +390,16 @@
                 rcmail.env.kolab_old_source = rcmail.env.source;
                 rcmail.env.kolab_old_group = rcmail.env.group;
 
-                var onclick = $(p.source).attr('onclick');
+                var elem = $(p.source), onclick = elem.attr('onclick');
                 if (onclick && onclick.match(rcmail.context_menu_command_pattern)) {
                     rcmail.env.source = RegExp.$2;
                     rcmail.env.group = null;
                 }
+                else if (elem.parent().hasClass('contactgroup')) {
+                    var grp = String(elem.attr('rel')).split(':');
+                    rcmail.env.source = grp[0];
+                    rcmail.env.group = grp[1];
+                }
             },
             'aftercommand': function(p) {
                 rcmail.env.source = rcmail.env.kolab_old_source;
@@ -380,7 +408,7 @@
         }
     );
 
-    $('#directorylist div > a').off('contextmenu').on('contextmenu', function(e) {
+    $('#directorylist').off('contextmenu').on('contextmenu', 'div > a, li.contactgroup > a', function(e) {
         $(this).blur();
         rcm_show_menu(e, this, $(this).attr('rel'), menu);
     });

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

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

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

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

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

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

@@ -50,47 +50,23 @@
 });
 
 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) {
-        rcmail.env.subtype_html = $('#_subtype').html();
-    }
-
     // Add onchange handler for folder type SELECT, and call it on form init
     $('#_ctype').change(function() {
         var type = $(this).val(),
             sub = $('#_subtype'),
-            subtype = sub.val();
+            subtypes = rcmail.env.kolab_folder_subtypes[type] || {};
 
-        // For IE we need to revert the whole SELECT to the original state
-        if (bw.ie) {
-            sub.html(rcmail.env.subtype_html).val(subtype);
-        }
+        // reset subtype selector
+        sub.html('<option value=""></option>');
 
-        // For non-mail folders we must hide mail-specific subtypes
-        $('option', sub).each(function() {
-            var opt = $(this), val = opt.val();
-            if (val == '')
-                return;
-            // there's no mail.default
-            if (val == 'default' && type != 'mail') {
-                opt.show();
-                return;
-            };
-
-            if (type == 'mail' && val != 'default')
-                opt.show();
-            else if (bw.ie)
-                opt.remove();
-            else
-                opt.hide();
+        // append available subtypes for the given folder type
+        $.each(subtypes, function(val, label) {
+            $('<option>').attr('value', val).text(label).appendTo(sub);
         });
 
         // And re-set subtype
-        if (type != 'mail' && subtype != '' && subtype != 'default') {
-            sub.val('');
-        }
-    }).change();
+        sub.val(rcmail.env.kolab_folder_subtype);
+    });
 });
 
 function kolab_folders_filter(filter)

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

@@ -27,7 +27,17 @@
     public $task = '?(?!login).*';
 
     public $types      = array('mail', 'event', 'journal', 'task', 'note', 'contact', 'configuration', 'file', 'freebusy');
-    public $mail_types = array('inbox', 'drafts', 'sentitems', 'outbox', 'wastebasket', 'junkemail');
+    public $subtypes   = array(
+        'mail'          => array('inbox', 'drafts', 'sentitems', 'outbox', 'wastebasket', 'junkemail'),
+        'event'         => array('default', 'confidential'),
+        'task'          => array('default', 'confidential'),
+        'journal'       => array('default'),
+        'note'          => array('default'),
+        'contact'       => array('default'),
+        'configuration' => array('default'),
+        'file'          => array('default'),
+        'freebusy'      => array('default'),
+    );
     public $act_types  = array('event', 'task');
 
     private $rc;
@@ -248,6 +258,7 @@
         // build type SELECT fields
         $type_select = new html_select(array('name' => '_ctype', 'id' => '_ctype'));
         $sub_select  = new html_select(array('name' => '_subtype', 'id' => '_subtype'));
+        $sub_select->add('', '');
 
         foreach ($this->types as $type) {
             $type_select->add($this->gettext('foldertype'.$type), $type);
@@ -257,10 +268,14 @@
             $type_select->add($ctype, $ctype);
         }
 
-        $sub_select->add('', '');
-        $sub_select->add($this->gettext('default'), 'default');
-        foreach ($this->mail_types as $type) {
-            $sub_select->add($this->gettext($type), $type);
+        $sub_types = array();
+        foreach ($this->subtypes as $ftype => $subtypes) {
+            $sub_types[$ftype] = array_combine($subtypes, array_map(array($this, 'gettext'), $subtypes));
+
+            // fill options for the current folder type
+            if ($ftype == $ctype || $ftype == $new_ctype) {
+                $sub_select->add(array_values($sub_types[$ftype]), $subtypes);
+            }
         }
 
         $args['form']['props']['fieldsets']['settings']['content']['foldertype'] = array(
@@ -269,6 +284,9 @@
                 . $sub_select->show(isset($new_subtype) ? $new_subtype : $subtype),
         );
 
+        $this->rc->output->set_env('kolab_folder_subtypes', $sub_types);
+        $this->rc->output->set_env('kolab_folder_subtype', isset($new_subtype) ? $new_subtype : $subtype);
+
         return $args;
     }
 
@@ -312,7 +330,7 @@
             }
         }
         // Subtype sanity-checks
-        else if ($subtype && ($ctype != 'mail' || !in_array($subtype, $this->mail_types))) {
+        else if ($subtype && (!($subtypes = $this->subtypes[$ctype]) || !in_array($subtype, $subtypes))) {
             $subtype = '';
         }

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

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

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

@@ -217,9 +217,15 @@
                     ''
                 ) .
                 html::span('handle', '') .
-                (isset($prop['subscribed']) ?
-                    html::a(array('href' => '#', 'class' => 'subscribed', 'title' => $this->plugin->gettext('foldersubscribe'), 'role' => 'checkbox', 'aria-checked' => $prop['subscribed'] ? 'true' : 'false'), ' ') :
-                    ''
+                html::span('actions',
+                    (!$prop['default'] ?
+                        html::a(array('href' => '#', 'class' => 'remove', 'title' => $this->plugin->gettext('removelist')), ' ') :
+                        ''
+                    ) .
+                    (isset($prop['subscribed']) ?
+                        html::a(array('href' => '#', 'class' => 'subscribed', 'title' => $this->plugin->gettext('foldersubscribe'), 'role' => 'checkbox', 'aria-checked' => $prop['subscribed'] ? 'true' : 'false'), ' ') :
+                        ''
+                    )
                 )
             )
         );

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

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

@@ -59,6 +59,7 @@
         }, false);
         rcmail.register_command('list-create', function(){ list_edit_dialog(null); }, true);
         rcmail.register_command('list-edit', function(){ list_edit_dialog(me.selected_list); }, false);
+        rcmail.register_command('list-delete', function(){ list_delete(me.selected_list); }, false);
         rcmail.register_command('list-remove', function(){ list_remove(me.selected_list); }, false);
         rcmail.register_command('list-sort', list_set_sort, true);
         rcmail.register_command('save', save_note, true);
@@ -112,7 +113,8 @@
             var id = node.id;
             if (me.notebooks[id] && id != me.selected_list) {
                 warn_unsaved_changes(function(){
-                    rcmail.enable_command('createnote', 'list-edit', 'list-remove', me.notebooks[id].editable);
+                    rcmail.enable_command('createnote', 'list-edit', 'list-delete', me.notebooks[id].editable);
+                    rcmail.enable_command('list-remove', !me.notebooks[id].default);
                     fetch_notes(id);  // sets me.selected_list
                 },
                 function(){
@@ -128,6 +130,11 @@
                 rcmail.http_post('list', { _do:'subscribe', _list:{ id:p.id, permanent:list.subscribed?1:0 } });
             }
         });
+        notebookslist.addEventListener('remove', function(p) {
+            if (me.notebooks[p.id] && !me.notebooks[p.id].default) {
+                list_remove(p.id);
+            }
+        });
         notebookslist.addEventListener('insert-item', function(p) {
             var list = p.data;
             if (list && list.id && !list.virtual) {
@@ -554,11 +561,10 @@
         }
     }
 
-
     /**
      * 
      */
-    function list_remove(id)
+    function list_delete(id)
     {
         var list = me.notebooks[id];
         if (list && confirm(rcmail.gettext('deletenotebookconfirm', 'kolab_notes'))) {
@@ -568,6 +574,17 @@
     }
 
     /**
+     * 
+     */
+    function list_remove(id)
+    {
+        if (me.notebooks[id]) {
+            list_destroy(me.notebooks[id]);
+            rcmail.http_post('list', { _do:'subscribe', _list:{ id:id, permanent:0, recursive:1 } });
+        }
+    }
+
+    /**
      * Callback from server on list delete command
      */
     function list_destroy(prop)

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

@@ -325,7 +325,8 @@
 	position: relative;
 }
 
-.notesview #notebooks li > div.folder {
+.notesview #notebooks li > div.folder,
+.notesview #notebooksbox .searchresults li > div.folder {
 	position: relative;
 	padding: 0;
 	height: 28px;
@@ -354,11 +355,37 @@
 	padding-top: 3px;
 }
 
-.notesview #notebooksbox .treelist li a.subscribed {
+.notesview #notebooksbox .treelist div span.actions {
 	display: inline-block;
 	position: absolute;
-	top: 6px;
-	right: 5px;
+	top: 2px;
+	right: 2px;
+	padding: 5px 20px 0 6px;
+	min-width: 20px;
+	height: 19px;
+	text-align: right;
+}
+
+.notesview #notebooksbox .treelist div:hover span.actions {
+	top: 1px;
+	right: 1px;
+	border: 1px solid #c6c6c6;
+	border-radius: 4px;
+	background: #f7f7f7;
+	background: -moz-linear-gradient(top, #f9f9f9 0%, #e6e6e6 100%);
+	background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#f9f9f9), color-stop(100%,#e6e6e6));
+	background: -o-linear-gradient(top, #f9f9f9 0%, #e6e6e6 100%);
+	background: -ms-linear-gradient(top, #f9f9f9 0%, #e6e6e6 100%);
+	background: linear-gradient(top, #f9f9f9 0%, #e6e6e6 100%);
+	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#f9f9f9', endColorstr='#e6e6e6', GradientType=0);
+}
+
+.notesview #notebooksbox .treelist div a.remove,
+.notesview #notebooksbox .treelist div a.subscribed {
+	display: inline-block;
+	position: absolute;
+	top: 5px;
+	right: 4px;
 	height: 16px;
 	width: 16px;
 	padding: 0;
@@ -368,20 +395,37 @@
 	cursor: pointer;
 }
 
-.notesview #notebooksbox .treelist div > a.subscribed:focus,
-.notesview #notebooksbox .treelist div:hover > a.subscribed {
-	background-position: 2px -266px;
+.notesview #notebooksbox .treelist div a.subscribed:focus,
+.notesview #notebooksbox .treelist div:hover a.subscribed {
+	background-position: 0 -266px;
 }
 
 .notesview #notebooksbox .treelist div.subscribed a.subscribed {
 	background-position: -16px -266px;
 }
 
-.notesview #notebooksbox .treelist li a.subscribed:focus {
+.notesview #notebooksbox .treelist div a.remove {
+	position: relative;
+	top: 0;
+	left: 0;
+	margin-right: 4px;
+}
+
+.notesview #notebooksbox .treelist div a.remove:focus,
+.notesview #notebooksbox .treelist div:hover a.remove {
+	background-position: 0 -284px;
+}
+
+.notesview #notebooksbox .treelist div a.remove:focus,
+.notesview #notebooksbox .treelist div a.subscribed:focus {
 	border-radius: 3px;
 	outline: 2px solid rgba(30,150,192, 0.5);
 }
 
+.notesview #notebooksbox .searchresults .treelist div a.remove {
+	display: none;
+}
+
 .notesview #notebooksbox .treelist input {
 	position: absolute;
 	top: 4px;

roundcubemail-plugins-kolab-3.2.tar.gz/plugins/kolab_notes/skins/larry/sprites.png Changed

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

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

@@ -361,6 +361,7 @@
       return array(
           'uid' => $event['uid'],
           'id' => asciiwords($event['uid'], true),
+          'existing' => $existing ? true : false,
           'saved' => $existing ? true : false,
           'latest' => $latest,
           'status' => $status,
@@ -372,7 +373,7 @@
     /**
      * Build inline UI elements for iTip messages
      */
-    public function mail_itip_inline_ui($event, $method, $mime_id, $task, $message_date = null)
+    public function mail_itip_inline_ui($event, $method, $mime_id, $task, $message_date = null, $preview_url = null)
     {
         $buttons = array();
         $dom_id = asciiwords($event['uid'], true);
@@ -433,6 +434,11 @@
             $emails = $this->lib->get_user_emails();
             $title = $event['sequence'] > 0 ? $this->gettext('itipupdate') : $this->gettext('itipinvitation');
             $metadata['rsvp'] = true;
+            $metadata['sensitivity'] = $event['sensitivity'];
+
+            if (is_object($event['start'])) {
+                $metadata['date'] = $event['start']->format('U');
+            }
 
             // check for X-KOLAB-INVITATIONTYPE property and only show accept/decline buttons
             if (self::get_custom_property($event, 'X-KOLAB-INVITATIONTYPE') == 'CONFIRMATION') {
@@ -450,6 +456,17 @@
                 ));
             }
 
+            // add button to open calendar/preview
+            if (!empty($preview_url)) {
+              $msgref = $this->lib->ical_message->folder . '/' . $this->lib->ical_message->uid . '#' . $mime_id;
+              $rsvp_buttons .= html::tag('input', array(
+                  'type' => 'button',
+                  'class' => "button preview",
+                  'onclick' => "rcube_libcalendaring.open_itip_preview('" . JQ($preview_url) . "', '" . JQ($msgref) . "')",
+                  'value' => $this->gettext('openpreview'),
+              ));
+            }
+
             // 2. update the local copy with minor changes
             $update_button = html::tag('input', array(
                 'type' => 'button',
@@ -606,6 +623,10 @@
             $table->add('label', $this->plugin->gettext('location'), $this->domain);
             $table->add('location', Q($event['location']));
         }
+        if ($event['sensitivity'] && $event['sensitivity'] != 'public') {
+            $table->add('label', $this->plugin->gettext('sensitivity'), $this->domain);
+            $table->add('sensitivity', ucfirst($this->plugin->gettext($event['sensitivity'])) . '!');
+        }
         if ($event['comment']) {
             $table->add('label', $this->plugin->gettext('comment'), $this->domain);
             $table->add('location', Q($event['comment']));

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

@@ -892,6 +892,7 @@
 rcube_libcalendaring.update_itip_object_status = function(p)
 {
   rcmail.env.rsvp_saved = p.saved;
+  rcmail.env.itip_existing = p.existing;
 
   // hide all elements first
   $('#itip-buttons-'+p.id+' > div').hide();
@@ -911,6 +912,20 @@
  
   // show rsvp/import buttons (with calendar selector)
   $('#'+p.action+'-'+p.id).show().find('input.button').last().after(p.select);
+
+  // show itip box appendix after replacing the given placeholders
+  if (p.append && p.append.selector) {
+    var elem = $(p.append.selector);
+    if (p.append.replacements) {
+      $.each(p.append.replacements, function(k, html) {
+        elem.html(elem.html().replace(k, html));
+      });
+    }
+    else if (p.append.html) {
+      elem.html(p.append.html)
+    }
+    elem.show();
+  }
 };
 
 /**
@@ -953,6 +968,17 @@
   }
 };
 
+/**
+ * Open the calendar preview for the current iTip event
+ */
+rcube_libcalendaring.open_itip_preview = function(url, msgref)
+{
+  if (!rcmail.env.itip_existing)
+    url += '&itip=' + escape(msgref);
+
+  var win = rcmail.open_window(url);
+};
+
 
 // extend jQuery
 (function($){

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

@@ -50,12 +50,14 @@
     private $forward_exceptions;
     private $vhead;
     private $fp;
+    private $vtimezones = array();
 
     public $method;
     public $agent = '';
     public $objects = array();
     public $freebusy = array();
 
+
     /**
      * Default constructor
      */
@@ -106,6 +108,7 @@
         $this->method = '';
         $this->objects = array();
         $this->freebusy = array();
+        $this->vtimezones = array();
         $this->iteratorkey = 0;
 
         if ($this->fp) {
@@ -791,13 +794,26 @@
      * @param string Property name
      * @param object DateTime
      */
-    public static function datetime_prop($name, $dt, $utc = false, $dateonly = null)
+    public function datetime_prop($name, $dt, $utc = false, $dateonly = null)
     {
         $is_utc = $utc || (($tz = $dt->getTimezone()) && in_array($tz->getName(), array('UTC','GMT','Z')));
         $is_dateonly = $dateonly === null ? (bool)$dt->_dateonly : (bool)$dateonly;
         $vdt = new VObject\Property\DateTime($name);
         $vdt->setDateTime($dt, $is_dateonly ? VObject\Property\DateTime::DATE :
             ($is_utc ? VObject\Property\DateTime::UTC : VObject\Property\DateTime::LOCALTZ));
+
+        // register timezone for VTIMEZONE block
+        if (!$is_utc && !$dateonly && $tz && ($tzname = $tz->getName())) {
+            $ts = $dt->format('U');
+            if (is_array($this->vtimezones[$tzname])) {
+                $this->vtimezones[$tzname][0] = min($this->vtimezones[$tzname][0], $ts);
+                $this->vtimezones[$tzname][1] = max($this->vtimezones[$tzname][1], $ts);
+            }
+            else {
+                $this->vtimezones[$tzname] = array($ts, $ts);
+            }
+        }
+
         return $vdt;
     }
 
@@ -834,9 +850,10 @@
      * @param  string  VCalendar method to advertise
      * @param  boolean Directly send data to stdout instead of returning
      * @param  callable Callback function to fetch attachment contents, false if no attachment export
+     * @param  boolean Add VTIMEZONE block with timezone definitions for the included events
      * @return string  Events in iCalendar format (http://tools.ietf.org/html/rfc5545)
      */
-    public function export($objects, $method = null, $write = false, $get_attachment = false, $recurrence_id = null)
+    public function export($objects, $method = null, $write = false, $get_attachment = false, $with_timezones = true)
     {
         $memory_limit = parse_bytes(ini_get('memory_limit'));
         $this->method = $method;
@@ -851,8 +868,6 @@
             $vcal->METHOD = $method;
         }
 
-        // TODO: include timezone information
-
         // write vcalendar header
         if ($write) {
             echo preg_replace('/END:VCALENDAR[\r\n]*$/m', '', $vcal->serialize());
@@ -862,6 +877,23 @@
             $this->_to_ical($object, !$write?$vcal:false, $get_attachment);
         }
 
+        // include timezone information
+        if ($with_timezones || !empty($method)) {
+            foreach ($this->vtimezones as $tzid => $range) {
+                $vt = self::get_vtimezone($tzid, $range[0], $range[1]);
+                if (empty($vt)) {
+                    continue;  // no timezone information found
+                }
+
+                if ($vcal) {
+                    $vcal->add($vt);
+                }
+                else {
+                    echo $vt->serialize();
+                }
+            }
+        }
+
         if ($write) {
             echo "END:VCALENDAR\r\n";
             return true;
@@ -887,7 +919,7 @@
 
         // set DTSTAMP according to RFC 5545, 3.8.7.2.
         $dtstamp = !empty($event['changed']) && !empty($this->method) ? $event['changed'] : new DateTime();
-        $ve->add(self::datetime_prop('DTSTAMP', $dtstamp, true));
+        $ve->add($this->datetime_prop('DTSTAMP', $dtstamp, true));
 
         // all-day events end the next day
         if ($event['allday'] && !empty($event['end'])) {
@@ -896,15 +928,15 @@
             $event['end']->_dateonly = true;
         }
         if (!empty($event['created']))
-            $ve->add(self::datetime_prop('CREATED', $event['created'], true));
+            $ve->add($this->datetime_prop('CREATED', $event['created'], true));
         if (!empty($event['changed']))
-            $ve->add(self::datetime_prop('LAST-MODIFIED', $event['changed'], true));
+            $ve->add($this->datetime_prop('LAST-MODIFIED', $event['changed'], true));
         if (!empty($event['start']))
-            $ve->add(self::datetime_prop('DTSTART', $event['start'], false, (bool)$event['allday']));
+            $ve->add($this->datetime_prop('DTSTART', $event['start'], false, (bool)$event['allday']));
         if (!empty($event['end']))
-            $ve->add(self::datetime_prop('DTEND',   $event['end'], false, (bool)$event['allday']));
+            $ve->add($this->datetime_prop('DTEND',   $event['end'], false, (bool)$event['allday']));
         if (!empty($event['due']))
-            $ve->add(self::datetime_prop('DUE',   $event['due'], false));
+            $ve->add($this->datetime_prop('DUE',   $event['due'], false));
 
         if ($recurrence_id)
             $ve->add($recurrence_id);
@@ -944,7 +976,7 @@
             }
             // add RDATEs
             if (!empty($rdates)) {
-                $sample = self::datetime_prop('RDATE', $rdates[0]);
+                $sample = $this->datetime_prop('RDATE', $rdates[0]);
                 $rdprop = new VObject\Property\MultiDateTime('RDATE', null);
                 $rdprop->setDateTimes($rdates, $sample->getDateType());
                 $ve->add($rdprop);
@@ -985,7 +1017,7 @@
             $ve->add('PERCENT-COMPLETE', intval($event['complete']));
             // Apple iCal required the COMPLETED date to be set in order to consider a task complete
             if ($event['complete'] == 100)
-                $ve->add(self::datetime_prop('COMPLETED', $event['changed'] ?: new DateTime('now - 1 hour'), true));
+                $ve->add($this->datetime_prop('COMPLETED', $event['changed'] ?: new DateTime('now - 1 hour'), true));
         }
 
         if ($event['valarms']) {
@@ -993,7 +1025,7 @@
                 $va = VObject\Component::create('VALARM');
                 $va->action = $alarm['action'];
                 if ($alarm['trigger'] instanceof DateTime) {
-                    $va->add(self::datetime_prop('TRIGGER', $alarm['trigger'], true));
+                    $va->add($this->datetime_prop('TRIGGER', $alarm['trigger'], true));
                 }
                 else {
                     $va->add('TRIGGER', $alarm['trigger']);
@@ -1028,7 +1060,7 @@
             if ($val[3])
                 $va->add('TRIGGER', $val[3]);
             else if ($val[0] instanceof DateTime)
-                $va->add(self::datetime_prop('TRIGGER', $val[0]));
+                $va->add($this->datetime_prop('TRIGGER', $val[0]));
             $ve->add($va);
         }
 
@@ -1111,7 +1143,7 @@
             foreach ($event['recurrence']['EXCEPTIONS'] as $ex) {
                 $exdate = clone $event['start'];
                 $exdate->setDate($ex['start']->format('Y'), $ex['start']->format('n'), $ex['start']->format('j'));
-                $recurrence_id = self::datetime_prop('RECURRENCE-ID', $exdate, true);
+                $recurrence_id = $this->datetime_prop('RECURRENCE-ID', $exdate, true);
                 // if ($ex['thisandfuture'])  // not supported by any client :-(
                 //    $recurrence_id->add('RANGE', 'THISANDFUTURE');
                 $this->_to_ical($ex, $vcal, $get_attachment, $recurrence_id);
@@ -1119,6 +1151,95 @@
         }
     }
 
+    /**
+     * Returns a VTIMEZONE component for a Olson timezone identifier
+     * with daylight transitions covering the given date range.
+     *
+     * @param string Timezone ID as used in PHP's Date functions
+     * @param integer Unix timestamp with first date/time in this timezone
+     * @param integer Unix timestap with last date/time in this timezone
+     *
+     * @return mixed A Sabre\VObject\Component object representing a VTIMEZONE definition
+     *               or false if no timezone information is available
+     */
+    public static function get_vtimezone($tzid, $from = 0, $to = 0)
+    {
+        if (!$from) $from = time();
+        if (!$to)   $to = $from;
+
+        if (is_string($tzid)) {
+            try {
+                $tz = new \DateTimeZone($tzid);
+            }
+            catch (\Exception $e) {
+                return false;
+            }
+        }
+        else if (is_a($tzid, '\\DateTimeZone')) {

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

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

@@ -327,7 +327,7 @@
     /**
      * Test for iCal export from internal hash array representation
      *
-     * @depends test_extended
+     * 
      */
     function test_export()
     {
@@ -343,12 +343,20 @@
         $event['attachments'][0]['id'] = '1';
         $event['description'] = '*Exported by libvcalendar*';
 
-        $ics = $ical->export(array($event), 'REQUEST', false, array($this, 'get_attachment_data'));
+        $event['start']->setTimezone(new DateTimezone('Europe/Berlin'));
+        $event['end']->setTimezone(new DateTimezone('Europe/Berlin'));
+
+        $ics = $ical->export(array($event), 'REQUEST', false, array($this, 'get_attachment_data'), true);
 
         $this->assertContains('BEGIN:VCALENDAR',    $ics, "VCALENDAR encapsulation BEGIN");
-        $this->assertContains('METHOD:REQUEST',     $ics, "iTip method");
-        $this->assertContains('BEGIN:VEVENT',       $ics, "VEVENT encapsulation BEGIN");
 
+        $this->assertContains('BEGIN:VTIMEZONE', $ics, "VTIMEZONE encapsulation BEGIN");
+        $this->assertContains('TZID:Europe/Berlin', $ics, "Timezone ID");
+        $this->assertContains('TZOFFSETFROM:+0100', $ics, "Timzone transition FROM");
+        $this->assertContains('TZOFFSETTO:+0200', $ics, "Timzone transition TO");
+        $this->assertContains('END:VTIMEZONE', $ics, "VTIMEZONE encapsulation END");
+
+        $this->assertContains('BEGIN:VEVENT',       $ics, "VEVENT encapsulation BEGIN");
         $this->assertContains('UID:ac6b0aee-2519-4e5c-9a25-48c57064c9f0', $ics, "Event UID");
         $this->assertContains('SEQUENCE:' . $event['sequence'],           $ics, "Export Sequence number");
         $this->assertContains('CLASS:CONFIDENTIAL',                       $ics, "Sensitivity => Class");
@@ -471,10 +479,11 @@
 
     function test_datetime()
     {
-        $localtime = libvcalendar::datetime_prop('DTSTART', new DateTime('2013-09-01 12:00:00', new DateTimeZone('Europe/Berlin')));
-        $localdate = libvcalendar::datetime_prop('DTSTART', new DateTime('2013-09-01', new DateTimeZone('Europe/Berlin')), false, true);
-        $utctime   = libvcalendar::datetime_prop('DTSTART', new DateTime('2013-09-01 12:00:00', new DateTimeZone('UTC')));
-        $asutctime = libvcalendar::datetime_prop('DTSTART', new DateTime('2013-09-01 12:00:00', new DateTimeZone('Europe/Berlin')), true);
+        $ical = new libvcalendar();
+        $localtime = $ical->datetime_prop('DTSTART', new DateTime('2013-09-01 12:00:00', new DateTimeZone('Europe/Berlin')));
+        $localdate = $ical->datetime_prop('DTSTART', new DateTime('2013-09-01', new DateTimeZone('Europe/Berlin')), false, true);
+        $utctime   = $ical->datetime_prop('DTSTART', new DateTime('2013-09-01 12:00:00', new DateTimeZone('UTC')));
+        $asutctime = $ical->datetime_prop('DTSTART', new DateTime('2013-09-01 12:00:00', new DateTimeZone('Europe/Berlin')), true);
 
         $this->assertContains('TZID=Europe/Berlin', $localtime->serialize());
         $this->assertContains('VALUE=DATE', $localdate->serialize());
@@ -482,6 +491,44 @@
         $this->assertContains('20130901T100000Z', $asutctime->serialize());
     }
 
+    function test_get_vtimezone()
+    {
+        $vtz = libvcalendar::get_vtimezone('Europe/Berlin', strtotime('2014-08-22T15:00:00+02:00'));
+        $this->assertInstanceOf('\Sabre\VObject\Component', $vtz, "VTIMEZONE is a Component object");
+        $this->assertEquals('Europe/Berlin', $vtz->TZID);
+        $this->assertEquals('4', $vtz->{'X-MICROSOFT-CDO-TZID'});
+
+        // check for transition to daylight saving time which is BEFORE the given date
+        $dst = reset($vtz->select('DAYLIGHT'));
+        $this->assertEquals('DAYLIGHT', $dst->name);
+        $this->assertEquals('20140330T010000', $dst->DTSTART);
+        $this->assertEquals('+0100', $dst->TZOFFSETFROM);
+        $this->assertEquals('+0200', $dst->TZOFFSETTO);
+        $this->assertEquals('CEST', $dst->TZNAME);
+
+        // check (last) transition to standard time which is AFTER the given date
+        $std = end($vtz->select('STANDARD'));
+        $this->assertEquals('STANDARD', $std->name);
+        $this->assertEquals('20141026T010000', $std->DTSTART);
+        $this->assertEquals('+0200', $std->TZOFFSETFROM);
+        $this->assertEquals('+0100', $std->TZOFFSETTO);
+        $this->assertEquals('CET', $std->TZNAME);
+
+        // unknown timezone
+        $vtz = libvcalendar::get_vtimezone('America/Foo Bar');
+        $this->assertEquals(false, $vtz);
+
+        // invalid input data
+        $vtz = libvcalendar::get_vtimezone(new DateTime());
+        $this->assertEquals(false, $vtz);
+
+        // DateTimezone as input data
+        $vtz = libvcalendar::get_vtimezone(new DateTimezone('Pacific/Chatham'));
+        $this->assertInstanceOf('\Sabre\VObject\Component', $vtz);
+        $this->assertContains('TZOFFSETFROM:+1245', $vtz->serialize());
+        $this->assertContains('TZOFFSETTO:+1345', $vtz->serialize());
+    }
+
     function get_attachment_data($id, $event)
     {
         return $this->attachment_data;

roundcubemail-plugins-kolab-3.2.tar.gz/plugins/libkolab/SQL/oracle.initial.sql Added

@@ -0,0 +1,184 @@
+/**
+ * libkolab database schema
+ *
+ * @version 1.1
+ * @author Aleksander Machniak
+ * @licence GNU AGPL
+ **/
+
+
+CREATE TABLE "kolab_folders" (
+    "folder_id" number NOT NULL PRIMARY KEY,
+    "resource" VARCHAR(255) NOT NULL,
+    "type" VARCHAR(32) NOT NULL,
+    "synclock" integer DEFAULT 0 NOT NULL,
+    "ctag" VARCHAR(40) DEFAULT NULL
+);
+
+CREATE INDEX "kolab_folders_resource_idx" ON "kolab_folders" ("resource", "type");
+
+CREATE SEQUENCE "kolab_folders_seq"
+    START WITH 1 INCREMENT BY 1 NOMAXVALUE;
+
+CREATE TRIGGER "kolab_folders_seq_trig"
+BEFORE INSERT ON "kolab_folders" FOR EACH ROW
+BEGIN
+    :NEW."folder_id" := "kolab_folders_seq".nextval;
+END;
+
+
+CREATE TABLE "kolab_cache_contact" (
+    "folder_id" number NOT NULL
+        REFERENCES "kolab_folders" ("folder_id") ON DELETE CASCADE,
+    "msguid" number NOT NULL,
+    "uid" varchar(128) NOT NULL,
+    "created" timestamp DEFAULT NULL,
+    "changed" timestamp DEFAULT NULL,
+    "data" clob NOT NULL,
+    "xml" clob NOT NULL,
+    "tags" varchar(255) DEFAULT NULL,
+    "words" clob DEFAULT NULL,
+    "type" varchar(32) NOT NULL,
+    "name" varchar(255) DEFAULT NULL,
+    "firstname" varchar(255) DEFAULT NULL,
+    "surname" varchar(255) DEFAULT NULL,
+    "email" varchar(255) DEFAULT NULL,
+    PRIMARY KEY ("folder_id", "msguid")
+);
+
+CREATE INDEX "kolab_cache_contact_type_idx" ON "kolab_cache_contact" ("folder_id", "type");
+CREATE INDEX "kolab_cache_contact_uid2msguid" ON "kolab_cache_contact" ("folder_id", "uid", "msguid");
+
+
+CREATE TABLE "kolab_cache_event" (
+    "folder_id" number NOT NULL
+        REFERENCES "kolab_folders" ("folder_id") ON DELETE CASCADE,
+    "msguid" number NOT NULL,
+    "uid" varchar(128) NOT NULL,
+    "created" timestamp DEFAULT NULL,
+    "changed" timestamp DEFAULT NULL,
+    "data" clob NOT NULL,
+    "xml" clob NOT NULL,
+    "tags" varchar(255) DEFAULT NULL,
+    "words" clob DEFAULT NULL,
+    "dtstart" timestamp DEFAULT NULL,
+    "dtend" timestamp DEFAULT NULL,
+    PRIMARY KEY ("folder_id", "msguid")
+);
+
+CREATE INDEX "kolab_cache_event_uid2msguid" ON "kolab_cache_event" ("folder_id", "uid", "msguid");
+
+
+CREATE TABLE "kolab_cache_task" (
+    "folder_id" number NOT NULL
+        REFERENCES "kolab_folders" ("folder_id") ON DELETE CASCADE,
+    "msguid" number NOT NULL,
+    "uid" varchar(128) NOT NULL,
+    "created" timestamp DEFAULT NULL,
+    "changed" timestamp DEFAULT NULL,
+    "data" clob NOT NULL,
+    "xml" clob NOT NULL,
+    "tags" varchar(255) DEFAULT NULL,
+    "words" clob DEFAULT NULL,
+    "dtstart" timestamp DEFAULT NULL,
+    "dtend" timestamp DEFAULT NULL,
+    PRIMARY KEY ("folder_id", "msguid")
+);
+
+CREATE INDEX "kolab_cache_task_uid2msguid" ON "kolab_cache_task" ("folder_id", "uid", "msguid");
+
+
+CREATE TABLE "kolab_cache_journal" (
+    "folder_id" number NOT NULL
+        REFERENCES "kolab_folders" ("folder_id") ON DELETE CASCADE,
+    "msguid" number NOT NULL,
+    "uid" varchar(128) NOT NULL,
+    "created" timestamp DEFAULT NULL,
+    "changed" timestamp DEFAULT NULL,
+    "data" clob NOT NULL,
+    "xml" clob NOT NULL,
+    "tags" varchar(255) DEFAULT NULL,
+    "words" clob DEFAULT NULL,
+    "dtstart" timestamp DEFAULT NULL,
+    "dtend" timestamp DEFAULT NULL,
+    PRIMARY KEY ("folder_id", "msguid")
+);
+
+CREATE INDEX "kolab_cache_journal_uid2msguid" ON "kolab_cache_journal" ("folder_id", "uid", "msguid");
+
+
+CREATE TABLE "kolab_cache_note" (
+    "folder_id" number NOT NULL
+        REFERENCES "kolab_folders" ("folder_id") ON DELETE CASCADE,
+    "msguid" number NOT NULL,
+    "uid" varchar(128) NOT NULL,
+    "created" timestamp DEFAULT NULL,
+    "changed" timestamp DEFAULT NULL,
+    "data" clob NOT NULL,
+    "xml" clob NOT NULL,
+    "tags" varchar(255) DEFAULT NULL,
+    "words" clob DEFAULT NULL,
+    PRIMARY KEY ("folder_id", "msguid")
+);
+
+CREATE INDEX "kolab_cache_note_uid2msguid" ON "kolab_cache_note" ("folder_id", "uid", "msguid");
+
+
+CREATE TABLE "kolab_cache_file" (
+    "folder_id" number NOT NULL
+        REFERENCES "kolab_folders" ("folder_id") ON DELETE CASCADE,
+    "msguid" number NOT NULL,
+    "uid" varchar(128) NOT NULL,
+    "created" timestamp DEFAULT NULL,
+    "changed" timestamp DEFAULT NULL,
+    "data" clob NOT NULL,
+    "xml" clob NOT NULL,
+    "tags" varchar(255) DEFAULT NULL,
+    "words" clob DEFAULT NULL,
+    "filename" varchar(255) DEFAULT NULL,
+    PRIMARY KEY ("folder_id", "msguid")
+);
+
+CREATE INDEX "kolab_cache_file_filename" ON "kolab_cache_file" ("folder_id", "filename");
+CREATE INDEX "kolab_cache_file_uid2msguid" ON "kolab_cache_file" ("folder_id", "uid", "msguid");
+
+
+CREATE TABLE "kolab_cache_configuration" (
+    "folder_id" number NOT NULL
+        REFERENCES "kolab_folders" ("folder_id") ON DELETE CASCADE,
+    "msguid" number NOT NULL,
+    "uid" varchar(128) NOT NULL,
+    "created" timestamp DEFAULT NULL,
+    "changed" timestamp DEFAULT NULL,
+    "data" clob NOT NULL,
+    "xml" clob NOT NULL,
+    "tags" varchar(255) DEFAULT NULL,
+    "words" clob DEFAULT NULL,
+    "type" varchar(32) NOT NULL,
+    PRIMARY KEY ("folder_id", "msguid")
+);
+
+CREATE INDEX "kolab_cache_config_type" ON "kolab_cache_configuration" ("folder_id", "type");
+CREATE INDEX "kolab_cache_config_uid2msguid" ON "kolab_cache_configuration" ("folder_id", "uid", "msguid");
+
+
+CREATE TABLE "kolab_cache_freebusy" (
+    "folder_id" number NOT NULL
+        REFERENCES "kolab_folders" ("folder_id") ON DELETE CASCADE,
+    "msguid" number NOT NULL,
+    "uid" varchar(128) NOT NULL,
+    "created" timestamp DEFAULT NULL,
+    "changed" timestamp DEFAULT NULL,
+    "data" clob NOT NULL,
+    "xml" clob NOT NULL,
+    "tags" varchar(255) DEFAULT NULL,
+    "words" clob DEFAULT NULL,
+    "dtstart" timestamp DEFAULT NULL,
+    "dtend" timestamp DEFAULT NULL,
+    PRIMARY KEY("folder_id", "msguid")
+);
+
+CREATE INDEX "kolab_cache_fb_uid2msguid" ON "kolab_cache_freebusy" ("folder_id", "uid", "msguid");
+
+
+INSERT INTO "system" ("name", "value") VALUES ('libkolab-version', '2014021000');

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

@@ -68,7 +68,7 @@
                           id = li.attr('id').replace(new RegExp('^'+p.id_prefix), '');
                       if (p.id_decode)
                           id = p.id_decode(id);
-                      node = search_results_widget.get_node(id),
+                      node = search_results_widget.get_node(id);
                       has_children = node.children && node.children.length;
 
                       e.stopPropagation();
@@ -81,6 +81,11 @@
                           li.children().first()
                               .toggleClass('subscribed')
                               .find('input[type=checkbox]').get(0).checked = true;
+
+                          if (has_children && search_results[id].group == 'other user') {
+                              li.find('ul li > div').addClass('subscribed')
+                                  .find('a.subscribed').attr('aria-checked', 'true');;
+                          }
                       }
                       else if (!this.checked) {
                           return;
@@ -97,6 +102,11 @@
                           li.remove();
                       }
 
+                      // set partial subscription status
+                      if (search_results[id].subscribed && search_results[id].parent && search_results[id].group == 'other') {
+                          parent_subscription_status($(me.get_item(id, true)));
+                      }
+
                       // set focus to cloned checkbox
                       if (rcube_event.is_keyboard(e)) {
                         $(me.get_item(id, true)).find('input[type=checkbox]').first().focus();
@@ -149,7 +159,8 @@
             prop = search_results[id],
             parent_id = prop.parent || null,
             has_children = node.children && node.children.length,
-            dom_node = has_children ? li.children().first().clone(true, true) : li.children().first();
+            dom_node = has_children ? li.children().first().clone(true, true) : li.children().first(),
+            childs = [];
 
         // find parent node and insert at the right place
         if (parent_id && me.get_node(parent_id)) {
@@ -171,18 +182,58 @@
                 .removeClass('virtual');
         }
         else {
+            // copy childs, too
+            if (has_children && prop.group == 'other user') {
+                for (var cid, j=0; j < node.children.length; j++) {
+                    if ((cid = node.children[j].id) && search_results[cid]) {
+                        childs.push(search_results_widget.get_node(cid));
+                    }
+                }
+            }
+
             // move this result item to the main list widget
             me.insert({
                 id: id,
                 classes: [ prop.group || '' ],
                 virtual: prop.virtual,
                 html: dom_node,
+                level: node.level,
+                collapsed: true,
+                children: childs
             }, parent_id, prop.group);
         }
 
         delete prop.html;
         prop.active = active;
         me.triggerEvent('insert-item', { id: id, data: prop, item: li });
+
+        // register childs, too
+        if (childs.length) {
+            for (var cid, j=0; j < node.children.length; j++) {
+                if ((cid = node.children[j].id) && search_results[cid]) {
+                    prop = search_results[cid];
+                    delete prop.html;
+                    prop.active = false;
+                    me.triggerEvent('insert-item', { id: cid, data: prop });
+                }
+            }
+        }
+    }
+
+    // update the given item's parent's (partial) subscription state
+    function parent_subscription_status(li)
+    {
+        var top_li = li.closest(me.container.children('li')),
+            all_childs = $('li > div:not(.treetoggle)', top_li),
+            subscribed = all_childs.filter('.subscribed').length;
+
+        if (subscribed == 0) {
+            top_li.children('div:first').removeClass('subscribed partial');
+        }
+        else {
+            top_li.children('div:first')
+                .addClass('subscribed')[subscribed < all_childs.length ? 'addClass' : 'removeClass']('partial');
+        }
     }
 
     // do some magic when search is performed on the widget
@@ -239,25 +290,60 @@
         }
     });
 
-    this.container.on('click', 'a.subscribed, span.subscribed', function(e){
+    this.container.on('click', 'a.subscribed, span.subscribed', function(e) {
         var li = $(this).closest('li'),
             id = li.attr('id').replace(new RegExp('^'+p.id_prefix), ''),
-            div = li.children().first();
+            div = li.children().first(),
+            is_subscribed;
 
-        if (me.is_search())
-          id = id.replace(/--xsR$/, '');
+        if (me.is_search()) {
+            id = id.replace(/--xsR$/, '');
+            li = $(me.get_item(id, true));
+            div = $(div).add(li.children().first());
+        }
 
         if (p.id_decode)
             id = p.id_decode(id);
 
         div.toggleClass('subscribed');
-        $(this).attr('aria-checked', div.hasClass('subscribed') ? 'true' : 'false');
-        me.triggerEvent('subscribe', { id: id, subscribed: div.hasClass('subscribed'), item: li });
+        is_subscribed = div.hasClass('subscribed');
+        $(this).attr('aria-checked', is_subscribed ? 'true' : 'false');
+        me.triggerEvent('subscribe', { id: id, subscribed: is_subscribed, item: li });
+
+        // update subscribe state of all 'virtual user' child folders
+        if (li.hasClass('other user')) {
+            $('ul li > div', li).each(function() {
+                $(this)[is_subscribed ? 'addClass' : 'removeClass']('subscribed');
+                $('.subscribed', div).attr('aria-checked', is_subscribed ? 'true' : 'false');
+            });
+            div.removeClass('partial');
+        }
+        // propagate subscription state to parent  'virtual user' folder
+        else if (li.closest('li.other.user').length) {
+            parent_subscription_status(li);
+        }
 
         e.stopPropagation();
         return false;
-    })
+    });
+
+    this.container.on('click', 'a.remove', function(e) {
+      var li = $(this).closest('li'),
+          id = li.attr('id').replace(new RegExp('^'+p.id_prefix), '');
+
+      if (me.is_search()) {
+          id = id.replace(/--xsR$/, '');
+          li = $(me.get_item(id, true));
+      }
 
+      if (p.id_decode)
+          id = p.id_decode(id);
+
+      me.triggerEvent('remove', { id: id, item: li });
+
+      e.stopPropagation();
+      return false;
+    });
 }
 
 // link prototype from base class

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

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

@@ -1049,7 +1049,8 @@
                         foreach ((array)self::$imap->get_metadata('%', $type_keys) as $folder => $metadata) {
                             if (!in_array($folder, $blacklist)) {
                                 $folderdata[$folder] = $metadata;
-                                if ($data = self::$imap->get_metadata($folder.$delimiter.'*', $type_keys)) {
+                                $opts = self::$imap->folder_attributes($folder);
+                                if (!in_array('\\HasNoChildren', $opts) && ($data = self::$imap->get_metadata($folder.$delimiter.'*', $type_keys))) {
                                     $folderdata += $data;
                                 }
                             }
@@ -1104,8 +1105,10 @@
         self::setup();
 
         // return in-memory cached result
-        if (is_array(self::$typedata['*']) && array_key_exists($folder, self::$typedata['*'])) {
-            return self::$typedata['*'][$folder];
+        foreach (self::$typedata as $typedata) {
+            if (array_key_exists($folder, $typedata)) {
+                return $typedata[$folder];
+            }
         }
 
         $metadata = self::$imap->get_metadata($folder, array(self::CTYPE_KEY, self::CTYPE_KEY_PRIVATE));
@@ -1534,6 +1537,16 @@
                     $folders[$foldername] = new kolab_storage_folder_user($foldername, $other_ns);
                 }
             }
+
+            // for every (subscribed) user folder, list all (unsubscribed) subfolders
+            foreach ($folders as $userfolder) {
+                foreach ((array)self::list_folders($userfolder->name . $delimiter, '*', $type, false, $folderdata) as $foldername) {
+                    if (!$folders[$foldername]) {
+                        $folders[$foldername] = new kolab_storage_folder($foldername, $folderdata[$foldername]);
+                        $userfolder->children[] = $folders[$foldername];
+                    }
+                }
+            }
         }
 
         return $folders;
@@ -1549,8 +1562,6 @@
     {
         $db = rcmail::get_instance()->get_dbh();
         $prefix = 'imap://' . urlencode($args['username']) . '@' . $args['host'] . '/%';
-        $db->query("DELETE FROM " . $db->table_name('kolab_folders') . " WHERE resource LIKE ?", $prefix);
+        $db->query("DELETE FROM " . $db->table_name('kolab_folders', true) . " WHERE `resource` LIKE ?", $prefix);
     }
-
 }
-

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

@@ -96,8 +96,8 @@
      */
     public function select_by_id($folder_id)
     {
-        $folders_table = $this->db->table_name('kolab_folders');
-        $sql_arr = $this->db->fetch_assoc($this->db->query("SELECT * FROM $folders_table WHERE folder_id=?", $folder_id));
+        $folders_table = $this->db->table_name('kolab_folders', true);
+        $sql_arr = $this->db->fetch_assoc($this->db->query("SELECT * FROM $folders_table WHERE `folder_id` = ?", $folder_id));
         if ($sql_arr) {
             $this->metadata = $sql_arr;
             $this->folder_id = $sql_arr['folder_id'];
@@ -188,7 +188,7 @@
 
                     // read cache index
                     $sql_result = $this->db->query(
-                        "SELECT msguid, uid FROM $this->cache_table WHERE folder_id=?",
+                        "SELECT `msguid`, `uid` FROM `{$this->cache_table}` WHERE `folder_id` = ?",
                         $this->folder_id
                     );
 
@@ -211,7 +211,7 @@
                     if (!empty($del_index)) {
                         $quoted_ids = join(',', array_map(array($this->db, 'quote'), $del_index));
                         $this->db->query(
-                            "DELETE FROM $this->cache_table WHERE folder_id=? AND msguid IN ($quoted_ids)",
+                            "DELETE FROM `{$this->cache_table}` WHERE `folder_id` = ? AND `msguid` IN ($quoted_ids)",
                             $this->folder_id
                         );
                     }
@@ -252,8 +252,8 @@
                 $this->_read_folder_data();
 
                 $sql_result = $this->db->query(
-                    "SELECT * FROM $this->cache_table ".
-                    "WHERE folder_id=? AND msguid=?",
+                    "SELECT * FROM `{$this->cache_table}` ".
+                    "WHERE `folder_id` = ? AND `msguid` = ?",
                     $this->folder_id,
                     $msguid
                 );
@@ -298,7 +298,7 @@
         // remove old entry
         if ($this->ready) {
             $this->_read_folder_data();
-            $this->db->query("DELETE FROM $this->cache_table WHERE folder_id=? AND msguid=?",
+            $this->db->query("DELETE FROM `{$this->cache_table}` WHERE `folder_id` = ? AND `msguid` = ?",
                 $this->folder_id, $msguid);
         }
 
@@ -345,13 +345,13 @@
                     $cols[$idx] = "$col = ?";
                 }
 
-                $query = "UPDATE $this->cache_table SET " . implode(', ', $cols)
-                    . " WHERE folder_id = ? AND msguid = ?";
+                $query = "UPDATE `{$this->cache_table}` SET " . implode(', ', $cols)
+                    . " WHERE `folder_id` = ? AND `msguid` = ?";
                 $args[] = $this->folder_id;
                 $args[] = $olduid;
             }
             else {
-                $query = "INSERT INTO $this->cache_table (created, " . implode(', ', $cols)
+                $query = "INSERT INTO `{$this->cache_table}` (`created`, " . implode(', ', $cols)
                     . ") VALUES (" . $this->db->now() . str_repeat(', ?', count($cols)) . ")";
             }
 
@@ -388,8 +388,8 @@
                 $this->_read_folder_data();
 
                 $this->db->query(
-                    "UPDATE $this->cache_table SET folder_id=?, msguid=? ".
-                    "WHERE folder_id=? AND msguid=?",
+                    "UPDATE `{$this->cache_table}` SET `folder_id` = ?, `msguid` = ? ".
+                    "WHERE `folder_id` = ? AND `msguid` = ?",
                     $target->cache->get_folder_id(),
                     $new_msguid,
                     $this->folder_id,
@@ -421,7 +421,7 @@
         $this->_read_folder_data();
 
         $result = $this->db->query(
-            "DELETE FROM $this->cache_table WHERE folder_id=?",
+            "DELETE FROM `{$this->cache_table}` WHERE `folder_id` = ?",
             $this->folder_id
         );
 
@@ -443,8 +443,8 @@
 
         // resolve new message UID in target folder
         $this->db->query(
-            "UPDATE $this->folders_table SET resource=? ".
-            "WHERE resource=?",
+            "UPDATE `{$this->folders_table}` SET `resource` = ? ".
+            "WHERE `resource` = ?",
             $target->get_resource_uri(),
             $this->resource_uri
         );
@@ -468,8 +468,8 @@
 
             // fetch full object data on one query if a small result set is expected
             $fetchall = !$uids && ($this->limit ? $this->limit[0] : $this->count($query)) < 500;
-            $sql_query = "SELECT " . ($fetchall ? '*' : 'msguid AS _msguid, uid') . " FROM $this->cache_table ".
-                         "WHERE folder_id=? " . $this->_sql_where($query);
+            $sql_query = "SELECT " . ($fetchall ? '*' : '`msguid` AS `_msguid`, `uid`') . " FROM `{$this->cache_table}` ".
+                         "WHERE `folder_id` = ? " . $this->_sql_where($query);
             if (!empty($this->order_by)) {
                 $sql_query .= ' ORDER BY ' . $this->order_by;
             }
@@ -551,8 +551,8 @@
             $this->_read_folder_data();
 
             $sql_result = $this->db->query(
-                "SELECT COUNT(*) AS numrows FROM $this->cache_table ".
-                "WHERE folder_id=? " . $this->_sql_where($query),
+                "SELECT COUNT(*) AS `numrows` FROM `{$this->cache_table}` ".
+                "WHERE `folder_id` = ?" . $this->_sql_where($query),
                 $this->folder_id
             );
 
@@ -593,7 +593,7 @@
     public function set_order_by($sortcols)
     {
         if (!empty($sortcols)) {
-            $this->order_by = join(', ', (array)$sortcols);
+            $this->order_by = '`' . join('`, `', (array)$sortcols) . '`';
         }
         else {
             $this->order_by = null;
@@ -789,6 +789,40 @@
         $line = '';
         if ($object) {
             $sql_data = $this->_serialize($object);
+
+            // Skip multifolder insert for Oracle, we can't put long data inline
+            if ($this->db->db_provider == 'oracle') {
+                $extra_cols = '';
+                if ($this->extra_cols) {
+                    $extra_cols = array_map(function($n) { return "`{$n}`"; }, $this->extra_cols);
+                    $extra_cols = ', ' . join(', ', $extra_cols);
+                    $extra_args = str_repeat(', ?', count($this->extra_cols));
+                }
+
+                $params = array($this->folder_id, $msguid, $object['uid'], $sql_data['changed'],
+                    $sql_data['data'], $sql_data['xml'], $sql_data['tags'], $sql_data['words']);
+
+                foreach ($this->extra_cols as $col) {
+                    $params[] = $sql_data[$col];
+                }
+
+                $result = $this->db->query(
+                    "INSERT INTO `{$this->cache_table}` "
+                    . " (`folder_id`, `msguid`, `uid`, `created`, `changed`, `data`, `xml`, `tags`, `words` $extra_cols)"
+                    . " VALUES (?, ?, ?, " . $this->db->now() . ", ?, ?, ?, ?, ? $extra_args)",
+                    $params
+                );
+
+                if (!$this->db->affected_rows($result)) {
+                    rcube::raise_error(array(
+                        'code' => 900, 'type' => 'php',
+                        'message' => "Failed to write to kolab cache"
+                    ), true);
+                }
+
+                return;
+            }
+
             $values = array(
                 $this->db->quote($this->folder_id),
                 $this->db->quote($msguid),
@@ -807,12 +841,18 @@
         }
 
         if ($buffer && (!$msguid || (strlen($buffer) + strlen($line) > $this->max_sql_packet()))) {
-            $extra_cols = $this->extra_cols ? ', ' . join(', ', $this->extra_cols) : '';
+            $extra_cols = '';
+            if ($this->extra_cols) {
+                $extra_cols = array_map(function($n) { return "`{$n}`"; }, $this->extra_cols);
+                $extra_cols = ', ' . join(', ', $extra_cols);
+            }
+
             $result = $this->db->query(
-                "INSERT INTO $this->cache_table ".
-                " (folder_id, msguid, uid, created, changed, data, xml, tags, words $extra_cols)".
+                "INSERT INTO `{$this->cache_table}` ".
+                " (`folder_id`, `msguid`, `uid`, `created`, `changed`, `data`, `xml`, `tags`, `words` $extra_cols)".
                 " VALUES $buffer"
             );
+
             if (!$this->db->affected_rows($result)) {
                 rcube::raise_error(array(
                     'code' => 900, 'type' => 'php',
@@ -849,13 +889,20 @@
         if (!empty($this->folder_id) || !$this->ready)
             return;
 
-        $sql_arr = $this->db->fetch_assoc($this->db->query("SELECT folder_id, synclock, ctag FROM $this->folders_table WHERE resource=?", $this->resource_uri));
+        $sql_arr = $this->db->fetch_assoc($this->db->query(
+                "SELECT `folder_id`, `synclock`, `ctag`"
+                . " FROM `{$this->folders_table}` WHERE `resource` = ?",
+                $this->resource_uri

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

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

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

@@ -26,6 +26,7 @@
     protected static $ldapcache = array();
 
     public $ldaprec;
+    public $type;
 
     /**
      * Default constructor
@@ -85,13 +86,28 @@
     }
 
     /**
-     * Check subscription status of this folder
+     * Check subscription status of this folder.
+     * Subscription of a virtual user folder depends on the subscriptions of subfolders.
      *
      * @return boolean True if subscribed, false if not
      */
     public function is_subscribed()
     {
-        return kolab_storage::folder_is_subscribed($this->name, true);
+        if (!empty($this->type)) {
+            $children = $subscribed = 0;
+            $delimiter = $this->imap->get_hierarchy_delimiter();
+            foreach ((array)kolab_storage::list_folders($this->name . $delimiter, '*', $this->type, false) as $subfolder) {
+                if (kolab_storage::folder_is_subscribed($subfolder)) {
+                    $subscribed++;
+                }
+                $children++;
+            }
+            if ($subscribed > 0) {
+                return $subscribed == $children ? true : 2;
+            }
+        }
+
+        return false;
     }
 
     /**
@@ -103,9 +119,17 @@
      */
     public function subscribe($subscribed)
     {
-        return $subscribed ?
-            kolab_storage::folder_subscribe($this->name, true) :
-            kolab_storage::folder_unsubscribe($this->name, true);
+        $success = false;
+
+        // (un)subscribe all subfolders of a given type
+        if (!empty($this->type)) {
+            $delimiter = $this->imap->get_hierarchy_delimiter();
+            foreach ((array)kolab_storage::list_folders($this->name . $delimiter, '*', $this->type, false) as $subfolder) {
+                $success |= ($subscribed ? kolab_storage::folder_subscribe($subfolder) : kolab_storage::folder_unsubscribe($subfolder));
+            }
+        }
+
+        return $success;
     }
 
 }
\ No newline at end of file

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

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

@@ -30,6 +30,7 @@
     public $attendees   = true;
     public $undelete    = false; // task undelete action
     public $alarm_types = array('DISPLAY','AUDIO');
+    public $search_more_results;
 
     private $rc;
     private $plugin;
@@ -142,7 +143,9 @@
             'virtual' => $folder->virtual,
             'children' => true,  // TODO: determine if that folder indeed has child folders
             'subscribed' => (bool)$folder->is_subscribed(),
-            'group'    => $folder->default ? 'default' : $folder->get_namespace(),
+            'removable' => !$folder->default,
+            'subtype'  => $folder->subtype,
+            'group' => $folder->default ? 'default' : $folder->get_namespace(),
             'class' => trim($folder->get_namespace() . ($folder->default ? ' default' : '')),
         );
     }
@@ -153,7 +156,7 @@
     public function get_lists(&$tree = null)
     {
         // attempt to create a default list for this user
-        if (empty($this->lists)) {
+        if (empty($this->lists) && !isset($this->search_more_results)) {
             $prop = array('name' => 'Tasks', 'color' => '0000CC', 'default' => true);
             if ($this->create_list($prop))
                 $this->_read_lists(true);
@@ -360,6 +363,16 @@
                 $ret |= $folder->subscribe(intval($prop['permanent']));
             if (isset($prop['active']))
                 $ret |= $folder->activate(intval($prop['active']));
+
+            // apply to child folders, too
+            if ($prop['recursive']) {
+                foreach ((array)kolab_storage::list_folders($folder->name, '*', 'task') as $subfolder) {
+                    if (isset($prop['permanent']))
+                        ($prop['permanent'] ? kolab_storage::folder_subscribe($subfolder) : kolab_storage::folder_unsubscribe($subfolder));
+                    if (isset($prop['active']))
+                        ($prop['active'] ? kolab_storage::folder_activate($subfolder) : kolab_storage::folder_deactivate($subfolder));
+                }
+            }
             return $ret;
         }
         return false;
@@ -372,7 +385,7 @@
      *      id: list Identifier
      * @return boolean True on success, Fales on failure
      */
-    public function remove_list($prop)
+    public function delete_list($prop)
     {
         if ($prop['id'] && ($folder = $this->get_folder($prop['id']))) {
           if (kolab_storage::folder_delete($folder->name))
@@ -699,12 +712,10 @@
         // get alarm information stored in local database
         if (!empty($candidates)) {
             $alarm_ids = array_map(array($this->rc->db, 'quote'), array_keys($candidates));
-            $result = $this->rc->db->query(sprintf(
-                "SELECT * FROM " . $this->rc->db->table_name('kolab_alarms') . "
-                 WHERE alarm_id IN (%s) AND user_id=?",
-                 join(',', $alarm_ids),
-                 $this->rc->db->now()
-                ),
+            $result = $this->rc->db->query("SELECT *"
+                . " FROM " . $this->rc->db->table_name('kolab_alarms', true)
+                . " WHERE `alarm_id` IN (" . join(',', $alarm_ids) . ")"
+                    . " AND `user_id` = ?",
                 $this->rc->user->ID
             );
 
@@ -739,8 +750,8 @@
     {
         // delete old alarm entry
         $this->rc->db->query(
-            "DELETE FROM " . $this->rc->db->table_name('kolab_alarms') . "
-             WHERE alarm_id=? AND user_id=?",
+            "DELETE FROM " . $this->rc->db->table_name('kolab_alarms', true) . "
+             WHERE `alarm_id` = ? AND `user_id` = ?",
             $id,
             $this->rc->user->ID
         );
@@ -749,9 +760,9 @@
         $notifyat = $snooze > 0 ? date('Y-m-d H:i:s', time() + $snooze) : null;
 
         $query = $this->rc->db->query(
-            "INSERT INTO " . $this->rc->db->table_name('kolab_alarms') . "
-             (alarm_id, user_id, dismissed, notifyat)
-             VALUES(?, ?, ?, ?)",
+            "INSERT INTO " . $this->rc->db->table_name('kolab_alarms', true) . "
+             (`alarm_id`, `user_id`, `dismissed`, `notifyat`)
+             VALUES (?, ?, ?, ?)",
             $id,
             $this->rc->user->ID,
             $snooze > 0 ? 0 : 1,
@@ -770,8 +781,8 @@
     {
         // delete alarm entry
         $this->rc->db->query(
-            "DELETE FROM " . $this->rc->db->table_name('kolab_alarms') . "
-             WHERE alarm_id=? AND user_id=?",
+            "DELETE FROM " . $this->rc->db->table_name('kolab_alarms', true) . "
+             WHERE `alarm_id` = ? AND `user_id` = ?",
             $id,
             $this->rc->user->ID
         );

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

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

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

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

@@ -302,36 +302,63 @@
 	background: url(sprites.png) right 20px no-repeat;
 }
 
-#tasklistsbox .treelist li a.quickview {
+.quickview-active #tasklistsbox .treelist li input,
+.quickview-active #tasklistsbox .treelist li span.listname {
+	opacity: 0.35;
+}
+
+.quickview-active #tasklistsbox .treelist div.focusview span.listname {
+	opacity: 1.0;
+}
+
+#tasklistsbox .treelist div span.actions {
 	display: inline-block;
 	position: absolute;
-	top: 6px;
-	right: 24px;
+	top: 2px;
+	right: 2px;
+	padding: 5px 20px 0 6px;
+	min-width: 40px;
+	height: 19px;
+	text-align: right;
+}
+
+#tasklistsbox .treelist div:hover span.actions {
+	top: 1px;
+	right: 1px;
+	border: 1px solid #c6c6c6;
+	border-radius: 4px;
+	background: #f7f7f7;
+	background: -moz-linear-gradient(top, #f9f9f9 0%, #e6e6e6 100%);
+	background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#f9f9f9), color-stop(100%,#e6e6e6));
+	background: -o-linear-gradient(top, #f9f9f9 0%, #e6e6e6 100%);
+	background: -ms-linear-gradient(top, #f9f9f9 0%, #e6e6e6 100%);
+	background: linear-gradient(top, #f9f9f9 0%, #e6e6e6 100%);
+	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#f9f9f9', endColorstr='#e6e6e6', GradientType=0);
+}
+
+#tasklistsbox .treelist div a.remove,
+#tasklistsbox .treelist div a.quickview,
+#tasklistsbox .treelist div a.subscribed {
+	display: inline-block;
 	width: 16px;
 	height: 16px;
 	padding: 0;
+	margin-right: 4px;
 	background: url(sprites.png) -200px 0 no-repeat;
 	overflow: hidden;
 	text-indent: -5000px;
 	cursor: pointer;
 }
 
-#tasklistsbox .treelist li a.subscribed {
-	display: inline-block;
+#tasklistsbox .treelist div a.subscribed {
 	position: absolute;
-	top: 6px;
-	right: 5px;
-	height: 16px;
-	width: 16px;
-	padding: 0;
-	background: url(sprites.png) -100px 0 no-repeat;
-	overflow: hidden;
-	text-indent: -5000px;
-	cursor: pointer;
+	top: 5px;
+	right: 4px;
+	margin: 0;
 }
 
-#tasklistsbox .treelist div > a.subscribed:focus,
-#tasklistsbox .treelist div:hover > a.subscribed {
+#tasklistsbox .treelist div a.subscribed:focus,
+#tasklistsbox .treelist div:hover a.subscribed {
 	background-position: -2px -215px;
 }
 
@@ -339,19 +366,28 @@
 	background-position: -20px -215px;
 }
 
-#tasklistsbox .treelist div > a.quickview:focus,
-#tasklistsbox .treelist li div:hover > a.quickview {
+#tasklistsbox .treelist div a.quickview:focus,
+#tasklistsbox .treelist div:hover a.quickview {
 	background-position: -20px -101px;
+	background-color: transparent !important;
 }
 
-#tasklistsbox .treelist li div.focusview > a.quickview {
+#tasklistsbox .treelist div a.remove:focus,
+#tasklistsbox .treelist div:hover a.remove {
+	background-position: -2px -371px;
+	background-color: transparent !important;
+}
+
+#tasklistsbox .treelist div.focusview a.quickview {
 	background-position: -2px -101px;
 }
 
-#tasklistsbox .searchresults .treelist li a.quickview {
+#tasklistsbox .searchresults .treelist div a.remove,
+#tasklistsbox .searchresults .treelist div a.quickview {
 	display: none;
 }
 
+#tasklistsbox .treelist div a.remove:focus,
 #tasklistsbox .treelist div a.quickview:focus,
 #tasklistsbox .treelist div a.subscribed:focus {
 	border-radius: 3px;
@@ -464,11 +500,16 @@
 	left: 0;
 	right: 0;
 	bottom: 0;
-	padding-bottom: 28px;
 	background: rgba(255, 255, 255, 0.2);
 	overflow: visible;
 }
 
+.quickview-active #tasksview {
+	background-image: url('images/focusview.png');
+	background-position: center;
+	background-repeat: no-repeat;
+}
+
 #message.statusbar {
 	border-top: 1px solid #c3c3c3;
 }
@@ -1145,6 +1186,10 @@
 	background: url(images/tasklist.png) 6px 5px no-repeat #fef893;
 }
 
+div.tasklist-invitebox td {
+	padding: 2px;
+}
+
 div.tasklist-invitebox td.ititle {
 	font-weight: bold;
 	padding-right: 0.5em;

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

@@ -51,9 +51,10 @@
 			<h3 id="aria-label-tasklistoptions" class="voice"><roundcube:label name="tasklist.listactions" /></h3>
 			<ul class="toolbarmenu" id="tasklistoptionsmenu-menu" role="menu" aria-labelledby="aria-label-tasklistoptions">
 				<li role="menuitem"><roundcube:button command="list-edit" label="edit" classAct="active" /></li>
-				<li role="menuitem"><roundcube:button command="list-remove" label="delete" classAct="active" /></li>
+				<li role="menuitem"><roundcube:button command="list-delete" label="delete" classAct="active" /></li>
 				
 				<roundcube:if condition="env:tasklist_driver == 'kolab'" />
+				<li role="menuitem"><roundcube:button command="list-remove" label="tasklist.removelist" classAct="active" /></li>
 				<li role="menuitem"><roundcube:button command="folders" task="settings" type="link" label="managefolders" classAct="active" /></li>
 				<roundcube:endif />
 			</ul>

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

@@ -62,7 +62,8 @@
     var filtermask = FILTER_MASK_ALL;
     var loadstate = { filter:-1, lists:'', search:null };
     var idcount = 0;
-    var focusview;
+    var focusview = false;
+    var focusview_lists = [];
     var saving_lock;
     var ui_loading;
     var taskcounts = {};
@@ -116,6 +117,7 @@
     this.quicksearch = quicksearch;
     this.reset_search = reset_search;
     this.expand_collapse = expand_collapse;
+    this.list_delete = list_delete;
     this.list_remove = list_remove;
     this.list_edit_dialog = list_edit_dialog;
     this.unlock_saving = unlock_saving;
@@ -154,7 +156,8 @@
         });
         tasklists_widget.addEventListener('select', function(node) {
             var id = $(this).data('id');
-            rcmail.enable_command('list-edit', 'list-remove', 'list-import', me.tasklists[node.id].editable);
+            rcmail.enable_command('list-edit', 'list-delete', 'list-import', me.tasklists[node.id].editable);
+            rcmail.enable_command('list-remove', me.tasklists[node.id] && me.tasklists[node.id].removable);
             me.selected_list = node.id;
         });
         tasklists_widget.addEventListener('subscribe', function(p) {
@@ -164,6 +167,11 @@
                 rcmail.http_post('tasklist', { action:'subscribe', l:{ id:p.id, active:list.active?1:0, permanent:list.subscribed?1:0 } });
             }
         });
+        tasklists_widget.addEventListener('remove', function(p) {
+            if (me.tasklists[p.id] && me.tasklists[p.id].removable) {
+                list_remove(p.id);
+            }
+        });
         tasklists_widget.addEventListener('insert-item', function(p) {
             var list = p.data;
             if (list && list.id && !list.virtual) {
@@ -193,7 +201,7 @@
                 rcmail.http_post('tasklist', { action:'subscribe', l:{ id:id, active:list.active?1:0 } });
 
                 // disable focusview
-                if (!this.checked && focusview == id) {
+                if (!this.checked && focusview && $.inArray(id, focusview_lists) >= 0) {
                     set_focusview(null);
                 }
 
@@ -220,7 +228,7 @@
             if (tasklists_widget.is_search())
               id = id.replace(/--xsR$/, '');
 
-            set_focusview(focusview == id ? null : id);
+            set_focusview(id, e.shiftKey || e.metaKey || e.ctrlKey);
             e.stopPropagation();
             return false;
         });
@@ -1985,7 +1993,7 @@
 
         task_attendees = [];
         attendees_list = $('#edit-attendees-table > tbody').html('');
-        $('#edit-attendees-notify')[(allow_invitations && (settings.itip_notify & 2) ? 'show' : 'hide')]();
+        $('#edit-attendees-notify')[(allow_invitations && has_attendees(rec) && (settings.itip_notify & 2) ? 'show' : 'hide')]();
         $('#edit-localchanges-warning')[(has_attendees(rec) && !(allow_invitations || (rec.owner && is_organizer(rec, rec.owner))) ? 'show' : 'hide')]();
 
         // attendees (aka assignees)
@@ -2386,8 +2394,8 @@
         var match = !filtermask || (filtermask & rec.mask) == filtermask;
 
         // in focusview mode, only tasks from the selected list are allowed
-        if (focusview && rec.list != focusview)
-            match = false;
+        if (focusview)
+            match = $.inArray(rec.list, focusview_lists) >= 0;
 
         if (match && tagsfilter.length) {
             match = rec.tags && rec.tags.length;
@@ -2560,18 +2568,30 @@
     /**
      *
      */
-    function list_remove(id)
+    function list_delete(id)
     {
         var list = me.tasklists[id];
         if (list && !list.norename && confirm(rcmail.gettext(list.children ? 'deletelistconfirmrecursive' : 'deletelistconfirm', 'tasklist'))) {
             saving_lock = rcmail.set_busy(true, 'tasklist.savingdata');
-            rcmail.http_post('tasklist', { action:'remove', l:{ id:list.id } });
+            rcmail.http_post('tasklist', { action:'delete', l:{ id:list.id } });
             return true;
         }
         return false;
     }
 
     /**
+     *
+     */
+    function list_remove(id)
+    {
+        var list = me.tasklists[id];
+        if (list && list.removable) {
+            destroy_list(list);
+            rcmail.http_post('tasklist', { action:'subscribe', l:{ id:list.id, active:0, permanent:0, recursive:1 } });
+        }
+    }
+
+    /**
      * Callback from server to finally remove the given list
      */
     function destroy_list(prop)
@@ -2796,16 +2816,31 @@
     /**
      * Enable/disable focusview mode for the given list
      */
-    function set_focusview(id)
+    function set_focusview(id, shift)
     {
-        if (focusview && focusview != id) {
-            $(tasklists_widget.get_item(focusview)).find('.tasklist').first().removeClass('focusview')
-                .find('a.quickview').attr('aria-checked', 'false');
+        var in_focus = $.inArray(id, focusview_lists) >= 0,
+            li = $(tasklists_widget.get_item(id)).find('.tasklist').first();
+
+        // remove list from focusview
+        if (in_focus && shift && id !== null) {
+            focusview_lists = $.grep(focusview_lists, function(list_id) { return list_id != id; });
         }
+        else {
+            if (!shift || id === null) {
+                focusview_lists = [];
+
+                // uncheck all active focusview icons
+                tasklists_widget.container.find('div.focusview')
+                    .removeClass('focusview')
+                    .find('a.quickview').attr('aria-checked', 'false');
+            }
 
-        focusview = id;
+            if (!in_focus && id !== null) {
+                focusview_lists.push(id)
+            }
+        }
 
-        var li = $(tasklists_widget.get_item(id)).find('.tasklist').first();
+        focusview = focusview_lists.length > 0;
 
         // activate list if necessary
         if (focusview && !me.tasklists[id].active) {
@@ -2818,7 +2853,12 @@
         list_tasks(null);
 
         if (focusview) {
-            li.addClass('focusview').find('a.quickview').attr('aria-checked', 'true');
+            li[in_focus ? 'removeClass' : 'addClass']('focusview')
+                .find('a.quickview').attr('aria-checked', in_focus ? 'false' : 'true');
+            $('body').addClass('quickview-active');
+        }
+        else {
+            $('body').removeClass('quickview-active');
         }
     }
 
@@ -2877,6 +2917,7 @@
 
   rcmail.register_command('list-create', function(){ rctasks.list_edit_dialog(null); }, true);
   rcmail.register_command('list-edit', function(){ rctasks.list_edit_dialog(rctasks.selected_list); }, false);
+  rcmail.register_command('list-delete', function(){ rctasks.list_delete(rctasks.selected_list); }, false);
   rcmail.register_command('list-remove', function(){ rctasks.list_remove(rctasks.selected_list); }, false);
 
   rcmail.register_command('search', function(){ rctasks.quicksearch(); }, true);

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

@@ -837,8 +837,8 @@
             $success = $this->driver->subscribe_list($list);
             break;
 
-        case 'remove':
-            if (($success = $this->driver->remove_list($list)))
+        case 'delete':
+            if (($success = $this->driver->delete_list($list)))
                 $this->rc->output->command('plugin.destroy_tasklist', $list);
             break;
 
@@ -1459,18 +1459,22 @@
     /**
      * Get properties of the tasklist this user has specified as default
      */
-    public function get_default_tasklist($writeable = false)
+    public function get_default_tasklist($writeable = false, $confidential = false)
     {
-//        $default_id = $this->rc->config->get('tasklist_default_list');
         $lists = $this->driver->get_lists();
-//        $list  = $calendars[$default_id] ?: null;
+        $list = null;
 
         if (!$list || ($writeable && !$list['editable'])) {
             foreach ($lists as $l) {
-                if ($l['default']) {
+                if ($confidential && $l['subtype'] == 'confidential') {
                     $list = $l;
                     break;
                 }
+                if ($l['default']) {
+                    $list = $l;
+                    if (!$confidential)
+                        break;
+                }
 
                 if (!$writeable || $l['editable']) {
                     $first = $l;
@@ -1514,10 +1518,10 @@
             // find writeable tasklist to store task
             $cal_id = !empty($_REQUEST['_list']) ? rcube_utils::get_input_value('_list', rcube_utils::INPUT_POST) : null;
             $lists  = $this->driver->get_lists();
-            $list   = $lists[$cal_id] ?: $this->get_default_tasklist(true);
 
             foreach ($tasks as $task) {
                 // save to tasklist
+                $list   = $lists[$cal_id] ?: $this->get_default_tasklist(true, $task['sensitivity'] == 'confidential');
                 if ($list && $list['editable'] && $task['_type'] == 'task') {
                     $task = $this->from_ical($task);
                     $task['list'] = $list['id'];
@@ -1568,7 +1572,7 @@
             // find writeable list to store the task
             $list_id = !empty($_REQUEST['_folder']) ? rcube_utils::get_input_value('_folder', rcube_utils::INPUT_POST) : null;
             $lists   = $this->driver->get_lists();
-            $list    = $lists[$list_id] ?: $this->get_default_tasklist(true);
+            $list    = $lists[$list_id] ?: $this->get_default_tasklist(true, $task['sensitivity'] == 'confidential');
 
             $metadata = array(
                 'uid'      => $task['uid'],
@@ -1780,9 +1784,9 @@
         }
 
         if ($select) {
-            $default_list = $this->get_default_tasklist(true);
+            $default_list = $this->get_default_tasklist(true, $data['sensitivity'] == 'confidential');
             $response['select'] = html::span('folder-select', $this->gettext('saveintasklist') . '&nbsp;' .
-                $select->show($this->rc->config->get('tasklist_default_list', $default_list['id'])));
+                $select->show($default_list['id']));
         }
 
         $this->rc->output->command('plugin.update_itip_object_status', $response);

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

@@ -248,9 +248,12 @@
             return html::div(join(' ', $classes),
                 html::span(array('class' => 'listname', 'title' => $title, 'id' => $label_id), $prop['listname'] ?: $prop['name']) .
                   ($prop['virtual'] ? '' :
-                    html::tag('input', array('type' => 'checkbox', 'name' => '_list[]', 'value' => $id, 'checked' => $prop['active'], 'aria-labelledby' => $label_id)) .
-                    html::a(array('href' => '#', 'class' => 'quickview', 'title' => $this->plugin->gettext('focusview'), 'role' => 'checkbox', 'aria-checked' => 'false'), ' ') .
-                    (isset($prop['subscribed']) ? html::a(array('href' => '#', 'class' => 'subscribed', 'title' => $this->plugin->gettext('tasklistsubscribe'), 'role' => 'checkbox', 'aria-checked' => $prop['subscribed'] ? 'true' : 'false'), ' ') : '')
+                      html::tag('input', array('type' => 'checkbox', 'name' => '_list[]', 'value' => $id, 'checked' => $prop['active'], 'aria-labelledby' => $label_id)) .
+                      html::span('actions', 
+                          ($prop['removable'] ? html::a(array('href' => '#', 'class' => 'remove', 'title' => $this->plugin->gettext('removelist')), ' ') : '') .
+                          html::a(array('href' => '#', 'class' => 'quickview', 'title' => $this->plugin->gettext('focusview'), 'role' => 'checkbox', 'aria-checked' => 'false'), ' ') .
+                          (isset($prop['subscribed']) ? html::a(array('href' => '#', 'class' => 'subscribed', 'title' => $this->plugin->gettext('tasklistsubscribe'), 'role' => 'checkbox', 'aria-checked' => $prop['subscribed'] ? 'true' : 'false'), ' ') : '')
+                      )
                 )
             );
         }