Kolab Groupware OBS

Changes of Revision 44

roundcubemail-plugins-kolab.spec Changed

@@ -24,14 +24,14 @@
 
 Name:       roundcubemail-plugins-kolab
 Version:    3.2
-Release:    0.3.dev20140404.gitb86a301d%{?dist}
+Release:    0.4.dev20140624.gitb120d395%{?dist}
 Summary:    Kolab Groupware plugins for Roundcube Webmail
 
 Group:      Applications/Internet
 License:    AGPLv3+ and GPLv3+
 URL:        http://www.kolab.org
 
-# From git b86a301d616a36a7a917b83d1ab8447f103b0ad8
+# From git b120d3958fc934d3377fb15c15af8f666b2b00c5
 Source0:    http://git.kolab.org/%{name}/snapshot/%{name}-%{version}.tar.gz
 Source1:    kolab_logo.png
 
@@ -162,6 +162,13 @@
         owncloud piwik_analytics tasklist; do
 
     for dir in `find /usr/share/roundcubemail/plugins/${plugin}/ -type d -name "SQL"`; do
+        # Skip plugins with multiple drivers and no kolab driver
+        if [ ! -z "$(echo $dir | grep driver)" ]; then
+            if [ -z "$(echo $dir | grep kolab)" ]; then
+                continue
+            fi
+        fi
+
         /usr/share/roundcubemail/bin/updatedb.sh \
             --dir $dir \
             --package ${plugin} \
@@ -210,6 +217,9 @@
 %attr(0770,root,%{httpd_group}) %{roundcube_lib}/plugins/odfviewer
 
 %changelog
+* Tue Jun 24 2014 Jeroen van Meeuwen <vanmeeuwen@kolabsys.com> - 3.2-0.4.git
+- New git master head snapshot
+
 * Fri Apr  4 2014 Jeroen van Meeuwen <vanmeeuwen@kolabsys.com> - 3.2-0.3.git
 - New git master head snapshot

debian.changelog Changed

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

@@ -100,6 +100,8 @@
       // default startup routine
       $this->add_hook('startup', array($this, 'startup'));
     }
+
+    $this->add_hook('user_delete', array($this, 'user_delete'));
   }
 
   /**
@@ -190,6 +192,8 @@
 
         $this->api->output->add_label('calendar.createfrommail');
       }
+
+      $this->add_hook('messages_list', array($this, 'mail_messages_list'));
     }
     else if ($args['task'] == 'addressbook') {
       if ($this->rc->config->get('calendar_contact_birthdays')) {
@@ -294,8 +298,8 @@
     $this->rc->output->set_env('timezone', $this->timezone->getName());
     $this->rc->output->set_env('calendar_driver', $this->rc->config->get('calendar_driver'), false);
     $this->rc->output->set_env('calendar_resources', (bool)$this->rc->config->get('calendar_resources_driver'));
-    $this->rc->output->set_env('mscolors', $this->driver->get_color_values());
-    $this->rc->output->set_env('identities-selector', $this->ui->identity_select(array('id' => 'edit-identities-list')));
+    $this->rc->output->set_env('mscolors', jqueryui::get_color_values());
+    $this->rc->output->set_env('identities-selector', $this->ui->identity_select(array('id' => 'edit-identities-list', 'aria-label' => $this->gettext('roleorganizer'))));
 
     $view = get_input_value('view', RCUBE_INPUT_GPC);
     if (in_array($view, array('agendaWeek', 'agendaDay', 'month', 'table')))
@@ -557,11 +561,8 @@
         });
         ', 'docready');
 
-        // include color picker
-        $this->include_script('lib/js/jquery.miniColors.min.js');
-        $this->include_stylesheet($this->local_skin_path() . '/jquery.miniColors.css');
-        $this->rc->output->set_env('mscolors', $this->driver->get_color_values());
-        $this->rc->output->add_script('$("input.colors").miniColors({ colorValues:rcmail.env.mscolors })', 'docready');
+        // load miniColors js/css files
+        jqueryui::miniColors();
     }
 
     // virtual birthdays calendar
@@ -727,6 +728,30 @@
         if (!$this->driver->subscribe_calendar($cal))
           $this->rc->output->show_message($this->gettext('errorsaving'), 'error');
         return;
+      case "search":
+        $results = array();
+        $color_mode = $this->rc->config->get('calendar_event_coloring', $this->defaults['calendar_event_coloring']);
+        foreach ((array)$this->driver->search_calendars(get_input_value('q', RCUBE_INPUT_GPC), get_input_value('source', RCUBE_INPUT_GPC)) as $id => $prop) {
+          $editname = $prop['editname'];
+          unset($prop['editname']);  // force full name to be displayed
+          $prop['active'] = false;
+
+          // let the UI generate HTML and CSS representation for this calendar
+          $html = $this->ui->calendar_list_item($id, $prop, $jsenv);
+          $cal = $jsenv[$id];
+          $cal['editname'] = $editname;
+          $cal['html'] = $html;
+          if (!empty($prop['color']))
+            $cal['css'] = $this->ui->calendar_css_classes($id, $prop, $color_mode);
+
+          $results[] = $cal;
+        }
+        // report more results available
+        if ($this->driver->search_more_results)
+          $this->rc->output->show_message('autocompletemore', 'info');
+
+        $this->rc->output->command('multi_thread_http_response', $results, get_input_value('_reqid', RCUBE_INPUT_GPC));
+        return;
     }
     
     if ($success)
@@ -764,7 +789,7 @@
       case "new":
         // create UID for new event
         $event['uid'] = $this->generate_uid();
-        $this->prepare_event($event, $action);
+        $this->write_preprocess($event, $action);
         if ($success = $this->driver->new_event($event)) {
           $event['id'] = $event['uid'];
           $this->cleanup_event($event);
@@ -773,20 +798,20 @@
         break;
         
       case "edit":
-        $this->prepare_event($event, $action);
+        $this->write_preprocess($event, $action);
         if ($success = $this->driver->edit_event($event))
             $this->cleanup_event($event);
         $reload =  $success && ($event['recurrence'] || $event['_savemode'] || $event['_fromcalendar']) ? 2 : 1;
         break;
       
       case "resize":
-        $this->prepare_event($event, $action);
+        $this->write_preprocess($event, $action);
         $success = $this->driver->resize_event($event);
         $reload = $event['_savemode'] ? 2 : 1;
         break;
       
       case "move":
-        $this->prepare_event($event, $action);
+        $this->write_preprocess($event, $action);
         $success = $this->driver->move_event($event);
         $reload  = $success && $event['_savemode'] ? 2 : 1;
         break;
@@ -1328,21 +1353,13 @@
   private function _client_event($event, $addcss = false)
   {
     // compose a human readable strings for alarms_text and recurrence_text
-    if ($event['alarms'])
-      $event['alarms_text'] = libcalendaring::alarms_text($event['alarms']);
+    if ($event['valarms']) {
+      $event['alarms_text'] = libcalendaring::alarms_text($event['valarms']);
+      $event['valarms'] = libcalendaring::to_client_alarms($event['valarms']);
+    }
     if ($event['recurrence']) {
-      $event['recurrence_text'] = $this->_recurrence_text($event['recurrence']);
-      if ($event['recurrence']['UNTIL'])
-        $event['recurrence']['UNTIL'] = $this->lib->adjust_timezone($event['recurrence']['UNTIL'], $event['allday'])->format('c');
-      unset($event['recurrence']['EXCEPTIONS']);
-
-      // format RDATE values
-      if (is_array($event['recurrence']['RDATE'])) {
-        $libcal = $this->lib;
-        $event['recurrence']['RDATE'] = array_map(function($rdate) use ($libcal) {
-          return $libcal->adjust_timezone($rdate, true)->format('c');
-        }, $event['recurrence']['RDATE']);
-      }
+      $event['recurrence_text'] = $this->lib->recurrence_text($event['recurrence']);
+      $event['recurrence'] = $this->lib->to_client_recurrence($event['recurrence'], $event['allday']);
     }
 
     foreach ((array)$event['attachments'] as $k => $attachment) {
@@ -1387,70 +1404,6 @@
 
 
   /**
-   * Render localized text describing the recurrence rule of an event
-   */
-  private function _recurrence_text($rrule)
-  {
-    // derive missing FREQ and INTERVAL from RDATE list
-    if (empty($rrule['FREQ']) && !empty($rrule['RDATE'])) {
-      $first = $rrule['RDATE'][0];
-      $second = $rrule['RDATE'][1];
-      $third  = $rrule['RDATE'][2];
-      if (is_a($first, 'DateTime') && is_a($second, 'DateTime')) {
-        $diff = $first->diff($second);
-        foreach (array('y' => 'YEARLY', 'm' => 'MONTHLY', 'd' => 'DAILY') as $k => $freq) {
-          if ($diff->$k != 0) {
-            $rrule['FREQ'] = $freq;
-            $rrule['INTERVAL'] = $diff->$k;
-
-            // verify interval with next item
-            if (is_a($third, 'DateTime')) {
-              $diff2 = $second->diff($third);
-              if ($diff2->$k != $diff->$k) {
-                unset($rrule['INTERVAL']);
-              }
-            }
-            break;
-          }
-        }
-      }
-      if (!$rrule['INTERVAL'])
-        $rrule['FREQ'] = 'RDATE';
-      $rrule['UNTIL'] = end($rrule['RDATE']);
-    }
-
-    // TODO: finish this
-    $freq = sprintf('%s %d ', $this->gettext('every'), $rrule['INTERVAL']);
-    $details = '';
-    switch ($rrule['FREQ']) {
-      case 'DAILY':
-        $freq .= $this->gettext('days');
-        break;
-      case 'WEEKLY':
-        $freq .= $this->gettext('weeks');
-        break;
-      case 'MONTHLY':
-        $freq .= $this->gettext('months');
-        break;
-      case 'YEARLY':
-        $freq .= $this->gettext('years');
-        break;
-    }
-    
-    if ($rrule['INTERVAL'] <= 1)
-      $freq = $this->gettext(strtolower($rrule['FREQ']));
-      
-    if ($rrule['COUNT'])
-      $until =  $this->gettext(array('name' => 'forntimes', 'vars' => array('nr' => $rrule['COUNT'])));
-    else if ($rrule['UNTIL'])
-      $until = $this->gettext('recurrencend') . ' ' . format_date($rrule['UNTIL'], libcalendaring::to_php_date_format($this->rc->config->get('calendar_date_format', $this->defaults['calendar_date_format'])));
-    else
-      $until = $this->gettext('forever');
-    
-    return rtrim($freq . $details . ', ' . $until);
-  }
-
-  /**
    * Generate a unique identifier for an event
    */
   public function generate_uid()
@@ -1556,7 +1509,7 @@
   /**
    * Prepares new/edited event properties before save
    */
-  private function prepare_event(&$event, $action)
+  private function write_preprocess(&$event, $action)
   {
     // convert dates into DateTime objects in user's current timezone
     $event['start'] = new DateTime($event['start'], $this->timezone);
@@ -1567,22 +1520,14 @@
       return;
     }
 
-    if (is_array($event['recurrence']) && !empty($event['recurrence']['UNTIL']))
-      $event['recurrence']['UNTIL'] = new DateTime($event['recurrence']['UNTIL'], $this->timezone);
+    // convert the submitted recurrence settings
+    if (is_array($event['recurrence'])) {
+      $event['recurrence'] = $this->lib->from_client_recurrence($event['recurrence'], $event['start']);
+    }
 
-    if (is_array($event['recurrence']) && is_array($event['recurrence']['RDATE'])) {
-      $tz = $this->timezone;
-      $start = $event['start'];
-      $event['recurrence']['RDATE'] = array_map(function($rdate) use ($tz, $start) {
-        try {
-          $dt = new DateTime($rdate, $tz);
-          $dt->setTime($start->format('G'), $start->format('i'));
-          return $dt;
-        }
-        catch (Exception $e) {
-          return null;
-        }
-      }, $event['recurrence']['RDATE']);
+    // convert the submitted alarm values
+    if ($event['valarms']) {
+      $event['valarms'] = libcalendaring::from_client_alarms($event['valarms']);
     }
 
     $attachments = array();
@@ -1655,11 +1600,11 @@
    */
   private function notify_attendees($event, $old, $action = 'edit')
   {
-    if ($action == 'remove') {
+    if ($action == 'remove' || ($event['status'] == 'CANCELLED' && $old['status'] != $event['status'])) {
       $event['cancelled'] = true;
       $is_cancelled = true;
     }
-    
+
     $itip = $this->load_itip();
     $emails = $this->get_user_emails();
 
@@ -2161,6 +2106,34 @@
   }
   
   /**
+   * 
+   */
+  public function mail_messages_list($p)
+  {
+    if (in_array('attachment', (array)$p['cols']) && !empty($p['messages'])) {
+      foreach ($p['messages'] as $i => $header) {
+        $part = new StdClass;
+        $part->mimetype = $header->ctype;
+        if ($this->is_vcalendar($part)) {
+          $header->list_flags['attachmentClass'] = 'ical';
+        }
+        else if (in_array($header->ctype, array('multipart/alternative', 'multipart/mixed'))) {
+          // TODO: fetch bodystructure and search for ical parts. Maybe too expensive?
+
+          if (!empty($header->structure) && is_array($header->structure->parts)) {
+            foreach ($header->structure->parts as $part) {
+              if ($this->is_vcalendar($part) && !empty($part->ctype_parameters['method'])) {
+                $header->list_flags['attachmentClass'] = 'ical';
+                break;
+              }
+            }
+          }
+        }
+      }
+    }
+  }
+  
+  /**
    * Check mail message structure of there are .ics files attached
    */
   public function mail_message_load($p)
@@ -2399,8 +2372,14 @@
           else if ($event['sequence'] >= $existing['sequence'] || $event['changed'] >= $existing['changed']) {
             $event['id'] = $existing['id'];
             $event['calendar'] = $existing['calendar'];
-            if ($status == 'declined' || $event['status'] == 'CANCELLED')  // show me as free when declined (#1670)
+
+            // set status=CANCELLED on CANCEL messages
+            if ($this->ical->method == 'CANCEL')
+              $event['status'] = 'CANCELLED';
+            // show me as free when declined (#1670)
+            if ($status == 'declined' || $event['status'] == 'CANCELLED')
               $event['free_busy'] = 'free';
+
             $success = $this->driver->edit_event($event);
           }
           else if (!empty($status)) {
@@ -2425,7 +2404,7 @@
     }
 
     if ($success) {
-      $message = $this->ical->method == 'REPLY' ? 'attendeupdateesuccess' : ($deleted ? 'successremoval' : 'importedsuccessfully');
+      $message = $this->ical->method == 'REPLY' ? 'attendeupdateesuccess' : ($deleted ? 'successremoval' : ($existing ? 'updatedsuccessfully' : 'importedsuccessfully'));
       $this->rc->output->command('display_message', $this->gettext(array('name' => $message, 'vars' => array('calendar' => $calendar['name']))), 'confirmation');
 
       $metadata['rsvp'] = intval($metadata['rsvp']);
@@ -2659,6 +2638,15 @@
   }
 
   /**
+   * Handler for user_delete plugin hook
+   */
+  public function user_delete($args)
+  {
+     $this->load_driver();
+     return $this->driver->user_delete($args);
+  }
+
+  /**
    * Magic getter for public access to protected members
    */
   public function __get($name)

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

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

@@ -1,10 +1,12 @@
 /**
  * Client UI Javascript for the Calendar plugin
  *
- * @version @package_version@
  * @author Lazlo Westerhof <hello@lazlo.me>
  * @author Thomas Bruederli <bruederli@kolabsys.com>
  *
+ * @licstart  The following is the entire license notice for the
+ * JavaScript code in this file.
+ *
  * Copyright (C) 2010, Lazlo Westerhof <hello@lazlo.me>
  * Copyright (C) 2012, Kolab Systems AG <contact@kolabsys.com>
  *
@@ -20,6 +22,9 @@
  *
  * You should have received a copy of the GNU Affero General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * @licend  The above is the entire license notice
+ * for the JavaScript code in this file.
  */
 
 // Roundcube calendar UI client class
@@ -34,6 +39,7 @@
     this.selected_calendar = null;
     this.search_request = null;
     this.saving_lock;
+    this.calendars = {};
 
 
     /***  private vars  ***/
@@ -46,6 +52,10 @@
     var ignore_click = false;
     var event_defaults = { free_busy:'busy', alarms:'' };
     var event_attendees = [];
+    var calendars_list;
+    var calenders_search_list;
+    var calenders_search_container;
+    var search_calendars = {};
     var attendees_list;
     var resources_list;
     var resources_treelist;
@@ -81,7 +91,7 @@
     var date2unixtime = this.date2unixtime;
     var fromunixtime = this.fromunixtime;
     var parseISO8601 = this.parseISO8601;
-    var init_alarms_edit = this.init_alarms_edit;
+    var date2servertime = this.date2ISO8601;
 
 
     /***  private methods  ***/
@@ -143,23 +153,11 @@
         date.setHours(0);
     };
 
-    // turn the given date into an ISO 8601 date string understandable by PHPs strtotime()
-    var date2servertime = function(date)
-    {
-      return date.getFullYear()+'-'+zeropad(date.getMonth()+1)+'-'+zeropad(date.getDate())
-          + 'T'+zeropad(date.getHours())+':'+zeropad(date.getMinutes())+':'+zeropad(date.getSeconds());
-    }
-
     var date2timestring = function(date, dateonly)
     {
       return date2servertime(date).replace(/[^0-9]/g, '').substr(0, (dateonly ? 8 : 14));
     }
 
-    var zeropad = function(num)
-    {
-      return (num < 10 ? '0' : '') + num;
-    }
-
     var render_link = function(url)
     {
       var islink = false, href = url;
@@ -239,32 +237,33 @@
         if (edit) {
           rcmail.env.attachments[elem.id] = elem;
           // delete icon
-          content = document.createElement('A');
-          content.href = '#delete';
-          content.title = rcmail.gettext('delete');
-          content.className = 'delete';
-          $(content).click({id: elem.id}, function(e) { remove_attachment(this, e.data.id); return false; });
+          content = $('<a href="#delete" />')
+            .attr('title', rcmail.gettext('delete'))
+            .attr('aria-label', rcmail.gettext('delete') + ' ' + Q(elem.name))
+            .addClass('delete')
+            .click({id: elem.id}, function(e) { remove_attachment(this, e.data.id); return false; });
 
           if (!rcmail.env.deleteicon)
-            content.innerHTML = rcmail.gettext('delete');
+            content.html(rcmail.gettext('delete'));
           else {
             img = document.createElement('IMG');
             img.src = rcmail.env.deleteicon;
             img.alt = rcmail.gettext('delete');
-            content.appendChild(img);
+            content.append(img);
           }
 
-          li.appendChild(content);
+          content.appendTo(li);
         }
 
         // name/link
-        content = document.createElement('A');
-        content.innerHTML = elem.name;
-        content.className = 'file';
-        content.href = '#load';
-        $(content).click({event: event, att: elem}, function(e) {
-          load_attachment(e.data.event, e.data.att); return false; });
-        li.appendChild(content);
+        content = $('<a href="#load" />')
+          .html(Q(elem.name))
+          .addClass('file')
+          .click({event: event, att: elem}, function(e) {
+            load_attachment(e.data.event, e.data.att);
+            return false;
+          })
+          .appendTo(li);
 
         ul.appendChild(li);
       }
@@ -285,7 +284,7 @@
     };
 
     // event details dialog (show only)
-    var event_show_dialog = function(event)
+    var event_show_dialog = function(event, ev)
     {
       var $dialog = $("#eventshow").attr('class', 'uidialog');
       var calendar = event.calendar && me.calendars[event.calendar] ? me.calendars[event.calendar] : { editable:false };
@@ -311,7 +310,7 @@
       if (event.recurrence && event.recurrence_text)
         $('#event-repeat').show().children('.event-text').html(Q(event.recurrence_text));
       
-      if (event.alarms && event.alarms_text)
+      if (event.valarms && event.alarms_text)
         $('#event-alarm').show().children('.event-text').html(Q(event.alarms_text));
       
       if (calendar.name)
@@ -325,6 +324,11 @@
         $('#event-priority').show().children('.event-text').html(Q(event.priority+' '+priolabels[event.priority]));
       }
 
+      if (event.status) {
+        var status_lc = String(event.status).toLowerCase();
+        $('#event-status').show().children('.event-text').html(Q(rcmail.gettext(status_lc,'calendar')));
+        $dialog.addClass('status-'+status_lc);
+      }
       if (event.sensitivity && event.sensitivity != 'public') {
         $('#event-sensitivity').show().children('.event-text').html(Q(sensitivitylabels[event.sensitivity]));
         $dialog.addClass('sensitivity-'+event.sensitivity);
@@ -402,7 +406,7 @@
           }
         }
         
-        $('#event-rsvp')[(rsvp && !is_organizer(event) ? 'show' : 'hide')]();
+        $('#event-rsvp')[(rsvp && !is_organizer(event) && event.status != 'CANCELLED' ? 'show' : 'hide')]();
         $('#event-rsvp .rsvp-buttons input').prop('disabled', false).filter('input[rel='+rsvp+']').prop('disabled', true);
       }
 
@@ -421,24 +425,34 @@
           $dialog.dialog('close');
         };
       }
-      
+
       // open jquery UI dialog
       $dialog.dialog({
         modal: false,
         resizable: !bw.ie6,
         closeOnEscape: (!bw.ie6 && !bw.ie7),  // disable for performance reasons
-        title: Q(me.event_date_text(event)),
+        title: me.event_date_text(event),
         open: function() {
-          $dialog.parent().find('.ui-button').first().focus();
+          $dialog.attr('aria-hidden', 'false');
+          setTimeout(function(){
+            $dialog.parent().find('.ui-button:not(.ui-dialog-titlebar-close)').first().focus();
+          }, 5);
         },
         close: function() {
-          $dialog.dialog('destroy').hide();
+          $dialog.dialog('destroy').attr('aria-hidden', 'true').hide();
         },
         buttons: buttons,
         minWidth: 320,
         width: 420
       }).show();
-      
+
+      // remember opener element (to be focused on close)
+      $dialog.data('opener', ev && rcube_event.is_keyboard(ev) ? ev.target : null);
+
+      // set voice title on dialog widget
+      $dialog.dialog('widget').removeAttr('aria-labelledby')
+        .attr('aria-label', me.event_date_text(event, true) + ', ', event.title);
+
       // set dialog size according to content
       me.dialog_resize($dialog.get(0), $dialog.height(), 420);
 /* 
@@ -469,8 +483,11 @@
     // bring up the event dialog (jquery-ui popup)
     var event_edit_dialog = function(action, event)
     {
+      // copy opener element from show dialog
+      var op_elem = $("#eventshow:ui-dialog").data('opener');
+
       // close show dialog first
-      $("#eventshow:ui-dialog").dialog('close');
+      $("#eventshow:ui-dialog").data('opener', null).dialog('close');
 
       var $dialog = $('<div>');
       var calendar = event.calendar && me.calendars[event.calendar] ? me.calendars[event.calendar] : { editable:action=='new' };
@@ -491,6 +508,7 @@
       var vurl = $('#edit-url').val(event.vurl || '');
       var categories = $('#edit-categories').val(event.categories);
       var calendars = $('#edit-calendar').val(event.calendar);
+      var eventstatus = $('#edit-event-status').val(event.status);
       var freebusy = $('#edit-free-busy').val(event.free_busy);
       var priority = $('#edit-priority').val(event.priority);
       var sensitivity = $('#edit-sensitivity').val(event.sensitivity);
@@ -513,34 +531,10 @@
       else {
         allday.checked = false;
       }
-      
+
       // set alarm(s)
-      // TODO: support multiple alarm entries
-      if (event.alarms || action != 'new') {
-        if (typeof event.alarms == 'string')
-          event.alarms = event.alarms.split(';');
-        
-        var valarms = event.alarms || [''];
-        for (var alarm, i=0; i < valarms.length; i++) {
-          alarm = String(valarms[i]).split(':');
-          if (!alarm[1] && alarm[0]) alarm[1] = 'DISPLAY';
-          $('#eventedit select.edit-alarm-type').val(alarm[1]);
-          
-          if (alarm[0].match(/@(\d+)/)) {
-            var ondate = fromunixtime(parseInt(RegExp.$1));
-            $('#eventedit select.edit-alarm-offset').val('@');
-            $('#eventedit input.edit-alarm-date').val($.fullCalendar.formatDate(ondate, settings['date_format']));
-            $('#eventedit input.edit-alarm-time').val($.fullCalendar.formatDate(ondate, settings['time_format']));
-          }
-          else if (alarm[0].match(/([-+])(\d+)([MHD])/)) {
-            $('#eventedit input.edit-alarm-value').val(RegExp.$2);
-            $('#eventedit select.edit-alarm-offset').val(''+RegExp.$1+RegExp.$3);
-          }
-        }
-      }
-      // set correct visibility by triggering onchange handlers
-      $('#eventedit select.edit-alarm-type, #eventedit select.edit-alarm-offset').change();
-      
+      me.set_alarms_edit('#edit-alarms', action != 'new' && event.valarms && calendar.alarms ? event.valarms : []);
+
       // enable/disable alarm property according to backend support
       $('#edit-alarms')[(calendar.alarms ? 'show' : 'hide')]();
 
@@ -549,55 +543,6 @@
         $('<option>').attr('value', event.categories).text(event.categories).appendTo(categories).prop('selected', true);
       }
 
-      // set recurrence form
-      var recurrence, interval, rrtimes, rrenddate;
-      var load_recurrence_tab = function()
-      {
-        recurrence = $('#edit-recurrence-frequency').val(event.recurrence ? event.recurrence.FREQ || (event.recurrence.RDATE ? 'RDATE' : '') : '').change();
-        interval = $('#eventedit select.edit-recurrence-interval').val(event.recurrence ? event.recurrence.INTERVAL : 1);
-        rrtimes = $('#edit-recurrence-repeat-times').val(event.recurrence ? event.recurrence.COUNT : 1);
-        rrenddate = $('#edit-recurrence-enddate').val(event.recurrence && event.recurrence.UNTIL ? $.fullCalendar.formatDate(parseISO8601(event.recurrence.UNTIL), settings['date_format']) : '');
-        $('#eventedit input.edit-recurrence-until:checked').prop('checked', false);
-        $('#edit-recurrence-rdates').html('');
-      
-        var weekdays = ['SU','MO','TU','WE','TH','FR','SA'];
-        var rrepeat_id = '#edit-recurrence-repeat-forever';
-        if (event.recurrence && event.recurrence.COUNT)      rrepeat_id = '#edit-recurrence-repeat-count';
-        else if (event.recurrence && event.recurrence.UNTIL) rrepeat_id = '#edit-recurrence-repeat-until';
-        $(rrepeat_id).prop('checked', true);
-      
-        if (event.recurrence && event.recurrence.BYDAY && event.recurrence.FREQ == 'WEEKLY') {
-          var wdays = event.recurrence.BYDAY.split(',');
-          $('input.edit-recurrence-weekly-byday').val(wdays);
-        }
-        if (event.recurrence && event.recurrence.BYMONTHDAY) {
-          $('input.edit-recurrence-monthly-bymonthday').val(String(event.recurrence.BYMONTHDAY).split(','));
-          $('input.edit-recurrence-monthly-mode').val(['BYMONTHDAY']);
-        }
-        if (event.recurrence && event.recurrence.BYDAY && (event.recurrence.FREQ == 'MONTHLY' || event.recurrence.FREQ == 'YEARLY')) {
-          var byday, section = event.recurrence.FREQ.toLowerCase();
-          if ((byday = String(event.recurrence.BYDAY).match(/(-?[1-4])([A-Z]+)/))) {
-            $('#edit-recurrence-'+section+'-prefix').val(byday[1]);
-            $('#edit-recurrence-'+section+'-byday').val(byday[2]);
-          }
-          $('input.edit-recurrence-'+section+'-mode').val(['BYDAY']);
-        }
-        else if (event.start) {
-          $('#edit-recurrence-monthly-byday').val(weekdays[event.start.getDay()]);
-        }
-        if (event.recurrence && event.recurrence.BYMONTH) {
-          $('input.edit-recurrence-yearly-bymonth').val(String(event.recurrence.BYMONTH).split(','));
-        }
-        else if (event.start) {
-          $('input.edit-recurrence-yearly-bymonth').val([String(event.start.getMonth()+1)]);
-        }
-        if (event.recurrence && event.recurrence.RDATE) {
-          $.each(event.recurrence.RDATE, function(i,rdate){
-            add_rdate(parseISO8601(rdate));
-          });
-        }
-      };
-      
       // show warning if editing a recurring event
       if (event.id && event.recurrence) {
         var sel = event.thisandfuture ? 'future' : (event.isexception ? 'current' : 'all');
@@ -682,24 +627,14 @@
           free_busy: freebusy.val(),
           priority: priority.val(),
           sensitivity: sensitivity.val(),
-          recurrence: '',
-          alarms: '',
+          status: eventstatus.val(),
+          recurrence: me.serialize_recurrence(endtime.val()),
+          valarms: me.serialize_alarms('#edit-alarms'),
           attendees: event_attendees,
           deleted_attachments: rcmail.env.deleted_attachments,
           attachments: []
         };
 
-        // serialize alarm settings
-        // TODO: support multiple alarm entries
-        var alarm = $('#eventedit select.edit-alarm-type').val();
-        if (alarm) {
-          var val, offset = $('#eventedit select.edit-alarm-offset').val();
-          if (offset == '@')
-            data.alarms = '@' + date2unixtime(parse_datetime($('#eventedit input.edit-alarm-time').val(), $('#eventedit input.edit-alarm-date').val())) + ':' + alarm;
-          else if ((val = parseInt($('#eventedit input.edit-alarm-value').val())) && !isNaN(val) && val >= 0)
-            data.alarms = offset[0] + val + offset[1] + ':' + alarm;
-        }
-
         // uploaded attachments list
         for (var i in rcmail.env.attachments)
           if (i.match(/^rcmfile(.+)/))
@@ -723,56 +658,6 @@
           data._notify = 1;
         }
 
-        // gather recurrence settings
-        var freq;
-        if ((freq = recurrence.val()) != '') {
-          data.recurrence = {
-            FREQ: freq,
-            INTERVAL: $('#edit-recurrence-interval-'+freq.toLowerCase()).val()
-          };
-          
-          var until = $('input.edit-recurrence-until:checked').val();
-          if (until == 'count')
-            data.recurrence.COUNT = rrtimes.val();
-          else if (until == 'until')
-            data.recurrence.UNTIL = date2servertime(parse_datetime(endtime.val(), rrenddate.val()));
-          
-          if (freq == 'WEEKLY') {
-            var byday = [];
-            $('input.edit-recurrence-weekly-byday:checked').each(function(){ byday.push(this.value); });
-            if (byday.length)
-              data.recurrence.BYDAY = byday.join(',');
-          }
-          else if (freq == 'MONTHLY') {
-            var mode = $('input.edit-recurrence-monthly-mode:checked').val(), bymonday = [];
-            if (mode == 'BYMONTHDAY') {
-              $('input.edit-recurrence-monthly-bymonthday:checked').each(function(){ bymonday.push(this.value); });
-              if (bymonday.length)
-                data.recurrence.BYMONTHDAY = bymonday.join(',');
-            }
-            else
-              data.recurrence.BYDAY = $('#edit-recurrence-monthly-prefix').val() + $('#edit-recurrence-monthly-byday').val();
-          }
-          else if (freq == 'YEARLY') {
-            var byday, bymonth = [];
-            $('input.edit-recurrence-yearly-bymonth:checked').each(function(){ bymonth.push(this.value); });
-            if (bymonth.length)
-              data.recurrence.BYMONTH = bymonth.join(',');
-            if ((byday = $('#edit-recurrence-yearly-byday').val()))
-              data.recurrence.BYDAY = $('#edit-recurrence-yearly-prefix').val() + byday;
-          }
-          else if (freq == 'RDATE') {
-            data.recurrence = { RDATE:[] };
-            // take selected but not yet added date into account
-            if ($('#edit-recurrence-rdate-input').val() != '') {
-              $('#recurrence-form-rdate input.button.add').click();
-            }
-            $('#edit-recurrence-rdates li').each(function(i, li){
-              data.recurrence.RDATE.push($(li).attr('data-value'));
-            });
-          }
-        }
-
         data.calendar = calendars.val();
 
         if (event.id) {
@@ -804,8 +689,8 @@
       $('#edit-tab-attachments')[(calendar.attachments?'show':'hide')]();
 
       // activate the first tab
-      $('#eventtabs').tabs('select', 0);
-      
+      $('#eventtabs').tabs('option', 'active', 0);
+
       // hack: set task to 'calendar' to make all dialog actions work correctly
       var comm_path_before = rcmail.env.comm_path;
       rcmail.env.comm_path = comm_path_before.replace(/_task=[a-z]+/, '_task=calendar');
@@ -819,15 +704,18 @@
         closeOnEscape: false,
         title: rcmail.gettext((action == 'edit' ? 'edit_event' : 'new_event'), 'calendar'),
         open: function() {
+          editform.attr('aria-hidden', 'false');
           $dialog.parent().find('.ui-dialog-buttonset .ui-button').first().addClass('mainaction');
         },
         close: function() {
-          editform.hide().appendTo(document.body);
+          editform.hide().attr('aria-hidden', 'true').appendTo(document.body);
           $dialog.dialog("destroy").remove();
           rcmail.ksearch_blur();
           rcmail.ksearch_destroy();
           freebusy_data = {};
           rcmail.env.comm_path = comm_path_before;  // restore comm_path
+          if (op_elem)
+            $(op_elem).focus();
         },
         buttons: buttons,
         minWidth: 500,
@@ -840,7 +728,7 @@
       title.select();
 
       // init other tabs asynchronously
-      window.setTimeout(load_recurrence_tab, exec_deferred);
+      window.setTimeout(function(){ me.set_recurrence_edit(event); }, exec_deferred);
       if (calendar.attendees)
         window.setTimeout(load_attendees_tab, exec_deferred);
       if (calendar.attachments)
@@ -972,12 +860,13 @@
         closeOnEscape: (!bw.ie6 && !bw.ie7),
         title: rcmail.gettext('scheduletime', 'calendar'),
         open: function() {
-          $dialog.parent().find('.ui-dialog-buttonset .ui-button').first().focus();
+          $dialog.attr('aria-hidden', 'false').find('#shedule-find-next, #shedule-find-prev').not(':disabled').first().focus();
         },
         close: function() {
           if (bw.ie6)
             $("#edit-attendees-table").css('visibility','visible');
-          $dialog.dialog("destroy").hide();
+          $dialog.dialog("destroy").attr('aria-hidden', 'true').hide();
+          // TODO: focus opener button
         },
         resizeStop: function() {
           render_freebusy_overlay();
@@ -1445,6 +1334,9 @@
         
         var now = new Date();
         $('#shedule-find-prev').button('option', 'disabled', (event.start.getTime() < now.getTime()));
+        
+        // speak new selection
+        rcmail.display_message(rcmail.gettext('suggestedslot', 'calendar') + ': ' + me.event_date_text(event, true), 'voice');
       }
       else {
         alert(rcmail.gettext('noslotfound','calendar'));
@@ -1536,7 +1428,7 @@
       if (organizer && !readonly)
           dispname = rcmail.env['identities-selector'];
       
-      var select = '<select class="edit-attendee-role"' + (organizer || readonly ? ' disabled="true"' : '') + '>';
+      var select = '<select class="edit-attendee-role"' + (organizer || readonly ? ' disabled="true"' : '') + ' aria-label="' + rcmail.gettext('role','calendar') + '">';
       for (var r in opts)
         select += '<option value="'+ r +'" class="' + r.toLowerCase() + '"' + (data.role == r ? ' selected="selected"' : '') +'>' + Q(opts[r]) + '</option>';
       select += '</select>';
@@ -1556,7 +1448,7 @@
 
       var html = '<td class="role">' + select + '</td>' +
         '<td class="name">' + dispname + '</td>' +
-        '<td class="availability"><img src="./program/resources/blank.gif" class="availabilityicon ' + avail + '" data-email="' + data.email + '" /></td>' +
+        '<td class="availability"><img src="./program/resources/blank.gif" class="availabilityicon ' + avail + '" data-email="' + data.email + '" alt="" /></td>' +
         '<td class="confirmstate"><span class="' + String(data.status).toLowerCase() + '" title="' + Q(tooltip) + '">' + Q(data.status || '') + '</span></td>' +
         '<td class="options">' + (organizer || readonly ? '' : dellink) + '</td>';
 
@@ -1611,10 +1503,11 @@
         url: rcmail.url('freebusy-status'),
         data: { email:email, start:date2servertime(clone_date(event.start, event.allDay?1:0)), end:date2servertime(clone_date(event.end, event.allDay?2:0)), _remote: 1 },
         success: function(status){
-          icon.removeClass('loading').addClass(String(status).toLowerCase());
+          var avail = String(status).toLowerCase();
+          icon.removeClass('loading').addClass(avail).attr('alt', rcmail.gettext('avail' + avail, 'calendar'));
         },
         error: function(){
-          icon.removeClass('loading').addClass('unknown');
+          icon.removeClass('loading').addClass('unknown').attr('alt', rcmail.gettext('availunknown', 'calendar'));
         }
       });
     };
@@ -1651,11 +1544,14 @@
         resizable: true,
         closeOnEscape: true,
         title: rcmail.gettext('findresources', 'calendar'),
+        open: function() {
+          $dialog.attr('aria-hidden', 'false');
+        },
         close: function() {
-          $dialog.dialog('destroy').hide();
+          $dialog.dialog('destroy').attr('aria-hidden', 'true').hide();
         },
         resize: function(e) {
-          var container = $(rcmail.gui_objects.resourceinfocalendar)
+          var container = $(rcmail.gui_objects.resourceinfocalendar);
           container.fullCalendar('option', 'height', container.height() + 4);
         },
         buttons: buttons,
@@ -1677,7 +1573,8 @@
           id_prefix: 'rcres',
           id_encode: rcmail.html_identifier_encode,
           id_decode: rcmail.html_identifier_decode,
-          selectable: true
+          selectable: true,
+          save_state: true
         });
         resources_treelist.addEventListener('select', function(node) {
           if (resources_data[node.id]) {
@@ -1721,9 +1618,11 @@
           titleFormat: { day: 'dddd ' + settings['date_long'] },
           currentTimeIndicator: settings.time_indicator,
           eventRender: function(event, element, view) {
+            var title = rcmail.get_label(event.status, 'calendar');
             element.addClass('status-' + event.status);
             element.find('.fc-event-head').hide();
-            element.find('.fc-event-title').text(rcmail.get_label(event.status, 'calendar'));
+            element.find('.fc-event-title').text(title);
+            element.attr('aria-label', me.event_date_text(event, true) + ': ' + title);
           }
         });
 
@@ -2099,10 +1998,12 @@
           title: rcmail.gettext((action == 'remove' ? 'removeeventconfirm' : 'changeeventconfirm'), 'calendar'),
           buttons: buttons,
           open: function() {
-            $dialog.parent().find('.ui-button').first().focus();
+            setTimeout(function(){
+              $dialog.parent().find('.ui-button:not(.ui-dialog-titlebar-close)').first().focus();
+            }, 5);
           },
           close: function(){
-            $dialog.dialog("destroy").hide();
+            $dialog.dialog("destroy").remove();
             if (!rcmail.busy)
               fc.fullCalendar('refetchEvents');
           }
@@ -2146,6 +2047,11 @@
         if (event.alarms)
           element.find('div.fc-event-time').append('<i class="fc-icon-alarms"></i>');
       }
+      if (event.status) {
+        element.addClass('cal-event-status-' + String(event.status).toLowerCase());
+      }
+
+      element.attr('aria-label', event.title + ', ' + me.event_date_text(event, true));
     };
 
 
@@ -2224,8 +2130,8 @@
           allDayText: rcmail.gettext('all-day', 'calendar'),
           currentTimeIndicator: settings.time_indicator,
           eventRender: fc_event_render,
-          eventClick: function(event) {
-            event_show_dialog(event);
+          eventClick: function(event, ev, view) {
+            event_show_dialog(event, ev);
           }
         });
         
@@ -2789,29 +2695,21 @@
     // mark the given calendar folder as selected
     this.select_calendar = function(id)
     {
-      var prefix = 'rcmlical';
-
-      $(rcmail.gui_objects.calendarslist).find('li.selected')
-        .removeClass('selected').addClass('unfocused');
-      $('#' + prefix + id, rcmail.gui_objects.calendarslist)
-        .removeClass('unfocused').addClass('selected');
+      calendars_list.select(id);
 
       // trigger event hook
-      rcmail.triggerEvent('selectfolder', { folder:name, prefix:prefix });
+      rcmail.triggerEvent('selectfolder', { folder:id, prefix:'rcmlical' });
 
       this.selected_calendar = id;
     };
 
+    // register the given calendar to the current view
+    var add_calendar_source = function(cal)
+    {
+      var color, brightness, select, id = cal.id;
 
-    /***  startup code  ***/
-
-    // create list of event sources AKA calendars
-    this.calendars = {};
-    var id, li, cal, active, color, brightness, event_sources = [];
-    for (id in rcmail.env.calendars) {
-      cal = rcmail.env.calendars[id];
-      this.calendars[id] = $.extend({
-        url: "./?_task=calendar&_action=load_events&source="+escape(id),
+      me.calendars[id] = $.extend({
+        url: rcmail.url('calendar/load_events', { source: id }),
         editable: !cal.readonly,
         className: 'fc-event-cal-'+id,
         id: id
@@ -2824,52 +2722,131 @@
           // http://javascriptrules.com/2009/08/05/css-color-brightness-contrast-using-javascript/
           brightness = (parseInt(RegExp.$1, 16) * 299 + parseInt(RegExp.$2, 16) * 587 + parseInt(RegExp.$3, 16) * 114) / 1000;
           if (brightness > 125)
-            this.calendars[id].textColor = 'black';
+            me.calendars[id].textColor = 'black';
         }
+
+        me.calendars[id].color = color;
       }
 
-      this.calendars[id].color = color;
+      if (fc && (cal.active || cal.subscribed)) {
+        if (cal.active)
+          fc.fullCalendar('addEventSource', me.calendars[id]);
 
-      if ((active = cal.active || false)) {
-        event_sources.push(this.calendars[id]);
+        var submit = { id: id, active: cal.active ? 1 : 0 };
+        if (cal.subscribed !== undefined)
+            submit.permanent = cal.subscribed ? 1 : 0;
+        rcmail.http_post('calendar', { action:'subscribe', c:submit });
       }
 
-      // init event handler on calendar list checkbox
-      if ((li = rcube_find_object('rcmlical' + id))) {
-        $('#'+li.id+' input').click(function(e){
-          var id = $(this).data('id');
-          if (me.calendars[id]) {  // add or remove event source on click
-            var action;
-            if (this.checked) {
-              action = 'addEventSource';
-              me.calendars[id].active = true;
-            }
-            else {
-              action = 'removeEventSource';
-              me.calendars[id].active = false;
-            }
-            
-            // add/remove event source
-            fc.fullCalendar(action, me.calendars[id]);
-            rcmail.http_post('calendar', { action:'subscribe', c:{ id:id, active:me.calendars[id].active?1:0 } });
-          }
-        }).data('id', id).get(0).checked = active;
-        
-        $(li).click(function(e){
-          me.select_calendar($(this).data('id'));
-          rcmail.enable_command('calendar-edit', true);
-          rcmail.enable_command('calendar-remove', 'calendar-showurl', true);
-        })
-        .dblclick(function(){ me.calendar_edit_dialog(me.calendars[me.selected_calendar]); })
-        .data('id', id);
+      // insert to #calendar-select options if writeable
+      select = $('#edit-calendar');
+      if (fc && !cal.readonly && select.length && !select.find('option[value="'+id+'"]').length) {
+        $('<option>').attr('value', id).html(cal.name).appendTo(select);
       }
-      
+    }
+
+
+    /***  startup code  ***/
+
+    // create list of event sources AKA calendars
+    var id, cal, active, event_sources = [];
+    for (id in rcmail.env.calendars) {
+      cal = rcmail.env.calendars[id];
+      active = cal.active || false;
+      add_calendar_source(cal);
+
+      // check active calendars
+      $('#rcmlical'+id+' > .calendar input').get(0).checked = active;
+
+      if (active) {
+        event_sources.push(this.calendars[id]);
+      }
+
       if (!cal.readonly && !this.selected_calendar) {
         this.selected_calendar = id;
         rcmail.enable_command('addevent', true);
       }
     }
-    
+
+    // initialize treelist widget that controls the calendars list
+    var widget_class = window.kolab_folderlist || rcube_treelist_widget;
+    calendars_list = new widget_class(rcmail.gui_objects.calendarslist, {
+      id_prefix: 'rcmlical',
+      selectable: true,
+      save_state: true,
+      keyboard: false,
+      searchbox: '#calendarlistsearch',
+      search_action: 'calendar/calendar',
+      search_sources: [ 'folders', 'users' ],
+      search_title: rcmail.gettext('calsearchresults','calendar')
+    });
+    calendars_list.addEventListener('select', function(node) {
+      me.select_calendar(node.id);
+      rcmail.enable_command('calendar-edit', 'calendar-showurl', true);
+      rcmail.enable_command('calendar-remove', !me.calendars[node.id].readonly);
+    });
+    calendars_list.addEventListener('insert-item', function(p) {
+      var cal = p.data;
+      if (cal && cal.id) {
+        add_calendar_source(cal);
+
+        // add css classes related to this calendar to document
+        if (cal.css) {
+          $('<style type="text/css"></style>')
+            .html(cal.css)
+            .appendTo('head');
+        }
+      }
+    });
+    calendars_list.addEventListener('subscribe', function(p) {
+      var cal;
+      if ((cal = me.calendars[p.id])) {
+        cal.subscribed = p.subscribed || false;
+        rcmail.http_post('calendar', { action:'subscribe', c:{ id:p.id, active:cal.active?1:0, permanent:cal.subscribed?1:0 } });
+      }
+    });
+    calendars_list.addEventListener('search-complete', function(data) {
+      if (data.length)
+        rcmail.display_message(rcmail.gettext('nrcalendarsfound','calendar').replace('$nr', data.length), 'voice');
+      else
+        rcmail.display_message(rcmail.gettext('nocalendarsfound','calendar'), 'info');
+    });
+
+    // init (delegate) event handler on calendar list checkboxes
+    $(rcmail.gui_objects.calendarslist).on('click', 'input[type=checkbox]', function(e){
+      var id = this.value;
+      if (me.calendars[id]) {  // add or remove event source on click
+        var action;
+        if (this.checked) {
+          action = 'addEventSource';
+          me.calendars[id].active = true;
+        }
+        else {
+          action = 'removeEventSource';
+          me.calendars[id].active = false;
+        }
+
+        // add/remove event source
+        fc.fullCalendar(action, me.calendars[id]);
+        rcmail.http_post('calendar', { action:'subscribe', c:{ id:id, active:me.calendars[id].active?1:0 } });
+
+        e.stopPropagation();
+      }
+    })
+    .on('keypress', 'input[type=checkbox]', function(e) {
+        // select calendar on <Enter>
+        if (e.keyCode == 13) {
+            calendars_list.select(this.value);
+            return rcube_event.cancel(e);
+        }
+    });
+
+    // register dbl-click handler to open calendar edit dialog
+    $(rcmail.gui_objects.calendarslist).on('dblclick', ':not(.virtual) > .calname', function(e){
+      var id = $(this).closest('li').attr('id').replace(/^rcmlical/, '');
+      me.calendar_edit_dialog(me.calendars[id]);
+    });
+
     // select default calendar
     if (settings.default_calendar && this.calendars[settings.default_calendar] && !this.calendars[settings.default_calendar].readonly)
       this.selected_calendar = settings.default_calendar;
@@ -2990,9 +2967,9 @@
         day_clicked_ts = now;
       },
       // callback when a specific event is clicked
-      eventClick: function(event) {
+      eventClick: function(event, ev, view) {
         if (!event.temp)
-          event_show_dialog(event);
+          event_show_dialog(event, ev);
       },
       // callback when an event was dragged and finally dropped
       eventDrop: function(event, dayDelta, minuteDelta, allDay, revertFunc) {
@@ -3122,7 +3099,7 @@
       // scroll to current time
       var $this = $(this);
       var widget = $this.autocomplete('widget');
-      var menu = $this.data('autocomplete').menu;
+      var menu = $this.data('ui-autocomplete').menu;
       var amregex = /^(.+)(a[.m]*)/i;
       var pmregex = /^(.+)(a[.m]*)/i;
       var val = $(this).val().replace(amregex, '0:$1').replace(pmregex, '1:$1');
@@ -3175,9 +3152,9 @@
           return [ true, (active ? 'ui-datepicker-activerange ui-datepicker-active-' + view.name : ''), ''];
         }
       })) // set event handler for clicks on calendar week cell of the datepicker widget
-        .click(function(e) {
+        .on('click', 'td.ui-datepicker-week-col', function(e) {
           var cell = $(e.target);
-          if (e.target.tagName == 'TD' && cell.hasClass('ui-datepicker-week-col')) {
+          if (e.target.tagName == 'TD' && cell.hasClass('')) {
             var base_date = minical.datepicker('getDate');
             if (minical.data('month'))
               base_date.setMonth(minical.data('month')-1);
@@ -3194,7 +3171,9 @@
             fc.fullCalendar('gotoDate', date).fullCalendar('setDate', date).fullCalendar('changeView', 'agendaWeek');
             minical.datepicker('setDate', date);
           }
-      });
+        });
+
+      minical.find('.ui-datepicker-inline').attr('aria-labelledby', 'aria-label-minical');
 
       if (rcmail.env.date) {
         var viewdate = new Date();
@@ -3204,10 +3183,11 @@
 
       // init event dialog
       $('#eventtabs').tabs({
-        show: function(event, ui) {
-          if (ui.panel.id == 'event-panel-attendees' || ui.panel.id == 'event-panel-resources') {
-            var tab = ui.panel.id == 'event-panel-resources' ? 'resource' : 'attendee';
-            $('#edit-'+tab+'-name').select();
+        activate: function(event, ui) {
+          if (ui.newPanel.selector == '#event-panel-attendees' || ui.newPanel.selector == '#event-panel-resources') {
+            var tab = ui.newPanel.selector == '#event-panel-resources' ? 'resource' : 'attendee';
+            if (!rcube_event.is_keyboard(event))
+              $('#edit-'+tab+'-name').select();
             // update free-busy status if needed
             if (freebusy_ui.needsupdate && me.selected_event)
               update_freebusy_status(me.selected_event);
@@ -3230,6 +3210,7 @@
         .autocomplete({
           delay: 100,
           minLength: 1,
+          appendTo: '#eventedit',
           source: autocomplete_times,
           open: autocomplete_open,
           change: event_times_changed,
@@ -3241,46 +3222,19 @@
         .click(function() {  // show drop-down upon clicks
           $(this).autocomplete('search', $(this).val() ? $(this).val().replace(/\D.*/, "") : " ");
         }).each(function(){
-          $(this).data('autocomplete')._renderItem = function(ul, item) {
+          $(this).data('ui-autocomplete')._renderItem = function(ul, item) {
             return $('<li>')
-              .data('item.autocomplete', item)
+              .data('ui-autocomplete-item', item)
               .append('<a>' + item[0] + item[1] + '</a>')
               .appendTo(ul);
             };
         });
 
-      // register events on alarm fields
-      init_alarms_edit('#eventedit');
-
-      // toggle recurrence frequency forms
-      $('#edit-recurrence-frequency').change(function(e){
-        var freq = $(this).val().toLowerCase();
-        $('.recurrence-form').hide();
-        if (freq) {
-          $('#recurrence-form-'+freq).show();
-          if (freq != 'rdate')
-            $('#recurrence-form-until').show();
-        }
-      });
-      $('#recurrence-form-rdate input.button.add').click(function(e){
-        var dt, dv = $('#edit-recurrence-rdate-input').val();
-        if (dv && (dt = parse_datetime('12:00', dv))) {
-          add_rdate(dt);
-          sort_rdates();
-          $('#edit-recurrence-rdate-input').val('')
-        }
-        else {
-          $('#edit-recurrence-rdate-input').select();
-        }
-      });
-      $('#edit-recurrence-rdates').on('click', 'a.delete', function(e){
-        $(this).closest('li').remove();
-        return false;
-      });
-      $('#edit-recurrence-enddate').datepicker(datepicker_settings).click(function(){ $("#edit-recurrence-repeat-until").prop('checked', true) });
-      $('#edit-recurrence-repeat-times').change(function(e){ $('#edit-recurrence-repeat-count').prop('checked', true); });
+      // register events on alarms and recurrence fields
+      me.init_alarms_edit('#edit-alarms');
+      me.init_recurrence_edit('#eventedit');
 
-      $('#edit-recurrence-rdate-input, #event-export-startdate').datepicker(datepicker_settings);
+      $('#event-export-startdate').datepicker(datepicker_settings);
 
       // init attendees autocompletion
       var ac_props;

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

@@ -52,6 +52,7 @@
  * 'recurrence_id' => 'ID of the recurrence group',   // usually the ID of the starting event
  *    'categories' => 'Event category',
  *     'free_busy' => 'free|busy|outofoffice|tentative',  // Show time as
+ *        'status' => 'TENTATIVE|CONFIRMED|CANCELLED',    // event status according to RFC 2445
  *      'priority' => 0-9,     // Event priority (0=undefined, 1=highest, 9=lowest)
  *   'sensitivity' => 'public|private|confidential',   // Event sensitivity
  *        'alarms' => '-15M:DISPLAY',  // DEPRECATED Reminder settings inspired by valarm definition (e.g. display alert 15 minutes before event)
@@ -165,6 +166,15 @@
   abstract function remove_calendar($prop);
 
   /**
+   * Search for shared or otherwise not listed calendars the user has access
+   *
+   * @param string Search string
+   * @param string Section/source to search
+   * @return array List of calendars
+   */
+  abstract function search_calendars($query, $source);
+
+  /**
    * Add a single event to the database
    *
    * @param array Hash array with event properties (see header of this file)
@@ -405,16 +415,6 @@
   }
 
   /**
-   * Return a (limited) list of color values to be used for calendar and category coloring
-   *
-   * @return mixed List for colors as hex values or false if no presets should be shown
-   */
-  public function get_color_values()
-  {
-    return false;
-  }
-
-  /**
    * Compose a list of birthday events from the contact records in the user's address books.
    *
    * This is a default implementation using Roundcube's address book API.
@@ -540,4 +540,15 @@
     return $events;
   }
 
+  /**
+   * Handler for user_delete plugin hook
+   *
+   * @param array Hash array with hook arguments
+   * @return array Return arguments for plugin hooks
+   */
+  public function user_delete($args)
+  {
+    // TO BE OVERRIDDEN
+    return $args;
+  }
 }

roundcubemail-plugins-kolab-3.2.tar.gz/plugins/calendar/drivers/database/SQL/mysql.initial.sql Changed

roundcubemail-plugins-kolab-3.2.tar.gz/plugins/calendar/drivers/database/SQL/mysql/2014040900.sql Added

roundcubemail-plugins-kolab-3.2.tar.gz/plugins/calendar/drivers/database/SQL/postgres.initial.sql Changed

roundcubemail-plugins-kolab-3.2.tar.gz/plugins/calendar/drivers/database/SQL/postgres/2014040900.sql Added

roundcubemail-plugins-kolab-3.2.tar.gz/plugins/calendar/drivers/database/SQL/sqlite.initial.sql Changed

roundcubemail-plugins-kolab-3.2.tar.gz/plugins/calendar/drivers/database/SQL/sqlite/2014040900.sql Added

@@ -0,0 +1,67 @@
+-- SQLite database updates since version 0.9-beta
+
+-- ALTER TABLE events ADD url varchar(255) NOT NULL AFTER categories;
+
+CREATE TABLE temp_events (
+  event_id integer NOT NULL PRIMARY KEY,
+  calendar_id integer NOT NULL default '0',
+  recurrence_id integer NOT NULL default '0',
+  uid varchar(255) NOT NULL default '',
+  created datetime NOT NULL default '1000-01-01 00:00:00',
+  changed datetime NOT NULL default '1000-01-01 00:00:00',
+  sequence integer NOT NULL default '0',
+  start datetime NOT NULL default '1000-01-01 00:00:00',
+  end datetime NOT NULL default '1000-01-01 00:00:00',
+  recurrence varchar(255) default NULL,
+  title varchar(255) NOT NULL,
+  description text NOT NULL,
+  location varchar(255) NOT NULL default '',
+  categories varchar(255) NOT NULL default '',
+  url varchar(255) NOT NULL default '',
+  all_day tinyint(1) NOT NULL default '0',
+  free_busy tinyint(1) NOT NULL default '0',
+  priority tinyint(1) NOT NULL default '0',
+  sensitivity tinyint(1) NOT NULL default '0',
+  alarms varchar(255) default NULL,
+  attendees text default NULL,
+  notifyat datetime default NULL
+);
+
+INSERT INTO temp_events (event_id, calendar_id, recurrence_id, uid, created, changed, sequence, start, end, recurrence, title, description, location, categories, url, all_day, free_busy, priority, sensitivity, alarms, attendees, notifyat)
+                  SELECT event_id, calendar_id, recurrence_id, uid, created, changed, sequence, start, end, recurrence, title, description, location, categories, url, all_day, free_busy, priority, sensitivity, alarms, attendees, notifyat
+                  FROM events;
+
+DROP TABLE events;
+
+CREATE TABLE events (
+  event_id integer NOT NULL PRIMARY KEY,
+  calendar_id integer NOT NULL default '0',
+  recurrence_id integer NOT NULL default '0',
+  uid varchar(255) NOT NULL default '',
+  created datetime NOT NULL default '1000-01-01 00:00:00',
+  changed datetime NOT NULL default '1000-01-01 00:00:00',
+  sequence integer NOT NULL default '0',
+  start datetime NOT NULL default '1000-01-01 00:00:00',
+  end datetime NOT NULL default '1000-01-01 00:00:00',
+  recurrence varchar(255) default NULL,
+  title varchar(255) NOT NULL,
+  description text NOT NULL,
+  location varchar(255) NOT NULL default '',
+  categories varchar(255) NOT NULL default '',
+  url varchar(255) NOT NULL default '',
+  all_day tinyint(1) NOT NULL default '0',
+  free_busy tinyint(1) NOT NULL default '0',
+  priority tinyint(1) NOT NULL default '0',
+  sensitivity tinyint(1) NOT NULL default '0',
+  status varchar(32) NOT NULL default '',
+  alarms varchar(255) default NULL,
+  attendees text default NULL,
+  notifyat datetime default NULL,
+  CONSTRAINT fk_events_calendar_id FOREIGN KEY (calendar_id)
+    REFERENCES calendars(calendar_id)
+);
+
+INSERT INTO events (event_id, calendar_id, recurrence_id, uid, created, changed, sequence, start, end, recurrence, title, description, location, categories, url, all_day, free_busy, priority, sensitivity, alarms, attendees, notifyat)
+             SELECT event_id, calendar_id, recurrence_id, uid, created, changed, sequence, start, end, recurrence, title, description, location, categories, url, all_day, free_busy, priority, sensitivity, alarms, attendees, notifyat
+             FROM temp_events;
+

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

@@ -59,9 +59,6 @@
     $this->rc = $cal->rc;
     $this->server_timezone = new DateTimeZone(date_default_timezone_get());
     
-    // load library classes
-    require_once($this->cal->home . '/lib/Horde_Date_Recurrence.php');
-    
     // read database config
     $db = $this->rc->get_dbh();
     $this->db_events = $this->rc->config->get('db_table_events', $db->table_name($this->db_events));
@@ -141,7 +138,7 @@
           'color'      => $prefs['color'],
           'showalarms' => (bool)$this->rc->config->get('calendar_birthdays_alarm_type'),
           'active'     => !in_array($id, $hidden),
-          'class_name' => 'birthdays',
+          'group'      => 'birthdays',
           'readonly'   => true,
           'default'    => false,
           'children'   => false,
@@ -251,6 +248,19 @@
   }
 
   /**
+   * Search for shared or otherwise not listed calendars the user has access
+   *
+   * @param string Search string
+   * @param string Section/source to search
+   * @return array List of calendars
+   */
+  public function search_calendars($query, $source)
+  {
+    // not implemented
+    return array();
+  }
+
+  /**
    * Add a single event to the database
    *
    * @param array Hash array with event properties
@@ -271,8 +281,8 @@
 
       $this->rc->db->query(sprintf(
         "INSERT INTO " . $this->db_events . "
-         (calendar_id, created, changed, uid, %s, %s, all_day, recurrence, title, description, location, categories, url, free_busy, priority, sensitivity, attendees, alarms, notifyat)
-         VALUES (?, %s, %s, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)",
+         (calendar_id, created, changed, uid, %s, %s, all_day, recurrence, title, description, location, categories, url, free_busy, priority, sensitivity, status, attendees, alarms, notifyat)
+         VALUES (?, %s, %s, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)",
           $this->rc->db->quote_identifier('start'),
           $this->rc->db->quote_identifier('end'),
           $this->rc->db->now(),
@@ -292,6 +302,7 @@
         intval($event['free_busy']),
         intval($event['priority']),
         intval($event['sensitivity']),
+        strval($event['status']),
         $event['attendees'],
         $event['alarms'],
         $event['notifyat']
@@ -450,14 +461,22 @@
     $event['_recurrence'] = rtrim($rrule, ';');
     $event['free_busy'] = intval($this->free_busy_map[strtolower($event['free_busy'])]);
     $event['sensitivity'] = intval($this->sensitivity_map[strtolower($event['sensitivity'])]);
-    
+
+    if ($event['free_busy'] == 'tentative') {
+        $event['status'] = 'TENTATIVE';
+    }
+
     if (isset($event['allday'])) {
       $event['all_day'] = $event['allday'] ? 1 : 0;
     }
-    
+
     // compute absolute time to notify the user
     $event['notifyat'] = $this->_get_notification($event);
-    
+
+    if (is_array($event['valarms'])) {
+        $event['alarms'] = $this->serialize_alarms($event['valarms']);
+    }
+
     // process event attendees
     $_attendees = '';
     foreach ((array)$event['attendees'] as $attendee) {
@@ -479,10 +498,10 @@
    */
   private function _get_notification($event)
   {
-    if ($event['alarms'] && $event['start'] > new DateTime()) {
+    if ($event['valarms'] && $event['start'] > new DateTime()) {
       $alarm = libcalendaring::get_next_alarm($event);
 
-      if ($alarm['time'] && $alarm['action'] == 'DISPLAY')
+      if ($alarm['time'] && in_array($alarm['action'], $this->alarm_types))
         return date('Y-m-d H:i:s', $alarm['time']);
     }
 
@@ -499,13 +518,13 @@
   {
     $event = $this->_save_preprocess($event);
     $sql_set = array();
-    $set_cols = array('start', 'end', 'all_day', 'recurrence_id', 'sequence', 'title', 'description', 'location', 'categories', 'url', 'free_busy', 'priority', 'sensitivity', 'attendees', 'alarms', 'notifyat');
+    $set_cols = array('start', 'end', 'all_day', 'recurrence_id', 'sequence', 'title', 'description', 'location', 'categories', 'url', 'free_busy', 'priority', 'sensitivity', 'status', 'attendees', 'alarms', 'notifyat');
     foreach ($set_cols as $col) {
       if (is_object($event[$col]) && is_a($event[$col], 'DateTime'))
         $sql_set[] = $this->rc->db->quote_identifier($col) . '=' . $this->rc->db->quote($event[$col]->format(self::DB_DATE_FORMAT));
       else if (is_array($event[$col]))
         $sql_set[] = $this->rc->db->quote_identifier($col) . '=' . $this->rc->db->quote(join(',', $event[$col]));
-      else if (isset($event[$col]))
+      else if (array_key_exists($col, $event))
         $sql_set[] = $this->rc->db->quote_identifier($col) . '=' . $this->rc->db->quote($event[$col]);
     }
     
@@ -581,11 +600,11 @@
         $next_start->setTimezone($this->server_timezone);
         $next_end = clone $next_start;
         $next_end->add($duration);
-        $notify_at = $this->_get_notification(array('alarms' => $event['alarms'], 'start' => $next_start, 'end' => $next_end));
+        $notify_at = $this->_get_notification(array('alarms' => $event['alarms'], 'start' => $next_start, 'end' => $next_end, 'status' => $event['status']));
         $query = $this->rc->db->query(sprintf(
           "INSERT INTO " . $this->db_events . "
-           (calendar_id, recurrence_id, created, changed, uid, %s, %s, all_day, recurrence, title, description, location, categories, url, free_busy, priority, sensitivity, alarms, attendees, notifyat)
-            SELECT calendar_id, ?, %s, %s, uid, ?, ?, all_day, recurrence, title, description, location, categories, url, free_busy, priority, sensitivity, alarms, attendees, ?
+           (calendar_id, recurrence_id, created, changed, uid, %s, %s, all_day, recurrence, title, description, location, categories, url, free_busy, priority, sensitivity, status, alarms, attendees, notifyat)
+            SELECT calendar_id, ?, %s, %s, uid, ?, ?, all_day, recurrence, title, description, location, categories, url, free_busy, priority, sensitivity, status, alarms, attendees, ?
             FROM  " . $this->db_events . " WHERE event_id=? AND calendar_id IN (" . $this->calendar_ids . ")",
             $this->rc->db->quote_identifier('start'),
             $this->rc->db->quote_identifier('end'),
@@ -872,7 +891,12 @@
     else {
       $event['attendees'] = array();
     }
-
+    
+    // decode serialized alarms
+    if ($event['alarms']) {
+      $event['valarms'] = $this->unserialize_alarms($event['alarms']);
+    }
+    
     unset($event['event_id'], $event['calendar_id'], $event['notifyat'], $event['all_day'], $event['_attachments']);
     return $event;
   }
@@ -1083,4 +1107,78 @@
     return $this->rc->db->affected_rows($query);
   }
 
+  /**
+   * Helper method to serialize the list of alarms into a string
+   */
+  private function serialize_alarms($valarms)
+  {
+      foreach ((array)$valarms as $i => $alarm) {
+          if ($alarm['trigger'] instanceof DateTime) {
+              $valarms[$i]['trigger'] = '@' . $alarm['trigger']->format('c');
+          }
+      }
+
+      return $valarms ? json_encode($valarms) : null;
+  }
+
+  /**
+   * Helper method to decode a serialized list of alarms
+   */
+  private function unserialize_alarms($alarms)
+  {
+      // decode json serialized alarms
+      if ($alarms && $alarms[0] == '[') {
+          $valarms = json_decode($alarms, true);
+          foreach ($valarms as $i => $alarm) {
+              if ($alarm['trigger'][0] == '@') {
+                  try {
+                      $valarms[$i]['trigger'] = new DateTime(substr($alarm['trigger'], 1));
+                  }
+                  catch (Exception $e) {
+                      unset($valarms[$i]);
+                  }
+              }
+          }
+      }
+      // convert legacy alarms data
+      else if (strlen($alarms)) {
+          list($trigger, $action) = explode(':', $alarms, 2);
+          if ($trigger = libcalendaring::parse_alaram_value($trigger)) {
+              $valarms = array(array('action' => $action, 'trigger' => $trigger[3] ?: $trigger[0]));
+          }
+      }
+
+      return $valarms;
+  }
+
+  /**
+   * Handler for user_delete plugin hook
+   */
+  public function user_delete($args)
+  {
+      $db = $this->rc->db;
+      $user = $args['user'];
+      $event_ids = array();
+
+      $events = $db->query(
+          "SELECT event_id FROM " . $this->db_events . " AS ev" .
+          " LEFT JOIN " . $this->db_calendars . " cal ON (ev.calendar_id = cal.calendar_id)".
+          " WHERE user_id=?",
+          $user->ID);
+
+      while ($row = $db->fetch_assoc($calendars)) {
+          $event_ids[] = $row['event_id'];
+      }
+
+      if (!empty($event_ids)) {
+          foreach (array($this->db_attachments, $this->db_events) as $table) {
+              $db->query(sprintf("DELETE FROM $table WHERE event_id IN (%s)", join(',', $event_ids)));
+          }
+      }
+
+      foreach (array($this->db_calendars, 'itipinvitations') as $table) {
+          $db->query("DELETE FROM $table WHERE user_id=?", $user->ID);
+      }
+  }
+
 }

roundcubemail-plugins-kolab-3.2.tar.gz/plugins/calendar/drivers/kolab/SQL/mysql.initial.sql Changed

roundcubemail-plugins-kolab-3.2.tar.gz/plugins/calendar/drivers/kolab/SQL/mysql/2014041700.sql Added

roundcubemail-plugins-kolab-3.2.tar.gz/plugins/calendar/drivers/kolab/SQL/postgres.initial.sql Changed

@@ -6,14 +6,16 @@
  **/
 
 CREATE TABLE IF NOT EXISTS kolab_alarms (
-  event_id character varying(255) NOT NULL,
+  alarm_id character varying(255) NOT NULL,
   user_id integer NOT NULL
         REFERENCES users (user_id) ON DELETE CASCADE ON UPDATE CASCADE,
   notifyat timestamp without time zone DEFAULT NULL,
   dismissed smallint NOT NULL DEFAULT 0,
-  PRIMARY KEY(event_id)
+  PRIMARY KEY(alarm_id)
 );
 
+CREATE INDEX kolab_alarms_user_id_idx ON kolab_alarms (user_id);
+
 CREATE TABLE IF NOT EXISTS itipinvitations (
   token character varying(64) NOT NULL,
   event_uid character varying(255) NOT NULL,
@@ -25,6 +27,6 @@
   PRIMARY KEY(token)
 );
 
-CREATE INDEX itipinvitations_event_uid_user_id_idx ON itipinvitations (event_uid, user_id);
+CREATE INDEX itipinvitations_user_id_event_uid_idx ON itipinvitations (user_id, event_uid);
 
-INSERT INTO system (name, value) VALUES ('calendar-kolab-version', '2013011000');
+INSERT INTO system (name, value) VALUES ('calendar-kolab-version', '2014041700');

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

@@ -24,6 +24,7 @@
  */
 
 require_once(dirname(__FILE__) . '/kolab_calendar.php');
+require_once(dirname(__FILE__) . '/kolab_user_calendar.php');
 
 class kolab_driver extends calendar_driver
 {
@@ -33,7 +34,7 @@
   public $freebusy = true;
   public $attachments = true;
   public $undelete = true;
-  public $alarm_types = array('DISPLAY');
+  public $alarm_types = array('DISPLAY','AUDIO');
   public $categoriesimmutable = true;
 
   private $rc;
@@ -62,6 +63,9 @@
         $this->alarm_types = array('DISPLAY');
         $this->alarm_absolute = false;
     }
+
+    // calendar uses fully encoded identifiers
+    kolab_storage::$encode_ids = true;
   }
 
 
@@ -75,29 +79,35 @@
       return $this->calendars;
 
     // get all folders that have "event" type, sorted by namespace/name
-    $folders = kolab_storage::sort_folders(kolab_storage::get_folders('event'));
+    $folders = kolab_storage::sort_folders(kolab_storage::get_folders('event') + kolab_storage::get_user_folders('event', true));
     $this->calendars = array();
 
     foreach ($folders as $folder) {
-      $calendar = new kolab_calendar($folder->name, $this->cal);
-      $this->calendars[$calendar->id] = $calendar;
-      if (!$calendar->readonly)
-        $this->has_writeable = true;
+      if ($folder instanceof kolab_storage_folder_user)
+        $calendar = new kolab_user_calendar($folder->name, $this->cal);
+      else
+        $calendar = new kolab_calendar($folder->name, $this->cal);
+
+      if ($calendar->ready) {
+        $this->calendars[$calendar->id] = $calendar;
+        if (!$calendar->readonly)
+          $this->has_writeable = true;
+      }
     }
 
     return $this->calendars;
   }
 
-
   /**
    * Get a list of available calendars from this source
    *
    * @param bool $active   Return only active calendars
    * @param bool $personal Return only personal calendars
+   * @param object $tree   Reference to hierarchical folder tree object
    *
    * @return array List of calendars
    */
-  public function list_calendars($active = false, $personal = false)
+  public function list_calendars($active = false, $personal = false, &$tree = null)
   {
     // attempt to create a default calendar for this user
     if (!$this->has_writeable) {
@@ -107,25 +117,64 @@
       }
     }
 
+    $delim = $this->rc->get_storage()->get_hierarchy_delimiter();
     $folders = $this->filter_calendars(false, $active, $personal);
-    $calendars = $names = array();
+    $calendars = array();
 
     // include virtual folders for a full folder tree
-    if (!$active && !$personal && !$this->rc->output->ajax_call && in_array($this->rc->action, array('index','')))
-      $folders = kolab_storage::folder_hierarchy($folders);
+    if (!is_null($tree))
+      $folders = kolab_storage::folder_hierarchy($folders, $tree);
 
     foreach ($folders as $id => $cal) {
       $fullname = $cal->get_name();
-      $listname = kolab_storage::folder_displayname($fullname, $names);
+      $listname = $cal->get_foldername();
+      $imap_path = explode($delim, $cal->name);
+
+      // find parent
+      do {
+        array_pop($imap_path);
+        $parent_id = kolab_storage::folder_id(join($delim, $imap_path));
+      }
+      while (count($imap_path) > 1 && !$this->calendars[$parent_id]);
 
-      // special handling for virtual folders
-      if ($cal->virtual) {
+      // restore "real" parent ID
+      if ($parent_id && !$this->calendars[$parent_id]) {
+          $parent_id = kolab_storage::folder_id($cal->get_parent());
+      }
+
+      // turn a kolab_storage_folder object into a kolab_calendar
+      if ($cal instanceof kolab_storage_folder) {
+          $cal = new kolab_calendar($cal->name, $this->cal);
+          $this->calendars[$cal->id] = $cal;
+      }
+
+      // special handling for user or virtual folders
+      if ($cal instanceof kolab_storage_folder_user) {
+        $calendars[$cal->id] = array(
+          'id' => $cal->id,
+          'name' => kolab_storage::object_name($fullname),
+          'listname' => $listname,
+          'editname' => $cal->get_foldername(),
+          'color'    => $cal->get_color(),
+          'active'   => $cal->is_active(),
+          'title'    => $cal->get_owner(),
+          'owner'    => $cal->get_owner(),
+          'virtual'  => false,
+          'readonly' => true,
+          'group'    => 'other',
+          'class'    => 'user',
+        );
+      }
+      else if ($cal->virtual) {
         $calendars[$cal->id] = array(
           'id' => $cal->id,
           'name' => $fullname,
           'listname' => $listname,
+          'editname' => $cal->get_foldername(),
           'virtual' => true,
           'readonly' => true,
+          'group'    => $cal->get_namespace(),
+          'class'    => 'folder',
         );
       }
       else {
@@ -134,17 +183,23 @@
           'name'     => $fullname,
           'listname' => $listname,
           'editname' => $cal->get_foldername(),
+          'title'    => $cal->get_title(),
           'color'    => $cal->get_color(),
           'readonly' => $cal->readonly,
           'showalarms' => $cal->alarms,
-          'class_name' => $cal->get_namespace(),
-          'default'  => $cal->storage->default,
-          'active'   => $cal->storage->is_active(),
+          'group'    => $cal->get_namespace(),
+          'default'  => $cal->default,
+          'active'   => $cal->is_active(),
           'owner'    => $cal->get_owner(),
           'children' => true,  // TODO: determine if that folder indeed has child folders
+          'parent'   => $parent_id,
           'caldavurl' => $cal->get_caldav_url(),
         );
       }
+
+      if ($cal->subscriptions) {
+        $calendars[$cal->id]['subscribed'] = (bool)$cal->is_subscribed();
+      }
     }
 
     // append the virtual birthdays calendar
@@ -159,7 +214,7 @@
           'color'      => $prefs[$id]['color'],
           'active'     => $prefs[$id]['active'],
           'showalarms' => (bool)$this->rc->config->get('calendar_birthdays_alarm_type'),
-          'class_name' => 'birthdays',
+          'group'      => 'birthdays',
           'readonly'   => true,
           'default'    => false,
           'children'   => false,
@@ -199,7 +254,7 @@
       if ($writeable && $cal->readonly) {
         continue;
       }
-      if ($active && !$cal->storage->is_active()) {
+      if ($active && !$cal->is_active()) {
         continue;
       }
       if ($personal && $cal->get_namespace() != 'personal') {
@@ -211,6 +266,25 @@
     return $calendars;
   }
 
+
+  /**
+   * Get the kolab_calendar instance for the given calendar ID
+   *
+   * @param string Calendar identifier (encoded imap folder name)
+   * @return object kolab_calendar Object nor null if calendar doesn't exist
+   */
+  protected function get_calendar($id)
+  {
+    // create calendar object if necesary
+    if (!$this->calendars[$id] && $id !== self::BIRTHDAY_CALENDAR_ID) {
+      $calendar = kolab_calendar::factory($id, $this->cal);
+      if ($calendar->ready)
+        $this->calendars[$calendar->id] = $calendar;
+    }
+
+    return $this->calendars[$id];
+  }
+
   /**
    * Create a new calendar assigned to the current user
    *
@@ -256,17 +330,8 @@
    */
   public function edit_calendar($prop)
   {
-    if ($prop['id'] && ($cal = $this->calendars[$prop['id']])) {
-      $prop['oldname'] = $cal->get_realname();
-      $newfolder = kolab_storage::folder_update($prop);
-
-      if ($newfolder === false) {
-        $this->last_error = $this->cal->gettext(kolab_storage::$last_error);
-        return false;
-      }
-
-      // create ID
-      $id = kolab_storage::folder_id($newfolder);
+    if ($prop['id'] && ($cal = $this->get_calendar($prop['id']))) {
+      $id = $cal->update($prop);
     }
     else {
       $id = $prop['id'];
@@ -298,8 +363,13 @@
    */
   public function subscribe_calendar($prop)
   {
-    if ($prop['id'] && ($cal = $this->calendars[$prop['id']])) {
-      return $cal->storage->activate($prop['active']);
+    if ($prop['id'] && ($cal = $this->get_calendar($prop['id']))) {
+      $ret = false;
+      if (isset($prop['permanent']))
+        $ret |= $cal->storage->subscribe(intval($prop['permanent']));
+      if (isset($prop['active']))
+        $ret |= $cal->storage->activate(intval($prop['active']));
+      return $ret;
     }
     else {
       // save state in local prefs
@@ -320,8 +390,9 @@
    */
   public function remove_calendar($prop)
   {
-    if ($prop['id'] && ($cal = $this->calendars[$prop['id']])) {
+    if ($prop['id'] && ($cal = $this->get_calendar($prop['id']))) {
       $folder = $cal->get_realname();
+      // TODO: unsubscribe if no admin rights
       if (kolab_storage::folder_delete($folder)) {
         // remove color in user prefs (temp. solution)
         $prefs['kolab_calendars'] = $this->rc->config->get('kolab_calendars', array());
@@ -339,6 +410,54 @@
 
 
   /**
+   * Search for shared or otherwise not listed calendars the user has access
+   *
+   * @param string Search string
+   * @param string Section/source to search
+   * @return array List of calendars
+   */
+  public function search_calendars($query, $source)
+  {
+    if (!kolab_storage::setup())
+      return array();
+
+    $this->calendars = array();
+    $this->search_more_results = false;
+
+    // find unsubscribed IMAP folders that have "event" type
+    if ($source == 'folders') {
+      foreach ((array)kolab_storage::search_folders('event', $query, array('other')) as $folder) {
+        $calendar = new kolab_calendar($folder->name, $this->cal);
+        $this->calendars[$calendar->id] = $calendar;
+      }
+    }
+    // find other user's virtual calendars
+    else if ($source == 'users') {
+      $limit = $this->rc->config->get('autocomplete_max', 15) * 2;  // we have slightly more space, so display twice the number
+      foreach (kolab_storage::search_users($query, 0, array(), $limit, $count) as $user) {
+        $calendar = new kolab_user_calendar($user, $this->cal);
+        $this->calendars[$calendar->id] = $calendar;
+
+        // search for calendar folders shared by this user
+        foreach (kolab_storage::list_user_folders($user, 'event', false) as $foldername) {
+          $cal = new kolab_calendar($foldername, $this->cal);
+          $this->calendars[$cal->id] = $cal;
+        }
+      }
+
+      if ($count > $limit) {
+        $this->search_more_results = true;
+      }
+    }
+
+    // don't list the birthday calendar
+    $this->rc->config->set('calendar_contact_birthdays', false);
+
+    return $this->list_calendars();
+  }
+
+
+  /**
    * Fetch a single event
    *
    * @see calendar_driver::get_event()
@@ -355,7 +474,7 @@
     }
 
     if ($cal) {
-      if ($storage = $this->calendars[$cal]) {
+      if ($storage = $this->get_calendar($cal)) {
         return $storage->get_event($id);
       }
     }
@@ -382,7 +501,7 @@
       return false;
 
     $cid = $event['calendar'] ? $event['calendar'] : reset(array_keys($this->calendars));
-    if ($storage = $this->calendars[$cid]) {
+    if ($storage = $this->get_calendar($cid)) {
       // handle attachments to add
       if (!empty($event['attachments'])) {
         foreach ($event['attachments'] as $idx => $attachment) {
@@ -424,7 +543,7 @@
    */
   public function move_event($event)
   {
-    if (($storage = $this->calendars[$event['calendar']]) && ($ev = $storage->get_event($event['id']))) {
+    if (($storage = $this->get_calendar($event['calendar'])) && ($ev = $storage->get_event($event['id']))) {
       unset($ev['sequence']);
       return $this->update_event($event + $ev);
     }
@@ -440,7 +559,7 @@
    */
   public function resize_event($event)
   {
-    if (($storage = $this->calendars[$event['calendar']]) && ($ev = $storage->get_event($event['id']))) {
+    if (($storage = $this->get_calendar($event['calendar'])) && ($ev = $storage->get_event($event['id']))) {
       unset($ev['sequence']);
       return $this->update_event($event + $ev);
     }
@@ -462,7 +581,7 @@
     $success = false;
     $savemode = $event['_savemode'];
 
-    if (($storage = $this->calendars[$event['calendar']]) && ($event = $storage->get_event($event['id']))) {
+    if (($storage = $this->get_calendar($event['calendar'])) && ($event = $storage->get_event($event['id']))) {
       $event['_savemode'] = $savemode;
       $savemode = 'all';
       $master = $event;
@@ -565,7 +684,7 @@
    */
   public function restore_event($event)
   {
-    if ($storage = $this->calendars[$event['calendar']]) {
+    if ($storage = $this->get_calendar($event['calendar'])) {
       if (!empty($_SESSION['calendar_restore_event_data']))
         $success = $storage->update_event($_SESSION['calendar_restore_event_data']);
       else
@@ -585,12 +704,12 @@
    */
   private function update_event($event)
   {
-    if (!($storage = $this->calendars[$event['calendar']]))
+    if (!($storage = $this->get_calendar($event['calendar'])))
       return false;
 
     // move event to another folder/calendar
     if ($event['_fromcalendar'] && $event['_fromcalendar'] != $event['calendar']) {
-      if (!($fromcalendar = $this->calendars[$event['_fromcalendar']]))
+      if (!($fromcalendar = $this->get_calendar($event['_fromcalendar'])))
         return false;
 
       if ($event['_savemode'] != 'new') {
@@ -779,18 +898,19 @@
   {
     if ($calendars && is_string($calendars))
       $calendars = explode(',', $calendars);
+    else if (!$calendars)
+      $calendars = array_keys($this->calendars);
 
     $query = array();
     if ($modifiedsince)
       $query[] = array('changed', '>=', $modifiedsince);
 
     $events = $categories = array();
-    foreach (array_keys($this->calendars) as $cid) {
-      if ($calendars && !in_array($cid, $calendars))
-        continue;
-
-      $events = array_merge($events, $this->calendars[$cid]->list_events($start, $end, $search, $virtual, $query));
-      $categories += $this->calendars[$cid]->categories;
+    foreach ($calendars as $cid) {
+      if ($storage = $this->get_calendar($cid)) {
+        $events = array_merge($events, $storage->list_events($start, $end, $search, $virtual, $query));
+        $categories += $storage->categories;
+      }
     }
 
     // add events from the address books birthday calendar
@@ -834,7 +954,7 @@
     
     $time = $slot + $interval;
     
-    $events = array();
+    $candidates = array();
     $query = array(array('tags', '=', 'x-has-alarms'));
     foreach ($this->calendars as $cid => $calendar) {
       // skip calendars with alarms disabled
@@ -844,41 +964,48 @@
       foreach ($calendar->list_events($time, $time + 86400 * 365, null, 1, $query) as $e) {
         // add to list if alarm is set
         $alarm = libcalendaring::get_next_alarm($e);
-        if ($alarm && $alarm['time'] && $alarm['time'] <= $time && $alarm['action'] == 'DISPLAY') {
-          $id = $e['id'];
-          $events[$id] = $e;
-          $events[$id]['notifyat'] = $alarm['time'];
+        if ($alarm && $alarm['time'] && $alarm['time'] >= $last && in_array($alarm['action'], $this->alarm_types)) {
+          $id = $alarm['id'];  // use alarm-id as primary identifier
+          $candidates[$id] = array(
+            'id'       => $id,
+            'title'    => $e['title'],
+            'location' => $e['location'],
+            'start'    => $e['start'],
+            'end'      => $e['end'],
+            'notifyat' => $alarm['time'],
+            'action'   => $alarm['action'],
+          );
         }
       }
     }
 
     // get alarm information stored in local database
-    if (!empty($events)) {
-      $event_ids = array_map(array($this->rc->db, 'quote'), array_keys($events));
+    if (!empty($candidates)) {
+      $alarm_ids = array_map(array($this->rc->db, 'quote'), array_keys($candidates));
       $result = $this->rc->db->query(sprintf(
           "SELECT * FROM kolab_alarms
-           WHERE event_id IN (%s) AND user_id=?",
-           join(',', $event_ids),
+           WHERE alarm_id IN (%s) AND user_id=?",
+           join(',', $alarm_ids),
            $this->rc->db->now()
           ),
           $this->rc->user->ID
        );
 
       while ($result && ($e = $this->rc->db->fetch_assoc($result))) {
-        $dbdata[$e['event_id']] = $e;
+        $dbdata[$e['alarm_id']] = $e;
       }
     }
     
     $alarms = array();
-    foreach ($events as $id => $e) {
-      // skip dismissed
+    foreach ($candidates as $id => $alarm) {
+      // skip dismissed alarms
       if ($dbdata[$id]['dismissed'])
         continue;
       
       // snooze function may have shifted alarm time
-      $notifyat = $dbdata[$id]['notifyat'] ? strtotime($dbdata[$id]['notifyat']) : $e['notifyat'];
+      $notifyat = $dbdata[$id]['notifyat'] ? strtotime($dbdata[$id]['notifyat']) : $alarm['notifyat'];
       if ($notifyat <= $time)
-        $alarms[] = $e;
+        $alarms[] = $alarm;
     }
     
     return $alarms;
@@ -889,13 +1016,13 @@
    *
    * @see calendar_driver::dismiss_alarm()
    */
-  public function dismiss_alarm($event_id, $snooze = 0)
+  public function dismiss_alarm($alarm_id, $snooze = 0)
   {
     // delete old alarm entry
     $this->rc->db->query(
       "DELETE FROM kolab_alarms
-       WHERE event_id=? AND user_id=?",
-       $event_id,
+       WHERE alarm_id=? AND user_id=?",
+       $alarm_id,
        $this->rc->user->ID
     );
 
@@ -904,9 +1031,9 @@
 
     $query = $this->rc->db->query(
       "INSERT INTO kolab_alarms
-       (event_id, user_id, dismissed, notifyat)
+       (alarm_id, user_id, dismissed, notifyat)
        VALUES(?, ?, ?, ?)",
-      $event_id,
+      $alarm_id,
       $this->rc->user->ID,
       $snooze > 0 ? 0 : 1,
       $notifyat
@@ -920,7 +1047,7 @@
    */
   public function list_attachments($event)
   {
-    if (!($storage = $this->calendars[$event['calendar']]))
+    if (!($storage = $this->get_calendar($event['calendar'])))
       return false;
 
     $event = $storage->get_event($event['id']);
@@ -933,7 +1060,7 @@
    */
   public function get_attachment($id, $event)
   {
-    if (!($storage = $this->calendars[$event['calendar']]))
+    if (!($storage = $this->get_calendar($event['calendar'])))
       return false;
 
     $event = $storage->get_event($event['id']);
@@ -955,7 +1082,7 @@
    */
   public function get_attachment_body($id, $event)
   {
-    if (!($cal = $this->calendars[$event['calendar']]))
+    if (!($cal = $this->get_calendar($event['calendar'])))
       return false;
 
     return $cal->storage->get_attachment($event['id'], $id);
@@ -1072,7 +1199,7 @@
     ignore_user_abort(true);
 
     $cal = get_input_value('source', RCUBE_INPUT_GPC);
-    if (!($cal = $this->calendars[$cal]))
+    if (!($cal = $this->get_calendar($cal)))
       return false;
 
     // trigger updates on folder
@@ -1099,6 +1226,11 @@
    */
   public function calendar_form($action, $calendar, $formfields)
   {
+    // show default dialog for birthday calendar
+    if ($calendar['id'] == self::BIRTHDAY_CALENDAR_ID) {
+      return parent::calendar_form($action, $calendar, $formfields);
+    }
+
     if ($calendar['id'] && ($cal = $this->calendars[$calendar['id']])) {
       $folder = $cal->get_realname(); // UTF7
       $color  = $cal->get_color();
@@ -1150,8 +1282,9 @@
       $hidden_fields[] = array('name' => 'parent', 'value' => $path_imap);
     }
     else {
-      $select = kolab_storage::folder_selector('event', array('name' => 'parent'), $folder);
+      $select = kolab_storage::folder_selector('event', array('name' => 'parent', 'id' => 'calendar-parent'), $folder);
       $form['props']['fieldsets']['location']['content']['path'] = array(
+        'id' => 'calendar-parent',
         'label' => $this->cal->gettext('parentcalendar'),
         'value' => $select->show(strlen($folder) ? $path_imap : ''),
       );
@@ -1231,10 +1364,9 @@
     if (is_array($form['content']) && !empty($form['content'])) {
       $table = new html_table(array('cols' => 2));
       foreach ($form['content'] as $col => $colprop) {
-        $colprop['id'] = '_'.$col;
         $label = !empty($colprop['label']) ? $colprop['label'] : rcube_label($col);
 
-        $table->add('title', sprintf('<label for="%s">%s</label>', $colprop['id'], Q($label)));
+        $table->add('title', html::label($colprop['id'], Q($label)));
         $table->add(null, $colprop['value']);
       }
       $content = $table->show();
@@ -1262,7 +1394,7 @@
   public function calendar_acl_form()
   {
     $calid = get_input_value('_id', RCUBE_INPUT_GPC);
-    if ($calid && ($cal = $this->calendars[$calid])) {
+    if ($calid && ($cal = $this->get_calendar($calid))) {
       $folder = $cal->get_realname(); // UTF7
       $color  = $cal->get_color();
     }
@@ -1293,31 +1425,14 @@
     return $plugin['form']['sharing']['content'];
   }
 
-
   /**
-   * Return a (limited) list of color values to be used for calendar and category coloring
-   *
-   * @return mixed List for colors as hex values or false if no presets should be shown
+   * Handler for user_delete plugin hook
    */
-  public function get_color_values()
+  public function user_delete($args)
   {
-      // selection from http://msdn.microsoft.com/en-us/library/aa358802%28v=VS.85%29.aspx
-      return array('000000','006400','2F4F4F','800000','808000','008000',
-        '008080','000080','800080','4B0082','191970','8B0000','008B8B',
-        '00008B','8B008B','556B2F','8B4513','228B22','6B8E23','2E8B57',
-        'B8860B','483D8B','A0522D','0000CD','A52A2A','00CED1','696969',
-        '20B2AA','9400D3','B22222','C71585','3CB371','D2691E','DC143C',
-        'DAA520','00FA9A','4682B4','7CFC00','9932CC','FF0000','FF4500',
-        'FF8C00','FFA500','FFD700','FFFF00','9ACD32','32CD32','00FF00',
-        '00FF7F','00FFFF','5F9EA0','00BFFF','0000FF','FF00FF','808080',
-        '708090','CD853F','8A2BE2','778899','FF1493','48D1CC','1E90FF',
-        '40E0D0','4169E1','6A5ACD','BDB76B','BA55D3','CD5C5C','ADFF2F',
-        '66CDAA','FF6347','8FBC8B','DA70D6','BC8F8F','9370DB','DB7093',
-        'FF7F50','6495ED','A9A9A9','F4A460','7B68EE','D2B48C','E9967A',
-        'DEB887','FF69B4','FA8072','F08080','EE82EE','87CEEB','FFA07A',
-        'F0E68C','DDA0DD','90EE90','7FFFD4','C0C0C0','87CEFA','B0C4DE',
-        '98FB98','ADD8E6','B0E0E6','D8BFD8','EEE8AA','AFEEEE','D3D3D3',
-        'FFDEAD');
+    $db = $this->rc->get_dbh();
+    foreach (array('kolab_alarms', 'itipinvitations') as $table) {
+      $db->query("DELETE FROM $table WHERE user_id=?", $args['user']->ID);
+    }
   }
-
 }

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

@@ -0,0 +1,396 @@
+<?php
+
+/**
+ * Kolab calendar storage class simulating a virtual user calendar
+ *
+ * @author Thomas Bruederli <bruederli@kolabsys.com>
+ *
+ * Copyright (C) 2014, Kolab Systems AG <contact@kolabsys.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+class kolab_user_calendar extends kolab_calendar
+{
+  public $id = 'unknown';
+  public $ready = false;
+  public $readonly = true;
+  public $attachments = false;
+  public $subscriptions = false;
+
+  protected $userdata = array();
+  protected $timeindex = array();
+
+
+  /**
+   * Default constructor
+   */
+  public function __construct($user_or_folder, $calendar)
+  {
+    $this->cal = $calendar;
+
+    // full user record is provided
+    if (is_array($user_or_folder)) {
+      $this->userdata = $user_or_folder;
+      $this->storage = new kolab_storage_folder_user($this->userdata['kolabtargetfolder'], '', $this->userdata);
+    }
+    else {  // get user record from LDAP
+      $this->storage = new kolab_storage_folder_user($user_or_folder);
+      $this->userdata = $this->storage->ldaprec;
+    }
+
+    $this->ready = !empty($this->userdata['kolabtargetfolder']);
+
+    if ($this->ready) {
+      // ID is derrived from the user's kolabtargetfolder attribute
+      $this->id = kolab_storage::folder_id($this->userdata['kolabtargetfolder'], true);
+      $this->imap_folder = $this->userdata['kolabtargetfolder'];
+      $this->name = $this->storage->get_name();
+      $this->parent = '';  // user calendars are top level
+
+      // user-specific alarms settings win
+      $prefs = $this->cal->rc->config->get('kolab_calendars', array());
+      if (isset($prefs[$this->id]['showalarms']))
+        $this->alarms = $prefs[$this->id]['showalarms'];
+    }
+  }
+
+
+  /**
+   * Getter for a nice and human readable name for this calendar
+   *
+   * @return string Name of this calendar
+   */
+  public function get_name()
+  {
+    return $this->userdata['name'] ?: $this->userdata['mail'];
+  }
+
+
+  /**
+   * Getter for the IMAP folder owner
+   *
+   * @return string Name of the folder owner
+   */
+  public function get_owner()
+  {
+    return $this->userdata['mail'];
+  }
+
+
+  /**
+   *
+   */
+  public function get_title()
+  {
+    return $this->userdata['mail'];
+  }
+
+
+  /**
+   * Getter for the name of the namespace to which the IMAP folder belongs
+   *
+   * @return string Name of the namespace (personal, other, shared)
+   */
+  public function get_namespace()
+  {
+    return 'other user';
+  }
+
+
+  /**
+   * Getter for the top-end calendar folder name (not the entire path)
+   *
+   * @return string Name of this calendar
+   */
+  public function get_foldername()
+  {
+    return $this->get_name();
+  }
+
+  /**
+   * Return color to display this calendar
+   */
+  public function get_color()
+  {
+    // calendar color is stored in local user prefs
+    $prefs = $this->cal->rc->config->get('kolab_calendars', array());
+
+    if (!empty($prefs[$this->id]) && !empty($prefs[$this->id]['color']))
+      return $prefs[$this->id]['color'];
+
+    return 'cc0000';
+  }
+
+  /**
+   * Compose an URL for CalDAV access to this calendar (if configured)
+   */
+  public function get_caldav_url()
+  {
+    return false;
+  }
+
+
+  /**
+   * Update properties of this calendar folder
+   *
+   * @see calendar_driver::edit_calendar()
+   */
+  public function update(&$prop)
+  {
+    // don't change anything.
+    // let kolab_driver save props in local prefs
+    return $prop['id'];
+  }
+
+
+  /**
+   * Getter for a single event object
+   */
+  public function get_event($id)
+  {
+    // TODO: implement this
+    return $this->events[$id];
+  }
+
+
+  /**
+   * @param  integer Event's new start (unix timestamp)
+   * @param  integer Event's new end (unix timestamp)
+   * @param  string  Search query (optional)
+   * @param  boolean Include virtual events (optional)
+   * @param  array   Additional parameters to query storage
+   * @return array A list of event records
+   */
+  public function list_events($start, $end, $search = null, $virtual = 1, $query = array())
+  {
+    // convert to DateTime for comparisons
+    try {
+      $start_dt = new DateTime('@'.$start);
+    }
+    catch (Exception $e) {
+      $start_dt = new DateTime('@0');
+    }
+    try {
+      $end_dt = new DateTime('@'.$end);
+    }
+    catch (Exception $e) {
+      $end_dt = new DateTime('today +10 years');
+    }
+
+    $limit_changed = null;
+    if (!empty($query)) {
+      foreach ($query as $q) {
+        if ($q[0] == 'changed' && $q[1] == '>=') {
+          try { $limit_changed = new DateTime('@'.$q[2]); }
+          catch (Exception $e) { /* ignore */ }
+        }
+      }
+    }
+
+    // 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)) {
+        $cal = new kolab_calendar($foldername, $this->cal);
+        foreach ($cal->list_events($start, $end, $search, 1) as $event) {
+          $this->events[$event['id']] = $event;
+          $this->timeindex[$this->time_key($event)] = $event['id'];
+        }
+      }
+    }
+
+    // get events from the user's free/busy feed
+    $this->fetch_freebusy($limit_changed);
+
+    $events = array();
+    foreach ($this->events as $id => $event) {
+      // list events in requested time window
+      if ($event['start'] <= $end_dt && $event['end'] >= $start_dt &&
+           (!$limit_changed || !$event['changed'] || $event['changed'] >= $limit_changed)) {
+        $events[] = $event;
+      }
+    }
+
+    // avoid session race conditions that will loose temporary subscriptions
+    $this->cal->rc->session->nowrite = true;
+
+    return $events;
+  }
+
+  /**
+   * Helper method to fetch free/busy data for the user and turn it into calendar data
+   */
+  private function fetch_freebusy($limit_changed = null)
+  {
+    // ask kolab server first
+    try {
+      $request_config = array(
+        'store_body'       => true,
+        'follow_redirects' => true,
+      );
+      $request  = libkolab::http_request(kolab_storage::get_freebusy_url($this->userdata['mail']), 'GET', $request_config);
+      $response = $request->send();
+
+      // authentication required
+      if ($response->getStatus() == 401) {
+        $request->setAuth($this->rc->user->get_username(), $this->rc->decrypt($_SESSION['password']));
+        $response = $request->send();
+      }
+
+      if ($response->getStatus() == 200)
+        $fbdata = $response->getBody();
+
+      unset($request, $response);
+    }
+    catch (Exception $e) {
+      rcube::raise_error(array(
+        'code' => 900,
+        'type' => 'php',
+        'file' => __FILE__,
+        'line' => __LINE__,
+        'message' => "Error fetching free/busy information: " . $e->getMessage()),
+        true, false);
+
+      return false;
+    }
+
+    $statusmap = array(
+      'FREE' => 'free',
+      'BUSY' => 'busy',
+      'BUSY-TENTATIVE' => 'tentative',
+      'X-OUT-OF-OFFICE' => 'outofoffice',
+      'OOF' => 'outofoffice',
+    );
+    $titlemap = array(
+      'FREE' => $this->cal->gettext('availfree'),
+      'BUSY' => $this->cal->gettext('availbusy'),
+      'BUSY-TENTATIVE' => $this->cal->gettext('availtentative'),
+      'X-OUT-OF-OFFICE' => $this->cal->gettext('availoutofoffice'),
+    );
+
+    // console('_fetch_freebusy', kolab_storage::get_freebusy_url($this->userdata['mail']), $fbdata);
+
+    // parse free-busy information using Horde classes
+    $count = 0;
+    if ($fbdata) {
+      $ical = $this->cal->get_ical();
+      $ical->import($fbdata);
+      if ($fb = $ical->freebusy) {
+        $result = array();
+
+        // consider 'changed >= X' queries
+        if ($limit_changed && $fb['created'] && $fb['created'] < $limit_changed) {
+          return 0;
+        }
+
+        foreach ($fb['periods'] as $tuple) {
+          list($from, $to, $type) = $tuple;
+          $event = array(
+            'id'        => md5($this->id . $from->format('U') . '/' . $to->format('U')),
+            'calendar'  => $this->id,
+            'changed'   => $fb['created'] ?: new DateTime(),
+            'title'     => $titlemap[$type] ?: $type,
+            'start'     => $from,
+            'end'       => $to,
+            'free_busy' => $statusmap[$type] ?: 'busy',
+            'organizer' => array(
+              'email' => $this->userdata['mail'],
+              'name'  => $this->userdata['displayname'],
+            ),
+          );
+
+          // avoid duplicate entries
+          $key = $this->time_key($event);
+          if (!$this->timeindex[$key]) {
+            $this->events[$event['id']] = $event;
+            $this->timeindex[$key] = $event['id'];
+            $count++;
+          }
+        }
+      }
+    }
+
+    return $count;
+  }
+
+  /**
+   * Helper to build a key for the absolute time slot the given event convers
+   */
+  private function time_key($event)
+  {
+    return sprintf('%s/%s', $event['start']->format('U'), is_object($event['end']->format('U')) ?: '0');
+  }
+
+
+  /**
+   * Create a new event record
+   *
+   * @see calendar_driver::new_event()
+   * 
+   * @return mixed The created record ID on success, False on error
+   */
+  public function insert_event($event)
+  {
+    return false;
+  }
+
+  /**
+   * Update a specific event record
+   *
+   * @see calendar_driver::new_event()
+   * @return boolean True on success, False on error
+   */
+
+  public function update_event($event, $exception_id = null)
+  {
+    return false;
+  }
+
+  /**
+   * Delete an event record
+   *
+   * @see calendar_driver::remove_event()
+   * @return boolean True on success, False on error
+   */
+  public function delete_event($event, $force = true)
+  {
+    return false;
+  }
+
+  /**
+   * Restore deleted event record
+   *
+   * @see calendar_driver::undelete_event()
+   * @return boolean True on success, False on error
+   */
+  public function restore_event($event)
+  {
+    return false;
+  }
+
+
+  /**
+   * Convert from Kolab_Format to internal representation
+   */
+  private function _to_rcube_event($record)
+  {
+    $record['id'] = $record['uid'];
+    $record['calendar'] = $this->id;
+
+    // TODO: implement this
+
+    return $record;
+  }
+
+}

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

@@ -1,15 +1,15 @@
 <?php
 
+require_once realpath(__DIR__ . '/../../libcalendaring/lib/libcalendaring_recurrence.php');
+
 /**
  * Recurrence computation class for the Calendar plugin
  *
  * Uitility class to compute instances of recurring events.
  *
- * @version @package_version@
  * @author Thomas Bruederli <bruederli@kolabsys.com>
- * @package @package_name@
  *
- * Copyright (C) 2012, Kolab Systems AG <contact@kolabsys.com>
+ * Copyright (C) 2012-2014, Kolab Systems AG <contact@kolabsys.com>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as
@@ -24,14 +24,10 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-class calendar_recurrence
+class calendar_recurrence extends libcalendaring_recurrence
 {
-  private $cal;
   private $event;
-  private $next;
-  private $engine;
   private $duration;
-  private $hour = 0;
 
   /**
    * Default constructor
@@ -41,62 +37,25 @@
    */
   function __construct($cal, $event)
   {
-    // use Horde classes to compute recurring instances
-    // TODO: replace with something that has less than 6'000 lines of code
-    require_once(__DIR__ . '/Horde_Date_Recurrence.php');
+    parent::__construct($cal->lib);
 
-    $this->cal = $cal;
     $this->event = $event;
-    $this->next = new Horde_Date($event['start'], $cal->timezone->getName());
-    $this->hour = $this->next->hour;
 
     if (is_object($event['start']) && is_object($event['end']))
       $this->duration = $event['start']->diff($event['end']);
 
-    $this->engine = new Horde_Date_Recurrence($event['start']);
-    $this->engine->fromRRule20(libcalendaring::to_rrule($event['recurrence']));
-
-    if (is_array($event['recurrence']['EXDATE'])) {
-      foreach ($event['recurrence']['EXDATE'] as $exdate) {
-        if (is_a($exdate, 'DateTime')) {
-          $this->engine->addException($exdate->format('Y'), $exdate->format('n'), $exdate->format('j'));
-        }
-      }
-    }
-    if (is_array($event['recurrence']['RDATE'])) {
-      foreach ($event['recurrence']['RDATE'] as $rdate) {
-        if (is_a($rdate, 'DateTime')) {
-          $this->engine->addRDate($rdate->format('Y'), $rdate->format('n'), $rdate->format('j'));
-        }
-      }
-    }
+    $event['start']->_dateonly |= $event['allday'];
+    $this->init($event['recurrence'], $event['start']);
   }
 
   /**
-   * Get date/time of the next occurence of this event
+   * Alias of libcalendaring_recurrence::next()
    *
    * @return mixed DateTime object or False if recurrence ended
    */
   public function next_start()
   {
-    $time = false;
-    $after = clone $this->next;
-    $after->mday = $after->mday + 1;
-    if ($this->next && ($next = $this->engine->nextActiveRecurrence($after))) {
-      if (!$next->after($this->next)) {
-        // avoid endless loops if recurrence computation fails
-        return false;
-      }
-      if ($this->event['allday']) {
-        $next->hour = $this->hour;  # fix time for all-day events
-        $next->min = 0;
-      }
-
-      $time = $next->toDateTime();
-      $this->next = $next;
-    }
-
-    return $time;
+    return $this->next();
   }
 
   /**
@@ -106,14 +65,16 @@
    */
   public function next_instance()
   {
-    if ($next_start = $this->next_start()) {
-      $next_end = clone $next_start;
-      $next_end->add($this->duration);
-
+    if ($next_start = $this->next()) {
       $next = $this->event;
       $next['recurrence_id'] = $next_start->format('Y-m-d');
       $next['start'] = $next_start;
-      $next['end'] = $next_end;
+
+      if ($this->duration) {
+        $next['end'] = clone $next_start;
+        $next['end']->add($this->duration);
+      }
+
       unset($next['_formatobj']);
 
       return $next;

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

@@ -74,11 +74,12 @@
     $this->cal->register_handler('plugin.calendar_select', array($this, 'calendar_select'));
     $this->cal->register_handler('plugin.identity_select', array($this, 'identity_select'));
     $this->cal->register_handler('plugin.category_select', array($this, 'category_select'));
+    $this->cal->register_handler('plugin.status_select', array($this, 'status_select'));
     $this->cal->register_handler('plugin.freebusy_select', array($this, 'freebusy_select'));
     $this->cal->register_handler('plugin.priority_select', array($this, 'priority_select'));
     $this->cal->register_handler('plugin.sensitivity_select', array($this, 'sensitivity_select'));
     $this->cal->register_handler('plugin.alarm_select', array($this, 'alarm_select'));
-    $this->cal->register_handler('plugin.recurrence_form', array($this, 'recurrence_form'));
+    $this->cal->register_handler('plugin.recurrence_form', array($this->cal->lib, 'recurrence_form'));
     $this->cal->register_handler('plugin.attachments_form', array($this, 'attachments_form'));
     $this->cal->register_handler('plugin.attachments_list', array($this, 'attachments_list'));
     $this->cal->register_handler('plugin.filedroparea', array($this, 'file_drop_area'));
@@ -106,7 +107,6 @@
   {
     $skin_path = $this->cal->local_skin_path();
     $this->cal->include_stylesheet($skin_path . '/fullcalendar.css');
-    $this->cal->include_stylesheet($skin_path . '/jquery.miniColors.css');
   }
 
   /**
@@ -116,8 +116,14 @@
   {
     $this->cal->include_script('calendar_ui.js');
     $this->cal->include_script('lib/js/fullcalendar.js');
-    $this->cal->include_script('lib/js/jquery.miniColors.min.js');
     $this->rc->output->include_script('treelist.js');
+
+    // include kolab folderlist widget if available
+    if (is_readable($this->cal->api->dir . 'libkolab/js/folderlist.js')) {
+        $this->cal->api->include_script('libkolab/js/folderlist.js');
+    }
+
+    jqueryui::miniColors();
   }
 
   /**
@@ -157,26 +163,7 @@
     foreach ((array)$calendars as $id => $prop) {
       if (!$prop['color'])
         continue;
-      $color = $prop['color'];
-      $class = 'cal-' . asciiwords($id, true);
-      $css .= "li.$class, #eventshow .$class { color: #$color }\n";
-      if ($mode != 1) {
-        if ($mode == 3) {
-          $css .= ".fc-event-$class .fc-event-bg {";
-          $css .= " opacity: 0.9;";
-          $css .= " filter: alpha(opacity=90);";
-        }
-        else {
-          $css .= ".fc-event-$class, ";
-          $css .= ".fc-event-$class .fc-event-inner {";
-        }
-        if (!$attrib['printmode'])
-          $css .= " background-color: #$color;";
-        if ($mode % 2 == 0)
-        $css .= " border-color: #$color;";
-        $css .= "}\n";
-      }
-      $css .= ".$class .handle { background-color: #$color; }";
+      $css .= $this->calendar_css_classes($id, $prop, $mode);
     }
     
     return html::tag('style', array('type' => 'text/css'), $css);
@@ -185,47 +172,149 @@
   /**
    *
    */
+  public function calendar_css_classes($id, $prop, $mode)
+  {
+    $color = $prop['color'];
+    $class = 'cal-' . asciiwords($id, true);
+    $css .= "li.$class, #eventshow .$class { color: #$color }\n";
+
+    if ($mode != 1) {
+      if ($mode == 3) {
+        $css .= ".fc-event-$class .fc-event-bg {";
+        $css .= " opacity: 0.9;";
+        $css .= " filter: alpha(opacity=90);";
+      }
+      else {
+        $css .= ".fc-event-$class, ";
+        $css .= ".fc-event-$class .fc-event-inner {";
+      }
+      if (!$attrib['printmode'])
+        $css .= " background-color: #$color;";
+      if ($mode % 2 == 0)
+      $css .= " border-color: #$color;";
+      $css .= "}\n";
+    }
+
+    return $css . ".$class .handle { background-color: #$color; }\n";
+  }
+
+  /**
+   *
+   */
   function calendar_list($attrib = array())
   {
-    $calendars = $this->cal->driver->list_calendars();
+    $html = '';
+    $jsenv = array();
+    $tree = true;
+    $calendars = $this->cal->driver->list_calendars(false, false, $tree);
+
+    // walk folder tree
+    if (is_object($tree)) {
+      $html = $this->list_tree_html($tree, $calendars, $jsenv, $attrib);
+
+      // append birthdays calendar which isn't part of $tree
+      if ($bdaycal = $calendars[calendar_driver::BIRTHDAY_CALENDAR_ID]) {
+        $calendars = array(calendar_driver::BIRTHDAY_CALENDAR_ID => $bdaycal);
+      }
+      else {
+        $calendars = array();  // clear array for flat listing
+      }
+    }
+    else {
+      // fall-back to flat folder listing
+      $attrib['class'] .= ' flat';
+    }
 
-    $li = '';
     foreach ((array)$calendars as $id => $prop) {
       if ($attrib['activeonly'] && !$prop['active'])
         continue;
-      
-      unset($prop['user_id']);
-      $prop['alarms'] = $this->cal->driver->alarms;
-      $prop['attendees'] = $this->cal->driver->attendees;
-      $prop['freebusy'] = $this->cal->driver->freebusy;
-      $prop['attachments'] = $this->cal->driver->attachments;
-      $prop['undelete'] = $this->cal->driver->undelete;
-      $prop['feedurl'] = $this->cal->get_url(array('_cal' => $this->cal->ical_feed_hash($id) . '.ics', 'action' => 'feed'));
-
-      if (!$prop['virtual'])
-        $jsenv[$id] = $prop;
-
-      $html_id = html_identifier($id);
-      $class = 'cal-'  . asciiwords($id, true);
-      $title = $prop['name'] != $prop['listname'] ? html_entity_decode($prop['name'], ENT_COMPAT, RCMAIL_CHARSET) : '';
-
-      if ($prop['virtual'])
-        $class .= ' virtual';
-      else if ($prop['readonly'])
-        $class .= ' readonly';
-      if ($prop['class_name'])
-        $class .= ' '.$prop['class_name'];
-
-      $li .= html::tag('li', array('id' => 'rcmlical' . $html_id, 'class' => $class),
-        ($prop['virtual'] ? '' : html::tag('input', array('type' => 'checkbox', 'name' => '_cal[]', 'value' => $id, 'checked' => $prop['active']), '') .
-        html::span('handle', '&nbsp;')) .
-        html::span(array('class' => 'calname', 'title' => $title), $prop['listname']));
+
+      $html .= html::tag('li', array('id' => 'rcmlical' . $id, 'class' => $prop['group']),
+        $content = $this->calendar_list_item($id, $prop, $jsenv, $attrib['activeonly'])
+      );
     }
 
     $this->rc->output->set_env('calendars', $jsenv);
     $this->rc->output->add_gui_object('calendarslist', $attrib['id']);
 
-    return html::tag('ul', $attrib, $li, html::$common_attrib);
+    return html::tag('ul', $attrib, $html, html::$common_attrib);
+  }
+
+  /**
+   * Return html for a structured list <ul> for the folder tree
+   */
+  public function list_tree_html($node, $data, &$jsenv, $attrib)
+  {
+    $out = '';
+    foreach ($node->children as $folder) {
+      $id = $folder->id;
+      $prop = $data[$id];
+      $is_collapsed = false; // TODO: determine this somehow?
+
+      $content = $this->calendar_list_item($id, $prop, $jsenv, $attrib['activeonly']);
+
+      if (!empty($folder->children)) {
+        $content .= html::tag('ul', array('style' => ($is_collapsed ? "display:none;" : null)),
+          $this->list_tree_html($folder, $data, $jsenv, $attrib));
+      }
+
+      if (strlen($content)) {
+        $out .= html::tag('li', array(
+            'id' => 'rcmlical' . rcube_utils::html_identifier($id),
+            'class' => $prop['group'] . ($prop['virtual'] ? ' virtual' : ''),
+          ),
+          $content);
+      }
+    }
+
+    return $out;
+  }
+
+  /**
+   * Helper method to build a calendar list item (HTML content and js data)
+   */
+  public function calendar_list_item($id, $prop, &$jsenv, $activeonly = false)
+  {
+    // enrich calendar properties with settings from the driver
+    if (!$prop['virtual']) {
+      unset($prop['user_id']);
+      $prop['alarms']      = $this->cal->driver->alarms;
+      $prop['attendees']   = $this->cal->driver->attendees;
+      $prop['freebusy']    = $this->cal->driver->freebusy;
+      $prop['attachments'] = $this->cal->driver->attachments;
+      $prop['undelete']    = $this->cal->driver->undelete;
+      $prop['feedurl']     = $this->cal->get_url(array('_cal' => $this->cal->ical_feed_hash($id) . '.ics', 'action' => 'feed'));
+
+      $jsenv[$id] = $prop;
+    }
+
+    $classes = array('calendar', 'cal-'  . asciiwords($id, true));
+    $title = $prop['title'] ?: ($prop['name'] != $prop['listname'] || strlen($prop['name']) > 25 ?
+      html_entity_decode($prop['name'], ENT_COMPAT, RCMAIL_CHARSET) : '');
+
+    if ($prop['virtual'])
+      $classes[] = 'virtual';
+    else if ($prop['readonly'])
+      $classes[] = 'readonly';
+    if ($prop['subscribed'])
+      $classes[] = 'subscribed';
+    if ($prop['class'])
+      $classes[] = $prop['class'];
+
+    $content = '';
+    if (!$activeonly || $prop['active']) {
+      $label_id = 'cl:' . $id;
+      $content = html::div(join(' ', $classes),
+        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), '') .
+          (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;')
+        )
+      );
+    }
+
+    return $content;
   }
 
   /**
@@ -237,17 +326,17 @@
     $attrib['style'] .= 'display:none';
     
     $select_range = new html_select(array('name' => 'listrange', 'id' => 'agenda-listrange'));
-    $select_range->add(1 . ' ' . preg_replace('/$.+$/', '', $this->cal->gettext('days')), $days);
-    foreach (array(2,5,7,14,30,60,90) as $days)
-      $select_range->add($days . ' ' . preg_replace('/$|$/', '', $this->cal->gettext('days')), $days);
+    $select_range->add(1 . ' ' . preg_replace('/$.+$/', '', $this->cal->lib->gettext('days')), $days);
+    foreach (array(2,5,7,14,30,60,90,180,365) as $days)
+      $select_range->add($days . ' ' . preg_replace('/$|$/', '', $this->cal->lib->gettext('days')), $days);
     
     $html .= html::label('agenda-listrange', $this->cal->gettext('listrange'));
     $html .= $select_range->show($this->rc->config->get('calendar_agenda_range', $this->cal->defaults['calendar_agenda_range']));
     
     $select_sections = new html_select(array('name' => 'listsections', 'id' => 'agenda-listsections'));
     $select_sections->add('---', '');
-    foreach (array('day' => 'days', 'week' => 'weeks', 'month' => 'months', 'smart' => 'smartsections') as $val => $label)
-      $select_sections->add(preg_replace('/$|$/', '', ucfirst($this->cal->gettext($label))), $val);
+    foreach (array('day' => 'libcalendaring.days', 'week' => 'libcalendaring.weeks', 'month' => 'libcalendaring.months', 'smart' => 'calendar.smartsections') as $val => $label)
+      $select_sections->add(preg_replace('/$|$/', '', ucfirst($this->rc->gettext($label))), $val);
     
     $html .= html::span('spacer', '&nbsp;');
     $html .= html::label('agenda-listsections', $this->cal->gettext('listsections'));
@@ -305,6 +394,20 @@
   }
 
   /**
+   * Render a HTML select box for status property
+   */
+  function status_select($attrib = array())
+  {
+    $attrib['name'] = 'status';
+    $select = new html_select($attrib);
+    $select->add('---', '');
+    $select->add($this->cal->gettext('confirmed'), 'CONFIRMED');
+    $select->add($this->cal->gettext('cancelled'), 'CANCELLED');
+    //$select->add($this->cal->gettext('tentative'), 'TENTATIVE');
+    return $select->show(null);
+  }
+
+  /**
    * Render a HTML select box for free/busy/out-of-office property
    */
   function freebusy_select($attrib = array())
@@ -383,161 +486,6 @@
        
     return html::div($attrib, html::div('message', html::span('ui-icon ui-icon-alert', '') . $this->cal->gettext('changerecurringeventwarning')) . html::div('savemode', $form));
   }
-  
-  /**
-   * Generate the form for recurrence settings
-   */
-  function recurrence_form($attrib = array())
-  {
-    switch ($attrib['part']) {
-      // frequency selector
-      case 'frequency':
-        $select = new html_select(array('name' => 'frequency', 'id' => 'edit-recurrence-frequency'));
-        $select->add($this->cal->gettext('never'), '');
-        $select->add($this->cal->gettext('daily'), 'DAILY');
-        $select->add($this->cal->gettext('weekly'), 'WEEKLY');
-        $select->add($this->cal->gettext('monthly'), 'MONTHLY');
-        $select->add($this->cal->gettext('yearly'), 'YEARLY');
-        $select->add($this->cal->gettext('rdate'), 'RDATE');
-        $html = html::label('edit-frequency', $this->cal->gettext('frequency')) . $select->show('');
-        break;
-
-      // daily recurrence
-      case 'daily':
-        $select = $this->interval_selector(array('name' => 'interval', 'class' => 'edit-recurrence-interval', 'id' => 'edit-recurrence-interval-daily'));
-        $html = html::div($attrib, html::label(null, $this->cal->gettext('every')) . $select->show(1) . html::span('label-after', $this->cal->gettext('days')));
-        break;
-
-      // weekly recurrence form
-      case 'weekly':
-        $select = $this->interval_selector(array('name' => 'interval', 'class' => 'edit-recurrence-interval', 'id' => 'edit-recurrence-interval-weekly'));
-        $html = html::div($attrib, html::label(null, $this->cal->gettext('every')) . $select->show(1) . html::span('label-after', $this->cal->gettext('weeks')));
-        // weekday selection
-        $daymap = array('sun','mon','tue','wed','thu','fri','sat');
-        $checkbox = new html_checkbox(array('name' => 'byday', 'class' => 'edit-recurrence-weekly-byday'));
-        $first = $this->rc->config->get('calendar_first_day', 1);
-        for ($weekdays = '', $j = $first; $j <= $first+6; $j++) {
-            $d = $j % 7;
-            $weekdays .= html::label(array('class' => 'weekday'), $checkbox->show('', array('value' => strtoupper(substr($daymap[$d], 0, 2)))) . $this->cal->gettext($daymap[$d])) . ' ';
-        }
-        $html .= html::div($attrib, html::label(null, $this->cal->gettext('bydays')) . $weekdays);
-        break;
-
-      // monthly recurrence form
-      case 'monthly':
-        $select = $this->interval_selector(array('name' => 'interval', 'class' => 'edit-recurrence-interval', 'id' => 'edit-recurrence-interval-monthly'));
-        $html = html::div($attrib, html::label(null, $this->cal->gettext('every')) . $select->show(1) . html::span('label-after', $this->cal->gettext('months')));
-
-        $checkbox = new html_checkbox(array('name' => 'bymonthday', 'class' => 'edit-recurrence-monthly-bymonthday'));
-        for ($monthdays = '', $d = 1; $d <= 31; $d++) {
-            $monthdays .= html::label(array('class' => 'monthday'), $checkbox->show('', array('value' => $d)) . $d);
-            $monthdays .= $d % 7 ? ' ' : html::br();
-        }
-
-        // rule selectors
-        $radio = new html_radiobutton(array('name' => 'repeatmode', 'class' => 'edit-recurrence-monthly-mode'));
-        $table = new html_table(array('cols' => 2, 'border' => 0, 'cellpadding' => 0, 'class' => 'formtable'));
-        $table->add('label', html::label(null, $radio->show('BYMONTHDAY', array('value' => 'BYMONTHDAY')) . ' ' . $this->cal->gettext('each')));
-        $table->add(null, $monthdays);
-        $table->add('label', html::label(null, $radio->show('', array('value' => 'BYDAY')) . ' ' . $this->cal->gettext('onevery')));
-        $table->add(null, $this->rrule_selectors($attrib['part']));
-        
-        $html .= html::div($attrib, $table->show());
-
-        break;
-
-      // annually recurrence form
-      case 'yearly':
-        $select = $this->interval_selector(array('name' => 'interval', 'class' => 'edit-recurrence-interval', 'id' => 'edit-recurrence-interval-yearly'));
-        $html = html::div($attrib, html::label(null, $this->cal->gettext('every')) . $select->show(1) . html::span('label-after', $this->cal->gettext('years')));
-        // month selector
-        $monthmap = array('','jan','feb','mar','apr','may','jun','jul','aug','sep','oct','nov','dec');
-        $checkbox = new html_checkbox(array('name' => 'bymonth', 'class' => 'edit-recurrence-yearly-bymonth'));
-        for ($months = '', $m = 1; $m <= 12; $m++) {
-            $months .= html::label(array('class' => 'month'), $checkbox->show(null, array('value' => $m)) . $this->cal->gettext($monthmap[$m]));
-            $months .= $m % 4 ? ' ' : html::br();
-        }
-        $html .= html::div($attrib + array('id' => 'edit-recurrence-yearly-bymonthblock'), $months);
-        
-        // day rule selection
-        $html .= html::div($attrib, html::label(null, $this->cal->gettext('onevery')) . $this->rrule_selectors($attrib['part'], '---'));
-        break;
-
-      // end of recurrence form
-      case 'until':
-        $radio = new html_radiobutton(array('name' => 'repeat', 'class' => 'edit-recurrence-until'));
-        $select = $this->interval_selector(array('name' => 'times', 'id' => 'edit-recurrence-repeat-times'));
-        $input = new html_inputfield(array('name' => 'untildate', 'id' => 'edit-recurrence-enddate', 'size' => "10"));
-
-        $table = new html_table(array('cols' => 2, 'border' => 0, 'cellpadding' => 0, 'class' => 'formtable'));
-
-        $table->add('label', ucfirst($this->cal->gettext('recurrencend')));
-        $table->add(null, html::label(null, $radio->show('', array('value' => '', 'id' => 'edit-recurrence-repeat-forever')) . ' ' .
-          $this->cal->gettext('forever')));
-
-        $table->add('label', '');
-        $table->add(null, $radio->show('', array('value' => 'count', 'id' => 'edit-recurrence-repeat-count')) . ' ' .
-          $this->cal->gettext(array(
-            'name' => 'forntimes',
-            'vars' => array('nr' => $select->show(1)))
-          ));
-
-        $table->add('label', '');
-        $table->add(null, $radio->show('', array('value' => 'until', 'id' => 'edit-recurrence-repeat-until')) . ' ' .
-          $this->cal->gettext('untildate') . ' ' . $input->show(''));
-        $html = $table->show();
-        break;
-
-      case 'rdate':
-        $ul = html::tag('ul', array('id' => 'edit-recurrence-rdates'), '');
-        $input = new html_inputfield(array('name' => 'rdate', 'id' => 'edit-recurrence-rdate-input', 'size' => "10"));
-        $button = new html_inputfield(array('type' => 'button', 'class' => 'button add', 'value' => $this->cal->gettext('addrdate')));
-        $html .= html::div($attrib, $ul . html::div('inputform', $input->show() . $button->show()));
-        break;
-    }
-
-    return $html;
-  }
-
-  /**
-   * Input field for interval selection
-   */
-  private function interval_selector($attrib)
-  {
-    $select = new html_select($attrib);
-    $select->add(range(1,30), range(1,30));
-    return $select;
-  }
-  
-  /**
-   * Drop-down menus for recurrence rules like "each last sunday of"
-   */
-  private function rrule_selectors($part, $noselect = null)
-  {
-    // rule selectors
-    $select_prefix = new html_select(array('name' => 'bydayprefix', 'id' => "edit-recurrence-$part-prefix"));
-    if ($noselect) $select_prefix->add($noselect, '');
-    $select_prefix->add(array(
-        $this->cal->gettext('first'),
-        $this->cal->gettext('second'),
-        $this->cal->gettext('third'),
-        $this->cal->gettext('fourth'),
-        $this->cal->gettext('last')
-      ),
-      array(1, 2, 3, 4, -1));
-    
-    $select_wday = new html_select(array('name' => 'byday', 'id' => "edit-recurrence-$part-byday"));
-    if ($noselect) $select_wday->add($noselect, '');
-    
-    $daymap = array('sunday','monday','tuesday','wednesday','thursday','friday','saturday');
-    $first = $this->rc->config->get('calendar_first_day', 1);
-    for ($j = $first; $j <= $first+6; $j++) {
-      $d = $j % 7;
-      $select_wday->add($this->cal->gettext($daymap[$d]), strtoupper(substr($daymap[$d], 0, 2)));
-    }
-    
-    return $select_prefix->show() . '&nbsp;' . $select_wday->show();
-  }
 
   /**
    * Form for uploading and importing events

roundcubemail-plugins-kolab-3.2.tar.gz/plugins/calendar/lib/fullcalendar-rc.patch Deleted

@@ -1,943 +0,0 @@
---- js/fullcalendar-1.5.2.js	2011-08-21 22:07:18.000000000 +0200
-+++ js/fullcalendar.js	2011-11-14 23:44:05.000000000 +0100
-@@ -29,6 +29,7 @@
- 		right: 'today prev,next'
- 	},
- 	weekends: true,
-+	currentTimeIndicator: false,
- 	
- 	// editing
- 	//editable: false,
-@@ -47,12 +48,16 @@
- 	titleFormat: {
- 		month: 'MMMM yyyy',
- 		week: "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}",
--		day: 'dddd, MMM d, yyyy'
-+		day: 'dddd, MMM d, yyyy',
-+		list: 'MMM d, yyyy',
-+		table: 'MMM d, yyyy'
- 	},
- 	columnFormat: {
- 		month: 'ddd',
- 		week: 'ddd M/d',
--		day: 'dddd M/d'
-+		day: 'dddd M/d',
-+		list: 'dddd, MMM d, yyyy',
-+		table: 'dddd, MMM d, yyyy'
- 	},
- 	timeFormat: { // for event elements
- 		'': 'h(:mm)t' // default
-@@ -73,8 +78,28 @@
- 		today: 'today',
- 		month: 'month',
- 		week: 'week',
--		day: 'day'
-+		day: 'day',
-+		list: 'list',
-+		table: 'table'
- 	},
-+	listTexts: {
-+		until: 'until',
-+		past: 'Past events',
-+		today: 'Today',
-+		tomorrow: 'Tomorrow',
-+		thisWeek: 'This week',
-+		nextWeek: 'Next week',
-+		thisMonth: 'This month',
-+		nextMonth: 'Next month',
-+		future: 'Future events',
-+		week: 'W'
-+	},
-+	
-+	// list/table options
-+	listSections: 'month',  // false|'day'|'week'|'month'|'smart'
-+	listRange: 30,  // number of days to be displayed
-+	listPage: 7,  // number of days to jump when paging
-+	tableCols: ['handle', 'date', 'time', 'title'],
- 	
- 	// jquery-ui theming
- 	theme: false,
-@@ -424,6 +449,7 @@
- 			setSize();
- 			unselect();
- 			currentView.clearEvents();
-+			currentView.trigger('viewRender', currentView);
- 			currentView.renderEvents(events);
- 			currentView.sizeDirty = false;
- 		}
-@@ -500,8 +526,8 @@
- 	}
- 	
- 	
--	function refetchEvents() {
--		fetchEvents(currentView.visStart, currentView.visEnd); // will call reportEvents
-+	function refetchEvents(source) {
-+		fetchEvents(currentView.visStart, currentView.visEnd, source); // will call reportEvents
- 	}
- 	
- 	
-@@ -523,6 +549,7 @@
- 		markEventsDirty();
- 		if (elementVisible()) {
- 			currentView.clearEvents();
-+			currentView.trigger('viewRender', currentView);
- 			currentView.renderEvents(events, modifiedEventID);
- 			currentView.eventsDirty = false;
- 		}
-@@ -632,6 +659,12 @@
- 		if (name == 'height' || name == 'contentHeight' || name == 'aspectRatio') {
- 			options[name] = value;
- 			updateSize();
-+		} else if (name.indexOf('list') == 0 || name == 'tableCols') {
-+			options[name] = value;
-+			currentView.start = null; // force re-render
-+		}
-+		else if (name == 'maxHeight') {
-+			options[name] = value;
- 		}
- 	}
- 	
-@@ -897,15 +930,16 @@
- 	}
- 	
- 	
--	function fetchEvents(start, end) {
-+	function fetchEvents(start, end, src) {
- 		rangeStart = start;
- 		rangeEnd = end;
--		cache = [];
-+		cache = typeof src != 'undefined' ? $.grep(cache, function(e) { return !isSourcesEqual(e.source, src); }) : [];
- 		var fetchID = ++currentFetchID;
- 		var len = sources.length;
--		pendingSourceCnt = len;
-+		pendingSourceCnt = typeof src == 'undefined' ? len : 1;
- 		for (var i=0; i<len; i++) {
--			fetchEventSource(sources[i], fetchID);
-+			if (typeof src == 'undefined' || isSourcesEqual(sources[i], src))
-+				fetchEventSource(sources[i], fetchID);
- 		}
- 	}
- 	
-@@ -1092,8 +1126,9 @@
- 				stickySource.events.push(event);
- 				event.source = stickySource;
- 			}
--			cache.push(event);
- 		}
-+		
-+		cache.push(event);
- 		reportEvents(cache);
- 	}
- 	
-@@ -1581,10 +1616,23 @@
- 			return 'th';
- 		}
- 		return ['st', 'nd', 'rd'][date%10-1] || 'th';
--	}
-+	},
-+	W	: function(d)	{ return iso8601Week(d); }
- };
- 
- 
-+// Determine the week of the year based on the ISO 8601 definition.
-+// copied from jquery UI Datepicker
-+var iso8601Week = function(date) {
-+	var checkDate = cloneDate(date);
-+	// Find Thursday of this week starting on Monday
-+	checkDate.setDate(checkDate.getDate() + 4 - (checkDate.getDay() || 7));
-+	var time = checkDate.getTime();
-+	checkDate.setMonth(0); // Compare with Jan 1
-+	checkDate.setDate(1);
-+	return Math.floor(Math.round((time - checkDate) / 86400000) / 7) + 1;
-+};
-+
- 
- fc.applyAll = applyAll;
- 
-@@ -3536,10 +3584,10 @@
- 	function slotSelectionMousedown(ev) {
- 		if (ev.which == 1 && opt('selectable')) { // ev.which==1 means left mouse button
- 			unselect(ev);
--			var dates;
-+			var dates, helperOption = opt('selectHelper');
- 			hoverListener.start(function(cell, origCell) {
- 				clearSelection();
--				if (cell && cell.col == origCell.col && !cellIsAllDay(cell)) {
-+				if (cell && (cell.col == origCell.col || !helperOption) && !cellIsAllDay(cell)) {
- 					var d1 = cellDate(origCell);
- 					var d2 = cellDate(cell);
- 					dates = [
-@@ -3651,7 +3699,7 @@
- 	var calendar = t.calendar;
- 	var formatDate = calendar.formatDate;
- 	var formatDates = calendar.formatDates;
--	
-+	var timeLineInterval;
- 	
- 	
- 	/* Rendering
-@@ -3675,6 +3723,12 @@
- 			setHeight(); // no params means set to viewHeight
- 		}
- 		renderSlotSegs(compileSlotSegs(slotEvents), modifiedEventId);
-+		
-+		if (opt('currentTimeIndicator')) {
-+			window.clearInterval(timeLineInterval);
-+			timeLineInterval = window.setInterval(setTimeIndicator, 30000);
-+			setTimeIndicator();
-+		}
- 	}
- 	
- 	
-@@ -3764,7 +3818,8 @@
- 			height,
- 			slotSegmentContainer = getSlotSegmentContainer(),
- 			rtl, dis, dit,
--			colCnt = getColCnt();
-+			colCnt = getColCnt(),
-+			overlapping = colCnt > 1;
- 			
- 		if (rtl = opt('isRTL')) {
- 			dis = -1;
-@@ -3791,8 +3846,11 @@
- 				outerWidth = availWidth / (levelI + forward + 1);
- 			}else{
- 				if (forward) {
--					// moderately wide, aligned left still
--					outerWidth = ((availWidth / (forward + 1)) - (12/2)) * 2; // 12 is the predicted width of resizer =
-+					if (overlapping) {	// moderately wide, aligned left still
-+						outerWidth = ((availWidth / (forward + 1)) - (12/2)) * 2; // 12 is the predicted width of resizer =
-+					}else{
-+						outerWidth = outerWidth = availWidth / (forward + 1);
-+					}
- 				}else{
- 					// can be entire width, aligned left
- 					outerWidth = availWidth;
-@@ -3803,7 +3861,7 @@
- 				* dis + (rtl ? availWidth - outerWidth : 0);   // rtl
- 			seg.top = top;
- 			seg.left = left;
--			seg.outerWidth = outerWidth;
-+			seg.outerWidth = outerWidth - (overlapping ? 0 : 1);
- 			seg.outerHeight = bottom - top;
- 			html += slotSegHtml(event, seg);
- 		}
-@@ -3953,6 +4011,37 @@
- 	}
- 	
- 	
-+	// draw a horizontal line across the agenda view indicating the current time (#143)
-+	function setTimeIndicator()
-+	{
-+		var container = getBodyContent();
-+		var timeline = container.children('.fc-timeline');
-+		if (timeline.length == 0) { // if timeline isn't there, add it
-+			timeline = $('<hr>').addClass('fc-timeline').appendTo(container);
-+		}
-+
-+		var cur_time = new Date();
-+		if (t.visStart < cur_time && t.visEnd > cur_time) {
-+			timeline.show();
-+		}
-+		else {
-+			timeline.hide();
-+			return;
-+		}
-+
-+		var secs = (cur_time.getHours() * 60 * 60) + (cur_time.getMinutes() * 60) + cur_time.getSeconds();
-+		var percents = secs / 86400; // 24 * 60 * 60 = 86400, # of seconds in a day
-+
-+		timeline.css('top', Math.floor(container.height() * percents - 1) + 'px');
-+
-+		if (t.name == 'agendaWeek') { // week view, don't want the timeline to go the whole way across
-+			var daycol = $('.fc-today', t.element);
-+			var left = daycol.position().left + 1;
-+			var width = daycol.width();
-+			timeline.css({ left: left + 'px', width: width + 'px' });
-+		}
-+	}
-+	
- 	
- 	/* Dragging
- 	-----------------------------------------------------------------------------------*/
-@@ -4262,7 +4351,7 @@
- 	
- 	function opt(name, viewNameOverride) {
- 		var v = options[name];
--		if (typeof v == 'object') {
-+		if (typeof v == 'object' && !v.length) {
- 			return smartProperty(v, viewNameOverride || viewName);
- 		}
- 		return v;
-@@ -4528,6 +4617,9 @@
- 		var seg;
- 		var top;
- 		var k;
-+		var overflows;
-+		var overflowLinks;
-+		var maxHeight = opt('maxHeight');
- 		segmentContainer[0].innerHTML = daySegHTML(segs); // faster than .html()
- 		daySegElementResolve(segs, segmentContainer.children());
- 		daySegElementReport(segs);
-@@ -4539,26 +4631,69 @@
- 		// set row heights, calculate event tops (in relation to row top)
- 		for (rowI=0; rowI<rowCnt; rowI++) {
- 			levelI = 0;
-+			overflows = [];
-+			overflowLinks = {};
- 			colHeights = [];
- 			for (j=0; j<colCnt; j++) {
-+				overflows[j] = 0;
- 				colHeights[j] = 0;
- 			}
- 			while (i<segCnt && (seg = segs[i]).row == rowI) {
- 				// loop through segs in a row
- 				top = arrayMax(colHeights.slice(seg.startCol, seg.endCol));
--				seg.top = top;
--				top += seg.outerHeight;
-+				if (maxHeight && top + seg.outerHeight > maxHeight) {
-+					seg.overflow = true;
-+				}
-+				else {
-+					seg.top = top;
-+					top += seg.outerHeight;
-+				}
- 				for (k=seg.startCol; k<seg.endCol; k++) {
--					colHeights[k] = top;
-+					if (overflows[k])
-+						seg.overflow = true;
-+					if (seg.overflow) {
-+						if (seg.isStart && !overflowLinks[k])
-+							overflowLinks[k] = { seg:seg, top:top, date:cloneDate(seg.start, true), count:0 };
-+						if (overflowLinks[k])
-+							overflowLinks[k].count++;
-+						overflows[k]++;
-+					}
-+					else
-+						colHeights[k] = top;
- 				}
- 				i++;
- 			}
- 			rowDivs[rowI].height(arrayMax(colHeights));
-+			renderOverflowLinks(overflowLinks, rowDivs[rowI]);
- 		}
- 		daySegSetTops(segs, getRowTops(rowDivs));
- 	}
- 	
- 	
-+	function renderOverflowLinks(overflowLinks, rowDiv) {
-+		var container = getDaySegmentContainer();
-+		var colCnt = getColCnt();
-+		var element, triggerRes, link;
-+		for (var j=0; j<colCnt; j++) {
-+			if ((link = overflowLinks[j])) {
-+				if (link.count > 1) {
-+					element = $('<a>').addClass('fc-more-link').html('+'+link.count).appendTo(container);
-+					element[0].style.position = 'absolute';
-+					element[0].style.left = link.seg.left + 'px';
-+					element[0].style.top = (link.top + rowDiv[0].offsetTop) + 'px';
-+					triggerRes = trigger('overflowRender', link, { count:link.count, date:link.date }, element);
-+					if (triggerRes === false)
-+						element.remove();
-+				}
-+				else {
-+					link.seg.top = link.top;
-+					link.seg.overflow = false;
-+				}
-+			}
-+		}
-+	}
-+	
-+	
- 	function renderTempDaySegs(segs, adjustRow, adjustTop) {
- 		var tempContainer = $("<div/>");
- 		var elements;
-@@ -4806,6 +4941,8 @@
- 				}
- 				seg.outerHeight = element[0].offsetHeight + val;
- 			}
-+			else
-+				seg.outerHeight = 0;
- 		}
- 	}
- 	
-@@ -4842,11 +4979,13 @@
- 		for (i=0; i<segCnt; i++) {
- 			seg = segs[i];
- 			element = seg.element;
--			if (element) {
-+			if (element && !seg.overflow) {
- 				element[0].style.top = rowTops[seg.row] + (seg.top||0) + 'px';
- 				event = seg.event;
- 				trigger('eventAfterRender', event, event, element);
- 			}
-+			else if (element)
-+				element.hide();
- 		}
- 	}
- 	
-@@ -5206,5 +5345,561 @@
- 	};
- 	
- }
--
--})(jQuery);
-+
-+
-+/* Additional view: list (by bruederli@kolabsys.com)
-+---------------------------------------------------------------------------------*/
-+
-+function ListEventRenderer() {
-+	var t = this;
-+	
-+	// exports
-+	t.renderEvents = renderEvents;
-+	t.renderEventTime = renderEventTime;
-+	t.compileDaySegs = compileSegs; // for DayEventRenderer
-+	t.clearEvents = clearEvents;
-+	t.lazySegBind = lazySegBind;
-+	t.sortCmp = sortCmp;
-+	
-+	// imports
-+	DayEventRenderer.call(t);
-+	var opt = t.opt;
-+	var trigger = t.trigger;
-+	var reportEvents = t.reportEvents;
-+	var reportEventClear = t.reportEventClear;
-+	var reportEventElement = t.reportEventElement;
-+	var eventElementHandlers = t.eventElementHandlers;
-+	var showEvents = t.showEvents;
-+	var hideEvents = t.hideEvents;
-+	var getListContainer = t.getDaySegmentContainer;
-+	var calendar = t.calendar;
-+	var formatDate = calendar.formatDate;
-+	var formatDates = calendar.formatDates;
-+	
-+	
-+	/* Rendering
-+	--------------------------------------------------------------------*/
-+	
-+	function clearEvents() {
-+		reportEventClear();
-+		getListContainer().empty();
-+	}
-+	
-+	function renderEvents(events, modifiedEventId) {
-+		events.sort(sortCmp);
-+		reportEvents(events);
-+		renderSegs(compileSegs(events), modifiedEventId);
-+	}
-+	
-+	function compileSegs(events) {
-+		var segs = [];
-+		var colFormat = opt('titleFormat', 'day');
-+		var firstDay = opt('firstDay');
-+		var segmode = opt('listSections');
-+		var event, i, dd, wd, md, seg, segHash, curSegHash, segDate, curSeg = -1;
-+		var today = clearTime(new Date());
-+		var weekstart = addDays(cloneDate(today), -((today.getDay() - firstDay + 7) % 7));
-+		
-+		for (i=0; i < events.length; i++) {
-+			event = events[i];
-+			
-+			// skip events out of range
-+			if (event.end < t.start || event.start > t.visEnd)
-+				continue;
-+			
-+			// define sections of this event
-+			// create smart sections such as today, tomorrow, this week, next week, next month, ect.
-+			segDate = cloneDate(event.start < t.start && event.end > t.start ? t.start : event.start, true);
-+			dd = dayDiff(segDate, today);
-+			wd = Math.floor(dayDiff(segDate, weekstart) / 7);
-+			md = segDate.getMonth() + ((segDate.getYear() - today.getYear()) * 12) - today.getMonth();
-+			
-+			// build section title
-+			if (segmode == 'smart') {
-+				if (dd < 0) {
-+					segHash = opt('listTexts', 'past');
-+				} else if (dd == 0) {
-+					segHash = opt('listTexts', 'today');
-+				} else if (dd == 1) {
-+					segHash = opt('listTexts', 'tomorrow');
-+				} else if (wd == 0) {
-+					segHash = opt('listTexts', 'thisWeek');
-+				} else if (wd == 1) {
-+					segHash = opt('listTexts', 'nextWeek');
-+				} else if (md == 0) {
-+					segHash = opt('listTexts', 'thisMonth');
-+				} else if (md == 1) {
-+					segHash = opt('listTexts', 'nextMonth');
-+				} else if (md > 1) {
-+					segHash = opt('listTexts', 'future');
-+				}
-+			} else if (segmode == 'month') {
-+				segHash = formatDate(segDate, 'MMMM yyyy');
-+			} else if (segmode == 'week') {
-+				segHash = opt('listTexts', 'week') + formatDate(segDate, ' W');
-+			} else if (segmode == 'day') {
-+				segHash = formatDate(segDate, colFormat);
-+			} else {
-+				segHash = '';
-+			}
-+			
-+			// start new segment
-+			if (segHash != curSegHash) {
-+				segs[++curSeg] = { events: [], start: segDate, title: segHash, daydiff: dd, weekdiff: wd, monthdiff: md };
-+				curSegHash = segHash;
-+			}
-+			
-+			segs[curSeg].events.push(event);
-+		}
-+		
-+		return segs;
-+	}
-+
-+	function sortCmp(a, b) {
-+		var sd = a.start.getTime() - b.start.getTime();
-+		return sd + (sd ? 0 : a.end.getTime() - b.end.getTime());
-+	}
-+	
-+	function renderSegs(segs, modifiedEventId) {
-+		var tm = opt('theme') ? 'ui' : 'fc';
-+		var headerClass = tm + "-widget-header";
-+		var contentClass = tm + "-widget-content";
-+		var i, j, seg, event, times, s, skinCss, skinCssAttr, classes, segContainer, eventElements;
-+
-+		for (j=0; j < segs.length; j++) {
-+			seg = segs[j];
-+			
-+			if (seg.title) {
-+				$('<div class="fc-list-header ' + headerClass + '">' + htmlEscape(seg.title) + '</div>').appendTo(getListContainer());
-+			}
-+			segContainer = $('<div>').addClass('fc-list-section ' + contentClass).appendTo(getListContainer());
-+			s = '';
-+			
-+			for (i=0; i < seg.events.length; i++) {
-+				event = seg.events[i];
-+				times = renderEventTime(event, seg);
-+				skinCss = getSkinCss(event, opt);
-+				skinCssAttr = (skinCss ? " style='" + skinCss + "'" : '');
-+				classes = ['fc-event', 'fc-event-skin', 'fc-event-vert', 'fc-corner-top', 'fc-corner-bottom'].concat(event.className);
-+				if (event.source && event.source.className) {
-+					classes = classes.concat(event.source.className);
-+				}
-+				
-+				s += 
-+					"<div class='" + classes.join(' ') + "'" + skinCssAttr + ">" +
-+					"<div class='fc-event-inner fc-event-skin'" + skinCssAttr + ">" +
-+					"<div class='fc-event-head fc-event-skin'" + skinCssAttr + ">" +
-+					"<div class='fc-event-time'>" +
-+					(times[0] ? '<span class="fc-col-date">' + times[0] + '</span> ' : '') +
-+					(times[1] ? '<span class="fc-col-time">' + times[1] + '</span>' : '') +
-+					"</div>" +
-+					"</div>" +
-+					"<div class='fc-event-content'>" +
-+					"<div class='fc-event-title'>" +
-+					htmlEscape(event.title) +
-+					"</div>" +
-+					"</div>" +
-+					"<div class='fc-event-bg'></div>" +
-+					"</div>" + // close inner
-+					"</div>";  // close outer
-+			}
-+			
-+			segContainer[0].innerHTML = s;
-+			eventElements = segContainer.children();
-+
-+			// retrieve elements, run through eventRender callback, bind event handlers
-+			for (i=0; i < seg.events.length; i++) {
-+				event = seg.events[i];
-+				eventElement = $(eventElements[i]); // faster than eq()
-+				triggerRes = trigger('eventRender', event, event, eventElement);
-+				if (triggerRes === false) {
-+					eventElement.remove();
-+				} else {
-+					if (triggerRes && triggerRes !== true) {
-+						eventElement.remove();
-+						eventElement = $(triggerRes).appendTo(segContainer);
-+					}
-+					if (event._id === modifiedEventId) {
-+						eventElementHandlers(event, eventElement, seg);
-+					} else {
-+						eventElement[0]._fci = i; // for lazySegBind
-+					}
-+					reportEventElement(event, eventElement);
-+				}
-+			}
-+		
-+			lazySegBind(segContainer, seg, eventElementHandlers);
-+		}
-+		
-+		markFirstLast(getListContainer());
-+	}
-+	
-+	// event time/date range to display
-+	function renderEventTime(event, seg) {
-+		var timeFormat = opt('timeFormat');
-+		var dateFormat = opt('columnFormat');
-+		var segmode = opt('listSections');
-+		var duration = event.end.getTime() - event.start.getTime();
-+		var datestr = '', timestr = '';
-+		
-+		if (segmode == 'smart') {
-+			if (event.start < seg.start) {
-+				datestr = opt('listTexts', 'until') + ' ' + formatDate(event.end, (event.allDay || event.end.getDate() != seg.start.getDate()) ? dateFormat : timeFormat);
-+			} else if (duration > DAY_MS) {
-+				datestr = formatDates(event.start, event.end, dateFormat + '{ - ' + dateFormat + '}');
-+			} else if (seg.daydiff == 0) {
-+				datestr = opt('listTexts', 'today');
-+			}	else if (seg.daydiff == 1) {
-+				datestr = opt('listTexts', 'tomorrow');
-+			} else if (seg.weekdiff == 0 || seg.weekdiff == 1) {
-+				datestr = formatDate(event.start, 'dddd');
-+			} else if (seg.daydiff > 1 || seg.daydiff < 0) {
-+				datestr = formatDate(event.start, dateFormat);
-+			}
-+		} else if (segmode != 'day') {
-+			datestr = formatDates(event.start, event.end, dateFormat + (duration > DAY_MS ? '{ - ' + dateFormat + '}' : ''));
-+		}
-+		
-+		if (!datestr && event.allDay) {
-+			timestr = opt('allDayText');
-+		} else if ((duration < DAY_MS || !datestr) && !event.allDay) {
-+			timestr = formatDates(event.start, event.end, timeFormat);
-+		}
-+		
-+		return [datestr, timestr];
-+	}
-+	
-+	function lazySegBind(container, seg, bindHandlers) {
-+		container.unbind('mouseover').mouseover(function(ev) {
-+			var parent = ev.target, e = parent, i, event;
-+			while (parent != this) {
-+				e = parent;
-+				parent = parent.parentNode;
-+			}
-+			if ((i = e._fci) !== undefined) {
-+				e._fci = undefined;
-+				event = seg.events[i];
-+				bindHandlers(event, container.children().eq(i), seg);
-+				$(ev.target).trigger(ev);
-+			}
-+			ev.stopPropagation();
-+		});
-+	}
-+	
-+}
-+
-+
-+fcViews.list = ListView;
-+
-+
-+function ListView(element, calendar) {
-+	var t = this;
-+
-+	// exports
-+	t.render = render;
-+	t.select = dummy;
-+	t.unselect = dummy;
-+	t.getDaySegmentContainer = function(){ return body; };
-+
-+	// imports
-+	View.call(t, element, calendar, 'list');
-+	ListEventRenderer.call(t);
-+	var opt = t.opt;
-+	var trigger = t.trigger;
-+  var clearEvents = t.clearEvents;
-+	var reportEventClear = t.reportEventClear;
-+	var formatDates = calendar.formatDates;
-+	var formatDate = calendar.formatDate;
-+
-+	// overrides
-+	t.setWidth = setWidth;
-+	t.setHeight = setHeight;
-+	
-+	// locals
-+	var body;
-+	var firstDay;
-+	var nwe;
-+	var tm;
-+	var colFormat;
-+	
-+	
-+	function render(date, delta) {
-+		if (delta) {
-+			addDays(date, opt('listPage') * delta);
-+		}
-+		t.start = t.visStart = cloneDate(date, true);
-+		t.end = addDays(cloneDate(t.start), opt('listPage'));
-+		t.visEnd = addDays(cloneDate(t.start), opt('listRange'));
-+		addMinutes(t.visEnd, -1);  // set end to 23:59
-+		t.title = formatDates(date, t.visEnd, opt('titleFormat'));
-+		
-+		updateOptions();
-+
-+		if (!body) {
-+			buildSkeleton();
-+		} else {
-+			clearEvents();
-+		}
-+	}
-+	
-+	
-+	function updateOptions() {
-+		firstDay = opt('firstDay');
-+		nwe = opt('weekends') ? 0 : 1;
-+		tm = opt('theme') ? 'ui' : 'fc';
-+		colFormat = opt('columnFormat', 'day');
-+	}
-+	
-+	
-+	function buildSkeleton() {
-+		body = $('<div>').addClass('fc-list-content').appendTo(element);
-+	}
-+	
-+	function setHeight(height, dateChanged) {
-+		body.css('height', (height-1)+'px').css('overflow', 'auto');
-+	}
-+
-+	function setWidth(width) {
-+		// nothing to be done here
-+	}
-+	
-+	function dummy() {
-+		// Stub.
-+	}
-+
-+}
-+
-+
-+/* Additional view: table (by bruederli@kolabsys.com)
-+---------------------------------------------------------------------------------*/
-+
-+function TableEventRenderer() {
-+	var t = this;
-+	
-+	// imports
-+	ListEventRenderer.call(t);
-+	var opt = t.opt;
-+	var sortCmp = t.sortCmp;
-+	var trigger = t.trigger;
-+	var compileSegs = t.compileDaySegs;
-+	var reportEvents = t.reportEvents;
-+	var reportEventClear = t.reportEventClear;
-+	var reportEventElement = t.reportEventElement;
-+	var eventElementHandlers = t.eventElementHandlers;
-+	var renderEventTime = t.renderEventTime;
-+	var showEvents = t.showEvents;
-+	var hideEvents = t.hideEvents;
-+	var getListContainer = t.getDaySegmentContainer;
-+	var lazySegBind = t.lazySegBind;
-+	var calendar = t.calendar;
-+	var formatDate = calendar.formatDate;
-+	var formatDates = calendar.formatDates;
-+
-+	// exports
-+	t.renderEvents = renderEvents;
-+	t.clearEvents = clearEvents;
-+
-+
-+	/* Rendering
-+	--------------------------------------------------------------------*/
-+	
-+	function clearEvents() {
-+		reportEventClear();
-+		getListContainer().children('tbody').remove();
-+	}
-+	
-+	function renderEvents(events, modifiedEventId) {
-+		events.sort(sortCmp);
-+		reportEvents(events);
-+		renderSegs(compileSegs(events), modifiedEventId);
-+		getListContainer().removeClass('fc-list-smart fc-list-day fc-list-month fc-list-week').addClass('fc-list-' + opt('listSections'));
-+	}
-+
-+	function renderSegs(segs, modifiedEventId) {
-+		var tm = opt('theme') ? 'ui' : 'fc';
-+		var table = getListContainer();
-+		var headerClass = tm + "-widget-header";
-+		var contentClass = tm + "-widget-content";
-+		var tableCols = opt('tableCols');
-+		var timecol = $.inArray('time', tableCols) >= 0;
-+		var i, j, seg, event, times, s, skinCss, skinCssAttr, skinClasses, rowClasses, segContainer, eventElements;
-+
-+		for (j=0; j < segs.length; j++) {
-+			seg = segs[j];
-+			
-+			if (seg.title) {
-+				$('<tbody class="fc-list-header"><tr><td class="fc-list-header ' + headerClass + '" colspan="' + tableCols.length + '">' + htmlEscape(seg.title) + '</td></tr></tbody>').appendTo(table);
-+			}
-+			segContainer = $('<tbody>').addClass('fc-list-section ' + contentClass).appendTo(table);
-+			s = '';
-+			
-+			for (i=0; i < seg.events.length; i++) {
-+				event = seg.events[i];
-+				times = renderEventTime(event, seg);
-+				skinCss = getSkinCss(event, opt);
-+				skinCssAttr = (skinCss ? " style='" + skinCss + "'" : '');
-+				skinClasses = ['fc-event-skin', 'fc-corner-left', 'fc-corner-right', 'fc-corner-top', 'fc-corner-bottom'].concat(event.className);
-+				if (event.source && event.source.className) {
-+					skinClasses = skinClasses.concat(event.source.className);
-+				}
-+				rowClasses = ['fc-event', 'fc-event-row', 'fc-'+dayIDs[event.start.getDay()]];
-+				if (seg.daydiff == 0) {
-+					rowClasses.push('fc-today');
-+				}
-+				
-+				s +=  "<tr class='" + rowClasses.join(' ') + "'>";
-+				for (var col, c=0; c < tableCols.length; c++) {
-+					col = tableCols[c];
-+					if (col == 'handle') {
-+						s += "<td class='fc-event-handle'>" +
-+							"<div class='" + skinClasses.join(' ') + "'" + skinCssAttr + ">" +
-+							"<span class='fc-event-inner'></span>" +
-+							"</div></td>";
-+					} else if (col == 'date') {
-+						s += "<td class='fc-event-date' colspan='" + (times[1] || !timecol ? 1 : 2) + "'>" + htmlEscape(times[0]) + "</td>";
-+					} else if (col == 'time') {
-+						if (times[1]) {
-+							s += "<td class='fc-event-time'>" + htmlEscape(times[1]) + "</td>";
-+						}
-+					} else {
-+						s += "<td class='fc-event-" + col + "'>" + (htmlEscape(event[col]) || '&nbsp;') + "</td>";
-+					}
-+				}
-+				s += "</tr>";
-+				
-+				// IE doesn't like innerHTML on tbody elements so we insert every row individually
-+				if (document.all) {
-+					$(s).appendTo(segContainer);
-+					s = '';
-+				}
-+			}
-+
-+			if (!document.all)
-+				segContainer[0].innerHTML = s;
-+
-+			eventElements = segContainer.children();
-+
-+			// retrieve elements, run through eventRender callback, bind event handlers
-+			for (i=0; i < seg.events.length; i++) {
-+				event = seg.events[i];
-+				eventElement = $(eventElements[i]); // faster than eq()
-+				triggerRes = trigger('eventRender', event, event, eventElement);
-+				if (triggerRes === false) {
-+					eventElement.remove();
-+				} else {
-+					if (triggerRes && triggerRes !== true) {
-+						eventElement.remove();
-+						eventElement = $(triggerRes).appendTo(segContainer);
-+					}
-+					if (event._id === modifiedEventId) {
-+						eventElementHandlers(event, eventElement, seg);
-+					} else {
-+						eventElement[0]._fci = i; // for lazySegBind
-+					}
-+					reportEventElement(event, eventElement);
-+				}
-+			}
-+		
-+			lazySegBind(segContainer, seg, eventElementHandlers);
-+			markFirstLast(segContainer);
-+		}
-+		
-+		//markFirstLast(table);
-+	}
-+
-+}
-+
-+
-+fcViews.table = TableView;
-+
-+
-+function TableView(element, calendar) {
-+	var t = this;
-+
-+	// exports
-+	t.render = render;
-+	t.select = dummy;
-+	t.unselect = dummy;
-+	t.getDaySegmentContainer = function(){ return table; };
-+
-+	// imports
-+	View.call(t, element, calendar, 'table');
-+	TableEventRenderer.call(t);
-+	var opt = t.opt;
-+	var trigger = t.trigger;
-+  var clearEvents = t.clearEvents;
-+	var reportEventClear = t.reportEventClear;
-+	var formatDates = calendar.formatDates;
-+	var formatDate = calendar.formatDate;
-+
-+	// overrides
-+	t.setWidth = setWidth;
-+	t.setHeight = setHeight;
-+	
-+	// locals
-+	var div;
-+	var table;
-+	var firstDay;
-+	var nwe;
-+	var tm;
-+	var colFormat;
-+	
-+	
-+	function render(date, delta) {
-+		if (delta) {
-+			addDays(date, opt('listPage') * delta);
-+		}
-+		t.start = t.visStart = cloneDate(date, true);
-+		t.end = addDays(cloneDate(t.start), opt('listPage'));
-+		t.visEnd = addDays(cloneDate(t.start), opt('listRange'));
-+		addMinutes(t.visEnd, -1);  // set end to 23:59
-+		t.title = (t.visEnd.getTime() - t.visStart.getTime() < DAY_MS) ? formatDate(date, opt('titleFormat')) : formatDates(date, t.visEnd, opt('titleFormat'));
-+		
-+		updateOptions();
-+
-+		if (!table) {
-+			buildSkeleton();
-+		} else {
-+			clearEvents();
-+		}
-+	}
-+	
-+	
-+	function updateOptions() {
-+		firstDay = opt('firstDay');
-+		nwe = opt('weekends') ? 0 : 1;
-+		tm = opt('theme') ? 'ui' : 'fc';
-+		colFormat = opt('columnFormat');
-+	}
-+	
-+	
-+	function buildSkeleton() {
-+		var tableCols = opt('tableCols');
-+		var s =
-+			"<table class='fc-border-separate' style='width:100%' cellspacing='0'>" +
-+			"<colgroup>";
-+		for (var c=0; c < tableCols.length; c++) {
-+			s += "<col class='fc-event-" + tableCols[c] + "' />";
-+		}
-+		s += "</colgroup>" +
-+			"</table>";
-+		div = $('<div>').addClass('fc-list-content').appendTo(element);
-+		table = $(s).appendTo(div);
-+	}
-+	
-+	function setHeight(height, dateChanged) {
-+		div.css('height', (height-1)+'px').css('overflow', 'auto');
-+	}
-+
-+	function setWidth(width) {
-+		// nothing to be done here
-+	}
-+	
-+	function dummy() {
-+		// Stub.
-+	}
-+
-+}
-+
-+
-+})(jQuery);
-\ No newline at end of file

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

@@ -1,24 +1,20 @@
-/**
- * @preserve
- * FullCalendar v1.5.4-rcube-0.9.0
- * https://github.com/roundcube/fullcalendar
- *
+/*!
+ * FullCalendar v1.6.4-rcube-1.1
+ * Docs & License: http://arshaw.com/fullcalendar/
+ * (c) 2013 Adam Shaw, 2014 Kolab Systems AG
+ */
+
+/*
  * Use fullcalendar.css for basic styling.
  * For event drag & drop, requires jQuery UI draggable.
  * For event resizing, requires jQuery UI resizable.
- *
- * Copyright (c) 2011 Adam Shaw
- * Copyright (c) 2011, Kolab Systems AG
- * Dual licensed under the MIT and GPL licenses, located in
- * MIT-LICENSE.txt and GPL-LICENSE.txt respectively.
- *
- * Date: Wed Nov 7 16:28:11 2012 +0100
- *
  */
  
 (function($, undefined) {
 
 
+;;
+
 var defaults = {
 
 	// display
@@ -30,6 +26,9 @@
 		right: 'today prev,next'
 	},
 	weekends: true,
+	weekNumbers: false,
+	weekNumberCalculation: 'iso',
+	weekNumberTitle: 'W',
 	currentTimeIndicator: false,
 	
 	// editing
@@ -72,10 +71,10 @@
 	dayNames: ['Sunday','Monday','Tuesday','Wednesday','Thursday','Friday','Saturday'],
 	dayNamesShort: ['Sun','Mon','Tue','Wed','Thu','Fri','Sat'],
 	buttonText: {
-		prev: '&nbsp;&#9668;&nbsp;',
-		next: '&nbsp;&#9658;&nbsp;',
-		prevYear: '&nbsp;&lt;&lt;&nbsp;',
-		nextYear: '&nbsp;&gt;&gt;&nbsp;',
+		prev: "<span class='fc-text-arrow'>&lsaquo;</span>",
+		next: "<span class='fc-text-arrow'>&rsaquo;</span>",
+		prevYear: "<span class='fc-text-arrow'>&laquo;</span>",
+		nextYear: "<span class='fc-text-arrow'>&raquo;</span>",
 		today: 'today',
 		month: 'month',
 		week: 'week',
@@ -112,7 +111,9 @@
 	//selectable: false,
 	unselectAuto: true,
 	
-	dropAccept: '*'
+	dropAccept: '*',
+	
+	handleWindowResize: true
 	
 };
 
@@ -124,10 +125,10 @@
 		right: 'title'
 	},
 	buttonText: {
-		prev: '&nbsp;&#9658;&nbsp;',
-		next: '&nbsp;&#9668;&nbsp;',
-		prevYear: '&nbsp;&gt;&gt;&nbsp;',
-		nextYear: '&nbsp;&lt;&lt;&nbsp;'
+		prev: "<span class='fc-text-arrow'>&rsaquo;</span>",
+		next: "<span class='fc-text-arrow'>&lsaquo;</span>",
+		prevYear: "<span class='fc-text-arrow'>&raquo;</span>",
+		nextYear: "<span class='fc-text-arrow'>&laquo;</span>"
 	},
 	buttonIcons: {
 		prev: 'circle-triangle-e',
@@ -137,7 +138,9 @@
 
 
 
-var fc = $.fullCalendar = { version: "1.5.4-rcube-0.9.0" };
+;;
+
+var fc = $.fullCalendar = { version: "1.6.4-rcube-1.0" };
 var fcViews = fc.views = {};
 
 
@@ -165,7 +168,8 @@
 		}
 		return this;
 	}
-	
+
+	options = options || {};
 	
 	// would like to have this logic in EventManager, but needs to happen before options are recursively extended
 	var eventSources = options.eventSources || [];
@@ -203,6 +207,8 @@
 
 
 
+;;
+
  
 function Calendar(element, options, eventSources) {
 	var t = this;
@@ -247,10 +253,8 @@
 	var content;
 	var tm; // for making theme classes
 	var currentView;
-	var viewInstances = {};
 	var elementOuterWidth;
 	var suggestedViewHeight;
-	var absoluteViewElement;
 	var resizeUID = 0;
 	var ignoreWindowResize = 0;
 	var date = new Date();
@@ -269,11 +273,11 @@
 	function render(inc) {
 		if (!content) {
 			initialRender();
-		}else{
+		}
+		else if (elementVisible()) {
+			// mainly for the public API
 			calcSize();
-			markSizesDirty();
-			markEventsDirty();
-			renderView(inc);
+			_renderView(inc);
 		}
 	}
 	
@@ -284,18 +288,28 @@
 		if (options.isRTL) {
 			element.addClass('fc-rtl');
 		}
+		else {
+			element.addClass('fc-ltr');
+		}
 		if (options.theme) {
 			element.addClass('ui-widget');
 		}
+
 		content = $("<div class='fc-content' style='position:relative'/>")
 			.prependTo(element);
+
 		header = new Header(t, options);
 		headerElement = header.render();
 		if (headerElement) {
 			element.prepend(headerElement);
 		}
+
 		changeView(options.defaultView);
-		$(window).resize(windowResize);
+
+		if (options.handleWindowResize) {
+			$(window).resize(windowResize);
+		}
+
 		// needed for IE in a 0x0 iframe, b/c when it is resized, never triggers a windowResize
 		if (!bodyVisible()) {
 			lateRender();
@@ -315,21 +329,27 @@
 	
 	
 	function destroy() {
+
+		if (currentView) {
+			trigger('viewDestroy', currentView, currentView, currentView.element);
+			currentView.triggerEventDestroy();
+		}
+
 		$(window).unbind('resize', windowResize);
+
 		header.destroy();
 		content.remove();
 		element.removeClass('fc fc-rtl ui-widget');
 	}
 	
 	
-	
 	function elementVisible() {
-		return _element.offsetWidth !== 0;
+		return element.is(':visible');
 	}
 	
 	
 	function bodyVisible() {
-		return $('body')[0].offsetWidth !== 0;
+		return $('body').is(':visible');
 	}
 	
 	
@@ -337,115 +357,89 @@
 	/* View Rendering
 	-----------------------------------------------------------------------------*/
 	
-	// TODO: improve view switching (still weird transition in IE, and FF has whiteout problem)
-	
+
 	function changeView(newViewName) {
 		if (!currentView || newViewName != currentView.name) {
-			ignoreWindowResize++; // because setMinHeight might change the height before render (and subsequently setSize) is reached
+			_changeView(newViewName);
+		}
+	}
+
+
+	function _changeView(newViewName) {
+		ignoreWindowResize++;
 
+		if (currentView) {
+			trigger('viewDestroy', currentView, currentView, currentView.element);
 			unselect();
-			
-			var oldView = currentView;
-			var newViewElement;
-				
-			if (oldView) {
-				(oldView.beforeHide || noop)(); // called before changing min-height. if called after, scroll state is reset (in Opera)
-				setMinHeight(content, content.height());
-				oldView.element.hide();
-			}else{
-				setMinHeight(content, 1); // needs to be 1 (not 0) for IE7, or else view dimensions miscalculated
-			}
-			content.css('overflow', 'hidden');
-			
-			currentView = viewInstances[newViewName];
-			if (currentView) {
-				currentView.element.show();
-			}else{
-				currentView = viewInstances[newViewName] = new fcViews[newViewName](
-					newViewElement = absoluteViewElement =
-						$("<div class='fc-view fc-view-" + newViewName + "' style='position:absolute'/>")
-							.appendTo(content),
-					t // the calendar object
-				);
-			}
-			
-			if (oldView) {
-				header.deactivateButton(oldView.name);
-			}
-			header.activateButton(newViewName);
-			
-			renderView(); // after height has been set, will make absoluteViewElement's position=relative, then set to null
-			
-			content.css('overflow', '');
-			if (oldView) {
-				setMinHeight(content, 1);
-			}
-			
-			if (!newViewElement) {
-				(currentView.afterShow || noop)(); // called after setting min-height/overflow, so in final scroll state (for Opera)
-			}
-			
-			ignoreWindowResize--;
+			currentView.triggerEventDestroy(); // trigger 'eventDestroy' for each event
+			freezeContentHeight();
+			currentView.element.remove();
+			header.deactivateButton(currentView.name);
 		}
+
+		header.activateButton(newViewName);
+
+		currentView = new fcViews[newViewName](
+			$("<div class='fc-view fc-view-" + newViewName + "' style='position:relative'/>")
+				.appendTo(content),
+			t // the calendar object
+		);
+
+		renderView();
+		unfreezeContentHeight();
+
+		ignoreWindowResize--;
 	}
-	
-	
-	
+
+
 	function renderView(inc) {
-		if (elementVisible()) {
-			ignoreWindowResize++; // because renderEvents might temporarily change the height before setSize is reached
+		if (
+			!currentView.start || // never rendered before
+			inc || date < currentView.start || date >= currentView.end // or new date range
+		) {
+			if (elementVisible()) {
+				_renderView(inc);
+			}
+		}
+	}
 
+
+	function _renderView(inc) { // assumes elementVisible
+		ignoreWindowResize++;
+
+		if (currentView.start) { // already been rendered?
+			trigger('viewDestroy', currentView, currentView, currentView.element);
 			unselect();
-			
-			if (suggestedViewHeight === undefined) {
-				calcSize();
-			}
-			
-			var forceEventRender = false;
-			if (!currentView.start || inc || date < currentView.start || date >= currentView.end) {
-				// view must render an entire new date range (and refetch/render events)
-				currentView.render(date, inc || 0); // responsible for clearing events
-				setSize(true);
-				forceEventRender = true;
-			}
-			else if (currentView.sizeDirty) {
-				// view must resize (and rerender events)
-				currentView.clearEvents();
-				setSize();
-				forceEventRender = true;
-			}
-			else if (currentView.eventsDirty) {
-				currentView.clearEvents();
-				forceEventRender = true;
-			}
-			currentView.sizeDirty = false;
-			currentView.eventsDirty = false;
-			updateEvents(forceEventRender);
-			
-			elementOuterWidth = element.outerWidth();
-			
-			header.updateTitle(currentView.title);
-			var today = new Date();
-			if (today >= currentView.start && today < currentView.end) {
-				header.disableButton('today');
-			}else{
-				header.enableButton('today');
-			}
-			
-			ignoreWindowResize--;
-			currentView.trigger('viewDisplay', _element);
+			clearEvents();
 		}
+
+		freezeContentHeight();
+		currentView.render(date, inc || 0); // the view's render method ONLY renders the skeleton, nothing else
+		setSize();
+		unfreezeContentHeight();
+		(currentView.afterRender || noop)();
+
+		updateTitle();
+		updateTodayButton();
+
+		trigger('viewRender', currentView, currentView, currentView.element);
+		currentView.trigger('viewDisplay', _element); // deprecated
+
+		ignoreWindowResize--;
+
+		getAndRenderEvents();
 	}
 	
 	
-	
+
 	/* Resizing
 	-----------------------------------------------------------------------------*/
 	
 	
 	function updateSize() {
-		markSizesDirty();
 		if (elementVisible()) {
+			unselect();
+			clearEvents();
 			calcSize();
 			setSize();
 			unselect();
@@ -457,14 +451,7 @@
 	}
 	
 	
-	function markSizesDirty() {
-		$.each(viewInstances, function(i, inst) {
-			inst.sizeDirty = true;
-		});
-	}
-	
-	
-	function calcSize() {
+	function calcSize() { // assumes elementVisible
 		if (options.contentHeight) {
 			suggestedViewHeight = options.contentHeight;
 		}
@@ -477,15 +464,20 @@
 	}
 	
 	
-	function setSize(dateChanged) { // todo: dateChanged?
-		ignoreWindowResize++;
-		currentView.setHeight(suggestedViewHeight, dateChanged);
-		if (absoluteViewElement) {
-			absoluteViewElement.css('position', 'relative');
-			absoluteViewElement = null;
+	function setSize() { // assumes elementVisible
+
+		if (suggestedViewHeight === undefined) {
+			calcSize(); // for first time
+				// NOTE: we don't want to recalculate on every renderView because
+				// it could result in oscillating heights due to scrollbars.
 		}
-		currentView.setWidth(content.width(), dateChanged);
+
+		ignoreWindowResize++;
+		currentView.setHeight(suggestedViewHeight);
+		currentView.setWidth(content.width());
 		ignoreWindowResize--;
+
+		elementOuterWidth = element.outerWidth();
 	}
 	
 	
@@ -514,53 +506,90 @@
 	
 	/* Event Fetching/Rendering
 	-----------------------------------------------------------------------------*/
+	// TODO: going forward, most of this stuff should be directly handled by the view
+
+
+	function refetchEvents() { // can be called as an API method
+		clearEvents();
+		fetchAndRenderEvents();
+	}
+
+
+	function rerenderEvents(modifiedEventID) { // can be called as an API method
+		clearEvents();
+		renderEvents(modifiedEventID);
+	}
+
+
+	function renderEvents(modifiedEventID) { // TODO: remove modifiedEventID hack
+		if (elementVisible()) {
+			currentView.setEventData(events); // for View.js, TODO: unify with renderEvents
+			currentView.renderEvents(events, modifiedEventID); // actually render the DOM elements
+			currentView.trigger('eventAfterAllRender');
+		}
+	}
+
+
+	function clearEvents() {
+		currentView.triggerEventDestroy(); // trigger 'eventDestroy' for each event
+		currentView.clearEvents(); // actually remove the DOM elements
+		currentView.clearEventData(); // for View.js, TODO: unify with clearEvents
+	}
 	
-	
-	// fetches events if necessary, rerenders events if necessary (or if forced)
-	function updateEvents(forceRender) {
+
+	function getAndRenderEvents() {
 		if (!options.lazyFetching || isFetchNeeded(currentView.visStart, currentView.visEnd)) {
-			refetchEvents();
+			fetchAndRenderEvents();
 		}
-		else if (forceRender) {
-			rerenderEvents();
+		else {
+			renderEvents();
 		}
 	}
-	
-	
+
+
+	function fetchAndRenderEvents() {
+		fetchEvents(currentView.visStart, currentView.visEnd);
+			// ... will call reportEvents
+			// ... which will call renderEvents
+	}
+
+
 	function refetchEvents(source) {
 		fetchEvents(currentView.visStart, currentView.visEnd, source); // will call reportEvents
 	}
-	
+
 	
 	// called when event data arrives
 	function reportEvents(_events) {
 		events = _events;
-		rerenderEvents();
+		renderEvents();
 	}
-	
-	
+
+
 	// called when a single event's data has been changed
 	function reportEventChange(eventID) {
 		rerenderEvents(eventID);
 	}
-	
-	
-	// attempts to rerenderEvents
-	function rerenderEvents(modifiedEventID) {
-		markEventsDirty();
-		if (elementVisible()) {
-			currentView.clearEvents();
-			currentView.trigger('viewRender', currentView);
-			currentView.renderEvents(events, modifiedEventID);
-			currentView.eventsDirty = false;
-		}
+
+
+
+	/* Header Updating
+	-----------------------------------------------------------------------------*/
+
+
+	function updateTitle() {
+		header.updateTitle(currentView.title);
 	}
-	
-	
-	function markEventsDirty() {
-		$.each(viewInstances, function(i, inst) {
-			inst.eventsDirty = true;
-		});
+
+
+	function updateTodayButton() {
+		var today = new Date();
+		if (today >= currentView.start && today < currentView.end) {
+			header.disableButton('today');
+		}
+		else {
+			header.enableButton('today');
+		}
 	}
 	
 
@@ -641,6 +670,29 @@
 	function getDate() {
 		return cloneDate(date);
 	}
+
+
+
+	/* Height "Freezing"
+	-----------------------------------------------------------------------------*/
+
+
+	function freezeContentHeight() {
+		content.css({
+			width: '100%',
+			height: content.height(),
+			overflow: 'hidden'
+		});
+	}
+
+
+	function unfreezeContentHeight() {
+		content.css({
+			width: '',
+			height: '',
+			overflow: ''
+		});
+	}
 	
 	
 	
@@ -707,6 +759,8 @@
 
 }
 
+;;
+
 function Header(calendar, options) {
 	var t = this;
 	
@@ -759,7 +813,7 @@
 				var prevButton;
 				$.each(this.split(','), function(j, buttonName) {
 					if (buttonName == 'title') {
-						e.append("<span class='fc-header-title'><h2>&nbsp;</h2></span>");
+						e.append("<span class='fc-header-title'><h2 aria-live='polite' aria-relevant='text' aria-atomic='true'>&nbsp;</h2></span>");
 						if (prevButton) {
 							prevButton.addClass(tm + '-corner-right');
 						}
@@ -779,55 +833,52 @@
 							var icon = options.theme ? smartProperty(options.buttonIcons, buttonName) : null; // why are we using smartProperty here?
 							var text = smartProperty(options.buttonText, buttonName); // why are we using smartProperty here?
 							var button = $(
-								"<span class='fc-button fc-button-" + buttonName + " " + tm + "-state-default'>" +
-									"<span class='fc-button-inner'>" +
-										"<span class='fc-button-content'>" +
-											(icon ?
-												"<span class='fc-icon-wrap'>" +
-													"<span class='ui-icon ui-icon-" + icon + "'/>" +
-												"</span>" :
-												text
-												) +
-										"</span>" +
-										"<span class='fc-button-effect'><span></span></span>" +
-									"</span>" +
+								"<span class='fc-button fc-button-" + buttonName + " " + tm + "-state-default' role='button' tabindex='0'>" +
+									(icon ?
+										"<span class='fc-icon-wrap'>" +
+											"<span class='ui-icon ui-icon-" + icon + "'/>" +
+										"</span>" :
+										text
+										) +
 								"</span>"
-							);
-							if (button) {
-								button
-									.click(function() {
-										if (!button.hasClass(tm + '-state-disabled')) {
-											buttonClick();
-										}
-									})
-									.mousedown(function() {
+								)
+								.click(function() {
+									if (!button.hasClass(tm + '-state-disabled')) {
+										buttonClick();
+									}
+								})
+								.mousedown(function() {
+									button
+										.not('.' + tm + '-state-active')
+										.not('.' + tm + '-state-disabled')
+										.addClass(tm + '-state-down');
+								})
+								.mouseup(function() {
+									button.removeClass(tm + '-state-down');
+								})
+								.hover(
+									function() {
 										button
 											.not('.' + tm + '-state-active')
 											.not('.' + tm + '-state-disabled')
-											.addClass(tm + '-state-down');
-									})
-									.mouseup(function() {
-										button.removeClass(tm + '-state-down');
-									})
-									.hover(
-										function() {
-											button
-												.not('.' + tm + '-state-active')
-												.not('.' + tm + '-state-disabled')
-												.addClass(tm + '-state-hover');
-										},
-										function() {
-											button
-												.removeClass(tm + '-state-hover')
-												.removeClass(tm + '-state-down');
-										}
-									)
-									.appendTo(e);
-								if (!prevButton) {
-									button.addClass(tm + '-corner-left');
-								}
-								prevButton = button;
+											.addClass(tm + '-state-hover');
+									},
+									function() {
+										button
+											.removeClass(tm + '-state-hover')
+											.removeClass(tm + '-state-down');
+									}
+								)
+								.keypress(function(ev) {
+									if (ev.keyCode == 13)
+										$(ev.target).trigger('click');
+								})
+								.appendTo(e);
+							disableTextSelection(button);
+							if (!prevButton) {
+								button.addClass(tm + '-corner-left');
 							}
+							prevButton = button;
 						}
 					}
 				});
@@ -848,30 +899,32 @@
 	
 	function activateButton(buttonName) {
 		element.find('span.fc-button-' + buttonName)
-			.addClass(tm + '-state-active');
+			.addClass(tm + '-state-active').attr('tabindex', '-1');
 	}
 	
 	
 	function deactivateButton(buttonName) {
 		element.find('span.fc-button-' + buttonName)
-			.removeClass(tm + '-state-active');
+			.removeClass(tm + '-state-active').attr('tabindex', '0');
 	}
 	
 	
 	function disableButton(buttonName) {
 		element.find('span.fc-button-' + buttonName)
-			.addClass(tm + '-state-disabled');
+			.addClass(tm + '-state-disabled').attr('tabindex', '-1');
 	}
 	
 	
 	function enableButton(buttonName) {
 		element.find('span.fc-button-' + buttonName)
-			.removeClass(tm + '-state-disabled');
+			.removeClass(tm + '-state-disabled').attr('tabindex', '0');
 	}
 
 
 }
 
+;;
+
 fc.sourceNormalizers = [];
 fc.sourceFetchers = [];
 
@@ -950,6 +1003,16 @@
 		_fetchEventSource(source, function(events) {
 			if (fetchID == currentFetchID) {
 				if (events) {
+
+					if (options.eventDataTransform) {
+						events = $.map(events, options.eventDataTransform);
+					}
+					if (source.eventDataTransform) {
+						events = $.map(events, source.eventDataTransform);
+					}
+					// TODO: this technique is not ideal for static array event sources.
+					//  For arrays, we'll want to process all events right in the beginning, then never again.
+				
 					for (var i=0; i<events.length; i++) {
 						events[i].source = source;
 						normalizeEvent(events[i]);
@@ -1002,7 +1065,22 @@
 				var success = source.success;
 				var error = source.error;
 				var complete = source.complete;
-				var data = $.extend({}, source.data || {});
+
+				// retrieve any outbound GET/POST $.ajax data from the options
+				var customData;
+				if ($.isFunction(source.data)) {
+					// supplied as a function that returns a key/value object
+					customData = source.data();
+				}
+				else {
+					// supplied as a straight key/value object
+					customData = source.data;
+				}
+
+				// use a copy of the custom data so we can modify the parameters
+				// and not affect the passed-in object.
+				var data = $.extend({}, customData || {});
+
 				var startParam = firstDefined(source.startParam, options.startParam);
 				var endParam = firstDefined(source.endParam, options.endParam);
 				if (startParam) {
@@ -1011,6 +1089,7 @@
 				if (endParam) {
 					data[endParam] = Math.round(+rangeEnd / 1000);
 				}
+
 				pushLoading();
 				$.ajax($.extend({}, ajaxDefaults, source, {
 					data: data,
@@ -1110,7 +1189,7 @@
 				e.className = event.className;
 				e.editable = event.editable;
 				e.color = event.color;
-				e.backgroudColor = event.backgroudColor;
+				e.backgroundColor = event.backgroundColor;
 				e.borderColor = event.borderColor;
 				e.textColor = event.textColor;
 				normalizeEvent(e);
@@ -1184,14 +1263,14 @@
 	
 	function pushLoading() {
 		if (!loadingLevel++) {
-			trigger('loading', null, true);
+			trigger('loading', null, true, getView());
 		}
 	}
 	
 	
 	function popLoading() {
 		if (!--loadingLevel) {
-			trigger('loading', null, false);
+			trigger('loading', null, false, getView());
 		}
 	}
 	
@@ -1264,6 +1343,8 @@
 
 }
 
+;;
+
 
 fc.addDays = addDays;
 fc.cloneDate = cloneDate;
@@ -1368,15 +1449,6 @@
 }
 
 
-function skipWeekend(date, inc, excl) {
-	inc = inc || 1;
-	while (!date.getDay() || (excl && date.getDay()==1 || !excl && date.getDay()==6)) {
-		addDays(date, inc);
-	}
-	return date;
-}
-
-
 function dayDiff(d1, d2) { // d1 - d2
 	return Math.round((cloneDate(d1, true) - cloneDate(d2, true)) / DAY_MS);
 }
@@ -1618,10 +1690,35 @@
 			return 'th';
 		}
 		return ['st', 'nd', 'rd'][date%10-1] || 'th';
-	}	,
-	W	: function(d)	{ return iso8601Week(d); }
+	},
+	w   : function(d, o) { // local
+		return o.weekNumberCalculation(d);
+	},
+	W   : function(d) { // ISO
+		return iso8601Week(d);
+	}
 };
+fc.dateFormatters = dateFormatters;
+
+
+/* thanks jQuery UI (https://github.com/jquery/jquery-ui/blob/master/ui/jquery.ui.datepicker.js)
+ * 
+ * Set as calculateWeek to determine the week of the year based on the ISO 8601 definition.
+ * `date` - the date to get the week for
+ * `number` - the number of the week within the year that contains this date
+ */
+function iso8601Week(date) {
+	var time;
+	var checkDate = new Date(date.getTime());
 
+	// Find Thursday of this week starting on Monday
+	checkDate.setDate(checkDate.getDate() + 4 - (checkDate.getDay() || 7));
+
+	time = checkDate.getTime();
+	checkDate.setMonth(0); // Compare with Jan 1
+	checkDate.setDate(1);
+	return Math.floor(Math.round((time - checkDate) / 86400000) / 7) + 1;
+}
 
 // Determine the week of the year based on the ISO 8601 definition.
 // copied from jquery UI Datepicker
@@ -1636,6 +1733,8 @@
 };
 
 
+;;
+
 fc.applyAll = applyAll;
 
 
@@ -1655,95 +1754,7 @@
 function _exclEndDay(end, allDay) {
 	end = cloneDate(end);
 	return allDay || end.getHours() || end.getMinutes() ? addDays(end, 1) : clearTime(end);
-}
-
-
-function segCmp(a, b) {
-	return (b.msLength - a.msLength) * 100 + (a.event.start - b.event.start);
-}
-
-
-function segsCollide(seg1, seg2) {
-	return seg1.end > seg2.start && seg1.start < seg2.end;
-}
-
-
-
-/* Event Sorting
------------------------------------------------------------------------------*/
-
-
-// event rendering utilities
-function sliceSegs(events, visEventEnds, start, end) {
-	var segs = [],
-		i, len=events.length, event,
-		eventStart, eventEnd,
-		segStart, segEnd,
-		isStart, isEnd;
-	for (i=0; i<len; i++) {
-		event = events[i];
-		eventStart = event.start;
-		eventEnd = visEventEnds[i];
-		if (eventEnd > start && eventStart < end) {
-			if (eventStart < start) {
-				segStart = cloneDate(start);
-				isStart = false;
-			}else{
-				segStart = eventStart;
-				isStart = true;
-			}
-			if (eventEnd > end) {
-				segEnd = cloneDate(end);
-				isEnd = false;
-			}else{
-				segEnd = eventEnd;
-				isEnd = true;
-			}
-			segs.push({
-				event: event,
-				start: segStart,
-				end: segEnd,
-				isStart: isStart,
-				isEnd: isEnd,
-				msLength: segEnd - segStart
-			});
-		}
-	}
-	return segs.sort(segCmp);
-}
-
-
-// event rendering calculation utilities
-function stackSegs(segs) {
-	var levels = [],
-		i, len = segs.length, seg,
-		j, collide, k;
-	for (i=0; i<len; i++) {
-		seg = segs[i];
-		j = 0; // the level index where seg should belong
-		while (true) {
-			collide = false;
-			if (levels[j]) {
-				for (k=0; k<levels[j].length; k++) {
-					if (segsCollide(levels[j][k], seg)) {
-						collide = true;
-						break;
-					}
-				}
-			}
-			if (collide) {
-				j++;
-			}else{
-				break;
-			}
-		}
-		if (levels[j]) {
-			levels[j].push(seg);
-		}else{
-			levels[j] = [seg];
-		}
-	}
-	return levels;
+	// why don't we check for seconds/ms too?
 }
 
 
@@ -1753,7 +1764,7 @@
 
 
 function lazySegBind(container, segs, bindHandlers) {
-	container.unbind('mouseover').mouseover(function(ev) {
+	container.unbind('mouseover focusin').bind('mouseover focusin', function(ev) {
 		var parent=ev.target, e,
 			i, seg;
 		while (parent != this) {
@@ -1838,15 +1849,6 @@
 }
 
 
-function setMinHeight(element, height) {
-	height = (typeof height == 'number' ? height + 'px' : height);
-	element.each(function(i, _element) {
-		_element.style.cssText += ';min-height:' + height + ';_height:' + height;
-		// why can't we just use .css() ? i forget
-	});
-}
-
-
 
 /* Misc Utils
 -----------------------------------------------------------------------------*/
@@ -1859,7 +1861,7 @@
 function noop() { }
 
 
-function cmp(a, b) {
+function dateCompare(a, b) {
 	return a - b;
 }
 
@@ -1900,11 +1902,6 @@
 }
 
 
-function cssKey(_element) {
-	return _element.id + '/' + _element.className + '/' + _element.style.cssText.replace(/(^|;)\s*(top|left|width|height)\s*:[^;]*/ig, '');
-}
-
-
 function disableTextSelection(element) {
 	element
 		.attr('unselectable', 'on')
@@ -2003,6 +2000,8 @@
 }
 
 
+;;
+
 fcViews.month = MonthView;
 
 function MonthView(element, calendar) {
@@ -2017,44 +2016,56 @@
 	BasicView.call(t, element, calendar, 'month');
 	var opt = t.opt;
 	var renderBasic = t.renderBasic;
+	var skipHiddenDays = t.skipHiddenDays;
+	var getCellsPerWeek = t.getCellsPerWeek;
 	var formatDate = calendar.formatDate;
 	
 	
-	
 	function render(date, delta) {
+
 		if (delta) {
 			addMonths(date, delta);
 			date.setDate(1);
 		}
+
+		var firstDay = opt('firstDay');
+
 		var start = cloneDate(date, true);
 		start.setDate(1);
+
 		var end = addMonths(cloneDate(start), 1);
+
 		var visStart = cloneDate(start);
+		addDays(visStart, -((visStart.getDay() - firstDay + 7) % 7));
+		skipHiddenDays(visStart);
+
 		var visEnd = cloneDate(end);
-		var firstDay = opt('firstDay');
-		var nwe = opt('weekends') ? 0 : 1;
-		if (nwe) {
-			skipWeekend(visStart);
-			skipWeekend(visEnd, -1, true);
-		}
-		addDays(visStart, -((visStart.getDay() - Math.max(firstDay, nwe) + 7) % 7));
-		addDays(visEnd, (7 - visEnd.getDay() + Math.max(firstDay, nwe)) % 7);
-		var rowCnt = Math.round((visEnd - visStart) / (DAY_MS * 7));
+		addDays(visEnd, (7 - visEnd.getDay() + firstDay) % 7);
+		skipHiddenDays(visEnd, -1, true);
+
+		var colCnt = getCellsPerWeek();
+		var rowCnt = Math.round(dayDiff(visEnd, visStart) / 7); // should be no need for Math.round
+
 		if (opt('weekMode') == 'fixed') {
-			addDays(visEnd, (6 - rowCnt) * 7);
+			addDays(visEnd, (6 - rowCnt) * 7); // add weeks to make up for it
 			rowCnt = 6;
 		}
+
 		t.title = formatDate(start, opt('titleFormat'));
+
 		t.start = start;
 		t.end = end;
 		t.visStart = visStart;
 		t.visEnd = visEnd;
-		renderBasic(6, rowCnt, nwe ? 5 : 7, true);
+
+		renderBasic(rowCnt, colCnt, true);
 	}
 	
 	
 }
 
+;;
+
 fcViews.basicWeek = BasicWeekView;
 
 function BasicWeekView(element, calendar) {
@@ -2069,41 +2080,48 @@
 	BasicView.call(t, element, calendar, 'basicWeek');
 	var opt = t.opt;
 	var renderBasic = t.renderBasic;
+	var skipHiddenDays = t.skipHiddenDays;
+	var getCellsPerWeek = t.getCellsPerWeek;
 	var formatDates = calendar.formatDates;
 	
 	
-	
 	function render(date, delta) {
+
 		if (delta) {
 			addDays(date, delta * 7);
 		}
+
 		var start = addDays(cloneDate(date), -((date.getDay() - opt('firstDay') + 7) % 7));
 		var end = addDays(cloneDate(start), 7);
+
 		var visStart = cloneDate(start);
+		skipHiddenDays(visStart);
+
 		var visEnd = cloneDate(end);
-		var weekends = opt('weekends');
-		if (!weekends) {
-			skipWeekend(visStart);
-			skipWeekend(visEnd, -1, true);
-		}
+		skipHiddenDays(visEnd, -1, true);
+
+		var colCnt = getCellsPerWeek();
+
+		t.start = start;
+		t.end = end;
+		t.visStart = visStart;
+		t.visEnd = visEnd;
+
 		t.title = formatDates(
 			visStart,
 			addDays(cloneDate(visEnd), -1),
 			opt('titleFormat')
 		);
-		t.start = start;
-		t.end = end;
-		t.visStart = visStart;
-		t.visEnd = visEnd;
-		renderBasic(1, 1, weekends ? 7 : 5, false);
+
+		renderBasic(1, colCnt, false);
 	}
 	
 	
 }
 
-fcViews.basicDay = BasicDayView;
+;;
 
-//TODO: when calendar's date starts out on a weekend, shouldn't happen
+fcViews.basicDay = BasicDayView;
 
 
 function BasicDayView(element, calendar) {
@@ -2118,26 +2136,33 @@
 	BasicView.call(t, element, calendar, 'basicDay');
 	var opt = t.opt;
 	var renderBasic = t.renderBasic;
+	var skipHiddenDays = t.skipHiddenDays;
 	var formatDate = calendar.formatDate;
 	
 	
-	
 	function render(date, delta) {
+
 		if (delta) {
 			addDays(date, delta);
-			if (!opt('weekends')) {
-				skipWeekend(date, delta < 0 ? -1 : 1);
-			}
 		}
+		skipHiddenDays(date, delta < 0 ? -1 : 1);
+
+		var start = cloneDate(date, true);
+		var end = addDays(cloneDate(start), 1);
+
 		t.title = formatDate(date, opt('titleFormat'));
-		t.start = t.visStart = cloneDate(date, true);
-		t.end = t.visEnd = addDays(cloneDate(t.start), 1);
-		renderBasic(1, 1, 1, false);
+
+		t.start = t.visStart = start;
+		t.end = t.visEnd = end;
+
+		renderBasic(1, 1, false);
 	}
 	
 	
 }
 
+;;
+
 setDefaults({
 	weekMode: 'fixed'
 });
@@ -2160,14 +2185,12 @@
 	t.dragStop = dragStop;
 	t.defaultEventEnd = defaultEventEnd;
 	t.getHoverListener = function() { return hoverListener };
+	t.colLeft = colLeft;
+	t.colRight = colRight;
 	t.colContentLeft = colContentLeft;
 	t.colContentRight = colContentRight;
-	t.dayOfWeekCol = dayOfWeekCol;
-	t.dateCell = dateCell;
-	t.cellDate = cellDate;
-	t.cellIsAllDay = function() { return true };
+	t.getIsCellAllDay = function() { return true };
 	t.allDayRow = allDayRow;
-	t.allDayBounds = allDayBounds;
 	t.getRowCnt = function() { return rowCnt };
 	t.getColCnt = function() { return colCnt };
 	t.getColWidth = function() { return colWidth };
@@ -2181,38 +2204,45 @@
 	BasicEventRenderer.call(t);
 	var opt = t.opt;
 	var trigger = t.trigger;
-	var clearEvents = t.clearEvents;
 	var renderOverlay = t.renderOverlay;
 	var clearOverlays = t.clearOverlays;
 	var daySelectionMousedown = t.daySelectionMousedown;
+	var cellToDate = t.cellToDate;
+	var dateToCell = t.dateToCell;
+	var rangeToSegments = t.rangeToSegments;
 	var formatDate = calendar.formatDate;
 	
 	
 	// locals
 	
+	var table;
 	var head;
 	var headCells;
 	var body;
 	var bodyRows;
 	var bodyCells;
 	var bodyFirstCells;
-	var bodyCellTopInners;
+	var firstRowCellInners;
+	var firstRowCellContentInners;
 	var daySegmentContainer;
 	
 	var viewWidth;
 	var viewHeight;
 	var colWidth;
+	var weekNumberWidth;
 	
 	var rowCnt, colCnt;
+	var showNumbers;
 	var coordinateGrid;
 	var hoverListener;
+	var colPositions;
 	var colContentPositions;
 	
-	var rtl, dis, dit;
-	var firstDay;
-	var nwe;
 	var tm;
 	var colFormat;
+	var showWeekNumbers;
+	var weekNumberTitle;
+	var weekNumberFormat;
 	
 	
 	
@@ -2223,154 +2253,212 @@
 	disableTextSelection(element.addClass('fc-grid'));
 	
 	
-	function renderBasic(maxr, r, c, showNumbers) {
-		rowCnt = r;
-		colCnt = c;
+	function renderBasic(_rowCnt, _colCnt, _showNumbers) {
+		rowCnt = _rowCnt;
+		colCnt = _colCnt;
+		showNumbers = _showNumbers;
 		updateOptions();
-		var firstTime = !body;
-		if (firstTime) {
-			buildSkeleton(maxr, showNumbers);
-		}else{
-			clearEvents();
+
+		if (!body) {
+			buildEventContainer();
 		}
-		updateCells(firstTime);
+
+		buildTable();
 	}
 	
 	
-	
 	function updateOptions() {
-		rtl = opt('isRTL');
-		if (rtl) {
-			dis = -1;
-			dit = colCnt - 1;
-		}else{
-			dis = 1;
-			dit = 0;
-		}
-		firstDay = opt('firstDay');
-		nwe = opt('weekends') ? 0 : 1;
 		tm = opt('theme') ? 'ui' : 'fc';
 		colFormat = opt('columnFormat');
+
+		// week # options. (TODO: bad, logic also in other views)
+		showWeekNumbers = opt('weekNumbers');
+		weekNumberTitle = opt('weekNumberTitle');
+		if (opt('weekNumberCalculation') != 'iso') {
+			weekNumberFormat = "w";
+		}
+		else {
+			weekNumberFormat = "W";
+		}
 	}
 	
 	
+	function buildEventContainer() {
+		daySegmentContainer =
+			$("<div class='fc-event-container' style='position:absolute;z-index:8;top:0;left:0'/>")
+				.appendTo(element);
+	}
 	
-	function buildSkeleton(maxRowCnt, showNumbers) {
-		var s;
-		var headerClass = tm + "-widget-header";
-		var contentClass = tm + "-widget-content";
-		var i, j;
-		var table;
-		
-		s =
-			"<table class='fc-border-separate' style='width:100%' cellspacing='0'>" +
-			"<thead>" +
-			"<tr>";
-		for (i=0; i<colCnt; i++) {
-			s +=
-				"<th class='fc- " + headerClass + "'/>"; // need fc- for setDayID
-		}
-		s +=
-			"</tr>" +
-			"</thead>" +
-			"<tbody>";
-		for (i=0; i<maxRowCnt; i++) {
-			s +=
-				"<tr class='fc-week" + i + "'>";
-			for (j=0; j<colCnt; j++) {
-				s +=
-					"<td class='fc- " + contentClass + " fc-day" + (i*colCnt+j) + "'>" + // need fc- for setDayID
-					"<div>" +
-					(showNumbers ?
-						"<div class='fc-day-number'/>" :
-						''
-						) +
-					"<div class='fc-day-content'>" +
-					"<div style='position:relative'>&nbsp;</div>" +
-					"</div>" +
-					"</div>" +
-					"</td>";
-			}
-			s +=
-				"</tr>";
+	
+	function buildTable() {
+		var html = buildTableHTML();
+
+		if (table) {
+			table.remove();
 		}
-		s +=
-			"</tbody>" +
-			"</table>";
-		table = $(s).appendTo(element);
-		
+		table = $(html).appendTo(element);
+
 		head = table.find('thead');
-		headCells = head.find('th');
+		headCells = head.find('.fc-day-header');
 		body = table.find('tbody');
 		bodyRows = body.find('tr');
-		bodyCells = body.find('td');
-		bodyFirstCells = bodyCells.filter(':first-child');
-		bodyCellTopInners = bodyRows.eq(0).find('div.fc-day-content div');
+		bodyCells = body.find('.fc-day');
+		bodyFirstCells = bodyRows.find('td:first-child');
+
+		firstRowCellInners = bodyRows.eq(0).find('.fc-day > div');
+		firstRowCellContentInners = bodyRows.eq(0).find('.fc-day-content > div');
 		
 		markFirstLast(head.add(head.find('tr'))); // marks first+last tr/th's
 		markFirstLast(bodyRows); // marks first+last td's
-		bodyRows.eq(0).addClass('fc-first'); // fc-last is done in updateCells
-		
+		bodyRows.eq(0).addClass('fc-first');
+		bodyRows.filter(':last').addClass('fc-last');
+
+		bodyCells.each(function(i, _cell) {
+			var date = cellToDate(
+				Math.floor(i / colCnt),
+				i % colCnt
+			);
+			trigger('dayRender', t, date, $(_cell));
+		});
+
 		dayBind(bodyCells);
-		
-		daySegmentContainer =
-			$("<div style='position:absolute;z-index:8;top:0;left:0'/>")
-				.appendTo(element);
 	}
-	
-	
-	
-	function updateCells(firstTime) {
-		var dowDirty = firstTime || rowCnt == 1; // could the cells' day-of-weeks need updating?
-		var month = t.start.getMonth();
-		var today = clearTime(new Date());
-		var cell;
+
+
+
+	/* HTML Building
+	-----------------------------------------------------------*/
+
+
+	function buildTableHTML() {
+		var html =
+			"<table class='fc-border-separate' style='width:100%' cellspacing='0'>" +
+			buildHeadHTML() +
+			buildBodyHTML() +
+			"</table>";
+
+		return html;
+	}
+
+
+	function buildHeadHTML() {
+		var headerClass = tm + "-widget-header";
+		var html = '';
+		var col;
 		var date;
-		var row;
-	
-		if (dowDirty) {
-			headCells.each(function(i, _cell) {
-				cell = $(_cell);
-				date = indexDate(i);
-				cell.html(formatDate(date, colFormat));
-				setDayID(cell, date);
-			});
+
+		html += "<thead><tr>";
+
+		if (showWeekNumbers) {
+			html +=
+				"<th class='fc-week-number " + headerClass + "'>" +
+				htmlEscape(weekNumberTitle) +
+				"</th>";
 		}
-		
-		bodyCells.each(function(i, _cell) {
-			cell = $(_cell);
-			date = indexDate(i);
-			if (date.getMonth() == month) {
-				cell.removeClass('fc-other-month');
-			}else{
-				cell.addClass('fc-other-month');
-			}
-			if (+date == +today) {
-				cell.addClass(tm + '-state-highlight fc-today');
-			}else{
-				cell.removeClass(tm + '-state-highlight fc-today');
-			}
-			cell.find('div.fc-day-number').text(date.getDate());
-			if (dowDirty) {
-				setDayID(cell, date);
+
+		for (col=0; col<colCnt; col++) {
+			date = cellToDate(0, col);
+			html +=
+				"<th class='fc-day-header fc-" + dayIDs[date.getDay()] + " " + headerClass + "'>" +
+				htmlEscape(formatDate(date, colFormat)) +
+				"</th>";
+		}
+
+		html += "</tr></thead>";
+
+		return html;
+	}
+
+
+	function buildBodyHTML() {
+		var contentClass = tm + "-widget-content";
+		var html = '';
+		var row;
+		var col;
+		var date;
+
+		html += "<tbody>";
+
+		for (row=0; row<rowCnt; row++) {
+
+			html += "<tr class='fc-week'>";
+
+			if (showWeekNumbers) {
+				date = cellToDate(row, 0);
+				html +=
+					"<td class='fc-week-number " + contentClass + "'>" +
+					"<div>" +
+					htmlEscape(formatDate(date, weekNumberFormat)) +
+					"</div>" +
+					"</td>";
 			}
-		});
-		
-		bodyRows.each(function(i, _row) {
-			row = $(_row);
-			if (i < rowCnt) {
-				row.show();
-				if (i == rowCnt-1) {
-					row.addClass('fc-last');
-				}else{
-					row.removeClass('fc-last');
-				}
-			}else{
-				row.hide();
+
+			for (col=0; col<colCnt; col++) {
+				date = cellToDate(row, col);
+				html += buildCellHTML(date);
 			}
-		});
+
+			html += "</tr>";
+		}
+
+		html += "</tbody>";
+
+		return html;
 	}
-	
+
+
+	function buildCellHTML(date) {
+		var contentClass = tm + "-widget-content";
+		var month = t.start.getMonth();
+		var today = clearTime(new Date());
+		var html = '';
+		var classNames = [
+			'fc-day',
+			'fc-' + dayIDs[date.getDay()],
+			contentClass
+		];
+
+		if (date.getMonth() != month) {
+			classNames.push('fc-other-month');
+		}
+		if (+date == +today) {
+			classNames.push(
+				'fc-today',
+				tm + '-state-highlight'
+			);
+		}
+		else if (date < today) {
+			classNames.push('fc-past');
+		}
+		else {
+			classNames.push('fc-future');
+		}
+
+		html +=
+			"<td" +
+			" class='" + classNames.join(' ') + "'" +
+			" data-date='" + formatDate(date, 'yyyy-MM-dd') + "'" +
+			">" +
+			"<div>";
+
+		if (showNumbers) {
+			html += "<div class='fc-day-number'>" + date.getDate() + "</div>";
+		}
+
+		html +=
+			"<div class='fc-day-content'>" +
+			"<div style='position:relative'>&nbsp;</div>" +
+			"</div>" +
+			"</div>" +
+			"</td>";
+
+		return html;
+	}
+
+
+
+	/* Dimensions
+	-----------------------------------------------------------*/
 	
 	
 	function setHeight(height) {
@@ -2391,8 +2479,8 @@
 		bodyFirstCells.each(function(i, _cell) {
 			if (i < rowCnt) {
 				cell = $(_cell);
-				setMinHeight(
-					cell.find('> div'),
+				cell.find('> div').css(
+					'min-height',
 					(i==rowCnt-1 ? rowHeightLast : rowHeight) - vsides(cell)
 				);
 			}
@@ -2403,8 +2491,15 @@
 	
 	function setWidth(width) {
 		viewWidth = width;
+		colPositions.clear();
 		colContentPositions.clear();
-		colWidth = Math.floor(viewWidth / colCnt);
+
+		weekNumberWidth = 0;
+		if (showWeekNumbers) {
+			weekNumberWidth = head.find('th.fc-week-number').outerWidth();
+		}
+
+		colWidth = Math.floor((viewWidth - weekNumberWidth) / colCnt);
 		setOuterWidth(headCells.slice(0, -1), colWidth);
 	}
 	
@@ -2422,8 +2517,7 @@
 	
 	function dayClick(ev) {
 		if (!opt('selectable')) { // if selectable, SelectionManager will worry about dayClick
-			var index = parseInt(this.className.match(/fc\-day(\d+)/)[1]); // TODO: maybe use .data
-			var date = indexDate(index);
+			var date = parseISO8601($(this).data('date'));
 			trigger('dayClick', this, date, true, ev);
 		}
 	}
@@ -2432,35 +2526,30 @@
 	
 	/* Semi-transparent Overlay Helpers
 	------------------------------------------------------*/
-	
-	
+	// TODO: should be consolidated with AgendaView's methods
+
+
 	function renderDayOverlay(overlayStart, overlayEnd, refreshCoordinateGrid) { // overlayEnd is exclusive
+
 		if (refreshCoordinateGrid) {
 			coordinateGrid.build();
 		}
-		var rowStart = cloneDate(t.visStart);
-		var rowEnd = addDays(cloneDate(rowStart), colCnt);
-		for (var i=0; i<rowCnt; i++) {
-			var stretchStart = new Date(Math.max(rowStart, overlayStart));
-			var stretchEnd = new Date(Math.min(rowEnd, overlayEnd));
-			if (stretchStart < stretchEnd) {
-				var colStart, colEnd;
-				if (rtl) {
-					colStart = dayDiff(stretchEnd, rowStart)*dis+dit+1;
-					colEnd = dayDiff(stretchStart, rowStart)*dis+dit+1;
-				}else{
-					colStart = dayDiff(stretchStart, rowStart);
-					colEnd = dayDiff(stretchEnd, rowStart);
-				}
-				dayBind(
-					renderCellOverlay(i, colStart, i, colEnd-1)
-				);
-			}
-			addDays(rowStart, 7);
-			addDays(rowEnd, 7);
+
+		var segments = rangeToSegments(overlayStart, overlayEnd);
+
+		for (var i=0; i<segments.length; i++) {
+			var segment = segments[i];
+			dayBind(
+				renderCellOverlay(
+					segment.row,
+					segment.leftCol,
+					segment.row,
+					segment.rightCol
+				)
+			);
 		}
 	}
-	
+
 	
 	function renderCellOverlay(row0, col0, row1, col1) { // row1,col1 is inclusive
 		var rect = coordinateGrid.rect(row0, col0, row1, col1, element);
@@ -2489,7 +2578,7 @@
 	
 	
 	function reportDayClick(date, allDay, ev) {
-		var cell = dateCell(date);
+		var cell = dateToCell(date);
 		var _element = bodyCells[cell.row*colCnt + cell.col];
 		trigger('dayClick', _element, date, allDay, ev);
 	}
@@ -2514,7 +2603,7 @@
 		var cell = hoverListener.stop();
 		clearOverlays();
 		if (cell) {
-			var d = cellDate(cell);
+			var d = cellToDate(cell);
 			trigger('drop', _dragElement, d, true, ev, ui);
 		}
 	}
@@ -2559,10 +2648,23 @@
 	
 	hoverListener = new HoverListener(coordinateGrid);
 	
-	
+	colPositions = new HorizontalPositionCache(function(col) {
+		return firstRowCellInners.eq(col);
+	});
+
 	colContentPositions = new HorizontalPositionCache(function(col) {
-		return bodyCellTopInners.eq(col);
+		return firstRowCellContentInners.eq(col);
 	});
+
+
+	function colLeft(col) {
+		return colPositions.left(col);
+	}
+
+
+	function colRight(col) {
+		return colPositions.right(col);
+	}
 	
 	
 	function colContentLeft(col) {
@@ -2575,195 +2677,43 @@
 	}
 	
 	
-	
-	
-	function dateCell(date) {
-		return {
-			row: Math.floor(dayDiff(date, t.visStart) / 7),
-			col: dayOfWeekCol(date.getDay())
-		};
-	}
-	
-	
-	function cellDate(cell) {
-		return _cellDate(cell.row, cell.col);
-	}
-	
-	
-	function _cellDate(row, col) {
-		return addDays(cloneDate(t.visStart), row*7 + col*dis+dit);
-		// what about weekends in middle of week?
-	}
-	
-	
-	function indexDate(index) {
-		return _cellDate(Math.floor(index/colCnt), index%colCnt);
-	}
-	
-	
-	function dayOfWeekCol(dayOfWeek) {
-		return ((dayOfWeek - Math.max(firstDay, nwe) + colCnt) % colCnt) * dis + dit;
-	}
-	
-	
-	
-	
 	function allDayRow(i) {
 		return bodyRows.eq(i);
 	}
 	
-	
-	function allDayBounds(i) {
-		return {
-			left: 0,
-			right: viewWidth
-		};
-	}
-	
-	
 }
 
+;;
+
 function BasicEventRenderer() {
 	var t = this;
 	
 	
 	// exports
 	t.renderEvents = renderEvents;
-	t.compileDaySegs = compileSegs; // for DayEventRenderer
 	t.clearEvents = clearEvents;
-	t.bindDaySeg = bindDaySeg;
-	
 	
+
 	// imports
 	DayEventRenderer.call(t);
-	var opt = t.opt;
-	var trigger = t.trigger;
-	//var setOverflowHidden = t.setOverflowHidden;
-	var isEventDraggable = t.isEventDraggable;
-	var isEventResizable = t.isEventResizable;
-	var reportEvents = t.reportEvents;
-	var reportEventClear = t.reportEventClear;
-	var eventElementHandlers = t.eventElementHandlers;
-	var showEvents = t.showEvents;
-	var hideEvents = t.hideEvents;
-	var eventDrop = t.eventDrop;
-	var getDaySegmentContainer = t.getDaySegmentContainer;
-	var getHoverListener = t.getHoverListener;
-	var renderDayOverlay = t.renderDayOverlay;
-	var clearOverlays = t.clearOverlays;
-	var getRowCnt = t.getRowCnt;
-	var getColCnt = t.getColCnt;
-	var renderDaySegs = t.renderDaySegs;
-	var resizableDayEvent = t.resizableDayEvent;
-	
-	
-	
-	/* Rendering
-	--------------------------------------------------------------------*/
-	
+
 	
 	function renderEvents(events, modifiedEventId) {
-		reportEvents(events);
-		renderDaySegs(compileSegs(events), modifiedEventId);
+		t.renderDayEvents(events, modifiedEventId);
 	}
 	
 	
 	function clearEvents() {
-		reportEventClear();
-		getDaySegmentContainer().empty();
-	}
-	
-	
-	function compileSegs(events) {
-		var rowCnt = getRowCnt(),
-			colCnt = getColCnt(),
-			d1 = cloneDate(t.visStart),
-			d2 = addDays(cloneDate(d1), colCnt),
-			visEventsEnds = $.map(events, exclEndDay),
-			i, row,
-			j, level,
-			k, seg,
-			segs=[];
-		for (i=0; i<rowCnt; i++) {
-			row = stackSegs(sliceSegs(events, visEventsEnds, d1, d2));
-			for (j=0; j<row.length; j++) {
-				level = row[j];
-				for (k=0; k<level.length; k++) {
-					seg = level[k];
-					seg.row = i;
-					seg.level = j; // not needed anymore
-					segs.push(seg);
-				}
-			}
-			addDays(d1, 7);
-			addDays(d2, 7);
-		}
-		return segs;
-	}
-	
-	
-	function bindDaySeg(event, eventElement, seg) {
-		if (isEventDraggable(event)) {
-			draggableDayEvent(event, eventElement);
-		}
-		if (seg.isEnd && isEventResizable(event)) {
-			resizableDayEvent(event, eventElement, seg);
-		}
-		eventElementHandlers(event, eventElement);
-			// needs to be after, because resizableDayEvent might stopImmediatePropagation on click
-	}
-	
-	
-	
-	/* Dragging
-	----------------------------------------------------------------------------*/
-	
-	
-	function draggableDayEvent(event, eventElement) {
-		var hoverListener = getHoverListener();
-		var dayDelta;
-		eventElement.draggable({
-			zIndex: 9,
-			delay: 50,
-			opacity: opt('dragOpacity'),
-			revertDuration: opt('dragRevertDuration'),
-			start: function(ev, ui) {
-				trigger('eventDragStart', eventElement, event, ev, ui);
-				hideEvents(event, eventElement);
-				hoverListener.start(function(cell, origCell, rowDelta, colDelta) {
-					eventElement.draggable('option', 'revert', !cell || !rowDelta && !colDelta);
-					clearOverlays();
-					if (cell) {
-						//setOverflowHidden(true);
-						dayDelta = rowDelta*7 + colDelta * (opt('isRTL') ? -1 : 1);
-						renderDayOverlay(
-							addDays(cloneDate(event.start), dayDelta),
-							addDays(exclEndDay(event), dayDelta)
-						);
-					}else{
-						//setOverflowHidden(false);
-						dayDelta = 0;
-					}
-				}, ev, 'drag');
-			},
-			stop: function(ev, ui) {
-				hoverListener.stop();
-				clearOverlays();
-				trigger('eventDragStop', eventElement, event, ev, ui);
-				if (dayDelta) {
-					eventDrop(this, event, dayDelta, 0, event.allDay, ev, ui);
-				}else{
-					eventElement.css('filter', ''); // clear IE opacity side-effects
-					showEvents(event, eventElement);
-				}
-				//setOverflowHidden(false);
-			}
-		});
+		t.getDaySegmentContainer().empty();
 	}
 
 
+	// TODO: have this class (and AgendaEventRenderer) be responsible for creating the event container div
+
 }
 
+;;
+
 fcViews.agendaWeek = AgendaWeekView;
 
 function AgendaWeekView(element, calendar) {
@@ -2778,40 +2728,49 @@
 	AgendaView.call(t, element, calendar, 'agendaWeek');
 	var opt = t.opt;
 	var renderAgenda = t.renderAgenda;
+	var skipHiddenDays = t.skipHiddenDays;
+	var getCellsPerWeek = t.getCellsPerWeek;
 	var formatDates = calendar.formatDates;
-	
-	
+
 	
 	function render(date, delta) {
+
 		if (delta) {
 			addDays(date, delta * 7);
 		}
+
 		var start = addDays(cloneDate(date), -((date.getDay() - opt('firstDay') + 7) % 7));
 		var end = addDays(cloneDate(start), 7);
+
 		var visStart = cloneDate(start);
+		skipHiddenDays(visStart);
+
 		var visEnd = cloneDate(end);
-		var weekends = opt('weekends');
-		if (!weekends) {
-			skipWeekend(visStart);
-			skipWeekend(visEnd, -1, true);
-		}
+		skipHiddenDays(visEnd, -1, true);
+
+		var colCnt = getCellsPerWeek();
+
 		t.title = formatDates(
 			visStart,
 			addDays(cloneDate(visEnd), -1),
 			opt('titleFormat')
 		);
+
 		t.start = start;
 		t.end = end;
 		t.visStart = visStart;
 		t.visEnd = visEnd;
-		renderAgenda(weekends ? 7 : 5);
+
+		renderAgenda(colCnt);
 	}
-	
 
 }
 
+;;
+
 fcViews.agendaDay = AgendaDayView;
 
+
 function AgendaDayView(element, calendar) {
 	var t = this;
 	
@@ -2824,28 +2783,33 @@
 	AgendaView.call(t, element, calendar, 'agendaDay');
 	var opt = t.opt;
 	var renderAgenda = t.renderAgenda;
+	var skipHiddenDays = t.skipHiddenDays;
 	var formatDate = calendar.formatDate;
 	
 	
-	
 	function render(date, delta) {
+
 		if (delta) {
 			addDays(date, delta);
-			if (!opt('weekends')) {
-				skipWeekend(date, delta < 0 ? -1 : 1);
-			}
 		}
+		skipHiddenDays(date, delta < 0 ? -1 : 1);
+
 		var start = cloneDate(date, true);
 		var end = addDays(cloneDate(start), 1);
+
 		t.title = formatDate(date, opt('titleFormat'));
+
 		t.start = t.visStart = start;
 		t.end = t.visEnd = end;
+
 		renderAgenda(1);
 	}
 	
 
 }
 
+;;
+
 setDefaults({
 	allDaySlot: true,
 	allDayText: 'all-day',
@@ -2860,7 +2824,8 @@
 		agenda: .5
 	},
 	minTime: 0,
-	maxTime: 24
+	maxTime: 24,
+	slotEventOverlap: true
 });
 
 
@@ -2876,28 +2841,27 @@
 	t.renderAgenda = renderAgenda;
 	t.setWidth = setWidth;
 	t.setHeight = setHeight;
-	t.beforeHide = beforeHide;
-	t.afterShow = afterShow;
+	t.afterRender = afterRender;
 	t.defaultEventEnd = defaultEventEnd;
 	t.timePosition = timePosition;
-	t.dayOfWeekCol = dayOfWeekCol;
-	t.dateCell = dateCell;
-	t.cellDate = cellDate;
-	t.cellIsAllDay = cellIsAllDay;
+	t.getIsCellAllDay = getIsCellAllDay;
 	t.allDayRow = getAllDayRow;
-	t.allDayBounds = allDayBounds;
+	t.getCoordinateGrid = function() { return coordinateGrid }; // specifically for AgendaEventRenderer
 	t.getHoverListener = function() { return hoverListener };
+	t.colLeft = colLeft;
+	t.colRight = colRight;
 	t.colContentLeft = colContentLeft;
 	t.colContentRight = colContentRight;
 	t.getDaySegmentContainer = function() { return daySegmentContainer };
 	t.getSlotSegmentContainer = function() { return slotSegmentContainer };
 	t.getMinMinute = function() { return minMinute };
 	t.getMaxMinute = function() { return maxMinute };
-	t.getBodyContent = function() { return slotContent }; // !!??
+	t.getSlotContainer = function() { return slotContainer };
 	t.getRowCnt = function() { return 1 };
 	t.getColCnt = function() { return colCnt };
 	t.getColWidth = function() { return colWidth };
-	t.getSlotHeight = function() { return slotHeight };
+	t.getSnapHeight = function() { return snapHeight };
+	t.getSnapMinutes = function() { return snapMinutes };
 	t.defaultSelectionEnd = defaultSelectionEnd;
 	t.renderDayOverlay = renderDayOverlay;
 	t.renderSelection = renderSelection;
@@ -2914,13 +2878,15 @@
 	AgendaEventRenderer.call(t);
 	var opt = t.opt;
 	var trigger = t.trigger;
-	var clearEvents = t.clearEvents;
 	var renderOverlay = t.renderOverlay;
 	var clearOverlays = t.clearOverlays;
 	var reportSelection = t.reportSelection;
 	var unselect = t.unselect;
 	var daySelectionMousedown = t.daySelectionMousedown;
 	var slotSegHtml = t.slotSegHtml;
+	var cellToDate = t.cellToDate;
+	var dateToCell = t.dateToCell;
+	var rangeToSegments = t.rangeToSegments;
 	var formatDate = calendar.formatDate;
 	
 	
@@ -2932,6 +2898,7 @@
 	var dayBody;
 	var dayBodyCells;
 	var dayBodyCellInners;
+	var dayBodyCellContentInners;
 	var dayBodyFirstCell;
 	var dayBodyFirstCellStretcher;
 	var slotLayer;
@@ -2939,12 +2906,9 @@
 	var allDayTable;
 	var allDayRow;
 	var slotScroller;
-	var slotContent;
+	var slotContainer;
 	var slotSegmentContainer;
 	var slotTable;
-	var slotTableFirstInner;
-	var axisFirstCells;
-	var gutterCells;
 	var selectionHelper;
 	
 	var viewWidth;
@@ -2953,21 +2917,26 @@
 	var colWidth;
 	var gutterWidth;
 	var slotHeight; // TODO: what if slotHeight changes? (see issue 650)
-	var savedScrollTop;
+
+	var snapMinutes;
+	var snapRatio; // ratio of number of "selection" slots to normal slots. (ex: 1, 2, 4)
+	var snapHeight; // holds the pixel hight of a "selection" slot
 	
 	var colCnt;
 	var slotCnt;
 	var coordinateGrid;
 	var hoverListener;
+	var colPositions;
 	var colContentPositions;
 	var slotTopCache = {};
 	
 	var tm;
-	var firstDay;
-	var nwe;            // no weekends (int)
-	var rtl, dis, dit;  // day index sign / translate
+	var rtl;
 	var minMinute, maxMinute;
 	var colFormat;
+	var showWeekNumbers;
+	var weekNumberTitle;
+	var weekNumberFormat;
 	
 
 	
@@ -2981,89 +2950,54 @@
 	function renderAgenda(c) {
 		colCnt = c;
 		updateOptions();
-		if (!dayTable) {
-			buildSkeleton();
-		}else{
-			clearEvents();
+
+		if (!dayTable) { // first time rendering?
+			buildSkeleton(); // builds day table, slot area, events containers
+		}
+		else {
+			buildDayTable(); // rebuilds day table
 		}
-		updateCells();
 	}
 	
 	
-	
 	function updateOptions() {
+
 		tm = opt('theme') ? 'ui' : 'fc';
-		nwe = opt('weekends') ? 0 : 1;
-		firstDay = opt('firstDay');
-		if (rtl = opt('isRTL')) {
-			dis = -1;
-			dit = colCnt - 1;
-		}else{
-			dis = 1;
-			dit = 0;
-		}
+		rtl = opt('isRTL')
 		minMinute = parseTime(opt('minTime'));
 		maxMinute = parseTime(opt('maxTime'));
 		colFormat = opt('columnFormat');
+
+		// week # options. (TODO: bad, logic also in other views)
+		showWeekNumbers = opt('weekNumbers');
+		weekNumberTitle = opt('weekNumberTitle');
+		if (opt('weekNumberCalculation') != 'iso') {
+			weekNumberFormat = "w";
+		}
+		else {
+			weekNumberFormat = "W";
+		}
+
+		snapMinutes = opt('snapMinutes') || opt('slotMinutes');
 	}
-	
-	
-	
+
+
+
+	/* Build DOM
+	-----------------------------------------------------------------------*/
+
+
 	function buildSkeleton() {
 		var headerClass = tm + "-widget-header";
 		var contentClass = tm + "-widget-content";
 		var s;
-		var i;
 		var d;
+		var i;
 		var maxd;
 		var minutes;
 		var slotNormal = opt('slotMinutes') % 15 == 0;
 		
-		s =
-			"<table style='width:100%' class='fc-agenda-days fc-border-separate' cellspacing='0'>" +
-			"<thead>" +
-			"<tr>" +
-			"<th class='fc-agenda-axis " + headerClass + "'>&nbsp;</th>";
-		for (i=0; i<colCnt; i++) {
-			s +=
-				"<th class='fc- fc-col" + i + ' ' + headerClass + "'/>"; // fc- needed for setDayID
-		}
-		s +=
-			"<th class='fc-agenda-gutter " + headerClass + "'>&nbsp;</th>" +
-			"</tr>" +
-			"</thead>" +
-			"<tbody>" +
-			"<tr>" +
-			"<th class='fc-agenda-axis " + headerClass + "'>&nbsp;</th>";
-		for (i=0; i<colCnt; i++) {
-			s +=
-				"<td class='fc- fc-col" + i + ' ' + contentClass + "'>" + // fc- needed for setDayID
-				"<div>" +
-				"<div class='fc-day-content'>" +
-				"<div style='position:relative'>&nbsp;</div>" +
-				"</div>" +
-				"</div>" +
-				"</td>";
-		}
-		s +=
-			"<td class='fc-agenda-gutter " + contentClass + "'>&nbsp;</td>" +
-			"</tr>" +
-			"</tbody>" +
-			"</table>";
-		dayTable = $(s).appendTo(element);
-		dayHead = dayTable.find('thead');
-		dayHeadCells = dayHead.find('th').slice(1, -1);
-		dayBody = dayTable.find('tbody');
-		dayBodyCells = dayBody.find('td').slice(0, -1);
-		dayBodyCellInners = dayBodyCells.find('div.fc-day-content div');
-		dayBodyFirstCell = dayBodyCells.eq(0);
-		dayBodyFirstCellStretcher = dayBodyFirstCell.find('> div');
-		
-		markFirstLast(dayHead.add(dayHead.find('tr')));
-		markFirstLast(dayBody.add(dayBody.find('tr')));
-		
-		axisFirstCells = dayHead.find('th:first');
-		gutterCells = dayTable.find('.fc-agenda-gutter');
+		buildDayTable();
 		
 		slotLayer =
 			$("<div style='position:absolute;z-index:2;left:0;width:100%'/>")
@@ -3072,7 +3006,7 @@
 		if (opt('allDaySlot')) {
 		
 			daySegmentContainer =
-				$("<div style='position:absolute;z-index:8;top:0;left:0'/>")
+				$("<div class='fc-event-container' style='position:absolute;z-index:8;top:0;left:0'/>")
 					.appendTo(slotLayer);
 		
 			s =
@@ -3090,9 +3024,6 @@
 			
 			dayBind(allDayRow.find('td'));
 			
-			axisFirstCells = axisFirstCells.add(allDayTable.find('th:first'));
-			gutterCells = gutterCells.add(allDayTable.find('th.fc-agenda-gutter'));
-			
 			slotLayer.append(
 				"<div class='fc-agenda-divider " + headerClass + "'>" +
 				"<div class='fc-agenda-divider-inner'/>" +
@@ -3109,13 +3040,13 @@
 			$("<div style='position:absolute;width:100%;overflow-x:hidden;overflow-y:auto'/>")
 				.appendTo(slotLayer);
 				
-		slotContent =
+		slotContainer =
 			$("<div style='position:relative;width:100%;overflow:hidden'/>")
 				.appendTo(slotScroller);
 				
 		slotSegmentContainer =
-			$("<div style='position:absolute;z-index:8;top:0;left:0'/>")
-				.appendTo(slotContent);
+			$("<div class='fc-event-container' style='position:absolute;z-index:8;top:0;left:0'/>")
+				.appendTo(slotContainer);
 		
 		s =
 			"<table class='fc-agenda-slots' style='width:100%' cellspacing='0'>" +
@@ -3141,71 +3072,209 @@
 		s +=
 			"</tbody>" +
 			"</table>";
-		slotTable = $(s).appendTo(slotContent);
-		slotTableFirstInner = slotTable.find('div:first');
+		slotTable = $(s).appendTo(slotContainer);
 		
 		slotBind(slotTable.find('td'));
+	}
+
+
+
+	/* Build Day Table
+	-----------------------------------------------------------------------*/
+
+
+	function buildDayTable() {
+		var html = buildDayTableHTML();
+
+		if (dayTable) {
+			dayTable.remove();
+		}
+		dayTable = $(html).appendTo(element);
+
+		dayHead = dayTable.find('thead');
+		dayHeadCells = dayHead.find('th').slice(1, -1); // exclude gutter
+		dayBody = dayTable.find('tbody');
+		dayBodyCells = dayBody.find('td').slice(0, -1); // exclude gutter
+		dayBodyCellInners = dayBodyCells.find('> div');
+		dayBodyCellContentInners = dayBodyCells.find('.fc-day-content > div');
+
+		dayBodyFirstCell = dayBodyCells.eq(0);
+		dayBodyFirstCellStretcher = dayBodyCellInners.eq(0);
 		
-		axisFirstCells = axisFirstCells.add(slotTable.find('th:first'));
+		markFirstLast(dayHead.add(dayHead.find('tr')));
+		markFirstLast(dayBody.add(dayBody.find('tr')));
+
+		// TODO: now that we rebuild the cells every time, we should call dayRender
 	}
-	
-	
-	
-	function updateCells() {
-		var i;
-		var headCell;
-		var bodyCell;
+
+
+	function buildDayTableHTML() {
+		var html =
+			"<table style='width:100%' class='fc-agenda-days fc-border-separate' cellspacing='0'>" +
+			buildDayTableHeadHTML() +
+			buildDayTableBodyHTML() +
+			"</table>";
+
+		return html;
+	}
+
+
+	function buildDayTableHeadHTML() {
+		var headerClass = tm + "-widget-header";
 		var date;
-		var today = clearTime(new Date());
-		for (i=0; i<colCnt; i++) {
-			date = colDate(i);
-			headCell = dayHeadCells.eq(i);
-			headCell.html(formatDate(date, colFormat));
-			bodyCell = dayBodyCells.eq(i);
-			if (+date == +today) {
-				bodyCell.addClass(tm + '-state-highlight fc-today');
-			}else{
-				bodyCell.removeClass(tm + '-state-highlight fc-today');
+		var html = '';
+		var weekText;
+		var col;
+
+		html +=
+			"<thead>" +
+			"<tr>";
+
+		if (showWeekNumbers) {
+			date = cellToDate(0, 0);
+			weekText = formatDate(date, weekNumberFormat);
+			if (rtl) {
+				weekText += weekNumberTitle;
 			}
-			setDayID(headCell.add(bodyCell), date);
+			else {
+				weekText = weekNumberTitle + weekText;
+			}
+			html +=
+				"<th class='fc-agenda-axis fc-week-number " + headerClass + "'>" +
+				htmlEscape(weekText) +
+				"</th>";
 		}
-	}
-	
-	
-	
-	function setHeight(height, dateChanged) {
-		if (height === undefined) {
-			height = viewHeight;
+		else {
+			html += "<th class='fc-agenda-axis " + headerClass + "'>&nbsp;</th>";
 		}
-		viewHeight = height;
-		slotTopCache = {};
-	
-		var headHeight = dayBody.position().top;
-		var allDayHeight = slotScroller.position().top; // including divider
-		var bodyHeight = Math.min( // total body height, including borders
-			height - headHeight,   // when scrollbars
-			slotTable.height() + allDayHeight + 1 // when no scrollbars. +1 for bottom border
-		);
-		
-		dayBodyFirstCellStretcher
-			.height(bodyHeight - vsides(dayBodyFirstCell));
-		
-		slotLayer.css('top', headHeight);
-		
-		slotScroller.height(bodyHeight - allDayHeight - 1);
-		
-		slotHeight = slotTableFirstInner.height() + 1; // +1 for border
-		
-		if (dateChanged) {
-			resetScroll();
+
+		for (col=0; col<colCnt; col++) {
+			date = cellToDate(0, col);
+			html +=
+				"<th class='fc-" + dayIDs[date.getDay()] + " fc-col" + col + ' ' + headerClass + "'>" +
+				htmlEscape(formatDate(date, colFormat)) +
+				"</th>";
 		}
+
+		html +=
+			"<th class='fc-agenda-gutter " + headerClass + "'>&nbsp;</th>" +
+			"</tr>" +
+			"</thead>";
+
+		return html;
 	}
-	
-	
-	
+
+
+	function buildDayTableBodyHTML() {
+		var headerClass = tm + "-widget-header"; // TODO: make these when updateOptions() called
+		var contentClass = tm + "-widget-content";
+		var date;
+		var today = clearTime(new Date());
+		var col;
+		var cellsHTML;
+		var cellHTML;
+		var classNames;
+		var html = '';
+
+		html +=
+			"<tbody>" +
+			"<tr>" +
+			"<th class='fc-agenda-axis " + headerClass + "'>&nbsp;</th>";
+
+		cellsHTML = '';
+
+		for (col=0; col<colCnt; col++) {
+
+			date = cellToDate(0, col);
+
+			classNames = [
+				'fc-col' + col,
+				'fc-' + dayIDs[date.getDay()],
+				contentClass
+			];
+			if (+date == +today) {
+				classNames.push(
+					tm + '-state-highlight',
+					'fc-today'
+				);
+			}
+			else if (date < today) {
+				classNames.push('fc-past');
+			}
+			else {
+				classNames.push('fc-future');
+			}
+
+			cellHTML =
+				"<td class='" + classNames.join(' ') + "'>" +
+				"<div>" +
+				"<div class='fc-day-content'>" +
+				"<div style='position:relative'>&nbsp;</div>" +
+				"</div>" +
+				"</div>" +
+				"</td>";
+
+			cellsHTML += cellHTML;
+		}
+
+		html += cellsHTML;
+		html +=
+			"<td class='fc-agenda-gutter " + contentClass + "'>&nbsp;</td>" +
+			"</tr>" +
+			"</tbody>";
+
+		return html;
+	}
+
+
+	// TODO: data-date on the cells
+
+	
+	
+	/* Dimensions
+	-----------------------------------------------------------------------*/
+
+	
+	function setHeight(height) {
+		if (height === undefined) {
+			height = viewHeight;
+		}
+		viewHeight = height;
+		slotTopCache = {};
+	
+		var headHeight = dayBody.position().top;
+		var allDayHeight = slotScroller.position().top; // including divider
+		var bodyHeight = Math.min( // total body height, including borders
+			height - headHeight,   // when scrollbars
+			slotTable.height() + allDayHeight + 1 // when no scrollbars. +1 for bottom border
+		);
+
+		dayBodyFirstCellStretcher
+			.height(bodyHeight - vsides(dayBodyFirstCell));
+		
+		slotLayer.css('top', headHeight);
+		
+		slotScroller.height(bodyHeight - allDayHeight - 1);
+		
+		// the stylesheet guarantees that the first row has no border.
+		// this allows .height() to work well cross-browser.
+		slotHeight = slotTable.find('tr:first').height() + 1; // +1 for bottom border
+
+		snapRatio = opt('slotMinutes') / snapMinutes;
+		snapHeight = slotHeight / snapRatio;
+	}
+	
+	
 	function setWidth(width) {
 		viewWidth = width;
+		colPositions.clear();
 		colContentPositions.clear();
+
+		var axisFirstCells = dayHead.find('th:first');
+		if (allDayTable) {
+			axisFirstCells = axisFirstCells.add(allDayTable.find('th:first'));
+		}
+		axisFirstCells = axisFirstCells.add(slotTable.find('th:first'));
 		
 		axisWidth = 0;
 		setOuterWidth(
@@ -3217,8 +3286,12 @@
 			axisWidth
 		);
 		
+		var gutterCells = dayTable.find('.fc-agenda-gutter');
+		if (allDayTable) {
+			gutterCells = gutterCells.add(allDayTable.find('th.fc-agenda-gutter'));
+		}
+
 		var slotTableWidth = slotScroller[0].clientWidth; // needs to be done after axisWidth (for IE7)
-		//slotTable.width(slotTableWidth);
 		
 		gutterWidth = slotScroller.width() - slotTableWidth;
 		if (gutterWidth) {
@@ -3240,6 +3313,10 @@
 	
 
 
+	/* Scrolling
+	-----------------------------------------------------------------------*/
+
+
 	function resetScroll() {
 		var d0 = zeroDate();
 		var scrollDate = cloneDate(d0);
@@ -3251,15 +3328,10 @@
 		scroll();
 		setTimeout(scroll, 0); // overrides any previous scroll state made by the browser
 	}
-	
-	
-	function beforeHide() {
-		savedScrollTop = slotScroller.scrollTop();
-	}
-	
-	
-	function afterShow() {
-		slotScroller.scrollTop(savedScrollTop);
+
+
+	function afterRender() { // after the view has been freshly rendered and sized
+		resetScroll();
 	}
 	
 	
@@ -3283,7 +3355,7 @@
 	function slotClick(ev) {
 		if (!opt('selectable')) { // if selectable, SelectionManager will worry about dayClick
 			var col = Math.min(colCnt-1, Math.floor((ev.pageX - dayTable.offset().left - axisWidth) / colWidth));
-			var date = colDate(col);
+			var date = cellToDate(0, col);
 			var rowMatch = this.parentNode.className.match(/fc-slot(\d+)/); // TODO: maybe use data
 			if (rowMatch) {
 				var mins = parseInt(rowMatch[1]) * opt('slotMinutes');
@@ -3301,26 +3373,26 @@
 	
 	/* Semi-transparent Overlay Helpers
 	-----------------------------------------------------*/
-	
+	// TODO: should be consolidated with BasicView's methods
+
+
+	function renderDayOverlay(overlayStart, overlayEnd, refreshCoordinateGrid) { // overlayEnd is exclusive
 
-	function renderDayOverlay(startDate, endDate, refreshCoordinateGrid) { // endDate is exclusive
 		if (refreshCoordinateGrid) {
 			coordinateGrid.build();
 		}
-		var visStart = cloneDate(t.visStart);
-		var startCol, endCol;
-		if (rtl) {
-			startCol = dayDiff(endDate, visStart)*dis+dit+1;
-			endCol = dayDiff(startDate, visStart)*dis+dit+1;
-		}else{
-			startCol = dayDiff(startDate, visStart);
-			endCol = dayDiff(endDate, visStart);
-		}
-		startCol = Math.max(0, startCol);
-		endCol = Math.min(colCnt, endCol);
-		if (startCol < endCol) {
+
+		var segments = rangeToSegments(overlayStart, overlayEnd);
+
+		for (var i=0; i<segments.length; i++) {
+			var segment = segments[i];
 			dayBind(
-				renderCellOverlay(0, startCol, 0, endCol-1)
+				renderCellOverlay(
+					segment.row,
+					segment.leftCol,
+					segment.row,
+					segment.rightCol
+				)
 			);
 		}
 	}
@@ -3333,24 +3405,21 @@
 	
 
 	function renderSlotOverlay(overlayStart, overlayEnd) {
-		var dayStart = cloneDate(t.visStart);
-		var dayEnd = addDays(cloneDate(dayStart), 1);
 		for (var i=0; i<colCnt; i++) {
+			var dayStart = cellToDate(0, i);
+			var dayEnd = addDays(cloneDate(dayStart), 1);
 			var stretchStart = new Date(Math.max(dayStart, overlayStart));
 			var stretchEnd = new Date(Math.min(dayEnd, overlayEnd));
 			if (stretchStart < stretchEnd) {
-				var col = i*dis+dit;
-				var rect = coordinateGrid.rect(0, col, 0, col, slotContent); // only use it for horizontal coords
+				var rect = coordinateGrid.rect(0, i, 0, i, slotContainer); // only use it for horizontal coords
 				var top = timePosition(dayStart, stretchStart);
 				var bottom = timePosition(dayStart, stretchEnd);
 				rect.top = top;
 				rect.height = bottom - top;
 				slotBind(
-					renderOverlay(rect, slotContent)
+					renderOverlay(rect, slotContainer)
 				);
 			}
-			addDays(dayStart, 1);
-			addDays(dayEnd, 1);
 		}
 	}
 	
@@ -3377,16 +3446,16 @@
 			n = e.offset().top;
 			rows[0] = [n, n+e.outerHeight()];
 		}
-		var slotTableTop = slotContent.offset().top;
+		var slotTableTop = slotContainer.offset().top;
 		var slotScrollerTop = slotScroller.offset().top;
 		var slotScrollerBottom = slotScrollerTop + slotScroller.outerHeight();
 		function constrain(n) {
 			return Math.max(slotScrollerTop, Math.min(slotScrollerBottom, n));
 		}
-		for (var i=0; i<slotCnt; i++) {
+		for (var i=0; i<slotCnt*snapRatio; i++) { // adapt slot count to increased/decreased selection slot count
 			rows.push([
-				constrain(slotTableTop + slotHeight*i),
-				constrain(slotTableTop + slotHeight*(i+1))
+				constrain(slotTableTop + snapHeight*i),
+				constrain(slotTableTop + snapHeight*(i+1))
 			]);
 		}
 	});
@@ -3394,62 +3463,53 @@
 	
 	hoverListener = new HoverListener(coordinateGrid);
 	
+	colPositions = new HorizontalPositionCache(function(col) {
+		return dayBodyCellInners.eq(col);
+	});
 	
 	colContentPositions = new HorizontalPositionCache(function(col) {
-		return dayBodyCellInners.eq(col);
+		return dayBodyCellContentInners.eq(col);
 	});
 	
 	
+	function colLeft(col) {
+		return colPositions.left(col);
+	}
+
+
 	function colContentLeft(col) {
 		return colContentPositions.left(col);
 	}
+
+
+	function colRight(col) {
+		return colPositions.right(col);
+	}
 	
 	
 	function colContentRight(col) {
 		return colContentPositions.right(col);
 	}
-	
-	
-	
-	
-	function dateCell(date) { // "cell" terminology is now confusing
-		return {
-			row: Math.floor(dayDiff(date, t.visStart) / 7),
-			col: dayOfWeekCol(date.getDay())
-		};
+
+
+	function getIsCellAllDay(cell) {
+		return opt('allDaySlot') && !cell.row;
 	}
-	
-	
-	function cellDate(cell) {
-		var d = colDate(cell.col);
+
+
+	function realCellToDate(cell) { // ugh "real" ... but blame it on our abuse of the "cell" system
+		var d = cellToDate(0, cell.col);
 		var slotIndex = cell.row;
 		if (opt('allDaySlot')) {
 			slotIndex--;
 		}
 		if (slotIndex >= 0) {
-			addMinutes(d, minMinute + slotIndex * opt('slotMinutes'));
+			addMinutes(d, minMinute + slotIndex * snapMinutes);
 		}
 		return d;
 	}
 	
 	
-	function colDate(col) { // returns dates with 00:00:00
-		return addDays(cloneDate(t.visStart), col*dis+dit);
-	}
-	
-	
-	function cellIsAllDay(cell) {
-		return opt('allDaySlot') && !cell.row;
-	}
-	
-	
-	function dayOfWeekCol(dayOfWeek) {
-		return ((dayOfWeek - Math.max(firstDay, nwe) + colCnt) % colCnt)*dis+dit;
-	}
-	
-	
-	
-	
 	// get the Y coordinate of the given time on the given day (both Date objects)
 	function timePosition(day, time) { // both date objects. day holds 00:00 of current day
 		day = cloneDate(day, true);
@@ -3464,7 +3524,11 @@
 			slotI = Math.floor(minutes / slotMinutes),
 			slotTop = slotTopCache[slotI];
 		if (slotTop === undefined) {
-			slotTop = slotTopCache[slotI] = slotTable.find('tr:eq(' + slotI + ') td div')[0].offsetTop; //.position().top; // need this optimization???
+			slotTop = slotTopCache[slotI] =
+				slotTable.find('tr').eq(slotI).find('td div')[0].offsetTop;
+				// .eq() is faster than ":eq()" selector
+				// [0].offsetTop is faster than .position().top (do we really need this optimization?)
+				// a better optimization would be to cache all these divs
 		}
 		return Math.max(0, Math.round(
 			slotTop - 1 + slotHeight * ((minutes % slotMinutes) / slotMinutes)
@@ -3472,14 +3536,6 @@
 	}
 	
 	
-	function allDayBounds() {
-		return {
-			left: axisWidth,
-			right: viewWidth - gutterWidth
-		}
-	}
-	
-	
 	function getAllDayRow(index) {
 		return allDayRow;
 	}
@@ -3522,9 +3578,9 @@
 		var helperOption = opt('selectHelper');
 		coordinateGrid.build();
 		if (helperOption) {
-			var col = dayDiff(startDate, t.visStart) * dis + dit;
+			var col = dateToCell(startDate).col;
 			if (col >= 0 && col < colCnt) { // only works when times are on same day
-				var rect = coordinateGrid.rect(0, col, 0, col, slotContent); // only for horizontal coords
+				var rect = coordinateGrid.rect(0, col, 0, col, slotContainer); // only for horizontal coords
 				var top = timePosition(startDate, startDate);
 				var bottom = timePosition(startDate, endDate);
 				if (bottom > top) { // protect against selections that are entirely before or after visible range
@@ -3536,10 +3592,9 @@
 						var helperRes = helperOption(startDate, endDate);
 						if (helperRes) {
 							rect.position = 'absolute';
-							rect.zIndex = 8;
 							selectionHelper = $(helperRes)
 								.css(rect)
-								.appendTo(slotContent);
+								.appendTo(slotContainer);
 						}
 					}else{
 						rect.isStart = true; // conside rect a "seg" now
@@ -3558,7 +3613,7 @@
 					}
 					if (selectionHelper) {
 						slotBind(selectionHelper);
-						slotContent.append(selectionHelper);
+						slotContainer.append(selectionHelper);
 						setOuterWidth(selectionHelper, rect.width, true); // needs to be after appended
 						setOuterHeight(selectionHelper, rect.height, true);
 					}
@@ -3585,15 +3640,15 @@
 			var dates, helperOption = opt('selectHelper');
 			hoverListener.start(function(cell, origCell) {
 				clearSelection();
-				if (cell && (cell.col == origCell.col || !helperOption) && !cellIsAllDay(cell)) {
-					var d1 = cellDate(origCell);
-					var d2 = cellDate(cell);
+				if (cell && (cell.col == origCell.col || !helperOption) && !getIsCellAllDay(cell)) {
+					var d1 = realCellToDate(origCell);
+					var d2 = realCellToDate(cell);
 					dates = [
 						d1,
-						addMinutes(cloneDate(d1), opt('slotMinutes')),
+						addMinutes(cloneDate(d1), snapMinutes), // calculate minutes depending on selection slot minutes 
 						d2,
-						addMinutes(cloneDate(d2), opt('slotMinutes'))
-					].sort(cmp);
+						addMinutes(cloneDate(d2), snapMinutes)
+					].sort(dateCompare);
 					renderSlotSelection(dates[0], dates[3]);
 				}else{
 					dates = null;
@@ -3610,10 +3665,10 @@
 			});
 		}
 	}
-	
-	
+
+
 	function reportDayClick(date, allDay, ev) {
-		trigger('dayClick', dayBodyCells[dayOfWeekCol(date.getDay())], date, allDay, ev);
+		trigger('dayClick', dayBodyCells[dateToCell(date).col], date, allDay, ev);
 	}
 	
 	
@@ -3626,10 +3681,10 @@
 		hoverListener.start(function(cell) {
 			clearOverlays();
 			if (cell) {
-				if (cellIsAllDay(cell)) {
+				if (getIsCellAllDay(cell)) {
 					renderCellOverlay(cell.row, cell.col, cell.row, cell.col);
 				}else{
-					var d1 = cellDate(cell);
+					var d1 = realCellToDate(cell);
 					var d2 = addMinutes(cloneDate(d1), opt('defaultEventMinutes'));
 					renderSlotOverlay(d1, d2);
 				}
@@ -3642,35 +3697,32 @@
 		var cell = hoverListener.stop();
 		clearOverlays();
 		if (cell) {
-			trigger('drop', _dragElement, cellDate(cell), cellIsAllDay(cell), ev, ui);
+			trigger('drop', _dragElement, realCellToDate(cell), getIsCellAllDay(cell), ev, ui);
 		}
 	}
-
+	
 
 }
 
+;;
+
 function AgendaEventRenderer() {
 	var t = this;
 	
 	
 	// exports
 	t.renderEvents = renderEvents;
-	t.compileDaySegs = compileDaySegs; // for DayEventRenderer
 	t.clearEvents = clearEvents;
 	t.slotSegHtml = slotSegHtml;
-	t.bindDaySeg = bindDaySeg;
 	
 	
 	// imports
 	DayEventRenderer.call(t);
 	var opt = t.opt;
 	var trigger = t.trigger;
-	//var setOverflowHidden = t.setOverflowHidden;
 	var isEventDraggable = t.isEventDraggable;
 	var isEventResizable = t.isEventResizable;
 	var eventEnd = t.eventEnd;
-	var reportEvents = t.reportEvents;
-	var reportEventClear = t.reportEventClear;
 	var eventElementHandlers = t.eventElementHandlers;
 	var setHeight = t.setHeight;
 	var getDaySegmentContainer = t.getDaySegmentContainer;
@@ -3679,14 +3731,15 @@
 	var getMaxMinute = t.getMaxMinute;
 	var getMinMinute = t.getMinMinute;
 	var timePosition = t.timePosition;
+	var getIsCellAllDay = t.getIsCellAllDay;
 	var colContentLeft = t.colContentLeft;
 	var colContentRight = t.colContentRight;
-	var renderDaySegs = t.renderDaySegs;
-	var resizableDayEvent = t.resizableDayEvent; // TODO: streamline binding architecture
+	var cellToDate = t.cellToDate;
 	var getColCnt = t.getColCnt;
 	var getColWidth = t.getColWidth;
-	var getSlotHeight = t.getSlotHeight;
-	var getBodyContent = t.getBodyContent;
+	var getSnapHeight = t.getSnapHeight;
+	var getSnapMinutes = t.getSnapMinutes;
+	var getSlotContainer = t.getSlotContainer;
 	var reportEventElement = t.reportEventElement;
 	var showEvents = t.showEvents;
 	var hideEvents = t.hideEvents;
@@ -3694,19 +3747,22 @@
 	var eventResize = t.eventResize;
 	var renderDayOverlay = t.renderDayOverlay;
 	var clearOverlays = t.clearOverlays;
+	var renderDayEvents = t.renderDayEvents;
 	var calendar = t.calendar;
 	var formatDate = calendar.formatDate;
 	var formatDates = calendar.formatDates;
 	var timeLineInterval;
 	
 	
+	// overrides
+	t.draggableDayEvent = draggableDayEvent;
+	
 	
 	/* Rendering
 	----------------------------------------------------------------------------*/
 	
 
 	function renderEvents(events, modifiedEventId) {
-		reportEvents(events);
 		var i, len=events.length,
 			dayEvents=[],
 			slotEvents=[];
@@ -3717,10 +3773,12 @@
 				slotEvents.push(events[i]);
 			}
 		}
+
 		if (opt('allDaySlot')) {
-			renderDaySegs(compileDaySegs(dayEvents), modifiedEventId);
+			renderDayEvents(dayEvents, modifiedEventId);
 			setHeight(); // no params means set to viewHeight
 		}
+
 		renderSlotSegs(compileSlotSegs(slotEvents), modifiedEventId);
 		
 		if (opt('currentTimeIndicator')) {
@@ -3732,58 +3790,85 @@
 	
 	
 	function clearEvents() {
-		reportEventClear();
 		getDaySegmentContainer().empty();
 		getSlotSegmentContainer().empty();
 	}
-	
-	
-	function compileDaySegs(events) {
-		var levels = stackSegs(sliceSegs(events, $.map(events, exclEndDay), t.visStart, t.visEnd)),
-			i, levelCnt=levels.length, level,
-			j, seg,
-			segs=[];
-		for (i=0; i<levelCnt; i++) {
-			level = levels[i];
-			for (j=0; j<level.length; j++) {
-				seg = level[j];
-				seg.row = 0;
-				seg.level = i; // not needed anymore
-				segs.push(seg);
-			}
-		}
-		return segs;
-	}
-	
+
 	
 	function compileSlotSegs(events) {
 		var colCnt = getColCnt(),
 			minMinute = getMinMinute(),
 			maxMinute = getMaxMinute(),
-			d = addMinutes(cloneDate(t.visStart), minMinute),
+			d,
 			visEventEnds = $.map(events, slotEventEnd),
-			i, col,
-			j, level,
-			k, seg,
-			segs=[];
+			i,
+			j, seg,
+			colSegs,
+			segs = [];
+
 		for (i=0; i<colCnt; i++) {
-			col = stackSegs(sliceSegs(events, visEventEnds, d, addMinutes(cloneDate(d), maxMinute-minMinute)));
-			countForwardSegs(col);
-			for (j=0; j<col.length; j++) {
-				level = col[j];
-				for (k=0; k<level.length; k++) {
-					seg = level[k];
-					seg.col = i;
-					seg.level = j;
-					segs.push(seg);
-				}
+
+			d = cellToDate(0, i);
+			addMinutes(d, minMinute);
+
+			colSegs = sliceSegs(
+				events,
+				visEventEnds,
+				d,
+				addMinutes(cloneDate(d), maxMinute-minMinute)
+			);
+
+			colSegs = placeSlotSegs(colSegs); // returns a new order
+
+			for (j=0; j<colSegs.length; j++) {
+				seg = colSegs[j];
+				seg.col = i;
+				segs.push(seg);
 			}
-			addDays(d, 1, true);
 		}
+
 		return segs;
 	}
-	
-	
+
+
+	function sliceSegs(events, visEventEnds, start, end) {
+		var segs = [],
+			i, len=events.length, event,
+			eventStart, eventEnd,
+			segStart, segEnd,
+			isStart, isEnd;
+		for (i=0; i<len; i++) {
+			event = events[i];
+			eventStart = event.start;
+			eventEnd = visEventEnds[i];
+			if (eventEnd > start && eventStart < end) {
+				if (eventStart < start) {
+					segStart = cloneDate(start);
+					isStart = false;
+				}else{
+					segStart = eventStart;
+					isStart = true;
+				}
+				if (eventEnd > end) {
+					segEnd = cloneDate(end);
+					isEnd = false;
+				}else{
+					segEnd = eventEnd;
+					isEnd = true;
+				}
+				segs.push({
+					event: event,
+					start: segStart,
+					end: segEnd,
+					isStart: isStart,
+					isEnd: isEnd
+				});
+			}
+		}
+		return segs.sort(compareSlotSegs);
+	}
+
+
 	function slotEventEnd(event) {
 		if (event.end) {
 			return cloneDate(event.end);
@@ -3794,39 +3879,30 @@
 	
 	
 	// renders events in the 'time slots' at the bottom
+	// TODO: when we refactor this, when user returns `false` eventRender, don't have empty space
+	// TODO: refactor will include using pixels to detect collisions instead of dates (handy for seg cmp)
 	
 	function renderSlotSegs(segs, modifiedEventId) {
 	
 		var i, segCnt=segs.length, seg,
 			event,
-			classes,
-			top, bottom,
-			colI, levelI, forward,
-			leftmost,
-			availWidth,
-			outerWidth,
+			top,
+			bottom,
+			columnLeft,
+			columnRight,
+			columnWidth,
+			width,
 			left,
-			html='',
+			right,
+			html = '',
 			eventElements,
 			eventElement,
 			triggerRes,
-			vsideCache={},
-			hsideCache={},
-			key, val,
 			contentElement,
 			height,
 			slotSegmentContainer = getSlotSegmentContainer(),
-			rtl, dis, dit,
-			colCnt = getColCnt(),
-			overlapping = colCnt > 1;
-			
-		if (rtl = opt('isRTL')) {
-			dis = -1;
-			dit = colCnt - 1;
-		}else{
-			dis = 1;
-			dit = 0;
-		}
+			isRTL = opt('isRTL'),
+			colCnt = getColCnt();
 			
 		// calculate position/dimensions, create html
 		for (i=0; i<segCnt; i++) {
@@ -3834,36 +3910,49 @@
 			event = seg.event;
 			top = timePosition(seg.start, seg.start);
 			bottom = timePosition(seg.start, seg.end);
-			colI = seg.col;
-			levelI = seg.level;
-			forward = seg.forward || 0;
-			leftmost = colContentLeft(colI*dis + dit);
-			availWidth = colContentRight(colI*dis + dit) - leftmost;
-			availWidth = Math.min(availWidth-6, availWidth*.95); // TODO: move this to CSS
-			if (levelI) {
-				// indented and thin
-				outerWidth = availWidth / (levelI + forward + 1);
-			}else{
-				if (forward) {
-					if (overlapping) {	// moderately wide, aligned left still
-						outerWidth = ((availWidth / (forward + 1)) - (12/2)) * 2; // 12 is the predicted width of resizer =
-					}else{
-						outerWidth = outerWidth = availWidth / (forward + 1);
-					}
-				}else{
-					// can be entire width, aligned left
-					outerWidth = availWidth;
-				}
+			columnLeft = colContentLeft(seg.col);
+			columnRight = colContentRight(seg.col);
+			columnWidth = columnRight - columnLeft;
+
+			// shave off space on right near scrollbars (2.5%)
+			// TODO: move this to CSS somehow
+			columnRight -= columnWidth * .025;
+			columnWidth = columnRight - columnLeft;
+
+			width = columnWidth * (seg.forwardCoord - seg.backwardCoord);
+
+			// bruederli@kolabsys.com: always disable slotEventOverlap in single day view
+			if (opt('slotEventOverlap') && colCnt > 1) {
+				// double the width while making sure resize handle is visible
+				// (assumed to be 20px wide)
+				width = Math.max(
+					(width - (20/2)) * 2,
+					width // narrow columns will want to make the segment smaller than
+						// the natural width. don't allow it
+				);
 			}
-			left = leftmost +                                  // leftmost possible
-				(availWidth / (levelI + forward + 1) * levelI) // indentation
-				* dis + (rtl ? availWidth - outerWidth : 0);   // rtl
+
+			if (isRTL) {
+				right = columnRight - seg.backwardCoord * columnWidth;
+				left = right - width;
+			}
+			else {
+				left = columnLeft + seg.backwardCoord * columnWidth;
+				right = left + width;
+			}
+
+			// make sure horizontal coordinates are in bounds
+			left = Math.max(left, columnLeft);
+			right = Math.min(right, columnRight);
+			width = right - left;
+
 			seg.top = top;
 			seg.left = left;
-			seg.outerWidth = outerWidth - (overlapping ? 0 : 1);
+			seg.outerWidth = width;
 			seg.outerHeight = bottom - top;
 			html += slotSegHtml(event, seg);
 		}
+
 		slotSegmentContainer[0].innerHTML = html; // faster than html()
 		eventElements = slotSegmentContainer.children();
 		
@@ -3902,11 +3991,9 @@
 		for (i=0; i<segCnt; i++) {
 			seg = segs[i];
 			if (eventElement = seg.element) {
-				val = vsideCache[key = seg.key = cssKey(eventElement[0])];
-				seg.vsides = val === undefined ? (vsideCache[key] = vsides(eventElement, true)) : val;
-				val = hsideCache[key];
-				seg.hsides = val === undefined ? (hsideCache[key] = hsides(eventElement, true)) : val;
-				contentElement = eventElement.find('div.fc-event-content');
+				seg.vsides = vsides(eventElement, true);
+				seg.hsides = hsides(eventElement, true);
+				contentElement = eventElement.find('.fc-event-content');
 				if (contentElement.length) {
 					seg.contentTop = contentElement[0].offsetTop;
 				}
@@ -3922,7 +4009,7 @@
 				eventElement[0].style.height = height + 'px';
 				event = seg.event;
 				if (seg.contentTop !== undefined && height - seg.contentTop < 10) {
-					// not enough room for title, put it in the time header
+					// not enough room for title, put it in the time (TODO: maybe make both display:inline instead)
 					eventElement.find('div.fc-event-time')
 						.text(formatDate(event.start, opt('timeFormat')) + ' - ' + event.title);
 					eventElement.find('div.fc-event-title')
@@ -3945,10 +4032,10 @@
 			classes.push('fc-event-draggable');
 		}
 		if (seg.isStart) {
-			classes.push('fc-corner-top');
+			classes.push('fc-event-start');
 		}
 		if (seg.isEnd) {
-			classes.push('fc-corner-bottom');
+			classes.push('fc-event-end');
 		}
 		classes = classes.concat(event.className);
 		if (event.source) {
@@ -3961,8 +4048,14 @@
 		}
 		html +=
 			" class='" + classes.join(' ') + "'" +
-			" style='position:absolute;z-index:8;top:" + seg.top + "px;left:" + seg.left + "px;" + skinCss + "'" +
-			">" +
+			" style=" +
+				"'" +
+				"position:absolute;" +
+				"top:" + seg.top + "px;" +
+				"left:" + seg.left + "px;" +
+				skinCss +
+				"'" +
+			" tabindex='0'>" +
 			"<div class='fc-event-inner fc-event-skin'" + skinCssAttr + ">" +
 			"<div class='fc-event-head fc-event-skin'" + skinCssAttr + ">" +
 			"<div class='fc-event-time'>" +
@@ -3971,14 +4064,14 @@
 			"</div>" +
 			"<div class='fc-event-content'>" +
 			"<div class='fc-event-title'>" +
-			htmlEscape(event.title) +
+			htmlEscape(event.title || '') +
 			"</div>" +
 			"</div>" +
 			"<div class='fc-event-bg'></div>" +
 			"</div>"; // close inner
 		if (seg.isEnd && isEventResizable(event)) {
 			html +=
-				"<div class='ui-resizable-handle ui-resizable-s'>=</div>";
+				"<div class='ui-resizable-handle ui-resizable-s' role='presentation'>=</div>";
 		}
 		html +=
 			"</" + (url ? "a" : "div") + ">";
@@ -3986,18 +4079,6 @@
 	}
 	
 	
-	function bindDaySeg(event, eventElement, seg) {
-		if (isEventDraggable(event)) {
-			draggableDayEvent(event, eventElement, seg.isStart);
-		}
-		if (seg.isEnd && isEventResizable(event)) {
-			resizableDayEvent(event, eventElement, seg);
-		}
-		eventElementHandlers(event, eventElement);
-			// needs to be after, because resizableDayEvent might stopImmediatePropagation on click
-	}
-	
-	
 	function bindSlotSeg(event, eventElement, seg) {
 		var timeElement = eventElement.find('div.fc-event-time');
 		if (isEventDraggable(event)) {
@@ -4013,7 +4094,7 @@
 	// draw a horizontal line indicating the current time (#143)
 	function setTimeIndicator()
 	{
-		var container = getBodyContent();
+		var container = getSlotContainer();
 		var timeline = container.children('.fc-timeline');
 		if (timeline.length == 0) { // if timeline isn't there, add it
 			timeline = $('<hr>').addClass('fc-timeline').appendTo(container);
@@ -4047,31 +4128,34 @@
 	
 	
 	// when event starts out FULL-DAY
+	// overrides DayEventRenderer's version because it needs to account for dragging elements
+	// to and from the slot area.
 	
-	function draggableDayEvent(event, eventElement, isStart) {
+	function draggableDayEvent(event, eventElement, seg) {
+		var isStart = seg.isStart;
 		var origWidth;
 		var revert;
-		var allDay=true;
+		var allDay = true;
 		var dayDelta;
-		var dis = opt('isRTL') ? -1 : 1;
 		var hoverListener = getHoverListener();
 		var colWidth = getColWidth();
-		var slotHeight = getSlotHeight();
+		var snapHeight = getSnapHeight();
+		var snapMinutes = getSnapMinutes();
 		var minMinute = getMinMinute();
 		eventElement.draggable({
-			zIndex: 9,
 			opacity: opt('dragOpacity', 'month'), // use whatever the month view was using
 			revertDuration: opt('dragRevertDuration'),
 			start: function(ev, ui) {
 				trigger('eventDragStart', eventElement, event, ev, ui);
 				hideEvents(event, eventElement);
 				origWidth = eventElement.width();
-				hoverListener.start(function(cell, origCell, rowDelta, colDelta) {
+				hoverListener.start(function(cell, origCell) {
 					clearOverlays();
 					if (cell) {
-						//setOverflowHidden(true);
 						revert = false;
-						dayDelta = colDelta * dis;
+						var origDate = cellToDate(0, origCell.col);
+						var date = cellToDate(0, cell.col);
+						dayDelta = dayDiff(date, origDate);
 						if (!cell.row) {
 							// on full-days
 							renderDayOverlay(
@@ -4087,9 +4171,9 @@
 									eventElement.width(colWidth - 10); // don't use entire width
 									setOuterHeight(
 										eventElement,
-										slotHeight * Math.round(
-											(event.end ? ((event.end - event.start) / MINUTE_MS) : opt('defaultEventMinutes'))
-											/ opt('slotMinutes')
+										snapHeight * Math.round(
+											(event.end ? ((event.end - event.start) / MINUTE_MS) : opt('defaultEventMinutes')) /
+												snapMinutes
 										)
 									);
 									eventElement.draggable('option', 'grid', [colWidth, 1]);
@@ -4102,7 +4186,6 @@
 						revert = revert || (allDay && !dayDelta);
 					}else{
 						resetElement();
-						//setOverflowHidden(false);
 						revert = true;
 					}
 					eventElement.draggable('option', 'revert', revert);
@@ -4121,14 +4204,13 @@
 					// changed!
 					var minuteDelta = 0;
 					if (!allDay) {
-						minuteDelta = Math.round((eventElement.offset().top - getBodyContent().offset().top) / slotHeight)
-							* opt('slotMinutes')
+						minuteDelta = Math.round((eventElement.offset().top - getSlotContainer().offset().top) / snapHeight)
+							* snapMinutes
 							+ minMinute
 							- (event.start.getHours() * 60 + event.start.getMinutes());
 					}
 					eventDrop(this, event, dayDelta, minuteDelta, allDay, ev, ui);
 				}
-				//setOverflowHidden(false);
 			}
 		});
 		function resetElement() {
@@ -4146,94 +4228,156 @@
 	// when event starts out IN TIMESLOTS
 	
 	function draggableSlotEvent(event, eventElement, timeElement) {
-		var origPosition;
-		var allDay=false;
-		var dayDelta;
-		var minuteDelta;
-		var prevMinuteDelta;
-		var dis = opt('isRTL') ? -1 : 1;
-		var hoverListener = getHoverListener();
+		var coordinateGrid = t.getCoordinateGrid();
 		var colCnt = getColCnt();
 		var colWidth = getColWidth();
-		var slotHeight = getSlotHeight();
+		var snapHeight = getSnapHeight();
+		var snapMinutes = getSnapMinutes();
+
+		// states
+		var origPosition; // original position of the element, not the mouse
+		var origCell;
+		var isInBounds, prevIsInBounds;
+		var isAllDay, prevIsAllDay;
+		var colDelta, prevColDelta;
+		var dayDelta; // derived from colDelta
+		var minuteDelta, prevMinuteDelta;
+
 		eventElement.draggable({
-			zIndex: 9,
 			scroll: false,
-			grid: [colWidth, slotHeight],
+			grid: [ colWidth, snapHeight ],
 			axis: colCnt==1 ? 'y' : false,
 			opacity: opt('dragOpacity'),
 			revertDuration: opt('dragRevertDuration'),
 			start: function(ev, ui) {
+
 				trigger('eventDragStart', eventElement, event, ev, ui);
 				hideEvents(event, eventElement);
+
+				coordinateGrid.build();
+
+				// initialize states
 				origPosition = eventElement.position();
+				origCell = coordinateGrid.cell(ev.pageX, ev.pageY);
+				isInBounds = prevIsInBounds = true;
+				isAllDay = prevIsAllDay = getIsCellAllDay(origCell);
+				colDelta = prevColDelta = 0;
+				dayDelta = 0;
 				minuteDelta = prevMinuteDelta = 0;
-				hoverListener.start(function(cell, origCell, rowDelta, colDelta) {
-					eventElement.draggable('option', 'revert', !cell);
-					clearOverlays();
-					if (cell) {
-						dayDelta = colDelta * dis;
-						if (opt('allDaySlot') && !cell.row) {
-							// over full days
-							if (!allDay) {
-								// convert to temporary all-day event
-								allDay = true;
-								timeElement.hide();
-								eventElement.draggable('option', 'grid', null);
-							}
-							renderDayOverlay(
-								addDays(cloneDate(event.start), dayDelta),
-								addDays(exclEndDay(event), dayDelta)
-							);
-						}else{
-							// on slots
-							resetElement();
-						}
-					}
-				}, ev, 'drag');
+
 			},
 			drag: function(ev, ui) {
-				minuteDelta = Math.round((ui.position.top - origPosition.top) / slotHeight) * opt('slotMinutes');
-				if (minuteDelta != prevMinuteDelta) {
-					if (!allDay) {
-						updateTimeText(minuteDelta);
+
+				// NOTE: this `cell` value is only useful for determining in-bounds and all-day.
+				// Bad for anything else due to the discrepancy between the mouse position and the
+				// element position while snapping. (problem revealed in PR #55)
+				//
+				// PS- the problem exists for draggableDayEvent() when dragging an all-day event to a slot event.
+				// We should overhaul the dragging system and stop relying on jQuery UI.
+				var cell = coordinateGrid.cell(ev.pageX, ev.pageY);
+
+				// update states
+				isInBounds = !!cell;
+				if (isInBounds) {
+					isAllDay = getIsCellAllDay(cell);
+
+					// calculate column delta
+					colDelta = Math.round((ui.position.left - origPosition.left) / colWidth);
+					if (colDelta != prevColDelta) {
+						// calculate the day delta based off of the original clicked column and the column delta
+						var origDate = cellToDate(0, origCell.col);
+						var col = origCell.col + colDelta;
+						col = Math.max(0, col);
+						col = Math.min(colCnt-1, col);
+						var date = cellToDate(0, col);
+						dayDelta = dayDiff(date, origDate);
 					}
+
+					// calculate minute delta (only if over slots)
+					if (!isAllDay) {
+						minuteDelta = Math.round((ui.position.top - origPosition.top) / snapHeight) * snapMinutes;
+					}
+				}
+
+				// any state changes?
+				if (
+					isInBounds != prevIsInBounds ||
+					isAllDay != prevIsAllDay ||
+					colDelta != prevColDelta ||
+					minuteDelta != prevMinuteDelta
+				) {
+
+					updateUI();
+
+					// update previous states for next time
+					prevIsInBounds = isInBounds;
+					prevIsAllDay = isAllDay;
+					prevColDelta = colDelta;
 					prevMinuteDelta = minuteDelta;
 				}
+
+				// if out-of-bounds, revert when done, and vice versa.
+				eventElement.draggable('option', 'revert', !isInBounds);
+
 			},
 			stop: function(ev, ui) {
-				var cell = hoverListener.stop();
+
 				clearOverlays();
 				trigger('eventDragStop', eventElement, event, ev, ui);
-				if (cell && (dayDelta || minuteDelta || allDay)) {
-					// changed!
-					eventDrop(this, event, dayDelta, allDay ? 0 : minuteDelta, allDay, ev, ui);
-				}else{
-					// either no change or out-of-bounds (draggable has already reverted)
-					resetElement();
+
+				if (isInBounds && (isAllDay || dayDelta || minuteDelta)) { // changed!
+					eventDrop(this, event, dayDelta, isAllDay ? 0 : minuteDelta, isAllDay, ev, ui);
+				}
+				else { // either no change or out-of-bounds (draggable has already reverted)
+
+					// reset states for next time, and for updateUI()
+					isInBounds = true;
+					isAllDay = false;
+					colDelta = 0;
+					dayDelta = 0;
+					minuteDelta = 0;
+
+					updateUI();
 					eventElement.css('filter', ''); // clear IE opacity side-effects
-					eventElement.css(origPosition); // sometimes fast drags make event revert to wrong position
-					updateTimeText(0);
+
+					// sometimes fast drags make event revert to wrong position, so reset.
+					// also, if we dragged the element out of the area because of snapping,
+					// but the *mouse* is still in bounds, we need to reset the position.
+					eventElement.css(origPosition);
+
 					showEvents(event, eventElement);
 				}
 			}
 		});
-		function updateTimeText(minuteDelta) {
-			var newStart = addMinutes(cloneDate(event.start), minuteDelta);
-			var newEnd;
-			if (event.end) {
-				newEnd = addMinutes(cloneDate(event.end), minuteDelta);
-			}
-			timeElement.text(formatDates(newStart, newEnd, opt('timeFormat')));
-		}
-		function resetElement() {
-			// convert back to original slot-event
-			if (allDay) {
-				timeElement.css('display', ''); // show() was causing display=inline
-				eventElement.draggable('option', 'grid', [colWidth, slotHeight]);
-				allDay = false;
+
+		function updateUI() {
+			clearOverlays();
+			if (isInBounds) {
+				if (isAllDay) {
+					timeElement.hide();
+					eventElement.draggable('option', 'grid', null); // disable grid snapping
+					renderDayOverlay(
+						addDays(cloneDate(event.start), dayDelta),
+						addDays(exclEndDay(event), dayDelta)
+					);
+				}
+				else {
+					updateTimeText(minuteDelta);
+					timeElement.css('display', ''); // show() was causing display=inline
+					eventElement.draggable('option', 'grid', [colWidth, snapHeight]); // re-enable grid snapping
+				}
+			}
+		}
+
+		function updateTimeText(minuteDelta) {
+			var newStart = addMinutes(cloneDate(event.start), minuteDelta);
+			var newEnd;
+			if (event.end) {
+				newEnd = addMinutes(cloneDate(event.end), minuteDelta);
 			}
+			timeElement.text(formatDates(newStart, newEnd, opt('timeFormat')));
 		}
+
 	}
 	
 	
@@ -4243,40 +4387,39 @@
 	
 	
 	function resizableSlotEvent(event, eventElement, timeElement) {
-		var slotDelta, prevSlotDelta;
-		var slotHeight = getSlotHeight();
+		var snapDelta, prevSnapDelta;
+		var snapHeight = getSnapHeight();
+		var snapMinutes = getSnapMinutes();
 		eventElement.resizable({
 			handles: {
-				s: 'div.ui-resizable-s'
+				s: '.ui-resizable-handle'
 			},
-			grid: slotHeight,
+			grid: snapHeight,
 			start: function(ev, ui) {
-				slotDelta = prevSlotDelta = 0;
+				snapDelta = prevSnapDelta = 0;
 				hideEvents(event, eventElement);
-				eventElement.css('z-index', 9);
 				trigger('eventResizeStart', this, event, ev, ui);
 			},
 			resize: function(ev, ui) {
 				// don't rely on ui.size.height, doesn't take grid into account
-				slotDelta = Math.round((Math.max(slotHeight, eventElement.height()) - ui.originalSize.height) / slotHeight);
-				if (slotDelta != prevSlotDelta) {
+				snapDelta = Math.round((Math.max(snapHeight, eventElement.height()) - ui.originalSize.height) / snapHeight);
+				if (snapDelta != prevSnapDelta) {
 					timeElement.text(
 						formatDates(
 							event.start,
-							(!slotDelta && !event.end) ? null : // no change, so don't display time range
-								addMinutes(eventEnd(event), opt('slotMinutes')*slotDelta),
+							(!snapDelta && !event.end) ? null : // no change, so don't display time range
+								addMinutes(eventEnd(event), snapMinutes*snapDelta),
 							opt('timeFormat')
 						)
 					);
-					prevSlotDelta = slotDelta;
+					prevSnapDelta = snapDelta;
 				}
 			},
 			stop: function(ev, ui) {
 				trigger('eventResizeStop', this, event, ev, ui);
-				if (slotDelta) {
-					eventResize(this, event, 0, opt('slotMinutes')*slotDelta, ev, ui);
+				if (snapDelta) {
+					eventResize(this, event, 0, snapMinutes*snapDelta, ev, ui);
 				}else{
-					eventElement.css('z-index', 8);
 					showEvents(event, eventElement);
 					// BUG: if event was really short, need to put title back in span
 				}
@@ -4288,1630 +4431,2403 @@
 }
 
 
-function countForwardSegs(levels) {
-	var i, j, k, level, segForward, segBack;
-	for (i=levels.length-1; i>0; i--) {
+
+/* Agenda Event Segment Utilities
+-----------------------------------------------------------------------------*/
+
+
+// Sets the seg.backwardCoord and seg.forwardCoord on each segment and returns a new
+// list in the order they should be placed into the DOM (an implicit z-index).
+function placeSlotSegs(segs) {
+	var levels = buildSlotSegLevels(segs);
+	var level0 = levels[0];
+	var i;
+
+	computeForwardSlotSegs(levels);
+
+	if (level0) {
+
+		for (i=0; i<level0.length; i++) {
+			computeSlotSegPressures(level0[i]);
+		}
+
+		for (i=0; i<level0.length; i++) {
+			computeSlotSegCoords(level0[i], 0, 0);
+		}
+	}
+
+	return flattenSlotSegLevels(levels);
+}
+
+
+// Builds an array of segments "levels". The first level will be the leftmost tier of segments
+// if the calendar is left-to-right, or the rightmost if the calendar is right-to-left.
+function buildSlotSegLevels(segs) {
+	var levels = [];
+	var i, seg;
+	var j;
+
+	for (i=0; i<segs.length; i++) {
+		seg = segs[i];
+
+		// go through all the levels and stop on the first level where there are no collisions
+		for (j=0; j<levels.length; j++) {
+			if (!computeSlotSegCollisions(seg, levels[j]).length) {
+				break;
+			}
+		}
+
+		(levels[j] || (levels[j] = [])).push(seg);
+	}
+
+	return levels;
+}
+
+
+// For every segment, figure out the other segments that are in subsequent
+// levels that also occupy the same vertical space. Accumulate in seg.forwardSegs
+function computeForwardSlotSegs(levels) {
+	var i, level;
+	var j, seg;
+	var k;
+
+	for (i=0; i<levels.length; i++) {
 		level = levels[i];
+
 		for (j=0; j<level.length; j++) {
-			segForward = level[j];
-			for (k=0; k<levels[i-1].length; k++) {
-				segBack = levels[i-1][k];
-				if (segsCollide(segForward, segBack)) {
-					segBack.forward = Math.max(segBack.forward||0, (segForward.forward||0)+1);
-				}
+			seg = level[j];
+
+			seg.forwardSegs = [];
+			for (k=i+1; k<levels.length; k++) {
+				computeSlotSegCollisions(seg, levels[k], seg.forwardSegs);
 			}
 		}
 	}
 }
 
 
+// Figure out which path forward (via seg.forwardSegs) results in the longest path until
+// the furthest edge is reached. The number of segments in this path will be seg.forwardPressure
+function computeSlotSegPressures(seg) {
+	var forwardSegs = seg.forwardSegs;
+	var forwardPressure = 0;
+	var i, forwardSeg;
 
+	if (seg.forwardPressure === undefined) { // not already computed
 
-function View(element, calendar, viewName) {
+		for (i=0; i<forwardSegs.length; i++) {
+			forwardSeg = forwardSegs[i];
+
+			// figure out the child's maximum forward path
+			computeSlotSegPressures(forwardSeg);
+
+			// either use the existing maximum, or use the child's forward pressure
+			// plus one (for the forwardSeg itself)
+			forwardPressure = Math.max(
+				forwardPressure,
+				1 + forwardSeg.forwardPressure
+			);
+		}
+
+		seg.forwardPressure = forwardPressure;
+	}
+}
+
+
+// Calculate seg.forwardCoord and seg.backwardCoord for the segment, where both values range
+// from 0 to 1. If the calendar is left-to-right, the seg.backwardCoord maps to "left" and
+// seg.forwardCoord maps to "right" (via percentage). Vice-versa if the calendar is right-to-left.
+//
+// The segment might be part of a "series", which means consecutive segments with the same pressure
+// who's width is unknown until an edge has been hit. `seriesBackwardPressure` is the number of
+// segments behind this one in the current series, and `seriesBackwardCoord` is the starting
+// coordinate of the first segment in the series.
+function computeSlotSegCoords(seg, seriesBackwardPressure, seriesBackwardCoord) {
+	var forwardSegs = seg.forwardSegs;
+	var i;
+
+	if (seg.forwardCoord === undefined) { // not already computed
+
+		if (!forwardSegs.length) {
+
+			// if there are no forward segments, this segment should butt up against the edge
+			seg.forwardCoord = 1;
+		}
+		else {
+
+			// sort highest pressure first
+			forwardSegs.sort(compareForwardSlotSegs);
+
+			// this segment's forwardCoord will be calculated from the backwardCoord of the
+			// highest-pressure forward segment.
+			computeSlotSegCoords(forwardSegs[0], seriesBackwardPressure + 1, seriesBackwardCoord);
+			seg.forwardCoord = forwardSegs[0].backwardCoord;
+		}
+
+		// calculate the backwardCoord from the forwardCoord. consider the series
+		seg.backwardCoord = seg.forwardCoord -
+			(seg.forwardCoord - seriesBackwardCoord) / // available width for series
+			(seriesBackwardPressure + 1); // # of segments in the series
+
+		// use this segment's coordinates to computed the coordinates of the less-pressurized
+		// forward segments
+		for (i=0; i<forwardSegs.length; i++) {
+			computeSlotSegCoords(forwardSegs[i], 0, seg.forwardCoord);
+		}
+	}
+}
+
+
+// Outputs a flat array of segments, from lowest to highest level
+function flattenSlotSegLevels(levels) {
+	var segs = [];
+	var i, level;
+	var j;
+
+	for (i=0; i<levels.length; i++) {
+		level = levels[i];
+
+		for (j=0; j<level.length; j++) {
+			segs.push(level[j]);
+		}
+	}
+
+	return segs;
+}
+
+
+// Find all the segments in `otherSegs` that vertically collide with `seg`.
+// Append into an optionally-supplied `results` array and return.
+function computeSlotSegCollisions(seg, otherSegs, results) {
+	results = results || [];
+
+	for (var i=0; i<otherSegs.length; i++) {
+		if (isSlotSegCollision(seg, otherSegs[i])) {
+			results.push(otherSegs[i]);
+		}
+	}
+
+	return results;
+}
+
+
+// Do these segments occupy the same vertical space?
+function isSlotSegCollision(seg1, seg2) {
+	return seg1.end > seg2.start && seg1.start < seg2.end;
+}
+
+
+// A cmp function for determining which forward segment to rely on more when computing coordinates.
+function compareForwardSlotSegs(seg1, seg2) {
+	// put higher-pressure first
+	return seg2.forwardPressure - seg1.forwardPressure ||
+		// put segments that are closer to initial edge first (and favor ones with no coords yet)
+		(seg1.backwardCoord || 0) - (seg2.backwardCoord || 0) ||
+		// do normal sorting...
+		compareSlotSegs(seg1, seg2);
+}
+
+
+// A cmp function for determining which segment should be closer to the initial edge
+// (the left edge on a left-to-right calendar).
+function compareSlotSegs(seg1, seg2) {
+	return seg1.start - seg2.start || // earlier start time goes first
+		(seg2.end - seg2.start) - (seg1.end - seg1.start) || // tie? longer-duration goes first
+		(seg1.event.title || '').localeCompare(seg2.event.title); // tie? alphabetically by title
+}
+
+
+;;
+
+/* Additional view: list (by bruederli@kolabsys.com)
+---------------------------------------------------------------------------------*/
+
+fcViews.list = ListView;
+
+
+function ListView(element, calendar) {
 	var t = this;
-	
-	
+
 	// exports
-	t.element = element;
-	t.calendar = calendar;
-	t.name = viewName;
-	t.opt = opt;
-	t.trigger = trigger;
-	//t.setOverflowHidden = setOverflowHidden;
-	t.isEventDraggable = isEventDraggable;
-	t.isEventResizable = isEventResizable;
-	t.reportEvents = reportEvents;
-	t.eventEnd = eventEnd;
-	t.reportEventElement = reportEventElement;
-	t.reportEventClear = reportEventClear;
-	t.eventElementHandlers = eventElementHandlers;
-	t.showEvents = showEvents;
-	t.hideEvents = hideEvents;
-	t.eventDrop = eventDrop;
-	t.eventResize = eventResize;
-	// t.title
-	// t.start, t.end
-	// t.visStart, t.visEnd
-	
-	
+	t.render = render;
+	t.select = dummy;
+	t.unselect = dummy;
+	t.reportSelection = dummy;
+	t.getDaySegmentContainer = function(){ return body; };
+
 	// imports
-	var defaultEventEnd = t.defaultEventEnd;
-	var normalizeEvent = calendar.normalizeEvent; // in EventManager
-	var reportEventChange = calendar.reportEventChange;
-	
+	View.call(t, element, calendar, 'list');
+	ListEventRenderer.call(t);
+	var opt = t.opt;
+	var trigger = t.trigger;
+	var clearEvents = t.clearEvents;
+	var reportEventClear = t.reportEventClear;
+	var formatDates = calendar.formatDates;
+	var formatDate = calendar.formatDate;
+
+	// overrides
+	t.setWidth = setWidth;
+	t.setHeight = setHeight;
 	
 	// locals
-	var eventsByID = {};
-	var eventElements = [];
-	var eventElementsByID = {};
-	var options = calendar.options;
-	
+	var body;
+	var firstDay;
+	var nwe;
+	var tm;
+	var colFormat;
 	
 	
-	function opt(name, viewNameOverride) {
-		var v = options[name];
-		if (typeof v == 'object' && !v.length) {
-			return smartProperty(v, viewNameOverride || viewName);
+	function render(date, delta) {
+		if (delta) {
+			addDays(date, opt('listPage') * delta);
 		}
-		return v;
-	}
+		t.start = t.visStart = cloneDate(date, true);
+		t.end = addDays(cloneDate(t.start), opt('listPage'));
+		t.visEnd = addDays(cloneDate(t.start), opt('listRange'));
+		addMinutes(t.visEnd, -1);  // set end to 23:59
+		t.title = formatDates(date, t.visEnd, opt('titleFormat'));
+		
+		updateOptions();
 
-	
-	function trigger(name, thisObj) {
-		return calendar.trigger.apply(
-			calendar,
-			[name, thisObj || t].concat(Array.prototype.slice.call(arguments, 2), [t])
-		);
+		if (!body) {
+			buildSkeleton();
+		} else {
+			clearEvents();
+		}
 	}
 	
 	
-	/*
-	function setOverflowHidden(bool) {
-		element.css('overflow', bool ? 'hidden' : '');
+	function updateOptions() {
+		firstDay = opt('firstDay');
+		nwe = opt('weekends') ? 0 : 1;
+		tm = opt('theme') ? 'ui' : 'fc';
+		colFormat = opt('columnFormat', 'day');
 	}
-	*/
 	
 	
-	function isEventDraggable(event) {
-		return isEventEditable(event) && !opt('disableDragging');
+	function buildSkeleton() {
+		body = $('<div>').addClass('fc-list-content').appendTo(element);
 	}
 	
-	
-	function isEventResizable(event) { // but also need to make sure the seg.isEnd == true
-		return isEventEditable(event) && !opt('disableResizing');
+	function setHeight(height, dateChanged) {
+	  if (!opt('listNoHeight'))
+		  body.css('height', (height-1)+'px').css('overflow', 'auto');
+	}
+
+	function setWidth(width) {
+		// nothing to be done here
 	}
 	
-	
-	function isEventEditable(event) {
-		return firstDefined(event.editable, (event.source || {}).editable, opt('editable'));
+	function dummy() {
+		// Stub.
 	}
+
+}
+
+;;
+
+/* Additional view renderer: list (by bruederli@kolabsys.com)
+---------------------------------------------------------------------------------*/
+
+function ListEventRenderer() {
+	var t = this;
 	
+	// exports
+	t.renderEvents = renderEvents;
+	t.renderEventTime = renderEventTime;
+	t.compileDaySegs = compileSegs; // for DayEventRenderer
+	t.clearEvents = clearEvents;
+	t.lazySegBind = lazySegBind;
+	t.sortCmp = sortCmp;
 	
+	// imports
+	DayEventRenderer.call(t);
+	var opt = t.opt;
+	var trigger = t.trigger;
+	var reportEventElement = t.reportEventElement;
+	var eventElementHandlers = t.eventElementHandlers;
+	var showEvents = t.showEvents;
+	var hideEvents = t.hideEvents;
+	var getListContainer = t.getDaySegmentContainer;
+	var calendar = t.calendar;
+	var formatDate = calendar.formatDate;
+	var formatDates = calendar.formatDates;
 	
-	/* Event Data
-	------------------------------------------------------------------------------*/
 	
+	/* Rendering
+	--------------------------------------------------------------------*/
 	
-	// report when view receives new events
-	function reportEvents(events) { // events are already normalized at this point
-		eventsByID = {};
-		var i, len=events.length, event;
-		for (i=0; i<len; i++) {
-			event = events[i];
-			if (eventsByID[event._id]) {
-				eventsByID[event._id].push(event);
-			}else{
-				eventsByID[event._id] = [event];
-			}
-		}
+	function clearEvents() {
+		getListContainer().empty();
 	}
 	
-	
-	// returns a Date object for an event's end
-	function eventEnd(event) {
-		return event.end ? cloneDate(event.end) : defaultEventEnd(event);
+	function renderEvents(events, modifiedEventId) {
+		events.sort(sortCmp);
+		renderSegs(compileSegs(events), modifiedEventId);
 	}
 	
-	
-	
-	/* Event Elements
-	------------------------------------------------------------------------------*/
-	
-	
-	// report when view creates an element for an event
-	function reportEventElement(event, element) {
-		eventElements.push(element);
-		if (eventElementsByID[event._id]) {
-			eventElementsByID[event._id].push(element);
-		}else{
-			eventElementsByID[event._id] = [element];
+	function compileSegs(events) {
+		var segs = [];
+		var colFormat = opt('titleFormat', 'day');
+		var firstDay = opt('firstDay');
+		var segmode = opt('listSections');
+		var event, i, dd, wd, md, seg, segHash, curSegHash, segDate, curSeg = -1;
+		var today = clearTime(new Date());
+		var weekstart = addDays(cloneDate(today), -((today.getDay() - firstDay + 7) % 7));
+		
+		for (i=0; i < events.length; i++) {
+			event = events[i];
+			
+			// skip events out of range
+			if ((event.end || event.start) < t.start || event.start > t.visEnd)
+				continue;
+			
+			// define sections of this event
+			// create smart sections such as today, tomorrow, this week, next week, next month, ect.
+			segDate = cloneDate(event.start < t.start && event.end > t.start ? t.start : event.start, true);
+			dd = dayDiff(segDate, today);
+			wd = Math.floor(dayDiff(segDate, weekstart) / 7);
+			md = segDate.getMonth() + ((segDate.getYear() - today.getYear()) * 12) - today.getMonth();
+			
+			// build section title
+			if (segmode == 'smart') {
+				if (dd < 0) {
+					segHash = opt('listTexts', 'past');
+				} else if (dd == 0) {
+					segHash = opt('listTexts', 'today');
+				} else if (dd == 1) {
+					segHash = opt('listTexts', 'tomorrow');
+				} else if (wd == 0) {
+					segHash = opt('listTexts', 'thisWeek');
+				} else if (wd == 1) {
+					segHash = opt('listTexts', 'nextWeek');
+				} else if (md == 0) {
+					segHash = opt('listTexts', 'thisMonth');
+				} else if (md == 1) {
+					segHash = opt('listTexts', 'nextMonth');
+				} else if (md > 1) {
+					segHash = opt('listTexts', 'future');
+				}
+			} else if (segmode == 'month') {
+				segHash = formatDate(segDate, 'MMMM yyyy');
+			} else if (segmode == 'week') {
+				segHash = opt('listTexts', 'week') + formatDate(segDate, ' W');
+			} else if (segmode == 'day') {
+				segHash = formatDate(segDate, colFormat);
+			} else {
+				segHash = '';
+			}
+			
+			// start new segment
+			if (segHash != curSegHash) {
+				segs[++curSeg] = { events: [], start: segDate, title: segHash, daydiff: dd, weekdiff: wd, monthdiff: md };
+				curSegHash = segHash;
+			}
+			
+			segs[curSeg].events.push(event);
 		}
+		
+		return segs;
 	}
-	
-	
-	function reportEventClear() {
-		eventElements = [];
-		eventElementsByID = {};
+
+	function sortCmp(a, b) {
+		var sd = a.start.getTime() - b.start.getTime();
+		return sd || (a.end ? a.end.getTime() : 0) - (b.end ? b.end.getTime() : 0);
 	}
 	
-	
-	// attaches eventClick, eventMouseover, eventMouseout
-	function eventElementHandlers(event, eventElement) {
-		eventElement
-			.click(function(ev) {
-				if (!eventElement.hasClass('ui-draggable-dragging') &&
-					!eventElement.hasClass('ui-resizable-resizing')) {
-						return trigger('eventClick', this, event, ev);
+	function renderSegs(segs, modifiedEventId) {
+		var tm = opt('theme') ? 'ui' : 'fc';
+		var headerClass = tm + "-widget-header";
+		var contentClass = tm + "-widget-content";
+		var i, j, seg, event, times, s, skinCss, skinCssAttr, classes, segContainer, eventElement, eventElements, triggerRes;
+
+		for (j=0; j < segs.length; j++) {
+			seg = segs[j];
+			
+			if (seg.title) {
+				$('<div class="fc-list-header ' + headerClass + '">' + htmlEscape(seg.title) + '</div>').appendTo(getListContainer());
+			}
+			segContainer = $('<div>').addClass('fc-list-section ' + contentClass).appendTo(getListContainer());
+			s = '';
+			
+			for (i=0; i < seg.events.length; i++) {
+				event = seg.events[i];
+				times = renderEventTime(event, seg);
+				skinCss = getSkinCss(event, opt);
+				skinCssAttr = (skinCss ? " style='" + skinCss + "'" : '');
+				classes = ['fc-event', 'fc-event-skin', 'fc-event-vert', 'fc-corner-top', 'fc-corner-bottom'].concat(event.className);
+				if (event.source && event.source.className) {
+					classes = classes.concat(event.source.className);
+				}
+				
+				s += 
+					"<div class='" + classes.join(' ') + "'" + skinCssAttr + ">" +
+					"<div class='fc-event-inner fc-event-skin'" + skinCssAttr + ">" +
+					"<div class='fc-event-head fc-event-skin'" + skinCssAttr + ">" +
+					"<div class='fc-event-time'>" +
+					(times[0] ? '<span class="fc-col-date">' + times[0] + '</span> ' : '') +
+					(times[1] ? '<span class="fc-col-time">' + times[1] + '</span>' : '') +
+					"</div>" +
+					"</div>" +
+					"<div class='fc-event-content'>" +
+					"<div class='fc-event-title'>" +
+					htmlEscape(event.title) +
+					"</div>" +
+					"</div>" +
+					"<div class='fc-event-bg'></div>" +
+					"</div>" + // close inner
+					"</div>";  // close outer
+			}
+			
+			segContainer[0].innerHTML = s;
+			eventElements = segContainer.children();
+
+			// retrieve elements, run through eventRender callback, bind event handlers
+			for (i=0; i < seg.events.length; i++) {
+				event = seg.events[i];
+				eventElement = $(eventElements[i]); // faster than eq()
+				triggerRes = trigger('eventRender', event, event, eventElement);
+				if (triggerRes === false) {
+					eventElement.remove();
+				} else {
+					if (triggerRes && triggerRes !== true) {
+						eventElement.remove();
+						eventElement = $(triggerRes).appendTo(segContainer);
 					}
-			})
-			.hover(
-				function(ev) {
-					trigger('eventMouseover', this, event, ev);
-				},
-				function(ev) {
-					trigger('eventMouseout', this, event, ev);
+					if (event._id === modifiedEventId) {
+						eventElementHandlers(event, eventElement, seg);
+					} else {
+						eventElement[0]._fci = i; // for lazySegBind
+					}
+					reportEventElement(event, eventElement);
 				}
-			);
-		// TODO: don't fire eventMouseover/eventMouseout *while* dragging is occuring (on subject element)
-		// TODO: same for resizing
+			}
+		
+			lazySegBind(segContainer, seg, eventElementHandlers);
+		}
+		
+		markFirstLast(getListContainer());
 	}
 	
+	// event time/date range to display
+	function renderEventTime(event, seg) {
+		var timeFormat = opt('timeFormat');
+		var dateFormat = opt('columnFormat');
+		var segmode = opt('listSections');
+		var duration = event.end ? event.end.getTime() - event.start.getTime() : 0;
+		var datestr = '', timestr = '';
+		
+		if (segmode == 'smart') {
+			if (event.start < seg.start) {
+				datestr = opt('listTexts', 'until') + ' ' + formatDate(event.end, (event.allDay || event.end.getDate() != seg.start.getDate()) ? dateFormat : timeFormat);
+			} else if (duration > DAY_MS) {
+				datestr = formatDates(event.start, event.end, dateFormat + '{ - ' + dateFormat + '}');
+			} else if (seg.daydiff == 0) {
+				datestr = opt('listTexts', 'today');
+			}	else if (seg.daydiff == 1) {
+				datestr = opt('listTexts', 'tomorrow');
+			} else if (seg.weekdiff == 0 || seg.weekdiff == 1) {
+				datestr = formatDate(event.start, 'dddd');
+			} else if (seg.daydiff > 1 || seg.daydiff < 0) {
+				datestr = formatDate(event.start, dateFormat);
+			}
+		} else if (segmode != 'day') {
+			datestr = formatDates(event.start, event.end, dateFormat + (duration > DAY_MS ? '{ - ' + dateFormat + '}' : ''));
+		}
+		
+		if (!datestr && event.allDay) {
+			timestr = opt('allDayText');
+		} else if ((duration < DAY_MS || !datestr) && !event.allDay) {
+			timestr = formatDates(event.start, event.end, timeFormat);
+		}
+		
+		return [datestr, timestr];
+	}
 	
-	function showEvents(event, exceptElement) {
-		eachEventElement(event, exceptElement, 'show');
+	function lazySegBind(container, seg, bindHandlers) {
+		container.unbind('mouseover focusin').bind('mouseover focusin', function(ev) {
+			var parent = ev.target, e = parent, i, event;
+			while (parent != this) {
+				e = parent;
+				parent = parent.parentNode;
+			}
+			if ((i = e._fci) !== undefined) {
+				e._fci = undefined;
+				event = seg.events[i];
+				bindHandlers(event, container.children().eq(i), seg);
+				$(ev.target).trigger(ev);
+			}
+			ev.stopPropagation();
+		});
 	}
 	
+}
+
+
+;;
+
+/* Additional view: table (by bruederli@kolabsys.com)
+---------------------------------------------------------------------------------*/
+
+fcViews.table = TableView;
+
+
+function TableView(element, calendar) {
+	var t = this;
+
+	// exports
+	t.render = render;
+	t.select = dummy;
+	t.unselect = dummy;
+	t.getDaySegmentContainer = function(){ return table; };
+
+	// imports
+	View.call(t, element, calendar, 'table');
+	TableEventRenderer.call(t);
+	var opt = t.opt;
+	var trigger = t.trigger;
+  var clearEvents = t.clearEvents;
+	var reportEventClear = t.reportEventClear;
+	var formatDates = calendar.formatDates;
+	var formatDate = calendar.formatDate;
+
+	// overrides
+	t.setWidth = setWidth;
+	t.setHeight = setHeight;
 	
-	function hideEvents(event, exceptElement) {
-		eachEventElement(event, exceptElement, 'hide');
-	}
+	// locals
+	var div;
+	var table;
+	var firstDay;
+	var nwe;
+	var tm;
+	var colFormat;
 	
 	
-	function eachEventElement(event, exceptElement, funcName) {
-		var elements = eventElementsByID[event._id],
-			i, len = elements.length;
-		for (i=0; i<len; i++) {
-			if (!exceptElement || elements[i][0] != exceptElement[0]) {
-				elements[i][funcName]();
-			}
+	function render(date, delta) {
+		if (delta) {
+			addDays(date, opt('listPage') * delta);
+		}
+		t.start = t.visStart = cloneDate(date, true);
+		t.end = addDays(cloneDate(t.start), opt('listPage'));
+		t.visEnd = addDays(cloneDate(t.start), opt('listRange'));
+		addMinutes(t.visEnd, -1);  // set end to 23:59
+		t.title = (t.visEnd.getTime() - t.visStart.getTime() < DAY_MS) ? formatDate(date, opt('titleFormat')) : formatDates(date, t.visEnd, opt('titleFormat'));
+		
+		updateOptions();
+
+		if (!table) {
+			buildSkeleton();
+		} else {
+			clearEvents();
 		}
 	}
 	
 	
-	
-	/* Event Modification Reporting
-	---------------------------------------------------------------------------------*/
-	
-	
-	function eventDrop(e, event, dayDelta, minuteDelta, allDay, ev, ui) {
-		var oldAllDay = event.allDay;
-		var eventId = event._id;
-		moveEvents(eventsByID[eventId], dayDelta, minuteDelta, allDay);
-		trigger(
-			'eventDrop',
-			e,
-			event,
-			dayDelta,
-			minuteDelta,
-			allDay,
-			function() {
-				// TODO: investigate cases where this inverse technique might not work
-				moveEvents(eventsByID[eventId], -dayDelta, -minuteDelta, oldAllDay);
-				reportEventChange(eventId);
-			},
-			ev,
-			ui
-		);
-		reportEventChange(eventId);
+	function updateOptions() {
+		firstDay = opt('firstDay');
+		nwe = opt('weekends') ? 0 : 1;
+		tm = opt('theme') ? 'ui' : 'fc';
+		colFormat = opt('columnFormat');
 	}
 	
 	
-	function eventResize(e, event, dayDelta, minuteDelta, ev, ui) {
-		var eventId = event._id;
-		elongateEvents(eventsByID[eventId], dayDelta, minuteDelta);
-		trigger(
-			'eventResize',
-			e,
-			event,
-			dayDelta,
-			minuteDelta,
-			function() {
-				// TODO: investigate cases where this inverse technique might not work
-				elongateEvents(eventsByID[eventId], -dayDelta, -minuteDelta);
-				reportEventChange(eventId);
-			},
-			ev,
-			ui
-		);
-		reportEventChange(eventId);
+	function buildSkeleton() {
+		var tableCols = opt('tableCols');
+		var s =
+			"<table class='fc-border-separate' style='width:100%' cellspacing='0'>" +
+			"<colgroup>";
+		for (var c=0; c < tableCols.length; c++) {
+			s += "<col class='fc-event-" + tableCols[c] + "' />";
+		}
+		s += "</colgroup>" +
+			"</table>";
+		div = $('<div>').addClass('fc-list-content').appendTo(element);
+		table = $(s).appendTo(div);
 	}
 	
+	function setHeight(height, dateChanged) {
+	  if (!opt('listNoHeight'))
+		  div.css('height', (height-1)+'px').css('overflow', 'auto');
+	}
+
+	function setWidth(width) {
+		// nothing to be done here
+	}
 	
+	function dummy() {
+		// Stub.
+	}
+
+}
+
+;;
+
+/* Additional view renderer: table (by bruederli@kolabsys.com)
+---------------------------------------------------------------------------------*/
+
+function TableEventRenderer() {
+	var t = this;
 	
-	/* Event Modification Math
-	---------------------------------------------------------------------------------*/
+	// imports
+	ListEventRenderer.call(t);
+	var opt = t.opt;
+	var sortCmp = t.sortCmp;
+	var trigger = t.trigger;
+	var compileSegs = t.compileDaySegs;
+	var reportEventElement = t.reportEventElement;
+	var eventElementHandlers = t.eventElementHandlers;
+	var renderEventTime = t.renderEventTime;
+	var showEvents = t.showEvents;
+	var hideEvents = t.hideEvents;
+	var getListContainer = t.getDaySegmentContainer;
+	var lazySegBind = t.lazySegBind;
+	var calendar = t.calendar;
+	var formatDate = calendar.formatDate;
+	var formatDates = calendar.formatDates;
+
+	// exports
+	t.renderEvents = renderEvents;
+	t.clearEvents = clearEvents;
+
+
+	/* Rendering
+	--------------------------------------------------------------------*/
 	
+	function clearEvents() {
+		getListContainer().children('tbody').remove();
+	}
 	
-	function moveEvents(events, dayDelta, minuteDelta, allDay) {
-		minuteDelta = minuteDelta || 0;
-		for (var e, len=events.length, i=0; i<len; i++) {
-			e = events[i];
-			if (allDay !== undefined) {
-				e.allDay = allDay;
+	function renderEvents(events, modifiedEventId) {
+		events.sort(sortCmp);
+		renderSegs(compileSegs(events), modifiedEventId);
+		getListContainer().removeClass('fc-list-smart fc-list-day fc-list-month fc-list-week').addClass('fc-list-' + opt('listSections'));
+	}
+
+	function renderSegs(segs, modifiedEventId) {
+		var tm = opt('theme') ? 'ui' : 'fc';
+		var table = getListContainer();
+		var headerClass = tm + "-widget-header";
+		var contentClass = tm + "-widget-content";
+		var tableCols = opt('tableCols');
+		var timecol = $.inArray('time', tableCols) >= 0;
+		var i, j, seg, event, times, s, skinCss, skinCssAttr, skinClasses, rowClasses, segContainer, eventElements, eventElement, triggerRes;
+
+		for (j=0; j < segs.length; j++) {
+			seg = segs[j];
+			
+			if (seg.title) {
+				$('<tbody class="fc-list-header"><tr><td class="fc-list-header ' + headerClass + '" colspan="' + tableCols.length + '">' + htmlEscape(seg.title) + '</td></tr></tbody>').appendTo(table);
 			}
-			addMinutes(addDays(e.start, dayDelta, true), minuteDelta);
-			if (e.end) {
-				e.end = addMinutes(addDays(e.end, dayDelta, true), minuteDelta);
+			segContainer = $('<tbody>').addClass('fc-list-section ' + contentClass).appendTo(table);
+			s = '';
+			
+			for (i=0; i < seg.events.length; i++) {
+				event = seg.events[i];
+				times = renderEventTime(event, seg);
+				skinCss = getSkinCss(event, opt);
+				skinCssAttr = (skinCss ? " style='" + skinCss + "'" : '');
+				skinClasses = ['fc-event-skin', 'fc-corner-left', 'fc-corner-right', 'fc-corner-top', 'fc-corner-bottom'].concat(event.className);
+				if (event.source && event.source.className) {
+					skinClasses = skinClasses.concat(event.source.className);
+				}
+				rowClasses = ['fc-event', 'fc-event-row', 'fc-'+dayIDs[event.start.getDay()]];
+				if (seg.daydiff == 0) {
+					rowClasses.push('fc-today');
+				}
+				
+				s +=  "<tr class='" + rowClasses.join(' ') + "' tabindex='0'>";
+				for (var col, c=0; c < tableCols.length; c++) {
+					col = tableCols[c];
+					if (col == 'handle') {
+						s += "<td class='fc-event-handle'>" +
+							"<div class='" + skinClasses.join(' ') + "'" + skinCssAttr + ">" +
+							"<span class='fc-event-inner'></span>" +
+							"</div></td>";
+					} else if (col == 'date') {
+						s += "<td class='fc-event-date' colspan='" + (times[1] || !timecol ? 1 : 2) + "'>" + htmlEscape(times[0]) + "</td>";
+					} else if (col == 'time') {
+						if (times[1]) {
+							s += "<td class='fc-event-time'>" + htmlEscape(times[1]) + "</td>";
+						}
+					} else {
+						s += "<td class='fc-event-" + col + "'>" + (event[col] ? htmlEscape(event[col]) : '&nbsp;') + "</td>";
+					}
+				}
+				s += "</tr>";
+				
+				// IE doesn't like innerHTML on tbody elements so we insert every row individually
+				if (document.all) {
+					$(s).appendTo(segContainer);
+					s = '';
+				}
 			}
-			normalizeEvent(e, options);
-		}
-	}
-	
-	
-	function elongateEvents(events, dayDelta, minuteDelta) {
-		minuteDelta = minuteDelta || 0;
-		for (var e, len=events.length, i=0; i<len; i++) {
-			e = events[i];
-			e.end = addMinutes(addDays(eventEnd(e), dayDelta, true), minuteDelta);
-			normalizeEvent(e, options);
+
+			if (!document.all)
+				segContainer[0].innerHTML = s;
+
+			eventElements = segContainer.children();
+
+			// retrieve elements, run through eventRender callback, bind event handlers
+			for (i=0; i < seg.events.length; i++) {
+				event = seg.events[i];
+				eventElement = $(eventElements[i]); // faster than eq()
+				triggerRes = trigger('eventRender', event, event, eventElement);
+				if (triggerRes === false) {
+					eventElement.remove();
+				} else {
+					if (triggerRes && triggerRes !== true) {
+						eventElement.remove();
+						eventElement = $(triggerRes).appendTo(segContainer);
+					}
+					if (event._id === modifiedEventId) {
+						eventElementHandlers(event, eventElement, seg);
+					} else {
+						eventElement[0]._fci = i; // for lazySegBind
+					}
+					reportEventElement(event, eventElement);
+				}
+			}
+		
+			lazySegBind(segContainer, seg, eventElementHandlers);
+			markFirstLast(segContainer);
 		}
+		
+		//markFirstLast(table);
 	}
-	
 
 }
+;;
 
-function DayEventRenderer() {
-	var t = this;
 
+function View(element, calendar, viewName) {
+	var t = this;
+	
 	
 	// exports
-	t.renderDaySegs = renderDaySegs;
-	t.resizableDayEvent = resizableDayEvent;
+	t.element = element;
+	t.calendar = calendar;
+	t.name = viewName;
+	t.opt = opt;
+	t.trigger = trigger;
+	t.isEventDraggable = isEventDraggable;
+	t.isEventResizable = isEventResizable;
+	t.setEventData = setEventData;
+	t.clearEventData = clearEventData;
+	t.eventEnd = eventEnd;
+	t.reportEventElement = reportEventElement;
+	t.triggerEventDestroy = triggerEventDestroy;
+	t.eventElementHandlers = eventElementHandlers;
+	t.showEvents = showEvents;
+	t.hideEvents = hideEvents;
+	t.eventDrop = eventDrop;
+	t.eventResize = eventResize;
+	// t.title
+	// t.start, t.end
+	// t.visStart, t.visEnd
 	
 	
 	// imports
-	var opt = t.opt;
-	var trigger = t.trigger;
-	var isEventDraggable = t.isEventDraggable;
-	var isEventResizable = t.isEventResizable;
-	var eventEnd = t.eventEnd;
-	var reportEventElement = t.reportEventElement;
-	var showEvents = t.showEvents;
-	var hideEvents = t.hideEvents;
-	var eventResize = t.eventResize;
-	var getRowCnt = t.getRowCnt;
-	var getColCnt = t.getColCnt;
-	var getColWidth = t.getColWidth;
-	var allDayRow = t.allDayRow;
-	var allDayBounds = t.allDayBounds;
-	var colContentLeft = t.colContentLeft;
-	var colContentRight = t.colContentRight;
-	var dayOfWeekCol = t.dayOfWeekCol;
-	var dateCell = t.dateCell;
-	var compileDaySegs = t.compileDaySegs;
-	var getDaySegmentContainer = t.getDaySegmentContainer;
-	var bindDaySeg = t.bindDaySeg; //TODO: streamline this
-	var formatDates = t.calendar.formatDates;
-	var renderDayOverlay = t.renderDayOverlay;
-	var clearOverlays = t.clearOverlays;
-	var clearSelection = t.clearSelection;
+	var defaultEventEnd = t.defaultEventEnd;
+	var normalizeEvent = calendar.normalizeEvent; // in EventManager
+	var reportEventChange = calendar.reportEventChange;
 	
 	
+	// locals
+	var eventsByID = {}; // eventID mapped to array of events (there can be multiple b/c of repeating events)
+	var eventElementsByID = {}; // eventID mapped to array of jQuery elements
+	var eventElementCouples = []; // array of objects, { event, element } // TODO: unify with segment system
+	var options = calendar.options;
 	
-	/* Rendering
-	-----------------------------------------------------------------------------*/
 	
 	
-	function renderDaySegs(segs, modifiedEventId) {
-		var segmentContainer = getDaySegmentContainer();
-		var rowDivs;
-		var rowCnt = getRowCnt();
-		var colCnt = getColCnt();
-		var i = 0;
-		var rowI;
-		var levelI;
-		var colHeights;
-		var j;
-		var segCnt = segs.length;
-		var seg;
-		var top;
-		var k;
-		var overflows;
-		var overflowLinks;
-		var maxHeight = opt('maxHeight');
-		segmentContainer[0].innerHTML = daySegHTML(segs); // faster than .html()
-		daySegElementResolve(segs, segmentContainer.children());
-		daySegElementReport(segs);
-		daySegHandlers(segs, segmentContainer, modifiedEventId);
-		daySegCalcHSides(segs);
-		daySegSetWidths(segs);
-		daySegCalcHeights(segs);
-		rowDivs = getRowDivs();
-		// set row heights, calculate event tops (in relation to row top)
-		for (rowI=0; rowI<rowCnt; rowI++) {
-			levelI = 0;
-			overflows = [];
-			overflowLinks = {};
-			colHeights = [];
-			for (j=0; j<colCnt; j++) {
-				overflows[j] = 0;
-				colHeights[j] = 0;
-			}
-			while (i<segCnt && (seg = segs[i]).row == rowI) {
-				// loop through segs in a row
-				top = arrayMax(colHeights.slice(seg.startCol, seg.endCol));
-				if (maxHeight && top + seg.outerHeight > maxHeight) {
-					seg.overflow = true;
-				}
-				else {
-					seg.top = top;
-					top += seg.outerHeight;
-				}
-				for (k=seg.startCol; k<seg.endCol; k++) {
-					if (overflows[k])
-						seg.overflow = true;
-					if (seg.overflow) {
-						if (seg.isStart && !overflowLinks[k])
-							overflowLinks[k] = { seg:seg, top:top, date:cloneDate(seg.start, true), count:0 };
-						if (overflowLinks[k])
-							overflowLinks[k].count++;
-						overflows[k]++;
-					}
-					else
-						colHeights[k] = top;
-				}
-				i++;
-			}
-			rowDivs[rowI].height(arrayMax(colHeights));
-			renderOverflowLinks(overflowLinks, rowDivs[rowI]);
+	function opt(name, viewNameOverride) {
+		var v = options[name];
+		if ($.isPlainObject(v)) {
+			return smartProperty(v, viewNameOverride || viewName);
 		}
-		daySegSetTops(segs, getRowTops(rowDivs));
+		return v;
 	}
+
 	
-	
-	function renderOverflowLinks(overflowLinks, rowDiv) {
-		var container = getDaySegmentContainer();
-		var colCnt = getColCnt();
-		var element, triggerRes, link;
-		for (var j=0; j<colCnt; j++) {
-			if ((link = overflowLinks[j])) {
-				if (link.count > 1) {
-					element = $('<a>').addClass('fc-more-link').html('+'+link.count).appendTo(container);
-					element[0].style.position = 'absolute';
-					element[0].style.left = link.seg.left + 'px';
-					element[0].style.top = (link.top + rowDiv[0].offsetTop) + 'px';
-					triggerRes = trigger('overflowRender', link, { count:link.count, date:link.date }, element);
-					if (triggerRes === false)
-						element.remove();
-				}
-				else {
-					link.seg.top = link.top;
-					link.seg.overflow = false;
-				}
-			}
-		}
+	function trigger(name, thisObj) {
+		return calendar.trigger.apply(
+			calendar,
+			[name, thisObj || t].concat(Array.prototype.slice.call(arguments, 2), [t])
+		);
 	}
 	
+
+
+	/* Event Editable Boolean Calculations
+	------------------------------------------------------------------------------*/
+
 	
-	function renderTempDaySegs(segs, adjustRow, adjustTop) {
-		var tempContainer = $("<div/>");
-		var elements;
-		var segmentContainer = getDaySegmentContainer();
-		var i;
-		var segCnt = segs.length;
-		var element;
-		tempContainer[0].innerHTML = daySegHTML(segs); // faster than .html()
-		elements = tempContainer.children();
-		segmentContainer.append(elements);
-		daySegElementResolve(segs, elements);
-		daySegCalcHSides(segs);
-		daySegSetWidths(segs);
-		daySegCalcHeights(segs);
-		daySegSetTops(segs, getRowTops(getRowDivs()));
-		elements = [];
-		for (i=0; i<segCnt; i++) {
-			element = segs[i].element;
-			if (element) {
-				if (segs[i].row === adjustRow) {
-					element.css('top', adjustTop);
-				}
-				elements.push(element[0]);
-			}
-		}
-		return $(elements);
+	function isEventDraggable(event) {
+		var source = event.source || {};
+		return firstDefined(
+				event.startEditable,
+				source.startEditable,
+				opt('eventStartEditable'),
+				event.editable,
+				source.editable,
+				opt('editable')
+			)
+			&& !opt('disableDragging'); // deprecated
 	}
 	
 	
-	function daySegHTML(segs) { // also sets seg.left and seg.outerWidth
-		var rtl = opt('isRTL');
-		var i;
-		var segCnt=segs.length;
-		var seg;
-		var event;
-		var url;
-		var classes;
-		var bounds = allDayBounds();
-		var minLeft = bounds.left;
-		var maxLeft = bounds.right;
-		var leftCol;
-		var rightCol;
-		var left;
-		var right;
-		var skinCss;
-		var html = '';
-		// calculate desired position/dimensions, create html
-		for (i=0; i<segCnt; i++) {
-			seg = segs[i];
-			event = seg.event;
-			classes = ['fc-event', 'fc-event-skin', 'fc-event-hori'];
-			if (isEventDraggable(event)) {
-				classes.push('fc-event-draggable');
-			}
-			if (rtl) {
-				if (seg.isStart) {
-					classes.push('fc-corner-right');
-				}
-				if (seg.isEnd) {
-					classes.push('fc-corner-left');
-				}
-				leftCol = dayOfWeekCol(seg.end.getDay()-1);
-				rightCol = dayOfWeekCol(seg.start.getDay());
-				left = seg.isEnd ? colContentLeft(leftCol) : minLeft;
-				right = seg.isStart ? colContentRight(rightCol) : maxLeft;
-			}else{
-				if (seg.isStart) {
-					classes.push('fc-corner-left');
-				}
-				if (seg.isEnd) {
-					classes.push('fc-corner-right');
-				}
-				leftCol = dayOfWeekCol(seg.start.getDay());
-				rightCol = dayOfWeekCol(seg.end.getDay()-1);
-				left = seg.isStart ? colContentLeft(leftCol) : minLeft;
-				right = seg.isEnd ? colContentRight(rightCol) : maxLeft;
-			}
-			classes = classes.concat(event.className);
-			if (event.source) {
-				classes = classes.concat(event.source.className || []);
-			}
-			url = event.url;
-			skinCss = getSkinCss(event, opt);
-			if (url) {
-				html += "<a href='" + htmlEscape(url) + "'";
-			}else{
-				html += "<div";
-			}
-			html +=
-				" class='" + classes.join(' ') + "'" +
-				" style='position:absolute;z-index:8;left:"+left+"px;" + skinCss + "'" +
-				">" +
-				"<div" +
-				" class='fc-event-inner fc-event-skin'" +
-				(skinCss ? " style='" + skinCss + "'" : '') +
-				">";
-			if (!event.allDay && seg.isStart) {
-				html +=
-					"<span class='fc-event-time'>" +
-					htmlEscape(formatDates(event.start, event.end, opt('timeFormat'))) +
-					"</span>";
-			}
-			html +=
-				"<span class='fc-event-title'>" + htmlEscape(event.title) + "</span>" +
-				"</div>";
-			if (seg.isEnd && isEventResizable(event)) {
-				html +=
-					"<div class='ui-resizable-handle ui-resizable-" + (rtl ? 'w' : 'e') + "'>" +
-					"&nbsp;&nbsp;&nbsp;" + // makes hit area a lot better for IE6/7
-					"</div>";
-			}
-			html +=
-				"</" + (url ? "a" : "div" ) + ">";
-			seg.left = left;
-			seg.outerWidth = right - left;
-			seg.startCol = leftCol;
-			seg.endCol = rightCol + 1; // needs to be exclusive
-		}
-		return html;
+	function isEventResizable(event) { // but also need to make sure the seg.isEnd == true
+		var source = event.source || {};
+		return firstDefined(
+				event.durationEditable,
+				source.durationEditable,
+				opt('eventDurationEditable'),
+				event.editable,
+				source.editable,
+				opt('editable')
+			)
+			&& !opt('disableResizing'); // deprecated
 	}
 	
 	
-	function daySegElementResolve(segs, elements) { // sets seg.element
-		var i;
-		var segCnt = segs.length;
-		var seg;
-		var event;
-		var element;
-		var triggerRes;
-		for (i=0; i<segCnt; i++) {
-			seg = segs[i];
-			event = seg.event;
-			element = $(elements[i]); // faster than .eq()
-			triggerRes = trigger('eventRender', event, event, element);
-			if (triggerRes === false) {
-				element.remove();
+	
+	/* Event Data
+	------------------------------------------------------------------------------*/
+	
+	
+	function setEventData(events) { // events are already normalized at this point
+		eventsByID = {};
+		var i, len=events.length, event;
+		for (i=0; i<len; i++) {
+			event = events[i];
+			if (eventsByID[event._id]) {
+				eventsByID[event._id].push(event);
 			}else{
-				if (triggerRes && triggerRes !== true) {
-					triggerRes = $(triggerRes)
-						.css({
-							position: 'absolute',
-							left: seg.left
-						});
-					element.replaceWith(triggerRes);
-					element = triggerRes;
-				}
-				seg.element = element;
+				eventsByID[event._id] = [event];
 			}
 		}
 	}
+
+
+	function clearEventData() {
+		eventsByID = {};
+		eventElementsByID = {};
+		eventElementCouples = [];
+	}
 	
 	
-	function daySegElementReport(segs) {
-		var i;
-		var segCnt = segs.length;
-		var seg;
-		var element;
-		for (i=0; i<segCnt; i++) {
-			seg = segs[i];
-			element = seg.element;
-			if (element) {
-				reportEventElement(seg.event, element);
-			}
-		}
+	// returns a Date object for an event's end
+	function eventEnd(event) {
+		return event.end ? cloneDate(event.end) : defaultEventEnd(event);
 	}
 	
 	
-	function daySegHandlers(segs, segmentContainer, modifiedEventId) {
-		var i;
-		var segCnt = segs.length;
-		var seg;
-		var element;
-		var event;
-		// retrieve elements, run through eventRender callback, bind handlers
-		for (i=0; i<segCnt; i++) {
-			seg = segs[i];
-			element = seg.element;
-			if (element) {
-				event = seg.event;
-				if (event._id === modifiedEventId) {
-					bindDaySeg(event, element, seg);
-				}else{
-					element[0]._fci = i; // for lazySegBind
-				}
-			}
+	
+	/* Event Elements
+	------------------------------------------------------------------------------*/
+	
+	
+	// report when view creates an element for an event
+	function reportEventElement(event, element) {
+		eventElementCouples.push({ event: event, element: element });
+		if (eventElementsByID[event._id]) {
+			eventElementsByID[event._id].push(element);
+		}else{
+			eventElementsByID[event._id] = [element];
 		}
-		lazySegBind(segmentContainer, segs, bindDaySeg);
+	}
+
+
+	function triggerEventDestroy() {
+		$.each(eventElementCouples, function(i, couple) {
+			t.trigger('eventDestroy', couple.event, couple.event, couple.element);
+		});
 	}
 	
 	
-	function daySegCalcHSides(segs) { // also sets seg.key
-		var i;
-		var segCnt = segs.length;
-		var seg;
-		var element;
-		var key, val;
-		var hsideCache = {};
-		// record event horizontal sides
-		for (i=0; i<segCnt; i++) {
-			seg = segs[i];
-			element = seg.element;
-			if (element) {
-				key = seg.key = cssKey(element[0]);
-				val = hsideCache[key];
-				if (val === undefined) {
-					val = hsideCache[key] = hsides(element, true);
+	// attaches eventClick, eventMouseover, eventMouseout
+	function eventElementHandlers(event, eventElement) {
+		eventElement
+			.click(function(ev) {
+				if (!eventElement.hasClass('ui-draggable-dragging') &&
+					!eventElement.hasClass('ui-resizable-resizing')) {
+						return trigger('eventClick', this, event, ev);
+					}
+			})
+			.hover(
+				function(ev) {
+					trigger('eventMouseover', this, event, ev);
+				},
+				function(ev) {
+					trigger('eventMouseout', this, event, ev);
 				}
-				seg.hsides = val;
-			}
-		}
+			)
+			.keypress(function(ev) {
+				if (ev.keyCode == 13)
+					$(this).trigger('click', { pointerType:'keyboard' });
+			});
+		// TODO: don't fire eventMouseover/eventMouseout *while* dragging is occuring (on subject element)
+		// TODO: same for resizing
 	}
 	
 	
-	function daySegSetWidths(segs) {
-		var i;
-		var segCnt = segs.length;
-		var seg;
-		var element;
-		for (i=0; i<segCnt; i++) {
-			seg = segs[i];
-			element = seg.element;
-			if (element) {
-				element[0].style.width = Math.max(0, seg.outerWidth - seg.hsides) + 'px';
-			}
-		}
+	function showEvents(event, exceptElement) {
+		eachEventElement(event, exceptElement, 'show');
 	}
 	
 	
-	function daySegCalcHeights(segs) {
-		var i;
-		var segCnt = segs.length;
-		var seg;
-		var element;
-		var key, val;
-		var vmarginCache = {};
-		// record event heights
-		for (i=0; i<segCnt; i++) {
-			seg = segs[i];
-			element = seg.element;
-			if (element) {
-				key = seg.key; // created in daySegCalcHSides
-				val = vmarginCache[key];
-				if (val === undefined) {
-					val = vmarginCache[key] = vmargins(element);
-				}
-				seg.outerHeight = element[0].offsetHeight + val;
-			}
-			else  // always set a value (issue #1108 )
-				seg.outerHeight = 0;
-		}
+	function hideEvents(event, exceptElement) {
+		eachEventElement(event, exceptElement, 'hide');
 	}
 	
 	
-	function getRowDivs() {
-		var i;
-		var rowCnt = getRowCnt();
-		var rowDivs = [];
-		for (i=0; i<rowCnt; i++) {
-			rowDivs[i] = allDayRow(i)
-				.find('td:first div.fc-day-content > div'); // optimal selector?
+	function eachEventElement(event, exceptElement, funcName) {
+		// NOTE: there may be multiple events per ID (repeating events)
+		// and multiple segments per event
+		var elements = eventElementsByID[event._id],
+			i, len = elements.length;
+		for (i=0; i<len; i++) {
+			if (!exceptElement || elements[i][0] != exceptElement[0]) {
+				elements[i][funcName]();
+			}
 		}
-		return rowDivs;
 	}
 	
 	
-	function getRowTops(rowDivs) {
-		var i;
-		var rowCnt = rowDivs.length;
-		var tops = [];
-		for (i=0; i<rowCnt; i++) {
-			tops[i] = rowDivs[i][0].offsetTop; // !!?? but this means the element needs position:relative if in a table cell!!!!
-		}
-		return tops;
+	
+	/* Event Modification Reporting
+	---------------------------------------------------------------------------------*/
+	
+	
+	function eventDrop(e, event, dayDelta, minuteDelta, allDay, ev, ui) {
+		var oldAllDay = event.allDay;
+		var eventId = event._id;
+		moveEvents(eventsByID[eventId], dayDelta, minuteDelta, allDay);
+		trigger(
+			'eventDrop',
+			e,
+			event,
+			dayDelta,
+			minuteDelta,
+			allDay,
+			function() {
+				// TODO: investigate cases where this inverse technique might not work
+				moveEvents(eventsByID[eventId], -dayDelta, -minuteDelta, oldAllDay);
+				reportEventChange(eventId);
+			},
+			ev,
+			ui
+		);
+		reportEventChange(eventId);
 	}
 	
 	
-	function daySegSetTops(segs, rowTops) { // also triggers eventAfterRender
-		var i;
-		var segCnt = segs.length;
-		var seg;
-		var element;
-		var event;
-		for (i=0; i<segCnt; i++) {
-			seg = segs[i];
-			element = seg.element;
-			if (element && !seg.overflow) {
-				element[0].style.top = rowTops[seg.row] + (seg.top||0) + 'px';
-				event = seg.event;
-				trigger('eventAfterRender', event, event, element);
-			}
-			else if (element)
-				element.hide();
-		}
+	function eventResize(e, event, dayDelta, minuteDelta, ev, ui) {
+		var eventId = event._id;
+		elongateEvents(eventsByID[eventId], dayDelta, minuteDelta);
+		trigger(
+			'eventResize',
+			e,
+			event,
+			dayDelta,
+			minuteDelta,
+			function() {
+				// TODO: investigate cases where this inverse technique might not work
+				elongateEvents(eventsByID[eventId], -dayDelta, -minuteDelta);
+				reportEventChange(eventId);
+			},
+			ev,
+			ui
+		);
+		reportEventChange(eventId);
 	}
 	
 	
 	
-	/* Resizing
-	-----------------------------------------------------------------------------------*/
+	/* Event Modification Math
+	---------------------------------------------------------------------------------*/
 	
 	
-	function resizableDayEvent(event, element, seg) {
-		var rtl = opt('isRTL');
-		var direction = rtl ? 'w' : 'e';
-		var handle = element.find('div.ui-resizable-' + direction);
-		var isResizing = false;
-		
-		// TODO: look into using jquery-ui mouse widget for this stuff
-		disableTextSelection(element); // prevent native <a> selection for IE
-		element
-			.mousedown(function(ev) { // prevent native <a> selection for others
-				ev.preventDefault();
-			})
-			.click(function(ev) {
-				if (isResizing) {
-					ev.preventDefault(); // prevent link from being visited (only method that worked in IE6)
-					ev.stopImmediatePropagation(); // prevent fullcalendar eventClick handler from being called
-					                               // (eventElementHandlers needs to be bound after resizableDayEvent)
-				}
-			});
-		
-		handle.mousedown(function(ev) {
-			if (ev.which != 1) {
-				return; // needs to be left mouse button
+	function moveEvents(events, dayDelta, minuteDelta, allDay) {
+		minuteDelta = minuteDelta || 0;
+		for (var e, len=events.length, i=0; i<len; i++) {
+			e = events[i];
+			if (allDay !== undefined) {
+				e.allDay = allDay;
 			}
-			isResizing = true;
-			var hoverListener = t.getHoverListener();
-			var rowCnt = getRowCnt();
-			var colCnt = getColCnt();
-			var dis = rtl ? -1 : 1;
-			var dit = rtl ? colCnt-1 : 0;
-			var elementTop = element.css('top');
-			var dayDelta;
-			var helpers;
-			var eventCopy = $.extend({}, event);
-			var minCell = dateCell(event.start);
-			clearSelection();
-			$('body')
-				.css('cursor', direction + '-resize')
-				.one('mouseup', mouseup);
-			trigger('eventResizeStart', this, event, ev);
-			hoverListener.start(function(cell, origCell) {
-				if (cell) {
-					var r = Math.max(minCell.row, cell.row);
-					var c = cell.col;
-					if (rowCnt == 1) {
-						r = 0; // hack for all-day area in agenda views
-					}
-					if (r == minCell.row) {
-						if (rtl) {
-							c = Math.min(minCell.col, c);
-						}else{
-							c = Math.max(minCell.col, c);
-						}
-					}
-					dayDelta = (r*7 + c*dis+dit) - (origCell.row*7 + origCell.col*dis+dit);
-					var newEnd = addDays(eventEnd(event), dayDelta, true);
-					if (dayDelta) {
-						eventCopy.end = newEnd;
-						var oldHelpers = helpers;
-						helpers = renderTempDaySegs(compileDaySegs([eventCopy]), seg.row, elementTop);
-						helpers.find('*').css('cursor', direction + '-resize');
-						if (oldHelpers) {
-							oldHelpers.remove();
-						}
-						hideEvents(event);
-					}else{
-						if (helpers) {
-							showEvents(event);
-							helpers.remove();
-							helpers = null;
-						}
-					}
-					clearOverlays();
-					renderDayOverlay(event.start, addDays(cloneDate(newEnd), 1)); // coordinate grid already rebuild at hoverListener.start
-				}
-			}, ev);
-			
-			function mouseup(ev) {
-				trigger('eventResizeStop', this, event, ev);
-				$('body').css('cursor', '');
-				hoverListener.stop();
-				clearOverlays();
-				if (dayDelta) {
-					eventResize(this, event, dayDelta, 0, ev);
-					// event redraw will clear helpers
-				}
-				// otherwise, the drag handler already restored the old events
-				
-				setTimeout(function() { // make this happen after the element's click event
-					isResizing = false;
-				},0);
+			addMinutes(addDays(e.start, dayDelta, true), minuteDelta);
+			if (e.end) {
+				e.end = addMinutes(addDays(e.end, dayDelta, true), minuteDelta);
+			}
+			normalizeEvent(e, options);
+		}
+	}
+	
+	
+	function elongateEvents(events, dayDelta, minuteDelta) {
+		minuteDelta = minuteDelta || 0;
+		for (var e, len=events.length, i=0; i<len; i++) {
+			e = events[i];
+			e.end = addMinutes(addDays(eventEnd(e), dayDelta, true), minuteDelta);
+			normalizeEvent(e, options);
+		}
+	}
+
+
+
+	// ====================================================================================================
+	// Utilities for day "cells"
+	// ====================================================================================================
+	// The "basic" views are completely made up of day cells.
+	// The "agenda" views have day cells at the top "all day" slot.
+	// This was the obvious common place to put these utilities, but they should be abstracted out into
+	// a more meaningful class (like DayEventRenderer).
+	// ====================================================================================================
+
+
+	// For determining how a given "cell" translates into a "date":
+	//
+	// 1. Convert the "cell" (row and column) into a "cell offset" (the # of the cell, cronologically from the first).
+	//    Keep in mind that column indices are inverted with isRTL. This is taken into account.
+	//
+	// 2. Convert the "cell offset" to a "day offset" (the # of days since the first visible day in the view).
+	//
+	// 3. Convert the "day offset" into a "date" (a JavaScript Date object).
+	//
+	// The reverse transformation happens when transforming a date into a cell.
+
+
+	// exports
+	t.isHiddenDay = isHiddenDay;
+	t.skipHiddenDays = skipHiddenDays;
+	t.getCellsPerWeek = getCellsPerWeek;
+	t.dateToCell = dateToCell;
+	t.dateToDayOffset = dateToDayOffset;
+	t.dayOffsetToCellOffset = dayOffsetToCellOffset;
+	t.cellOffsetToCell = cellOffsetToCell;
+	t.cellToDate = cellToDate;
+	t.cellToCellOffset = cellToCellOffset;
+	t.cellOffsetToDayOffset = cellOffsetToDayOffset;
+	t.dayOffsetToDate = dayOffsetToDate;
+	t.rangeToSegments = rangeToSegments;
+
+
+	// internals
+	var hiddenDays = opt('hiddenDays') || []; // array of day-of-week indices that are hidden
+	var isHiddenDayHash = []; // is the day-of-week hidden? (hash with day-of-week-index -> bool)
+	var cellsPerWeek;
+	var dayToCellMap = []; // hash from dayIndex -> cellIndex, for one week
+	var cellToDayMap = []; // hash from cellIndex -> dayIndex, for one week
+	var isRTL = opt('isRTL');
+
+
+	// initialize important internal variables
+	(function() {
+
+		if (opt('weekends') === false) {
+			hiddenDays.push(0, 6); // 0=sunday, 6=saturday
+		}
+
+		// Loop through a hypothetical week and determine which
+		// days-of-week are hidden. Record in both hashes (one is the reverse of the other).
+		for (var dayIndex=0, cellIndex=0; dayIndex<7; dayIndex++) {
+			dayToCellMap[dayIndex] = cellIndex;
+			isHiddenDayHash[dayIndex] = $.inArray(dayIndex, hiddenDays) != -1;
+			if (!isHiddenDayHash[dayIndex]) {
+				cellToDayMap[cellIndex] = dayIndex;
+				cellIndex++;
 			}
-			
-		});
+		}
+
+		cellsPerWeek = cellIndex;
+		if (!cellsPerWeek) {
+			throw 'invalid hiddenDays'; // all days were hidden? bad.
+		}
+
+	})();
+
+
+	// Is the current day hidden?
+	// `day` is a day-of-week index (0-6), or a Date object
+	function isHiddenDay(day) {
+		if (typeof day == 'object') {
+			day = day.getDay();
+		}
+		return isHiddenDayHash[day];
+	}
+
+
+	function getCellsPerWeek() {
+		return cellsPerWeek;
+	}
+
+
+	// Keep incrementing the current day until it is no longer a hidden day.
+	// If the initial value of `date` is not a hidden day, don't do anything.
+	// Pass `isExclusive` as `true` if you are dealing with an end date.
+	// `inc` defaults to `1` (increment one day forward each time)
+	function skipHiddenDays(date, inc, isExclusive) {
+		inc = inc || 1;
+		while (
+			isHiddenDayHash[ ( date.getDay() + (isExclusive ? inc : 0) + 7 ) % 7 ]
+		) {
+			addDays(date, inc);
+		}
+	}
+
+
+	//
+	// TRANSFORMATIONS: cell -> cell offset -> day offset -> date
+	//
+
+	// cell -> date (combines all transformations)
+	// Possible arguments:
+	// - row, col
+	// - { row:#, col: # }
+	function cellToDate() {
+		var cellOffset = cellToCellOffset.apply(null, arguments);
+		var dayOffset = cellOffsetToDayOffset(cellOffset);
+		var date = dayOffsetToDate(dayOffset);
+		return date;
+	}
+
+	// cell -> cell offset
+	// Possible arguments:
+	// - row, col
+	// - { row:#, col:# }
+	function cellToCellOffset(row, col) {
+		var colCnt = t.getColCnt();
+
+		// rtl variables. wish we could pre-populate these. but where?
+		var dis = isRTL ? -1 : 1;
+		var dit = isRTL ? colCnt - 1 : 0;
+
+		if (typeof row == 'object') {
+			col = row.col;
+			row = row.row;
+		}
+		var cellOffset = row * colCnt + (col * dis + dit); // column, adjusted for RTL (dis & dit)
+
+		return cellOffset;
+	}
+
+	// cell offset -> day offset
+	function cellOffsetToDayOffset(cellOffset) {
+		var day0 = t.visStart.getDay(); // first date's day of week
+		cellOffset += dayToCellMap[day0]; // normlize cellOffset to beginning-of-week
+		return Math.floor(cellOffset / cellsPerWeek) * 7 // # of days from full weeks
+			+ cellToDayMap[ // # of days from partial last week
+				(cellOffset % cellsPerWeek + cellsPerWeek) % cellsPerWeek // crazy math to handle negative cellOffsets
+			]
+			- day0; // adjustment for beginning-of-week normalization
+	}
+
+	// day offset -> date (JavaScript Date object)
+	function dayOffsetToDate(dayOffset) {
+		var date = cloneDate(t.visStart);
+		addDays(date, dayOffset);
+		return date;
+	}
+
+
+	//
+	// TRANSFORMATIONS: date -> day offset -> cell offset -> cell
+	//
+
+	// date -> cell (combines all transformations)
+	function dateToCell(date) {
+		var dayOffset = dateToDayOffset(date);
+		var cellOffset = dayOffsetToCellOffset(dayOffset);
+		var cell = cellOffsetToCell(cellOffset);
+		return cell;
+	}
+
+	// date -> day offset
+	function dateToDayOffset(date) {
+		return dayDiff(date, t.visStart);
+	}
+
+	// day offset -> cell offset
+	function dayOffsetToCellOffset(dayOffset) {
+		var day0 = t.visStart.getDay(); // first date's day of week
+		dayOffset += day0; // normalize dayOffset to beginning-of-week
+		return Math.floor(dayOffset / 7) * cellsPerWeek // # of cells from full weeks
+			+ dayToCellMap[ // # of cells from partial last week
+				(dayOffset % 7 + 7) % 7 // crazy math to handle negative dayOffsets
+			]
+			- dayToCellMap[day0]; // adjustment for beginning-of-week normalization
+	}
+
+	// cell offset -> cell (object with row & col keys)
+	function cellOffsetToCell(cellOffset) {
+		var colCnt = t.getColCnt();
+
+		// rtl variables. wish we could pre-populate these. but where?
+		var dis = isRTL ? -1 : 1;
+		var dit = isRTL ? colCnt - 1 : 0;
+
+		var row = Math.floor(cellOffset / colCnt);
+		var col = ((cellOffset % colCnt + colCnt) % colCnt) * dis + dit; // column, adjusted for RTL (dis & dit)
+		return {
+			row: row,
+			col: col
+		};
+	}
+
+
+	//
+	// Converts a date range into an array of segment objects.
+	// "Segments" are horizontal stretches of time, sliced up by row.
+	// A segment object has the following properties:
+	// - row
+	// - cols
+	// - isStart
+	// - isEnd
+	//
+	function rangeToSegments(startDate, endDate) {
+		var rowCnt = t.getRowCnt();
+		var colCnt = t.getColCnt();
+		var segments = []; // array of segments to return
+
+		// day offset for given date range
+		var rangeDayOffsetStart = dateToDayOffset(startDate);
+		var rangeDayOffsetEnd = dateToDayOffset(endDate); // exclusive
+
+		// first and last cell offset for the given date range
+		// "last" implies inclusivity
+		var rangeCellOffsetFirst = dayOffsetToCellOffset(rangeDayOffsetStart);
+		var rangeCellOffsetLast = dayOffsetToCellOffset(rangeDayOffsetEnd) - 1;
+
+		// loop through all the rows in the view
+		for (var row=0; row<rowCnt; row++) {
+
+			// first and last cell offset for the row
+			var rowCellOffsetFirst = row * colCnt;
+			var rowCellOffsetLast = rowCellOffsetFirst + colCnt - 1;
+
+			// get the segment's cell offsets by constraining the range's cell offsets to the bounds of the row
+			var segmentCellOffsetFirst = Math.max(rangeCellOffsetFirst, rowCellOffsetFirst);
+			var segmentCellOffsetLast = Math.min(rangeCellOffsetLast, rowCellOffsetLast);
+
+			// make sure segment's offsets are valid and in view
+			if (segmentCellOffsetFirst <= segmentCellOffsetLast) {
+
+				// translate to cells
+				var segmentCellFirst = cellOffsetToCell(segmentCellOffsetFirst);
+				var segmentCellLast = cellOffsetToCell(segmentCellOffsetLast);
+
+				// view might be RTL, so order by leftmost column
+				var cols = [ segmentCellFirst.col, segmentCellLast.col ].sort();
+
+				// Determine if segment's first/last cell is the beginning/end of the date range.
+				// We need to compare "day offset" because "cell offsets" are often ambiguous and
+				// can translate to multiple days, and an edge case reveals itself when we the
+				// range's first cell is hidden (we don't want isStart to be true).
+				var isStart = cellOffsetToDayOffset(segmentCellOffsetFirst) == rangeDayOffsetStart;
+				var isEnd = cellOffsetToDayOffset(segmentCellOffsetLast) + 1 == rangeDayOffsetEnd; // +1 for comparing exclusively
+
+				segments.push({
+					row: row,
+					leftCol: cols[0],
+					rightCol: cols[1],
+					isStart: isStart,
+					isEnd: isEnd
+				});
+			}
+		}
+
+		return segments;
 	}
 	
 
 }
 
-//BUG: unselect needs to be triggered when events are dragged+dropped
+;;
 
-function SelectionManager() {
+function DayEventRenderer() {
 	var t = this;
-	
+
 	
 	// exports
-	t.select = select;
-	t.unselect = unselect;
-	t.reportSelection = reportSelection;
-	t.daySelectionMousedown = daySelectionMousedown;
+	t.renderDayEvents = renderDayEvents;
+	t.draggableDayEvent = draggableDayEvent; // made public so that subclasses can override
+	t.resizableDayEvent = resizableDayEvent; // "
 	
 	
 	// imports
 	var opt = t.opt;
 	var trigger = t.trigger;
-	var defaultSelectionEnd = t.defaultSelectionEnd;
-	var renderSelection = t.renderSelection;
+	var isEventDraggable = t.isEventDraggable;
+	var isEventResizable = t.isEventResizable;
+	var eventEnd = t.eventEnd;
+	var reportEventElement = t.reportEventElement;
+	var eventElementHandlers = t.eventElementHandlers;
+	var showEvents = t.showEvents;
+	var hideEvents = t.hideEvents;
+	var eventDrop = t.eventDrop;
+	var eventResize = t.eventResize;
+	var getRowCnt = t.getRowCnt;
+	var getColCnt = t.getColCnt;
+	var getColWidth = t.getColWidth;
+	var allDayRow = t.allDayRow; // TODO: rename
+	var colLeft = t.colLeft;
+	var colRight = t.colRight;
+	var colContentLeft = t.colContentLeft;
+	var colContentRight = t.colContentRight;
+	var dateToCell = t.dateToCell;
+	var getDaySegmentContainer = t.getDaySegmentContainer;
+	var formatDates = t.calendar.formatDates;
+	var renderDayOverlay = t.renderDayOverlay;
+	var clearOverlays = t.clearOverlays;
 	var clearSelection = t.clearSelection;
-	
-	
-	// locals
-	var selected = false;
+	var getHoverListener = t.getHoverListener;
+	var rangeToSegments = t.rangeToSegments;
+	var cellToDate = t.cellToDate;
+	var cellToCellOffset = t.cellToCellOffset;
+	var cellOffsetToDayOffset = t.cellOffsetToDayOffset;
+	var dateToDayOffset = t.dateToDayOffset;
+	var dayOffsetToCellOffset = t.dayOffsetToCellOffset;
+
+
+	// Render `events` onto the calendar, attach mouse event handlers, and call the `eventAfterRender` callback for each.
+	// Mouse event will be lazily applied, except if the event has an ID of `modifiedEventId`.
+	// Can only be called when the event container is empty (because it wipes out all innerHTML).
+	function renderDayEvents(events, modifiedEventId) {
+
+		// do the actual rendering. Receive the intermediate "segment" data structures.
+		var segments = _renderDayEvents(
+			events,
+			false, // don't append event elements
+			true // set the heights of the rows
+		);
 
+		// report the elements to the View, for general drag/resize utilities
+		segmentElementEach(segments, function(segment, element) {
+			reportEventElement(segment.event, element);
+		});
 
+		// attach mouse handlers
+		attachHandlers(segments, modifiedEventId);
 
-	// unselectAuto
-	if (opt('selectable') && opt('unselectAuto')) {
-		$(document).mousedown(function(ev) {
-			var ignore = opt('unselectCancel');
-			if (ignore) {
-				if ($(ev.target).parents(ignore).length) { // could be optimized to stop after first match
-					return;
-				}
+		// call `eventAfterRender` callback for each event
+		segmentElementEach(segments, function(segment, element) {
+			trigger('eventAfterRender', segment.event, segment.event, element);
+		});
+	}
+
+
+	// Render an event on the calendar, but don't report them anywhere, and don't attach mouse handlers.
+	// Append this event element to the event container, which might already be populated with events.
+	// If an event's segment will have row equal to `adjustRow`, then explicitly set its top coordinate to `adjustTop`.
+	// This hack is used to maintain continuity when user is manually resizing an event.
+	// Returns an array of DOM elements for the event.
+	function renderTempDayEvent(event, adjustRow, adjustTop) {
+
+		// actually render the event. `true` for appending element to container.
+		// Recieve the intermediate "segment" data structures.
+		var segments = _renderDayEvents(
+			[ event ],
+			true, // append event elements
+			false // don't set the heights of the rows
+		);
+
+		var elements = [];
+
+		// Adjust certain elements' top coordinates
+		segmentElementEach(segments, function(segment, element) {
+			if (segment.row === adjustRow) {
+				element.css('top', adjustTop);
 			}
-			unselect(ev);
+			elements.push(element[0]); // accumulate DOM nodes
 		});
+
+		return elements;
 	}
-	
 
-	function select(startDate, endDate, allDay) {
-		unselect();
-		if (!endDate) {
-			endDate = defaultSelectionEnd(startDate, allDay);
+
+	// Render events onto the calendar. Only responsible for the VISUAL aspect.
+	// Not responsible for attaching handlers or calling callbacks.
+	// Set `doAppend` to `true` for rendering elements without clearing the existing container.
+	// Set `doRowHeights` to allow setting the height of each row, to compensate for vertical event overflow.
+	function _renderDayEvents(events, doAppend, doRowHeights) {
+
+		// where the DOM nodes will eventually end up
+		var finalContainer = getDaySegmentContainer();
+
+		// the container where the initial HTML will be rendered.
+		// If `doAppend`==true, uses a temporary container.
+		var renderContainer = doAppend ? $("<div/>") : finalContainer;
+
+		var segments = buildSegments(events);
+		var html;
+		var elements;
+
+		// calculate the desired `left` and `width` properties on each segment object
+		calculateHorizontals(segments);
+
+		// build the HTML string. relies on `left` property
+		html = buildHTML(segments);
+
+		// render the HTML. innerHTML is considerably faster than jQuery's .html()
+		renderContainer[0].innerHTML = html;
+
+		// retrieve the individual elements
+		elements = renderContainer.children();
+
+		// if we were appending, and thus using a temporary container,
+		// re-attach elements to the real container.
+		if (doAppend) {
+			finalContainer.append(elements);
 		}
-		renderSelection(startDate, endDate, allDay);
-		reportSelection(startDate, endDate, allDay);
+
+		// assigns each element to `segment.event`, after filtering them through user callbacks
+		resolveElements(segments, elements);
+
+		// Calculate the left and right padding+margin for each element.
+		// We need this for setting each element's desired outer width, because of the W3C box model.
+		// It's important we do this in a separate pass from acually setting the width on the DOM elements
+		// because alternating reading/writing dimensions causes reflow for every iteration.
+		segmentElementEach(segments, function(segment, element) {
+			segment.hsides = hsides(element, true); // include margins = `true`
+		});
+
+		// Set the width of each element
+		segmentElementEach(segments, function(segment, element) {
+			element.width(
+				Math.max(0, segment.outerWidth - segment.hsides)
+			);
+		});
+
+		// Grab each element's outerHeight (setVerticals uses this).
+		// To get an accurate reading, it's important to have each element's width explicitly set already.
+		segmentElementEach(segments, function(segment, element) {
+			segment.outerHeight = element.outerHeight(true); // include margins = `true`
+		});
+
+		// Set the top coordinate on each element (requires segment.outerHeight)
+		setVerticals(segments, doRowHeights);
+
+		return segments;
 	}
-	
-	
-	function unselect(ev) {
-		if (selected) {
-			selected = false;
-			clearSelection();
-			trigger('unselect', null, ev);
+
+
+	// Generate an array of "segments" for all events.
+	function buildSegments(events) {
+		var segments = [];
+		for (var i=0; i<events.length; i++) {
+			var eventSegments = buildSegmentsForEvent(events[i]);
+			segments.push.apply(segments, eventSegments); // append an array to an array
 		}
+		return segments;
 	}
-	
-	
-	function reportSelection(startDate, endDate, allDay, ev) {
-		selected = true;
-		trigger('select', null, startDate, endDate, allDay, ev);
+
+
+	// Generate an array of segments for a single event.
+	// A "segment" is the same data structure that View.rangeToSegments produces,
+	// with the addition of the `event` property being set to reference the original event.
+	function buildSegmentsForEvent(event) {
+		var startDate = event.start;
+		var endDate = exclEndDay(event);
+		var segments = rangeToSegments(startDate, endDate);
+		for (var i=0; i<segments.length; i++) {
+			segments[i].event = event;
+		}
+		return segments;
 	}
-	
-	
-	function daySelectionMousedown(ev) { // not really a generic manager method, oh well
-		var cellDate = t.cellDate;
-		var cellIsAllDay = t.cellIsAllDay;
-		var hoverListener = t.getHoverListener();
-		var reportDayClick = t.reportDayClick; // this is hacky and sort of weird
-		if (ev.which == 1 && opt('selectable')) { // which==1 means left mouse button
-			unselect(ev);
-			var _mousedownElement = this;
-			var dates;
-			hoverListener.start(function(cell, origCell) { // TODO: maybe put cellDate/cellIsAllDay info in cell
-				clearSelection();
-				if (cell && cellIsAllDay(cell)) {
-					dates = [ cellDate(origCell), cellDate(cell) ].sort(cmp);
-					renderSelection(dates[0], dates[1], true);
-				}else{
-					dates = null;
-				}
-			}, ev);
-			$(document).one('mouseup', function(ev) {
-				hoverListener.stop();
-				if (dates) {
-					if (+dates[0] == +dates[1]) {
-						reportDayClick(dates[0], true, ev);
-					}
-					reportSelection(dates[0], dates[1], true, ev);
-				}
-			});
+
+
+	// Sets the `left` and `outerWidth` property of each segment.
+	// These values are the desired dimensions for the eventual DOM elements.
+	function calculateHorizontals(segments) {
+		var isRTL = opt('isRTL');
+		for (var i=0; i<segments.length; i++) {
+			var segment = segments[i];
+
+			// Determine functions used for calulating the elements left/right coordinates,
+			// depending on whether the view is RTL or not.
+			// NOTE:
+			// colLeft/colRight returns the coordinate butting up the edge of the cell.
+			// colContentLeft/colContentRight is indented a little bit from the edge.
+			var leftFunc = (isRTL ? segment.isEnd : segment.isStart) ? colContentLeft : colLeft;
+			var rightFunc = (isRTL ? segment.isStart : segment.isEnd) ? colContentRight : colRight;
+
+			var left = leftFunc(segment.leftCol);
+			var right = rightFunc(segment.rightCol);
+			segment.left = left;
+			segment.outerWidth = right - left;
 		}
 	}
 
 
-}
- 
-function OverlayManager() {
-	var t = this;
-	
-	
-	// exports
-	t.renderOverlay = renderOverlay;
-	t.clearOverlays = clearOverlays;
-	
-	
-	// locals
-	var usedOverlays = [];
-	var unusedOverlays = [];
-	
-	
-	function renderOverlay(rect, parent) {
-		var e = unusedOverlays.shift();
-		if (!e) {
-			e = $("<div class='fc-cell-overlay' style='position:absolute;z-index:3'/>");
+	// Build a concatenated HTML string for an array of segments
+	function buildHTML(segments) {
+		var html = '';
+		for (var i=0; i<segments.length; i++) {
+			html += buildHTMLForSegment(segments[i]);
 		}
-		if (e[0].parentNode != parent[0]) {
-			e.appendTo(parent);
+		return html;
+	}
+
+
+	// Build an HTML string for a single segment.
+	// Relies on the following properties:
+	// - `segment.event` (from `buildSegmentsForEvent`)
+	// - `segment.left` (from `calculateHorizontals`)
+	function buildHTMLForSegment(segment) {
+		var html = '';
+		var isRTL = opt('isRTL');
+		var event = segment.event;
+		var url = event.url;
+
+		// generate the list of CSS classNames
+		var classNames = [ 'fc-event', 'fc-event-skin', 'fc-event-hori' ];
+		if (isEventDraggable(event)) {
+			classNames.push('fc-event-draggable');
 		}
-		usedOverlays.push(e.css(rect).show());
-		return e;
+		if (segment.isStart) {
+			classNames.push('fc-event-start');
+		}
+		if (segment.isEnd) {
+			classNames.push('fc-event-end');
+		}
+		// use the event's configured classNames
+		// guaranteed to be an array via `normalizeEvent`
+		classNames = classNames.concat(event.className);
+		if (event.source) {
+			// use the event's source's classNames, if specified
+			classNames = classNames.concat(event.source.className || []);
+		}
+
+		// generate a semicolon delimited CSS string for any of the "skin" properties
+		// of the event object (`backgroundColor`, `borderColor` and such)
+		var skinCss = getSkinCss(event, opt);
+
+		if (url) {
+			html += "<a href='" + htmlEscape(url) + "'";
+		}else{
+			html += "<div";
+		}
+		html +=
+			" class='" + classNames.join(' ') + "'" +
+			" style=" +
+				"'" +
+				"position:absolute;" +
+				"left:" + segment.left + "px;" +
+				skinCss +
+				"'" +
+			" tabindex='0'>" +
+			"<div class='fc-event-inner'>";
+		if (!event.allDay && segment.isStart) {
+			html +=
+				"<span class='fc-event-time'>" +
+				htmlEscape(
+					formatDates(event.start, event.end, opt('timeFormat'))
+				) +
+				"</span>";
+		}
+		html +=
+			"<span class='fc-event-title'>" +
+			htmlEscape(event.title || '') +
+			"</span>" +
+			"</div>";
+		if (segment.isEnd && isEventResizable(event)) {
+			html +=
+				"<div class='ui-resizable-handle ui-resizable-" + (isRTL ? 'w' : 'e') + "'>" +
+				"&nbsp;&nbsp;&nbsp;" + // makes hit area a lot better for IE6/7
+				"</div>";
+		}
+		html += "</" + (url ? "a" : "div") + ">";
+
+		// TODO:
+		// When these elements are initially rendered, they will be briefly visibile on the screen,
+		// even though their widths/heights are not set.
+		// SOLUTION: initially set them as visibility:hidden ?
+
+		return html;
 	}
-	
 
-	function clearOverlays() {
-		var e;
-		while (e = usedOverlays.shift()) {
-			unusedOverlays.push(e.hide().unbind());
+
+	// Associate each segment (an object) with an element (a jQuery object),
+	// by setting each `segment.element`.
+	// Run each element through the `eventRender` filter, which allows developers to
+	// modify an existing element, supply a new one, or cancel rendering.
+	function resolveElements(segments, elements) {
+		for (var i=0; i<segments.length; i++) {
+			var segment = segments[i];
+			var event = segment.event;
+			var element = elements.eq(i);
+
+			// call the trigger with the original element
+			var triggerRes = trigger('eventRender', event, event, element);
+
+			if (triggerRes === false) {
+				// if `false`, remove the event from the DOM and don't assign it to `segment.event`
+				element.remove();
+			}
+			else {
+				if (triggerRes && triggerRes !== true) {
+					// the trigger returned a new element, but not `true` (which means keep the existing element)
+
+					// re-assign the important CSS dimension properties that were already assigned in `buildHTMLForSegment`
+					triggerRes = $(triggerRes)
+						.css({
+							position: 'absolute',
+							left: segment.left
+						});
+
+					element.replaceWith(triggerRes);
+					element = triggerRes;
+				}
+
+				segment.element = element;
+			}
 		}
 	}
 
 
-}
 
-function CoordinateGrid(buildFunc) {
+	/* Top-coordinate Methods
+	-------------------------------------------------------------------------------------------------*/
 
-	var t = this;
-	var rows;
-	var cols;
-	
-	
-	t.build = function() {
-		rows = [];
-		cols = [];
-		buildFunc(rows, cols);
-	};
-	
-	
-	t.cell = function(x, y) {
-		var rowCnt = rows.length;
-		var colCnt = cols.length;
-		var i, r=-1, c=-1;
-		for (i=0; i<rowCnt; i++) {
-			if (y >= rows[i][0] && y < rows[i][1]) {
-				r = i;
-				break;
+
+	// Sets the "top" CSS property for each element.
+	// If `doRowHeights` is `true`, also sets each row's first cell to an explicit height,
+	// so that if elements vertically overflow, the cell expands vertically to compensate.
+	function setVerticals(segments, doRowHeights) {
+		var overflowLinks = {};
+		var rowContentHeights = calculateVerticals(segments, overflowLinks); // also sets segment.top
+		var rowContentElements = getRowContentElements(); // returns 1 inner div per row
+		var rowContentTops = [];
+
+		// Set each row's height by setting height of first inner div
+		if (doRowHeights) {
+			for (var i=0; i<rowContentElements.length; i++) {
+				rowContentElements[i].height(rowContentHeights[i]);
+				if (overflowLinks[i])
+					renderOverflowLinks(overflowLinks[i], rowContentElements[i]);
 			}
 		}
-		for (i=0; i<colCnt; i++) {
-			if (x >= cols[i][0] && x < cols[i][1]) {
-				c = i;
-				break;
-			}
+
+		// Get each row's top, relative to the views's origin.
+		// Important to do this after setting each row's height.
+		for (var i=0; i<rowContentElements.length; i++) {
+			rowContentTops.push(
+				rowContentElements[i].position().top
+			);
 		}
-		return (r>=0 && c>=0) ? { row:r, col:c } : null;
-	};
-	
-	
-	t.rect = function(row0, col0, row1, col1, originElement) { // row1,col1 is inclusive
-		var origin = originElement.offset();
-		return {
-			top: rows[row0][0] - origin.top,
-			left: cols[col0][0] - origin.left,
-			width: cols[col1][1] - cols[col0][0],
-			height: rows[row1][1] - rows[row0][0]
-		};
-	};
 
-}
+		// Set each segment element's CSS "top" property.
+		// Each segment object has a "top" property, which is relative to the row's top, but...
+		segmentElementEach(segments, function(segment, element) {
+			if (!segment.overflow) {
+				element.css(
+					'top',
+					rowContentTops[segment.row] + segment.top // ...now, relative to views's origin
+				);
+			}
+			else {
+				element.hide();
+			}
+		});
+	}
 
-function HoverListener(coordinateGrid) {
 
+	// Calculate the "top" coordinate for each segment, relative to the "top" of the row.
+	// Also, return an array that contains the "content" height for each row
+	// (the height displaced by the vertically stacked events in the row).
+	// Requires segments to have their `outerHeight` property already set.
+	function calculateVerticals(segments, overflowLinks) {
+		var rowCnt = getRowCnt();
+		var colCnt = getColCnt();
+		var rowContentHeights = []; // content height for each row
+		var segmentRows = buildSegmentRows(segments); // an array of segment arrays, one for each row
+		var maxHeight = opt('maxHeight');
+		var top;
+
+		for (var rowI=0; rowI<rowCnt; rowI++) {
+			var segmentRow = segmentRows[rowI];
 
-	var t = this;
-	var bindType;
-	var change;
-	var firstCell;
-	var cell;
-	
-	
-	t.start = function(_change, ev, _bindType) {
-		change = _change;
-		firstCell = cell = null;
-		coordinateGrid.build();
-		mouse(ev);
-		bindType = _bindType || 'mousemove';
-		$(document).bind(bindType, mouse);
-	};
-	
-	
-	function mouse(ev) {
-		_fixUIEvent(ev); // see below
-		var newCell = coordinateGrid.cell(ev.pageX, ev.pageY);
-		if (!newCell != !cell || newCell && (newCell.row != cell.row || newCell.col != cell.col)) {
-			if (newCell) {
-				if (!firstCell) {
-					firstCell = newCell;
+			// an array of running total heights for each column.
+			// initialize with all zeros.
+			overflowLinks[rowI] = {};
+			var colHeights = [];
+			var overflows = [];
+			for (var colI=0; colI<colCnt; colI++) {
+				colHeights.push(0);
+				overflows.push(0);
+			}
+
+			// loop through every segment
+			for (var segmentI=0; segmentI<segmentRow.length; segmentI++) {
+				var segment = segmentRow[segmentI];
+
+				// find the segment's top coordinate by looking at the max height
+				// of all the columns the segment will be in.
+				top = arrayMax(
+					colHeights.slice(
+						segment.leftCol,
+						segment.rightCol + 1 // make exclusive for slice
+					)
+				);
+
+				if (maxHeight && top + segment.outerHeight > maxHeight) {
+					segment.overflow = true;
+				}
+				else {
+					segment.top = top;
+					top += segment.outerHeight;
+				}
+
+				// adjust the columns to account for the segment's height
+				for (var colI=segment.leftCol; colI<=segment.rightCol; colI++) {
+					if (overflows[colI]) {
+						segment.overflow = true;
+					}
+					if (segment.overflow) {
+						if (segment.isStart && !overflowLinks[rowI][colI])
+							overflowLinks[rowI][colI] = { seg:segment, top:top, date:cloneDate(segment.event.start, true), count:0 };
+						if (overflowLinks[rowI][colI])
+							overflowLinks[rowI][colI].count++;
+						overflows[colI]++;
+					}
+					else {
+						colHeights[colI] = top;
+					}
 				}
-				change(newCell, firstCell, newCell.row-firstCell.row, newCell.col-firstCell.col);
-			}else{
-				change(newCell, firstCell);
 			}
-			cell = newCell;
+
+			// the tallest column in the row should be the "content height"
+			rowContentHeights.push(arrayMax(colHeights));
 		}
+
+		return rowContentHeights;
 	}
-	
-	
-	t.stop = function() {
-		$(document).unbind(bindType, mouse);
-		return cell;
-	};
-	
-	
-}
 
 
+	// Build an array of segment arrays, each representing the segments that will
+	// be in a row of the grid, sorted by which event should be closest to the top.
+	function buildSegmentRows(segments) {
+		var rowCnt = getRowCnt();
+		var segmentRows = [];
+		var segmentI;
+		var segment;
+		var rowI;
 
-// this fix was only necessary for jQuery UI 1.8.16 (and jQuery 1.7 or 1.7.1)
-// upgrading to jQuery UI 1.8.17 (and using either jQuery 1.7 or 1.7.1) fixed the problem
-// but keep this in here for 1.8.16 users
-// and maybe remove it down the line
+		// group segments by row
+		for (segmentI=0; segmentI<segments.length; segmentI++) {
+			segment = segments[segmentI];
+			rowI = segment.row;
+			if (segment.element) { // was rendered?
+				if (segmentRows[rowI]) {
+					// already other segments. append to array
+					segmentRows[rowI].push(segment);
+				}
+				else {
+					// first segment in row. create new array
+					segmentRows[rowI] = [ segment ];
+				}
+			}
+		}
 
-function _fixUIEvent(event) { // for issue 1168
-	if (event.pageX === undefined) {
-		event.pageX = event.originalEvent.pageX;
-		event.pageY = event.originalEvent.pageY;
-	}
-}
-function HorizontalPositionCache(getElement) {
+		// sort each row
+		for (rowI=0; rowI<rowCnt; rowI++) {
+			segmentRows[rowI] = sortSegmentRow(
+				segmentRows[rowI] || [] // guarantee an array, even if no segments
+			);
+		}
 
-	var t = this,
-		elements = {},
-		lefts = {},
-		rights = {};
-		
-	function e(i) {
-		return elements[i] = elements[i] || getElement(i);
+		return segmentRows;
 	}
-	
-	t.left = function(i) {
-		return lefts[i] = lefts[i] === undefined ? e(i).position().left : lefts[i];
-	};
-	
-	t.right = function(i) {
-		return rights[i] = rights[i] === undefined ? t.left(i) + e(i).width() : rights[i];
-	};
-	
-	t.clear = function() {
-		elements = {};
-		lefts = {};
-		rights = {};
-	};
-	
-}
 
-/* Additional view: list (by bruederli@kolabsys.com)
----------------------------------------------------------------------------------*/
 
-function ListEventRenderer() {
-	var t = this;
-	
-	// exports
-	t.renderEvents = renderEvents;
-	t.renderEventTime = renderEventTime;
-	t.compileDaySegs = compileSegs; // for DayEventRenderer
-	t.clearEvents = clearEvents;
-	t.lazySegBind = lazySegBind;
-	t.sortCmp = sortCmp;
-	
-	// imports
-	DayEventRenderer.call(t);
-	var opt = t.opt;
-	var trigger = t.trigger;
-	var reportEvents = t.reportEvents;
-	var reportEventClear = t.reportEventClear;
-	var reportEventElement = t.reportEventElement;
-	var eventElementHandlers = t.eventElementHandlers;
-	var showEvents = t.showEvents;
-	var hideEvents = t.hideEvents;
-	var getListContainer = t.getDaySegmentContainer;
-	var calendar = t.calendar;
-	var formatDate = calendar.formatDate;
-	var formatDates = calendar.formatDates;
-	
-	
-	/* Rendering
-	--------------------------------------------------------------------*/
-	
-	function clearEvents() {
-		reportEventClear();
-		getListContainer().empty();
-	}
-	
-	function renderEvents(events, modifiedEventId) {
-		events.sort(sortCmp);
-		reportEvents(events);
-		renderSegs(compileSegs(events), modifiedEventId);
+	// Sort an array of segments according to which segment should appear closest to the top
+	function sortSegmentRow(segments) {
+		var sortedSegments = [];
+
+		// build the subrow array
+		var subrows = buildSegmentSubrows(segments);
+
+		// flatten it
+		for (var i=0; i<subrows.length; i++) {
+			sortedSegments.push.apply(sortedSegments, subrows[i]); // append an array to an array
+		}
+
+		return sortedSegments;
 	}
-	
-	function compileSegs(events) {
-		var segs = [];
-		var colFormat = opt('titleFormat', 'day');
-		var firstDay = opt('firstDay');
-		var segmode = opt('listSections');
-		var event, i, dd, wd, md, seg, segHash, curSegHash, segDate, curSeg = -1;
-		var today = clearTime(new Date());
-		var weekstart = addDays(cloneDate(today), -((today.getDay() - firstDay + 7) % 7));
-		
-		for (i=0; i < events.length; i++) {
-			event = events[i];
-			
-			// skip events out of range
-			if ((event.end || event.start) < t.start || event.start > t.visEnd)
-				continue;
-			
-			// define sections of this event
-			// create smart sections such as today, tomorrow, this week, next week, next month, ect.
-			segDate = cloneDate(event.start < t.start && event.end > t.start ? t.start : event.start, true);
-			dd = dayDiff(segDate, today);
-			wd = Math.floor(dayDiff(segDate, weekstart) / 7);
-			md = segDate.getMonth() + ((segDate.getYear() - today.getYear()) * 12) - today.getMonth();
-			
-			// build section title
-			if (segmode == 'smart') {
-				if (dd < 0) {
-					segHash = opt('listTexts', 'past');
-				} else if (dd == 0) {
-					segHash = opt('listTexts', 'today');
-				} else if (dd == 1) {
-					segHash = opt('listTexts', 'tomorrow');
-				} else if (wd == 0) {
-					segHash = opt('listTexts', 'thisWeek');
-				} else if (wd == 1) {
-					segHash = opt('listTexts', 'nextWeek');
-				} else if (md == 0) {
-					segHash = opt('listTexts', 'thisMonth');
-				} else if (md == 1) {
-					segHash = opt('listTexts', 'nextMonth');
-				} else if (md > 1) {
-					segHash = opt('listTexts', 'future');
-				}
-			} else if (segmode == 'month') {
-				segHash = formatDate(segDate, 'MMMM yyyy');
-			} else if (segmode == 'week') {
-				segHash = opt('listTexts', 'week') + formatDate(segDate, ' W');
-			} else if (segmode == 'day') {
-				segHash = formatDate(segDate, colFormat);
-			} else {
-				segHash = '';
+
+
+	// Take an array of segments, which are all assumed to be in the same row,
+	// and sort into subrows.
+	function buildSegmentSubrows(segments) {
+
+		// Give preference to elements with certain criteria, so they have
+		// a chance to be closer to the top.
+		segments.sort(compareDaySegments);
+
+		var subrows = [];
+		for (var i=0; i<segments.length; i++) {
+			var segment = segments[i];
+
+			// loop through subrows, starting with the topmost, until the segment
+			// doesn't collide with other segments.
+			for (var j=0; j<subrows.length; j++) {
+				if (!isDaySegmentCollision(segment, subrows[j])) {
+					break;
+				}
 			}
-			
-			// start new segment
-			if (segHash != curSegHash) {
-				segs[++curSeg] = { events: [], start: segDate, title: segHash, daydiff: dd, weekdiff: wd, monthdiff: md };
-				curSegHash = segHash;
+			// `j` now holds the desired subrow index
+			if (subrows[j]) {
+				subrows[j].push(segment);
+			}
+			else {
+				subrows[j] = [ segment ];
 			}
-			
-			segs[curSeg].events.push(event);
 		}
-		
-		return segs;
+
+		return subrows;
 	}
 
-	function sortCmp(a, b) {
-		var sd = a.start.getTime() - b.start.getTime();
-		return sd || (a.end ? a.end.getTime() : 0) - (b.end ? b.end.getTime() : 0);
+
+	// Return an array of jQuery objects for the placeholder content containers of each row.
+	// The content containers don't actually contain anything, but their dimensions should match
+	// the events that are overlaid on top.
+	function getRowContentElements() {
+		var i;
+		var rowCnt = getRowCnt();
+		var rowDivs = [];
+		for (i=0; i<rowCnt; i++) {
+			rowDivs[i] = allDayRow(i)
+				.find('div.fc-day-content > div');
+		}
+		return rowDivs;
 	}
-	
-	function renderSegs(segs, modifiedEventId) {
-		var tm = opt('theme') ? 'ui' : 'fc';
-		var headerClass = tm + "-widget-header";
-		var contentClass = tm + "-widget-content";
-		var i, j, seg, event, times, s, skinCss, skinCssAttr, classes, segContainer, eventElement, eventElements, triggerRes;
 
-		for (j=0; j < segs.length; j++) {
-			seg = segs[j];
-			
-			if (seg.title) {
-				$('<div class="fc-list-header ' + headerClass + '">' + htmlEscape(seg.title) + '</div>').appendTo(getListContainer());
-			}
-			segContainer = $('<div>').addClass('fc-list-section ' + contentClass).appendTo(getListContainer());
-			s = '';
-			
-			for (i=0; i < seg.events.length; i++) {
-				event = seg.events[i];
-				times = renderEventTime(event, seg);
-				skinCss = getSkinCss(event, opt);
-				skinCssAttr = (skinCss ? " style='" + skinCss + "'" : '');
-				classes = ['fc-event', 'fc-event-skin', 'fc-event-vert', 'fc-corner-top', 'fc-corner-bottom'].concat(event.className);
-				if (event.source && event.source.className) {
-					classes = classes.concat(event.source.className);
-				}
-				
-				s += 
-					"<div class='" + classes.join(' ') + "'" + skinCssAttr + ">" +
-					"<div class='fc-event-inner fc-event-skin'" + skinCssAttr + ">" +
-					"<div class='fc-event-head fc-event-skin'" + skinCssAttr + ">" +
-					"<div class='fc-event-time'>" +
-					(times[0] ? '<span class="fc-col-date">' + times[0] + '</span> ' : '') +
-					(times[1] ? '<span class="fc-col-time">' + times[1] + '</span>' : '') +
-					"</div>" +
-					"</div>" +
-					"<div class='fc-event-content'>" +
-					"<div class='fc-event-title'>" +
-					htmlEscape(event.title) +
-					"</div>" +
-					"</div>" +
-					"<div class='fc-event-bg'></div>" +
-					"</div>" + // close inner
-					"</div>";  // close outer
-			}
-			
-			segContainer[0].innerHTML = s;
-			eventElements = segContainer.children();
 
-			// retrieve elements, run through eventRender callback, bind event handlers
-			for (i=0; i < seg.events.length; i++) {
-				event = seg.events[i];
-				eventElement = $(eventElements[i]); // faster than eq()
-				triggerRes = trigger('eventRender', event, event, eventElement);
-				if (triggerRes === false) {
-					eventElement.remove();
-				} else {
-					if (triggerRes && triggerRes !== true) {
-						eventElement.remove();
-						eventElement = $(triggerRes).appendTo(segContainer);
-					}
-					if (event._id === modifiedEventId) {
-						eventElementHandlers(event, eventElement, seg);
-					} else {
-						eventElement[0]._fci = i; // for lazySegBind
-					}
-					reportEventElement(event, eventElement);
+	function renderOverflowLinks(overflowLinks, rowDiv) {
+		var container = getDaySegmentContainer();
+		var colCnt = getColCnt();
+		var element, triggerRes, link;
+		for (var j=0; j<colCnt; j++) {
+			if ((link = overflowLinks[j])) {
+				if (link.count > 1) {
+					element = $('<a>').addClass('fc-more-link').html('+'+link.count).appendTo(container);
+					element[0].style.position = 'absolute';
+					element[0].style.left = link.seg.left + 'px';
+					element[0].style.top = (link.top + rowDiv[0].offsetTop) + 'px';
+					triggerRes = trigger('overflowRender', link, { count:link.count, date:link.date }, element);
+					if (triggerRes === false)
+						element.remove();
+				}
+				else {
+					link.seg.top = link.top;
+					link.seg.overflow = false;
 				}
 			}
-		
-			lazySegBind(segContainer, seg, eventElementHandlers);
 		}
-		
-		markFirstLast(getListContainer());
 	}
-	
-	// event time/date range to display
-	function renderEventTime(event, seg) {
-		var timeFormat = opt('timeFormat');
-		var dateFormat = opt('columnFormat');
-		var segmode = opt('listSections');
-		var duration = event.end ? event.end.getTime() - event.start.getTime() : 0;
-		var datestr = '', timestr = '';
-		
-		if (segmode == 'smart') {
-			if (event.start < seg.start) {
-				datestr = opt('listTexts', 'until') + ' ' + formatDate(event.end, (event.allDay || event.end.getDate() != seg.start.getDate()) ? dateFormat : timeFormat);
-			} else if (duration > DAY_MS) {
-				datestr = formatDates(event.start, event.end, dateFormat + '{ - ' + dateFormat + '}');
-			} else if (seg.daydiff == 0) {
-				datestr = opt('listTexts', 'today');
-			}	else if (seg.daydiff == 1) {
-				datestr = opt('listTexts', 'tomorrow');
-			} else if (seg.weekdiff == 0 || seg.weekdiff == 1) {
-				datestr = formatDate(event.start, 'dddd');
-			} else if (seg.daydiff > 1 || seg.daydiff < 0) {
-				datestr = formatDate(event.start, dateFormat);
+
+
+	/* Mouse Handlers
+	---------------------------------------------------------------------------------------------------*/
+	// TODO: better documentation!
+
+
+	function attachHandlers(segments, modifiedEventId) {
+		var segmentContainer = getDaySegmentContainer();
+
+		segmentElementEach(segments, function(segment, element, i) {
+			var event = segment.event;
+			if (event._id === modifiedEventId) {
+				bindDaySeg(event, element, segment);
+			}else{
+				element[0]._fci = i; // for lazySegBind
 			}
-		} else if (segmode != 'day') {
-			datestr = formatDates(event.start, event.end, dateFormat + (duration > DAY_MS ? '{ - ' + dateFormat + '}' : ''));
+		});
+
+		lazySegBind(segmentContainer, segments, bindDaySeg);
+	}
+
+
+	function bindDaySeg(event, eventElement, segment) {
+
+		if (isEventDraggable(event)) {
+			t.draggableDayEvent(event, eventElement, segment); // use `t` so subclasses can override
 		}
-		
-		if (!datestr && event.allDay) {
-			timestr = opt('allDayText');
-		} else if ((duration < DAY_MS || !datestr) && !event.allDay) {
-			timestr = formatDates(event.start, event.end, timeFormat);
+
+		if (
+			segment.isEnd && // only allow resizing on the final segment for an event
+			isEventResizable(event)
+		) {
+			t.resizableDayEvent(event, eventElement, segment); // use `t` so subclasses can override
 		}
-		
-		return [datestr, timestr];
+
+		// attach all other handlers.
+		// needs to be after, because resizableDayEvent might stopImmediatePropagation on click
+		eventElementHandlers(event, eventElement);
 	}
+
 	
-	function lazySegBind(container, seg, bindHandlers) {
-		container.unbind('mouseover').mouseover(function(ev) {
-			var parent = ev.target, e = parent, i, event;
-			while (parent != this) {
-				e = parent;
-				parent = parent.parentNode;
+	function draggableDayEvent(event, eventElement) {
+		var hoverListener = getHoverListener();
+		var dayDelta;
+		eventElement.draggable({
+			delay: 50,
+			opacity: opt('dragOpacity'),
+			revertDuration: opt('dragRevertDuration'),
+			start: function(ev, ui) {
+				trigger('eventDragStart', eventElement, event, ev, ui);
+				hideEvents(event, eventElement);
+				hoverListener.start(function(cell, origCell, rowDelta, colDelta) {
+					eventElement.draggable('option', 'revert', !cell || !rowDelta && !colDelta);
+					clearOverlays();
+					if (cell) {
+						var origDate = cellToDate(origCell);
+						var date = cellToDate(cell);
+						dayDelta = dayDiff(date, origDate);
+						renderDayOverlay(
+							addDays(cloneDate(event.start), dayDelta),
+							addDays(exclEndDay(event), dayDelta)
+						);
+					}else{
+						dayDelta = 0;
+					}
+				}, ev, 'drag');
+			},
+			stop: function(ev, ui) {
+				hoverListener.stop();
+				clearOverlays();
+				trigger('eventDragStop', eventElement, event, ev, ui);
+				if (dayDelta) {
+					eventDrop(this, event, dayDelta, 0, event.allDay, ev, ui);
+				}else{
+					eventElement.css('filter', ''); // clear IE opacity side-effects
+					showEvents(event, eventElement);
+				}
 			}
-			if ((i = e._fci) !== undefined) {
-				e._fci = undefined;
-				event = seg.events[i];
-				bindHandlers(event, container.children().eq(i), seg);
-				$(ev.target).trigger(ev);
+		});
+	}
+
+	
+	function resizableDayEvent(event, element, segment) {
+		var isRTL = opt('isRTL');
+		var direction = isRTL ? 'w' : 'e';
+		var handle = element.find('.ui-resizable-' + direction); // TODO: stop using this class because we aren't using jqui for this
+		var isResizing = false;
+		
+		// TODO: look into using jquery-ui mouse widget for this stuff
+		disableTextSelection(element); // prevent native <a> selection for IE
+		element
+			.mousedown(function(ev) { // prevent native <a> selection for others
+				ev.preventDefault();
+			})
+			.click(function(ev) {
+				if (isResizing) {
+					ev.preventDefault(); // prevent link from being visited (only method that worked in IE6)
+					ev.stopImmediatePropagation(); // prevent fullcalendar eventClick handler from being called
+					                               // (eventElementHandlers needs to be bound after resizableDayEvent)
+				}
+			});
+		
+		handle.mousedown(function(ev) {
+			if (ev.which != 1) {
+				return; // needs to be left mouse button
+			}
+			isResizing = true;
+			var hoverListener = getHoverListener();
+			var rowCnt = getRowCnt();
+			var colCnt = getColCnt();
+			var elementTop = element.css('top');
+			var dayDelta;
+			var helpers;
+			var eventCopy = $.extend({}, event);
+			var minCellOffset = dayOffsetToCellOffset( dateToDayOffset(event.start) );
+			clearSelection();
+			$('body')
+				.css('cursor', direction + '-resize')
+				.one('mouseup', mouseup);
+			trigger('eventResizeStart', this, event, ev);
+			hoverListener.start(function(cell, origCell) {
+				if (cell) {
+
+					var origCellOffset = cellToCellOffset(origCell);
+					var cellOffset = cellToCellOffset(cell);
+
+					// don't let resizing move earlier than start date cell
+					cellOffset = Math.max(cellOffset, minCellOffset);
+
+					dayDelta =
+						cellOffsetToDayOffset(cellOffset) -
+						cellOffsetToDayOffset(origCellOffset);
+
+					if (dayDelta) {
+						eventCopy.end = addDays(eventEnd(event), dayDelta, true);
+						var oldHelpers = helpers;
+
+						helpers = renderTempDayEvent(eventCopy, segment.row, elementTop);
+						helpers = $(helpers); // turn array into a jQuery object
+
+						helpers.find('*').css('cursor', direction + '-resize');
+						if (oldHelpers) {
+							oldHelpers.remove();
+						}
+
+						hideEvents(event);
+					}
+					else {
+						if (helpers) {
+							showEvents(event);
+							helpers.remove();
+							helpers = null;
+						}
+					}
+					clearOverlays();
+					renderDayOverlay( // coordinate grid already rebuilt with hoverListener.start()
+						event.start,
+						addDays( exclEndDay(event), dayDelta )
+						// TODO: instead of calling renderDayOverlay() with dates,
+						// call _renderDayOverlay (or whatever) with cell offsets.
+					);
+				}
+			}, ev);
+			
+			function mouseup(ev) {
+				trigger('eventResizeStop', this, event, ev);
+				$('body').css('cursor', '');
+				hoverListener.stop();
+				clearOverlays();
+				if (dayDelta) {
+					eventResize(this, event, dayDelta, 0, ev);
+					// event redraw will clear helpers
+				}
+				// otherwise, the drag handler already restored the old events
+				
+				setTimeout(function() { // make this happen after the element's click event
+					isResizing = false;
+				},0);
 			}
-			ev.stopPropagation();
 		});
 	}
 	
-}
-
 
-fcViews.list = ListView;
+}
 
 
-function ListView(element, calendar) {
-	var t = this;
 
-	// exports
-	t.render = render;
-	t.select = dummy;
-	t.unselect = dummy;
-	t.getDaySegmentContainer = function(){ return body; };
+/* Generalized Segment Utilities
+-------------------------------------------------------------------------------------------------*/
 
-	// imports
-	View.call(t, element, calendar, 'list');
-	ListEventRenderer.call(t);
-	var opt = t.opt;
-	var trigger = t.trigger;
-  var clearEvents = t.clearEvents;
-	var reportEventClear = t.reportEventClear;
-	var formatDates = calendar.formatDates;
-	var formatDate = calendar.formatDate;
 
-	// overrides
-	t.setWidth = setWidth;
-	t.setHeight = setHeight;
-	
-	// locals
-	var body;
-	var firstDay;
-	var nwe;
-	var tm;
-	var colFormat;
-	
-	
-	function render(date, delta) {
-		if (delta) {
-			addDays(date, opt('listPage') * delta);
+function isDaySegmentCollision(segment, otherSegments) {
+	for (var i=0; i<otherSegments.length; i++) {
+		var otherSegment = otherSegments[i];
+		if (
+			otherSegment.leftCol <= segment.rightCol &&
+			otherSegment.rightCol >= segment.leftCol
+		) {
+			return true;
 		}
-		t.start = t.visStart = cloneDate(date, true);
-		t.end = addDays(cloneDate(t.start), opt('listPage'));
-		t.visEnd = addDays(cloneDate(t.start), opt('listRange'));
-		addMinutes(t.visEnd, -1);  // set end to 23:59
-		t.title = formatDates(date, t.visEnd, opt('titleFormat'));
-		
-		updateOptions();
+	}
+	return false;
+}
 
-		if (!body) {
-			buildSkeleton();
-		} else {
-			clearEvents();
+
+function segmentElementEach(segments, callback) { // TODO: use in AgendaView?
+	for (var i=0; i<segments.length; i++) {
+		var segment = segments[i];
+		var element = segment.element;
+		if (element) {
+			callback(segment, element, i);
 		}
 	}
-	
-	
-	function updateOptions() {
-		firstDay = opt('firstDay');
-		nwe = opt('weekends') ? 0 : 1;
-		tm = opt('theme') ? 'ui' : 'fc';
-		colFormat = opt('columnFormat', 'day');
-	}
-	
-	
-	function buildSkeleton() {
-		body = $('<div>').addClass('fc-list-content').appendTo(element);
-	}
-	
-	function setHeight(height, dateChanged) {
-	  if (!opt('listNoHeight'))
-		  body.css('height', (height-1)+'px').css('overflow', 'auto');
-	}
+}
 
-	function setWidth(width) {
-		// nothing to be done here
-	}
-	
-	function dummy() {
-		// Stub.
-	}
 
+// A cmp function for determining which segments should appear higher up
+function compareDaySegments(a, b) {
+	return (b.rightCol - b.leftCol) - (a.rightCol - a.leftCol) || // put wider events first
+		b.event.allDay - a.event.allDay || // if tie, put all-day events first (booleans cast to 0/1)
+		a.event.start - b.event.start || // if a tie, sort by event start date
+		(a.event.title || '').localeCompare(b.event.title) // if a tie, sort by event title
 }
 
-/* Additional view: table (by bruederli@kolabsys.com)
----------------------------------------------------------------------------------*/
 
-function TableEventRenderer() {
+;;
+
+//BUG: unselect needs to be triggered when events are dragged+dropped
+
+function SelectionManager() {
 	var t = this;
 	
+	
+	// exports
+	t.select = select;
+	t.unselect = unselect;
+	t.reportSelection = reportSelection;
+	t.daySelectionMousedown = daySelectionMousedown;
+	
+	
 	// imports
-	ListEventRenderer.call(t);
 	var opt = t.opt;
-	var sortCmp = t.sortCmp;
 	var trigger = t.trigger;
-	var compileSegs = t.compileDaySegs;
-	var reportEvents = t.reportEvents;
-	var reportEventClear = t.reportEventClear;
-	var reportEventElement = t.reportEventElement;
-	var eventElementHandlers = t.eventElementHandlers;
-	var renderEventTime = t.renderEventTime;
-	var showEvents = t.showEvents;
-	var hideEvents = t.hideEvents;
-	var getListContainer = t.getDaySegmentContainer;
-	var lazySegBind = t.lazySegBind;
-	var calendar = t.calendar;
-	var formatDate = calendar.formatDate;
-	var formatDates = calendar.formatDates;
-
-	// exports
-	t.renderEvents = renderEvents;
-	t.clearEvents = clearEvents;
-
-
-	/* Rendering
-	--------------------------------------------------------------------*/
+	var defaultSelectionEnd = t.defaultSelectionEnd;
+	var renderSelection = t.renderSelection;
+	var clearSelection = t.clearSelection;
 	
-	function clearEvents() {
-		reportEventClear();
-		getListContainer().children('tbody').remove();
-	}
 	
-	function renderEvents(events, modifiedEventId) {
-		events.sort(sortCmp);
-		reportEvents(events);
-		renderSegs(compileSegs(events), modifiedEventId);
-		getListContainer().removeClass('fc-list-smart fc-list-day fc-list-month fc-list-week').addClass('fc-list-' + opt('listSections'));
-	}
+	// locals
+	var selected = false;
 
-	function renderSegs(segs, modifiedEventId) {
-		var tm = opt('theme') ? 'ui' : 'fc';
-		var table = getListContainer();
-		var headerClass = tm + "-widget-header";
-		var contentClass = tm + "-widget-content";
-		var tableCols = opt('tableCols');
-		var timecol = $.inArray('time', tableCols) >= 0;
-		var i, j, seg, event, times, s, skinCss, skinCssAttr, skinClasses, rowClasses, segContainer, eventElements, eventElement, triggerRes;
 
-		for (j=0; j < segs.length; j++) {
-			seg = segs[j];
-			
-			if (seg.title) {
-				$('<tbody class="fc-list-header"><tr><td class="fc-list-header ' + headerClass + '" colspan="' + tableCols.length + '">' + htmlEscape(seg.title) + '</td></tr></tbody>').appendTo(table);
-			}
-			segContainer = $('<tbody>').addClass('fc-list-section ' + contentClass).appendTo(table);
-			s = '';
-			
-			for (i=0; i < seg.events.length; i++) {
-				event = seg.events[i];
-				times = renderEventTime(event, seg);
-				skinCss = getSkinCss(event, opt);
-				skinCssAttr = (skinCss ? " style='" + skinCss + "'" : '');
-				skinClasses = ['fc-event-skin', 'fc-corner-left', 'fc-corner-right', 'fc-corner-top', 'fc-corner-bottom'].concat(event.className);
-				if (event.source && event.source.className) {
-					skinClasses = skinClasses.concat(event.source.className);
-				}
-				rowClasses = ['fc-event', 'fc-event-row', 'fc-'+dayIDs[event.start.getDay()]];
-				if (seg.daydiff == 0) {
-					rowClasses.push('fc-today');
-				}
-				
-				s +=  "<tr class='" + rowClasses.join(' ') + "'>";
-				for (var col, c=0; c < tableCols.length; c++) {
-					col = tableCols[c];
-					if (col == 'handle') {
-						s += "<td class='fc-event-handle'>" +
-							"<div class='" + skinClasses.join(' ') + "'" + skinCssAttr + ">" +
-							"<span class='fc-event-inner'></span>" +
-							"</div></td>";
-					} else if (col == 'date') {
-						s += "<td class='fc-event-date' colspan='" + (times[1] || !timecol ? 1 : 2) + "'>" + htmlEscape(times[0]) + "</td>";
-					} else if (col == 'time') {
-						if (times[1]) {
-							s += "<td class='fc-event-time'>" + htmlEscape(times[1]) + "</td>";
-						}
-					} else {
-						s += "<td class='fc-event-" + col + "'>" + (event[col] ? htmlEscape(event[col]) : '&nbsp;') + "</td>";
-					}
-				}
-				s += "</tr>";
-				
-				// IE doesn't like innerHTML on tbody elements so we insert every row individually
-				if (document.all) {
-					$(s).appendTo(segContainer);
-					s = '';
+
+	// unselectAuto
+	if (opt('selectable') && opt('unselectAuto')) {
+		$(document).mousedown(function(ev) {
+			var ignore = opt('unselectCancel');
+			if (ignore) {
+				if ($(ev.target).parents(ignore).length) { // could be optimized to stop after first match
+					return;
 				}
 			}
+			unselect(ev);
+		});
+	}
+	
 
-			if (!document.all)
-				segContainer[0].innerHTML = s;
-
-			eventElements = segContainer.children();
-
-			// retrieve elements, run through eventRender callback, bind event handlers
-			for (i=0; i < seg.events.length; i++) {
-				event = seg.events[i];
-				eventElement = $(eventElements[i]); // faster than eq()
-				triggerRes = trigger('eventRender', event, event, eventElement);
-				if (triggerRes === false) {
-					eventElement.remove();
-				} else {
-					if (triggerRes && triggerRes !== true) {
-						eventElement.remove();
-						eventElement = $(triggerRes).appendTo(segContainer);
-					}
-					if (event._id === modifiedEventId) {
-						eventElementHandlers(event, eventElement, seg);
-					} else {
-						eventElement[0]._fci = i; // for lazySegBind
+	function select(startDate, endDate, allDay) {
+		unselect();
+		if (!endDate) {
+			endDate = defaultSelectionEnd(startDate, allDay);
+		}
+		renderSelection(startDate, endDate, allDay);
+		reportSelection(startDate, endDate, allDay);
+	}
+	
+	
+	function unselect(ev) {
+		if (selected) {
+			selected = false;
+			clearSelection();
+			trigger('unselect', null, ev);
+		}
+	}
+	
+	
+	function reportSelection(startDate, endDate, allDay, ev) {
+		selected = true;
+		trigger('select', null, startDate, endDate, allDay, ev);
+	}
+	
+	
+	function daySelectionMousedown(ev) { // not really a generic manager method, oh well
+		var cellToDate = t.cellToDate;
+		var getIsCellAllDay = t.getIsCellAllDay;
+		var hoverListener = t.getHoverListener();
+		var reportDayClick = t.reportDayClick; // this is hacky and sort of weird
+		if (ev.which == 1 && opt('selectable')) { // which==1 means left mouse button
+			unselect(ev);
+			var _mousedownElement = this;
+			var dates;
+			hoverListener.start(function(cell, origCell) { // TODO: maybe put cellToDate/getIsCellAllDay info in cell
+				clearSelection();
+				if (cell && getIsCellAllDay(cell)) {
+					dates = [ cellToDate(origCell), cellToDate(cell) ].sort(dateCompare);
+					renderSelection(dates[0], dates[1], true);
+				}else{
+					dates = null;
+				}
+			}, ev);
+			$(document).one('mouseup', function(ev) {
+				hoverListener.stop();
+				if (dates) {
+					if (+dates[0] == +dates[1]) {
+						reportDayClick(dates[0], true, ev);
 					}
-					reportEventElement(event, eventElement);
+					reportSelection(dates[0], dates[1], true, ev);
 				}
-			}
-		
-			lazySegBind(segContainer, seg, eventElementHandlers);
-			markFirstLast(segContainer);
+			});
 		}
-		
-		//markFirstLast(table);
 	}
 
+
 }
 
+;;
+ 
+function OverlayManager() {
+	var t = this;
+	
+	
+	// exports
+	t.renderOverlay = renderOverlay;
+	t.clearOverlays = clearOverlays;
+	
+	
+	// locals
+	var usedOverlays = [];
+	var unusedOverlays = [];
+	
+	
+	function renderOverlay(rect, parent) {
+		var e = unusedOverlays.shift();
+		if (!e) {
+			e = $("<div class='fc-cell-overlay' style='position:absolute;z-index:3'/>");
+		}
+		if (e[0].parentNode != parent[0]) {
+			e.appendTo(parent);
+		}
+		usedOverlays.push(e.css(rect).show());
+		return e;
+	}
+	
 
-fcViews.table = TableView;
+	function clearOverlays() {
+		var e;
+		while (e = usedOverlays.shift()) {
+			unusedOverlays.push(e.hide().unbind());
+		}
+	}
 
 
-function TableView(element, calendar) {
-	var t = this;
+}
 
-	// exports
-	t.render = render;
-	t.select = dummy;
-	t.unselect = dummy;
-	t.getDaySegmentContainer = function(){ return table; };
+;;
 
-	// imports
-	View.call(t, element, calendar, 'table');
-	TableEventRenderer.call(t);
-	var opt = t.opt;
-	var trigger = t.trigger;
-  var clearEvents = t.clearEvents;
-	var reportEventClear = t.reportEventClear;
-	var formatDates = calendar.formatDates;
-	var formatDate = calendar.formatDate;
+function CoordinateGrid(buildFunc) {
 
-	// overrides
-	t.setWidth = setWidth;
-	t.setHeight = setHeight;
+	var t = this;
+	var rows;
+	var cols;
 	
-	// locals
-	var div;
-	var table;
-	var firstDay;
-	var nwe;
-	var tm;
-	var colFormat;
+	
+	t.build = function() {
+		rows = [];
+		cols = [];
+		buildFunc(rows, cols);
+	};
 	
 	
-	function render(date, delta) {
-		if (delta) {
-			addDays(date, opt('listPage') * delta);
+	t.cell = function(x, y) {
+		var rowCnt = rows.length;
+		var colCnt = cols.length;
+		var i, r=-1, c=-1;
+		for (i=0; i<rowCnt; i++) {
+			if (y >= rows[i][0] && y < rows[i][1]) {
+				r = i;
+				break;
+			}
 		}
-		t.start = t.visStart = cloneDate(date, true);
-		t.end = addDays(cloneDate(t.start), opt('listPage'));
-		t.visEnd = addDays(cloneDate(t.start), opt('listRange'));
-		addMinutes(t.visEnd, -1);  // set end to 23:59
-		t.title = (t.visEnd.getTime() - t.visStart.getTime() < DAY_MS) ? formatDate(date, opt('titleFormat')) : formatDates(date, t.visEnd, opt('titleFormat'));
-		
-		updateOptions();
-
-		if (!table) {
-			buildSkeleton();
-		} else {
-			clearEvents();
+		for (i=0; i<colCnt; i++) {
+			if (x >= cols[i][0] && x < cols[i][1]) {
+				c = i;
+				break;
+			}
 		}
-	}
+		return (r>=0 && c>=0) ? { row:r, col:c } : null;
+	};
 	
 	
-	function updateOptions() {
-		firstDay = opt('firstDay');
-		nwe = opt('weekends') ? 0 : 1;
-		tm = opt('theme') ? 'ui' : 'fc';
-		colFormat = opt('columnFormat');
-	}
+	t.rect = function(row0, col0, row1, col1, originElement) { // row1,col1 is inclusive
+		var origin = originElement.offset();
+		return {
+			top: rows[row0][0] - origin.top,
+			left: cols[col0][0] - origin.left,
+			width: cols[col1][1] - cols[col0][0],
+			height: rows[row1][1] - rows[row0][0]
+		};
+	};
+
+}
+
+;;
+
+function HoverListener(coordinateGrid) {
+
+
+	var t = this;
+	var bindType;
+	var change;
+	var firstCell;
+	var cell;
 	
 	
-	function buildSkeleton() {
-		var tableCols = opt('tableCols');
-		var s =
-			"<table class='fc-border-separate' style='width:100%' cellspacing='0'>" +
-			"<colgroup>";
-		for (var c=0; c < tableCols.length; c++) {
-			s += "<col class='fc-event-" + tableCols[c] + "' />";
+	t.start = function(_change, ev, _bindType) {
+		change = _change;
+		firstCell = cell = null;
+		coordinateGrid.build();
+		mouse(ev);
+		bindType = _bindType || 'mousemove';
+		$(document).bind(bindType, mouse);
+	};
+	
+	
+	function mouse(ev) {
+		_fixUIEvent(ev); // see below
+		var newCell = coordinateGrid.cell(ev.pageX, ev.pageY);
+		if (!newCell != !cell || newCell && (newCell.row != cell.row || newCell.col != cell.col)) {
+			if (newCell) {
+				if (!firstCell) {
+					firstCell = newCell;
+				}
+				change(newCell, firstCell, newCell.row-firstCell.row, newCell.col-firstCell.col);
+			}else{
+				change(newCell, firstCell);
+			}
+			cell = newCell;
 		}
-		s += "</colgroup>" +
-			"</table>";
-		div = $('<div>').addClass('fc-list-content').appendTo(element);
-		table = $(s).appendTo(div);
 	}
 	
-	function setHeight(height, dateChanged) {
-	  if (!opt('listNoHeight'))
-		  div.css('height', (height-1)+'px').css('overflow', 'auto');
+	
+	t.stop = function() {
+		$(document).unbind(bindType, mouse);
+		return cell;
+	};
+	
+	
+}
+
+
+
+// this fix was only necessary for jQuery UI 1.8.16 (and jQuery 1.7 or 1.7.1)
+// upgrading to jQuery UI 1.8.17 (and using either jQuery 1.7 or 1.7.1) fixed the problem
+// but keep this in here for 1.8.16 users
+// and maybe remove it down the line
+
+function _fixUIEvent(event) { // for issue 1168
+	if (event.pageX === undefined) {
+		event.pageX = event.originalEvent.pageX;
+		event.pageY = event.originalEvent.pageY;
 	}
+}
+;;
 
-	function setWidth(width) {
-		// nothing to be done here
+function HorizontalPositionCache(getElement) {
+
+	var t = this,
+		elements = {},
+		lefts = {},
+		rights = {};
+		
+	function e(i) {
+		return elements[i] = elements[i] || getElement(i);
 	}
 	
-	function dummy() {
-		// Stub.
-	}
-
+	t.left = function(i) {
+		return lefts[i] = lefts[i] === undefined ? e(i).position().left : lefts[i];
+	};
+	
+	t.right = function(i) {
+		return rights[i] = rights[i] === undefined ? t.left(i) + e(i).width() : rights[i];
+	};
+	
+	t.clear = function() {
+		elements = {};
+		lefts = {};
+		rights = {};
+	};
+	
 }
 
-})(jQuery);
+;;
+
+})(jQuery);
\ No newline at end of file

roundcubemail-plugins-kolab-3.2.tar.gz/plugins/calendar/lib/js/jquery.miniColors.min.js Deleted

@@ -1,16 +0,0 @@
-// http://plugins.jquery.com/project/jQueryMiniColors
-jQuery&&function(d){d.extend(d.fn,{miniColors:function(j,k){var x=function(a,b){var e=l(a.val());e||(e="FFFFFF");var c=p(e),e=d('<a class="miniColors-trigger" style="background-color: #'+e+'" href="#"></a>');e.insertAfter(a);a.addClass("miniColors").attr("maxlength",7).attr("autocomplete","off");a.data("trigger",e);a.data("hsb",c);b.change&&a.data("change",b.change);b.readonly&&a.attr("readonly",true);b.disabled&&q(a);b.colorValues&&a.data("colorValues",b.colorValues);e.bind("click.miniColors",function(b){b.preventDefault();
-a.trigger("focus")});a.bind("focus.miniColors",function(){w(a)});a.bind("blur.miniColors",function(){var b=l(a.val());a.val(b?"#"+b:"")});a.bind("keydown.miniColors",function(b){b.keyCode===9&&i(a)});a.bind("keyup.miniColors",function(){var b=a.val().replace(/[^A-F0-9#]/ig,"");a.val(b);r(a)||a.data("trigger").css("backgroundColor","#FFF")});a.bind("paste.miniColors",function(){setTimeout(function(){a.trigger("keyup")},5)})},q=function(a){i(a);a.attr("disabled",true);a.data("trigger").css("opacity",
-0.5)},w=function(a){if(a.attr("disabled"))return false;i();var b=d('<div class="miniColors-selector"></div>');b.append('<div class="miniColors-colors" style="background-color: #FFF;"><div class="miniColors-colorPicker"></div></div>');b.append('<div class="miniColors-hues"><div class="miniColors-huePicker"></div></div>');b.css({top:a.is(":visible")?a.offset().top+a.outerHeight():a.data("trigger").offset().top+a.data("trigger").outerHeight(),left:a.is(":visible")?a.offset().left:a.data("trigger").offset().left,
-display:"none"}).addClass(a.attr("class"));var e=a.data("colorValues");if(e&&e.length){var c,f='<div class="miniColors-presets">',g;for(g in e)c=l(e[g]),f+='<div class="miniColors-colorPreset" style="background-color:#'+c+'" rel="'+c+'"></div>';f+="</div>";b.append(f);c=Math.ceil(e.length/7)*24;b.css("width",b.width()+c+5+"px");b.find(".miniColors-presets").css("width",c+"px")}c=a.data("hsb");b.find(".miniColors-colors").css("backgroundColor","#"+n(m({h:c.h,s:100,b:100})));(f=a.data("colorPosition"))||
-(f=s(c));b.find(".miniColors-colorPicker").css("top",f.y+"px").css("left",f.x+"px");(f=a.data("huePosition"))||(f=t(c));b.find(".miniColors-huePicker").css("top",f.y+"px");a.data("selector",b);a.data("huePicker",b.find(".miniColors-huePicker"));a.data("colorPicker",b.find(".miniColors-colorPicker"));a.data("mousebutton",0);d("BODY").append(b);b.fadeIn(100);b.bind("selectstart",function(){return false});d(document).bind("mousedown.miniColors",function(b){a.data("mousebutton",1);d(b.target).parents().andSelf().hasClass("miniColors-colors")&&
-(b.preventDefault(),a.data("moving","colors"),u(a,b));d(b.target).parents().andSelf().hasClass("miniColors-hues")&&(b.preventDefault(),a.data("moving","hues"),v(a,b));d(b.target).parents().andSelf().hasClass("miniColors-selector")?b.preventDefault():d(b.target).parents().andSelf().hasClass("miniColors")||i(a)});d(document).bind("mouseup.miniColors",function(){a.data("mousebutton",0);a.removeData("moving")});d(document).bind("mousemove.miniColors",function(b){a.data("mousebutton")===1&&(a.data("moving")===
-"colors"&&u(a,b),a.data("moving")==="hues"&&v(a,b))});e&&(b.find(".miniColors-colorPreset").click(function(){a.val(d(this).attr("rel"));r(a)}),b.find('.miniColors-presets div[rel="'+a.val().replace(/#/,"")+'"]').addClass("miniColors-colorPreset-active"))},i=function(a){a||(a=".miniColors");d(a).each(function(){var a=d(this).data("selector");d(this).removeData("selector");d(a).fadeOut(100,function(){d(this).remove()})});d(document).unbind("mousedown.miniColors");d(document).unbind("mousemove.miniColors")},
-u=function(a,b){var e=a.data("colorPicker");e.hide();var c={x:b.clientX-a.data("selector").find(".miniColors-colors").offset().left+d(document).scrollLeft()-5,y:b.clientY-a.data("selector").find(".miniColors-colors").offset().top+d(document).scrollTop()-5};if(c.x<=-5)c.x=-5;if(c.x>=144)c.x=144;if(c.y<=-5)c.y=-5;if(c.y>=144)c.y=144;a.data("colorPosition",c);e.css("left",c.x).css("top",c.y).show();e=Math.round((c.x+5)*0.67);e<0&&(e=0);e>100&&(e=100);c=100-Math.round((c.y+5)*0.67);c<0&&(c=0);c>100&&
-(c=100);var f=a.data("hsb");f.s=e;f.b=c;o(a,f,true)},v=function(a,b){var e=a.data("huePicker");e.hide();var c={y:b.clientY-a.data("selector").find(".miniColors-colors").offset().top+d(document).scrollTop()-1};if(c.y<=-1)c.y=-1;if(c.y>=149)c.y=149;a.data("huePosition",c);e.css("top",c.y).show();e=Math.round((150-c.y-1)*2.4);e<0&&(e=0);e>360&&(e=360);c=a.data("hsb");c.h=e;o(a,c,true)},o=function(a,b,e){a.data("hsb",b);var c=n(m(b));e&&a.val("#"+c);a.data("trigger").css("backgroundColor","#"+c);a.data("selector")&&
-a.data("selector").find(".miniColors-colors").css("backgroundColor","#"+n(m({h:b.h,s:100,b:100})));a.data("change")&&a.data("change").call(a,"#"+c,m(b));a.data("colorValues")&&(a.data("selector").find(".miniColors-colorPreset-active").removeClass("miniColors-colorPreset-active"),a.data("selector").find('.miniColors-presets div[rel="'+c+'"]').addClass("miniColors-colorPreset-active"))},r=function(a){var b=l(a.val());if(!b)return false;var b=p(b),e=a.data("hsb");if(b.h===e.h&&b.s===e.s&&b.b===e.b)return true;
-e=s(b);d(a.data("colorPicker")).css("top",e.y+"px").css("left",e.x+"px");e=t(b);d(a.data("huePicker")).css("top",e.y+"px");o(a,b,false);return true},s=function(a){var b=Math.ceil(a.s/0.67);b<0&&(b=0);b>150&&(b=150);a=150-Math.ceil(a.b/0.67);a<0&&(a=0);a>150&&(a=150);return{x:b-5,y:a-5}},t=function(a){a=150-a.h/2.4;a<0&&(h=0);a>150&&(h=150);return{y:a-1}},l=function(a){a=a.replace(/[^A-Fa-f0-9]/,"");a.length==3&&(a=a[0]+a[0]+a[1]+a[1]+a[2]+a[2]);return a.length===6?a:null},m=function(a){var b,e,c;
-b=Math.round(a.h);var d=Math.round(a.s*255/100),a=Math.round(a.b*255/100);if(d==0)b=e=c=a;else{var d=(255-d)*a/255,g=(a-d)*(b%60)/60;b==360&&(b=0);b<60?(b=a,c=d,e=d+g):b<120?(e=a,c=d,b=a-g):b<180?(e=a,b=d,c=d+g):b<240?(c=a,b=d,e=a-g):b<300?(c=a,e=d,b=d+g):b<360?(b=a,e=d,c=a-g):c=e=b=0}return{r:Math.round(b),g:Math.round(e),b:Math.round(c)}},n=function(a){var b=[a.r.toString(16),a.g.toString(16),a.b.toString(16)];d.each(b,function(a,c){c.length==1&&(b[a]="0"+c)});return b.join("")},p=function(a){var b=
-a,b=parseInt(b.indexOf("#")>-1?b.substring(1):b,16),a=b>>16,d=(b&65280)>>8;b&=255;var c={h:0,s:0,b:0},f=Math.min(a,d,b),g=Math.max(a,d,b),f=g-f;c.b=g;c.s=g!=0?255*f/g:0;c.h=c.s!=0?a==g?(d-b)/f:d==g?2+(b-a)/f:4+(a-d)/f:-1;c.h*=60;c.h<0&&(c.h+=360);c.s*=100/255;c.b*=100/255;if(c.s===0)c.h=360;return c};switch(j){case "readonly":return d(this).each(function(){d(this).attr("readonly",k)}),d(this);case "disabled":return d(this).each(function(){if(k)q(d(this));else{var a=d(this);a.attr("disabled",false);
-a.data("trigger").css("opacity",1)}}),d(this);case "value":return d(this).each(function(){d(this).val(k).trigger("keyup")}),d(this);case "destroy":return d(this).each(function(){var a=d(this);i();a=d(a);a.data("trigger").remove();a.removeAttr("autocomplete");a.removeData("trigger");a.removeData("selector");a.removeData("hsb");a.removeData("huePicker");a.removeData("colorPicker");a.removeData("mousebutton");a.removeData("moving");a.unbind("click.miniColors");a.unbind("focus.miniColors");a.unbind("blur.miniColors");
-a.unbind("keyup.miniColors");a.unbind("keydown.miniColors");a.unbind("paste.miniColors");d(document).unbind("mousedown.miniColors");d(document).unbind("mousemove.miniColors")}),d(this);default:return j||(j={}),d(this).each(function(){d(this)[0].tagName.toLowerCase()==="input"&&(d(this).data("trigger")||x(d(this),j,k))}),d(this)}}})}(jQuery);

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

@@ -1,7 +1,4 @@
 <?php
-
-$labels = array();
-
 // preferences
 $labels['default_view'] = 'Изглед по подразбиране';
 $labels['time_format'] = 'Формат на часовете';
@@ -17,7 +14,6 @@
 $labels['coloringmode1'] = 'Относно категорията';
 $labels['coloringmode2'] = 'Календар за очертание, категория за съдържание';
 $labels['coloringmode3'] = 'Категория за очертание, календар за съдържание';
-
 // calendar
 $labels['calendar'] = 'Календар';
 $labels['calendars'] = 'Календари';
@@ -58,6 +54,7 @@
 $labels['busy'] = 'Заето';
 $labels['outofoffice'] = 'Извън офиса';
 $labels['tentative'] = 'Предварително';
+$labels['status'] = 'Статус';
 $labels['priority'] = 'Приоритет';
 $labels['sensitivity'] = 'Частност';
 $labels['public'] = 'публично';
@@ -77,7 +74,6 @@
 $labels['nmonthsback'] = '$nr месеца назад';
 $labels['showurl'] = 'Показване на URL на календара';
 $labels['showurldescription'] = 'Използвайте следния адрес, за да достъпвате (само за четене) вашия календар от други приложения. Можете да копирате и поставяте това във всеки календарен софтуер, поддържащ форматът iCal';
-
 // agenda view
 $labels['listrange'] = 'Оразмеряване към екран:';
 $labels['listsections'] = 'Разделяне на:';
@@ -92,12 +88,10 @@
 $labels['weekofyear'] = 'Седмица';
 $labels['pastevents'] = 'Минали';
 $labels['futureevents'] = 'Бъдещи';
-
 // alarm/reminder settings
 $labels['showalarms'] = 'Show reminders';
 $labels['defaultalarmtype'] = 'Настройка за напомняне по подразбиране';
 $labels['defaultalarmoffset'] = 'Време за напомняне по подразбиране';
-
 // attendees
 $labels['attendee'] = 'Участник';
 $labels['role'] = 'Роля';
@@ -107,6 +101,7 @@
 $labels['roleorganizer'] = 'Организатор';
 $labels['rolerequired'] = 'Задължителен';
 $labels['roleoptional'] = 'По избор';
+$labels['cutyperesource'] = 'Resource';
 $labels['availfree'] = 'Свободно';
 $labels['availbusy'] = 'Заето';
 $labels['availunknown'] = 'Неизвестно';
@@ -115,22 +110,25 @@
 $labels['sendinvitations'] = 'Изпращане на покани';
 $labels['sendnotifications'] = 'Известяване на участниците относно промените';
 $labels['sendcancellation'] = 'Известяване на участниците относно отмяна на събития';
-
-// invitation handling
+// invitation handling (overrides labels from libcalendaring)
 $labels['itipdeclineevent'] = 'Искате ли да отхвърлите поканата за това събитие?';
 $labels['saveincalendar'] = 'запазване в';
-
+// resources
+$labels['resource'] = 'Resource';
 // event dialog tabs
 $labels['tabsummary'] = 'Заглавие';
 $labels['tabrecurrence'] = 'Recurrence';
 $labels['tabattendees'] = 'Участници';
 $labels['tabattachments'] = 'Прикрепени файлове';
 $labels['tabsharing'] = 'Споделяне';
-
 // messages
+$labels['deleteobjectconfirm'] = 'Наистина ли искате да премахнете това събитие?';
 $labels['deleteventconfirm'] = 'Наистина ли искате да премахнете това събитие?';
 $labels['deletecalendarconfirm'] = 'Наистина ли искате да премахнете този календар с всичките му събития?';
 $labels['savingdata'] = 'Запазване на данни...';
 $labels['errorsaving'] = 'Неуспешно записването на промените.';
-
+// recurrence form
+$labels['recurrencend'] = 'до';
+$labels['futurevents'] = 'Бъдещи';
+// birthdays calendar
 ?>

roundcubemail-plugins-kolab-3.2.tar.gz/plugins/calendar/localization/ca_ES.inc Added

@@ -0,0 +1,65 @@
+<?php
+// preferences
+$labels['default_view'] = 'Vista per defecte';
+$labels['time_format'] = 'Format de l\'hora';
+$labels['first_day'] = 'Primer dia de la setmana';
+$labels['first_hour'] = 'Primera hora a mostrar';
+$labels['workinghours'] = 'Hores de feina';
+$labels['add_category'] = 'Afegeix categoria';
+$labels['remove_category'] = 'Suprimeix categoria';
+// calendar
+$labels['calendar'] = 'Calendari';
+$labels['calendars'] = 'Calendaris';
+$labels['category'] = 'Categoria';
+$labels['categories'] = 'Categories';
+$labels['createcalendar'] = 'Crea un nou calendari';
+$labels['editcalendar'] = 'Edita les propietats del calendari';
+$labels['name'] = 'Nom';
+$labels['color'] = 'Color';
+$labels['day'] = 'Dia';
+$labels['week'] = 'Setmana';
+$labels['month'] = 'Mes';
+$labels['agenda'] = 'Agenda';
+$labels['new'] = 'Nou';
+$labels['edit'] = 'Edita';
+$labels['save'] = 'Desa';
+$labels['remove'] = 'Suprimeix';
+$labels['cancel'] = 'Cancel·la';
+$labels['select'] = 'Selecciona';
+$labels['print'] = 'Imprimeix';
+$labels['printtitle'] = 'Imprimeix calendaris';
+$labels['title'] = 'Resum';
+$labels['description'] = 'Descripció';
+$labels['all-day'] = 'tot-el-dia';
+$labels['export'] = 'Exporta';
+$labels['exporttitle'] = 'Exporta a iCalendari';
+$labels['location'] = 'Ubicació';
+$labels['date'] = 'Data';
+$labels['start'] = 'Inici';
+$labels['end'] = 'Final';
+$labels['selectdate'] = 'Tria la data';
+$labels['freebusy'] = 'Mostra\'m com';
+$labels['free'] = 'Lliure';
+$labels['busy'] = 'Ocupat';
+$labels['outofoffice'] = 'Fora de l\'oficina';
+$labels['priority'] = 'Prioritat';
+$labels['sensitivity'] = 'Privadesa';
+$labels['public'] = 'públic';
+$labels['private'] = 'privat';
+$labels['confidential'] = 'confidencial';
+$labels['alarms'] = 'Recordatori';
+// agenda view
+$labels['weekofyear'] = 'Setmana';
+// alarm/reminder settings
+// attendees
+$labels['availfree'] = 'Lliure';
+$labels['availbusy'] = 'Ocupat';
+$labels['availoutofoffice'] = 'Fora de l\'oficina';
+// invitation handling (overrides labels from libcalendaring)
+// resources
+// event dialog tabs
+$labels['tabsummary'] = 'Resum';
+// messages
+// recurrence form
+// birthdays calendar
+?>

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

@@ -1,7 +1,4 @@
 <?php
-
-$labels = array();
-
 // preferences
 $labels['default_view'] = 'Výchozí pohled';
 $labels['time_format'] = 'Formát data';
@@ -17,7 +14,6 @@
 $labels['coloringmode1'] = 'Podle kategorie';
 $labels['coloringmode2'] = 'Kalendář pro orámování, kategorie pro obsah';
 $labels['coloringmode3'] = 'Kategorie pro orámování, kalendář pro obsah';
-
 // calendar
 $labels['calendar'] = 'Kalendář';
 $labels['calendars'] = 'Kalendáře';
@@ -58,6 +54,7 @@
 $labels['busy'] = 'obsazeno';
 $labels['outofoffice'] = 'mimo kancelář';
 $labels['tentative'] = 'nezávazně';
+$labels['status'] = 'Stav';
 $labels['priority'] = 'Priorita';
 $labels['sensitivity'] = 'Soukromí';
 $labels['public'] = 'veřejné';
@@ -78,7 +75,6 @@
 $labels['nmonthsback'] = '$nr měsíců nazpátek';
 $labels['showurl'] = 'Ukázat URL kalendáře';
 $labels['showurldescription'] = 'Tuto adresu použijte pro přístup (jen ke čtení) ke kalendáři z jiných aplikací. Můžete ji zkopírovat a vložit do jakéhokoli kalendářového softwaru, který podporuje formát iCal.';
-
 // agenda view
 $labels['listrange'] = 'Rozsah k zobrazení:';
 $labels['listsections'] = 'Rozdělit na:';
@@ -93,12 +89,10 @@
 $labels['weekofyear'] = 'Týden';
 $labels['pastevents'] = 'Minulost';
 $labels['futureevents'] = 'Budoucnost';
-
 // alarm/reminder settings
 $labels['showalarms'] = 'Show reminders';
 $labels['defaultalarmtype'] = 'Výchozí nastavení připomenutí';
 $labels['defaultalarmoffset'] = 'Výchozí čas připomenutí';
-
 // attendees
 $labels['attendee'] = 'Účastník';
 $labels['availability'] = 'Dost.';
@@ -130,8 +124,7 @@
 $labels['eventupdatemailbody'] = "*\$title*\n\nKdy: \$date\n\nPozváni: \$attendees\n\nPodrobnosti o aktualizované události najdete v přiloženém souboru typu iCalendar. Můžete si ho naimportovat do kalendářového programu.";
 $labels['eventcancelsubject'] = 'Událost "$title" byla zrušena';
 $labels['eventcancelmailbody'] = "*\$title*\n\nKdy: \$date\n\nPozváni: \$attendees\n\nUdálost byla zrušena organizátorem (\$organizer).\n\nPodrobnosti najdete v přiloženém souboru ve formátu iCalendar.";
-
-// invitation handling
+// invitation handling (overrides labels from libcalendaring)
 $labels['itipmailbodyaccepted'] = "\$sender přijal(a) pozvání na tuto událost:\n\n*\$title*\n\nKdy: \$date\n\nPozváni: \$attendees";
 $labels['itipmailbodytentative'] = "\$sender nezávazně přijal(a) pozvání na tuto událost:\n\n*\$title*\n\nKdy: \$date\n\nPozváni: \$attendees";
 $labels['itipmailbodydeclined'] = "\$sender odmítl(a) pozvání na tuto událost:\n\n*\$title*\n\nKdy: \$date\n\nPozváni: \$attendees";
@@ -139,15 +132,16 @@
 $labels['notanattendee'] = 'Nejste na seznamu účastníků této události';
 $labels['eventcancelled'] = 'Tato událost byla zrušena';
 $labels['saveincalendar'] = 'uložit do';
-
+// resources
+$labels['resource'] = 'Prostředek';
 // event dialog tabs
 $labels['tabsummary'] = 'Souhrn';
 $labels['tabrecurrence'] = 'Opakování';
 $labels['tabattendees'] = 'Účastníci';
 $labels['tabattachments'] = 'Přílohy';
 $labels['tabsharing'] = 'Sdílení';
-
 // messages
+$labels['deleteobjectconfirm'] = 'Opravdu chcete smazat tuto událost?';
 $labels['deleteventconfirm'] = 'Opravdu chcete smazat tuto událost?';
 $labels['deletecalendarconfirm'] = 'Opravdu chcete smazat tento kalendář se všemi událostmi?';
 $labels['deletecalendarconfirmrecursive'] = 'Do you really want to delete this calendar with all its events and sub-calendars?';
@@ -173,36 +167,8 @@
 $labels['importnone'] = 'Nebyly nalezeny žádné události k importu';
 $labels['importerror'] = 'Při importu došlo k chybě';
 $labels['aclnorights'] = 'Nemáte administrátorská práva k tomuto kalendáři.';
-
 // recurrence form
 $labels['repeat'] = 'Opakování';
-$labels['frequency'] = 'Opakovat';
-$labels['never'] = 'nikdy';
-$labels['daily'] = 'denně';
-$labels['weekly'] = 'týdně';
-$labels['monthly'] = 'měsíčně';
-$labels['yearly'] = 'ročně';
-$labels['rdate'] = 'on dates';
-$labels['every'] = 'Každý';
-$labels['days'] = 'den (dny)';
-$labels['weeks'] = 'týden (týdny)';
-$labels['months'] = 'měsíc(e/ů)';
-$labels['years'] = 'rok(y/ů) v:';
-$labels['bydays'] = 'On';
-$labels['untildate'] = 'do';
-$labels['each'] = 'Každý';
-$labels['onevery'] = 'Vždy v';
-$labels['onsamedate'] = 'Ve stejné datum';
-$labels['forever'] = 'trvale';
-$labels['recurrencend'] = 'do';
-$labels['forntimes'] = 'jen $nrkrát';
-$labels['first'] = 'první';
-$labels['second'] = 'druhý';
-$labels['third'] = 'třetí';
-$labels['fourth'] = 'čtvrtý';
-$labels['last'] = 'poslední';
-$labels['dayofmonth'] = 'Den v měsíci';
-
 $labels['changeeventconfirm'] = 'Změnit událost';
 $labels['removeeventconfirm'] = 'Odstranit událost';
 $labels['changerecurringeventwarning'] = 'Toto je opakovaná událost. Chcete upravit jen toto konání, toto a všechna následující konání, úplně všechna konání nebo uložit událost jako novou?';
@@ -211,5 +177,5 @@
 $labels['futurevents'] = 'Budoucí';
 $labels['allevents'] = 'Všechny';
 $labels['saveasnew'] = 'Uložit jako novou';
-
+// birthdays calendar
 ?>

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

@@ -1,11 +1,7 @@
 <?php
-
-$labels = array();
-
 // preferences
 $labels['default_view'] = 'Standardvisning';
 $labels['time_format'] = 'Tidsformat';
-$labels['timeslots'] = '';
 $labels['first_day'] = 'Første ugedag';
 $labels['first_hour'] = 'Første time som vises';
 $labels['workinghours'] = 'Arbejdstider';
@@ -17,7 +13,6 @@
 $labels['coloringmode1'] = 'Ifølge kategori';
 $labels['coloringmode2'] = 'Kalender til oversigt, kategori til indhold';
 $labels['coloringmode3'] = 'Kategori til oversigt, kalender til indhold';
-
 // calendar
 $labels['calendar'] = 'Kalender';
 $labels['calendars'] = 'Kalendere';
@@ -60,13 +55,15 @@
 $labels['busy'] = 'Optaget';
 $labels['outofoffice'] = 'Ikke på kontoret';
 $labels['tentative'] = 'Forsøgsvis';
+$labels['status'] = 'Status';
+$labels['confirmed'] = 'Bekræftet';
+$labels['cancelled'] = 'Annulleret';
 $labels['priority'] = 'Prioritet';
 $labels['sensitivity'] = 'Privatliv';
 $labels['public'] = 'offentlig';
 $labels['private'] = 'privat';
 $labels['confidential'] = 'fortrolig';
 $labels['alarms'] = 'Påmindelse';
-$labels['comment'] = '';
 $labels['generated'] = 'oprettet per';
 $labels['printdescriptions'] = 'Udskriv beskrivelser';
 $labels['parentcalendar'] = 'Indsæt indeni';
@@ -82,7 +79,6 @@
 $labels['showurl'] = 'Vis kalenderens URL';
 $labels['showurldescription'] = 'Brug følgende adresse for at tilgå din kalender (skrivebeskyttet) fra andre programmer.  Du kan kopiere og indsætet denne i ethvert kalenderprogram, der understøtter iCal-formatet.';
 $labels['caldavurldescription'] = 'Kopiér denne adresse til en <a href="http://en.wikipedia.org/wiki/CalDAV" target="_blank">CalDAV</a>-klientprogram (eks. Evolution eller Mozilla Thunderbird) for at synkronisere denne kalender komplet med din computer eller mobilenhed.';
-
 // agenda view
 $labels['listrange'] = 'Interval som skal vises:';
 $labels['listsections'] = 'Del op i:';
@@ -97,12 +93,9 @@
 $labels['weekofyear'] = 'Uge';
 $labels['pastevents'] = 'Tidligere';
 $labels['futureevents'] = 'Fremtid';
-
 // alarm/reminder settings
-$labels['showalarms'] = '';
 $labels['defaultalarmtype'] = 'Standardindstilling for påmindelse';
 $labels['defaultalarmoffset'] = 'Standardtidspunkt for påmindelse';
-
 // attendees
 $labels['attendee'] = 'Deltager';
 $labels['role'] = 'Rolle';
@@ -113,7 +106,6 @@
 $labels['rolerequired'] = 'Påkrævet';
 $labels['roleoptional'] = 'Valgfri';
 $labels['rolechair'] = 'Formand';
-$labels['rolenonparticipant'] = '';
 $labels['cutypeindividual'] = 'Individuel';
 $labels['cutypegroup'] = 'Gruppe';
 $labels['cutyperesource'] = 'Ressource';
@@ -140,27 +132,25 @@
 $labels['eventupdatemailbody'] = "*\$title*\n\nTidspunkt: \$date\n\nInviterede: \$attendees\n\nBemærk venligst vedhæftede iCalendar-fil med alle detaljer om arrangementet, som du kan importere til dit kalenderprogram.";
 $labels['eventcancelsubject'] = '"$title" er blevet aflyst';
 $labels['eventcancelmailbody'] = "*\$title*\n\nTidspunkt: \$date\n\nInviterede: \$attendees\n\nDette arrangement er blevet aflyst af \$organizer.\n\nBemærk venligst vedhæftede iCalendard-fil med de opdaterede detaljer om arrangementet.";
-
 // invitation handling (overrides labels from libcalendaring)
-$labels['itipobjectnotfound'] = '';
-
 $labels['itipmailbodyaccepted'] = "\$sender har accepteret invitationen til det følgende arrangement:\n\n*\$title*\n\nTidspunkt: \$date\n\nInviterede: \$attendees";
 $labels['itipmailbodytentative'] = "\$sender har forsøgsvist accepteret invitationen til det følgende arrangement:\n\n*\$title*\n\nTidspunkt: \$date\n\nInviterede: \$attendees";
 $labels['itipmailbodydeclined'] = "\$sender har afvist invitationen til det følgende arrangement:\n\n*\$title*\n\nTidspunkt: \$date\n\nInviterede: \$attendees";
 $labels['itipdeclineevent'] = 'Sikker på at du vil afvise dette arrangement?';
 $labels['declinedeleteconfirm'] = 'Vil du også slette dette afviste arrangement fra din kalender?';
-
 $labels['notanattendee'] = 'Du er ikke opført som deltager for dette arrangement';
 $labels['eventcancelled'] = 'Arrangementet er blevet aflyst';
 $labels['saveincalendar'] = 'gem i';
-
+// resources
+$labels['resource'] = 'Ressource';
+$labels['resourcedetails'] = 'Detaljer';
 // event dialog tabs
 $labels['tabsummary'] = 'Resumé';
 $labels['tabrecurrence'] = 'Gentagelse';
 $labels['tabattendees'] = 'Deltagere';
+$labels['tabresources'] = 'Ressourcer';
 $labels['tabattachments'] = 'Vedhæftninger';
 $labels['tabsharing'] = 'Deling';
-
 // messages
 $labels['deleteobjectconfirm'] = 'Sikker på at du vil slette dette arrangement?';
 $labels['deleteventconfirm'] = 'Sikker på at du vil slette dette arrangement?';
@@ -189,35 +179,8 @@
 $labels['importnone'] = 'Fandt ingen arrangementer som kunne importeres';
 $labels['importerror'] = 'Der opstod en fejl under import';
 $labels['aclnorights'] = 'Du har ikke administratorrettigheder for denne kalender.';
-
 // recurrence form
 $labels['repeat'] = 'Gentag';
-$labels['frequency'] = 'Gentag';
-$labels['never'] = 'aldrig';
-$labels['daily'] = 'dagligt';
-$labels['weekly'] = 'ugentligt';
-$labels['monthly'] = 'månedligt';
-$labels['yearly'] = 'årligt';
-$labels['every'] = 'Hver';
-$labels['days'] = 'dag(e)';
-$labels['weeks'] = 'uge(r)';
-$labels['months'] = 'måned(er)';
-$labels['years'] = 'år i:';
-$labels['bydays'] = 'Per';
-$labels['untildate'] = 'den';
-$labels['each'] = 'Hver';
-$labels['onevery'] = 'På hver';
-$labels['onsamedate'] = 'På samme dato';
-$labels['forever'] = 'for altid';
-$labels['recurrencend'] = 'indtil';
-$labels['forntimes'] = 'for $nr gang(e)';
-$labels['first'] = 'første';
-$labels['second'] = 'anden';
-$labels['third'] = 'tredje';
-$labels['fourth'] = 'fjerde';
-$labels['last'] = 'sidste';
-$labels['dayofmonth'] = 'Dag på måneden';
-
 $labels['changeeventconfirm'] = 'Tilpas arrangement';
 $labels['removeeventconfirm'] = 'Fjern arrangement';
 $labels['changerecurringeventwarning'] = 'Dette er et tilbagevendende arrangement. Ønsker du kun at redige det aktuelle arrangement, dette og alle fremtidige forekomster, alle forekomster eller gemme det som et nyt arrangement?';
@@ -226,5 +189,5 @@
 $labels['futurevents'] = 'Fremtid';
 $labels['allevents'] = 'Alle';
 $labels['saveasnew'] = 'Gem som ny';
-
+// birthdays calendar
 ?>

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

@@ -1,7 +1,4 @@
 <?php
-
-$labels = array();
-
 // preferences
 $labels['default_view'] = 'Ansicht';
 $labels['time_format'] = 'Zeitformatierung';
@@ -17,7 +14,6 @@
 $labels['coloringmode1'] = 'Farbe der Kategorie';
 $labels['coloringmode2'] = 'Kalenderfarbe aussen, Kategoriefarbe innen';
 $labels['coloringmode3'] = 'Kategoriefarbe aussen, Kalenderfarbe innen';
-
 // calendar
 $labels['calendar'] = 'Kalender';
 $labels['calendars'] = 'Kalender';
@@ -60,6 +56,7 @@
 $labels['busy'] = 'Gebucht';
 $labels['outofoffice'] = 'Abwesend';
 $labels['tentative'] = 'Mit Vorbehalt';
+$labels['status'] = 'Status';
 $labels['priority'] = 'Priorität';
 $labels['sensitivity'] = 'Sichtbarkeit';
 $labels['public'] = 'öffentlich';
@@ -81,7 +78,6 @@
 $labels['showurl'] = 'URL anzeigen';
 $labels['showurldescription'] = 'Über die folgende Adresse können Sie mit einem beliebigen Kalenderprogramm Ihren Kalender abrufen (nur lesend), sofern dieses das iCal-Format unterstützt.';
 $labels['caldavurldescription'] = 'Copy this address to a <a href="http://en.wikipedia.org/wiki/CalDAV" target="_blank">CalDAV</a> client application (e.g. Evolution or Mozilla Thunderbird) to fully synchronize this specific calendar with your computer or mobile device.';
-
 // agenda view
 $labels['listrange'] = 'Angezeigter Bereich:';
 $labels['listsections'] = 'Unterteilung:';
@@ -96,12 +92,10 @@
 $labels['weekofyear'] = 'KW';
 $labels['pastevents'] = 'Vergangene';
 $labels['futureevents'] = 'Zukünftige';
-
 // alarm/reminder settings
 $labels['showalarms'] = 'Show reminders';
 $labels['defaultalarmtype'] = 'Standard-Erinnerungseinstellung';
 $labels['defaultalarmoffset'] = 'Standard-Erinnerungszeit';
-
 // attendees
 $labels['attendee'] = 'Teilnehmer';
 $labels['role'] = 'Rolle';
@@ -116,6 +110,7 @@
 $labels['cutypeindividual'] = 'Individual';
 $labels['cutypegroup'] = 'Group';
 $labels['cutyperesource'] = 'Ressource';
+$labels['cutyperoom'] = 'Room';
 $labels['availfree'] = 'Frei';
 $labels['availbusy'] = 'Gebucht';
 $labels['availunknown'] = 'Unbekannt';
@@ -138,27 +133,29 @@
 $labels['eventupdatemailbody'] = "*\$title*\n\nWann: \$date\n\nTeilnehmer: \$attendees\n\nIm Anhang finden Sie eine iCalendar-Datei mit den aktualisiereten Termindaten. Diese können Sie in Ihre Kalenderanwendung importieren.";
 $labels['eventcancelsubject'] = '"$title" wurde abgesagt';
 $labels['eventcancelmailbody'] = "*\$title*\n\nWann: \$date\n\nTeilnehmer: \$attendees\n\nDer Termin wurde von \$organizer abgesagt.\n\nIm Anhang finden Sie eine iCalendar-Datei mit den Termindaten.";
-
-// invitation handling
+// invitation handling (overrides labels from libcalendaring)
 $labels['itipmailbodyaccepted'] = "\$sender hat die Einladung zum folgenden Termin angenommen:\n\n*\$title*\n\nWann: \$date\n\nTeilnehmer: \$attendees";
 $labels['itipmailbodytentative'] = "\$sender hat die Einladung mit Vorbehalt zum folgenden Termin angenommen:\n\n*\$title*\n\nWann: \$date\n\nTeilnehmer: \$attendees";
 $labels['itipmailbodydeclined'] = "\$sender hat die Einladung zum folgenden Termin abgelehnt:\n\n*\$title*\n\nWann: \$date\n\nTeilnehmer: \$attendees";
 $labels['itipdeclineevent'] = 'Möchten Sie die Einladung zu diesem Termin ablehnen?';
-
+$labels['declinedeleteconfirm'] = 'Do you also want to delete this declined event from your calendar?';
 $labels['notanattendee'] = 'Sie sind nicht in der Liste der Teilnehmer aufgeführt';
 $labels['eventcancelled'] = 'Der Termin wurde vom Organisator abgesagt';
 $labels['saveincalendar'] = 'speichern in';
-
+// resources
+$labels['resource'] = 'Ressource';
+$labels['resourcedetails'] = 'Details';
 // event dialog tabs
 $labels['tabsummary'] = 'Übersicht';
 $labels['tabrecurrence'] = 'Wiederholung';
 $labels['tabattendees'] = 'Teilnehmer';
 $labels['tabattachments'] = 'Anhänge';
 $labels['tabsharing'] = 'Freigabe';
-
 // messages
+$labels['deleteobjectconfirm'] = 'Möchten Sie diesen Termin wirklich löschen?';
 $labels['deleteventconfirm'] = 'Möchten Sie diesen Termin wirklich löschen?';
 $labels['deletecalendarconfirm'] = 'Möchten Sie diesen Kalender mit allen Terminen wirklich löschen?';
+$labels['deletecalendarconfirmrecursive'] = 'Do you really want to delete this calendar with all its events and sub-calendars?';
 $labels['savingdata'] = 'Speichere Daten...';
 $labels['errorsaving'] = 'Fehler beim Speichern.';
 $labels['operationfailed'] = 'Die Aktion ist fehlgeschlagen.';
@@ -177,39 +174,13 @@
 $labels['itipresponseerror'] = 'Die Antwort auf diese Einladung konnte nicht versendet werden';
 $labels['itipinvalidrequest'] = 'Diese Einladung ist nicht mehr gültig';
 $labels['sentresponseto'] = 'Antwort auf diese Einladung erfolgreich an $mailto gesendet';
+$labels['localchangeswarning'] = 'You are about to make changes that will only be reflected on your calendar and not be sent to the organizer of the event.';
 $labels['importsuccess'] = 'Es wurden $nr Termine erfolgreich importiert';
 $labels['importnone'] = 'Keine Termine zum Importieren gefunden';
 $labels['importerror'] = 'Fehler beim Importieren';
 $labels['aclnorights'] = 'Sie haben keine Administrator-Rechte für diesen Kalender.';
-
 // recurrence form
 $labels['repeat'] = 'Wiederholung';
-$labels['frequency'] = 'Wiederholung';
-$labels['never'] = 'nie';
-$labels['daily'] = 'täglich';
-$labels['weekly'] = 'wöchentlich';
-$labels['monthly'] = 'monatlich';
-$labels['yearly'] = 'jährlich';
-$labels['every'] = 'Alle';
-$labels['days'] = 'Tag(e)';
-$labels['weeks'] = 'Woche(n)';
-$labels['months'] = 'Monat(e)';
-$labels['years'] = 'Jahre(e) im:';
-$labels['bydays'] = 'Am';
-$labels['untildate'] = 'am';
-$labels['each'] = 'Jeden';
-$labels['onevery'] = 'An jedem';
-$labels['onsamedate'] = 'Am gleichen Tag';
-$labels['forever'] = 'unendlich';
-$labels['recurrencend'] = 'bis';
-$labels['forntimes'] = '$nr Wiederholungen';
-$labels['first'] = 'erster';
-$labels['second'] = 'zweiter';
-$labels['third'] = 'dritter';
-$labels['fourth'] = 'vierter';
-$labels['last'] = 'letzter';
-$labels['dayofmonth'] = 'Tag des Montats';
-
 $labels['changeeventconfirm'] = 'Termin ändern';
 $labels['removeeventconfirm'] = 'Termin löschen';
 $labels['changerecurringeventwarning'] = 'Dies ist eine Terminreihe. Möchten Sie nur den aktuellen, diesen und alle zukünftigen oder alle Termine bearbeiten oder die Änderungen als neuen Termin speichern?';
@@ -218,7 +189,6 @@
 $labels['futurevents'] = 'Zukünftige';
 $labels['allevents'] = 'Alle';
 $labels['saveasnew'] = 'Als neu speichern';
-
 // birthdays calendar
 $labels['birthdays'] = 'Geburtstage';
 $labels['birthdayscalendar'] = 'Geburtstags-Kalender';
@@ -226,5 +196,4 @@
 $labels['birthdayscalendarsources'] = 'Für diese Adressbücher';
 $labels['birthdayeventtitle'] = '$names Geburtstag';
 $labels['birthdayage'] = 'Alter $age';
-
 ?>

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

@@ -1,7 +1,4 @@
 <?php
-
-$labels = array();
-
 // preferences
 $labels['default_view'] = 'Standardansicht';
 $labels['time_format'] = 'Zeitformatierung';
@@ -17,7 +14,6 @@
 $labels['coloringmode1'] = 'Farbe der Kategorie';
 $labels['coloringmode2'] = 'Kalenderfarbe außen, Kategoriefarbe innen';
 $labels['coloringmode3'] = 'Kategoriefarbe außen, Kalenderfarbe innen';
-
 // calendar
 $labels['calendar'] = 'Kalender';
 $labels['calendars'] = 'Kalender';
@@ -60,12 +56,16 @@
 $labels['busy'] = 'Gebucht';
 $labels['outofoffice'] = 'Abwesend';
 $labels['tentative'] = 'Mit Vorbehalt';
+$labels['status'] = 'Status';
+$labels['confirmed'] = 'Bestätigt';
+$labels['cancelled'] = 'Gekündigt';
 $labels['priority'] = 'Priorität';
 $labels['sensitivity'] = 'Sichtbarkeit';
 $labels['public'] = 'öffentlich';
 $labels['private'] = 'privat';
 $labels['confidential'] = 'vertraulich';
 $labels['alarms'] = 'Erinnerung';
+$labels['comment'] = 'Kommentar';
 $labels['generated'] = 'erstellt am';
 $labels['printdescriptions'] = 'Beschreibung drucken';
 $labels['parentcalendar'] = 'Erstellen in';
@@ -81,7 +81,6 @@
 $labels['showurl'] = 'URL anzeigen';
 $labels['showurldescription'] = 'Über die folgende Adresse können Sie mit einem beliebigen Kalenderprogramm Ihren Kalender abrufen (nur lesend), sofern dieses das iCal-Format unterstützt.';
 $labels['caldavurldescription'] = 'Diese Adresse in einen <a href="http://en.wikipedia.org/wiki/CalDAV" target="_blank">CalDAV</a>-Klienten (z.B. Evolution oder Mozilla Thunderbird) kopieren, um den Kalender in Gänze mit einem mobilen Gerät zu synchronisieren.';
-
 // agenda view
 $labels['listrange'] = 'Angezeigter Bereich:';
 $labels['listsections'] = 'Unterteilung:';
@@ -96,11 +95,10 @@
 $labels['weekofyear'] = 'Woche';
 $labels['pastevents'] = 'Vergangene';
 $labels['futureevents'] = 'Zukünftige';
-
 // alarm/reminder settings
+$labels['showalarms'] = 'Show reminders';
 $labels['defaultalarmtype'] = 'Standard-Erinnerungseinstellung';
 $labels['defaultalarmoffset'] = 'Standard-Erinnerungszeit';
-
 // attendees
 $labels['attendee'] = 'Teilnehmer';
 $labels['role'] = 'Rolle';
@@ -138,8 +136,7 @@
 $labels['eventupdatemailbody'] = "*\$title*\n\nWann: \$date\n\nTeilnehmer: \$attendees\n\nIm Anhang finden Sie eine iCalendar-Datei mit den aktualisiereten Termindaten. Diese können Sie in Ihre Kalenderanwendung importieren.";
 $labels['eventcancelsubject'] = '"$title" wurde abgesagt';
 $labels['eventcancelmailbody'] = "*\$title*\n\nWann: \$date\n\nTeilnehmer: \$attendees\n\nDer Termin wurde von \$organizer abgesagt.\n\nIm Anhang finden Sie eine iCalendar-Datei mit den Termindaten.";
-
-// invitation handling
+// invitation handling (overrides labels from libcalendaring)
 $labels['itipmailbodyaccepted'] = "\$sender hat die Einladung zum folgenden Termin angenommen:\n\n*\$title*\n\nWann: \$date\n\nTeilnehmer: \$attendees";
 $labels['itipmailbodytentative'] = "\$sender hat die Einladung mit Vorbehalt zum folgenden Termin angenommen:\n\n*\$title*\n\nWann: \$date\n\nTeilnehmer: \$attendees";
 $labels['itipmailbodydeclined'] = "\$sender hat die Einladung zum folgenden Termin abgelehnt:\n\n*\$title*\n\nWann: \$date\n\nTeilnehmer: \$attendees";
@@ -148,15 +145,18 @@
 $labels['notanattendee'] = 'Sie sind nicht in der Liste der Teilnehmer aufgeführt';
 $labels['eventcancelled'] = 'Der Termin wurde vom Organisator abgesagt';
 $labels['saveincalendar'] = 'speichern in';
-
+// resources
+$labels['resource'] = 'Ressource';
+$labels['resourcedetails'] = 'Details';
 // event dialog tabs
 $labels['tabsummary'] = 'Übersicht';
 $labels['tabrecurrence'] = 'Wiederholung';
 $labels['tabattendees'] = 'Teilnehmer';
+$labels['tabresources'] = 'Ressourcen';
 $labels['tabattachments'] = 'Anhänge';
 $labels['tabsharing'] = 'Freigabe';
-
 // messages
+$labels['deleteobjectconfirm'] = 'Möchten Sie diesen Termin wirklich löschen?';
 $labels['deleteventconfirm'] = 'Möchten Sie diesen Termin wirklich löschen?';
 $labels['deletecalendarconfirm'] = 'Möchten Sie diesen Kalender mit allen Terminen wirklich löschen?';
 $labels['deletecalendarconfirmrecursive'] = 'Soll dieser Kalender wirklich mit allen Terminen und Unterkalendern gelöscht werden?';
@@ -183,35 +183,8 @@
 $labels['importnone'] = 'Keine Termine zum Importieren gefunden';
 $labels['importerror'] = 'Fehler beim Importieren';
 $labels['aclnorights'] = 'Der Zugriff auf diesen Kalender erfordert Administrator-Rechte.';
-
 // recurrence form
 $labels['repeat'] = 'Wiederholung';
-$labels['frequency'] = 'Wiederholung';
-$labels['never'] = 'nie';
-$labels['daily'] = 'täglich';
-$labels['weekly'] = 'wöchentlich';
-$labels['monthly'] = 'monatlich';
-$labels['yearly'] = 'jährlich';
-$labels['every'] = 'Alle';
-$labels['days'] = 'Tag(e)';
-$labels['weeks'] = 'Woche(n)';
-$labels['months'] = 'Monat(e)';
-$labels['years'] = 'Jahre(e) im:';
-$labels['bydays'] = 'Am';
-$labels['untildate'] = 'am';
-$labels['each'] = 'Jeden';
-$labels['onevery'] = 'An jedem';
-$labels['onsamedate'] = 'Am gleichen Tag';
-$labels['forever'] = 'unendlich';
-$labels['recurrencend'] = 'bis';
-$labels['forntimes'] = '$nr Wiederholungen';
-$labels['first'] = 'erster';
-$labels['second'] = 'zweiter';
-$labels['third'] = 'dritter';
-$labels['fourth'] = 'vierter';
-$labels['last'] = 'letzter';
-$labels['dayofmonth'] = 'Tag des Montats';
-
 $labels['changeeventconfirm'] = 'Termin ändern';
 $labels['removeeventconfirm'] = 'Termin löschen';
 $labels['changerecurringeventwarning'] = 'Dies ist eine Terminreihe. Möchten Sie nur den aktuellen, diesen und alle zukünftigen oder alle Termine bearbeiten oder die Änderungen als neuen Termin speichern?';
@@ -220,7 +193,6 @@
 $labels['futurevents'] = 'Zukünftige';
 $labels['allevents'] = 'Alle';
 $labels['saveasnew'] = 'Als neu speichern';
-
 // birthdays calendar
 $labels['birthdays'] = 'Geburtstage';
 $labels['birthdayscalendar'] = 'Geburtstags-Kalender';
@@ -228,5 +200,4 @@
 $labels['birthdayscalendarsources'] = 'Für diese Adressbücher';
 $labels['birthdayeventtitle'] = '$names Geburtstag';
 $labels['birthdayage'] = 'Alter $age';
-
 ?>

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

@@ -53,13 +53,19 @@
 $labels['url'] = 'URL';
 $labels['date'] = 'Date';
 $labels['start'] = 'Start';
+$labels['starttime'] = 'Start time';
 $labels['end'] = 'End';
+$labels['endtime'] = 'End time';
+$labels['repeat'] = 'Repeat';
 $labels['selectdate'] = 'Choose date';
 $labels['freebusy'] = 'Show me as';
 $labels['free'] = 'Free';
 $labels['busy'] = 'Busy';
 $labels['outofoffice'] = 'Out of Office';
 $labels['tentative'] = 'Tentative';
+$labels['status'] = 'Status';
+$labels['confirmed'] = 'Confirmed';
+$labels['cancelled'] = 'Cancelled';
 $labels['priority'] = 'Priority';
 $labels['sensitivity'] = 'Privacy';
 $labels['public'] = 'public';
@@ -82,6 +88,12 @@
 $labels['showurl'] = 'Show calendar URL';
 $labels['showurldescription'] = 'Use the following address to access (read only) your calendar from other applications. You can copy and paste this into any calendar software that supports the iCal format.';
 $labels['caldavurldescription'] = 'Copy this address to a <a href="http://en.wikipedia.org/wiki/CalDAV" target="_blank">CalDAV</a> client application (e.g. Evolution or Mozilla Thunderbird) to fully synchronize this specific calendar with your computer or mobile device.';
+$labels['findcalendars'] = 'Find calendars...';
+$labels['searchterms'] = 'Search terms';
+$labels['calsearchresults'] = 'Available Calendars';
+$labels['calendarsubscribe'] = 'List permanently';
+$labels['nocalendarsfound'] = 'No calendars found';
+$labels['nrcalendarsfound'] = '$nr calendars found';
 
 // agenda view
 $labels['listrange'] = 'Range to display:';
@@ -92,6 +104,7 @@
 $labels['tomorrow'] = 'Tomorrow';
 $labels['thisweek'] = 'This week';
 $labels['nextweek'] = 'Next week';
+$labels['prevweek'] = 'Previous week';
 $labels['thismonth'] = 'This month';
 $labels['nextmonth'] = 'Next month';
 $labels['weekofyear'] = 'Week';
@@ -133,6 +146,7 @@
 $labels['reqallattendees'] = 'Required/all participants';
 $labels['prevslot'] = 'Previous Slot';
 $labels['nextslot'] = 'Next Slot';
+$labels['suggestedslot'] = 'Suggested Slot';
 $labels['noslotfound'] = 'Unable to find a free time slot';
 $labels['invitationsubject'] = 'You\'ve been invited to "$title"';
 $labels['invitationmailbody'] = "*\$title*\n\nWhen: \$date\n\nInvitees: \$attendees\n\nPlease find attached an iCalendar file with all the event details which you can import to your calendar application.";
@@ -196,6 +210,7 @@
 $labels['newerversionexists'] = 'A newer version of this event already exists! Aborted.';
 $labels['nowritecalendarfound'] = 'No calendar found to save the event';
 $labels['importedsuccessfully'] = 'The event was successfully added to \'$calendar\'';
+$labels['updatedsuccessfully'] = 'The event was successfully updated in \'$calendar\'';
 $labels['attendeupdateesuccess'] = 'Successfully updated the participant\'s status';
 $labels['itipsendsuccess'] = 'Invitation sent to participants.';
 $labels['itipresponseerror'] = 'Failed to send the response to this event invitation';
@@ -207,36 +222,6 @@
 $labels['importerror'] = 'An error occured while importing';
 $labels['aclnorights'] = 'You do not have administrator rights on this calendar.';
 
-// recurrence form
-$labels['repeat'] = 'Repeat';
-$labels['frequency'] = 'Repeat';
-$labels['never'] = 'never';
-$labels['daily'] = 'daily';
-$labels['weekly'] = 'weekly';
-$labels['monthly'] = 'monthly';
-$labels['yearly'] = 'annually';
-$labels['rdate'] = 'on dates';
-$labels['every'] = 'Every';
-$labels['days'] = 'day(s)';
-$labels['weeks'] = 'week(s)';
-$labels['months'] = 'month(s)';
-$labels['years'] = 'year(s) in:';
-$labels['bydays'] = 'On';
-$labels['untildate'] = 'the';
-$labels['each'] = 'Each';
-$labels['onevery'] = 'On every';
-$labels['onsamedate'] = 'On the same date';
-$labels['forever'] = 'forever';
-$labels['recurrencend'] = 'until';
-$labels['forntimes'] = 'for $nr time(s)';
-$labels['first'] = 'first';
-$labels['second'] = 'second';
-$labels['third'] = 'third';
-$labels['fourth'] = 'fourth';
-$labels['last'] = 'last';
-$labels['dayofmonth'] = 'Day of month';
-$labels['addrdate'] = 'Add repeat date';
-
 $labels['changeeventconfirm'] = 'Change event';
 $labels['removeeventconfirm'] = 'Remove 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?';
@@ -254,4 +239,16 @@
 $labels['birthdayeventtitle'] = '$name\'s Birthday';
 $labels['birthdayage'] = 'Age $age';
 
+// (hidden) titles and labels for accessibility annotations
+$labels['arialabelminical'] = 'Calendar date selection';
+$labels['arialabelcalendarview'] = 'Calendar view';
+$labels['arialabelsearchform'] = 'Event search form';
+$labels['arialabelquicksearchbox'] = 'Event search input';
+$labels['arialabelcalsearchform'] = 'Calendars search form';
+$labels['calendaractions'] = 'Calendar actions';
+$labels['arialabeleventattendees'] = 'Event participants list';
+$labels['arialabeleventresources'] = 'Event resources list';
+$labels['arialabelresourcesearchform'] = 'Resources search form';
+$labels['arialabelresourceselection'] = 'Available resources';
+
 ?>

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

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

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

@@ -1,7 +1,4 @@
 <?php
-
-$labels = array();
-
 // preferences
 $labels['default_view'] = 'Oletusnäkymä';
 $labels['time_format'] = 'Aikamuoto';
@@ -14,7 +11,6 @@
 $labels['eventcoloring'] = 'Tapahtuman väritys';
 $labels['coloringmode0'] = 'Kalenterin mukaan';
 $labels['coloringmode1'] = 'Luokan mukaan';
-
 // calendar
 $labels['calendar'] = 'Kalenteri';
 $labels['calendars'] = 'Kalenterit';
@@ -53,6 +49,9 @@
 $labels['freebusy'] = 'Aseta tilakseni';
 $labels['free'] = 'Vapaa';
 $labels['busy'] = 'Varattu';
+$labels['status'] = 'Tila';
+$labels['confirmed'] = 'Vahvistettu';
+$labels['cancelled'] = 'Peruttu';
 $labels['priority'] = 'Tärkeys';
 $labels['sensitivity'] = 'Yksityisyys';
 $labels['public'] = 'julkinen';
@@ -72,7 +71,6 @@
 $labels['showurl'] = 'Näytä kalenterin osoite';
 $labels['showurldescription'] = 'Käytä seuraavia osoitteita avataksesi kalenterisi pelkässä lukumuodossa muissa sovelluksissa. Voit kopioida ja liittää osoitteen mihin tahansa iCal-muotoa tukevaan kalenterisovellukseen.';
 $labels['caldavurldescription'] = 'Kopioi tämä osoite <a href="http://en.wikipedia.org/wiki/CalDAV" target="_blank">CalDAV</a-asiakassovellukseen (esim. Evolution tai Mozilla Thunderbird) synkronoidaksesi tämän kalenterin tietokoneesi tai mobiililaitteesi kanssa.';
-
 // agenda view
 $labels['until'] = 'kunnes';
 $labels['today'] = 'Tänään';
@@ -82,11 +80,9 @@
 $labels['thismonth'] = 'Tässä kuussa';
 $labels['nextmonth'] = 'Ensi kuussa';
 $labels['weekofyear'] = 'Viikko';
-
 // alarm/reminder settings
 $labels['defaultalarmtype'] = 'Muistutuksen oletusasetus';
 $labels['defaultalarmoffset'] = 'Muistutuksen oletusaika';
-
 // attendees
 $labels['role'] = 'Rooli';
 $labels['confirmstate'] = 'Tila';
@@ -111,20 +107,20 @@
 $labels['eventupdatesubject'] = '"$title" on päivitetty';
 $labels['eventupdatesubjectempty'] = 'Sinua koskeva tapahtuma on päivitetty';
 $labels['eventcancelsubject'] = '"$title" on peruttu';
-
 // invitation handling (overrides labels from libcalendaring)
 $labels['declinedeleteconfirm'] = 'Haluatko poistaa tämän hylätyn tapahtuman kalenteristasi?';
-
 $labels['notanattendee'] = 'Sinua ei ole määritetty tapahtuman osanottajaksi';
 $labels['eventcancelled'] = 'Tapahtuma on peruttu';
-
+// resources
+$labels['resource'] = 'Resurssi';
+$labels['resourcedetails'] = 'Tiedot';
 // event dialog tabs
 $labels['tabsummary'] = 'Yhteenveto';
 $labels['tabrecurrence'] = 'Toistuminen';
 $labels['tabattendees'] = 'Osallistujat';
+$labels['tabresources'] = 'Resurssit';
 $labels['tabattachments'] = 'Liitteet';
 $labels['tabsharing'] = 'Jakaminen';
-
 // messages
 $labels['deleteobjectconfirm'] = 'Haluatko varmasti poistaa tämän tapahtuman?';
 $labels['deleteventconfirm'] = 'Haluatko varmasti poistaa tämän tapahtuman?';
@@ -149,7 +145,6 @@
 $labels['importnone'] = 'Tuotavaksi tarkoitettuja tapahtumia ei löytynyt';
 $labels['importerror'] = 'Tuotaessa tapahtui virhe';
 $labels['aclnorights'] = 'Sinulla ei ole ylläpitäjän oikeuksia tähän kalenteriin.';
-
 // recurrence form
 $labels['daily'] = 'päivittäin';
 $labels['weekly'] = 'viikottain';
@@ -157,9 +152,8 @@
 $labels['yearly'] = 'vuosittain';
 $labels['forever'] = 'ikuisesti';
 $labels['recurrencend'] = 'kunnes';
-
 $labels['removeeventconfirm'] = 'Poista tapahtuma';
 $labels['allevents'] = 'Kaikki';
 $labels['saveasnew'] = 'Tallenna uutena';
-
+// birthdays calendar
 ?>

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

@@ -1,7 +1,4 @@
 <?php
-
-$labels = array();
-
 // preferences
 $labels['default_view'] = 'Vue par défaut';
 $labels['time_format'] = 'Format de l\'heure';
@@ -16,7 +13,6 @@
 $labels['coloringmode1'] = 'Selon la catégorie';
 $labels['coloringmode2'] = 'Calendrier en contour, catégorie en contenu';
 $labels['coloringmode3'] = 'Catégorie en contour, calendrier en contenu';
-
 // calendar
 $labels['calendar'] = 'Agenda';
 $labels['calendars'] = 'Agendas';
@@ -58,6 +54,9 @@
 $labels['busy'] = 'Occupé';
 $labels['outofoffice'] = 'Absent';
 $labels['tentative'] = 'Provisoire';
+$labels['status'] = 'Statut';
+$labels['confirmed'] = 'Confirmé';
+$labels['cancelled'] = 'Annulé';
 $labels['priority'] = 'Priorité';
 $labels['sensitivity'] = 'Diffusion';
 $labels['public'] = 'publique';
@@ -79,7 +78,6 @@
 $labels['showurl'] = 'Afficher l\'URL de l\'agenda';
 $labels['showurldescription'] = 'Utilisez l\'adresse suivante pour accéder(lecture seule) à votre agenda depuis une autre application. Vous pouvez copier/coller celle-ci dans n\'importe quel agenda électronique gérant le format iCal.';
 $labels['caldavurldescription'] = 'Copiez cette adresse vers une application client (comme Evolution ou Mozilla Thunderbird) compatible <a href="http://fr.wikipedia.org/wiki/CalDAV" target="_blank">CalDAV</a> pour synchroniser ce calendrier avec votre ordinateur ou votre smartphone.';
-
 // agenda view
 $labels['listrange'] = 'Intervalle à afficher :';
 $labels['listsections'] = 'Diviser en :';
@@ -94,12 +92,10 @@
 $labels['weekofyear'] = 'Semaine';
 $labels['pastevents'] = 'Passé';
 $labels['futureevents'] = 'Futur';
-
 // alarm/reminder settings
 $labels['showalarms'] = 'Afficher les rappels';
 $labels['defaultalarmtype'] = 'Paramètre de rappel par défaut';
 $labels['defaultalarmoffset'] = 'Durée de rappel par défaut';
-
 // attendees
 $labels['attendee'] = 'Participant';
 $labels['role'] = 'Rôle';
@@ -136,8 +132,7 @@
 $labels['eventupdatemailbody'] = "*\$title*\n\nQuand: \$date\n\nParticipants: \$attendees\n\nVous trouverez ci-joint un fichier iCalendar avec tous les modifications de l'évènement que vous pourrez importer dans votre agenda électronique.";
 $labels['eventcancelsubject'] = '"$title" a été annulé';
 $labels['eventcancelmailbody'] = "*\$title*\n\nQuand: \$date\n\nParticipants: \$attendees\n\nL'évènement a été annulé par \$organizer.\n\nVous trouverez en pièce jointe un fichier iCalendar avec les modifications de l'évènement que vous pourrez importer dans votre agenda électronique.";
-
-// invitation handling
+// invitation handling (overrides labels from libcalendaring)
 $labels['itipmailbodyaccepted'] = "\$sender a accepté l'invitation à l'évènement suivant :\n\n*\$title*\n\nQuand: \$date\n\nParticipants: \$attendees";
 $labels['itipmailbodytentative'] = "\$sender a accepté provisoirement l'invitation à l'évènement suivant :\n\n*\$title*\n\nQuand: \$date\n\nParticipants: \$attendees";
 $labels['itipmailbodydeclined'] = "\$sender a refusé l'invitation à l'évènement suivant :\n\n*\$title*\n\nQuand: \$date\n\nParticipants: \$attendees";
@@ -146,15 +141,18 @@
 $labels['notanattendee'] = 'Vous n\'êtes pas dans la liste des participants à cet évènement';
 $labels['eventcancelled'] = 'L\'évènement a été annulé';
 $labels['saveincalendar'] = 'Enregistrer sous';
-
+// resources
+$labels['resource'] = 'Ressource';
+$labels['resourcedetails'] = 'Détails';
 // event dialog tabs
 $labels['tabsummary'] = 'Résumé';
 $labels['tabrecurrence'] = 'Récurrence';
 $labels['tabattendees'] = 'Participants';
+$labels['tabresources'] = 'Ressources';
 $labels['tabattachments'] = 'Pièces jointes';
 $labels['tabsharing'] = 'Partage';
-
 // messages
+$labels['deleteobjectconfirm'] = 'Voulez-vous vraiment supprimer cet évènement?';
 $labels['deleteventconfirm'] = 'Voulez-vous vraiment supprimer cet évènement?';
 $labels['deletecalendarconfirm'] = 'Voulez-vous vraiment supprimer cet agenda et tous ses évènements?';
 $labels['savingdata'] = 'Enregistrer...';
@@ -179,35 +177,8 @@
 $labels['importnone'] = 'Pas d\'évènements à importer';
 $labels['importerror'] = 'Une erreur est arrivée lors de l\'import';
 $labels['aclnorights'] = 'Vous n\'avez pas les droits d\'administration sur cet agenda.';
-
 // recurrence form
 $labels['repeat'] = 'Répéter';
-$labels['frequency'] = 'Répéter';
-$labels['never'] = 'Jamais';
-$labels['daily'] = 'Quotidienne';
-$labels['weekly'] = 'Hebdomadaire';
-$labels['monthly'] = 'Mensuelle';
-$labels['yearly'] = 'Annuelle';
-$labels['every'] = 'Tous les';
-$labels['days'] = 'jour(s)';
-$labels['weeks'] = 'semaine(s)';
-$labels['months'] = 'mois';
-$labels['years'] = 'année(s) en :';
-$labels['bydays'] = 'Le';
-$labels['untildate'] = 'le';
-$labels['each'] = 'Chaque';
-$labels['onevery'] = 'Tous les';
-$labels['onsamedate'] = 'à la même date';
-$labels['forever'] = 'Pour toujours';
-$labels['recurrencend'] = 'Jusqu\'à';
-$labels['forntimes'] = '$nr fois';
-$labels['first'] = 'premier';
-$labels['second'] = 'deuxième';
-$labels['third'] = 'troisième';
-$labels['fourth'] = 'quatrième';
-$labels['last'] = 'dernier';
-$labels['dayofmonth'] = 'Jour du mois';
-
 $labels['changeeventconfirm'] = 'Modifier l\'évènement';
 $labels['removeeventconfirm'] = 'Supprimer l\'évènement';
 $labels['changerecurringeventwarning'] = 'Ceci est un évènement récurant. Voulez vous éditer seulement cette occurrence, celle-ci et toutes les suivantes, toutes les occurrences ou l\'enregistrer comme un nouvel évènement? ';
@@ -216,5 +187,5 @@
 $labels['futurevents'] = 'Cette occurrence et toutes les suivantes';
 $labels['allevents'] = 'Toutes les occurrences';
 $labels['saveasnew'] = 'Enregistrer comme un nouvel évènement';
-
+// birthdays calendar
 ?>

roundcubemail-plugins-kolab-3.2.tar.gz/plugins/calendar/localization/hr.inc Added

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

@@ -1,26 +1,213 @@
 <?php
-
-$labels = array();
-
 // preferences
-$labels['default_view'] = 'Alap nézet';
-$labels['time_format'] = 'Idõ formátum';
-$labels['first_day'] = 'A hét elsõ napja';
-
+$labels['default_view'] = 'Alapnézett nézet';
+$labels['time_format'] = 'Idő formátum';
+$labels['timeslots'] = 'Órák felbontása időrésekre';
+$labels['first_day'] = 'A hét első napja';
+$labels['first_hour'] = 'Kezdő óra';
+$labels['workinghours'] = 'Munkaidő';
+$labels['add_category'] = 'Kategória hozzáadása';
+$labels['remove_category'] = 'Kategória törlése';
+$labels['defaultcalendar'] = 'Új események alapértelmezett helye';
+$labels['eventcoloring'] = 'Események színezése';
+$labels['coloringmode0'] = 'Naptár szerint';
+$labels['coloringmode1'] = 'Kategória szerint';
+$labels['coloringmode2'] = 'Naptár színe körvonal, kategória színe belsőrész';
+$labels['coloringmode3'] = 'Kategória színe körvonal, naptár színe belsőrész';
 // calendar
 $labels['calendar'] = 'Naptár';
+$labels['calendars'] = 'Naptárak';
 $labels['category'] = 'Kategória';
+$labels['categories'] = 'Kategóriák';
+$labels['createcalendar'] = 'Új naptár létrehozása';
+$labels['editcalendar'] = 'Naptár tulajdonságai';
+$labels['name'] = 'Név';
+$labels['color'] = 'Szín';
 $labels['day'] = 'Nap';
 $labels['week'] = 'Hét';
 $labels['month'] = 'Hónap';
-$labels['new_event'] = 'Új bejegyzés';
-$labels['edit_event'] = 'Bejegyzés szerkesztése';
+$labels['agenda'] = 'Napirend';
+$labels['new'] = 'Új';
+$labels['new_event'] = 'Új esemény';
+$labels['edit_event'] = 'Esemény módosítása';
+$labels['edit'] = 'Módosítás';
 $labels['save'] = 'Mentés';
 $labels['remove'] = 'Törlés';
 $labels['cancel'] = 'Mégse';
+$labels['select'] = 'Jelölés';
+$labels['print'] = 'Nyomtatás';
+$labels['printtitle'] = 'Naptárak nyomtatása';
 $labels['title'] = 'Tárgy';
 $labels['description'] = 'Leírás';
 $labels['all-day'] = 'Egész nap';
-$labels['export'] = 'Exportálás ICS formátumba';
-
+$labels['export'] = 'Exportálás';
+$labels['exporttitle'] = 'Exportálás iCalendar-ba';
+$labels['exportrange'] = 'Visszamenőleg';
+$labels['exportattachments'] = 'Csatolmányokkal';
+$labels['customdate'] = 'Megadott dátumig';
+$labels['location'] = 'Hol';
+$labels['url'] = 'URL';
+$labels['date'] = 'Dátum';
+$labels['start'] = 'Kezdet';
+$labels['end'] = 'Vég';
+$labels['selectdate'] = 'Válasszon dátumot';
+$labels['freebusy'] = 'Foglaltság';
+$labels['free'] = 'Szabad';
+$labels['busy'] = 'Foglalt';
+$labels['outofoffice'] = 'Házon kívűl';
+$labels['tentative'] = 'Feltételes';
+$labels['status'] = 'Stát.';
+$labels['confirmed'] = 'Confirmed';
+$labels['cancelled'] = 'Cancelled';
+$labels['priority'] = 'Prioritás';
+$labels['sensitivity'] = 'Manánszféra';
+$labels['public'] = 'publikus';
+$labels['private'] = 'privát';
+$labels['confidential'] = 'titkos';
+$labels['alarms'] = 'Emlékeztető';
+$labels['comment'] = 'Megjegyzés';
+$labels['generated'] = 'készítve:';
+$labels['printdescriptions'] = 'Leírás nyomtatása';
+$labels['parentcalendar'] = 'Szülőnaptár';
+$labels['searchearlierdates'] = '< Korábbi események keresése';
+$labels['searchlaterdates'] = 'Későbbi események keresése >';
+$labels['andnmore'] = 'még $nr ...';
+$labels['togglerole'] = 'Kattintson a szerepváltáshoz';
+$labels['createfrommail'] = 'Mentés naptári eseményként';
+$labels['importevents'] = 'Események importálása';
+$labels['importrange'] = 'Visszamenőleg';
+$labels['onemonthback'] = '1 hónapra';
+$labels['nmonthsback'] = '$nr hónapra';
+$labels['showurl'] = 'Naptár URL címe';
+$labels['showurldescription'] = 'Ezen a címen érhető el (csak olvasásra!) a naptár más alkalmazások számára, iCal formátumban.';
+$labels['caldavurldescription'] = 'Másolja be ezt a címet egy <a href="http://en.wikipedia.org/wiki/CalDAV" target="_blank">CalDAV</a>-kompatibilis kliensbe (pl. Evolution vagy Mozilla Thunderbird) hogy kétirányú szinkronizációval tudjon a naptárához hozzáférni.';
+// agenda view
+$labels['listrange'] = 'Megjelenítés:';
+$labels['listsections'] = 'Felosztás:';
+$labels['smartsections'] = 'Áttekintve';
+$labels['until'] = 'eddig';
+$labels['today'] = 'Ma';
+$labels['tomorrow'] = 'Holnap';
+$labels['thisweek'] = 'Ezen a héten';
+$labels['nextweek'] = 'Jövő héten';
+$labels['thismonth'] = 'Ebben a hónapban';
+$labels['nextmonth'] = 'Jövő hónapban';
+$labels['weekofyear'] = 'Hét:';
+$labels['pastevents'] = 'Múltban';
+$labels['futureevents'] = 'Jövőben';
+// alarm/reminder settings
+$labels['showalarms'] = 'Emlékeztetők megjelenítése';
+$labels['defaultalarmtype'] = 'Alapértelmezett emlékeztető';
+$labels['defaultalarmoffset'] = 'Alapértelmezett emlékeztető ideje';
+// attendees
+$labels['attendee'] = 'Résztvevő';
+$labels['role'] = 'Szerepkör';
+$labels['availability'] = 'Elérh.';
+$labels['confirmstate'] = 'Stát.';
+$labels['addattendee'] = 'Résztvevő meghívása';
+$labels['roleorganizer'] = 'Szervező';
+$labels['rolerequired'] = 'Kötelező';
+$labels['roleoptional'] = 'Opcionális';
+$labels['rolechair'] = 'Elnöklő';
+$labels['rolenonparticipant'] = 'Hiányzó';
+$labels['cutypeindividual'] = 'Egyén';
+$labels['cutypegroup'] = 'Csoport';
+$labels['cutyperesource'] = 'Eszköz';
+$labels['cutyperoom'] = 'Helyiség';
+$labels['availfree'] = 'Szabad';
+$labels['availbusy'] = 'Foglalt';
+$labels['availunknown'] = 'Ismeretlen foglaltság';
+$labels['availtentative'] = 'Feltételes';
+$labels['availoutofoffice'] = 'Házon kívül';
+$labels['delegatedto'] = 'Beosztva ide: ';
+$labels['delegatedfrom'] = 'Beosztva innen: ';
+$labels['scheduletime'] = 'Elérhetőség';
+$labels['sendinvitations'] = 'Meghívók küldése';
+$labels['sendnotifications'] = 'Résztvevők értesítése a változásokról';
+$labels['sendcancellation'] = 'Résztvevők értesítése a lemondásról';
+$labels['onlyworkinghours'] = 'Elérhetőség figyelembevétele csak az én munkaidőmben';
+$labels['reqallattendees'] = 'Mindenki részére';
+$labels['prevslot'] = 'Előző idősáv';
+$labels['nextslot'] = 'Következő idősáv';
+$labels['noslotfound'] = 'Nem sikerült szabad idősávot találni';
+$labels['invitationsubject'] = '$title';
+$labels['invitationmailbody'] = "Meghívó érkezett '\$title' eseményre.\n\nIdőpont: \$date\nSzervező: \$organizer\nRésztvevők: \$attendees\n\n\nMellékletben egy iCalendar naptárbejegyzés, mely tetszőleges naptárprogramba importálható.";
+$labels['invitationattendlinks'] = "Amennyiben a levelezőben nem lát elfogadó/elutasító gombokat (a levelező program nem támogatja az iTip üzeneteket), kattintson ide a meghívó elfogadására, vagy elutasítására:\n\$url";
+$labels['eventupdatesubject'] = '$title - módosítva';
+$labels['eventupdatesubjectempty'] = 'Egy Önt érintő esemény módosítva lett';
+$labels['eventupdatemailbody'] = "Módosítás érkezett '\$title' eseményre vonatkozóan.\n\nIdőpont: \$date\nSzervező: \$organizer\nRésztvevők: \$attendees\n\n\nMellékletben egy frissített iCalendar naptárbejegyzés, mely tetszőleges naptárprogramba importálható.";
+$labels['eventcancelsubject'] = '$title - lemondva';
+$labels['eventcancelmailbody'] = "'\$title' eseményre \$organizer szervező visszavonta a meghívást.\n\nIdőpont: \$date\nRésztvevők: \$attendees\n\n\nMellékletben egy frissített iCalendar naptárbejegyzés, mely tetszőleges naptárprogramba importálható.";
+// invitation handling (overrides labels from libcalendaring)
+$labels['itipobjectnotfound'] = 'Az üzenetben hivatkozott esemény nem található a naptárban.';
+$labels['itipmailbodyaccepted'] = "\$sender elfogadta a meghívást '\$title' eseményre.\n\nIdőpont: \$date\nRésztvevők: \$attendees";
+$labels['itipmailbodytentative'] = "\$sender feltételesen elfogadta a meghívást '\$title' eseményre.\n\nIdőpont: \$date\nRésztvevők: \$attendees";
+$labels['itipmailbodydeclined'] = "\$sender elutasította a meghívást '\$title' eseményre.\n\nIdőpont: \$date\nRésztvevők: \$attendees";
+$labels['itipmailbodycancel'] = "\$sender elutasította a részvételét '\$title' eseményen, \$date időpontra";
+$labels['itipdeclineevent'] = 'Biztos benne, hogy el szeretné utasítani ezt a meghívást?';
+$labels['declinedeleteconfirm'] = 'Ki is szeretné törölni a saját naptárából ezt az időpontot?';
+$labels['notanattendee'] = 'Ön nem szerepel az esemény meghívottai között';
+$labels['eventcancelled'] = 'Az esemény le lett mondva';
+$labels['saveincalendar'] = 'Mentés naptárba';
+$labels['updatemycopy'] = 'Naptárbejegyzés frissítése';
+// resources
+$labels['resource'] = 'Eszközök';
+$labels['addresource'] = 'Eszköz foglalása';
+$labels['findresources'] = 'Eszközök keresése';
+$labels['resourcedetails'] = 'Részletek';
+$labels['resourceavailability'] = 'Elérhetőség';
+$labels['resourceowner'] = 'Tulajdonos';
+$labels['resourceadded'] = 'Az eszköz le lett foglalva az eseményhez';
+// event dialog tabs
+$labels['tabsummary'] = 'Részletek';
+$labels['tabrecurrence'] = 'Ismétlődés';
+$labels['tabattendees'] = 'Résztvevők';
+$labels['tabresources'] = 'Eszközök';
+$labels['tabattachments'] = 'Csatolmányok';
+$labels['tabsharing'] = 'Megosztás';
+// messages
+$labels['deleteobjectconfirm'] = 'Biztos benne, hogy törölni szeretné ezt az eseményt?';
+$labels['deleteventconfirm'] = 'Biztos benne, hogy törölni szeretné ezt az eseményt?';
+$labels['deletecalendarconfirm'] = 'Biztos benne, hogy törölni szeretné ezt a naptárat, az összes benne lévő eseménnyel?';
+$labels['deletecalendarconfirmrecursive'] = 'Biztos benne, hogy törölni szeretné ezt a naptárat, az összes benne lévő al-naptárral és eseménnyel?';
+$labels['savingdata'] = 'Adatok mentése...';
+$labels['errorsaving'] = 'A módosításokat nem sikerült elmenteni.';
+$labels['operationfailed'] = 'A műveletet nem sikerült elvégezni.';
+$labels['invalideventdates'] = 'Helytelen dátumokoat adott meg! Kérem, ellenörizze a bevírt adatokat.';
+$labels['invalidcalendarproperties'] = 'Helytelen naptár tulajdonságok! Kérem, adjon meg egy helyes nevet.';
+$labels['searchnoresults'] = 'Nem található esemény a kiválasztott naptárakban.';
+$labels['successremoval'] = 'Az esemény törlése sikerült.';
+$labels['successrestore'] = 'Az esemény sikeresen vissza lett állítva.';
+$labels['errornotifying'] = 'Nem sikerült meghívókat küldeni a résztvevőknek.';
+$labels['errorimportingevent'] = 'Az esemény importálása sikertelen volt.';
+$labels['newerversionexists'] = 'Egy újabb verzió már van ebből az eseményből! Itt abbahagytam.';
+$labels['nowritecalendarfound'] = 'No calendar found to save the event';
+$labels['importedsuccessfully'] = 'Az esemény a \'$calendar\' naptárhoz hozzá lett adva';
+$labels['attendeupdateesuccess'] = 'A résztvevők adatai sikeresen frissítve';
+$labels['itipsendsuccess'] = 'Értesítés küldve a résztvevőknek';
+$labels['itipresponseerror'] = 'Nem sikerült választ küldeni erre a meghívásra';
+$labels['itipinvalidrequest'] = 'Ez a meghívás már érvénytelen';
+$labels['sentresponseto'] = 'Értesítésre válasz küldve: $mailto';
+$labels['localchangeswarning'] = 'Ezek a változások csak az ön naptárában fognak megjelenni, az esemény szervezőjénél nem.';
+$labels['importsuccess'] = '$nr esemény sikeresen importálva lett';
+$labels['importnone'] = 'Nem található importálható esemény.';
+$labels['importerror'] = 'Hiba importálás közben';
+$labels['aclnorights'] = 'Nincs adminisztrátori joga ehhez a naptárhoz';
+// recurrence form
+$labels['repeat'] = 'Ismétlődés';
+$labels['changeeventconfirm'] = 'Bejegyzés módosítása';
+$labels['removeeventconfirm'] = 'Bejegyzés törlése';
+$labels['changerecurringeventwarning'] = 'Ez egy ismétlődő esemény. Csak ezt az előfordulást szeretné módosítani, esetleg ezt az előfordulást az összes következővel, netán a teljes sorozatot, vagy új eseményként legyen mentve?';
+$labels['removerecurringeventwarning'] = 'Ez egy ismétlődő esemény. Csak ezt az előfordulást szeretné törölni, esetleg ezt az előfordulást az összes következővel törölné, netán a teljes sorozatot eltávolítaná?';
+$labels['currentevent'] = 'Csak ezt';
+$labels['futurevents'] = 'Ezt és a következőeket';
+$labels['allevents'] = 'Egész sorozatot';
+$labels['saveasnew'] = 'Mentés újként';
+// birthdays calendar
+$labels['birthdays'] = 'Születésnapok';
+$labels['birthdayscalendar'] = 'Születésnapi naptár';
+$labels['displaybirthdayscalendar'] = 'Születésnapok megjelenítése';
+$labels['birthdayscalendarsources'] = 'Alábbi címjegyzékekből:';
+$labels['birthdayeventtitle'] = '$name születésnapja';
+$labels['birthdayage'] = '$age éves';
 ?>

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

@@ -1,7 +1,4 @@
 <?php
-
-$labels = array();
-
 // preferences
 $labels['default_view'] = 'Visualizzazione predefinita';
 $labels['time_format'] = 'Formato ora';
@@ -15,7 +12,6 @@
 $labels['eventcoloring'] = 'Colorazione evento';
 $labels['coloringmode0'] = 'Secondo il calendario';
 $labels['coloringmode1'] = 'Secondo la categoria';
-
 // calendar
 $labels['calendar'] = 'Calendario';
 $labels['calendars'] = 'Calendari';
@@ -58,6 +54,7 @@
 $labels['busy'] = 'Occupato';
 $labels['outofoffice'] = 'Fuori Ufficio';
 $labels['tentative'] = 'Provvisorio';
+$labels['status'] = 'Stato';
 $labels['priority'] = 'Priorità';
 $labels['sensitivity'] = 'Privacy';
 $labels['public'] = 'pubblico';
@@ -79,7 +76,6 @@
 $labels['showurl'] = 'Mostra URL calendario';
 $labels['showurldescription'] = 'Usare il seguente indirizzo per accedere (in sola lettura) al calendario da altre applicazioni. È possibile copiarlo e incollarlo in qualsiasi software che supporta il formato iCal.';
 $labels['caldavurldescription'] = 'Copiare questo indirizzo in un\'applicazione client <a href="http://en.wikipedia.org/wiki/CalDAV" target="_blank">CalDAV</a> (es. Evolution o Mozilla Thunderbird) per sincronizzare completamente questo specifico calendario con il proprio computer o dispositivo mobile.';
-
 // agenda view
 $labels['listrange'] = 'Intervallo da visualizzare:';
 $labels['listsections'] = 'Dividi in:';
@@ -94,12 +90,10 @@
 $labels['weekofyear'] = 'Settimana';
 $labels['pastevents'] = 'Passato';
 $labels['futureevents'] = 'Futuro';
-
 // alarm/reminder settings
 $labels['showalarms'] = 'Mostra promemoria';
 $labels['defaultalarmtype'] = 'Impostazioni predefinite dei promemoria';
 $labels['defaultalarmoffset'] = 'Tempo predefinito per i promemoria';
-
 // attendees
 $labels['attendee'] = 'Partecipante';
 $labels['role'] = 'Ruolo';
@@ -114,6 +108,7 @@
 $labels['cutypeindividual'] = 'Individual';
 $labels['cutypegroup'] = 'Gruppo';
 $labels['cutyperesource'] = 'Risorsa';
+$labels['cutyperoom'] = 'Stanza';
 $labels['availfree'] = 'Libero';
 $labels['availbusy'] = 'Occupato';
 $labels['availunknown'] = 'Sconosciuto';
@@ -136,8 +131,7 @@
 $labels['eventupdatemailbody'] = "*\$title*\n\nQuando: \$date\n\nInvitati: \$attendees\n\nIn allegato un file iCalendar con i dettagli aggiornati dell'evento che puoi importare nella tua applicazione calendario.";
 $labels['eventcancelsubject'] = '"$title" è stato annullato';
 $labels['eventcancelmailbody'] = "*\$title*\n\nQuando: \$date\n\nInvitati: \$attendees\n\nL'evento è stato cancellato da \$organizer.\n\nIn allegato un file iCalendar con i dettagli aggiornati dell'evento .";
-
-// invitation handling
+// invitation handling (overrides labels from libcalendaring)
 $labels['itipmailbodyaccepted'] = "\$sender ha accettato l'invito al seguente evento:\n\n*\$title*\n\nQuando: \$date\n\nInvitati: \$attendees";
 $labels['itipmailbodytentative'] = "\$sender ha accettato con riserva l'invito al seguente evento:\n\n*\$title*\n\nQuando: \$date\n\nInvitati: \$attendees";
 $labels['itipmailbodydeclined'] = "\$sender ha rifiutato l'invito al seguente evento:\n\n*\$title*\n\nQuando: \$date\n\nInvitati: \$attendees";
@@ -146,15 +140,18 @@
 $labels['notanattendee'] = 'Non sei elencato tra i partecipanti a questo evento';
 $labels['eventcancelled'] = 'L\'evento è stato annullato';
 $labels['saveincalendar'] = 'salva in';
-
+// resources
+$labels['resource'] = 'Risorsa';
+$labels['resourcedetails'] = 'Dettagli';
 // event dialog tabs
 $labels['tabsummary'] = 'Riepilogo';
 $labels['tabrecurrence'] = 'Ricorrenza';
 $labels['tabattendees'] = 'Partecipanti';
+$labels['tabresources'] = 'Risorse';
 $labels['tabattachments'] = 'Allegati';
 $labels['tabsharing'] = 'Condivisione';
-
 // messages
+$labels['deleteobjectconfirm'] = 'Cancellare davvero questo evento?';
 $labels['deleteventconfirm'] = 'Cancellare davvero questo evento?';
 $labels['deletecalendarconfirm'] = 'Cancellare davvero questo calendario con tutti i suoi eventi?';
 $labels['deletecalendarconfirmrecursive'] = 'Vuoi veramente eliminare questo calendario con tutti i suoi eventi e i suoi sotto-calendari?';
@@ -181,42 +178,16 @@
 $labels['importnone'] = 'Nessun evento trovato da importare';
 $labels['importerror'] = 'Si è verificato un errore durante l\'importazione';
 $labels['aclnorights'] = 'Non hai i diritti di amministratore per questo calendario.';
-
 // recurrence form
 $labels['repeat'] = 'Ricorrenza';
-$labels['frequency'] = 'Frequenza';
-$labels['never'] = 'una volta';
-$labels['daily'] = 'quotidiana';
-$labels['weekly'] = 'settimanale';
-$labels['monthly'] = 'mensile';
-$labels['yearly'] = 'annuale';
-$labels['every'] = 'Ogni';
-$labels['days'] = 'giorno/i';
-$labels['weeks'] = 'settimana/e';
-$labels['months'] = 'mese/i';
-$labels['years'] = 'anno/i in:';
-$labels['bydays'] = 'Di';
-$labels['untildate'] = 'il';
-$labels['each'] = 'Nei giorni';
-$labels['onevery'] = 'Ogni';
-$labels['onsamedate'] = 'Alla stessa data';
-$labels['forever'] = 'per sempre';
-$labels['recurrencend'] = 'fino al';
-$labels['forntimes'] = 'per $nr volte';
-$labels['first'] = 'primo';
-$labels['second'] = 'secondo';
-$labels['third'] = 'terzo';
-$labels['fourth'] = 'quarto';
-$labels['last'] = 'ultimo';
-$labels['dayofmonth'] = 'Giorno del mese';
-
 $labels['changeeventconfirm'] = 'Cambia evento';
 $labels['removeeventconfirm'] = 'Rimuovi evento';
+$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['currentevent'] = 'Current';
 $labels['futurevents'] = 'Futuro';
 $labels['allevents'] = 'Tutto';
 $labels['saveasnew'] = 'Salva come nuovo';
-
 // birthdays calendar
 $labels['birthdays'] = 'Compleanni';
 $labels['birthdayscalendar'] = 'Calendario compleanni';
@@ -224,5 +195,4 @@
 $labels['birthdayscalendarsources'] = 'Da queste rubriche';
 $labels['birthdayeventtitle'] = 'Compleanno di $name';
 $labels['birthdayage'] = 'Età: $age anni';
-
 ?>

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

@@ -1,7 +1,4 @@
 <?php
-
-$labels = array();
-
 // preferences
 $labels['default_view'] = 'デフォルトビュー';
 $labels['time_format'] = '時刻表示形式';
@@ -16,7 +13,6 @@
 $labels['coloringmode1'] = 'カテゴリの説明';
 $labels['coloringmode2'] = 'アウトライン用カレンダー、コンテンツ用カテゴリ';
 $labels['coloringmode3'] = 'アウトライン用カレンダー、コンテンツ用カテゴリ';
-
 // calendar
 $labels['calendar'] = 'カレンダー';
 $labels['calendars'] = 'カレンダー';
@@ -57,6 +53,7 @@
 $labels['busy'] = 'ビジー';
 $labels['outofoffice'] = '外出';
 $labels['tentative'] = '仮';
+$labels['status'] = '状態';
 $labels['priority'] = '優先度';
 $labels['sensitivity'] = 'プライバシー';
 $labels['public'] = 'パブリック';
@@ -77,7 +74,6 @@
 $labels['nmonthsback'] = '$nr ヶ月戻る';
 $labels['showurl'] = 'カレンダーURL表示';
 $labels['showurldescription'] = '以下のアドレスを使用して他のアプリケーションからカレンダーにアクセス(読込のみ)できます。iCal形式をサポートしたカレンダーソフトウェアへコピーアンドペーストができます。';
-
 // agenda view
 $labels['listrange'] = '表示範囲:';
 $labels['listsections'] = '分割:';
@@ -92,11 +88,9 @@
 $labels['weekofyear'] = '週';
 $labels['pastevents'] = '以前';
 $labels['futureevents'] = '以降';
-
 // alarm/reminder settings
 $labels['defaultalarmtype'] = 'デフォルト通知設定';
 $labels['defaultalarmoffset'] = 'デフォルト通知時間';
-
 // attendees
 $labels['attendee'] = '参加者';
 $labels['role'] = 'ロール';
@@ -130,23 +124,25 @@
 $labels['eventupdatemailbody'] = "*\$title*\n\nいつ: \$date\n\n招待者: \$attendees\n\nあなたのカレンダーアプリケーションにインポートできるアップデートされた全イベントの詳細が添付されたiカレンダーファイルを見つけてください。";
 $labels['eventcancelsubject'] = '"$title" は変更されました';
 $labels['eventcancelmailbody'] = "*\$title*\n\nいつ: \$date\n\n招待者: \$attendees\n\nイベントが \$organizer によってキャンセルされました。\n\n更新されたイベントの詳細とともに添付されたiカレンダーファイルを見つけてください。";
-
-// invitation handling
+// invitation handling (overrides labels from libcalendaring)
 $labels['itipmailbodyaccepted'] = "\$sender は以下のイベントへの招待を承諾しました:\n\n*\$title*\n\nいつ: \$date\n\n招待者: \$attendees";
 $labels['itipmailbodytentative'] = "\$sender は以下のイベントへの招待を仮承諾しました:\n\n*\$title*\n\nいつ: \$date\n\n招待者: \$attendees";
 $labels['itipmailbodydeclined'] = "\$sender は以下のイベントへの招待を辞退しました:\n\n*\$title*\n\nいつ: \$date\n\n招待者: \$attendees";
 $labels['itipdeclineevent'] = 'このイベントへの招待を辞退しますか?';
 $labels['eventcancelled'] = 'このイベントはキャンセルされました';
 $labels['saveincalendar'] = '保存';
-
+// resources
+$labels['resource'] = 'リソース';
+$labels['resourcedetails'] = '詳細';
 // event dialog tabs
 $labels['tabsummary'] = '要約';
 $labels['tabrecurrence'] = '繰返し';
 $labels['tabattendees'] = '参加者';
+$labels['tabresources'] = 'リソース';
 $labels['tabattachments'] = '添付';
 $labels['tabsharing'] = '共有';
-
 // messages
+$labels['deleteobjectconfirm'] = '本当にこのイベントを削除しますか?';
 $labels['deleteventconfirm'] = '本当にこのイベントを削除しますか?';
 $labels['deletecalendarconfirm'] = '本当にこのカレンダーを全イベントとともに削除しますか?';
 $labels['savingdata'] = 'データを保存中…';
@@ -171,35 +167,8 @@
 $labels['importnone'] = 'インポートされたイベントはありません';
 $labels['importerror'] = 'インポート中にエラーが発生しました。';
 $labels['aclnorights'] = 'このカレンダーの管理権限がありません。';
-
 // recurrence form
 $labels['repeat'] = '繰返し';
-$labels['frequency'] = '繰返し';
-$labels['never'] = '繰返さない';
-$labels['daily'] = '毎日';
-$labels['weekly'] = '毎週';
-$labels['monthly'] = '毎月';
-$labels['yearly'] = '毎年';
-$labels['every'] = 'いつでも';
-$labels['days'] = '日(s)';
-$labels['weeks'] = '週(s)';
-$labels['months'] = '月(s)';
-$labels['years'] = '年(s):';
-$labels['bydays'] = '上';
-$labels['untildate'] = 'その';
-$labels['each'] = 'いずれも';
-$labels['onevery'] = '各';
-$labels['onsamedate'] = 'いつか';
-$labels['forever'] = 'ずっと';
-$labels['recurrencend'] = 'まで';
-$labels['forntimes'] = '$nr まで(s)';
-$labels['first'] = '第1週';
-$labels['second'] = '第2週';
-$labels['third'] = '第3週';
-$labels['fourth'] = '第4週';
-$labels['last'] = '最終週';
-$labels['dayofmonth'] = '日';
-
 $labels['changeeventconfirm'] = 'イベント変更';
 $labels['removeeventconfirm'] = 'イベント削除';
 $labels['changerecurringeventwarning'] = 'これは繰返しイベントです。現在のイベントのみ、このイベントと今後の全イベント、全イベント、編集したい、もしくは新しいイベントとして保存したい?';
@@ -208,5 +177,5 @@
 $labels['futurevents'] = '今後';
 $labels['allevents'] = '全て';
 $labels['saveasnew'] = '新規保存';
-
+// birthdays calendar
 ?>

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

@@ -1,10 +1,8 @@
 <?php
-
-$labels = array();
-
 // preferences
 $labels['default_view'] = 'Standaard agenda';
 $labels['time_format'] = 'Tijdsformaat';
+$labels['timeslots'] = 'Tijdsdelen per uur';
 $labels['first_day'] = 'Eerste weekdag';
 $labels['first_hour'] = 'Eerste uur om weer te geven';
 $labels['workinghours'] = 'Werkuren';
@@ -16,14 +14,13 @@
 $labels['coloringmode1'] = 'Volgens categorie';
 $labels['coloringmode2'] = 'Kalender voor omtrek, categorie voor inhoud';
 $labels['coloringmode3'] = 'Categorie voor omtrek, kalender voor inhoud';
-
 // calendar
-$labels['calendar'] = 'Agenda';
+$labels['calendar'] = 'Kalender';
 $labels['calendars'] = 'Kalenders';
 $labels['category'] = 'Categorie';
-$labels['categories'] = 'Categorieen';
-$labels['createcalendar'] = 'Creeer nieuwe kalender';
-$labels['editcalendar'] = 'Wijzig calendar eigenschappen';
+$labels['categories'] = 'Categorieën';
+$labels['createcalendar'] = 'Maak een nieuwe kalender';
+$labels['editcalendar'] = 'Wijzig kalender eigenschappen';
 $labels['name'] = 'Naam';
 $labels['color'] = 'Kleur';
 $labels['day'] = 'Dag';
@@ -32,20 +29,22 @@
 $labels['agenda'] = 'Agenda';
 $labels['new'] = 'Nieuw';
 $labels['new_event'] = 'Nieuwe afspraak';
-$labels['edit_event'] = 'Wijzig evenement';
+$labels['edit_event'] = 'Wijzig afspraak';
 $labels['edit'] = 'Wijzig';
 $labels['save'] = 'Bewaar';
 $labels['remove'] = 'Verwijder';
 $labels['cancel'] = 'Terug';
 $labels['select'] = 'Selecteer';
-$labels['print'] = 'Print';
-$labels['printtitle'] = 'Print kalenders';
+$labels['print'] = 'Afdrukken';
+$labels['printtitle'] = 'Kalenders afdrukken';
 $labels['title'] = 'Samenvatting';
-$labels['description'] = 'Beschrijving';
+$labels['description'] = 'Omschrijving';
 $labels['all-day'] = 'hele dag';
 $labels['export'] = 'Exporteer naar ICS';
 $labels['exporttitle'] = 'Als iCalender exporteren';
-$labels['exportrange'] = 'Events from';
+$labels['exportrange'] = 'Afspraken uit';
+$labels['exportattachments'] = 'Exporteer bijlages';
+$labels['customdate'] = 'Aangepaste datumweergave';
 $labels['location'] = 'Locatie';
 $labels['url'] = 'URL';
 $labels['date'] = 'Datum';
@@ -54,35 +53,36 @@
 $labels['selectdate'] = 'Kies datum';
 $labels['freebusy'] = 'Toon mij als';
 $labels['free'] = 'Vrij';
-$labels['busy'] = 'Bezig';
+$labels['busy'] = 'Bezet';
 $labels['outofoffice'] = 'Niet Aanwezig';
 $labels['tentative'] = 'Misschien';
+$labels['status'] = 'Status';
 $labels['priority'] = 'Prioriteit';
-$labels['sensitivity'] = 'Privacy';
+$labels['sensitivity'] = 'Zichtbaarheid';
 $labels['public'] = 'publiek';
 $labels['private'] = 'prive';
 $labels['confidential'] = 'vertrouwelijk';
 $labels['alarms'] = 'Herinnering';
+$labels['comment'] = 'Opmerking';
 $labels['generated'] = 'gegenereerd op';
 $labels['printdescriptions'] = 'Print beschrijvingen';
-$labels['parentcalendar'] = 'Insert inside';
-$labels['searchearlierdates'] = '« Zoek voor eerdere evenementen';
-$labels['searchlaterdates'] = 'Zoek voor latere evenementen »';
+$labels['parentcalendar'] = 'Voeg toe in';
+$labels['searchearlierdates'] = '« Zoek voor eerdere afspraken';
+$labels['searchlaterdates'] = 'Zoek voor latere afspraken »';
 $labels['andnmore'] = '$nr meer...';
-$labels['togglerole'] = 'Click to toggle role';
-$labels['createfrommail'] = 'Bewaar als evenement';
-$labels['importevents'] = 'Evenementen importeren';
-$labels['importrange'] = 'Events from';
+$labels['togglerole'] = 'Klik om van rol te wisselen';
+$labels['createfrommail'] = 'Bewaar als afspraak';
+$labels['importevents'] = 'Afspraken importeren';
+$labels['importrange'] = 'Afspraken vanaf';
 $labels['onemonthback'] = '1 maand terug';
 $labels['nmonthsback'] = '$nr maanden terug';
 $labels['showurl'] = 'Toon kalender URL';
-$labels['showurldescription'] = 'Use the following address to access (read only) your calendar from other applications. You can copy and paste this into any calendar software that supports the iCal format.';
-$labels['caldavurldescription'] = 'Copy this address to a <a href="http://en.wikipedia.org/wiki/CalDAV" target="_blank">CalDAV</a> client application (e.g. Evolution or Mozilla Thunderbird) to fully synchronize this specific calendar with your computer or mobile device.';
-
+$labels['showurldescription'] = 'Gebruik het volgende adres om uw kalendar te gebruiken (alleen lezen) in andere programma\'s. U kunt dit knippen en plakken in elk kalender programma dat het iCal formaat ondersteunt.';
+$labels['caldavurldescription'] = 'Kopieer dit adres in een <a href="http://en.wikipedia.org/wiki/CalDAV" target="_blank">CalDAV</a> programma (bijv. Evolution of Mozilla Thunderbird) om deze specifieke kalender volledig te synchronizeren met je computer of mobiel apparaat.';
 // agenda view
-$labels['listrange'] = 'Range to display:';
+$labels['listrange'] = 'Bereik om te tonen:';
 $labels['listsections'] = 'Verdeel in:';
-$labels['smartsections'] = 'Smart sections';
+$labels['smartsections'] = 'Slimme secties';
 $labels['until'] = 'tot';
 $labels['today'] = 'Vandaag';
 $labels['tomorrow'] = 'Morgen';
@@ -93,12 +93,10 @@
 $labels['weekofyear'] = 'Week';
 $labels['pastevents'] = 'Verleden';
 $labels['futureevents'] = 'Toekomst';
-
 // alarm/reminder settings
-$labels['showalarms'] = 'Show reminders';
-$labels['defaultalarmtype'] = 'Standaard herinnering instelling';
-$labels['defaultalarmoffset'] = 'Standaard herinnering tijd';
-
+$labels['showalarms'] = 'Toon herinneringen';
+$labels['defaultalarmtype'] = 'Instelling standaard herinnering';
+$labels['defaultalarmoffset'] = 'Standaard herinneringstijd';
 // attendees
 $labels['attendee'] = 'Deelnemer';
 $labels['role'] = 'Rol';
@@ -108,66 +106,108 @@
 $labels['roleorganizer'] = 'Organisatie';
 $labels['rolerequired'] = 'Verplicht';
 $labels['roleoptional'] = 'Optioneel';
-$labels['rolechair'] = 'Chair';
-$labels['rolenonparticipant'] = 'Absent';
-$labels['cutypeindividual'] = 'Individual';
+$labels['rolechair'] = 'Voorzitter';
+$labels['rolenonparticipant'] = 'Afwezig';
+$labels['cutypeindividual'] = 'Individueel';
 $labels['cutypegroup'] = 'Groep';
 $labels['cutyperesource'] = 'Middel';
+$labels['cutyperoom'] = 'Kamer';
 $labels['availfree'] = 'Vrij';
-$labels['availbusy'] = 'Bezig';
+$labels['availbusy'] = 'Bezet';
 $labels['availunknown'] = 'Onbekend';
 $labels['availtentative'] = 'Misschien';
 $labels['availoutofoffice'] = 'Niet Aanwezig';
+$labels['delegatedto'] = 'Gedelegeerd aan';
+$labels['delegatedfrom'] = 'Gedelegeerd door';
 $labels['scheduletime'] = 'Vind beschikbaarheid';
 $labels['sendinvitations'] = 'Verzend uitnodigingen';
+$labels['sendnotifications'] = 'Verzend notificaties';
+$labels['sendcancellation'] = 'Verzend annulering';
+$labels['onlyworkinghours'] = 'Vind beschikbaarheid binnen mijn werkuren';
+$labels['reqallattendees'] = 'Verplicht/alle deelnemers';
+$labels['prevslot'] = 'vorig voorstel';
+$labels['nextslot'] = 'volgend voorstel';
+$labels['noslotfound'] = 'Geen voorstel gevonden';
 $labels['invitationsubject'] = 'U bent uitgenodigd voor "$title"';
-
+$labels['invitationmailbody'] = "*\$title*\n\nWanneer: \$date\n\nGenodigden: \$attendees\n\nBijgevoegd vindt u een iCalendar bestand met alle details omtrent de afspraak die u kunt importeren in uw kalender programma.";
+$labels['invitationattendlinks'] = "In het geval dat uw email programma geen iTip verzoeken aankan, kunt u de volgende link gebruiken om deze uitnodiging te accepteren or af te wijzen :\n\$url";
+$labels['eventupdatesubject'] = '"$title" is gewijzigd';
+$labels['eventupdatesubjectempty'] = 'Een afspraak is gewijzigd';
+$labels['eventupdatemailbody'] = "*\$title*\n\nWanneer: \$date\n\nGenodigden: \$attendees\n\nBijgevoegd vindt u een iCalendar bestand met de gewijzigde details omtrent de afspraak die u kunt importeren in uw kalender programma.";
+$labels['eventcancelsubject'] = '"$title" is geannuleerd';
+$labels['eventcancelmailbody'] = "*\$title*\n\nWanneer: \$date\n\nGenodigden: \$attendees\n\nDeze afspraak is geannuleerd door \$organizer.\n\nBijgevoegd vindt u een iCalendar bestand met de gewijzigde details omtrent de afspraak";
+// invitation handling (overrides labels from libcalendaring)
+$labels['itipobjectnotfound'] = 'De afspraak waaraan door dit bericht wordt gereferreerd is niet gevonden in uw kalender.';
+$labels['itipmailbodyaccepted'] = "\$sender heeft de uitnodiging geaccepteerd voor de volgende afspraak:\n\n*\$title*\n\nWanneer: \$date\n\nGenodigden: \$attendees";
+$labels['itipmailbodytentative'] = "\$sender heeft onder voorbehoud de uitnodiging geaccepteerd voor de volgende afspraak:\n\n*\$title*\n\nWanneer: \$date\n\nGenodigden: \$attendees";
+$labels['itipmailbodydeclined'] = "\$sender heeft de uitnodiging afgewezen voor de volgende afspraak:\n\n*\$title*\n\nWanneer: \$date\n\nGenodigden: \$attendees";
+$labels['itipmailbodycancel'] = "\$sender heeft je deelname afgewezen voor de volgende afspraak:\n\n*\$title*\n\nWanneer: \$date";
+$labels['itipdeclineevent'] = 'Wil u de uitnodiging voor deze afspraak afwijzen?';
+$labels['declinedeleteconfirm'] = 'Wilt u tevens deze afgewezen uitnodiging verwijderen uit je kalender?';
+$labels['notanattendee'] = 'U staat niet op de lijst van genodigden voor deze afspraak';
 $labels['eventcancelled'] = 'Dit evenement is afgelast';
 $labels['saveincalendar'] = 'bewaar in';
-
+$labels['updatemycopy'] = 'Wijzig in mijn kalender';
+$labels['savetocalendar'] = 'Opslaan in kalender';
+// resources
+$labels['resource'] = 'Hulpmiddel';
+$labels['addresource'] = 'Voeg hulpmiddel toe';
+$labels['findresources'] = 'Vind hulpmiddelen';
+$labels['resourcedetails'] = 'Details';
+$labels['resourceavailability'] = 'Beschikbaarheid';
+$labels['resourceowner'] = 'Eigenaar';
+$labels['resourceadded'] = 'Hulpmiddel is toegevoegd aan uw afspraak';
 // event dialog tabs
 $labels['tabsummary'] = 'Samenvatting';
 $labels['tabrecurrence'] = 'Herhaling';
 $labels['tabattendees'] = 'Deelnemers';
+$labels['tabresources'] = 'Middelen';
 $labels['tabattachments'] = 'Toebehoren';
 $labels['tabsharing'] = 'Delen';
-
 // messages
+$labels['deleteobjectconfirm'] = 'Weet je zeker dat je deze afspraak wilt verwijderen?';
+$labels['deleteventconfirm'] = 'Weet u zeker dat u deze afspraak wilt verwijderen?';
+$labels['deletecalendarconfirm'] = 'Weet u zeker dat u deze kalender samen met alle afspraken wilt verwijderen?';
+$labels['deletecalendarconfirmrecursive'] = 'Weet u zeker dat je deze kalender samen met alle afspraken en er onder hangende kalenders wilt verwijderen?';
 $labels['savingdata'] = 'Data wordt opgeslagen...';
-
+$labels['errorsaving'] = 'Opslaan mislukt.';
+$labels['operationfailed'] = 'De gevraagde opdracht is mislukt.';
+$labels['invalideventdates'] = 'Ongeldige datums ingevoerd! Controleer aub uw invoer.';
+$labels['invalidcalendarproperties'] = 'Ongeldige kalender eigenschappen! Gebruik aub een geldige naam.';
+$labels['searchnoresults'] = 'Geen afspraken gevonden in de geselecteerde kalenders.';
+$labels['successremoval'] = 'De afspraak is succesvol verwijdert.';
+$labels['successrestore'] = 'De afspraak is succesvol herstelt';
+$labels['errornotifying'] = 'Uitnodigingen versturen naar de genodigden van de afspraak is mislukt';
+$labels['errorimportingevent'] = 'Afspraak importeren is mislukt';
+$labels['importwarningexists'] = 'Een kopie van deze afspraak bevindt zich al in uw kalender.';
+$labels['newerversionexists'] = 'Een nieuwere versie van deze afspraak bestaat! Bewerking afgebroken.';
+$labels['nowritecalendarfound'] = 'Geen kalender gevonden om de afspraak in op te slaan';
+$labels['importedsuccessfully'] = 'De afspraak is succesvol toegevoegd aan \'$calendar\'';
+$labels['attendeupdateesuccess'] = 'Status van genodigde succesvol gewijzigd';
+$labels['itipsendsuccess'] = 'Uitnodiging verstuurd aan de genodigden.';
+$labels['itipresponseerror'] = 'Antwoord op deze uitnodiging versturen is mislukt';
+$labels['itipinvalidrequest'] = 'Deze uitnodiging is niet langer geldig';
+$labels['sentresponseto'] = 'Antwoord op deze uitnodiging was succesvol verstuurd aan $mailto';
+$labels['localchangeswarning'] = 'U bent bezig wijzigingen te maken die alleen zichtbaar zijn in u eigen kalender en die niet doorgestuurd zullen worden aan de organisator van de afspraak.';
+$labels['importsuccess'] = 'Succesvol $nr afspraken geïmporteerd';
+$labels['importnone'] = 'Geen afspraken gevonden om te importeren';
+$labels['importerror'] = 'Er is een fout tijdens het importeren opgetreden';
+$labels['aclnorights'] = 'U heeft geen administratieve rechten op deze kalender.';
 // recurrence form
 $labels['repeat'] = 'Herhaal';
-$labels['frequency'] = 'Herhaal';
-$labels['never'] = 'nooit';
-$labels['daily'] = 'dagelijks';
-$labels['weekly'] = 'weekelijks';
-$labels['monthly'] = 'maandelijks';
-$labels['yearly'] = 'jaarlijks';
-$labels['every'] = 'Elke';
-$labels['days'] = 'dag(en)';
-$labels['weeks'] = 'week / weken';
-$labels['months'] = 'maand(en)';
-$labels['years'] = 'year(s) in:';
-$labels['bydays'] = 'Op';
-$labels['untildate'] = 'de';
-$labels['each'] = 'Elke';
-$labels['onevery'] = 'Op elke';
-$labels['onsamedate'] = 'Op dezelfde datum';
-$labels['forever'] = 'oneindig';
-$labels['recurrencend'] = 'tot';
-$labels['forntimes'] = 'voor $nr keer';
-$labels['first'] = 'eerste';
-$labels['second'] = 'tweede';
-$labels['third'] = 'derde';
-$labels['fourth'] = 'vierde';
-$labels['last'] = 'laatste';
-$labels['dayofmonth'] = 'Dag van de maand';
-
-$labels['changeeventconfirm'] = 'Wijzig evenement';
-$labels['removeeventconfirm'] = 'Verwijder evenement';
+$labels['changeeventconfirm'] = 'Wijzig afspraak';
+$labels['removeeventconfirm'] = 'Verwijder afspraak';
+$labels['changerecurringeventwarning'] = 'Dit is een terugkerende afspraak. Wilt u alleen de huidige afspraak wijzigen, deze en alle toekomstige afspraken, alle afspraken of opslaan als een nieuwe afspraak?';
+$labels['removerecurringeventwarning'] = 'Dit is een terugkerende afspraak. Wilt u alleen de huidige afspraak verwijderen, deze en alle toekomstige afspraken of alle afspraken?';
 $labels['currentevent'] = 'Huidige';
-$labels['futurevents'] = 'Toekomst';
+$labels['futurevents'] = 'Toekomstige';
 $labels['allevents'] = 'Alle';
 $labels['saveasnew'] = 'Bewaar als nieuw';
-
+// birthdays calendar
+$labels['birthdays'] = 'Verjaardagen';
+$labels['birthdayscalendar'] = 'Verjaardagskalender';
+$labels['displaybirthdayscalendar'] = 'Toon verjaardagskalender';
+$labels['birthdayscalendarsources'] = 'Uit deze adresboeken';
+$labels['birthdayeventtitle'] = 'verjaardag van $name';
+$labels['birthdayage'] = 'Leeftijd $age';
 ?>

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

@@ -1,10 +1,8 @@
 <?php
-
-$labels = array();
-
 // preferences
 $labels['default_view'] = 'Domyślny widok';
 $labels['time_format'] = 'Format czasu';
+$labels['timeslots'] = 'Time slots per hour';
 $labels['first_day'] = 'Pierwszy dzień tygodnia';
 $labels['first_hour'] = 'Pierwsza godzina';
 $labels['workinghours'] = 'Godziny robocze';
@@ -16,7 +14,6 @@
 $labels['coloringmode1'] = 'Zgodnie z kategorią';
 $labels['coloringmode2'] = 'Kalendarz dla obramowania, kategoria dla środka';
 $labels['coloringmode3'] = 'Kategoria dla obramowania, kalendarz dla środka';
-
 // calendar
 $labels['calendar'] = 'Kalendarz';
 $labels['calendars'] = 'Kalendarze';
@@ -59,6 +56,7 @@
 $labels['busy'] = 'Zajęty';
 $labels['outofoffice'] = 'Poza biurem';
 $labels['tentative'] = 'Niepewny';
+$labels['status'] = 'Status';
 $labels['priority'] = 'Priorytet';
 $labels['sensitivity'] = 'Poufność';
 $labels['public'] = 'publiczny';
@@ -80,7 +78,6 @@
 $labels['showurl'] = 'Pokaż adres URL kalendarza';
 $labels['showurldescription'] = 'Używaj tego adresu aby dostać się do kalendarza z innych programów (w trybie tylko-do-odczytu). Możesz wkleić go do dowolnej aplikacji obsługującej format iCal.';
 $labels['caldavurldescription'] = 'Skopiuj ten adres do aplikacji obsługującej format <a href="http://en.wikipedia.org/wiki/CalDAV" target="_blank">CalDAV</a> (np. Evolution lub Mozilla Thunderbird) aby zsynchronizować wybrany kalendarz z twoim komputerem lub urządzeniem przenośnym.';
-
 // agenda view
 $labels['listrange'] = 'Zakres do pokazania:';
 $labels['listsections'] = 'Podziel na:';
@@ -95,12 +92,10 @@
 $labels['weekofyear'] = 'Tydzień';
 $labels['pastevents'] = 'Przeszłe';
 $labels['futureevents'] = 'Przyszłe';
-
 // alarm/reminder settings
 $labels['showalarms'] = 'Show reminders';
 $labels['defaultalarmtype'] = 'Domyślne powiadomienie';
 $labels['defaultalarmoffset'] = 'Domyślny czas powiadomienia';
-
 // attendees
 $labels['attendee'] = 'Uczestnik';
 $labels['role'] = 'Rola';
@@ -138,8 +133,7 @@
 $labels['eventupdatemailbody'] = "*\$title*\n\nKiedy: \$date\n\nZaproszeni: \$attendees\n\nW załączeniu plik w formacie iCalendar zawierający zaktualizowane szczegóły zdarzenia, które możesz zaimportować do swojej aplikacji kalendarza.";
 $labels['eventcancelsubject'] = '"$title" zostało anulowane';
 $labels['eventcancelmailbody'] = "*\$title*\n\nKiedy: \$date\n\nZaproszeni: \$attendees\n\nZdarzenie zostało anulowane przez \$organizer.\n\nW załączeniu plik w formacie iCalendar ze zaktualizowanymi szczegółami zdarzenia.";
-
-// invitation handling
+// invitation handling (overrides labels from libcalendaring)
 $labels['itipmailbodyaccepted'] = "\$sender zaakceptował zaproszenie do następującego zdarzenia:\n\n*\$title*\n\nKiedy: \$date\n\nZaproszeni: \$attendees";
 $labels['itipmailbodytentative'] = "\$sender warunkowo zaakceptował zaproszenie do następującego zdarzenia:\n\n*\$title*\n\nKiedy: \$date\n\nZaproszeni: \$attendees";
 $labels['itipmailbodydeclined'] = "\$sender odrzucił zaproszenie na następujące zdarzenie:\n\n*\$title*\n\nKiedy: \$date\n\nZaproszeni: \$attendees";
@@ -148,15 +142,18 @@
 $labels['notanattendee'] = 'Nie jesteś na liście uczestników tego zdarzenia';
 $labels['eventcancelled'] = 'Zdarzenie zostało anulowane';
 $labels['saveincalendar'] = 'zapisz w';
-
+// resources
+$labels['resource'] = 'Zasób';
+$labels['resourcedetails'] = 'Szczegóły';
 // event dialog tabs
 $labels['tabsummary'] = 'Podsumowanie';
 $labels['tabrecurrence'] = 'Powtarzalność';
 $labels['tabattendees'] = 'Uczestnicy';
+$labels['tabresources'] = 'Zasoby';
 $labels['tabattachments'] = 'Załączniki';
 $labels['tabsharing'] = 'Udostępnianie';
-
 // messages
+$labels['deleteobjectconfirm'] = 'Czy na pewno chcesz usunąć to zdarzenie?';
 $labels['deleteventconfirm'] = 'Czy na pewno chcesz usunąć to zdarzenie?';
 $labels['deletecalendarconfirm'] = 'Czy na pewno chcesz usunąć ten kalendarz z wszystkimi zadaniami?';
 $labels['deletecalendarconfirmrecursive'] = 'Czy na pewno chcesz usunąć ten kalendarz ze wszystkimi zdarzeniami i pod-kalendarzami?';
@@ -183,35 +180,8 @@
 $labels['importnone'] = 'Nie znaleziono zdarzeń do zaimportowania.';
 $labels['importerror'] = 'Wystąpił błąd podczas importu.';
 $labels['aclnorights'] = 'Nie masz uprawnień administracyjnych dla tego kalendarza.';
-
 // recurrence form
 $labels['repeat'] = 'Powtórz';
-$labels['frequency'] = 'Powtórz';
-$labels['never'] = 'nigdy';
-$labels['daily'] = 'codziennie';
-$labels['weekly'] = 'cotygodniowo';
-$labels['monthly'] = 'miesięcznie';
-$labels['yearly'] = 'corocznie';
-$labels['every'] = 'Każdy';
-$labels['days'] = 'dnia';
-$labels['weeks'] = 'tygodnia';
-$labels['months'] = 'miesiąca';
-$labels['years'] = 'roku w:';
-$labels['bydays'] = 'W';
-$labels['untildate'] = 'do';
-$labels['each'] = 'Każdy';
-$labels['onevery'] = 'W każdy';
-$labels['onsamedate'] = 'W tej samej dacie';
-$labels['forever'] = 'zawsze';
-$labels['recurrencend'] = 'dopóki';
-$labels['forntimes'] = '$nr raz(y)';
-$labels['first'] = 'pierwszy';
-$labels['second'] = 'drugi';
-$labels['third'] = 'trzeci';
-$labels['fourth'] = 'czwarty';
-$labels['last'] = 'ostatni';
-$labels['dayofmonth'] = 'Dzień miesiąca';
-
 $labels['changeeventconfirm'] = 'Zmień zdarzenie';
 $labels['removeeventconfirm'] = 'Usuń zdarzenie';
 $labels['changerecurringeventwarning'] = 'To jest zdarzenie powtarzalne. Czy chcesz zmienić bieżące zdarzenie, bieżące i przyszłe, wszystkie, a może zapisać je jako nowe zdarzenie?';
@@ -220,5 +190,11 @@
 $labels['futurevents'] = 'Przyszłe';
 $labels['allevents'] = 'Wszystkie';
 $labels['saveasnew'] = 'Zapisz jako nowe';
-
+// birthdays calendar
+$labels['birthdays'] = 'Birthdays';
+$labels['birthdayscalendar'] = 'Birthdays Calendar';
+$labels['displaybirthdayscalendar'] = 'Display birthdays calendar';
+$labels['birthdayscalendarsources'] = 'From these address books';
+$labels['birthdayeventtitle'] = '$name\'s Birthday';
+$labels['birthdayage'] = 'Age $age';
 ?>

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

@@ -1,10 +1,8 @@
 <?php
-
-$labels = array();
-
 // preferences
 $labels['default_view'] = 'Visualização padrão';
 $labels['time_format'] = 'Formato da hora';
+$labels['timeslots'] = 'Time slots per hour';
 $labels['first_day'] = 'Primeiro dia da semana';
 $labels['first_hour'] = 'Primeira hora a mostrar';
 $labels['workinghours'] = 'Horário de trabalho';
@@ -16,7 +14,6 @@
 $labels['coloringmode1'] = 'De acordo com a categoria';
 $labels['coloringmode2'] = 'Calendário para esboço, categoria para conteúdo';
 $labels['coloringmode3'] = 'Categoria para esboço, calendário para conteúdo';
-
 // calendar
 $labels['calendar'] = 'Calendário';
 $labels['calendars'] = 'Calendários';
@@ -46,6 +43,8 @@
 $labels['export'] = 'Exportar';
 $labels['exporttitle'] = 'Exportar para iCalendar';
 $labels['exportrange'] = 'Eventos de';
+$labels['exportattachments'] = 'With attachments';
+$labels['customdate'] = 'Custom date';
 $labels['location'] = 'Local';
 $labels['url'] = 'URL';
 $labels['date'] = 'Data';
@@ -57,12 +56,16 @@
 $labels['busy'] = 'Ocupado';
 $labels['outofoffice'] = 'Fora de escritório';
 $labels['tentative'] = 'Tentativa';
+$labels['status'] = 'Situação';
+$labels['confirmed'] = 'Confirmado';
+$labels['cancelled'] = 'Cancalado';
 $labels['priority'] = 'Prioridade';
 $labels['sensitivity'] = 'Privacidade';
 $labels['public'] = 'público';
 $labels['private'] = 'privado';
 $labels['confidential'] = 'confidencial';
 $labels['alarms'] = 'Lembrete';
+$labels['comment'] = 'Comentário';
 $labels['generated'] = 'gerado em';
 $labels['printdescriptions'] = 'Descrições de impressão';
 $labels['parentcalendar'] = 'Inserir dentro';
@@ -78,7 +81,6 @@
 $labels['showurl'] = 'Mostrar URL do calendário';
 $labels['showurldescription'] = 'Use o seguinte endereço para acessar (somente leitura) seu calendário em outras aplicações. Você pode copiar e colar este endereço em qualquer software de calendário que suporte o formato iCal.';
 $labels['caldavurldescription'] = 'Copy this address to a <a href="http://en.wikipedia.org/wiki/CalDAV" target="_blank">CalDAV</a> client application (e.g. Evolution or Mozilla Thunderbird) to fully synchronize this specific calendar with your computer or mobile device.';
-
 // agenda view
 $labels['listrange'] = 'Intervalo para exibir:';
 $labels['listsections'] = 'Dividir em:';
@@ -93,12 +95,10 @@
 $labels['weekofyear'] = 'Semana';
 $labels['pastevents'] = 'Passado';
 $labels['futureevents'] = 'Futuro';
-
 // alarm/reminder settings
 $labels['showalarms'] = 'Show reminders';
 $labels['defaultalarmtype'] = 'Configuração de lembrete padrão';
 $labels['defaultalarmoffset'] = 'Horário padrão de lembrete';
-
 // attendees
 $labels['attendee'] = 'Participante';
 $labels['role'] = 'Papel';
@@ -113,6 +113,7 @@
 $labels['cutypeindividual'] = 'Individual';
 $labels['cutypegroup'] = 'Grupo';
 $labels['cutyperesource'] = 'Recurso';
+$labels['cutyperoom'] = 'Room';
 $labels['availfree'] = 'Disponível';
 $labels['availbusy'] = 'Ocupado';
 $labels['availunknown'] = 'Desconhecido';
@@ -135,26 +136,30 @@
 $labels['eventupdatemailbody'] = "*\$title*\n\nQuando: \$date\n\nConvidados: \$attendees\n\nSegue em anexo um arquivo iCalendar com os detalhes atualizados do evento na qual você pode importar para sua aplicação de calendário.";
 $labels['eventcancelsubject'] = '"$title" foi cancelado';
 $labels['eventcancelmailbody'] = "*\$title*\n\nQuando: \$date\n\nConvidados: \$attendees\n\nO evento foi cancelado por \$organizer.\n\nSegue em anexo um arquivo iCalendar com os detalhes atualizados do evento.";
-
-// invitation handling
+// invitation handling (overrides labels from libcalendaring)
 $labels['itipmailbodyaccepted'] = "\$sender aceitou o convite para o seguinte evento:\n\n*\$title*\n\nQuando: \$date\n\nConvidados: \$attendees";
 $labels['itipmailbodytentative'] = "\$sender aceitou como tentativa o convite para o seguinte evento:\n\n*\$title*\n\nQuando: \$date\n\nConvidados: \$attendees";
 $labels['itipmailbodydeclined'] = "\$sender recusou o convite para o seguinte evento:\n\n*\$title*\n\nQuando: \$date\n\nConvidados: \$attendees";
 $labels['itipdeclineevent'] = 'Você deseja recusar o convite para este evento?';
+$labels['declinedeleteconfirm'] = 'Do you also want to delete this declined event from your calendar?';
 $labels['notanattendee'] = 'Você não está listado como um participante deste evento';
 $labels['eventcancelled'] = 'O evento foi cancelado';
 $labels['saveincalendar'] = 'salvar em';
-
+// resources
+$labels['resource'] = 'Recurso';
+$labels['resourcedetails'] = 'Detalhes';
 // event dialog tabs
 $labels['tabsummary'] = 'Sumário';
 $labels['tabrecurrence'] = 'Repetição';
 $labels['tabattendees'] = 'Participantes';
+$labels['tabresources'] = 'Recursos';
 $labels['tabattachments'] = 'Anexos';
 $labels['tabsharing'] = 'Compartilhamento';
-
 // messages
+$labels['deleteobjectconfirm'] = 'Você realmente deseja remover este evento?';
 $labels['deleteventconfirm'] = 'Você realmente deseja remover este evento?';
 $labels['deletecalendarconfirm'] = 'Você realmente deseja excluir este calendário com todos os seus eventos?';
+$labels['deletecalendarconfirmrecursive'] = 'Do you really want to delete this calendar with all its events and sub-calendars?';
 $labels['savingdata'] = 'Salvando dados...';
 $labels['errorsaving'] = 'Falha ao salvar as modificações.';
 $labels['operationfailed'] = 'A operação requisitada falhou.';
@@ -173,39 +178,13 @@
 $labels['itipresponseerror'] = 'Falha ao enviar a resposta para este convite de evento';
 $labels['itipinvalidrequest'] = 'Este convite não é mais válido';
 $labels['sentresponseto'] = 'Resposta de convite enviada com sucesso para $mailto';
+$labels['localchangeswarning'] = 'You are about to make changes that will only be reflected on your calendar and not be sent to the organizer of the event.';
 $labels['importsuccess'] = 'Importado com sucesso $nr eventos';
 $labels['importnone'] = 'Não há eventos a serem importados';
 $labels['importerror'] = 'Ocorreu um erro na importação';
 $labels['aclnorights'] = 'Você não tem permissão de administrador neste calendário.';
-
 // recurrence form
 $labels['repeat'] = 'Repetir';
-$labels['frequency'] = 'Repetir';
-$labels['never'] = 'nunca';
-$labels['daily'] = 'diariamente';
-$labels['weekly'] = 'semanalmente';
-$labels['monthly'] = 'mensalmente';
-$labels['yearly'] = 'anualmente';
-$labels['every'] = 'À cada';
-$labels['days'] = 'dia(s)';
-$labels['weeks'] = 'semana(s)';
-$labels['months'] = 'mês(es)';
-$labels['years'] = 'ano(s) em:';
-$labels['bydays'] = 'No';
-$labels['untildate'] = 'em';
-$labels['each'] = 'Cada';
-$labels['onevery'] = 'Em cada';
-$labels['onsamedate'] = 'Na mesma data';
-$labels['forever'] = 'nunca termina';
-$labels['recurrencend'] = 'até';
-$labels['forntimes'] = 'por $nr vez(es)';
-$labels['first'] = 'primeira';
-$labels['second'] = 'segunda';
-$labels['third'] = 'terceira';
-$labels['fourth'] = 'quarta';
-$labels['last'] = 'última';
-$labels['dayofmonth'] = 'Dia do mês';
-
 $labels['changeeventconfirm'] = 'Trocar evento';
 $labels['removeeventconfirm'] = 'Remover evento';
 $labels['changerecurringeventwarning'] = 'Este é um evento com repetição. Você gostaria de editar o evento atual somente, estas e todas as futuras ocorrências ou salvar este como um novo evento?';
@@ -214,5 +193,11 @@
 $labels['futurevents'] = 'Futuro';
 $labels['allevents'] = 'Todos';
 $labels['saveasnew'] = 'Salvar como novo';
-
+// birthdays calendar
+$labels['birthdays'] = 'Birthdays';
+$labels['birthdayscalendar'] = 'Birthdays Calendar';
+$labels['displaybirthdayscalendar'] = 'Display birthdays calendar';
+$labels['birthdayscalendarsources'] = 'From these address books';
+$labels['birthdayeventtitle'] = '$name\'s Birthday';
+$labels['birthdayage'] = 'Age $age';
 ?>

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

@@ -1,7 +1,4 @@
 <?php
-
-$labels = array();
-
 // preferences
 $labels['default_view'] = 'Вид по умолчанию';
 $labels['time_format'] = 'Формат времени';
@@ -17,7 +14,6 @@
 $labels['coloringmode1'] = 'Согласно цвета категории';
 $labels['coloringmode2'] = 'Цвет календаря для рамки, цвет категории для фона';
 $labels['coloringmode3'] = 'Цвет категории для рамки, цвет календаря для фона';
-
 // calendar
 $labels['calendar'] = 'Календарь';
 $labels['calendars'] = 'Календари';
@@ -60,6 +56,7 @@
 $labels['busy'] = 'Занят';
 $labels['outofoffice'] = 'Вне офиса';
 $labels['tentative'] = 'Неопределённо';
+$labels['status'] = 'Статус';
 $labels['priority'] = 'Приоритет';
 $labels['sensitivity'] = 'Секретность';
 $labels['public'] = 'общедоступная';
@@ -81,7 +78,6 @@
 $labels['showurl'] = 'Показать URL календаря';
 $labels['showurldescription'] = 'Используйте следующий адрес для просмотра Вашего календаря из других приложений. Вы можете скопировать и вставить это в любое приложение которое поддерживает формат iCal.';
 $labels['caldavurldescription'] = 'Скопируйте этот адрес в клиент, <a href="http://en.wikipedia.org/wiki/CalDAV" target="_blank">поддерживающий CalDAV</a> (например, Evolution или Mozilla Thunderbird) для полной синхронизации данного календаря со своим компьютером или мобильным устройством.';
-
 // agenda view
 $labels['listrange'] = 'Диапазон:';
 $labels['listsections'] = 'Разделить на:';
@@ -96,12 +92,10 @@
 $labels['weekofyear'] = 'Неделя';
 $labels['pastevents'] = 'Прошедшее';
 $labels['futureevents'] = 'Будущее';
-
 // alarm/reminder settings
 $labels['showalarms'] = 'Показывать напоминания';
 $labels['defaultalarmtype'] = 'Настройки напоминания по умолчанию';
 $labels['defaultalarmoffset'] = 'Время напоминания по умолчанию';
-
 // attendees
 $labels['attendee'] = 'Участник';
 $labels['role'] = 'Роль';
@@ -139,8 +133,7 @@
 $labels['eventupdatemailbody'] = "*\$title*\n\nКогда: \$date\n\nПриглашенные: \$attendees\n\nВо вложении вы найдёте файл iCalendar со всеми изменениями в событии, который Вы можете импортировать в Вашу программу-ежедневник.";
 $labels['eventcancelsubject'] = '"$title" было отменено';
 $labels['eventcancelmailbody'] = "*\$title*\n\nКогда: \$date\n\nПриглашенные: \$attendees\n\nЭто событие отменено \$organizer.\n\nВо вложении вы найдёте файл iCalendar со всеми изменениями в событии.";
-
-// invitation handling
+// invitation handling (overrides labels from libcalendaring)
 $labels['itipmailbodyaccepted'] = "\$sender принял(а) приглашение на следующее событие:\n\n*\$title*\n\nКогда: \$date\n\nПриглашенные: \$attendees";
 $labels['itipmailbodytentative'] = "\$sender предварительно принял(а) приглашение на следующее событие:\n\n*\$title*\n\nКогда: \$date\n\nПриглашенные: \$attendees";
 $labels['itipmailbodydeclined'] = "\$sender отклонил(а) приглашение на следующее событие:\n\n*\$title*\n\nКогда: \$date\n\nПриглашенные: \$attendees";
@@ -149,15 +142,18 @@
 $labels['notanattendee'] = 'Вы не в списке участников этого события';
 $labels['eventcancelled'] = 'Это событие отменено';
 $labels['saveincalendar'] = 'сохранить в';
-
+// resources
+$labels['resource'] = 'Ресурс';
+$labels['resourcedetails'] = 'Подробнее';
 // event dialog tabs
 $labels['tabsummary'] = 'Сводка';
 $labels['tabrecurrence'] = 'Повторение';
 $labels['tabattendees'] = 'Участники';
+$labels['tabresources'] = 'Ресурсы';
 $labels['tabattachments'] = 'Вложения';
 $labels['tabsharing'] = 'Совместное использование';
-
 // messages
+$labels['deleteobjectconfirm'] = 'Вы действительно хотите удалить это событие?';
 $labels['deleteventconfirm'] = 'Вы действительно хотите удалить это событие?';
 $labels['deletecalendarconfirm'] = 'Вы действительно хотите удалить этот календарь со всеми его событиями?';
 $labels['deletecalendarconfirmrecursive'] = 'Вы действительно хотите удалить этот календарь со всеми его событиями и вложенными календарями?';
@@ -184,37 +180,8 @@
 $labels['importnone'] = 'Не найдено событий для импорта';
 $labels['importerror'] = 'Ошибка при импорте';
 $labels['aclnorights'] = 'Вы не имеете прав администратора для этого календаря.';
-
 // recurrence form
 $labels['repeat'] = 'Повторить';
-$labels['frequency'] = 'Повторить';
-$labels['never'] = 'никогда';
-$labels['daily'] = 'ежедневно';
-$labels['weekly'] = 'еженедельно';
-$labels['monthly'] = 'ежемесячно';
-$labels['yearly'] = 'ежегодно';
-$labels['rdate'] = 'on dates';
-$labels['every'] = 'Каждый(ую)';
-$labels['days'] = 'день';
-$labels['weeks'] = 'неделю';
-$labels['months'] = 'месяц';
-$labels['years'] = 'год в:';
-$labels['bydays'] = 'В';
-$labels['untildate'] = 'до';
-$labels['each'] = 'Каждого';
-$labels['onevery'] = 'В';
-$labels['onsamedate'] = 'В ту же самую дату';
-$labels['forever'] = 'всегда';
-$labels['recurrencend'] = 'Повторять';
-$labels['forntimes'] = '$nr раз(а)';
-$labels['first'] = 'первый(ую)';
-$labels['second'] = 'вторый(ую)';
-$labels['third'] = 'третий(ую)';
-$labels['fourth'] = 'четвертый(ую)';
-$labels['last'] = 'последний(ую)';
-$labels['dayofmonth'] = 'День месяца';
-$labels['addrdate'] = 'Add repeat date';
-
 $labels['changeeventconfirm'] = 'Изменить событие';
 $labels['removeeventconfirm'] = 'Удалить событие';
 $labels['changerecurringeventwarning'] = 'Это - повторяющееся событие. Хотели бы Вы редактировать только текущее событие, это и все будущие повторения, все события или сохранять его как новое событие?';
@@ -223,7 +190,6 @@
 $labels['futurevents'] = 'Будущие';
 $labels['allevents'] = 'Все';
 $labels['saveasnew'] = 'Сохранить как новое';
-
 // birthdays calendar
 $labels['birthdays'] = 'Дни рождения';
 $labels['birthdayscalendar'] = 'Календарь Дней Рождения';
@@ -231,5 +197,4 @@
 $labels['birthdayscalendarsources'] = 'Из этих адресных книг';
 $labels['birthdayeventtitle'] = 'День рождения $name';
 $labels['birthdayage'] = 'Возраст $age';
-
 ?>

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

@@ -56,17 +56,10 @@
 				<tasks:replace from="@name@" to="name" type="package-info"/>
 				<tasks:replace from="@package_version@" to="version" type="package-info"/>
 			</file>
-			<file name="lib/calendar_recurrence.php" role="php">
-				<tasks:replace from="@name@" to="name" type="package-info"/>
-				<tasks:replace from="@package_version@" to="version" type="package-info"/>
-			</file>
 			<file name="lib/calendar_ui.php" role="php">
 				<tasks:replace from="@name@" to="name" type="package-info"/>
 				<tasks:replace from="@package_version@" to="version" type="package-info"/>
 			</file>
-			<file name="lib/Horde_Date.php" role="php"></file>
-			<file name="lib/Horde_Date_Recurrence.php" role="php"></file>
-			<file name="lib/Horde_iCalendar.php" role="php"></file>
 			<file name="lib/fullcalendar-rc.patch" role="data">
 				<tasks:replace from="@name@" to="name" type="package-info"/>
 				<tasks:replace from="@package_version@" to="version" type="package-info"/>
@@ -75,10 +68,6 @@
 				<tasks:replace from="@name@" to="name" type="package-info"/>
 				<tasks:replace from="@package_version@" to="version" type="package-info"/>
 			</file>
-			<file name="lib/jquery.miniColors.min.js" role="data">
-				<tasks:replace from="@name@" to="name" type="package-info"/>
-				<tasks:replace from="@package_version@" to="version" type="package-info"/>
-			</file>
 			<file name="drivers/calendar_driver.php" role="php">
 				<tasks:replace from="@name@" to="name" type="package-info"/>
 				<tasks:replace from="@package_version@" to="version" type="package-info"/>

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

@@ -1,9 +1,11 @@
 /**
  * Print view for the Calendar plugin
  *
- * @version @package_version@
  * @author Thomas Bruederli <bruederli@kolabsys.com>
  *
+ * @licstart  The following is the entire license notice for the
+ * JavaScript code in this file.
+ *
  * Copyright (C) 2011, Kolab Systems AG <contact@kolabsys.com>
  *
  * This program is free software: you can redistribute it and/or modify
@@ -18,6 +20,9 @@
  *
  * You should have received a copy of the GNU Affero General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * @licend  The above is the entire license notice
+ * for the JavaScript code in this file.
  */
 
 
@@ -121,7 +126,7 @@
     // event rendering
     eventRender: function(event, element, view) {
       if (view.name != 'month') {
-        var cont = element.find('div.fc-event-title');
+        var cont = element.find('.fc-event-title');
         if (event.location) {
           cont.after('<div class="fc-event-location">@&nbsp;' + Q(event.location) + '</div>');
           cont = cont.next();
@@ -131,9 +136,9 @@
         }
 /* TODO: create icons black on white
         if (event.recurrence)
-          element.find('div.fc-event-time').append('<i class="fc-icon-recurring"></i>');
+          element.find('.fc-event-time').append('<i class="fc-icon-recurring"></i>');
         if (event.alarms)
-          element.find('div.fc-event-time').append('<i class="fc-icon-alarms"></i>');
+          element.find('.fc-event-time').append('<i class="fc-icon-alarms"></i>');
 */
       }
       if (view.name == 'table' && event.description && showdesc) {

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

@@ -105,6 +105,14 @@
 	overflow: hidden;
 }
 
+#calendars .boxlistcontent {
+	top: 43px;
+}
+
+#calendars .listsearchbox {
+	padding: 2px 4px;
+}
+
 #calendarslist {
 	list-style: none;
 	margin: 0;
@@ -122,54 +130,143 @@
 	cursor: default;
 }
 
-#calendarslist li label {
-	display: block;
+#calendars .treelist li {
+	margin: 0;
+	padding: 0;
+	position: relative;
+}
+
+#calendars .treelist ul li:last-child {
+	border-bottom: 0;
+}
+
+#calendars .treelist li div.folder,
+#calendars .treelist li div.calendar {
+	position: relative;
+	height: 22px;
 }
 
-#calendarslist li span.handle {
+#calendars .treelist li span.calname {
+	display: block;
+	padding: 0px 30px 2px 2px;
+	position: absolute;
+	top: 4px;
+	left: 38px;
+	right: 40px;
 	cursor: default;
-	background: url(images/calendars.png) 0 -2px no-repeat;
+	background: url(images/calendars.png) right 20px no-repeat;
+	overflow: hidden;
+	text-overflow: ellipsis;
+	white-space: nowrap;
+}
+
+#calendars .treelist li div.virtual > span.calname {
+	color: #aaa;
+	left: 20px;
+}
+
+#calendars .treelist.flat li span.calname {
+	left: 24px;
+	right: 22px;
+}
+
+#calendars .treelist li span.handle {
 	display: inline-block;
-	width: 20px;
+	position: absolute;
+	top: 5px;
+	right: 6px;
+	padding: 0;
+	width: 12px;
+	height: 12px;
+	border-radius: 3px;
+	font-size: 0.8em;
 }
 
-#calendarslist li input {
-	margin-right: 5px;
+#calendars .treelist li a.subscribed {
+	display: inline-block;
+	position: absolute;
+	top: 2px;
+	right: 22px;
+	height: 16px;
+	width: 16px;
+	padding: 0;
+	background: url(images/calendars.png) -100px 0 no-repeat;
+	overflow: hidden;
+	text-indent: -5000px;
+	cursor: pointer;
 }
 
-#calendarslist li.selected {
-	background-color: #ccc;
-	border-bottom: 1px solid #bbb;
+#calendars .treelist div:hover > a.subscribed {
+	background-position: 0 -126px;
 }
 
-#calendarslist li.selected span {
-	font-weight: bold;
+#calendars .treelist div.subscribed a.subscribed {
+	background-position: 0 -144px;
+}
+
+#calendars .treelist li input {
+	position: absolute;
+	top: 1px;
+	left: 18px;
+}
+
+#calendars .treelist li div.treetoggle {
+	top: -1px;
+	left: 1px !important;
+}
+
+#calendars .treelist ul li div.treetoggle {
+	left: 17px !important;
+}
+
+#calendars .treelist ul ul li div.treetoggle {
+	left: 33px !important;
+}
+
+#calendars .treelist.flat li input {
+	left: 4px;
 }
 
-#calendarslist li.readonly span.handle {
-    background-position: 0 -20px;
+#calendars .treelist ul li div.folder,
+#calendars .treelist ul li div.calendar {
+	margin-left: 16px;
 }
 
-#calendarslist li.other span.handle {
-    background-position: 0 -38px;
+#calendars .treelist ul ul li div.folder,
+#calendars .treelist ul ul li div.calendar {
+	margin-left: 32px;
 }
 
-#calendarslist li.other.readonly span.handle {
-    background-position: 0 -56px;
+#calendars .treelist ul ul ul li div.folder,
+#calendars .treelist ul ul ul li div.calendar {
+	margin-left: 48px;
 }
 
-#calendarslist li.shared span.handle {
-    background-position: 0 -74px;
+#calendars .treelist li.selected {
+	background-color: #ccc;
 }
 
-#calendarslist li.shared.readonly span.handle {
-    background-position: 0 -92px;
+#calendars .treelist li.selected > span.calname {
+	font-weight: bold;
+}
+
+#calendars .treelist div.readonly span.calname {
+	background-position: right -20px;
+}
+
+#calendars .treelist li.user > div > span.calname {
+	background-position: right -38px;
 }
 
 #calendarslist li.virtual span.calname {
 	color: #666;
 }
 
+#calendars .searchresults .boxtitle {
+	border-top: 1px solid #aaa;
+	margin-bottom: 0;
+}
+
 #calfeedurl,
 #caldavurl {
 	width: 98%;
@@ -272,7 +369,7 @@
 }
 
 .calendarmain #quicksearchbar {
-	top: 82px;
+	top: 80px;
 	right: 4px;
 }
 
@@ -446,6 +543,10 @@
 	margin: 0 -0.2em;
 }
 
+#eventshow.status-cancelled {
+	background: url(images/badge_cancelled.png) top right no-repeat;
+}
+
 #eventshow.sensitivity-private {
 	background: url(images/badge_private.png) top right no-repeat;
 }
@@ -531,6 +632,44 @@
 	vertical-align: top;
 }
 
+#eventedit .edit-alarm-item {
+	position: relative;
+	padding-right: 30px;
+	margin-bottom: 2px;
+}
+
+#eventedit .edit-alarm-buttons {
+	position: absolute;
+	top: 2px;
+	right: 0;
+}
+
+#eventedit .edit-alarm-buttons a.iconlink {
+	display: none;
+	width: 18px;
+	height: 17px;
+	padding: 1px;
+	text-indent: -5000px;
+	overflow: hidden;
+}
+
+#eventedit .edit-alarm-buttons a.add-alarm {
+	background: url(images/plus.png) 1px 1px no-repeat;
+}
+
+#eventedit .edit-alarm-buttons a.delete-alarm {
+	background: url(images/delete.png) 1px 1px no-repeat;
+}
+
+#eventedit .edit-alarm-buttons a.delete-alarm,
+#eventedit .first .edit-alarm-buttons a.add-alarm {
+	display: inline-block;
+}
+
+#eventedit .first .edit-alarm-buttons a.delete-alarm {
+	display: none;
+}
+
 #eventedit label.weekday,
 #eventedit label.monthday {
 	min-width: 3em;
@@ -1241,7 +1380,7 @@
 
 #calendar .fc-header-right {
 	padding-right: 200px;
-	padding-top: 4px;
+	padding-top: 0;
 }
 
 .rcube-fc-content {
@@ -1257,6 +1396,10 @@
 	font-weight: bold;
 }
 
+.cal-event-status-cancelled .fc-event-title {
+	text-decoration: line-through;
+}
+
 .fc-event-hori .fc-event-title {
 	font-weight: normal;
 	white-space: nowrap;
@@ -1278,7 +1421,7 @@
 	font-style:italic; 
 }
 
-div.fc-event-location {
+.fc-event-location {
 	font-size: 90%;
 }
 
@@ -1323,6 +1466,14 @@
 	cursor: pointer;
 }
 
+#calendar .fc-event-vert .fc-event-head,
+#calendar .fc-event-vert .fc-event-content {
+	position: relative;
+	z-index: 2;
+	width: 100%;
+	overflow: hidden;
+}
+
 .fc-view-list div.fc-list-header,
 .fc-view-table td.fc-list-header,
 .edit-attendees-table thead td {
@@ -1379,6 +1530,15 @@
 
 /* Invitation UI in mail */
 
+.messagelist tbody .attachment span.ical {
+	display: inline-block;
+	vertical-align: middle;
+	height: 18px;
+	width: 20px;
+	padding: 0;
+	background: url(images/calendar-small.png) 1px 1px no-repeat;
+}
+
 #messagemenu li a.calendarlink,
 #attachmentmenu li a.calendarlink {
 	background-image: url(images/calendars.png);

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

@@ -1,724 +0,0 @@
-/*
- * FullCalendar v1.5.4-rcube-0.9.0 Stylesheet
- *
- * Copyright (c) 2011 Adam Shaw
- * Copyright (c) 2011, Kolab Systems AG
- * Dual licensed under the MIT and GPL licenses, located in
- * MIT-LICENSE.txt and GPL-LICENSE.txt respectively.
- *
- * Date: Wed Nov 7 16:28:11 2012 +0100
- *
- */
-
-
-.fc {
-	direction: ltr;
-	text-align: left;
-	}
-	
-.fc table {
-	border-collapse: collapse;
-	border-spacing: 0;
-	}
-	
-html .fc,
-.fc table {
-	font-size: 1em;
-	}
-	
-.fc td,
-.fc th {
-	padding: 0;
-	vertical-align: top;
-	}
-
-
-
-/* Header
-------------------------------------------------------------------------*/
-
-.fc-header td {
-	white-space: nowrap;
-	}
-
-.fc-header-left {
-	width: 25%;
-	text-align: left;
-	}
-	
-.fc-header-center {
-	text-align: center;
-	}
-	
-.fc-header-right {
-	width: 25%;
-	text-align: right;
-	}
-	
-.fc-header-title {
-	display: inline-block;
-	vertical-align: top;
-	}
-	
-.fc-header-title h2 {
-	margin-top: 0;
-	white-space: nowrap;
-	}
-	
-.fc .fc-header-space {
-	padding-left: 10px;
-	}
-	
-.fc-header .fc-button {
-	margin-bottom: 1em;
-	vertical-align: top;
-	}
-	
-/* buttons edges butting together */
-
-.fc-header .fc-button {
-	margin-right: -1px;
-	}
-	
-.fc-header .fc-corner-right {
-	margin-right: 1px; /* back to normal */
-	}
-	
-.fc-header .ui-corner-right {
-	margin-right: 0; /* back to normal */
-	}
-	
-/* button layering (for border precedence) */
-	
-.fc-header .fc-state-hover,
-.fc-header .ui-state-hover {
-	z-index: 2;
-	}
-	
-.fc-header .fc-state-down {
-	z-index: 3;
-	}
-
-.fc-header .fc-state-active,
-.fc-header .ui-state-active {
-	z-index: 4;
-	}
-	
-	
-	
-/* Content
-------------------------------------------------------------------------*/
-	
-.fc-content {
-	clear: both;
-	}
-	
-.fc-view {
-	width: 100%; /* needed for view switching (when view is absolute) */
-	overflow: hidden;
-	}
-	
-	
-
-/* Cell Styles
-------------------------------------------------------------------------*/
-
-.fc-widget-header,    /* <th>, usually */
-.fc-widget-content {  /* <td>, usually */
-	border: 1px solid #ccc;
-	}
-	
-.fc-state-highlight { /* <td> today cell */ /* TODO: add .fc-today to <th> */
-	background: #ffc;
-	}
-	
-.fc-cell-overlay { /* semi-transparent rectangle while dragging */
-	background: #9cf;
-	opacity: .2;
-	filter: alpha(opacity=20); /* for IE */
-	}
-	
-
-
-/* Buttons
-------------------------------------------------------------------------*/
-
-.fc-button {
-	position: relative;
-	display: inline-block;
-	cursor: pointer;
-	}
-	
-.fc-state-default { /* non-theme */
-	border-style: solid;
-	border-width: 1px 0;
-	}
-	
-.fc-button-inner {
-	position: relative;
-	float: left;
-	overflow: hidden;
-	}
-	
-.fc-state-default .fc-button-inner { /* non-theme */
-	border-style: solid;
-	border-width: 0 1px;
-	}
-	
-.fc-button-content {
-	position: relative;
-	float: left;
-	height: 1.9em;
-	line-height: 1.9em;
-	padding: 0 .6em;
-	white-space: nowrap;
-	}
-	
-/* icon (for jquery ui) */
-	
-.fc-button-content .fc-icon-wrap {
-	position: relative;
-	float: left;
-	top: 50%;
-	}
-	
-.fc-button-content .ui-icon {
-	position: relative;
-	float: left;
-	margin-top: -50%;
-	*margin-top: 0;
-	*top: -50%;
-	}
-	
-/* gloss effect */
-	
-.fc-state-default .fc-button-effect {
-	position: absolute;
-	top: 50%;
-	left: 0;
-	}
-	
-.fc-state-default .fc-button-effect span {
-	position: absolute;
-	top: -100px;
-	left: 0;
-	width: 500px;
-	height: 100px;
-	border-width: 100px 0 0 1px;
-	border-style: solid;
-	border-color: #fff;
-	background: #444;
-	opacity: .09;
-	filter: alpha(opacity=9);
-	}
-	
-/* button states (determines colors)  */
-	
-.fc-state-default,
-.fc-state-default .fc-button-inner {
-	border-style: solid;
-	border-color: #ccc #bbb #aaa;
-	background: #F3F3F3;
-	color: #000;
-	}
-	
-.fc-state-hover,
-.fc-state-hover .fc-button-inner {
-	border-color: #999;
-	}
-	
-.fc-state-down,
-.fc-state-down .fc-button-inner {
-	border-color: #555;
-	background: #777;
-	}
-	
-.fc-state-active,
-.fc-state-active .fc-button-inner {
-	border-color: #555;
-	background: #777;
-	color: #fff;
-	}
-	
-.fc-state-disabled,
-.fc-state-disabled .fc-button-inner {
-	color: #999;
-	border-color: #ddd;
-	}
-	
-.fc-state-disabled {
-	cursor: default;
-	}
-	
-.fc-state-disabled .fc-button-effect {
-	display: none;
-	}
-	
-	
-
-/* Global Event Styles
-------------------------------------------------------------------------*/
-	 
-.fc-event {
-	border-style: solid;
-	border-width: 0;
-	font-size: .85em;
-	cursor: default;
-	}
-	
-a.fc-event,
-.fc-event-draggable {
-	cursor: pointer;
-	}
-	
-a.fc-event {
-	text-decoration: none;
-	}
-	
-.fc-rtl .fc-event {
-	text-align: right;
-	}
-	
-.fc-event-skin {
-	border-color: #36c;     /* default BORDER color */
-	background-color: #36c; /* default BACKGROUND color */
-	color: #fff;            /* default TEXT color */
-	}
-	
-.fc-event-inner {
-	position: relative;
-	width: 100%;
-	height: 100%;
-	border-style: solid;
-	border-width: 0;
-	overflow: hidden;
-	}
-	
-.fc-event-time,
-.fc-event-title {
-	padding: 0 1px;
-	}
-	
-.fc .ui-resizable-handle { /*** TODO: don't use ui-resizable anymore, change class ***/
-	display: block;
-	position: absolute;
-	z-index: 99999;
-	overflow: hidden; /* hacky spaces (IE6/7) */
-	font-size: 300%;  /* */
-	line-height: 50%; /* */
-	}
-	
-	
-	
-/* Horizontal Events
-------------------------------------------------------------------------*/
-
-.fc-event-hori {
-	border-width: 1px 0;
-	margin-bottom: 1px;
-	}
-	
-/* resizable */
-	
-.fc-event-hori .ui-resizable-e {
-	top: 0           !important; /* importants override pre jquery ui 1.7 styles */
-	right: -3px      !important;
-	width: 7px       !important;
-	height: 100%     !important;
-	cursor: e-resize;
-	}
-	
-.fc-event-hori .ui-resizable-w {
-	top: 0           !important;
-	left: -3px       !important;
-	width: 7px       !important;
-	height: 100%     !important;
-	cursor: w-resize;
-	}
-	
-.fc-event-hori .ui-resizable-handle {
-	_padding-bottom: 14px; /* IE6 had 0 height */
-	}
-	
-	
-	
-/* Fake Rounded Corners (for buttons and events)
-------------------------------------------------------------*/
-	
-.fc-corner-left {
-	margin-left: 1px;
-	}
-	
-.fc-corner-left .fc-button-inner,
-.fc-corner-left .fc-event-inner {
-	margin-left: -1px;
-	}
-	
-.fc-corner-right {
-	margin-right: 1px;
-	}
-	
-.fc-corner-right .fc-button-inner,
-.fc-corner-right .fc-event-inner {
-	margin-right: -1px;
-	}
-	
-.fc-corner-top {
-	margin-top: 1px;
-	}
-	
-.fc-corner-top .fc-event-inner {
-	margin-top: -1px;
-	}
-	
-.fc-corner-bottom {
-	margin-bottom: 1px;
-	}
-	
-.fc-corner-bottom .fc-event-inner {
-	margin-bottom: -1px;
-	}
-	
-	
-	
-/* Fake Rounded Corners SPECIFICALLY FOR EVENTS
------------------------------------------------------------------*/
-	
-.fc-corner-left .fc-event-inner {
-	border-left-width: 1px;
-	}
-	
-.fc-corner-right .fc-event-inner {
-	border-right-width: 1px;
-	}
-	
-.fc-corner-top .fc-event-inner {
-	border-top-width: 1px;
-	}
-	
-.fc-corner-bottom .fc-event-inner {
-	border-bottom-width: 1px;
-	}
-	
-	
-	
-/* Reusable Separate-border Table
-------------------------------------------------------------*/
-
-table.fc-border-separate {
-	border-collapse: separate;
-	}
-	
-.fc-border-separate th,
-.fc-border-separate td {
-	border-width: 1px 0 0 1px;
-	}
-	
-.fc-border-separate th.fc-last,
-.fc-border-separate td.fc-last {
-	border-right-width: 1px;
-	}
-	
-.fc-border-separate tr.fc-last th,
-.fc-border-separate tr.fc-last td {
-	border-bottom-width: 1px;
-	}
-	
-.fc-border-separate tbody tr.fc-first td,
-.fc-border-separate tbody tr.fc-first th {
-	border-top-width: 0;
-	}
-	
-	
-
-/* Month View, Basic Week View, Basic Day View
-------------------------------------------------------------------------*/
-
-.fc-grid th {
-	text-align: center;
-	}
-	
-.fc-grid .fc-day-number {
-	float: right;
-	padding: 0 2px;
-	}
-	
-.fc-grid .fc-other-month .fc-day-number {
-	opacity: 0.3;
-	filter: alpha(opacity=30); /* for IE */
-	/* opacity with small font can sometimes look too faded
-	   might want to set the 'color' property instead
-	   making day-numbers bold also fixes the problem */
-	}
-	
-.fc-grid .fc-day-content {
-	clear: both;
-	padding: 2px 2px 1px; /* distance between events and day edges */
-	}
-	
-/* event styles */
-	
-.fc-grid .fc-event-time {
-	font-weight: bold;
-	}
-	
-/* right-to-left */
-	
-.fc-rtl .fc-grid .fc-day-number {
-	float: left;
-	}
-	
-.fc-rtl .fc-grid .fc-event-time {
-	float: right;
-	}
-	
-.fc-more-link {
-	font-size: 0.85em;
-	white-space: nowrap;
-	text-decoration: none;
-	cursor: pointer;
-	padding: 1px;
-}
-
-/* Agenda Week View, Agenda Day View
-------------------------------------------------------------------------*/
-
-.fc-agenda table {
-	border-collapse: separate;
-	}
-	
-.fc-agenda-days th {
-	text-align: center;
-	}
-	
-.fc-agenda .fc-agenda-axis {
-	width: 50px;
-	padding: 0 4px;
-	vertical-align: middle;
-	text-align: right;
-	white-space: nowrap;
-	font-weight: normal;
-	}
-	
-.fc-agenda .fc-day-content {
-	padding: 2px 2px 1px;
-	}
-	
-/* make axis border take precedence */
-	
-.fc-agenda-days .fc-agenda-axis {
-	border-right-width: 1px;
-	}
-	
-.fc-agenda-days .fc-col0 {
-	border-left-width: 0;
-	}
-	
-/* all-day area */
-	
-.fc-agenda-allday th {
-	border-width: 0 1px;
-	}
-	
-.fc-agenda-allday .fc-day-content {
-	min-height: 34px; /* TODO: doesnt work well in quirksmode */
-	_height: 34px;
-	}
-	
-/* divider (between all-day and slots) */
-	
-.fc-agenda-divider-inner {
-	height: 2px;
-	overflow: hidden;
-	}
-	
-.fc-widget-header .fc-agenda-divider-inner {
-	background: #eee;
-	}
-	
-/* slot rows */
-	
-.fc-agenda-slots th {
-	border-width: 1px 1px 0;
-	}
-	
-.fc-agenda-slots td {
-	border-width: 1px 0 0;
-	background: none;
-	}
-	
-.fc-agenda-slots td div {
-	height: 20px;
-	}
-	
-.fc-agenda-slots tr.fc-slot0 th,
-.fc-agenda-slots tr.fc-slot0 td {
-	border-top-width: 0;
-	}
-
-.fc-agenda-slots tr.fc-minor th,
-.fc-agenda-slots tr.fc-minor td {
-	border-top-style: dotted;
-	}
-	
-.fc-agenda-slots tr.fc-minor th.ui-widget-header {
-	*border-top-style: solid; /* doesn't work with background in IE6/7 */
-	}
-	
-
-
-/* Vertical Events
-------------------------------------------------------------------------*/
-
-.fc-event-vert {
-	border-width: 0 1px;
-	}
-	
-.fc-event-vert .fc-event-head,
-.fc-event-vert .fc-event-content {
-	position: relative;
-	z-index: 2;
-	width: 100%;
-	overflow: hidden;
-	}
-	
-.fc-event-vert .fc-event-time {
-	white-space: nowrap;
-	font-size: 10px;
-	}
-	
-.fc-event-vert .fc-event-bg { /* makes the event lighter w/ a semi-transparent overlay  */
-	position: absolute;
-	z-index: 1;
-	top: 0;
-	left: 0;
-	width: 100%;
-	height: 100%;
-	background: #fff;
-	opacity: .3;
-	filter: alpha(opacity=30);
-	}
-	
-.fc .ui-draggable-dragging .fc-event-bg, /* TODO: something nicer like .fc-opacity */
-.fc-select-helper .fc-event-bg {
-	display: none\9; /* for IE6/7/8. nested opacity filters while dragging don't work */
-	}
-	
-/* resizable */
-	
-.fc-event-vert .ui-resizable-s {
-	bottom: 0        !important; /* importants override pre jquery ui 1.7 styles */
-	width: 100%      !important;
-	height: 8px      !important;
-	overflow: hidden !important;
-	line-height: 8px !important;
-	font-size: 11px  !important;
-	font-family: monospace;
-	text-align: center;
-	cursor: s-resize;
-	}
-	
-.fc-agenda .ui-resizable-resizing { /* TODO: better selector */
-	_overflow: hidden;
-	}
-	
-.fc-timeline {
-	position: absolute;
-	width: 100%;
-	left: 0;
-	margin: 0;
-	padding: 0;
-	border: none;
-	border-top: 2px solid #3ec400;
-	z-index: 999;
-}
-
-/* List view  (by bruederli@kolabsys.com)
-------------------------------------------------------------------------*/
-
-.fc-view-list,
-.fc-view-table {
-	border: 1px solid #ccc;
-	width: auto;
-}
-
-.fc-view-list .fc-list-header,
-.fc-view-table td.fc-list-header {
-	border-width: 0;
-	border-bottom-width: 1px;
-	padding: 3px 5px;
-}
-
-.fc-view-table .fc-first td.fc-list-header {
-	border-top-width: 0;
-}
-
-.fc-list-section {
-	padding: 4px 2px;
-	border-width: 0;
-	border-bottom-width: 1px;
-}
-
-.fc-view-list .fc-last {
-	border-bottom-width: 0;
-}
-
-.fc-list-section .fc-event {
-	position: relative;
-	margin: 1px 2px 3px 2px;
-}
-
-.fc-view-table tr.fc-event td {
-	padding: 2px;
-	border-bottom: 1px solid #ccc;
-}
-
-.fc-view-table tr.fc-event td.fc-event-handle {
-	padding: 3px 8px 3px 3px;
-}
-
-.fc-view-table .fc-event-handle .fc-event-skin {
-	border-radius: 2px;
-	-moz-border-radius: 2px;
-}
-
-.fc-view-table .fc-event-handle .fc-event-inner {
-	display: block;
-	width: 8px;
-	height: 10px;
-	border-radius: 2px;
-	-moz-border-radius: 2px;
-}
-
-.fc-view-table table {
-	table-layout: fixed;
-	width: 100%;
-}
-
-.fc-view-table col.fc-event-handle {
-	width: 18px;
-}
-
-.fc-event-handle .fc-event-inner {
-	border-color: inherit;
-	background-color: inherit;
-}
-
-.fc-view-table col.fc-event-date {
-	width: 7em;
-}
-
-.fc-view-table .fc-list-day col.fc-event-date {
-	width: 1px;
-}
-
-.fc-view-table col.fc-event-time {
-	width: 8em;
-}
-
-.fc-view-table td.fc-event-date,
-.fc-view-table td.fc-event-time {
-	white-space: nowrap;
-	padding-right: 1em;
-}
-
+(symlink to ../larry/fullcalendar.css)

roundcubemail-plugins-kolab-3.2.tar.gz/plugins/calendar/skins/classic/images/badge_cancelled.png Added

roundcubemail-plugins-kolab-3.2.tar.gz/plugins/calendar/skins/classic/images/calendars.gif Changed

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

roundcubemail-plugins-kolab-3.2.tar.gz/plugins/calendar/skins/classic/images/delete.png Added

roundcubemail-plugins-kolab-3.2.tar.gz/plugins/calendar/skins/classic/images/ical-attachment.png Added

roundcubemail-plugins-kolab-3.2.tar.gz/plugins/calendar/skins/classic/images/minicolors-all.png Deleted

roundcubemail-plugins-kolab-3.2.tar.gz/plugins/calendar/skins/classic/images/minicolors-handles.gif Deleted

roundcubemail-plugins-kolab-3.2.tar.gz/plugins/calendar/skins/classic/images/plus.png Added

roundcubemail-plugins-kolab-3.2.tar.gz/plugins/calendar/skins/classic/jquery.miniColors.css Deleted

@@ -1,106 +0,0 @@
-.miniColors-trigger {
-	height: 22px;
-	width: 22px;
-	background: url('images/minicolors-all.png') -170px 0 no-repeat;
-	vertical-align: middle;
-	margin: 0 .25em;
-	display: inline-block;
-	outline: none;
-}
-
-.miniColors-selector {
-	position: absolute;
-	width: 175px;
-	height: 150px;
-	background: #FFF;
-	border: solid 1px #BBB;
-	-moz-box-shadow: 0 0 6px rgba(0, 0, 0, .25);
-	-webkit-box-shadow: 0 0 6px rgba(0, 0, 0, .25);
-	box-shadow: 0 0 6px rgba(0, 0, 0, .25);
-	-moz-border-radius: 5px;
-	-webkit-border-radius: 5px;
-	border-radius: 5px;
-	padding: 5px;
-	z-index: 999999;
-}
-
-.miniColors-selector.black {
-	background: #000;
-	border-color: #000;
-}
-
-.miniColors-colors {
-	position: absolute;
-	top: 5px;
-	left: 5px;
-	width: 150px;
-	height: 150px;
-	background: url('images/minicolors-all.png') top left no-repeat;
-	cursor: crosshair;
-}
-
-.miniColors-hues {
-	position: absolute;
-	top: 5px;
-	left: 160px;
-	width: 20px;
-	height: 150px;
-	background: url('images/minicolors-all.png') -150px 0 no-repeat;
-	cursor: crosshair;
-}
-
-.miniColors-colorPicker {
-	position: absolute;
-	width: 11px;
-	height: 11px;
-	background: url('images/minicolors-all.png') -170px -28px no-repeat;
-}
-
-.miniColors-huePicker {
-	position: absolute;
-	left: -3px;
-	width: 26px;
-	height: 3px;
-	background: url('images/minicolors-all.png') -170px -24px no-repeat;
-	overflow: hidden;
-}
-
-.miniColors-presets {
-	position: absolute;
-	left: 185px;
-	top: 5px;
-	width: 60px;
-}
-
-.miniColors-colorPreset {
-	float: left;
-	width: 18px;
-	height: 15px;
-	margin: 2px;
-	border: 1px solid #333;
-	cursor: pointer;
-}
-
-.miniColors-colorPreset-active {
-	border: 2px dotted #666;
-	margin: 1px;
-}
-
-/* Hacks for IE6/7 */
-
-* html .miniColors-colors {
-	background-image: none;
-	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='plugins/calendar/skins/classic/images/minicolors-all.png', sizingMethod='crop');
-}
-
-* html .miniColors-colorPicker {
-	background: url('images/minicolors-handles.gif') 0 -28px no-repeat;
-}
-
-* html .miniColors-huePicker {
-	background: url('images/minicolors-handles.gif') 0 -24px no-repeat;
-}
-
-* html .miniColors-trigger {
-	background: url('images/minicolors-handles.gif') 0 0 no-repeat;
-}

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

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

@@ -24,8 +24,15 @@
     <div id="datepicker"></div>
     <div id="calendars" style="visibility:hidden">
       <div class="boxtitle"><roundcube:label name="calendar.calendars" /></div>
+      <div class="listsearchbox">
+        <div class="searchbox">
+          <input type="text" name="q" id="calendarlistsearch" placeholder="<roundcube:label name='calendar.findcalendars' />" />
+          <a class="iconbutton searchicon"></a>
+          <roundcube:button command="reset-listsearch" id="calendarlistsearch-reset" class="reset searchreset" title="resetsearch" content="x" />
+        </div>
+      </div>
       <div class="boxlistcontent">
-      <roundcube:object name="plugin.calendar_list" id="calendarslist" />
+      <roundcube:object name="plugin.calendar_list" id="calendarslist" class="treelist" />
       </div>
       <div class="boxfooter">
         <roundcube:button command="calendar-create" type="link" title="calendar.createcalendar" class="buttonPas addgroup" classAct="button addgroup" content=" " />

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

@@ -41,8 +41,14 @@
         <input type="text" name="endtime" size="6"  id="edit-endtime" />
       </div>
       <div class="event-section" id="edit-alarms">
-        <label for="edit-alarm"><roundcube:label name="calendar.alarms" /></label>
-        <roundcube:object name="plugin.alarm_select" />
+        <div class="edit-alarm-item first">
+          <label for="edit-alarm"><roundcube:label name="calendar.alarms" /></label>
+          <roundcube:object name="plugin.alarm_select" />
+          <span class="edit-alarm-buttons">
+            <a href="#add" class="iconlink add add-alarm">+</a>
+            <a href="#delete" class="iconlink delete delete-alarm">-</a>
+          </span>
+        </div>
       </div>
       <div class="event-section" id="calendar-select">
         <label for="edit-calendar"><roundcube:label name="calendar.calendar" /></label>
@@ -53,6 +59,10 @@
         <roundcube:object name="plugin.category_select" id="edit-categories" />
       </div>
       <div class="event-section">
+        <label for="edit-event-status"><roundcube:label name="calendar.status" /></label>
+        <roundcube:object name="plugin.status_select" id="edit-event-status" />
+      </div>
+      <div class="event-section">
         <label for="edit-free-busy"><roundcube:label name="calendar.freebusy" /></label>
         <roundcube:object name="plugin.freebusy_select" id="edit-free-busy" />
       </div>

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

@@ -85,6 +85,14 @@
 	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#d9f1fb', endColorstr='#c5e3ee', GradientType=0);
 }
 
+#datepicker .ui-datepicker-days-cell-over a.ui-state-default {
+	color: #fff;
+	border-color: #2fa0c0;
+	background: rgba(73,180,210,0.6);
+	text-shadow: 0px 1px 1px #666;
+	filter: none;
+}
+
 #datepicker .ui-datepicker-activerange a.ui-state-active {
 	color: #fff;
 	background: #00acd4;
@@ -109,21 +117,21 @@
 	top: 4px;
 }
 
-#calendarsidebartoggle {
+#calsidebarsplitter {
 	position: absolute;
 	left: 264px;
-	width: 8px;
-	top: 40px;
+	width: 6px;
+	top: 40px !important;
 	bottom: 0;
-	background: url(images/toggle.gif) 0 48% no-repeat transparent;
-	cursor: pointer;
+	background: url(images/toggle.gif) -1px 48% no-repeat transparent;
 }
 
 div.sidebarclosed {
 	background-position: -8px 48% !important;
+	cursor: pointer;
 }
 
-#calendarsidebartoggle:hover {
+#calsidebarsplitter:hover {
 	background-color: #ddd;
 }
 
@@ -164,45 +172,86 @@
 	right: 0;
 }
 
-#calendarslist li {
-	margin: 0;
-	height: 20px;
-	padding: 6px 8px 2px;
-	display: block;
+#calendars .boxtitle {
 	position: relative;
 }
 
-#calendarslist li.virtual {
-	height: 12px;
+#calendars .boxtitle a.iconbutton.search {
+	position: absolute;
+	top: 8px;
+	right: 8px;
+	width: 16px;
+	cursor: pointer;
+	background-position: -2px -317px;
+}
+
+#calendars .listsearchbox {
+	display: none;
 }
 
-#calendarslist li label {
+#calendars .listsearchbox.expanded {
 	display: block;
 }
 
-#calendarslist li span.calname {
+#calendars .scroller {
+	top: 34px;
+}
+
+#calendars .listsearchbox.expanded + .scroller {
+	top: 68px;
+}
+
+#calendars .treelist li {
+	margin: 0;
+	position: relative;
+}
+
+#calendars .treelist li div.folder,
+#calendars .treelist li div.calendar {
+	position: relative;
+	height: 28px;
+}
+
+#calendars .treelist li div.virtual {
+	height: 22px;
+}
+
+
+#calendars .treelist li span.calname {
 	display: block;
+	padding: 0px 30px 2px 2px;
 	position: absolute;
-	top: 6px;
-	left: 26px;
-	right: 24px;
+	top: 7px;
+	left: 38px;
+	right: 40px;
 	cursor: default;
 	background: url(images/calendars.png) right 20px no-repeat;
-	padding-bottom: 2px;
-	padding-right: 30px;
 	overflow: hidden;
 	text-overflow: ellipsis;
 	white-space: nowrap;
 	color: #004458;
 }
 
-#calendarslist li span.handle {
+#calendars .treelist li div.virtual > span.calname {
+	color: #aaa;
+	top: 4px;
+	left: 20px;
+}
+
+#calendars .treelist.flat li span.calname {
+	left: 24px;
+	right: 22px;
+}
+
+#calendars .treelist li span.handle {
 	display: inline-block;
+	position: absolute;
+	top: 8px;
+	right: 6px;
 	padding: 0;
-	border-radius: 7px;
-	margin-right: 6px;
 	width: 10px;
 	height: 10px;
+	border-radius: 7px;
 	font-size: 0.8em;
 	border: 1px solid rgba(0, 0, 0, 0.5);
 	-webkit-box-shadow: inset 0px 0 1px 1px rgba(0, 0, 0, 0.3);
@@ -210,43 +259,109 @@
 	box-shadow: inset 0px 0 1px 1px rgba(0, 0, 0, 0.3);
 }
 
-#calendarslist li input {
+#calendars .treelist li a.subscribed {
+	display: inline-block;
 	position: absolute;
-	top: 4px;
-	right: 5px;
+	top: 7px;
+	right: 24px;
+	height: 16px;
+	width: 16px;
+	padding: 0;
+	background: url(images/calendars.png) -100px 0 no-repeat;
+	overflow: hidden;
+	text-indent: -5000px;
+	cursor: pointer;
+}
+
+#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 {
+	background-position: 0 -110px;
+}
+
+#calendars .treelist div.subscribed a.subscribed,
+#calendars .treelist div.subscribed a.subscribed:focus {
+	background-position: -16px -110px;
+}
+
+#calendars .treelist li input {
+	position: absolute;
+	top: 5px;
+	left: 18px;
 }
 
-#calendarslist li.selected {
+#calendars .treelist li div.treetoggle {
+	top: 8px;
+}
+
+#calendars .treelist li.virtual div.treetoggle {
+	top: 6px;
+}
+
+#calendars .treelist.flat li input {
+	left: 4px;
+}
+
+#calendars .treelist ul li div.folder,
+#calendars .treelist ul li div.calendar {
+	margin-left: 16px;
+}
+
+#calendars .treelist ul ul li div.folder,
+#calendars .treelist ul ul li div.calendar {
+	margin-left: 32px;
+}
+
+#calendars .treelist ul ul ul li div.folder,
+#calendars .treelist ul ul ul li div.calendar {
+	margin-left: 48px;
+}
+
+#calendars .treelist li.selected {
 	background-color: #c7e3ef;
 }
 
-#calendarslist li.selected span.calname {
+#calendars .treelist li.selected > span.calname {
 	font-weight: bold;
 }
 
-#calendarslist li.readonly span.calname {
+#calendars .treelist div.readonly span.calname {
 	background-position: right -20px;
 }
 
-#calendarslist li.other span.calname {
+#calendars .treelist li.user > div > span.calname {
 	background-position: right -38px;
 }
-
-#calendarslist li.other.readonly span.calname {
+/*
+#calendars .treelist div.user.readonly span.calname {
 	background-position: right -56px;
 }
 
-#calendarslist li.shared span.calname {
+#calendars .treelist div.shared span.calname {
 	background-position: right -74px;
 }
 
-#calendarslist li.shared.readonly span.calname {
+#calendars .treelist div.shared.readonly span.calname {
 	background-position: right -92px;
 }
+*/
 
-#calendarslist li.virtual span.calname {
-	color: #aaa;
-	top: 2px;
+#calendars .searchresults {
+	background: #b0ccd7;
+	margin-top: 8px;
+}
+
+#calendars .searchresults .boxtitle {
+	background: none;
+	padding: 2px 8px 2px 8px;
+}
+
+#calendars .searchresults .listing li {
+	background-color: #c7e3ef;
 }
 
 #calfeedurl,
@@ -320,7 +435,7 @@
 }
 
 body.calendarmain #quicksearchbar {
-	z-index: 200;
+	z-index: 20;
 }
 
 body.calendarmain #searchmenulink {
@@ -500,7 +615,7 @@
 .calendarmain .fc-view-table td.fc-list-header,
 #attendees-freebusy-table h3.boxtitle,
 #schedule-freebusy-times thead th,
-.edit-attendees-table thead td
+.edit-attendees-table thead th
  {
 	color: #69939e;
 	font-size: 11px;
@@ -514,6 +629,7 @@
 	border: 0;
 	border-bottom: 1px solid #ccc;
 	height: 18px;
+	line-height: 18px;
 	padding: 8px 7px 3px 7px;
 }
 
@@ -536,6 +652,10 @@
 	margin: 0 -0.2em;
 }
 
+#eventshow.status-cancelled {
+	background: url(images/badge_cancelled.png) top right no-repeat;
+}
+
 #eventshow.sensitivity-private {
 	background: url(images/badge_private.png) top right no-repeat;
 }
@@ -614,39 +734,6 @@
 	min-width: 5em;
 }
 
-#edit-recurrence-yearly-bymonthblock {
-	margin-left: 7.5em;
-}
-
-#eventedit .recurrence-form {
-	display: none;
-}
-
-#edit-recurrence-rdates {
-	display: block;
-	list-style: none;
-	margin: 0 0 0.8em 0;
-	padding: 0;
-	max-height: 300px;
-	overflow: auto;
-}
-
-#edit-recurrence-rdates li {
-	display: block;
-	position: relative;
-	width: 12em;
-	padding: 4px 0 4px 0;
-}
-
-#edit-recurrence-rdates li a.delete {
-	position: absolute;
-	top: 2px;
-	right: 0;
-	width: 20px;
-	height: 18px;
-	background-position: -7px -337px;
-}
-
 #eventedit .formtable td {
 	padding: 0.2em 0;
 }
@@ -704,21 +791,26 @@
 	margin-top: 0.5em;
 }
 
+.edit-attendees-table th.role,
 .edit-attendees-table td.role {
 	width: 9em;
 }
 
+.edit-attendees-table th.availability,
 .edit-attendees-table td.availability,
+.edit-attendees-table th.confirmstate,
 .edit-attendees-table td.confirmstate {
 	width: 4em;
 }
 
+.edit-attendees-table th.options,
 .edit-attendees-table td.options {
 	width: 3em;
 	text-align: right;
 	padding-right: 4px;
 }
 
+.edit-attendees-table th.name,
 .edit-attendees-table td.name {
 	width: auto;
 	white-space: nowrap;
@@ -1049,7 +1141,7 @@
 	left: 0;
 	right: 0;
 	height: auto;
-	z-index: 200;
+	z-index: 10;
 	padding: 4px 5px;
 	border: 1px solid #c3c3c3;
 	border-top-color: #ddd;
@@ -1082,13 +1174,6 @@
 	padding-right: 10px;
 }
 
-#calendar-kolabform fieldset.tab {
-	background: #efefef;
-	display: block;
-	margin-top: 0.5em;
-	padding: 0.5em 1em;
-}
-
 #resource-selection {
 	position: absolute;
 	top: 0;
@@ -1232,15 +1317,11 @@
 }
 
 .calendarmain .fc-button,
-.calendarmain .fc-button.fc-state-hover,
-.calendarmain .fc-button.fc-state-down {
-	border: 0;
-	background: none;
-}
-
-.calendarmain .fc-state-default .fc-button-inner,
-.calendarmain .fc-state-hover .fc-button-inner {
+.calendarmain .fc-button.fc-state-default,
+.calendarmain .fc-button.fc-state-hover {
 	margin: 0 0 0 0;
+	height: 20px;
+	line-height: 20px;
 	color: #505050;
 	text-shadow: 0px 1px 1px #fff;
 	border: 1px solid #e6e6e6;
@@ -1257,17 +1338,12 @@
 	text-decoration: none;
 }
 
-.calendarmain .fc-state-disabled .fc-button-inner {
+.calendarmain .fc-button.fc-state-disabled {
 	color: #999;
 	background: #d8d8d8;
 }
 
-.calendarmain .fc-header .fc-button {
-	margin-left: -1px;
-	margin-right: 0;
-}
-
-.calendarmain .fc-state-down .fc-button-inner {
+.calendarmain .fc-button.fc-state-down {
 	margin: 0;
 	background: #bababa;
 	background: -moz-linear-gradient(top, #bababa 0%, #d8d8d8 100%);
@@ -1277,7 +1353,7 @@
 	background: linear-gradient(top, #bababa 0%, #d8d8d8 100%);
 }
 
-.calendarmain .fc-state-active .fc-button-inner {
+.calendarmain .fc-button.fc-state-active {
 	color: #333;
 	background: #bababa;
 	background: -moz-linear-gradient(top, #bababa 0%, #d8d8d8 100%);
@@ -1287,34 +1363,13 @@
 	background: linear-gradient(top, #bababa 0%, #d8d8d8 100%);
 }
 
-.calendarmain .fc-corner-left .fc-button-inner,
-.calendarmain .fc-corner-left .fc-button-content {
-	border-top-left-radius: 4px;
-	border-bottom-left-radius: 4px;
-}
-
-.calendarmain .fc-corner-right .fc-button-inner,
-.calendarmain .fc-corner-right .fc-button-content {
-	border-top-right-radius: 4px;
-	border-bottom-right-radius: 4px;
-}
-
-.calendarmain .fc-button-effect {
-	display: none;
-}
-
-.calendarmain .fc-button-content {
-	height: 20px;
-	line-height: 20px;
+.calendarmain .fc-header .fc-button {
+	margin-left: -1px;
+	margin-right: 0;
 }
 
 .calendarmain .fc-header-left .fc-button {
-	margin: -7px 0 0 0;
-	padding: 0;
-}
-
-.calendarmain .fc-header-left .fc-state-default .fc-button-inner,
-.calendarmain .fc-header-left .fc-state-hover .fc-button-inner {
+	display: inline-block;
 	margin: 0;
 	text-align: center;
 	font-size: 10px;
@@ -1322,9 +1377,11 @@
 	min-width: 50px;
 	max-width: 75px;
 	height: 13px;
+	line-height: 1em;
 	overflow: hidden;
 	text-overflow: ellipsis;
 	white-space: nowrap;
+	margin: -7px 0 0 0;
 	padding: 28px 2px 0 2px;
 	text-shadow: 0px 1px 1px #EEE;
 	border: 0;
@@ -1333,48 +1390,52 @@
 	-o-box-shadow: none;
 	-webkit-box-shadow: none;
 	-moz-box-shadow: none;
+	outline: none;
 }
 
-.calendarmain .fc-header-left .fc-button-content {
-	float: none;
-	line-height: 1em;
-	padding: 0;
+.calendarmain .fc-header-left .fc-button:focus {
+	color: #fff;
+	text-shadow: 0px 1px 1px #666;
+	background-color: rgba(30,150,192, 0.5);
+	border-radius: 3px;
 }
 
-.calendarmain .fc-header-left .fc-state-active .fc-button-content {
+.calendarmain .fc-header-left .fc-button.fc-state-active {
 	font-weight: bold;
 	color: #222;
+	text-shadow: none;
+	background-color: transparent;
 }
 
-.calendarmain .fc-header-left .fc-button-agendaDay .fc-button-inner {
+.calendarmain .fc-header-left .fc-button-agendaDay {
 	background-position: center -120px;
 }
 
-.calendarmain .fc-header-left .fc-button-agendaDay.fc-state-active .fc-button-inner {
+.calendarmain .fc-header-left .fc-button-agendaDay.fc-state-active {
 	background-position: center -160px;
 }
 
-.calendarmain .fc-header-left .fc-button-agendaWeek .fc-button-inner {
+.calendarmain .fc-header-left .fc-button-agendaWeek {
 	background-position: center -200px;
 }
 
-.calendarmain .fc-header-left .fc-button-agendaWeek.fc-state-active .fc-button-inner {
+.calendarmain .fc-header-left .fc-button-agendaWeek.fc-state-active {
 	background-position: center -240px;
 }
 
-.calendarmain .fc-header-left .fc-button-month .fc-button-inner {
+.calendarmain .fc-header-left .fc-button-month {
 	background-position: center -280px;
 }
 
-.calendarmain .fc-header-left .fc-button-month.fc-state-active .fc-button-inner {
+.calendarmain .fc-header-left .fc-button-month.fc-state-active {
 	background-position: center -320px;
 }
 
-.calendarmain .fc-header-left .fc-button-table .fc-button-inner {
+.calendarmain .fc-header-left .fc-button-table {
 	background-position: center -360px;
 }
 
-.calendarmain .fc-header-left .fc-button-table.fc-state-active .fc-button-inner {
+.calendarmain .fc-header-left .fc-button-table.fc-state-active {
 	background-position: center -400px;
 }
 
@@ -1391,10 +1452,21 @@
 	font-size: 1em !important;
 }
 
+.calendarmain .fc-event:focus {
+	outline: 1px solid rgba(71,135,177, 0.4);
+	-webkit-box-shadow: 0 0 2px 3px rgba(71,135,177, 0.6);
+	   -moz-box-shadow: 0 0 2px 3px rgba(71,135,177, 0.6);
+	     -o-box-shadow: 0 0 2px 3px rgba(71,135,177, 0.6);
+	        box-shadow: 0 0 2px 3px rgba(71,135,177, 0.6);
+}
 .fc-event-title {
 	font-weight: bold;
 }
 
+.cal-event-status-cancelled .fc-event-title {
+	text-decoration: line-through;
+}
+
 .fc-event-hori .fc-event-title {
 	font-weight: normal;
 	white-space: nowrap;
@@ -1412,6 +1484,10 @@
 	padding-right: 0.3em;
 }
 
+.calendarmain .fc-event-vert .fc-event-inner {
+	z-index: 0;
+}
+
 .fc-event-cateories {
 	font-style:italic; 
 }
@@ -1505,6 +1581,7 @@
 	width: 10px;
 	height: 10px;
 	padding: 0;
+	margin: -1px;
 	font-size: 10px;
 	border-radius: 8px;
 	border: 1px solid rgba(0, 0, 0, 0.4);
@@ -1551,6 +1628,15 @@
 
 /* Invitation UI in mail */
 
+.messagelist tbody .attachment span.ical {
+	display: inline-block;
+	vertical-align: middle;
+	height: 18px;
+	width: 20px;
+	padding: 0;
+	background: url(images/ical-attachment.png) 2px 1px no-repeat;
+}
+
 #messagemenu li a.calendarlink span.calendar,
 #attachmentmenu li a.calendarlink span.calendar {
 	background-position: 0px -2197px;

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

-(symlink to ../classic/fullcalendar.css)
@@ -0,0 +1,711 @@
+/*!
+ * FullCalendar v1.6.4-rcube-1.0 Stylesheet
+ * Docs & License: http://arshaw.com/fullcalendar/
+ * (c) 2013 Adam Shaw, 2014 Kolab Systems AG
+ */
+
+
+.fc {
+	direction: ltr;
+	text-align: left;
+	}
+	
+.fc table {
+	border-collapse: collapse;
+	border-spacing: 0;
+	}
+	
+html .fc,
+.fc table {
+	font-size: 1em;
+	}
+	
+.fc td,
+.fc th {
+	padding: 0;
+	vertical-align: top;
+	}
+
+
+
+/* Header
+------------------------------------------------------------------------*/
+
+.fc-header td {
+	white-space: nowrap;
+	}
+
+.fc-header-left {
+	width: 25%;
+	text-align: left;
+	}
+	
+.fc-header-center {
+	text-align: center;
+	}
+	
+.fc-header-right {
+	width: 25%;
+	text-align: right;
+	}
+	
+.fc-header-title {
+	display: inline-block;
+	vertical-align: top;
+	}
+	
+.fc-header-title h2 {
+	margin-top: 0;
+	white-space: nowrap;
+	}
+	
+.fc .fc-header-space {
+	padding-left: 10px;
+	}
+	
+.fc-header .fc-button {
+	margin-bottom: 1em;
+	vertical-align: top;
+	}
+	
+/* buttons edges butting together */
+
+.fc-header .fc-button {
+	margin-right: -1px;
+	}
+	
+.fc-header .fc-corner-right,  /* non-theme */
+.fc-header .ui-corner-right { /* theme */
+	margin-right: 0; /* back to normal */
+	}
+	
+/* button layering (for border precedence) */
+	
+.fc-header .fc-state-hover,
+.fc-header .ui-state-hover {
+	z-index: 2;
+	}
+	
+.fc-header .fc-state-down {
+	z-index: 3;
+	}
+
+.fc-header .fc-state-active,
+.fc-header .ui-state-active {
+	z-index: 4;
+	}
+	
+	
+	
+/* Content
+------------------------------------------------------------------------*/
+	
+.fc-content {
+	clear: both;
+	zoom: 1; /* for IE7, gives accurate coordinates for [un]freezeContentHeight */
+	}
+	
+.fc-view {
+	width: 100%;
+	overflow: hidden;
+	}
+	
+	
+
+/* Cell Styles
+------------------------------------------------------------------------*/
+
+.fc-widget-header,    /* <th>, usually */
+.fc-widget-content {  /* <td>, usually */
+	border: 1px solid #ddd;
+	}
+	
+.fc-state-highlight { /* <td> today cell */ /* TODO: add .fc-today to <th> */
+	background: #fcf8e3;
+	}
+	
+.fc-cell-overlay { /* semi-transparent rectangle while dragging */
+	background: #bce8f1;
+	opacity: .3;
+	filter: alpha(opacity=30); /* for IE */
+	}
+	
+
+
+/* Buttons
+------------------------------------------------------------------------*/
+
+.fc-button {
+	position: relative;
+	display: inline-block;
+	padding: 0 .6em;
+	overflow: hidden;
+	height: 1.9em;
+	line-height: 1.9em;
+	white-space: nowrap;
+	cursor: pointer;
+	}
+	
+.fc-state-default { /* non-theme */
+	border: 1px solid;
+	}
+
+.fc-state-default.fc-corner-left { /* non-theme */
+	border-top-left-radius: 4px;
+	border-bottom-left-radius: 4px;
+	}
+
+.fc-state-default.fc-corner-right { /* non-theme */
+	border-top-right-radius: 4px;
+	border-bottom-right-radius: 4px;
+	}
+
+/*
+	Our default prev/next buttons use HTML entities like &lsaquo; &rsaquo; &laquo; &raquo;
+	and we'll try to make them look good cross-browser.
+*/
+
+.fc-text-arrow {
+	margin: 0 .1em;
+	font-size: 2em;
+	font-family: "Courier New", Courier, monospace;
+	vertical-align: baseline; /* for IE7 */
+	}
+
+.fc-button-prev .fc-text-arrow,
+.fc-button-next .fc-text-arrow { /* for &lsaquo; &rsaquo; */
+	font-weight: bold;
+	}
+	
+/* icon (for jquery ui) */
+	
+.fc-button .fc-icon-wrap {
+	position: relative;
+	float: left;
+	top: 50%;
+	}
+	
+.fc-button .ui-icon {
+	position: relative;
+	float: left;
+	margin-top: -50%;
+	*margin-top: 0;
+	*top: -50%;
+	}
+	
+/*
+  button states
+  borrowed from twitter bootstrap (http://twitter.github.com/bootstrap/)
+*/
+
+.fc-state-default {
+	background-color: #f5f5f5;
+	background-image: -moz-linear-gradient(top, #ffffff, #e6e6e6);
+	background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), to(#e6e6e6));
+	background-image: -webkit-linear-gradient(top, #ffffff, #e6e6e6);
+	background-image: -o-linear-gradient(top, #ffffff, #e6e6e6);
+	background-image: linear-gradient(to bottom, #ffffff, #e6e6e6);
+	background-repeat: repeat-x;
+	border-color: #e6e6e6 #e6e6e6 #bfbfbf;
+	border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
+	color: #333;
+	text-shadow: 0 1px 1px rgba(255, 255, 255, 0.75);
+	box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);
+	}
+
+.fc-state-hover,
+.fc-state-down,
+.fc-state-active,
+.fc-state-disabled {
+	color: #333333;
+	background-color: #e6e6e6;
+	}
+
+.fc-state-hover {
+	color: #333333;
+	text-decoration: none;
+	background-position: 0 -15px;
+	-webkit-transition: background-position 0.1s linear;
+	   -moz-transition: background-position 0.1s linear;
+	     -o-transition: background-position 0.1s linear;
+	        transition: background-position 0.1s linear;
+	}
+
+.fc-state-down,
+.fc-state-active {
+	background-color: #cccccc;
+	background-image: none;
+	outline: 0;
+	box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05);
+	}
+
+.fc-state-disabled {
+	cursor: default;
+	background-image: none;
+	opacity: 0.65;
+	filter: alpha(opacity=65);
+	box-shadow: none;
+	}
+
+	
+
+/* Global Event Styles
+------------------------------------------------------------------------*/
+
+.fc-event-container > * {
+	z-index: 8;
+	}
+
+.fc-event-container > .ui-draggable-dragging,
+.fc-event-container > .ui-resizable-resizing {
+	z-index: 9;
+	}
+	 
+.fc-event {
+	border: 1px solid #3a87ad; /* default BORDER color */
+	background-color: #3a87ad; /* default BACKGROUND color */
+	color: #fff;               /* default TEXT color */
+	font-size: .85em;
+	cursor: default;
+	}
+
+.fc-event:focus {
+	outline: 2px solid ActiveBorder;
+	}
+
+a.fc-event {
+	text-decoration: none;
+	}
+	
+a.fc-event,
+.fc-event-draggable {
+	cursor: pointer;
+	}
+	
+.fc-rtl .fc-event {
+	text-align: right;
+	}
+
+.fc-event-inner {
+	width: 100%;
+	height: 100%;
+	overflow: hidden;
+	}
+	
+.fc-event-time,
+.fc-event-title {
+	padding: 0 1px;
+	}
+	
+.fc .ui-resizable-handle {
+	display: block;
+	position: absolute;
+	z-index: 99999;
+	overflow: hidden; /* hacky spaces (IE6/7) */
+	font-size: 300%;  /* */
+	line-height: 50%; /* */
+	}
+	
+	
+	
+/* Horizontal Events
+------------------------------------------------------------------------*/
+
+.fc-event-hori {
+	border-width: 1px 0;
+	margin-bottom: 1px;
+	}
+
+.fc-ltr .fc-event-hori.fc-event-start,
+.fc-rtl .fc-event-hori.fc-event-end {
+	border-left-width: 1px;
+	border-top-left-radius: 3px;
+	border-bottom-left-radius: 3px;
+	}
+
+.fc-ltr .fc-event-hori.fc-event-end,
+.fc-rtl .fc-event-hori.fc-event-start {
+	border-right-width: 1px;
+	border-top-right-radius: 3px;
+	border-bottom-right-radius: 3px;
+	}
+	
+/* resizable */
+	
+.fc-event-hori .ui-resizable-e {
+	top: 0           !important; /* importants override pre jquery ui 1.7 styles */
+	right: -3px      !important;
+	width: 7px       !important;
+	height: 100%     !important;
+	cursor: e-resize;
+	}
+	
+.fc-event-hori .ui-resizable-w {
+	top: 0           !important;
+	left: -3px       !important;
+	width: 7px       !important;
+	height: 100%     !important;
+	cursor: w-resize;
+	}
+	
+.fc-event-hori .ui-resizable-handle {
+	_padding-bottom: 14px; /* IE6 had 0 height */
+	}
+	
+	
+	
+/* Reusable Separate-border Table
+------------------------------------------------------------*/
+
+table.fc-border-separate {
+	border-collapse: separate;
+	}
+	
+.fc-border-separate th,
+.fc-border-separate td {
+	border-width: 1px 0 0 1px;
+	}
+	
+.fc-border-separate th.fc-last,
+.fc-border-separate td.fc-last {
+	border-right-width: 1px;
+	}
+	
+.fc-border-separate tr.fc-last th,
+.fc-border-separate tr.fc-last td {
+	border-bottom-width: 1px;
+	}
+	
+.fc-border-separate tbody tr.fc-first td,
+.fc-border-separate tbody tr.fc-first th {
+	border-top-width: 0;
+	}
+	
+	
+
+/* Month View, Basic Week View, Basic Day View
+------------------------------------------------------------------------*/
+
+.fc-grid th {
+	text-align: center;
+	}
+
+.fc .fc-week-number {
+	width: 22px;
+	text-align: center;
+	}
+
+.fc .fc-week-number div {
+	padding: 0 2px;
+	}
+	
+.fc-grid .fc-day-number {
+	float: right;
+	padding: 0 2px;
+	}
+	
+.fc-grid .fc-other-month .fc-day-number {
+	opacity: 0.3;
+	filter: alpha(opacity=30); /* for IE */
+	/* opacity with small font can sometimes look too faded
+	   might want to set the 'color' property instead
+	   making day-numbers bold also fixes the problem */
+	}
+	
+.fc-grid .fc-day-content {
+	clear: both;
+	padding: 2px 2px 1px; /* distance between events and day edges */
+	}
+	
+/* event styles */
+	
+.fc-grid .fc-event-time {
+	font-weight: bold;
+	}
+	
+/* right-to-left */
+	
+.fc-rtl .fc-grid .fc-day-number {
+	float: left;
+	}
+	
+.fc-rtl .fc-grid .fc-event-time {
+	float: right;
+	}
+	
+.fc-more-link {
+	font-size: 0.85em;
+	white-space: nowrap;
+	text-decoration: none;
+	cursor: pointer;
+	padding: 1px;
+}
+
+/* Agenda Week View, Agenda Day View
+------------------------------------------------------------------------*/
+
+.fc-agenda table {
+	border-collapse: separate;
+	}
+	
+.fc-agenda-days th {
+	text-align: center;
+	}
+	
+.fc-agenda .fc-agenda-axis {
+	width: 50px;
+	padding: 0 4px;
+	vertical-align: middle;
+	text-align: right;
+	white-space: nowrap;
+	font-weight: normal;
+	}
+
+.fc-agenda .fc-week-number {
+	font-weight: bold;
+	}
+	
+.fc-agenda .fc-day-content {
+	padding: 2px 2px 1px;
+	}
+	
+/* make axis border take precedence */
+	
+.fc-agenda-days .fc-agenda-axis {
+	border-right-width: 1px;
+	}
+	
+.fc-agenda-days .fc-col0 {
+	border-left-width: 0;
+	}
+	
+/* all-day area */
+	
+.fc-agenda-allday th {
+	border-width: 0 1px;
+	}
+	
+.fc-agenda-allday .fc-day-content {
+	min-height: 34px; /* TODO: doesnt work well in quirksmode */
+	_height: 34px;
+	}
+	
+/* divider (between all-day and slots) */
+	
+.fc-agenda-divider-inner {
+	height: 2px;
+	overflow: hidden;
+	}
+	
+.fc-widget-header .fc-agenda-divider-inner {
+	background: #eee;
+	}
+	
+/* slot rows */
+	
+.fc-agenda-slots th {
+	border-width: 1px 1px 0;
+	}
+	
+.fc-agenda-slots td {
+	border-width: 1px 0 0;
+	background: none;
+	}
+	
+.fc-agenda-slots td div {
+	height: 20px;
+	}
+	
+.fc-agenda-slots tr.fc-slot0 th,
+.fc-agenda-slots tr.fc-slot0 td {
+	border-top-width: 0;
+	}
+
+.fc-agenda-slots tr.fc-minor th,
+.fc-agenda-slots tr.fc-minor td {
+	border-top-style: dotted;
+	}
+	
+.fc-agenda-slots tr.fc-minor th.ui-widget-header {
+	*border-top-style: solid; /* doesn't work with background in IE6/7 */
+	}
+	
+
+
+/* Vertical Events
+------------------------------------------------------------------------*/
+
+.fc-event-vert {
+	border-width: 0 1px;
+	}
+
+.fc-event-vert .fc-event-head,
+.fc-event-vert .fc-event-content {
+	position: relative;
+	z-index: 2;
+	width: 100%;
+	overflow: hidden;
+	}
+
+.fc-event-vert.fc-event-start {
+	border-top-width: 1px;
+	border-top-left-radius: 3px;
+	border-top-right-radius: 3px;
+	}
+
+.fc-event-vert.fc-event-end {
+	border-bottom-width: 1px;
+	border-bottom-left-radius: 3px;
+	border-bottom-right-radius: 3px;
+	}
+	
+.fc-event-vert .fc-event-time {
+	white-space: nowrap;
+	font-size: 10px;
+	}
+
+.fc-event-vert .fc-event-inner {
+	position: relative;
+	z-index: 2;
+	}
+	
+.fc-event-vert .fc-event-bg { /* makes the event lighter w/ a semi-transparent overlay  */
+	position: absolute;
+	z-index: 1;
+	top: 0;
+	left: 0;
+	width: 100%;
+	height: 100%;
+	background: #fff;
+	opacity: .25;
+	filter: alpha(opacity=25);
+	}
+	
+.fc .ui-draggable-dragging .fc-event-bg, /* TODO: something nicer like .fc-opacity */
+.fc-select-helper .fc-event-bg {
+	display: none\9; /* for IE6/7/8. nested opacity filters while dragging don't work */
+	}
+	
+/* resizable */
+	
+.fc-event-vert .ui-resizable-s {
+	bottom: 0        !important; /* importants override pre jquery ui 1.7 styles */
+	width: 100%      !important;
+	height: 8px      !important;
+	overflow: hidden !important;
+	line-height: 8px !important;
+	font-size: 11px  !important;
+	font-family: monospace;
+	text-align: center;
+	cursor: s-resize;
+	}
+	
+.fc-agenda .ui-resizable-resizing { /* TODO: better selector */
+	_overflow: hidden;
+	}
+	
+.fc-timeline {
+	position: absolute;
+	width: 100%;
+	left: 0;
+	margin: 0;
+	padding: 0;
+	border: none;
+	border-top: 2px solid #3ec400;
+	z-index: 999;
+}
+
+/* List view  (by bruederli@kolabsys.com)
+------------------------------------------------------------------------*/
+
+.fc-view-list,
+.fc-view-table {
+	border: 1px solid #ccc;
+	width: auto;
+}
+
+.fc-view-list .fc-list-header,
+.fc-view-table td.fc-list-header {
+	border-width: 0;
+	border-bottom-width: 1px;
+	padding: 3px 5px;
+}
+
+.fc-view-table .fc-first td.fc-list-header {
+	border-top-width: 0;
+}
+
+.fc-list-section {
+	padding: 4px 2px;
+	border-width: 0;
+	border-bottom-width: 1px;
+}
+
+.fc-view-list .fc-last {
+	border-bottom-width: 0;
+}
+
+.fc-list-section .fc-event {
+	position: relative;
+	margin: 1px 2px 3px 2px;
+}
+
+.fc-view-table tr.fc-event {
+	background: inherit;
+	color: inherit;
+}
+
+.fc-view-table tr.fc-event td {
+	padding: 2px;
+	border-bottom: 1px solid #ccc;
+}
+
+.fc-view-table tr.fc-event td.fc-event-handle {
+	padding: 3px 8px 3px 3px;
+}
+
+.fc-view-table .fc-event-handle .fc-event-skin {
+	border-radius: 2px;
+	-moz-border-radius: 2px;
+}
+
+.fc-view-table .fc-event-handle .fc-event-inner {
+	display: block;
+	width: 8px;
+	height: 10px;
+	border-radius: 2px;
+	-moz-border-radius: 2px;
+}
+
+.fc-view-table table {
+	table-layout: fixed;
+	width: 100%;
+}
+
+.fc-view-table col.fc-event-handle {
+	width: 18px;
+}
+
+.fc-event-handle .fc-event-inner {
+	border-color: inherit;
+	background-color: inherit;
+}
+
+.fc-view-table col.fc-event-date {
+	width: 7em;
+}
+
+.fc-view-table .fc-list-day col.fc-event-date {
+	width: 1px;
+}
+
+.fc-view-table col.fc-event-time {
+	width: 9em;
+}
+
+.fc-view-table td.fc-event-date,
+.fc-view-table td.fc-event-time {
+	white-space: nowrap;
+	padding-right: 1em;
+}
+

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

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

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

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/ical-attachment.png Added

roundcubemail-plugins-kolab-3.2.tar.gz/plugins/calendar/skins/larry/images/minicolors-all.png Deleted

roundcubemail-plugins-kolab-3.2.tar.gz/plugins/calendar/skins/larry/images/minicolors-handles.gif Deleted

roundcubemail-plugins-kolab-3.2.tar.gz/plugins/calendar/skins/larry/jquery.miniColors.css Deleted

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

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

@@ -9,9 +9,12 @@
 
 <roundcube:include file="/includes/header.html" />
 
+<h1 class="voice"><roundcube:label name="calendar.calendar" /></h1>
+
 <div id="mainscreen">
 	<div id="calendarsidebar">
-		<div id="calendartoolbar" class="toolbar">
+		<h2 id="aria-label-toolbar" class="voice"><roundcube:label name="arialabeltoolbar" /></h2>
+		<div id="calendartoolbar" class="toolbar" role="toolbar" aria-labelledby="aria-label-toolbar">
 			<roundcube:button command="addevent" type="link" class="button addevent disabled" classAct="button addevent" classSel="button addevent pressed" label="calendar.new_event" title="calendar.new_event" />
 			<roundcube:button command="print" type="link" class="button print disabled" classAct="button print" classSel="button print pressed" label="calendar.print" title="calendar.printtitle" />
 			<roundcube:button command="events-import" type="link" class="button import disabled" classAct="button import" classSel="button import pressed" label="import" title="calendar.importevents" />
@@ -19,27 +22,41 @@
 			<roundcube:container name="toolbar" id="calendartoolbar" />
 		</div>
 
-		<div id="datepicker" class="uibox"></div>
+		<h2 id="aria-label-minical" class="voice"><roundcube:label name="calendar.arialabelminical" /></h2>
+		<div id="datepicker" class="uibox" role="presentation"></div>
 
-		<div id="calendars" class="uibox listbox" style="visibility:hidden">
-			<h2 class="boxtitle"><roundcube:label name="calendar.calendars" /></h2>
+		<div id="calendars" class="uibox listbox" style="visibility:hidden" role="navigation" aria-labelledby="aria-label-calendarlist">
+			<h2 class="boxtitle" id="aria-label-calendarlist"><roundcube:label name="calendar.calendars" />
+				<a href="#calendars" class="iconbutton search" title="<roundcube:label name='calendar.findcalendars' />" tabindex="0"><roundcube:label name='calendar.findcalendars' /></a>
+			</h2>
+			<div class="listsearchbox">
+				<div class="searchbox" role="search" aria-labelledby="aria-label-calsearchform" aria-controls="calendarslist">
+					<h3 id="aria-label-calsearchform" class="voice"><roundcube:label name="calendar.arialabelcalsearchform" /></h3>
+					<label for="calendarlistsearch" class="voice"><roundcube:label name="calendar.searchterms" /></label>
+					<input type="text" name="q" id="calendarlistsearch" placeholder="<roundcube:label name='calendar.findcalendars' />" />
+					<a class="iconbutton searchicon"></a>
+					<roundcube:button command="reset-listsearch" id="calendarlistsearch-reset" class="iconbutton reset" title="resetsearch" label="resetsearch" />
+				</div>
+			</div>
 			<div class="scroller withfooter">
-			<roundcube:object name="plugin.calendar_list" id="calendarslist" class="listing" />
+				<roundcube:object name="plugin.calendar_list" id="calendarslist" class="treelist listing" />
 			</div>
 			<div class="boxfooter">
-				<roundcube:button command="calendar-create" type="link" title="calendar.createcalendar" class="listbutton add disabled" classAct="listbutton add" innerClass="inner" content="+" /><roundcube:button name="calendaroptionslink" id="calendaroptionsmenulink" type="link" title="moreactions" class="listbutton groupactions" onclick="UI.show_popup('calendaroptionsmenu', undefined, { above:true });return false" innerClass="inner" content="&#9881;" />
+				<roundcube:button command="calendar-create" type="link" title="calendar.createcalendar" class="listbutton add disabled" classAct="listbutton add" innerClass="inner" content="+" /><roundcube:button name="calendaroptionslink" id="calendaroptionsmenulink" type="link" title="moreactions" class="listbutton groupactions" onclick="return UI.toggle_popup('calendaroptionsmenu', event, { above:true })" innerClass="inner" label="calendar.calendaractions" aria-haspopup="true" aria-expanded="false" aria-owns="calendaroptionsmenu-menu" />
 			</div>
 		</div>
 	</div>
-	<div id="calendarsidebartoggle"></div>
 
-	<div id="quicksearchbar">
+	<div id="quicksearchbar" class="searchbox" role="search" aria-labelledby="aria-label-searchform">
+		<h2 id="aria-label-searchform" class="voice"><roundcube:label name="calendar.arialabelsearchform" /></h2>
+		<label for="quicksearchbox" class="voice"><roundcube:label name="calendar.arialabelquicksearchbox" /></label>
 		<roundcube:object name="plugin.searchform" id="quicksearchbox" />
-		<a id="searchmenulink" class="iconbutton searchoptions" > </a>
-		<roundcube:button command="reset-search" id="searchreset" class="iconbutton reset" title="resetsearch" content=" " />
+		<a id="searchmenulink" class="iconbutton searchoptions" tabindex="-1"> </a>
+		<roundcube:button command="reset-search" id="searchreset" class="iconbutton reset" title="resetsearch" label="resetsearch" />
 	</div>
 
-	<div id="calendar">
+	<h2 id="aria-label-calendarview" class="voice"><roundcube:label name="calendar.arialabelcalendarview" /></h2>
+	<div id="calendar" role="main" aria-labelledby="aria-label-calendarview">
 		<roundcube:object name="plugin.angenda_options" class="boxfooter" id="agendaoptions" />
 	</div>
 </div>
@@ -48,18 +65,19 @@
 
 <roundcube:object name="message" id="messagestack" />
 
-<div id="calendaroptionsmenu" class="popupmenu">
-	<ul class="toolbarmenu">
-		<li><roundcube:button command="calendar-edit" label="calendar.edit" classAct="active" /></li>
-		<li><roundcube:button command="calendar-remove" label="calendar.remove" classAct="active" /></li>
-		<li><roundcube:button command="calendar-showurl" label="calendar.showurl" classAct="active" /></li>
+<div id="calendaroptionsmenu" class="popupmenu" aria-hidden="true">
+	<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-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>
+		<li role="menuitem"><roundcube:button command="folders" task="settings" type="link" label="managefolders" classAct="active" /></li>
 		<roundcube:endif />
 	</ul>
 </div>
 
-<div id="eventshow" class="uidialog">
+<div id="eventshow" class="uidialog" aria-hidden="true">
 	<h1 id="event-title">Event Title</h1>
 	<div class="event-section" id="event-location">Location</div>
 	<div class="event-section" id="event-date">From-To</div>
@@ -91,6 +109,10 @@
 		<label><roundcube:label name="calendar.category" /></label>
 		<span class="event-text"></span>
 	</div>
+	<div class="event-line" id="event-status">
+		<label><roundcube:label name="calendar.status" /></label>
+		<span class="event-text"></span>
+	</div>
 	<div class="event-line" id="event-free-busy">
 		<label><roundcube:label name="calendar.freebusy" /></label>
 		<span class="event-text"></span>
@@ -113,14 +135,17 @@
 
 <roundcube:include file="/templates/eventedit.html" />
 
-<div id="eventresourcesdialog" class="uidialog">
+<div id="eventresourcesdialog" class="uidialog" aria-hidden="true">
 	<div id="resource-dialog-left">
-		<div id="resource-selection" class="uibox listbox">
+		<div id="resource-selection" class="uibox listbox" role="navigation" aria-labelledby="aria-label-resourceselection">
+			<h2 class="voice" id="aria-label-resourceselection"><roundcube:label name="calendar.arialabelresourceselection" /></h2>
 			<div id="resourcequicksearch">
-				<div class="searchbox">
+				<div class="searchbox" role="search" aria-labelledby="aria-label-resourcesearchform" aria-controls="resources-list">
+					<h3 id="aria-label-resourcesearchform" class="voice"><roundcube:label name="calendar.arialabelresourcesearchform" /></h3>
+					<label for="resourcesearchbox" class="voice"><roundcube:label name="calendar.searchterms" /></label>
 					<roundcube:object name="plugin.resources_searchform" id="resourcesearchbox" />
 					<a id="resourcesearchmenulink" class="iconbutton searchoptions"> </a>
-					<roundcube:button command="reset-resource-search" id="resourcesearchreset" class="iconbutton reset" title="resetsearch" content=" " />
+					<roundcube:button command="reset-resource-search" id="resourcesearchreset" class="iconbutton reset" title="resetsearch" label="resetsearch" />
 				</div>
 			</div>
 			<div class="scroller">
@@ -130,25 +155,25 @@
 	</div>
 
 	<div id="resource-dialog-right">
-		<div id="resource-info" class="uibox contentbox">
-			<h2 class="boxtitle"><roundcube:label name="calendar.resourcedetails" /></h2>
+		<div id="resource-info" class="uibox contentbox" role="region" aria-labelledby="aria-label-resourcedetails">
+			<h2 class="boxtitle" id="aria-label-resourcedetails"><roundcube:label name="calendar.resourcedetails" /></h2>
 			<div class="scroller">
-				<roundcube:object name="plugin.resource_info" id="resource-details" class="propform" />
+				<roundcube:object name="plugin.resource_info" id="resource-details" class="propform" aria-live="polite" aria-relevant="text" aria-atomic="true" />
 			</div>
 		</div>
 
-		<div id="resource-availability" class="uibox contentbox">
-			<h2 class="boxtitle"><roundcube:label name="calendar.resourceavailability" /></h2>
+		<div id="resource-availability" class="uibox contentbox" role="region" aria-labelledby="aria-label-resourceavailability">
+			<h2 class="boxtitle" id="aria-label-resourceavailability"><roundcube:label name="calendar.resourceavailability" /></h2>
 			<roundcube:object name="plugin.resource_calendar" id="resource-freebusy-calendar" />
 			<div class="boxpagenav">
-				<roundcube:button name="resource-cal-prev" id="resource-calendar-prev" type="link" class="icon prevpage" title="calendar.prevslot" content="&amp;lt;" />
-				<roundcube:button name="resource-cal-next" id="resource-calendar-next" type="link" class="icon nextpage" title="calendar.nextslot" content="&amp;gt;" />
+				<roundcube:button name="resource-cal-prev" id="resource-calendar-prev" type="link" class="icon prevpage" title="calendar.prevslot" label="calendar.prevweek" />
+				<roundcube:button name="resource-cal-next" id="resource-calendar-next" type="link" class="icon nextpage" title="calendar.nextslot" label="calendar.nextweek" />
 			</div>
 		</div>
 	</div>
 </div>
 
-<div id="eventfreebusy" class="uidialog">
+<div id="eventfreebusy" class="uidialog" aria-hidden="true">
 	<roundcube:object name="plugin.attendees_freebusy_table" id="attendees-freebusy-table" cellpadding="0" />
 
 	<div class="schedule-options">
@@ -191,7 +216,7 @@
 	</div>
 </div>
 
-<div id="calendarform" class="uidialog">
+<div id="calendarform" class="uidialog" aria-hidden="true">
 	<roundcube:label name="loading" />
 </div>
 
@@ -222,30 +247,158 @@
 $(document).ready(function(e){
 	UI.init();
 
-	// initialize sidebar toggle
-	$('#calendarsidebartoggle').click(function() {
-		var width = $(this).data('sidebarwidth');
-		var offset = $(this).data('offset');
-		var $sidebar = $('#calendarsidebar'), time = 250;
-		
-		if ($sidebar.is(':visible')) {
-			$sidebar.animate({ left:'-'+(width+10)+'px' }, time, function(){ $('#calendarsidebar').hide(); });
-			$(this).animate({ left:'8px'}, time, function(){ $('#calendarsidebartoggle').addClass('sidebarclosed') });
-			$('#calendar').animate({ left:'20px'}, time, function(){ $(this).fullCalendar('render'); });
-		}
-		else {
-			$sidebar.show().animate({ left:'10px' }, time);
-			$(this).animate({ left:offset+'px'}, time, function(){ $('#calendarsidebartoggle').removeClass('sidebarclosed'); });
-			$('#calendar').animate({ left:(width+16)+'px'}, time, function(){ $(this).fullCalendar('render'); });
-		}
-	})
-	.data('offset', $('#calendarsidebartoggle').position().left)
-	.data('sidebarwidth', $('#calendarsidebar').width() + $('#calendarsidebar').position().left);
+	new calendarview_splitter({ id:'calsidebarsplitter', p1:'#calendarsidebar', p2:'#calendar',
+		orientation:'v', relative:true, start:270, min:240, size:12, offset:0 });
 
 	new rcube_splitter({ id:'calresourceviewsplitter', p1:'#resource-dialog-left', p2:'#resource-dialog-right',
 		orientation:'v', relative:true, start:380, min:220, size:10, offset:-3 }).init();
+
+	// animation to unfold list search box
+	$('#calendars .boxtitle a.search').click(function(e){
+		var box = $('#calendars .listsearchbox'),
+			dir = box.is(':visible') ? -1 : 1;
+
+		box.slideToggle({
+			duration: 160,
+			progress: function(animation, progress) {
+				if (dir < 0) progress = 1 - progress;
+				$('#calendars .scroller').css('top', (34 + 34 * progress) + 'px');
+			},
+			complete: function() {
+				box.toggleClass('expanded');
+				if (box.is(':visible')) {
+					box.find('input[type=text]').focus();
+				}
+				else {
+					$('#calendarlistsearch-reset').click();
+				}
+				// TODO: save state in localStorage
+			}
+		});
+
+		return false;
+	});
+
 });
 
+
+/**
+ * Extended rcube_splitter class that entirely collapses the calendar sidebar
+ */
+function calendarview_splitter(p)
+{
+	this.collapsed = false;
+	this.dragging = false;
+	this.threshold = 80;
+	this.lastpos = -1;
+	this._lastpos = -1;
+	this._min = p.min;
+
+	var me = this;
+	p.callback = function(e){
+		if (me.lastpos != me._lastpos) {
+			me.dragging = true;
+			setTimeout(function(){ me.dragging = false; }, 50);
+			me._lastpos = me.lastpos;
+		}
+	};
+
+	// extend base class
+	p.min = 20;
+	rcube_splitter.call(this, p);
+
+	// @override
+	this.resize = function()
+	{
+		if (this.pos < this.threshold) {
+			if (!this.collapsed)
+				this.collapse();
+		}
+		else if (this.pos < this._min && this.pos > this._min / 2) {
+			if (this.collapsed)
+				this.expand();
+		}
+		else if (this.pos >= this._min) {
+			this.p1.css('width', Math.floor(this.pos - this.p1pos.left - this.halfsize) + 'px');
+			this.p2.css('left', Math.ceil(this.pos + this.halfsize) + 'px');
+			this.handle.css('left', Math.round(this.pos - this.halfsize + this.offset + 3)+'px');
+			if (bw.ie) {
+				var new_width = parseInt(this.parent.outerWidth(), 10) - parseInt(this.p2.css('left'), 10) ;
+				this.p2.css('width', (new_width > 0 ? new_width : 0) + 'px');
+			}
+
+			this.p2.resize();
+			this.p1.resize();
+			this.lastpos = this.pos;
+
+			if (this._lastpos == -1)
+				this._lastpos = this.pos;
+
+			// also resize iframe covers
+			if (this.drag_active) {
+				$('iframe').each(function(i, elem) {
+					var pos = $(this).offset();
+					$('#iframe-splitter-fix-'+i).css({ top: pos.top+'px', left: pos.left+'px', width:elem.offsetWidth+'px', height: elem.offsetHeight+'px' });
+				});
+			}
+
+			if (typeof this.render == 'function')
+				this.render(this);
+		}
+	}
+
+	this.collapse = function(animated)
+	{
+		var me = this, time = 250;
+		if (animated) {
+			this.p1.animate({ left:'0px' }, time, function(){ $(this).hide(); });
+			this.p2.animate({ left:this.p.size + 'px' }, time, function(){ $(this).resize(); });
+			this.handle.animate({ left:'3px'}, time, function(){ $(this).addClass('sidebarclosed') });
+		}
+		else {
+			this.p1.css('left', 0).hide();
+			this.p2.css('left', this.p.size + 'px');
+			this.handle.css('left', '3px').addClass('sidebarclosed');
+			this.p2.resize();
+		}
+
+		// stop dragging
+		if (this.drag_active) {
+			this.drag_active = false;
+			$(document).unbind('.'+this.id);
+			$('div.iframe-splitter-fix').remove();
+		}
+
+		this.pos = 10;
+		this.collapsed = true;
+		this.set_cookie();
+	}
+
+	this.expand = function()
+	{
+		var me = this, time = 250;
+		this.handle.removeClass('sidebarclosed');
+		this.pos = this.lastpos || this._min;
+		this.p1pos.left = 10;
+		this.p1.show().animate({ left:'10px', width:(this.pos - this.p1pos.left - this.halfsize) + 'px' }, time);
+		this.p2.animate({ left:(this.pos + this.halfsize) + 'px' }, time, function(){ me.resize(); });
+		this.handle.animate({ left:(this.pos - this.halfsize + this.offset + 3) + 'px' }, time);
+
+		this.collapsed = false;
+		this.set_cookie();
+	}
+
+	this.init();
+
+	var me = this;
+	this.handle.bind('click', function(e){
+		if (!me.collapsed && !me.dragging)
+			me.collapse(true);
+		else if (!me.dragging)
+			me.expand();
+	});
+}
+
 </script>
 
 </body>

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

@@ -1,4 +1,4 @@
-<div id="eventedit" class="uidialog uidialog-tabbed">
+<div id="eventedit" class="uidialog uidialog-tabbed" aria-hidden="true">
 	<form id="eventtabs" action="#" method="post" enctype="multipart/form-data">
 		<ul>
 			<li><a href="#event-panel-summary"><roundcube:label name="calendar.tabsummary" /></a></li><li id="edit-tab-recurrence"><a href="#event-panel-recurrence"><roundcube:label name="calendar.tabrecurrence" /></a></li><li id="edit-tab-attendees"><a href="#event-panel-attendees"><roundcube:label name="calendar.tabattendees" /></a></li><li id="edit-tab-resources"><a href="#event-panel-resources"><roundcube:label name="calendar.tabresources" /></a></li><li id="edit-tab-attachments"><a href="#event-panel-attachments"><roundcube:label name="calendar.tabattachments" /></a></li>
@@ -8,7 +8,7 @@
 			<div class="event-section">
 				<label for="edit-title"><roundcube:label name="calendar.title" /></label>
 				<br />
-				<input type="text" class="text" name="title" id="edit-title" size="40" />
+				<input type="text" class="text" name="title" id="edit-title" size="40" required="true" />
 			</div>
 			<div class="event-section">
 				<label for="edit-location"><roundcube:label name="calendar.location" /></label>
@@ -28,17 +28,23 @@
 			<div class="event-section">
 				<label style="float:right;padding-right:0.5em"><input type="checkbox" name="allday" id="edit-allday" value="1" /><roundcube:label name="calendar.all-day" /></label>
 				<label for="edit-startdate"><roundcube:label name="calendar.start" /></label>
-				<input type="text" name="startdate" size="11" id="edit-startdate" /> &nbsp;
-				<input type="text" name="starttime" size="6" id="edit-starttime" />
+				<input type="text" name="startdate" size="11" id="edit-startdate" required="true" /> &nbsp;
+				<input type="text" name="starttime" size="6" id="edit-starttime" aria-label="<roundcube:label name='calendar.starttime' />" />
 			</div>
 			<div class="event-section">
 				<label for="edit-enddate"><roundcube:label name="calendar.end" /></label>
-				<input type="text" name="enddate" size="11" id="edit-enddate" /> &nbsp;
-				<input type="text" name="endtime" size="6" id="edit-endtime" />
+				<input type="text" name="enddate" size="11" id="edit-enddate" required="true" /> &nbsp;
+				<input type="text" name="endtime" size="6" id="edit-endtime" aria-label="<roundcube:label name='calendar.endtime' />" />
 			</div>
 			<div class="event-section" id="edit-alarms">
-				<label for="edit-alarm"><roundcube:label name="calendar.alarms" /></label>
-				<roundcube:object name="plugin.alarm_select" />
+				<div class="edit-alarm-item first">
+					<label for="edit-alarm-item"><roundcube:label name="calendar.alarms" /></label>
+					<roundcube:object name="plugin.alarm_select" id="edit-alarm-item" />
+					<span class="edit-alarm-buttons">
+						<a href="#add" class="iconbutton add add-alarm"><roundcube:label name="libcalendaring.addalarm" /></a>
+						<a href="#delete" class="iconbutton remove delete-alarm"><roundcube:label name="libcalendaring.removealarm" /></a>
+					</span>
+				</div>
 			</div>
 			<div class="event-section" id="calendar-select">
 				<label for="edit-calendar"><roundcube:label name="calendar.calendar" /></label>
@@ -49,6 +55,10 @@
 				<roundcube:object name="plugin.category_select" id="edit-categories" />
 			</div>
 			<div class="event-section">
+				<label for="edit-event-status"><roundcube:label name="calendar.status" /></label>
+				<roundcube:object name="plugin.status_select" id="edit-event-status" />
+			</div>
+			<div class="event-section">
 				<label for="edit-free-busy"><roundcube:label name="calendar.freebusy" /></label>
 				<roundcube:object name="plugin.freebusy_select" id="edit-free-busy" />
 			</div>
@@ -87,13 +97,15 @@
 		</div>
 		
 		<div id="event-panel-attendees">
-			<roundcube:object name="plugin.attendees_list" id="edit-attendees-table" class="records-table edit-attendees-table" coltitle="attendee" />
+			<h3 id="aria-label-attendeestable" class="voice"><roundcube:label name="calendar.arialabeleventattendees" /></h3>
+			<roundcube:object name="plugin.attendees_list" id="edit-attendees-table" class="records-table edit-attendees-table" coltitle="attendee" aria-labelledby="aria-label-attendeestable" />
 			<roundcube:object name="plugin.attendees_form" id="edit-attendees-form" />
 			<roundcube:include file="/templates/freebusylegend.html" />
 		</div>
 		
 		<div id="event-panel-resources">
-			<roundcube:object name="plugin.attendees_list" id="edit-resources-table" class="records-table edit-attendees-table" coltitle="resource" />
+			<h3 id="aria-label-resourcestable" class="voice"><roundcube:label name="calendar.arialabeleventresources" /></h3>
+			<roundcube:object name="plugin.attendees_list" id="edit-resources-table" class="records-table edit-attendees-table" coltitle="resource" aria-labelledby="aria-label-resourcestable" />
 			<roundcube:object name="plugin.resources_form" id="edit-resources-form" />
 			<roundcube:include file="/templates/freebusylegend.html" />
 		</div>
@@ -102,7 +114,8 @@
 			<div id="edit-attachments">
 				<roundcube:object name="plugin.attachments_list" id="attachment-list" class="attachmentslist" />
 			</div>
-			<div id="edit-attachments-form">
+			<div id="edit-attachments-form" role="region" aria-labelledby="aria-label-attachmentuploadform">
+				<h3 id="aria-label-attachmentuploadform" class="voice"><roundcube:label name="arialabelattachmentuploadform" /></h2>
 				<roundcube:object name="plugin.attachments_form" id="calendar-attachment-form" attachmentFieldSize="30" />
 			</div>
 			<roundcube:object name="plugin.filedroparea" id="event-panel-attachments" />

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

@@ -35,8 +35,7 @@
   if (rcmail.gui_objects.devicelist) {
     var devicelist = new rcube_list_widget(rcmail.gui_objects.devicelist,
       { multiselect:true, draggable:false, keyboard:true });
-    devicelist.addEventListener('select', select_device);
-    devicelist.init();
+    devicelist.addEventListener('select', select_device).init().focus();
 
     // load frame if there are no devices
     if (!rcmail.env.devicecount)
@@ -56,14 +55,16 @@
         $('#'+this.id+'_alarm').prop('checked', false);
     });
 
-    $('.subscriptionblock thead td.subscription img, .subscriptionblock thead td.alarm img').click(function(e) {
-      var $this = $(this),
-        classname = $this.parent().get(0).className,
-        list = $this.closest('table').find('input.'+classname),
+    var fn = function(elem) {
+      var classname = elem.className,
+        list = $(elem).closest('table').find('input.' + classname),
         check = list.not(':checked').length > 0;
 
       list.prop('checked', check).change();
-    });
+    };
+
+    $('th.subscription,th.alarm').click(function() { fn(this); })
+      .keydown(function(e) { if (e.which == 13 || e.which == 32) fn(this); });
   }
 
   /* private methods */

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

roundcubemail-plugins-kolab-3.2.tar.gz/plugins/kolab_activesync/kolab_activesync_ui.php Changed

@@ -144,9 +144,11 @@
         $alarms = ($attrib['type'] == 'event' || $attrib['type'] == 'task');
 
         $table = new html_table(array('cellspacing' => 0));
-        $table->add_header('subscription', $attrib['syncicon'] ? html::img(array('src' => $this->skin_path . $attrib['syncicon'], 'title' => $this->plugin->gettext('synchronize'))) : '');
+        $table->add_header(array('class' => 'subscription', 'title' => $this->plugin->gettext('synchronize'), 'tabindex' => 0),
+            $attrib['syncicon'] ? html::img(array('src' => $this->skin_path . $attrib['syncicon'])) : '');
         if ($alarms) {
-            $table->add_header('alarm', $attrib['alarmicon'] ? html::img(array('src' => $this->skin_path . $attrib['alarmicon'], 'title' => $this->plugin->gettext('withalarms'))) : '');
+            $table->add_header(array('class' => 'alarm', 'title' => $this->plugin->gettext('withalarms'), 'tabindex' => 0),
+                $attrib['alarmicon'] ? html::img(array('src' => $this->skin_path . $attrib['alarmicon'])) : '');
         }
         $table->add_header('foldername', $this->plugin->gettext('folder'));

roundcubemail-plugins-kolab-3.2.tar.gz/plugins/kolab_activesync/localization/bg_BG.inc Changed

@@ -2,12 +2,9 @@
 $labels['tabtitle'] = 'Activesync';
 $labels['devices'] = 'Устройства';
 $labels['devicealias'] = 'Име на устройство';
-$labels['syncmode'] = 'Режим на синхронизация';
-$labels['modeauto'] = 'Автоматично определяне';
 $labels['synchronize'] = 'Синхронизиране';
 $labels['withalarms'] = 'С аларми';
 $labels['syncsettings'] = 'Настройки на синхронизация';
-$labels['deviceconfig'] = 'Конфигуриране на устройството';
 $labels['folderstosync'] = 'Папки за синхронизиране';
 $labels['mail'] = 'Електронна поща';
 $labels['contact'] = 'Адресни книги';
@@ -16,8 +13,6 @@
 $labels['note'] = 'Бележки';
 $labels['configuration'] = 'Конфигурация';
 $labels['deletedevice'] = 'Изтриване на устройство';
-$labels['imageformat'] = 'Формат на картинка';
-$labels['laxpiclabel'] = 'Разрешаване на PNG и GIF картинки';
 $labels['savingdata'] = 'Запазване на данни...';
 $labels['savingerror'] = 'Неуспех при запазване на конфигурацията';
 $labels['devicedeleteconfirm'] = 'Наистина ли искате да изтриете конфигурацията за това устройство?';

roundcubemail-plugins-kolab-3.2.tar.gz/plugins/kolab_activesync/localization/ca_ES.inc Added

roundcubemail-plugins-kolab-3.2.tar.gz/plugins/kolab_activesync/localization/da_DK.inc Added

@@ -0,0 +1,31 @@
+<?php
+$labels['tabtitle'] = 'Activesync';
+$labels['devices'] = 'Enheder';
+$labels['devicealias'] = 'Enhedsnavn';
+$labels['synchronize'] = 'Synkronisér';
+$labels['withalarms'] = 'Med alarmer';
+$labels['syncsettings'] = 'Indstillinger for synkronisering';
+$labels['deviceconfig'] = 'Konfiguration af enhed';
+$labels['folderstosync'] = 'Mapper som skal synkroniseres';
+$labels['mail'] = 'E-post';
+$labels['contact'] = 'Adressebøger';
+$labels['event'] = 'Kalendere';
+$labels['task'] = 'Opgaver';
+$labels['note'] = 'Noter';
+$labels['configuration'] = 'Konfiguration';
+$labels['deletedevice'] = 'Slet enhed';
+$labels['nodevices'] = 'Der er i øjeblikket ingen registrerede enheder.<br/><br/>For at registrere en enhed, så skal den først tilsluttes til serveren, med anvendelse af <a href="http://wiki.kolab.org/Setup_ActiveSync">instrukserne i wiki\'en</a>. Bagefter bør enheden være tilgængelig til konfigurationen her.';
+$labels['savingdata'] = 'Gemmer data...';
+$labels['savingerror'] = 'Kunne ikke gemme konfiguration';
+$labels['notsupported'] = 'Din server understøtter ikke metadata/annotationer';
+$labels['devicedeleteconfirm'] = 'Vil du virkelig slette denne enheds konfiguration?';
+$labels['successfullydeleted'] = 'Fjernelse af enhedskonfigurationen blev gennemført ';
+$labels['devicenotfound'] = 'Kunne ikke læse enhedskonfiguration';
+$labels['devicetype'] = 'Enhedstype';
+$labels['acsversion'] = 'Protokolversion';
+$labels['useragent'] = 'Brugeragent';
+$labels['friendlyname'] = 'Letlæseligt navn';
+$labels['os'] = 'Operativsystem';
+$labels['oslanguage'] = 'Sprog for OS';
+$labels['phonenumber'] = 'Telefonnummer';
+?>

roundcubemail-plugins-kolab-3.2.tar.gz/plugins/kolab_activesync/localization/de_CH.inc Changed

@@ -2,14 +2,9 @@
 $labels['tabtitle'] = 'Activesync';
 $labels['devices'] = 'Geräte';
 $labels['devicealias'] = 'Gerätename';
-$labels['syncmode'] = 'Modus';
-$labels['modeauto'] = 'Automatisch';
-$labels['modeflat'] = 'Flache Struktur erzwingen';
-$labels['modefolder'] = 'Ordnerstruktur erzwingen';
 $labels['synchronize'] = 'Synchronisieren';
 $labels['withalarms'] = 'Mit Erinnerungen';
 $labels['syncsettings'] = 'Synchronisationseinstellungen';
-$labels['deviceconfig'] = 'Gerätekonfiguration';
 $labels['folderstosync'] = 'Order zum Synchronisieren';
 $labels['mail'] = 'E-Mail';
 $labels['contact'] = 'Kontakte';
@@ -18,8 +13,6 @@
 $labels['note'] = 'Notizen';
 $labels['configuration'] = 'Konfiguration';
 $labels['deletedevice'] = 'Gerät löschen';
-$labels['imageformat'] = 'Bildformat';
-$labels['laxpiclabel'] = 'PNG- und GIF-Bilder erlauben';
 $labels['savingdata'] = 'Daten werden gespeichert...';
 $labels['savingerror'] = 'Fehler beim Speichern';
 $labels['notsupported'] = 'Ihr Server unterstützt keine Activesync-Konfiguration';

roundcubemail-plugins-kolab-3.2.tar.gz/plugins/kolab_activesync/localization/de_DE.inc Changed

@@ -2,10 +2,6 @@
 $labels['tabtitle'] = 'Activesync';
 $labels['devices'] = 'Geräte';
 $labels['devicealias'] = 'Gerätename';
-$labels['syncmode'] = 'Modus';
-$labels['modeauto'] = 'Automatisch';
-$labels['modeflat'] = 'Flache Struktur erzwingen';
-$labels['modefolder'] = 'Ordnerstruktur erzwingen';
 $labels['synchronize'] = 'Synchronisieren';
 $labels['withalarms'] = 'Mit Erinnerungen';
 $labels['syncsettings'] = 'Synchronisationseinstellungen';
@@ -18,12 +14,18 @@
 $labels['note'] = 'Notizen';
 $labels['configuration'] = 'Konfiguration';
 $labels['deletedevice'] = 'Gerät löschen';
-$labels['imageformat'] = 'Bildformat';
-$labels['laxpiclabel'] = 'PNG- und GIF-Bilder erlauben';
+$labels['nodevices'] = 'Es sind aktuell keine Geräte registriert.<br/><br/>Um ein Gerät hinzuzufügen, verbinden sie es zuerst mit dem Server durch Verwenden der Anleitung im Wiki: <a href="http://wiki.kolab.org/Setup_ActiveSync"></a>. Im Anschluss sollte das Gerät auf dieser Seite zur Konfiguration zur Verfügung stehen.';
 $labels['savingdata'] = 'Daten werden gespeichert...';
 $labels['savingerror'] = 'Fehler beim Speichern';
 $labels['notsupported'] = 'Ihr Server unterstützt keine Activesync-Konfiguration';
 $labels['devicedeleteconfirm'] = 'Wollen Sie wirklich alle Einstellungen für dieses Gerät löschen?';
 $labels['successfullydeleted'] = 'Die Geräteinstellungen wurden erfolgreich gelöscht';
 $labels['devicenotfound'] = 'Es kann nicht auf die Gerätekonfiguration zugegriffen werden.';
+$labels['devicetype'] = 'Gerätetyp';
+$labels['acsversion'] = 'Protokollversion';
+$labels['useragent'] = 'User Agent';
+$labels['friendlyname'] = 'Lesbarer Name';
+$labels['os'] = 'Betriebssystem';
+$labels['oslanguage'] = 'Betriebssystemsprache';
+$labels['phonenumber'] = 'Telefonnummer';
 ?>

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

roundcubemail-plugins-kolab-3.2.tar.gz/plugins/kolab_activesync/localization/es_ES.inc Changed

roundcubemail-plugins-kolab-3.2.tar.gz/plugins/kolab_activesync/localization/et_EE.inc Changed

roundcubemail-plugins-kolab-3.2.tar.gz/plugins/kolab_activesync/localization/fi_FI.inc Added

@@ -0,0 +1,31 @@
+<?php
+$labels['tabtitle'] = 'Activesync';
+$labels['devices'] = 'Laitteet';
+$labels['devicealias'] = 'Laitteen nimi';
+$labels['synchronize'] = 'Synkronoi';
+$labels['withalarms'] = 'Hälytyksien kera';
+$labels['syncsettings'] = 'Synkronointiasetukset';
+$labels['deviceconfig'] = 'Laitteen määritykset';
+$labels['folderstosync'] = 'Synkronoitavat kansiot';
+$labels['mail'] = 'Sähköposti';
+$labels['contact'] = 'Osoitekirjat';
+$labels['event'] = 'Kalenterit';
+$labels['task'] = 'Tehtävät';
+$labels['note'] = 'Muistiot';
+$labels['configuration'] = 'Määritykset';
+$labels['deletedevice'] = 'Poista laite';
+$labels['nodevices'] = 'Ei rekisteröityjä laitteita.<br/><br/>Rekisteröi laite yhdistämällä palvelimeen, lue tarkemmat ohjeet <a href="http://wiki.kolab.org/Setup_ActiveSync">wikistä</a>. Sen jälkeen laitteen pitäisi olla määritettävissä täällä.';
+$labels['savingdata'] = 'Tallennetaan tietoja...';
+$labels['savingerror'] = 'Määritysten tallentaminen epäonnistui';
+$labels['notsupported'] = 'Käyttämäsi palvelin ei tue seuraavaa ominaisuutta: metadata/annotations';
+$labels['devicedeleteconfirm'] = 'Haluatko varmasti poistaa tämän laitteen määritykset?';
+$labels['successfullydeleted'] = 'Laitteen määritykset poistettiin onnistuneesti';
+$labels['devicenotfound'] = 'Laitemäärityksen lukeminen epäonnistui';
+$labels['devicetype'] = 'Laitteen tyyppi';
+$labels['acsversion'] = 'Protokollan versio';
+$labels['useragent'] = 'Tunniste / User agent';
+$labels['friendlyname'] = 'Kutsumanimi';
+$labels['os'] = 'Käyttöjärjestelmä';
+$labels['oslanguage'] = 'Käyttöjärjestelmän kieli';
+$labels['phonenumber'] = 'Puhelinnumero';
+?>

roundcubemail-plugins-kolab-3.2.tar.gz/plugins/kolab_activesync/localization/fr_FR.inc Changed

@@ -2,14 +2,9 @@
 $labels['tabtitle'] = 'Activesync';
 $labels['devices'] = 'Périphériques';
 $labels['devicealias'] = 'Nom du Périphérique';
-$labels['syncmode'] = 'Mode de synchronisation';
-$labels['modeauto'] = 'Choix automatique';
-$labels['modeflat'] = 'Forcer le mode à plat';
-$labels['modefolder'] = 'Forcer le mode dossier';
 $labels['synchronize'] = 'Synchroniser';
 $labels['withalarms'] = 'Avec alarmes';
 $labels['syncsettings'] = 'Paramètres de synchronisation';
-$labels['deviceconfig'] = 'Configuration du périphérique';
 $labels['folderstosync'] = 'Dossiers à synchroniser';
 $labels['mail'] = 'Adresse de messagerie';
 $labels['contact'] = 'Carnet d\'adresses';
@@ -18,12 +13,11 @@
 $labels['note'] = 'Notes';
 $labels['configuration'] = 'Configuration';
 $labels['deletedevice'] = 'Supprimer ce périphérique';
-$labels['imageformat'] = 'Format d\'image';
-$labels['laxpiclabel'] = 'Autoriser les images PNG et GIF';
 $labels['savingdata'] = 'Enregistrer...';
 $labels['savingerror'] = 'Échec de l\'enregistrement de la configuration';
 $labels['notsupported'] = 'Votre serveur ne supporte pas les métadonnées ou les annotations';
 $labels['devicedeleteconfirm'] = 'Voulez-vous vraiment supprimer la configuration de ce périphérique?';
 $labels['successfullydeleted'] = 'La configuration de ce périphérique a été supprimée';
 $labels['devicenotfound'] = 'Impossible de lire la configuration du périphérique';
+$labels['phonenumber'] = 'Numéro de téléphone';
 ?>

roundcubemail-plugins-kolab-3.2.tar.gz/plugins/kolab_activesync/localization/hu_HU.inc Added

@@ -0,0 +1,31 @@
+<?php
+$labels['tabtitle'] = 'Activesync';
+$labels['devices'] = 'Készülékek';
+$labels['devicealias'] = 'Készülék neve';
+$labels['synchronize'] = 'Szinkronizálás';
+$labels['withalarms'] = 'Riasztásokkal-értesítésekkel';
+$labels['syncsettings'] = 'Szinkronizációs beállítások';
+$labels['deviceconfig'] = 'Készülék jellemzői';
+$labels['folderstosync'] = 'Szinkronizálandó mappák';
+$labels['mail'] = 'E-mail';
+$labels['contact'] = 'Címjegyzékek';
+$labels['event'] = 'Naptárak';
+$labels['task'] = 'Feladatok';
+$labels['note'] = 'Jegyzetek';
+$labels['configuration'] = 'Konfiguráció';
+$labels['deletedevice'] = 'Készülék törlése';
+$labels['nodevices'] = 'A fiókjához nincs társítva egyetlen készülék sem.<br/><br/>Csatlakozzon a szerverhez, ezáltal társítva egy készüléket a fiókjához, mint ahogy a <a href="http://wiki.kolab.org/Setup_ActiveSync">Wiki-ben</a> lévő leírásban is szerepel. Azt követően itt meg fog jelenni a társított készülék, melynek testreszabhatja a beállításait.';
+$labels['savingdata'] = 'Adatok mentése...';
+$labels['savingerror'] = 'Az adatok mentése nem sikerült';
+$labels['notsupported'] = 'A szerver nem támogat metaadatokat/megjegyzéseket';
+$labels['devicedeleteconfirm'] = 'Biztos benne, hogy törölni szeretné ezt a készüléket?';
+$labels['successfullydeleted'] = 'A készülék konfigurációja sikeresen törölve lett';
+$labels['devicenotfound'] = 'A készülék konfigurációja nem olvasható be';
+$labels['devicetype'] = 'Készülék típusa';
+$labels['acsversion'] = 'Protokoll verziószáma';
+$labels['useragent'] = 'Felhasználókliens (user agent)';
+$labels['friendlyname'] = 'Elnevezés';
+$labels['os'] = 'Operációs rendszer';
+$labels['oslanguage'] = 'Készülék nyelve';
+$labels['phonenumber'] = 'Telefonszám';
+?>

roundcubemail-plugins-kolab-3.2.tar.gz/plugins/kolab_activesync/localization/it_IT.inc Added

@@ -0,0 +1,28 @@
+<?php
+$labels['tabtitle'] = 'Activesync';
+$labels['devices'] = 'Dispositivi';
+$labels['devicealias'] = 'Nome dispositivo';
+$labels['synchronize'] = 'Sincronizza';
+$labels['withalarms'] = 'Con allarmi';
+$labels['syncsettings'] = 'Impostazioni sincronizzazione';
+$labels['folderstosync'] = 'Cartelle da sincronizzare';
+$labels['mail'] = 'Email';
+$labels['contact'] = 'Rubriche';
+$labels['event'] = 'Calendari';
+$labels['task'] = 'Attività';
+$labels['note'] = 'Annotazioni';
+$labels['configuration'] = 'Configurazione';
+$labels['deletedevice'] = 'Elimina dispositivo';
+$labels['savingdata'] = 'Salvataggio dati...';
+$labels['savingerror'] = 'Impossibile salvare la configurazione';
+$labels['notsupported'] = 'Il tuo server non supporta i metadati/le annotazioni';
+$labels['devicedeleteconfirm'] = 'Vuoi veramente eliminare la configurazione per questo dispositivo?';
+$labels['successfullydeleted'] = 'La configurazione del dispositivo è stata rimossa con successo.';
+$labels['devicenotfound'] = 'Impossibile leggere la configurazione del dispositivo';
+$labels['devicetype'] = 'Tipo di dispositivo';
+$labels['acsversion'] = 'Versione protocollo';
+$labels['useragent'] = 'Agente utente';
+$labels['os'] = 'Sistema operativo';
+$labels['oslanguage'] = 'Lingua SO';
+$labels['phonenumber'] = 'Numero di telefono';
+?>

roundcubemail-plugins-kolab-3.2.tar.gz/plugins/kolab_activesync/localization/ja_JP.inc Changed

@@ -2,14 +2,9 @@
 $labels['tabtitle'] = 'アクティブシンク';
 $labels['devices'] = '機器';
 $labels['devicealias'] = '機器名';
-$labels['syncmode'] = '同期モード';
-$labels['modeauto'] = '自動決定';
-$labels['modeflat'] = '強制フラットモード';
-$labels['modefolder'] = '強制フォルダモード';
 $labels['synchronize'] = '同期';
 $labels['withalarms'] = 'アラーム付';
 $labels['syncsettings'] = '同期設定';
-$labels['deviceconfig'] = '機器設定';
 $labels['folderstosync'] = '同期するフォルダ';
 $labels['mail'] = 'Email';
 $labels['contact'] = 'アドレス帳';
@@ -18,12 +13,11 @@
 $labels['note'] = 'ノート';
 $labels['configuration'] = '設定';
 $labels['deletedevice'] = '機器の削除';
-$labels['imageformat'] = 'イメージの形式';
-$labels['laxpiclabel'] = 'ＰＮＧとGIFのイメージを使用可';
 $labels['savingdata'] = 'データを保存中…';
 $labels['savingerror'] = '設定の保存に失敗しました';
 $labels['notsupported'] = 'サーバはmetadata/annotionsをサポートしていません';
 $labels['devicedeleteconfirm'] = '本当にこのデバイスの設定を削除しますか？';
 $labels['successfullydeleted'] = 'デヴァイスの削除に成功しました';
 $labels['devicenotfound'] = 'デヴァイスの設定を読込めません';
+$labels['phonenumber'] = '電話番号';
 ?>

roundcubemail-plugins-kolab-3.2.tar.gz/plugins/kolab_activesync/localization/nl_NL.inc Changed

@@ -1,18 +1,31 @@
 <?php
 $labels['tabtitle'] = 'Activesync';
-$labels['syncmode'] = 'Synchronizatie modus';
-$labels['modeauto'] = 'Stel automatisch vast';
-$labels['modeflat'] = 'Forceer vlakke modus';
-$labels['modefolder'] = 'Forceer mappen modus';
+$labels['devices'] = 'Apparaten';
+$labels['devicealias'] = 'Apparaat naam';
 $labels['synchronize'] = 'Synchronizeren';
 $labels['withalarms'] = 'Met alarmen';
 $labels['syncsettings'] = 'Synchronizatie instellingen';
+$labels['deviceconfig'] = 'Apparaat configuratie';
+$labels['folderstosync'] = 'Mappen voor synchronisatie';
 $labels['mail'] = 'Email';
 $labels['contact'] = 'Adresboeken';
 $labels['event'] = 'Kalenders';
 $labels['task'] = 'Taken';
 $labels['note'] = 'Notities';
 $labels['configuration'] = 'Configuratie';
-$labels['laxpiclabel'] = 'Sta PNG en GIF plaatjes toe';
+$labels['deletedevice'] = 'Verwijder apparaat';
+$labels['nodevices'] = 'Er zijn momenteel geen apparaten geregistreerd.<br/><br/>Om een apparaat te registreren, verbind deze dan eerst met de server met behulp van <a href="http://wiki.kolab.org/Setup_ActiveSync">de instructies op de Wiki</a>. Daarna is het apparaat hier beschikbaar voor configuratie.';
 $labels['savingdata'] = 'Data wordt opgeslagen...';
+$labels['savingerror'] = 'Fout in opslaan van configuratie';
+$labels['notsupported'] = 'Uw server ondersteunt geen metadata/annotaties';
+$labels['devicedeleteconfirm'] = 'Wilt u de configuratie voor dit apparaat echt verwijderen?';
+$labels['successfullydeleted'] = 'Het apparaat is succesvol verwijderd';
+$labels['devicenotfound'] = 'Lezen van apparaat configuratie mislukt';
+$labels['devicetype'] = 'Apparaat type';
+$labels['acsversion'] = 'Protocol versie';
+$labels['useragent'] = 'User agent';
+$labels['friendlyname'] = 'Weergave naam';
+$labels['os'] = 'Besturingssysteem';
+$labels['oslanguage'] = 'Taal besturingssysteem';
+$labels['phonenumber'] = 'Telefoonnummer';
 ?>

roundcubemail-plugins-kolab-3.2.tar.gz/plugins/kolab_activesync/localization/pl_PL.inc Changed

@@ -2,14 +2,9 @@
 $labels['tabtitle'] = 'ActiveSync';
 $labels['devices'] = 'Urządzenia';
 $labels['devicealias'] = 'Nazwa urządzenia';
-$labels['syncmode'] = 'Tryb synchronizacji';
-$labels['modeauto'] = 'Ustaw automatycznie';
-$labels['modeflat'] = 'Wymuszaj tryb "płaski"';
-$labels['modefolder'] = 'Wymuszaj tryb folderów';
 $labels['synchronize'] = 'Synchronizuj';
 $labels['withalarms'] = 'Z alarmami';
 $labels['syncsettings'] = 'Ustawienia synchronizacji';
-$labels['deviceconfig'] = 'Konfiguracja urządzenia';
 $labels['folderstosync'] = 'Foldery do synchronizacji';
 $labels['mail'] = 'Poczta';
 $labels['contact'] = 'Książki adresowe';
@@ -18,11 +13,18 @@
 $labels['note'] = 'Notatki';
 $labels['configuration'] = 'Konfiguracja';
 $labels['deletedevice'] = 'Usuń urządzenie';
-$labels['imageformat'] = 'Format obrazków';
+$labels['nodevices'] = 'Obecnie nie masz zarejestrowanych urządzeń.<br/><br/>Aby zarejestrować urządzenie należy je podłączyć do serwera według <a href="http://wiki.kolab.org/Setup_ActiveSync">instrukcji</a>. Następnie będzie można konfigurować to urządzenie tutaj.';
 $labels['savingdata'] = 'Zapisuję dane...';
 $labels['savingerror'] = 'Nie udało się zapisać konfiguracji';
 $labels['notsupported'] = 'Twój serwer nie obsługuje rozszerzenia metadata/annotations';
 $labels['devicedeleteconfirm'] = 'Czy na pewno chcesz usunąć konfigurację tego urządzenia?';
 $labels['successfullydeleted'] = 'Konfiguracja urządzenie została usunięta';
 $labels['devicenotfound'] = 'Nie można odczytać konfiguracji urządzenia';
+$labels['devicetype'] = 'Typ urządzenia';
+$labels['acsversion'] = 'Wersja protokołu';
+$labels['useragent'] = 'User-agent';
+$labels['friendlyname'] = 'Przyjazna nazwa';
+$labels['os'] = 'System operacyjny';
+$labels['oslanguage'] = 'Język systemu';
+$labels['phonenumber'] = 'Numer telefonu';
 ?>

roundcubemail-plugins-kolab-3.2.tar.gz/plugins/kolab_activesync/localization/pt_BR.inc Changed

@@ -2,14 +2,9 @@
 $labels['tabtitle'] = 'Activesync';
 $labels['devices'] = 'Dispositivos';
 $labels['devicealias'] = 'Nome do dispositivo';
-$labels['syncmode'] = 'Modo de Sincronização';
-$labels['modeauto'] = 'Determinar automaticamente';
-$labels['modeflat'] = 'Força modo plano';
-$labels['modefolder'] = 'Forçar modo pasta';
 $labels['synchronize'] = 'Sincronizar';
 $labels['withalarms'] = 'Com alarmes';
 $labels['syncsettings'] = 'Sincronizar configurações';
-$labels['deviceconfig'] = 'Configuração do dispositivo';
 $labels['folderstosync'] = 'Pastas para sincronizar';
 $labels['mail'] = 'Email';
 $labels['contact'] = 'Catálogo de Endereços';
@@ -18,12 +13,11 @@
 $labels['note'] = 'Notas';
 $labels['configuration'] = 'Configuração';
 $labels['deletedevice'] = 'Remover dispositivo';
-$labels['imageformat'] = 'Formato de imagem';
-$labels['laxpiclabel'] = 'Permitir imagens em formato PNG e GIF';
 $labels['savingdata'] = 'Salvando dados...';
 $labels['savingerror'] = 'Falha ao salvar a configuração';
 $labels['notsupported'] = 'Seu servidor não suporta metadados/anotações';
 $labels['devicedeleteconfirm'] = 'Você deseja realmente remover a configuração deste dispositivo?';
 $labels['successfullydeleted'] = 'A configuração do dispositivo foi removida com sucesso';
 $labels['devicenotfound'] = 'Não foi possível ler a configuração do dispositivo';
+$labels['phonenumber'] = 'Telefone';
 ?>

roundcubemail-plugins-kolab-3.2.tar.gz/plugins/kolab_activesync/localization/ru_RU.inc Changed

@@ -2,10 +2,6 @@
 $labels['tabtitle'] = 'Activesync';
 $labels['devices'] = 'Устройства';
 $labels['devicealias'] = 'Имя устройства';
-$labels['syncmode'] = 'Режим синхронизации';
-$labels['modeauto'] = 'Определить автоматически';
-$labels['modeflat'] = 'Использовать плоский режим';
-$labels['modefolder'] = 'Использовать режим директории';
 $labels['synchronize'] = 'Синхронизовать';
 $labels['withalarms'] = 'С напоминаниями';
 $labels['syncsettings'] = 'Настройки синхронизации';
@@ -18,12 +14,18 @@
 $labels['note'] = 'Заметки';
 $labels['configuration'] = 'Конфигурация';
 $labels['deletedevice'] = 'Удалить устройство';
-$labels['imageformat'] = 'Формат изображений';
-$labels['laxpiclabel'] = 'Разрешить PNG и GIF изображения';
+$labels['nodevices'] = 'У вас нет зарегистрированных устройств.<br/><br/>Для того, чтобы зарегистрировать устройство, подключите его к серверу, используя <a href="http://wiki.kolab.org/Setup_ActiveSync">инструкцию в Wiki</a>. После этого устройство должно стать доступным для конфигурации здесь.';
 $labels['savingdata'] = 'Сохранение данных...';
 $labels['savingerror'] = 'Не удалось сохранить конфигурацию';
 $labels['notsupported'] = 'Ваш сервер не поддерживает метаданные/аннотации';
 $labels['devicedeleteconfirm'] = 'Вы действительно хотите удалить конфигурацию для этого устройства?';
 $labels['successfullydeleted'] = 'Конфигурация для устройства была успешно удалена.';
 $labels['devicenotfound'] = 'Не удалось прочитать конфигурацию для устройства';
+$labels['devicetype'] = 'Тип устройства';
+$labels['acsversion'] = 'Версия протокола';
+$labels['useragent'] = 'User agent';
+$labels['friendlyname'] = 'Имя для отображения';
+$labels['os'] = 'Операционная система';
+$labels['oslanguage'] = 'Язык ОС';
+$labels['phonenumber'] = 'Телефон';
 ?>

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

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

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

@@ -10,11 +10,13 @@
 
 <div id="mainscreen" class="offset">
 
+<h1 class="voice"><roundcube:label name="settings" /> : <roundcube:label name="kolab_activesync.tabtitle" /></h1>
+
 <roundcube:include file="/includes/settingstabs.html" />
 
 <div id="settings-right">
 
-<div id="sectionslist" class="uibox listbox">
+<div id="sectionslist" class="uibox listbox" role="navigation" aria-labelledby="directorylist-title">
 	<h2 id="directorylist-title" class="boxtitle"><roundcube:label name="kolab_activesync.devices" /></h2>
 	<div class="boxlistcontent">
 		<roundcube:object name="plugin.devicelist" id="devices-table" class="listing" cellspacing="0" />
@@ -24,11 +26,10 @@
 	</div>
 </div>
 
-<div id="prefs-box" class="uibox contentbox">
+<div id="prefs-box" class="uibox contentbox" role="main">
 	<div class="iframebox">
-		<roundcube:frame contentframe="activesync-frame" id="activesync-frame" style="width:100%; height:100%" frameborder="0" src="/watermark.html" />
+		<roundcube:frame contentframe="activesync-frame" id="activesync-frame" style="width:100%; height:100%" frameborder="0" src="/watermark.html" title="arialabeldeviceframe" />
 	</div>
-	<roundcube:object name="message" id="message" class="statusbar" />
 </div>
 
 </div>
@@ -39,8 +40,8 @@
 
 <script type="text/javascript">
 
-	var viewsplit = new rcube_splitter({ id:'devicelistsplitter', p1:'#sectionslist', p2:'#prefs-box', orientation:'v', relative:true, start:226, min:150, size:12 });
-	rcmail.add_onload('viewsplit.init()');
+var viewsplit = new rcube_splitter({ id:'devicelistsplitter', p1:'#sectionslist', p2:'#prefs-box', orientation:'v', relative:true, start:266, min:150, size:12 });
+rcmail.add_onload('viewsplit.init()');
 
 </script>

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

@@ -1,3 +1,31 @@
+/**
+ * Client script for the Kolab address book plugin
+ *
+ * @author Aleksander Machniak <machniak@kolabsys.com>
+ * @author Thomas Bruederli <bruederli@kolabsys.com>
+ *
+ * @licstart  The following is the entire license notice for the
+ * JavaScript code in this file.
+ *
+ * Copyright (C) 2011-2014, Kolab Systems AG <contact@kolabsys.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * @licend  The above is the entire license notice
+ * for the JavaScript code in this file.
+ */
+
 if (window.rcmail) {
     rcmail.addEventListener('init', function() {
         rcmail.set_book_actions();
@@ -193,124 +221,39 @@
 };
 
 // action executed after book create/update
-rcube_webmail.prototype.book_update = function(data, old, recur)
+rcube_webmail.prototype.book_update = function(data, old)
 {
-    var n, i, id, len, link, row, prop, olddata, oldid, name, sources, level,
-        folders = [], classes = ['addressbook'],
-        groups = this.env.contactgroups;
+    var link, classes = [(data.group || ''), 'addressbook'];
 
-    this.env.contactfolders[data.id] = this.env.address_sources[data.id] = data;
     this.show_contentframe(false);
 
-    // update (remove old row)
-    if (old && old != data.id) {
-        olddata = this.env.address_sources[old];
-        delete this.env.address_sources[old];
-        delete this.env.contactfolders[old];
-        this.treelist.remove(old);
-    }
-
-    sources = this.env.address_sources;
-
     // set row attributes
     if (data.readonly)
         classes.push('readonly');
-    if (data.class_name)
-        classes.push(data.class_name);
-    // updated currently selected book
-    if (this.env.source != '' && this.env.source == old) {
-        classes.push('selected');
-        this.env.source = data.id;
-    }
+    if (data.group)
+        classes.push(data.group);
 
     link = $('<a>').html(data.name)
       .attr({
-        href: '#', rel: data.id,
+        href: this.url('', { _source: data.id }),
+        rel: data.id,
         onclick: "return rcmail.command('list', '" + data.id + "', this)"
       });
 
-    // add row at the end of the list
-    // treelist widget is not very smart, we need
-    // to do sorting and add groups list by ourselves
-    this.treelist.insert({id: data.id, html:link, classes: classes, childlistclass: 'groups'}, '', false);
-    row = $(this.treelist.get_item(data.id));
-    row.append($('<ul class="groups">').hide());
-
-    // we need to sort rows because treelist can't sort by property
-    $.each(sources, function(i, v) {
-        if (v.kolab && v.realname)
-            folders.push(v.realname);
-    });
-    folders.sort();
-
-    for (n=0, len=folders.length; n<len; n++)
-        if (folders[n] == data.realname)
-           break;
-
-    // find the row before and re-insert after it
-    if (n && n < len - 1) {
-        name = folders[n-1];
-        for (n in sources)
-            if (sources[n].realname && sources[n].realname == name) {
-                row.detach().insertAfter(this.treelist.get_item(n));
-                break;
-            }
+    // update (remove old row)
+    if (old) {
+      this.treelist.update(old, { id: data.id, html:link, classes: classes, parent:(old != data.id ? data.parent : null) }, data.group || true);
+    }
+    else {
+      this.treelist.insert({ id: data.id, html:link, classes: classes, childlistclass: 'groups' }, data.parent, data.group || true);
     }
 
-    if (olddata) {
-        // update groups
-        for (n in groups) {
-            if (groups[n].source == old) {
-                prop = groups[n];
-                prop.type = 'group';
-                prop.source = data.id;
-                id = 'G' + prop.source + prop.id;
-
-                link = $('<a>').text(prop.name)
-                  .attr({
-                    href: '#', rel: prop.source + ':' + prop.id,
-                    onclick: "return rcmail.command('listgroup', {source: '"+prop.source+"', id: '"+prop.id+"'}, this)"
-                  });
-
-                this.treelist.insert({id:id, html:link, classes:['contactgroup']}, prop.source, true);
-
-                this.env.contactfolders[id] = this.env.contactgroups[id] = prop;
-                delete this.env.contactgroups[n];
-                delete this.env.contactfolders[n];
-            }
-        }
-
-        if (recur)
-            return;
-
-        // update subfolders
-        old += '_';
-        level = olddata.realname.split(this.env.delimiter).length - data.realname.split(this.env.delimiter).length;
-        olddata.realname += this.env.delimiter;
-
-        for (n in sources) {
-            if (sources[n].realname && sources[n].realname.indexOf(olddata.realname) == 0) {
-                prop = sources[n];
-                oldid = sources[n].id;
-                // new ID
-                prop.id = data.id + '_' + n.substr(old.length);
-                prop.realname = data.realname + prop.realname.substr(olddata.realname.length - 1);
-                name = prop.name;
-
-                // update display name
-                if (level > 0) {
-                    for (i=level; i>0; i--)
-                        name = name.replace(/^&nbsp;&nbsp;/, '');
-                }
-                else if (level < 0) {
-                    for (i=level; i<0; i++)
-                        name = '&nbsp;&nbsp;' + name;
-                }
+    this.env.contactfolders[data.id] = this.env.address_sources[data.id] = data;
 
-                prop.name = name;
-                this.book_update(prop, oldid, true)
-            }
-        }
+    // updated currently selected book
+    if (this.env.source != '' && this.env.source == old) {
+        this.treelist.select(data.id);
+        this.env.source = data.id;
     }
 };

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

@@ -29,9 +29,10 @@
 
 class kolab_addressbook extends rcube_plugin
 {
-    public $task = 'mail|settings|addressbook|calendar|tasks';
+    public $task = '?(?!login|logout).*';
 
     private $sources;
+    private $folders;
     private $rc;
     private $ui;
 
@@ -60,6 +61,7 @@
         if ($this->rc->task == 'addressbook') {
             $this->add_texts('localization');
             $this->add_hook('contact_form', array($this, 'contact_form'));
+            $this->add_hook('template_object_directorylist', array($this, 'directorylist_html'));
 
             // Plugin actions
             $this->register_action('plugin.book', array($this, 'book_actions'));
@@ -103,24 +105,9 @@
         }
 
         $sources = array();
-        $names   = array();
-
         foreach ($this->_list_sources() as $abook_id => $abook) {
-            $name = kolab_storage::folder_displayname($abook->get_name(), $names);
-
             // register this address source
-            $sources[$abook_id] = array(
-                'id'       => $abook_id,
-                'name'     => $name,
-                'readonly' => $abook->readonly,
-                'editable' => $abook->editable,
-                'groups'   => $abook->groups,
-                'undelete' => $abook->undelete && $undelete,
-                'realname' => rcube_charset::convert($abook->get_realname(), 'UTF7-IMAP'), // IMAP folder name
-                'class_name' => $abook->get_namespace(),
-                'carddavurl' => $abook->get_carddav_url(),
-                'kolab'    => true,
-            );
+            $sources[$abook_id] = $this->abook_prop($abook_id, $abook);
         }
 
         // Add personal address sources to the list
@@ -141,6 +128,139 @@
         return $p;
     }
 
+    /**
+     * Helper method to build a hash array of address book properties
+     */
+    protected function abook_prop($id, $abook)
+    {
+        return array(
+            'id'       => $id,
+            'name'     => $abook->get_name(),
+            'listname' => $abook->get_foldername(),
+            'readonly' => $abook->readonly,
+            'editable' => $abook->editable,
+            'groups'   => $abook->groups,
+            'undelete' => $abook->undelete && $this->rc->config->get('undo_timeout'),
+            'realname' => rcube_charset::convert($abook->get_realname(), 'UTF7-IMAP'), // IMAP folder name
+            'group'    => $abook->get_namespace(),
+            'carddavurl' => $abook->get_carddav_url(),
+            'kolab'    => true,
+        );
+    }
+
+    /**
+     *
+     */
+    public function directorylist_html($args)
+    {
+        $out = '';
+        $jsdata = array();
+        $sources = (array)$this->rc->get_address_sources();
+
+        // list all non-kolab sources first
+        foreach (array_filter($sources, function($source){ return empty($source['kolab']); }) as $j => $source) {
+            $id = strval(strlen($source['id']) ? $source['id'] : $j);
+            $out .= $this->addressbook_list_item($id, $source, $jsdata) . '</li>';
+        }
+
+        // render a hierarchical list of kolab contact folders
+        kolab_storage::folder_hierarchy($this->folders, $tree);
+        $out .= $this->folder_tree_html($tree, $sources, $jsdata);
+
+        $this->rc->output->set_env('contactgroups', $jsdata);
+
+        $args['content'] = html::tag('ul', $args, $out, html::$common_attrib);
+        return $args;
+    }
+
+    /**
+     * Return html for a structured list <ul> for the folder tree
+     */
+    public function folder_tree_html($node, $data, &$jsdata)
+    {
+        $out = '';
+        foreach ($node->children as $folder) {
+            $id = $folder->id;
+            $source = $data[$id];
+            $is_collapsed = strpos($this->rc->config->get('collapsed_abooks',''), '&'.rawurlencode($id).'&') !== false;
+
+            if ($folder->virtual) {
+                $source = array(
+                    'id'       => $folder->id,
+                    'name'     => $folder->get_name(),
+                    'listname' => $folder->get_foldername(),
+                    'group'    => $folder->get_namespace(),
+                    'readonly' => true,
+                    'editable' => false,
+                    'kolab'    => true,
+                    'virtual'  => true,
+                );
+            }
+
+            $content = $this->addressbook_list_item($id, $source, $jsdata);
+
+            if (!empty($folder->children)) {
+                $child_html = $this->folder_tree_html($folder, $data, $jsdata);
+
+                if (!empty($child_html) && preg_match('!</ul>\n*$!', $content)) {
+                    $content = preg_replace('!</ul>\n*$!', $child_html . '</ul>', $content);
+                }
+                else if (!empty($child_html)) {
+                    $content .= html::tag('ul', array('style' => ($is_collapsed ? "display:none;" : null)), $child_html);
+                }
+            }
+
+            $out .= $content . '</li>';
+        }
+
+        return $out;
+    }
+
+    /**
+     *
+     */
+    protected function addressbook_list_item($id, $source, &$jsdata, $checkbox = false)
+    {
+        $folder = $this->folders[$id];
+        $current = rcube_utils::get_input_value('_source', rcube_utils::INPUT_GPC);
+
+        // set class name(s)
+        $classes = array($source['group'] ?: '000', 'addressbook');
+        if ($current === $id)
+            $classes[] = 'selected';
+        if ($source['readonly'])
+            $classes[] = 'readonly';
+        if ($source['virtual'])
+            $classes[] = 'virtual';
+        if ($source['class_name'])
+            $classes[] = $source['class_name'];
+
+        $name = !empty($source['listname']) ? $source['listname'] : (!empty($source['name']) ? $source['name'] : $id);
+        $out .= html::tag('li', array(
+                'id' => 'rcmli' . rcube_utils::html_identifier($id, true),
+                'class' => join(' ', $classes), 
+                'noclose' => true,
+            ),
+            ($source['virtual'] ?
+                html::a(array('tabindex' => '0'), $name) :
+                html::a(array(
+                        'href' => $this->rc->url(array('_source' => $id)),
+                        'rel' => $source['id'],
+                        'onclick' => "return " . rcmail_output::JS_OBJECT_NAME.".command('list','" . rcube::JQ($id) . "',this)",
+                    ), $name)
+            )
+        );
+
+        $groupdata = array('out' => '', 'jsdata' => $jsdata, 'source' => $id);
+        if ($source['groups'] && function_exists('rcmail_contact_groups')) {
+            $groupdata = rcmail_contact_groups($groupdata);
+        }
+
+        $jsdata = $groupdata['jsdata'];
+        $out .= $groupdata['out'];
+
+        return $out;
+    }
 
     /**
      * Sets autocomplete_addressbooks option according to
@@ -203,6 +323,16 @@
             if ($this->sources[$p['id']]) {
                 $p['instance'] = $this->sources[$p['id']];
             }
+            else {
+                $folder = kolab_storage::get_folder(kolab_storage::id_decode($p['id']));
+                if ($folder->type) {  // try with unencoded (old-style) identifier
+                    $folder = kolab_storage::get_folder(kolab_storage::id_decode($p['id'], false));
+                }
+                if ($folder->type) {
+                    $this->sources[$p['id']] = new rcube_kolab_contacts($folder->name);
+                    $p['instance'] = $this->sources[$p['id']];
+                }
+            }
         }
 
         return $p;
@@ -215,7 +345,9 @@
         if (isset($this->sources))
             return $this->sources;
 
+        kolab_storage::$encode_ids = true;
         $this->sources = array();
+        $this->folders = array();
 
         $abook_prio = $this->addressbook_prio();
 
@@ -247,9 +379,10 @@
             $names = array();
             foreach ($folders as $folder) {
                 // create instance of rcube_contacts
-                $abook_id = kolab_storage::folder_id($folder->name);
+                $abook_id = $folder->id;
                 $abook = new rcube_kolab_contacts($folder->name);
                 $this->sources[$abook_id] = $abook;
+                $this->folders[$abook_id] = $folder;
             }
         }
 
@@ -436,40 +569,19 @@
         if ($result) {
             $storage = $this->rc->get_storage();
             $delimiter = $storage->get_hierarchy_delimiter();
-            $kolab_folder = new rcube_kolab_contacts($folder);
-
-            // create display name for the folder (see self::address_sources())
-            if (strpos($folder, $delimiter)) {
-                $names = array();
-                foreach ($this->_list_sources() as $abook) {
-                    $realname = $abook->get_realname();
-                    // The list can be not updated yet, handle old folder name
-                    if ($type == 'update' && $realname == $prop['oldname']) {
-                        $abook    = $kolab_folder;
-                        $realname = $folder;
-                    }
-
-                    $name = kolab_storage::folder_displayname($abook->get_name(), $names);
-
-                    if ($realname == $folder) {
-                        break;
-                    }
-                }
-            }
-            else {
-                $name = $kolab_folder->get_name();
-            }
+            $kolab_folder = kolab_storage::get_folder($folder);
 
             $this->rc->output->show_message('kolab_addressbook.book'.$type.'d', 'confirmation');
             $this->rc->output->command('set_env', 'delimiter', $delimiter);
             $this->rc->output->command('book_update', array(
                 'id'       => kolab_storage::folder_id($folder),
-                'name'     => $name,
+                'name'     => $kolab_folder->get_foldername(),
                 'readonly' => false,
                 'editable' => true,
                 'groups'   => true,
                 'realname' => rcube_charset::convert($folder, 'UTF7-IMAP'), // IMAP folder name
-                'class_name' => $kolab_folder->get_namespace(),
+                'group'    => $kolab_folder->get_namespace(),
+                'parent'   => kolab_storage::folder_id($kolab_folder->get_parent()),
                 'kolab'    => true,
             ), kolab_storage::folder_id($prop['oldname']));

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

@@ -154,6 +154,14 @@
         return $folder;
     }
 
+    /**
+     * Wrapper for kolab_storage_folder::get_foldername()
+     */
+    public function get_foldername()
+    {
+        return $this->storagefolder->get_foldername();
+    }
+
 
     /**
      * Getter for the IMAP folder name
@@ -181,6 +189,16 @@
     }
 
     /**
+     * Getter for parent folder path
+     *
+     * @return string Full path to parent folder
+     */
+    public function get_parent()
+    {
+        return $this->storagefolder->get_parent();
+    }
+
+    /**
      * Compose an URL for CardDAV access to this address book (if configured)
      */
     public function get_carddav_url()
@@ -337,8 +355,8 @@
                 }
             }
         }
-        else {
-            $this->result->count = $this->storagefolder->count($query);
+        else if (isset($this->dataset)) {
+            $this->result->count = isset($query) ? $this->storagefolder->count($query) : 0;
             foreach ($this->dataset as $idx => $record) {
                 $this->result->add($this->_to_rcube_contact($record));
             }

roundcubemail-plugins-kolab-3.2.tar.gz/plugins/kolab_addressbook/localization/da_DK.inc Added

@@ -0,0 +1,43 @@
+<?php
+$labels['initials'] = 'Initialer';
+$labels['profession'] = 'Stilling';
+$labels['officelocation'] = 'Arbejdsplads';
+$labels['children'] = 'Børn';
+$labels['pgppublickey'] = 'Offentlig PGP-nøgle';
+$labels['pkcs7publickey'] = 'Offentlig S/MIME-nøgle';
+$labels['freebusyurl'] = 'URL for ledig/optaget';
+$labels['typebusiness'] = 'Virksomhed';
+$labels['typebusinessfax'] = 'Fax arbejde';
+$labels['typecompany'] = 'Firma';
+$labels['typeprimary'] = 'Primær';
+$labels['typetelex'] = 'Telex';
+$labels['typeradio'] = 'Radio';
+$labels['typeisdn'] = 'ISDN';
+$labels['typettytdd'] = 'TTY/TDD';
+$labels['typecallback'] = 'Tilbagekald';
+$labels['settings'] = 'Indstillinger';
+$labels['bookcreate'] = 'Opret adressebog';
+$labels['bookedit'] = 'Redigér adressebog';
+$labels['bookdelete'] = 'Slet adressebog';
+$labels['bookproperties'] = 'Egenskaber for adressebog';
+$labels['bookname'] = 'Navn på bog';
+$labels['parentbook'] = 'Overordnet bog';
+$labels['bookshowurl'] = 'Vis CardDAV-URL';
+$labels['carddavurldescription'] = 'Kopiér denne adresse til et <a href="http://en.wikipedia.org/wiki/CardDAV" target="_blank">CardDAV</a>-klientprogram for komplet synkronisering af denne specifikke adressebog med din maskine eller mobilenhed.';
+$labels['addressbookprio'] = 'Markering/adfærd for adressebøger';
+$labels['personalfirst'] = 'Personlige adressebøger først';
+$labels['globalfirst'] = 'Globale adressebøger først';
+$labels['personalonly'] = 'Kun personlige adresse';
+$labels['globalonly'] = 'Kun globale adressebøger';
+$messages['bookdeleteconfirm']  = 'Vil du virkelig slette den valgte adressebog og alle kontakterne i den?';
+$messages['bookdeleting'] = 'Sletter adressebog...';
+$messages['booksaving'] = 'Gemmer adressebog...';
+$messages['bookdeleted'] = 'Sletning af adressebogen blev gennemført.';
+$messages['bookupdated'] = 'Opdateringen af adressebog blev gennemført.';
+$messages['bookcreated'] = 'Oprettelsen af adressbog blev gennemført.';
+$messages['bookdeleteerror'] = 'Der opstod en fejl under sletning af adressebogen.';
+$messages['bookupdateerror'] = 'Der opstod en fejl under opdatering af adressebogen.';
+$messages['bookcreateerror'] = 'Der opstod en fejl under oprettelse af adressebogen.';
+$messages['nobooknamewarning'] = 'Angiv venligst navnet på adressebogen.';
+$messages['noemailnamewarning'] = 'Angiv venligst e-postadresse eller kontaktnavn.';
+?>

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

roundcubemail-plugins-kolab-3.2.tar.gz/plugins/kolab_addressbook/localization/fi_FI.inc Added

@@ -0,0 +1,36 @@
+<?php
+$labels['initials'] = 'Nimikirjaimet';
+$labels['profession'] = 'Ammatti';
+$labels['officelocation'] = 'Toimiston sijainti';
+$labels['pgppublickey'] = 'Julkinen PGP-avain';
+$labels['pkcs7publickey'] = 'Julkinen S/MIME-avain';
+$labels['typebusiness'] = 'Työ';
+$labels['typebusinessfax'] = 'Työfaksi';
+$labels['typecompany'] = 'Yhtiö';
+$labels['typeprimary'] = 'Ensisijainen';
+$labels['typeisdn'] = 'ISDN';
+$labels['settings'] = 'Asetukset';
+$labels['bookcreate'] = 'Luo osoitekirja';
+$labels['bookedit'] = 'Muokkaa osoitekirjaa';
+$labels['bookdelete'] = 'Poista osoitekirja';
+$labels['bookproperties'] = 'Osoitekirjan ominaisuudet';
+$labels['bookname'] = 'Kirjan nimi';
+$labels['bookshowurl'] = 'Näytä CardDAV-osoite';
+$labels['carddavurldescription'] = 'Kopioi tämä osoite <a href="http://en.wikipedia.org/wiki/CardDAV" target="_blank">CardDAV</a-asiakassovellukseen synkronoidaksesi tämän osoitekirjan tietokoneesi tai mobiililaitteesi kanssa.';
+$labels['addressbookprio'] = 'Osoitekirjojen valinta ja toiminta';
+$labels['personalfirst'] = 'Henkilökohtainen osoitekirja ensin';
+$labels['globalfirst'] = 'Yleinen osoitekirja ensin';
+$labels['personalonly'] = 'Pelkkä henkilökohtainen osoitekirja';
+$labels['globalonly'] = 'Pelkkä yleinen osoitekirja';
+$messages['bookdeleteconfirm']  = 'Haluatko varmasti poistaa valitun osoitekirjan ja siinä olevat yhteystiedot?';
+$messages['bookdeleting'] = 'Poistetaan osoitekirja...';
+$messages['booksaving'] = 'Tallennetaan osoitekirjaa...';
+$messages['bookdeleted'] = 'Osoitekirja poistettiin onnistuneesti.';
+$messages['bookupdated'] = 'Osoitekirja päivitettiin onnistuneesti.';
+$messages['bookcreated'] = 'Osoitekirja luotiin onnistuneesti.';
+$messages['bookdeleteerror'] = 'Osoitekirjaa poistaessa tapahtui virhe.';
+$messages['bookupdateerror'] = 'Osoitekirjaa päivittäessä tapahtui virhe.';
+$messages['bookcreateerror'] = 'Osoitekirjaa luotaessa tapahtui virhe.';
+$messages['nobooknamewarning'] = 'Anna osoitekirjalle nimi.';
+$messages['noemailnamewarning'] = 'Anna sähköpostiosoite tai yhteystiedon nimi.';
+?>

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

roundcubemail-plugins-kolab-3.2.tar.gz/plugins/kolab_addressbook/localization/hu_HU.inc Added

@@ -0,0 +1,43 @@
+<?php
+$labels['initials'] = 'Megszólítás';
+$labels['profession'] = 'Foglalkozás';
+$labels['officelocation'] = 'Irodai cím';
+$labels['children'] = 'Gyermekek';
+$labels['pgppublickey'] = 'PGP nyilvános kulcs';
+$labels['pkcs7publickey'] = 'S/MIME nyilvános kulcs';
+$labels['freebusyurl'] = 'Foglaltság URL';
+$labels['typebusiness'] = 'Munkahely';
+$labels['typebusinessfax'] = 'Munkahelyi Fax';
+$labels['typecompany'] = 'Munkaadó';
+$labels['typeprimary'] = 'Elsődleges';
+$labels['typetelex'] = 'Telex';
+$labels['typeradio'] = 'Mobil';
+$labels['typeisdn'] = 'ISDN';
+$labels['typettytdd'] = 'Pager';
+$labels['typecallback'] = 'Pager';
+$labels['settings'] = 'Beállítások';
+$labels['bookcreate'] = 'Címjegyzék létrehozása';
+$labels['bookedit'] = 'Címjegyzék szerkesztése';
+$labels['bookdelete'] = 'Címjegyzék törlése';
+$labels['bookproperties'] = 'Címjegyzék tulajdonságai';
+$labels['bookname'] = 'Címjegyzékmappa neve';
+$labels['parentbook'] = 'Szülőmappa';
+$labels['bookshowurl'] = 'Címjegyzék URL címe';
+$labels['carddavurldescription'] = 'Másolja be ezt a címet egy <a href="http://en.wikipedia.org/wiki/CardDAV" target="_blank">CardDAV</a>-kompatibilis kliensbe hogy kétirányú szinkronizációval tudjon a címjegyzékéhez onnan is hozzáférni.';
+$labels['addressbookprio'] = 'Címjegyzék használatának módja';
+$labels['personalfirst'] = 'Saját címjegyzék előbb';
+$labels['globalfirst'] = 'Központi címjegyzék előbb';
+$labels['personalonly'] = 'Csak saját címjegyzék';
+$labels['globalonly'] = 'Csak központi címjegyzék';
+$messages['bookdeleteconfirm']  = 'Biztos benne, hogy törölni szeretné a kiválasztott címjegyzékett a benne lévő összes kapcsolattal?';
+$messages['bookdeleting'] = 'Címjegyzék törlése...';
+$messages['booksaving'] = 'Címjegyzék mentése...';
+$messages['bookdeleted'] = 'Címjegyzék sikeresen törölve.';
+$messages['bookupdated'] = 'Címjegyzék sikeresen frissítve.';
+$messages['bookcreated'] = 'Címjegyzék sikeresen létrehozva.';
+$messages['bookdeleteerror'] = 'A címjegyzék törlése során hiba lépett fel.';
+$messages['bookupdateerror'] = 'A címjegyzék frissítése során hiba lépett fel.';
+$messages['bookcreateerror'] = 'A címjegyzék létrehozása során hiba lépett fel.';
+$messages['nobooknamewarning'] = 'Kérem, adja meg a címjegyzék nevét.';
+$messages['noemailnamewarning'] = 'Kérem, adja meg az e-mail címet vagy a kapcsolat nevét.';
+?>

roundcubemail-plugins-kolab-3.2.tar.gz/plugins/kolab_addressbook/localization/it_IT.inc Added

@@ -0,0 +1,37 @@
+<?php
+$labels['initials'] = 'Iniziali';
+$labels['profession'] = 'Professione';
+$labels['officelocation'] = 'Office location';
+$labels['children'] = 'Figli';
+$labels['pgppublickey'] = 'Chiave pubblica PGP';
+$labels['pkcs7publickey'] = 'Chiave pubblica S/MIME';
+$labels['freebusyurl'] = 'URL Free-busy';
+$labels['typebusiness'] = 'Lavoro';
+$labels['typebusinessfax'] = 'Fax Ufficio';
+$labels['typecompany'] = 'Azienda';
+$labels['typeprimary'] = 'Principale';
+$labels['settings'] = 'Impostazioni';
+$labels['bookcreate'] = 'Crea rubrica';
+$labels['bookedit'] = 'Modifica rubrica';
+$labels['bookdelete'] = 'Elimina rubrica';
+$labels['bookproperties'] = 'Proprietà rubrica';
+$labels['bookname'] = 'Nome rubrica';
+$labels['parentbook'] = 'Rubrica genitore';
+$labels['bookshowurl'] = 'Mostra URL CardDAV';
+$labels['addressbookprio'] = 'Selezione/comportamento rubrica/che';
+$labels['personalfirst'] = 'Usa prima rubrica/che personale/i';
+$labels['globalfirst'] = 'Usa prima rubrica/che globale/i';
+$labels['personalonly'] = 'Usa solo rubrica/che personale/i';
+$labels['globalonly'] = 'Usa solo rubrica/che globale/i';
+$messages['bookdeleteconfirm']  = 'Vuoi veramente eliminare la rubrica selezionata con tutti i contatti attualmente presenti?';
+$messages['bookdeleting'] = 'Eliminazione rubrica...';
+$messages['booksaving'] = 'Salvataggio rubrica...';
+$messages['bookdeleted'] = 'Rubrica eliminata con successo.';
+$messages['bookupdated'] = 'Rubrica aggiornata con successo.';
+$messages['bookcreated'] = 'Rubrica creata con successo.';
+$messages['bookdeleteerror'] = 'Si è verificato un errore durante l\'eliminazione della rubrica.';
+$messages['bookupdateerror'] = 'Si è verificato un errore durante l\'aggiornamento della rubrica.';
+$messages['bookcreateerror'] = 'Si è verificato un errore durante la creazione della rubrica.';
+$messages['nobooknamewarning'] = 'Inserire il nome della rubrica.';
+$messages['noemailnamewarning'] = 'Inserire l\'indirizzo email o il nome del contatto.';
+?>

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

@@ -5,7 +5,7 @@
 $labels['children'] = 'Kinderen';
 $labels['pgppublickey'] = 'PGP publieke sleutel';
 $labels['pkcs7publickey'] = 'S/MIME publieke sleutel';
-$labels['freebusyurl'] = 'Free/Busy URL';
+$labels['freebusyurl'] = 'Vrij/Bezet URL';
 $labels['typebusiness'] = 'Zakelijk';
 $labels['typebusinessfax'] = 'Zakelijk (Fax)';
 $labels['typecompany'] = 'Bedrijfsnaam';
@@ -14,6 +14,7 @@
 $labels['typeradio'] = 'Radio';
 $labels['typeisdn'] = 'ISDN';
 $labels['typettytdd'] = 'TTY/TDD';
+$labels['typecallback'] = 'Callback';
 $labels['settings'] = 'Instellingen';
 $labels['bookcreate'] = 'Maak adresboek aan';
 $labels['bookedit'] = 'Wijzig adresboek';
@@ -21,6 +22,8 @@
 $labels['bookproperties'] = 'Eigenschappen voor adresboek';
 $labels['bookname'] = 'Adresboek naam';
 $labels['parentbook'] = 'Toevoegen aan bestaand adresboek';
+$labels['bookshowurl'] = 'Toon CardDAV URL';
+$labels['carddavurldescription'] = 'Kopieer dit adres naar een <a href="http://en.wikipedia.org/wiki/CardDAV" target="_blank">CardDAV</a> programma om het volledige adresboek te synchroniseren met uw computer of mobiel apparaat.';
 $labels['addressbookprio'] = 'Gedrag voor adresboek(en)-selectie';
 $labels['personalfirst'] = 'Eerst persoonlijke adresboek(en)';
 $labels['globalfirst'] = 'Eerst globale adresboek(en)';

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

@@ -5,7 +5,7 @@
 $labels['children'] = 'Dzieci';
 $labels['pgppublickey'] = 'Klucz publiczny PGP';
 $labels['pkcs7publickey'] = 'Klucz publiczny S/MIME';
-$labels['freebusyurl'] = 'URL free-busy';
+$labels['freebusyurl'] = 'Adres URL free-busy';
 $labels['typebusiness'] = 'Firmowy';
 $labels['typebusinessfax'] = 'Fax firmowy';
 $labels['typecompany'] = 'Firma';
@@ -22,6 +22,8 @@
 $labels['bookproperties'] = 'Właściwości książki adresowej';
 $labels['bookname'] = 'Nazwa książki';
 $labels['parentbook'] = 'Nadrzędna książka';
+$labels['bookshowurl'] = 'Pokaż adres URL CardDAV';
+$labels['carddavurldescription'] = 'Skopiuj ten adres do aplikacji obsługującej format <a href="http://en.wikipedia.org/wiki/CardDAV" target="_blank">CardDAV</a> aby zsynchronizować książkę adresową z twoim komputerem lub urządzeniem przenośnym.';
 $labels['addressbookprio'] = 'Wybór/zachowanie książek adresowych';
 $labels['personalfirst'] = 'najpierw prywatne książki adresowe';
 $labels['globalfirst'] = 'najpierw globalne książki adresowe';
@@ -32,7 +34,7 @@
 $messages['booksaving'] = 'Zapisywanie książki adresowej...';
 $messages['bookdeleted'] = 'Książka adresowa została usunięta.';
 $messages['bookupdated'] = 'Książka adresowa została zaktualizowana.';
-$messages['bookcreated'] = 'Książka adresowa zostałą utworzona.';
+$messages['bookcreated'] = 'Książka adresowa została utworzona.';
 $messages['bookdeleteerror'] = 'Podczas usuwania książki adresowej wystąpił błąd.';
 $messages['bookupdateerror'] = 'Podczas zapisywania książki adresowej wystąpił błąd.';
 $messages['bookcreateerror'] = 'Podczas dodawania książki adresowej wystąpił błąd.';

roundcubemail-plugins-kolab-3.2.tar.gz/plugins/kolab_addressbook/localization/ru_RU.inc 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_auth/config.inc.php.dist Changed

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

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

@@ -213,13 +213,13 @@
      *                          0 - partial (*abc*),
      *                          1 - strict (=),
      *                          2 - prefix (abc*)
-     * @param boolean $select   True if results are requested, False if count only
      * @param array   $required List of fields that cannot be empty
      * @param int     $limit    Number of records
+     * @param int     $count    Returns the number of records found
      *
      * @return array List or false on error
      */
-    function search($fields, $value, $mode=1, $required = array(), $limit = 0)
+    function dosearch($fields, $value, $mode=1, $required = array(), $limit = 0, &$count = 0)
     {
         if (empty($fields)) {
             return array();
@@ -296,7 +296,8 @@
         $attrs   = array_values($this->fieldmap);
         $list    = array();
 
-        if ($result = parent::search($base_dn, $filter, $scope, $attrs)) {
+        if ($result = $this->search($base_dn, $filter, $scope, $attrs)) {
+            $count = $result->count();
             $i = 0;
             foreach ($result as $entry) {
                 if ($limit && $limit <= $i) {

roundcubemail-plugins-kolab-3.2.tar.gz/plugins/kolab_auth/localization/da_DK.inc Added

roundcubemail-plugins-kolab-3.2.tar.gz/plugins/kolab_auth/localization/fi_FI.inc Added

roundcubemail-plugins-kolab-3.2.tar.gz/plugins/kolab_auth/localization/hu_HU.inc Added

roundcubemail-plugins-kolab-3.2.tar.gz/plugins/kolab_auth/localization/it_IT.inc Added

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

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

@@ -1,10 +1,12 @@
 /**
  * Client scripts for the Kolab Delegation configuration utitlity
  *
- * @version @package_version@
  * @author Aleksander Machniak <machniak@kolabsys.com>
  * @author Thomas Bruederli <bruederli@kolabsys.com>
  *
+ * @licstart  The following is the entire license notice for the
+ * JavaScript code in this file.
+ *
  * Copyright (C) 2011-2012, Kolab Systems AG <contact@kolabsys.com>
  *
  * This program is free software: you can redistribute it and/or modify
@@ -19,6 +21,9 @@
  *
  * You should have received a copy of the GNU Affero General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * @licend  The above is the entire license notice
+ * for the JavaScript code in this file.
  */
 
 window.rcmail && rcmail.addEventListener('init', function(evt) {
@@ -44,8 +49,8 @@
     if (rcmail.gui_objects.delegatelist) {
       rcmail.delegatelist = new rcube_list_widget(rcmail.gui_objects.delegatelist,
         { multiselect:true, draggable:false, keyboard:true });
-      rcmail.delegatelist.addEventListener('select', function(o) { rcmail.select_delegate(o); });
-      rcmail.delegatelist.init();
+      rcmail.delegatelist.addEventListener('select', function(o) { rcmail.select_delegate(o); })
+        .init();
 
       rcmail.enable_command('delegate-add', true);
     }
@@ -72,14 +77,16 @@
           $('input.write', this.parentNode.parentNode).prop('checked', false);
       });
 
-      $('.foldersblock thead td img').click(function(e) {
-        var $this = $(this),
-          classname = $this.parent().get(0).className,
-          list = $this.closest('table').find('input.'+classname),
+      var fn = function(elem) {
+        var classname = elem.className,
+          list = $(elem).closest('table').find('input.' + classname),
           check = list.not(':checked').length > 0;
 
         list.prop('checked', check).change();
-      });
+      };
+
+      $('th.read,th.write').click(function() { fn(this); })
+        .keydown(function(e) { if (e.which == 13 || e.which == 32) fn(this); });
     }
   }
 });

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

@@ -94,6 +94,7 @@
             'class'  => 'delegation',
             'label'  => 'tabtitle',
             'domain' => 'kolab_delegation',
+            'title'  => 'delegationtitle',
         );
 
         return $args;
@@ -320,7 +321,7 @@
      */
     public function controller_action()
     {
-        $this->add_texts('localization/', true);
+        $this->add_texts('localization/');
 
         $engine = $this->engine();
 
@@ -376,10 +377,10 @@
         // Delegate autocompletion
         else if ($this->rc->action == 'plugin.delegation-autocomplete') {
             $search = get_input_value('_search', RCUBE_INPUT_GPC, true);
-            $sid    = get_input_value('_id', RCUBE_INPUT_GPC);
+            $reqid  = get_input_value('_reqid', RCUBE_INPUT_GPC);
             $users  = $engine->list_users($search);
 
-            $this->rc->output->command('ksearch_query_results', $users, $search, $sid);
+            $this->rc->output->command('ksearch_query_results', $users, $search, $reqid);
         }
 
         $this->rc->output->send();
@@ -497,8 +498,8 @@
         $write_ico = $attrib['writeicon'] ? html::img(array('src' => $path . $attrib['writeicon'], 'title' => $this->gettext('write'))) : '';
 
         $table = new html_table(array('cellspacing' => 0));
-        $table->add_header('read', $read_ico);
-        $table->add_header('write', $write_ico);
+        $table->add_header(array('class' => 'read', 'title' => $this->gettext('read'), 'tabindex' => 0), $read_ico);
+        $table->add_header(array('class' => 'write', 'title' => $this->gettext('write'), 'tabindex' => 0), $write_ico);
         $table->add_header('foldername', $this->rc->gettext('folder'));
 
         $checkbox_read  = new html_checkbox(array('name' => 'read[]', 'class' => 'read'));

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

@@ -202,7 +202,7 @@
             return array();
         }
 
-        $list = $ldap->search($this->ldap_login_field, $login, 1);
+        $list = $ldap->dosearch($this->ldap_login_field, $login, 1);
 
         if (count($list) == 1) {
             $dn   = key($list);
@@ -288,7 +288,7 @@
             return array();
         }
 
-        $list = $ldap->search($this->ldap_delegate_field, $this->ldap_dn, 1);
+        $list = $ldap->dosearch($this->ldap_delegate_field, $this->ldap_dn, 1);
 
         foreach ($list as $dn => $delegator) {
             $delegator = $this->parse_ldap_record($delegator, $dn);
@@ -424,9 +424,14 @@
         $fields = array_unique(array_filter(array_merge((array)$this->ldap_name_field, (array)$this->ldap_login_field)));
         $users  = array();
 
-        $result = $ldap->search($fields, $search, $mode, (array)$this->ldap_login_field, $max);
+        $result = $ldap->dosearch($fields, $search, $mode, (array)$this->ldap_login_field, $max);
 
         foreach ($result as $record) {
+            // skip self
+            if ($record['dn'] == $_SESSION['kolab_dn']) {
+                continue;
+            }
+
             $user = $this->parse_ldap_record($record);
 
             if ($user['name']) {

roundcubemail-plugins-kolab-3.2.tar.gz/plugins/kolab_delegation/localization/ca_ES.inc Added

roundcubemail-plugins-kolab-3.2.tar.gz/plugins/kolab_delegation/localization/da_DK.inc Added

@@ -0,0 +1,26 @@
+<?php
+$labels['tabtitle'] = 'Delegering';
+$labels['delegates'] = 'Delegerede';
+$labels['delegate'] = 'Delegér';
+$labels['mail'] = 'E-post';
+$labels['contact'] = 'Adressebøger';
+$labels['event'] = 'Kalendere';
+$labels['task'] = 'Opgaver';
+$labels['note'] = 'Noter';
+$labels['yes'] = 'Ja';
+$labels['no'] = 'Nej';
+$labels['read'] = 'Skrivebeskyttet';
+$labels['write'] = 'Skriv';
+$labels['adddelegate'] = 'Tilføj delegeret';
+$labels['deletedelegate'] = 'Slet delegeret';
+$labels['savingdata'] = 'Gemmer data...';
+$labels['delegatedeleteconfirm'] = 'Sikker på du vil slette denne delegerede?';
+$labels['delegateremoveacl'] = 'fjern adgangsrettigheder til mapper tildelt denne bruger';
+$labels['deleteconfirm'] = 'Bekræftelse';
+$labels['deletesuccess'] = 'Gennemførte fjernelsen af delegerede.';
+$labels['deleteerror'] = 'Kunne ikke fjerne delegerede.';
+$labels['updatesuccess'] = 'Gennemførte opdatering af delegerede.';
+$labels['updateerror'] = 'Kunne ikke opdatere delegerede.';
+$labels['createsuccess'] = 'Gennemførte tilføjelse af den delegerede.';
+$labels['createerror'] = 'Kunne ikke tilføje delegerede.';
+?>

roundcubemail-plugins-kolab-3.2.tar.gz/plugins/kolab_delegation/localization/de_DE.inc Changed

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

roundcubemail-plugins-kolab-3.2.tar.gz/plugins/kolab_delegation/localization/es_ES.inc Changed

roundcubemail-plugins-kolab-3.2.tar.gz/plugins/kolab_delegation/localization/et_EE.inc Changed

roundcubemail-plugins-kolab-3.2.tar.gz/plugins/kolab_delegation/localization/fi_FI.inc Added

@@ -0,0 +1,26 @@
+<?php
+$labels['tabtitle'] = 'Edustus';
+$labels['delegates'] = 'Edustajat';
+$labels['delegate'] = 'Edustaja';
+$labels['mail'] = 'Sähköposti';
+$labels['contact'] = 'Osoitekirjat';
+$labels['event'] = 'Kalenterit';
+$labels['task'] = 'Tehtävät';
+$labels['note'] = 'Muistiot';
+$labels['yes'] = 'Kyllä';
+$labels['no'] = 'Ei';
+$labels['read'] = 'Vain luku';
+$labels['write'] = 'Kirjoitus';
+$labels['adddelegate'] = 'Lisää edustaja';
+$labels['deletedelegate'] = 'Poista edustaja';
+$labels['savingdata'] = 'Tallennetaan tietoja...';
+$labels['delegatedeleteconfirm'] = 'Haluatko varmasti poistaa tämän edustajan?';
+$labels['delegateremoveacl'] = 'poista tälle käyttäjälle kansioihin määritetyt käyttöoikeudet';
+$labels['deleteconfirm'] = 'Vahvistus';
+$labels['deletesuccess'] = 'Edustaja poistettiin onnistuneesti.';
+$labels['deleteerror'] = 'Edustajan poistaminen ei onnistunut.';
+$labels['updatesuccess'] = 'Edustaja päivitettiin onnistuneesti.';
+$labels['updateerror'] = 'Edustajan päivittäminen ei onnistunut.';
+$labels['createsuccess'] = 'Edustaja lisättiin onnistuneesti.';
+$labels['createerror'] = 'Edustajan lisääminen ei onnistunut.';
+?>

roundcubemail-plugins-kolab-3.2.tar.gz/plugins/kolab_delegation/localization/fr_FR.inc Changed

roundcubemail-plugins-kolab-3.2.tar.gz/plugins/kolab_delegation/localization/hu_HU.inc Added

@@ -0,0 +1,26 @@
+<?php
+$labels['tabtitle'] = 'Meghatalmazás';
+$labels['delegates'] = 'Meghatalmazottak';
+$labels['delegate'] = 'Meghatalmazott:';
+$labels['mail'] = 'E-mail';
+$labels['contact'] = 'Címjegyzékek';
+$labels['event'] = 'Naptárak';
+$labels['task'] = 'Feladatok';
+$labels['note'] = 'Jegyzetek';
+$labels['yes'] = 'Igen';
+$labels['no'] = 'Nem';
+$labels['read'] = 'Csak olvasásra';
+$labels['write'] = 'Írásra';
+$labels['adddelegate'] = 'Meghatalmazás';
+$labels['deletedelegate'] = 'Meghatalmazás visszavonása';
+$labels['savingdata'] = 'Adatok mentése...';
+$labels['delegatedeleteconfirm'] = 'Biztos benne, hogy meg szeretné szüntetni ezt a meghatalmazást?';
+$labels['delegateremoveacl'] = 'a mappákhoz megadott hozzáférések visszavonásával';
+$labels['deleteconfirm'] = 'Megerősítés';
+$labels['deletesuccess'] = 'A meghatalmazás sikeresen meg lett szüntetve.';
+$labels['deleteerror'] = 'Nem sikerült visszavonni a meghatalmazást.';
+$labels['updatesuccess'] = 'A meghatalmazás sikeresen frissítve lett.';
+$labels['updateerror'] = 'Nem sikerült frissíteni a meghatalmazást.';
+$labels['createsuccess'] = 'A meghatalmazás sikeresen létre lett hozva.';
+$labels['createerror'] = 'Nem sikerült létrehozni a meghatalmazást.';
+?>

roundcubemail-plugins-kolab-3.2.tar.gz/plugins/kolab_delegation/localization/it_IT.inc Added

@@ -0,0 +1,26 @@
+<?php
+$labels['tabtitle'] = 'Deleghe';
+$labels['delegates'] = 'Delegati';
+$labels['delegate'] = 'Delegato';
+$labels['mail'] = 'Email';
+$labels['contact'] = 'Rubriche';
+$labels['event'] = 'Calendari';
+$labels['task'] = 'Attività';
+$labels['note'] = 'Note';
+$labels['yes'] = 'sì';
+$labels['no'] = 'No';
+$labels['read'] = 'Sola lettura';
+$labels['write'] = 'Scrittura';
+$labels['adddelegate'] = 'Aggiungi delegato';
+$labels['deletedelegate'] = 'Elimina delegato';
+$labels['savingdata'] = 'Salvataggio dati...';
+$labels['delegatedeleteconfirm'] = 'Vuoi davvero eliminare questo delegato?';
+$labels['delegateremoveacl'] = 'rimuovi i diritti di accesso alle cartelle assegnati a questo utente';
+$labels['deleteconfirm'] = 'Conferma';
+$labels['deletesuccess'] = 'Il delegato è stato rimosso correttamente.';
+$labels['deleteerror'] = 'Impossibile rimuovere il delegato.';
+$labels['updatesuccess'] = 'Il delegato è stato aggiornato correttamente.';
+$labels['updateerror'] = 'Impossibile aggiornare il delegato.';
+$labels['createsuccess'] = 'Il delegato è stato aggiunto correttamente.';
+$labels['createerror'] = 'Impossibile aggiungere il delegato.';
+?>

roundcubemail-plugins-kolab-3.2.tar.gz/plugins/kolab_delegation/localization/ja_JP.inc Changed

roundcubemail-plugins-kolab-3.2.tar.gz/plugins/kolab_delegation/localization/nl_NL.inc Changed

roundcubemail-plugins-kolab-3.2.tar.gz/plugins/kolab_delegation/localization/pl_PL.inc Changed

@@ -1,9 +1,26 @@
 <?php
+$labels['tabtitle'] = 'Pełnomocnictwa';
 $labels['delegates'] = 'Wydelegowani';
+$labels['delegate'] = 'Pełnomocnik';
 $labels['mail'] = 'Poczta';
 $labels['contact'] = 'Książki adresowe';
 $labels['event'] = 'Kalendarze';
 $labels['task'] = 'Zadania';
 $labels['note'] = 'Notatki';
+$labels['yes'] = 'Tak';
+$labels['no'] = 'Nie';
+$labels['read'] = 'Tylko-do-odczytu';
+$labels['write'] = 'Zapis';
+$labels['adddelegate'] = 'Dodaj delegata';
+$labels['deletedelegate'] = 'Usuń delegata';
 $labels['savingdata'] = 'Zapisuję dane...';
+$labels['delegatedeleteconfirm'] = 'Czy na pewno chcesz usunąć tego delegata?';
+$labels['delegateremoveacl'] = 'usuń prawa dostępu do folderów przypisanych do tego użytkownika';
+$labels['deleteconfirm'] = 'Potwierdzenie';
+$labels['deletesuccess'] = 'Delegat został usunięty.';
+$labels['deleteerror'] = 'Nie można usunąć delegata.';
+$labels['updatesuccess'] = 'Delegat został zaktualizowany.';
+$labels['updateerror'] = 'Nie można zaktualizować delegata.';
+$labels['createsuccess'] = 'Delegat został dodany.';
+$labels['createerror'] = 'Nie można dodać delegata.';
 ?>

roundcubemail-plugins-kolab-3.2.tar.gz/plugins/kolab_delegation/localization/pt_BR.inc Changed

roundcubemail-plugins-kolab-3.2.tar.gz/plugins/kolab_delegation/localization/ru_RU.inc Changed

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

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

roundcubemail-plugins-kolab-3.2.tar.gz/plugins/kolab_delegation/skins/kolab Deleted

roundcubemail-plugins-kolab-3.2.tar.gz/plugins/kolab_delegation/skins/kolab/read.png Deleted

roundcubemail-plugins-kolab-3.2.tar.gz/plugins/kolab_delegation/skins/kolab/style.css Deleted

@@ -1,107 +0,0 @@
-/* Stylesheets for the Kolab Delegation configuration UI */
-
-#sectionslist {
-	width: 220px;
-}
-
-#prefs-box {
-	position: absolute;
-	top: 0;
-	left: 232px;
-	right: 0;
-	bottom: 0;
-}
-
-#delegation-frame {
-	border-radius: 3px;
-}
-
-#delegates-table {
-	width: 100%;
-	table-layout: fixed;
-}
-
-div.foldersblock {
-	float: left;
-	margin: 0 3em 2em 0;
-	padding: 0;
-}
-
-div.foldersblock h3 {
-	font-size: 14px;
-	color: #333;
-	margin: 0 0 0.6em 0;
-	padding: 2px 4px 2px 30px;
-}
-
-div.foldersblock h3.contact {
-	background-position: 4px -18px;
-}
-
-div.foldersblock h3.event {
-	background-position: 4px -38px;
-}
-
-div.foldersblock h3.task {
-	background-position: 4px -58x;
-}
-
-div.foldersblock h3.note {
-	background-position: 4px -78px;
-}
-
-#delegatefolders thead td {
-	color: #69939e;
-	font-weight: bold;
-	padding: 2px;
-    padding-top: 4px;
-	min-width: 2em;
-	background: #d6eaf3;
-	border-bottom: 2px solid #fff;
-	text-align: center;
-}
-
-#delegatefolders thead td.foldername {
-  text-align: left;
-}
-
-#delegatefolders thead td img {
-	cursor: pointer;
-}
-
-#delegatefolders tbody td {
-	background: #eee;
-	padding: 2px;
-	border-bottom: 2px solid #fff;
-}
-
-#delegatefolders td label {
-	display: block;
-}
-
-#delegatefolders td.mailbox {
-	padding-right: 3em;
-	padding-left: 2px;
-	min-width: 12em;
-}
-
-#delegatefolders td.virtual {
-	color: #999;
-}
-
-#delegatefolders {
-	overflow: auto;
-	margin-top: 0.5em;
-}
-
-#delegate-delete-dialog {
-	display: none;
-}
-
-#delegate-delete-dialog p {
-	font-weight: bold;
-}
-
-#delegate-delete-dialog input {
-	vertical-align: middle;
-}

roundcubemail-plugins-kolab-3.2.tar.gz/plugins/kolab_delegation/skins/kolab/templates Deleted

roundcubemail-plugins-kolab-3.2.tar.gz/plugins/kolab_delegation/skins/kolab/templates/editform.html Deleted

roundcubemail-plugins-kolab-3.2.tar.gz/plugins/kolab_delegation/skins/kolab/templates/settings.html Deleted

roundcubemail-plugins-kolab-3.2.tar.gz/plugins/kolab_delegation/skins/kolab/write.png Deleted

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

@@ -1,21 +1,17 @@
 /* Stylesheets for the Kolab Delegation configuration UI */
 
-#settings-sections span.listitem.delegation a {
+#settings-sections .listitem.delegation a {
   background: url(delegation.png) 6px 1px no-repeat;
 }
 
-#settings-sections span.listitem.delegation.selected a {
+#settings-sections .listitem.delegation.selected a {
   background-position: 6px -23px;
 }
 
-#sectionslist {
-	width: 220px;
-}
-
 #prefs-box {
 	position: absolute;
 	top: 0;
-	left: 232px;
+	left: 272px;
 	right: 0;
 	bottom: 0;
 }
@@ -59,25 +55,21 @@
 	background-position: 4px -78px;
 }
 
-#delegatefolders thead td {
+#delegatefolders thead th {
 	color: #69939e;
 	font-weight: bold;
 	padding: 2px;
-    padding-top: 4px;
+	padding-top: 4px;
 	min-width: 2em;
 	background: #d6eaf3;
 	border-bottom: 2px solid #fff;
 	text-align: center;
 }
 
-#delegatefolders thead td.foldername {
+#delegatefolders thead th.foldername {
   text-align: left;
 }
 
-#delegatefolders thead td img {
-	cursor: pointer;
-}
-
 #delegatefolders tbody td {
 	background: #eee;
 	padding: 2px;
@@ -114,3 +106,17 @@
 #delegate-delete-dialog input {
 	vertical-align: middle;
 }
+
+.foldersblock th.read {
+  background: url(read.png) center no-repeat;
+  width: 18px;
+  height: 20px;
+  cursor: pointer;
+}
+
+.foldersblock th.write {
+  background: url(write.png) center no-repeat;
+  width: 18px;
+  height: 20px;
+  cursor: pointer;
+}

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

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

@@ -10,11 +10,13 @@
 
 <div id="mainscreen" class="offset">
 
+<h1 class="voice"><roundcube:label name="settings" /> : <roundcube:label name="kolab_delegation.tabtitle" /></h1>
+
 <roundcube:include file="/includes/settingstabs.html" />
 
 <div id="settings-right">
 
-<div id="sectionslist" class="uibox listbox">
+<div id="sectionslist" class="uibox listbox" role="navigation" aria-labelledby="delegatelist-title">
 	<h2 id="delegatelist-title" class="boxtitle"><roundcube:label name="kolab_delegation.delegates" /></h2>
 	<div class="boxlistcontent">
 		<roundcube:object name="plugin.delegatelist" id="delegate-table" class="listing" cellspacing="0" />
@@ -24,30 +26,29 @@
 	</div>
 </div>
 
-<div id="prefs-box" class="uibox contentbox">
+<div id="prefs-box" class="uibox contentbox" role="main">
 	<div class="iframebox">
-		<roundcube:frame contentframe="delegation-frame" id="delegation-frame" style="width:100%; height:100%" frameborder="0" src="/watermark.html" />
+		<roundcube:frame contentframe="delegation-frame" id="delegation-frame" style="width:100%; height:100%" frameborder="0" src="/watermark.html" title="arialabeldelegateform" />
 	</div>
-	<roundcube:object name="message" id="message" class="statusbar" />
 </div>
 
 </div>
+</div>
 
+<div id="delegate-delete-dialog" role="dialog" aria-labelledby="aria-label-delegatedeletedialog" aria-hidden="true">
+	<h3 id="aria-label-delegatedeletedialog" class="voice"><roundcube:label name="kolab_delegation.arialabeldelegatedelete" /></h3>
+	<p><roundcube:label name="kolab_delegation.delegatedeleteconfirm" /></p>
+	<span><input type="checkbox" value="1" checked="checked" /><roundcube:label name="kolab_delegation.delegateremoveacl" /></span>
 </div>
 
 <roundcube:include file="/includes/footer.html" />
 
 <script type="text/javascript">
 
-	var viewsplit = new rcube_splitter({ id:'delegatelistsplitter', p1:'#sectionslist', p2:'#prefs-box', orientation:'v', relative:true, start:266, min:150, size:12 });
-	rcmail.add_onload('viewsplit.init()');
+var viewsplit = new rcube_splitter({ id:'delegatelistsplitter', p1:'#sectionslist', p2:'#prefs-box', orientation:'v', relative:true, start:266, min:150, size:12 });
+rcmail.add_onload('viewsplit.init()');
 
 </script>
 
-<div id="delegate-delete-dialog">
-	<p><roundcube:label name="kolab_delegation.delegatedeleteconfirm" /></p>
-	<span><input type="checkbox" value="1" checked="checked" /><roundcube:label name="kolab_delegation.delegateremoveacl" /></span>
-</div>
-
 </body>
 </html>

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

@@ -1,8 +1,28 @@
 /**
  * Kolab files plugin
  *
- * @version @package_version@
- * @author Aleksander Machniak <alec@alec.pl>
+ * @author Aleksander Machniak <machniak@kolabsys.com>
+ *
+ * @licstart  The following is the entire license notice for the
+ * JavaScript code in this file.
+ *
+ * Copyright (C) 2011, Kolab Systems AG <contact@kolabsys.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * @licend  The above is the entire license notice
+ * for the JavaScript code in this file.
  */
 
 window.rcmail && rcmail.addEventListener('init', function() {
@@ -10,22 +30,21 @@
     // mail compose
     if (rcmail.env.action == 'compose') {
       var elem = $('#compose-attachments > div'),
-        input = $('<input class="button" type="button">');
-
-      input.val(rcmail.gettext('kolab_files.fromcloud'))
-        .click(function() { kolab_files_selector_dialog(); })
-        .appendTo(elem);
+        input = $('<input class="button" type="button">')
+          .attr('tabindex', $('input', elem).attr('tabindex') || 0)
+          .val(rcmail.gettext('kolab_files.fromcloud'))
+          .click(function() { kolab_files_selector_dialog(); })
+          .appendTo(elem);
 
       if (rcmail.gui_objects.filelist) {
         rcmail.file_list = new rcube_list_widget(rcmail.gui_objects.filelist, {
           multiselect: true,
-//        draggable: true,
           keyboard: true,
           column_movable: false,
           dblclick_time: rcmail.dblclick_time
         });
-        rcmail.file_list.addEventListener('select', function(o) { kolab_files_list_select(o); });
-        rcmail.file_list.addEventListener('listupdate', function(e) { rcmail.triggerEvent('listupdate', e); });
+        rcmail.file_list.addEventListener('select', function(o) { kolab_files_list_select(o); })
+          .addEventListener('listupdate', function(e) { rcmail.triggerEvent('listupdate', e); });
 
         rcmail.gui_objects.filelist.parentNode.onmousedown = function(e){ return kolab_files_click_on_list(e); };
         rcmail.enable_command('files-sort', 'files-search', 'files-search-reset', true);
@@ -49,6 +68,7 @@
       }
 
       rcmail.addEventListener('menu-open', kolab_files_attach_menu_open);
+      rcmail.enable_command('folder-create', true);
     }
 
     kolab_files_init();
@@ -70,16 +90,16 @@
       rcmail.file_list.addEventListener('dragstart', function(o){ p.drag_start(o); });
       rcmail.file_list.addEventListener('dragmove', function(e){ p.drag_move(e); });
 */
-      rcmail.file_list.addEventListener('dblclick', function(o){ kolab_files_list_dblclick(o); });
-      rcmail.file_list.addEventListener('select', function(o){ kolab_files_list_select(o); });
-      rcmail.file_list.addEventListener('dragend', function(e){ kolab_files_drag_end(e); });
-      rcmail.file_list.addEventListener('column_replace', function(e){ kolab_files_set_coltypes(e); });
-      rcmail.file_list.addEventListener('listupdate', function(e){ rcmail.triggerEvent('listupdate', e); });
+      rcmail.file_list.addEventListener('dblclick', function(o) { kolab_files_list_dblclick(o); })
+        .addEventListener('select', function(o) { kolab_files_list_select(o); })
+        .addEventListener('keypress', function(o) { kolab_files_list_keypress(o); })
+        .addEventListener('dragend', function(e) { kolab_files_drag_end(e); })
+        .addEventListener('column_replace', function(e) { kolab_files_set_coltypes(e); })
+        .addEventListener('listupdate', function(e) { rcmail.triggerEvent('listupdate', e); });
 
-//      document.onmouseup = function(e){ return p.doc_mouse_up(e); };
-      rcmail.gui_objects.filelist.parentNode.onmousedown = function(e){ return kolab_files_click_on_list(e); };
+      rcmail.gui_objects.filelist.parentNode.onmousedown = function(e) { return kolab_files_click_on_list(e); };
 
-      rcmail.enable_command('menu-open', 'menu-save', 'files-sort', 'files-search', 'files-search-reset', true);
+      rcmail.enable_command('menu-open', 'menu-save', 'files-sort', 'files-search', 'files-search-reset', 'folder-create', true);
 
       rcmail.file_list.init();
       kolab_files_list_coltypes();
@@ -134,7 +154,7 @@
 {
   // consider the token from parent window more reliable (fresher) than in framed window
   // it's because keep-alive is not requested in frames
-  return (window.parent && parent.rcmail && parent.rcmail.env.files_token) || rcmail.env.files_token;
+  return window.parent && parent.rcmail && parent.rcmail.env.files_token ? parent.rcmail.env.files_token : rcmail.env.files_token;
 };
 
 // folder selection dialog
@@ -144,11 +164,20 @@
     input = $('#file-save-as-input'),
     form = $('#file-save-as'),
     list = $('#folderlistbox'),
-    buttons = {}, label = 'saveto';
+    buttons = {}, label = 'saveto',
+    win = window, fn;
 
   // attachment is specified
   if (id) {
-    var attach = $('#attach'+id), filename = attach.attr('title') || attach.text();
+    var attach = $('#attach' + id + '> a').first(),
+      filename = attach.attr('title');
+
+    if (!filename) {
+      attach = attach.clone();
+      $('.attachment-size', attach).remove();
+      filename = attach.text();
+    }
+
     form.show();
     dialog.addClass('saveas');
     input.val(filename);
@@ -166,6 +195,8 @@
     label = 'saveall';
   }
 
+  $('#foldercreatelink').attr('tabindex', 0);
+
   buttons[rcmail.gettext('kolab_files.save')] = function () {
     var lock = rcmail.set_busy(true, 'saving'),
       request = {
@@ -181,12 +212,20 @@
     }
 
     rcmail.http_post('plugin.kolab_files', request, lock);
-    dialog.dialog('destroy').hide();
+    kolab_dialog_close(this);
   };
+
   buttons[rcmail.gettext('kolab_files.cancel')] = function () {
-    dialog.dialog('destroy').hide();
+    kolab_dialog_close(this);
   };
 
+  if (!rcmail.env.folders_loaded) {
+    fn = function() {
+      file_api.folder_list();
+      rcmail.env.folders_loaded = true;
+    };
+  }
+
   // show dialog window
   kolab_dialog_show(dialog, {
     title: rcmail.gettext('kolab_files.' + label),
@@ -195,11 +234,14 @@
     minHeight: 300,
     height: 350,
     width: 300
-  });
+  }, fn);
 
-  if (!rcmail.env.folders_loaded) {
-    file_api.folder_list();
-    rcmail.env.folders_loaded = true;
+  // "enable" folder creation when dialog is displayed in parent window
+  if (rcmail.is_framed() && !parent.rcmail.folder_create) {
+    parent.rcmail.enable_command('folder-create', true);
+    parent.rcmail.folder_create = function() {
+      win.kolab_files_folder_create_dialog();
+    };
   }
 };
 
@@ -214,7 +256,7 @@
       list.push($(this).data('file'));
     });
 
-    dialog.dialog('destroy').hide();
+    kolab_dialog_close(this);
 
     if (list.length) {
       // display upload indicator and cancel button
@@ -232,8 +274,9 @@
       });
     }
   };
+
   buttons[rcmail.gettext('kolab_files.cancel')] = function () {
-    dialog.dialog('destroy').hide();
+    kolab_dialog_close(this);
   };
 
   // show dialog window
@@ -250,8 +293,9 @@
     file_api.folder_list();
     rcmail.env.files_loaded = true;
   }
-  else
+  else {
     rcmail.file_list.clear_selection();
+  }
 };
 
 function kolab_files_attach_menu_open(p)
@@ -286,10 +330,11 @@
     folder += name;
 
     file_api.folder_create(folder);
-    dialog.dialog('destroy').hide();
+    kolab_dialog_close(this);
   };
+
   buttons[rcmail.gettext('kolab_files.cancel')] = function () {
-    dialog.dialog('destroy').hide();
+    kolab_dialog_close(this);
   };
 
   // show dialog window
@@ -338,10 +383,10 @@
     // @TODO: now we only update filename
     if (name != file)
       file_api.file_rename(file, name);
-    dialog.dialog('destroy').hide();
+    kolab_dialog_close(this);
   };
   buttons[rcmail.gettext('kolab_files.cancel')] = function () {
-    dialog.dialog('destroy').hide();
+    kolab_dialog_close(this);
   };
 
   // Fix submitting form with Enter
@@ -354,11 +399,11 @@
   });
 };
 
-function kolab_dialog_show(dialog, params)
+function kolab_dialog_show(content, params, onopen)
 {
   params = $.extend({
     modal: true,
-    resizable: !bw.ie6,
+    resizable: true,
     closeOnEscape: (!bw.ie6 && !bw.ie7),  // disabled for performance reasons
     minWidth: 400,
     minHeight: 300,
@@ -366,7 +411,36 @@
     height: 400
   }, params || {});
 
-  dialog.dialog(params).show();
+  // dialog close handler
+  params.close = function(e, ui) {
+    var elem, stack = rcmail.dialog_stack;
+
+    content.appendTo(document.body).hide();
+    $(this).parent().remove(); // remove dialog
+
+    // focus previously focused element (guessed)
+    stack.pop();
+    if (stack.length) {
+      elem = stack[stack.length-1].find('input[type!="hidden"]:not(:hidden):first');
+      if (!elem.length)
+        elem = stack[stack.length-1].parent().find('a[role="button"], .ui-dialog-buttonpane button').first();
+    }
+
+    (elem && elem.length ? elem : window).focus();
+  };
+
+  // display it as popup
+  var dialog = rcmail.show_popup_dialog('', params.title, params.buttons, params);
+
+  content.appendTo(dialog).show().find('input[type!="hidden"]:not(:hidden):first').focus();
+
+  if (onopen) onopen(content);
+
+  // save dialog reference, to handle focus when closing one of opened dialogs
+  if (!rcmail.dialog_stack)
+    rcmail.dialog_stack = [];
+
+  rcmail.dialog_stack.push(dialog);
 };
 
 // Handle form submit with Enter key, click first dialog button instead
@@ -376,6 +450,12 @@
   return false;
 };
 
+// Hides dialog
+function kolab_dialog_close(dialog)
+{
+  (rcmail.is_framed() ? window.parent : window).$(dialog).dialog('close');
+};
+
 // smart upload button
 function kolab_files_upload_input(button)
 {
@@ -387,7 +467,7 @@
     file.css({top: (e.pageY - offset.top - 10) + 'px', left: (e.pageX - offset.left - 10) + 'px'});
   }
 
-  file.attr({name: 'file[]', type: 'file', multiple: 'multiple', size: 5, title: link.attr('title')})
+  file.attr({name: 'file[]', type: 'file', multiple: 'multiple', size: 5, title: link.attr('title'), tabindex: "-1"})
     .change(function() { rcmail.files_upload('#filesuploadform'); })
     .click(function() { setTimeout(function() { link.mouseleave(); }, 20); })
     // opacity:0 does the trick, display/visibility doesn't work
@@ -559,6 +639,17 @@
   rcmail.enable_command('files-open', rcmail.env.viewer);
 };
 
+kolab_files_list_keypress = function(list)
+{
+  if (list.modkey == CONTROL_KEY)
+    return;
+
+  if (list.key_pressed == list.ENTER_KEY)
+    rcmail.command('files-open');
+  else if (list.key_pressed == list.DELETE_KEY || list.key_pressed == list.BACKSPACE_KEY)
+    rcmail.command('files-delete');
+};
+
 kolab_files_drag_end = function(e)
 {
   var folder = $('#files-folder-list li.droptarget').removeClass('droptarget');
@@ -771,6 +862,11 @@
   this.set_quota(p);
 };
 
+rcube_webmail.prototype.folder_create = function()
+{
+  kolab_files_folder_create_dialog();
+};
+
 
 /**********************************************************/
 /*********          Files API handler            **********/
@@ -830,6 +926,12 @@
       list = $('<ul class="listing"></ul>'),
       collections = !rcmail.env.action.match(/^(preview|show)$/) ? ['audio', 'video', 'image', 'document'] : [];
 
+    // try parent window if the list element does not exist
+    // i.e. called from dialog in parent window
+    if (!elem.length && window.parent && parent.rcmail) {
+      elem = $('#files-folder-list', window.parent.document.body);
+    }
+
     elem.html('').append(list);
 
     this.env.folders = this.folder_list_parse(response.result);
@@ -848,7 +950,9 @@
       if (f.virtual)
         row.addClass('virtual');
       else
-        row.click(function() { file_api.folder_select(i); })
+        row.attr('tabindex', 0)
+          .keypress(function(e) { if (e.which == 13 || e.which == 32) file_api.folder_select(i); })
+          .click(function() { file_api.folder_select(i); })
           .mouseenter(function() {
             if (rcmail.file_list && rcmail.file_list.drag_active && !$(this).hasClass('selected'))
               $(this).addClass('droptarget');
@@ -868,7 +972,7 @@
     $.each(collections, function(i, n) {
       var row = $('<li class="mailbox collection ' + n + '"></li>');
 
-      row.attr('id', 'folder-collection-' + n)
+      row.attr({id: 'folder-collection-' + n, tabindex: 0})
         .append($('<span class="name"></span>').text(rcmail.gettext('kolab_files.collection_' + n)))
         .click(function() { file_api.folder_select(n, true); });
 
@@ -889,11 +993,17 @@
 
   this.folder_select = function(folder, is_collection)
   {
-    var list = $('#files-folder-list > ul');
-
     if (rcmail.busy)
       return;
 
+    var list = $('#files-folder-list > ul');
+
+    // try parent window if the list element does not exist
+    // i.e. called from dialog in parent window
+    if (!list.length && window.parent && parent.rcmail) {
+      list = $('#files-folder-list > ul', window.parent.document.body);
+    }
+
     $('li.selected', list).removeClass('selected');
 
     rcmail.enable_command('files-list', true);
@@ -1462,11 +1572,23 @@
   // file upload request
   this.file_upload = function(form)
   {
-    var form = $(form),
+    var i, size = 0, maxsize = rcmail.env.files_max_upload,
+      form = $(form),
       field = $('input[type=file]', form).get(0),
       files = field.files ? field.files.length : field.value ? 1 : 0;
 
     if (files) {
+      // check upload max size
+      if (field.files && maxsize) {
+        for (i=0; i < files; i++)
+          size += field.files[i].size;
+
+        if (size > maxsize) {
+          alert(rcmail.get_label('kolab_files.uploadsizeerror').replace('$size', this.file_size(maxsize)));
+          return;
+        }
+      }
+
       // submit form and read server response
       this.file_upload_form(form, 'file_upload', function(event) {
         var doc, response;

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

@@ -298,7 +298,7 @@
 
         $thead = '';
         foreach ($this->file_list_head($attrib, $a_show_cols) as $cell) {
-            $thead .= html::tag('td', array('class' => $cell['className'], 'id' => $cell['id']), $cell['html']);
+            $thead .= html::tag('th', array('class' => $cell['className'], 'id' => $cell['id']), $cell['html']);
         }
 
         return html::tag('table', $attrib,
@@ -332,14 +332,21 @@
             $a_sort_cols = $this->sort_cols;
 
         if (!empty($attrib['optionsmenuicon'])) {
-            $onclick = 'return ' . JS_OBJECT_NAME . ".command('menu-open', 'filelistmenu')";
-            if ($attrib['optionsmenuicon'] === true || $attrib['optionsmenuicon'] == 'true')
-                $list_menu = html::div(array('onclick' => $onclick, 'class' => 'listmenu',
-                    'id' => 'listmenulink', 'title' => $this->rc->gettext('listoptions')));
-            else
-                $list_menu = html::a(array('href' => '#', 'onclick' => $onclick),
-                    html::img(array('src' => $skin_path . $attrib['optionsmenuicon'],
-                        'id' => 'listmenulink', 'title' => $this->rc->gettext('listoptions'))));
+            $onclick = 'return ' . JS_OBJECT_NAME . ".command('menu-open', 'filelistmenu', this, event)";
+            $inner   = $this->rc->gettext('listoptions');
+
+            if (is_string($attrib['optionsmenuicon']) && $attrib['optionsmenuicon'] != 'true') {
+                $inner = html::img(array('src' => $skin_path . $attrib['optionsmenuicon'], 'alt' => $RCMAIL->gettext('listoptions')));
+            }
+
+            $list_menu = html::a(array(
+                'href'     => '#list-options',
+                'onclick'  => $onclick,
+                'class'    => 'listmenu',
+                'id'       => 'listmenulink',
+                'title'    => $this->rc->gettext('listoptions'),
+                'tabindex' => '0',
+            ), $inner);
         }
         else {
             $list_menu = '';
@@ -623,7 +630,7 @@
     {
         $this->plugin->add_label(
             'folderdeleting', 'folderdeleteconfirm', 'folderdeletenotice',
-            'uploading', 'attaching',
+            'uploading', 'attaching', 'uploadsizeerror',
             'filedeleting', 'filedeletenotice', 'filedeleteconfirm',
             'filemoving', 'filemovenotice', 'filemoveconfirm', 'filecopying', 'filecopynotice',
             'collection_audio', 'collection_video', 'collection_image', 'collection_document',
@@ -633,6 +640,7 @@
         $this->rc->output->set_pagetitle($this->plugin->gettext('files'));
         $this->rc->output->set_env('file_mimetypes', $this->get_mimetypes());
         $this->rc->output->set_env('files_quota', $_SESSION['kolab_files_caps']['QUOTA']);
+        $this->rc->output->set_env('files_max_upload', $_SESSION['kolab_files_caps']['MAX_UPLOAD']);
         $this->rc->output->send('kolab_files.files');
     }

roundcubemail-plugins-kolab-3.2.tar.gz/plugins/kolab_files/localization/ca_ES.inc Added

roundcubemail-plugins-kolab-3.2.tar.gz/plugins/kolab_files/localization/da_DK.inc Added

@@ -0,0 +1,62 @@
+<?php
+$labels['files'] = 'Filer';
+$labels['saveall'] = 'Gem alle i skyen...';
+$labels['saveto'] = 'Gem i skyen...';
+$labels['saveas'] = 'Gem som:';
+$labels['create'] = 'Opret';
+$labels['save'] = 'Gem';
+$labels['cancel'] = 'Annullér';
+$labels['fromcloud'] = 'Fra sky...';
+$labels['selectfiles'] = 'Vælg fil(er) til vedhæftning...';
+$labels['attachsel'] = 'Vedhæfte den valgte';
+$labels['foldercreate'] = 'Opret mappe';
+$labels['folderrename'] = 'Omdøb mappe';
+$labels['folderdelete'] = 'Slet mappe';
+$labels['folderinside'] = 'Indsæt indeni';
+$labels['foldername'] = 'Mappenavn';
+$labels['name'] = 'Navn';
+$labels['mtime'] = 'Ændret';
+$labels['type'] = 'Type';
+$labels['upload'] = 'Overfør';
+$labels['uploadfile'] = 'Overfør fil(er)';
+$labels['get'] = 'Hent';
+$labels['getfile'] = 'Hent fil';
+$labels['view'] = 'Vis';
+$labels['viewfile'] = 'Vis fil';
+$labels['rename'] = 'Omdøb fil';
+$labels['deletefile'] = 'Slet fil(er)';
+$labels['edit'] = 'Redigér';
+$labels['editfile'] = 'Redigér fil';
+$labels['save'] = 'Gem';
+$labels['savefile'] = 'Gem fil';
+$labels['printfile'] = 'Udskriv fil';
+$labels['fileedit'] = 'Filegenskaber';
+$labels['collection_audio'] = 'Lyd';
+$labels['collection_video'] = 'Video';
+$labels['collection_image'] = 'Billeder';
+$labels['collection_document'] = 'Dokumenter';
+$labels['uploading'] = 'Overfører fil(er)..';
+$labels['attaching'] = 'Vedhæfter fil(er)..';
+$labels['foldercreating'] = 'Opretter mappe...';
+$labels['folderdeleting'] = 'Sletter mappe...';
+$labels['folderdeleteconfirm'] = 'Er du sikker på at du vil slette valgte mappe?';
+$labels['folderdeletenotice'] = 'Sletningen af mappe blev gennemført.';
+$labels['foldercreatenotice'] = 'Oprettelsen af mappe blev gennemført.';
+$labels['saveallnotice'] = 'Gennemførte lagring af $n fil(er).';
+$labels['saveallerror'] = 'Lagringen af $n fil(er) mislykkedes.';
+$labels['attacherror'] = 'Mislykkedes med at vedhæfte fil(er) fra skyen';
+$labels['fileupdating'] = 'Opdaterer fil...';
+$labels['filemoving'] = 'Flytter fil(er)...';
+$labels['filecopying'] = 'Kopierer fil(er)...';
+$labels['filedeleting'] = 'Sletter fil(er)...';
+$labels['filedeleteconfirm'] = 'Er du sikker på du vil slette valgte filer?';
+$labels['filedeletenotice'] = 'Sletningen af fil(er) blev gennemført.';
+$labels['filemovenotice'] = 'Flytning af fil(er) blev gennemført.';
+$labels['filecopynotice'] = 'Kopiering af fil(er) blev gennemført.';
+$labels['allfolders'] = 'søg i alle mapper';
+$labels['fileskip'] = 'Spring over';
+$labels['fileskipall'] = 'Spring alle over';
+$labels['fileoverwrite'] = 'Overskriv';
+$labels['fileoverwriteall'] = 'Overskriv alle';
+$labels['filemoveconfirm'] = 'Denne handling vil overskrive destinationsfilen: <b>$file</b>.';
+?>

roundcubemail-plugins-kolab-3.2.tar.gz/plugins/kolab_files/localization/de_CH.inc Changed

roundcubemail-plugins-kolab-3.2.tar.gz/plugins/kolab_files/localization/de_DE.inc Changed

@@ -1,9 +1,62 @@
 <?php
 $labels['files'] = 'Dateien';
+$labels['saveall'] = 'Alle in die Cloud speichern...';
+$labels['saveto'] = 'In die Cloud speichern...';
+$labels['saveas'] = 'Speichern als:';
+$labels['create'] = 'Erstellen';
 $labels['save'] = 'Speichern';
 $labels['cancel'] = 'Abbrechen';
+$labels['fromcloud'] = 'Aus der Cloud...';
+$labels['selectfiles'] = 'Datei(en) zum Anhängen auswählen...';
+$labels['attachsel'] = 'Ausgewählte anhängen';
+$labels['foldercreate'] = 'Ordner erstellen';
+$labels['folderrename'] = 'Ordner umbenennen';
+$labels['folderdelete'] = 'Ordner löschen';
 $labels['folderinside'] = 'Erstellen in';
+$labels['foldername'] = 'Ordnername';
 $labels['name'] = 'Name';
+$labels['mtime'] = 'Geändert';
+$labels['type'] = 'Typ';
+$labels['upload'] = 'Hochladen';
+$labels['uploadfile'] = 'Datei(en) hochladen';
+$labels['get'] = 'Herunterladen';
+$labels['getfile'] = 'Datei herunterladen';
+$labels['view'] = 'Ansehen';
+$labels['viewfile'] = 'Datei ansehen';
+$labels['rename'] = 'Datei umbenennen';
+$labels['deletefile'] = 'Datei(en) löschen';
 $labels['edit'] = 'Bearbeiten';
+$labels['editfile'] = 'Datei bearbeiten';
 $labels['save'] = 'Speichern';
+$labels['savefile'] = 'Datei speichern';
+$labels['printfile'] = 'Datei drucken';
+$labels['fileedit'] = 'Dateieigenschaften';
+$labels['collection_audio'] = 'Audio';
+$labels['collection_video'] = 'Video';
+$labels['collection_image'] = 'Bilder';
+$labels['collection_document'] = 'Dokumente';
+$labels['uploading'] = 'Lade Datei(en) hoch...';
+$labels['attaching'] = 'Hänge Datei(en) an...';
+$labels['foldercreating'] = 'Erstelle Ordner...';
+$labels['folderdeleting'] = 'Lösche Ordner...';
+$labels['folderdeleteconfirm'] = 'Sind Sie sicher, dass Sie den gewählten Ordner löschen möchten?';
+$labels['folderdeletenotice'] = 'Ordner erfolgreich gelöscht.';
+$labels['foldercreatenotice'] = 'Ordner erfolgreich erstellt.';
+$labels['saveallnotice'] = '$n Datei(en) erfolgreich gespeichert.';
+$labels['saveallerror'] = 'Speichern von $n Datei(en) fehlgeschlagen.';
+$labels['attacherror'] = 'Anhängen von Datei(en) aus der Cloud fehlgeschlagen.';
+$labels['fileupdating'] = 'Aktualisiere Datei...';
+$labels['filemoving'] = 'Verschiebe Datei(en)...';
+$labels['filecopying'] = 'Kopiere Datei(en)...';
+$labels['filedeleting'] = 'Lösche Datei(en)...';
+$labels['filedeleteconfirm'] = 'Sind Sie sicher, dass Sie die gewählten Dateien löschen möchten?';
+$labels['filedeletenotice'] = 'Datei(en) erfolgreich gelöscht.';
+$labels['filemovenotice'] = 'Datei(en) erfolgreich verschoben.';
+$labels['filecopynotice'] = 'Datei(en) erfolgreich kopiert.';
+$labels['allfolders'] = 'suche in allen Ordnern';
+$labels['fileskip'] = 'Überspringen';
+$labels['fileskipall'] = 'Alle überspringen';
+$labels['fileoverwrite'] = 'Überschreiben';
+$labels['fileoverwriteall'] = 'Alle überschreiben';
+$labels['filemoveconfirm'] = 'Diese Aktion wird die Zieldatei <b>$file</b> überschreiben.';
 ?>

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

@@ -1,6 +1,7 @@
 <?php
 
 $labels['files'] = 'Files';
+$labels['filepreview'] = 'File preview';
 $labels['saveall'] = 'Save all to cloud...';
 $labels['saveto'] = 'Save to cloud...';
 $labels['saveas'] = 'Save as:';
@@ -58,6 +59,7 @@
 $labels['filedeletenotice'] = 'File(s) deleted successfully.';
 $labels['filemovenotice'] = 'File(s) moved successfully.';
 $labels['filecopynotice'] = 'File(s) copied successfully.';
+$labels['uploadsizeerror'] = 'Maximum file size ($size) exceeded!';
 
 $labels['allfolders'] = 'search in all folders';
 $labels['fileskip'] = 'Skip';
@@ -66,4 +68,17 @@
 $labels['fileoverwriteall'] = 'Overwrite all';
 $labels['filemoveconfirm'] = 'This action is going to overwrite the destination file: <b>$file</b>.';
 
+$labels['arialabelsearchform'] = 'Files search form';
+$labels['arialabelquicksearchbox'] = 'Search input';
+$labels['arialabellistoptions'] = 'Files list options';
+$labels['arialabelfolderoptions'] = 'Folder actions';
+$labels['arialabelfileeditform'] = 'File editing form';
+$labels['arialabelfoldercreateform'] = 'Folder creation form';
+$labels['arialabelfolderlist'] = 'Folder/Collection selection';
+$labels['arialabelfileselectdialog'] = 'File selection dialog';
+$labels['arialabelattachmentoptions'] = 'Attachment save options';
+$labels['arialabelfilesavedialog'] = 'File(s) saving dialog';
+$labels['arialabelfileprops'] = 'File properties';
+$labels['arialabelfilecontent'] = 'File content';
+
 ?>

roundcubemail-plugins-kolab-3.2.tar.gz/plugins/kolab_files/localization/es_ES.inc Changed

roundcubemail-plugins-kolab-3.2.tar.gz/plugins/kolab_files/localization/et_EE.inc Changed

roundcubemail-plugins-kolab-3.2.tar.gz/plugins/kolab_files/localization/fi_FI.inc Added

@@ -0,0 +1,61 @@
+<?php
+$labels['files'] = 'Tiedostot';
+$labels['saveall'] = 'Tallenna kaikki pilveen...';
+$labels['saveto'] = 'Tallenna pilveen...';
+$labels['saveas'] = 'Tallenna nimellä:';
+$labels['create'] = 'Luo';
+$labels['save'] = 'Tallenna';
+$labels['cancel'] = 'Peru';
+$labels['fromcloud'] = 'Pilvestä...';
+$labels['selectfiles'] = 'Valitse yksi tai useampi liitettävä tiedosto...';
+$labels['attachsel'] = 'Liitä valitut';
+$labels['foldercreate'] = 'Luo kansio';
+$labels['folderrename'] = 'Nimeä kansio uudelleen';
+$labels['folderdelete'] = 'Poista kansio';
+$labels['foldername'] = 'Kansion nimi';
+$labels['name'] = 'Nimi';
+$labels['mtime'] = 'Muokattu';
+$labels['type'] = 'Tyyppi';
+$labels['upload'] = 'Lähetä';
+$labels['uploadfile'] = 'Lähetä yksi tai useampi tiedosto';
+$labels['get'] = 'Lataa';
+$labels['getfile'] = 'Lataa tiedosto';
+$labels['view'] = 'Näytä';
+$labels['viewfile'] = 'Näytä tiedosto';
+$labels['rename'] = 'Muuta tiedoston nimeä';
+$labels['deletefile'] = 'Poista yksi tai useampi tiedosto';
+$labels['edit'] = 'Muokkaa';
+$labels['editfile'] = 'Muokkaa tiedostoa';
+$labels['save'] = 'Tallenna';
+$labels['savefile'] = 'Tallenna tiedosto';
+$labels['printfile'] = 'Tulosta tiedosto';
+$labels['fileedit'] = 'Tiedoston ominaisuudet';
+$labels['collection_audio'] = 'Ääni';
+$labels['collection_video'] = 'Video';
+$labels['collection_image'] = 'Kuvat';
+$labels['collection_document'] = 'Asiakirjat';
+$labels['uploading'] = 'Lähetetään tiedostoja...';
+$labels['attaching'] = 'Liitetään tiedostoja...';
+$labels['foldercreating'] = 'Luodaan kansiota...';
+$labels['folderdeleting'] = 'Poistetaan kansiota...';
+$labels['folderdeleteconfirm'] = 'Haluatko varmasti poistaa valitun kansion?';
+$labels['folderdeletenotice'] = 'Kansio poistettu onnistuneesti.';
+$labels['foldercreatenotice'] = 'Kansio luotu onnistuneesti.';
+$labels['saveallnotice'] = '$n tiedosto(a) tallennettiin onnistuneesti.';
+$labels['saveallerror'] = '$n tiedoston tallentaminen epäonnistui.';
+$labels['attacherror'] = 'Tiedostojen liittäminen pilvestä epäonnistui';
+$labels['fileupdating'] = 'Päivitetään tiedostoa...';
+$labels['filemoving'] = 'Siirretään tiedosto(ja)...';
+$labels['filecopying'] = 'Kopioidaan tiedosto(ja)...';
+$labels['filedeleting'] = 'Poistetaan tiedosto(ja)...';
+$labels['filedeleteconfirm'] = 'Haluatko varmasti poistaa valitut tiedostot?';
+$labels['filedeletenotice'] = 'Tiedosto(t) poistettiin onnistuneesti.';
+$labels['filemovenotice'] = 'Tiedosto(t) siirrettiin onnistuneesti.';
+$labels['filecopynotice'] = 'Tiedosto(t) kopioitiin onnistuneesti.';
+$labels['allfolders'] = 'etsi kaikista kansioista';
+$labels['fileskip'] = 'Ohita';
+$labels['fileskipall'] = 'Ohita kaikki';
+$labels['fileoverwrite'] = 'Korvaa';
+$labels['fileoverwriteall'] = 'Korvaa kaikki';
+$labels['filemoveconfirm'] = 'Tämä toiminto korvaa kohdetiedoston: <b>$file</b>.';
+?>

roundcubemail-plugins-kolab-3.2.tar.gz/plugins/kolab_files/localization/fr_FR.inc Changed

@@ -1,10 +1,62 @@
 <?php
 $labels['files'] = 'Fichiers';
+$labels['saveall'] = 'Enregistrer tout dans le nuage...';
+$labels['saveto'] = 'Enregistrer dans le nuage...';
+$labels['saveas'] = 'Enregistrer sous:';
+$labels['create'] = 'Créer';
 $labels['save'] = 'Enregistrer';
 $labels['cancel'] = 'Annuler';
+$labels['fromcloud'] = 'Depuis le nuage...';
+$labels['selectfiles'] = 'Sélectionnez le(s) fichier(s) à attacher..';
+$labels['attachsel'] = 'Attachement sélectionné';
+$labels['foldercreate'] = 'Nouveau répertoire';
+$labels['folderrename'] = 'Renommer le répertoire';
+$labels['folderdelete'] = 'Supprimer le répertoire';
 $labels['folderinside'] = 'Ajouter à l\'intérieur';
+$labels['foldername'] = 'Nom du répertoire';
 $labels['name'] = 'Nom';
+$labels['mtime'] = 'Modifié';
 $labels['type'] = 'Type';
+$labels['upload'] = 'Téléverser';
+$labels['uploadfile'] = 'Téléversement de fichier(s)';
+$labels['get'] = 'Télécharger';
+$labels['getfile'] = 'Téléchargement de fichier(s)';
+$labels['view'] = 'Voir';
+$labels['viewfile'] = 'Voir le fichier';
+$labels['rename'] = 'Renommer le fichier';
+$labels['deletefile'] = 'Supprimer le(s) fichier(s)';
 $labels['edit'] = 'Modifier';
+$labels['editfile'] = 'Modifier le fichier';
 $labels['save'] = 'Enregistrer';
+$labels['savefile'] = 'Sauvegarder le fichier';
+$labels['printfile'] = 'Imprimer le fichier';
+$labels['fileedit'] = 'Propriétés du fichier';
+$labels['collection_audio'] = 'Son';
+$labels['collection_video'] = 'Vidéo';
+$labels['collection_image'] = 'Images';
+$labels['collection_document'] = 'Documents';
+$labels['uploading'] = 'Téléversement de(s) fichier(s)...';
+$labels['attaching'] = 'Attachement de fichier(s)...';
+$labels['foldercreating'] = 'Création d\'un répertoire...';
+$labels['folderdeleting'] = 'Suppression d\'un répertoire...';
+$labels['folderdeleteconfirm'] = 'Êtes-vous sûr de de vouloir supprimer le répertoire sélectionné ?';
+$labels['folderdeletenotice'] = 'Le répertoire a été supprimé.';
+$labels['foldercreatenotice'] = 'Le répertoire a été créé.';
+$labels['saveallnotice'] = '$n fichier(s) ont été sauvegardé(s)';
+$labels['saveallerror'] = 'La sauvegarde de $n fichier(s) a échoué.';
+$labels['attacherror'] = 'L\'attachement de fichier(s) depuis le nuage a échoué';
+$labels['fileupdating'] = 'Modification du fichier...';
+$labels['filemoving'] = 'Déplacement de fichier(s)...';
+$labels['filecopying'] = 'Copie de fichier(s)...';
+$labels['filedeleting'] = 'Suppression de fichier(s)...';
+$labels['filedeleteconfirm'] = 'Êtes-vous sûr de de vouloir supprimer les fichiers sélectionnés ?';
+$labels['filedeletenotice'] = 'Le(s) fichier(s) ont été supprimé(s).';
+$labels['filemovenotice'] = 'Le(s) fichier(s) ont été déplacé(s).';
+$labels['filecopynotice'] = 'Le(s) fichier(s) ont été copié(s).';
+$labels['allfolders'] = 'Recherche dans tous les répertoires';
+$labels['fileskip'] = 'Ignorer';
+$labels['fileskipall'] = 'Ignorer tout';
+$labels['fileoverwrite'] = 'Écraser';
+$labels['fileoverwriteall'] = 'Écraser tout';
+$labels['filemoveconfirm'] = 'Cette action va écraser le fichier de destination : <b>$file</b>.';
 ?>

roundcubemail-plugins-kolab-3.2.tar.gz/plugins/kolab_files/localization/hu_HU.inc Changed

@@ -1,5 +1,62 @@
 <?php
+$labels['files'] = 'Fájlfelhő';
+$labels['saveall'] = 'Csatolmányok mentése a felhőbe...';
+$labels['saveto'] = 'Mentés a felhőbe...';
+$labels['saveas'] = 'Fájlnév:';
+$labels['create'] = 'Létrehozás';
 $labels['save'] = 'Mentés';
 $labels['cancel'] = 'Mégse';
+$labels['fromcloud'] = 'Fájlfelhőből...';
+$labels['selectfiles'] = 'Csatolmányok kiválasztása...';
+$labels['attachsel'] = 'Jelölt fájlok csatolása';
+$labels['foldercreate'] = 'Mappa létrehozása';
+$labels['folderrename'] = 'Mappa átnevezése';
+$labels['folderdelete'] = 'Mappa törlése';
+$labels['folderinside'] = 'Almappa ide';
+$labels['foldername'] = 'Mappa neve';
+$labels['name'] = 'Név';
+$labels['mtime'] = 'Módosítva';
+$labels['type'] = 'Típus';
+$labels['upload'] = 'Feltöltés';
+$labels['uploadfile'] = 'Fájlok feltöltése';
+$labels['get'] = 'Letöltés';
+$labels['getfile'] = 'Fájlok letöltése';
+$labels['view'] = 'Megtekintés';
+$labels['viewfile'] = 'Fájl megtekintése';
+$labels['rename'] = 'Átnevezés';
+$labels['deletefile'] = 'Fájlok törlése';
+$labels['edit'] = 'Szerkesztés';
+$labels['editfile'] = 'Fájl szerkesztése';
 $labels['save'] = 'Mentés';
+$labels['savefile'] = 'Fájl mentése';
+$labels['printfile'] = 'Fájl nyomtatása';
+$labels['fileedit'] = 'Fájl tulajdonságai';
+$labels['collection_audio'] = 'Hangfájlok';
+$labels['collection_video'] = 'Videó fájlok';
+$labels['collection_image'] = 'Képek';
+$labels['collection_document'] = 'Dokumentumok';
+$labels['uploading'] = 'Feltöltés...';
+$labels['attaching'] = 'Csatolás...';
+$labels['foldercreating'] = 'Mappa létrehozása...';
+$labels['folderdeleting'] = 'Mappa törlése...';
+$labels['folderdeleteconfirm'] = 'Biztos benne, hogy törölni szeretné a kijelölt mappát?';
+$labels['folderdeletenotice'] = 'Mappa törlése sikeres.';
+$labels['foldercreatenotice'] = 'Mappa létrehozása sikeres.';
+$labels['saveallnotice'] = '$n fájl mentése sikeres.';
+$labels['saveallerror'] = '$n fájl mentése nem sikerült.';
+$labels['attacherror'] = 'Nem sikerült csatolni a fájlfelhőből';
+$labels['fileupdating'] = 'Fájl frissítése...';
+$labels['filemoving'] = 'Áthelyezés...';
+$labels['filecopying'] = 'Fájlmásolás...';
+$labels['filedeleting'] = 'Fájltörlés...';
+$labels['filedeleteconfirm'] = 'Biztos benne, hogy törölni szeretné a kijelölt fájlokat?';
+$labels['filedeletenotice'] = 'Törlés sikeres.';
+$labels['filemovenotice'] = 'Áthelyezés sikeres.';
+$labels['filecopynotice'] = 'Másolás sikeres.';
+$labels['allfolders'] = 'keresés minden mappában';
+$labels['fileskip'] = 'Kihagyás';
+$labels['fileskipall'] = 'Mindegyik kihagyása';
+$labels['fileoverwrite'] = 'Felülírás';
+$labels['fileoverwriteall'] = 'Mindegyik felülírása';
+$labels['filemoveconfirm'] = 'Ezzel a művelettel felülíródik a fájl: <b>$file</b>.';
 ?>

roundcubemail-plugins-kolab-3.2.tar.gz/plugins/kolab_files/localization/it_IT.inc Changed

@@ -1,5 +1,61 @@
 <?php
+$labels['files'] = 'File';
+$labels['saveall'] = 'Salva tutti nel cloud...';
+$labels['saveto'] = 'Salva nel cloud...';
+$labels['saveas'] = 'Salva come:';
+$labels['create'] = 'Crea';
 $labels['save'] = 'Salva';
 $labels['cancel'] = 'Annulla';
+$labels['fromcloud'] = 'Dal cloud...';
+$labels['selectfiles'] = 'Seleziona file da allegare...';
+$labels['attachsel'] = 'Allega selezionati';
+$labels['foldercreate'] = 'Crea cartella';
+$labels['folderrename'] = 'Rinomina cartella';
+$labels['folderdelete'] = 'Elimina cartella';
+$labels['folderinside'] = 'Inserisci dentro';
+$labels['foldername'] = 'Nome cartella';
+$labels['name'] = 'Nome';
+$labels['mtime'] = 'Modificato';
+$labels['type'] = 'Tipo';
+$labels['upload'] = 'Carica';
+$labels['uploadfile'] = 'Carica file';
+$labels['get'] = 'Scarica';
+$labels['getfile'] = 'Scarica file';
+$labels['view'] = 'Visualizza';
+$labels['viewfile'] = 'Visualizza file';
+$labels['rename'] = 'Rinomina file';
+$labels['deletefile'] = 'Elimina file';
+$labels['edit'] = 'Modifica';
+$labels['editfile'] = 'Modifica file';
 $labels['save'] = 'Salva';
+$labels['savefile'] = 'Salva file';
+$labels['printfile'] = 'Stampa file';
+$labels['fileedit'] = 'Proprietà file';
+$labels['collection_audio'] = 'Audio';
+$labels['collection_video'] = 'Video';
+$labels['collection_image'] = 'Immagini';
+$labels['collection_document'] = 'Documenti';
+$labels['uploading'] = 'Caricamento file...';
+$labels['foldercreating'] = 'Creazione cartella...';
+$labels['folderdeleting'] = 'Eliminazione cartella...';
+$labels['folderdeleteconfirm'] = 'Sei sicuro di voler eliminare la cartella selezionata?';
+$labels['folderdeletenotice'] = 'Cartella eliminata correttamente.';
+$labels['foldercreatenotice'] = 'Cartella creata correttamente.';
+$labels['saveallnotice'] = '$n file salvati correttamente.';
+$labels['saveallerror'] = 'Salvataggio di $n file fallito.';
+$labels['attacherror'] = 'Impossibile allegare file dal cloud';
+$labels['fileupdating'] = 'Aggiornamento file...';
+$labels['filemoving'] = 'Spostamento file...';
+$labels['filecopying'] = 'Copia file...';
+$labels['filedeleting'] = 'Eliminazione file...';
+$labels['filedeleteconfirm'] = 'Sei sicuro di voler eliminare i file selezionati?';
+$labels['filedeletenotice'] = 'File eliminati correttamente.';
+$labels['filemovenotice'] = 'File spostati correttamente.';
+$labels['filecopynotice'] = 'File copiati correttamente.';
+$labels['allfolders'] = 'cerca in tutte le cartelle';
+$labels['fileskip'] = 'Salta';
+$labels['fileskipall'] = 'Salta tutti';
+$labels['fileoverwrite'] = 'Sovrascrivi';
+$labels['fileoverwriteall'] = 'Sovrascrivi tutti';
+$labels['filemoveconfirm'] = 'Questa azione sovrascriverà i file di destinazione: <b>$file</b>.';
 ?>

roundcubemail-plugins-kolab-3.2.tar.gz/plugins/kolab_files/localization/nl_NL.inc Changed

@@ -1,9 +1,62 @@
 <?php
 $labels['files'] = 'Bestanden';
+$labels['saveall'] = 'Sla alles op in de cloud...';
+$labels['saveto'] = 'Sla op in de cloud...';
+$labels['saveas'] = 'Opslaan als:';
+$labels['create'] = 'Creëer';
 $labels['save'] = 'Opslaan';
 $labels['cancel'] = 'Annuleren';
-$labels['foldername'] = 'Folder naam';
+$labels['fromcloud'] = 'Uit de cloud...';
+$labels['selectfiles'] = 'Selecteer bestand(en) om toe te voegen...';
+$labels['attachsel'] = 'Voeg het geselekteerde toe';
+$labels['foldercreate'] = 'Creëer map';
+$labels['folderrename'] = 'Hernoem map';
+$labels['folderdelete'] = 'Verwijder map';
+$labels['folderinside'] = 'Insert inside';
+$labels['foldername'] = 'Map naam';
 $labels['name'] = 'Naam';
+$labels['mtime'] = 'Gewijzigd';
+$labels['type'] = 'Type';
+$labels['upload'] = 'Upload';
+$labels['uploadfile'] = 'Upload bestand(en)';
+$labels['get'] = 'Downloaden';
+$labels['getfile'] = 'Download bestand';
+$labels['view'] = 'Bekijken';
+$labels['viewfile'] = 'Bekijk bestand';
+$labels['rename'] = 'Hernoem bestand';
+$labels['deletefile'] = 'Verwijder bestand(en)';
 $labels['edit'] = 'Wijzigen';
+$labels['editfile'] = 'Wijzig bestand';
 $labels['save'] = 'Opslaan';
+$labels['savefile'] = 'Sla bestand op';
+$labels['printfile'] = 'Druk bestand af';
+$labels['fileedit'] = 'Eigenschappen van bestand';
+$labels['collection_audio'] = 'Geluid';
+$labels['collection_video'] = 'Video';
+$labels['collection_image'] = 'Afbeeldingen';
+$labels['collection_document'] = 'Documenten';
+$labels['uploading'] = 'Uploaden van bestand(en)...';
+$labels['attaching'] = 'Bestand(en) toevoegen...';
+$labels['foldercreating'] = 'Creëren van map...';
+$labels['folderdeleting'] = 'Verwijderen van map...';
+$labels['folderdeleteconfirm'] = 'Weet u zeker dat u de geselecteerde map wilt verwijderen?';
+$labels['folderdeletenotice'] = 'Map succesvol verwijderd.';
+$labels['foldercreatenotice'] = 'Map succesvol aangemaakt.';
+$labels['saveallnotice'] = 'Succesvol $n bestand(en) opgeslagen.';
+$labels['saveallerror'] = 'Opslaan van $n bestand(en) mislukt.';
+$labels['attacherror'] = 'Toevoegen van bestand(en) uit de cloud mislukt';
+$labels['fileupdating'] = 'Wijzigen van bestand...';
+$labels['filemoving'] = 'Verplaatsen van bestand(en)...';
+$labels['filecopying'] = 'Kopiëren van bestand(en)...';
+$labels['filedeleting'] = 'Verwijderen van bestand(en)...';
+$labels['filedeleteconfirm'] = 'Weet u zeker dat u de geselecteerde bestanden wilt verwijderen?';
+$labels['filedeletenotice'] = 'Bestand(en) succesvol verwijderd.';
+$labels['filemovenotice'] = 'Bestand(en) succesvol verplaatst.';
+$labels['filecopynotice'] = 'Bestand(en) succesvol gekopieerd.';
+$labels['allfolders'] = 'Zoek in alle mappen';
+$labels['fileskip'] = 'Overslaan';
+$labels['fileskipall'] = 'Sla allen over';
+$labels['fileoverwrite'] = 'Overschrijven';
+$labels['fileoverwriteall'] = 'Overschrijf alle';
+$labels['filemoveconfirm'] = 'Deze actie overschrijft het volgende doelbestand: <b>$file</b>.';
 ?>

roundcubemail-plugins-kolab-3.2.tar.gz/plugins/kolab_files/localization/pl_PL.inc Changed

@@ -1,8 +1,62 @@
 <?php
 $labels['files'] = 'Pliki';
+$labels['saveall'] = 'Zapisz wszystkie w chmurze...';
+$labels['saveto'] = 'Zapisz w chmurze...';
+$labels['saveas'] = 'Zapisz jako:';
+$labels['create'] = 'Utwórz';
 $labels['save'] = 'Zapisz';
 $labels['cancel'] = 'Anuluj';
+$labels['fromcloud'] = 'Z chmury...';
+$labels['selectfiles'] = 'Wybierz pliki do załączenia...';
+$labels['attachsel'] = 'Załącz wybrane';
+$labels['foldercreate'] = 'Utwórz folder';
+$labels['folderrename'] = 'Zmień nazwę folderu';
+$labels['folderdelete'] = 'Usuń folder';
+$labels['folderinside'] = 'Wstaw wewnątrz';
+$labels['foldername'] = 'Nazwa folderu';
 $labels['name'] = 'Nazwa';
+$labels['mtime'] = 'Zmodyfikowano';
+$labels['type'] = 'Typ';
+$labels['upload'] = 'Wyślij';
+$labels['uploadfile'] = 'Wyślij plik(i)';
+$labels['get'] = 'Pobierz';
+$labels['getfile'] = 'Pobierz plik';
+$labels['view'] = 'Podgląd';
+$labels['viewfile'] = 'Podgląd pliku';
+$labels['rename'] = 'Zmień nazwę pliku';
+$labels['deletefile'] = 'Usuń plik(i)';
 $labels['edit'] = 'Edytuj';
+$labels['editfile'] = 'Edytuj plik';
 $labels['save'] = 'Zapisz';
+$labels['savefile'] = 'Zapisz plik';
+$labels['printfile'] = 'Drukuj plik';
+$labels['fileedit'] = 'Właściwości pliku';
+$labels['collection_audio'] = 'Audio';
+$labels['collection_video'] = 'Video';
+$labels['collection_image'] = 'Obrazy';
+$labels['collection_document'] = 'Dokumenty';
+$labels['uploading'] = 'Zapisywanie plików...';
+$labels['attaching'] = 'Załączanie plików...';
+$labels['foldercreating'] = 'Tworzenie folderu...';
+$labels['folderdeleting'] = 'Usuwanie folderu...';
+$labels['folderdeleteconfirm'] = 'Czy na pewno chcesz usunąć wybrany folder?';
+$labels['folderdeletenotice'] = 'Folder został usunięty.';
+$labels['foldercreatenotice'] = 'Folder został utworzony.';
+$labels['saveallnotice'] = 'Pomyślnie zapisano $n plików.';
+$labels['saveallerror'] = 'Nie można zapisać $n plików.';
+$labels['attacherror'] = 'Nie udało się załączenie plików z chmury';
+$labels['fileupdating'] = 'Aktualizowanie pliku...';
+$labels['filemoving'] = 'Przenoszenie plików...';
+$labels['filecopying'] = 'Kopiowanie plików...';
+$labels['filedeleting'] = 'Usuwanie plików...';
+$labels['filedeleteconfirm'] = 'Czy na pewno chcesz usunąć wybrane pliki?';
+$labels['filedeletenotice'] = 'Plik(i) zostały usunięte.';
+$labels['filemovenotice'] = 'Plik(i) zostały przeniesione.';
+$labels['filecopynotice'] = 'Plik(i) zostały skopiowane.';
+$labels['allfolders'] = 'szukaj we wszystkich folderach';
+$labels['fileskip'] = 'Omiń';
+$labels['fileskipall'] = 'Omiń wszystkie';
+$labels['fileoverwrite'] = 'Nadpisz';
+$labels['fileoverwriteall'] = 'Nadpisz wszystkie';
+$labels['filemoveconfirm'] = 'Akcja ta nadpisze docelowy plik: <b>$file</b>.';
 ?>

roundcubemail-plugins-kolab-3.2.tar.gz/plugins/kolab_files/localization/pt_BR.inc Changed

roundcubemail-plugins-kolab-3.2.tar.gz/plugins/kolab_files/localization/ru_RU.inc Changed

@@ -1,9 +1,62 @@
 <?php
 $labels['files'] = 'Файлы';
+$labels['saveall'] = 'Сохранить всё в облако...';
+$labels['saveto'] = 'Сохранить в облако...';
+$labels['saveas'] = 'Сохранить как:';
+$labels['create'] = 'Создать';
 $labels['save'] = 'Сохранить';
 $labels['cancel'] = 'Отмена';
-$labels['folderinside'] = 'Вставить внутри';
+$labels['fromcloud'] = 'Из облака...';
+$labels['selectfiles'] = 'Выбрать файл(ы) для прикрепления...';
+$labels['attachsel'] = 'Прикрепить выбранные';
+$labels['foldercreate'] = 'Создать папку';
+$labels['folderrename'] = 'Переименовать папку';
+$labels['folderdelete'] = 'Удалить папку';
+$labels['folderinside'] = 'Вставить внутрь';
+$labels['foldername'] = 'Имя папки';
 $labels['name'] = 'Имя';
+$labels['mtime'] = 'Изменён';
+$labels['type'] = 'Тип';
+$labels['upload'] = 'Закачать';
+$labels['uploadfile'] = 'Закачать файл(ы)';
+$labels['get'] = 'Скачать';
+$labels['getfile'] = 'Скачать файл';
+$labels['view'] = 'Просмотреть';
+$labels['viewfile'] = 'Просмотреть файл';
+$labels['rename'] = 'Переименовать файл';
+$labels['deletefile'] = 'Удалить файл(ы)';
 $labels['edit'] = 'Редактировать';
+$labels['editfile'] = 'Редактировать файл';
 $labels['save'] = 'Сохранить';
+$labels['savefile'] = 'Сохранить файл';
+$labels['printfile'] = 'Распечатать файл';
+$labels['fileedit'] = 'Свойства файла';
+$labels['collection_audio'] = 'Аудио';
+$labels['collection_video'] = 'Видео';
+$labels['collection_image'] = 'Картинки';
+$labels['collection_document'] = 'Документы';
+$labels['uploading'] = 'Закачиваются файлы...';
+$labels['attaching'] = 'Прикрепляются файлы...';
+$labels['foldercreating'] = 'Создаётся папка...';
+$labels['folderdeleting'] = 'Удаляется папка...';
+$labels['folderdeleteconfirm'] = 'Вы уверены, что хотите удалить выбранную папку?';
+$labels['folderdeletenotice'] = 'Папка удалена успешно.';
+$labels['foldercreatenotice'] = 'Папка создана успешно.';
+$labels['saveallnotice'] = 'Успешно сохранены $n файл(ов).';
+$labels['saveallerror'] = 'Сохранение $n файл(ов) не удалось.';
+$labels['attacherror'] = 'Не удалось прикрепить файл(ы) из облака';
+$labels['fileupdating'] = 'Обновляется файл...';
+$labels['filemoving'] = 'Перемещаются файлы...';
+$labels['filecopying'] = 'Копируются файлы...';
+$labels['filedeleting'] = 'Удаляются файлы...';
+$labels['filedeleteconfirm'] = 'Вы уверены, что хотите удалить выбранные файлы?';
+$labels['filedeletenotice'] = 'Файл(ы) удален(ы) успешно.';
+$labels['filemovenotice'] = 'Файл(ы) перемещен(ы) успешно.';
+$labels['filecopynotice'] = 'Файл(ы) скопирован(ы) успешно.';
+$labels['allfolders'] = 'искать во всех папках';
+$labels['fileskip'] = 'Пропустить';
+$labels['fileskipall'] = 'Пропустить все';
+$labels['fileoverwrite'] = 'Перезаписать';
+$labels['fileoverwriteall'] = 'Перезаписать все';
+$labels['filemoveconfirm'] = 'Это действие перезапишет файл: <b>$file</b>.';
 ?>

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

@@ -53,7 +53,9 @@
 }
 
 #filestoolbar a.button.print {
-  background:  url(../../../../skins/larry/images/buttons.png) center -810px no-repeat;
+  background-image: url(../../../../skins/larry/images/buttons.png);
+  background-position: center -810px;
+  background-repeat: no-repeat;
 }
 
 #filestoolbar form {
@@ -152,59 +154,62 @@
   color: #aaa;
 }
 
-.filelist thead tr td {
+.filelist thead tr th {
   padding: 0;
 }
 
 .filelist tbody tr td {
   padding: 2px 7px;
   height: 18px;
+  line-height: 18px;
 }
 
-.filelist tr td.size {
+.filelist tr > .size {
   width: 80px;
   text-align: right;
 }
 
-.filelist thead tr td.size {
+.filelist thead tr > .size {
   text-align: left;
 }
 
-.filelist tr td.mtime {
+.filelist tr > .mtime {
   width: 125px;
 }
 
-.filelist tr td.options {
-  width: 26px;
+.filelist tr > .options {
+  width: 32px;
   cursor: pointer;
 }
 
-.filelist thead tr td.filename,
+.filelist thead tr th.filename,
 .filelist tbody tr td.filename {
   width: 99%;
   white-space: nowrap;
 }
 
-.filelist thead tr td.sortedASC a,
-.filelist thead tr td.sortedDESC a {
+.filelist thead tr th.sortedASC a,
+.filelist thead tr th.sortedDESC a {
   color: #004458;
   text-decoration: underline;
-  background: url(../../../../skins/larry/images/listicons.png) right -912px no-repeat;
+  background-image: url(../../../../skins/larry/images/listicons.png);
+  background-position: right -912px;
+  background-repeat: no-repeat;
 }
 
-.filelist thead tr td.sortedASC a {
+.filelist thead tr th.sortedASC a {
   background-position: right -944px;
 }
 
-.filelist td img {
+.filelist img {
   vertical-align: middle;
   display: inline-block;
 }
 
-.filelist tr td.options div.listmenu,
-.filelist tr td.flag span.flagged,
-.filelist tr td.flag span.unflagged,
-.filelist tr td.flag span.unflagged:hover {
+.filelist tr > .options a.listmenu,
+.filelist tr > .flag span.flagged,
+.filelist tr > .flag span.unflagged,
+.filelist tr > .flag span.unflagged:hover {
   display: inline-block;
   vertical-align: middle;
   height: 18px;
@@ -213,28 +218,33 @@
   background: url(../../../../skins/larry/images/listicons.png) -100px 0 no-repeat;
 }
 
-.filelist thead tr td.options div.listmenu {
-  background-position: 0 -976px;
-  cursor: pointer;
-  width: 26px;
+.filelist thead tr th.options {
+  padding: 0;
+  border-left: none;
 }
 
-.filelist thead tr td.options {
-  padding: 0 3px;
+.filelist thead tr th.options .listmenu {
+  background-position: 3px -970px;
+  cursor: pointer;
+  width: 24px;
+  height: 20px;
+  padding: 4px 4px 5px;
+  text-indent: -5000px;
 }
 
-.filelist thead tr td.options {
-  padding: 2px 3px;
+.filelist thead tr th.options .listmenu:focus {
+  outline: none;
+  background-color: rgba(73,180,210,0.7);
 }
 
-.filelist thead tr td:first-child {
+.filelist thead tr th:first-child {
   border-radius: 4px 0 0 0;
 }
 
 .filelist tbody tr td.options:hover span {
   width: 26px;
   height: 18px;
-  background: url(../../../../skins/larry/images/buttons.png) -5px -418px no-repeat;
+  background: url(../../../../skins/larry/images/buttons.png) -5px -417px no-repeat;
   display: block;
 }

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

@@ -1,21 +1,27 @@
-<div id="files-compose-dialog" class="uidialog">
-    <div id="quicksearchbar" class="searchbox">
+<div id="files-compose-dialog" class="uidialog" role="dialog" aria-labelledby="aria-label-fileselect" aria-hidden="true">
+    <h2 id="aria-label-fileselect" class="voice"><roundcube:label name="kolab_files.arialabelfileselectdialog" /></h2>
+    <div id="quicksearchbar" class="searchbox" role="search" aria-labelledby="aria-label-searchform">
+        <h3 id="aria-label-searchform" class="voice"><roundcube:label name="kolab_files.arialabelsearchform" /></h3>
+        <label for="quicksearchbox" class="voice"><roundcube:label name="arialabelquicksearchbox" /></label>
+        <roundcube:button name="filesearchmenulink" id="filesearchmenulink" class="iconbutton searchoptions" onclick="return UI.toggle_popup('filesearchmenu', event)" title="searchmod"  label="options" aria-haspopup="true" aria-expanded="false" aria-owns="filesearchmenu-menu" />
         <roundcube:object name="file-search-form" id="filesearchbox" />
-        <roundcube:button name="filesearchmenulink" id="filesearchmenulink" class="iconbutton searchoptions" onclick="UI.show_popup('filesearchmenu');return false" title="searchmod" content=" " />
         <roundcube:button command="files-search-reset" id="searchreset" class="iconbutton reset" title="resetsearch" content=" " />
     </div>
 
-    <div id="folderlistbox" class="uibox listbox">
+    <div id="folderlistbox" class="uibox listbox" role="navigation" aria-labelledby="aria-label-folderlist">
+        <h3 id="aria-label-folderlist" class="voice"><roundcube:label name="kolab_files.arialabelfolderlist" /></h3>
         <div id="files-folder-list" class="scroller"></div>
     </div>
 
     <div id="filelistcontainer" class="boxlistcontent uibox">
-        <roundcube:object name="filelist" id="filelist" class="records-table filelist sortheader fixedheader" />
+        <h3 id="aria-label-filelist" class="voice"><roundcube:label name="arialabelfilelist" /></h3>
+        <roundcube:object name="filelist" id="filelist" class="records-table filelist sortheader fixedheader" aria-labelledby="aria-label-filelist" />
     </div>
 </div>
 
-<div id="filesearchmenu" class="popupmenu" style="z-index: 2000">
-    <ul class="toolbarmenu">
-        <li><label><input type="checkbox" name="all_folders" value="1" id="search_all_folders" /> <span><roundcube:label name="kolab_files.allfolders" /></span></label></li>
+<div id="filesearchmenu" class="popupmenu" style="z-index: 2000" data-editable="true" aria-hidden="true">
+    <h4 id="aria-label-searchmenu" class="voice"><roundcube:label name="searchmod" /></h4>
+    <ul id="filesearchmenu-menu" class="toolbarmenu" role="menu" aria-labelledby="aria-label-searchmenu">
+        <li role="menuitem"><label><input type="checkbox" name="all_folders" value="1" id="search_all_folders" /> <span><roundcube:label name="kolab_files.allfolders" /></span></label></li>
     </ul>
 </div>

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

@@ -9,10 +9,12 @@
 
 <roundcube:include file="/includes/header.html" />
 
-
 <div id="mainscreen">
 
-<div id="filestoolbar" class="toolbar">
+<h1 class="voice"><roundcube:label name="kolab_files.filepreview" /></h1>
+
+<h2 id="aria-label-toolbar" class="voice"><roundcube:label name="arialabeltoolbar" /></h2>
+<div id="filestoolbar" class="toolbar" role="toolbar" aria-labelledby="aria-label-toolbar">
     <roundcube:button command="files-get" type="link" class="button get disabled" classAct="button get" classSel="button get pressed" label="kolab_files.get" title="kolab_files.getfile" />
     <roundcube:button command="files-edit" type="link" class="button edit disabled" classAct="button edit" classSel="button edit pressed" label="kolab_files.edit" title="kolab_files.editfile" />
     <roundcube:button command="files-save" type="link" class="button save disabled" classAct="button save" classSel="button save pressed" label="kolab_files.save" title="kolab_files.savefile" style="display:none" />
@@ -20,13 +22,14 @@
     <roundcube:button command="files-print" type="link" class="button print disabled" classAct="button print" classSel="button print pressed" label="print" title="kolab_files.printfile" />
 </div>
 
-<div id="fileinfobox" class="uibox listbox">
+<h2 id="aria-label-fileprops" class="voice"><roundcube:label name="kolab_files.arialabelfileprops" /></h2>
+<div id="fileinfobox" class="uibox listbox" aria-labelledby="aria-label-toolbar">
     <roundcube:object name="fileinfobox" id="fileinfo" class="listing" />
 </div>
 
 <div id="filecontent" class="uibox">
     <div class="iframebox">
-        <roundcube:object name="filepreviewframe" id="fileframe" frameborder="0" />
+        <roundcube:object name="filepreviewframe" id="fileframe" frameborder="0" title="kolab_files.arialabelfilecontent" />
     </div>
 </div>

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

@@ -11,7 +11,10 @@
 
 <div id="mainscreen">
 
-<div id="filestoolbar" class="toolbar">
+<h1 class="voice"><roundcube:label name="kolab_files.files" /></h1>
+
+<div id="filestoolbar" class="toolbar" role="toolbar" aria-labelledby="aria-label-toolbar">
+    <h2 id="aria-label-toolbar" class="voice"><roundcube:label name="arialabeltoolbar" /></h2>
     <form id="filesuploadform">
         <roundcube:button command="files-upload" type="link" class="button upload disabled" classAct="button upload" classSel="button upload pressed" label="kolab_files.upload" title="kolab_files.uploadfile" />
     </form>
@@ -20,50 +23,59 @@
     <roundcube:button command="files-delete" type="link" class="button delete disabled" classAct="button delete" classSel="button delete pressed" label="delete" title="kolab_files.deletefile" />
 </div>
 
-<div id="quicksearchbar" class="quicksearchbox">
+<div id="quicksearchbar" class="quicksearchbox" role="search" aria-labelledby="aria-label-searchform">
+    <h2 id="aria-label-searchform" class="voice"><roundcube:label name="kolab_files.arialabelsearchform" /></h2>
+    <label for="quicksearchbox" class="voice"><roundcube:label name="arialabelquicksearchbox" /></label>
+    <roundcube:button name="filesearchmenulink" id="filesearchmenulink" class="iconbutton searchoptions" onclick="return UI.toggle_popup('filesearchmenu', event)" title="searchmod" label="options" aria-haspopup="true" aria-expanded="false" aria-owns="filesearchmenu-menu" />
     <roundcube:object name="file-search-form" id="quicksearchbox" />
-    <roundcube:button name="filesearchmenulink" id="filesearchmenulink" class="iconbutton searchoptions" onclick="UI.show_popup('filesearchmenu');return false" title="searchmod" content=" " />
-    <roundcube:button command="files-search-reset" id="searchreset" class="iconbutton reset" title="resetsearch" content=" " />
+    <roundcube:button command="files-search-reset" id="searchreset" class="iconbutton reset" title="resetsearch" label="resetsearch" />
 </div>
 
-<div id="folderlistbox" class="uibox listbox">
+<div id="folderlistbox" class="uibox listbox" role="navigation" aria-labelledby="aria-label-folderlist">
+    <h2 id="aria-label-folderlist" class="voice"><roundcube:label name="kolab_files.arialabelfolderlist" /></h2>
     <div id="files-folder-list" class="scroller withfooter">
     </div>
     <div id="folderlist-footer" class="boxfooter">
-        <roundcube:button name="folder-create" type="link" title="kolab_files.foldercreate" class="listbutton add" classAct="listbutton add" innerClass="inner" content="+" onclick="kolab_files_folder_create_dialog()" /><roundcube:button name="folderoptions" id="folderoptionslink" type="link" title="moreactions" class="listbutton groupactions" onclick="UI.show_popup('folderoptions', undefined, {above: 1});return false" innerClass="inner" content="&#9881;" />
+        <roundcube:button command="folder-create" type="link" title="kolab_files.foldercreate" class="listbutton add" classAct="listbutton add" innerClass="inner" content="+" /><roundcube:button name="folderoptions" id="folderoptionslink" type="link" title="moreactions" class="listbutton groupactions" onclick="return UI.toggle_popup('folderoptions', event)" innerClass="inner" content="&#9881;" aria-haspopup="true" aria-expanded="false" aria-owns="folderoptionsmenu" />
         <roundcube:if condition="env:files_quota" />
+            <span class="voice"><roundcube:label name="quota"></span>
             <roundcube:object name="filequotadisplay" id="quotadisplay" class="countdisplay" display="text" />
         <roundcube:endif />
     </div>
 </div>
 
 <div id="filelistcontainer" class="uibox">
+    <h2 id="aria-label-filelist" class="voice"><roundcube:label name="arialabelfilelist" /></h2>
     <div id="filelistbox" class="boxlistcontent">
-        <roundcube:object name="filelist" id="filelist" class="records-table filelist sortheader fixedheader" optionsmenuIcon="true" />
+        <roundcube:object name="filelist" id="filelist" class="records-table filelist sortheader fixedheader" optionsmenuIcon="true" aria-labelledby="aria-label-filelist" />
     </div>
 </div>
 
 </div>
 
-<div id="folderoptions" class="popupmenu">
-    <ul id="folderoptionsmenu" class="toolbarmenu">
+<div id="folderoptions" class="popupmenu" data-editable="true" aria-hidden="true">
+    <h3 id="aria-label-folderoptions" class="voice"><roundcube:label name="kolab_files.folderoptions" /></h3>
+    <ul id="folderoptionsmenu" class="toolbarmenu" role="menu" aria-labelledby="aria-label-folderoptions">
 
-        <li><roundcube:button command="files-folder-delete" label="delete" classAct="active" /></li>
-        <li><roundcube:button command="folders" task="settings" type="link" label="managefolders" classAct="active" /></li>
+        <li role="menuitem"><roundcube:button command="files-folder-delete" label="delete" classAct="active" /></li>
+        <li role="menuitem"><roundcube:button command="folders" task="settings" type="link" label="managefolders" classAct="active" /></li>
         <roundcube:container name="filesfolderoptions" id="folderoptionsmenu" />
     </ul>
 </div>
 
-<div id="files-folder-create-dialog">
+<div id="files-folder-create-dialog" role="dialog" aria-labelledby="aria-label-foldercreateform" aria-hidden="true">
+    <h3 id="aria-label-foldercreateform" class="voice"><roundcube:label name="kolab_files.arialabelfoldercreateform" /></h3>
     <roundcube:object name="folder-create-form" />
 </div>
-<div id="files-file-edit-dialog">
+<div id="files-file-edit-dialog" role="dialog" aria-labelledby="aria-label-fileeditform" aria-hidden="true">
+    <h3 id="aria-label-fileeditform" class="voice"><roundcube:label name="kolab_files.arialabelfileeditform" /></h3>
     <roundcube:object name="file-edit-form" />
 </div>
 
-<div id="listoptions" class="propform popupdialog">
+<div id="listoptions" class="propform popupdialog" data-editable="true" role="dialog" aria-labelledby="aria-label-listoptions" aria-hidden="true">
+    <h3 id="aria-label-listoptions" class="voice"><roundcube:label name="kolab_files.arialabellistoptions" /></h3>
 <roundcube:if condition="!in_array('kolab_files_list_cols', (array)config:dont_override)" />
     <fieldset class="floating">
         <legend><roundcube:label name="listcolumns" /></legend>
@@ -97,20 +109,21 @@
     <br style="clear:both" />
     <div class="formbuttons">
         <roundcube:button command="menu-save" id="listmenusave" type="input" class="button mainaction" label="save" />
-        <roundcube:button command="menu-open" id="listmenucancel" type="input" class="button" label="cancel" />
+        <roundcube:button command="menu-close" prop="filelistmenu" id="listmenucancel" type="input" class="button" label="cancel" />
     </div>
 </div>
 
-<div id="dragfilemenu" class="popupmenu">
-    <ul class="toolbarmenu">
-        <li><roundcube:button command="files-move" onclick="return kolab_files_drag_menu_action('files-move')" label="move" classAct="active" /></li>
-        <li><roundcube:button command="files-copy" onclick="return kolab_files_drag_menu_action('files-copy')" label="copy" classAct="active" /></li>
+<div id="dragfilemenu" class="popupmenu" aria-hidden="true">
+    <ul class="toolbarmenu" role="menu">
+        <li role="menuitem"><roundcube:button command="files-move" onclick="return kolab_files_drag_menu_action('files-move')" label="move" classAct="active" /></li>
+        <li role="menuitem"><roundcube:button command="files-copy" onclick="return kolab_files_drag_menu_action('files-copy')" label="copy" classAct="active" /></li>
     </ul>
 </div>
 
-<div id="filesearchmenu" class="popupmenu">
-    <ul class="toolbarmenu">
-        <li><label><input type="checkbox" name="all_folders" value="1" id="search_all_folders" /> <span><roundcube:label name="kolab_files.allfolders" /></span></label></li>
+<div id="filesearchmenu" class="popupmenu" data-editable="true" aria-hidden="true">
+    <h3 id="aria-label-searchmenu" class="voice"><roundcube:label name="searchmod" /></h3>
+    <ul id="filesearchmenu-menu" class="toolbarmenu" role="menu" aria-labelledby="aria-label-searchmenu">
+        <li role="menuitem"><label><input type="checkbox" name="all_folders" value="1" id="search_all_folders" /> <span><roundcube:label name="kolab_files.allfolders" /></span></label></li>
     </ul>
 </div>

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

@@ -1,16 +1,21 @@
-<div id="files-dialog" class="uidialog">
+<div id="files-dialog" class="uidialog" data-editable="true" role="dialog" aria-labelledby="aria-label-filesavedialog" aria-hidden="true">
+    <h3 id="aria-label-filesavedialog" class="voice"><roundcube:label name="kolab_files.arialabelfilesavedialog" /></h3>
     <div id="file-save-as">
         <label for="file-save-as-input"><roundcube:label name="kolab_files.saveas" /></label>
         <input id="file-save-as-input" type="text" value="">
     </div>
-    <div id="folderlistbox" class="uibox listbox">
+    <div id="folderlistbox" class="uibox listbox" role="navigation" aria-labelledby="aria-label-folderlist">
+        <h3 id="aria-label-folderlist" class="voice"><roundcube:label name="kolab_files.arialabelfolderlist" /></h3>
         <div id="files-folder-list" class="scroller withfooter"></div>
         <div id="folderlist-footer" class="boxfooter">
-            <roundcube:button name="foldercreatelink" id="foldercreatelink" type="link" onclick="kolab_files_folder_create_dialog()" title="createfolder" class="listbutton add" classAct="listbutton add" innerClass="inner" content="+" />
+            <roundcube:button command="folder-create" name="foldercreatelink" id="foldercreatelink" type="link" title="createfolder" class="listbutton add" classAct="listbutton add" innerClass="inner" content="+" />
         </div>
     </div>
 </div>
-<div id="files-folder-create-dialog">
+
+<div id="files-folder-create-dialog" role="dialog" aria-labelledby="aria-label-foldercreateform" aria-hidden="true">
+    <h3 id="aria-label-foldercreateform" class="voice"><roundcube:label name="kolab_files.arialabelfoldercreateform" /></h3>
     <roundcube:object name="folder-create-form" />
 </div>
+
 <script src="plugins/kolab_files/skins/larry/ui.js" type="text/javascript"></script>

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

@@ -13,6 +13,7 @@
   $(document).ready(function() {
     rcmail.addEventListener('menu-open', kolab_files_show_listoptions);
     rcmail.addEventListener('menu-save', kolab_files_save_listoptions);
+    rcmail.addEventListener('menu-close', kolab_files_show_listoptions);
     rcmail.addEventListener('setquota', kolab_files_update_quota);
 
     var menu = $('#dragfilemenu');
@@ -24,7 +25,6 @@
     menu = $('#filesearchmenu');
     if (menu.length) {
       rcmail.gui_object('file_searchmenu', 'filesearchmenu');
-      UI.add_popup('filesearchmenu', {sticky: 1});
     }
   });
 
@@ -45,8 +45,12 @@
     return UI.update_quota(p);
 };
 
-function kolab_files_show_listoptions()
+function kolab_files_show_listoptions(p)
 {
+  if (!p || p.name != 'filelistmenu') {
+    return;
+  }
+
   var $dialog = $('#listoptions');
 
   // close the dialog
@@ -69,10 +73,8 @@
     modal: true,
     resizable: false,
     closeOnEscape: true,
+    close: function() { rcmail.file_list.focus(); },
     title: null,
-    close: function() {
-      $dialog.dialog('destroy').hide();
-    },
     minWidth: 400,
     width: $dialog.width()+20
   }).show();

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

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

roundcubemail-plugins-kolab-3.2.tar.gz/plugins/kolab_folders/localization/ca_ES.inc Added

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

roundcubemail-plugins-kolab-3.2.tar.gz/plugins/kolab_folders/localization/da_DK.inc Added

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

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

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

roundcubemail-plugins-kolab-3.2.tar.gz/plugins/kolab_folders/localization/et_EE.inc Added

roundcubemail-plugins-kolab-3.2.tar.gz/plugins/kolab_folders/localization/fi_FI.inc Added

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

roundcubemail-plugins-kolab-3.2.tar.gz/plugins/kolab_folders/localization/hu_HU.inc Added

roundcubemail-plugins-kolab-3.2.tar.gz/plugins/kolab_folders/localization/it_IT.inc Added

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

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

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

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

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

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

roundcubemail-plugins-kolab-3.2.tar.gz/plugins/kolab_notes/jquery.tagedit.js Added

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

@@ -0,0 +1,1166 @@
+<?php
+
+/**
+ * Kolab notes module
+ *
+ * Adds simple notes management features to the web client
+ *
+ * @version @package_version@
+ * @author Thomas Bruederli <bruederli@kolabsys.com>
+ *
+ * Copyright (C) 2014, Kolab Systems AG <contact@kolabsys.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+class kolab_notes extends rcube_plugin
+{
+    public $task = '?(?!login|logout).*';
+    public $allowed_prefs = array('kolab_notes_sort_col');
+    public $rc;
+
+    private $ui;
+    private $lists;
+    private $folders;
+    private $cache = array();
+    private $message_notes = array();
+
+    /**
+     * Required startup method of a Roundcube plugin
+     */
+    public function init()
+    {
+        $this->require_plugin('libkolab');
+
+        $this->rc = rcube::get_instance();
+
+        $this->register_task('notes');
+
+        // load plugin configuration
+        $this->load_config();
+
+        // proceed initialization in startup hook
+        $this->add_hook('startup', array($this, 'startup'));
+    }
+
+    /**
+     * Startup hook
+     */
+    public function startup($args)
+    {
+        // the notes module can be enabled/disabled by the kolab_auth plugin
+        if ($this->rc->config->get('notes_disabled', false) || !$this->rc->config->get('notes_enabled', true)) {
+            return;
+        }
+
+        // load localizations
+        $this->add_texts('localization/', $args['task'] == 'notes' && (!$args['action'] || $args['action'] == 'dialog-ui'));
+        $this->rc->load_language($_SESSION['language'], array('notes.notes' => $this->gettext('navtitle')));  // add label for task title
+
+        if ($args['task'] == 'notes') {
+            $this->add_hook('storage_init', array($this, 'storage_init'));
+
+            // register task actions
+            $this->register_action('index', array($this, 'notes_view'));
+            $this->register_action('fetch', array($this, 'notes_fetch'));
+            $this->register_action('get',   array($this, 'note_record'));
+            $this->register_action('action', array($this, 'note_action'));
+            $this->register_action('list',  array($this, 'list_action'));
+            $this->register_action('dialog-ui', array($this, 'dialog_view'));
+        }
+        else if ($args['task'] == 'mail') {
+            $this->add_hook('storage_init', array($this, 'storage_init'));
+            $this->add_hook('message_load', array($this, 'mail_message_load'));
+            $this->add_hook('message_compose', array($this, 'mail_message_compose'));
+            $this->add_hook('template_object_messagebody', array($this, 'mail_messagebody_html'));
+
+            // add 'Append note' item to message menu
+            if ($this->api->output->type == 'html' && $_REQUEST['_rel'] != 'note') {
+                $this->api->add_content(html::tag('li', null, 
+                    $this->api->output->button(array(
+                      'command'  => 'append-kolab-note',
+                      'label'    => 'kolab_notes.appendnote',
+                      'type'     => 'link',
+                      'classact' => 'icon appendnote active',
+                      'class'    => 'icon appendnote',
+                      'innerclass' => 'icon note',
+                    ))),
+                    'messagemenu');
+
+                $this->api->output->add_label('kolab_notes.appendnote', 'kolab_notes.editnote', 'kolab_notes.deletenotesconfirm', 'kolab_notes.entertitle', 'save', 'delete', 'cancel', 'close');
+                $this->include_script('notes_mail.js');
+            }
+        }
+
+        if (!$this->rc->output->ajax_call && (!$this->rc->output->env['framed'] || in_array($args['action'], array('folder-acl','dialog-ui')))) {
+            $this->load_ui();
+        }
+
+        // notes use fully encoded identifiers
+        kolab_storage::$encode_ids = true;
+    }
+
+    /**
+     * Hook into IMAP FETCH HEADER.FIELDS command and request MESSAGE-ID
+     */
+    public function storage_init($p)
+    {
+        $p['fetch_headers'] = trim($p['fetch_headers'] . ' MESSAGE-ID');
+        return $p;
+    }
+
+    /**
+     * Load and initialize UI class
+     */
+    private function load_ui()
+    {
+        require_once($this->home . '/kolab_notes_ui.php');
+        $this->ui = new kolab_notes_ui($this);
+        $this->ui->init();
+    }
+
+    /**
+     * Read available calendars for the current user and store them internally
+     */
+    private function _read_lists($force = false)
+    {
+        // already read sources
+        if (isset($this->lists) && !$force)
+            return $this->lists;
+
+        // get all folders that have type "task"
+        $folders = kolab_storage::sort_folders(kolab_storage::get_folders('note'));
+        $this->lists = $this->folders = array();
+
+        // find default folder
+        $default_index = 0;
+        foreach ($folders as $i => $folder) {
+            if ($folder->default)
+                $default_index = $i;
+        }
+
+        // put default folder on top of the list
+        if ($default_index > 0) {
+            $default_folder = $folders[$default_index];
+            unset($folders[$default_index]);
+            array_unshift($folders, $default_folder);
+        }
+
+        $delim = $this->rc->get_storage()->get_hierarchy_delimiter();
+
+        foreach ($folders as $folder) {
+            $item = $this->folder_props($folder, $delim);
+            $this->lists[$item['id']] = $item;
+            $this->folders[$item['id']] = $folder;
+            $this->folders[$folder->name] = $folder;
+        }
+    }
+
+    /**
+     * Get a list of available folders from this source
+     */
+    public function get_lists(&$tree = null)
+    {
+        $this->_read_lists();
+
+        // attempt to create a default folder for this user
+        if (empty($this->lists)) {
+            $folder = array('name' => 'Notes', 'type' => 'note', 'default' => true, 'subscribed' => true);
+            if (kolab_storage::folder_update($folder)) {
+                $this->_read_lists(true);
+            }
+        }
+
+        $folders = array();
+        foreach ($this->lists as $id => $list) {
+            if (!empty($this->folders[$id])) {
+                $folders[] = $this->folders[$id];
+            }
+        }
+
+        // include virtual folders for a full folder tree
+        if (!is_null($tree)) {
+            $folders = kolab_storage::folder_hierarchy($folders, $tree);
+        }
+
+        $delim = $this->rc->get_storage()->get_hierarchy_delimiter();
+
+        $lists = array();
+        foreach ($folders as $folder) {
+            $list_id = $folder->id;
+            $imap_path = explode($delim, $folder->name);
+
+            // find parent
+            do {
+              array_pop($imap_path);
+              $parent_id = kolab_storage::folder_id(join($delim, $imap_path));
+            }
+            while (count($imap_path) > 1 && !$this->folders[$parent_id]);
+
+            // restore "real" parent ID
+            if ($parent_id && !$this->folders[$parent_id]) {
+                $parent_id = kolab_storage::folder_id($folder->get_parent());
+            }
+
+            $fullname = $folder->get_name();
+            $listname = $folder->get_foldername();
+
+            // special handling for virtual folders
+            if ($folder instanceof kolab_storage_folder_user) {
+                $lists[$list_id] = array(
+                    'id'       => $list_id,
+                    'name'     => $fullname,
+                    'listname' => $listname,
+                    'title'    => $folder->get_owner(),
+                    'virtual'  => true,
+                    'editable' => false,
+                    'group'    => 'other virtual',
+                    'class'    => 'user',
+                    'parent'   => $parent_id,
+                );
+            }
+            else if ($folder->virtual) {
+                $lists[$list_id] = array(
+                    'id'       => $list_id,
+                    'name'     => kolab_storage::object_name($fullname),
+                    'listname' => $listname,
+                    'virtual'  => true,
+                    'editable' => false,
+                    'group'    => $folder->get_namespace(),
+                    'parent'   => $parent_id,
+                );
+            }
+            else {
+                if (!$this->lists[$list_id]) {
+                    $this->lists[$list_id] = $this->folder_props($folder, $delim);
+                    $this->folders[$list_id] = $folder;
+                }
+                $this->lists[$list_id]['parent'] = $parent_id;
+                $lists[$list_id] = $this->lists[$list_id];
+            }
+        }
+
+        return $lists;
+    }
+
+    /**
+     * Search for shared or otherwise not listed folders the user has access
+     *
+     * @param string Search string
+     * @param string Section/source to search
+     * @return array List of notes folders
+     */
+    protected function search_lists($query, $source)
+    {
+        if (!kolab_storage::setup()) {
+            return array();
+        }
+
+        $this->search_more_results = false;
+        $this->lists = $this->folders = array();
+
+        $delim = $this->rc->get_storage()->get_hierarchy_delimiter();
+
+        // find unsubscribed IMAP folders that have "event" type
+        if ($source == 'folders') {
+            foreach ((array)kolab_storage::search_folders('note', $query, array('other')) as $folder) {
+                $this->folders[$folder->id] = $folder;
+                $this->lists[$folder->id] = $this->folder_props($folder, $delim);
+            }
+        }
+        // search other user's namespace via LDAP
+        else if ($source == 'users') {
+            $limit = $this->rc->config->get('autocomplete_max', 15) * 2;  // we have slightly more space, so display twice the number
+            foreach (kolab_storage::search_users($query, 0, array(), $limit * 10) as $user) {
+                $folders = array();
+                // search for tasks folders shared by this user
+                foreach (kolab_storage::list_user_folders($user, 'note', false) as $foldername) {
+                    $folders[] = new kolab_storage_folder($foldername, 'note');
+                }
+
+                if (count($folders)) {
+                    $userfolder = new kolab_storage_folder_user($user['kolabtargetfolder'], '', $user);
+                    $this->folders[$userfolder->id] = $userfolder;
+                    $this->lists[$userfolder->id] = $this->folder_props($userfolder, $delim, array());
+
+                    foreach ($folders as $folder) {
+                        $this->folders[$folder->id] = $folder;
+                        $this->lists[$folder->id] = $this->folder_props($folder, $delim, array());
+                        $count++;
+                    }
+                }
+
+                if ($count >= $limit) {
+                    $this->search_more_results = true;
+                    break;
+                }
+            }
+
+        }
+
+        return $this->get_lists();
+    }
+
+    /**
+     * Derive list properties from the given kolab_storage_folder object
+     */
+    protected function folder_props($folder, $delim)
+    {
+        if ($folder->get_namespace() == 'personal') {
+            $norename = false;
+            $readonly = false;
+            $alarms = true;
+        }
+        else {
+            $alarms = false;
+            $readonly = true;
+            if (($rights = $folder->get_myrights()) && !PEAR::isError($rights)) {
+                if (strpos($rights, 'i') !== false)
+                  $readonly = false;
+            }
+            $info = $folder->get_folder_info();
+            $norename = $readonly || $info['norename'] || $info['protected'];
+        }
+
+        $list_id = $folder->id;
+        return array(
+            'id' => $list_id,
+            'name' => $folder->get_name(),
+            'listname' => $folder->get_foldername(),
+            'editname' => $folder->get_foldername(),
+            'editable' => !$readonly,
+            'norename' => $norename,
+            'parentfolder' => $folder->get_parent(),
+            'subscribed' => (bool)$folder->is_subscribed(),
+            'default'  => $folder->default,
+            'group'    => $folder->default ? 'default' : $folder->get_namespace(),
+            'class'    => trim($folder->get_namespace() . ($folder->default ? ' default' : '')),
+        );
+    }
+
+    /**
+     * Get the kolab_calendar instance for the given calendar ID
+     *
+     * @param string List identifier (encoded imap folder name)
+     * @return object kolab_storage_folder Object nor null if list doesn't exist
+     */
+    public function get_folder($id)
+    {
+        // create list and folder instance if necesary
+        if (!$this->lists[$id]) {
+            $folder = kolab_storage::get_folder(kolab_storage::id_decode($id));
+            if ($folder->type) {
+                $this->folders[$id] = $folder;
+                $this->lists[$id] = $this->folder_props($folder, $this->rc->get_storage()->get_hierarchy_delimiter());
+            }
+        }
+
+        return $this->folders[$id];
+    }
+
+    /*******  UI functions  ********/
+
+    /**
+     * Render main view of the tasklist task
+     */
+    public function notes_view()
+    {
+        $this->ui->init();
+        $this->ui->init_templates();
+        $this->rc->output->set_pagetitle($this->gettext('navtitle'));
+        $this->rc->output->send('kolab_notes.notes');
+    }
+
+    /**
+     * Deliver a rediced UI for inline (dialog)
+     */
+    public function dialog_view()
+    {
+        // resolve message reference
+        if ($msgref = rcube_utils::get_input_value('_msg', RCUBE_INPUT_GPC, true)) {
+            $storage = $this->rc->get_storage();
+            list($uid, $folder) = explode('-', $msgref, 2);
+            if ($message = $storage->get_message_headers($msgref)) {
+                $this->rc->output->set_env('kolab_notes_template', array(
+                    '_from_mail' => true,
+                    'title' => $message->get('subject'),
+                    'links' => array($this->get_message_reference($this->get_message_uri($message, $folder))),
+                ));
+            }
+        }
+
+        $this->ui->init_templates();
+        $this->rc->output->send('kolab_notes.dialogview');
+    }
+
+    /**
+     * Handler to retrieve note records for the given list and/or search query
+     */
+    public function notes_fetch()
+    {
+        $search = rcube_utils::get_input_value('_q', RCUBE_INPUT_GPC, true);
+        $list = rcube_utils::get_input_value('_list', RCUBE_INPUT_GPC);
+
+        $data = $this->notes_data($this->list_notes($list, $search), $tags);
+        $this->rc->output->command('plugin.data_ready', array('list' => $list, 'search' => $search, 'data' => $data, 'tags' => array_values($tags)));
+    }
+
+    /**
+     * Convert the given note records for delivery to the client
+     */
+    protected function notes_data($records, &$tags)
+    {
+        $tags = array();
+
+        foreach ($records as $i => $rec) {
+            unset($records[$i]['description']);
+            $this->_client_encode($records[$i]);
+
+            foreach ((array)$rec['categories'] as $tag) {
+                $tags[] = $tag;
+            }
+        }
+
+        $tags = array_unique($tags);
+        return $records;
+    }
+
+    /**
+     * Read note records for the given list from the storage backend
+     */
+    protected function list_notes($list_id, $search = null)
+    {
+        $results = array();
+
+        // query Kolab storage
+        $query = array();
+
+        // full text search (only works with cache enabled)
+        if (strlen($search)) {
+            $words = array_filter(rcube_utils::normalize_string(mb_strtolower($search), true));
+            foreach ($words as $word) {
+                if (strlen($word) > 2) {  // only words > 3 chars are stored in DB
+                    $query[] = array('words', '~', $word);
+                }
+            }
+        }
+
+        $this->_read_lists();
+        if ($folder = $this->get_folder($list_id)) {
+            foreach ($folder->select($query) as $record) {
+                // post-filter search results
+                if (strlen($search)) {
+                    $matches = 0;
+                    $contents = mb_strtolower(
+                        $record['title'] .
+                        ($this->is_html($record) ? strip_tags($record['description']) : $record['description']) .
+                        join(' ', (array)$record['categories'])
+                    );
+                    foreach ($words as $word) {
+                        if (mb_strpos($contents, $word) !== false) {
+                            $matches++;
+                        }
+                    }
+
+                    // skip records not matching all search words
+                    if ($matches < count($words)) {
+                        continue;
+                    }
+                }
+                $record['list'] = $list_id;
+                $results[] = $record;
+            }
+        }
+
+        return $results;
+    }
+
+    /**
+     * Handler for delivering a full note record to the client
+     */
+    public function note_record()
+    {
+        $data = $this->get_note(array(
+            'uid' => rcube_utils::get_input_value('_id', RCUBE_INPUT_GPC),
+            'list' => rcube_utils::get_input_value('_list', RCUBE_INPUT_GPC),
+        ));
+
+        // encode for client use
+        if (is_array($data)) {
+            $this->_client_encode($data, true);
+        }
+
+        $this->rc->output->command('plugin.render_note', $data);
+    }
+
+    /**
+     * Get the full note record identified by the given UID + Lolder identifier
+     */
+    public function get_note($note)
+    {
+        if (is_array($note)) {
+            $uid = $note['uid'] ?: $note['id'];
+            $list_id = $note['list'];
+        }
+        else {
+            $uid = $note;
+        }
+
+        // deliver from in-memory cache
+        $key = $list_id . ':' . $uid;
+        if ($this->cache[$key]) {
+            return $this->cache[$key];
+        }
+
+        $this->_read_lists();
+        if ($list_id) {
+            if ($folder = $this->get_folder($list_id)) {
+                return $folder->get_object($uid);
+            }
+        }
+        // iterate over all calendar folders and search for the event ID
+        else {
+            foreach ($this->folders as $list_id => $folder) {
+                if ($result = $folder->get_object($uid)) {
+                    $result['list'] = $list_id;
+                    return $result;
+                }
+            }
+        }
+
+        return false;
+    }
+
+    /**
+     * Helper method to encode the given note record for use in the client
+     */
+    private function _client_encode(&$note, $resolve = false)
+    {
+        foreach ($note as $key => $prop) {
+            if ($key[0] == '_' || $key == 'x-custom') {
+                unset($note[$key]);
+            }
+        }
+
+        foreach (array('created','changed') as $key) {
+            if (is_object($note[$key]) && $note[$key] instanceof DateTime) {
+                $note[$key.'_'] = $note[$key]->format('U');
+                $note[$key] = $this->rc->format_date($note[$key]);
+            }
+        }
+
+        // clean HTML contents
+        if (!empty($note['description']) && $this->is_html($note)) {
+            $note['html'] = $this->_wash_html($note['description']);
+        }
+
+        // resolve message links
+        if (is_array($note['links'])) {
+            $me = $this;
+            $note['links'] = array_map(function($link) use ($me, $resolve){
+                return $me->get_message_reference($link, $resolve) ?: array('uri' => $link);
+            }, $note['links']);
+        }
+
+        return $note;
+    }
+
+    /**
+     * Handler for client-initiated actions on a single note record
+     */
+    public function note_action()
+    {
+        $action = rcube_utils::get_input_value('_do', RCUBE_INPUT_POST);
+        $note = rcube_utils::get_input_value('_data', RCUBE_INPUT_POST, true);
+
+        $success = false;
+        switch ($action) {
+            case 'new':
+                $temp_id = $rec['tempid'];
+
+            case 'edit':
+                if ($success = $this->save_note($note)) {
+                    $refresh = $this->get_note($note);
+                    $refresh['tempid'] = $temp_id;
+                }
+                break;
+
+            case 'move':
+                $uids = explode(',', $note['uid']);
+                foreach ($uids as $uid) {
+                    $note['uid'] = $uid;
+                    if (!($success = $this->move_note($note, $note['to']))) {
+                        $refresh = $this->get_note($note);
+                        break;
+                    }
+                }
+                break;
+
+            case 'delete':
+                $uids = explode(',', $note['uid']);
+                foreach ($uids as $uid) {
+                    $note['uid'] = $uid;
+                    if (!($success = $this->delete_note($note))) {
+                        $refresh = $this->get_note($note);
+                        break;
+                    }
+                }
+                break;
+        }
+
+        // show confirmation/error message
+        if ($success) {
+            $this->rc->output->show_message('successfullysaved', 'confirmation');
+        }
+        else {
+            $this->rc->output->show_message('errorsaving', 'error');
+        }
+ 
+        // unlock client
+        $this->rc->output->command('plugin.unlock_saving');
+
+        if ($refresh) {
+            $this->rc->output->command('plugin.update_note', $this->_client_encode($refresh));
+        }
+    }
+
+    /**
+     * Update an note record with the given data
+     *
+     * @param array Hash array with note properties (id, list)
+     * @return boolean True on success, False on error
+     */
+    private function save_note(&$note)
+    {
+        $this->_read_lists();
+
+        $list_id = $note['list'];
+        if (!$list_id || !($folder = $this->get_folder($list_id)))
+            return false;
+
+        // moved from another folder
+        if ($note['_fromlist'] && ($fromfolder = $this->get_folder($note['_fromlist']))) {
+            if (!$fromfolder->move($note['uid'], $folder->name))
+                return false;
+
+            unset($note['_fromlist']);
+        }
+
+        // load previous version of this record to merge
+        if ($note['uid']) {
+            $old = $folder->get_object($note['uid']);
+            if (!$old || PEAR::isError($old))
+                return false;
+
+            // merge existing properties if the update isn't complete
+            if (!isset($note['title']) || !isset($note['description']))
+                $note += $old;
+        }
+
+        // generate new note object from input
+        $object = $this->_write_preprocess($note, $old);
+        $saved = $folder->save($object, 'note', $note['uid']);
+
+        if (!$saved) {
+            raise_error(array(
+                'code' => 600, 'type' => 'php',
+                'file' => __FILE__, 'line' => __LINE__,
+                'message' => "Error saving note object to Kolab server"),
+                true, false);
+            $saved = false;
+        }
+        else {
+            $note = $object;
+            $note['list'] = $list_id;
+
+            // cache this in memory for later read
+            $key = $list_id . ':' . $note['uid'];
+            $this->cache[$key] = $note;
+        }
+
+        return $saved;
+    }
+
+    /**
+     * Move the given note to another folder
+     */
+    function move_note($note, $list_id)
+    {
+        $this->_read_lists();
+        $tofolder = $this->get_folder($list_id);
+        $fromfolder = $this->get_folder($note['list']);
+
+        if ($fromfolder && $tofolder) {
+            return $fromfolder->move($note['uid'], $tofolder->name);
+        }
+
+        return false;
+    }
+
+    /**
+     * Remove a single note record from the backend
+     *
+     * @param array   Hash array with note properties (id, list)
+     * @param boolean Remove record irreversible (mark as deleted otherwise)
+     * @return boolean True on success, False on error
+     */
+    public function delete_note($note, $force = true)
+    {
+        $this->_read_lists();
+
+        $list_id = $note['list'];
+        if (!$list_id || !($folder = $this->get_folder($list_id)))
+            return false;
+
+        return $folder->delete($note['uid'], $force);
+    }
+
+    /**
+     * Handler for client requests to list (aka folder) actions
+     */
+    public function list_action()
+    {
+        $action = rcube_utils::get_input_value('_do', RCUBE_INPUT_GPC);
+        $list = rcube_utils::get_input_value('_list', RCUBE_INPUT_GPC, true);
+        $success = $update_cmd = false;
+
+        if (empty($action)) {
+            $action = rcube_utils::get_input_value('action', RCUBE_INPUT_GPC);
+        }
+
+        switch ($action) {
+            case 'form-new':
+            case 'form-edit':
+                $this->_read_lists();
+                echo $this->ui->list_editform($action, $this->lists[$list['id']], $this->folders[$list['id']]);
+                exit;
+
+            case 'new':
+                $list['type'] = 'note';
+                $list['subscribed'] = true;
+                $folder = kolab_storage::folder_update($list);
+
+                if ($folder === false) {
+                    $save_error = $this->gettext(kolab_storage::$last_error);
+                }
+                else {
+                    $success = true;
+                    $update_cmd = 'plugin.update_list';
+                    $list['id'] = kolab_storage::folder_id($folder);
+                    $list['_reload'] = true;
+                }
+                break;
+
+            case 'edit':
+                $this->_read_lists();
+                $oldparent = $this->lists[$list['id']]['parentfolder'];
+                $newfolder = kolab_storage::folder_update($list);
+
+                if ($newfolder === false) {
+                  $save_error = $this->gettext(kolab_storage::$last_error);
+                }
+                else {
+                    $success = true;
+                    $update_cmd = 'plugin.update_list';
+                    $list['newid'] = kolab_storage::folder_id($newfolder);
+                    $list['_reload'] = $list['parent'] != $oldparent;
+
+                    // compose the new display name
+                    $delim = $this->rc->get_storage()->get_hierarchy_delimiter();
+                    $path_imap = explode($delim, $newfolder);
+                    $list['name'] = kolab_storage::object_name($newfolder);
+                    $list['editname'] = rcube_charset::convert(array_pop($path_imap), 'UTF7-IMAP');
+                    $list['listname'] = str_repeat('&nbsp;&nbsp;&nbsp;', count($path_imap)) . '&raquo; ' . $list['editname'];
+                }
+                break;
+
+            case 'delete':
+                $this->_read_lists();
+                $folder = $this->get_folder($list['id']);
+                if ($folder && kolab_storage::folder_delete($folder->name)) {
+                    $success = true;
+                    $update_cmd = 'plugin.destroy_list';
+                }
+                else {
+                    $save_error = $this->gettext(kolab_storage::$last_error);
+                }
+                break;
+
+            case 'search':
+                $this->load_ui();
+                $results = array();
+                foreach ((array)$this->search_lists(rcube_utils::get_input_value('q', RCUBE_INPUT_GPC), rcube_utils::get_input_value('source', RCUBE_INPUT_GPC)) as $id => $prop) {
+                    $editname = $prop['editname'];
+                    unset($prop['editname']);  // force full name to be displayed
+
+                    // let the UI generate HTML and CSS representation for this calendar
+                    $html = $this->ui->folder_list_item($id, $prop, $jsenv, true);
+                    $prop += (array)$jsenv[$id];
+                    $prop['editname'] = $editname;
+                    $prop['html'] = $html;
+
+                    $results[] = $prop;
+                }
+                // report more results available
+                if ($this->driver->search_more_results) {
+                    $this->rc->output->show_message('autocompletemore', 'info');
+                }
+
+                $this->rc->output->command('multi_thread_http_response', $results, rcube_utils::get_input_value('_reqid', RCUBE_INPUT_GPC));
+                return;
+
+            case 'subscribe':
+                $success = false;
+                if ($list['id'] && ($folder = $this->get_folder($list['id']))) {
+                    if (isset($list['permanent']))
+                        $success |= $folder->subscribe(intval($list['permanent']));
+                    if (isset($list['active']))
+                        $success |= $folder->activate(intval($list['active']));
+                }
+                break;
+        }
+
+        $this->rc->output->command('plugin.unlock_saving');
+
+        if ($success) {
+            $this->rc->output->show_message('successfullysaved', 'confirmation');
+
+            if ($update_cmd) {
+                $this->rc->output->command($update_cmd, $list);
+            }
+        }
+        else {
+            $error_msg = $this->gettext('errorsaving') . ($save_error ? ': ' . $save_error :'');
+            $this->rc->output->show_message($error_msg, 'error');
+        }
+    }
+
+    /**
+     * Hook to add note attachments to message compose if the according parameter is present.
+     * This completes the 'send note by mail' feature.
+     */
+    public function mail_message_compose($args)
+    {
+        if (!empty($args['param']['with_notes'])) {
+            $uids = explode(',', $args['param']['with_notes']);
+            $list = $args['param']['notes_list'];
+            $attachments = array();
+            foreach ($uids as $uid) {
+                if ($note = $this->get_note(array('uid' => $uid, 'list' => $list))) {
+                    $args['attachments'][] = array(
+                        'name'     => abbreviate_string($note['title'], 50, ''),
+                        'mimetype' => 'message/rfc822',
+                        'data'     => $this->note2message($note),
+                    );
+
+                    if (empty($args['param']['subject'])) {
+                        $args['param']['subject'] = $note['title'];
+                    }
+                }
+            }
+
+            unset($args['param']['with_notes'], $args['param']['notes_list']);
+        }
+
+        return $args;
+    }
+
+    /**
+     * Lookup backend storage and find notes tagged with the given message-ID
+     */
+    public function mail_message_load($p)
+    {
+        $this->message = $p['object'];
+        $this->message_notes = array();
+
+        // TODO: only query for notes if message was flagged with $KolabNotes ?
+
+        $message_id = trim($p['object']->headers->messageID, '<> ');
+        if ($message_id && $p['object']->uid) {
+            $query = array(array('tags','=','ref:' . $message_id));
+            foreach (kolab_storage::select($query, 'note') as $record) {
+                $record['list'] = kolab_storage::folder_id($record['_mailbox']);
+                $this->message_notes[] = $record;
+            }
+        }
+    }
+
+    /**
+     * Handler for 'messagebody_html' hook
+     */
+    public function mail_messagebody_html($args)
+    {
+        $html = '';
+        foreach ($this->message_notes as $note) {
+            $html .= html::a(array(
+                'href' => $this->rc->url(array('task' => 'notes', '_list' => $note['list'], '_id' => $note['uid'])),
+                'class' => 'kolabnotesref',
+                'rel' => $note['uid'] . '@' . $note['list'],
+                'target' => '_blank',
+            ), Q($note['title']));
+        }
+
+        // prepend note links to message body
+        if ($html) {
+            $this->load_ui();
+            $args['content'] = html::div('kolabmessagenotes', $html) . $args['content'];
+        }
+
+        return $args;
+    }
+
+    /**
+     * Determine whether the given note is HTML formatted
+     */
+    private function is_html($note)
+    {
+        // check for opening and closing <html> or <body> tags
+        return (preg_match('/<(html|body)(\s+[a-z]|>)/', $note['description'], $m) && strpos($note['description'], '</'.$m[1].'>') > 0);
+    }
+
+    /**
+     * Build an RFC 822 message from the given note
+     */
+    private function note2message($note)
+    {
+        $message = new Mail_mime("\r\n");
+
+        $message->setParam('text_encoding', '8bit');
+        $message->setParam('html_encoding', 'quoted-printable');
+        $message->setParam('head_encoding', 'quoted-printable');
+        $message->setParam('head_charset', RCUBE_CHARSET);
+        $message->setParam('html_charset', RCUBE_CHARSET);
+        $message->setParam('text_charset', RCUBE_CHARSET);
+
+        $message->headers(array(
+            'Subject' => $note['title'],
+            'Date' => $note['changed']->format('r'),
+        ));
+
+        if ($this->is_html($note)) {
+            $message->setHTMLBody($note['description']);
+
+            // add a plain text version of the note content as an alternative part.
+            $h2t = new rcube_html2text($note['description'], false, true, 0, RCUBE_CHARSET);
+            $plain_part = rcube_mime::wordwrap($h2t->get_text(), $this->rc->config->get('line_length', 72), "\r\n", false, RCUBE_CHARSET);
+            $plain_part = trim(wordwrap($plain_part, 998, "\r\n", true));
+
+            // make sure all line endings are CRLF
+            $plain_part = preg_replace('/\r?\n/', "\r\n", $plain_part);
+
+            $message->setTXTBody($plain_part);
+        }
+        else {
+            $message->setTXTBody($note['description']);
+        }
+
+        return $message->getMessage();
+    }
+
+    /**
+     * Build a URI representing the given message reference
+     */
+    private function get_message_uri($headers, $folder)
+    {
+        return sprintf('imap://%s/%s?message-id=%s&subject=%s',
+            $headers->folder ?: $folder,
+            $headers->uid,
+            urlencode($headers->messageID),
+            urlencode($headers->get('subject'))
+        );
+    }
+
+    /**
+     * Extract message reference components from the given URI
+     */
+    private function parse_message_uri($uri)
+    {
+        $url = parse_url($uri);
+        if ($url['scheme'] == 'imap') {
+            parse_str($url['query'], $param);
+            $linkref = array(
+                'uri' => $uri,
+                'message_id' => $param['message-id'] ?: urldecode($url['fragment']),
+                'subject' => $param['subject'],
+            );
+
+            $path = explode('/', $url['host'] . $url['path']);
+            $linkref['msguid'] = array_pop($path);
+            $linkref['folder'] = join('/', $path);
+
+            return $linkref;
+        }
+
+        return false;
+    }
+
+    /**
+     * Resolve the email message reference from the given URI
+     */
+    public function get_message_reference($uri, $resolve = false)
+    {
+        if ($linkref = $this->parse_message_uri($uri)) {
+            // fetch message subject
+            if ($resolve || empty($linkref['subject'])) {
+                $imap = $this->rc->get_storage();
+                if (!($message = $imap->get_message_headers($linrkef['msguid'], $linkref['folder']))) {
+                    // try to find message using the message_id fragment
+                    $index = $imap->search_once($imap->list_folders_subscribed('', '*', 'mail', null, true), 'HEADER MESSAGE-ID ' . $linkref['message_id']);
+                    if ($index->count()) {
+                        $uid = reset($index->get());
+                        $folder = $index->get_parameters('MAILBOX');
+                        if ($message = $imap->get_message_headers($uid, $folder)) {
+                            // replace metadata
+                            $linkref['subject'] = $message->get('subject');
+                            $linkref['msguid'] = $message->uid;
+                            $linkref['folder'] = $message->folder;
+                            $linkref['uri'] = $this->get_message_uri($message, $folder);
+                        }
+                    }
+                }
+            }
+
+            $linkref['mailurl'] = $this->rc->url(array(
+                'task' => 'mail',
+                'action' => 'show',
+                'mbox' => $linkref['folder'],
+                'uid' => $linkref['msguid'],
+                'rel' => 'note',
+            ));
+        }
+
+        return $linkref;
+    }
+
+    /**
+     * Process the given note data (submitted by the client) before saving it
+     */
+    private function _write_preprocess($note, $old = array())
+    {
+        $object = $note;
+
+        // TODO: handle attachments
+
+        // convert link references into simple URIs
+        if (array_key_exists('links', $note)) {
+            $object['links'] = array_map(function($link){ return is_array($link) ? $link['uri'] : strval($link); }, $note['links']);
+        }
+        else {
+            $object['links'] = $old['links'];
+        }
+
+        // clean up HTML content
+        $object['description'] = $this->_wash_html($note['description']);
+        $is_html = true;
+
+        // try to be smart and convert to plain-text if no real formatting is detected
+        if (preg_match('!<body><(?:p|pre)>(.*)</(?:p|pre)></body>!Uims', $object['description'], $m)) {
+            if (!preg_match('!<(a|b|i|strong|em|p|span|div|pre|li)(\s+[a-z]|>)!im', $m[1], $n) || !strpos($m[1], '</'.$n[1].'>')) {
+                // $converter = new rcube_html2text($m[1], false, true, 0);
+                // $object['description'] = rtrim($converter->get_text());
+                $object['description'] = html_entity_decode(preg_replace('!<br(\s+/)>!', "\n", $m[1]));
+                $is_html = false;
+            }
+        }
+
+        // Add proper HTML header, otherwise Kontact renders it as plain text
+        if ($is_html) {
+            $object['description'] = '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">'."\n" .
+                str_replace('<head>', '<head><meta name="qrichtext" content="1" />', $object['description']);
+        }
+
+        // copy meta data (starting with _) from old object
+        foreach ((array)$old as $key => $val) {
+            if (!isset($object[$key]) && $key[0] == '_')
+                $object[$key] = $val;
+        }
+
+        // make list of categories unique
+        if (is_array($object['categories'])) {
+            $object['categories'] = array_unique(array_filter($object['categories']));
+        }
+
+        unset($object['list'], $object['tempid'], $object['created'], $object['changed'], $object['created_'], $object['changed_']);
+        return $object;
+    }
+
+    /**
+     * Sanity checks/cleanups HTML content
+     */
+    private function _wash_html($html)
+    {
+        // Add header with charset spec., washtml cannot work without that
+        $html = '<html><head>'
+            . '<meta http-equiv="Content-Type" content="text/html; charset='.RCUBE_CHARSET.'" />'
+            . '</head><body>' . $html . '</body></html>';
+
+        // clean HTML with washtml by Frederic Motte
+        $wash_opts = array(
+            'show_washed'   => false,
+            'allow_remote'  => 1,
+            'charset'       => RCUBE_CHARSET,
+            'html_elements' => array('html', 'head', 'meta', 'body', 'link'),
+            'html_attribs'  => array('rel', 'type', 'name', 'http-equiv'),
+        );
+
+        // initialize HTML washer
+        $washer = new rcube_washtml($wash_opts);
+
+        $washer->add_callback('form', array($this, '_washtml_callback'));
+        $washer->add_callback('a',    array($this, '_washtml_callback'));
+
+        // Remove non-UTF8 characters
+        $html = rcube_charset::clean($html);
+
+        $html = $washer->wash($html);
+
+        // remove unwanted comments (produced by washtml)
+        $html = preg_replace('//', '', $html);
+
+        return $html;
+    }
+
+    /**
+     * Callback function for washtml cleaning class
+     */
+    public function _washtml_callback($tagname, $attrib, $content, $washtml)
+    {
+        switch ($tagname) {
+        case 'form':
+            $out = html::div('form', $content);
+            break;
+
+        case 'a':
+            // strip temporary link tags from plain-text markup
+            $attrib = html::parse_attrib_string($attrib);
+            if (!empty($attrib['class']) && strpos($attrib['class'], 'x-templink') !== false) {
+                // remove link entirely
+                if (strpos($attrib['href'], html_entity_decode($content)) !== false) {
+                    $out = $content;
+                    break;
+                }
+                $attrib['class'] = trim(str_replace('x-templink', '', $attrib['class']));
+            }
+            $out = html::a($attrib, $content);
+            break;
+
+        default:
+            $out = '';
+        }
+
+        return $out;
+    }
+
+}
+

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

@@ -0,0 +1,431 @@
+<?php
+
+class kolab_notes_ui
+{
+    private $rc;
+    private $plugin;
+    private $ready = false;
+
+    function __construct($plugin)
+    {
+        $this->plugin = $plugin;
+        $this->rc = $plugin->rc;
+    }
+
+    /**
+    * Calendar UI initialization and requests handlers
+    */
+    public function init()
+    {
+        if ($this->ready)  // already done
+            return;
+
+        // add taskbar button
+        $this->plugin->add_button(array(
+            'command' => 'notes',
+            'class'   => 'button-notes',
+            'classsel' => 'button-notes button-selected',
+            'innerclass' => 'button-inner',
+            'label'   => 'kolab_notes.navtitle',
+        ), 'taskbar');
+
+        $this->plugin->include_stylesheet($this->plugin->local_skin_path() . '/notes.css');
+
+        $this->plugin->register_action('print', array($this, 'print_template'));
+        $this->plugin->register_action('folder-acl', array($this, 'folder_acl'));
+
+        $this->ready = true;
+  }
+
+    /**
+    * Register handler methods for the template engine
+    */
+    public function init_templates()
+    {
+        $this->plugin->register_handler('plugin.tagslist', array($this, 'tagslist'));
+        $this->plugin->register_handler('plugin.notebooks', array($this, 'folders'));
+        #$this->plugin->register_handler('plugin.folders_select', array($this, 'folders_select'));
+        $this->plugin->register_handler('plugin.searchform', array($this->rc->output, 'search_form'));
+        $this->plugin->register_handler('plugin.listing', array($this, 'listing'));
+        $this->plugin->register_handler('plugin.editform', array($this, 'editform'));
+        $this->plugin->register_handler('plugin.notetitle', array($this, 'notetitle'));
+        $this->plugin->register_handler('plugin.detailview', array($this, 'detailview'));
+        $this->plugin->register_handler('plugin.attachments_list', array($this, 'attachments_list'));
+
+        $this->rc->output->include_script('list.js');
+        $this->rc->output->include_script('treelist.js');
+        $this->plugin->include_script('notes.js');
+        $this->plugin->include_script('jquery.tagedit.js');
+
+        // include kolab folderlist widget if available
+        if (is_readable($this->plugin->api->dir . 'libkolab/js/folderlist.js')) {
+            $this->plugin->api->include_script('libkolab/js/folderlist.js');
+        }
+
+        $this->plugin->include_stylesheet($this->plugin->local_skin_path() . '/tagedit.css');
+
+        // load config options and user prefs relevant for the UI
+        $settings = array(
+            'sort_col' => $this->rc->config->get('kolab_notes_sort_col', 'changed'),
+            'print_template' => $this->rc->url('print'),
+        );
+
+        if ($list = rcube_utils::get_input_value('_list', RCUBE_INPUT_GPC)) {
+            $settings['selected_list'] = $list;
+        }
+        if ($uid = rcube_utils::get_input_value('_id', RCUBE_INPUT_GPC)) {
+            $settings['selected_uid'] = $uid;
+        }
+
+        $lang_codes = array($_SESSION['language']);
+
+        if ($pos = strpos($_SESSION['language'], '_')) {
+            $lang_codes[] = substr($_SESSION['language'], 0, $pos);
+        }
+
+        foreach ($lang_codes as $code) {
+            if (file_exists(INSTALL_PATH . "program/js/tinymce/langs/$code.js")) {
+                $lang = $code;
+                break;
+            }
+        }
+
+        if (empty($lang)) {
+            $lang = 'en';
+        }
+
+        $settings['editor'] = array(
+            'lang'       => $lang,
+            'spellcheck' => intval($this->rc->config->get('enable_spellcheck')),
+            'spelldict'  => intval($this->rc->config->get('spellcheck_dictionary'))
+        );
+
+        $this->rc->output->set_env('kolab_notes_settings', $settings);
+
+        $this->rc->output->add_label('save','cancel');
+    }
+
+    public function folders($attrib)
+    {
+        $attrib += array('id' => 'rcmkolabnotebooks');
+
+        if ($attrib['type'] == 'select') {
+            $attrib['is_escaped'] = true;
+            $select = new html_select($attrib);
+        }
+
+        $tree = $attrib['type'] != 'select' ? true : null;
+        $lists = $this->plugin->get_lists($tree);
+        $jsenv = array();
+
+        if (is_object($tree)) {
+            $html = $this->folder_tree_html($tree, $lists, $jsenv, $attrib);
+        }
+        else {
+            $html = '';
+            foreach ($lists as $prop) {
+                $id = $prop['id'];
+
+                if (!$prop['virtual']) {
+                    unset($prop['user_id']);
+                    $jsenv[$id] = $prop;
+                }
+
+                if ($attrib['type'] == 'select') {
+                    if ($prop['editable']) {
+                        $select->add($prop['name'], $prop['id']);
+                    }
+                }
+                else {
+                    $html .= html::tag('li', array('id' => 'rcmliknb' . rcube_utils::html_identifier($id), 'class' => $prop['group']),
+                        $this->folder_list_item($id, $prop, $jsenv)
+                    );
+                }
+            }
+        }
+
+        $this->rc->output->set_env('kolab_notebooks', $jsenv);
+        $this->rc->output->add_gui_object('notebooks', $attrib['id']);
+
+        return $attrib['type'] == 'select' ? $select->show() : html::tag('ul', $attrib, $html, html::$common_attrib);
+    }
+
+    /**
+     * Return html for a structured list <ul> for the folder tree
+     */
+    public function folder_tree_html($node, $data, &$jsenv, $attrib)
+    {
+        $out = '';
+        foreach ($node->children as $folder) {
+            $id = $folder->id;
+            $prop = $data[$id];
+            $is_collapsed = false; // TODO: determine this somehow?
+
+            $content = $this->folder_list_item($id, $prop, $jsenv);
+
+            if (!empty($folder->children)) {
+                $content .= html::tag('ul', array('style' => ($is_collapsed ? "display:none;" : null)),
+                    $this->folder_tree_html($folder, $data, $jsenv, $attrib));
+            }
+
+            if (strlen($content)) {
+                $out .= html::tag('li', array(
+                      'id' => 'rcmliknb' . rcube_utils::html_identifier($id),
+                      'class' => $prop['group'] . ($prop['virtual'] ? ' virtual' : ''),
+                    ),
+                    $content);
+            }
+        }
+
+        return $out;
+    }
+
+    /**
+     * Helper method to build a tasklist item (HTML content and js data)
+     */
+    public function folder_list_item($id, $prop, &$jsenv, $checkbox = false)
+    {
+        if (!$prop['virtual']) {
+            unset($prop['user_id']);
+            $jsenv[$id] = $prop;
+        }
+
+        $classes = array('folder');
+        if ($prop['virtual']) {
+            $classes[] = 'virtual';
+        }
+        else if (!$prop['editable']) {
+            $classes[] = 'readonly';
+        }
+        if ($prop['subscribed']) {
+            $classes[] = 'subscribed';
+        }
+        if ($prop['class']) {
+            $classes[] = $prop['class'];
+        }
+
+        $title = $prop['title'] ?: ($prop['name'] != $prop['listname'] || strlen($prop['name']) > 25 ?
+          html_entity_decode($prop['name'], ENT_COMPAT, RCMAIL_CHARSET) : '');
+
+        $label_id = 'nl:' . $id;
+        $attr = $prop['virtual'] ? array('tabindex' => '0') : array('href' => $this->rc->url(array('_list' => $id)));
+        return html::div(join(' ', $classes),
+            html::a($attr + array('class' => 'listname', 'title' => $title, 'id' => $label_id), $prop['listname'] ?: $prop['name']) .
+            ($prop['virtual'] ? '' :
+                ($checkbox ?
+                    html::tag('input', array('type' => 'checkbox', 'name' => '_list[]', 'value' => $id, 'checked' => $prop['active'], 'aria-labelledby' => $label_id)) :
+                    ''
+                ) .
+                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'), ' ') :
+                    ''
+                )
+            )
+        );
+
+        return '';
+    }
+
+    public function listing($attrib)
+    {
+        $attrib += array('id' => 'rcmkolabnoteslist');
+        $this->rc->output->add_gui_object('noteslist', $attrib['id']);
+        return html::tag('ul', $attrib, '', html::$common_attrib);
+    }
+
+    public function tagslist($attrib)
+    {
+        $attrib += array('id' => 'rcmkolabnotestagslist');
+        $this->rc->output->add_gui_object('notestagslist', $attrib['id']);
+        return html::tag('ul', $attrib, '', html::$common_attrib);
+    }
+
+    public function editform($attrib)
+    {
+        $attrib += array('action' => '#', 'id' => 'rcmkolabnoteseditform');
+
+        $this->rc->output->add_gui_object('noteseditform', $attrib['id']);
+        $this->rc->output->include_script('tinymce/tinymce.min.js');
+
+        $textarea = new html_textarea(array('name' => 'content', 'id' => 'notecontent', 'cols' => 60, 'rows' => 20, 'tabindex' => 0));
+        return html::tag('form', $attrib, $textarea->show(), array_merge(html::$common_attrib, array('action')));
+    }
+
+    public function detailview($attrib)
+    {
+        $attrib += array('id' => 'rcmkolabnotesdetailview');
+        $this->rc->output->add_gui_object('notesdetailview', $attrib['id']);
+        return html::div($attrib, '');
+    }
+
+    public function notetitle($attrib)
+    {
+        $attrib += array('id' => 'rcmkolabnotestitle');
+        $this->rc->output->add_gui_object('noteviewtitle', $attrib['id']);
+
+        $summary = new html_inputfield(array('name' => 'summary', 'class' => 'notetitle inline-edit', 'size' => 60, 'tabindex' => 0));
+
+        $html = $summary->show();
+        $html .= html::div(array('class' => 'tagline tagedit', 'style' => 'display:none'), '&nbsp;');
+        $html .= html::div(array('class' => 'dates', 'style' => 'display:none'),
+            html::label(array(), $this->plugin->gettext('created')) .
+            html::span('notecreated', '') .
+            html::label(array(), $this->plugin->gettext('changed')) .
+            html::span('notechanged', '')
+        );
+
+        return html::div($attrib, $html);
+    }
+
+    public function attachments_list($attrib)
+    {
+        $attrib += array('id' => 'rcmkolabnotesattachmentslist');
+        $this->rc->output->add_gui_object('notesattachmentslist', $attrib['id']);
+        return html::tag('ul', $attrib, '', html::$common_attrib);
+    }
+
+    /**
+     * Render edit for notes lists (folders)
+     */
+    public function list_editform($action, $list, $folder)
+    {
+        if (is_object($folder)) {
+            $folder_name = $folder->name; // UTF7
+        }
+        else {
+            $folder_name = '';
+        }
+
+        $hidden_fields[] = array('name' => 'oldname', 'value' => $folder_name);
+
+        $storage = $this->rc->get_storage();
+        $delim   = $storage->get_hierarchy_delimiter();
+        $form   = array();
+
+        if (strlen($folder_name)) {
+            $options = $storage->folder_info($folder_name);
+
+            $path_imap = explode($delim, $folder_name);
+            array_pop($path_imap);  // pop off name part
+            $path_imap = implode($path_imap, $delim);
+        }
+        else {
+            $path_imap = '';
+            $options = array();
+        }
+
+        // General tab
+        $form['properties'] = array(
+            'name' => $this->rc->gettext('properties'),
+            'fields' => array(),
+        );
+
+        // folder name (default field)
+        $input_name = new html_inputfield(array('name' => 'name', 'id' => 'noteslist-name', 'size' => 20));
+        $form['properties']['fields']['name'] = array(
+            'label' => $this->plugin->gettext('listname'),
+            'value' => $input_name->show($list['editname'], array('disabled' => ($options['norename'] || $options['protected']))),
+            'id' => 'noteslist-name',
+        );
+
+        // prevent user from moving folder
+        if (!empty($options) && ($options['norename'] || $options['protected'])) {
+            $hidden_fields[] = array('name' => 'parent', 'value' => $path_imap);
+        }
+        else {
+            $select = kolab_storage::folder_selector('note', array('name' => 'parent', 'id' => 'parent-folder'), $folder_name);
+            $form['properties']['fields']['path'] = array(
+                'label' => $this->plugin->gettext('parentfolder'),
+                'value' => $select->show(strlen($folder_name) ? $path_imap : ''),
+                'id' => 'parent-folder',
+            );
+        }
+
+        // add folder ACL tab
+        if ($action != 'form-new') {
+            $form['sharing'] = array(
+                'name'    => Q($this->plugin->gettext('tabsharing')),
+                'content' => html::tag('iframe', array(
+                    'src' => $this->rc->url(array('_action' => 'folder-acl', '_folder' => $folder_name, 'framed' => 1)),
+                    'width' => '100%',
+                    'height' => 280,
+                    'border' => 0,
+                    'style' => 'border:0'),
+                '')
+            );
+        }
+
+        $form_html = '';
+        if (is_array($hidden_fields)) {
+            foreach ($hidden_fields as $field) {
+                $hiddenfield = new html_hiddenfield($field);
+                $form_html .= $hiddenfield->show() . "\n";
+            }
+        }
+
+        // create form output
+        foreach ($form as $tab) {
+            if (is_array($tab['fields']) && empty($tab['content'])) {
+                $table = new html_table(array('cols' => 2));
+                foreach ($tab['fields'] as $col => $colprop) {
+                    $label = !empty($colprop['label']) ? $colprop['label'] : $this->plugin->gettext($col);
+
+                    $table->add('title', html::label($colprop['id'], Q($label)));
+                    $table->add(null, $colprop['value']);
+                }
+                $content = $table->show();
+            }
+            else {
+                $content = $tab['content'];
+            }
+
+            if (!empty($content)) {
+                $form_html .= html::tag('fieldset', null, html::tag('legend', null, Q($tab['name'])) . $content) . "\n";
+            }
+        }
+
+        return html::tag('form', array('action' => "#", 'method' => "post", 'id' => "noteslistpropform"), $form_html);
+    }
+
+    /**
+     * Handler to render ACL form for a notes folder
+     */
+    public function folder_acl()
+    {
+        $this->plugin->require_plugin('acl');
+        $this->rc->output->add_handler('folderacl', array($this, 'folder_acl_form'));
+        $this->rc->output->send('kolab_notes.kolabacl');
+    }
+
+    /**
+     * Handler for ACL form template object
+     */
+    public function folder_acl_form()
+    {
+        $folder = rcube_utils::get_input_value('_folder', RCUBE_INPUT_GPC);
+
+        if (strlen($folder)) {
+            $storage = $this->rc->get_storage();
+            $options = $storage->folder_info($folder);
+
+            // get sharing UI from acl plugin
+            $acl = $this->rc->plugins->exec_hook('folder_form',
+                array('form' => array(), 'options' => $options, 'name' => $folder));
+        }
+
+        return $acl['form']['sharing']['content'] ?: html::div('hint', $this->plugin->gettext('aclnorights'));
+    }
+
+    /**
+     * Render the template for printing with placeholders
+     */
+    public function print_template()
+    {
+        $this->rc->output->reset(true);
+        echo $this->rc->output->parse('kolab_notes.print', false, false);
+        exit;
+    }
+
+}
+

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

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

@@ -0,0 +1,56 @@
+<?php
+
+$labels = array();
+$labels['navtitle'] = 'Notes';
+$labels['tags'] = 'Tags';
+$labels['lists'] = 'Notebooks';
+$labels['notes'] = 'Notes';
+$labels['create'] = 'New Note';
+$labels['createnote'] = 'Create a new note';
+$labels['send'] = 'Send';
+$labels['sendnote'] = 'Send note by email';
+$labels['newnote'] = 'New Note';
+$labels['notags'] = 'No tags';
+$labels['removetag'] = 'Remove tag';
+$labels['created'] = 'Created';
+$labels['changed'] = 'Last Modified';
+$labels['title'] = 'Title';
+$labels['now'] = 'Now';
+$labels['sortby'] = 'Sort by';
+$labels['newnotebook'] = 'Create a new notebook';
+$labels['addnotebook'] = 'Add notebook';
+$labels['editlist'] = 'Edit Notebook';
+$labels['listname'] = 'Name';
+$labels['tabsharing'] = 'Sharing';
+$labels['discard'] = 'Discard';
+$labels['abort'] = 'Abort';
+$labels['unsavedchanges'] = 'Unsaved Changes!';
+$labels['appendnote'] = 'Add a Note';
+$labels['editnote'] = 'Edit Note';
+$labels['savein'] = 'Save in';
+$labels['foldersubscribe'] = 'List permanently';
+$labels['findnotebooks'] = 'Find notebooks...';
+$labels['listsearchresults'] = 'Additional notebooks';
+$labels['nrnotebooksfound'] = '$nr notebooks found';
+$labels['nonotebooksfound'] = 'No notebooks found';
+
+$labels['savingdata'] = 'Saving data...';
+$labels['recordnotfound'] = 'Record not found';
+$labels['norecordsfound'] = 'No notes found';
+$labels['nochanges'] = 'No changes to be saved';
+$labels['entertitle'] = 'Please enter a title for this note!';
+$labels['deletenotesconfirm'] = 'Do you really want to delete the selected notes?';
+$labels['deletenotebookconfirm'] = 'Do you really want to delete this notebook with all its notes? This action cannot be undone.';
+$labels['discardunsavedchanges'] = 'The current note has not yet been saved. Discard the changes?';
+$labels['invalidlistproperties'] = 'Invalid notebook properties! Please set a valid name.';
+$labels['entertitle'] = 'Please enter a title for this note.';
+$labels['aclnorights'] = 'You do not have administrator rights for this notebook.';
+
+$labels['arialabelnoteslist'] = 'List of notes';
+$labels['arialabelnotesearchform'] = 'Notes search form';
+$labels['arialabelnotesquicksearchbox'] = 'Notes search input';
+$labels['arialabelnotessortmenu'] = 'Notes list sorting options';
+$labels['arialabelnotesoptionsmenu'] = 'Notebook actions menu';
+$labels['arialabelnotebookform'] = 'Notebook properties';
+$labels['arialabelmessagereferences'] = 'Linked email messages';
+$labels['arialabelfolderearchform'] = 'Notebooks search form';

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

@@ -0,0 +1,1404 @@
+/**
+ * Client scripts for the Kolab Notes plugin
+ *
+ * @author Thomas Bruederli <bruederli@kolabsys.com>
+ *
+ * @licstart  The following is the entire license notice for the
+ * JavaScript code in this file.
+ *
+ * Copyright (C) 2014, Kolab Systems AG <contact@kolabsys.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * @licend  The above is the entire license notice
+ * for the JavaScript code in this file.
+ */
+
+function rcube_kolab_notes_ui(settings)
+{
+    /*  private vars  */
+    var ui_loading = false;
+    var saving_lock;
+    var search_query;
+    var folder_drop_target;
+    var notebookslist;
+    var noteslist;
+    var notesdata = {};
+    var tagsfilter = [];
+    var tags = [];
+    var search_request;
+    var search_query;
+    var tag_draghelper;
+    var render_no_focus;
+    var me = this;
+
+    /*  public members  */
+    this.selected_list;
+    this.selected_note;
+    this.notebooks = rcmail.env.kolab_notebooks || {};
+
+    /**
+     * initialize the notes UI
+     */
+    function init()
+    {
+        // register button commands
+        rcmail.register_command('createnote', function(){
+            warn_unsaved_changes(function(){ edit_note(null, 'new'); })
+        }, 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-remove', function(){ list_remove(me.selected_list); }, false);
+        rcmail.register_command('list-sort', list_set_sort, true);
+        rcmail.register_command('save', save_note, true);
+        rcmail.register_command('delete', delete_notes, false);
+        rcmail.register_command('search', quicksearch, true);
+        rcmail.register_command('reset-search', reset_search, true);
+        rcmail.register_command('sendnote', send_note, false);
+        rcmail.register_command('print', print_note, false);
+
+        // register server callbacks
+        rcmail.addEventListener('plugin.data_ready', data_ready);
+        rcmail.addEventListener('plugin.render_note', render_note);
+        rcmail.addEventListener('plugin.update_note', update_note);
+        rcmail.addEventListener('plugin.update_list', list_update);
+        rcmail.addEventListener('plugin.destroy_list', list_destroy);
+        rcmail.addEventListener('plugin.unlock_saving', function(){
+            if (saving_lock) {
+                rcmail.set_busy(false, null, saving_lock);
+            }
+            if (rcmail.gui_objects.noteseditform) {
+                rcmail.lock_form(rcmail.gui_objects.noteseditform, false);
+            }
+        });
+
+        // initialize folder selectors
+        var li, id;
+        for (id in me.notebooks) {
+            if (me.notebooks[id].editable && !settings.selected_list) {
+                settings.selected_list = id;
+            }
+        }
+
+        var widget_class = window.kolab_folderlist || rcube_treelist_widget;
+        notebookslist = new widget_class(rcmail.gui_objects.notebooks, {
+          id_prefix: 'rcmliknb',
+          save_state: true,
+          selectable: true,
+          keyboard: false,
+          searchbox: '#notebooksearch',
+          search_action: 'notes/list',
+          search_sources: [ 'folders', 'users' ],
+          search_title: rcmail.gettext('listsearchresults','kolab_notes'),
+          check_droptarget: function(node) {
+              var list = me.notebooks[node.id];
+              return !node.virtual && list.editable && node.id != me.selected_list;
+          }
+        });
+        notebookslist.addEventListener('select', function(node) {
+            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);
+                    fetch_notes(id);  // sets me.selected_list
+                },
+                function(){
+                    // restore previous selection
+                    notebookslist.select(me.selected_list);
+                });
+            }
+        });
+        notebookslist.addEventListener('subscribe', function(p) {
+            var list;
+            if ((list = me.notebooks[p.id])) {
+                list.subscribed = p.subscribed || false;
+                rcmail.http_post('list', { _do:'subscribe', _list:{ id:p.id, permanent:list.subscribed?1:0 } });
+            }
+        });
+        notebookslist.addEventListener('insert-item', function(p) {
+            var list = p.data;
+            if (list && list.id && !list.virtual) {
+                me.notebooks[list.id] = list;
+                var prop = { id:p.id, active:list.active?1:0 };
+                if (list.subscribed) prop.permanent = 1;
+                rcmail.http_post('list', { _do:'subscribe', _list:prop });
+            }
+        });
+        notebookslist.addEventListener('search-complete', function(data) {
+            if (data.length)
+                rcmail.display_message(rcmail.gettext('nrnotebooksfound','kolab_notes').replace('$nr', data.length), 'voice');
+            else
+                rcmail.display_message(rcmail.gettext('nonotebooksfound','kolab_notes'), 'info');
+        });
+
+        $(rcmail.gui_objects.notebooks).on('click', 'div.folder > a.listname', function(e) {
+            var id = String($(this).closest('li').attr('id')).replace(/^rcmliknb/, '');
+            notebookslist.select(id);
+            e.preventDefault();
+            return false;
+        });
+
+        // register dbl-click handler to open list edit dialog
+        $(rcmail.gui_objects.notebooks).on('dblclick', 'li:not(.virtual) a', function(e) {
+            var id = String($(this).closest('li').attr('id')).replace(/^rcmliknb/, '');
+            if (me.notebooks[id] && me.notebooks[id].editable) {
+                list_edit_dialog(id);
+            }
+
+            // clear text selection (from dbl-clicking)
+            var sel = window.getSelection ? window.getSelection() : document.selection;
+            if (sel && sel.removeAllRanges) {
+                sel.removeAllRanges();
+            }
+            else if (sel && sel.empty) {
+                sel.empty();
+            }
+
+            e.preventDefault();
+            return false;
+        });
+
+        // initialize notes list widget
+        if (rcmail.gui_objects.noteslist) {
+            noteslist = new rcube_list_widget(rcmail.gui_objects.noteslist,
+                { multiselect:true, draggable:true, keyboard:true });
+            noteslist.addEventListener('select', function(list) {
+                render_no_focus = rcube_event._last_keyboard_event && $(list.list).has(rcube_event._last_keyboard_event.target);
+                var selection_changed = list.selection.length != 1 || !me.selected_note || list.selection[0] != me.selected_note.id;
+                selection_changed && warn_unsaved_changes(function(){
+                    var note;
+                    if (noteslist.selection.length == 1 && (note = notesdata[noteslist.selection[0]])) {
+                        edit_note(note.uid, 'edit');
+                    }
+                    else {
+                        reset_view();
+                    }
+                },
+                function(){
+                    // TODO: previous restore selection
+                    list.select(me.selected_note.id);
+                });
+
+                rcmail.enable_command('delete', me.notebooks[me.selected_list] && me.notebooks[me.selected_list].editable && list.selection.length > 0);
+                rcmail.enable_command('sendnote', list.selection.length > 0);
+                rcmail.enable_command('print', list.selection.length == 1);
+            })
+            .addEventListener('dragstart', function(e) {
+                folder_drop_target = null;
+                notebookslist.drag_start();
+            })
+            .addEventListener('dragmove', function(e) {
+                folder_drop_target = notebookslist.intersects(rcube_event.get_mouse_pos(e), true);
+            })
+            .addEventListener('dragend', function(e) {
+                notebookslist.drag_end();
+
+                // move dragged notes to this folder
+                if (folder_drop_target) {
+                    noteslist.draglayer.hide();
+                    move_notes(folder_drop_target);
+                    noteslist.clear_selection();
+                    reset_view();
+                }
+                folder_drop_target = null;
+            })
+            .init().focus();
+        }
+
+        if (settings.sort_col) {
+            $('#notessortmenu a.by-' + settings.sort_col).addClass('selected');
+        }
+
+        // click-handler on tags list
+        $(rcmail.gui_objects.notestagslist).on('click', 'li', function(e){
+            var item = e.target.nodeName == 'LI' ? $(e.target) : $(e.target).closest('li'),
+                tag = item.data('value');
+
+            if (!tag)
+                return false;
+
+            // reset selection on regular clicks
+            var index = $.inArray(tag, tagsfilter);
+            var shift = e.shiftKey || e.ctrlKey || e.metaKey;
+
+            if (!shift) {
+                if (tagsfilter.length > 1)
+                    index = -1;
+
+                $('li', rcmail.gui_objects.notestagslist).removeClass('selected').attr('aria-checked', 'false');
+                tagsfilter = [];
+            }
+
+            // add tag to filter
+            if (index < 0) {
+                item.addClass('selected').attr('aria-checked', 'true');
+                tagsfilter.push(tag);
+            }
+            else if (shift) {
+                item.removeClass('selected').attr('aria-checked', 'false');
+                var a = tagsfilter.slice(0,index);
+                tagsfilter = a.concat(tagsfilter.slice(index+1));
+            }
+
+            filter_notes();
+
+            // clear text selection in IE after shift+click
+            if (shift && document.selection)
+              document.selection.empty();
+
+            e.preventDefault();
+            return false;
+        })
+        .on('keypress', 'li', function(e) {
+            if (e.keyCode == 13) {
+                $(this).trigger('click', { pointerType:'keyboard' });
+            }
+        })
+        .mousedown(function(e){
+            // disable content selection with the mouse
+            e.preventDefault();
+            return false;
+        });
+
+        init_editor();
+
+        if (settings.selected_list) {
+            notebookslist.select(settings.selected_list)
+        }
+    }
+    this.init = init;
+
+    /**
+     *
+     */
+    function init_dialog()
+    {
+        rcmail.register_command('save', save_note, true);
+        rcmail.addEventListener('plugin.render_note', render_note);
+        rcmail.addEventListener('plugin.update_note', function(data){
+            data.id = rcmail.html_identifier_encode(data.uid);
+            notesdata[data.id] = data;
+            render_note(data);
+        });
+        rcmail.addEventListener('plugin.unlock_saving', function(){
+            if (saving_lock) {
+                rcmail.set_busy(false, null, saving_lock);
+            }
+            if (rcmail.gui_objects.noteseditform) {
+                rcmail.lock_form(rcmail.gui_objects.noteseditform, false);
+            }
+        });
+
+        var id;
+        for (id in me.notebooks) {
+            if (me.notebooks[id].editable) {
+                me.selected_list = id;
+                break;
+            }
+        }
+
+        init_editor();
+        if (settings.selected_uid) {
+            me.selected_list = settings.selected_list;
+            edit_note(settings.selected_uid);
+        }
+        else {
+            setTimeout(function(){
+                me.selected_note = $.extend({
+                    list: me.selected_list,
+                    uid: null,
+                    title: rcmail.gettext('newnote','kolab_notes'),
+                    description: '',
+                    categories: [],
+                    created: rcmail.gettext('now', 'kolab_notes'),
+                    changed: rcmail.gettext('now', 'kolab_notes')
+                }, rcmail.env.kolab_notes_template || {});
+                render_note(me.selected_note);
+            }, 100);
+        }
+    }
+    this.init_dialog = init_dialog;
+
+    /**
+     * initialize tinyMCE editor
+     */
+    function init_editor()
+    {
+        var editor_conf = {
+            selector: '#notecontent',
+            theme: 'modern',
+            language: settings.editor.lang,
+            content_css: 'program/js/tinymce/roundcube/content.css?v1',
+            plugins: 'autolink charmap code link paste tabfocus searchreplace table textcolor',
+            toolbar: 'bold italic underline | alignleft aligncenter alignright alignjustify '
+                + '| bullist numlist outdent indent blockquote | forecolor backcolor fontselect fontsizeselect '
+                + '| link unlink table charmap | code searchreplace undo redo',
+            menubar: false,
+            statusbar: false,
+            toolbar_items_size: 'small',
+            extended_valid_elements: 'font[face|size|color|style],span[id|class|align|style]',
+            relative_urls: false,
+            remove_script_host: false,
+            convert_urls: false,
+            image_description: false,
+            paste_webkit_style: "color font-size font-family",
+            paste_data_images: true,
+            //spellchecker_rpc_url: '../../../../../?_task=utils&_action=spell_html&_remote=1',
+            //spellchecker_language: rcmail.env.spell_lang,
+            accessibility_focus: false,
+            tabfocus_elements: [':prev','btn-save-note'],
+            setup: function(ed) {
+                // make links open on shift-click
+                ed.on('click', function(e) {
+                    var link = $(e.target).closest('a');
+                    if (link.length && e.shiftKey) {
+                        if (!bw.mz) window.open(link.get(0).href, '_blank');
+                        return false;
+                    }
+                });
+            }
+        };
+
+        // support external configuration settings e.g. from skin
+        if (window.rcmail_editor_settings)
+            $.extend(editor_conf, window.rcmail_editor_settings);
+
+        tinyMCE.init(editor_conf);
+
+        // register click handler for message links
+        $(rcmail.gui_objects.notesattachmentslist).on('click', 'li a.messagelink', function(){
+            rcmail.open_window(this.href);
+            return false;
+        });
+    }
+
+    /**
+     * Quote HTML entities
+     */
+    function Q(str)
+    {
+        return String(str).replace(/</g, '&lt;').replace(/>/g, '&gt;').replace(/"/g, '&quot;');
+    }
+
+    /**
+     * Trim whitespace off the given string
+     */
+    function trim(str)
+    {
+        return String(str).replace(/\s+$/, '').replace(/^\s+/, '');
+    }
+
+    /**
+     * 
+     */
+    function edit_note(uid, action)
+    {
+        if (!uid) {
+            if (noteslist)
+                noteslist.clear_selection();
+            me.selected_note = {
+                list: me.selected_list,
+                uid: null,
+                title: rcmail.gettext('newnote','kolab_notes'),
+                description: '',
+                categories: [],
+                created: rcmail.gettext('now', 'kolab_notes'),
+                changed: rcmail.gettext('now', 'kolab_notes')
+            }
+            render_note(me.selected_note);
+            rcmail.enable_command('print', true);
+        }
+        else {
+            ui_loading = rcmail.set_busy(true, 'loading');
+            rcmail.http_request('get', { _list:me.selected_list, _id:uid }, true);
+        }
+    }
+
+    /**
+     * 
+     */
+    function list_edit_dialog(id)
+    {
+        if (!rcmail.gui_containers.notebookeditform) {
+            return false;
+        }
+
+        // close show dialog first
+        var $dialog = rcmail.gui_containers.notebookeditform;
+        if ($dialog.is(':ui-dialog')) {
+            $dialog.dialog('close');
+        }
+
+        var list = me.notebooks[id] || { name:'', editable:true };
+        var form, name;
+
+        $dialog.html(rcmail.get_label('loading'));
+        $.ajax({
+            type: 'GET',
+            dataType: 'html',
+            url: rcmail.url('list'),
+            data: { _do: (list.id ? 'form-edit' : 'form-new'), _list: { id: list.id } },
+            success: function(data) {
+                $dialog.html(data);
+                rcmail.triggerEvent('kolab_notes_editform_load', list);
+
+                // resize and reposition dialog window
+                form = $('#noteslistpropform');
+                var win = $(window), w = win.width(), h = win.height();
+                $dialog.dialog('option', { height: Math.min(h-20, form.height()+130), width: Math.min(w-20, form.width()+50) })
+                    .dialog('option', 'position', ['center', 'center']);  // only works in a separate call (!?)
+
+                name = $('#noteslist-name').prop('disabled', !list.editable).val(list.editname || list.name);
+                name.select();
+            }
+        });
+
+        // dialog buttons
+        var buttons = {};
+        buttons[rcmail.gettext('save')] = function() {
+            // form is not loaded
+            if (!form || !form.length)
+              return;
+
+            // do some input validation
+            if (!name.val() || name.val().length < 2) {
+              alert(rcmail.gettext('invalidlistproperties', 'kolab_notes'));
+              name.select();
+              return;
+            }
+
+            // post data to server
+            var data = form.serializeJSON();
+            if (list.id)
+              data.id = list.id;
+
+            saving_lock = rcmail.set_busy(true, 'kolab_notes.savingdata');
+            rcmail.http_post('list', { _do: (list.id ? 'edit' : 'new'), _list: data });
+            $dialog.dialog('close');
+        };
+
+        buttons[rcmail.gettext('cancel')] = function() {
+            $dialog.dialog('close');
+        };
+
+        // open jquery UI dialog
+        $dialog.dialog({
+            modal: true,
+            resizable: true,
+            closeOnEscape: false,
+            title: rcmail.gettext((list.id ? 'editlist' : 'newnotebook'), 'kolab_notes'),
+            open: function() {
+                $dialog.parent().find('.ui-dialog-buttonset .ui-button').first().addClass('mainaction');
+            },
+            close: function() {
+                $dialog.html('').dialog('destroy').hide();
+            },
+            buttons: buttons,
+            minWidth: 480,
+            width: 640,
+        }).show();
+
+    }
+
+    /**
+     * Callback from server after changing list properties
+     */
+    function list_update(prop)
+    {
+        if (prop._reload) {
+            rcmail.redirect(rcmail.url('', { _list: (prop.newid || prop.id) }));
+        }
+        else if (prop.newid && prop.newid != prop.id) {
+            var book = $.extend({}, me.notebooks[prop.id]);
+            book.id = prop.newid;
+            book.name = prop.name;
+            book.listname = prop.listname;
+            book.editname = prop.editname || prop.name;
+
+            me.notebooks[prop.newid] = book;
+            delete me.notebooks[prop.id];
+
+            // update treelist item
+            var li = $(notebookslist.get_item(prop.id));
+            $('.listname', li).html(prop.listname);
+            notebookslist.update(prop.id, { id:book.id, html:li.html() });
+
+            // link all loaded note records to the new list id
+            if (me.selected_list == prop.id) {
+                me.selected_list = prop.newid;
+                for (var k in notesdata) {
+                    if (notesdata[k].list == prop.id) {
+                        notesdata[k].list = book.id;
+                    }
+                }
+                notebookslist.select(prop.newid);
+            }
+        }
+    }
+
+
+    /**
+     * 
+     */
+    function list_remove(id)
+    {
+        var list = me.notebooks[id];
+        if (list && confirm(rcmail.gettext('deletenotebookconfirm', 'kolab_notes'))) {
+            saving_lock = rcmail.set_busy(true, 'kolab_notes.savingdata');
+            rcmail.http_post('list', { _do: 'delete', _list: { id: list.id } });
+        }
+    }
+
+    /**
+     * Callback from server on list delete command
+     */
+    function list_destroy(prop)
+    {
+        if (!me.notebooks[prop.id]) {
+            return;
+        }
+
+        notebookslist.remove(prop.id);
+        delete me.notebooks[prop.id];
+
+        if (me.selected_list == prop.id) {
+            for (id in me.notebooks) {
+                if (me.notebooks[id]) {
+                    notebookslist.select(id);
+                    break;
+                }
+            }
+        }
+    }
+
+    /**
+     * Change notes list sort order
+     */
+    function list_set_sort(col)
+    {
+        if (settings.sort_col != col) {
+            settings.sort_col = col;
+            $('#notessortmenu a').removeClass('selected').filter('.by-' + col).addClass('selected');
+            rcmail.save_pref({ name: 'kolab_notes_sort_col', value: col });
+
+            // re-sort table in DOM
+            $(noteslist.tbody).children().sortElements(function(la, lb){
+                var a_id = String(la.id).replace(/^rcmrow/, ''),
+                    b_id = String(lb.id).replace(/^rcmrow/, ''),
+                    a = notesdata[a_id],
+                    b = notesdata[b_id];
+
+                if (!a || !b) {
+                    return 0;
+                }
+                else if (settings.sort_col == 'title') {
+                    return String(a.title).toLowerCase() > String(b.title).toLowerCase() ? 1 : -1;
+                }
+                else {
+                    return b.changed_ - a.changed_;
+                }
+            });
+        }
+    }
+
+    /**
+     * Execute search
+     */
+    function quicksearch()
+    {
+        var q;
+        if (rcmail.gui_objects.qsearchbox && (q = rcmail.gui_objects.qsearchbox.value)) {
+            var id = 'search-'+q;
+
+            // ignore if query didn't change
+            if (search_request == id)
+                return;
+
+            warn_unsaved_changes(function(){
+                search_request = id;
+                search_query = q;
+
+                fetch_notes();
+            },
+            function(){
+                reset_search();
+            });
+        }
+        else {  // empty search input equals reset
+            reset_search();
+        }
+    }
+
+    /**
+     * Reset search and get back to normal listing
+     */
+    function reset_search()
+    {
+        $(rcmail.gui_objects.qsearchbox).val('');
+
+        if (search_request) {
+            search_request = search_query = null;
+            fetch_notes();
+        }
+    }
+
+    /**
+     * 
+     */
+    function fetch_notes(id)
+    {
+        if (rcmail.busy)
+            return;
+
+        if (id && id != me.selected_list) {
+            me.selected_list = id;
+        }
+
+        ui_loading = rcmail.set_busy(true, 'loading');
+        rcmail.http_request('fetch', { _list:me.selected_list, _q:search_query }, true);
+
+        reset_view();
+        noteslist.clear(true);
+        notesdata = {};
+        tagsfilter = [];
+        update_state();
+    }
+
+    function filter_notes()
+    {
+        // tagsfilter
+        var note, tr, match;
+        for (var id in noteslist.rows) {
+            tr = noteslist.rows[id].obj;
+            note = notesdata[id];
+            match = note.categories && note.categories.length;
+            for (var i=0; match && note && i < tagsfilter.length; i++) {
+                if ($.inArray(tagsfilter[i], note.categories) < 0)
+                    match = false;
+            }
+
+            if (match || !tagsfilter.length) {
+                $(tr).show();
+            }
+            else {
+                $(tr).hide();
+            }
+
+            if (me.selected_note && me.selected_note.uid == note.uid && !match) {
+                warn_unsaved_changes(function(){
+                    me.selected_note = null;
+                    noteslist.clear_selection();
+                }, function(){
+                    tagsfilter = [];
+                    filter_notes();
+                    update_tagcloud();
+                });
+            }
+        }
+    }
+
+    /**
+     * 
+     */
+    function data_ready(data)
+    {
+        data.data.sort(function(a,b){
+            if (settings.sort_col == 'title') {
+                return String(a.title).toLowerCase() > String(b.title).toLowerCase() ? 1 : -1;
+            }
+            else {
+                return b.changed_ - a.changed_;
+            }
+        });
+
+        var i, id, rec;
+        for (i=0; data.data && i < data.data.length; i++) {
+            rec = data.data[i];
+            rec.id = rcmail.html_identifier_encode(rec.uid);
+            noteslist.insert_row({
+                id: 'rcmrow' + rec.id,
+                cols: [
+                    { className:'title', innerHTML:Q(rec.title) },
+                    { className:'date',  innerHTML:Q(rec.changed || '') }
+                ]
+            });
+
+            notesdata[rec.id] = rec;
+        }
+
+        render_tagslist(data.tags || [], !data.search)
+        rcmail.set_busy(false, 'loading', ui_loading);
+
+        // select the single result
+        if (data.data.length == 1) {
+            noteslist.select(data.data[0].id);
+        }
+        else if (settings.selected_uid) {
+            noteslist.select(rcmail.html_identifier_encode(settings.selected_uid));
+            delete settings.selected_uid;
+        }
+        else if (me.selected_note && notesdata[me.selected_note.id]) {
+            noteslist.select(me.selected_note.id);
+        }
+        else if (!data.data.length) {
+            console.log(data);
+            rcmail.display_message(rcmail.gettext('norecordsfound','kolab_notes'), 'info');
+        }
+    }
+
+    /**
+     *
+     */
+    function render_note(data)
+    {
+        rcmail.set_busy(false, 'loading', ui_loading);
+
+        if (!data) {
+            rcmail.display_message(rcmail.get_label('recordnotfound', 'kolab_notes'), 'error');
+            return;
+        }
+
+        var list = me.notebooks[data.list] || me.notebooks[me.selected_list] || {};
+            content = $('#notecontent').val(data.description),
+            readonly = data.readonly || !list.editable,
+            attachmentslist = $(rcmail.gui_objects.notesattachmentslist).html('');
+        $('.notetitle', rcmail.gui_objects.noteviewtitle).val(data.title).prop('disabled', readonly);
+        $('.dates .notecreated', rcmail.gui_objects.noteviewtitle).html(Q(data.created || ''));
+        $('.dates .notechanged', rcmail.gui_objects.noteviewtitle).html(Q(data.changed || ''));
+        $(rcmail.gui_objects.notebooks).filter('select').val(list.id);
+        if (data.created || data.changed) {
+            $('.dates', rcmail.gui_objects.noteviewtitle).show();
+        }
+
+        // tag-edit line
+        var tagline = $('.tagline', rcmail.gui_objects.noteviewtitle).empty().show();
+        $.each(typeof data.categories == 'object' && data.categories.length ? data.categories : [''], function(i,val){
+            $('<input>')
+                .attr('name', 'tags[]')
+                .attr('tabindex', '0')
+                .addClass('tag')
+                .val(val)
+                .appendTo(tagline);
+        });
+
+        if (!data.categories || !data.categories.length) {
+            $('<span>').addClass('placeholder').html(rcmail.gettext('notags', 'kolab_notes')).appendTo(tagline);
+        }
+
+        $('.tagline input.tag', rcmail.gui_objects.noteviewtitle).tagedit({
+            animSpeed: 100,
+            allowEdit: false,
+            allowAdd: !readonly,
+            allowDelete: !readonly,
+            checkNewEntriesCaseSensitive: false,
+            autocompleteOptions: { source: tags, minLength: 0, noCheck: true },
+            texts: { removeLinkTitle: rcmail.gettext('removetag', 'kolab_notes') }
+        });
+
+        if (data.links) {
+            $.each(data.links, function(i, link){
+                var li = $('<li>').addClass('link')
+                    .addClass('message eml')
+                    .append($('<a>')
+                        .attr('href', link.mailurl)
+                        .addClass('messagelink')
+                        .html(Q(link.subject || link.message_id || link.uri))
+                    )
+                    .appendTo(attachmentslist);
+/*
+                if (!readonly && !data._from_mail) {
+                    $('<a>')
+                        .attr('href', '#delete')
+                        .attr('title', rcmail.gettext('delete'))
+                        .addClass('delete')
+                        .html(rcmail.gettext('delete'))
+                        .appendTo(li);
+                }
+*/
+            });
+        }
+
+        if (!readonly) {
+            $('.tagedit-list', rcmail.gui_objects.noteviewtitle)
+                .on('click', function(){ $('.tagline .placeholder').hide(); });
+        }
+
+        if (!data.list)
+            data.list = list.id;
+
+        me.selected_note = data;
+        me.selected_note.id = rcmail.html_identifier_encode(data.uid);
+        rcmail.enable_command('save', list.editable && !data.readonly);
+
+        var html = data.html || data.description;
+
+        // convert plain text to HTML and make URLs clickable
+        if (!data.html || !html.match(/<(html|body)/)) {
+            html = text2html(html);
+        }
+
+        var node, editor = tinyMCE.get('notecontent'), is_html = false;
+        if (!readonly && editor) {
+            $(rcmail.gui_objects.notesdetailview).hide();
+            $(rcmail.gui_objects.noteseditform).show();
+            editor.setContent(html);
+            node = editor.getContentAreaContainer().childNodes[0];
+            if (node) node.tabIndex = content.get(0).tabIndex;
+
+            if (me.selected_note.uid) {
+                if (!render_no_focus)
+                    editor.getBody().focus();
+            }
+            else
+                $('.notetitle', rcmail.gui_objects.noteviewtitle).focus().select();
+
+            // read possibly re-formatted content back from editor for later comparison
+            me.selected_note.description = editor.getContent({ format:'html' });
+            is_html = true;
+        }
+        else {
+            $(rcmail.gui_objects.noteseditform).hide();
+            $(rcmail.gui_objects.notesdetailview).html(html).show();
+        }
+
+        render_no_focus = false;
+
+        // notify subscribers
+        rcmail.triggerEvent('kolab_notes_render', { data:data, readonly:readonly, html:is_html });
+        if (rcmail.is_framed())
+            parent.rcmail.triggerEvent('kolab_notes_render', { data:data, readonly:readonly, html:is_html });
+
+        // Trigger resize (needed for proper editor resizing)
+        $(window).resize();
+    }
+
+    /**
+     * Convert the given plain text to HTML contents to be displayed in editor
+     */
+    function text2html(str)
+    {
+        // simple link parser (similar to rcube_string_replacer class in PHP)
+        var utf_domain = '[^?&@"\'/\$\$\\s\\r\\t\\n]+\\.([^\x00-\x2f\x3b-\x40\x5b-\x60\x7b-\x7f]{2,}|xn--[a-z0-9]{2,})',
+            url1 = '.:;,', url2 = 'a-z0-9%=#@+?&/_~\\[\\]-',
+            link_pattern = new RegExp('([hf]t+ps?://|www.)('+utf_domain+'(['+url1+']?['+url2+']+)*)?', 'ig'),
+            link_replace = function(matches, p1, p2) {
+                var url = (p1 == 'www.' ? 'http://' : '') + p1 + p2;
+                return '<a href="' + url + '" class="x-templink">' + p1 + p2 + '</a>';
+            };
+
+        return '<pre>' + Q(str).replace(link_pattern, link_replace) + '</pre>';
+    }
+
+    /**
+     * Open a new window to print the currently selected note
+     */
+    function print_note()
+    {
+        var printwin, data;
+        if (me.selected_note && (printwin = rcmail.open_window(settings.print_template))) {
+            data = get_save_data();
+            $(printwin).load(function(){
+                printwin.document.title = data.title;
+                $('#notetitle', printwin.document).html(Q(data.title));
+                $('#notebody',  printwin.document).html(data.description);
+                $('#notetags',  printwin.document).html('<span class="tag">' + data.categories.join('</span><span class="tag">') + '</span>');
+                $('#notecreated', printwin.document).html(Q(me.selected_note.created));
+                $('#notechanged', printwin.document).html(Q(me.selected_note.changed));
+                printwin.print();
+            });
+        }
+    }
+
+    /**
+     * Redirect to message compose screen with UIDs of notes to be appended
+     */
+    function send_note()
+    {
+        var uids = [];
+        for (var rec, i=0; i < noteslist.selection.length; i++) {
+            if (rec = notesdata[noteslist.selection[i]]) {
+                uids.push(rec.uid);
+                // TODO: check if rec.uid == me.selected_note.uid and unsaved changes
+            }
+        }
+
+        if (uids.length) {
+            rcmail.goto_url('mail/compose', { _with_notes: uids.join(','), _notes_list: me.selected_list }, true);
+        }
+    }
+
+    /**
+     *
+     */
+    function render_tagslist(newtags, replace)
+    {
+        if (replace) {
+            tags = newtags;
+        }
+        else {
+            var append = [];
+            for (var i=0; i < newtags.length; i++) {
+                if ($.inArray(newtags[i], tags) < 0)
+                    append.push(newtags[i]);
+            }
+            if (!append.length) {
+                update_tagcloud();
+                return;  // nothing to be added
+            }
+            tags = tags.concat(append);
+        }
+
+        // sort tags first
+        tags.sort(function(a,b){
+            return a.toLowerCase() > b.toLowerCase() ? 1 : -1;
+        })
+
+        var widget = $(rcmail.gui_objects.notestagslist).html('');
+
+        // append tags to tag cloud
+        $.each(tags, function(i, tag){
+            li = $('<li role="checkbox" aria-checked="false" tabindex="0"></li>')
+                .attr('rel', tag)
+                .data('value', tag)
+                .html(Q(tag) + '<span class="count"></span>')
+                .appendTo(widget)
+                .draggable({
+                    addClasses: false,
+                    revert: 'invalid',
+                    revertDuration: 300,
+                    helper: tag_draggable_helper,
+                    start: tag_draggable_start,
+                    appendTo: 'body',
+                    cursor: 'pointer'
+                });
+        });
+
+        update_tagcloud();
+    }
+
+    /**
+     * Display the given counts to each tag and set those inactive which don't
+     * have any matching records in the current view.
+     */
+    function update_tagcloud(counts)
+    {
+        // compute counts first by iterating over all visible task items
+        if (typeof counts == 'undefined') {
+            counts = {};
+            $.each(notesdata, function(id, rec){
+                for (var t, j=0; rec && rec.categories && j < rec.categories.length; j++) {
+                    t = rec.categories[j];
+                    if (typeof counts[t] == 'undefined')
+                        counts[t] = 0;
+                    counts[t]++;
+                }
+            });
+        }
+
+        $(rcmail.gui_objects.notestagslist).children('li').each(function(i,li){
+            var elem = $(li), tag = elem.attr('rel'),
+                count = counts[tag] || 0;
+
+            elem.children('.count').html(count+'');
+            if (count == 0) elem.addClass('inactive');
+            else            elem.removeClass('inactive');
+
+            if (tagsfilter && tagsfilter.length && $.inArray(tag, tagsfilter)) {
+                elem.addClass('selected').attr('aria-checked', 'true');
+            }
+            else {
+                elem.removeClass('selected').attr('aria-checked', 'false');
+            }
+        });
+    }
+
+    /**
+     * Callback from server after saving a note record
+     */
+    function update_note(data)
+    {
+        data.id = rcmail.html_identifier_encode(data.uid);
+
+        var row, is_new = notesdata[data.id] == undefined
+        notesdata[data.id] = data;
+
+        if (is_new || me.selected_note && data.id == me.selected_note.id) {
+            render_note(data);
+            render_tagslist(data.categories || []);
+        }
+        else if (data.categories) {
+            render_tagslist(data.categories);
+        }
+
+        // add list item on top
+        if (is_new) {
+            noteslist.insert_row({
+                id: 'rcmrow' + data.id,
+                cols: [
+                    { className:'title', innerHTML:Q(data.title) },
+                    { className:'date',  innerHTML:Q(data.changed || '') }
+                ]
+            }, true);
+
+            noteslist.select(data.id);
+        }
+        // update list item
+        else if (row = noteslist.rows[data.id]) {
+            $('.title', row.obj).html(Q(data.title));
+            $('.date', row.obj).html(Q(data.changed || ''));
+            // TODO: move to top
+        }
+    }
+
+    /**
+     * 
+     */
+    function reset_view()
+    {
+        me.selected_note = null;
+        $('.notetitle', rcmail.gui_objects.noteviewtitle).val('');
+        $('.tagline, .dates', rcmail.gui_objects.noteviewtitle).hide();
+        $(rcmail.gui_objects.noteseditform).hide();
+        $(rcmail.gui_objects.notesdetailview).hide();
+        $(rcmail.gui_objects.notesattachmentslist).html('');
+        rcmail.enable_command('save', false);
+    }
+
+    /**
+     * Collect data from the edit form and submit it to the server
+     */
+    function save_note()
+    {
+        if (!me.selected_note) {
+            return false;
+        }
+
+        var savedata = get_save_data();
+
+        // copy links as they're yet immutable
+        if (me.selected_note.links)
+            savedata.links = me.selected_note.links;
+
+        // add reference to old list if changed
+        if (me.selected_note.list && savedata.list != me.selected_note.list) {
+            savedata._fromlist = me.selected_note.list;
+        }
+
+        // do some input validation
+        if (savedata.title == '') {
+            alert(rcmail.gettext('entertitle', 'kolab_notes'));
+            $('.notetitle', rcmail.gui_objects.noteviewtitle).focus();
+            return false;
+        }
+
+        if (check_change_state(savedata)) {
+            rcmail.lock_form(rcmail.gui_objects.noteseditform, true);
+            saving_lock = rcmail.set_busy(true, 'kolab_notes.savingdata');
+            rcmail.http_post('action', { _data: savedata, _do: savedata.uid?'edit':'new' }, true);
+        }
+        else {
+            rcmail.display_message(rcmail.get_label('nochanges', 'kolab_notes'), 'info');
+        }
+    }
+
+    /**
+     * Collect updated note properties from edit form for saving
+     */
+    function get_save_data()
+    {
+        var editor = tinyMCE.get('notecontent'),
+            listselect = $('option:selected', rcmail.gui_objects.notebooks);
+        var savedata = {
+            title: trim($('.notetitle', rcmail.gui_objects.noteviewtitle).val()),
+            description: editor ? editor.getContent({ format:'html' }) : $('#notecontent').val(),
+            list: listselect.length ? listselect.val() : me.selected_note.list || me.selected_list,
+            uid: me.selected_note.uid,
+            categories: []
+        };
+
+        // collect tags
+        $('.tagedit-list input[type="hidden"]', rcmail.gui_objects.noteviewtitle).each(function(i, elem){
+            if (elem.value)
+                savedata.categories.push(elem.value);
+        });
+        // including the "pending" one in the text box
+        var newtag = $('#tagedit-input').val();
+        if (newtag != '') {
+            savedata.categories.push(newtag);
+        }
+
+        return savedata;
+    }
+
+    /**
+     * Check if the currently edited note record was changed
+     */
+    function check_change_state(data)
+    {
+        if (!me.selected_note || me.selected_note.readonly || !me.notebooks[me.selected_note.list || me.selected_list].editable) {
+            return false;
+        }
+
+        var savedata = data || get_save_data();
+
+        return savedata.title != me.selected_note.title
+            || savedata.description != me.selected_note.description
+            || savedata.categories.join(',') != (me.selected_note.categories || []).join(',')
+            || savedata.list != me.selected_note.list;
+    }
+
+    /**
+     * Check for unsaved changes and warn the user
+     */
+    function warn_unsaved_changes(ok, nok)
+    {
+        if (typeof ok != 'function')
+            ok = function(){ };
+        if (typeof nok != 'function')
+            nok = function(){ };
+
+        if (check_change_state()) {
+            var dialog, buttons = [];
+
+            buttons.push({
+                text: rcmail.gettext('discard', 'kolab_notes'),
+                click: function() {
+                    dialog.dialog('close');
+                    ok();
+                }
+            });
+
+            buttons.push({
+                text: rcmail.gettext('save'),
+                click: function() {
+                    save_note();
+                    dialog.dialog('close');
+                    ok();
+                }
+            });
+
+            buttons.push({
+                text: rcmail.gettext('abort', 'kolab_notes'),
+                click: function() {
+                    dialog.dialog('close');
+                    nok();
+                }
+            });
+
+            var options = {
+                width: 460,
+                resizable: false,
+                closeOnEscape: false,
+                dialogClass: 'warning',
+                open: function(event, ui) {
+                    $(this).parent().find('.ui-dialog-titlebar-close').hide();
+                    setTimeout(function(){
+                        dialog.parent().find('.ui-button:visible').first().addClass('mainaction').focus();
+                    }, 10);
+                }
+            };
+
+            // open jquery UI dialog
+            dialog = rcmail.show_popup_dialog(
+                rcmail.gettext('discardunsavedchanges', 'kolab_notes'),
+                rcmail.gettext('unsavedchanges', 'kolab_notes'),
+                buttons,
+                options
+            );
+
+            return false;
+        }
+
+        if (typeof ok == 'function') {
+            ok();
+        }
+
+        return true;
+    }
+
+    /**
+     *
+     */
+    function delete_notes()
+    {
+        if (!noteslist.selection.length) {
+            return false;
+        }
+
+        if (confirm(rcmail.gettext('deletenotesconfirm','kolab_notes'))) {
+            var rec, id, uids = [];
+            for (var i=0; i < noteslist.selection.length; i++) {
+                id = noteslist.selection[i];
+                rec = notesdata[id];
+                if (rec) {
+                    noteslist.remove_row(id);
+                    uids.push(rec.uid);
+                    delete notesdata[id];
+                }
+            }
+
+            saving_lock = rcmail.set_busy(true, 'kolab_notes.savingdata');
+            rcmail.http_post('action', { _data: { uid: uids.join(','), list: me.selected_list }, _do: 'delete' }, true);
+
+            reset_view();
+            update_tagcloud();
+            noteslist.clear_selection();
+        }
+    }
+
+    /**
+     *
+     */
+    function move_notes(list_id)
+    {
+        var rec, id, uids = [];
+        for (var i=0; i < noteslist.selection.length; i++) {
+            id = noteslist.selection[i];
+            rec = notesdata[id];
+            if (rec) {
+                noteslist.remove_row(id);
+                uids.push(rec.uid);
+                delete notesdata[id];
+            }
+        }
+
+        if (uids.length) {
+            saving_lock = rcmail.set_busy(true, 'kolab_notes.savingdata');
+            rcmail.http_post('action', { _data: { uid: uids.join(','), list: me.selected_list, to: list_id }, _do: 'move' }, true);
+        }
+    }
+
+    /**
+     * update browser location to remember current view
+     */
+    function update_state()
+    {
+        var query = { _list: me.selected_list }
+
+        if (settings.selected_uid) {
+            query._id = settings.selected_uid;
+        }
+
+        if (window.history.replaceState) {
+            window.history.replaceState({}, document.title, rcmail.url('', query));
+        }
+    }
+
+
+    /*  Helper functions for drag & drop functionality of tags  */
+    
+    function tag_draggable_helper()
+    {
+        if (!tag_draghelper)
+            tag_draghelper = $('<div class="tag-draghelper"></div>');
+        else
+            tag_draghelper.html('');
+
+        $(this).clone().addClass('tag').appendTo(tag_draghelper);
+        return tag_draghelper;
+    }
+
+    function tag_draggable_start(event, ui)
+    {
+        // register notes list to receive drop events
+        $('li', rcmail.gui_objects.noteslist).droppable({
+            hoverClass: 'droptarget',
+            accept: tag_droppable_accept,
+            drop: tag_draggable_dropped,
+            addClasses: false
+        });
+
+        // allow to drop tags onto edit form title
+        $(rcmail.gui_objects.noteviewtitle).droppable({
+            drop: function(event, ui){
+                $('#tagedit-input').val(ui.draggable.data('value')).trigger('transformToTag');
+            },
+            addClasses: false
+        })
+    }
+
+    function tag_droppable_accept(draggable)
+    {
+        if (rcmail.busy)
+            return false;
+
+        var tag = draggable.data('value'),
+            drop_id = $(this).attr('id').replace(/^rcmrow/, ''),
+            drop_rec = notesdata[drop_id];
+
+        // target already has this tag assigned
+        if (!drop_rec || (drop_rec.categories && $.inArray(tag, drop_rec.categories) >= 0)) {
+            return false;
+        }
+
+        return true;
+    }
+
+    function tag_draggable_dropped(event, ui)
+    {
+        var drop_id = $(this).attr('id').replace(/^rcmrow/, ''),
+            tag = ui.draggable.data('value'),
+            rec = notesdata[drop_id],
+            savedata;
+
+        if (rec && rec.id) {
+            savedata = me.selected_note && rec.uid == me.selected_note.uid ? get_save_data() : $.extend({}, rec);
+
+            if (savedata.id)   delete savedata.id;
+            if (savedata.html) delete savedata.html;
+
+            if (!savedata.categories)
+                savedata.categories = [];
+            savedata.categories.push(tag);
+
+            rcmail.lock_form(rcmail.gui_objects.noteseditform, true);
+            saving_lock = rcmail.set_busy(true, 'kolab_notes.savingdata');
+            rcmail.http_post('action', { _data: savedata, _do: 'edit' }, true);
+        }
+    }
+
+}
+
+
+// extend jQuery
+// from http://james.padolsey.com/javascript/sorting-elements-with-jquery/
+jQuery.fn.sortElements = (function(){
+    var sort = [].sort;
+
+    return function(comparator, getSortable) {
+        getSortable = getSortable || function(){ return this };
+
+        var last = null;
+        return sort.call(this, comparator).each(function(i){
+            // at this point the array is sorted, so we can just detach each one from wherever it is, and add it after the last
+            var node = $(getSortable.call(this));
+            var parent = node.parent();
+            if (last) last.after(node);
+            else      parent.prepend(node);
+            last = node;
+        });
+    };
+})();
+
+
+/* notes plugin UI initialization */
+var kolabnotes;
+window.rcmail && rcmail.addEventListener('init', function(evt) {
+    kolabnotes = new rcube_kolab_notes_ui(rcmail.env.kolab_notes_settings);
+    if (rcmail.env.action == 'dialog-ui')
+        kolabnotes.init_dialog();
+    else
+        kolabnotes.init();
+});
+

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

@@ -0,0 +1,161 @@
+/**
+ * Mail integration script for the Kolab Notes plugin
+ *
+ * @author Thomas Bruederli <bruederli@kolabsys.com>
+ *
+ * @licstart  The following is the entire license notice for the
+ * JavaScript code in this file.
+ *
+ * Copyright (C) 2014, Kolab Systems AG <contact@kolabsys.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * @licend  The above is the entire license notice
+ * for the JavaScript code in this file.
+ */
+
+
+window.rcmail && rcmail.addEventListener('init', function(evt) {
+    /**
+     * Open the notes edit GUI in a jquery UI dialog
+     */
+    function kolab_note_dialog(url)
+    {
+        var frame, name, mywin = window, edit = url && url._id,
+            $dialog = $('#kolabnotesinlinegui');
+
+        function dialog_render(p)
+        {
+            $dialog.parent().find('.ui-dialog-buttonset .ui-button')
+                .prop('disabled', p.readonly)
+                .last().prop('disabled', false);
+        }
+
+        // create dialog if not exists
+        if (!$dialog.length) {
+            $dialog = $('<iframe>')
+                .attr('id', 'kolabnotesinlinegui')
+                .attr('name', 'kolabnotesdialog')
+                .attr('src', 'about:blank')
+                .css('min-width', '100%')
+                .appendTo(document.body)
+                .bind('load', function(e){
+                    frame = rcmail.get_frame_window('kolabnotesinlinegui');
+                    name = $('.notetitle', frame.rcmail.gui_objects.noteviewtitle);
+                    frame.rcmail.addEventListener('responseafteraction', refresh_mailview);
+                });
+
+            // subscribe event in parent window which is also triggered from iframe
+            // (probably before the 'load' event from above)
+            rcmail.addEventListener('kolab_notes_render', dialog_render);
+        }
+        // close show dialog first
+        else if ($dialog.is(':ui-dialog')) {
+            $dialog.dialog('close');
+        }
+
+        if (!url) url = {};
+        url._framed = 1;
+        $dialog.attr('src', rcmail.url('notes/dialog-ui', url));
+
+        // dialog buttons
+        var buttons = {};
+        buttons[rcmail.gettext('save')] = function() {
+            // frame is not loaded
+            if (!frame)
+                return;
+
+            // do some input validation
+            if (!name.val() || name.val().length < 2) {
+                alert(rcmail.gettext('entertitle', 'kolab_notes'));
+                name.select();
+                return;
+            }
+
+            frame.rcmail.command('save');
+        };
+
+        if (edit) {
+            buttons[rcmail.gettext('delete')] = function() {
+                if (confirm(rcmail.gettext('deletenotesconfirm','kolab_notes'))) {
+                    rcmail.addEventListener('responseafteraction', refresh_mailview);
+                    rcmail.http_post('notes/action', { _data: { uid: url._id, list: url._list }, _do: 'delete' }, true);
+                    $dialog.dialog('close');
+                }
+            };
+        }
+
+        buttons[rcmail.gettext(edit ? 'close' : 'cancel')] = function() {
+            $dialog.dialog('close');
+        };
+
+        // open jquery UI dialog
+        var win = $(window);
+        $dialog.dialog({
+            modal: true,
+            resizable: true,
+            closeOnEscape: true,
+            title: edit ? rcmail.gettext('editnote','kolab_notes') : rcmail.gettext('appendnote','kolab_notes'),
+            open: function() {
+                $dialog.parent().find('.ui-dialog-buttonset .ui-button').prop('disabled', true).first().addClass('mainaction');
+            },
+            close: function() {
+                $dialog.dialog('destroy').remove();
+                rcmail.removeEventListener('kolab_notes_render', dialog_render);
+            },
+            buttons: buttons,
+            minWidth: 480,
+            width: 680,
+            height: Math.min(640, win.height() - 100)
+        }).show();
+    }
+
+    /**
+     * Reload the mail view/preview to update the notes listing
+     */
+    function refresh_mailview(e)
+    {
+        var win = rcmail.env.contentframe ? rcmail.get_frame_window(rcmail.env.contentframe) : mywin;
+        if (win && e.response) {
+            win.location.reload();
+            // $dialog.dialog('close');
+        }
+    }
+
+    // register commands
+    rcmail.register_command('edit-kolab-note', kolab_note_dialog, true);
+    rcmail.register_command('append-kolab-note', function() {
+        var uid;
+        if ((uid = rcmail.get_single_uid())) {
+            kolab_note_dialog({ _msg: uid + '-' + rcmail.env.mailbox });
+        }
+    });
+
+    if (rcmail.env.action == 'show') {
+        rcmail.enable_command('append-kolab-note', true);
+    }
+    else {
+        rcmail.env.message_commands.push('append-kolab-note');
+    }
+
+    // register handlers for inline note editing
+    if (rcmail.env.action == 'show' || rcmail.env.action == 'preview') {
+        $('.kolabmessagenotes a.kolabnotesref').click(function(e){
+            var ref = String($(this).attr('rel')).split('@'),
+                win = rcmail.is_framed() ? parent.window : window;
+            win.rcmail.command('edit-kolab-note', { _list:ref[1], _id:ref[0] });
+            return false;
+        });
+    }
+});

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

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

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

@@ -0,0 +1,494 @@
+/**
+ * Kolab Notes plugin styles for skin "Larry"
+ *
+ * Copyright (C) 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
+ * License. It is allowed to copy, distribute, transmit and to adapt the work
+ * by keeping credits to the original autors in the README file.
+ * See http://creativecommons.org/licenses/by-sa/3.0/ for details.
+ */
+
+
+#taskbar a.button-notes span.button-inner {
+	background-image: url('sprites.png');
+	background-position: 0 0;
+}
+
+#taskbar a.button-notes:hover span.button-inner,
+#taskbar a.button-notes.button-selected span.button-inner {
+	background-image: url('sprites.png');
+	background-position: 0 -26px;
+}
+
+.notesview #sidebar {
+	position: absolute;
+	top: 0;
+	left: 0;
+	bottom: 0;
+	width: 240px;
+}
+
+.notesview #notestoolbar {
+	position: absolute;
+	top: -6px;
+	left: 0;
+	width: 100%;
+	height: 40px;
+	white-space: nowrap;
+}
+
+.notesview #notestoolbar a.button.createnote {
+	background-image: url('sprites.png');
+	background-position: center -54px;
+}
+
+.notesview #notestoolbar a.button.sendnote {
+	background-position: left -650px;
+}
+
+.notesview #quicksearchbar {
+	top: 2px;
+}
+
+.notesview #searchmenulink {
+	width: 15px;
+}
+
+.notesview #mainview-right {
+	position: absolute;
+	bottom: 0;
+	right: 0;
+	top: 0;
+	left: 252px;
+}
+
+.notesview #tagsbox {
+	position: absolute;
+	top: 0;
+	left: 0;
+	width: 100%;
+	height: 240px;
+}
+
+.notesview #notebooksbox {
+	position: absolute;
+	top: 252px;
+	left: 0;
+	width: 100%;
+	bottom: 0px;
+}
+
+.notesview #noteslistbox {
+	position: absolute;
+	top: 0;
+	left: 0;
+	width: 240px;
+	bottom: 0px;
+}
+
+.notesview #kolabnoteslist li {
+	border-left: 2px solid transparent;
+}
+
+.notesview #kolabnoteslist.focus li.focused {
+	border-left: 2px solid #739da8;
+}
+
+.notesview #kolabnoteslist .title {
+	display: block;
+	padding: 4px 6px;
+	overflow: hidden;
+	text-overflow: ellipsis;
+	outline: none;
+}
+
+.notesview #kolabnoteslist .date {
+	display: block;
+	padding: 0px 6px 4px 6px;
+	color: #777;
+	font-weight: normal;
+}
+
+.notesview .boxpagenav a.icon.sortoptions {
+	background: url(sprites.png) center -93px no-repeat;
+}
+
+.notesview .toolbarmenu.iconized .selected span.icon {
+	background: url(sprites.png) -4px -110px no-repeat;
+}
+
+.notesview #notedetailsbox {
+	position: absolute;
+	top: 0;
+	left: 252px;
+	right: 0;
+	bottom: 0px;
+}
+
+.notesdialog #notedetailsbox {
+	left: 0;
+}
+
+.notesview #notedetailsbox .formbuttons {
+	position: absolute;
+	bottom: 0;
+	left: 0;
+	right: 0;
+	padding: 8px 12px;
+	background: #f9f9f9;
+}
+
+.notesview #noteform,
+.notesview #notedetails {
+	display: none;
+	position: absolute;
+	top: 82px;
+	left: 0;
+	bottom: 41px;
+	width: 100%;
+}
+
+.notesview #notedetails {
+	padding: 8px;
+	-webkit-box-sizing: border-box;
+	   -moz-box-sizing: border-box;
+	    -ms-box-sizing: border-box;
+	        box-sizing: border-box;
+	border-bottom: 1px solid #dfdfdf;
+}
+
+.notesdialog #noteform,
+.notesdialog #notedetails {
+	bottom: 30px;
+}
+
+.notesview #notedetails pre {
+	font-family: "Lucida Grande", Verdana,  Arial, Helvetica, sans-serif;
+	font-size: 12px;
+	margin: 0;
+}
+
+.notesview #notecontent {
+	position: relative;
+	width: 100%;
+	height: 100%;
+	border: 0;
+	border-radius: 0;
+	padding: 8px 0 8px 8px;
+	resize: none;
+	font-family: "Lucida Grande", Verdana, Arial, Helvetica, sans-serif;
+	font-size: 12px;
+	outline: none;
+	-webkit-box-sizing: border-box;
+	   -moz-box-sizing: border-box;
+	    -ms-box-sizing: border-box;
+	        box-sizing: border-box;
+	-webkit-box-shadow: inset 0 0 2px 1px rgba(0,0,0, 0.2);
+	   -moz-box-shadow: inset 0 0 2px 1px rgba(0,0,0, 0.2);
+	     -o-box-shadow: inset 0 0 2px 1px rgba(0,0,0, 0.2);
+	        box-shadow: inset 0 0 2px 1px rgba(0,0,0, 0.2);
+}
+
+.notesview #notecontent:active,
+.notesview #notecontent:focus {
+	-webkit-box-shadow: inset 0 0 3px 2px rgba(71,135,177, 0.9);
+	   -moz-box-shadow: inset 0 0 3px 2px rgba(71,135,177, 0.9);
+	     -o-box-shadow: inset 0 0 3px 2px rgba(71,135,177, 0.9);
+	        box-shadow: inset 0 0 3px 2px rgba(71,135,177, 0.9);
+}
+
+.notesview .mce-panel {
+	border: 0;
+}
+
+.notesview #notedetailstitle {
+	height: auto;
+}
+
+.notesview #notedetailstitle .tagedit-list,
+.notesview #notedetailstitle input.inline-edit,
+.notesview #notedetailstitle input.inline-edit:focus {
+	outline: none;
+	padding: 0;
+	margin: 0;
+	border: 0;
+	background: rgba(255,255,255,0.01);
+	-webkit-box-shadow: none;
+	   -moz-box-shadow: none;
+	     -o-box-shadow: none;
+	        box-shadow: none;
+}
+
+.notesview #notedetailstitle input.notetitle,
+.notesview #notedetailstitle input.notetitle:focus {
+	width: 100%;
+	font-size: 14px;
+	font-weight: bold;
+	color: #777;
+}
+
+.notesview #notedetailstitle .dates,
+.notesview #notedetailstitle .tagline,
+.notesdialog .notebookselect label {
+	color: #999;
+	font-weight: normal;
+	font-size: 0.9em;
+	margin-top: 6px;
+}
+
+.notesview #notedetailstitle .dates,
+.notesview #notedetailstitle .notebookselect {
+	margin-top: 4px;
+	margin-bottom: 4px;
+}
+
+.notesview #notedetailstitle .tagline {
+	position: relative;
+	cursor: text;
+	margin: 6px -2px -2px -2px;
+}
+
+.notesview #notedetailstitle .tagline .placeholder {
+	position: absolute;
+	top: 4px;
+	left: 0;
+	z-index: 1;
+}
+
+.notesview #notedetailstitle .tagedit-list {
+	position: relative;
+	z-index: 2;
+	padding: 2px;
+}
+
+.notesview #notedetailstitle #tagedit-input {
+	background: none;
+}
+
+.notesview .tag-draghelper {
+	z-index: 1000;
+}
+
+.notesview #notedetailstitle .notecreated,
+.notesview #notedetailstitle .notechanged {
+	display: inline-block;
+	padding-left: 0.4em;
+	padding-right: 2em;
+	color: #777;
+}
+
+.notesview #notereferences {
+	position: absolute;
+	left: 0;
+	right: 0;
+	bottom: 41px;
+	height: 27px;
+	background: #fff;
+	padding-left: 10px;
+}
+
+.notesdialog #notereferences {
+	bottom: 0;
+}
+
+.notesview #notebooksbox .scroller {
+	top: 34px;
+}
+
+.notesview #notebooks li {
+	margin: 0;
+	display: block;
+	position: relative;
+}
+
+.notesview #notebooks li > div.folder {
+	position: relative;
+	padding: 0;
+	height: 28px;
+}
+
+.notesview #notebooks li.virtual > div.folder {
+	height: 22px;
+}
+
+.notesview #notebooks li .listname {
+	display: block;
+	cursor: default;
+	margin: 0;
+	height: 24px;
+	padding-bottom: 0;
+	padding-right: 26px;
+	color: #004458;
+	overflow: hidden;
+	text-overflow: ellipsis;
+	white-space: nowrap;
+}
+
+.notesview #notebooks li.virtual > div > .listname {
+	color: #aaa;
+	height: 18px;
+	padding-top: 3px;
+}
+
+.notesview #notebooksbox .treelist li a.subscribed {
+	display: inline-block;
+	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;
+}
+
+.notesview #notebooksbox .treelist div > a.subscribed:focus,
+.notesview #notebooksbox .treelist div:hover > a.subscribed {
+	background-position: 2px -266px;
+}
+
+.notesview #notebooksbox .treelist div.subscribed a.subscribed {
+	background-position: -16px -266px;
+}
+
+.notesview #notebooksbox .treelist li a.subscribed:focus {
+	border-radius: 3px;
+	outline: 2px solid rgba(30,150,192, 0.5);
+}
+
+.notesview #notebooksbox .treelist input {
+	position: absolute;
+	top: 4px;
+	left: 14px;
+}
+
+.notesview #notebooks input {
+	display: none;
+}
+
+.notesview #notebooksbox .searchresults a.listname {
+	padding-left: 36px;
+}
+
+.notesview #notebooks div.folder span.handle {
+	display: inline-block;
+	position: absolute;
+	top: 6px;
+	right: 26px;
+	height: 16px;
+	width: 30px;
+	padding: 0;
+	background: url('sprites.png') right -1000px no-repeat;
+}
+
+.notesview #notebooks div.readonly span.handle {
+	background-position: right -192px;
+}
+
+.notesview #notebooks div.other span.handle {
+	background-position: right -210px;
+}
+
+.notesview #notebooks div.other.readonly span.handle {
+	background-position: right -228px;
+}
+
+.notesview #notebooks div.shared span.handle {
+	background-position: right -246px;
+}
+
+.notesview #notebooks div.other .listname,
+.notesview #notebooks div.shared .listname,
+.notesview #notebooks div.readonly .listname {
+	padding-right: 46px;
+}
+
+.notesview #notebooks div.other.readonly .listname {
+	padding-right: 56px;
+}
+
+.notesview #notebooksbox .searchresults {
+	background: #b0ccd7;
+	margin-top: 8px;
+}
+
+.notesview #notebooksbox .searchresults  .boxtitle {
+	background: none;
+	padding: 2px 8px 2px 8px;
+}
+
+.notesview #notebooksbox .boxtitle a.iconbutton.search {
+	position: absolute;
+	top: 8px;
+	right: 8px;
+	width: 16px;
+	cursor: pointer;
+	background-position: -2px -317px;
+}
+
+.notesview .uidialog .tabbed {
+	margin-top: -12px;
+}
+
+.notesview .uidialog .propform fieldset.ui-tabs-panel {
+	min-height: 290px;
+}
+
+.notesview .uidialog .propform #noteslist-name {
+	width: 20em;
+}
+
+.notesdialog #notesdialogheader {
+	height: auto;
+}
+
+#kolabnotesinlinegui {
+	border: 0;
+	padding: 0;
+	-webkit-box-sizing: border-box;
+	   -moz-box-sizing: border-box;
+	    -ms-box-sizing: border-box;
+	        box-sizing: border-box;
+}
+
+.notesview .attachmentslist li.message.eml {
+	display: inline-block;
+	background-image: url(sprites.png);
+	background-position: -6px -128px;
+	margin-right: 1em;
+}
+
+.notesview .attachmentslist li.message a.messagelink {
+	padding-left: 24px;
+}
+
+ul.toolbarmenu li .appendnote span.icon {
+	background-image: url(sprites.png);
+	background-position: -4px -170px;
+}
+
+div.kolabmessagenotes {
+	margin: 8px 8px;
+	padding: 4px 8px;
+	border: 1px solid #dfdfdf;
+	background: #fafafa;
+	border-radius: 4px;
+}
+
+div.kolabmessagenotes a.kolabnotesref {
+	display: inline-block;
+	color: #333;
+	font-weight: bold;
+	padding: 3px 15px 2px 22px;
+	text-shadow: 0px 1px 1px #fff;
+	text-decoration: none;
+	white-space: nowrap;
+	overflow: hidden;
+	text-overflow: ellipsis;
+	max-width: 12em;
+	background: url(sprites.png) -6px -151px no-repeat;
+}
\ No newline at end of file

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

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

roundcubemail-plugins-kolab-3.2.tar.gz/plugins/kolab_notes/skins/larry/tagedit.css Added

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

roundcubemail-plugins-kolab-3.2.tar.gz/plugins/kolab_notes/skins/larry/templates/dialogview.html Added

@@ -0,0 +1,61 @@
+<roundcube:object name="doctype" value="html5" />
+<html>
+<head>
+<title><roundcube:object name="pagetitle" /></title>
+<roundcube:include file="/includes/links.html" />
+</head>
+<body class="iframe notesview notesdialog noscroll">
+
+<div id="notedetailsbox">
+    <div id="notesdialogheader" class="boxtitle">
+        <roundcube:object name="plugin.notetitle" id="notedetailstitle" />
+        <div class="notebookselect" style="display:none">
+            <label for="notebook"><roundcube:label name="kolab_notes.savein" /></label>
+            <roundcube:object name="plugin.notebooks" id="kolab-notebook" type="select" />
+        </div>
+    </div>
+    <roundcube:object name="plugin.editform" id="noteform" />
+    <roundcube:object name="plugin.detailview" id="notedetails" class="scroller" />
+    <div id="notereferences">
+        <roundcube:object name="plugin.attachments_list" id="attachment-list" class="attachmentslist" />
+    </div>
+</div>
+
+<script type="text/javascript">
+
+// UI startup
+var UI = new rcube_mail_ui();
+
+$(document).ready(function(e){
+    UI.init();
+
+    function layout_view()
+    {
+        var form = $('#noteform, #notedetails'),
+            content = $('#notecontent'),
+            header = $('#notesdialogheader'),
+            w, h;
+
+        form.css('top', header.outerHeight()+'px');
+
+        w = form.outerWidth();
+        h = form.outerHeight();
+        content.width(w).height(h);
+
+        $('#noteform > div.mce-tinymce').width(w);
+        $('#notecontent_ifr').width(w).height(h - 4 - $('div.mce-toolbar').height());
+    }
+
+    $(window).resize(function(e){
+        layout_view();
+    });
+
+    rcmail.addEventListener('kolab_notes_render', function(p){
+        $('#notesdialogheader .notebookselect')[p.readonly ? 'hide' : 'show']();
+    });
+});
+
+</script>
+
+</body>
+</html>

roundcubemail-plugins-kolab-3.2.tar.gz/plugins/kolab_notes/skins/larry/templates/kolabacl.html Added

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

@@ -0,0 +1,198 @@
+<roundcube:object name="doctype" value="html5" />
+<html>
+<head>
+<title><roundcube:object name="pagetitle" /></title>
+<roundcube:include file="/includes/links.html" />
+</head>
+<body class="notesview noscroll">
+
+<roundcube:include file="/includes/header.html" />
+
+<div id="mainscreen">
+    <h1 class="voice"><roundcube:label name="kolab_notes.navtitle" /></h1>
+
+    <div id="notestoolbar" class="toolbar" role="toolbar" aria-labelledby="aria-label-toolbar">
+        <h2 id="aria-label-toolbar" class="voice"><roundcube:label name="arialabeltoolbar" /></h2>
+        <roundcube:button command="createnote" type="link" class="button createnote disabled" classAct="button createnote" classSel="button createnote pressed" label="kolab_notes.create" title="kolab_notes.createnote" />
+        <roundcube:button command="print" type="link" class="button print disabled" classAct="button print" classSel="button print pressed" label="print" title="print" />
+        <roundcube:button command="sendnote" type="link" class="button sendnote disabled" classAct="button sendnote" classSel="button sendnote pressed" label="kolab_notes.send" title="kolab_notes.sendnote" />
+        <roundcube:container name="toolbar" id="notestoolbar" />
+    </div>
+
+    <div id="quicksearchbar" role="search" aria-labelledby="aria-label-searchform">
+        <h2 id="aria-label-searchform" class="voice"><roundcube:label name="kolab_notes.arialabelnotesearchform" /></h2>
+        <label for="quicksearchbox" class="voice"><roundcube:label name="kolab_notes.arialabelnotesquicksearchbox" /></label>
+        <a id="searchmenulink" class="iconbutton searchoptions" > </a>
+        <roundcube:object name="plugin.searchform" id="quicksearchbox" />
+        <roundcube:button command="reset-search" id="searchreset" class="iconbutton reset" title="resetsearch" content=" " />
+    </div>
+
+    <div id="mainscreencontent">
+
+    <div id="sidebar">
+        <div id="tagsbox" class="uibox listbox">
+            <h2 class="boxtitle" id="aria-label-tagsbox"><roundcube:label name="kolab_notes.tags" id="taglist" /></h2>
+            <div class="scroller">
+                <roundcube:object name="plugin.tagslist" id="tagslist" class="tagcloud" role="region" aria-labelledby="aria-label-tagsbox" aria-controls="kolabnoteslist" />
+            </div>
+        </div>
+
+        <div id="notebooksbox" class="uibox listbox" role="navigation" aria-labelledby="aria-label-notebooks">
+            <h2 class="boxtitle" id="aria-label-notebooks"><roundcube:label name="kolab_notes.lists" />
+                <a href="#notebooks" class="iconbutton search" title="<roundcube:label name='kolab_notes.findnotebooks' />" tabindex="0"><roundcube:label name="kolab_notes.findnotebooks" /></a>
+            </h2>
+            <div class="listsearchbox" style="display:none">
+                <div class="searchbox" role="search" aria-labelledby="aria-label-notebooksearchform" aria-controls="kolabnoteslist">
+                    <h3 id="aria-label-notebooksearchform" class="voice"><roundcube:label name="kolab_notes.arialabelfolderearchform" /></h3>
+                    <label for="notebooksearch" class="voice"><roundcube:label name="kolab_notes.searchterms" /></label>
+                    <input type="text" name="q" id="notebooksearch" placeholder="<roundcube:label name='kolab_notes.findnotebooks' />" />
+                    <a class="iconbutton searchicon"></a>
+                    <roundcube:button command="reset-listsearch" id="notebooksearch-reset" class="iconbutton reset" title="resetsearch" label="resetsearch" />
+                </div>
+            </div>
+            <div class="scroller withfooter">
+                <roundcube:object name="plugin.notebooks" id="notebooks" class="listing treelist" />
+            </div>
+            <div class="boxfooter">
+                <roundcube:button command="list-create" type="link" title="kolab_notes.newnotebook" class="listbutton add disabled" classAct="listbutton add" innerClass="inner" label="kolab_notes.addnotebook" /><roundcube:button name="notesoptionslink" id="notesoptionsmenulink" type="link" title="kolab_notes.listactions" class="listbutton groupactions" onclick="return UI.toggle_popup('notesoptionsmenu', event)" innerClass="inner" label="kolab_notes.listactions" aria-haspopup="true" aria-expanded="false" aria-owns="notesoptionsmenu-menu" />
+            </div>
+        </div>
+
+        <div id="notesoptionsmenu" class="popupmenu" aria-hidden="true">
+            <h3 id="aria-label-optionsmenu" class="voice"><roundcube:label name="kolab_notes.arialabelnotesoptionsmenu" /></h3>
+            <ul class="toolbarmenu" id="notesoptionsmenu-menu" role="menu" aria-labelledby="aria-label-optionsmenu">
+                <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="folders" task="settings" type="link" label="managefolders" classAct="active" /></li>
+            </ul>
+        </div>
+    </div>
+
+    <div id="mainview-right">
+        <div id="noteslistbox" class="uibox listbox">
+            <h3 id="aria-label-noteslist" class="boxtitle"><roundcube:label name="kolab_notes.notes" /></h3>
+            <div class="scroller withfooter" aria-labelledby="aria-label-noteslist">
+                <roundcube:object name="plugin.listing" id="kolabnoteslist" class="listing" summary="kolab_notes.arialabelnoteslist" />
+            </div>
+            <div class="boxfooter">
+                <roundcube:button command="delete" type="link" title="delete" class="listbutton delete disabled" classAct="listbutton delete" innerClass="inner" label="delete" />
+                <roundcube:object name="plugin.recordsCountDisplay" class="countdisplay" label="fromtoshort" aria-live="polite" aria-relevant="text" />
+            </div>
+            <div class="boxpagenav">
+                <roundcube:button name="notessortmenulink" id="notessortmenulink" type="link" title="kolab_notes.sortby" class="icon sortoptions" onclick="return UI.toggle_popup('notessortmenu', event)" innerClass="inner" content="v" aria-haspopup="true" aria-expanded="false" aria-owns="notessortmenu-menu" />
+            </div>
+        </div>
+
+        <div id="notedetailsbox" class="uibox contentbox" role="main" aria-labelledby="aria-label-noteform">
+            <h3 id="aria-label-noteform" class="voice"><roundcube:label name="kolab_notes.arialabelnoteform" /></h3>
+            <roundcube:object name="plugin.notetitle" id="notedetailstitle" class="boxtitle" />
+            <roundcube:object name="plugin.editform" id="noteform" />
+            <roundcube:object name="plugin.detailview" id="notedetails" class="scroller" />
+            <div id="notereferences">
+                <h3 id="aria-label-messagereferences" class="voice"><roundcube:label name="kolab_notes.arialabelmessagereferences" /></h3>
+                <roundcube:object name="plugin.attachments_list" id="attachment-list" class="attachmentslist" role="region" aria-labelledby="aria-label-messagereferences" />
+            </div>
+            <div class="footerleft formbuttons">
+                <roundcube:button command="save" type="input" class="button mainaction" label="save" id="btn-save-note" />
+            </div>
+        </div>
+    </div>
+
+    </div>
+</div>
+
+<roundcube:object name="message" id="messagestack" />
+
+<div id="notessortmenu" class="popupmenu" aria-hidden="true">
+    <h3 id="aria-label-sortmenu" class="voice"><roundcube:label name="kolab_notes.arialabelnotessortmenu" /></h3>
+    <ul class="toolbarmenu iconized" id="notessortmenu-menu" role="menu" aria-labelledby="aria-label-sortmenu">
+        <li role="menuitem"><roundcube:button command="list-sort" prop="changed" type="link" label="kolab_notes.changed" class="icon active by-changed" innerclass="icon" /></li>
+        <li role="menuitem"><roundcube:button command="list-sort" prop="title" type="link" label="kolab_notes.title" class="icon active by-title" innerclass="icon" /></li>
+    </ul>
+</div>
+
+<div id="notebookeditform" class="uidialog" aria-labelledby="aria-label-editform" aria-hidden="true" role="dialog">
+    <h3 id="aria-label-editform" class="voice"><roundcube:label name="kolab_notes.arialabelnotebookform" /></h3>
+    <roundcube:container name="notebookeditform" id="notebookeditform" />
+    <roundcube:label name="loading" />
+</div>
+
+<script type="text/javascript">
+
+// UI startup
+var UI = new rcube_mail_ui();
+
+$(document).ready(function(e){
+    UI.init();
+
+    rcmail.addEventListener('kolab_notes_editform_load', function(e){
+        UI.init_tabs($('#notebookeditform > form').addClass('propform tabbed'));
+    })
+
+    new rcube_splitter({ id:'notesviewsplitter', p1:'#sidebar', p2:'#mainview-right',
+        orientation:'v', relative:true, start:240, min:180, size:12, render:layout_view }).init();
+    new rcube_splitter({ id:'noteslistsplitter2', p1:'#noteslistbox', p2:'#notedetailsbox',
+        orientation:'v', relative:true, start:242, min:180, size:12, render:layout_view }).init();
+    new rcube_splitter({ id:'notesviewsplitterv', p1:'#tagsbox', p2:'#notebooksbox',
+        orientation:'h', relative:true, start:242, min:120, size:12, offset:4 }).init();
+
+    function layout_view()
+    {
+        var form = $('#noteform, #notedetails'),
+            content = $('#notecontent'),
+            header = $('#notedetailstitle'),
+            footer = $('#notereferences'),
+            w, h;
+
+        if ($('#attachment-list li').length)
+            footer.show();
+        else
+            footer.hide();
+
+        form.css('top', header.outerHeight()+'px');
+        form.css('bottom', ((footer.is(':visible') ? footer.outerHeight()+4 : 0) + 41) + 'px');
+
+        w = form.outerWidth();
+        h = form.outerHeight();
+        content.width(w).height(h);
+
+        $('#noteform > div.mce-tinymce').width(w);
+        $('#notecontent_ifr').width(w).height(h - 4 - $('div.mce-toolbar').height());
+    }
+
+    $(window).resize(function(e){
+        layout_view();
+    });
+
+    // animation to unfold list search box
+    $('#notebooksbox .boxtitle a.search').click(function(e){
+        var box = $('#notebooksbox .listsearchbox'),
+            dir = box.is(':visible') ? -1 : 1;
+
+        box.slideToggle({
+            duration: 160,
+            progress: function(animation, progress) {
+                if (dir < 0) progress = 1 - progress;
+                $('#notebooksbox .scroller').css('top', (34 + 34 * progress) + 'px');
+            },
+            complete: function() {
+                box.toggleClass('expanded');
+                if (box.is(':visible')) {
+                    box.find('input[type=text]').focus();
+                }
+                else {
+                    $('#notebooksearch-reset').click();
+                }
+                // TODO: save state in localStorage
+            }
+        });
+
+        return false;
+    });
+    
+});
+
+</script>
+
+</body>
+</html>

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

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

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

roundcubemail-plugins-kolab-3.2.tar.gz/plugins/libcalendaring/lib/Sabre/VObject/Parameter.php Changed

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

roundcubemail-plugins-kolab-3.2.tar.gz/plugins/libcalendaring/lib/libcalendaring_recurrence.php Added

@@ -0,0 +1,155 @@
+<?php
+
+/**
+ * Recurrence computation class for shared use
+ *
+ * Uitility class to compute reccurrence dates from the given rules
+ *
+ * @author Thomas Bruederli <bruederli@kolabsys.com>
+ *
+ * Copyright (C) 2012-2014, Kolab Systems AG <contact@kolabsys.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+class libcalendaring_recurrence
+{
+    protected $lib;
+    protected $start;
+    protected $next;
+    protected $engine;
+    protected $recurrence;
+    protected $dateonly = false;
+    protected $hour = 0;
+
+    /**
+     * Default constructor
+     *
+     * @param object calendar The calendar plugin instance
+     */
+    function __construct($lib)
+    {
+      // use Horde classes to compute recurring instances
+      // TODO: replace with something that has less than 6'000 lines of code
+      require_once(__DIR__ . '/Horde_Date_Recurrence.php');
+
+      $this->lib = $lib;
+    }
+
+    /**
+     * Initialize recurrence engine
+     *
+     * @param array  The recurrence properties
+     * @param object DateTime The recurrence start date
+     */
+    public function init($recurrence, $start = null)
+    {
+        $this->recurrence = $recurrence;
+
+        $this->engine = new Horde_Date_Recurrence($start);
+        $this->engine->fromRRule20(libcalendaring::to_rrule($recurrence));
+
+        $this->set_start($start);
+
+        if (is_array($recurrence['EXDATE'])) {
+            foreach ($recurrence['EXDATE'] as $exdate) {
+                if (is_a($exdate, 'DateTime')) {
+                    $this->engine->addException($exdate->format('Y'), $exdate->format('n'), $exdate->format('j'));
+                }
+            }
+        }
+        if (is_array($recurrence['RDATE'])) {
+            foreach ($recurrence['RDATE'] as $rdate) {
+                if (is_a($rdate, 'DateTime')) {
+                    $this->engine->addRDate($rdate->format('Y'), $rdate->format('n'), $rdate->format('j'));
+                }
+            }
+        }
+    }
+
+    /**
+     * Setter for (new) recurrence start date
+     *
+     * @param object DateTime The recurrence start date
+     */
+    public function set_start($start)
+    {
+        $this->start = $start;
+        $this->dateonly = $start->_dateonly;
+        $this->next = new Horde_Date($start, $this->lib->timezone->getName());
+        $this->hour = $this->next->hour;
+        $this->engine->setRecurStart($this->next);
+    }
+
+    /**
+     * Get date/time of the next occurence of this event
+     *
+     * @return mixed DateTime object or False if recurrence ended
+     */
+    public function next()
+    {
+        $time = false;
+        $after = clone $this->next;
+        $after->mday = $after->mday + 1;
+        if ($this->next && ($next = $this->engine->nextActiveRecurrence($after))) {
+            // avoid endless loops if recurrence computation fails
+            if (!$next->after($this->next)) {
+                return false;
+            }
+            // fix time for all-day events
+            if ($this->dateonly) {
+                $next->hour = $this->hour;
+                $next->min = 0;
+            }
+
+            $time = $next->toDateTime();
+            $this->next = $next;
+        }
+
+        return $time;
+    }
+
+    /**
+     * Get the end date of the occurence of this recurrence cycle
+     *
+     * @return DateTime|bool End datetime of the last occurence or False if recurrence exceeds limit
+     */
+    public function end()
+    {
+        // recurrence end date is given
+        if ($this->recurrence['UNTIL'] instanceof DateTime) {
+            return $this->recurrence['UNTIL'];
+        }
+
+        // take the last RDATE entry if set
+        if (is_array($this->recurrence['RDATE']) && !empty($this->recurrence['RDATE'])) {
+            $last = end($this->recurrence['RDATE']);
+            if ($last instanceof DateTime) {
+              return $last;
+            }
+        }
+
+        // run through all items till we reach the end
+        if ($this->recurrence['COUNT']) {
+            $last = $this->start;
+            $this->next = new Horde_Date($this->start, $this->lib->timezone->getName());
+            while (($next = $this->next()) && $c < 1000) {
+                $last = $next;
+                $c++;
+            }
+        }
+
+        return $last;
+    }
+
+}

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

@@ -3,6 +3,9 @@
  *
  * @author Thomas Bruederli <bruederli@kolabsys.com>
  *
+ * @licstart  The following is the entire license notice for the
+ * JavaScript code in this page.
+ *
  * Copyright (C) 2012-2014, Kolab Systems AG <contact@kolabsys.com>
  *
  * This program is free software: you can redistribute it and/or modify
@@ -17,6 +20,9 @@
  *
  * You should have received a copy of the GNU Affero General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * @licend  The above is the entire license notice
+ * for the JavaScript code in this page.
  */
 
 function rcube_libcalendaring(settings)
@@ -62,25 +68,26 @@
     /**
      * Create a nice human-readable string for the date/time range
      */
-    this.event_date_text = function(event)
+    this.event_date_text = function(event, voice)
     {
       if (!event.start)
         return '';
       if (!event.end)
         event.end = event.start;
 
-      var fromto, duration = event.end.getTime() / 1000 - event.start.getTime() / 1000;
+      var fromto, duration = event.end.getTime() / 1000 - event.start.getTime() / 1000,
+        until = voice ? ' ' + rcmail.gettext('until','libcalendaring') + ' ' : ' — ';
       if (event.allDay) {
-        fromto = this.format_datetime(event.start, 1)
-          + (duration > 86400 || event.start.getDay() != event.end.getDay() ? ' &mdash; ' + this.format_datetime(event.end, 1) : '');
+        fromto = this.format_datetime(event.start, 1, voice)
+          + (duration > 86400 || event.start.getDay() != event.end.getDay() ? until + this.format_datetime(event.end, 1, voice) : '');
       }
       else if (duration < 86400 && event.start.getDay() == event.end.getDay()) {
-        fromto = this.format_datetime(event.start, 0)
-          + (duration > 0 ? ' &mdash; ' + this.format_datetime(event.end, 2) : '');
+        fromto = this.format_datetime(event.start, 0, voice)
+          + (duration > 0 ? until + this.format_datetime(event.end, 2, voice) : '');
       }
       else {
-        fromto = this.format_datetime(event.start, 0)
-          + (duration > 0 ? ' &mdash; ' + this.format_datetime(event.end, 0) : '');
+        fromto = this.format_datetime(event.start, 0, voice)
+          + (duration > 0 ? until + this.format_datetime(event.end, 0, voice) : '');
       }
 
       return fromto;
@@ -159,17 +166,31 @@
     }
 
     /**
+     * Turn the given date into an ISO 8601 date string understandable by PHPs strtotime()
+     */
+    this.date2ISO8601 = function(date)
+    {
+        var zeropad = function(num) { return (num < 10 ? '0' : '') + num; };
+
+        return date.getFullYear() + '-' + zeropad(date.getMonth()+1) + '-' + zeropad(date.getDate())
+            + 'T' + zeropad(date.getHours()) + ':' + zeropad(date.getMinutes()) + ':' + zeropad(date.getSeconds());
+    };
+
+    /**
      * Format the given date object according to user's prefs
      */
-    this.format_datetime = function(date, mode)
+    this.format_datetime = function(date, mode, voice)
     {
         var res = '';
-        if (!mode || mode == 1)
-            res += $.datepicker.formatDate(datepicker_settings.dateFormat, date, datepicker_settings);
-        if (!mode)
-            res += ' ';
-        if (!mode || mode == 2)
-            res += this.format_time(date);
+        if (!mode || mode == 1) {
+          res += $.datepicker.formatDate(voice ? 'MM d yy' : datepicker_settings.dateFormat, date, datepicker_settings);
+        }
+        if (!mode) {
+            res += voice ? ' ' + rcmail.gettext('at','libcalendaring') + ' ' : ' ';
+        }
+        if (!mode || mode == 2) {
+            res += this.format_time(date, voice);
+        }
 
         return res;
     }
@@ -177,7 +198,7 @@
     /**
      * Clone from fullcalendar.js
      */
-    this.format_time = function(date)
+    this.format_time = function(date, voice)
     {
         var zeroPad = function(n) { return (n < 10 ? '0' : '') + n; }
         var formatters = {
@@ -195,7 +216,8 @@
             TT  : function(d) { return d.getHours() < 12 ? 'AM' : 'PM' }
         };
 
-        var i, i2, c, formatter, res = '', format = settings['time_format'];
+        var i, i2, c, formatter, res = '',
+          format = voice ? settings['time_format'].replace(':',' ').replace('HH','H').replace('hh','h').replace('mm','m').replace('ss','s') : settings['time_format'];
         for (i=0; i < format.length; i++) {
             c = format.charAt(i);
             for (i2=Math.min(i+2, format.length); i2 > i; i2--) {
@@ -299,10 +321,13 @@
             .replace(/\n/g, "<br/>");
     };
 
-    this.init_alarms_edit = function(prefix)
+    this.init_alarms_edit = function(prefix, index)
     {
+        var edit_type = $(prefix+' select.edit-alarm-type'),
+          dom_id = edit_type.attr('id');
+
         // register events on alarm fields
-        $(prefix+' select.edit-alarm-type').change(function(){
+        edit_type.change(function(){
             $(this).parent().find('span.edit-alarm-values')[(this.selectedIndex>0?'show':'hide')]();
         });
         $(prefix+' select.edit-alarm-offset').change(function(){
@@ -311,9 +336,94 @@
             $(this).parent().find('.edit-alarm-value').prop('disabled', mode == 'show');
         });
 
-        $(prefix+' .edit-alarm-date').datepicker(datepicker_settings);
+        $(prefix+' .edit-alarm-date').removeClass('hasDatepicker').removeAttr('id').datepicker(datepicker_settings);
+
+        $(prefix).on('click', 'a.delete-alarm', function(e){
+            if ($(this).closest('.edit-alarm-item').siblings().length > 0) {
+                $(this).closest('.edit-alarm-item').remove();
+            }
+            return false;
+        });
+
+        // set a unique id attribute and set label reference accordingly
+        if ((index || 0) > 0 && dom_id) {
+            dom_id += ':' + (new Date().getTime());
+            edit_type.attr('id', dom_id);
+            $(prefix+' label:first').attr('for', dom_id);
+        }
+
+        $(prefix).on('click', 'a.add-alarm', function(e){
+            var i = $(this).closest('.edit-alarm-item').siblings().length + 1;
+            var item = $(this).closest('.edit-alarm-item').clone(false)
+              .removeClass('first')
+              .appendTo(prefix);
+
+              me.init_alarms_edit(prefix + ' .edit-alarm-item:eq(' + i + ')', i);
+              $('select.edit-alarm-type, select.edit-alarm-offset', item).change();
+              return false;
+        });
     }
 
+    this.set_alarms_edit = function(prefix, valarms)
+    {
+        $(prefix + ' .edit-alarm-item:gt(0)').remove();
+
+        var i, alarm, domnode, val, offset;
+        for (i=0; i < valarms.length; i++) {
+          alarm = valarms[i];
+          if (!alarm.action)
+              alarm.action = 'DISPLAY';
+
+          if (i == 0) {
+              domnode = $(prefix + ' .edit-alarm-item').eq(0);
+          }
+          else {
+              domnode = $(prefix + ' .edit-alarm-item').eq(0).clone(false).removeClass('first').appendTo(prefix);
+              this.init_alarms_edit(prefix + ' .edit-alarm-item:eq(' + i + ')', i);
+          }
+
+          $('select.edit-alarm-type', domnode).val(alarm.action);
+
+          if (String(alarm.trigger).match(/@(\d+)/)) {
+              var ondate = this.fromunixtime(parseInt(RegExp.$1));
+              $('select.edit-alarm-offset', domnode).val('@');
+              $('input.edit-alarm-value', domnode).val('');
+              $('input.edit-alarm-date', domnode).val(this.format_datetime(ondate, 1));
+              $('input.edit-alarm-time', domnode).val(this.format_datetime(ondate, 2));
+          }
+          else if (String(alarm.trigger).match(/([-+])(\d+)([MHDS])/)) {
+              val = RegExp.$2; offset = ''+RegExp.$1+RegExp.$3;
+              $('input.edit-alarm-value', domnode).val(val);
+              $('select.edit-alarm-offset', domnode).val(offset);
+          }
+        }
+
+        // set correct visibility by triggering onchange handlers
+        $(prefix + ' select.edit-alarm-type, ' + prefix + ' select.edit-alarm-offset').change();
+    };
+
+    this.serialize_alarms = function(prefix)
+    {
+        var valarms = [];
+
+        $(prefix + ':visible .edit-alarm-item').each(function(i, elem){
+            var val, offset, alarm = { action: $('select.edit-alarm-type', elem).val() };
+            if (alarm.action) {
+                offset = $('select.edit-alarm-offset', elem).val();
+                if (offset == '@') {
+                    alarm.trigger = '@' + me.date2unixtime(me.parse_datetime($('input.edit-alarm-time', elem).val(), $('input.edit-alarm-date', elem).val()));
+                }
+                else if (!isNaN((val = parseInt($('input.edit-alarm-value', elem).val()))) && val >= 0) {
+                    alarm.trigger = offset[0] + val + offset[1];
+                }
+
+                valarms.push(alarm);
+            }
+        });
+
+        return valarms;
+    };
+
 
     /*****  Alarms handling  *****/
 
@@ -433,6 +543,183 @@
 
         this.dismiss_link = null;
     };
+
+
+    /*****  Recurrence form handling  *****/
+
+    /**
+     * Install event handlers on recurrence form elements
+     */
+    this.init_recurrence_edit = function(prefix)
+    {
+        // toggle recurrence frequency forms
+        $('#edit-recurrence-frequency').change(function(e){
+            var freq = $(this).val().toLowerCase();
+            $('.recurrence-form').hide();
+            if (freq) {
+              $('#recurrence-form-'+freq).show();
+              if (freq != 'rdate')
+                $('#recurrence-form-until').show();
+            }
+        });
+        $('#recurrence-form-rdate input.button.add').click(function(e){
+            var dt, dv = $('#edit-recurrence-rdate-input').val();
+            if (dv && (dt = me.parse_datetime('12:00', dv))) {
+                me.add_rdate(dt);
+                me.sort_rdates();
+                $('#edit-recurrence-rdate-input').val('')
+            }
+            else {
+                $('#edit-recurrence-rdate-input').select();
+            }
+        });
+        $('#edit-recurrence-rdates').on('click', 'a.delete', function(e){
+            $(this).closest('li').remove();
+            return false;
+        });
+
+        $('#edit-recurrence-enddate').datepicker(datepicker_settings).click(function(){ $("#edit-recurrence-repeat-until").prop('checked', true) });
+        $('#edit-recurrence-repeat-times').change(function(e){ $('#edit-recurrence-repeat-count').prop('checked', true); });
+        $('#edit-recurrence-rdate-input').datepicker(datepicker_settings);
+    };
+
+    /**
+     * Set recurrence form according to the given event/task record
+     */
+    this.set_recurrence_edit = function(rec)
+    {
+        var recurrence = $('#edit-recurrence-frequency').val(rec.recurrence ? rec.recurrence.FREQ || (rec.recurrence.RDATE ? 'RDATE' : '') : '').change(),
+            interval = $('.recurrence-form select.edit-recurrence-interval').val(rec.recurrence ? rec.recurrence.INTERVAL || 1 : 1),
+            rrtimes = $('#edit-recurrence-repeat-times').val(rec.recurrence ? rec.recurrence.COUNT || 1 : 1),
+            rrenddate = $('#edit-recurrence-enddate').val(rec.recurrence && rec.recurrence.UNTIL ? this.format_datetime(this.parseISO8601(rec.recurrence.UNTIL), 1) : '');
+        $('.recurrence-form input.edit-recurrence-until:checked').prop('checked', false);
+        $('#edit-recurrence-rdates').html('');
+
+        var weekdays = ['SU','MO','TU','WE','TH','FR','SA'],
+            rrepeat_id = '#edit-recurrence-repeat-forever';
+        if      (rec.recurrence && rec.recurrence.COUNT) rrepeat_id = '#edit-recurrence-repeat-count';
+        else if (rec.recurrence && rec.recurrence.UNTIL) rrepeat_id = '#edit-recurrence-repeat-until';
+        $(rrepeat_id).prop('checked', true);
+
+        if (rec.recurrence && rec.recurrence.BYDAY && rec.recurrence.FREQ == 'WEEKLY') {
+            var wdays = rec.recurrence.BYDAY.split(',');
+            $('input.edit-recurrence-weekly-byday').val(wdays);
+        }
+        if (rec.recurrence && rec.recurrence.BYMONTHDAY) {
+            $('input.edit-recurrence-monthly-bymonthday').val(String(rec.recurrence.BYMONTHDAY).split(','));
+            $('input.edit-recurrence-monthly-mode').val(['BYMONTHDAY']);
+        }
+        if (rec.recurrence && rec.recurrence.BYDAY && (rec.recurrence.FREQ == 'MONTHLY' || rec.recurrence.FREQ == 'YEARLY')) {
+            var byday, section = rec.recurrence.FREQ.toLowerCase();
+            if ((byday = String(rec.recurrence.BYDAY).match(/(-?[1-4])([A-Z]+)/))) {
+                $('#edit-recurrence-'+section+'-prefix').val(byday[1]);
+                $('#edit-recurrence-'+section+'-byday').val(byday[2]);
+            }
+            $('input.edit-recurrence-'+section+'-mode').val(['BYDAY']);
+        }
+        else if (rec.start) {
+            $('#edit-recurrence-monthly-byday').val(weekdays[rec.start.getDay()]);
+        }
+        if (rec.recurrence && rec.recurrence.BYMONTH) {
+            $('input.edit-recurrence-yearly-bymonth').val(String(rec.recurrence.BYMONTH).split(','));
+        }
+        else if (rec.start) {
+            $('input.edit-recurrence-yearly-bymonth').val([String(rec.start.getMonth()+1)]);
+        }
+        if (rec.recurrence && rec.recurrence.RDATE) {
+            $.each(rec.recurrence.RDATE, function(i,rdate){
+                me.add_rdate(me.parseISO8601(rdate));
+            });
+        }
+    };
+
+    /**
+     * Gather recurrence settings from form
+     */
+    this.serialize_recurrence = function(timestr)
+    {
+        var recurrence = '',
+            freq = $('#edit-recurrence-frequency').val();
+
+        if (freq != '') {
+            recurrence = {
+                FREQ: freq,
+                INTERVAL: $('#edit-recurrence-interval-'+freq.toLowerCase()).val()
+            };
+
+            var until = $('input.edit-recurrence-until:checked').val();
+            if (until == 'count')
+                recurrence.COUNT = $('#edit-recurrence-repeat-times').val();
+            else if (until == 'until')
+                recurrence.UNTIL = me.date2ISO8601(me.parse_datetime(timestr || '00:00', $('#edit-recurrence-enddate').val()));
+
+            if (freq == 'WEEKLY') {
+                var byday = [];
+                $('input.edit-recurrence-weekly-byday:checked').each(function(){ byday.push(this.value); });
+                if (byday.length)
+                    recurrence.BYDAY = byday.join(',');
+            }
+            else if (freq == 'MONTHLY') {
+                var mode = $('input.edit-recurrence-monthly-mode:checked').val(), bymonday = [];
+                if (mode == 'BYMONTHDAY') {
+                    $('input.edit-recurrence-monthly-bymonthday:checked').each(function(){ bymonday.push(this.value); });
+                    if (bymonday.length)
+                        recurrence.BYMONTHDAY = bymonday.join(',');
+                }
+                else
+                    recurrence.BYDAY = $('#edit-recurrence-monthly-prefix').val() + $('#edit-recurrence-monthly-byday').val();
+            }
+            else if (freq == 'YEARLY') {
+                var byday, bymonth = [];
+                $('input.edit-recurrence-yearly-bymonth:checked').each(function(){ bymonth.push(this.value); });
+                if (bymonth.length)
+                    recurrence.BYMONTH = bymonth.join(',');
+                if ((byday = $('#edit-recurrence-yearly-byday').val()))
+                    recurrence.BYDAY = $('#edit-recurrence-yearly-prefix').val() + byday;
+            }
+            else if (freq == 'RDATE') {
+                recurrence = { RDATE:[] };
+                // take selected but not yet added date into account
+                if ($('#edit-recurrence-rdate-input').val() != '') {
+                    $('#recurrence-form-rdate input.button.add').click();
+                }
+                $('#edit-recurrence-rdates li').each(function(i, li){
+                    recurrence.RDATE.push($(li).attr('data-value'));
+                });
+            }
+        }
+
+        return recurrence;
+    };
+
+    // add the given date to the RDATE list
+    this.add_rdate = function(date)
+    {
+        var li = $('<li>')
+            .attr('data-value', this.date2ISO8601(date))
+            .html('<span>' + Q(this.format_datetime(date, 1)) + '</span>')
+            .appendTo('#edit-recurrence-rdates');
+
+        $('<a>').attr('href', '#del')
+            .addClass('iconbutton delete')
+            .html(rcmail.get_label('delete', 'libcalendaring'))
+            .attr('title', rcmail.get_label('delete', 'libcalendaring'))
+            .appendTo(li);
+    };
+
+    // re-sort the list items by their 'data-value' attribute
+    this.sort_rdates = function()
+    {
+        var mylist = $('#edit-recurrence-rdates'),
+            listitems = mylist.children('li').get();
+        listitems.sort(function(a, b) {
+            var compA = $(a).attr('data-value');
+            var compB = $(b).attr('data-value');
+            return (compA < compB) ? -1 : (compA > compB) ? 1 : 0;
+        })
+        $.each(listitems, function(idx, item) { mylist.append(item); });
+    };
+
 }
 
 //////  static methods

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

@@ -125,6 +125,16 @@
     }
 
     /**
+     * Load recurrence computation engine
+     */
+    public static function get_recurrence()
+    {
+        $self = self::get_instance();
+        require_once($self->home . '/lib/libcalendaring_recurrence.php');
+        return new libcalendaring_recurrence($self);
+    }
+
+    /**
      * Shift dates into user's current timezone
      *
      * @param mixed Any kind of a date representation (DateTime object, string or unix timestamp)
@@ -278,7 +288,7 @@
     public function alarm_select($attrib, $alarm_types, $absolute_time = true)
     {
         unset($attrib['name']);
-        $select_type = new html_select(array('name' => 'alarmtype[]', 'class' => 'edit-alarm-type'));
+        $select_type = new html_select(array('name' => 'alarmtype[]', 'class' => 'edit-alarm-type', 'id' => $attrib['id']));
         $select_type->add($this->gettext('none'), '');
         foreach ($alarm_types as $type)
             $select_type->add($this->gettext(strtolower("alarm{$type}option")), $type);
@@ -345,25 +355,92 @@
     public static function parse_alaram_value($val)
     {
         if ($val[0] == '@') {
-            return array(substr($val, 1));
+            return array(new DateTime($val));
         }
-        else if (preg_match('/([+-])P?(T?\d+[HMSDW])+/', $val, $m) && preg_match_all('/T?(\d+)([HMSDW])/', $val, $m2, PREG_SET_ORDER)) {
+        else if (preg_match('/([+-]?)P?(T?\d+[HMSDW])+/', $val, $m) && preg_match_all('/T?(\d+)([HMSDW])/', $val, $m2, PREG_SET_ORDER)) {
+            if ($m[1] == '')
+                $m[1] = '+';
             foreach ($m2 as $seg) {
+                $prefix = $seg[2] == 'D' || $seg[2] == 'W' ? 'P' : 'PT';
                 if ($seg[1] > 0) {  // ignore zero values
-                    return array($seg[1], $m[1].$seg[2], $m[1].$seg[1].$seg[2]);
+                    return array($seg[1], $m[1].$seg[2], $m[1].$seg[1].$seg[2], $m[1].$prefix.$seg[1].$seg[2]);
                 }
             }
+
+            // return zero value nevertheless
+            return array($seg[1], $m[1].$seg[2], $m[1].$seg[1].$seg[2], $m[1].$prefix.$seg[1].$seg[2]);
         }
 
         return false;
     }
 
     /**
+     * Convert the alarms list items to be processed on the client
+     */
+    public static function to_client_alarms($valarms)
+    {
+        return array_map(function($alarm){
+            if ($alarm['trigger'] instanceof DateTime) {
+                $alarm['trigger'] = '@' . $alarm['trigger']->format('U');
+            }
+            else if ($trigger = self::parse_alaram_value($alarm['trigger'])) {
+                $alarm['trigger'] = $trigger[2];
+            }
+            return $alarm;
+        }, (array)$valarms);
+    }
+
+    /**
+     * Process the alarms values submitted by the client
+     */
+    public static function from_client_alarms($valarms)
+    {
+        return array_map(function($alarm){
+            if ($alarm['trigger'][0] == '@') {
+                try {
+                    $alarm['trigger'] = new DateTime($alarm['trigger']);
+                    $alarm['trigger']->setTimezone(new DateTimeZone('UTC'));
+                }
+                catch (Exception $e) { /* handle this ? */ }
+            }
+            else if ($trigger = libcalendaring::parse_alaram_value($alarm['trigger'])) {
+                $alarm['trigger'] = $trigger[3];
+            }
+            return $alarm;
+        }, (array)$valarms);
+    }
+
+    /**
      * Render localized text for alarm settings
      */
-    public static function alarms_text($alarm)
+    public static function alarms_text($alarms)
     {
-        list($trigger, $action) = explode(':', $alarm);
+        if (is_array($alarms) && is_array($alarms[0])) {
+            $texts = array();
+            foreach ($alarms as $alarm) {
+                if ($text = self::alarm_text($alarm))
+                    $texts[] = $text;
+            }
+
+            return join(', ', $texts);
+        }
+        else {
+            return self::alarm_text($alarms);
+        }
+    }
+
+    /**
+     * Render localized text for a single alarm property
+     */
+    public static function alarm_text($alarm)
+    {
+        if (is_string($alarm)) {
+            list($trigger, $action) = explode(':', $alarm);
+        }
+        else {
+            $trigger = $alarm['trigger'];
+            $action = $alarm['action'];
+        }
 
         $text = '';
         $rcube = rcube::get_instance();
@@ -375,19 +452,33 @@
         case 'DISPLAY':
             $text = $rcube->gettext('libcalendaring.alarmdisplay');
             break;
+        case 'AUDIO':
+            $text = $rcube->gettext('libcalendaring.alarmaudio');
+            break;
         }
 
-        if (preg_match('/@(\d+)/', $trigger, $m)) {
+        if ($trigger instanceof DateTime) {
+            $text .= ' ' . $rcube->gettext(array(
+                'name' => 'libcalendaring.alarmat',
+                'vars' => array('datetime' => $rcube->format_date($trigger))
+            ));
+        }
+        else if (preg_match('/@(\d+)/', $trigger, $m)) {
             $text .= ' ' . $rcube->gettext(array(
                 'name' => 'libcalendaring.alarmat',
                 'vars' => array('datetime' => $rcube->format_date($m[1]))
             ));
         }
         else if ($val = self::parse_alaram_value($trigger)) {
-            $text .= ' ' . intval($val[0]) . ' ' . $rcube->gettext('libcalendaring.trigger' . $val[1]);
+            // TODO: for all-day events say 'on date of event at XX' ?
+            if ($val[0] == 0)
+                $text .= ' ' . $rcube->gettext('libcalendaring.triggerattime');
+            else
+                $text .= ' ' . intval($val[0]) . ' ' . $rcube->gettext('libcalendaring.trigger' . $val[1]);
         }
-        else
+        else {
             return false;
+        }
 
         return $text;
     }
@@ -400,53 +491,78 @@
      */
     public static function get_next_alarm($rec, $type = 'event')
     {
-        if (!$rec['alarms'])
+        if (!($rec['valarms'] || $rec['alarms']) || $rec['cancelled'] || $rec['status'] == 'CANCELLED')
             return null;
 
         if ($type == 'task') {
             $timezone = self::get_instance()->timezone;
-            if ($rec['date'])
-                $rec['start'] = new DateTime($rec['date'] . ' ' . ($rec['time'] ?: '12:00'), $timezone);
             if ($rec['startdate'])
-                $rec['end'] = new DateTime($rec['startdate'] . ' ' . ($rec['starttime'] ?: '12:00'), $timezone);
+                $rec['start'] = new DateTime($rec['startdate'] . ' ' . ($rec['starttime'] ?: '12:00'), $timezone);
+            if ($rec['date'])
+                $rec[($rec['start'] ? 'end' : 'start')] = new DateTime($rec['date'] . ' ' . ($rec['time'] ?: '12:00'), $timezone);
         }
 
         if (!$rec['end'])
             $rec['end'] = $rec['start'];
 
+        // support legacy format
+        if (!$rec['valarms']) {
+            list($trigger, $action) = explode(':', $rec['alarms'], 2);
+            if ($alarm = self::parse_alaram_value($trigger)) {
+                $rec['valarms'] = array(array('action' => $action, 'trigger' => $alarm[3] ?: $alarm[0]));
+            }
+        }
 
-        // TODO: handle multiple alarms (currently not supported)
-        list($trigger, $action) = explode(':', $rec['alarms'], 2);
-
-        $notify = self::parse_alaram_value($trigger);
-        if (!empty($notify[1])){  // offset
-            $mult = 1;
-            switch ($notify[1]) {
-                case '-S': $mult =     -1; break;
-                case '+S': $mult =      1; break;
-                case '-M': $mult =    -60; break;
-                case '+M': $mult =     60; break;
-                case '-H': $mult =  -3600; break;
-                case '+H': $mult =   3600; break;
-                case '-D': $mult = -86400; break;
-                case '+D': $mult =  86400; break;
-                case '-W': $mult = -604800; break;
-                case '+W': $mult =  604800; break;
+        $expires = new DateTime('now - 12 hours');
+        $alarm_id = $rec['id'];  // alarm ID eq. record ID by default to keep backwards compatibility
+
+        // handle multiple alarms
+        $notify_at = null;
+        foreach ($rec['valarms'] as $alarm) {
+            $notify_time = null;
+
+            if ($alarm['trigger'] instanceof DateTime) {
+                $notify_time = $alarm['trigger'];
             }
-            $offset = $notify[0] * $mult;
-            $refdate = $mult > 0 ? $rec['end'] : $rec['start'];
+            else if (is_string($alarm['trigger'])) {
+                $refdate = $alarm['trigger'][0] == '+' ? $rec['end'] : $rec['start'];
 
-            // abort of no reference date is available to compute notification time
-            if (!is_a($refdate, 'DateTime'))
-                return null;
+                // abort if no reference date is available to compute notification time
+                if (!is_a($refdate, 'DateTime'))
+                    continue;
 
-            $notify_at = $refdate->format('U') + $offset;
-        }
-        else {  // absolute timestamp
-            $notify_at = $notify[0];
+                // TODO: for all-day events, take start @ 00:00 as reference date ?
+
+                try {
+                    $interval = new DateInterval(trim($alarm['trigger'], '+-'));
+                    $interval->invert = $alarm['trigger'][0] != '+';
+                    $notify_time = clone $refdate;
+                    $notify_time->add($interval);
+                }
+                catch (Exception $e) {
+                    rcube::raise_error($e, true);
+                    continue;
+                }
+            }
+
+            if ($notify_time && (!$notify_at || ($notify_time < $notify_at && $notify_time > $expires))) {
+                $notify_at = $notify_time;
+                $action = $alarm['action'];
+                $alarm_prop = $alarm;
+
+                // generate a unique alarm ID if multiple alarms are set
+                if (count($rec['valarms']) > 1) {
+                    $alarm_id = substr(md5($rec['id']), 0, 16) . '-' . $notify_at->format('Ymd\THis');
+                }
+            }
         }
 
-        return array('time' => $notify_at, 'action' => $action ? strtoupper($action) : 'DISPLAY');
+        return !$notify_at ? null : array(
+            'time'   => $notify_at->format('U'),
+            'action' => $action ? strtoupper($action) : 'DISPLAY',
+            'id'     => $alarm_id,
+            'prop'   => $alarm_prop,
+        );
     }
 
     /**
@@ -534,6 +650,285 @@
     }
 
 
+    /*********  Recurrence rules handling ********/
+
+    /**
+     * Render localized text describing the recurrence rule of an event
+     */
+    public function recurrence_text($rrule)
+    {
+        // derive missing FREQ and INTERVAL from RDATE list
+        if (empty($rrule['FREQ']) && !empty($rrule['RDATE'])) {
+            $first = $rrule['RDATE'][0];
+            $second = $rrule['RDATE'][1];
+            $third  = $rrule['RDATE'][2];
+            if (is_a($first, 'DateTime') && is_a($second, 'DateTime')) {
+                $diff = $first->diff($second);
+                foreach (array('y' => 'YEARLY', 'm' => 'MONTHLY', 'd' => 'DAILY') as $k => $freq) {
+                    if ($diff->$k != 0) {
+                        $rrule['FREQ'] = $freq;
+                        $rrule['INTERVAL'] = $diff->$k;
+
+                        // verify interval with next item
+                        if (is_a($third, 'DateTime')) {
+                            $diff2 = $second->diff($third);
+                            if ($diff2->$k != $diff->$k) {
+                                unset($rrule['INTERVAL']);
+                            }
+                        }
+                        break;
+                    }
+                }
+            }
+            if (!$rrule['INTERVAL']) {
+                $rrule['FREQ'] = 'RDATE';
+            }
+            $rrule['UNTIL'] = end($rrule['RDATE']);
+        }
+
+        $freq = sprintf('%s %d ', $this->gettext('every'), $rrule['INTERVAL']);
+        $details = '';
+        switch ($rrule['FREQ']) {
+            case 'DAILY':
+                $freq .= $this->gettext('days');
+                break;
+            case 'WEEKLY':
+                $freq .= $this->gettext('weeks');
+                break;
+            case 'MONTHLY':
+                $freq .= $this->gettext('months');
+                break;
+            case 'YEARLY':
+                $freq .= $this->gettext('years');
+                break;
+        }
+
+        if ($rrule['INTERVAL'] <= 1) {
+            $freq = $this->gettext(strtolower($rrule['FREQ']));
+        }
+
+        if ($rrule['COUNT']) {
+            $until =  $this->gettext(array('name' => 'forntimes', 'vars' => array('nr' => $rrule['COUNT'])));
+        }
+        else if ($rrule['UNTIL']) {
+            $until = $this->gettext('recurrencend') . ' ' . format_date($rrule['UNTIL'], self::to_php_date_format($this->rc->config->get('calendar_date_format', $this->defaults['calendar_date_format'])));
+        }
+        else {
+            $until = $this->gettext('forever');
+        }
+
+        return rtrim($freq . $details . ', ' . $until);
+    }
+
+    /**
+     * Generate the form for recurrence settings
+     */
+    public function recurrence_form($attrib = array())
+    {
+        switch ($attrib['part']) {
+            // frequency selector
+            case 'frequency':
+                $select = new html_select(array('name' => 'frequency', 'id' => 'edit-recurrence-frequency'));
+                $select->add($this->gettext('never'),   '');
+                $select->add($this->gettext('daily'),   'DAILY');
+                $select->add($this->gettext('weekly'),  'WEEKLY');
+                $select->add($this->gettext('monthly'), 'MONTHLY');
+                $select->add($this->gettext('yearly'),  'YEARLY');
+                $select->add($this->gettext('rdate'),   'RDATE');
+                $html = html::label('edit-recurrence-frequency', $this->gettext('frequency')) . $select->show('');
+                break;
+
+            // daily recurrence
+            case 'daily':
+                $select = $this->interval_selector(array('name' => 'interval', 'class' => 'edit-recurrence-interval', 'id' => 'edit-recurrence-interval-daily'));
+                $html = html::div($attrib, html::label('edit-recurrence-interval-daily', $this->gettext('every')) . $select->show(1) . html::span('label-after', $this->gettext('days')));
+                break;
+
+            // weekly recurrence form
+            case 'weekly':
+                $select = $this->interval_selector(array('name' => 'interval', 'class' => 'edit-recurrence-interval', 'id' => 'edit-recurrence-interval-weekly'));
+                $html = html::div($attrib, html::label('edit-recurrence-interval-weekly', $this->gettext('every')) . $select->show(1) . html::span('label-after', $this->gettext('weeks')));
+                // weekday selection
+                $daymap = array('sun','mon','tue','wed','thu','fri','sat');
+                $checkbox = new html_checkbox(array('name' => 'byday', 'class' => 'edit-recurrence-weekly-byday'));
+                $first = $this->rc->config->get('calendar_first_day', 1);
+                for ($weekdays = '', $j = $first; $j <= $first+6; $j++) {
+                    $d = $j % 7;
+                    $weekdays .= html::label(array('class' => 'weekday'),
+                        $checkbox->show('', array('value' => strtoupper(substr($daymap[$d], 0, 2)))) .
+                        $this->gettext($daymap[$d])
+                    ) . ' ';
+                }
+                $html .= html::div($attrib, html::label(null, $this->gettext('bydays')) . $weekdays);
+                break;
+
+            // monthly recurrence form
+            case 'monthly':
+                $select = $this->interval_selector(array('name' => 'interval', 'class' => 'edit-recurrence-interval', 'id' => 'edit-recurrence-interval-monthly'));
+                $html = html::div($attrib, html::label('edit-recurrence-interval-monthly', $this->gettext('every')) . $select->show(1) . html::span('label-after', $this->gettext('months')));
+
+                $checkbox = new html_checkbox(array('name' => 'bymonthday', 'class' => 'edit-recurrence-monthly-bymonthday'));
+                for ($monthdays = '', $d = 1; $d <= 31; $d++) {
+                    $monthdays .= html::label(array('class' => 'monthday'), $checkbox->show('', array('value' => $d)) . $d);
+                    $monthdays .= $d % 7 ? ' ' : html::br();
+                }
+
+                // rule selectors
+                $radio = new html_radiobutton(array('name' => 'repeatmode', 'class' => 'edit-recurrence-monthly-mode'));
+                $table = new html_table(array('cols' => 2, 'border' => 0, 'cellpadding' => 0, 'class' => 'formtable'));
+                $table->add('label', html::label(null, $radio->show('BYMONTHDAY', array('value' => 'BYMONTHDAY')) . ' ' . $this->gettext('each')));
+                $table->add(null, $monthdays);
+                $table->add('label', html::label(null, $radio->show('', array('value' => 'BYDAY')) . ' ' . $this->gettext('onevery')));
+                $table->add(null, $this->rrule_selectors($attrib['part']));
+
+                $html .= html::div($attrib, $table->show());
+                break;
+
+            // annually recurrence form
+            case 'yearly':
+                $select = $this->interval_selector(array('name' => 'interval', 'class' => 'edit-recurrence-interval', 'id' => 'edit-recurrence-interval-yearly'));
+                $html = html::div($attrib, html::label('edit-recurrence-interval-yearly', $this->gettext('every')) . $select->show(1) . html::span('label-after', $this->gettext('years')));
+                // month selector
+                $monthmap = array('','jan','feb','mar','apr','may','jun','jul','aug','sep','oct','nov','dec');
+                $checkbox = new html_checkbox(array('name' => 'bymonth', 'class' => 'edit-recurrence-yearly-bymonth'));
+                for ($months = '', $m = 1; $m <= 12; $m++) {
+                    $months .= html::label(array('class' => 'month'), $checkbox->show(null, array('value' => $m)) . $this->gettext($monthmap[$m]));
+                    $months .= $m % 4 ? ' ' : html::br();
+                }
+                $html .= html::div($attrib + array('id' => 'edit-recurrence-yearly-bymonthblock'), $months);
+
+                // day rule selection
+                $html .= html::div($attrib, html::label(null, $this->gettext('onevery')) . $this->rrule_selectors($attrib['part'], '---'));
+                break;
+
+            // end of recurrence form
+            case 'until':
+                $radio = new html_radiobutton(array('name' => 'repeat', 'class' => 'edit-recurrence-until'));
+                $select = $this->interval_selector(array('name' => 'times', 'id' => 'edit-recurrence-repeat-times'));
+                $input = new html_inputfield(array('name' => 'untildate', 'id' => 'edit-recurrence-enddate', 'size' => "10"));
+
+                $html = html::div('line first',
+                    html::label(null, $radio->show('', array('value' => '', 'id' => 'edit-recurrence-repeat-forever')) . ' ' .
+                        $this->gettext('forever'))
+                );
+
+                $forntimes = $this->gettext(array(
+                    'name' => 'forntimes',
+                    'vars' => array('nr' => '%s'))
+                );
+                $html .= html::div('line',
+                    $radio->show('', array('value' => 'count', 'id' => 'edit-recurrence-repeat-count', 'aria-label' => sprintf($forntimes, 'N'))) . ' ' .
+                        sprintf($forntimes, $select->show(1))
+                );
+
+                $html .= html::div('line',
+                    $radio->show('', array('value' => 'until', 'id' => 'edit-recurrence-repeat-until', 'aria-label' => $this->gettext('untilenddate'))) . ' ' .
+                        $this->gettext('untildate') . ' ' . $input->show('', array('aria-label' => $this->gettext('untilenddate')))
+                );
+
+                $html = html::div($attrib, html::label(null, ucfirst($this->gettext('recurrencend'))) . $html);
+                break;
+
+            case 'rdate':
+                $ul = html::tag('ul', array('id' => 'edit-recurrence-rdates'), '');
+                $input = new html_inputfield(array('name' => 'rdate', 'id' => 'edit-recurrence-rdate-input', 'size' => "10"));
+                $button = new html_inputfield(array('type' => 'button', 'class' => 'button add', 'value' => $this->gettext('addrdate')));
+                $html .= html::div($attrib, $ul . html::div('inputform', $input->show() . $button->show()));
+                break;
+        }
+
+        return $html;
+    }
+
+    /**
+     * Input field for interval selection
+     */
+    private function interval_selector($attrib)
+    {
+        $select = new html_select($attrib);
+        $select->add(range(1,30), range(1,30));
+        return $select;
+    }
+
+    /**
+     * Drop-down menus for recurrence rules like "each last sunday of"
+     */
+    private function rrule_selectors($part, $noselect = null)
+    {
+        // rule selectors
+        $select_prefix = new html_select(array('name' => 'bydayprefix', 'id' => "edit-recurrence-$part-prefix"));
+        if ($noselect) $select_prefix->add($noselect, '');
+        $select_prefix->add(array(
+                $this->gettext('first'),
+                $this->gettext('second'),
+                $this->gettext('third'),
+                $this->gettext('fourth'),
+                $this->gettext('last')
+            ),
+            array(1, 2, 3, 4, -1));
+
+        $select_wday = new html_select(array('name' => 'byday', 'id' => "edit-recurrence-$part-byday"));
+        if ($noselect) $select_wday->add($noselect, '');
+
+        $daymap = array('sunday','monday','tuesday','wednesday','thursday','friday','saturday');
+        $first = $this->rc->config->get('calendar_first_day', 1);
+        for ($j = $first; $j <= $first+6; $j++) {
+            $d = $j % 7;
+            $select_wday->add($this->gettext($daymap[$d]), strtoupper(substr($daymap[$d], 0, 2)));
+        }
+
+        return $select_prefix->show() . '&nbsp;' . $select_wday->show();
+    }
+
+    /**
+     * Convert the recurrence settings to be processed on the client
+     */
+    public function to_client_recurrence($recurrence, $allday = false)
+    {
+        if ($recurrence['UNTIL'])
+            $recurrence['UNTIL'] = $this->adjust_timezone($recurrence['UNTIL'], $allday)->format('c');
+
+        // format RDATE values
+        if (is_array($recurrence['RDATE'])) {
+            $libcal = $this;
+            $recurrence['RDATE'] = array_map(function($rdate) use ($libcal) {
+                return $libcal->adjust_timezone($rdate, true)->format('c');
+            }, $recurrence['RDATE']);
+        }
+
+        unset($recurrence['EXCEPTIONS']);
+
+        return $recurrence;
+    }
+
+    /**
+     * Process the alarms values submitted by the client
+     */
+    public function from_client_recurrence($recurrence, $start = null)
+    {
+        if (is_array($recurrence) && !empty($recurrence['UNTIL'])) {
+            $recurrence['UNTIL'] = new DateTime($recurrence['UNTIL'], $this->timezone);
+        }
+
+        if (is_array($recurrence) && is_array($recurrence['RDATE'])) {
+            $tz = $this->timezone;
+            $recurrence['RDATE'] = array_map(function($rdate) use ($tz, $start) {
+                try {
+                    $dt = new DateTime($rdate, $tz);
+                    if (is_a($start, 'DateTime'))
+                        $dt->setTime($start->format('G'), $start->format('i'));
+                    return $dt;
+                }
+                catch (Exception $e) {
+                    return null;
+                }
+            }, $recurrence['RDATE']);
+        }
+
+        return $recurrence;
+    }
+
+
     /*********  Attachments handling  *********/
 
     /**
@@ -597,6 +992,7 @@
                       'class' => 'delete',
                       'onclick' => sprintf("return %s.remove_from_attachment_list('rcmfile%s')", JS_OBJECT_NAME, $id),
                       'title' => $this->rc->gettext('delete'),
+                      'aria-label' => $this->rc->gettext('delete') . ' ' . $attachment['name'],
                   ), $button);
 
                   $content .= Q($attachment['name']);

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

@@ -422,7 +422,7 @@
                 break;
 
             case 'RRULE':
-                $params = array();
+                $params = is_array($event['recurrence']) ? $event['recurrence'] : array();
                 // parse recurrence rule attributes
                 foreach (explode(';', $prop->value) as $par) {
                     list($k, $v) = explode('=', $par);
@@ -673,9 +673,12 @@
                 continue;
 
             switch ($prop->name) {
+            case 'CREATED':
+            case 'LAST-MODIFIED':
+            case 'DTSTAMP':
             case 'DTSTART':
             case 'DTEND':
-                $propmap = array('DTSTART' => 'start', 'DTEND' => 'end');
+                $propmap = array('DTSTART' => 'start', 'DTEND' => 'end', 'CREATED' => 'created', 'LAST-MODIFIED' => 'changed', 'DTSTAMP' => 'changed');
                 $this->freebusy[$propmap[$prop->name]] =  self::convert_datetime($prop);
                 break;
 
@@ -1025,9 +1028,10 @@
             $va = VObject\Component::create('VALARM');
             list($trigger, $va->action) = explode(':', $event['alarms']);
             $val = libcalendaring::parse_alaram_value($trigger);
-            $period = $val[1] && preg_match('/[HMS]$/', $val[1]) ? 'PT' : 'P';
-            if ($val[1]) $va->add('TRIGGER', preg_replace('/^([-+])P?T?(.+)/', "\\1$period\\2", $trigger));
-            else         $va->add('TRIGGER', gmdate('Ymd\THis\Z', $val[0]), array('VALUE' => 'DATE-TIME'));
+            if ($val[3])
+                $va->add('TRIGGER', $val[3]);
+            else if ($val[0] instanceof DateTime)
+                $va->add(self::datetime_prop('TRIGGER', $val[0]));
             $ve->add($va);
         }
 
@@ -1106,7 +1110,7 @@
         }
 
         // append recurrence exceptions
-        if ($event['recurrence']['EXCEPTIONS']) {
+        if (is_array($event['recurrence']) && $event['recurrence']['EXCEPTIONS']) {
             foreach ($event['recurrence']['EXCEPTIONS'] as $ex) {
                 $exdate = clone $event['start'];
                 $exdate->setDate($ex['start']->format('Y'), $ex['start']->format('n'), $ex['start']->format('j'));

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

@@ -1,7 +1,27 @@
 <?php
-
-$labels = array();
-
+$labels['alarmemail'] = 'Send Email';
+$labels['alarmdisplay'] = 'Show message';
+$labels['alarmdisplayoption'] = 'Message';
+$labels['alarmemailoption'] = 'Електронна поща';
+$labels['alarmat'] = 'at $datetime';
+$labels['trigger@'] = 'on date';
+$labels['trigger-M'] = 'minutes before';
+$labels['trigger-H'] = 'hours before';
+$labels['trigger-D'] = 'days before';
+$labels['trigger+M'] = 'minutes after';
+$labels['trigger+H'] = 'hours after';
+$labels['trigger+D'] = 'days after';
+$labels['addalarm'] = 'add alarm';
+$labels['alarmtitle'] = 'Upcoming events';
+$labels['dismissall'] = 'Dismiss all';
+$labels['dismiss'] = 'Dismiss';
+$labels['snooze'] = 'Snooze';
+$labels['repeatinmin'] = 'Repeat in $min minutes';
+$labels['repeatinhr'] = 'Repeat in 1 hour';
+$labels['repeatinhrs'] = 'Repeat in $hrs hours';
+$labels['repeattomorrow'] = 'Repeat tomorrow';
+$labels['repeatinweek'] = 'Repeat in a week';
+$labels['showmore'] = 'Show more...';
 // itip related labels
 $labels['itipinvitation'] = 'Invitation to';
 $labels['itipupdate'] = 'Update of';
@@ -10,14 +30,11 @@
 $labels['itipaccepted'] = 'Приемане';
 $labels['itiptentative'] = 'Може би';
 $labels['itipdeclined'] = 'Отхвърляне';
-
 $labels['itipsubjectaccepted'] = '"$title" беше прието от $name';
 $labels['itipsubjectdeclined'] = '"$title" беше отхвърлено от $name';
-
-$labels['importtocalendar'] = 'Запазване в моя календар';
-$labels['removefromcalendar'] = 'Премахване от моя календар';
 $labels['updateattendeestatus'] = 'Подновяване на статусът на участника';
 $labels['acceptinvitation'] = 'Приемате ли тази покана?';
 $labels['youhaveaccepted'] = 'Вие сте приели тази покана';
-
-$labels['savingdata'] = 'Запазване на данни...';
\ No newline at end of file
+$labels['importtocalendar'] = 'Запазване в моя календар';
+$labels['removefromcalendar'] = 'Премахване от моя календар';
+$labels['savingdata'] = 'Запазване на данни...';

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

@@ -1,7 +1,4 @@
 <?php
-
-$labels = array();
-
 $labels['alarmemail'] = 'Poslat e-mail';
 $labels['alarmdisplay'] = 'Zobrazit zprávu';
 $labels['alarmdisplayoption'] = 'Zpráva';
@@ -15,7 +12,6 @@
 $labels['trigger+H'] = 'hodin po';
 $labels['trigger+D'] = 'dnů po';
 $labels['addalarm'] = 'přidat upozornění';
-
 $labels['alarmtitle'] = 'Blížící se události';
 $labels['dismissall'] = 'Zrušit vše';
 $labels['dismiss'] = 'Zrušit';
@@ -25,9 +21,36 @@
 $labels['repeatinhrs'] = 'Zopakovat za $hrs hodin';
 $labels['repeattomorrow'] = 'Zopakovat zítra';
 $labels['repeatinweek'] = 'Zopakovat za týden';
-
 $labels['showmore'] = 'Ukázat víc...';
 
+// recurrence related labels
+$labels['frequency'] = 'Opakovat';
+$labels['never'] = 'nikdy';
+$labels['daily'] = 'denně';
+$labels['weekly'] = 'týdně';
+$labels['monthly'] = 'měsíčně';
+$labels['yearly'] = 'ročně';
+$labels['rdate'] = 'on dates';
+$labels['every'] = 'Každý';
+$labels['days'] = 'den (dny)';
+$labels['weeks'] = 'týden (týdny)';
+$labels['months'] = 'měsíc(e/ů)';
+$labels['years'] = 'rok(y/ů) v:';
+$labels['bydays'] = 'On';
+$labels['untildate'] = 'do';
+$labels['each'] = 'Každý';
+$labels['onevery'] = 'Vždy v';
+$labels['onsamedate'] = 'Ve stejné datum';
+$labels['forever'] = 'trvale';
+$labels['recurrencend'] = 'do';
+$labels['forntimes'] = 'jen $nrkrát';
+$labels['first'] = 'první';
+$labels['second'] = 'druhý';
+$labels['third'] = 'třetí';
+$labels['fourth'] = 'čtvrtý';
+$labels['last'] = 'poslední';
+$labels['dayofmonth'] = 'Den v měsíci';
+
 // itip related labels
 $labels['itipinvitation'] = 'Pozvání na událost';
 $labels['itipupdate'] = 'Aktualizace události';
@@ -36,18 +59,15 @@
 $labels['itipaccepted'] = 'Potvrdit';
 $labels['itiptentative'] = 'Možná';
 $labels['itipdeclined'] = 'Odmítnout';
-
 $labels['itipsubjectaccepted'] = '$name potvrdil(a) účas na události "$title"';
 $labels['itipsubjecttentative'] = '$name nezávazně potvrdil(a) účast na události "$title"';
 $labels['itipsubjectdeclined'] = '$name odmítl(a) účast na události "$title"';
-
-$labels['importtocalendar'] = 'Uložit do kalendáře';
-$labels['removefromcalendar'] = 'Odstranit z kalendáře';
 $labels['updateattendeestatus'] = 'Aktualizovat stav účastníka';
 $labels['acceptinvitation'] = 'Chcete přijmout toto pozvání (potvrdit účast)?';
 $labels['youhaveaccepted'] = 'Přijal(a) jste toto pozvání';
 $labels['youhavetentative'] = 'Nezávazně jste přijal(a) toto pozvání';
 $labels['youhavedeclined'] = 'Odmítl(a) jste toto pozvání';
 $labels['notanattendee'] = 'Nejste na seznamu účastníků této události';
-
-$labels['savingdata'] = 'Ukládám data...';
\ No newline at end of file
+$labels['importtocalendar'] = 'Uložit do kalendáře';
+$labels['removefromcalendar'] = 'Odstranit z kalendáře';
+$labels['savingdata'] = 'Ukládám data...';

roundcubemail-plugins-kolab-3.2.tar.gz/plugins/libcalendaring/localization/da_DK.inc Added

@@ -0,0 +1,71 @@
+<?php
+$labels['alarmemail'] = 'Afsend e-post';
+$labels['alarmdisplay'] = 'Vis besked';
+$labels['alarmdisplayoption'] = 'Besked';
+$labels['alarmemailoption'] = 'E-post';
+$labels['alarmat'] = 'per $datetime';
+$labels['trigger@'] = 'per dato';
+$labels['trigger-M'] = 'minutter før';
+$labels['trigger-H'] = 'timer før';
+$labels['trigger-D'] = 'dage før';
+$labels['trigger+M'] = 'minutter efter';
+$labels['trigger+H'] = 'timer efter';
+$labels['trigger+D'] = 'dage efter';
+$labels['addalarm'] = 'tilføj alarm';
+$labels['alarmtitle'] = 'Kommende arrangementer';
+$labels['dismissall'] = 'Afvis alle';
+$labels['dismiss'] = 'Afvis';
+$labels['snooze'] = 'Slumre';
+$labels['repeatinmin'] = 'Gentag om $min minutter';
+$labels['repeatinhr'] = 'Gentag om 1 time';
+$labels['repeatinhrs'] = 'Gentag om $hrs timer';
+$labels['repeattomorrow'] = 'Gentag i morgen';
+$labels['repeatinweek'] = 'Gentag om en uge';
+$labels['showmore'] = 'Vis mere ...';
+
+// recurrence related labels
+$labels['frequency'] = 'Gentag';
+$labels['never'] = 'aldrig';
+$labels['daily'] = 'dagligt';
+$labels['weekly'] = 'ugentligt';
+$labels['monthly'] = 'månedligt';
+$labels['yearly'] = 'årligt';
+$labels['every'] = 'Hver';
+$labels['days'] = 'dag(e)';
+$labels['weeks'] = 'uge(r)';
+$labels['months'] = 'måned(er)';
+$labels['years'] = 'år i:';
+$labels['bydays'] = 'Per';
+$labels['untildate'] = 'den';
+$labels['each'] = 'Hver';
+$labels['onevery'] = 'På hver';
+$labels['onsamedate'] = 'På samme dato';
+$labels['forever'] = 'for altid';
+$labels['recurrencend'] = 'indtil';
+$labels['forntimes'] = 'for $nr gang(e)';
+$labels['first'] = 'første';
+$labels['second'] = 'anden';
+$labels['third'] = 'tredje';
+$labels['fourth'] = 'fjerde';
+$labels['last'] = 'sidste';
+$labels['dayofmonth'] = 'Dag på måneden';
+
+// itip related labels
+$labels['itipinvitation'] = 'Invitation til';
+$labels['itipupdate'] = 'Opdatering per';
+$labels['itipcancellation'] = 'Aflyst:';
+$labels['itipreply'] = 'Svar til';
+$labels['itipaccepted'] = 'Acceptér';
+$labels['itiptentative'] = 'Måske';
+$labels['itipdeclined'] = 'Afvis';
+$labels['itipsubjectaccepted'] = '"$title" er blevet accepteret af $name';
+$labels['itipsubjecttentative'] = '"$title" er blevet forsøgsvist accepteret af $name';
+$labels['itipsubjectdeclined'] = '"$title" af blevet afvist af $name';
+$labels['updateattendeestatus'] = 'Opdatér status for deltagere';
+$labels['acceptinvitation'] = 'Vil du acceptere denne invitation?';
+$labels['youhaveaccepted'] = 'Du har accepteret denne invitation';
+$labels['youhavetentative'] = 'Du har forsøgsvist accepteret denne invitation';
+$labels['youhavedeclined'] = 'Du har afvist denne invitation';
+$labels['importtocalendar'] = 'Gem i min kalender';
+$labels['removefromcalendar'] = 'Fjern fra min kalender';
+$labels['savingdata'] = 'Gemmer data...';

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

@@ -1,7 +1,4 @@
 <?php
-
-$labels = array();
-
 $labels['alarmemail'] = 'E-Mail senden';
 $labels['alarmdisplay'] = 'Nachricht anzeigen';
 $labels['alarmdisplayoption'] = 'Nachricht';
@@ -15,7 +12,6 @@
 $labels['trigger+H'] = 'Stunden danach';
 $labels['trigger+D'] = 'Tage danach';
 $labels['addalarm'] = 'Erinnerung hinzufügen';
-
 $labels['alarmtitle'] = 'Anstehende Termine';
 $labels['dismissall'] = 'Alle ignorieren';
 $labels['dismiss'] = 'Ignorieren';
@@ -25,9 +21,37 @@
 $labels['repeatinhrs'] = 'Wiederholung in $hrs Stunden';
 $labels['repeattomorrow'] = 'Wiederholung morgen';
 $labels['repeatinweek'] = 'Wiederholung in einer Woche';
-
 $labels['showmore'] = 'Mehr anzeigen...';
 
+// recurrence related labels
+$labels['frequency'] = 'Wiederholung';
+$labels['never'] = 'nie';
+$labels['daily'] = 'täglich';
+$labels['weekly'] = 'wöchentlich';
+$labels['monthly'] = 'monatlich';
+$labels['yearly'] = 'jährlich';
+$labels['rdate'] = 'on dates';
+$labels['every'] = 'Alle';
+$labels['days'] = 'Tag(e)';
+$labels['weeks'] = 'Woche(n)';
+$labels['months'] = 'Monat(e)';
+$labels['years'] = 'Jahre(e) im:';
+$labels['bydays'] = 'Am';
+$labels['untildate'] = 'am';
+$labels['each'] = 'Jeden';
+$labels['onevery'] = 'An jedem';
+$labels['onsamedate'] = 'Am gleichen Tag';
+$labels['forever'] = 'unendlich';
+$labels['recurrencend'] = 'bis';
+$labels['forntimes'] = '$nr Wiederholungen';
+$labels['first'] = 'erster';
+$labels['second'] = 'zweiter';
+$labels['third'] = 'dritter';
+$labels['fourth'] = 'vierter';
+$labels['last'] = 'letzter';
+$labels['dayofmonth'] = 'Tag des Montats';
+$labels['addrdate'] = 'Datum hinzufügen';
+
 // itip related labels
 $labels['itipinvitation'] = 'Einladung zu';
 $labels['itipupdate'] = 'Aktialisiert:';
@@ -36,21 +60,17 @@
 $labels['itipaccepted'] = 'Akzeptieren';
 $labels['itiptentative'] = 'Mit Vorbehalt';
 $labels['itipdeclined'] = 'Ablehnen';
-
 $labels['itipsubjectaccepted'] = 'Einladung zu "$title" wurde von $name angenommen';
 $labels['itipsubjecttentative'] = 'Einladung zu "$title" wurde von $name mit Vorbehalt angenommen';
 $labels['itipsubjectdeclined'] = 'Einladung zu "$title" wurde von $name abgelehnt';
-
-$labels['importtocalendar'] = 'In Kalender übernehmen';
-$labels['removefromcalendar'] = 'Aus meinem Kalender löschen';
 $labels['updateattendeestatus'] = 'Teilnehmerstatus aktualisieren';
 $labels['acceptinvitation'] = 'Möchten Sie die Einladung zu diesem Termin annehmen?';
 $labels['youhaveaccepted'] = 'Sie haben die Einladung angenommen';
 $labels['youhavetentative'] = 'Sie haben die Einladung mit Vorbehalt angenommen';
 $labels['youhavedeclined'] = 'Sie haben die Einladung abgelehnt';
 $labels['notanattendee'] = 'Sie sind nicht in der Liste der Teilnehmer aufgeführt';
-
+$labels['importtocalendar'] = 'In Kalender übernehmen';
+$labels['removefromcalendar'] = 'Aus meinem Kalender löschen';
 $labels['deleteobjectconfirm'] = 'Möchten Sie dieses Objekt wirklich löschen?';
 $labels['declinedeleteconfirm'] = 'Soll das abgelehnte Objekt ebenfalls aus Ihrem Konto gelöscht werden?';
-
 $labels['savingdata'] = 'Speichere...';

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

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

@@ -2,10 +2,17 @@
 
 $labels = array();
 
+// words for spoken dates
+$labels['until'] = 'until';
+$labels['at'] = 'at';
+
+// alarms related labels
 $labels['alarmemail'] = 'Send Email';
 $labels['alarmdisplay'] = 'Show message';
+$labels['alarmaudio'] = 'Play sound';
 $labels['alarmdisplayoption'] = 'Message';
 $labels['alarmemailoption'] = 'Email';
+$labels['alarmaudiooption'] = 'Sound';
 $labels['alarmat'] = 'at $datetime';
 $labels['trigger@'] = 'on date';
 $labels['trigger-M'] = 'minutes before';
@@ -14,7 +21,9 @@
 $labels['trigger+M'] = 'minutes after';
 $labels['trigger+H'] = 'hours after';
 $labels['trigger+D'] = 'days after';
-$labels['addalarm'] = 'add alarm';
+$labels['triggerattime'] = 'at time';
+$labels['addalarm'] = 'Add alarm';
+$labels['removealarm'] = 'Remove alarm';
 
 $labels['alarmtitle'] = 'Upcoming events';
 $labels['dismissall'] = 'Dismiss all';
@@ -28,6 +37,36 @@
 
 $labels['showmore'] = 'Show more...';
 
+// recurrence related labels
+$labels['frequency'] = 'Repeat';
+$labels['never'] = 'never';
+$labels['daily'] = 'daily';
+$labels['weekly'] = 'weekly';
+$labels['monthly'] = 'monthly';
+$labels['yearly'] = 'annually';
+$labels['rdate'] = 'on dates';
+$labels['every'] = 'Every';
+$labels['days'] = 'day(s)';
+$labels['weeks'] = 'week(s)';
+$labels['months'] = 'month(s)';
+$labels['years'] = 'year(s)';
+$labels['bydays'] = 'On';
+$labels['untildate'] = 'the';
+$labels['each'] = 'Each';
+$labels['onevery'] = 'On every';
+$labels['onsamedate'] = 'On the same date';
+$labels['forever'] = 'forever';
+$labels['recurrencend'] = 'until';
+$labels['untilenddate'] = 'until date';
+$labels['forntimes'] = 'for $nr time(s)';
+$labels['first'] = 'first';
+$labels['second'] = 'second';
+$labels['third'] = 'third';
+$labels['fourth'] = 'fourth';
+$labels['last'] = 'last';
+$labels['dayofmonth'] = 'Day of month';
+$labels['addrdate'] = 'Add repeat date';
+
 // itip related labels
 $labels['itipinvitation'] = 'Invitation to';
 $labels['itipupdate'] = 'Update of';

roundcubemail-plugins-kolab-3.2.tar.gz/plugins/libcalendaring/localization/es_ES.inc Added

roundcubemail-plugins-kolab-3.2.tar.gz/plugins/libcalendaring/localization/et_EE.inc Added

roundcubemail-plugins-kolab-3.2.tar.gz/plugins/libcalendaring/localization/fi_FI.inc Added

@@ -0,0 +1,34 @@
+<?php
+$labels['alarmemail'] = 'Lähetä sähköposti';
+$labels['alarmdisplay'] = 'Näytä viesti';
+$labels['alarmdisplayoption'] = 'Viesti';
+$labels['alarmemailoption'] = 'Sähköposti';
+$labels['trigger-M'] = 'minuuttia ennen';
+$labels['trigger-H'] = 'tuntia ennen';
+$labels['trigger-D'] = 'päivää ennen';
+$labels['addalarm'] = 'lisää hälytys';
+$labels['alarmtitle'] = 'Tulevat tapahtumat';
+$labels['dismissall'] = 'Hylkää kaikki';
+$labels['dismiss'] = 'Hylkää';
+$labels['snooze'] = 'Torkuta';
+$labels['repeatinmin'] = 'Toista $min minuutin päästä';
+$labels['repeatinhr'] = 'Toista 1 tunnin päästä';
+$labels['repeatinhrs'] = 'Toista $hrs tunnin päästä';
+$labels['repeattomorrow'] = 'Toista huomenna';
+$labels['repeatinweek'] = 'Toista viikon päästä';
+$labels['showmore'] = 'Näytä lisää...';
+// itip related labels
+$labels['itipcancellation'] = 'Peruttu:';
+$labels['itipaccepted'] = 'Hyväksy';
+$labels['itiptentative'] = 'Ehkä';
+$labels['itipdeclined'] = 'Kieltäydy';
+$labels['itipsubjectaccepted'] = '$name on hyväksynyt tapahtuman "$title"';
+$labels['itipsubjecttentative'] = '$name on alustavasti hyväkstynyt tapahtuman "$title"';
+$labels['itipsubjectdeclined'] = '$name on kieltäytynyt osallistumasta tapahtumaan "$title"';
+$labels['acceptinvitation'] = 'Hyväksytkö tämän kutsun?';
+$labels['youhaveaccepted'] = 'Olet hyväksynyt tämän kutsun';
+$labels['youhavetentative'] = 'Olet hyväksynyt tämän kutsun alustavasti';
+$labels['youhavedeclined'] = 'Olet kieltäytynyt tästä kutsusta';
+$labels['importtocalendar'] = 'Tallenna omaan kalenteriin';
+$labels['removefromcalendar'] = 'Poista omasta kalenterista';
+$labels['savingdata'] = 'Tallennetaan tietoja...';

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

@@ -1,7 +1,4 @@
 <?php
-
-$labels = array();
-
 $labels['alarmemail'] = 'Envoyer un email';
 $labels['alarmdisplay'] = 'Voir le message';
 $labels['alarmdisplayoption'] = 'Message';
@@ -15,7 +12,6 @@
 $labels['trigger+H'] = 'heures après';
 $labels['trigger+D'] = 'jours après';
 $labels['addalarm'] = 'ajouter alarme';
-
 $labels['alarmtitle'] = 'Evénements à venir';
 $labels['dismissall'] = 'Tout supprimer';
 $labels['dismiss'] = 'Abandonner';
@@ -25,9 +21,35 @@
 $labels['repeatinhrs'] = 'Répéter dans $hrs heures';
 $labels['repeattomorrow'] = 'Répéter demain';
 $labels['repeatinweek'] = 'Répéter dans une semaine';
-
 $labels['showmore'] = 'Afficher plus...';
 
+// recurrence related labels
+$labels['frequency'] = 'Répéter';
+$labels['never'] = 'Jamais';
+$labels['daily'] = 'Quotidienne';
+$labels['weekly'] = 'Hebdomadaire';
+$labels['monthly'] = 'Mensuelle';
+$labels['yearly'] = 'Annuelle';
+$labels['every'] = 'Tous les';
+$labels['days'] = 'jour(s)';
+$labels['weeks'] = 'semaine(s)';
+$labels['months'] = 'mois';
+$labels['years'] = 'année(s) en :';
+$labels['bydays'] = 'Le';
+$labels['untildate'] = 'le';
+$labels['each'] = 'Chaque';
+$labels['onevery'] = 'Tous les';
+$labels['onsamedate'] = 'à la même date';
+$labels['forever'] = 'Pour toujours';
+$labels['recurrencend'] = 'Jusqu\'à';
+$labels['forntimes'] = '$nr fois';
+$labels['first'] = 'premier';
+$labels['second'] = 'deuxième';
+$labels['third'] = 'troisième';
+$labels['fourth'] = 'quatrième';
+$labels['last'] = 'dernier';
+$labels['dayofmonth'] = 'Jour du mois';
+
 // itip related labels
 $labels['itipinvitation'] = 'Invitation à';
 $labels['itipupdate'] = 'Mise à jour de';
@@ -36,19 +58,15 @@
 $labels['itipaccepted'] = 'Accepter';
 $labels['itiptentative'] = 'Peut-être';
 $labels['itipdeclined'] = 'Refuser';
-
 $labels['itipsubjectaccepted'] = '"$title" a été accepté par $name';
 $labels['itipsubjecttentative'] = '"$title" a été accepté provisoirement par $name';
 $labels['itipsubjectdeclined'] = '"$title" a été refusé par $name';
-
-$labels['importtocalendar'] = 'Enregistrer mon agenda';
-$labels['removefromcalendar'] = 'Supprimer de mon agenda';
 $labels['updateattendeestatus'] = 'Modifier le statut des participants';
 $labels['acceptinvitation'] = 'Acceptez-vous cette invitation?';
 $labels['youhaveaccepted'] = 'Vous avez accepté cette invitation';
 $labels['youhavetentative'] = 'Vous avez accepté provisoirement cette invitation';
 $labels['youhavedeclined'] = 'Vous avez refusé cette invitation';
 $labels['notanattendee'] = 'Vous n\'êtes pas dans la liste des participants à cet évènement';
-
+$labels['importtocalendar'] = 'Enregistrer mon agenda';
+$labels['removefromcalendar'] = 'Supprimer de mon agenda';
 $labels['savingdata'] = 'Enregistrer...';
-

roundcubemail-plugins-kolab-3.2.tar.gz/plugins/libcalendaring/localization/hu_HU.inc Added

@@ -0,0 +1,91 @@
+<?php
+$labels['alarmemail'] = 'E-mail küldése';
+$labels['alarmdisplay'] = 'Üzenet megjelenítése';
+$labels['alarmdisplayoption'] = 'Üzenet';
+$labels['alarmemailoption'] = 'E-mail';
+$labels['alarmat'] = 'ekkor $datetime';
+$labels['trigger@'] = 'adott időpontban';
+$labels['trigger-M'] = 'perccel előtte';
+$labels['trigger-H'] = 'órával előtte';
+$labels['trigger-D'] = 'nappal előtte';
+$labels['trigger+M'] = 'perccel utána';
+$labels['trigger+H'] = 'órával utána';
+$labels['trigger+D'] = 'nappal utána';
+$labels['addalarm'] = 'emlékeztető hozzáadása';
+$labels['alarmtitle'] = 'Következő események';
+$labels['dismissall'] = 'Az összes emlékeztető mellőzése';
+$labels['dismiss'] = 'Nem emlékettet újra';
+$labels['snooze'] = 'Újra emlékeztet';
+$labels['repeatinmin'] = 'Emlékeztessen $min perc múlva';
+$labels['repeatinhr'] = 'Emlékeztessen újra 1 óra múlva';
+$labels['repeatinhrs'] = 'Emlékeztessen újra $hrs óra múlva';
+$labels['repeattomorrow'] = 'Emlékeztessen újra holnap';
+$labels['repeatinweek'] = 'Emlékeztessen újra egy hét múlva';
+$labels['showmore'] = 'Tovább...';
+
+// recurrence related labels
+$labels['frequency'] = 'Ismétlődik';
+$labels['never'] = 'soha';
+$labels['daily'] = 'naponta';
+$labels['weekly'] = 'hetente';
+$labels['monthly'] = 'havonta';
+$labels['yearly'] = 'évente';
+$labels['rdate'] = 'adott időpontokban';
+$labels['every'] = 'Minden';
+$labels['days'] = 'napon';
+$labels['weeks'] = 'héten';
+$labels['months'] = 'hónapban';
+$labels['years'] = 'évben ekkor:';
+$labels['bydays'] = 'napon';
+$labels['untildate'] = 'dátumig';
+$labels['each'] = 'napon';
+$labels['onevery'] = 'minden';
+$labels['onsamedate'] = 'Ugyanazon a dátumon';
+$labels['forever'] = 'örökké';
+$labels['recurrencend'] = 'Eddig';
+$labels['forntimes'] = '$nr alkalommal';
+$labels['first'] = 'első';
+$labels['second'] = 'második';
+$labels['third'] = 'harmadik';
+$labels['fourth'] = 'negyedik';
+$labels['last'] = 'utolsó';
+$labels['dayofmonth'] = 'hónap napja';
+$labels['addrdate'] = 'Ismétlési dátum hozzáadása';
+
+// itip related labels
+$labels['itipinvitation'] = 'Új esemény:';
+$labels['itipupdate'] = 'Módosítva:';
+$labels['itipcancellation'] = 'Lemondva:';
+$labels['itipreply'] = 'Válasz';
+$labels['itipaccepted'] = 'Elfogadás';
+$labels['itiptentative'] = 'Feltételes';
+$labels['itipdeclined'] = 'Elutasítás';
+$labels['itipcomment'] = 'Megjegyzés';
+$labels['itipeditresponse'] = 'Kérem, adjon meg egy választ';
+$labels['itipsendercomment'] = 'A feladó megjegyzése: ';
+$labels['itipobjectnotfound'] = 'A hivatkozott elem nem található az Ön fiókjában.';
+$labels['itipsubjectaccepted'] = '$title - elfogadva';
+$labels['itipsubjecttentative'] = '$title - feltételesen elfogadva';
+$labels['itipsubjectdeclined'] = '$title - elutasítva';
+$labels['itipsubjectcancel'] = '$title - lemondva';
+$labels['itipnewattendee'] = 'Válasz új résztvevőtől';
+$labels['updateattendeestatus'] = 'A résztvevő státuszának frissítése';
+$labels['acceptinvitation'] = 'Elfogadja ezt a meghívást?';
+$labels['acceptattendee'] = 'Részvétel elfogadása';
+$labels['declineattendee'] = 'Részvétel elutasítása';
+$labels['declineattendeeconfirm'] = 'Megjegyzés az elutasított részvevőnek (opcionális):';
+$labels['youhaveaccepted'] = 'Ön elfogadta ezt a meghívást';
+$labels['youhavetentative'] = 'Ön feltételesen elfogadta ezt a meghívást';
+$labels['youhavedeclined'] = 'Ön elutasította ezt a meghívást';
+$labels['youhavedelegated'] = 'Ön meghatalmazással továbbadta ezt a meghívást';
+$labels['attendeeaccepted'] = 'A résztvevő elfogadta';
+$labels['attendeetentative'] = 'A résztvevő feltételesen elfogadta';
+$labels['attendeedeclined'] = 'A résztvevő elutasította';
+$labels['attendeedelegated'] = 'A meghívott meghatalmazta részvételre: $delegatedto';
+$labels['notanattendee'] = 'Ön nem szerepel az esemény meghívottai között';
+$labels['importtocalendar'] = 'Mentés naptárba';
+$labels['removefromcalendar'] = 'Törlés a naptárból';
+$labels['updatemycopy'] = 'Naptárbejegyzés frissítése';
+$labels['deleteobjectconfirm'] = 'Biztos benne, hogy törölni szeretné ezt az elemet?';
+$labels['declinedeleteconfirm'] = 'Biztos benne, hogy törölni szeretné ezt az elutasított elemet a fiókjából?';
+$labels['savingdata'] = 'Adatok mentése...';

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

@@ -1,6 +1,54 @@
 <?php
+$labels['alarmemail'] = 'Spedisci email';
+$labels['alarmdisplay'] = 'Mostra messaggio';
+$labels['alarmdisplayoption'] = 'Messaggio';
+$labels['alarmemailoption'] = 'Email';
+$labels['trigger@'] = 'in data';
+$labels['trigger-M'] = 'miniti prima';
+$labels['trigger-H'] = 'ore prima';
+$labels['trigger-D'] = 'giorni prima';
+$labels['trigger+M'] = 'minuti dopo';
+$labels['trigger+H'] = 'ore dopo';
+$labels['trigger+D'] = 'giorni dopo';
+$labels['addalarm'] = 'aggiungi allarme';
+$labels['alarmtitle'] = 'Prossimi eventi';
+$labels['dismissall'] = 'Scarta tutti';
+$labels['dismiss'] = 'Scarta';
+$labels['snooze'] = 'Sospendi';
+$labels['repeatinmin'] = 'Ripeti tra $min minuti';
+$labels['repeatinhr'] = 'Ripeti tra 1 ora';
+$labels['repeatinhrs'] = 'Ripeti tra $hrs ore';
+$labels['repeattomorrow'] = 'Ripeti domani';
+$labels['repeatinweek'] = 'Ripeti tra una settimana';
+$labels['showmore'] = 'Mostra altro...';
 
-$labels = array();
+// recurrence related labels
+$labels['frequency'] = 'Frequenza';
+$labels['never'] = 'una volta';
+$labels['daily'] = 'quotidiana';
+$labels['weekly'] = 'settimanale';
+$labels['monthly'] = 'mensile';
+$labels['yearly'] = 'annuale';
+$labels['rdate'] = 'on dates';
+$labels['every'] = 'Ogni';
+$labels['days'] = 'giorno/i';
+$labels['weeks'] = 'settimana/e';
+$labels['months'] = 'mese/i';
+$labels['years'] = 'anno/i in:';
+$labels['bydays'] = 'Di';
+$labels['untildate'] = 'il';
+$labels['each'] = 'Nei giorni';
+$labels['onevery'] = 'Ogni';
+$labels['onsamedate'] = 'Alla stessa data';
+$labels['forever'] = 'per sempre';
+$labels['recurrencend'] = 'fino al';
+$labels['forntimes'] = 'per $nr volte';
+$labels['first'] = 'primo';
+$labels['second'] = 'secondo';
+$labels['third'] = 'terzo';
+$labels['fourth'] = 'quarto';
+$labels['last'] = 'ultimo';
+$labels['dayofmonth'] = 'Giorno del mese';
 
 // itip related labels
 $labels['itipinvitation'] = 'Invito a';
@@ -10,19 +58,24 @@
 $labels['itipaccepted'] = 'Accetta';
 $labels['itiptentative'] = 'Forse';
 $labels['itipdeclined'] = 'Rifiuta';
-
+$labels['itipobjectnotfound'] = 'L\'oggetto a cui si riferisce questo messaggio non è stato trovato nel tuo account.';
 $labels['itipsubjectaccepted'] = '"$title" è stato accettato da $name';
 $labels['itipsubjecttentative'] = '"$title" è stato accettato con riserva da $name';
 $labels['itipsubjectdeclined'] = '"$title" è stato rifiutato da $name';
-
-$labels['importtocalendar'] = 'Salva nel mio calendario';
-$labels['removefromcalendar'] = 'Rimuovi dal mio calendario';
+$labels['itipnewattendee'] = 'Questa è una risposta da un nuovo partecipante';
 $labels['updateattendeestatus'] = 'Aggiorna lo stato dei partecipanti';
 $labels['acceptinvitation'] = 'Accetti questo invito?';
 $labels['youhaveaccepted'] = 'Hai accettato questo invito';
 $labels['youhavetentative'] = 'Hai accettato con riserva questo invito';
 $labels['youhavedeclined'] = 'Hai rifiutato questo invito';
-
+$labels['youhavedelegated'] = 'Hai delegato questo invito';
+$labels['attendeeaccepted'] = 'Il partecipante ha accettato';
+$labels['attendeetentative'] = 'Il partecipante ha accettato con riserva';
+$labels['attendeedeclined'] = 'Il partecipante ha rifiutato';
+$labels['notanattendee'] = 'Non sei nell\'elenco dei partecipanti per questo oggetto';
+$labels['importtocalendar'] = 'Salva nel mio calendario';
+$labels['removefromcalendar'] = 'Rimuovi dal mio calendario';
+$labels['updatemycopy'] = 'Aggiorna la mia copia';
+$labels['deleteobjectconfirm'] = 'Vuoi davvero eliminare questo oggetto?';
+$labels['declinedeleteconfirm'] = 'Vuoi che l\'oggetto rifiutato venga eliminato anche dal tuo account?';
 $labels['savingdata'] = 'Salvataggio dati...';
-
-?>
\ No newline at end of file

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

@@ -1,7 +1,4 @@
 <?php
-
-$labels = array();
-
 $labels['alarmemail'] = 'メール送信';
 $labels['alarmdisplay'] = 'メッセージ表示';
 $labels['alarmdisplayoption'] = 'メッセージ';
@@ -15,7 +12,6 @@
 $labels['trigger+H'] = '時間後';
 $labels['trigger+D'] = '日後';
 $labels['addalarm'] = 'アラーム追加';
-
 $labels['alarmtitle'] = '今後のイベント';
 $labels['dismissall'] = '全て削除';
 $labels['dismiss'] = '削除';
@@ -25,9 +21,35 @@
 $labels['repeatinhrs'] = '$hrs で繰返し';
 $labels['repeattomorrow'] = '明日繰返し';
 $labels['repeatinweek'] = '1週間で繰返し';
-
 $labels['showmore'] = 'さらに表示…';
 
+// recurrence related labels
+$labels['frequency'] = '繰返し';
+$labels['never'] = '繰返さない';
+$labels['daily'] = '毎日';
+$labels['weekly'] = '毎週';
+$labels['monthly'] = '毎月';
+$labels['yearly'] = '毎年';
+$labels['every'] = 'いつでも';
+$labels['days'] = '日(s)';
+$labels['weeks'] = '週(s)';
+$labels['months'] = '月(s)';
+$labels['years'] = '年(s):';
+$labels['bydays'] = '上';
+$labels['untildate'] = 'その';
+$labels['each'] = 'いずれも';
+$labels['onevery'] = '各';
+$labels['onsamedate'] = 'いつか';
+$labels['forever'] = 'ずっと';
+$labels['recurrencend'] = 'まで';
+$labels['forntimes'] = '$nr まで(s)';
+$labels['first'] = '第1週';
+$labels['second'] = '第2週';
+$labels['third'] = '第3週';
+$labels['fourth'] = '第4週';
+$labels['last'] = '最終週';
+$labels['dayofmonth'] = '日';
+
 // itip related labels
 $labels['itipinvitation'] = '招待する';
 $labels['itipupdate'] = '更新';
@@ -36,18 +58,15 @@
 $labels['itipaccepted'] = '承諾';
 $labels['itiptentative'] = 'たぶん';
 $labels['itipdeclined'] = '辞退';
-
 $labels['itipsubjectaccepted'] = '$name が "$title" を承諾しました';
 $labels['itipsubjecttentative'] = '$name が "$title" を仮承諾しました';
 $labels['itipsubjectdeclined'] = '$name が "$title" を辞退しました';
-
-$labels['importtocalendar'] = 'カレンダーに保存';
-$labels['removefromcalendar'] = 'カレンダーから削除';
 $labels['updateattendeestatus'] = '参加者の状況更新';
 $labels['acceptinvitation'] = 'この招待を承諾しますか?';
 $labels['youhaveaccepted'] = 'この招待を承諾しました';
 $labels['youhavetentative'] = 'この招待を仮承諾しました。';
 $labels['youhavedeclined'] = 'この招待を辞退しました。';
 $labels['notanattendee'] = 'このイベントの出席者として一覧にありません';
-
+$labels['importtocalendar'] = 'カレンダーに保存';
+$labels['removefromcalendar'] = 'カレンダーから削除';
 $labels['savingdata'] = 'データを保存中…';

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

@@ -1,7 +1,4 @@
 <?php
-
-$labels = array();
-
 $labels['alarmemail'] = 'Verzend E-mail';
 $labels['alarmdisplay'] = 'Bericht weergeven';
 $labels['alarmdisplayoption'] = 'Bericht';
@@ -15,7 +12,6 @@
 $labels['trigger+H'] = 'uren na';
 $labels['trigger+D'] = 'dagen na';
 $labels['addalarm'] = 'alarm toevoegen';
-
 $labels['alarmtitle'] = 'Aankomende evenementen';
 $labels['dismissall'] = 'Dismiss all';
 $labels['dismiss'] = 'Dismiss';
@@ -25,9 +21,37 @@
 $labels['repeatinhrs'] = 'Herhaal over $hrs uur';
 $labels['repeattomorrow'] = 'Herhaal morgen';
 $labels['repeatinweek'] = 'Herhaal over een week';
-
 $labels['showmore'] = 'Toon meer...';
 
+// recurrence related labels
+$labels['frequency'] = 'Herhaal';
+$labels['never'] = 'nooit';
+$labels['daily'] = 'dagelijks';
+$labels['weekly'] = 'wekelijks';
+$labels['monthly'] = 'maandelijks';
+$labels['yearly'] = 'jaarlijks';
+$labels['rdate'] = 'op datums';
+$labels['every'] = 'Elke';
+$labels['days'] = 'dag(en)';
+$labels['weeks'] = 'week / weken';
+$labels['months'] = 'maand(en)';
+$labels['years'] = 'ja(a)r(en) in:';
+$labels['bydays'] = 'Op';
+$labels['untildate'] = 'de';
+$labels['each'] = 'Elke';
+$labels['onevery'] = 'Op elke';
+$labels['onsamedate'] = 'Op dezelfde datum';
+$labels['forever'] = 'oneindig';
+$labels['recurrencend'] = 'tot';
+$labels['forntimes'] = 'voor $nr keer';
+$labels['first'] = 'eerste';
+$labels['second'] = 'tweede';
+$labels['third'] = 'derde';
+$labels['fourth'] = 'vierde';
+$labels['last'] = 'laatste';
+$labels['dayofmonth'] = 'Dag van de maand';
+$labels['addrdate'] = 'Voeg herhaal datum toe';
+
 // itip related labels
 $labels['itipinvitation'] = 'Uitnodiging voor';
 $labels['itipupdate'] = 'Update van';
@@ -36,18 +60,32 @@
 $labels['itipaccepted'] = 'Accepteer';
 $labels['itiptentative'] = 'Misschien';
 $labels['itipdeclined'] = 'Afwijzen';
-
+$labels['itipcomment'] = 'Uw antwoord';
+$labels['itipeditresponse'] = 'Voeg een antwoord tekst toe';
+$labels['itipsendercomment'] = 'Opmerking van verzender:';
+$labels['itipobjectnotfound'] = 'Het object waaraan in dit bericht wordt gerefereerd is niet gevonden in uw account.';
 $labels['itipsubjectaccepted'] = '"$title" is geaccepteerd door $name';
 $labels['itipsubjecttentative'] = '"$title" has been tentatively accepted by $name';
 $labels['itipsubjectdeclined'] = '"$title" has been declined by $name';
-
-$labels['importtocalendar'] = 'Bewaar in mijn kalender';
-$labels['removefromcalendar'] = 'Verwijder van mijn kalender';
+$labels['itipsubjectcancel'] = 'Uw deelname aan "$title" is geannuleerd';
+$labels['itipnewattendee'] = 'Dit is een antwoord van een nieuwe deelnemer';
 $labels['updateattendeestatus'] = 'Update status van deelnemer';
 $labels['acceptinvitation'] = 'Accepteer je deze uitnodiging?';
+$labels['acceptattendee'] = 'Accepteer deelnemer';
+$labels['declineattendee'] = 'Afwijzen deelnemer';
+$labels['declineattendeeconfirm'] = 'Voeg een bericht toe voor de afgewezen deelnemer (optioneel):';
 $labels['youhaveaccepted'] = 'Je hebt de uitnodiging geaccepteerd';
 $labels['youhavetentative'] = 'You have tentatively accepted this invitation';
 $labels['youhavedeclined'] = 'Je hebt deze uitnodiging afgewezen';
+$labels['youhavedelegated'] = 'U heeft deze uitnodiging gedelegeerd';
+$labels['attendeeaccepted'] = 'Deelnemer heeft geaccepteerd';
+$labels['attendeetentative'] = 'Deelnemer heeft voorwaardelijk geaccepteerd';
+$labels['attendeedeclined'] = 'Deelnemer heeft afgewezen ';
+$labels['attendeedelegated'] = 'Deelnemer heeft gedelegeerd aan ';
 $labels['notanattendee'] = 'You\'re not listed as an attendee of this event';
-
+$labels['importtocalendar'] = 'Bewaar in mijn kalender';
+$labels['removefromcalendar'] = 'Verwijder van mijn kalender';
+$labels['updatemycopy'] = 'Wijzig mijn kopie';
+$labels['deleteobjectconfirm'] = 'Wilt u echt dit object verwijderen?';
+$labels['declinedeleteconfirm'] = 'Wilt u tevens deze afgewezen object verwijderen uit uw kalender?';
 $labels['savingdata'] = 'Data wordt opgeslagen...';

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

@@ -1,7 +1,4 @@
 <?php
-
-$labels = array();
-
 $labels['alarmemail'] = 'Wyślij e-mail';
 $labels['alarmdisplay'] = 'Pokaż wiadomość';
 $labels['alarmdisplayoption'] = 'Wiadomość';
@@ -15,7 +12,6 @@
 $labels['trigger+H'] = 'godzin(y) po';
 $labels['trigger+D'] = 'dni po';
 $labels['addalarm'] = 'dodaj alarm';
-
 $labels['alarmtitle'] = 'Nadchodzące zdarzenia';
 $labels['dismissall'] = 'Odrzuć wszystkie';
 $labels['dismiss'] = 'Odrzuć';
@@ -25,9 +21,36 @@
 $labels['repeatinhrs'] = 'Powtórz po $hrs godzinach';
 $labels['repeattomorrow'] = 'Powtórz jutro';
 $labels['repeatinweek'] = 'Powtórz za tydzień';
-
 $labels['showmore'] = 'Pokaż więcej...';
 
+// recurrence related labels
+$labels['frequency'] = 'Powtórz';
+$labels['never'] = 'nigdy';
+$labels['daily'] = 'codziennie';
+$labels['weekly'] = 'cotygodniowo';
+$labels['monthly'] = 'miesięcznie';
+$labels['yearly'] = 'corocznie';
+$labels['rdate'] = 'on dates';
+$labels['every'] = 'Każdy';
+$labels['days'] = 'dnia';
+$labels['weeks'] = 'tygodnia';
+$labels['months'] = 'miesiąca';
+$labels['years'] = 'roku w:';
+$labels['bydays'] = 'W';
+$labels['untildate'] = 'do';
+$labels['each'] = 'Każdy';
+$labels['onevery'] = 'W każdy';
+$labels['onsamedate'] = 'W tej samej dacie';
+$labels['forever'] = 'zawsze';
+$labels['recurrencend'] = 'dopóki';
+$labels['forntimes'] = '$nr raz(y)';
+$labels['first'] = 'pierwszy';
+$labels['second'] = 'drugi';
+$labels['third'] = 'trzeci';
+$labels['fourth'] = 'czwarty';
+$labels['last'] = 'ostatni';
+$labels['dayofmonth'] = 'Dzień miesiąca';
+
 // itip related labels
 $labels['itipinvitation'] = 'Zaproszenie do';
 $labels['itipupdate'] = 'Aktualizacja';
@@ -36,18 +59,15 @@
 $labels['itipaccepted'] = 'Akceptuj';
 $labels['itiptentative'] = 'Może';
 $labels['itipdeclined'] = 'Odrzuć';
-
 $labels['itipsubjectaccepted'] = '"$title" zostało zaakceptowane przez $name';
 $labels['itipsubjecttentative'] = '"$title" zostało warunkowo zaakceptowane przez $name';
 $labels['itipsubjectdeclined'] = '"$title" zostało odrzucone przez $name';
-
-$labels['importtocalendar'] = 'Zapisz w moim kalendarzu';
-$labels['removefromcalendar'] = 'Usuń z mojego kalendarza';
 $labels['updateattendeestatus'] = 'Zaktualizuj status uczestnika';
 $labels['acceptinvitation'] = 'Czy akceptujesz to zdarzenie?';
 $labels['youhaveaccepted'] = 'Zaakceptowałeś to zaproszenie';
 $labels['youhavetentative'] = 'Zaakceptowałeś to zdarzenie warunkowo';
 $labels['youhavedeclined'] = 'Odrzuciłeś to zdarzenie';
 $labels['notanattendee'] = 'Nie jesteś na liście uczestników tego zdarzenia';
-
+$labels['importtocalendar'] = 'Zapisz w moim kalendarzu';
+$labels['removefromcalendar'] = 'Usuń z mojego kalendarza';
 $labels['savingdata'] = 'Zapisuję dane...';

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

@@ -1,7 +1,4 @@
 <?php
-
-$labels = array();
-
 $labels['alarmemail'] = 'Enviar Email';
 $labels['alarmdisplay'] = 'Mostrar mensagem';
 $labels['alarmdisplayoption'] = 'Mensagem';
@@ -15,7 +12,6 @@
 $labels['trigger+H'] = 'horas depois';
 $labels['trigger+D'] = 'dias depois';
 $labels['addalarm'] = 'adicionar alarme';
-
 $labels['alarmtitle'] = 'Próximos eventos';
 $labels['dismissall'] = 'Dispensar tudo';
 $labels['dismiss'] = 'Dispensar';
@@ -25,9 +21,36 @@
 $labels['repeatinhrs'] = 'Repetir em $hrs horas';
 $labels['repeattomorrow'] = 'Repetir amanhã';
 $labels['repeatinweek'] = 'Repetir em uma semana';
-
 $labels['showmore'] = 'Mostrar mais...';
 
+// recurrence related labels
+$labels['frequency'] = 'Repetir';
+$labels['never'] = 'nunca';
+$labels['daily'] = 'diariamente';
+$labels['weekly'] = 'semanalmente';
+$labels['monthly'] = 'mensalmente';
+$labels['yearly'] = 'anualmente';
+$labels['rdate'] = 'on dates';
+$labels['every'] = 'À cada';
+$labels['days'] = 'dia(s)';
+$labels['weeks'] = 'semana(s)';
+$labels['months'] = 'mês(es)';
+$labels['years'] = 'ano(s) em:';
+$labels['bydays'] = 'No';
+$labels['untildate'] = 'em';
+$labels['each'] = 'Cada';
+$labels['onevery'] = 'Em cada';
+$labels['onsamedate'] = 'Na mesma data';
+$labels['forever'] = 'nunca termina';
+$labels['recurrencend'] = 'até';
+$labels['forntimes'] = 'por $nr vez(es)';
+$labels['first'] = 'primeira';
+$labels['second'] = 'segunda';
+$labels['third'] = 'terceira';
+$labels['fourth'] = 'quarta';
+$labels['last'] = 'última';
+$labels['dayofmonth'] = 'Dia do mês';
+
 // itip related labels
 $labels['itipinvitation'] = 'Convite para';
 $labels['itipupdate'] = 'Atualização de';
@@ -36,17 +59,14 @@
 $labels['itipaccepted'] = 'Aceitar';
 $labels['itiptentative'] = 'Talvez';
 $labels['itipdeclined'] = 'Rejeitar';
-
 $labels['itipsubjectaccepted'] = '"$title" foi aceito por $name';
 $labels['itipsubjecttentative'] = '"$title" foi aceito como tentativa por $name';
 $labels['itipsubjectdeclined'] = '"$title" foi recusado por $name';
-
-$labels['importtocalendar'] = 'Salvar em meu calendário';
-$labels['removefromcalendar'] = 'Remover do meu calendário';
 $labels['updateattendeestatus'] = 'Atualizar o estado dos participantes';
 $labels['acceptinvitation'] = 'Você aceita este convite?';
 $labels['youhaveaccepted'] = 'Você aceitou este convite';
 $labels['youhavetentative'] = 'Você aceitou como tentativa este convite';
 $labels['youhavedeclined'] = 'Você recusou este convite';
-
-$labels['savingdata'] = 'Salvando dados...';
\ No newline at end of file
+$labels['importtocalendar'] = 'Salvar em meu calendário';
+$labels['removefromcalendar'] = 'Remover do meu calendário';
+$labels['savingdata'] = 'Salvando dados...';

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

@@ -1,7 +1,4 @@
 <?php
-
-$labels = array();
-
 $labels['alarmemail'] = 'Послать e-mail';
 $labels['alarmdisplay'] = 'Показать сообщение';
 $labels['alarmdisplayoption'] = 'Сообщение';
@@ -15,7 +12,6 @@
 $labels['trigger+H'] = 'часов после';
 $labels['trigger+D'] = 'дней после';
 $labels['addalarm'] = 'добавить уведомление';
-
 $labels['alarmtitle'] = 'Предстоящие события';
 $labels['dismissall'] = 'Отменить все';
 $labels['dismiss'] = 'Отменить';
@@ -25,9 +21,36 @@
 $labels['repeatinhrs'] = 'Повторить через $hrs часов';
 $labels['repeattomorrow'] = 'Повторить завтра';
 $labels['repeatinweek'] = 'Повторить через неделю';
-
 $labels['showmore'] = 'Показать больше...';
 
+// recurrence related labels
+$labels['frequency'] = 'Повторить';
+$labels['never'] = 'никогда';
+$labels['daily'] = 'ежедневно';
+$labels['weekly'] = 'еженедельно';
+$labels['monthly'] = 'ежемесячно';
+$labels['yearly'] = 'ежегодно';
+$labels['rdate'] = 'on dates';
+$labels['every'] = 'Каждый(ую)';
+$labels['days'] = 'день';
+$labels['weeks'] = 'неделю';
+$labels['months'] = 'месяц';
+$labels['years'] = 'год в:';
+$labels['bydays'] = 'В';
+$labels['untildate'] = 'до';
+$labels['each'] = 'Каждого';
+$labels['onevery'] = 'В';
+$labels['onsamedate'] = 'В ту же самую дату';
+$labels['forever'] = 'всегда';
+$labels['recurrencend'] = 'Повторять';
+$labels['forntimes'] = '$nr раз(а)';
+$labels['first'] = 'первый(ую)';
+$labels['second'] = 'вторый(ую)';
+$labels['third'] = 'третий(ую)';
+$labels['fourth'] = 'четвертый(ую)';
+$labels['last'] = 'последний(ую)';
+$labels['dayofmonth'] = 'День месяца';
+
 // itip related labels
 $labels['itipinvitation'] = 'Приглашение на';
 $labels['itipupdate'] = 'Обновление';
@@ -36,18 +59,14 @@
 $labels['itipaccepted'] = 'Принять';
 $labels['itiptentative'] = 'Может быть';
 $labels['itipdeclined'] = 'Отклонить';
-
 $labels['itipsubjectaccepted'] = '"$title" принято $name';
 $labels['itipsubjecttentative'] = '"$title" предварительно принято $name';
 $labels['itipsubjectdeclined'] = '"$title" отклонено $name';
-
-$labels['importtocalendar'] = 'Сохранить в мой календарь';
-$labels['removefromcalendar'] = 'Удалить из моего календаря';
 $labels['updateattendeestatus'] = 'Обновить статус участника';
 $labels['acceptinvitation'] = 'Вы принимаете это приглашение?';
 $labels['youhaveaccepted'] = 'Вы приняли это приглашение';
 $labels['youhavetentative'] = 'Вы предварительно приняли это приглашение';
 $labels['youhavedeclined'] = 'Вы отклонили это приглашение';
-
+$labels['importtocalendar'] = 'Сохранить в мой календарь';
+$labels['removefromcalendar'] = 'Удалить из моего календаря';
 $labels['savingdata'] = 'Сохранение данных...';
-

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

@@ -1,7 +1,7 @@
 /**
  * Roundcube libcalendaring plugin styles for skin "Larry"
  *
- * Copyright (c) 2012, Kolab Systems AG <contact@kolabsys.com>
+ * Copyright (c) 2012-2014, Kolab Systems AG <contact@kolabsys.com>
  *
  * The contents are subject to the Creative Commons Attribution-ShareAlike
  * License. It is allowed to copy, distribute, transmit and to adapt the work
@@ -75,4 +75,81 @@
 
 .popup textarea.itip-comment {
 	width: 98%;
-}
\ No newline at end of file
+}
+
+.edit-alarm-item {
+	position: relative;
+	padding-right: 30px;
+	margin-bottom: 0.2em;
+}
+
+.edit-alarm-buttons {
+	position: absolute;
+	top: 1px;
+	right: 0;
+}
+
+.edit-alarm-buttons a.iconbutton {
+	display: none;
+}
+
+.edit-alarm-item .edit-alarm-buttons a.delete-alarm,
+.edit-alarm-item.first .edit-alarm-buttons a.add-alarm {
+	display: inline-block;
+}
+
+.edit-alarm-item.first .edit-alarm-buttons a.delete-alarm {
+	display: none;
+}
+
+.recurrence-form {
+	display: none;
+}
+
+.recurrence-form label.weekday,
+.recurrence-form label.monthday {
+	min-width: 3em;
+}
+
+.recurrence-form label.month {
+	min-width: 5em;
+}
+
+#edit-recurrence-yearly-bymonthblock {
+	margin-left: 7.5em;
+}
+
+#edit-recurrence-rdates {
+	display: block;
+	list-style: none;
+	margin: 0 0 0.8em 0;
+	padding: 0;
+	max-height: 300px;
+	overflow: auto;
+}
+
+#edit-recurrence-rdates li {
+	display: block;
+	position: relative;
+	width: 12em;
+	padding: 4px 0 4px 0;
+}
+
+#edit-recurrence-rdates li a.delete {
+	position: absolute;
+	top: 2px;
+	right: 0;
+	width: 20px;
+	height: 18px;
+	background-position: -7px -337px;
+}
+
+#recurrence-form-until div.line {
+	margin-left: 7.5em;
+	margin-bottom: 0.3em;
+}
+
+#recurrence-form-until div.line.first {
+	margin-top: -1.4em;
+}
+

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

@@ -182,7 +182,7 @@
         $this->assertEquals('-H', $alarm[1], "Alarm unit");
 
         $this->assertEquals('DISPLAY', $event['valarms'][0]['action'],  "Full alarm item (action)");
-        $this->assertEquals('-PT12H',   $event['valarms'][0]['trigger'], "Full alarm item (trigger)");
+        $this->assertEquals('-PT12H',  $event['valarms'][0]['trigger'], "Full alarm item (trigger)");
 
         // alarm trigger with 0 values
         $events = $ical->import_from_file(__DIR__ . '/resources/alarms.ics', 'UTF-8');
@@ -193,6 +193,7 @@
         $this->assertEquals('30', $alarm[0], "Alarm value");
         $this->assertEquals('-M', $alarm[1], "Alarm unit");
         $this->assertEquals('-30M', $alarm[2], "Alarm string");
+        $this->assertEquals('-PT30M', $alarm[3], "Unified alarm string (stripped zero-values)");
 
         $this->assertEquals('DISPLAY', $event['valarms'][0]['action'],  "First alarm action");
         $this->assertEquals('This is the first event reminder', $event['valarms'][0]['description'],  "First alarm text");
@@ -262,6 +263,10 @@
 
         $this->assertEquals("House, Street, Zip Place", $event['location'], "Decode escaped commas in location value");
         $this->assertEquals("Me, meets Them\nThem, meet Me", $event['description'], "Decode description value");
+        $this->assertEquals("Kolab, Thomas", $event['attendees'][3]['name'], "Unescaped");
+
+        $ics = $ical->export($events);
+        $this->assertContains('ATTENDEE;CN="Kolab, Thomas";PARTSTAT=', $ics, "Quoted attendee parameters");
     }
 
     /**

roundcubemail-plugins-kolab-3.2.tar.gz/plugins/libcalendaring/tests/resources/escaped.ics Changed

roundcubemail-plugins-kolab-3.2.tar.gz/plugins/libkolab/SQL/mysql.initial.sql Changed

@@ -1,7 +1,7 @@
 /**
  * libkolab database schema
  *
- * @version 1.0
+ * @version 1.1
  * @author Thomas Bruederli
  * @licence GNU AGPL
  **/
@@ -29,7 +29,7 @@
   `uid` VARCHAR(128) CHARACTER SET ascii NOT NULL,
   `created` DATETIME DEFAULT NULL,
   `changed` DATETIME DEFAULT NULL,
-  `data` TEXT NOT NULL,
+  `data` LONGTEXT NOT NULL,
   `xml` LONGBLOB NOT NULL,
   `tags` VARCHAR(255) NOT NULL,
   `words` TEXT NOT NULL,
@@ -41,7 +41,8 @@
   CONSTRAINT `fk_kolab_cache_contact_folder` FOREIGN KEY (`folder_id`)
     REFERENCES `kolab_folders`(`folder_id`) ON DELETE CASCADE ON UPDATE CASCADE,
   PRIMARY KEY(`folder_id`,`msguid`),
-  INDEX `contact_type` (`folder_id`,`type`)
+  INDEX `contact_type` (`folder_id`,`type`),
+  INDEX `contact_uid2msguid` (`folder_id`,`uid`,`msguid`)
 ) /*!40000 ENGINE=INNODB */ /*!40101 CHARACTER SET utf8 COLLATE utf8_general_ci */;
 
 DROP TABLE IF EXISTS `kolab_cache_event`;
@@ -52,7 +53,7 @@
   `uid` VARCHAR(128) CHARACTER SET ascii NOT NULL,
   `created` DATETIME DEFAULT NULL,
   `changed` DATETIME DEFAULT NULL,
-  `data` TEXT NOT NULL,
+  `data` LONGTEXT NOT NULL,
   `xml` LONGBLOB NOT NULL,
   `tags` VARCHAR(255) NOT NULL,
   `words` TEXT NOT NULL,
@@ -60,7 +61,8 @@
   `dtend` DATETIME,
   CONSTRAINT `fk_kolab_cache_event_folder` FOREIGN KEY (`folder_id`)
     REFERENCES `kolab_folders`(`folder_id`) ON DELETE CASCADE ON UPDATE CASCADE,
-  PRIMARY KEY(`folder_id`,`msguid`)
+  PRIMARY KEY(`folder_id`,`msguid`),
+  INDEX `event_uid2msguid` (`folder_id`,`uid`,`msguid`)
 ) /*!40000 ENGINE=INNODB */ /*!40101 CHARACTER SET utf8 COLLATE utf8_general_ci */;
 
 DROP TABLE IF EXISTS `kolab_cache_task`;
@@ -71,7 +73,7 @@
   `uid` VARCHAR(128) CHARACTER SET ascii NOT NULL,
   `created` DATETIME DEFAULT NULL,
   `changed` DATETIME DEFAULT NULL,
-  `data` TEXT NOT NULL,
+  `data` LONGTEXT NOT NULL,
   `xml` LONGBLOB NOT NULL,
   `tags` VARCHAR(255) NOT NULL,
   `words` TEXT NOT NULL,
@@ -79,7 +81,8 @@
   `dtend` DATETIME,
   CONSTRAINT `fk_kolab_cache_task_folder` FOREIGN KEY (`folder_id`)
     REFERENCES `kolab_folders`(`folder_id`) ON DELETE CASCADE ON UPDATE CASCADE,
-  PRIMARY KEY(`folder_id`,`msguid`)
+  PRIMARY KEY(`folder_id`,`msguid`),
+  INDEX `task_uid2msguid` (`folder_id`,`uid`,`msguid`)
 ) /*!40000 ENGINE=INNODB */ /*!40101 CHARACTER SET utf8 COLLATE utf8_general_ci */;
 
 DROP TABLE IF EXISTS `kolab_cache_journal`;
@@ -90,7 +93,7 @@
   `uid` VARCHAR(128) CHARACTER SET ascii NOT NULL,
   `created` DATETIME DEFAULT NULL,
   `changed` DATETIME DEFAULT NULL,
-  `data` TEXT NOT NULL,
+  `data` LONGTEXT NOT NULL,
   `xml` LONGBLOB NOT NULL,
   `tags` VARCHAR(255) NOT NULL,
   `words` TEXT NOT NULL,
@@ -98,7 +101,8 @@
   `dtend` DATETIME,
   CONSTRAINT `fk_kolab_cache_journal_folder` FOREIGN KEY (`folder_id`)
     REFERENCES `kolab_folders`(`folder_id`) ON DELETE CASCADE ON UPDATE CASCADE,
-  PRIMARY KEY(`folder_id`,`msguid`)
+  PRIMARY KEY(`folder_id`,`msguid`),
+  INDEX `journal_uid2msguid` (`folder_id`,`uid`,`msguid`)
 ) /*!40000 ENGINE=INNODB */ /*!40101 CHARACTER SET utf8 COLLATE utf8_general_ci */;
 
 DROP TABLE IF EXISTS `kolab_cache_note`;
@@ -109,13 +113,14 @@
   `uid` VARCHAR(128) CHARACTER SET ascii NOT NULL,
   `created` DATETIME DEFAULT NULL,
   `changed` DATETIME DEFAULT NULL,
-  `data` TEXT NOT NULL,
+  `data` LONGTEXT NOT NULL,
   `xml` LONGBLOB NOT NULL,
   `tags` VARCHAR(255) NOT NULL,
   `words` TEXT NOT NULL,
   CONSTRAINT `fk_kolab_cache_note_folder` FOREIGN KEY (`folder_id`)
     REFERENCES `kolab_folders`(`folder_id`) ON DELETE CASCADE ON UPDATE CASCADE,
-  PRIMARY KEY(`folder_id`,`msguid`)
+  PRIMARY KEY(`folder_id`,`msguid`),
+  INDEX `note_uid2msguid` (`folder_id`,`uid`,`msguid`)
 ) /*!40000 ENGINE=INNODB */ /*!40101 CHARACTER SET utf8 COLLATE utf8_general_ci */;
 
 DROP TABLE IF EXISTS `kolab_cache_file`;
@@ -126,7 +131,7 @@
   `uid` VARCHAR(128) CHARACTER SET ascii NOT NULL,
   `created` DATETIME DEFAULT NULL,
   `changed` DATETIME DEFAULT NULL,
-  `data` TEXT NOT NULL,
+  `data` LONGTEXT NOT NULL,
   `xml` LONGBLOB NOT NULL,
   `tags` VARCHAR(255) NOT NULL,
   `words` TEXT NOT NULL,
@@ -134,7 +139,8 @@
   CONSTRAINT `fk_kolab_cache_file_folder` FOREIGN KEY (`folder_id`)
     REFERENCES `kolab_folders`(`folder_id`) ON DELETE CASCADE ON UPDATE CASCADE,
   PRIMARY KEY(`folder_id`,`msguid`),
-  INDEX `folder_filename` (`folder_id`, `filename`)
+  INDEX `folder_filename` (`folder_id`, `filename`),
+  INDEX `file_uid2msguid` (`folder_id`,`uid`,`msguid`)
 ) /*!40000 ENGINE=INNODB */ /*!40101 CHARACTER SET utf8 COLLATE utf8_general_ci */;
 
 DROP TABLE IF EXISTS `kolab_cache_configuration`;
@@ -145,7 +151,7 @@
   `uid` VARCHAR(128) CHARACTER SET ascii NOT NULL,
   `created` DATETIME DEFAULT NULL,
   `changed` DATETIME DEFAULT NULL,
-  `data` TEXT NOT NULL,
+  `data` LONGTEXT NOT NULL,
   `xml` LONGBLOB NOT NULL,
   `tags` VARCHAR(255) NOT NULL,
   `words` TEXT NOT NULL,
@@ -153,7 +159,8 @@
   CONSTRAINT `fk_kolab_cache_configuration_folder` FOREIGN KEY (`folder_id`)
     REFERENCES `kolab_folders`(`folder_id`) ON DELETE CASCADE ON UPDATE CASCADE,
   PRIMARY KEY(`folder_id`,`msguid`),
-  INDEX `configuration_type` (`folder_id`,`type`)
+  INDEX `configuration_type` (`folder_id`,`type`),
+  INDEX `configuration_uid2msguid` (`folder_id`,`uid`,`msguid`)
 ) /*!40000 ENGINE=INNODB */ /*!40101 CHARACTER SET utf8 COLLATE utf8_general_ci */;
 
 DROP TABLE IF EXISTS `kolab_cache_freebusy`;
@@ -164,7 +171,7 @@
   `uid` VARCHAR(128) CHARACTER SET ascii NOT NULL,
   `created` DATETIME DEFAULT NULL,
   `changed` DATETIME DEFAULT NULL,
-  `data` TEXT NOT NULL,
+  `data` LONGTEXT NOT NULL,
   `xml` LONGBLOB NOT NULL,
   `tags` VARCHAR(255) NOT NULL,
   `words` TEXT NOT NULL,
@@ -172,7 +179,8 @@
   `dtend` DATETIME,
   CONSTRAINT `fk_kolab_cache_freebusy_folder` FOREIGN KEY (`folder_id`)
     REFERENCES `kolab_folders`(`folder_id`) ON DELETE CASCADE ON UPDATE CASCADE,
-  PRIMARY KEY(`folder_id`,`msguid`)
+  PRIMARY KEY(`folder_id`,`msguid`),
+  INDEX `freebusy_uid2msguid` (`folder_id`,`uid`,`msguid`)
 ) /*!40000 ENGINE=INNODB */ /*!40101 CHARACTER SET utf8 COLLATE utf8_general_ci */;

roundcubemail-plugins-kolab-3.2.tar.gz/plugins/libkolab/SQL/mysql/2014032700.sql Added

roundcubemail-plugins-kolab-3.2.tar.gz/plugins/libkolab/SQL/mysql/2014040900.sql Added

roundcubemail-plugins-kolab-3.2.tar.gz/plugins/libkolab/bin/modcache.sh Changed

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

@@ -16,6 +16,10 @@
 // folders in calendar view or available addressbooks
 $rcmail_config['kolab_use_subscriptions'] = false;
 
+// List any of 'personal','shared','other' namespaces to be excluded from groupware folder listing
+// example: array('other');
+$rcmail_config['kolab_skip_namespace'] = null;
+
 // Enables the use of displayname folder annotations as introduced in KEP:?
 // for displaying resource folder names (experimental!)
 $rcmail_config['kolab_custom_display_names'] = false;
@@ -30,3 +34,21 @@
 // 2 - bypass messages/indexes cache completely
 // 1 - bypass only messages, but use index cache
 $rcmail_config['kolab_messages_cache_bypass'] = 0;
+
+// LDAP directory to find avilable users for folder sharing.
+// Either contains an array with LDAP addressbook configuration or refers to entry in $config['ldap_public'].
+// If not specified, the configuraton from 'kolab_auth_addressbook' will be used.
+$rcmail_config['kolab_users_directory'] = null;
+
+// Filter to be used for resolving user folders in LDAP.
+// Defaults to the 'kolab_auth_filter' configuration option.
+$rcmail_config['kolab_users_filter'] = '(&(objectclass=kolabInetOrgPerson)(|(uid=%u)(mail=%fu)))';
+
+// Which property of the LDAP user record to use for user folder mapping in IMAP.
+// Defaults to the 'kolab_auth_login' configuration option.
+$rcmail_config['kolab_users_id_attrib'] = null;
+
+// Use these attributes when searching users in LDAP
+$rcmail_config['kolab_users_search_attrib'] = array('cn','mail','alias');
+
+

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

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

@@ -0,0 +1,236 @@
+/**
+ * Kolab groupware folders treelist widget
+ *
+ * @author Thomas Bruederli <bruederli@kolabsys.com>
+ *
+ * @licstart  The following is the entire license notice for the
+ * JavaScript code in this file.
+ *
+ * Copyright (C) 2014, Kolab Systems AG <contact@kolabsys.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * @licend  The above is the entire license notice
+ * for the JavaScript code in this file.
+ */
+
+function kolab_folderlist(node, p)
+{
+    // extends treelist.js
+    rcube_treelist_widget.call(this, node, p);
+
+    // private vars
+    var me = this;
+    var search_results;
+    var search_results_widget;
+    var search_results_container;
+    var listsearch_request;
+    var search_messagebox;
+
+    var Q = rcmail.quote_html;
+
+    // render the results for folderlist search
+    function render_search_results(results)
+    {
+        if (results.length) {
+          // create treelist widget to present the search results
+          if (!search_results_widget) {
+              var list_id = (me.container.attr('id') || p.id_prefix || '0')
+              search_results_container = $('<div class="searchresults"></div>')
+                  .html(p.search_title ? '<h2 class="boxtitle" id="st:' + list_id + '">' + p.search_title + '</h2>' : '')
+                  .insertAfter(me.container);
+
+              search_results_widget = new rcube_treelist_widget('<ul>', {
+                  id_prefix: p.id_prefix,
+                  selectable: false
+              });
+              // copy classes from main list
+              search_results_widget.container.addClass(me.container.attr('class')).attr('aria-labelledby', 'st:' + list_id);
+
+              // register click handler on search result's checkboxes to select the given item for listing
+              search_results_widget.container
+                  .appendTo(search_results_container)
+                  .on('click', 'input[type=checkbox], a.subscribed', function(e) {
+                      var li = $(this).closest('li'),
+                          id = li.attr('id').replace(new RegExp('^'+p.id_prefix), '')
+                          node = search_results_widget.get_node(id),
+                          has_children = node.children && node.children.length;
+
+                      // activate + subscribe
+                      if ($(e.target).hasClass('subscribed')) {
+                          search_results[id].subscribed = true;
+                          $(e.target).attr('aria-checked', 'true');
+                          li.children().first()
+                              .toggleClass('subscribed')
+                              .find('input[type=checkbox]').get(0).checked = true;
+                      }
+                      else if (!this.checked) {
+                          return;
+                      }
+
+                      // copy item to the main list
+                      add_result2list(id, li, true);
+
+                      if (has_children) {
+                          li.find('input[type=checkbox]').first().prop('disabled', true).get(0).checked = true;
+                          li.find('a.subscribed').first().hide();
+                      }
+                      else {
+                          li.remove();
+                      }
+
+                      // set focus to cloned checkbox
+                      if (rcube_event.is_keyboard(e)) {
+                        $(me.get_item(id, true)).find('input[type=checkbox]').first().focus();
+                      }
+                  });
+          }
+
+          // add results to list
+          for (var prop, item, i=0; i < results.length; i++) {
+              prop = results[i];
+              item = $(prop.html);
+              search_results[prop.id] = prop;
+              search_results_widget.insert({
+                  id: prop.id,
+                  classes: [ prop.group || '' ],
+                  html: item,
+                  collapsed: true
+              }, prop.parent);
+
+              // disable checkbox if item already exists in main list
+              if (me.get_node(prop.id) && !me.get_node(prop.id).virtual) {
+                  item.find('input[type=checkbox]').first().prop('disabled', true).get(0).checked = true;
+                  item.find('a.subscribed').hide();
+              }
+          }
+
+          search_results_container.show();
+        }
+    }
+
+    // helper method to (recursively) add a search result item to the main list widget
+    function add_result2list(id, li, active)
+    {
+        var node = search_results_widget.get_node(id),
+            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();
+
+        // find parent node and insert at the right place
+        if (parent_id && me.get_node(parent_id)) {
+            dom_node.children('span,a').first().html(Q(prop.editname));
+        }
+        else if (parent_id && search_results[parent_id]) {
+            // copy parent tree from search results
+            add_result2list(parent_id, $(search_results_widget.get_item(parent_id)), false);
+        }
+        else if (parent_id) {
+            // use full name for list display
+            dom_node.children('span,a').first().html(Q(prop.name));
+        }
+
+        // replace virtual node with a real one
+        if (me.get_node(id)) {
+            $(me.get_item(id, true)).children().first()
+                .replaceWith(dom_node)
+                .removeClass('virtual');
+        }
+        else {
+            // move this result item to the main list widget
+            me.insert({
+                id: id,
+                classes: [ prop.group || '' ],
+                virtual: prop.virtual,
+                html: dom_node,
+            }, parent_id, prop.group);
+        }
+
+        delete prop.html;
+        prop.active = active;
+        me.triggerEvent('insert-item', { id: id, data: prop, item: li });
+    }
+
+    // do some magic when search is performed on the widget
+    this.addEventListener('search', function(search) {
+        // hide search results
+        if (search_results_widget) {
+            search_results_container.hide();
+            search_results_widget.reset();
+        }
+        search_results = {};
+
+        if (search_messagebox)
+            rcmail.hide_message(search_messagebox);
+
+        // send search request(s) to server
+        if (search.query && search.execute) {
+            // require a minimum length for the search string
+            if (rcmail.env.autocomplete_min_length && search.query.length < rcmail.env.autocomplete_min_length) {
+                search_messagebox = rcmail.display_message(
+                    rcmail.get_label('autocompletechars').replace('$min', rcmail.env.autocomplete_min_length));
+                return;
+            }
+
+            if (listsearch_request) {
+                // ignore, let the currently running request finish
+                if (listsearch_request.query == search.query) {
+                    return;
+                }
+                else { // cancel previous search request
+                    rcmail.multi_thread_request_abort(listsearch_request.id);
+                    listsearch_request = null;
+                }
+            }
+
+            var sources = p.search_sources || [ 'folders' ];
+            var reqid = rcmail.multi_thread_http_request({
+                items: sources,
+                threads: rcmail.env.autocomplete_threads || 1,
+                action:  p.search_action || 'listsearch',
+                postdata: { action:'search', q:search.query, source:'%s' },
+                lock: rcmail.display_message(rcmail.get_label('searching'), 'loading'),
+                onresponse: render_search_results,
+                whendone: function(data){
+                  listsearch_request = null;
+                  me.triggerEvent('search-complete', data);
+                }
+            });
+
+            listsearch_request = { id:reqid, query:search.query };
+        }
+        else if (!search.query && listsearch_request) {
+            rcmail.multi_thread_request_abort(listsearch_request.id);
+            listsearch_request = null;
+        }
+    });
+
+    this.container.on('click', 'a.subscribed', function(e){
+        var li = $(this).closest('li'),
+            id = li.attr('id').replace(new RegExp('^'+p.id_prefix), ''),
+            div = li.children().first();
+
+        div.toggleClass('subscribed');
+        $(this).attr('aria-checked', div.hasClass('subscribed') ? 'true' : 'false');
+        me.triggerEvent('subscribe', { id: id, subscribed: div.hasClass('subscribed'), item: li });
+
+        e.stopPropagation();
+        return false;
+    })
+
+}
+
+// link prototype from base class
+kolab_folderlist.prototype = rcube_treelist_widget.prototype;

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

@@ -174,7 +174,7 @@
      * Convert a libkolabxml vector to a PHP array
      *
      * @param object vector Object
-     * @return array Indexed array contaning vector elements
+     * @return array Indexed array containing vector elements
      */
     public static function vector2array($vec, $max = PHP_INT_MAX)
     {
@@ -415,7 +415,7 @@
         $this->obj->setLastModified(self::get_datetime($object['changed']));
 
         // Save custom properties of the given object
-        if (isset($object['x-custom'])) {
+        if (isset($object['x-custom']) && method_exists($this->obj, 'setCustomProperties')) {
             $vcustom = new vectorcs;
             foreach ((array)$object['x-custom'] as $cp) {
                 if (is_array($cp))
@@ -423,7 +423,8 @@
             }
             $this->obj->setCustomProperties($vcustom);
         }
-        else {  // load custom properties from XML for caching (#2238)
+        // load custom properties from XML for caching (#2238) if method exists (#3125)
+        else if (method_exists($this->obj, 'customProperties')) {
             $object['x-custom'] = array();
             $vcustom = $this->obj->customProperties();
             for ($i=0; $i < $vcustom->size(); $i++) {
@@ -456,10 +457,12 @@
         }
 
         // read custom properties
-        $vcustom = $this->obj->customProperties();
-        for ($i=0; $i < $vcustom->size(); $i++) {
-            $cp = $vcustom->get($i);
-            $object['x-custom'][] = array($cp->identifier, $cp->value);
+        if (method_exists($this->obj, 'customProperties')) {
+            $vcustom = $this->obj->customProperties();
+            for ($i=0; $i < $vcustom->size(); $i++) {
+                $cp = $vcustom->get($i);
+                $object['x-custom'][] = array($cp->identifier, $cp->value);
+            }
         }
 
         // merge with additional data, e.g. attachments from the message
@@ -502,6 +505,11 @@
         return array();
     }
 
+    /**
+     * Utility function to extract object attachment data
+     *
+     * @param array Hash array reference to append attachment data into
+     */
     protected function get_attachments(&$object)
     {
         // handle attachments
@@ -520,13 +528,19 @@
                     'content'  => $content,
                 );
             }
-            else if (substr($attach->uri(), 0, 4) == 'http') {
+            else if (in_array(substr($attach->uri(), 0, 4), array('http','imap'))) {
                 $object['links'][] = $attach->uri();
             }
         }
     }
 
-    protected function set_attachments($object)
+    /**
+     * Utility function to set attachment properties to the kolabformat object
+     *
+     * @param array  Object data as hash array
+     * @param boolean True to always overwrite attachment information
+     */
+    protected function set_attachments($object, $write = true)
     {
         // save attachments
         $vattach = new vectorattachment;
@@ -537,16 +551,17 @@
             $attach->setLabel((string)$attr['name']);
             $attach->setUri('cid:' . $cid, $attr['mimetype'] ?: 'application/octet-stream');
             if ($attach->isValid()) {
-              $vattach->push($attach);
+                $vattach->push($attach);
+                $write = true;
             }
             else {
-              rcube::raise_error(array(
-                  'code' => 660,
-                  'type' => 'php',
-                  'file' => __FILE__,
-                  'line' => __LINE__,
-                  'message' => "Invalid attributes for attachment $cid: " . var_export($attr, true),
-              ), true);
+                rcube::raise_error(array(
+                    'code' => 660,
+                    'type' => 'php',
+                    'file' => __FILE__,
+                    'line' => __LINE__,
+                    'message' => "Invalid attributes for attachment $cid: " . var_export($attr, true),
+                ), true);
             }
         }
 
@@ -554,8 +569,11 @@
             $attach = new Attachment;
             $attach->setUri($link, 'unknown');
             $vattach->push($attach);
+            $write = true;
         }
 
-        $this->obj->setAttachments($vattach);
+        if ($write) {
+            $this->obj->setAttachments($vattach);
+        }
     }
 }

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

@@ -24,16 +24,18 @@
 
 class kolab_format_configuration extends kolab_format
 {
-    public $CTYPE = 'application/x-vnd.kolab.configuration';
+    public $CTYPE   = 'application/x-vnd.kolab.configuration';
     public $CTYPEv2 = 'application/x-vnd.kolab.configuration';
 
-    protected $objclass = 'Configuration';
-    protected $read_func = 'readConfiguration';
+    protected $objclass   = 'Configuration';
+    protected $read_func  = 'readConfiguration';
     protected $write_func = 'writeConfiguration';
 
     private $type_map = array(
+        'category'   => Configuration::TypeCategoryColor,
         'dictionary' => Configuration::TypeDictionary,
-        'category' => Configuration::TypeCategoryColor,
+        'relation'   => Configuration::TypeRelation,
+        'snippet'    => Configuration::TypeSnippet,
     );
 
 
@@ -60,6 +62,48 @@
             $categories = new vectorcategorycolor;
             $this->obj = new Configuration($categories);
             break;
+
+        case 'relation':
+            $relation = new Relation($object['name'], $object['category']);
+
+            if ($object['color']) {
+                $relation->setColor($object['color']);
+            }
+            if ($object['parent']) {
+                $relation->setParent($object['parent']);
+            }
+            if ($object['iconName']) {
+                $relation->setIconName($object['iconName']);
+            }
+            if ($object['priority'] > 0) {
+                $relation->setPriority((int) $object['priority']);
+            }
+            if (!empty($object['members'])) {
+                $relation->setMembers(self::array2vector($object['members']));
+            }
+
+            $this->obj = new Configuration($relation);
+            break;
+
+        case 'snippet':
+            $collection = new SnippetCollection($object['name']);
+            $snippets   = new vectorsnippets;
+
+            foreach ((array) $object['snippets'] as $item) {
+                $snippet = new snippet($item['name'], $item['text']);
+                $snippet->setTextType(strtolower($item['type']) == 'html' ? Snippet::HTML : Snippet::Plain);
+                if ($item['shortcut']) {
+                    $snippet->setShortCut($item['shortcut']);
+                }
+
+                $snippets->push($snippet);
+            }
+
+            $collection->setSnippets($snippets);
+
+            $this->obj = new Configuration($collection);
+            break;
+
         default:
             return false;
         }
@@ -90,8 +134,9 @@
     public function to_array($data = array())
     {
         // return cached result
-        if (!empty($this->data))
+        if (!empty($this->data)) {
             return $this->data;
+        }
 
         // read common object props into local data object
         $object = parent::to_array($data);
@@ -111,11 +156,44 @@
         case 'category':
             // TODO: implement this
             break;
+
+        case 'relation':
+            $relation = $this->obj->relation();
+
+            $object['name']     = $relation->name();
+            $object['category'] = $relation->type();
+            $object['color']    = $relation->color();
+            $object['parent']   = $relation->parent();
+            $object['iconName'] = $relation->iconName();
+            $object['priority'] = $relation->priority();
+            $object['members']  = self::vector2array($relation->members());
+
+            break;
+
+        case 'snippet':
+            $collection = $this->obj->snippets();
+
+            $object['name']     = $collection->name();
+            $object['snippets'] = array();
+
+            $snippets = $collection->snippets();
+            for ($i=0; $i < $snippets->size(); $i++) {
+                $snippet = $snippets->get($i);
+                $object['snippets'][] = array(
+                    'name'     => $snippet->name(),
+                    'text'     => $snippet->text(),
+                    'type'     => $snippet->textType() == Snippet::HTML ? 'html' : 'plain',
+                    'shortcut' => $snippet->shortCut(),
+                );
+            }
+
+            break;
         }
 
         // adjust content-type string
-        if ($object['type'])
+        if ($object['type']) {
             $this->CTYPE = $this->CTYPEv2 = 'application/x-vnd.kolab.configuration.' . $object['type'];
+        }
 
         $this->data = $object;
         return $this->data;
@@ -130,10 +208,10 @@
     {
         $tags = array();
 
-        if ($this->data['type'] == 'dictionary')
+        if ($this->data['type'] == 'dictionary') {
             $tags = array($this->data['language']);
+        }
 
         return $tags;
     }
-
 }

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

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

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

@@ -24,9 +24,11 @@
 
 class kolab_format_note extends kolab_format
 {
-    public $CTYPE = 'application/x-vnd.kolab.note';
+    public $CTYPE = 'application/vnd.kolab+xml';
     public $CTYPEv2 = 'application/x-vnd.kolab.note';
 
+    public static $fulltext_cols = array('title', 'description', 'categories');
+
     protected $objclass = 'Note';
     protected $read_func = 'readNote';
     protected $write_func = 'writeNote';
@@ -107,11 +109,45 @@
     {
         $tags = array();
 
-        foreach ((array) $this->data['categories'] as $cat) {
+        foreach ((array)$this->data['categories'] as $cat) {
             $tags[] = rcube_utils::normalize_string($cat);
         }
 
+        // add tag for message references
+        foreach ((array)$this->data['links'] as $link) {
+            $url = parse_url($link);
+            if ($url['scheme'] == 'imap') {
+                parse_str($url['query'], $param);
+                $tags[] = 'ref:' . trim($param['message-id'] ?: urldecode($url['fragment']), '<> ');
+            }
+        }
+
         return $tags;
     }
 
+    /**
+     * Callback for kolab_storage_cache to get words to index for fulltext search
+     *
+     * @return array List of words to save in cache
+     */
+    public function get_words()
+    {
+        $data = '';
+        foreach (self::$fulltext_cols as $col) {
+            // convert HTML content to plain text
+            if ($col == 'description' && preg_match('/<(html|body)(\s[a-z]|>)/', $this->data[$col], $m) && strpos($this->data[$col], '</'.$m[1].'>')) {
+                $converter = new rcube_html2text($this->data[$col], false, false, 0);
+                $val = $converter->get_text();
+            }
+            else {
+                $val = is_array($this->data[$col]) ? join(' ', $this->data[$col]) : $this->data[$col];
+            }
+
+            if (strlen($val))
+                $data .= $val . ' ';
+        }
+
+        return array_filter(array_unique(rcube_utils::normalize_string($data, true)));
+    }
+
 }

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

@@ -44,15 +44,13 @@
         $this->obj->setPercentComplete(intval($object['complete']));
 
         $status = kolabformat::StatusUndefined;
-        if ($object['complete'] == 100)
+        if ($object['complete'] == 100 && !array_key_exists('status', $object))
             $status = kolabformat::StatusCompleted;
         else if ($object['status'] && array_key_exists($object['status'], $this->status_map))
             $status = $this->status_map[$object['status']];
         $this->obj->setStatus($status);
 
-        if (isset($object['start']))
-            $this->obj->setStart(self::get_datetime($object['start'], null, $object['start']->_dateonly));
-
+        $this->obj->setStart(self::get_datetime($object['start'], null, $object['start']->_dateonly));
         $this->obj->setDue(self::get_datetime($object['due'], null, $object['due']->_dateonly));
 
         $related = new vectors;
@@ -115,13 +113,13 @@
     {
         $tags = array();
 
-        if ($this->data['status'] == 'COMPLETED' || $this->data['complete'] == 100)
+        if ($this->data['status'] == 'COMPLETED' || ($this->data['complete'] == 100 && empty($this->data['status'])))
             $tags[] = 'x-complete';
 
         if ($this->data['priority'] == 1)
             $tags[] = 'x-flagged';
 
-        if (!empty($this->data['alarms']))
+        if (!empty($this->data['valarms']))
             $tags[] = 'x-has-alarms';
 
         if ($this->data['parent_id'])

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

@@ -7,7 +7,7 @@
  * @author Thomas Bruederli <bruederli@kolabsys.com>
  * @author Aleksander Machniak <machniak@kolabsys.com>
  *
- * Copyright (C) 2012, Kolab Systems AG <contact@kolabsys.com>
+ * Copyright (C) 2012-2014, Kolab Systems AG <contact@kolabsys.com>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as
@@ -37,12 +37,16 @@
 
     public static $version = '3.0';
     public static $last_error;
+    public static $encode_ids = false;
 
     private static $ready = false;
+    private static $with_tempsubs = true;
     private static $subscriptions;
+    private static $typedata = array();
     private static $states;
     private static $config;
     private static $imap;
+    private static $ldap;
 
     // Default folder names
     private static $default_folders = array(
@@ -83,7 +87,6 @@
                 'skip_deleted' => true,
                 'threading' => false,
             ));
-            self::$imap->set_pagesize(9999);
         }
         else if (!class_exists('kolabformat')) {
             rcube::raise_error(array(
@@ -101,6 +104,41 @@
         return self::$ready;
     }
 
+    /**
+     * Initializes LDAP object to resolve Kolab users
+     */
+    public static function ldap()
+    {
+        if (self::$ldap) {
+            return self::$ldap;
+        }
+
+        self::setup();
+
+        $config = self::$config->get('kolab_users_directory', self::$config->get('kolab_auth_addressbook'));
+
+        if (!is_array($config)) {
+            $ldap_config = (array)self::$config->get('ldap_public');
+            $config = $ldap_config[$config];
+        }
+
+        if (empty($config)) {
+            return null;
+        }
+
+        // overwrite filter option
+        if ($filter = self::$config->get('kolab_users_filter')) {
+            self::$config->set('kolab_auth_filter', $filter);
+        }
+
+        // re-use the LDAP wrapper class from kolab_auth plugin
+        require_once rtrim(RCUBE_PLUGINS_DIR, '/') . '/kolab_auth/kolab_auth_ldap.php';
+
+        self::$ldap = new kolab_auth_ldap($config);
+
+        return self::$ldap;
+    }
+
 
     /**
      * Get a list of storage folders for the given data type
@@ -178,6 +216,33 @@
         return false;
     }
 
+    /**
+     * Execute cross-folder searches with the given query.
+     *
+     * @param array  Pseudo-SQL query as list of filter parameter triplets
+     * @param string Object type (contact,event,task,journal,file,note,configuration)
+     * @return array List of Kolab data objects (each represented as hash array)
+     * @see kolab_storage_format::select()
+     */
+    public static function select($query, $type)
+    {
+        self::setup();
+        $folder = null;
+        $result = array();
+
+        foreach ((array)self::list_folders('', '*', $type) as $foldername) {
+            if (!$folder)
+                $folder = new kolab_storage_folder($foldername);
+            else
+                $folder->set_folder($foldername);
+
+            foreach ($folder->select($query, '*') as $object) {
+                $result[] = $object;
+            }
+        }
+
+        return $result;
+    }
 
     /**
      *
@@ -200,13 +265,57 @@
     /**
      * Creates folder ID from folder name
      *
-     * @param string $folder Folder name (UTF7-IMAP)
-     *
+     * @param string  $folder Folder name (UTF7-IMAP)
+     * @param boolean $enc    Use lossless encoding
      * @return string Folder ID string
      */
-    public static function folder_id($folder)
+    public static function folder_id($folder, $enc = null)
+    {
+        return $enc == true || ($enc === null && self::$encode_ids) ?
+            self::id_encode($folder) :
+            asciiwords(strtr($folder, '/.-', '___'));
+    }
+
+
+    /**
+     * Encode the given ID to a safe ascii representation
+     *
+     * @param string $id Arbitrary identifier string
+     *
+     * @return string Ascii representation
+     */
+    public static function id_encode($id)
+    {
+        return rtrim(strtr(base64_encode($id), '+/', '-_'), '=');
+    }
+
+    /**
+     * Convert the given identifier back to it's raw value
+     *
+     * @param string $id Ascii identifier
+     * @return string Raw identifier string
+     */
+    public static function id_decode($id)
+    {
+      return base64_decode(str_pad(strtr($id, '-_', '+/'), strlen($id) % 4, '=', STR_PAD_RIGHT));
+    }
+
+
+    /**
+     * Return the (first) path of the requested IMAP namespace
+     *
+     * @param string  Namespace name (personal, shared, other)
+     * @return string IMAP root path for that namespace
+     */
+    public static function namespace_root($name)
     {
-        return asciiwords(strtr($folder, '/.-', '___'));
+        foreach ((array)self::$imap->get_namespace($name) as $paths) {
+            if (strlen($paths[0]) > 1) {
+                return $paths[0];
+            }
+        }
+
+        return '';
     }
 
 
@@ -437,7 +546,7 @@
                         $folder = substr($folder, $pos+1);
                     }
                     else {
-                        $prefix = $folder;
+                        $prefix = '('.$folder.')';
                         $folder = '';
                     }
 
@@ -639,18 +748,29 @@
         if (!$filter) {
             // Get ALL folders list, standard way
             if ($subscribed) {
-                return self::$imap->list_folders_subscribed($root, $mbox);
+                $folders = self::$imap->list_folders_subscribed($root, $mbox);
+                // add temporarily subscribed folders
+                if (self::$with_tempsubs && is_array($_SESSION['kolab_subscribed_folders'])) {
+                    $folders = array_unique(array_merge($folders, $_SESSION['kolab_subscribed_folders']));
+                }
             }
             else {
-                return self::$imap->list_folders($root, $mbox);
+                $folders = self::_imap_list_folders($root, $mbox);
             }
-        }
 
+            return $folders;
+        }
         $prefix = $root . $mbox;
         $regexp = '/^' . preg_quote($filter, '/') . '(\..+)?$/';
 
-        // get folders types
-        $folderdata = self::folders_typedata($prefix);
+        // get folders types for all folders
+        if (!$subscribed || $prefix == '*' || !self::$config->get('kolab_skip_namespace')) {
+            $folderdata = self::folders_typedata($prefix);
+        }
+        else {
+            // fetch folder types for the effective list of (subscribed) folders when post-filtering
+            $folderdata = array();
+        }
 
         if (!is_array($folderdata)) {
             return array();
@@ -670,9 +790,14 @@
         // Get folders list
         if ($subscribed) {
             $folders = self::$imap->list_folders_subscribed($root, $mbox);
+
+            // add temporarily subscribed folders
+            if (self::$with_tempsubs && is_array($_SESSION['kolab_subscribed_folders'])) {
+                $folders = array_unique(array_merge($folders, $_SESSION['kolab_subscribed_folders']));
+            }
         }
         else {
-            $folders = self::$imap->list_folders($root, $mbox);
+            $folders = self::_imap_list_folders($root, $mbox);
         }
 
         // In case of an error, return empty list (?)
@@ -682,6 +807,11 @@
 
         // Filter folders list
         foreach ($folders as $idx => $folder) {
+            // lookup folder type
+            if (!array_key_exists($folder, $folderdata)) {
+                $folderdata[$folder] = self::folder_type($folder);
+            }
+
             $type = $folderdata[$folder];
 
             if ($filter == 'mail' && empty($type)) {
@@ -695,6 +825,71 @@
         return $folders;
     }
 
+    /**
+     * Wrapper for rcube_imap::list_folders() with optional post-filtering
+     */
+    protected static function _imap_list_folders($root, $mbox)
+    {
+        $postfilter = null;
+
+        // compose a post-filter expression for the excluded namespaces
+        if ($root . $mbox == '*' && ($skip_ns = self::$config->get('kolab_skip_namespace'))) {
+            $excludes = array();
+            foreach ((array)$skip_ns as $ns) {
+                if ($ns_root = self::namespace_root($ns)) {
+                    $excludes[] = $ns_root;
+                }
+            }
+
+            if (count($excludes)) {
+                $postfilter = '!^(' . join(')|(', array_map('preg_quote', $excludes)) . ')!';
+            }
+        }
+
+        // use normal LIST command to return all folders, it's fast enough
+        $folders = self::$imap->list_folders($root, $mbox, null, null, !empty($postfilter));
+
+        if (!empty($postfilter)) {
+            $folders = array_filter($folders, function($folder) use ($postfilter) { return !preg_match($postfilter, $folder); });
+            $folders = self::$imap->sort_folder_list($folders);
+        }
+
+        return $folders;
+    }
+
+
+    /**
+     * Search for shared or otherwise not listed groupware folders the user has access
+     *
+     * @param string Folder type of folders to search for
+     * @param string Search string
+     * @param array  Namespace(s) to exclude results from
+     *
+     * @return array List of matching kolab_storage_folder objects
+     */
+    public static function search_folders($type, $query, $exclude_ns = array())
+    {
+        if (!self::setup()) {
+            return array();
+        }
+
+        $folders = array();
+
+        // find unsubscribed IMAP folders of the given type
+        foreach ((array)self::list_folders('', '*', $type, false, $folderdata) as $foldername) {
+            // FIXME: only consider the last part of the folder path for searching?
+            $realname = strtolower(rcube_charset::convert($foldername, 'UTF7-IMAP'));
+            if (strpos($realname, $query) !== false &&
+                !self::folder_is_subscribed($foldername, true) &&
+                !in_array(self::$imap->folder_namespace($foldername), (array)$exclude_ns)
+              ) {
+                $folders[] = new kolab_storage_folder($foldername, $folderdata[$foldername]);
+            }
+        }
+
+        return $folders;
+    }
+
 
     /**
      * Sort the given list of kolab folders by namespace/name
@@ -716,7 +911,7 @@
 
         // $folders is a result of get_folders() we can assume folders were already sorted
         foreach (array_keys($nsnames) as $ns) {
-            // asort($nsnames[$ns], SORT_LOCALE_STRING);
+            asort($nsnames[$ns], SORT_LOCALE_STRING);
             foreach (array_keys($nsnames[$ns]) as $utf7name) {
                 $out[] = $folders[$utf7name];
             }
@@ -730,43 +925,65 @@
      * Check the folder tree and add the missing parents as virtual folders
      *
      * @param array $folders Folders list
+     * @param object $tree   Reference to the root node of the folder tree
      *
-     * @return array Folders list
+     * @return array Flat folders list
      */
-    public static function folder_hierarchy($folders)
+    public static function folder_hierarchy($folders, &$tree = null)
     {
         $_folders = array();
-        $existing = array_map(function($folder){ return $folder->get_name(); }, $folders);
-        $delim    = rcube::get_instance()->get_storage()->get_hierarchy_delimiter();
+        $delim    = self::$imap->get_hierarchy_delimiter();
+        $other_ns = rtrim(self::namespace_root('other'), $delim);
+        $tree     = new kolab_storage_folder_virtual('', '<root>', '');  // create tree root
+        $refs     = array('' => $tree);
 
         foreach ($folders as $idx => $folder) {
             $path = explode($delim, $folder->name);
             array_pop($path);
+            $folder->parent = join($delim, $path);
+            $folder->children = array();  // reset list
 
             // skip top folders or ones with a custom displayname
-            if (count($path) <= 1 || kolab_storage::custom_displayname($folder->name)) {
+            if (count($path) < 1 || kolab_storage::custom_displayname($folder->name)) {
+                $tree->children[] = $folder;
             }
             else {
                 $parents = array();
+                $depth = $folder->get_namespace() == 'personal' ? 1 : 2;
 
-                while (count($path) > 1 && ($parent = join($delim, $path))) {
-                    $name = kolab_storage::object_name($parent, $folder->get_namespace());
-                    if (!in_array($name, $existing)) {
-                        $parents[$parent] = new virtual_kolab_storage_folder($parent, $name, $folder->get_namespace());
-                        $existing[] = $name;
-                    }
-
+                while (count($path) >= $depth && ($parent = join($delim, $path))) {
                     array_pop($path);
+                    $parent_parent = join($delim, $path);
+                    if (!$refs[$parent]) {
+                        if ($folder->type && self::folder_type($parent) == $folder->type) {
+                            $refs[$parent] = new kolab_storage_folder($parent, $folder->type);
+                            $refs[$parent]->parent = $parent_parent;
+                        }
+                        else if ($parent_parent == $other_ns) {
+                            $refs[$parent] = new kolab_storage_folder_user($parent, $parent_parent);
+                        }
+                        else {
+                            $name = kolab_storage::object_name($parent, $folder->get_namespace());
+                            $refs[$parent] = new kolab_storage_folder_virtual($parent, $name, $folder->get_namespace(), $parent_parent);
+                        }
+                        $parents[] = $refs[$parent];
+                    }
                 }
 
                 if (!empty($parents)) {
-                    $parents = array_reverse(array_values($parents));
+                    $parents = array_reverse($parents);
                     foreach ($parents as $parent) {
+                        $parent_node = $refs[$parent->parent] ?: $tree;
+                        $parent_node->children[] = $parent;
                         $_folders[] = $parent;
                     }
                 }
+
+                $parent_node = $refs[$folder->parent] ?: $tree;
+                $parent_node->children[] = $folder;
             }
 
+            $refs[$folder->name] = $folder;
             $_folders[] = $folder;
             unset($folders[$idx]);
         }
@@ -788,13 +1005,56 @@
             return false;
         }
 
-        $folderdata = self::$imap->get_metadata($prefix, array(self::CTYPE_KEY, self::CTYPE_KEY_PRIVATE));
+        // return cached result
+        if (is_array(self::$typedata[$prefix])) {
+            return self::$typedata[$prefix];
+        }
+
+        $type_keys = array(self::CTYPE_KEY, self::CTYPE_KEY_PRIVATE);
+
+        // fetch metadata from *some* folders only
+        if (($prefix == '*' || $prefix == '') && ($skip_ns = self::$config->get('kolab_skip_namespace'))) {
+            $delimiter = self::$imap->get_hierarchy_delimiter();
+            $folderdata = $blacklist = array();
+            foreach ((array)$skip_ns as $ns) {
+                if ($ns_root = rtrim(self::namespace_root($ns), $delimiter)) {
+                    $blacklist[] = $ns_root;
+                }
+            }
+            foreach (array('personal','other','shared') as $ns) {
+                if (!in_array($ns, (array)$skip_ns)) {
+                    $ns_root = rtrim(self::namespace_root($ns), $delimiter);
+
+                    // list top-level folders and their childs one by one
+                    // GETMETADATA "%" doesn't list shared or other namespace folders but "*" would
+                    if ($ns_root == '') {
+                        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)) {
+                                    $folderdata += $data;
+                                }
+                            }
+                        }
+                    }
+                    else if ($data = self::$imap->get_metadata($ns_root.$delimiter.'*', $type_keys)) {
+                        $folderdata += $data;
+                    }
+                }
+            }
+        }
+        else {
+            $folderdata = self::$imap->get_metadata($prefix, $type_keys);
+        }
 
         if (!is_array($folderdata)) {
             return false;
         }
 
-        return array_map(array('kolab_storage', 'folder_select_metadata'), $folderdata);
+        // keep list in memory
+        self::$typedata[$prefix] = array_map(array('kolab_storage', 'folder_select_metadata'), $folderdata);
+
+        return self::$typedata[$prefix];
     }
 
 
@@ -825,6 +1085,11 @@
     {
         self::setup();
 
+        // return in-memory cached result
+        if (is_array(self::$typedata['*']) && array_key_exists($folder, self::$typedata['*'])) {
+            return self::$typedata['*'][$folder];
+        }
+
         $metadata = self::$imap->get_metadata($folder, array(self::CTYPE_KEY, self::CTYPE_KEY_PRIVATE));
 
         if (!is_array($metadata)) {
@@ -866,17 +1131,21 @@
      * Check subscription status of this folder
      *
      * @param string $folder Folder name
+     * @param boolean $temp  Include temporary/session subscriptions
      *
      * @return boolean True if subscribed, false if not
      */
-    public static function folder_is_subscribed($folder)
+    public static function folder_is_subscribed($folder, $temp = false)
     {
         if (self::$subscriptions === null) {
             self::setup();
+            self::$with_tempsubs = false;
             self::$subscriptions = self::$imap->list_folders_subscribed();
+            self::$with_tempsubs = true;
         }
 
-        return in_array($folder, self::$subscriptions);
+        return in_array($folder, self::$subscriptions) ||
+            ($temp && in_array($folder, (array)$_SESSION['kolab_subscribed_folders']));
     }
 
 
@@ -884,14 +1153,25 @@
      * Change subscription status of this folder
      *
      * @param string $folder Folder name
+     * @param boolean $temp  Only subscribe temporarily for the current session
      *
      * @return True on success, false on error
      */
-    public static function folder_subscribe($folder)
+    public static function folder_subscribe($folder, $temp = false)
     {
         self::setup();
 
-        if (self::$imap->subscribe($folder)) {
+        // temporary/session subscription
+        if ($temp) {
+            if (self::folder_is_subscribed($folder)) {
+                return true;
+            }
+            else if (!is_array($_SESSION['kolab_subscribed_folders']) || !in_array($folder, $_SESSION['kolab_subscribed_folders'])) {
+                $_SESSION['kolab_subscribed_folders'][] = $folder;
+                return true;
+            }
+        }
+        else if (self::$imap->subscribe($folder)) {
             self::$subscriptions === null;
             return true;
         }
@@ -904,14 +1184,22 @@
      * Change subscription status of this folder
      *
      * @param string $folder Folder name
+     * @param boolean $temp  Only remove temporary subscription
      *
      * @return True on success, false on error
      */
-    public static function folder_unsubscribe($folder)
+    public static function folder_unsubscribe($folder, $temp = false)
     {
         self::setup();
 
-        if (self::$imap->unsubscribe($folder)) {
+        // temporary/session subscription
+        if ($temp) {
+            if (is_array($_SESSION['kolab_subscribed_folders']) && ($i = array_search($folder, $_SESSION['kolab_subscribed_folders'])) !== false) {
+                unset($_SESSION['kolab_subscribed_folders'][$i]);
+            }
+            return true;
+        }
+        else if (self::$imap->unsubscribe($folder)) {
             self::$subscriptions === null;
             return true;
         }
@@ -944,6 +1232,8 @@
      */
     public static function folder_activate($folder)
     {
+        // activation implies temporary subscription
+        self::folder_subscribe($folder, true);
         return self::set_state($folder, true);
     }
 
@@ -957,6 +1247,9 @@
      */
     public static function folder_deactivate($folder)
     {
+        // remove from temp subscriptions, really?
+        self::folder_unsubscribe($folder, true);
+
         return self::set_state($folder, false);
     }
 
@@ -980,7 +1273,9 @@
         else {
             self::setup();
             if (self::$subscriptions === null) {
+                self::$with_tempsubs = false;
                 self::$subscriptions = self::$imap->list_folders_subscribed();
+                self::$with_tempsubs = true;
             }
             self::$states = self::$subscriptions;
             $folders = implode(self::$states, '**');
@@ -1037,7 +1332,7 @@
 
         // check if we have any folder in personal namespace
         // folder(s) may exist but not subscribed
-        foreach ($folders as $f => $data) {
+        foreach ((array)$folders as $f => $data) {
             if (strpos($data[self::CTYPE_KEY_PRIVATE], $type) === 0) {
                 $folder = $f;
                 break;
@@ -1115,34 +1410,127 @@
         }
     }
 
-}
 
-/**
- * Helper class that represents a virtual IMAP folder
- * with a subset of the kolab_storage_folder API.
- */
-class virtual_kolab_storage_folder
-{
-    public $id;
-    public $name;
-    public $namespace;
-    public $virtual = true;
+    /**
+     *
+     * @param mixed   $query    Search value (or array of field => value pairs)
+     * @param int     $mode     Matching mode: 0 - partial (*abc*), 1 - strict (=), 2 - prefix (abc*)
+     * @param array   $required List of fields that shall ot be empty
+     * @param int     $limit    Maximum number of records
+     * @param int     $count    Returns the number of records found
+     *
+     * @return array List or false on error
+     */
+    public static function search_users($query, $mode = 1, $required = array(), $limit = 0, &$count = 0)
+    {
+        // requires a working LDAP setup
+        if (!self::ldap()) {
+            return array();
+        }
+
+        // search users using the configured attributes
+        $results = self::$ldap->dosearch(self::$config->get('kolab_users_search_attrib', array('cn','mail','alias')), $query, $mode, $required, $limit, $count);
+
+        // exclude myself
+        if ($_SESSION['kolab_dn']) {
+            unset($results[$_SESSION['kolab_dn']]);
+        }
 
-    public function __construct($realname, $name, $ns)
+        // resolve to IMAP folder name
+        $root = self::namespace_root('other');
+        $user_attrib = self::$config->get('kolab_users_id_attrib', self::$config->get('kolab_auth_login', 'mail'));
+
+        array_walk($results, function(&$user, $dn) use ($root, $user_attrib) {
+            list($localpart, $domain) = explode('@', $user[$user_attrib]);
+            $user['kolabtargetfolder'] = $root . $localpart;
+        });
+
+        return $results;
+    }
+
+
+    /**
+     * Returns a list of IMAP folders shared by the given user
+     *
+     * @param array   User entry from LDAP
+     * @param string  Data type to list folders for (contact,event,task,journal,file,note,mail,configuration)
+     * @param boolean Return subscribed folders only (null to use configured subscription mode)
+     * @param array   Will be filled with folder-types data
+     *
+     * @return array List of folders
+     */
+    public static function list_user_folders($user, $type, $subscribed = null, &$folderdata = array())
     {
-        $this->id        = kolab_storage::folder_id($realname);
-        $this->name      = $name;
-        $this->namespace = $ns;
+        self::setup();
+
+        $folders = array();
+
+        // use localpart of user attribute as root for folder listing
+        $user_attrib = self::$config->get('kolab_users_id_attrib', self::$config->get('kolab_auth_login', 'mail'));
+        if (!empty($user[$user_attrib])) {
+            list($mbox) = explode('@', $user[$user_attrib]);
+
+            $delimiter = self::$imap->get_hierarchy_delimiter();
+            $other_ns = self::namespace_root('other');
+            $folders = self::list_folders($other_ns . $mbox . $delimiter, '*', $type, $subscribed, $folderdata);
+        }
+
+        return $folders;
     }
 
-    public function get_namespace()
+
+    /**
+     * Get a list of (virtual) top-level folders from the other users namespace
+     *
+     * @param string  Data type to list folders for (contact,event,task,journal,file,note,mail,configuration)
+     * @param boolean Enable to return subscribed folders only (null to use configured subscription mode)
+     *
+     * @return array List of kolab_storage_folder_user objects
+     */
+    public static function get_user_folders($type, $subscribed)
     {
-        return $this->namespace;
+        $folders = $folderdata = array();
+
+        if (self::setup()) {
+            $delimiter = self::$imap->get_hierarchy_delimiter();
+            $other_ns = rtrim(self::namespace_root('other'), $delimiter);
+            $path_len = count(explode($delimiter, $other_ns));
+
+            foreach ((array)self::list_folders($other_ns . $delimiter, '*', '', $subscribed) as $foldername) {
+                if ($foldername == 'INBOX')  // skip INBOX which is added by default
+                    continue;
+
+                $path = explode($delimiter, $foldername);
+
+                // compare folder type if a subfolder is listed
+                if ($type && count($path) > $path_len + 1 && $type != self::folder_type($foldername)) {
+                    continue;
+                }
+
+                // truncate folder path to top-level folders of the 'other' namespace
+                $foldername = join($delimiter, array_slice($path, 0, $path_len + 1));
+
+                if (!$folders[$foldername]) {
+                    $folders[$foldername] = new kolab_storage_folder_user($foldername, $other_ns);
+                }
+            }
+        }
+
+        return $folders;
     }
 
-    public function get_name()
+
+    /**
+     * Handler for user_delete plugin hooks
+     *
+     * Remove all cache data from the local database related to the given user.
+     */
+    public static function delete_user_folders($args)
     {
-        // this is already kolab_storage::object_name() result
-        return $this->name;
+        $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);
     }
+
 }
+

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

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

@@ -22,38 +22,15 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-class kolab_storage_folder
+class kolab_storage_folder extends kolab_storage_folder_api
 {
     /**
-     * The folder name.
-     * @var string
-     */
-    public $name;
-
-    /**
-     * The type of this folder.
-     * @var string
-     */
-    public $type;
-
-    /**
-     * Is this folder set to be the default for its type
-     * @var boolean
-     */
-    public $default = false;
-
-    /**
      * The kolab_storage_cache instance for caching operations
      * @var object
      */
     public $cache;
 
     private $type_annotation;
-    private $namespace;
-    private $imap;
-    private $info;
-    private $idata;
-    private $owner;
     private $resource_uri;
 
 
@@ -62,7 +39,7 @@
      */
     function __construct($name, $type = null)
     {
-        $this->imap = rcube::get_instance()->get_storage();
+        parent::__construct($name);
         $this->imap->set_options(array('skip_deleted' => true));
         $this->set_folder($name, $type);
     }
@@ -83,6 +60,7 @@
         $this->default      = $suffix == 'default';
         $this->name         = $name;
         $this->resource_uri = null;
+        $this->id           = kolab_storage::folder_id($name);
 
         // get a new cache instance of folder type changed
         if (!$this->cache || $type != $oldtype)
@@ -92,148 +70,6 @@
         $this->cache->set_folder($this);
     }
 
-    /**
-     *
-     */
-    public function get_folder_info()
-    {
-        if (!isset($this->info))
-            $this->info = $this->imap->folder_info($this->name);
-
-        return $this->info;
-    }
-
-    /**
-     * Make IMAP folder data available for this folder
-     */
-    public function get_imap_data()
-    {
-        if (!isset($this->idata))
-            $this->idata = $this->imap->folder_data($this->name);
-
-        return $this->idata;
-    }
-
-    /**
-     * Returns IMAP metadata/annotations (GETMETADATA/GETANNOTATION)
-     *
-     * @param array List of metadata keys to read
-     * @return array Metadata entry-value hash array on success, NULL on error
-     */
-    public function get_metadata($keys)
-    {
-        $metadata = $this->imap->get_metadata($this->name, (array)$keys);
-        return $metadata[$this->name];
-    }
-
-
-    /**
-     * Sets IMAP metadata/annotations (SETMETADATA/SETANNOTATION)
-     *
-     * @param array  $entries Entry-value array (use NULL value as NIL)
-     * @return boolean True on success, False on failure
-     */
-    public function set_metadata($entries)
-    {
-        return $this->imap->set_metadata($this->name, $entries);
-    }
-
-
-    /**
-     * Returns the owner of the folder.
-     *
-     * @return string  The owner of this folder.
-     */
-    public function get_owner()
-    {
-        // return cached value
-        if (isset($this->owner))
-            return $this->owner;
-
-        $info = $this->get_folder_info();
-        $rcmail = rcube::get_instance();
-
-        switch ($info['namespace']) {
-        case 'personal':
-            $this->owner = $rcmail->get_user_name();
-            break;
-
-        case 'shared':
-            $this->owner = 'anonymous';
-            break;
-
-        default:
-            list($prefix, $user) = explode($this->imap->get_hierarchy_delimiter(), $info['name']);
-            if (strpos($user, '@') === false) {
-                $domain = strstr($rcmail->get_user_name(), '@');
-                if (!empty($domain))
-                    $user .= $domain;
-            }
-            $this->owner = $user;
-            break;
-        }
-
-        return $this->owner;
-    }
-
-
-    /**
-     * Getter for the name of the namespace to which the IMAP folder belongs
-     *
-     * @return string Name of the namespace (personal, other, shared)
-     */
-    public function get_namespace()
-    {
-        if (!isset($this->namespace))
-            $this->namespace = $this->imap->folder_namespace($this->name);
-        return $this->namespace;
-    }
-
-
-    /**
-     * Get IMAP ACL information for this folder
-     *
-     * @return string  Permissions as string
-     */
-    public function get_myrights()
-    {
-        $rights = $this->info['rights'];
-
-        if (!is_array($rights))
-            $rights = $this->imap->my_rights($this->name);
-
-        return join('', (array)$rights);
-    }
-
-
-    /**
-     * Get the display name value of this folder
-     *
-     * @return string Folder name
-     */
-    public function get_name()
-    {
-        return kolab_storage::object_name($this->name, $this->namespace);
-    }
-
-
-    /**
-     * Get the color value stored in metadata
-     *
-     * @param string Default color value to return if not set
-     * @return mixed Color value from IMAP metadata or $default is not set
-     */
-    public function get_color($default = null)
-    {
-        // color is defined in folder METADATA
-        $metadata = $this->get_metadata(array(kolab_storage::COLOR_KEY_PRIVATE, kolab_storage::COLOR_KEY_SHARED));
-        if (($color = $metadata[kolab_storage::COLOR_KEY_PRIVATE]) || ($color = $metadata[kolab_storage::COLOR_KEY_SHARED])) {
-            return $color;
-        }
-
-        return $default;
-    }
-
 
     /**
      * Compose a unique resource URI for this IMAP folder
@@ -578,7 +414,7 @@
 
         // get XML part
         foreach ((array)$message->attachments as $part) {
-            if (!$xml && ($part->mimetype == $content_type || preg_match('!application/([a-z]+\+)?xml!', $part->mimetype))) {
+            if (!$xml && ($part->mimetype == $content_type || preg_match('!application/([a-z.]+\+)?xml!', $part->mimetype))) {
                 $xml = $part->body ? $part->body : $message->get_part_content($part->mime_id);
             }
             else if ($part->filename || $part->content_id) {

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

@@ -0,0 +1,298 @@
+<?php
+
+/**
+ * Abstract interface class for Kolab storage IMAP folder objects
+ *
+ * @author Thomas Bruederli <bruederli@kolabsys.com>
+ *
+ * Copyright (C) 2014, Kolab Systems AG <contact@kolabsys.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+abstract class kolab_storage_folder_api
+{
+    /**
+     * Folder identifier
+     * @var string
+     */
+    public $id;
+
+    /**
+     * The folder name.
+     * @var string
+     */
+    public $name;
+
+    /**
+     * The type of this folder.
+     * @var string
+     */
+    public $type;
+
+    /**
+     * Is this folder set to be the default for its type
+     * @var boolean
+     */
+    public $default = false;
+
+    /**
+     * List of direct child folders
+     * @var array
+     */
+    public $children = array();
+    
+    /**
+     * Name of the parent folder
+     * @var string
+     */
+    public $parent = '';
+
+    protected $imap;
+    protected $owner;
+    protected $info;
+    protected $idata;
+    protected $namespace;
+
+
+    /**
+     * Private constructor
+     */
+    protected function __construct($name)
+    {
+      $this->name = $name;
+      $this->id   = kolab_storage::folder_id($name);
+      $this->imap = rcube::get_instance()->get_storage();
+    }
+
+
+    /**
+     * Returns the owner of the folder.
+     *
+     * @return string  The owner of this folder.
+     */
+    public function get_owner()
+    {
+        // return cached value
+        if (isset($this->owner))
+            return $this->owner;
+
+        $info = $this->get_folder_info();
+        $rcmail = rcube::get_instance();
+
+        switch ($info['namespace']) {
+        case 'personal':
+            $this->owner = $rcmail->get_user_name();
+            break;
+
+        case 'shared':
+            $this->owner = 'anonymous';
+            break;
+
+        default:
+            list($prefix, $user) = explode($this->imap->get_hierarchy_delimiter(), $info['name']);
+            if (strpos($user, '@') === false) {
+                $domain = strstr($rcmail->get_user_name(), '@');
+                if (!empty($domain))
+                    $user .= $domain;
+            }
+            $this->owner = $user;
+            break;
+        }
+
+        return $this->owner;
+    }
+
+
+    /**
+     * Getter for the name of the namespace to which the IMAP folder belongs
+     *
+     * @return string Name of the namespace (personal, other, shared)
+     */
+    public function get_namespace()
+    {
+        if (!isset($this->namespace))
+            $this->namespace = $this->imap->folder_namespace($this->name);
+        return $this->namespace;
+    }
+
+
+    /**
+     * Get the display name value of this folder
+     *
+     * @return string Folder name
+     */
+    public function get_name()
+    {
+        return kolab_storage::object_name($this->name, $this->get_namespace());
+    }
+
+
+    /**
+     * Getter for the top-end folder name (not the entire path)
+     *
+     * @return string Name of this folder
+     */
+    public function get_foldername()
+    {
+        $parts = explode('/', $this->name);
+        return rcube_charset::convert(end($parts), 'UTF7-IMAP');
+    }
+
+    /**
+     * Getter for parent folder path
+     *
+     * @return string Full path to parent folder
+     */
+    public function get_parent()
+    {
+        $path = explode('/', $this->name);
+        array_pop($path);
+
+        // don't list top-level namespace folder
+        if (count($path) == 1 && in_array($this->get_namespace(), array('other', 'shared'))) {
+            $path = array();
+        }
+
+        return join('/', $path);
+    }
+
+
+    /**
+     * Get the color value stored in metadata
+     *
+     * @param string Default color value to return if not set
+     * @return mixed Color value from IMAP metadata or $default is not set
+     */
+    public function get_color($default = null)
+    {
+        // color is defined in folder METADATA
+        $metadata = $this->get_metadata(array(kolab_storage::COLOR_KEY_PRIVATE, kolab_storage::COLOR_KEY_SHARED));
+        if (($color = $metadata[kolab_storage::COLOR_KEY_PRIVATE]) || ($color = $metadata[kolab_storage::COLOR_KEY_SHARED])) {
+            return $color;
+        }
+
+        return $default;
+    }
+
+
+    /**
+     * Returns IMAP metadata/annotations (GETMETADATA/GETANNOTATION)
+     *
+     * @param array List of metadata keys to read
+     * @return array Metadata entry-value hash array on success, NULL on error
+     */
+    public function get_metadata($keys)
+    {
+        $metadata = rcube::get_instance()->get_storage()->get_metadata($this->name, (array)$keys);
+        return $metadata[$this->name];
+    }
+
+
+    /**
+     * Sets IMAP metadata/annotations (SETMETADATA/SETANNOTATION)
+     *
+     * @param array  $entries Entry-value array (use NULL value as NIL)
+     * @return boolean True on success, False on failure
+     */
+    public function set_metadata($entries)
+    {
+        return $this->imap->set_metadata($this->name, $entries);
+    }
+
+
+    /**
+     *
+     */
+    public function get_folder_info()
+    {
+        if (!isset($this->info))
+            $this->info = $this->imap->folder_info($this->name);
+
+        return $this->info;
+    }
+
+    /**
+     * Make IMAP folder data available for this folder
+     */
+    public function get_imap_data()
+    {
+        if (!isset($this->idata))
+            $this->idata = $this->imap->folder_data($this->name);
+
+        return $this->idata;
+    }
+
+
+    /**
+     * Get IMAP ACL information for this folder
+     *
+     * @return string  Permissions as string
+     */
+    public function get_myrights()
+    {
+        $rights = $this->info['rights'];
+
+        if (!is_array($rights))
+            $rights = $this->imap->my_rights($this->name);
+
+        return join('', (array)$rights);
+    }
+
+
+    /**
+     * Check activation status of this folder
+     *
+     * @return boolean True if enabled, false if not
+     */
+    public function is_active()
+    {
+        return kolab_storage::folder_is_active($this->name);
+    }
+
+    /**
+     * Change activation status of this folder
+     *
+     * @param boolean The desired subscription status: true = active, false = not active
+     *
+     * @return True on success, false on error
+     */
+    public function activate($active)
+    {
+        return $active ? kolab_storage::folder_activate($this->name) : kolab_storage::folder_deactivate($this->name);
+    }
+
+    /**
+     * Check subscription status of this folder
+     *
+     * @return boolean True if subscribed, false if not
+     */
+    public function is_subscribed()
+    {
+        return kolab_storage::folder_is_subscribed($this->name);
+    }
+
+    /**
+     * Change subscription status of this folder
+     *
+     * @param boolean The desired subscription status: true = subscribed, false = not subscribed
+     *
+     * @return True on success, false on error
+     */
+    public function subscribe($subscribed)
+    {
+        return $subscribed ? kolab_storage::folder_subscribe($this->name) : kolab_storage::folder_unsubscribe($this->name);
+    }
+
+}
+

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

@@ -0,0 +1,101 @@
+<?php
+
+/**
+ * Class that represents a (virtual) folder in the 'other' namespace
+ * implementing a subset of the kolab_storage_folder API.
+ *
+ * @author Thomas Bruederli <bruederli@kolabsys.com>
+ *
+ * Copyright (C) 2014, Kolab Systems AG <contact@kolabsys.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+class kolab_storage_folder_user extends kolab_storage_folder_virtual
+{
+    protected static $ldapcache = array();
+
+    public $ldaprec;
+
+    /**
+     * Default constructor
+     */
+    public function __construct($name, $parent = '', $ldaprec = null)
+    {
+        parent::__construct($name, $name, 'other', $parent);
+
+        if (!empty($ldaprec)) {
+            self::$ldapcache[$name] = $this->ldaprec = $ldaprec;
+        }
+        // use value cached in memory for repeated lookups
+        else if (array_key_exists($name, self::$ldapcache)) {
+            $this->ldaprec = self::$ldapcache[$name];
+        }
+        // lookup user in LDAP and set $this->ldaprec
+        else if ($ldap = kolab_storage::ldap()) {
+            // get domain from current user
+            list(,$domain) = explode('@', rcube::get_instance()->get_user_name());
+            $this->ldaprec = $ldap->get_user_record(parent::get_foldername($this->name) . '@' . $domain, $_SESSION['imap_host']);
+            if (!empty($this->ldaprec)) {
+                $this->ldaprec['kolabtargetfolder'] = $name;
+            }
+            self::$ldapcache[$name] = $this->ldaprec;
+        }
+    }
+
+    /**
+     * Getter for the top-end folder name to be displayed
+     *
+     * @return string Name of this folder
+     */
+    public function get_foldername()
+    {
+        return $this->ldaprec ? ($this->ldaprec['displayname'] ?: $this->ldaprec['name']) :
+            parent::get_foldername();
+    }
+
+    /**
+     * Returns the owner of the folder.
+     *
+     * @return string  The owner of this folder.
+     */
+    public function get_owner()
+    {
+        return $this->ldaprec['mail'];
+    }
+
+    /**
+     * Check subscription status of this folder
+     *
+     * @return boolean True if subscribed, false if not
+     */
+    public function is_subscribed()
+    {
+        return kolab_storage::folder_is_subscribed($this->name, true);
+    }
+
+    /**
+     * Change subscription status of this folder
+     *
+     * @param boolean The desired subscription status: true = subscribed, false = not subscribed
+     *
+     * @return True on success, false on error
+     */
+    public function subscribe($subscribed)
+    {
+        return $subscribed ?
+            kolab_storage::folder_subscribe($this->name, true) :
+            kolab_storage::folder_unsubscribe($this->name, true);
+    }
+
+}
\ No newline at end of file

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

@@ -0,0 +1,59 @@
+<?php
+
+/**
+ * Helper class that represents a virtual IMAP folder
+ * with a subset of the kolab_storage_folder API.
+ *
+ * @author Thomas Bruederli <bruederli@kolabsys.com>
+ *
+ * Copyright (C) 2014, Kolab Systems AG <contact@kolabsys.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+class kolab_storage_folder_virtual extends kolab_storage_folder_api
+{
+    public $virtual = true;
+
+    protected $displayname;
+
+    public function __construct($name, $dispname, $ns, $parent = '')
+    {
+        parent::__construct($name);
+
+        $this->namespace = $ns;
+        $this->parent    = $parent;
+        $this->displayname = $dispname;
+    }
+
+    /**
+     * Get the display name value of this folder
+     *
+     * @return string Folder name
+     */
+    public function get_name()
+    {
+        return $this->displayname ?: parent::get_name();
+    }
+
+    /**
+     * Get the color value stored in metadata
+     *
+     * @param string Default color value to return if not set
+     * @return mixed Color value from IMAP metadata or $default is not set
+     */
+    public function get_color($default = null)
+    {
+        return $default;
+    }
+}
\ No newline at end of file

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

roundcubemail-plugins-kolab-3.2.tar.gz/plugins/odfviewer/odf.html Changed

@@ -8,7 +8,30 @@
 <script type="text/javascript" src="%%DOCROOT%%webodf.js" charset="utf-8"></script>
 <script type="text/javascript" charset="utf-8">
 
-// WebODF viewer code from https://gitorious.org/webodf/webodf/source/HEADe:programs/viewer
+/**
+
+    WebODF viewer code from https://gitorious.org/webodf/webodf/source/HEADe:programs/viewer
+
+    @licstart  The following is the entire license notice for the 
+    JavaScript code in this page.
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as
+    published by the Free Software Foundation, either version 3 of the
+    License, or (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+    @licend  The above is the entire license notice
+    for the JavaScript code in this page.
+
+*/
 
 function init() {
     viewer = new Viewer(new ODFViewerPlugin(), '%%DOCURL%%');

roundcubemail-plugins-kolab-3.2.tar.gz/plugins/owncloud/localization/da_DK.inc Added

roundcubemail-plugins-kolab-3.2.tar.gz/plugins/owncloud/localization/fi_FI.inc Added

roundcubemail-plugins-kolab-3.2.tar.gz/plugins/owncloud/localization/hu_HU.inc Added

roundcubemail-plugins-kolab-3.2.tar.gz/plugins/owncloud/localization/it_IT.inc Added

roundcubemail-plugins-kolab-3.2.tar.gz/plugins/tasklist/drivers/database/SQL/mysql.initial.sql Changed

roundcubemail-plugins-kolab-3.2.tar.gz/plugins/tasklist/drivers/database/SQL/mysql/2014051900.sql Added

roundcubemail-plugins-kolab-3.2.tar.gz/plugins/tasklist/drivers/database/SQL/postgres.initial.sql Added

@@ -0,0 +1,64 @@
+/**
+ * Roundcube Tasklist plugin database
+ *
+ * @version @package_version@
+ * @author Thomas Bruederli
+ * @licence GNU AGPL
+ * @copyright (C) 2014, Kolab Systems AG
+ */
+
+CREATE SEQUENCE tasklists_seq
+    INCREMENT BY 1
+    NO MAXVALUE
+    NO MINVALUE
+    CACHE 1;
+
+CREATE TABLE tasklists (
+    tasklist_id integer DEFAULT nextval('tasklists_seq'::regclass) NOT NULL,
+    user_id integer NOT NULL
+        REFERENCES users (user_id) ON UPDATE CASCADE ON DELETE CASCADE,
+    name varchar(255) NOT NULL,
+    color varchar(8) NOT NULL,
+    showalarms smallint NOT NULL DEFAULT 0,
+    PRIMARY KEY (tasklist_id)
+);
+
+CREATE INDEX tasklists_user_id_idx ON tasklists (user_id, name);
+
+CREATE SEQUENCE tasks_seq
+    INCREMENT BY 1
+    NO MAXVALUE
+    NO MINVALUE
+    CACHE 1;
+
+CREATE TABLE tasks (
+    task_id integer DEFAULT nextval('tasks_seq'::regclass) NOT NULL,
+    tasklist_id integer NOT NULL
+        REFERENCES tasklists (tasklist_id) ON UPDATE CASCADE ON DELETE CASCADE,
+    parent_id integer DEFAULT NULL,
+    uid varchar(255) NOT NULL,
+    created timestamp without time zone DEFAULT now() NOT NULL,
+    changed timestamp without time zone DEFAULT now() NOT NULL,
+    del smallint NOT NULL DEFAULT '0',
+    title varchar(255) NOT NULL,
+    description text,
+    tags text,
+    date varchar(10) DEFAULT NULL,
+    time varchar(5) DEFAULT NULL,
+    startdate varchar(10) DEFAULT NULL,
+    starttime varchar(5) DEFAULT NULL,
+    flagged smallint NOT NULL DEFAULT 0,
+    complete float NOT NULL DEFAULT 0,
+    status varchar(16) NOT NULL DEFAULT '',
+    alarms varchar(255) DEFAULT NULL,
+    recurrence varchar(255) DEFAULT NULL,
+    organizer varchar(255) DEFAULT NULL,
+    attendees text,
+    notify timestamp without time zone DEFAULT NULL,
+    PRIMARY KEY (task_id)
+);
+
+CREATE INDEX tasks_tasklisting_idx ON tasks (tasklist_id, del, date);
+CREATE INDEX tasks_uid_idx ON tasks (uid);
+
+INSERT INTO system (name, value) VALUES ('tasklist-database-version', '2014051900');

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

@@ -24,6 +24,8 @@
 
 class tasklist_database_driver extends tasklist_driver
 {
+    const IS_COMPLETE_SQL = "(status='COMPLETED' OR (complete=1 AND status=''))";
+
     public $undelete = true; // yes, we can
     public $sortable = false;
     public $alarm_types = array('DISPLAY');
@@ -89,7 +91,8 @@
     {
       // attempt to create a default list for this user
       if (empty($this->lists)) {
-        if ($this->create_list(array('name' => 'Default', 'color' => '000000')))
+        $prop = array('name' => 'Default', 'color' => '000000');
+        if ($this->create_list($prop))
           $this->_read_lists();
       }
 
@@ -103,7 +106,7 @@
      * @return mixed ID of the new list on success, False on error
      * @see tasklist_driver::create_list()
      */
-    public function create_list($prop)
+    public function create_list(&$prop)
     {
         $result = $this->rc->db->query(
             "INSERT INTO " . $this->db_lists . "
@@ -128,7 +131,7 @@
      * @return boolean True on success, Fales on failure
      * @see tasklist_driver::edit_list()
      */
-    public function edit_list($prop)
+    public function edit_list(&$prop)
     {
         $query = $this->rc->db->query(
             "UPDATE " . $this->db_lists . "
@@ -199,6 +202,18 @@
     }
 
     /**
+     * Search for shared or otherwise not listed tasklists the user has access
+     *
+     * @param string Search string
+     * @param string Section/source to search
+     * @return array List of tasklists
+     */
+    public function search_lists($query, $source)
+    {
+        return array();
+    }
+
+    /**
      * Get number of tasks matching the given filter
      *
      * @param array List of lists to count tasks of
@@ -223,7 +238,7 @@
         $result = $this->rc->db->query(sprintf(
             "SELECT task_id, flagged, date FROM " . $this->db_tasks . "
              WHERE tasklist_id IN (%s)
-             AND del=0 AND complete<1",
+             AND del=0 AND NOT " . self::IS_COMPLETE_SQL,
             join(',', $list_ids)
         ));
 
@@ -285,9 +300,9 @@
             $sql_add = ' AND date IS NULL';
 
         if ($filter['mask'] & tasklist::FILTER_MASK_COMPLETE)
-            $sql_add .= ' AND complete=1';
+            $sql_add .= ' AND ' . self::IS_COMPLETE_SQL;
         else if (empty($filter['since']))  // don't show complete tasks by default
-            $sql_add .= ' AND complete<1';
+            $sql_add .= ' AND NOT ' . self::IS_COMPLETE_SQL;
 
         if ($filter['mask'] & tasklist::FILTER_MASK_FLAGGED)
             $sql_add .= ' AND flagged=1';
@@ -434,7 +449,7 @@
             $result = $this->rc->db->query(sprintf(
                 "SELECT * FROM " . $this->db_tasks . "
                  WHERE tasklist_id IN (%s)
-                 AND notify <= %s AND complete < 1",
+                 AND notify <= %s AND NOT " . self::IS_COMPLETE_SQL,
                 join(',', $list_ids),
                 $this->rc->db->fromunixtime($time)
             ));
@@ -470,6 +485,16 @@
     }
 
     /**
+     * Remove alarm dismissal or snooze state
+     *
+     * @param  string  Task identifier
+     */
+    public function clear_alarms($id)
+    {
+        // Nothing to do here. Alarms are reset in edit_task()
+    }
+
+    /**
      * Map some internal database values to match the generic "API"
      */
     private function _read_postprocess($rec)
@@ -482,6 +507,17 @@
         if (!$rec['parent_id'])
             unset($rec['parent_id']);
 
+        // decode serialized alarms
+        if ($rec['alarms']) {
+            $rec['valarms'] = $this->unserialize_alarms($rec['alarms']);
+            unset($rec['alarms']);
+        }
+
+        // decode serialze recurrence rules
+        if ($rec['recurrence']) {
+            $rec['recurrence'] = $this->unserialize_recurrence($rec['recurrence']);
+        }
+
         unset($rec['task_id'], $rec['tasklist_id'], $rec['created']);
         return $rec;
     }
@@ -500,7 +536,14 @@
         if (!$this->lists[$list_id] || $this->lists[$list_id]['readonly'])
             return false;
 
-        foreach (array('parent_id', 'date', 'time', 'startdate', 'starttime', 'alarms') as $col) {
+        if (is_array($prop['valarms'])) {
+            $prop['alarms'] = $this->serialize_alarms($prop['valarms']);
+        }
+        if (is_array($prop['recurrence'])) {
+            $prop['recurrence'] = $this->serialize_recurrence($prop['recurrence']);
+        }
+
+        foreach (array('parent_id', 'date', 'time', 'startdate', 'starttime', 'alarms', 'recurrence', 'status') as $col) {
             if (empty($prop[$col]))
                 $prop[$col] = null;
         }
@@ -508,8 +551,8 @@
         $notify_at = $this->_get_notification($prop);
         $result = $this->rc->db->query(sprintf(
             "INSERT INTO " . $this->db_tasks . "
-             (tasklist_id, uid, parent_id, created, changed, title, date, time, startdate, starttime, description, tags, alarms, notify)
-             VALUES (?, ?, ?, %s, %s, ?, ?, ?, ?, ?, ?, ?, ?, ?)",
+             (tasklist_id, uid, parent_id, created, changed, title, date, time, startdate, starttime, description, tags, flagged, complete, status, alarms, recurrence, notify)
+             VALUES (?, ?, ?, %s, %s, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)",
              $this->rc->db->now(),
              $this->rc->db->now()
             ),
@@ -523,7 +566,11 @@
             $prop['starttime'],
             strval($prop['description']),
             join(',', (array)$prop['tags']),
+            $prop['flagged'] ? 1 : 0,
+            intval($prop['complete']),
+            $prop['status'],
             $prop['alarms'],
+            $prop['recurrence'],
             $notify_at
         );
 
@@ -542,12 +589,19 @@
      */
     public function edit_task($prop)
     {
+        if (is_array($prop['valarms'])) {
+            $prop['alarms'] = $this->serialize_alarms($prop['valarms']);
+        }
+        if (is_array($prop['recurrence'])) {
+            $prop['recurrence'] = $this->serialize_recurrence($prop['recurrence']);
+        }
+
         $sql_set = array();
         foreach (array('title', 'description', 'flagged', 'complete') as $col) {
             if (isset($prop[$col]))
                 $sql_set[] = $this->rc->db->quote_identifier($col) . '=' . $this->rc->db->quote($prop[$col]);
         }
-        foreach (array('parent_id', 'date', 'time', 'startdate', 'starttime', 'alarms') as $col) {
+        foreach (array('parent_id', 'date', 'time', 'startdate', 'starttime', 'alarms', 'recurrence', 'status') as $col) {
             if (isset($prop[$col]))
                 $sql_set[] = $this->rc->db->quote_identifier($col) . '=' . (empty($prop[$col]) ? 'NULL' : $this->rc->db->quote($prop[$col]));
         }
@@ -655,14 +709,115 @@
      */
     private function _get_notification($task)
     {
-        if ($task['alarms'] && $task['complete'] < 1 || strpos($task['alarms'], '@') !== false) {
+        if ($task['valarms'] && !$this->is_complete($task)) {
             $alarm = libcalendaring::get_next_alarm($task, 'task');
 
-        if ($alarm['time'] && $alarm['action'] == 'DISPLAY')
+        if ($alarm['time'] && in_array($alarm['action'], $this->alarm_types))
           return date('Y-m-d H:i:s', $alarm['time']);
       }
 
       return null;
     }
 
+    /**
+     * Helper method to serialize the list of alarms into a string
+     */
+    private function serialize_alarms($valarms)
+    {
+        foreach ((array)$valarms as $i => $alarm) {
+            if ($alarm['trigger'] instanceof DateTime) {
+                $valarms[$i]['trigger'] = '@' . $alarm['trigger']->format('c');
+            }
+        }
+
+        return $valarms ? json_encode($valarms) : null;
+    }
+
+    /**
+     * Helper method to decode a serialized list of alarms
+     */
+    private function unserialize_alarms($alarms)
+    {
+        // decode json serialized alarms
+        if ($alarms && $alarms[0] == '[') {
+            $valarms = json_decode($alarms, true);
+            foreach ($valarms as $i => $alarm) {
+                if ($alarm['trigger'][0] == '@') {
+                    try {
+                        $valarms[$i]['trigger'] = new DateTime(substr($alarm['trigger'], 1));
+                    }
+                    catch (Exception $e) {
+                        unset($valarms[$i]);
+                    }
+                }
+            }
+        }
+        // convert legacy alarms data
+        else if (strlen($alarms)) {
+            list($trigger, $action) = explode(':', $alarms, 2);
+            if ($trigger = libcalendaring::parse_alaram_value($trigger)) {
+                $valarms = array(array('action' => $action, 'trigger' => $trigger[3] ?: $trigger[0]));
+            }
+        }
+
+        return $valarms;
+    }
+
+    /**
+     * Helper method to serialize task recurrence properties
+     */
+    private function serialize_recurrence($recurrence)
+    {
+        foreach ((array)$recurrence as $k => $val) {
+            if ($val instanceof DateTime) {
+                $recurrence[$k] = '@' . $val->format('c');
+            }
+        }
+
+        return $recurrence ? json_encode($recurrence) : null;
+    }
+
+    /**
+     * Helper method to decode a serialized task recurrence struct
+     */
+    private function unserialize_recurrence($ser)
+    {
+        if (strlen($ser)) {
+            $recurrence = json_decode($ser, true);
+            foreach ((array)$recurrence as $k => $val) {
+                if ($val[0] == '@') {
+                    try {
+                        $recurrence[$k] = new DateTime(substr($val, 1));
+                    }
+                    catch (Exception $e) {
+                        unset($recurrence[$k]);
+                    }
+                }
+            }
+        }
+        else {
+            $recurrence = '';
+        }
+
+        return $recurrence;
+    }
+
+    /**
+     * Handler for user_delete plugin hook
+     */
+    public function user_delete($args)
+    {
+        $db = $this->rc->db;
+        $list_ids = array();
+        $lists = $db->query("SELECT tasklist_id FROM " . $this->db_lists . " WHERE user_id=?", $args['user']->ID);
+        while ($row = $db->fetch_assoc($lists)) {
+            $list_ids[] = $row['tasklist_id'];
+        }
+
+        if (!empty($list_ids)) {
+            foreach (array($this->db_tasks, $this->db_lists) as $table) {
+                $db->query(sprintf("DELETE FROM $table WHERE tasklist_id IN (%s)", join(',', $list_ids)));
+            }
+        }
+    }
 }

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

@@ -28,7 +28,7 @@
     public $alarms = false;
     public $attachments = true;
     public $undelete = false; // task undelete action
-    public $alarm_types = array('DISPLAY');
+    public $alarm_types = array('DISPLAY','AUDIO');
 
     private $rc;
     private $plugin;
@@ -45,11 +45,16 @@
         $this->rc = $plugin->rc;
         $this->plugin = $plugin;
 
-        $this->_read_lists();
-
         if (kolab_storage::$version == '2.0') {
             $this->alarm_absolute = false;
         }
+
+        // tasklist use fully encoded identifiers
+        kolab_storage::$encode_ids = true;
+
+        $this->_read_lists();
+
+        $this->plugin->register_action('folder-acl', array($this, 'folder_acl'));
     }
 
     /**
@@ -81,87 +86,171 @@
 
         $delim = $this->rc->get_storage()->get_hierarchy_delimiter();
         $prefs = $this->rc->config->get('kolab_tasklists', array());
-        $listnames = array();
+
+        foreach ($folders as $folder) {
+            $tasklist = $this->folder_props($folder, $delim, $prefs);
+
+            $this->lists[$tasklist['id']] = $tasklist;
+            $this->folders[$tasklist['id']] = $folder;
+            $this->folders[$folder->name] = $folder;
+        }
+    }
+
+    /**
+     * Derive list properties from the given kolab_storage_folder object
+     */
+    protected function folder_props($folder, $delim, $prefs)
+    {
+        if ($folder->get_namespace() == 'personal') {
+            $norename = false;
+            $readonly = false;
+            $alarms = true;
+        }
+        else {
+            $alarms = false;
+            $readonly = true;
+            if (($rights = $folder->get_myrights()) && !PEAR::isError($rights)) {
+                if (strpos($rights, 'i') !== false)
+                  $readonly = false;
+            }
+            $info = $folder->get_folder_info();
+            $norename = $readonly || $info['norename'] || $info['protected'];
+        }
+
+        $list_id = $folder->id; #kolab_storage::folder_id($folder->name);
+        $old_id = kolab_storage::folder_id($folder->name, false);
+
+        if (!isset($prefs[$list_id]['showalarms']) && isset($prefs[$old_id]['showalarms'])) {
+            $prefs[$list_id]['showalarms'] = $prefs[$old_id]['showalarms'];
+        }
+
+        return array(
+            'id' => $list_id,
+            'name' => $folder->get_name(),
+            'listname' => $folder->get_foldername(),
+            'editname' => $folder->get_foldername(),
+            'color' => $folder->get_color('0000CC'),
+            'showalarms' => isset($prefs[$list_id]['showalarms']) ? $prefs[$list_id]['showalarms'] : $alarms,
+            'editable' => !$readonly,
+            'norename' => $norename,
+            'active' => $folder->is_active(),
+            'parentfolder' => $folder->get_parent(),
+            'default' => $folder->default,
+            '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(),
+            'class' => trim($folder->get_namespace() . ($folder->default ? ' default' : '')),
+        );
+    }
+
+    /**
+     * Get a list of available task lists from this source
+     */
+    public function get_lists(&$tree = null)
+    {
+        // attempt to create a default list for this user
+        if (empty($this->lists)) {
+            $prop = array('name' => 'Tasks', 'color' => '0000CC', 'default' => true);
+            if ($this->create_list($prop))
+                $this->_read_lists(true);
+        }
+
+        $folders = array();
+        foreach ($this->lists as $id => $list) {
+            if (!empty($this->folders[$id])) {
+                $folders[] = $this->folders[$id];
+            }
+        }
 
         // include virtual folders for a full folder tree
-        if (!$this->rc->output->ajax_call && in_array($this->rc->action, array('index','')))
-            $folders = kolab_storage::folder_hierarchy($folders);
+        if (!is_null($tree)) {
+            $folders = kolab_storage::folder_hierarchy($folders, $tree);
+        }
 
+        $delim = $this->rc->get_storage()->get_hierarchy_delimiter();
+        $prefs = $this->rc->config->get('kolab_tasklists', array());
+
+        $lists = array();
         foreach ($folders as $folder) {
-            $utf7name = $folder->name;
+            $list_id = $folder->id; #kolab_storage::folder_id($folder->name);
+            $imap_path = explode($delim, $folder->name);
+
+            // find parent
+            do {
+              array_pop($imap_path);
+              $parent_id = kolab_storage::folder_id(join($delim, $imap_path));
+            }
+            while (count($imap_path) > 1 && !$this->folders[$parent_id]);
 
-            $path_imap = explode($delim, $utf7name);
-            $editname = rcube_charset::convert(array_pop($path_imap), 'UTF7-IMAP');  // pop off raw name part
-            $path_imap = join($delim, $path_imap);
+            // restore "real" parent ID
+            if ($parent_id && !$this->folders[$parent_id]) {
+                $parent_id = kolab_storage::folder_id($folder->get_parent());
+            }
 
             $fullname = $folder->get_name();
-            $listname = kolab_storage::folder_displayname($fullname, $listnames);
+            $listname = $folder->get_foldername();
 
             // special handling for virtual folders
-            if ($folder->virtual) {
-                $list_id = kolab_storage::folder_id($utf7name);
-                $this->lists[$list_id] = array(
-                    'id' => $list_id,
-                    'name' => $fullname,
+            if ($folder instanceof kolab_storage_folder_user) {
+                $lists[$list_id] = array(
+                    'id'       => $list_id,
+                    'name'     => $folder->get_name(),
                     'listname' => $listname,
-                    'virtual' => true,
+                    'title'    => $folder->get_owner(),
+                    'virtual'  => true,
                     'editable' => false,
+                    'group'    => 'other virtual',
+                    'class'    => 'user',
+                    'parent'   => $parent_id,
                 );
-                continue;
             }
-
-            if ($folder->get_namespace() == 'personal') {
-                $norename = false;
-                $readonly = false;
-                $alarms = true;
+            else if ($folder->virtual) {
+                $lists[$list_id] = array(
+                    'id'       => $list_id,
+                    'name'     => kolab_storage::object_name($fullname),
+                    'listname' => $listname,
+                    'virtual'  => true,
+                    'editable' => false,
+                    'group'    => $folder->get_namespace(),
+                    'class'    => 'folder',
+                    'parent'   => $parent_id,
+                );
             }
             else {
-                $alarms = false;
-                $readonly = true;
-                if (($rights = $folder->get_myrights()) && !PEAR::isError($rights)) {
-                    if (strpos($rights, 'i') !== false)
-                      $readonly = false;
+                if (!$this->lists[$list_id]) {
+                    $this->lists[$list_id] = $this->folder_props($folder, $delim, $prefs);
+                    $this->folders[$list_id] = $folder;
                 }
-                $info = $folder->get_folder_info();
-                $norename = $readonly || $info['norename'] || $info['protected'];
+                $this->lists[$list_id]['parent'] = $parent_id;
+                $lists[$list_id] = $this->lists[$list_id];
             }
-
-            $list_id = kolab_storage::folder_id($utf7name);
-            $tasklist = array(
-                'id' => $list_id,
-                'name' => $fullname,
-                'listname' => $listname,
-                'editname' => $editname,
-                'color' => $folder->get_color('0000CC'),
-                'showalarms' => isset($prefs[$list_id]['showalarms']) ? $prefs[$list_id]['showalarms'] : $alarms,
-                'editable' => !$readionly,
-                'norename' => $norename,
-                'active' => $folder->is_active(),
-                'parentfolder' => $path_imap,
-                'default' => $folder->default,
-                'children' => true,  // TODO: determine if that folder indeed has child folders
-                'class_name' => trim($folder->get_namespace() . ($folder->default ? ' default' : '')),
-            );
-            $this->lists[$tasklist['id']] = $tasklist;
-            $this->folders[$tasklist['id']] = $folder;
-            $this->folders[$folder->name] = $folder;
         }
+
+        return $lists;
     }
 
     /**
-     * Get a list of available task lists from this source
+     * Get the kolab_calendar instance for the given calendar ID
+     *
+     * @param string List identifier (encoded imap folder name)
+     * @return object kolab_storage_folder Object nor null if list doesn't exist
      */
-    public function get_lists()
+    protected function get_folder($id)
     {
-        // attempt to create a default list for this user
-        if (empty($this->lists)) {
-            if ($this->create_list(array('name' => 'Tasks', 'color' => '0000CC', 'default' => true)))
-                $this->_read_lists(true);
+        // create list and folder instance if necesary
+        if (!$this->lists[$id]) {
+            $folder = kolab_storage::get_folder(kolab_storage::id_decode($id));
+            if ($folder->type) {
+                $this->folders[$id] = $folder;
+                $this->lists[$id] = $this->folder_props($folder, $this->rc->get_storage()->get_hierarchy_delimiter(), $this->rc->config->get('kolab_tasklists', array()));
+            }
         }
 
-        return $this->lists;
+        return $this->folders[$id];
     }
 
+
     /**
      * Create a new list assigned to the current user
      *
@@ -171,7 +260,7 @@
      *  showalarms: True if alarms are enabled
      * @return mixed ID of the new list on success, False on error
      */
-    public function create_list($prop)
+    public function create_list(&$prop)
     {
         $prop['type'] = 'task' . ($prop['default'] ? '.default' : '');
         $prop['active'] = true; // activate folder by default
@@ -194,6 +283,15 @@
         if ($prefs['kolab_tasklists'][$id])
             $this->rc->user->save_prefs($prefs);
 
+        // force page reload to properly render folder hierarchy
+        if (!empty($prop['parent'])) {
+            $prop['_reload'] = true;
+        }
+        else {
+            $folder = kolab_storage::get_folder($folder);
+            $prop += $this->folder_props($folder, $this->rc->get_storage()->get_hierarchy_delimiter(), array());
+        }
+
         return $id;
     }
 
@@ -207,9 +305,9 @@
      *  showalarms: True if alarms are enabled (if supported)
      * @return boolean True on success, Fales on failure
      */
-    public function edit_list($prop)
+    public function edit_list(&$prop)
     {
-        if ($prop['id'] && ($folder = $this->folders[$prop['id']])) {
+        if ($prop['id'] && ($folder = $this->get_folder($prop['id']))) {
             $prop['oldname'] = $folder->name;
             $prop['type'] = 'task';
             $newfolder = kolab_storage::folder_update($prop);
@@ -232,6 +330,10 @@
             if ($prefs['kolab_tasklists'][$id])
                 $this->rc->user->save_prefs($prefs);
 
+            // force page reload if folder name/hierarchy changed
+            if ($newfolder != $prop['oldname'])
+                $prop['_reload'] = true;
+
             return $id;
         }
 
@@ -244,12 +346,18 @@
      * @param array Hash array with list properties
      *          id: List Identifier
      *      active: True if list is active, false if not
+     *   permanent: True if list is to be subscribed permanently
      * @return boolean True on success, Fales on failure
      */
     public function subscribe_list($prop)
     {
-        if ($prop['id'] && ($folder = $this->folders[$prop['id']])) {
-            return $folder->activate($prop['active']);
+        if ($prop['id'] && ($folder = $this->get_folder($prop['id']))) {
+            $ret = false;
+            if (isset($prop['permanent']))
+                $ret |= $folder->subscribe(intval($prop['permanent']));
+            if (isset($prop['active']))
+                $ret |= $folder->activate(intval($prop['active']));
+            return $ret;
         }
         return false;
     }
@@ -263,7 +371,7 @@
      */
     public function remove_list($prop)
     {
-        if ($prop['id'] && ($folder = $this->folders[$prop['id']])) {
+        if ($prop['id'] && ($folder = $this->get_folder($prop['id']))) {
           if (kolab_storage::folder_delete($folder->name))
               return true;
           else
@@ -274,6 +382,63 @@
     }
 
     /**
+     * Search for shared or otherwise not listed tasklists the user has access
+     *
+     * @param string Search string
+     * @param string Section/source to search
+     * @return array List of tasklists
+     */
+    public function search_lists($query, $source)
+    {
+        if (!kolab_storage::setup()) {
+            return array();
+        }
+
+        $this->search_more_results = false;
+        $this->lists = $this->folders = array();
+
+        $delim = $this->rc->get_storage()->get_hierarchy_delimiter();
+
+        // find unsubscribed IMAP folders that have "event" type
+        if ($source == 'folders') {
+            foreach ((array)kolab_storage::search_folders('task', $query, array('other')) as $folder) {
+                $this->folders[$folder->id] = $folder;
+                $this->lists[$folder->id] = $this->folder_props($folder, $delim, array());
+            }
+        }
+        // search other user's namespace via LDAP
+        else if ($source == 'users') {
+            $limit = $this->rc->config->get('autocomplete_max', 15) * 2;  // we have slightly more space, so display twice the number
+            foreach (kolab_storage::search_users($query, 0, array(), $limit * 10) as $user) {
+                $folders = array();
+                // search for tasks folders shared by this user
+                foreach (kolab_storage::list_user_folders($user, 'task', false) as $foldername) {
+                    $folders[] = new kolab_storage_folder($foldername, 'task');
+                }
+
+                if (count($folders)) {
+                    $userfolder = new kolab_storage_folder_user($user['kolabtargetfolder'], '', $user);
+                    $this->folders[$userfolder->id] = $userfolder;
+                    $this->lists[$userfolder->id] = $this->folder_props($userfolder, $delim, array());
+
+                    foreach ($folders as $folder) {
+                        $this->folders[$folder->id] = $folder;
+                        $this->lists[$folder->id] = $this->folder_props($folder, $delim, array());
+                        $count++;
+                    }
+                }
+
+                if ($count >= $limit) {
+                    $this->search_more_results = true;
+                    break;
+                }
+            }
+        }
+
+        return $this->get_lists();
+    }
+
+    /**
      * Get number of tasks matching the given filter
      *
      * @param array List of lists to count tasks of
@@ -293,11 +458,13 @@
 
         $counts = array('all' => 0, 'flagged' => 0, 'today' => 0, 'tomorrow' => 0, 'overdue' => 0, 'nodate' => 0);
         foreach ($lists as $list_id) {
-            $folder = $this->folders[$list_id];
+            if (!$folder = $this->get_folder($list_id)) {
+                continue;
+            }
             foreach ($folder->select(array(array('tags','!~','x-complete'))) as $record) {
                 $rec = $this->_to_rcube_task($record);
 
-                if ($rec['complete'] >= 1.0)  // don't count complete tasks
+                if ($this->is_complete($rec))  // don't count complete tasks
                     continue;
 
                 $counts['all']++;
@@ -314,6 +481,9 @@
             }
         }
 
+        // avoid session race conditions that will loose temporary subscriptions
+        $this->plugin->rc->session->nowrite = true;
+
         return $counts;
     }
 
@@ -357,7 +527,9 @@
         }
 
         foreach ($lists as $list_id) {
-            $folder = $this->folders[$list_id];
+            if (!$folder = $this->get_folder($list_id)) {
+                continue;
+            }
             foreach ($folder->select($query) as $record) {
                 $task = $this->_to_rcube_task($record);
                 $task['list'] = $list_id;
@@ -368,6 +540,9 @@
             }
         }
 
+        // avoid session race conditions that will loose temporary subscriptions
+        $this->plugin->rc->session->nowrite = true;
+
         return $results;
     }
 
@@ -381,11 +556,11 @@
     {
         $id = is_array($prop) ? ($prop['uid'] ?: $prop['id']) : $prop;
         $list_id = is_array($prop) ? $prop['list'] : null;
-        $folders = $list_id ? array($list_id => $this->folders[$list_id]) : $this->folders;
+        $folders = $list_id ? array($list_id => $this->get_folder($list_id)) : $this->folders;
 
         // find task in the available folders
         foreach ($folders as $list_id => $folder) {
-            if (is_numeric($list_id))
+            if (is_numeric($list_id) || !$folder)
                 continue;
             if (!$this->tasks[$id] && ($object = $folder->get_object($id))) {
                 $this->tasks[$id] = $this->_to_rcube_task($object);
@@ -414,7 +589,7 @@
         $childs = array();
         $list_id = $prop['list'];
         $task_ids = array($prop['id']);
-        $folder = $this->folders[$list_id];
+        $folder = $this->get_folder($list_id);
 
         // query for childs (recursively)
         while ($folder && !empty($task_ids)) {
@@ -467,49 +642,55 @@
 
         $time = $slot + $interval;
 
-        $tasks = array();
+        $candidates = array();
         $query = array(array('tags', '=', 'x-has-alarms'), array('tags', '!=', 'x-complete'));
         foreach ($this->lists as $lid => $list) {
             // skip lists with alarms disabled
             if (!$list['showalarms'] || ($lists && !in_array($lid, $lists)))
                 continue;
 
-            $folder = $this->folders[$lid];
+            $folder = $this->get_folder($lid);
             foreach ($folder->select($query) as $record) {
-                if (!$record['alarms'] || $record['status'] == 'COMPLETED' || $record['complete'] == 100)  // don't trust query :-)
+                if (!($record['valarms'] || $record['alarms']) || $record['status'] == 'COMPLETED' || $record['complete'] == 100)  // don't trust query :-)
                     continue;
 
                 $task = $this->_to_rcube_task($record);
 
                 // add to list if alarm is set
                 $alarm = libcalendaring::get_next_alarm($task, 'task');
-                if ($alarm && $alarm['time'] && $alarm['time'] <= $time && $alarm['action'] == 'DISPLAY') {
-                    $id = $task['id'];
-                    $tasks[$id] = $task;
-                    $tasks[$id]['notifyat'] = $alarm['time'];
+                if ($alarm && $alarm['time'] && $alarm['time'] <= $time && in_array($alarm['action'], $this->alarm_types)) {
+                    $id = $alarm['id'];  // use alarm-id as primary identifier
+                    $candidates[$id] = array(
+                        'id'       => $id,
+                        'title'    => $task['title'],
+                        'date'     => $task['date'],
+                        'time'     => $task['time'],
+                        'notifyat' => $alarm['time'],
+                        'action'   => $alarm['action'],
+                    );
                 }
             }
         }
 
         // get alarm information stored in local database
-        if (!empty($tasks)) {
-            $task_ids = array_map(array($this->rc->db, 'quote'), array_keys($tasks));
+        if (!empty($candidates)) {
+            $alarm_ids = array_map(array($this->rc->db, 'quote'), array_keys($candidates));
             $result = $this->rc->db->query(sprintf(
                 "SELECT * FROM kolab_alarms
-                 WHERE event_id IN (%s) AND user_id=?",
-                 join(',', $task_ids),
+                 WHERE alarm_id IN (%s) AND user_id=?",
+                 join(',', $alarm_ids),
                  $this->rc->db->now()
                 ),
                 $this->rc->user->ID
             );
 
             while ($result && ($rec = $this->rc->db->fetch_assoc($result))) {
-                $dbdata[$rec['event_id']] = $rec;
+                $dbdata[$rec['alarm_id']] = $rec;
             }
         }
 
         $alarms = array();
-        foreach ($tasks as $id => $task) {
+        foreach ($candidates as $id => $task) {
           // skip dismissed
           if ($dbdata[$id]['dismissed'])
               continue;
@@ -535,7 +716,7 @@
         // delete old alarm entry
         $this->rc->db->query(
             "DELETE FROM kolab_alarms
-             WHERE event_id=? AND user_id=?",
+             WHERE alarm_id=? AND user_id=?",
             $id,
             $this->rc->user->ID
         );
@@ -545,7 +726,7 @@
 
         $query = $this->rc->db->query(
             "INSERT INTO kolab_alarms
-             (event_id, user_id, dismissed, notifyat)
+             (alarm_id, user_id, dismissed, notifyat)
              VALUES(?, ?, ?, ?)",
             $id,
             $this->rc->user->ID,
@@ -557,6 +738,24 @@
     }
 
     /**
+     * Remove alarm dismissal or snooze state
+     *
+     * @param  string  Task identifier
+     */
+    public function clear_alarms($id)
+    {
+        // delete alarm entry
+        $this->rc->db->query(
+            "DELETE FROM kolab_alarms
+             WHERE alarm_id=? AND user_id=?",
+            $id,
+            $this->rc->user->ID
+        );
+
+        return true;
+    }
+
+    /**
      * Convert from Kolab_Format to internal representation
      */
     private function _to_rcube_task($record)
@@ -569,27 +768,34 @@
             'description' => $record['description'],
             'tags' => array_filter((array)$record['categories']),
             'flagged' => $record['priority'] == 1,
-            'complete' => $record['status'] == 'COMPLETED' ? 1 : floatval($record['complete'] / 100),
+            'complete' => floatval($record['complete'] / 100),
+            'status' => $record['status'],
             'parent_id' => $record['parent_id'],
+            'recurrence' => $record['recurrence'],
         );
 
         // convert from DateTime to internal date format
         if (is_a($record['due'], 'DateTime')) {
-            $task['date'] = $record['due']->format('Y-m-d');
+            $due = $this->plugin->lib->adjust_timezone($record['due']);
+            $task['date'] = $due->format('Y-m-d');
             if (!$record['due']->_dateonly)
-                $task['time'] = $record['due']->format('H:i');
+                $task['time'] = $due->format('H:i');
         }
         // convert from DateTime to internal date format
         if (is_a($record['start'], 'DateTime')) {
-            $task['startdate'] = $record['start']->format('Y-m-d');
+            $start = $this->plugin->lib->adjust_timezone($record['start']);
+            $task['startdate'] = $start->format('Y-m-d');
             if (!$record['start']->_dateonly)
-                $task['starttime'] = $record['start']->format('H:i');
+                $task['starttime'] = $start->format('H:i');
         }
         if (is_a($record['dtstamp'], 'DateTime')) {
             $task['changed'] = $record['dtstamp'];
         }
 
-        if ($record['alarms']) {
+        if ($record['valarms']) {
+            $task['valarms'] = $record['valarms'];
+        }
+        else if ($record['alarms']) {
             $task['alarms'] = $record['alarms'];
         }
 
@@ -632,7 +838,7 @@
         }
 
         $object['complete'] = $task['complete'] * 100;
-        if ($task['complete'] == 1.0)
+        if ($task['complete'] == 1.0 && empty($task['complete']))
             $object['status'] = 'COMPLETED';
 
         if ($task['flagged'])
@@ -642,13 +848,12 @@
 
         // copy meta data (starting with _) from old object
         foreach ((array)$old as $key => $val) {
-          if (!isset($object[$key]) && $key[0] == '_')
-            $object[$key] = $val;
+            if (!isset($object[$key]) && $key[0] == '_')
+                $object[$key] = $val;
         }
 
-        // copy recurrence rules as long as the web client doesn't support it.
-        // that way it doesn't get removed when saving through the web client (#2713)
-        if ($old['recurrence']) {
+        // copy recurrence rules if the client didn't submit it (#2713)
+        if (!array_key_exists('recurrence', $object) && $old['recurrence']) {
             $object['recurrence'] = $old['recurrence'];
         }
 
@@ -717,11 +922,11 @@
     public function edit_task($task)
     {
         $list_id = $task['list'];
-        if (!$list_id || !($folder = $this->folders[$list_id]))
+        if (!$list_id || !($folder = $this->get_folder($list_id)))
             return false;
 
         // moved from another folder
-        if ($task['_fromlist'] && ($fromfolder = $this->folders[$task['_fromlist']])) {
+        if ($task['_fromlist'] && ($fromfolder = $this->get_folder($task['_fromlist']))) {
             if (!$fromfolder->move($task['id'], $folder->name))
                 return false;
 
@@ -770,11 +975,11 @@
     public function move_task($task)
     {
         $list_id = $task['list'];
-        if (!$list_id || !($folder = $this->folders[$list_id]))
+        if (!$list_id || !($folder = $this->get_folder($list_id)))
             return false;
 
         // execute move command
-        if ($task['_fromlist'] && ($fromfolder = $this->folders[$task['_fromlist']])) {
+        if ($task['_fromlist'] && ($fromfolder = $this->get_folder($task['_fromlist']))) {
             return $fromfolder->move($task['id'], $folder->name);
         }
 
@@ -792,7 +997,7 @@
     public function delete_task($task, $force = true)
     {
         $list_id = $task['list'];
-        if (!$list_id || !($folder = $this->folders[$list_id]))
+        if (!$list_id || !($folder = $this->get_folder($list_id)))
             return false;
 
         return $folder->delete($task['id']);
@@ -853,7 +1058,7 @@
      */
     public function get_attachment_body($id, $task)
     {
-        if ($storage = $this->folders[$task['list']]) {
+        if ($storage = $this->get_folder($task['list'])) {
             return $storage->get_attachment($task['id'], $id);
         }
 
@@ -863,21 +1068,131 @@
     /**
      * 
      */
-    public function tasklist_edit_form($fieldprop)
+    public function tasklist_edit_form($action, $list, $fieldprop)
     {
-        $select = kolab_storage::folder_selector('task', array('name' => 'parent', 'id' => 'taskedit-parentfolder'), null);
-        $fieldprop['parent'] = array(
-            'id' => 'taskedit-parentfolder',
-            'label' => $this->plugin->gettext('parentfolder'),
-            'value' => $select->show(''),
+        if ($list['id'] && ($list = $this->lists[$list['id']])) {
+            $folder_name = $this->get_folder($list['id'])->name; // UTF7
+        }
+        else {
+            $folder_name = '';
+        }
+
+        $storage = $this->rc->get_storage();
+        $delim   = $storage->get_hierarchy_delimiter();
+        $form    = array();
+
+        if (strlen($folder_name)) {
+            $path_imap = explode($delim, $folder_name);
+            array_pop($path_imap);  // pop off name part
+            $path_imap = implode($path_imap, $delim);
+
+            $options = $storage->folder_info($folder_name);
+        }
+        else {
+            $path_imap = '';
+        }
+
+        $hidden_fields[] = array('name' => 'oldname', 'value' => $folder_name);
+
+        // folder name (default field)
+        $input_name = new html_inputfield(array('name' => 'name', 'id' => 'taskedit-tasklistame', 'size' => 20));
+        $fieldprop['name']['value'] = $input_name->show($list['editname'], array('disabled' => ($options['norename'] || $options['protected'])));
+
+        // prevent user from moving folder
+        if (!empty($options) && ($options['norename'] || $options['protected'])) {
+            $hidden_fields[] = array('name' => 'parent', 'value' => $path_imap);
+        }
+        else {
+            $select = kolab_storage::folder_selector('task', array('name' => 'parent', 'id' => 'taskedit-parentfolder'), $folder_name);
+            $fieldprop['parent'] = array(
+                'id'    => 'taskedit-parentfolder',
+                'label' => $this->plugin->gettext('parentfolder'),
+                'value' => $select->show($path_imap),
+            );
+        }
+
+        // General tab
+        $form['properties'] = array(
+            'name' => $this->rc->gettext('properties'),
+            'fields' => array(),
         );
 
-        $formfields = array();
         foreach (array('name','parent','showalarms') as $f) {
-            $formfields[$f] = $fieldprop[$f];
+            $form['properties']['fields'][$f] = $fieldprop[$f];
+        }
+
+        // add folder ACL tab
+        if ($action != 'form-new') {
+            $form['sharing'] = array(
+                'name'    => Q($this->plugin->gettext('tabsharing')),
+                'content' => html::tag('iframe', array(
+                    'src' => $this->rc->url(array('_action' => 'folder-acl', '_folder' => $folder_name, 'framed' => 1)),
+                    'width' => '100%',
+                    'height' => 280,
+                    'border' => 0,
+                    'style' => 'border:0'),
+                '')
+            );
+        }
+
+        $form_html = '';
+        if (is_array($hidden_fields)) {
+            foreach ($hidden_fields as $field) {
+                $hiddenfield = new html_hiddenfield($field);
+                $form_html .= $hiddenfield->show() . "\n";
+            }
+        }
+
+        // create form output
+        foreach ($form as $tab) {
+            if (is_array($tab['fields']) && empty($tab['content'])) {
+                $table = new html_table(array('cols' => 2));
+                foreach ($tab['fields'] as $col => $colprop) {
+                    $label = !empty($colprop['label']) ? $colprop['label'] : $this->plugin->gettext($col);
+
+                    $table->add('title', html::label($colprop['id'], Q($label)));
+                    $table->add(null, $colprop['value']);
+                }
+                $content = $table->show();
+            }
+            else {
+                $content = $tab['content'];
+            }
+
+            if (!empty($content)) {
+                $form_html .= html::tag('fieldset', null, html::tag('legend', null, Q($tab['name'])) . $content) . "\n";
+            }
         }
 
-        return parent::tasklist_edit_form($formfields);
+        return $form_html;
+    }
+
+    /**
+     * Handler to render ACL form for a notes folder
+     */
+    public function folder_acl()
+    {
+        $this->plugin->require_plugin('acl');
+        $this->rc->output->add_handler('folderacl', array($this, 'folder_acl_form'));
+        $this->rc->output->send('tasklist.kolabacl');
     }
 
+    /**
+     * Handler for ACL form template object
+     */
+    public function folder_acl_form()
+    {
+        $folder = rcube_utils::get_input_value('_folder', RCUBE_INPUT_GPC);
+
+        if (strlen($folder)) {
+            $storage = $this->rc->get_storage();
+            $options = $storage->folder_info($folder);
+
+            // get sharing UI from acl plugin
+            $acl = $this->rc->plugins->exec_hook('folder_form',
+                array('form' => array(), 'options' => $options, 'name' => $folder));
+        }
+
+        return $acl['form']['sharing']['content'] ?: html::div('hint', $this->plugin->gettext('aclnorights'));
+    }
 }

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

@@ -41,8 +41,25 @@
   *    'categories' => 'Task category',
   *       'flagged' => 'Boolean value whether this record is flagged',
   *      'complete' => 'Float value representing the completeness state (range 0..1)',
-  *   'sensitivity' => 0|1|2,   // Event sensitivity (0=public, 1=private, 2=confidential)
-  *        'alarms' => '-15M:DISPLAY',  // Reminder settings inspired by valarm definition (e.g. display alert 15 minutes before due time)
+  *      'status'   => 'Task status string according to (NEEDS-ACTION, IN-PROCESS, COMPLETED, CANCELLED) RFC 2445',
+  *       'valarms' => array(           // List of reminders (new format), each represented as a hash array:
+  *                array(
+  *                   'trigger' => '-PT90M',     // ISO 8601 period string prefixed with '+' or '-', or DateTime object
+  *                    'action' => 'DISPLAY|EMAIL|AUDIO',
+  *                  'duration' => 'PT15M',      // ISO 8601 period string
+  *                    'repeat' => 0,            // number of repetitions
+  *               'description' => '',           // text to display for DISPLAY actions
+  *                   'summary' => '',           // message text for EMAIL actions
+  *                 'attendees' => array(),      // list of email addresses to receive alarm messages
+  *                ),
+  *    ),
+  *    'recurrence' => array(   // Recurrence definition according to iCalendar (RFC 2445) specification as list of key-value pairs
+  *              'FREQ' => 'DAILY|WEEKLY|MONTHLY|YEARLY',
+  *          'INTERVAL' => 1...n,
+  *             'UNTIL' => DateTime,
+  *             'COUNT' => 1..n,     // number of times
+  *             'RDATE' => array(),  // complete list of DateTime objects denoting individual repeat dates
+  *     ),
   *     '_fromlist' => 'List identifier where the task was stored before',
   *  );
   */
@@ -75,7 +92,7 @@
      *  showalarms: True if alarms are enabled
      * @return mixed ID of the new list on success, False on error
      */
-    abstract function create_list($prop);
+    abstract function create_list(&$prop);
 
     /**
      * Update properties of an existing tasklist
@@ -87,7 +104,7 @@
      *  showalarms: True if alarms are enabled (if supported)
      * @return boolean True on success, Fales on failure
      */
-    abstract function edit_list($prop);
+    abstract function edit_list(&$prop);
 
     /**
      * Set active/subscribed state of a list
@@ -109,6 +126,15 @@
     abstract function remove_list($prop);
 
     /**
+     * Search for shared or otherwise not listed tasklists the user has access
+     *
+     * @param string Search string
+     * @param string Section/source to search
+     * @return array List of tasklists
+     */
+    abstract function search_lists($query, $source);
+
+    /**
      * Get number of tasks matching the given filter
      *
      * @param array List of lists to count tasks of
@@ -153,6 +179,13 @@
     abstract function dismiss_alarm($id, $snooze = 0);
 
     /**
+     * Remove alarm dismissal or snooze state
+     *
+     * @param  string  Task identifier
+     */
+    abstract public function clear_alarms($id);
+
+    /**
      * Return data of a specific task
      *
      * @param mixed  Hash array with task properties or task UID
@@ -247,6 +280,17 @@
     public function get_attachment_body($id, $task) { }
 
     /**
+     * Helper method to determine whether the given task is considered "complete"
+     *
+     * @param array  $task  Hash array with event properties:
+     * @return boolean True if complete, False otherwiese
+     */
+    public function is_complete($task)
+    {
+        return ($task['complete'] >= 1.0 && empty($task['status'])) || $task['status'] === 'COMPLETED';
+    }
+
+    /**
      * List availabale categories
      * The default implementation reads them from config/user prefs
      */
@@ -260,10 +304,12 @@
      * Build the edit/create form for lists.
      * This gives the drivers the opportunity to add more list properties
      *
-     * @param array List with form fields to be rendered
+     * @param string  The action called this form
+     * @param array   Tasklist properties
+     * @param array   List with form fields to be rendered
      * @return string HTML content of the form
      */
-    public function tasklist_edit_form($formfields)
+    public function tasklist_edit_form($action, $list, $formfields)
     {
         $html = '';
         foreach ($formfields as $field) {
@@ -275,4 +321,15 @@
         return $html;
     }
 
+    /**
+     * Handler for user_delete plugin hook
+     *
+     * @param array Hash array with hook arguments
+     * @return array Return arguments for plugin hooks
+     */
+    public function user_delete($args)
+    {
+        // TO BE OVERRIDDEN
+        return $args;
+    }
 }

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

@@ -4,14 +4,41 @@
 *
 * Examples and documentation at: tagedit.webwork-albrecht.de
 *
-* Copyright (c) 2010 Oliver Albrecht <info@webwork-albrecht.de>
-*
 * License:
 * This work is licensed under a MIT License
-* http://www.opensource.org/licenses/mit-license.php
+*
+* @licstart  The following is the entire license notice for the
+* JavaScript code in this file.
+*
+* Copyright (c) 2010 Oliver Albrecht <info@webwork-albrecht.de>
+* Copyright (c) 2014 Thomas Brüderli <thomas@roundcube.net>
+*
+* Licensed under the MIT licenses
+*
+* Permission is hereby granted, free of charge, to any person obtaining
+* a copy of this software and associated documentation files (the
+* "Software"), to deal in the Software without restriction, including
+* without limitation the rights to use, copy, modify, merge, publish,
+* distribute, sublicense, and/or sell copies of the Software, and to
+* permit persons to whom the Software is furnished to do so, subject to
+* the following conditions:
+*
+* The above copyright notice and this permission notice shall be
+* included in all copies or substantial portions of the Software.
+*
+* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+* NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+* LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+* OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+* WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+*
+* @licend  The above is the entire license notice
+* for the JavaScript code in this file.
 *
 * @author Oliver Albrecht Mial: info@webwork-albrecht.de Twitter: @webworka
-* @version 1.2.1 (11/2011)
+* @version 1.5.2 (06/2014)
 * Requires: jQuery v1.4+, jQueryUI v1.8+, jQuerry.autoGrowInput
 *
 * Example of usage:
@@ -52,6 +79,7 @@
 		options = $.extend(true, {
 			// default options here
 			autocompleteURL: null,
+			checkToDeleteURL: null,
 			deletedPostfix: '-d',
 			addedPostfix: '-a',
 			additionalListClass: '',
@@ -67,14 +95,15 @@
 				}
 			},
 			breakKeyCodes: [ 13, 44 ],
-            checkNewEntriesCaseSensitive: false,
+			checkNewEntriesCaseSensitive: false,
 			texts: {
 				removeLinkTitle: 'Remove from list.',
 				saveEditLinkTitle: 'Save changes.',
 				deleteLinkTitle: 'Delete this tag from database.',
 				deleteConfirmation: 'Are you sure to delete this entry?',
 				deletedElementTitle: 'This Element will be deleted.',
-				breakEditLinkTitle: 'Cancel'
+				breakEditLinkTitle: 'Cancel',
+                forceDeleteConfirmation: 'There are more records using this tag, are you sure do you want to remove it?'
 			},
 			tabindex: false
 		}, options || {});
@@ -96,6 +125,7 @@
 		}
 
 		var elements = this;
+		var focusItem = null;
 
 		var baseNameRegexp = new RegExp("^(.*)\\[([0-9]*?("+options.deletedPostfix+"|"+options.addedPostfix+")?)?\]$", "i");
 
@@ -124,16 +154,18 @@
 		function inputsToList() {
 			var html = '<ul class="tagedit-list '+options.additionalListClass+'">';
 
-			elements.each(function() {
+			elements.each(function(i) {
 				var element_name = $(this).attr('name').match(baseNameRegexp);
 				if(element_name && element_name.length == 4 && (options.deleteEmptyItems == false || $(this).val().length > 0)) {
 					if(element_name[1].length > 0) {
-						var elementId = typeof element_name[2] != 'undefined'? element_name[2]: '';
+						var elementId = typeof element_name[2] != 'undefined'? element_name[2]: '',
+							domId = 'tagedit-' + baseName + '-' + (elementId || i);
 
-						html += '<li class="tagedit-listelement tagedit-listelement-old">';
-						html += '<span dir="'+options.direction+'">' + $(this).val() + '</span>';
+						html += '<li class="tagedit-listelement tagedit-listelement-old" aria-labelledby="'+domId+'">';
+						html += '<span dir="'+options.direction+'" id="'+domId+'">' + $(this).val() + '</span>';
 						html += '<input type="hidden" name="'+baseName+'['+elementId+']" value="'+$(this).val()+'" />';
-						html += '<a class="tagedit-close" title="'+options.texts.removeLinkTitle+'">x</a>';
+						if (options.allowDelete)
+							html += '<a class="tagedit-close" title="'+options.texts.removeLinkTitle+'" aria-label="'+options.texts.removeLinkTitle+' '+$(this).val()+'">x</a>';
 						html += '</li>';
 					}
 				}
@@ -155,7 +187,8 @@
 			// put an input field at the End
 			// Put an empty element at the end
 			html = '<li class="tagedit-listelement tagedit-listelement-new">';
-			html += '<input type="text" name="'+baseName+'[]" value="" id="tagedit-input" disabled="disabled" class="tagedit-input-disabled" dir="'+options.direction+'"/>';
+			if (options.allowAdd)
+				html += '<input type="text" name="'+baseName+'[]" value="" id="tagedit-input" disabled="disabled" class="tagedit-input-disabled" dir="'+options.direction+'"/>';
 			html += '</li>';
 			html += '</ul>';
 
@@ -169,27 +202,28 @@
 					.each(function() {
 						$(this).autoGrowInput({comfortZone: 15, minWidth: 15, maxWidth: 20000});
 
-						// Event ist triggert in case of choosing an item from the autocomplete, or finish the input
+						// Event is triggert in case of choosing an item from the autocomplete, or finish the input
 						$(this).bind('transformToTag', function(event, id) {
-							var oldValue = (typeof id != 'undefined' && id.length > 0);
+							var oldValue = (typeof id != 'undefined' && (id.length > 0 || id > 0));
 
-							var checkAutocomplete = oldValue == true? false : true;
+							var checkAutocomplete = oldValue == true || options.autocompleteOptions.noCheck ? false : true;
 							// check if the Value ist new
 							var isNewResult = isNew($(this).val(), checkAutocomplete);
-							if(isNewResult[0] === true || isNewResult[1] != null) {
+							if(isNewResult[0] === true || (isNewResult[0] === false && typeof isNewResult[1] == 'string')) {
 
-								if(oldValue == false && isNewResult[1] != null) {
+								if(oldValue == false && typeof isNewResult[1] == 'string') {
 									oldValue = true;
 									id = isNewResult[1];
 								}
 
 								if(options.allowAdd == true || oldValue) {
+									var domId = 'tagedit-' + baseName + '-' + id;
 									// Make a new tag in front the input
-									html = '<li class="tagedit-listelement tagedit-listelement-old">';
-									html += '<span dir="'+options.direction+'">' + $(this).val() + '</span>';
+									html = '<li class="tagedit-listelement tagedit-listelement-old" aria-labelledby="'+domId+'">';
+									html += '<span dir="'+options.direction+'" id="'+domId+'">' + $(this).val() + '</span>';
 									var name = oldValue? baseName + '['+id+options.addedPostfix+']' : baseName + '[]';
 									html += '<input type="hidden" name="'+name+'" value="'+$(this).val()+'" />';
-									html += '<a class="tagedit-close" title="'+options.texts.removeLinkTitle+'">x</a>';
+									html += '<a class="tagedit-close" title="'+options.texts.removeLinkTitle+'" aria-label="'+options.texts.removeLinkTitle+' '+$(this).val()+'">x</a>';
 									html += '</li>';
 
 									$(this).parent().before(html);
@@ -199,7 +233,8 @@
 
 							// close autocomplete
 							if(options.autocompleteOptions.source) {
-								$(this).autocomplete( "close" );
+								if($(this).is(':ui-autocomplete'))
+									$(this).autocomplete( "close" );
 							}
 
 						})
@@ -207,8 +242,19 @@
 							var code = event.keyCode > 0? event.keyCode : event.which;
 
 							switch(code) {
+								case 46:
+									if (!focusItem)
+										break;
 								case 8: // BACKSPACE
-									if($(this).val().length == 0) {
+									if(focusItem) {
+										focusItem.fadeOut(options.animSpeed, function() {
+											$(this).remove();
+										})
+										unfocusItem();
+										event.preventDefault();
+										return false;
+									}
+									else if($(this).val().length == 0) {
 										// delete Last Tag
 										var elementToRemove = elements.find('li.tagedit-listelement-old').last();
 										elementToRemove.fadeOut(options.animSpeed, function() {elementToRemove.remove();})
@@ -222,7 +268,41 @@
 										event.preventDefault();
 										return false;
 									}
-								break;
+									break;
+								case 37: // LEFT
+								case 39: // RIGHT
+									if($(this).val().length == 0) {
+										// select previous Tag
+										var inc = code == 37 ? -1 : 1,
+											items = elements.find('li.tagedit-listelement-old')
+											x = items.length, next = 0;
+										items.each(function(i, elem) {
+											if ($(elem).hasClass('tagedit-listelement-focus')) {
+												x = i;
+												return true;
+											}
+										});
+										unfocusItem();
+										next = Math.max(0, x + inc);
+										if (items.get(next)) {
+											focusItem = items.eq(next).addClass('tagedit-listelement-focus');
+											$(this).attr('aria-activedescendant', focusItem.attr('aria-labelledby'))
+
+											if(options.autocompleteOptions.source != false) {
+												$(this).autocomplete('close').autocomplete('disable');
+											}
+										}
+										event.preventDefault();
+										return false;
+									}
+									break;
+								default:
+									// ignore input if an item is focused
+									if (focusItem !== null) {
+										event.preventDefault();
+										event.bubble = false;
+										return false;
+									}
 							}
 							return true;
 						})
@@ -232,8 +312,11 @@
 								if($(this).val().length > 0 && $('ul.ui-autocomplete #ui-active-menuitem').length == 0) {
 									$(this).trigger('transformToTag');
 								}
-							event.preventDefault();
-							return false;
+								event.preventDefault();
+								return false;
+							}
+							else if($(this).val().length > 0){
+								unfocusItem();
 							}
 							return true;
 						})
@@ -255,9 +338,15 @@
 								var input = $(this);
 								$(this).data('blurtimer', window.setTimeout(function() {input.val('');}, 500));
 							}
+							unfocusItem();
+							// restore tabindex when widget looses focus
+							if (options.tabindex)
+								elements.attr('tabindex', options.tabindex);
 						})
 						.focus(function() {
 							window.clearTimeout($(this).data('blurtimer'));
+							// remove tabindex on <ul> because #tagedit-input now has it
+							elements.attr('tabindex', '-1');
 						});
 
 						if(options.autocompleteOptions.source != false) {
@@ -270,6 +359,7 @@
 						case 'A':
 							$(event.target).parent().fadeOut(options.animSpeed, function() {
 								$(event.target).parent().remove();
+								elements.find('#tagedit-input').focus();
 								});
 							break;
 						case 'INPUT':
@@ -288,11 +378,25 @@
 					}
 					return false;
 				})
-				// forward focus event
+				// forward focus event (on tabbing through the form)
 				.focus(function(e){ $(this).click(); })
 		}
 
 		/**
+		 * Remove class and reference to currently focused tag item
+		 */
+		function unfocusItem() {
+			if(focusItem){
+				if(options.autocompleteOptions.source != false) {
+					elements.find('#tagedit-input').autocomplete('enable');
+				}
+				focusItem.removeClass('tagedit-listelement-focus');
+				focusItem = null;
+				elements.find('#tagedit-input').removeAttr('aria-activedescendant');
+			}
+		}
+
+		/**
 		* Sets all Actions and events for editing an Existing Tag.
 		*
 		* @param event {object} The original Event that was given
@@ -321,7 +425,7 @@
 				}
 
 				textfield.remove();
-				$(this).find('a.tagedit-save, a.tagedit-break, a.tagedit-delete, tester').remove(); // Workaround. This normaly has to be done by autogrow Plugin
+				$(this).find('a.tagedit-save, a.tagedit-break, a.tagedit-delete').remove(); // Workaround. This normaly has to be done by autogrow Plugin
 				$(this).removeClass('tagedit-listelement-edit').unbind('finishEdit');
 				return false;
 			});
@@ -356,7 +460,16 @@
 					.click(function() {
                         window.clearTimeout(closeTimer);
 						if(confirm(options.texts.deleteConfirmation)) {
-							markAsDeleted($(this).parent());
+                            var canDelete = checkToDelete($(this).parent());
+                            if (!canDelete && confirm(options.texts.forceDeleteConfirmation)) {
+                                markAsDeleted($(this).parent());
+                            }
+
+                            if(canDelete) {
+                                markAsDeleted($(this).parent());
+                            }
+
+                            $(this).parent().find(':text').trigger('finishEdit', [true]);
 						}
                         else {
                             $(this).parent().find(':text').trigger('finishEdit', [true]);
@@ -386,6 +499,42 @@
 					});
 		}
 
+        /**
+         * Verifies if the tag select to be deleted is used by other records using an Ajax request.
+         *
+         * @param element
+         * @returns {boolean}
+         */
+        function checkToDelete(element) {
+            // if no URL is provide will not verify
+            if(options.checkToDeleteURL === null) {
+                return false;
+            }
+
+            var inputName = element.find('input:hidden').attr('name');
+            var idPattern = new RegExp('\\d');
+            var tagId = inputName.match(idPattern);
+            var checkResult = false;
+
+            $.ajax({
+                async   : false,
+                url     : options.checkToDeleteURL,
+                dataType: 'json',
+                type    : 'POST',
+                data    : { 'tagId' : tagId},
+                complete: function (XMLHttpRequest, textStatus) {
+
+                    // Expected JSON Object: { "success": Boolean, "allowDelete": Boolean}
+                    var result = $.parseJSON(XMLHttpRequest.responseText);
+                    if(result.success === true){
+                        checkResult = result.allowDelete;
+                    }
+                }
+            });
+
+            return checkResult;
+        }
+
 		/**
 		* Marks a single Tag as deleted.
 		*
@@ -451,12 +600,11 @@
 						}
 					});
 				}
-
+                
 				// If there is an entry for that already in the autocomplete, don't use it (Check could be case sensitive or not)
 				for (var i = 0; i < result.length; i++) {
-					var label = typeof result[i] == 'string' ? result[i] : result[i].label;
-					if (options.checkNewEntriesCaseSensitive == false)
-						label = label.toLowerCase();
+					var resultValue = result[i].label? result[i].label : result[i];
+					var label = options.checkNewEntriesCaseSensitive == true? resultValue : resultValue.toLowerCase();
 					if (label == compareValue) {
 						isNew = false;
 						autoCompleteId = typeof result[i] == 'string' ? i : result[i].id;
@@ -476,60 +624,60 @@
 // See related thread: http://stackoverflow.com/questions/931207/is-there-a-jquery-autogrow-plugin-for-text-fields
         
 $.fn.autoGrowInput = function(o) {
-	
-	o = $.extend({
-		maxWidth: 1000,
-		minWidth: 0,
-		comfortZone: 70
-	}, o);
-	
-	this.filter('input:text').each(function(){
-		
-		var minWidth = o.minWidth || $(this).width(),
-			val = '',
-			input = $(this),
-			testSubject = $('<tester/>').css({
-				position: 'absolute',
-				top: -9999,
-				left: -9999,
-				width: 'auto',
-				fontSize: input.css('fontSize'),
-				fontFamily: input.css('fontFamily'),
-				fontWeight: input.css('fontWeight'),
-				letterSpacing: input.css('letterSpacing'),
-				whiteSpace: 'nowrap'
-			}),
-			check = function() {
-				
-				if (val === (val = input.val())) {return;}
-				
-				// Enter new content into testSubject
-				var escaped = val.replace(/&/g, '&amp;').replace(/\s/g,'&nbsp;').replace(/</g, '&lt;').replace(/>/g, '&gt;');
-				testSubject.html(escaped);
-				
-				// Calculate new width + whether to change
-				var testerWidth = testSubject.width(),
-					newWidth = (testerWidth + o.comfortZone) >= minWidth ? testerWidth + o.comfortZone : minWidth,
-					currentWidth = input.width(),
-					isValidWidthChange = (newWidth < currentWidth && newWidth >= minWidth)
-										 || (newWidth > minWidth && newWidth < o.maxWidth);
-				
-				// Animate width
-				if (isValidWidthChange) {
-					input.width(newWidth);
-				}
-				
-			};
-			
-		testSubject.insertAfter(input);
-		
-		$(this).bind('keyup keydown blur update', check);
-		
-		check();
-	});
-	
-	return this;
+    
+    o = $.extend({
+        maxWidth: 1000,
+        minWidth: 0,
+        comfortZone: 70
+    }, o);
+    
+    this.filter('input:text').each(function(){
+        
+        var minWidth = o.minWidth || $(this).width(),
+            val = '',
+            input = $(this),
+            testSubject = $('<tester/>').css({
+                position: 'absolute',
+                top: -9999,
+                left: -9999,
+                width: 'auto',
+                fontSize: input.css('fontSize'),
+                fontFamily: input.css('fontFamily'),
+                fontWeight: input.css('fontWeight'),
+                letterSpacing: input.css('letterSpacing'),
+                whiteSpace: 'nowrap'
+            }),
+            check = function() {
+                
+                if (val === (val = input.val())) {return;}
+                
+                // Enter new content into testSubject
+                var escaped = val.replace(/&/g, '&amp;').replace(/\s/g,'&nbsp;').replace(/</g, '&lt;').replace(/>/g, '&gt;');
+                testSubject.html(escaped);
+                
+                // Calculate new width + whether to change
+                var testerWidth = testSubject.width(),
+                    newWidth = (testerWidth + o.comfortZone) >= minWidth ? testerWidth + o.comfortZone : minWidth,
+                    currentWidth = input.width(),
+                    isValidWidthChange = (newWidth < currentWidth && newWidth >= minWidth)
+                                         || (newWidth > minWidth && newWidth < o.maxWidth);
+                
+                // Animate width
+                if (isValidWidthChange) {
+                    input.width(newWidth);
+                }
+                
+            };
+            
+        testSubject.insertAfter(input);
+        
+        $(this).bind('keyup keydown blur update', check);
+        
+        check();
+    });
+    
+    return this;
 
 };
 
-})(jQuery);
+})(jQuery);
\ No newline at end of file

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

roundcubemail-plugins-kolab-3.2.tar.gz/plugins/tasklist/localization/ca_ES.inc Added

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

roundcubemail-plugins-kolab-3.2.tar.gz/plugins/tasklist/localization/da_DK.inc Added

@@ -0,0 +1,61 @@
+<?php
+$labels['navtitle'] = 'Opgaver';
+$labels['lists'] = 'Opgavelister';
+$labels['list'] = 'Opgaveliste';
+$labels['tags'] = 'Mærker';
+$labels['newtask'] = 'Ny opgave';
+$labels['createnewtask'] = 'Opret ny opgave (eks. Lørdag, Slå græsplænen)';
+$labels['createfrommail'] = 'Gem som opgave';
+$labels['mark'] = 'Markér';
+$labels['unmark'] = 'Fravælg';
+$labels['edit'] = 'Redigér';
+$labels['delete'] = 'Slet';
+$labels['title'] = 'Titel';
+$labels['description'] = 'Beskrivelse';
+$labels['datetime'] = 'Forfalder';
+$labels['start'] = 'Start';
+$labels['alarms'] = 'Påmindelse';
+$labels['all'] = 'Alle';
+$labels['flagged'] = 'Markeret';
+$labels['complete'] = 'Udført';
+$labels['overdue'] = 'Forfalden';
+$labels['today'] = 'I dag';
+$labels['tomorrow'] = 'I morgen';
+$labels['next7days'] = 'Næste 7 dage';
+$labels['later'] = 'Senere';
+$labels['nodate'] = 'ingen dato';
+$labels['removetag'] = 'Fjern';
+$labels['taskdetails'] = 'Detaljer';
+$labels['newtask'] = 'Ny opgave';
+$labels['edittask'] = 'Redigér opgave';
+$labels['save'] = 'Gem';
+$labels['cancel'] = 'Annullér';
+$labels['addsubtask'] = 'Tilføj delopgave';
+$labels['deletetask'] = 'Slet opgave';
+$labels['deletethisonly'] = 'Slet kunne denne opgave';
+$labels['deletewithchilds'] = 'Slette inklusive alle delopgaver';
+$labels['tabsummary'] = 'Resumé';
+$labels['tabrecurrence'] = 'Gentagelse';
+$labels['tabattachments'] = 'Vedhæftninger';
+$labels['tabsharing'] = 'Deling';
+$labels['editlist'] = 'Redigér liste';
+$labels['createlist'] = 'Tilføj liste';
+$labels['listactions'] = 'Tilvalg for liste...';
+$labels['listname'] = 'Navn';
+$labels['import'] = 'Import';
+$labels['viewoptions'] = 'Vis indstillinger';
+$labels['focusview'] = 'Vis kun denne liste';
+// date words
+$labels['on'] = 'til';
+$labels['at'] = 'ved';
+$labels['this'] = 'denne';
+$labels['next'] = 'næste';
+// mesages
+$labels['savingdata'] = 'Gemmer data...';
+$labels['errorsaving'] = 'Kunne ikke gemme data.';
+$labels['notasksfound'] = 'Fandt ingen opgaver ud fra angivne kriterie';
+$labels['invalidstartduedates'] = 'Startdato må ikke være senere end tidsfrist.';
+$labels['deletetasktconfirm'] = 'Vil du virkelig slette denne opgave?';
+$labels['deleteparenttasktconfirm'] = 'Vil du virkelig slette denne opgaver og alle dens delopgaver?';
+$labels['deletelistconfirm'] = 'Vil du virkelig slette denne liste og alle dens opgaver?';
+$labels['deletelistconfirmrecursive'] = 'Vil du virkelig slette denne liste og alle dens dellister og opgaver?';

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

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

@@ -2,6 +2,7 @@
 $labels['navtitle'] = 'Aufgaben';
 $labels['lists'] = 'Aufgabenlisten';
 $labels['list'] = 'Aufgabenliste';
+$labels['tags'] = 'Schlagworte';
 $labels['newtask'] = 'Neue Aufgabe';
 $labels['createnewtask'] = 'Neue Aufgabe erstellen (z.B. Samstag, Rasen mähen)';
 $labels['createfrommail'] = 'Aufgabe speichern';
@@ -11,6 +12,7 @@
 $labels['delete'] = 'Löschen';
 $labels['title'] = 'Titel';
 $labels['description'] = 'Beschreibung';
+$labels['datetime'] = 'Fällig';
 $labels['start'] = 'Beginn';
 $labels['alarms'] = 'Erinnerung';
 $labels['all'] = 'Alle';
@@ -40,12 +42,16 @@
 $labels['createlist'] = 'Liste hinzufügen';
 $labels['listactions'] = 'Listeneinstellungen…';
 $labels['listname'] = 'Name';
-$labels['showalarms'] = 'Erinnerungen anzeigen';
+$labels['showalarms'] = 'Show reminders';
 $labels['import'] = 'Importieren';
+$labels['viewoptions'] = 'Ansicht-Einstellungen';
+$labels['focusview'] = 'Nur diese Liste anzeigen';
+// date words
 $labels['on'] = 'am';
 $labels['at'] = 'um';
 $labels['this'] = 'dies';
 $labels['next'] = 'weiter';
+// mesages
 $labels['savingdata'] = 'Daten werden gespeichert…';
 $labels['errorsaving'] = 'Daten konnten nicht gespeichert werden.';
 $labels['notasksfound'] = 'Keine Aufgabe erfüllt die angelegten Kriterien';
@@ -53,3 +59,4 @@
 $labels['deletetasktconfirm'] = 'Diese Aufgabe wirklich löschen?';
 $labels['deleteparenttasktconfirm'] = 'Diese Aufgabe wirklich mit allen Teilaufgaben löschen?';
 $labels['deletelistconfirm'] = 'Diese Aufgabenliste wirklich mit allen Aufgaben löschen?';
+$labels['deletelistconfirmrecursive'] = 'Soll diese Liste wirklich mit allen Aufgaben und Unterlisten gelöscht werden?';

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

@@ -5,8 +5,15 @@
 $labels['lists'] = 'Tasklists';
 $labels['list'] = 'Tasklist';
 $labels['tags'] = 'Tags';
+$labels['tasklistsubscribe'] = 'List permanently';
+$labels['listsearchresults'] = 'Available Tasklists';
+$labels['findlists'] = 'Find tasklists...';
+$labels['searchterms'] = 'Search terms';
+$labels['notasklistsfound'] = 'No tasklists found';
+$labels['nrtasklistsfound'] = '$nr tasklists found';
 
 $labels['newtask'] = 'New Task';
+$labels['createtask'] = 'Create Task <Enter>';
 $labels['createnewtask'] = 'Create new Task (e.g. Saturday, Mow the lawn)';
 $labels['createfrommail'] = 'Save as task';
 $labels['mark'] = 'Mark';
@@ -16,8 +23,16 @@
 $labels['title'] = 'Title';
 $labels['description'] = 'Description';
 $labels['datetime'] = 'Due';
+$labels['duetime'] = 'Due time';
 $labels['start'] = 'Start';
+$labels['starttime'] = 'Start time';
 $labels['alarms'] = 'Reminder';
+$labels['repeat'] = 'Repeat';
+$labels['status'] = 'Status';
+$labels['status-needs-action'] = 'Needs action';
+$labels['status-in-process'] = 'In process';
+$labels['status-completed'] = 'Completed';
+$labels['status-cancelled'] = 'Cancelled';
 
 $labels['all'] = 'All';
 $labels['flagged'] = 'Flagged';
@@ -39,6 +54,7 @@
 $labels['deletetask'] = 'Delete task';
 $labels['deletethisonly'] = 'Delete this task only';
 $labels['deletewithchilds'] = 'Delete with all subtasks';
+$labels['taskactions'] = 'Task options...';
 
 $labels['tabsummary'] = 'Summary';
 $labels['tabrecurrence'] = 'Recurrence';
@@ -69,3 +85,14 @@
 $labels['deleteparenttasktconfirm'] = 'Do you really want to delete this task and all its subtasks?';
 $labels['deletelistconfirm'] = 'Do you really want to delete this list with all its tasks?';
 $labels['deletelistconfirmrecursive'] = 'Do you really want to delete this list with all its sub-lists and tasks?';
+$labels['aclnorights'] = 'You do not have administrator rights on this task list.';
+
+// (hidden) titles and labels for accessibility annotations
+$labels['quickaddinput'] = 'New task date and title';
+$labels['arialabelquickaddbox'] = 'Quick add new task';
+$labels['arialabelsearchform'] = 'Task search form';
+$labels['arialabelquicksearchbox'] = 'Task search input';
+$labels['arialabellistsearchform'] = 'Tasklists search form';
+$labels['arialabeltaskselector'] = 'List mode';
+$labels['arialabeltasklisting'] = 'Tasks listing';
+

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

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

roundcubemail-plugins-kolab-3.2.tar.gz/plugins/tasklist/localization/fi_FI.inc Added

@@ -0,0 +1,54 @@
+<?php
+$labels['navtitle'] = 'Tehtävät';
+$labels['lists'] = 'Tehtävätlistat';
+$labels['list'] = 'Tehtävälista';
+$labels['tags'] = 'Tunnisteet';
+$labels['newtask'] = 'Uusi tehtävä';
+$labels['createnewtask'] = 'Luo uusi tehtävä (esim. Sunnuntai, leikkaa ruoho)';
+$labels['createfrommail'] = 'Tallenna tehtävänä';
+$labels['mark'] = 'Merkitse';
+$labels['unmark'] = 'Poista merkintä';
+$labels['edit'] = 'Muokkaa';
+$labels['delete'] = 'Poista';
+$labels['description'] = 'Kuvaus';
+$labels['datetime'] = 'Erääntyy';
+$labels['start'] = 'Alkaa';
+$labels['alarms'] = 'Muistutus';
+$labels['all'] = 'Kaikki';
+$labels['flagged'] = 'Liputettu';
+$labels['complete'] = 'Valmiina';
+$labels['overdue'] = 'Myöhässä';
+$labels['today'] = 'Tänään';
+$labels['tomorrow'] = 'Huomenna';
+$labels['next7days'] = 'Seuraavat 7 päivää';
+$labels['later'] = 'Myöhemmin';
+$labels['nodate'] = 'ei päivää';
+$labels['removetag'] = 'Poista';
+$labels['taskdetails'] = 'Tiedot';
+$labels['newtask'] = 'Uusi tehtävä';
+$labels['edittask'] = 'Muokkaa tehtävää';
+$labels['save'] = 'Tallenna';
+$labels['cancel'] = 'Peru';
+$labels['addsubtask'] = 'Lisää alitehtävä';
+$labels['deletetask'] = 'Poista tehtävä';
+$labels['deletethisonly'] = 'Poista vain tämä tehtävä';
+$labels['deletewithchilds'] = 'Poista alitehtävineen';
+$labels['tabsummary'] = 'Yhteenveto';
+$labels['tabrecurrence'] = 'Toistuminen';
+$labels['tabattachments'] = 'Liitteet';
+$labels['tabsharing'] = 'Jakaminen';
+$labels['editlist'] = 'Muokkaa listaa';
+$labels['createlist'] = 'Lisää lista';
+$labels['listactions'] = 'Listan valinnat...';
+$labels['listname'] = 'Nimi';
+$labels['import'] = 'Tuo';
+// date words
+// mesages
+$labels['savingdata'] = 'Tallennetaan tietoja...';
+$labels['errorsaving'] = 'Tietojen tallenntaminen epäonnistui.';
+$labels['notasksfound'] = 'Ehtoja vastaavia tehtäviä ei löytynyt';
+$labels['invalidstartduedates'] = 'Aloituspäivän tulee olla vanhempi kuin eräpäivän.';
+$labels['deletetasktconfirm'] = 'Haluatko varmasti poistaa tämän tehtävän?';
+$labels['deleteparenttasktconfirm'] = 'Haluatko varmasti poistaa tämän tehtävän kaikkine alitehtävineen?';
+$labels['deletelistconfirm'] = 'Haluatko varmasti poistaa tämän listan ja sen kaikki tehtävät?';
+$labels['deletelistconfirmrecursive'] = 'Haluatko varmasti poistaa tämän listan, sen alilistat ja tehtävät?';

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

@@ -5,13 +5,14 @@
 $labels['tags'] = 'Étiquettes';
 $labels['newtask'] = 'Nouvelle tâche';
 $labels['createnewtask'] = 'Créer une nouvelle tâche (ex : Samedi, tondre la pelouse)';
-$labels['createfrommail'] = 'Enregistrer la tâche';
+$labels['createfrommail'] = 'Sauvegarder comme une tâche';
 $labels['mark'] = 'Sélectionner';
 $labels['unmark'] = 'Désélectionner';
 $labels['edit'] = 'Modifier';
-$labels['delete'] = 'Supprimet';
+$labels['delete'] = 'Supprimer';
 $labels['title'] = 'Titre';
 $labels['description'] = 'Description';
+$labels['datetime'] = 'Fin';
 $labels['start'] = 'Début';
 $labels['alarms'] = 'Rappel';
 $labels['all'] = 'Tous';
@@ -41,16 +42,21 @@
 $labels['createlist'] = 'Ajouter une liste';
 $labels['listactions'] = 'Liste des options';
 $labels['listname'] = 'Nom';
-$labels['showalarms'] = 'Montrer les alarmes';
+$labels['showalarms'] = 'Afficher les rappels';
 $labels['import'] = 'Importer';
+$labels['viewoptions'] = 'Options d\'affichage';
+$labels['focusview'] = 'Afficher uniquement cette liste';
+// date words
 $labels['on'] = 'sur';
 $labels['at'] = 'à';
 $labels['this'] = 'ce';
 $labels['next'] = 'suivant';
+// mesages
 $labels['savingdata'] = 'Enregistrer...';
-$labels['errorsaving'] = 'Échec de l\'enregistrement';
+$labels['errorsaving'] = 'Échec lors du sauvegardement des donnés';
 $labels['notasksfound'] = 'Pas de tâche trouvé avec les critères sélectionnés';
 $labels['invalidstartduedates'] = 'La date de début ne doit pas être supérieur à la date de fin';
 $labels['deletetasktconfirm'] = 'Êtes-vous sur de vouloir supprimer cette tâche?';
 $labels['deleteparenttasktconfirm'] = 'Êtes-vous sur de vouloir supprimer cette tâche et ses sous-tâches?';
 $labels['deletelistconfirm'] = 'Êtes-vous sur de vouloir supprimer cette liste et toutes ses tâches?';
+$labels['deletelistconfirmrecursive'] = 'Voulez-vous vraiment supprimer cette liste avec tous ses sous-listes et tâches?';

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

@@ -1,6 +1,62 @@
 <?php
+$labels['navtitle'] = 'Feladatok';
+$labels['lists'] = 'Feladatlisták';
+$labels['list'] = 'Feladatlista';
+$labels['tags'] = 'Kulcsszavak';
+$labels['newtask'] = 'Új feladat';
+$labels['createnewtask'] = 'Új feladat címe';
+$labels['createfrommail'] = 'Mentés feladatként';
+$labels['mark'] = 'Jelölés be';
+$labels['unmark'] = 'Jelölés ki';
+$labels['edit'] = 'Módosítás';
+$labels['delete'] = 'Törlés';
+$labels['title'] = 'Tárgy';
 $labels['description'] = 'Leírás';
-$labels['removetag'] = 'Törlés';
+$labels['datetime'] = 'Határidő';
+$labels['start'] = 'Kezdet';
+$labels['alarms'] = 'Emlékeztető';
+$labels['all'] = 'Minden feladat';
+$labels['flagged'] = 'Jelölt';
+$labels['complete'] = 'Teljesített';
+$labels['overdue'] = 'Túllépett';
+$labels['today'] = 'Mai napi';
+$labels['tomorrow'] = 'Holnapi';
+$labels['next7days'] = 'Következő 7 napi';
+$labels['later'] = 'Későbbi';
+$labels['nodate'] = 'Dátum nélküli';
+$labels['removetag'] = 'Eltávolítás';
+$labels['taskdetails'] = 'Részletek';
+$labels['newtask'] = 'Új feladat';
+$labels['edittask'] = 'Módosítás';
 $labels['save'] = 'Mentés';
 $labels['cancel'] = 'Mégse';
+$labels['addsubtask'] = 'Új részfeladat';
+$labels['deletetask'] = 'Törlés';
+$labels['deletethisonly'] = 'Csak ezen feladat törlése';
+$labels['deletewithchilds'] = 'Törlés részfeladatokkal együtt';
 $labels['tabsummary'] = 'Tárgy';
+$labels['tabrecurrence'] = 'Ismétlődés';
+$labels['tabattachments'] = 'Mellékletek';
+$labels['tabsharing'] = 'Megosztás';
+$labels['editlist'] = 'Lista szerkesztése';
+$labels['createlist'] = 'Lista hozzáadása';
+$labels['listactions'] = 'Lista beállítások...';
+$labels['listname'] = 'Név';
+$labels['showalarms'] = 'Emlékeztetők megjelenítése';
+$labels['import'] = 'Importálás';
+$labels['viewoptions'] = 'Opciók';
+$labels['focusview'] = 'Csak ezen lista megjelenítése';
+// date words
+$labels['on'] = 'dátum';
+$labels['at'] = 'időpont';
+$labels['this'] = 'ezen';
+$labels['next'] = 'következő';
+// mesages
+$labels['savingdata'] = 'Adatok mentése...';
+$labels['errorsaving'] = 'Az adatok mentése nem sikerült';
+$labels['notasksfound'] = 'A megadott kritériumoknak nem felelt meg egy feladat sem';
+$labels['invalidstartduedates'] = 'A kezdeti idő nem lehet később, mint a határidő';
+$labels['deletetasktconfirm'] = 'Biztos benne, hogy törölni szeretné ezt a feladatot?';
+$labels['deleteparenttasktconfirm'] = 'DBiztos benne, hogy törölni szeretné ezt a feladatot, az összes részfeladattal együtt?';
+$labels['deletelistconfirm'] = 'Biztos benne, hogy törölni szeretné ezt a listát, az összes benne lévő feladattal együtt?';
+$labels['deletelistconfirmrecursive'] = 'Biztos benne, hogy törölni szeretné ezt a listát, az összes benne lévő listával és feladattal együtt?';

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

@@ -1,6 +1,55 @@
 <?php
+$labels['navtitle'] = 'Attività';
+$labels['lists'] = 'Elenchi attività';
+$labels['list'] = 'Elenco attività';
+$labels['tags'] = 'Etichette';
+$labels['newtask'] = 'Nuova attività';
+$labels['createnewtask'] = 'Crea una nuova attività (es. Saturday, Falciare il prato)';
+$labels['createfrommail'] = 'Salva come attività';
+$labels['mark'] = 'Importante';
+$labels['unmark'] = 'Non importante';
+$labels['edit'] = 'Modifica';
+$labels['delete'] = 'Elimina';
+$labels['title'] = 'Titolo';
 $labels['description'] = 'Descrizione';
+$labels['datetime'] = 'Scadenza';
+$labels['start'] = 'Inizio';
+$labels['alarms'] = 'Promemoria';
+$labels['all'] = 'Tutto';
+$labels['flagged'] = 'Importanti';
+$labels['complete'] = 'Fatto';
+$labels['overdue'] = 'In ritardo';
+$labels['today'] = 'Oggi';
+$labels['tomorrow'] = 'Domani';
+$labels['next7days'] = 'Prossimi 7 giorni';
+$labels['later'] = 'Dopo';
+$labels['nodate'] = 'Senza data';
 $labels['removetag'] = 'Elimina';
+$labels['taskdetails'] = 'Dettagli';
+$labels['newtask'] = 'Nuova attività';
+$labels['edittask'] = 'Modifica attività';
 $labels['save'] = 'Salva';
 $labels['cancel'] = 'Annulla';
+$labels['addsubtask'] = 'Aggiungi sotto-attività';
+$labels['deletetask'] = 'Elimina attività';
+$labels['deletethisonly'] = 'Elimina solo questa attività';
+$labels['deletewithchilds'] = 'Elimina con tutte le sotto-attività';
 $labels['tabsummary'] = 'Oggetto';
+$labels['tabrecurrence'] = 'Ricorrenza';
+$labels['tabattachments'] = 'Allegati';
+$labels['tabsharing'] = 'Condivisione';
+$labels['editlist'] = 'Modifca elenco';
+$labels['createlist'] = 'Aggiungi elenco';
+$labels['listactions'] = 'Opzioni elenco...';
+$labels['listname'] = 'Nome';
+$labels['showalarms'] = 'Mostra promemoria';
+$labels['import'] = 'Importa';
+$labels['viewoptions'] = 'Vista opzioni';
+$labels['focusview'] = 'Mostra solo questo elenco';
+// date words
+// mesages
+$labels['savingdata'] = 'Salvataggio dati...';
+$labels['notasksfound'] = 'Nessuna attività trovata.';
+$labels['invalidstartduedates'] = 'La data di inizio non può essere successiva a quella di scadenza.';
+$labels['deletetasktconfirm'] = 'Eliminare davvero questa attività?';
+$labels['deleteparenttasktconfirm'] = 'Eliminare davvero questa attività e tutte le sotto-attività?';

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

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

@@ -2,7 +2,7 @@
 $labels['navtitle'] = 'Taken';
 $labels['lists'] = 'Takenlijsten';
 $labels['list'] = 'Takenlijst';
-$labels['tags'] = 'Tags';
+$labels['tags'] = 'Labels';
 $labels['newtask'] = 'Nieuwe Taak';
 $labels['createnewtask'] = 'Creer een nieuwe Taak (bijv. Zaterdag, gras maaien)';
 $labels['createfrommail'] = 'Als taak opslaan';
@@ -12,6 +12,7 @@
 $labels['delete'] = 'Verwijderen';
 $labels['title'] = 'Titel';
 $labels['description'] = 'Beschrijving';
+$labels['datetime'] = 'Vóór';
 $labels['start'] = 'Begin';
 $labels['alarms'] = 'Herinnering';
 $labels['all'] = 'Alle';
@@ -20,7 +21,7 @@
 $labels['overdue'] = 'Achterstallig';
 $labels['today'] = 'Vandaag';
 $labels['tomorrow'] = 'Morgen';
-$labels['next7days'] = 'Deze week';
+$labels['next7days'] = 'Volgende 7 dagen';
 $labels['later'] = 'Later';
 $labels['nodate'] = 'geen datum';
 $labels['removetag'] = 'Verwijder';
@@ -41,12 +42,16 @@
 $labels['createlist'] = 'Lijst toevoegen';
 $labels['listactions'] = 'Lijst opties...';
 $labels['listname'] = 'Naam';
-$labels['showalarms'] = 'Alarmen tonen';
+$labels['showalarms'] = 'Laat herinneringen zien';
 $labels['import'] = 'Importeren';
+$labels['viewoptions'] = 'Bekijk opties';
+$labels['focusview'] = 'Bekijk alleen deze lijst';
+// date words
 $labels['on'] = 'op';
 $labels['at'] = 'om';
 $labels['this'] = 'deze';
 $labels['next'] = 'volgende';
+// mesages
 $labels['savingdata'] = 'Data wordt opgeslagen...';
 $labels['errorsaving'] = 'Fout in opslaan van data.';
 $labels['notasksfound'] = 'Geen taken gevonden voor de gegeven criteria';
@@ -54,3 +59,4 @@
 $labels['deletetasktconfirm'] = 'Wilt u deze taak echt verwijderen?';
 $labels['deleteparenttasktconfirm'] = 'Wilt u deze taak en alle subtaken echt verwijderen?';
 $labels['deletelistconfirm'] = 'Wilt u deze lijst met alle taken echt verwijderen?';
+$labels['deletelistconfirmrecursive'] = 'Wilt u deze lijst en alle taken en subtaken echt verwijderen?';

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

@@ -12,6 +12,7 @@
 $labels['delete'] = 'Usuń';
 $labels['title'] = 'Tytuł';
 $labels['description'] = 'Opis';
+$labels['datetime'] = 'Termin';
 $labels['start'] = 'Start';
 $labels['alarms'] = 'Przypomnienie';
 $labels['all'] = 'Wszystkie';
@@ -34,16 +35,23 @@
 $labels['deletethisonly'] = 'Usuń tylko to zadanie';
 $labels['deletewithchilds'] = 'Usuń z wszystkimi podzadaniami';
 $labels['tabsummary'] = 'Podsumowanie';
+$labels['tabrecurrence'] = 'Powtarzalność';
 $labels['tabattachments'] = 'Załączniki';
+$labels['tabsharing'] = 'Udostępnianie';
 $labels['editlist'] = 'Edytuj listę';
 $labels['createlist'] = 'Dodaj listę';
+$labels['listactions'] = 'Opcje listy...';
 $labels['listname'] = 'Nazwa';
-$labels['showalarms'] = 'Pokaż alarmy';
+$labels['showalarms'] = 'Show reminders';
 $labels['import'] = 'Importuj';
+$labels['viewoptions'] = 'Opcje widoku';
+$labels['focusview'] = 'Pokaż tylko tę listę';
+// date words
 $labels['on'] = 'na';
 $labels['at'] = 'w';
 $labels['this'] = 'ten';
 $labels['next'] = 'następny';
+// mesages
 $labels['savingdata'] = 'Zapisuję dane...';
 $labels['errorsaving'] = 'Błąd podczas zapisu danych.';
 $labels['notasksfound'] = 'Nie znaleziono zadań spełniających kryteria';
@@ -51,3 +59,4 @@
 $labels['deletetasktconfirm'] = 'Na pewno chcesz usunąć to zadanie ?';
 $labels['deleteparenttasktconfirm'] = 'Na pewno chcesz usunąć to zadanie z wszystkimi podzadaniami ?';
 $labels['deletelistconfirm'] = 'Na pewno chcesz usunąć tą listę z wszystkimi zadaniami ?';
+$labels['deletelistconfirmrecursive'] = 'Czy na pewno chcesz usunąć tą listę wraz z wszystkimi zadaniami oraz pod-listami?';

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

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

@@ -12,6 +12,7 @@
 $labels['delete'] = 'Удалить';
 $labels['title'] = 'Заголовок';
 $labels['description'] = 'Описание';
+$labels['datetime'] = 'Дата/Время';
 $labels['start'] = 'Начало';
 $labels['alarms'] = 'Напоминание';
 $labels['all'] = 'Все';
@@ -41,12 +42,15 @@
 $labels['createlist'] = 'Добавить список';
 $labels['listactions'] = 'Действия со списком...';
 $labels['listname'] = 'Название';
-$labels['showalarms'] = 'Показывать уведомления';
+$labels['showalarms'] = 'Показывать напоминания';
 $labels['import'] = 'Импорт';
+$labels['focusview'] = 'Просмотреть только этот список';
+// date words
 $labels['on'] = 'в';
 $labels['at'] = 'в';
 $labels['this'] = 'этот';
 $labels['next'] = 'следующий';
+// mesages
 $labels['savingdata'] = 'Сохранение данных...';
 $labels['errorsaving'] = 'Не удалось сохранить.';
 $labels['notasksfound'] = 'По заданному условию не найдено задач';
@@ -54,3 +58,4 @@
 $labels['deletetasktconfirm'] = 'Вы действительно хотите удалить эту задачу?';
 $labels['deleteparenttasktconfirm'] = 'Вы действительно хотите удалить эту задачу и все ее подзадачи?';
 $labels['deletelistconfirm'] = 'Вы действительно хотите удалить этот список и все его задачи?';
+$labels['deletelistconfirmrecursive'] = 'Вы действительно хотите удалить этот список и все его задачи?';

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

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/tagedit.css Added

@@ -0,0 +1,122 @@
+/**
+ * Styles of the tagedit inputsforms
+ */
+.tagedit-list {
+	width: 100%;
+	margin: 0;
+	padding: 4px 4px 0 5px;
+	overflow: auto;
+	min-height: 26px;
+	background: #fff;
+	border: 1px solid #b2b2b2;
+	border-radius: 4px;
+	box-shadow: inset 0 0 2px 1px rgba(0,0,0, 0.1);
+	-moz-box-shadow: inset 0 0 2px 1px rgba(0,0,0, 0.1);
+	-webkit-box-shadow: inset 0 0 2px 1px rgba(0,0,0, 0.1);
+	-o-box-shadow: inset 0 0 2px 1px rgba(0,0,0, 0.1);
+}
+.tagedit-list li.tagedit-listelement {
+	list-style-type: none;
+	float: left;
+	margin: 0 4px 4px 0;
+	padding: 0;
+}
+
+/* New Item input */
+.tagedit-list li.tagedit-listelement-new input {
+	border: 0;
+	height: 100%;
+	padding: 4px 1px;
+	width: 15px;
+	background: #fff;
+	border-radius: 0;
+	box-shadow: none;
+	-moz-box-shadow: none;
+	-webkit-box-shadow: none;
+	-o-box-shadow: none;
+}
+.tagedit-list li.tagedit-listelement-new input:focus {
+	box-shadow: none;
+	-moz-box-shadow: none;
+	-webkit-box-shadow: none;
+	-o-box-shadow: none;
+	outline: none;
+}
+.tagedit-list li.tagedit-listelement-new input.tagedit-input-disabled {
+	display: none;
+}
+
+/* Item that is put to the List */
+.tagedit span.tag-element,
+.tagedit-list li.tagedit-listelement-old {
+	padding: 3px 6px 1px 6px;
+	background: #ddeef5;
+	background: -moz-linear-gradient(top, #edf6fa 0%, #d6e9f3 100%);
+	background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#edf6fa), color-stop(100%,#d6e9f3));
+	background: -o-linear-gradient(top, #edf6fa 0%, #d6e9f3 100%);
+	background: -ms-linear-gradient(top, #edf6fa 0%, #d6e9f3 100%);
+	background: linear-gradient(top, #edf6fa 0%, #d6e9f3 100%);
+	border: 1px solid #c2dae5;
+	-moz-border-radius: 4px;
+	-webkit-border-radius: 4px;
+	border-radius: 4px;
+	color: #0d5165;
+	line-height: 1.3em;
+}
+
+.tagedit-list li.tagedit-listelement-focus {
+	border-color: #4787b1;
+	-moz-box-shadow: 0 0 3px 1px rgba(71,135,177, 0.8);
+	-webkit-box-shadow: 0 0 3px 1px rgba(71,135,177, 0.8);
+	-o-box-shadow: 0 0 3px 1px rgba(71,135,177, 0.8);
+	box-shadow: 0 0 3px 1px rgba(71,135,177, 0.8);
+}
+
+.tagedit span.tag-element {
+	margin-right: 0.6em;
+	padding: 2px 6px;
+/*	cursor: pointer; */
+}
+
+.tagedit span.tag-element.inherit {
+	color: #666;
+	background: #f2f2f2;
+	border-color: #ddd;
+}
+
+.tagedit-list li.tagedit-listelement-old a.tagedit-close,
+.tagedit-list li.tagedit-listelement-old a.tagedit-break,
+.tagedit-list li.tagedit-listelement-old a.tagedit-delete,
+.tagedit-list li.tagedit-listelement-old a.tagedit-save {
+	text-indent: -2000px;
+	display: inline-block;
+	position: relative;
+	top: -1px;
+	width: 16px;
+	height: 16px;
+	margin: 0 -4px 0 6px;
+	background: url('data:image/gif;base64,iVBORw0KGgoAAAANSUhEUgAAAA0AAAAOCAYAAAD0f5bSAAAAgUlEQVQoz2NgQAKzdxwWAOIEIG5AwiC+AAM2AJQIAOL3QPwfCwaJB6BrSMChGB0nwDQYwATP3nn4f+Ge4ygKQXyQOJKYAUjTepjAm09fwBimEUTDxJA0rWdANxWmaMXB0xiGwDADurthGkEAmwbqaCLFeWQFBOlBTlbkkp2MSE2wAA8R50rWvqeRAAAAAElFTkSuQmCC') left 1px no-repeat;
+	cursor: pointer;
+}
+
+.tagedit-list li.tagedit-listelement-old span {
+	display: inline-block;
+	height: 15px;
+}
+
+/** Special hacks for IE7 **/
+
+html.ie7 .tagedit span.tag-element,
+html.ie7 .tagedit-list li.tagedit-listelement-old {
+	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#edf6fa', endColorstr='#d6e9f3', GradientType=0);
+}
+
+html.ie7 .tagedit-list li.tagedit-listelement span {
+	position: relative;
+	top: -3px;
+}
+
+html.ie7 .tagedit-list li.tagedit-listelement-old a.tagedit-close {
+	left: 5px;
+}
+

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

@@ -74,8 +74,34 @@
 	bottom: 0px;
 }
 
+#tasklistsbox .boxtitle a.iconbutton.search {
+	position: absolute;
+	top: 8px;
+	right: 8px;
+	width: 16px;
+	cursor: pointer;
+	background-position: -2px -317px;
+}
+
+#tasklistsbox .listsearchbox {
+	display: none;
+}
+
+#tasklistsbox .listsearchbox.expanded {
+	display: block;
+}
+
+#tasklistsbox .scroller {
+	top: 34px;
+}
+
+#tasklistsbox .listsearchbox.expanded + .scroller {
+	top: 68px;
+}
+
+
 #taskselector {
-	margin: -4px 40px 0 0;
+	margin: -1px 40px 0 0;
 	padding: 0;
 }
 
@@ -86,18 +112,24 @@
 	padding-right: 0.3em;
 }
 
-#tagslist li,
+.tagcloud li,
 #taskselector li a {
 	display: inline-block;
 	color: #004458;
-	min-width: 4em;
-	padding: 0.2em 0.6em 0.3em 0.6em;
+	min-width: 3.5em;
+	padding: 0.2em 0.6em 0.2em 0.6em;
 	text-align: center;
 	text-decoration: none;
 	border: 1px solid #eee;
 	border-color: transparent;
 }
 
+.webkit .tagcloud li,
+.webkit #taskselector li a {
+	padding-bottom: 0.25em;
+}
+
+
 #taskselector li:first-child {
 	border-top: 0;
 	border-radius: 4px 4px 0 0;
@@ -117,7 +149,7 @@
 	color: #97b3bf;
 }
 
-#tagslist li.selected,
+.tagcloud li.selected,
 #taskselector li.selected a {
 	color: #fff;
 	background: #005d76;
@@ -131,9 +163,8 @@
 	-webkit-box-shadow: inset 0 1px 1px 0 #003645;
 	-moz-box-shadow: inset 0 1px 1px 0 #003645;
 	border-color: #003645;
-	border-radius: 9px;
+	border-radius: 10px;
 	text-shadow: none;
-	outline: none;
 }
 
 #taskselector li .count {
@@ -180,13 +211,13 @@
 	border-color: #ff3800 transparent;
 }
 
-#tagslist {
+.tagcloud {
 	padding: 0;
 	margin: 6px;
 	list-style: none;
 }
 
-#tagslist li {
+.tagcloud li {
 	display: inline-block;
 	color: #004458;
 	padding-right: 0.2em;
@@ -196,14 +227,14 @@
 	cursor: pointer;
 }
 
-#tagslist li.inactive {
+.tagcloud li.inactive {
 	color: #89b3be;
 	padding-right: 0.6em;
 	font-size: 80%;
 /*	display: none; */
 }
 
-#tagslist li .count {
+.tagcloud li .count {
 	position: relative;
 	top: -1px;
 	margin-left: 5px;
@@ -221,36 +252,52 @@
 }
 
 .tag-draghelper .tag .count,
-#tagslist li.inactive .count {
+.tagcloud li.inactive .count {
 	display: none;
 }
 
-#tasklists li {
+#tasklistsbox .treelist li {
+	margin: 0;
+	display: block;
+	position: relative;
+}
+
+#tasklistsbox .treelist li div.tasklist {
 	margin: 0;
 	height: 20px;
 	padding: 6px 8px 2px 6px;
-	display: block;
 	position: relative;
 	white-space: nowrap;
 }
 
-#tasklists li.virtual {
-	height: 12px;
+#tasklistsbox .treelist li.virtual > div.tasklist {
+	height: 14px;
+}
+
+#tasklistsbox .treelist ul li > div.tasklist {
+	margin-left: 16px;
+}
+
+#tasklistsbox .treelist ul ul li > div.tasklist {
+	margin-left: 32px;
+}
+
+#tasklistsbox .treelist ul ul ul li > div.tasklist {
+	margin-left: 48px;
 }
 
-#tasklists li label {
+#tasklistsbox .treelist li label {
 	display: block;
 }
 
-#tasklists li span.listname {
+#tasklistsbox .treelist li span.listname {
 	display: block;
 	position: absolute;
 	top: 7px;
-	left: 26px;
-	right: 26px;
+	left: 38px;
+	right: 40px;
 	cursor: default;
-	padding-bottom: 2px;
-	padding-right: 30px;
+	padding: 0px 30px 2px 2px;
 	color: #004458;
 	overflow: hidden;
 	text-overflow: ellipsis;
@@ -258,61 +305,112 @@
 	background: url(sprites.png) right 20px no-repeat;
 }
 
-#tasklists li span.handle {
+#tasklistsbox .treelist li a.quickview {
 	display: inline-block;
+	position: absolute;
+	top: 6px;
+	right: 24px;
 	width: 16px;
 	height: 16px;
-	margin-right: 4px;
+	padding: 0;
 	background: url(sprites.png) -200px 0 no-repeat;
+	overflow: hidden;
+	text-indent: -5000px;
 	cursor: pointer;
 }
 
-#tasklists li:hover span.handle {
+#tasklistsbox .treelist li a.subscribed {
+	display: inline-block;
+	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;
+}
+
+#tasklistsbox .treelist div > a.subscribed:focus,
+#tasklistsbox .treelist div:hover > a.subscribed {
+	background-position: -2px -215px;
+}
+
+#tasklistsbox .treelist div.subscribed a.subscribed {
+	background-position: -20px -215px;
+}
+
+#tasklistsbox .treelist div > a.quickview:focus,
+#tasklistsbox .treelist li div:hover > a.quickview {
 	background-position: -20px -101px;
 }
 
-#tasklists li.focusview span.handle {
+#tasklistsbox .treelist li div.focusview > a.quickview {
 	background-position: -2px -101px;
 }
 
-#tasklists li.selected span.listname {
+#tasklistsbox .searchresults .treelist li a.quickview {
+	display: none;
+}
+
+#tasklistsbox .treelist div a.quickview:focus,
+#tasklistsbox .treelist div a.subscribed:focus {
+	border-radius: 3px;
+	outline: 2px solid rgba(30,150,192, 0.5);
+}
+
+#tasklistsbox .treelist li.selected > div > span.listname {
 	font-weight: bold;
 }
 
-#tasklists li.readonly span.listname {
+#tasklistsbox .treelist .readonly > span.listname {
 	background-position: right -142px;
 }
 
-#tasklists li.other span.listname {
+#tasklistsbox .treelist .user > span.listname {
 	background-position: right -160px;
 }
 
-#tasklists li.other.readonly span.listname {
-	background-position: right -178px;
+#tasklistsbox .treelist .virtual > span.listname {
+	color: #aaa;
+	top: 4px;
+	left: 20px;
+	right: 5px;
+}
+
+#tasklistsbox .treelist.flat li span.calname {
+	left: 24px;
+	right: 22px;
 }
 
-#tasklists li.shared span.listname {
-	background-position: right -196px;
+#tasklistsbox .treelist li input {
+	position: absolute;
+	top: 5px;
+	left: 18px;
 }
 
-#tasklists li.shared.readonly span.listname {
-	background-position: right -214px;
+#tasklistsbox .treelist li .treetoggle {
+	top: 8px;
 }
 
-#tasklists li.virtual span.listname {
-	color: #aaa;
-	top: 2px;
+#tasklistsbox .treelist li.virtual > .treetoggle {
+	top: 6px;
 }
 
-#tasklists li.virtual span.handle {
+#tasklistsbox .searchresults {
+	background: #b0ccd7;
+	margin-top: 8px;
+}
+
+#tasklistsbox .searchresults .boxtitle {
 	background: none;
-	cursor: default;
+	padding: 2px 8px 2px 8px;
 }
 
-#tasklists li input {
-	position: absolute;
-	top: 5px;
-	right: 5px;
+#tasklistsbox .searchresults .listing li {
+	background-color: #c7e3ef;
 }
 
 #mainview-right {
@@ -397,6 +495,8 @@
 	background: linear-gradient(top, #eee 0%, #dfdfdf 100%);
 	border-bottom: 1px solid #ccc;
 	position: relative;
+	line-height: 13px;
+	height: 20px;
 }
 
 #tasksview .buttonbar .buttonbar-right {
@@ -487,8 +587,10 @@
 	overflow: hidden;
 	text-overflow: ellipsis;
 	cursor: default;
+	outline: none;
 }
 
+.taskhead:focus,
 .taskhead.droptarget {
 	border-color: #4787b1;
 	box-shadow: 0 0 5px 2px rgba(71,135,177, 0.9);
@@ -507,21 +609,20 @@
 
 .taskhead .flagged {
 	display: inline-block;
-	visibility: hidden;
 	width: 16px;
 	height: 16px;
-	background: url(sprites.png) -2px -3px no-repeat;
+	background: url(sprites.png) 1000px -3px no-repeat;
 	margin: -3px 1em 0 0;
 	vertical-align: middle;
 	cursor: pointer;
 }
 
+.taskhead .flagged:focus,
 .taskhead:hover .flagged {
-	visibility: visible;
+	background-position: -2px -3px;
 }
 
 .taskhead.flagged .flagged {
-	visibility: visible;
 	background-position: -2px -23px;
 }
 
@@ -584,28 +685,22 @@
 	font-size: 11px;
 }
 
-.taskhead .actions,
-.taskhead .delete {
+.taskhead .actions {
 	display: block;
-	visibility: hidden;
 	position: absolute;
 	top: 3px;
 	right: 6px;
 	width: 18px;
 	height: 18px;
-	background: url(sprites.png) 0 -80px no-repeat;
-	text-indent: -1000px;
+	background: url(sprites.png) 1000px -80px no-repeat;
+	text-indent: -5000px;
 	overflow: hidden;
 	cursor: pointer;
 }
 
-.taskhead .delete {
-	background-position: 0 -40px;
-}
-
-.taskhead:hover .actions,
-.taskhead:hover .delete {
-	visibility: visible;
+.taskhead .actions:focus,
+.taskhead:hover .actions {
+	background-position: 0 -80px;
 }
 
 .taskhead.complete {
@@ -680,7 +775,7 @@
 #rootdroppable {
 	display: none;
 	position: absolute;
-	top: 36px;
+	top: 2px;
 	left: 1em;
 	right: 1em;
 	height: 5px;
@@ -748,6 +843,12 @@
 	margin: 0.5em 0;
 }
 
+#taskedit .border-after {
+	padding-bottom: 0.8em;
+	margin-bottom: 0.8em;
+	border-bottom: 2px solid #fafafa;
+}
+
 #taskedit-attachments {
 	margin: 0.6em 0;
 }
@@ -834,97 +935,16 @@
 	outline: none;
 }
 
-
-/**
- * Styles of the tagedit inputsforms
- */
-.tagedit-list {
-	width: 100%;
-	margin: 0;
-	padding: 4px 4px 0 5px;
-	overflow: auto;
-	min-height: 26px;
-	background: #fff;
-	border: 1px solid #b2b2b2;
-	border-radius: 4px;
-	box-shadow: inset 0 0 2px 1px rgba(0,0,0, 0.1);
-	-moz-box-shadow: inset 0 0 2px 1px rgba(0,0,0, 0.1);
-	-webkit-box-shadow: inset 0 0 2px 1px rgba(0,0,0, 0.1);
-	-o-box-shadow: inset 0 0 2px 1px rgba(0,0,0, 0.1);
-}
-.tagedit-list li.tagedit-listelement {
-	list-style-type: none;
-	float: left;
-	margin: 0 4px 4px 0;
-	padding: 0;
-}
-
-/* New Item input */
-.tagedit-list li.tagedit-listelement-new input {
-	border: 0;
-	height: 100%;
-	padding: 4px 1px;
-	width: 15px;
-	background: #fff;
-	border-radius: 0;
-	box-shadow: none;
-	-moz-box-shadow: none;
-	-webkit-box-shadow: none;
-	-o-box-shadow: none;
-}
-.tagedit-list li.tagedit-listelement-new input:focus {
-	box-shadow: none;
-	-moz-box-shadow: none;
-	-webkit-box-shadow: none;
-	-o-box-shadow: none;
-	outline: none;
-}
-.tagedit-list li.tagedit-listelement-new input.tagedit-input-disabled {
-	display: none;
-}
-
-/* Item that is put to the List */
-.form-section span.tag-element,
-.tagedit-list li.tagedit-listelement-old {
-	padding: 3px 0 1px 6px;
-	background: #ddeef5;
-	background: -moz-linear-gradient(top, #edf6fa 0%, #d6e9f3 100%);
-	background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#edf6fa), color-stop(100%,#d6e9f3));
-	background: -o-linear-gradient(top, #edf6fa 0%, #d6e9f3 100%);
-	background: -ms-linear-gradient(top, #edf6fa 0%, #d6e9f3 100%);
-	background: linear-gradient(top, #edf6fa 0%, #d6e9f3 100%);
-	border: 1px solid #c2dae5;
-	-moz-border-radius: 4px;
-	-webkit-border-radius: 4px;
-	border-radius: 4px;
-	color: #0d5165;
+.tasklistview .uidialog .tabbed {
+	min-width: 600px;
 }
 
-.form-section span.tag-element {
-	margin-right: 0.6em;
-	padding: 2px 6px;
-/*	cursor: pointer; */
+.tasklistview .uidialog .propform fieldset.ui-tabs-panel {
+	min-height: 290px;
 }
 
-.form-section span.tag-element.inherit {
-	color: #666;
-	background: #f2f2f2;
-	border-color: #ddd;
-}
-
-.tagedit-list li.tagedit-listelement-old a.tagedit-close,
-.tagedit-list li.tagedit-listelement-old a.tagedit-break,
-.tagedit-list li.tagedit-listelement-old a.tagedit-delete,
-.tagedit-list li.tagedit-listelement-old a.tagedit-save {
-	text-indent: -2000px;
-	display: inline-block;
-	position: relative;
-	top: -1px;
-	width: 16px;
-	height: 16px;
-	margin: 0 2px 0 6px;
-	background: url(sprites.png) -2px -122px no-repeat;
-	cursor: pointer;
+.tasklistview .uidialog .propform #taskedit-tasklistame {
+	width: 20em;
 }
 
 
@@ -935,17 +955,3 @@
 	display: inline;
 }
 
-html.ie7 .form-section span.tag-element,
-html.ie7 .tagedit-list li.tagedit-listelement-old {
-	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#edf6fa', endColorstr='#d6e9f3', GradientType=0);
-}
-
-html.ie7 .tagedit-list li.tagedit-listelement span {
-	position: relative;
-	top: -3px;
-}
-
-html.ie7 .tagedit-list li.tagedit-listelement-old a.tagedit-close {
-	left: 5px;
-}
-

roundcubemail-plugins-kolab-3.2.tar.gz/plugins/tasklist/skins/larry/templates/kolabacl.html Added

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

@@ -9,100 +9,123 @@
 
 <roundcube:include file="/includes/header.html" />
 
+<h1 class="voice"><roundcube:label name="tasklist.navtitle" /></h1>
+
 <div id="mainscreen">
 	<div id="sidebar">
-		<div id="taskstoolbar" class="toolbar">
+		<h2 id="aria-label-toolbar" class="voice"><roundcube:label name="arialabeltoolbar" /></h2>
+		<div id="taskstoolbar" class="toolbar" role="toolbar" aria-labelledby="aria-label-toolbar">
 			<roundcube:button command="newtask" type="link" class="button newtask disabled" classAct="button newtask" classSel="button newtask pressed" label="tasklist.newtask" title="tasklist.newtask" />
 			<roundcube:container name="toolbar" id="taskstoolbar" />
 		</div>
 
 		<div id="tagsbox" class="uibox listbox">
-			<h2 class="boxtitle"><roundcube:label name="tasklist.tags" id="taglist" /></h2>
+			<h2 class="boxtitle" id="aria-label-tagsbox"><roundcube:label name="tasklist.tags" id="taglist" /></h2>
 			<div class="scroller">
-				<roundcube:object name="plugin.tagslist" id="tagslist" />
+				<roundcube:object name="plugin.tagslist" id="tagslist" class="tagcloud" role="region" aria-labelledby="aria-label-tagsbox" aria-controls="thelist" />
 			</div>
 		</div>
 
-		<div id="tasklistsbox" class="uibox listbox">
-			<h2 class="boxtitle"><roundcube:label name="tasklist.lists" /></h2>
+		<div id="tasklistsbox" class="uibox listbox" role="navigation" aria-labelledby="aria-label-tasklists">
+			<h2 class="boxtitle" id="aria-label-tasklists"><roundcube:label name="tasklist.lists" />
+				<a href="#tasklists" class="iconbutton search" title="<roundcube:label name='tasklist.findlists' />" tabindex="0"><roundcube:label name="tasklist.findlists" /></a>
+			</h2>
+			<div class="listsearchbox">
+				<div class="searchbox" role="search" aria-labelledby="aria-label-listsearchform" aria-controls="tasklists">
+					<h3 id="aria-label-listsearchform" class="voice"><roundcube:label name="tasklist.arialabellistsearchform" /></h3>
+					<label for="tasklistsearch" class="voice"><roundcube:label name="tasklist.searchterms" /></label>
+					<input type="text" name="q" id="tasklistsearch" placeholder="<roundcube:label name='tasklist.findlists' />" />
+					<a class="iconbutton searchicon"></a>
+					<roundcube:button command="reset-listsearch" id="tasklistsearch-reset" class="iconbutton reset" title="resetsearch" label="resetsearch" />
+				</div>
+			</div>
 			<div class="scroller withfooter">
-			<roundcube:object name="plugin.tasklists" id="tasklists" class="listing" />
+			<roundcube:object name="plugin.tasklists" id="tasklists" class="treelist listing" />
 			</div>
 			<div class="boxfooter">
-				<roundcube:button command="list-create" type="link" title="tasklist.createlist" class="listbutton add disabled" classAct="listbutton add" innerClass="inner" content="+" /><roundcube:button name="tasklistoptionslink" id="tasklistoptionsmenulink" type="link" title="tasklist.listactions" class="listbutton groupactions" onclick="UI.show_popup('tasklistoptionsmenu', undefined, { above:true });return false" innerClass="inner" content="&#9881;" />
+				<roundcube:button command="list-create" type="link" title="tasklist.createlist" class="listbutton add disabled" classAct="listbutton add" innerClass="inner" label="tasklist.createlist" /><roundcube:button name="tasklistoptionslink" id="tasklistoptionsmenulink" type="link" title="tasklist.listactions" class="listbutton groupactions" onclick="return UI.toggle_popup('tasklistoptionsmenu', event, { above:true })" innerClass="inner" label="tasklist.listactions" aria-haspopup="true" aria-expanded="false" aria-owns="tasklistoptionsmenu-menu" />
 			</div>
 		</div>
+
+		<div id="tasklistoptionsmenu" class="popupmenu" aria-hidden="true">
+			<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>
+				
+				<roundcube:if condition="env:tasklist_driver == 'kolab'" />
+				<li role="menuitem"><roundcube:button command="folders" task="settings" type="link" label="managefolders" classAct="active" /></li>
+				<roundcube:endif />
+			</ul>
+		</div>
 	</div>
 	
 	<div id="mainview-right">
 	
-	<div id="quickaddbox">
+	<div id="quickaddbox" role="region" aria-labelledby="aria-label-quickaddbox">
+		<h2 id="aria-label-quickaddbox" class="voice"><roundcube:label name="tasklist.arialabelquickaddbox" /></h2>
 		<roundcube:object name="plugin.quickaddform" />
 	</div>
 
-	<div id="quicksearchbar">
+	<div id="quicksearchbar" role="search" aria-labelledby="aria-label-searchform">
+		<h2 id="aria-label-searchform" class="voice"><roundcube:label name="tasklist.arialabelsearchform" /></h2>
+		<label for="quicksearchbox" class="voice"><roundcube:label name="tasklist.arialabelquicksearchbox" /></label>
 		<roundcube:object name="plugin.searchform" id="quicksearchbox" />
 		<a id="searchmenulink" class="iconbutton searchoptions" > </a>
-		<roundcube:button command="reset-search" id="searchreset" class="iconbutton reset" title="resetsearch" content=" " />
+		<roundcube:button command="reset-search" id="searchreset" class="iconbutton reset" title="resetsearch" label="resetsearch" />
 	</div>
 
 	<div id="tasksview" class="uibox">
 		<div class="boxtitle buttonbar">
-			<ul id="taskselector">
-				<li class="all selected"><a href="#all"><roundcube:label name="tasklist.all" /><span class="count"></span></a></li>
-				<li class="overdue inactive"><a href="#overdue"><roundcube:label name="tasklist.overdue" /><span class="count"></span></a></li>
-				<li class="flagged"><a href="#flagged"><roundcube:label name="tasklist.flagged" /><span class="count"></span></a></li>
-				<li class="today"><a href="#today"><roundcube:label name="tasklist.today" /><span class="count"></span></a></li>
-				<li class="tomorrow"><a href="#tomorrow"><roundcube:label name="tasklist.tomorrow" /><span class="count"></span></a></li>
-				<li class="week"><a href="#week"><roundcube:label name="tasklist.next7days" /></a></li>
-				<li class="later"><a href="#later"><roundcube:label name="tasklist.later" /></a></li>
-				<li class="nodate"><a href="#nodate"><roundcube:label name="tasklist.nodate" ucfirst="true" /></a></li>
-				<li class="complete"><a href="#complete"><roundcube:label name="tasklist.complete" /><span class="count"></span></a></li>
+			<h2 id="aria-label-taskselector" class="voice"><roundcube:label name="tasklist.arialabeltaskselector" /></h2>
+			<ul id="taskselector" role="radiogroup" aria-labelledby="aria-label-taskselector" aria-controls="thelist">
+				<li class="all selected" role="radio" aria-checked="true" aria-labelledby="aria-radio-all"><a href="#all" id="aria-radio-all"><roundcube:label name="tasklist.all" /><span class="count"></span></a></li>
+				<li class="overdue inactive" role="radio" aria-checked="false" aria-labelledby="aria-radio-overdue"><a href="#overdue" id="aria-radio-overdue"><roundcube:label name="tasklist.overdue" /><span class="count"></span></a></li>
+				<li class="flagged" role="radio" aria-checked="false" aria-labelledby="aria-radio-flagged"><a href="#flagged" id="aria-radio-flagged"><roundcube:label name="tasklist.flagged" /><span class="count"></span></a></li>
+				<li class="today" role="radio" aria-checked="false" aria-labelledby="aria-radio-today"><a href="#today" id="aria-radio-today"><roundcube:label name="tasklist.today" /><span class="count"></span></a></li>
+				<li class="tomorrow" role="radio" aria-checked="false" aria-labelledby="aria-radio-tomorrow"><a href="#tomorrow" id="aria-radio-tomorrow"><roundcube:label name="tasklist.tomorrow" /><span class="count"></span></a></li>
+				<li class="week" role="radio" aria-checked="false" aria-labelledby="aria-radio-week"><a href="#week" id="aria-radio-week"><roundcube:label name="tasklist.next7days" /></a></li>
+				<li class="later" role="radio" aria-checked="false" aria-labelledby="aria-radio-later"><a href="#later" id="aria-radio-later"><roundcube:label name="tasklist.later" /></a></li>
+				<li class="nodate" role="radio" aria-checked="false" aria-labelledby="aria-radio-nodate"><a href="#nodate" id="aria-radio-nodate"><roundcube:label name="tasklist.nodate" ucfirst="true" /></a></li>
+				<li class="complete" role="radio" aria-checked="false" aria-labelledby="aria-radio-complete"><a href="#complete" id="aria-radio-complete"><roundcube:label name="tasklist.complete" /><span class="count"></span></a></li>
 			</ul>
 
 			<div class="buttonbar-right">
-				<roundcube:button name="taskviewmenulink" id="taskviewmenulink" type="link" title="tasklist.viewoptions" class="listmenu viewoptions" onclick="UI.show_popup('taskviewmenu');return false" innerClass="inner" content="&#9881;" />
+				<roundcube:button name="taskviewmenulink" id="taskviewmenulink" type="link" title="tasklist.viewoptions" class="listmenu viewoptions" onclick="return UI.toggle_popup('taskviewmenu',event)" innerClass="inner" label="tasklist.viewoptions" aria-haspopup="true" aria-expanded="false" aria-owns="taskviewmenu-menu" />
+			</div>
+
+			<div id="taskviewmenu" class="popupmenu" aria-hidden="true">
+				<h3 id="aria-label-taskviewmenu" class="voice"><roundcube:label name="tasklist.viewoptions" /></h3>
+				<ul class="toolbarmenu" id="taskviewmenu-menu" role="menu" aria-labelledby="aria-label-taskviewmenu">
+					<li role="menuitem"><roundcube:button command="expand-all" label="expand-all" class="icon" classAct="icon active" innerclass="icon expand" /></li>
+					<li role="menuitem"><roundcube:button command="collapse-all" label="collapse-all" class="icon" classAct="icon active" innerclass="icon collapse" /></li>
+				</ul>
 			</div>
 		</div>
 		
-		<div class="scroller">
-			<roundcube:object name="plugin.tasks" id="thelist" />
+		<h2 class="voice" id="aria-label-tasklisting"><roundcube:label name="tasklist.arialabeltasklisting" /></h2>
+		<div class="scroller" role="main" aria-labelledby="aria-label-tasklisting">
+			<roundcube:object name="plugin.tasks" id="thelist" role="tree" />
 			<div id="listmessagebox"></div>
+			<div id="rootdroppable"></div>
 		</div>
-		<div id="rootdroppable"></div>
 	</div>
 	
+	<div id="taskitemmenu" class="popupmenu" aria-hidden="true" data-align="right">
+		<h3 id="aria-label-taskactions" class="voice"><roundcube:label name="tasklist.taskactions" /></h3>
+		<ul class="toolbarmenu iconized" id="taskitemmenu-menu" role="menu" aria-labelledby="aria-label-taskactions">
+			<li role="menuitem"><roundcube:button name="edit" type="link" onclick="rctasks.edit_task(rctasks.selected_task.id, 'edit'); return false" label="edit" class="icon active" innerclass="icon edit" /></li>
+			<li role="menuitem"><roundcube:button name="delete" type="link" onclick="rctasks.delete_task(rctasks.selected_task.id); return false" label="delete" class="icon active" innerclass="icon delete" /></li>
+			<li role="menuitem"><roundcube:button name="addchild" type="link" onclick="rctasks.add_childtask(rctasks.selected_task.id); return false" label="tasklist.addsubtask" class="icon active" innerclass="icon add" /></li>
+		</ul>
 	</div>
 
-</div>
-
-<roundcube:object name="message" id="messagestack" />
+	</div>
 
-<div id="taskitemmenu" class="popupmenu">
-	<ul class="toolbarmenu iconized">
-		<li><roundcube:button name="edit" type="link" onclick="rctasks.edit_task(rctasks.selected_task.id, 'edit'); return false" label="edit" class="icon active" innerclass="icon edit" /></li>
-		<li><roundcube:button name="delete" type="link" onclick="rctasks.delete_task(rctasks.selected_task.id); return false" label="delete" class="icon active" innerclass="icon delete" /></li>
-		<li><roundcube:button name="addchild" type="link" onclick="rctasks.add_childtask(rctasks.selected_task.id); return false" label="tasklist.addsubtask" class="icon active" innerclass="icon add" /></li>
-	</ul>
 </div>
 
-<div id="tasklistoptionsmenu" class="popupmenu">
-	<ul class="toolbarmenu">
-		<li><roundcube:button command="list-edit" label="edit" classAct="active" /></li>
-		<li><roundcube:button command="list-remove" label="delete" classAct="active" /></li>
-		
-		<roundcube:if condition="env:tasklist_driver == 'kolab'" />
-		<li><roundcube:button command="folders" task="settings" type="link" label="managefolders" classAct="active" /></li>
-		<roundcube:endif />
-	</ul>
-</div>
+<roundcube:object name="message" id="messagestack" />
 
-<div id="taskviewmenu" class="popupmenu">
-	<ul class="toolbarmenu">
-		<li><roundcube:button command="expand-all" label="expand-all" class="icon" classAct="icon active" innerclass="icon expand" /></li>
-		<li><roundcube:button command="collapse-all" label="collapse-all" class="icon" classAct="icon active" innerclass="icon collapse" /></li>
-	</ul>
-</div>
 
 <div id="taskshow">
 	<div class="form-section" id="task-parent-title"></div>
@@ -113,7 +136,7 @@
 	</div>
 	<div id="task-tags" class="form-section">
 		<label><roundcube:label name="tasklist.tags" /></label>
-		<span class="task-text"></span>
+		<span class="task-text tagedit"></span>
 	</div>
 	<div id="task-start" class="form-section">
 		<label><roundcube:label name="tasklist.start" /></label>
@@ -125,6 +148,10 @@
 		<span class="task-text"></span>
 		<span id="task-time"></span>
 	</div>
+	<div id="task-recurrence" class="form-section">
+		<label><roundcube:label name="tasklist.repeat" /></label>
+		<span class="task-text"></span>
+	</div>
 	<div id="task-alarm" class="form-section">
 		<label><roundcube:label name="tasklist.alarms" /></label>
 		<span class="task-text"></span>
@@ -137,6 +164,10 @@
 		<label><roundcube:label name="tasklist.complete" /></label>
 		<span class="task-text"></span>
 	</div>
+	<div id="task-status" class="form-section">
+		<label><roundcube:label name="tasklist.status" /></label>
+		<span class="task-text"></span>
+	</div>
 	<div id="task-attachments" class="form-section">
 		<label><roundcube:label name="attachments" /></label>
 		<div class="task-text"></div>
@@ -146,7 +177,8 @@
 <roundcube:include file="/templates/taskedit.html" />
 
 <div id="tasklistform" class="uidialog">
-	<roundcube:object name="plugin.tasklist_editform" />
+	<roundcube:label name="loading" />
+	<roundcube:container name="tasklistform" id="tasklistform" />
 </div>
 
 <script type="text/javascript">
@@ -156,10 +188,40 @@
 
 $(document).ready(function(e){
 	UI.init();
+
+	rcmail.addEventListener('tasklist_editform_load', function(e){
+		if (rcmail.env.tasklist_driver == 'kolab')
+			UI.init_tabs($('#tasklistform > form').addClass('propform tabbed'));
+	});
+
 	new rcube_splitter({ id:'taskviewsplitter', p1:'#sidebar', p2:'#mainview-right',
-		orientation:'v', relative:true, start:240, min:180, size:16, offset:2 }).init();
+		orientation:'v', relative:true, start:240, min:180, size:12 }).init();
 	new rcube_splitter({ id:'taskviewsplitterv', p1:'#tagsbox', p2:'#tasklistsbox',
-		orientation:'h', relative:true, start:242, min:120, size:16, offset:6 }).init();
+		orientation:'h', relative:true, start:242, min:120, size:12, offset:4 }).init();
+
+	// animation to unfold list search box
+	$('#tasklistsbox .boxtitle a.search').click(function(e){
+		var box = $('#tasklistsbox .listsearchbox'),
+			dir = box.is(':visible') ? -1 : 1;
+
+		box.slideToggle({
+			duration: 160,
+			progress: function(animation, progress) {
+				if (dir < 0) progress = 1 - progress;
+				$('#tasklistsbox .scroller').css('top', (34 + 34 * progress) + 'px');
+			},
+			complete: function() {
+				box.toggleClass('expanded');
+				if (box.is(':visible')) {
+					box.find('input[type=text]').focus();
+				}
+				else {
+					$('#tasklistsearch-reset').click();
+				}
+				// TODO: save state in localStorage
+			}
+		});
+	});
 });
 
 </script>

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

@@ -1,56 +1,91 @@
 <div id="taskedit" class="uidialog uidialog-tabbed">
 	<form id="taskeditform" action="#" method="post" enctype="multipart/form-data">
 		<ul>
-			<li><a href="#taskedit-tab-1"><roundcube:label name="tasklist.tabsummary" /></a></li><li id="taskedit-tab-attachments"><a href="#taskedit-tab-2"><roundcube:label name="tasklist.tabattachments" /></a></li>
+			<li><a href="#taskedit-panel-main"><roundcube:label name="tasklist.tabsummary" /></a></li><li><a href="#taskedit-panel-recurrence"><roundcube:label name="tasklist.tabrecurrence" /></a></li><li id="taskedit-tab-attachments"><a href="#taskedit-panel-attachments"><roundcube:label name="tasklist.tabattachments" /></a></li>
 		</ul>
 		
-		<div id="taskedit-tab-1">
+		<div id="taskedit-panel-main">
 			<div class="form-section">
 				<label for="taskedit-title"><roundcube:label name="tasklist.title" /></label>
 				<br />
-				<input type="text" class="text" name="title" id="taskedit-title" size="60" tabindex="1" />
+				<input type="text" class="text" name="title" id="taskedit-title" size="60" />
 			</div>
 			<div class="form-section">
 				<label for="taskedit-description"><roundcube:label name="tasklist.description" /></label>
 				<br />
-				<textarea name="description" id="taskedit-description" class="text" rows="5" cols="60" tabindex="2"></textarea>
+				<textarea name="description" id="taskedit-description" class="text" rows="5" cols="60"></textarea>
 			</div>
 			<div class="form-section">
-				<label for="taskedit-tags"><roundcube:label name="tasklist.tags" /></label>
-				<roundcube:object name="plugin.tags_editline" id="taskedit-tagline" class="tagedit" tabindex="3" />
+				<label for="tagedit-input"><roundcube:label name="tasklist.tags" /></label>
+				<roundcube:object name="plugin.tags_editline" id="taskedit-tagline" class="tagedit" tabindex="0" />
 			</div>
 			<div class="form-section">
 				<label for="taskedit-startdate"><roundcube:label name="tasklist.start" /></label>
-				<input type="text" name="startdate" size="10" id="taskedit-startdate" tabindex="23" /> &nbsp;
-				<input type="text" name="starttime" size="6" id="taskedit-starttime" tabindex="24" />
+				<input type="text" name="startdate" size="10" id="taskedit-startdate" /> &nbsp;
+				<input type="text" name="starttime" size="6" id="taskedit-starttime" aria-label="<roundcube:label name='tasklist.starttime' />" />
 				<a href="#nodate" style="margin-left:1em" class="edit-nodate" rel="#taskedit-startdate,#taskedit-starttime"><roundcube:label name="tasklist.nodate" /></a>
 			</div>
 			<div class="form-section">
 				<label for="taskedit-date"><roundcube:label name="tasklist.datetime" /></label>
-				<input type="text" name="date" size="10" id="taskedit-date" tabindex="20" /> &nbsp;
-				<input type="text" name="time" size="6" id="taskedit-time" tabindex="21" />
+				<input type="text" name="date" size="10" id="taskedit-date" /> &nbsp;
+				<input type="text" name="time" size="6" id="taskedit-time" aria-label="<roundcube:label name='tasklist.duetime' />" />
 				<a href="#nodate" style="margin-left:1em" class="edit-nodate" rel="#taskedit-date,#taskedit-time"><roundcube:label name="tasklist.nodate" /></a>
 			</div>
 			<div class="form-section" id="taskedit-alarms">
-				<label for="taskedit-alarm"><roundcube:label name="tasklist.alarms" /></label>
-				<roundcube:object name="plugin.alarm_select" />
+				<div class="edit-alarm-item first">
+					<label for="edit-alarm-item"><roundcube:label name="tasklist.alarms" /></label>
+					<roundcube:object name="plugin.alarm_select" id="edit-alarm-item" />
+					<span class="edit-alarm-buttons">
+						<a href="#add" class="iconbutton add add-alarm"><roundcube:label name="libcalendaring.addalarm" /></a>
+						<a href="#delete" class="iconbutton remove delete-alarm"><roundcube:label name="libcalendaring.removealarm" /></a>
+					</span>
+				</div>
 			</div>
 			<div class="form-section">
 				<label for="taskedit-completeness"><roundcube:label name="tasklist.complete" /></label>
-				<input type="text" name="title" id="taskedit-completeness" size="3"  tabindex="25" />&nbsp;%
+				<input type="text" name="title" id="taskedit-completeness" size="3"  />&nbsp;%
 				<div id="taskedit-completeness-slider"></div>
 			</div>
+			<div class="form-section">
+				<label for="taskedit-status"><roundcube:label name="tasklist.status" /></label>
+				<roundcube:object name="plugin.status_select" id="taskedit-status" />
+			</div>
 			<div class="form-section" id="tasklist-select">
 				<label for="taskedit-tasklist"><roundcube:label name="tasklist.list" /></label>
-				<roundcube:object name="plugin.tasklist_select" id="taskedit-tasklist" tabindex="26" />
+				<roundcube:object name="plugin.tasklist_select" id="taskedit-tasklist" />
+			</div>
+		</div>
+		
+		<div id="taskedit-panel-recurrence">
+			<div class="form-section border-after">
+				<roundcube:object name="plugin.recurrence_form" part="frequency" />
+			</div>
+			<div class="recurrence-form border-after" id="recurrence-form-daily">
+				<roundcube:object name="plugin.recurrence_form" part="daily" class="form-section" />
+			</div>
+			<div class="recurrence-form border-after" id="recurrence-form-weekly">
+				<roundcube:object name="plugin.recurrence_form" part="weekly" class="form-section" />
+			</div>
+			<div class="recurrence-form border-after" id="recurrence-form-monthly">
+				<roundcube:object name="plugin.recurrence_form" part="monthly" class="form-section" />
+			</div>
+			<div class="recurrence-form border-after" id="recurrence-form-yearly">
+				<roundcube:object name="plugin.recurrence_form" part="yearly" class="form-section" />
+			</div>
+			<div class="recurrence-form" id="recurrence-form-until">
+				<roundcube:object name="plugin.recurrence_form" part="until" class="form-section" />
+			</div>
+			<div class="recurrence-form" id="recurrence-form-rdate">
+				<roundcube:object name="plugin.recurrence_form" part="rdate" class="form-section" />
 			</div>
 		</div>
 		
-		<div id="taskedit-tab-2">
+		<div id="taskedit-panel-attachments">
 			<div id="taskedit-attachments">
 				<roundcube:object name="plugin.attachments_list" id="taskedit-attachment-list" class="attachmentslist" />
 			</div>
-			<div id="taskedit-attachments-form">
+			<div id="taskedit-attachments-form" role="region" aria-labelledby="aria-label-attachmentuploadform">
+				<h3 id="aria-label-attachmentuploadform" class="voice"><roundcube:label name="arialabelattachmentuploadform" /></h2>
 				<roundcube:object name="plugin.attachments_form" id="taskedit-attachment-form" attachmentFieldSize="30" />
 			</div>
 			<roundcube:object name="plugin.filedroparea" id="taskedit-tab-2" />

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

@@ -1,9 +1,11 @@
 /**
  * Client scripts for the Tasklist plugin
  *
- * @version @package_version@
  * @author Thomas Bruederli <bruederli@kolabsys.com>
  *
+ * @licstart  The following is the entire license notice for the
+ * JavaScript code in this file.
+ *
  * Copyright (C) 2012, Kolab Systems AG <contact@kolabsys.com>
  *
  * This program is free software: you can redistribute it and/or modify
@@ -18,6 +20,9 @@
  *
  * You should have received a copy of the GNU Affero General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * @licend  The above is the entire license notice
+ * for the JavaScript code in this file.
  */
  
 function rcube_tasklist_ui(settings)
@@ -67,6 +72,16 @@
     var completeness_slider;
     var task_draghelper;
     var tag_draghelper;
+    var task_drag_active = false;
+    var list_scroll_top = 0;
+    var scroll_delay = 400;
+    var scroll_step = 5;
+    var scroll_speed = 20;
+    var scroll_sensitivity = 40;
+    var scroll_timer;
+    var tasklists_widget;
+    var focused_task;
+    var focused_subclass;
     var me = this;
 
     // general datepicker settings
@@ -107,7 +122,6 @@
     var parse_datetime = this.parse_datetime;
     var date2unixtime = this.date2unixtime;
     var fromunixtime = this.fromunixtime;
-    var init_alarms_edit = this.init_alarms_edit;
 
     /**
      * initialize the tasks UI
@@ -116,18 +130,96 @@
     {
         // initialize task list selectors
         for (var id in me.tasklists) {
-            if ((li = rcmail.get_folder_li(id, 'rcmlitasklist'))) {
-                init_tasklist_li(li, id);
-            }
-
             if (me.tasklists[id].editable && (!me.selected_list || (me.tasklists[id].active && !me.tasklists[me.selected_list].active))) {
                 me.selected_list = id;
+                break;
             }
         }
 
+        // initialize treelist widget that controls the tasklists list
+        var widget_class = window.kolab_folderlist || rcube_treelist_widget;
+        tasklists_widget = new widget_class(rcmail.gui_objects.tasklistslist, {
+            id_prefix: 'rcmlitasklist',
+            selectable: true,
+            save_state: true,
+            keyboard: false,
+            searchbox: '#tasklistsearch',
+            search_action: 'tasks/tasklist',
+            search_sources: [ 'folders', 'users' ],
+            search_title: rcmail.gettext('listsearchresults','tasklist')
+        });
+        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);
+            me.selected_list = node.id;
+        });
+        tasklists_widget.addEventListener('subscribe', function(p) {
+            var list;
+            if ((list = me.tasklists[p.id])) {
+                list.subscribed = p.subscribed || false;
+                rcmail.http_post('tasklist', { action:'subscribe', l:{ id:p.id, active:list.active?1:0, permanent:list.subscribed?1:0 } });
+            }
+        });
+        tasklists_widget.addEventListener('insert-item', function(p) {
+            var list = p.data;
+            if (list && list.id && !list.virtual) {
+                me.tasklists[list.id] = list;
+                var prop = { id:p.id, active:list.active?1:0 };
+                if (list.subscribed) prop.permanent = 1;
+                rcmail.http_post('tasklist', { action:'subscribe', l:prop });
+                list_tasks();
+                $(p.item).data('type', 'tasklist');
+            }
+        });
+        tasklists_widget.addEventListener('search-complete', function(data) {
+            if (data.length)
+                rcmail.display_message(rcmail.gettext('nrtasklistsfound','tasklist').replace('$nr', data.length), 'voice');
+            else
+                rcmail.display_message(rcmail.gettext('notasklistsfound','tasklist'), 'info');
+        });
+
+        // init (delegate) event handler on tasklist checkboxes
+        tasklists_widget.container.on('click', 'input[type=checkbox]', function(e) {
+            var list, id = this.value;
+            if ((list = me.tasklists[id])) {
+                list.active = this.checked;
+                fetch_counts();
+                if (!this.checked) remove_tasks(id);
+                else               list_tasks(null);
+                rcmail.http_post('tasklist', { action:'subscribe', l:{ id:id, active:list.active?1:0 } });
+
+                // disable focusview
+                if (!this.checked && focusview == id) {
+                    set_focusview(null);
+                }
+            }
+            e.stopPropagation();
+        })
+        .on('keypress', 'input[type=checkbox]', function(e) {
+            // select tasklist on <Enter>
+            if (e.keyCode == 13) {
+                tasklists_widget.select(this.value);
+                return rcube_event.cancel(e);
+            }
+        })
+        .find('li:not(.virtual)').data('type', 'tasklist');
+
+        // handler for clicks on quickview buttons
+        tasklists_widget.container.on('click', '.quickview', function(e){
+            var id = $(this).closest('li').attr('id').replace(/^rcmlitasklist/, '');
+            set_focusview(focusview == id ? null : id)
+            e.stopPropagation();
+        });
+
+        // register dbl-click handler to open calendar edit dialog
+        tasklists_widget.container.on('dblclick', ':not(.virtual) > .tasklist', function(e){
+            var id = $(this).closest('li').attr('id').replace(/^rcmlitasklist/, '');
+            list_edit_dialog(id);
+        });
+
         if (me.selected_list) {
             rcmail.enable_command('addtask', true);
-            $(rcmail.get_folder_li(me.selected_list, 'rcmlitasklist')).click();
+            tasklists_widget.select(me.selected_list);
         }
 
         // register server callbacks
@@ -174,7 +266,7 @@
         }).find('input[type=text]').placeholder(rcmail.gettext('createnewtask','tasklist'));
 
         // click-handler on tags list
-        $(rcmail.gui_objects.tagslist).click(function(e){
+        $(rcmail.gui_objects.tagslist).on('click', 'li', function(e){
             var item = e.target.nodeName == 'LI' ? $(e.target) : $(e.target).closest('li'),
                 tag = item.data('value');
 
@@ -189,17 +281,17 @@
                 if (tagsfilter.length > 1)
                     index = -1;
 
-                $('li', this).removeClass('selected');
+                $('li', rcmail.gui_objects.tagslist).removeClass('selected').attr('aria-checked', 'false');
                 tagsfilter = [];
             }
 
             // add tag to filter
             if (index < 0) {
-                item.addClass('selected');
+                item.addClass('selected').attr('aria-checked', 'true');
                 tagsfilter.push(tag);
             }
             else if (shift) {
-                item.removeClass('selected');
+                item.removeClass('selected').attr('aria-checked', 'false');
                 var a = tagsfilter.slice(0,index);
                 tagsfilter = a.concat(tagsfilter.slice(index+1));
             }
@@ -213,6 +305,11 @@
             e.preventDefault();
             return false;
         })
+        .on('keypress', 'li', function(e) {
+            if (e.keyCode == 13) {
+                $(this).trigger('click', { pointerType:'keyboard' });
+            }
+        })
         .mousedown(function(e){
             // disable content selection with the mouse
             e.preventDefault();
@@ -220,7 +317,7 @@
         });
 
         // click-handler on task list items (delegate)
-        $(rcmail.gui_objects.resultlist).click(function(e){
+        $(rcmail.gui_objects.resultlist).on('click', function(e){
             var item = $(e.target);
             var className = e.target.className;
 
@@ -238,11 +335,11 @@
             var id = item.data('id'),
                 li = item.parent(),
                 rec = listdata[id];
-            
+
             switch (className) {
                 case 'childtoggle':
                     rec.collapsed = !rec.collapsed;
-                    li.children('.childtasks:first').toggle();
+                    li.children('.childtasks:first').toggle().attr('aria-hidden', rec.collapsed ? 'true' : 'false');
                     $(e.target).toggleClass('collapsed').html(rec.collapsed ? '&#9654;' : '&#9660;');
                     rcmail.http_post('tasks/task', { action:'collapse', t:{ id:rec.id, list:rec.list }, collapsed:rec.collapsed?1:0 });
                     if (e.shiftKey)  // expand/collapse all childs
@@ -253,20 +350,20 @@
                     if (rcmail.busy)
                         return false;
 
-                    rec.complete = e.target.checked ? 1 : 0;
+                    rec.status = e.target.checked ? 'COMPLETED' : (rec.complete == 1 ? 'NEEDS-ACTION' : '');
                     li.toggleClass('complete');
                     save_task(rec, 'edit');
                     return true;
-                
+
                 case 'flagged':
                     if (rcmail.busy)
                         return false;
 
                     rec.flagged = rec.flagged ? 0 : 1;
-                    li.toggleClass('flagged');
+                    li.toggleClass('flagged').find('.flagged:first').attr('aria-checked', (rec.flagged ? 'true' : 'false'));
                     save_task(rec, 'edit');
                     break;
-                
+
                 case 'date':
                     if (rcmail.busy)
                         return false;
@@ -288,7 +385,7 @@
                     .datepicker('setDate', rec.date)
                     .datepicker('show');
                     break;
-                
+
                 case 'delete':
                     delete_task(id);
                     break;
@@ -296,14 +393,12 @@
                 case 'actions':
                     var pos, ref = $(e.target),
                         menu = $('#taskitemmenu');
+
                     if (menu.is(':visible') && menu.data('refid') == id) {
-                        menu.hide();
+                        rcmail.command('menu-close', 'taskitemmenu');
                     }
                     else {
-                        pos = ref.offset();
-                        pos.top += ref.outerHeight();
-                        pos.left += ref.width() - menu.outerWidth();
-                        menu.css({ top:pos.top+'px', left:pos.left+'px' }).show();
+                        rcmail.command('menu-open', { menu: 'taskitemmenu', show: true }, e.target, e);
                         menu.data('refid', id);
                         me.selected_task = rec;
                     }
@@ -321,7 +416,7 @@
 
             return false;
         })
-        .dblclick(function(e){
+        .on('dblclick', '.taskhead, .childtoggle', function(e){
             var id, rec, item = $(e.target);
             if (!item.hasClass('taskhead'))
                 item = item.closest('div.taskhead');
@@ -334,6 +429,58 @@
                     task_edit_dialog(id, 'edit');
                 clearSelection();
             }
+        })
+        .on('keydown', '.taskhead', function(e) {
+            var inc = 1;
+            switch (e.keyCode) {
+                case 13:  // Enter
+                    $(e.target).trigger('click', { pointerType:'keyboard' });
+                    return rcube_event.cancel(e);
+
+                case 38: // Up arrow key
+                    inc = -1;
+                case 40: // Down arrow key
+                    if ($(e.target).hasClass('actions')) {
+                        // unfold actions menu
+                        $(e.target).trigger('click', { pointerType:'keyboard' });
+                        return rcube_event.cancel(e);
+                    }
+
+                    // focus next/prev task item
+                    var x = 0, target = this, items = $(rcmail.gui_objects.resultlist).find('.taskhead:visible');
+                    items.each(function(i, item) {
+                        if (item === target) {
+                            x = i;
+                            return false;
+                        }
+                    });
+                    items.get(x + inc).focus();
+                    return rcube_event.cancel(e);
+
+                case 37: // Left arrow key
+                case 39: // Right arrow key
+                    $(this).parent().children('.childtoggle:visible').first().trigger('click', { pointerType:'keyboard' });
+                    break;
+            }
+        })
+        .on('focusin', '.taskhead', function(e){
+            if (rcube_event.is_keyboard(e)) {
+                var item = $(e.target);
+                if (!item.hasClass('taskhead'))
+                    item = item.closest('div.taskhead');
+
+                var id = item.data('id');
+                if (id && listdata[id]) {
+                    focused_task = id;
+                    focused_subclass = item.get(0) !== e.target ? e.target.className : null;
+                }
+            }
+        })
+        .on('focusout', '.taskhead', function(e){
+            var item = $(e.target);
+            if (focused_task && item.data('id') == focused_task) {
+                focused_task = focused_subclass = null;
+            }
         });
 
         // handle global document clicks: close popup menus
@@ -379,8 +526,9 @@
             completeness_slider.slider('value', parseInt(this.value))
         });
 
-        // register events on alarm fields
-        init_alarms_edit('#taskedit');
+        // register events on alarms and recurrence fields
+        me.init_alarms_edit('#taskedit-alarms');
+        me.init_recurrence_edit('#eventedit');
 
         $('#taskedit-date, #taskedit-startdate').datepicker(datepicker_settings);
 
@@ -429,8 +577,8 @@
         else
             render_tasklist();
 
-        $('#taskselector li.selected').removeClass('selected');
-        $('#taskselector li.'+selector).addClass('selected');
+        $('#taskselector li.selected').removeClass('selected').attr('aria-checked', 'false');
+        $('#taskselector li.'+selector).addClass('selected').attr('aria-checked', 'true');
     }
 
     /**
@@ -524,8 +672,10 @@
         fix_tree_toggles();
         update_tagcloud(activetags);
 
-        if (!count)
+        if (!count) {
             msgbox.html(rcmail.gettext('notasksfound','tasklist')).show();
+            rcmail.display_message(rcmail.gettext('notasksfound','tasklist'), 'voice');
+        }
     }
 
     /**
@@ -581,7 +731,9 @@
 
         // append new tags to tag cloud
         $.each(newtags, function(i, tag){
-            $('<li>').attr('rel', tag).data('value', tag)
+            $('<li role="checkbox" aria-checked="false" tabindex="0"></li>')
+                .attr('rel', tag)
+                .data('value', tag)
                 .html(Q(tag) + '<span class="count"></span>')
                 .appendTo(rcmail.gui_objects.tagslist)
                 .draggable({
@@ -662,10 +814,11 @@
 
         var tag = draggable.data('value'),
             drop_id = $(this).data('id'),
-            drop_rec = listdata[drop_id];
+            drop_rec = listdata[drop_id],
+            list = drop_rec && me.tasklists[drop_rec.list] ? me.tasklists[drop_rec.list] : { editable:true };
 
-        // target already has this tag assigned
-        if (!drop_rec || (drop_rec.tags && $.inArray(tag, drop_rec.tags) >= 0)) {
+        // target is not writeable or already has this tag assigned
+        if (!drop_rec || drop_rec.readonly || !list.editable || (drop_rec.tags && $.inArray(tag, drop_rec.tags) >= 0)) {
             return false;
         }
 
@@ -801,15 +954,18 @@
         for (var j=0; rec.tags && j < rec.tags.length; j++)
             tags_html += '<span class="tag">' + Q(rec.tags[j]) + '</span>';
 
+        var label_id = rcmail.html_identifier(rec.id) + '-title';
         var div = $('<div>').addClass('taskhead').html(
             '<div class="progressbar"><div class="progressvalue" style="width:' + (rec.complete * 100) + '%"></div></div>' +
-            '<input type="checkbox" name="completed[]" value="1" class="complete" ' + (rec.complete == 1.0 ? 'checked="checked" ' : '') + '/>' + 
-            '<span class="flagged"></span>' +
-            '<span class="title">' + text2html(Q(rec.title)) + '</span>' +
+            '<input type="checkbox" name="completed[]" value="1" class="complete" aria-label="' + rcmail.gettext('complete','tasklist') + '" ' + (is_complete(rec) ? 'checked="checked" ' : '') + '/>' + 
+            '<span class="flagged" role="checkbox" tabindex="0" aria-checked="' + (rec.flagged ? 'true' : 'false') + '" aria-label="' + rcmail.gettext('flagged','tasklist') + '"></span>' +
+            '<span class="title" id="' + label_id + '">' + text2html(Q(rec.title)) + '</span>' +
             '<span class="tags">' + tags_html + '</span>' +
             '<span class="date">' + Q(rec.date || rcmail.gettext('nodate','tasklist')) + '</span>' +
-            '<a href="#" class="actions">V</a>'
+            '<a href="#" class="actions" aria-haspopup="true" aria-expanded="false">' + rcmail.gettext('taskactions','tasklist') + '</a>'
             )
+            .attr('tabindex', '0')
+            .attr('aria-labelledby', label_id)
             .data('id', rec.id)
             .draggable({
                 revert: 'invalid',
@@ -819,10 +975,11 @@
                 appendTo: 'body',
                 start: task_draggable_start,
                 stop: task_draggable_stop,
+                drag: task_draggable_move,
                 revertDuration: 300
             });
 
-        if (rec.complete == 1.0)
+        if (is_complete(rec))
             div.addClass('complete');
         if (rec.flagged)
             div.addClass('flagged');
@@ -838,12 +995,12 @@
             inplace = true;
         }
         else {
-            li = $('<li>')
+            li = $('<li role="treeitem">')
                 .attr('rel', rec.id)
                 .addClass('taskitem')
                 .append((rec.collapsed ? '<span class="childtoggle collapsed">&#9654;' : '<span class="childtoggle expanded">&#9660;') + '</span>')
                 .append(div)
-                .append('<ul class="childtasks" style="' + (rec.collapsed ? 'display:none' : '') + '"></ul>');
+                .append('<ul class="childtasks" role="group" style="' + (rec.collapsed ? 'display:none' : '') + '" aria-hidden="' + (rec.collapsed ? 'true' : 'false') +'"></ul>');
 
             if (!parent || !parent.length)
                 li.appendTo(rcmail.gui_objects.resultlist);
@@ -856,6 +1013,11 @@
             resort_task(rec, li, true);
             // TODO: remove the item after a while if it doesn't match the current filter anymore
         }
+
+        // re-set focus to taskhead element after DOM update
+        if (focused_task == rec.id) {
+            focus_task(li);
+        }
     }
 
     /**
@@ -876,7 +1038,11 @@
             li.slideUp(speed, function(){
                 if (before)     li.insertBefore(before);
                 else if (after) li.insertAfter(after);
-                li.slideDown(speed);
+                li.slideDown(speed, function(){
+                    if (focused_task == rec.id) {
+                        focus_task(li);
+                    }
+                });
             });
         }
 
@@ -938,13 +1104,32 @@
      */
     function task_cmp(a, b)
     {
-        var d = Math.floor(a.complete) - Math.floor(b.complete);
+        var d = is_complete(a) - is_complete(b);
         if (!d) d = (b._hasdate-0) - (a._hasdate-0);
         if (!d) d = (a.datetime||99999999999) - (b.datetime||99999999999);
         return d;
     }
 
     /**
+     * Set focus on the given task item after DOM update
+     */
+    function focus_task(li)
+    {
+        var selector = '.taskhead';
+        if (focused_subclass)
+            selector += ' .' + focused_subclass
+        li.find(selector).focus();
+    }
+
+    /**
+     * Determine whether the given task should be displayed as "complete"
+     */
+    function is_complete(rec)
+    {
+        return ((rec.complete == 1.0 && !rec.status) || rec.status === 'COMPLETED') ? 1 : 0;
+    }
+
+    /**
      *
      */
     function get_all_childs(id)
@@ -972,21 +1157,57 @@
 
     function task_draggable_start(event, ui)
     {
-        $('.taskhead, #rootdroppable, #'+rcmail.gui_objects.folderlist.id+' li').droppable({
+        var opts = {
             hoverClass: 'droptarget',
             accept: task_droppable_accept,
             drop: task_draggable_dropped,
             addClasses: false
-        });
+        };
+
+        $('.taskhead, #rootdroppable').droppable(opts);
+        tasklists_widget.droppable(opts);
 
         $(this).parent().addClass('dragging');
         $('#rootdroppable').show();
+
+        // enable auto-scrolling of list container
+        var container = $(rcmail.gui_objects.resultlist);
+        if (container.height() > container.parent().height()) {
+            task_drag_active = true;
+            list_scroll_top = container.parent().scrollTop();
+        }
+    }
+
+    function task_draggable_move(event, ui)
+    {
+        var scroll = 0,
+            mouse = rcube_event.get_mouse_pos(event),
+            container = $(rcmail.gui_objects.resultlist);
+
+        mouse.y -= container.parent().offset().top;
+
+        if (mouse.y < scroll_sensitivity && list_scroll_top > 0) {
+            scroll = -1; // up
+        }
+        else if (mouse.y > container.parent().height() - scroll_sensitivity) {
+            scroll = 1; // down
+        }
+
+        if (task_drag_active && scroll != 0) {
+            if (!scroll_timer)
+                scroll_timer = window.setTimeout(function(){ tasklist_drag_scroll(container, scroll); }, scroll_delay);
+        }
+        else if (scroll_timer) {
+            window.clearTimeout(scroll_timer);
+            scroll_timer = null;
+        }
     }
 
     function task_draggable_stop(event, ui)
     {
         $(this).parent().removeClass('dragging');
         $('#rootdroppable').hide();
+        task_drag_active = false;
     }
 
     function task_droppable_accept(draggable)
@@ -1056,13 +1277,29 @@
         }
     }
 
+    /**
+     * Scroll list container in the given direction
+     */
+    function tasklist_drag_scroll(container, dir)
+    {
+        if (!task_drag_active)
+            return;
+
+        var old_top = list_scroll_top;
+        container.parent().get(0).scrollTop += scroll_step * dir;
+        list_scroll_top = container.parent().scrollTop();
+        scroll_timer = null;
+
+        if (list_scroll_top != old_top)
+            scroll_timer = window.setTimeout(function(){ tasklist_drag_scroll(container, dir); }, scroll_speed);
+    }
 
     /**
      * Show task details in a dialog
      */
     function task_show_dialog(id)
     {
-        var $dialog = $('#taskshow'), rec;
+        var $dialog = $('#taskshow'), rec, list;
 
         if ($dialog.is(':ui-dialog'))
           $dialog.dialog('close');
@@ -1071,6 +1308,7 @@
             return;
 
         me.selected_task = rec;
+        list = rec.list && me.tasklists[rec.list] ? me.tasklists[rec.list] : {};
 
         // fill dialog data
         $('#task-parent-title').html(Q(rec.parent_title || '')+' &raquo;').css('display', rec.parent_title ? 'block' : 'none');
@@ -1082,6 +1320,7 @@
         $('#task-starttime').html(Q(rec.starttime || ''));
         $('#task-alarm')[(rec.alarms_text ? 'show' : 'hide')]().children('.task-text').html(Q(rec.alarms_text));
         $('#task-completeness .task-text').html(((rec.complete || 0) * 100) + '%');
+        $('#task-status')[(rec.status ? 'show' : 'hide')]().children('.task-text').html(rcmail.gettext('status-'+String(rec.status).toLowerCase(),'tasklist'));
         $('#task-list .task-text').html(Q(me.tasklists[rec.list] ? me.tasklists[rec.list].name : ''));
 
         var itags = get_inherited_tags(rec);
@@ -1104,33 +1343,42 @@
             });
         }
 
+        if (rec.recurrence && rec.recurrence_text) {
+            $('#task-recurrence').show().children('.task-text').html(Q(rec.recurrence_text));
+        }
+        else {
+            $('#task-recurrence').hide();
+        }
+
         // build attachments list
         $('#task-attachments').hide();
         if ($.isArray(rec.attachments)) {
             task_show_attachments(rec.attachments || [], $('#task-attachments').children('.task-text'), rec);
             if (rec.attachments.length > 0) {
                 $('#task-attachments').show();
-          }
+            }
         }
 
         // define dialog buttons
         var buttons = [];
-        buttons.push({
-            text: rcmail.gettext('edit','tasklist'),
-            click: function() {
-                task_edit_dialog(me.selected_task.id, 'edit');
-            },
-            disabled: rcmail.busy
-        });
+        if (list.editable && !rec.readonly) {
+              buttons.push({
+                text: rcmail.gettext('edit','tasklist'),
+                click: function() {
+                    task_edit_dialog(me.selected_task.id, 'edit');
+                },
+                disabled: rcmail.busy
+            });
 
-        buttons.push({
-            text: rcmail.gettext('delete','tasklist'),
-            click: function() {
-                if (delete_task(me.selected_task.id))
-                    $dialog.dialog('close');
-            },
-            disabled: rcmail.busy
-        });
+            buttons.push({
+                text: rcmail.gettext('delete','tasklist'),
+                click: function() {
+                    if (delete_task(me.selected_task.id))
+                        $dialog.dialog('close');
+                },
+                disabled: rcmail.busy
+            });
+        }
 
         // open jquery UI dialog
         $dialog.dialog({
@@ -1139,7 +1387,7 @@
           closeOnEscape: true,
           title: rcmail.gettext('taskdetails', 'tasklist'),
           open: function() {
-            $dialog.parent().find('.ui-button').first().focus();
+            $dialog.parent().find('.ui-button:not(.ui-dialog-titlebar-close)').first().focus();
           },
           close: function() {
               $dialog.dialog('destroy').appendTo(document.body);
@@ -1169,7 +1417,7 @@
         if (rcmail.busy || !list.editable || (action == 'edit' && (!rec || rec.readonly)))
             return false;
 
-        me.selected_task = $.extend({ alarms:'' }, rec);  // clone task object
+        me.selected_task = $.extend({ valarms:[] }, rec);  // clone task object
         rec =  me.selected_task;
 
         // assign temporary id
@@ -1188,6 +1436,7 @@
         var recstarttime = $('#taskedit-starttime').val(rec.starttime || '');
         var complete = $('#taskedit-completeness').val((rec.complete || 0) * 100);
         completeness_slider.slider('value', complete.val());
+        var taskstatus = $('#taskedit-status').val(rec.status || '');
         var tasklist = $('#taskedit-tasklist').val(rec.list || me.selected_list).prop('disabled', rec.parent_id ? true : false);
 
         // tag-edit line
@@ -1195,7 +1444,7 @@
         $.each(typeof rec.tags == 'object' && rec.tags.length ? rec.tags : [''], function(i,val){
             $('<input>')
                 .attr('name', 'tags[]')
-                .attr('tabindex', '3')
+                .attr('tabindex', '0')
                 .addClass('tag')
                 .val(val)
                 .appendTo(tagline);
@@ -1205,34 +1454,15 @@
             animSpeed: 100,
             allowEdit: false,
             checkNewEntriesCaseSensitive: false,
-            autocompleteOptions: { source: tags, minLength: 0 },
+            autocompleteOptions: { source: tags, minLength: 0, noCheck: true, appendTo:'#taskedit' },
             texts: { removeLinkTitle: rcmail.gettext('removetag', 'tasklist') }
         });
 
         // set alarm(s)
-        if (rec.alarms || action != 'new') {
-          var valarms = (typeof rec.alarms == 'string' ? rec.alarms.split(';') : rec.alarms) || [''];
-          for (var alarm, i=0; i < valarms.length; i++) {
-              alarm = String(valarms[i]).split(':');
-              if (!alarm[1] && alarm[0]) alarm[1] = 'DISPLAY';
-              $('#taskedit select.edit-alarm-type').val(alarm[1]);
-
-              if (alarm[0].match(/@(\d+)/)) {
-                  var ondate = fromunixtime(parseInt(RegExp.$1));
-                  $('#taskedit select.edit-alarm-offset').val('@');
-                  $('#taskedit input.edit-alarm-date').val(me.format_datetime(ondate, 1));
-                  $('#taskedit input.edit-alarm-time').val(me.format_datetime(ondate, 2));
-              }
-              else if (alarm[0].match(/([-+])(\d+)([MHD])/)) {
-                  $('#taskedit input.edit-alarm-value').val(RegExp.$2);
-                  $('#taskedit select.edit-alarm-offset').val(''+RegExp.$1+RegExp.$3);
-              }
-
-              break; // only one alarm is currently supported
-          }
-        }
-        // set correct visibility by triggering onchange handlers
-        $('#taskedit select.edit-alarm-type, #taskedit select.edit-alarm-offset').change();
+        me.set_alarms_edit('#taskedit-alarms', action != 'new' && rec.valarms ? rec.valarms : []);
+
+        // set recurrence
+        me.set_recurrence_edit(rec);
 
         // attachments
         rcmail.enable_command('remove-attachment', list.editable);
@@ -1252,17 +1482,19 @@
         $('#taskedit-tab-attachments')[(list.attachments||rec.attachments?'show':'hide')]();
 
         // activate the first tab
-        $('#taskedit').tabs('select', 0);
+        $('#taskedit').tabs('option', 'active', 0);
 
         // define dialog buttons
         var buttons = {};
         buttons[rcmail.gettext('save', 'tasklist')] = function() {
             // copy form field contents into task object to save
-            $.each({ title:title, description:description, date:recdate, time:rectime, startdate:recstartdate, starttime:recstarttime, list:tasklist }, function(key,input){
+            $.each({ title:title, description:description, date:recdate, time:rectime, startdate:recstartdate, starttime:recstarttime, status:taskstatus, list:tasklist }, function(key,input){
                 me.selected_task[key] = input.val();
             });
             me.selected_task.tags = [];
             me.selected_task.attachments = [];
+            me.selected_task.valarms = me.serialize_alarms('#taskedit-alarms');
+            me.selected_task.recurrence = me.serialize_recurrence(rectime.val());
 
             // do some basic input validation
             if (!me.selected_task.title || !me.selected_task.title.length) {
@@ -1289,16 +1521,6 @@
                 me.selected_task.tags.push(newtag);
             }
 
-            // serialize alarm settings
-            var alarm = $('#taskedit select.edit-alarm-type').val();
-            if (alarm) {
-                var val, offset = $('#taskedit select.edit-alarm-offset').val();
-                if (offset == '@')
-                    me.selected_task.alarms = '@' + date2unixtime(parse_datetime($('#taskedit input.edit-alarm-time').val(), $('#taskedit input.edit-alarm-date').val())) + ':' + alarm;
-              else if ((val = parseInt($('#taskedit input.edit-alarm-value').val())) && !isNaN(val) && val >= 0)
-                    me.selected_task.alarms = offset[0] + val + offset[1] + ':' + alarm;
-            }
-
             // uploaded attachments list
             for (var i in rcmail.env.attachments) {
                 if (i.match(/^rcmfile(.+)/))
@@ -1341,9 +1563,6 @@
           resizable: (!bw.ie6 && !bw.ie7),  // disable for performance reasons
           closeOnEscape: false,
           title: rcmail.gettext((action == 'edit' ? 'edittask' : 'newtask'), 'tasklist'),
-          open: function() {
-            $dialog.parent().find('.ui-dialog-buttonset .ui-button').first().addClass('mainaction');
-          },
           close: function() {
               editform.hide().appendTo(document.body);
               $dialog.dialog('destroy').remove();
@@ -1618,8 +1837,7 @@
     function list_edit_dialog(id)
     {
         var list = me.tasklists[id],
-            $dialog = $('#tasklistform');
-            editform = $('#tasklisteditform');
+            $dialog = $(rcmail.gui_containers.tasklistform);
 
         if ($dialog.is(':ui-dialog'))
             $dialog.dialog('close');
@@ -1627,55 +1845,70 @@
         if (!list)
             list = { name:'', editable:true, showalarms:true };
 
-        // fill edit form
-        var name = $('#taskedit-tasklistame').prop('disabled', list.norename||false).val(list.editname || list.name),
-            alarms = $('#taskedit-showalarms').prop('checked', list.showalarms).get(0),
-            parent = $('#taskedit-parentfolder').val(list.parentfolder);
+        var editform, name, alarms;
+
+        $dialog.html(rcmail.get_label('loading'));
+        $.ajax({
+            type: 'GET',
+            dataType: 'html',
+            url: rcmail.url('tasklist'),
+            data: { action:(list.id ? 'form-edit' : 'form-new'), l:{ id:list.id } },
+            success: function(data) {
+                $dialog.html(data);
+                rcmail.triggerEvent('tasklist_editform_load', list);
+
+                // resize and reposition dialog window
+                editform = $('#tasklisteditform');
+                me.dialog_resize(rcmail.gui_containers.tasklistform, editform.height(), editform.width());
+
+                name = $('#taskedit-tasklistame').prop('disabled', list.norename||false).val(list.editname || list.name);
+                alarms = $('#taskedit-showalarms').prop('checked', list.showalarms).get(0);
+                name.select();
+            }
+        });
 
         // dialog buttons
         var buttons = {};
 
         buttons[rcmail.gettext('save','tasklist')] = function() {
-          // do some input validation
-          if (!name.val() || name.val().length < 2) {
-            alert(rcmail.gettext('invalidlistproperties', 'tasklist'));
-            name.select();
-            return;
-          }
+            // do some input validation
+            if (!name.val() || name.val().length < 2) {
+                alert(rcmail.gettext('invalidlistproperties', 'tasklist'));
+                name.select();
+                return;
+            }
 
-          // post data to server
-          var data = editform.serializeJSON();
-          if (list.id)
-            data.id = list.id;
-          if (alarms)
-            data.showalarms = alarms.checked ? 1 : 0;
-        if (parent.length)
-            data.parentfolder = $('option:selected', parent).val();
-
-          saving_lock = rcmail.set_busy(true, 'tasklist.savingdata');
-          rcmail.http_post('tasklist', { action:(list.id ? 'edit' : 'new'), l:data });
-          $dialog.dialog('close');
+            // post data to server
+            var data = editform.serializeJSON();
+            if (list.id)
+                data.id = list.id;
+            if (alarms)
+                data.showalarms = alarms.checked ? 1 : 0;
+
+            saving_lock = rcmail.set_busy(true, 'tasklist.savingdata');
+            rcmail.http_post('tasklist', { action:(list.id ? 'edit' : 'new'), l:data });
+            $dialog.dialog('close');
         };
 
         buttons[rcmail.gettext('cancel','tasklist')] = function() {
-          $dialog.dialog('close');
+            $dialog.dialog('close');
         };
 
         // open jquery UI dialog
         $dialog.dialog({
-          modal: true,
-          resizable: true,
-          closeOnEscape: false,
-          title: rcmail.gettext((list.id ? 'editlist' : 'createlist'), 'tasklist'),
-          open: function() {
-            $dialog.parent().find('.ui-dialog-buttonset .ui-button').first().addClass('mainaction');
-          },
-          close: function() {
-            $dialog.dialog('destroy').hide();
-          },
-          buttons: buttons,
-          minWidth: 400,
-          width: 420
+            modal: true,
+            resizable: true,
+            closeOnEscape: false,
+            title: rcmail.gettext((list.id ? 'editlist' : 'createlist'), 'tasklist'),
+            open: function() {
+                $dialog.parent().find('.ui-dialog-buttonset .ui-button').first().addClass('mainaction');
+            },
+            close: function() {
+                $dialog.dialog('destroy').hide();
+            },
+            buttons: buttons,
+            minWidth: 400,
+            width: 420
         }).show();
     }
 
@@ -1701,7 +1934,7 @@
         var li, delete_ids = [],
             list = me.tasklists[prop.id];
 
-            // find sub-lists
+        // find sub-lists
         if (list && list.children) {
             for (var child_id in me.tasklists) {
                 if (String(child_id).indexOf(prop.id) == 0)
@@ -1712,21 +1945,19 @@
             delete_ids.push(prop.id);
         }
 
-        // delete all calendars in the list
+        // delete all subfolders in the list
         for (var i=0; i < delete_ids.length; i++) {
             id = delete_ids[i];
             list = me.tasklists[id];
-            li = rcmail.get_folder_li(id, 'rcmlitasklist');
+            tasklists_widget.remove(id);
 
-            if (li) {
-                $(li).remove();
-            }
             if (list) {
                 list.active = false;
                 // delete me.tasklists[prop.id];
                 unlock_saving();
                 remove_tasks(list.id);
             }
+            $("#taskedit-tasklist option[value='"+id+"']").remove();
         }
     }
 
@@ -1735,13 +1966,26 @@
      */
     function insert_list(prop)
     {
-        var li = $('<li>').attr('id', 'rcmlitasklist'+prop.id)
-            .append('<input type="checkbox" name="_list[]" value="'+prop.id+'" checked="checked" />')
-            .append('<span class="handle">&nbsp;</span>')
-            .append('<span class="listname">'+Q(prop.name)+'</span>');
-        $(rcmail.gui_objects.folderlist).append(li);
+        if (prop._reload) {
+            rcmail.redirect(rcmail.url(''));
+            return;
+        }
+
+        tasklists_widget.insert({
+            id: prop.id,
+            classes: [ prop.group || '' ],
+            virtual: prop.virtual,
+            html: prop.html
+        }, prop.parent || null, prop.group);
+
+        // flag as tasklist for drag & drop
+        $(tasklists_widget.get_item(prop.id)).data('type', 'tasklist');
+
+        delete prop.html;
         me.tasklists[prop.id] = prop;
-        init_tasklist_li(li.get(0), prop.id);
+
+        // append to list selector in task edit dialog, too (#2985)
+        $('<option>').attr('value', prop.id).html(Q(prop.name)).appendTo('#taskedit-tasklist');
     }
 
     /**
@@ -1750,14 +1994,19 @@
     function update_list(prop)
     {
         var id = prop.oldid || prop.id,
-            li = rcmail.get_folder_li(id, 'rcmlitasklist');
+            li = tasklists_widget.get_item(id);
+
+        if (prop._reload) {
+            rcmail.redirect(rcmail.url(''));
+            return;
+        }
 
         if (me.tasklists[id] && li) {
             delete me.tasklists[id];
             me.tasklists[prop.id] = prop;
-            $(li).data('id', prop.id);
-            $('#'+li.id+' input').data('id', prop.id);
-            $('.listname', li).html(Q(prop.name));
+            $(li).find('input').first().val(prop.id);
+            $(li).find('.listname').first().html(Q(prop.name));
+            tasklists_widget.update(id, { id:prop.id, html:li.children().first() });
         }
     }
 
@@ -1877,62 +2126,22 @@
     };
 
     /**
-     * Register event handlers on a tasklist (folder) item
-     */
-    function init_tasklist_li(li, id)
-    {
-        $('#'+li.id+' input').click(function(e){
-            var id = $(this).data('id');
-            if (me.tasklists[id]) {  // add or remove event source on click
-                me.tasklists[id].active = this.checked;
-                fetch_counts();
-                if (!this.checked) remove_tasks(id);
-                else               list_tasks(null);
-                rcmail.http_post('tasklist', { action:'subscribe', l:{ id:id, active:me.tasklists[id].active?1:0 } });
-
-                // disable focusview
-                if (!this.checked && focusview == id) {
-                    set_focusview(null);
-                }
-            }
-        }).data('id', id).get(0).checked = me.tasklists[id].active || false;
-
-        $(li).click(function(e){
-            var id = $(this).data('id');
-            rcmail.select_folder(id, 'rcmlitasklist');
-            rcmail.enable_command('list-edit', 'list-remove', 'list-import', me.tasklists[id].editable);
-            me.selected_list = id;
-
-            // click on handle icon toggles focusview
-            if (e.target.className == 'handle') {
-                set_focusview(focusview == id ? null : id)
-            }
-            // disable focusview when selecting another list
-            else if (focusview && id != focusview) {
-                set_focusview(null);
-            }
-        })
-        .dblclick(function(e){
-            list_edit_dialog($(this).data('id'));
-        })
-        .data('id', id)
-        .data('type', 'tasklist')
-        .addClass(me.tasklists[id].editable ? null : 'readonly');
-    }
-
-    /**
      * Enable/disable focusview mode for the given list
      */
     function set_focusview(id)
     {
-        if (focusview && focusview != id)
-            $(rcmail.get_folder_li(focusview, 'rcmlitasklist')).removeClass('focusview');
+        if (focusview && focusview != id) {
+            $(tasklists_widget.get_item(focusview)).find('.tasklist').first().removeClass('focusview')
+                .find('a.quickview').attr('aria-checked', 'false');
+        }
 
         focusview = id;
 
+        var li = $(tasklists_widget.get_item(id)).find('.tasklist').first();
+
         // activate list if necessary
         if (focusview && !me.tasklists[id].active) {
-            $('input', rcmail.get_folder_li(id, 'rcmlitasklist')).get(0).checked = true;
+            li.find('input[type=checkbox]').get(0).checked = true;
             me.tasklists[id].active = true;
             fetch_counts();
         }
@@ -1941,7 +2150,7 @@
         list_tasks(null);
 
         if (focusview) {
-            $(rcmail.get_folder_li(focusview, 'rcmlitasklist')).addClass('focusview');
+            li.addClass('focusview').find('a.quickview').attr('aria-checked', 'true');
         }
     }

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

@@ -52,6 +52,7 @@
     public $driver;
     public $timezone;
     public $ui;
+    public $home;  // declare public to be used in other classes
 
     private $collapsed_tasks = array();
 
@@ -75,6 +76,8 @@
 
         // proceed initialization in startup hook
         $this->add_hook('startup', array($this, 'startup'));
+
+        $this->add_hook('user_delete', array($this, 'user_delete'));
     }
 
     /**
@@ -132,8 +135,7 @@
         }
 
         if (!$this->rc->output->ajax_call && !$this->rc->output->env['framed']) {
-            require_once($this->home . '/tasklist_ui.php');
-            $this->ui = new tasklist_ui($this);
+            $this->load_ui();
             $this->ui->init();
         }
 
@@ -142,6 +144,16 @@
         $this->add_hook('dismiss_alarms', array($this, 'dismiss_alarms'));
     }
 
+    /**
+     *
+     */
+    private function load_ui()
+    {
+        if (!$this->ui) {
+            require_once($this->home . '/tasklist_ui.php');
+            $this->ui = new tasklist_ui($this);
+        }
+    }
 
     /**
      * Helper method to load the backend driver according to local config
@@ -195,17 +207,24 @@
 
         case 'edit':
             $rec = $this->prepare_task($rec);
+            $clone = $this->handle_recurrence($rec, $this->driver->get_task($rec));
             if ($success = $this->driver->edit_task($rec)) {
                 $refresh[] = $this->driver->get_task($rec);
                 $this->cleanup_task($rec);
 
+                // add clone from recurring task
+                if ($clone && $this->driver->create_task($clone)) {
+                    $refresh[] = $this->driver->get_task($clone);
+                    $this->driver->clear_alarms($rec['id']);
+                }
+
                 // move all childs if list assignment was changed
                 if (!empty($rec['_fromlist']) && !empty($rec['list']) && $rec['_fromlist'] != $rec['list']) {
                     foreach ($this->driver->get_childs(array('id' => $rec['id'], 'list' => $rec['_fromlist']), true) as $cid) {
                         $child = array('id' => $cid, 'list' => $rec['list'], '_fromlist' => $rec['_fromlist']);
                         if ($this->driver->move_task($child)) {
                             $r = $this->driver->get_task($child);
-                            if ((bool)($filter & self::FILTER_MASK_COMPLETE) == ($r['complete'] == 1.0)) {
+                            if ((bool)($filter & self::FILTER_MASK_COMPLETE) == $this->driver->is_complete($r)) {
                                 $refresh[] = $r;
                             }
                         }
@@ -228,7 +247,7 @@
                           $child['id'] = $cid;
                           if ($this->driver->move_task($child)) {
                               $r = $this->driver->get_task($child);
-                              if ((bool)($filter & self::FILTER_MASK_COMPLETE) == ($r['complete'] == 1.0)) {
+                              if ((bool)($filter & self::FILTER_MASK_COMPLETE) == $this->driver->is_complete($r)) {
                                   $refresh[] = $r;
                               }
                           }
@@ -406,9 +425,46 @@
             $rec['tags'] = array_filter((array)$rec['tags']);
         }
 
-        // alarms cannot work without a date
-        if ($rec['alarms'] && !$rec['date'] && !$rec['startdate'] && strpos($rec['alarms'], '@') === false)
-            $rec['alarms'] = '';
+        // convert the submitted alarm values
+        if ($rec['valarms']) {
+            $valarms = array();
+            foreach (libcalendaring::from_client_alarms($rec['valarms']) as $alarm) {
+                // alarms can only work with a date (either task start, due or absolute alarm date)
+                if (is_a($alarm['trigger'], 'DateTime') || $rec['date'] || $rec['startdate'])
+                    $valarms[] = $alarm;
+            }
+            $rec['valarms'] = $valarms;
+        }
+
+        // convert the submitted recurrence settings
+        if (is_array($rec['recurrence'])) {
+            $refdate = null;
+            if (!empty($rec['date'])) {
+                $refdate = new DateTime($rec['date'] . ' ' . $rec['time'], $this->timezone);
+            }
+            else if (!empty($rec['startdate'])) {
+                $refdate = new DateTime($rec['startdate'] . ' ' . $rec['starttime'], $this->timezone);
+            }
+
+            if ($refdate) {
+                $rec['recurrence'] = $this->lib->from_client_recurrence($rec['recurrence'], $refdate);
+
+                // translate count into an absolute end date.
+                // why? because when shifting completed tasks to the next recurrence,
+                // the initial start date to count from gets lost.
+                if ($rec['recurrence']['COUNT']) {
+                    $engine = libcalendaring::get_recurrence();
+                    $engine->init($rec['recurrence'], $refdate);
+                    if ($until = $engine->end()) {
+                        $rec['recurrence']['UNTIL'] = $until;
+                        unset($rec['recurrence']['COUNT']);
+                    }
+                }
+            }
+            else {  // recurrence requires a reference date
+                $rec['recurrence'] = '';
+            }
+        }
 
         $attachments = array();
         $taskid = $rec['id'];
@@ -471,6 +527,64 @@
         }
     }
 
+    /**
+     * When flagging a recurring task as complete,
+     * clone it and shift dates to the next occurrence
+     */
+    private function handle_recurrence(&$rec, $old)
+    {
+        $clone = null;
+        if ($this->driver->is_complete($rec) && $old && $this->driver->is_complete($old) && is_array($rec['recurrence'])) {
+            $engine = libcalendaring::get_recurrence();
+            $rrule = $rec['recurrence'];
+            $updates = array();
+
+            // compute the next occurrence of date attributes
+            foreach (array('date'=>'time', 'startdate'=>'starttime') as $date_key => $time_key) {
+                if (empty($rec[$date_key]))
+                    continue;
+
+                $date = new DateTime($rec[$date_key] . ' ' . $rec[$time_key], $this->timezone);
+                $engine->init($rrule, $date);
+                if ($next = $engine->next()) {
+                    $updates[$date_key] = $next->format('Y-m-d');
+                    if (!empty($rec[$time_key]))
+                        $updates[$time_key] = $next->format('H:i');
+                }
+            }
+
+            // shift absolute alarm dates
+            if (!empty($updates) && is_array($rec['valarms'])) {
+                $updates['valarms'] = array();
+                unset($rrule['UNTIL'], $rrule['COUNT']);  // make recurrence rule unlimited
+
+                foreach ($rec['valarms'] as $i => $alarm) {
+                    if ($alarm['trigger'] instanceof DateTime) {
+                        $engine->init($rrule, $alarm['trigger']);
+                        if ($next = $engine->next()) {
+                            $alarm['trigger'] = $next;
+                        }
+                    }
+                    $updates['valarms'][$i] = $alarm;
+                }
+            }
+
+            if (!empty($updates)) {
+                // clone task to save a completed copy
+                $clone = $rec;
+                $clone['uid'] = $this->generate_uid();
+                $clone['parent_id'] = $rec['id'];
+                unset($clone['id'], $clone['recurrence'], $clone['attachments']);
+
+                // update the task but unset completed flag
+                $rec = array_merge($rec, $updates);
+                $rec['complete'] = $old['complete'];
+                $rec['satus'] = $old['satus'];
+            }
+        }
+
+        return $clone;
+    }
 
     /**
      * Dispatcher for tasklist actions initiated by the client
@@ -478,17 +592,27 @@
     public function tasklist_action()
     {
         $action = get_input_value('action', RCUBE_INPUT_GPC);
-        $list  = get_input_value('l', RCUBE_INPUT_POST, true);
+        $list  = get_input_value('l', RCUBE_INPUT_GPC, true);
         $success = false;
 
         if (isset($list['showalarms']))
           $list['showalarms'] = intval($list['showalarms']);
 
         switch ($action) {
+        case 'form-new':
+        case 'form-edit':
+            echo $this->ui->tasklist_editform($action, $list);
+            exit;
+
         case 'new':
             $list += array('showalarms' => true, 'active' => true, 'editable' => true);
             if ($insert_id = $this->driver->create_list($list)) {
                 $list['id'] = $insert_id;
+                if (!$list['_reload']) {
+                    $this->load_ui();
+                    $list['html'] = $this->ui->tasklist_list_item($insert_id, $list, $jsenv);
+                    $list += (array)$jsenv[$insert_id];
+                }
                 $this->rc->output->command('plugin.insert_tasklist', $list);
                 $success = true;
             }
@@ -511,6 +635,30 @@
             if (($success = $this->driver->remove_list($list)))
                 $this->rc->output->command('plugin.destroy_tasklist', $list);
             break;
+
+        case 'search':
+            $this->load_ui();
+            $results = array();
+            foreach ((array)$this->driver->search_lists(get_input_value('q', RCUBE_INPUT_GPC), get_input_value('source', RCUBE_INPUT_GPC)) as $id => $prop) {
+                $editname = $prop['editname'];
+                unset($prop['editname']);  // force full name to be displayed
+                $prop['active'] = false;
+
+                // let the UI generate HTML and CSS representation for this calendar
+                $html = $this->ui->tasklist_list_item($id, $prop, $jsenv);
+                $prop += (array)$jsenv[$id];
+                $prop['editname'] = $editname;
+                $prop['html'] = $html;
+
+                $results[] = $prop;
+            }
+            // report more results available
+            if ($this->driver->search_more_results) {
+                $this->rc->output->show_message('autocompletemore', 'info');
+            }
+
+            $this->rc->output->command('multi_thread_http_response', $results, get_input_value('_reqid', RCUBE_INPUT_GPC));
+            return;
         }
 
         if ($success)
@@ -610,7 +758,7 @@
                 $tags = array_merge($tags, (array)$rec['tags']);
 
             // apply filter; don't trust the driver on this :-)
-            if ((!$f && $rec['complete'] < 1.0) || ($rec['mask'] & $f))
+            if ((!$f && !$this->driver->is_complete($rec)) || ($rec['mask'] & $f))
                 $data[] = $rec;
         }
 
@@ -658,8 +806,15 @@
             }
         }
 
-        if ($rec['alarms'])
-            $rec['alarms_text'] = libcalendaring::alarms_text($rec['alarms']);
+        if ($rec['valarms']) {
+            $rec['alarms_text'] = libcalendaring::alarms_text($rec['valarms']);
+            $rec['valarms'] = libcalendaring::to_client_alarms($rec['valarms']);
+        }
+
+        if ($rec['recurrence']) {
+            $rec['recurrence_text'] = $this->lib->recurrence_text($rec['recurrence']);
+            $rec['recurrence'] = $this->lib->to_client_recurrence($rec['recurrence'], $rec['time'] || $rec['starttime']);
+        }
 
         foreach ((array)$rec['attachments'] as $k => $attachment) {
             $rec['attachments'][$k]['classname'] = rcube_utils::file2class($attachment['mimetype'], $attachment['name']);
@@ -730,7 +885,7 @@
 
         if ($rec['flagged'])
             $mask |= self::FILTER_MASK_FLAGGED;
-        if ($rec['complete'] == 1.0)
+        if ($this->driver->is_complete($rec))
             $mask |= self::FILTER_MASK_COMPLETE;
 
         if (empty($rec['date']))
@@ -742,9 +897,9 @@
             $mask |= self::FILTER_MASK_TODAY;
         if ($duedate <= $tomorrow || ($rec['startdate'] && $start <= $tomorrow))
             $mask |= self::FILTER_MASK_TOMORROW;
-        if ($start > $tomorrow || ($duedate > $tomorrow && $duedate <= $weeklimit))
+        if (($start > $tomorrow && $start <= $weeklimit) || ($duedate > $tomorrow && $duedate <= $weeklimit))
             $mask |= self::FILTER_MASK_WEEK;
-        if ($start > $weeklimit || ($rec['date'] && $duedate > $weeklimit))
+        else if ($start > $weeklimit || ($rec['date'] && $duedate > $weeklimit))
             $mask |= self::FILTER_MASK_LATER;
 
         return $mask;
@@ -760,6 +915,13 @@
     {
         $this->ui->init();
         $this->ui->init_templates();
+
+        // set autocompletion env
+        $this->rc->output->set_env('autocomplete_threads', (int)$this->rc->config->get('autocomplete_threads', 0));
+        $this->rc->output->set_env('autocomplete_max', (int)$this->rc->config->get('autocomplete_max', 15));
+        $this->rc->output->set_env('autocomplete_min_length', $this->rc->config->get('autocomplete_min_length'));
+        $this->rc->output->add_label('autocompletechars', 'autocompletemore');
+
         $this->rc->output->set_pagetitle($this->gettext('navtitle'));
         $this->rc->output->send('tasklist.mainview');
     }
@@ -777,11 +939,9 @@
 
         $this->ui->init_templates();
         echo $this->api->output->parse('tasklist.taskedit', false, false);
+        echo html::tag('link', array('rel' => 'stylesheet', 'type' => 'text/css', 'href' => $this->url($this->local_skin_path() . '/tagedit.css'), 'nl' => true));
         echo html::tag('script', array('type' => 'text/javascript'),
             "rcmail.set_env('tasklists', " . json_encode($this->api->output->env['tasklists']) . ");\n".
-//            "rcmail.set_env('deleteicon', '" . $this->api->output->env['deleteicon'] . "');\n".
-//            "rcmail.set_env('cancelicon', '" . $this->api->output->env['cancelicon'] . "');\n".
-//            "rcmail.set_env('loadingicon', '" . $this->api->output->env['loadingicon'] . "');\n".
             "rcmail.add_label(" . json_encode($texts) . ");\n"
         );
         exit;
@@ -972,5 +1132,13 @@
       return strtoupper(md5(time() . uniqid(rand())) . '-' . substr(md5($this->rc->user->get_username()), 0, 16));
     }
 
+    /**
+     * Handler for user_delete plugin hook
+     */
+    public function user_delete($args)
+    {
+       $this->load_driver();
+       return $this->driver->user_delete($args);
+    }
 }

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

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

@@ -67,66 +67,155 @@
     {
         $this->plugin->register_handler('plugin.tasklists', array($this, 'tasklists'));
         $this->plugin->register_handler('plugin.tasklist_select', array($this, 'tasklist_select'));
-        $this->plugin->register_handler('plugin.category_select', array($this, 'category_select'));
+        $this->plugin->register_handler('plugin.status_select', array($this, 'status_select'));
         $this->plugin->register_handler('plugin.searchform', array($this->rc->output, 'search_form'));
         $this->plugin->register_handler('plugin.quickaddform', array($this, 'quickadd_form'));
-        $this->plugin->register_handler('plugin.tasklist_editform', array($this, 'tasklist_editform'));
         $this->plugin->register_handler('plugin.tasks', array($this, 'tasks_resultview'));
         $this->plugin->register_handler('plugin.tagslist', array($this, 'tagslist'));
         $this->plugin->register_handler('plugin.tags_editline', array($this, 'tags_editline'));
         $this->plugin->register_handler('plugin.alarm_select', array($this, 'alarm_select'));
+        $this->plugin->register_handler('plugin.recurrence_form', array($this->plugin->lib, 'recurrence_form'));
         $this->plugin->register_handler('plugin.attachments_form', array($this, 'attachments_form'));
         $this->plugin->register_handler('plugin.attachments_list', array($this, 'attachments_list'));
         $this->plugin->register_handler('plugin.filedroparea', array($this, 'file_drop_area'));
 
         $this->plugin->include_script('jquery.tagedit.js');
         $this->plugin->include_script('tasklist.js');
+        $this->rc->output->include_script('treelist.js');
+
+        // include kolab folderlist widget if available
+        if (is_readable($this->plugin->api->dir . 'libkolab/js/folderlist.js')) {
+            $this->plugin->api->include_script('libkolab/js/folderlist.js');
+        }
+
+        $this->plugin->include_stylesheet($this->plugin->local_skin_path() . '/tagedit.css');
     }
 
     /**
      *
      */
-    function tasklists($attrib = array())
+    public function tasklists($attrib = array())
+    {
+        $tree = true;
+        $jsenv = array();
+        $lists = $this->plugin->driver->get_lists($tree);
+
+        // walk folder tree
+        if (is_object($tree)) {
+            $html = $this->list_tree_html($tree, $lists, $jsenv, $attrib);
+        }
+        else {
+            // fall-back to flat folder listing
+            $attrib['class'] .= ' flat';
+
+            $html = '';
+            foreach ((array)$lists as $id => $prop) {
+                if ($attrib['activeonly'] && !$prop['active'])
+                  continue;
+
+                $html .= html::tag('li', array(
+                        'id' => 'rcmlitasklist' . rcube_utils::html_identifier($id),
+                        'class' => $prop['group'],
+                    ),
+                    $this->tasklist_list_item($id, $prop, $jsenv, $attrib['activeonly'])
+                );
+            }
+        }
+
+        $this->rc->output->set_env('tasklists', $jsenv);
+        $this->rc->output->add_gui_object('tasklistslist', $attrib['id']);
+
+        return html::tag('ul', $attrib, $html, html::$common_attrib);
+    }
+
+    /**
+     * Return html for a structured list <ul> for the folder tree
+     */
+    public function list_tree_html($node, $data, &$jsenv, $attrib)
     {
-        $lists = $this->plugin->driver->get_lists();
+        $out = '';
+        foreach ($node->children as $folder) {
+            $id = $folder->id;
+            $prop = $data[$id];
+            $is_collapsed = false; // TODO: determine this somehow?
+
+            $content = $this->tasklist_list_item($id, $prop, $jsenv, $attrib['activeonly']);
+
+            if (!empty($folder->children)) {
+                $content .= html::tag('ul', array('style' => ($is_collapsed ? "display:none;" : null)),
+                    $this->list_tree_html($folder, $data, $jsenv, $attrib));
+            }
+
+            if (strlen($content)) {
+                $out .= html::tag('li', array(
+                      'id' => 'rcmlitasklist' . rcube_utils::html_identifier($id),
+                      'class' => $prop['group'] . ($prop['virtual'] ? ' virtual' : ''),
+                    ),
+                    $content);
+            }
+        }
 
-        $li = '';
-        foreach ((array)$lists as $id => $prop) {
-            if ($attrib['activeonly'] && !$prop['active'])
-              continue;
+        return $out;
+    }
 
+    /**
+     * Helper method to build a tasklist item (HTML content and js data)
+     */
+    public function tasklist_list_item($id, $prop, &$jsenv, $activeonly = false)
+    {
+        // enrich list properties with settings from the driver
+        if (!$prop['virtual']) {
             unset($prop['user_id']);
             $prop['alarms'] = $this->plugin->driver->alarms;
             $prop['undelete'] = $this->plugin->driver->undelete;
             $prop['sortable'] = $this->plugin->driver->sortable;
             $prop['attachments'] = $this->plugin->driver->attachments;
-
-            if (!$prop['virtual'])
-                $jsenv[$id] = $prop;
-
-            $html_id = html_identifier($id);
-            $class = 'tasks-'  . asciiwords($id, true);
-            $title = $prop['name'] != $prop['listname'] ? html_entity_decode($prop['name'], ENT_COMPAT, RCMAIL_CHARSET) : '';
-
-            if ($prop['virtual'])
-                $class .= ' virtual';
-            else if (!$prop['editable'])
-                $class .= ' readonly';
-            if ($prop['class_name'])
-                $class .= ' '.$prop['class_name'];
-
-            $li .= html::tag('li', array('id' => 'rcmlitasklist' . $html_id, 'class' => $class),
-                ($prop['virtual'] ? '' : html::tag('input', array('type' => 'checkbox', 'name' => '_list[]', 'value' => $id, 'checked' => $prop['active']))) .
-                html::span(array('class' => 'handle', 'title' => $this->plugin->gettext('focusview')), '&nbsp;') .
-                html::span(array('class' => 'listname', 'title' => $title), $prop['listname']));
+            $jsenv[$id] = $prop;
         }
 
-        $this->rc->output->set_env('tasklists', $jsenv);
-        $this->rc->output->add_gui_object('folderlist', $attrib['id']);
+        $classes = array('tasklist');
+        $title = $prop['title'] ?: ($prop['name'] != $prop['listname'] || strlen($prop['name']) > 25 ?
+          html_entity_decode($prop['name'], ENT_COMPAT, RCMAIL_CHARSET) : '');
+
+        if ($prop['virtual'])
+            $classes[] = 'virtual';
+        else if (!$prop['editable'])
+            $classes[] = 'readonly';
+        if ($prop['subscribed'])
+            $classes[] = 'subscribed';
+        if ($prop['class'])
+            $classes[] = $prop['class'];
+
+        if (!$activeonly || $prop['active']) {
+            $label_id = 'tl:' . $id;
+            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'), ' ') : '')
+                )
+            );
+        }
 
-        return html::tag('ul', $attrib, $li, html::$common_attrib);
+        return '';
     }
 
+    /**
+     * Render HTML form for task status selector
+     */
+    function status_select($attrib = array())
+    {
+        $attrib['name'] = 'status';
+        $select = new html_select($attrib);
+        $select->add('---', '');
+        $select->add($this->plugin->gettext('status-needs-action'), 'NEEDS-ACTION');
+        $select->add($this->plugin->gettext('status-in-process'),   'IN-PROCESS');
+        $select->add($this->plugin->gettext('status-completed'),    'COMPLETED');
+        $select->add($this->plugin->gettext('status-cancelled'),    'CANCELLED');
+
+        return $select->show(null);
+    }
 
     /**
      * Render a HTML select box for list selection
@@ -146,7 +235,7 @@
     }
 
 
-    function tasklist_editform($attrib = array())
+    function tasklist_editform($action, $list = array())
     {
         $fields = array(
             'name' => array(
@@ -169,7 +258,7 @@
         );
 
         return html::tag('form', array('action' => "#", 'method' => "post", 'id' => 'tasklisteditform'),
-            $this->plugin->driver->tasklist_edit_form($fields)
+            $this->plugin->driver->tasklist_edit_form($action, $list, $fields)
         );
     }
 
@@ -188,11 +277,12 @@
     {
         $attrib += array('action' => $this->rc->url('add'), 'method' => 'post', 'id' => 'quickaddform');
 
+        $label = html::label(array('for' => 'quickaddinput', 'class' => 'voice'), $this->plugin->gettext('quickaddinput'));
         $input = new html_inputfield(array('name' => 'text', 'id' => 'quickaddinput'));
-        $button = html::tag('input', array('type' => 'submit', 'value' => '+', 'class' => 'button mainaction'));
+        $button = html::tag('input', array('type' => 'submit', 'value' => '+', 'title' => $this->plugin->gettext('createtask'), 'class' => 'button mainaction'));
 
         $this->rc->output->add_gui_object('quickaddform', $attrib['id']);
-        return html::tag('form', $attrib, $input->show() . $button);
+        return html::tag('form', $attrib, $label . $input->show() . $button);
     }
 
     /**
@@ -229,6 +319,7 @@
         $this->rc->output->add_gui_object('edittagline', $attrib['id']);
 
         $input = new html_inputfield(array('name' => 'tags[]', 'class' => 'tag', 'size' => $attrib['size'], 'tabindex' => $attrib['tabindex']));
+        unset($attrib['tabindex']);
         return html::div($attrib, $input->show(''));
     }