Kolab Groupware OBS

roundcubemail-plugins-kolab.spec Changed

debian.changelog Changed

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

@@ -269,11 +269,15 @@
   /**
    * Get properties of the calendar this user has specified as default
    */
-  public function get_default_calendar($sensitivity = null)
+  public function get_default_calendar($sensitivity = null, $calendars = null)
   {
+    if ($calendars === null) {
+      $calendars = $this->driver->list_calendars(calendar_driver::FILTER_PERSONAL | calendar_driver::FILTER_WRITEABLE);
+    }
+
     $default_id = $this->rc->config->get('calendar_default_calendar');
-    $calendars = $this->driver->list_calendars(calendar_driver::FILTER_PERSONAL | calendar_driver::FILTER_WRITEABLE);
-    $calendar = $calendars[$default_id] ?: null;
+    $calendar   = $calendars[$default_id] ?: null;
+
     if (!$calendar || $sensitivity) {
       foreach ($calendars as $cal) {
         if ($sensitivity && $cal['subtype'] == $sensitivity) {
@@ -308,7 +312,6 @@
 
     $this->ui->init_templates();
     $this->rc->output->add_label('lowest','low','normal','high','highest','delete','cancel','uploading','noemailwarning','close');
-    $this->rc->output->add_label('libcalendaring.itipaccepted','libcalendaring.itiptentative','libcalendaring.itipdeclined','libcalendaring.itipdelegated','libcalendaring.expandattendeegroup','libcalendaring.expandattendeegroupnodata');
 
     // initialize attendees autocompletion
     $this->rc->autocomplete_init();
@@ -316,7 +319,6 @@
     $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', 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 = rcube_utils::get_input_value('view', rcube_utils::INPUT_GPC);
@@ -2187,6 +2189,7 @@
     
     // if the backend has free-busy information
     $fblist = $this->driver->get_freebusy_list($email, $start, $end);
+
     if (is_array($fblist)) {
       $status = 'FREE';
       
@@ -2236,13 +2239,26 @@
       $dts = new DateTime('@'.$start);
       $dts->setTimezone($this->timezone);
     }
-    
+
     $fblist = $this->driver->get_freebusy_list($email, $start, $end);
-    $slots = array();
-    
+    $slots  = '';
+
+    // prepare freebusy list before use (for better performance)
+    if (is_array($fblist)) {
+      foreach ($fblist as $idx => $slot) {
+        list($from, $to, ) = $slot;
+
+        // check for possible all-day times
+        if (gmdate('His', $from) == '000000' && gmdate('His', $to) == '235959') {
+          // shift into the user's timezone for sane matching
+          $fblist[$idx][0] -= $this->gmt_offset;
+          $fblist[$idx][1] -= $this->gmt_offset;
+        }
+      }
+    }
+
     // build a list from $start till $end with blocks representing the fb-status
     for ($s = 0, $t = $start; $t <= $end; $s++) {
-      $status = self::FREEBUSY_UNKNOWN;
       $t_end = $t + $interval * 60;
       $dt = new DateTime('@'.$t);
       $dt->setTimezone($this->timezone);
@@ -2250,16 +2266,10 @@
       // determine attendee's status
       if (is_array($fblist)) {
         $status = self::FREEBUSY_FREE;
+
         foreach ($fblist as $slot) {
           list($from, $to, $type) = $slot;
 
-          // check for possible all-day times
-          if (gmdate('His', $from) == '000000' && gmdate('His', $to) == '235959') {
-              // shift into the user's timezone for sane matching
-              $from -= $this->gmt_offset;
-              $to   -= $this->gmt_offset;
-          }
-
           if ($from < $t_end && $to > $t) {
             $status = isset($type) ? $type : self::FREEBUSY_BUSY;
             if ($status == self::FREEBUSY_BUSY)  // can't get any worse :-)
@@ -2267,9 +2277,12 @@
           }
         }
       }
-      
-      $slots[$s] = $status;
-      $times[$s] = intval($dt->format($strformat));
+      else {
+        $status = self::FREEBUSY_UNKNOWN;
+      }
+
+      // use most compact format, assume $status is one digit/character
+      $slots .= $status;
       $t = $t_end;
     }
     
@@ -2285,7 +2298,6 @@
       'end'   => $dte->format('c'),
       'interval' => $interval,
       'slots' => $slots,
-      'times' => $times,
     ));
     exit;
   }
@@ -2519,21 +2531,22 @@
   /**
    * Find an event in user calendars
    */
-  protected function find_event($event)
+  protected function find_event($event, &$mode)
   {
     $this->load_driver();
 
     // We search for writeable calendars in personal namespace by default
-    $result = $this->driver->get_event($event, calendar_driver::FILTER_WRITEABLE | calendar_driver::FILTER_PERSONAL);
-
-    // Some plugins may search in other users calendars, e.g. where delegation is involved
-    $plugin = $this->rc->plugins->exec_hook('calendar_event_find', array(
-            'search'   => $event,
-            'result'   => $result,
-            'calendar' => $this,
-    ));
+    $mode   = calendar_driver::FILTER_WRITEABLE | calendar_driver::FILTER_PERSONAL;
+    $result = $this->driver->get_event($event, $mode);
+    // ... now check shared folders if not found
+    if (!$result) {
+      $result = $this->driver->get_event($event, calendar_driver::FILTER_WRITEABLE | calendar_driver::FILTER_SHARED);
+      if ($result) {
+        $mode |= calendar_driver::FILTER_SHARED;
+      }
+    }
 
-    return $plugin['result'];
+    return $result;
   }
 
   /**
@@ -2545,14 +2558,18 @@
 
     $this->load_driver();
 
-    // find local copy of the referenced event
-    $existing = $this->find_event($data);
-    $itip     = $this->load_itip();
-    $response = $itip->get_itip_status($data, $existing);
+    // find local copy of the referenced event (in personal namespace)
+    $existing  = $this->find_event($data, $mode);
+    $is_shared = $mode & calendar_driver::FILTER_SHARED;
+    $itip      = $this->load_itip();
+    $response  = $itip->get_itip_status($data, $existing);
 
     // get a list of writeable calendars to save new events to
-    if (!$existing && !$data['nosave'] && $response['action'] == 'rsvp' || $response['action'] == 'import') {
-      $calendars = $this->driver->list_calendars(calendar_driver::FILTER_PERSONAL);
+    if ((!$existing || $is_shared)
+      && !$data['nosave']
+      && ($response['action'] == 'rsvp' || $response['action'] == 'import')
+    ) {
+      $calendars = $this->driver->list_calendars($mode);
       $calendar_select = new html_select(array('name' => 'calendar', 'id' => 'itip-saveto', 'is_escaped' => true));
       $calendar_select->add('--', '');
       $numcals = 0;
@@ -2562,14 +2579,14 @@
           $numcals++;
         }
       }
-      if ($numcals <= 1)
+      if ($numcals < 1)
         $calendar_select = null;
     }
 
     if ($calendar_select) {
-      $default_calendar = $this->get_default_calendar($data['sensitivity']);
+      $default_calendar = $this->get_default_calendar($data['sensitivity'], $calendars);
       $response['select'] = html::span('folder-select', $this->gettext('saveincalendar') . '&nbsp;' .
-        $calendar_select->show($default_calendar['id']));
+        $calendar_select->show($is_shared ? $existing['calendar'] : $default_calendar['id']));
     }
     else if ($data['nosave']) {
       $response['select'] = html::tag('input', array('type' => 'hidden', 'name' => 'calendar', 'id' => 'itip-saveto', 'value' => ''));
@@ -2618,9 +2635,10 @@
     $uid      = rcube_utils::get_input_value('uid', rcube_utils::INPUT_POST);
     $instance = rcube_utils::get_input_value('_instance', rcube_utils::INPUT_POST);
     $savemode = rcube_utils::get_input_value('_savemode', rcube_utils::INPUT_POST);
+    $listmode = calendar_driver::FILTER_WRITEABLE | calendar_driver::FILTER_PERSONAL;
 
     // search for event if only UID is given
-    if ($event = $this->driver->get_event(array('uid' => $uid, '_instance' => $instance), calendar_driver::FILTER_WRITEABLE)) {
+    if ($event = $this->driver->get_event(array('uid' => $uid, '_instance' => $instance), $listmode)) {
       $event['_savemode'] = $savemode;
       $success = $this->driver->remove_event($event, true);
     }
@@ -2890,15 +2908,19 @@
         $event['free_busy'] = 'free';
       }
 
+      $mode = calendar_driver::FILTER_PERSONAL
+        | calendar_driver::FILTER_SHARED
+        | calendar_driver::FILTER_WRITEABLE;
+
       // find writeable calendar to store event
-      $cal_id = !empty($_REQUEST['_folder']) ? rcube_utils::get_input_value('_folder', rcube_utils::INPUT_POST) : null;
-      $dontsave = ($_REQUEST['_folder'] === '' && $event['_method'] == 'REQUEST');
-      $calendars = $this->driver->list_calendars(calendar_driver::FILTER_PERSONAL);
-      $calendar = $calendars[$cal_id];
+      $cal_id    = rcube_utils::get_input_value('_folder', rcube_utils::INPUT_POST);
+      $dontsave  = $cal_id === '' && $event['_method'] == 'REQUEST';
+      $calendars = $this->driver->list_calendars($mode);
+      $calendar  = $calendars[$cal_id];
 
       // select default calendar except user explicitly selected 'none'
       if (!$calendar && !$dontsave)
-         $calendar = $this->get_default_calendar($event['sensitivity']);
+         $calendar = $this->get_default_calendar($event['sensitivity'], $calendars);
 
       $metadata = array(
         'uid' => $event['uid'],
@@ -2946,9 +2968,16 @@
       // save to calendar
       if ($calendar && $calendar['editable']) {
         // check for existing event with the same UID
-        $existing = $this->find_event($event);
+        $existing = $this->find_event($event, $mode);
+
+        // we'll create a new copy if user decided to change the calendar
+        if ($existing && $cal_id && $calendar && $calendar['id'] != $existing['calendar']) {
+          $existing = null;
+        }
 
         if ($existing) {
+          $calendar = $calendars[$existing['calendar']];
+
           // forward savemode for correct updates of recurring events
           $existing['_savemode'] = $savemode ?: $event['_savemode'];
 
@@ -3021,10 +3050,9 @@
             $event['id'] = $existing['id'];
             $event['calendar'] = $existing['calendar'];
 
-            // preserve my participant status for regular updates
-            if (empty($status)) {
-              $this->lib->merge_attendees($event, $existing);
-            }
+            // merge attendees status
+            // e.g. preserve my participant status for regular updates
+            $this->lib->merge_attendees($event, $existing, $status);
 
             // set status=CANCELLED on CANCEL messages
             if ($event['_method'] == 'CANCEL')

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

@@ -423,7 +423,7 @@
       if ($dialog.is(':ui-dialog'))
         $dialog.dialog('close');
 
-      // remove status-* classes
+      // remove status-* and sensitivity-* classes
       $dialog.removeClass(function(i, oldclass) {
           var oldies = String(oldclass).split(' ');
           return $.grep(oldies, function(cls) { return cls.indexOf('status-') === 0 || cls.indexOf('sensitivity-') === 0 }).join(' ');
@@ -471,11 +471,13 @@
 
       if (event.status) {
         var status_lc = String(event.status).toLowerCase();
-        $('#event-status').show().children('.event-text').html(Q(rcmail.gettext('status-'+status_lc,'calendar')));
+        $('#event-status').show().children('.event-text').text(rcmail.gettext('status-'+status_lc,'calendar'));
+        $('#event-status-badge > span').text(rcmail.gettext('status-'+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]));
+        $('#event-sensitivity').show().children('.event-text').text(sensitivitylabels[event.sensitivity]);
+        $('#event-status-badge > span').text(sensitivitylabels[event.sensitivity]);
         $dialog.addClass('sensitivity-'+event.sensitivity);
       }
       if (event.created || event.changed) {
@@ -526,7 +528,7 @@
             }
           }
 
-          line = event_attendee_html(data);
+          line = rcube_libcalendaring.attendee_html(data);
 
           if (morelink)
             overflow += line;
@@ -565,7 +567,7 @@
             .removeClass('accepted tentative declined delegated needs-action')
             .addClass(mystatus)
             .children('.event-text')
-            .html(Q(rcmail.gettext('itip' + mystatus, 'libcalendaring')));
+            .text(rcmail.gettext('status' + mystatus, 'libcalendaring'));
         }
 
         var show_rsvp = rsvp && !is_organizer(event) && event.status != 'CANCELLED' && has_permission(calendar, 'v');
@@ -669,24 +671,8 @@
       }
 
       rcmail.enable_command('event-history', calendar.history)
-    };
-
-    // render HTML code for displaying an attendee record
-    var event_attendee_html = function(data)
-    {
-      var dispname = Q(data.name || data.email), tooltip = '';
-
-      if (data.email) {
-        tooltip = data.email + '; ' + data.status;
-        dispname = '<a href="mailto:' + data.email + '" class="mailtolink" data-cutype="' + data.cutype + '">' + dispname + '</a>';
-      }
 
-      if (data['delegated-to'])
-        tooltip = rcmail.gettext('delegatedto', 'calendar') + data['delegated-to'];
-      else if (data['delegated-from'])
-        tooltip = rcmail.gettext('delegatedfrom', 'calendar') + data['delegated-from'];
-
-      return '<span class="attendee ' + String(data.role == 'ORGANIZER' ? 'organizer' : data.status).toLowerCase() + '" title="' + Q(tooltip) + '">' + dispname + '</span> ';
+      rcmail.triggerEvent('calendar-event-dialog', {dialog: $dialog});
     };
 
     // event handler for clicks on an attendee link
@@ -1012,6 +998,8 @@
         window.setTimeout(load_attendees_tab, exec_deferred);
       if (calendar.attachments)
         window.setTimeout(load_attachments_tab, exec_deferred);
+
+      rcmail.triggerEvent('calendar-event-dialog', {dialog: $dialog});
     };
 
     // show event changelog in a dialog
@@ -1115,8 +1103,8 @@
           }
           // format attendees struct
           else if (prop == 'attendees') {
-            if (change['old']) change.old_ = event_attendee_html(change['old']);
-            if (change['new']) change.new_ = event_attendee_html($.extend({}, change['old'] || {}, change['new']));
+            if (change['old']) change.old_ = rcube_libcalendaring.attendee_html(change['old']);
+            if (change['new']) change.new_ = rcube_libcalendaring.attendee_html($.extend({}, change['old'] || {}, change['new']));
             html = true;
           }
           // localize priority values
@@ -1254,7 +1242,7 @@
       freebusy_data = { required:{}, all:{} };
       freebusy_ui.loading = 1;  // prevent render_freebusy_grid() to load data yet
       freebusy_ui.numdays = Math.max(allday.checked ? 14 : 1, Math.ceil(duration * 2 / 86400));
-      freebusy_ui.interval = allday.checked ? 1440 : 60;
+      freebusy_ui.interval = allday.checked ? 1440 : (60 / (settings.timeslots || 1));
       freebusy_ui.start = fb_start;
       freebusy_ui.end = new Date(freebusy_ui.start.getTime() + DAY_MS * freebusy_ui.numdays);
       render_freebusy_grid(0);
@@ -1361,7 +1349,7 @@
       
       // adjust dialog size to fit grid without scrolling
       var gridw = $('#schedule-freebusy-times').width();
-      var overflow = gridw - $('#attendees-freebusy-table td.times').width() + 1;
+      var overflow = gridw - $('#attendees-freebusy-table td.times').width();
       me.dialog_resize($dialog.get(0), $dialog.height() + (bw.ie ? 20 : 0), 800 + Math.max(0, overflow));
       
       // fetch data from server
@@ -1391,10 +1379,12 @@
       var lastdate, datestr, css,
         curdate = new Date(),
         allday = (freebusy_ui.interval == 1440),
+        interval = allday ? 1440 : (freebusy_ui.interval * (settings.timeslots || 1));
         times_css = (allday ? 'allday ' : ''),
         dates_row = '<tr class="dates">',
         times_row = '<tr class="times">',
         slots_row = '';
+
       for (var s = 0, t = freebusy_ui.start.getTime(); t < freebusy_ui.end.getTime(); s++) {
         curdate.setTime(t);
         datestr = fc.fullCalendar('formatDate', curdate, date_format);
@@ -1407,9 +1397,9 @@
         // set css class according to working hours
         css = is_weekend(curdate) || (freebusy_ui.interval <= 60 && !is_workinghour(curdate)) ? 'offhours' : 'workinghours';
         times_row += '<td class="' + times_css + css + '" id="t-' + Math.floor(t/1000) + '">' + Q(allday ? rcmail.gettext('all-day','calendar') : $.fullCalendar.formatDate(curdate, settings['time_format'])) + '</td>';
-        slots_row += '<td class="' + css + ' unknown">&nbsp;</td>';
+        slots_row += '<td class="' + css + '">&nbsp;</td>';
         
-        t += freebusy_ui.interval * 60000;
+        t += interval * 60000;
       }
       dates_row += '</tr>';
       times_row += '</tr>';
@@ -1423,7 +1413,7 @@
       }
       
       // add line for all/required attendees
-      times_html += '<tr class="spacer"><td colspan="' + (dayslots * freebusy_ui.numdays) + '">&nbsp;</td>';
+      times_html += '<tr class="spacer"><td colspan="' + (dayslots * freebusy_ui.numdays) + '"></td>';
       times_html += '<tr id="fbrowall">' + slots_row + '</tr>';
       
       var table = $('#schedule-freebusy-times');
@@ -1445,7 +1435,7 @@
             update_freebusy_dates(newstart, new Date(newstart.getTime() + freebusy_ui.startdate.data('duration') * 1000));
             render_freebusy_overlay();
           }
-        })
+        });
       }
       
       // if we have loaded free-busy data, show it
@@ -1476,38 +1466,40 @@
           overlay.draggable('disable');
       }
       else {
-        var table = $('#schedule-freebusy-times'),
+        var i, n, table = $('#schedule-freebusy-times'),
           width = 0,
           pos = { top:table.children('thead').height(), left:0 },
           eventstart = date2unixtime(clone_date(me.selected_event.start, me.selected_event.allDay?1:0)),
           eventend = date2unixtime(clone_date(me.selected_event.end, me.selected_event.allDay?2:0)) - 60,
           slotstart = date2unixtime(freebusy_ui.start),
           slotsize = freebusy_ui.interval * 60,
-          slotend, fraction, $cell;
-        
+          slotnum = freebusy_ui.interval > 60 ? 1 : (60 / freebusy_ui.interval),
+          cells = table.children('thead').find('td'),
+          cell_width = cells.first().get(0).offsetWidth,
+          slotend;
+
         // iterate through slots to determine position and size of the overlay
-        table.children('thead').find('td').each(function(i, cell){
-          slotend = slotstart + slotsize - 1;
-          // event starts in this slot: compute left
-          if (eventstart >= slotstart && eventstart <= slotend) {
-            fraction = 1 - (slotend - eventstart) / slotsize;
-            pos.left = Math.round(cell.offsetLeft + cell.offsetWidth * fraction);
-          }
-          // event ends in this slot: compute width
-          if (eventend >= slotstart && eventend <= slotend) {
-            fraction = 1 - (slotend - eventend) / slotsize;
-            width = Math.round(cell.offsetLeft + cell.offsetWidth * fraction) - pos.left;
+        for (i=0; i < cells.length; i++) {
+          for (n=0; n < slotnum; n++) {
+            slotend = slotstart + slotsize - 1;
+            // event starts in this slot: compute left
+            if (eventstart >= slotstart && eventstart <= slotend) {
+              pos.left = Math.round(i * cell_width + (cell_width / slotnum) * n);
+            }
+            // event ends in this slot: compute width
+            if (eventend >= slotstart && eventend <= slotend) {
+              width = Math.round(i * cell_width + (cell_width / slotnum) * (n + 1)) - pos.left;
+            }
+            slotstart += slotsize;
           }
-
-          slotstart = slotstart + slotsize;
-        });
+        }
 
         if (!width)
           width = table.width() - pos.left;
 
         // overlay is visible
         if (width > 0) {
-          overlay.css({ width: (width-5)+'px', height:(table.children('tbody').height() - 4)+'px', left:pos.left+'px', top:pos.top+'px' }).show();
+          overlay.css({ width: (width-4)+'px', height:(table.children('tbody').height() - 4)+'px', left:pos.left+'px', top:pos.top+'px' }).show();
           
           // configure draggable
           if (!overlay.data('isdraggable')) {
@@ -1530,6 +1522,7 @@
                 }
                 else {
                   // round to 5 minutes
+                  // @TODO: round to timeslots?
                   var round = newstart.getMinutes() % 5;
                   if (round > 2.5) newstart.setTime(newstart.getTime() + (5 - round) * 60000);
                   else if (round > 0) newstart.setTime(newstart.getTime() - round * 60000);
@@ -1547,10 +1540,8 @@
         else
           overlay.draggable('disable').hide();
       }
-      
     };
-    
-    
+
     // fetch free-busy information for each attendee from server
     var load_freebusy_data = function(from, interval)
     {
@@ -1577,9 +1568,9 @@
             success: function(data) {
               freebusy_ui.loading--;
               
-              // find attendee 
-              var attendee = null;
-              for (var i=0; i < event_attendees.length; i++) {
+              // find attendee
+              var i, attendee = null;
+              for (i=0; i < event_attendees.length; i++) {
                 if (freebusy_ui.attendees[i].email == data.email) {
                   attendee = freebusy_ui.attendees[i];
                   break;
@@ -1587,25 +1578,31 @@
               }
               
               // copy data to member var
-              var ts, req = attendee.role != 'OPT-PARTICIPANT';
-              freebusy_data.start = parseISO8601(data.start);
+              var ts, status,
+                req = attendee.role != 'OPT-PARTICIPANT',
+                start = parseISO8601(data.start);
+
+              freebusy_data.start = new Date(start);
+              freebusy_data.end = parseISO8601(data.end);
+              freebusy_data.interval = data.interval;
               freebusy_data[data.email] = {};
-              for (var i=0; i < data.slots.length; i++) {
-                ts = data.times[i] + '';
-                freebusy_data[data.email][ts] = data.slots[i];
+
+              for (i=0; i < data.slots.length; i++) {
+                ts = date2timestring(start, data.interval > 60);
+                status = data.slots.charAt(i);
+                freebusy_data[data.email][ts] = status
+                start = new Date(start.getTime() + data.interval * 60000);
                 
                 // set totals
                 if (!freebusy_data.required[ts])
                   freebusy_data.required[ts] = [0,0,0,0];
                 if (req)
-                  freebusy_data.required[ts][data.slots[i]]++;
+                  freebusy_data.required[ts][status]++;
                 
                 if (!freebusy_data.all[ts])
                   freebusy_data.all[ts] = [0,0,0,0];
-                freebusy_data.all[ts][data.slots[i]]++;
+                freebusy_data.all[ts][status]++;
               }
-              freebusy_data.end = parseISO8601(data.end);
-              freebusy_data.interval = data.interval;
 
               // hide loading indicator
               var domid = String(data.email).replace(rcmail.identifier_expr, '');
@@ -1668,27 +1665,51 @@
 
       if (fbdata && fbdata[ts] !== undefined && row.length) {
         t = freebusy_ui.start.getTime();
-        row.children().each(function(i, cell){
-          curdate.setTime(t);
-          ts = date2timestring(curdate, dateonly);
-          cell.className = cell.className.replace('unknown', fbdata[ts] ? status_classes[fbdata[ts]] : 'unknown');
-
-          // also update total row if all data was loaded
-          if (freebusy_ui.loading == 0 && freebusy_data.all[ts] && (cell = rowall.get(i))) {
-            var workinghours = cell.className.indexOf('workinghours') >= 0;
-            var all_status = freebusy_data.all[ts][2] ? 'busy' : 'unknown';
-              req_status = freebusy_data.required[ts][2] ? 'busy' : 'free';
-            for (var j=1; j < status_classes.length; j++) {
-              if (freebusy_ui.numrequired && freebusy_data.required[ts][j] >= freebusy_ui.numrequired)
-                req_status = status_classes[j];
-              if (freebusy_data.all[ts][j] == event_attendees.length)
-                all_status = status_classes[j];
+        row.children().each(function(i, cell) {
+          var j, n, attr, last, all_slots = [], slots = [],
+            all_cell = rowall.get(i),
+            cnt = dateonly ? 1 : (60 / freebusy_ui.interval),
+            percent = (100 / cnt);
+
+          for (n=0; n < cnt; n++) {
+            curdate.setTime(t);
+            ts = date2timestring(curdate, dateonly);
+            attr = {
+              'style': 'float:left; width:' + percent.toFixed(2) + '%',
+              'class': fbdata[ts] ? status_classes[fbdata[ts]] : 'unknown'
+            };
+
+            slots.push($('<div>').attr(attr));
+
+            // also update total row if all data was loaded
+            if (!freebusy_ui.loading && freebusy_data.all[ts] && all_cell) {
+              var all_status = freebusy_data.all[ts][2] ? 'busy' : 'unknown',
+                req_status = freebusy_data.required[ts][2] ? 'busy' : 'free';
+
+              for (j=1; j < status_classes.length; j++) {
+                if (freebusy_ui.numrequired && freebusy_data.required[ts][j] >= freebusy_ui.numrequired)
+                  req_status = status_classes[j];
+                if (freebusy_data.all[ts][j] == event_attendees.length)
+                  all_status = status_classes[j];
+              }
+
+              attr['class'] = req_status + ' all-' + all_status;
+
+              // these elements use some specific styling, so we want to minimize their number
+              if (last && last.attr('class') == attr['class'])
+                last.css('width', (percent + parseFloat(last.css('width').replace('%', ''))).toFixed(2) + '%');
+              else {
+                last = $('<div>').attr(attr);
+                all_slots.push(last);
+              }
             }
-            
-            cell.className = (workinghours ? 'workinghours ' : 'offhours ') + req_status +  ' all-' + all_status;
+
+            t += freebusy_ui.interval * 60000;
           }
-          
-          t += freebusy_ui.interval * 60000;
+
+          $(cell).html('').append(slots);
+          if (all_slots.length)
+            $(all_cell).html('').append(all_slots);
         });
       }
     };
@@ -1728,17 +1749,20 @@
         sinterval = freebusy_data.interval * 60000,
         intvlslots = 1,
         numslots = Math.ceil(duration / sinterval),
-        checkdate, slotend, email, ts, slot, slotdate = new Date();
+        fb_start = freebusy_data.start.getTime(),
+        fb_end = freebusy_data.end.getTime(),
+        checkdate, slotend, email, ts, slot, slotdate = new Date(),
+        candidatecount = 0, candidatestart = false, success = false;
 
       // shift event times to next possible slot
       eventstart += sinterval * intvlslots * dir;
       eventend += sinterval * intvlslots * dir;
 
       // iterate through free-busy slots and find candidates
-      var candidatecount = 0, candidatestart = candidateend = success = false;
-      for (slot = dir > 0 ? freebusy_data.start.getTime() : freebusy_data.end.getTime() - sinterval;
-            (dir > 0 && slot < freebusy_data.end.getTime()) || (dir < 0 && slot >= freebusy_data.start.getTime());
-            slot += sinterval * dir) {
+      for (slot = dir > 0 ? fb_start : fb_end - sinterval;
+            (dir > 0 && slot < fb_end) || (dir < 0 && slot >= fb_start);
+            slot += sinterval * dir
+      ) {
         slotdate.setTime(slot);
         // fix slot if just crossed a DST change
         if (event.allDay) {
@@ -1750,10 +1774,10 @@
         if ((dir > 0 && slotend <= eventstart) || (dir < 0 && slot >= eventend))  // skip
           continue;
 
-        // respect workingours setting
+        // respect workinghours setting
         if (freebusy_ui.workinhoursonly) {
           if (is_weekend(slotdate) || (freebusy_data.interval <= 60 && !is_workinghour(slotdate))) {  // skip off-hours
-            candidatestart = candidateend = false;
+            candidatestart = false;
             candidatecount = 0;
             continue;
           }
@@ -1762,11 +1786,12 @@
         if (!candidatestart)
           candidatestart = slot;
 
-        // check freebusy data for all attendees
         ts = date2timestring(slotdate, freebusy_data.interval > 60);
+
+        // check freebusy data for all attendees
         for (var i=0; i < event_attendees.length; i++) {
           if (freebusy_ui.attendees[i].role != 'OPT-PARTICIPANT' && (email = freebusy_ui.attendees[i].email) && freebusy_data[email] && freebusy_data[email][ts] > 1) {
-            candidatestart = candidateend = false;
+            candidatestart = false;
             break;
           }
         }
@@ -1777,22 +1802,15 @@
           candidatecount = 0;
           continue;
         }
+        else if (dir < 0)
+          candidatestart = slot;
         
-        // set candidate end to slot end time
         candidatecount++;
-        if (dir < 0 && !candidateend)
-          candidateend = slotend;
         
         // if candidate is big enough, this is it!
         if (candidatecount == numslots) {
-          if (dir > 0) {
-            event.start.setTime(candidatestart);
-            event.end.setTime(candidatestart + duration);
-          }
-          else {
-            event.end.setTime(candidateend);
-            event.start.setTime(candidateend - duration);
-          }
+          event.start.setTime(candidatestart);
+          event.end.setTime(candidatestart + duration);
           success = true;
           break;
         }
@@ -1822,7 +1840,6 @@
       }
     };
 
-
     // update event properties and attendees availability if event times have changed
     var event_times_changed = function()
     {
@@ -1837,7 +1854,6 @@
       }
     };
 
-
     // add the given list of participants
     var add_attendees = function(names, params)
     {
@@ -1918,7 +1934,8 @@
       // delete icon
       var icon = rcmail.env.deleteicon ? '<img src="' + rcmail.env.deleteicon + '" alt="" />' : rcmail.gettext('delete');
       var dellink = '<a href="#delete" class="iconlink delete deletelink" title="' + Q(rcmail.gettext('delete')) + '">' + icon + '</a>';
-      var tooltip = data.status || '';
+      var tooltip = '', status = (data.status || '').toLowerCase(),
+        status_label = rcmail.gettext('status' + status, 'libcalendaring');
 
       // send invitation checkbox
       var invbox = '<input type="checkbox" class="edit-attendee-reply" value="' + Q(data.email) +'" title="' + Q(rcmail.gettext('calendar.sendinvitations')) + '" '
@@ -1928,6 +1945,8 @@
         tooltip = rcmail.gettext('delegatedto', 'calendar') + data['delegated-to'];
       else if (data['delegated-from'])
         tooltip = rcmail.gettext('delegatedfrom', 'calendar') + data['delegated-from'];
+      else if (status)
+        tooltip = status_label;
 
       // add expand button for groups
       if (data.cutype == 'GROUP') {
@@ -1939,7 +1958,7 @@
       var html = '<td class="role">' + select + '</td>' +
         '<td class="name"><span class="attendee-name">' + dispname + '</span></td>' +
         '<td class="availability"><img src="' + img_src + '" 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="confirmstate"><span class="' + status + '" title="' + Q(tooltip) + '">' + Q(status ? status_label : '') + '</span></td>' +
         (data.cutype != 'RESOURCE' ? '<td class="invite">' + (organizer || readonly || !invbox ? '' : invbox) + '</td>' : '') +
         '<td class="options">' + (organizer || readonly ? '' : dellink) + '</td>';
 
@@ -2513,13 +2532,20 @@
     // display confirm dialog when modifying/deleting an event
     var update_event_confirm = function(action, event, data)
     {
+      // Allow other plugins to do actions here
+      // E.g. when you move/resize the event init wasn't called
+      // but we need it as some plugins may modify user identities
+      // we depend on here (kolab_delegation)
+      rcmail.triggerEvent('calendar-event-init', {o: event});
+
       if (!data) data = event;
       var decline = false, notify = false, html = '', cal = me.calendars[event.calendar],
         _has_attendees = has_attendees(event), _is_organizer = is_organizer(event);
-      
+
       // event has attendees, ask whether to notify them
       if (_has_attendees) {
         var checked = (settings.itip_notify & 1 ? ' checked="checked"' : '');
+
         if (_is_organizer) {
           notify = true;
           if (settings.itip_notify & 2) {
@@ -2544,7 +2570,7 @@
           html += '<div class="message">' + rcmail.gettext('localchangeswarning', 'calendar') + '</div>';
         }
       }
-      
+
       // recurring event: user needs to select the savemode
       if (event.recurrence) {
         var future_disabled = '', message_label = (action == 'remove' ? 'removerecurringeventwarning' : 'changerecurringeventwarning');
@@ -3496,8 +3522,7 @@
     this.dialog_resize = function(id, height, width)
     {
       var win = $(window), w = win.width(), h = win.height();
-      $(id).dialog('option', { height: Math.min(h-20, height+130), width: Math.min(w-20, width+50) })
-        .dialog('option', 'position', ['center', 'center']);  // only works in a separate call (!?)
+      $(id).dialog('option', { height: Math.min(h-20, height+130), width: Math.min(w-20, width+50) });
     };
 
     // adjust calendar view size
@@ -3938,23 +3963,24 @@
       // init event dialog
       $('#eventtabs').tabs({
         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';
+          // newPanel.selector for jQuery-UI 1.10, newPanel.attr('id') for jQuery-UI 1.12
+          var tab = String(ui.newPanel.selector || ui.newPanel.attr('id'))
+              .replace(/^#?event-panel-/, '').replace(/s$/, '');
+
+          if (tab == 'attendee' || tab == 'resource') {
             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);
             // add current user as organizer if non added yet
-            if (!event_attendees.length) {
+            if (tab == 'attendee' && !event_attendees.length) {
               add_attendee($.extend({ role:'ORGANIZER' }, settings.identity));
               $('#edit-attendees-form .attendees-invitebox').show();
             }
           }
           // reset autocompletion on tab change (#3389)
-          if (ui.oldPanel.selector == '#event-panel-attendees' || ui.oldPanel.selector == '#event-panel-resources') {
-            rcmail.ksearch_blur();
-          }
+          rcmail.ksearch_blur();
         }
       });
       $('#edit-enddate').datepicker(datepicker_settings);

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

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

@@ -612,14 +612,8 @@
 
     // determine a reasonable end date if none given
     if (!$end) {
-      switch ($event['recurrence']['FREQ']) {
-        case 'YEARLY':  $intvl = 'P100Y'; break;
-        case 'MONTHLY': $intvl = 'P20Y';  break;
-        default:        $intvl = 'P10Y';  break;
-      }
-
       $end = clone $event['start'];
-      $end->add(new DateInterval($intvl));
+      $end->add(new DateInterval('P100Y'));
     }
 
     // copy the recurrence rule from the master event (to be used in the UI)
@@ -676,22 +670,34 @@
 
     $i = 0;
     while ($next_event = $recurrence->next_instance()) {
-      $datestr = $next_event['start']->format('Ymd');
+      $datestr     = $next_event['start']->format('Ymd');
       $instance_id = $next_event['start']->format($recurrence_id_format);
 
       // use this event data for future recurring instances
       if ($futuredata[$datestr])
         $overlay_data = $futuredata[$datestr];
 
+      $rec_id      = $event['uid'] . '-' . $instance_id;
+      $exception   = $exdata[$datestr] ?: $overlay_data;
+      $event_start = $next_event['start'];
+      $event_end   = $next_event['end'];
+
+      // copy some event from exception to get proper start/end dates
+      if ($exception) {
+        $event_copy = $next_event;
+        kolab_driver::merge_exception_dates($event_copy, $exception);
+        $event_start = $event_copy['start'];
+        $event_end   = $event_copy['end'];
+      }
+
       // add to output if in range
-      $rec_id = $event['uid'] . '-' . $instance_id;
-      if (($next_event['start'] <= $end && $next_event['end'] >= $start) || ($event_id && $rec_id == $event_id)) {
+      if (($event_start <= $end && $event_end >= $start) || ($event_id && $rec_id == $event_id)) {
         $rec_event = $this->_to_driver_event($next_event, false, false);
         $rec_event['_instance'] = $instance_id;
         $rec_event['_count'] = $i + 1;
 
-        if ($overlay_data || $exdata[$datestr])  // copy data from exception
-          kolab_driver::merge_exception_data($rec_event, $exdata[$datestr] ?: $overlay_data);
+        if ($exception)  // copy data from exception
+          kolab_driver::merge_exception_data($rec_event, $exception);
 
         $rec_event['id'] = $rec_id;
         $rec_event['recurrence_id'] = $event['uid'];
@@ -708,7 +714,7 @@
         break;
 
       // avoid endless recursion loops
-      if (++$i > 1000)
+      if (++$i > 100000)
           break;
     }

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

@@ -296,16 +296,15 @@
       'list'      => $this->calendars,
       'calendars' => $calendars,
       'filter'    => $filter,
-      'editable'  => ($filter & self::FILTER_WRITEABLE),
-      'insert'    => ($filter & self::FILTER_INSERTABLE),
-      'active'    => ($filter & self::FILTER_ACTIVE),
-      'personal'  => ($filter & self::FILTER_PERSONAL)
     ));
 
     if ($plugin['abort']) {
       return $plugin['calendars'];
     }
 
+    $personal = $filter & self::FILTER_PERSONAL;
+    $shared   = $filter & self::FILTER_SHARED;
+
     foreach ($this->calendars as $cal) {
       if (!$cal->ready) {
         continue;
@@ -325,9 +324,13 @@
       if (($filter & self::FILTER_CONFIDENTIAL) && $cal->subtype != 'confidential') {
         continue;
       }
-      if (($filter & self::FILTER_PERSONAL) && $cal->get_namespace() != 'personal') {
-        continue;
+      if ($personal || $shared) {
+        $ns = $cal->get_namespace();
+        if (!(($personal && $ns == 'personal') || ($shared && $ns == 'shared'))) {
+          continue;
+        }
       }
+
       $calendars[$cal->id] = $cal;
     }
 
@@ -1390,7 +1393,6 @@
     }
   }
 
-
   /**
    * Merge certain properties from the overlay event to the base event object
    *
@@ -1405,25 +1407,9 @@
     if (is_array($blacklist))
       $forbidden = array_merge($forbidden, $blacklist);
 
-    // compute date offset from the exception
-    if ($overlay['start'] instanceof DateTime && $overlay['recurrence_date'] instanceof DateTime) {
-      $date_offset = $overlay['recurrence_date']->diff($overlay['start']);
-    }
-
     foreach ($overlay as $prop => $value) {
       if ($prop == 'start' || $prop == 'end') {
-        if (is_object($event[$prop]) && $event[$prop] instanceof DateTime) {
-          // set date value if overlay is an exception of the current instance
-          if (substr($overlay['_instance'], 0, 8) == substr($event['_instance'], 0, 8)) {
-            $event[$prop]->setDate(intval($value->format('Y')), intval($value->format('n')), intval($value->format('j')));
-          }
-          // apply date offset
-          else if ($date_offset) {
-            $event[$prop]->add($date_offset);
-          }
-          // adjust time of the recurring event instance
-          $event[$prop]->setTime($value->format('G'), intval($value->format('i')), intval($value->format('s')));
-        }
+        // handled by merge_exception_dates() below
       }
       else if ($prop == 'thisandfuture' && $overlay['_instance'] == $event['_instance']) {
         $event[$prop] = $value;
@@ -1431,6 +1417,38 @@
       else if ($prop[0] != '_' && !in_array($prop, $forbidden))
         $event[$prop] = $value;
     }
+
+    self::merge_exception_dates($event, $overlay);
+  }
+
+  /**
+   * Merge start/end date from the overlay event to the base event object
+   *
+   * @param array The event object to be altered
+   * @param array The overlay event object to be merged over $event
+   */
+  public static function merge_exception_dates(&$event, $overlay)
+  {
+    // compute date offset from the exception
+    if ($overlay['start'] instanceof DateTime && $overlay['recurrence_date'] instanceof DateTime) {
+      $date_offset = $overlay['recurrence_date']->diff($overlay['start']);
+    }
+
+    foreach (array('start', 'end') as $prop) {
+      $value = $overlay[$prop];
+      if (is_object($event[$prop]) && $event[$prop] instanceof DateTime) {
+        // set date value if overlay is an exception of the current instance
+        if (substr($overlay['_instance'], 0, 8) == substr($event['_instance'], 0, 8)) {
+          $event[$prop]->setDate(intval($value->format('Y')), intval($value->format('n')), intval($value->format('j')));
+        }
+        // apply date offset
+        else if ($date_offset) {
+          $event[$prop]->add($date_offset);
+        }
+        // adjust time of the recurring event instance
+        $event[$prop]->setTime($value->format('G'), intval($value->format('i')), intval($value->format('s')));
+      }
+    }
   }
 
   /**

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

roundcubemail-plugins-kolab-3.3.tar.gz/plugins/calendar/helpdocs/locale/de_DE/LC_MESSAGES/importexport.po Changed

roundcubemail-plugins-kolab-3.3.tar.gz/plugins/calendar/helpdocs/locale/de_DE/LC_MESSAGES/index.po Changed

roundcubemail-plugins-kolab-3.3.tar.gz/plugins/calendar/helpdocs/locale/de_DE/LC_MESSAGES/invitations.po Changed

roundcubemail-plugins-kolab-3.3.tar.gz/plugins/calendar/helpdocs/locale/de_DE/LC_MESSAGES/manage.po Changed

roundcubemail-plugins-kolab-3.3.tar.gz/plugins/calendar/helpdocs/locale/de_DE/LC_MESSAGES/overview.po Changed

roundcubemail-plugins-kolab-3.3.tar.gz/plugins/calendar/helpdocs/locale/de_DE/LC_MESSAGES/settings.po Changed

roundcubemail-plugins-kolab-3.3.tar.gz/plugins/calendar/helpdocs/locale/de_DE/LC_MESSAGES/sharing.po Changed

roundcubemail-plugins-kolab-3.3.tar.gz/plugins/calendar/helpdocs/locale/es_AR/LC_MESSAGES/index.po Changed

roundcubemail-plugins-kolab-3.3.tar.gz/plugins/calendar/helpdocs/locale/tr_TR/LC_MESSAGES/importexport.po Changed

roundcubemail-plugins-kolab-3.3.tar.gz/plugins/calendar/helpdocs/locale/tr_TR/LC_MESSAGES/index.po Changed

roundcubemail-plugins-kolab-3.3.tar.gz/plugins/calendar/helpdocs/locale/tr_TR/LC_MESSAGES/invitations.po Changed

roundcubemail-plugins-kolab-3.3.tar.gz/plugins/calendar/helpdocs/locale/tr_TR/LC_MESSAGES/manage.po Changed

roundcubemail-plugins-kolab-3.3.tar.gz/plugins/calendar/helpdocs/locale/tr_TR/LC_MESSAGES/overview.po Changed

roundcubemail-plugins-kolab-3.3.tar.gz/plugins/calendar/helpdocs/locale/tr_TR/LC_MESSAGES/settings.po Changed

roundcubemail-plugins-kolab-3.3.tar.gz/plugins/calendar/helpdocs/locale/tr_TR/LC_MESSAGES/sharing.po Changed

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

@@ -169,16 +169,16 @@
 $labels['eventupdatesubject'] = '"$title" wurde aktualisiert';
 $labels['eventupdatesubjectempty'] = 'Termin wurde aktualisiert';
 $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.";
 $labels['itipobjectnotfound'] = 'Der Termin auf den sich diese Nachricht bezieht, wurde in Ihrem Kalender nicht gefunden.';
 $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['itipmailbodycancel'] = "\$sender hat ihre Teilnahme bei der folgenden Veranstaltung zurückgewiesen:\n\n*\$title*\n\nam: \$date";
-$labels['itipmailbodydelegated'] = "\$sender hat die Teilnahme an folgendem Event delegiert:\n\n*\$title*\n\nWhen: \$date";
-$labels['itipmailbodydelegatedto'] = "\$sender hat die Teilnahme an folgendem Event an Sie delegiert:\n\n*\$title*\n\nWhen: \$date";
+$labels['itipmailbodydelegated'] = "\$sender hat die Teilnahme an folgendem Event delegiert:\n\n*\$title*\n\nWann: \$date";
+$labels['itipmailbodydelegatedto'] = "\$sender hat die Teilnahme an folgendem Event an Sie delegiert:\n\n*\$title*\n\nWann: \$date";
 $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['itipcomment'] = 'Kommentar zur Einladungs/Benachrichtigung';
 $labels['itipcommenttitle'] = 'Dieser Kommentar wird an die Einladungs/Benachrichtigung angehängt, die an die Teilnehmer verschickt wird';
 $labels['notanattendee'] = 'Sie sind nicht in der Liste der Teilnehmer aufgeführt';

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

@@ -175,9 +175,9 @@
 $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['itipmailbodycancel'] = "\$sender hat Ihre Teilnahme bei der folgenden Veranstaltung zurückgewiesen:\n\n*\$title*\n\nam: \$date";
+$labels['itipmailbodycancel'] = "\$sender hat Ihre Teilnahme bei der folgenden Veranstaltung zurückgewiesen:\n\n*\$title*\n\nWann: \$date";
 $labels['itipmailbodydelegated'] = "\$sender hat die Teilnahme an folgendem Event delegiert:\n\n*\$title*\n\nWhen: \$date";
-$labels['itipmailbodydelegatedto'] = "\$sender hat die Teilnahme an folgendem Event an Sie delegiert:\n\n*\$title*\n\nWhen: \$date";
+$labels['itipmailbodydelegatedto'] = "\$sender hat die Teilnahme an folgendem Event an Sie delegiert:\n\n*\$title*\n\nWann: \$date";
 $labels['itipdeclineevent'] = 'Möchten Sie die Einladung zu diesem Termin ablehnen?';
 $labels['declinedeleteconfirm'] = 'Soll der abgelehnte Termin zusätzlich aus dem Kalender gelöscht werden?';
 $labels['itipcomment'] = 'Kommentar zur Einladungs-/Benachrichtigungsnachricht';

roundcubemail-plugins-kolab-3.3.tar.gz/plugins/calendar/localization/es_AR.inc Changed

@@ -80,6 +80,7 @@
 $labels['public'] = 'público';
 $labels['private'] = 'privado';
 $labels['confidential'] = 'confidencial';
+$labels['links'] = 'Referencia';
 $labels['alarms'] = 'Recordatorio';
 $labels['comment'] = 'Comentario';
 $labels['created'] = 'Creado';
@@ -88,6 +89,7 @@
 $labels['eventoptions'] = 'Opciones';
 $labels['generated'] = 'generado en';
 $labels['eventhistory'] = 'Historial';
+$labels['removelink'] = 'Eliminar referencia de correo';
 $labels['printdescriptions'] = 'Imprimir descripciones';
 $labels['parentcalendar'] = 'Insertar dentro';
 $labels['searchearlierdates'] = '« Buscar eventos anteriores';
@@ -167,12 +169,15 @@
 $labels['eventupdatesubject'] = '"$title" ha sido actualizado';
 $labels['eventupdatesubjectempty'] = 'Un evento que le interesa ha sido actualizado';
 $labels['eventupdatemailbody'] = "*\$title*\n\nCuándo: \$date\n\nInvitados: \$attendees\n\nEncontrará adjunto un archivo iCalendar con todos los detalles del evento, el cual puede importar a su aplicación de calendario.";
+$labels['eventcancelsubject'] = '"$title" ha sido cancelado';
 $labels['eventcancelmailbody'] = "*\$title*\n\nCuándo: \$date\n\nInvitados: \$attendees\n\nEl evento ha sido cancelado por \$organizer.\n\nEncontrará adjunto un archivo iCalendar con todos los detalles actualizados del evento.";
 $labels['itipobjectnotfound'] = 'El evento referido por este mensaje no fue encontrado en su calendario.';
 $labels['itipmailbodyaccepted'] = "\$sender ha aceptado la invitación al siguiente evento:\n\n*\$title*\n\nCuándo: \$date\n\nInvitados: \$attendees";
 $labels['itipmailbodytentative'] = "\$sender ha tentativamente aceptado la invitación al siguiente evento:\n\n*\$title*\n\nCuándo: \$date\n\nInvitados: \$attendees";
 $labels['itipmailbodydeclined'] = "\$sender ha rechazado la invitación al siguiente evento:\n\n*\$title*\n\nCuándo: \$date\n\nInvitados: \$attendees";
 $labels['itipmailbodycancel'] = "\$sender ha rechazado tu participación en el siguiente evento:\n\n*\$title*\n\nCuándo:\$date";
+$labels['itipmailbodydelegated'] = "\$sender ha delegado la invitación en el siguiente evento:\n\n*\$title*\n\nCuándo: \$date";
+$labels['itipmailbodydelegatedto'] = "\$sender ha delegado la participación en el siguiente evento a usted:\n\n*\$title*\n\nCuándo: \$date";
 $labels['itipdeclineevent'] = '¿Quiere rechazar la invitación a este evento?';
 $labels['declinedeleteconfirm'] = '¿Quiere también eliminar este evento rechazado de su calendario?';
 $labels['itipcomment'] = 'Comentario de la invitación/notificación';
@@ -231,6 +236,7 @@
 $labels['removeeventconfirm'] = 'Eliminar evento';
 $labels['changerecurringeventwarning'] = 'Este es un evento recurrente. ¿Desea editar solo el evento actual, este y las ocurrencias futuras, todas las ocurrencias o guardarlo como un evento nuevo?';
 $labels['removerecurringeventwarning'] = 'Este es un evento recurrente. ¿Desea eliminar solo el evento actual, este y las ocurrencias futuras o todas las ocurrencias del evento?';
+$labels['removerecurringallonly'] = 'Este es un evento recurrente. Como participante, usted solamente puede eliminar el evento completo con todas las ocurrencias.';
 $labels['currentevent'] = 'Actual';
 $labels['futurevents'] = 'Futuro';
 $labels['allevents'] = 'Todos';
@@ -242,10 +248,13 @@
 $labels['birthdayeventtitle'] = 'Cumpleaños de $name';
 $labels['birthdayage'] = 'Edad $age';
 $labels['objectchangelog'] = 'Cambiar Historial';
+$labels['objectdiff'] = 'Cambios de $rev1 a $rev2';
 $labels['objectnotfound'] = 'Fallo al cargar datos del evento';
 $labels['objectchangelognotavailable'] = 'Cambiar historial no esta disponible para este evento';
 $labels['objectdiffnotavailable'] = 'No es posible comparar las revisiones seleccionadas';
 $labels['revisionrestoreconfirm'] = 'Confirme que quiere recuperar la revisión $rev de este evento. Esta acción reemplazará el evento actual con la versión anterior.';
+$labels['objectrestoresuccess'] = 'Revisión $rev recuperada exitosamente';
+$labels['objectrestoreerror'] = 'Fallo al restaurar el evento anterior';
 $labels['arialabelminical'] = 'Selección de fecha del calendario';
 $labels['arialabelcalendarview'] = 'Vista del calendario';
 $labels['arialabelsearchform'] = 'Formulario de búsqueda de evento';

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

@@ -169,12 +169,15 @@
 $labels['eventupdatesubject'] = '"$title" zostało zaktualizowane';
 $labels['eventupdatesubjectempty'] = 'Zdarzenie które cię dotyczy zostało zaktualizowane';
 $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.";
 $labels['itipobjectnotfound'] = 'W twoim kalendarzu nie znaleziono zdarzenia związanego z tą wiadomością.';
 $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";
 $labels['itipmailbodycancel'] = "\$sender odrzucił twój udział w zastępującym zdarzeniu:\n\n*\$title*\n\nKiedy: \$date";
+$labels['itipmailbodydelegated'] = "\$sender oddelegował udział w następującym wydarzeniu:\n\n*\$title*\n\nKiedy: \$date";
+$labels['itipmailbodydelegatedto'] = "\$sender oddelegował do ciebie udział w następującym wydarzeniu:\n\n*\$title*\n\nKiedy: \$date";
 $labels['itipdeclineevent'] = 'Czy chcesz odrzucić zaproszenie na to zdarzenie?';
 $labels['declinedeleteconfirm'] = 'Czy chcesz także usunąć to odrzucone zdarzenie ze swojego kalendarza?';
 $labels['itipcomment'] = 'Komentarz zaproszenia/powiadomienia';
@@ -245,10 +248,13 @@
 $labels['birthdayeventtitle'] = 'Urodziny $name\'s';
 $labels['birthdayage'] = 'Wiek $age';
 $labels['objectchangelog'] = 'Historia zmian';
+$labels['objectdiff'] = 'Zmiany od $rev1 do $rev2';
 $labels['objectnotfound'] = 'Nie udało się wczytać zdarzenia';
 $labels['objectchangelognotavailable'] = 'Historia zmian jest niedostępna dla tego zdarzenia';
 $labels['objectdiffnotavailable'] = 'Nie można porównać wybranych wersji';
 $labels['revisionrestoreconfirm'] = 'Czy na pewno chcesz przywrócić wersję $rev tego zdarzenia? Bierzące zdarzenie zostanie zastąpione starszą wersją.';
+$labels['objectrestoresuccess'] = 'Wersja $rev została pomyślnie przywrócona';
+$labels['objectrestoreerror'] = 'Nie udało się przywrócić starej wersji';
 $labels['arialabelminical'] = 'Wybór daty kalendarza';
 $labels['arialabelcalendarview'] = 'Podgląd kalendarza';
 $labels['arialabelsearchform'] = 'Formularz wyszukiwania zdarzeń';

roundcubemail-plugins-kolab-3.3.tar.gz/plugins/calendar/localization/pt_PT.inc Changed

roundcubemail-plugins-kolab-3.3.tar.gz/plugins/calendar/localization/zh_CN.inc Changed

@@ -8,9 +8,15 @@
  */
 $labels['default_view'] = '默认视图';
 $labels['time_format'] = '时间格式';
+$labels['timeslots'] = '每小时分成几段';
+$labels['first_day'] = '周几排列在前';
+$labels['first_hour'] = '几点最前显示';
 $labels['workinghours'] = '工作时间';
 $labels['add_category'] = '增加分类';
 $labels['remove_category'] = '移除分类';
+$labels['defaultcalendar'] = '创建事件于';
+$labels['eventcoloring'] = '事件标色';
+$labels['coloringmode0'] = '根据日历';
 $labels['aftertrash'] = '移到回收站';
 $labels['afterdelete'] = '删除此信息';
 $labels['afterflagdeleted'] = '被删除标签';
@@ -36,6 +42,8 @@
 $labels['description'] = '描述';
 $labels['export'] = '导出';
 $labels['exporttitle'] = '导出到ICalendar';
+$labels['location'] = '地点';
+$labels['url'] = '网址';
 $labels['date'] = '日期';
 $labels['start'] = '开始';
 $labels['starttime'] = '开始时间';
@@ -64,14 +72,48 @@
 $labels['unknown'] = '未知';
 $labels['eventoptions'] = '选项';
 $labels['eventhistory'] = '历史';
+$labels['searchearlierdates'] = '<< 查找以前的事件';
+$labels['searchlaterdates'] = '查找以后的时间 >>';
+$labels['invitationspending'] = '未决邀请';
+$labels['invitationsdeclined'] = '已拒绝邀请';
+$labels['rsvpcomment'] = '邀请文字';
+$labels['until'] = '直到';
+$labels['today'] = '今天';
+$labels['tomorrow'] = '明天';
+$labels['thisweek'] = '本周';
+$labels['nextweek'] = '下周';
+$labels['prevweek'] = '上周';
+$labels['thismonth'] = '本月';
+$labels['nextmonth'] = '下月';
 $labels['weekofyear'] = '周';
+$labels['pastevents'] = '过去';
+$labels['futureevents'] = '未来';
+$labels['showalarms'] = '显示提醒';
+$labels['defaultalarmtype'] = '默认提醒设置';
+$labels['defaultalarmoffset'] = '默认提醒时间';
+$labels['attendee'] = '参与者';
+$labels['role'] = '身份';
+$labels['availability'] = '有空';
 $labels['confirmstate'] = '状态';
+$labels['addattendee'] = '添加参与者';
+$labels['roleorganizer'] = '组织者';
+$labels['rolerequired'] = '必须';
+$labels['roleoptional'] = '可选';
+$labels['rolenonparticipant'] = '缺席';
+$labels['cutypeindividual'] = '个人';
+$labels['cutypegroup'] = '组织';
+$labels['cutyperesource'] = '资源';
 $labels['availfree'] = '空闲';
 $labels['availbusy'] = '忙碌';
 $labels['availunknown'] = '未知';
 $labels['availtentative'] = '临时';
 $labels['availoutofoffice'] = '外出';
+$labels['scheduletime'] = '查找是否有空';
+$labels['sendinvitations'] = '发送邀请';
+$labels['sendnotifications'] = '通知参加者修改事项';
+$labels['resource'] = '资源';
 $labels['tabsummary'] = '汇总';
 $labels['tabsharing'] = '分享';
 $labels['savingdata'] = '保存数据...';
+$labels['futurevents'] = '未来';
 ?>

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

@@ -548,24 +548,56 @@
 	margin: 0 -0.2em;
 }
 
-#eventshow.status-cancelled {
-	background: url(images/badge_cancelled.png) top right no-repeat;
+#event-status-badge {
+	width: 100px;
+	height: 100px;
+	position: absolute;
+	top: 0;
+	right: 0;
+	overflow: hidden;
 }
 
-#eventshow.sensitivity-private {
-	background: url(images/badge_private.png) top right no-repeat;
+#event-status-badge span {
+	display: none;
+	text-transform: uppercase;
+	width: 150px;
+	height: 20px;
+	line-height: 20px;
+	position: absolute;
+	left: -20px;
+	top: 35px;
+	padding-left: 10px;
+	text-align: center;
+	font-weight: bold;
+	font-size: 12px;
+	color: #fff;
+	box-shadow: 1px 1px 2px #ccc, -1px -1px 2px #ccc;
+	-webkit-transform: rotate(45deg);
+	-moz-transform: rotate(45deg);
+	-ms-transform: rotate(45deg);
+	-o-transform: rotate(45deg);
+	transform: rotate(45deg);
 }
 
-#eventshow.sensitivity-confidential {
-	background: url(images/badge_confidential.png) top right no-repeat;
+#eventshow.status-cancelled #event-status-badge span {
+	background: url(images/badge.png) 26px -24px no-repeat #cc0000;
+	display: block;
 }
 
-.sensitivity-private #event-title {
-	margin-right: 50px;
+#eventshow.sensitivity-private #event-status-badge span {
+	background: url(images/badge.png) 40px -52px no-repeat #0066ff;
+	display: block;
+}
+
+#eventshow.sensitivity-confidential #event-status-badge span {
+	background: url(images/badge.png) 20px 2px no-repeat #cc0000;
+	display: block;
 }
 
-.sensitivity-confidential #event-title {
-	margin-right: 60px;
+#eventshow.status-cancelled #event-title,
+#eventshow.sensitivity-private #event-title,
+#eventshow.sensitivity-confidential #event-title {
+	margin-right: 80px;
 }
 
 #eventshow div.event-line {

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

roundcubemail-plugins-kolab-3.3.tar.gz/plugins/calendar/skins/classic/images/badge_cancelled.png Deleted

roundcubemail-plugins-kolab-3.3.tar.gz/plugins/calendar/skins/classic/images/badge_confidential.gif Deleted

roundcubemail-plugins-kolab-3.3.tar.gz/plugins/calendar/skins/classic/images/badge_confidential.png Deleted

roundcubemail-plugins-kolab-3.3.tar.gz/plugins/calendar/skins/classic/images/badge_private.gif Deleted

roundcubemail-plugins-kolab-3.3.tar.gz/plugins/calendar/skins/classic/images/badge_private.png Deleted

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

@@ -51,7 +51,7 @@
     <li><roundcube:button command="calendar-edit" label="calendar.edit" classAct="active" /></li>
     <li><roundcube:button command="calendar-delete" label="delete" classAct="active" /></li>
     <roundcube:if condition="env:calendar_driver == 'kolab'" />
-    <li><roundcube:button command="calendar-remove" label="calendar.remove" classAct="active" /></li>
+    <li><roundcube:button command="calendar-remove" label="calendar.removelist" classAct="active" /></li>
     <roundcube:endif />
     <li><roundcube:button command="calendar-showurl" label="calendar.showurl" classAct="active" /></li>
     <roundcube:if condition="env:calendar_driver == 'kolab'" />
@@ -62,6 +62,7 @@
 
 <div id="eventshow" class="uidialog">
   <h1 id="event-title">Event Title</h1>
+  <div id="event-status-badge"><span></span></div>
   <div class="event-section" id="event-location">Location</div>
   <div class="event-section" id="event-date">From-To</div>
   <div class="event-section" id="event-description">

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

@@ -115,6 +115,7 @@
 	width: 6px;
 	top: 40px !important;
 	bottom: 0;
+	height: auto;
 	background: url(images/toggle.gif) -1px 48% no-repeat transparent;
 }
 
@@ -683,7 +684,7 @@
 }
 
 .event-attendees span.attendee {
-	padding-right: 18px;
+	padding: 1px 18px 1px 0;
 	margin-right: 0.5em;
 	background: url(images/attendee-status.png) right 0 no-repeat;
 }
@@ -771,24 +772,56 @@
 	margin: 0 -0.2em;
 }
 
-.calendarmain .eventdialog.status-cancelled {
-	background: url(images/badge_cancelled.png) top right no-repeat;
+#event-status-badge {
+	width: 100px;
+	height: 100px;
+	position: absolute;
+	top: 0;
+	right: 0;
+	overflow: hidden;
 }
 
-.calendarmain .eventdialog.sensitivity-private {
-	background: url(images/badge_private.png) top right no-repeat;
+#event-status-badge span {
+	display: none;
+	text-transform: uppercase;
+	width: 150px;
+	height: 20px;
+	line-height: 20px;
+	position: absolute;
+	left: -20px;
+	top: 35px;
+	padding-left: 10px;
+	text-align: center;
+	font-weight: bold;
+	font-size: 12px;
+	color: #fff;
+	box-shadow: 1px 1px 2px #ccc, -1px -1px 2px #ccc;
+	-webkit-transform: rotate(45deg);
+	-moz-transform: rotate(45deg);
+	-ms-transform: rotate(45deg);
+	-o-transform: rotate(45deg);
+	transform: rotate(45deg);
+}
+
+.eventdialog.status-cancelled #event-status-badge span {
+	background: url(images/badge.png) 26px -24px no-repeat #cc0000;
+	display: block;
 }
 
-.calendarmain .eventdialog.sensitivity-confidential {
-	background: url(images/badge_confidential.png) top right no-repeat;
+.eventdialog.sensitivity-private #event-status-badge span {
+	background: url(images/badge.png) 40px -52px no-repeat #0066ff;
+	display: block;
 }
 
-.calendarmain .sensitivity-private #event-title {
-	margin-right: 50px;
+.eventdialog.sensitivity-confidential #event-status-badge span {
+	background: url(images/badge.png) 20px 2px no-repeat #cc0000;
+	display: block;
 }
 
+.calendarmain .status-cancelled #event-title,
+.calendarmain .sensitivity-private #event-title,
 .calendarmain .sensitivity-confidential #event-title {
-	margin-right: 60px;
+	margin-right: 80px;
 }
 
 .calendarmain .eventdialog div.event-line {
@@ -805,11 +838,6 @@
 	margin-left: 2em;
 }
 
-.calendarmain .eventdialog #event-rsvp-comment,
-.calendarmain .eventdialog #event-created-changed {
-	margin-top: 0.6em;
-}
-
 .eventdialog .event-text-old,
 .eventdialog .event-text-new,
 .eventdialog .event-text-diff {
@@ -1212,50 +1240,51 @@
 	height: 14px;
 	border-radius: 4px;
 	-moz-border-radius: 4px;
+	vertical-align: middle;
 }
 
 .availability img.availabilityicon.loading {
 	background: url(images/loading_blue.gif) center no-repeat;
 }
 
-#schedule-freebusy-times td.unknown,
+#schedule-freebusy-times td div.unknown,
 .availability img.availabilityicon.unknown {
 	background: #ddd;
 }
 
-#schedule-freebusy-times td.free,
+#schedule-freebusy-times td div.free,
 .availability img.availabilityicon.free {
 	background: #abd640;
 }
 
-#schedule-freebusy-times td.busy,
+#schedule-freebusy-times td div.busy,
 .availability img.availabilityicon.busy {
 	background: #e26569;
 }
 
-#schedule-freebusy-times td.tentative,
+#schedule-freebusy-times td div.tentative,
 .availability img.availabilityicon.tentative {
 	background: #8383fc;
 }
 
-#schedule-freebusy-times td.out-of-office,
+#schedule-freebusy-times td div.out-of-office,
 .availability img.availabilityicon.out-of-office {
 	background: #fbaa68;
 }
 
-#schedule-freebusy-times td.all-busy,
-#schedule-freebusy-times td.all-tentative,
-#schedule-freebusy-times td.all-out-of-office {
+#schedule-freebusy-times td div.all-busy,
+#schedule-freebusy-times td div.all-tentative,
+#schedule-freebusy-times td div.all-out-of-office {
 	background-image: url(images/freebusy-colors.png);
 	background-position: top right;
 	background-repeat: no-repeat;
 }
 
-#schedule-freebusy-times td.all-tentative {
+#schedule-freebusy-times td div.all-tentative {
 	background-position: right -40px;
 }
 
-#schedule-freebusy-times td.all-out-of-office {
+#schedule-freebusy-times td div.all-out-of-office {
 	background-position: right -80px;
 }
 
@@ -1269,10 +1298,6 @@
 	white-space: nowrap;
 }
 
-#edit-attendees-legend img.availabilityicon {
-	vertical-align: middle;
-}
-
 .edit-attendees-table tbody td.confirmstate {
 	overflow: hidden;
 	white-space: nowrap;
@@ -1286,22 +1311,27 @@
 }
 
 .edit-attendees-table td.confirmstate span.needs-action {
+	height: 14px;
 }
 
 .edit-attendees-table td.confirmstate span.accepted {
 	background-position: 5px -20px;
+	height: 14px;
 }
 
 .edit-attendees-table td.confirmstate span.declined {
 	background-position: 5px -40px;
+	height: 14px;
 }
 
 .edit-attendees-table td.confirmstate span.tentative {
 	background-position: 5px -60px;
+	height: 14px;
 }
 
 .edit-attendees-table td.confirmstate span.delegated {
 	background-position: 5px -180px;
+	height: 14px;
 }
 
 #attendees-freebusy-table {
@@ -1382,7 +1412,8 @@
 .attendees-list .spacer,
 #schedule-freebusy-times tr.spacer td {
 	background: 0;
-	font-size: 50%;
+	padding: 0;
+	height: 10px;
 }
 
 #schedule-freebusy-times {
@@ -1395,6 +1426,15 @@
 	border: 1px solid #ccc;
 }
 
+#schedule-freebusy-times tbody td {
+	padding: 0;
+	height: 20px;
+}
+
+#schedule-freebusy-times tbody td div {
+	height: 100%;
+}
+
 #attendees-freebusy-table div.timesheader,
 #schedule-freebusy-times tr.times td {
 	min-width: 30px;
@@ -1412,6 +1452,10 @@
 	cursor: pointer;
 }
 
+#schedule-freebusy-times #fbrowall td {
+	border-bottom: none;
+}
+
 #schedule-event-time {
 	position: absolute;
 	border: 2px solid #333;

roundcubemail-plugins-kolab-3.3.tar.gz/plugins/calendar/skins/larry/images/badge.png Added

roundcubemail-plugins-kolab-3.3.tar.gz/plugins/calendar/skins/larry/images/badge_cancelled.png Deleted

roundcubemail-plugins-kolab-3.3.tar.gz/plugins/calendar/skins/larry/images/badge_confidential.png Deleted

roundcubemail-plugins-kolab-3.3.tar.gz/plugins/calendar/skins/larry/images/badge_private.png Deleted

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

roundcubemail-plugins-kolab-3.3.tar.gz/plugins/kolab_2fa/config.inc.php.dist Changed

roundcubemail-plugins-kolab-3.3.tar.gz/plugins/kolab_2fa/kolab_2fa.php Changed

@@ -280,14 +280,19 @@
     }
 
     /**
-     * Load driver class for the given method
+     * Load driver class for the given authentication factor
+     *
+     * @param string $factor Factor identifier (<method>:<id>)
+     * @return Kolab2FA\Driver\Base
      */
-    public function get_driver($method)
+    public function get_driver($factor)
     {
+        list($method) = explode(':', $factor, 2);
+
         $rcmail = rcmail::get_instance();
 
-        if ($this->drivers[$method]) {
-            return $this->drivers[$method];
+        if ($this->drivers[$factor]) {
+            return $this->drivers[$factor];
         }
 
         $config = $rcmail->config->get('kolab_2fa_' . $method, array());
@@ -300,7 +305,7 @@
         try {
             // TODO: use external auth service if configured
 
-            $driver = \Kolab2FA\Driver\Base::factory($method, $config);
+            $driver = \Kolab2FA\Driver\Base::factory($factor, $config);
 
             // attach storage
             $driver->storage = $this->get_storage();
@@ -309,7 +314,7 @@
                 $driver->username  = $rcmail->get_user_name();
             }
 
-            $this->drivers[$method] = $driver;
+            $this->drivers[$factor] = $driver;
             return $driver;
         }
         catch (Exception $e) {

roundcubemail-plugins-kolab-3.3.tar.gz/plugins/kolab_2fa/lib/Kolab2FA/Driver/Yubikey.php Changed

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

@@ -18,5 +18,17 @@
 $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['activesynctitle'] = 'Verwalte ActiveSync-Geräte';
+$labels['deviceconfig'] = 'Gerätekonfiguration';
+$labels['nodevices'] = 'Es sind aktuell keine Geräte registriert.<br/><br/>Um ein Gerät zu registrieren, bitte zuerst nach der Anleitung von <a href="$url" target="_blank">dieser Seite</a> mit dem Server verbinden. Anschließend sollte das Gerät für die Konfiguration hier zur Verfügung stehen.';
+$labels['savingerror'] = 'Fehler beim Speichern der Konfiguration';
+$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';
+$labels['arialabeldeviceframe'] = 'Formular für die Einstellungen zur Gerätesynchronisation';
 ?>

roundcubemail-plugins-kolab-3.3.tar.gz/plugins/kolab_activesync/localization/es_AR.inc Changed

roundcubemail-plugins-kolab-3.3.tar.gz/plugins/kolab_activesync/localization/zh_CN.inc Changed

roundcubemail-plugins-kolab-3.3.tar.gz/plugins/kolab_addressbook/helpdocs/locale/de_DE/LC_MESSAGES/addressbook.po Changed

roundcubemail-plugins-kolab-3.3.tar.gz/plugins/kolab_addressbook/helpdocs/locale/tr_TR/LC_MESSAGES/addressbook.po Changed

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

@@ -299,12 +299,13 @@
         $groups = array();
 
         foreach ((array)$this->distlists as $group) {
-            if (!$search || strstr(strtolower($group['name']), strtolower($search)))
-                $groups[$group['name']] = array('ID' => $group['ID'], 'name' => $group['name']);
+            if (!$search || strstr(mb_strtolower($group['name']), mb_strtolower($search))) {
+                $groups[$group['ID']] = array('ID' => $group['ID'], 'name' => $group['name']);
+            }
         }
 
-        // sort groups
-        ksort($groups, SORT_LOCALE_STRING);
+        // sort groups by name
+        uasort($groups, function($a, $b) { return strcoll($a['name'], $b['name']); });
 
         return array_values($groups);
     }
@@ -414,6 +415,7 @@
      *                          0 - partial (*abc*),
      *                          1 - strict (=),
      *                          2 - prefix (abc*)
+     *                          4 - include groups (if supported)
      * @param boolean $select   True if results are requested, False if count only
      * @param boolean $nocount  True to skip the count query (select only)
      * @param array   $required List of fields that cannot be empty
@@ -436,7 +438,7 @@
             return $result;
         }
         else if ($fields == '*') {
-          $fields = $this->search_fields;
+            $fields = $this->search_fields;
         }
 
         if (!is_array($fields))
@@ -465,6 +467,8 @@
             $squery[] = array('tags', '=', 'x-has-birthday');
         }
 
+        $squery[] = array('type', '=', 'contact');
+
         // get all/matching records
         $this->_fetch_contacts($squery);
 
@@ -1174,10 +1178,14 @@
         }
 
         if (count($cols) == count($fields)) {
-            switch ($mode) {
-                case 1:  $prefix = '^'; $suffix = '$'; break;  // strict
-                case 2:  $prefix = '^'; $suffix = '';  break;  // prefix
-                default: $prefix = '';  $suffix = '';  break;  // substring
+            if ($mode & rcube_addressbook::SEARCH_STRICT) {
+                $prefix = '^'; $suffix = '$';
+            }
+            else if ($mode & rcube_addressbook::SEARCH_PREFIX) {
+                $prefix = '^'; $suffix = '';
+            }
+            else {
+                $prefix = ''; $suffix = '';
             }
 
             $search_string = is_array($value) ? join(' ', $value) : $value;

roundcubemail-plugins-kolab-3.3.tar.gz/plugins/kolab_addressbook/localization/de_CH.inc Changed

@@ -30,26 +30,29 @@
 $labels['bookproperties'] = 'Eigenschaften des Adressbuchs';
 $labels['bookname'] = 'Name des Buches';
 $labels['parentbook'] = 'Übergeordnetes Buch';
-$labels['bookshowurl'] = 'Show CardDAV URL';
-$labels['carddavurldescription'] = 'Copy this address to a <a href="http://en.wikipedia.org/wiki/CardDAV" target="_blank">CardDAV</a> client application to fully synchronize this specific address book with your computer or mobile device.';
 $labels['addressbookprio'] = 'Reihenfolge der Adressbücher';
 $labels['personalfirst'] = 'Private(s) Adressbuch/Adressbücher zuerst';
 $labels['globalfirst'] = 'Globale(s) Adressbuch/Adressbücher zuerst';
 $labels['personalonly'] = 'Nur persönliche(s) Adressbuch/Adressbücher';
 $labels['globalonly'] = 'Nur globale(s) Adressbuch/Adressbücher';
-$labels['findaddressbooks'] = 'Find address books';
-$labels['searchterms'] = 'Search terms';
-$labels['listsearchresults'] = 'Additional address books';
-$labels['foldersearchform'] = 'Address book search form';
-$labels['foldersubscribe'] = 'List permanently';
-$labels['nraddressbooksfound'] = '$nr address books found';
-$labels['noaddressbooksfound'] = 'No address books found';
 $labels['showhistory'] = 'Verlauf anzeigen';
 $labels['objectchangelog'] = 'Änderungsverlauf';
 $labels['objectdiff'] = 'Änderungen aus $rev1 nach $rev2';
 $labels['objectdiffnotavailable'] = 'Vergleich für die gewählten Versionen nicht möglich';
 $labels['objectrestoresuccess'] = 'Version $rev erfolgreich wiederhergestellt';
 $labels['objectrestoreerror'] = 'Fehler beim Wiederherstellen der alten Version';
+$labels['bookshowurl'] = 'CardDAV URL anzeigen';
+$labels['carddavurldescription'] = 'Diese Adresse in einen <a href="http://en.wikipedia.org/wiki/CardDAV" target="_blank">CardDAV</a>-Klienten kopieren, um dasAdressbuch mit einem Computer oder mobilen Gerät zu synchronisieren.';
+$labels['findaddressbooks'] = 'Adressbücher finden';
+$labels['searchterms'] = 'Suchbegriffe';
+$labels['listsearchresults'] = 'Zusätzliche Adressbücher';
+$labels['foldersearchform'] = 'Suchformular für Adressbuch';
+$labels['foldersubscribe'] = 'Permanent anzeigen';
+$labels['nraddressbooksfound'] = '$nr Adressbücher gefunden';
+$labels['noaddressbooksfound'] = 'Keine Adressbücher gefunden';
+$labels['revisionrestoreconfirm'] = 'Wollen Sie wirklich die Version $rev dieses Kontakt wiederherstellen? Diese Aktion wird die aktuelle Kopie mit der älteren Version ersetzen.';
+$labels['objectnotfound'] = 'Fehler beim Laden der Addressedaten';
+$labels['objectchangelognotavailable'] = 'Änderungshistorie ist nicht verfügbar für diesen Kontakt';
 $messages['bookdeleteconfirm']  = 'Soll das gewählte Adressbuch und alle Kontakte darin wirklich gelöscht werden?';
 $messages['bookdeleting'] = 'Adressbuch wird gelöscht...';
 $messages['booksaving'] = 'Adressbuch wird gespeichert...';

roundcubemail-plugins-kolab-3.3.tar.gz/plugins/kolab_addressbook/localization/es_AR.inc Changed

@@ -44,8 +44,15 @@
 $labels['foldersubscribe'] = 'Listar permanentemente';
 $labels['nraddressbooksfound'] = '$nr libretas de direcciones encontrada(s)';
 $labels['noaddressbooksfound'] = 'No se encontraron libretas de direcciones';
+$labels['showhistory'] = 'Mostrar Historial';
 $labels['objectchangelog'] = 'Cambiar Historial';
+$labels['objectdiff'] = 'Cambios de $rev1 a $rev2';
+$labels['revisionrestoreconfirm'] = 'Confirme que quiere recuperar la revisión $rev de este contacto. Esta acción reemplazará el evento actual con la versión anterior.';
+$labels['objectnotfound'] = 'Fallo al cargar datos del contacto';
+$labels['objectchangelognotavailable'] = 'Cambiar historial no está disponible para este contacto';
 $labels['objectdiffnotavailable'] = 'No es posible comparar las revisiones seleccionadas';
+$labels['objectrestoresuccess'] = 'Revisión $rev recuperada exitosamente';
+$labels['objectrestoreerror'] = 'Fallo al restaurar el evento anterior';
 $messages['bookdeleteconfirm']  = 'Confirme que desea eliminar la libreta de direcciones y todos los contactos en ella';
 $messages['bookdeleting'] = 'Eliminando libreta de direcciones...';
 $messages['booksaving'] = 'Guardando libreta de direcciones...';

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

roundcubemail-plugins-kolab-3.3.tar.gz/plugins/kolab_addressbook/localization/pt_PT.inc Changed

@@ -6,7 +6,31 @@
  *
  * For translation see https://www.transifex.com/projects/p/kolab/resource/kolab_addressbook/
  */
+$labels['initials'] = 'Iniciais';
+$labels['profession'] = 'Profissão';
+$labels['officelocation'] = 'Localização de escritório';
+$labels['children'] = 'Criança';
+$labels['pgppublickey'] = 'chave pública GPG';
+$labels['pkcs7publickey'] = 'chave pública S/MIME';
+$labels['freebusyurl'] = 'URL Livre-ocupado ';
+$labels['typebusiness'] = 'Negócio';
+$labels['typebusinessfax'] = 'Fax empresárial';
+$labels['typecompany'] = 'Empresa';
+$labels['typeprimary'] = 'Primário';
+$labels['typeradio'] = 'Rádio';
+$labels['typeisdn'] = 'RDSI';
+$labels['settings'] = 'Definições';
+$labels['bookcreate'] = 'Criar contacto';
+$labels['bookedit'] = 'Editar contacto';
+$labels['bookdelete'] = 'Apagar contacto';
 $labels['bookremove'] = 'Remove from list';
+$labels['bookproperties'] = 'Propriedades do contacto';
+$labels['bookname'] = 'Nome do livro';
+$labels['parentbook'] = 'Livro superior';
+$labels['bookshowurl'] = 'Mostrar CardDAV URL';
+$labels['carddavurldescription'] = 'Copie este endereço <a href="http://en.wikipedia.org/wiki/CardDAV" target="_blank">CardDAV</a> para uma aplicação cliente para sincronizar totalmente este contacto com o seu computador ou dispositivo móvel.';
+$labels['addressbookprio'] = 'Selecção/comportamento do contacto(s)';
+$labels['personalfirst'] = 'Contacto(s) pessoais primeiro';
 $labels['searchterms'] = 'Search terms';
 $labels['foldersubscribe'] = 'Listar permanentemente';
 $labels['objectchangelog'] = 'Alterar histórico';

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

roundcubemail-plugins-kolab-3.3.tar.gz/plugins/kolab_auth/localization/es_AR.inc Changed

roundcubemail-plugins-kolab-3.3.tar.gz/plugins/kolab_auth/localization/zh_CN.inc Added

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

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

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

@@ -54,7 +54,6 @@
         $this->add_hook('calendar_user_emails', array($this, 'calendar_user_emails'));
         $this->add_hook('calendar_list_filter', array($this, 'calendar_list_filter'));
         $this->add_hook('calendar_load_itip', array($this, 'calendar_load_itip'));
-        $this->add_hook('calendar_event_find', array($this, 'calendar_event_find'));
 
         // delegation support in kolab_auth plugin
         $this->add_hook('kolab_auth_emails', array($this, 'kolab_auth_emails'));
@@ -261,22 +260,6 @@
     }
 
     /**
-     * calendar::find_event() handler
-     */
-    public function calendar_event_find($args)
-    {
-        // If the event can't be found in user personal folders, we'll
-        // look in delegators' folders (T1264)
-
-        if (!empty($_SESSION['delegators']) && empty($args['result'])) {
-            $engine = $this->engine();
-            $engine->delegator_find_event($args);
-        }
-
-        return $args;
-    }
-
-    /**
      * Delegation support in Calendar plugin UI
      */
     public function calendar_ui()

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

@@ -783,10 +783,19 @@
      */
     public function delegator_folder_filter(&$args)
     {
-        $context   = $this->delegator_context();
+        $context = $this->delegator_context();
+
+        if (empty($context)) {
+            return $args;
+        }
+
         $storage   = $this->rc->get_storage();
         $other_ns  = $storage->get_namespace('other');
         $delim     = $storage->get_hierarchy_delimiter();
+        $editable  = $args['filter'] & calendar_driver::FILTER_WRITEABLE;
+        $active    = $args['filter'] & calendar_driver::FILTER_ACTIVE;
+        $personal  = $args['filter'] & calendar_driver::FILTER_PERSONAL;
+        $shared    = $args['filter'] & calendar_driver::FILTER_SHARED;
         $calendars = array();
 
         // code parts derived from kolab_driver::filter_calendars()
@@ -794,31 +803,33 @@
             if (!$cal->ready) {
                 continue;
             }
-            if ($args['writeable'] && $cal->readonly) {
+            if ($editable && !$cal->editable) {
                 continue;
             }
-            if ($args['active'] && !$cal->storage->is_active()) {
+            if ($active && !$cal->storage->is_active()) {
                 continue;
             }
-            if ($args['personal']) {
-                $ns   = $cal->get_namespace();
+            if ($personal || $shared) {
+                $ns = $cal->get_namespace();
 
-                if (empty($context)) {
-                    if ($ns != 'personal') {
-                        continue;
-                    }
+                if ($personal && $ns == 'personal') {
+                    continue;
                 }
-                else {
-                    if ($ns != 'other') {
-                        continue;
-                    }
-
+                else if ($personal && $ns == 'other') {
+                    $found = false;
                     foreach ($other_ns as $ns) {
                         $folder = $ns[0] . $context . $delim;
-                        if (strpos($cal->name, $folder) !== 0) {
-                            continue;
+                        if (strpos($cal->name, $folder) === 0) {
+                            $found = true;
                         }
                     }
+
+                    if (!$found) {
+                        continue;
+                    }
+                }
+                else if (!$shared || $ns != 'shared') {
+                    continue;
                 }
             }
 
@@ -864,39 +875,6 @@
     }
 
     /**
-     * Finds an event in delegators' folders. Calendar looks only in
-     * personal namespace, we "extend" this to delegators' folders.
-     *
-     * @param array $args Reference to plugin hook arguments
-     */
-    public function delegator_find_event(&$args)
-    {
-        // The event wasn't found and current user has delegators
-        if (!empty($_SESSION['delegators']) && empty($args['result'])) {
-            $event     = $args['search'];
-            $ns_root   = kolab_storage::namespace_root('other');
-            $storage   = $this->rc->get_storage();
-            $delimiter = $storage->get_hierarchy_delimiter();
-            $folders   = $storage->list_folders_subscribed($ns_root, '*', 'event', 'w');
-
-            // search in all delegators' calendars
-            foreach ($folders as $folder) {
-                list($uid, $path) = explode($delimiter, substr($folder, strlen($ns_root)), 2);
-
-                if (!empty($_SESSION['delegators'][$uid])) {
-                    $event['calendar'] = kolab_storage::folder_id($folder, true);
-                    $result = $args['calendar']->driver->get_event($event, calendar_driver::FILTER_WRITEABLE);
-
-                    if ($result) {
-                        $args['result'] = $result;
-                        return;
-                    }
-                }
-            }
-        }
-    }
-
-    /**
      * Compares two ACLs (according to supported rights)
      *
      * @param array $acl1 ACL rights array (or string)

roundcubemail-plugins-kolab-3.3.tar.gz/plugins/kolab_delegation/localization/de_CH.inc Changed

roundcubemail-plugins-kolab-3.3.tar.gz/plugins/kolab_delegation/localization/zh_CN.inc Changed

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

@@ -142,7 +142,7 @@
   if (window.file_api)
     return;
 
-  var manticore_config = {};
+  var editor_config = {};
 
   // Initialize application object (don't change var name!)
   file_api = $.extend(new files_api(), new kolab_files_ui());
@@ -161,22 +161,29 @@
   file_api.translations = rcmail.labels;
 
   if (rcmail.task == 'files') {
-    if (rcmail.env.action == 'edit' && rcmail.env.file_data.viewer && rcmail.env.file_data.viewer.manticore) {
-      manticore_config = {
+    if (rcmail.env.action == 'edit' && rcmail.env.editor_type) {
+      // Extract the domain here, it can't be done by Chwala
+      // when using WOPI, which does not set iframe src attribute
+      var domain, href = rcmail.env.file_data.viewer.href;
+      if (href && /^(https?:\/\/[^/]+)/i.test(href))
+        domain = RegExp.$1;
+
+      editor_config = {
         // UI elements
         iframe: $('#fileframe').get(0),
+        domain: domain,
         export_menu: rcmail.gui_objects.exportmenu ? $('ul', rcmail.gui_objects.exportmenu).get(0) : null,
         title_input: $('#document-title').get(0),
         members_list: $('#members').get(0),
         photo_url: '?_task=addressbook&_action=photo&_error=1&_email=%email',
         photo_default_url: rcmail.env.photo_placeholder,
         // events
-        ready: function(data) { manticore_init(); },
-        sessionClosed: function(data) { return manticore_close(); }
+        ready: function(data) { document_editor_init(); },
+        sessionClosed: function(data) { return document_editor_close(); }
       };
 
       if (rcmail.env.file_data.writable)
-        manticore_config.documentChanged = function(data) { rcmail.enable_command('document-save', true); };
+        editor_config.documentChanged = function(data) { rcmail.enable_command('document-save', true); };
     }
     else if (rcmail.env.action == 'open') {
       // initialize folders list (for dialogs)
@@ -191,17 +198,17 @@
     }
   }
 
-  if (rcmail.env.files_caps && rcmail.env.files_caps.MANTICORE && !rcmail.env.framed)
-    $.extend(manticore_config, {
+  if (rcmail.env.files_caps && !rcmail.env.framed && rcmail.env.files_caps.DOCEDIT)
+    $.extend(editor_config, {
       // invitation notifications
       api: file_api,
       owner: rcmail.env.files_user,
       interval: rcmail.env.files_interval || 60,
       invitationMore: true,
-      invitationChange: manticore_invitation_handler
+      invitationChange: document_editor_invitation_handler
     });
 
-  $.extend(manticore_config, {
+  $.extend(editor_config, {
     // notifications/alerts
     gettext: function(label) { return rcmail.get_label('kolab_files.' + label); },
     set_busy: function(state, message) { return rcmail.set_busy(state, message ? 'kolab_files.' + message : ''); },
@@ -213,7 +220,10 @@
     }
   });
 
-  manticore = new manticore_api(manticore_config);
+  if (window.document_editor_api)
+    document_editor = new document_editor_api(editor_config);
+  else
+    document_editor = new manticore_api(editor_config);
 };
 
 // returns API authorization token
@@ -577,7 +587,7 @@
         kolab_dialog_close(dlg);
 
       if (id && input.parent().is('.session.request')) {
-        manticore.invitation_request({session_id: id});
+        document_editor.invitation_request({session_id: id});
         return;
       }
 
@@ -799,7 +809,7 @@
     buttons[rcmail.gettext('kolab_files.request')] = function() {
       kolab_dialog_close(this);
       // @TODO: Add comment field to the dialog
-      manticore.invitation_request({session_id: session.id});
+      document_editor.invitation_request({session_id: session.id});
     };
   }
 
@@ -1166,18 +1176,21 @@
     info = rcmail.env.file_data;
 
   try {
-    rcmail.file_editor = win.file_editor && win.file_editor.editable ? win.file_editor : null;
+    rcmail.file_editor = win.file_editor;
   }
   catch (e) {};
 
   // on edit page switch immediately to edit mode
-  if (rcmail.file_editor && rcmail.env.action == 'edit')
+  if (rcmail.file_editor && rcmail.file_editor.editable && rcmail.env.action == 'edit')
     rcmail.files_edit();
 
-  rcmail.enable_command('files-edit', rcmail.file_editor
-    || (info && info.viewer && info.viewer.manticore));
+  rcmail.enable_command('files-edit', (rcmail.file_editor && rcmail.file_editor.editable)
+    || rcmail.env.editor_type
+    || (file_api.file_type_supported(rcmail.env.file_data.type, rcmail.env.files_caps) & 4));
+
   rcmail.enable_command('files-print', (rcmail.file_editor && rcmail.file_editor.printable)
     || (info && /^image\//i.test(info.type)));
+
   // detect Print button and check if it can be accessed
   try {
     if ($('#fileframe').contents().find('#print').length)
@@ -1271,32 +1284,31 @@
 
 
 /**********************************************************/
-/*********    Manticore editor functionality     **********/
+/*********     document editor functionality     **********/
 /**********************************************************/
 
 // Initialize document toolbar functionality
-function manticore_init()
+function document_editor_init()
 {
   var info = rcmail.env.file_data;
 
-  rcmail.enable_command('document-export', true);
+  rcmail.enable_command('document-export', 'document-print', true);
 
   if (info && info.session && info.session.is_owner)
     rcmail.enable_command('document-close', 'document-editors', true);
 };
 
 // executed on editing session termination
-function manticore_close()
+function document_editor_close()
 {
   $('<div>').addClass('popupdialog').attr('role', 'alertdialog')
     .html($('<span>').text(rcmail.gettext('kolab_files.sessionterminated')))
     .dialog({
       resizable: false,
       closeOnEscape: true,
-      dialogClass: 'popupmessage error',
+      dialogClass: 'error',
       title: rcmail.gettext('kolab_files.sessionterminatedtitle'),
       close: function() { window.close(); },
-      position: ['center', 'center'],
       width: 420,
       minHeight: 90
     }).show();
@@ -1306,14 +1318,19 @@
 
 rcube_webmail.prototype.document_save = function()
 {
-  manticore.save(function(data) {
+  document_editor.save(function(data) {
     rcmail.enable_command('document-save', false);
   });
 };
 
 rcube_webmail.prototype.document_export = function(type)
 {
-  manticore.export(type || 'odt');
+  document_editor.export(type || 'odt');
+};
+
+rcube_webmail.prototype.document_print = function()
+{
+  document_editor.print();
 };
 
 rcube_webmail.prototype.document_editors = function()
@@ -1459,7 +1476,7 @@
     select = $('<select>').change(function() {
         var val = $(this).val(), map = {accepted: 'invitation_accept', declined: 'invitation_decline'};
         if (map[val])
-          manticore[map[val]]({user: user, session_id: rcmail.env.file_data.session.id});
+          document_editor[map[val]]({user: user, session_id: rcmail.env.file_data.session.id});
       });
 
     if (type == 'requested')
@@ -1488,7 +1505,7 @@
       .append(name).append(state).append(buttons);
 };
 
-function manticore_invitation_handler(invitation)
+function document_editor_invitation_handler(invitation)
 {
   // make the "More" link clickable
   $('#' + invitation.id).parent('div').click(function() { kolab_files_invitation_dialog(invitation); });
@@ -1519,27 +1536,27 @@
 
   if (!invitation.is_session_owner) {
     if (invitation.status == 'invited') {
-      text = manticore.invitation_msg(invitation);
+      text = document_editor.invitation_msg(invitation);
 
       buttons[rcmail.gettext('kolab_files.join')] = function() {
         join_session();
         kolab_dialog_close(this);
       };
       buttons[rcmail.gettext('kolab_files.accept')] = function() {
-        manticore.invitation_accept(invitation);
+        document_editor.invitation_accept(invitation);
         kolab_dialog_close(this);
       };
       buttons[rcmail.gettext('kolab_files.decline')] = function() {
-        manticore.invitation_decline(invitation);
+        document_editor.invitation_decline(invitation);
         kolab_dialog_close(this);
       };
     }
     else if (invitation.status == 'declined-owner') {
       // @todo: add option to request for an invitation again?
-      text = manticore.invitation_msg(invitation);
+      text = document_editor.invitation_msg(invitation);
     }
     else if (invitation.status == 'accepted-owner') {
-      text = manticore.invitation_msg(invitation);
+      text = document_editor.invitation_msg(invitation);
 
       buttons[rcmail.gettext('kolab_files.join')] = function() {
         join_session();
@@ -1549,21 +1566,21 @@
   }
   else {
     if (invitation.status == 'accepted') {
-      text = manticore.invitation_msg(invitation);
+      text = document_editor.invitation_msg(invitation);
     }
     else if (invitation.status == 'declined') {
       // @todo: add option to invite the user again?
-      text = manticore.invitation_msg(invitation);
+      text = document_editor.invitation_msg(invitation);
     }
     else if (invitation.status == 'requested') {
-      text = manticore.invitation_msg(invitation);
+      text = document_editor.invitation_msg(invitation);
 
       buttons[rcmail.gettext('kolab_files.accept')] = function() {
-        manticore.invitation_accept(invitation);
+        document_editor.invitation_accept(invitation);
         kolab_dialog_close(this);
       };
       buttons[rcmail.gettext('kolab_files.decline')] = function() {
-        manticore.invitation_decline(invitation);
+        document_editor.invitation_decline(invitation);
         kolab_dialog_close(this);
       };
     }
@@ -1756,7 +1773,7 @@
   else if (session !== true)
     params.session = session;
 
-  if (this.file_editor && !session) {
+  if (this.file_editor && this.file_editor.editable && !session) {
     this.file_editor.enable();
     this.enable_command('files-save', true);
   }
@@ -1997,7 +2014,7 @@
     });
 
     // add Sessions entry
-    if (rcmail.task == 'files' && !rcmail.env.action && rcmail.env.files_caps && rcmail.env.files_caps.MANTICORE) {
+    if (rcmail.task == 'files' && !rcmail.env.action && rcmail.env.files_caps && rcmail.env.files_caps.DOCEDIT) {
       rows.push($('<li class="mailbox collection sessions"></li>')
         .attr('id', 'rcmli' + rcmail.html_identifier_encode('folder-collection-sessions'))
         .append($('<a class="name"></a>').text(rcmail.gettext('kolab_files.sessions')))
@@ -2971,7 +2988,7 @@
     });
 
     // refresh sessions info in time intervals
-    if (rcmail.env.files_caps && rcmail.env.files_caps.MANTICORE && (rcmail.fileslist || rcmail.env.file))
+    if (rcmail.env.files_caps && rcmail.env.files_caps.DOCEDIT && (rcmail.fileslist || rcmail.env.file))
       this.workers[folder] = setTimeout(function() {
         file_api.request('folder_info', {folder: folder, sessions: 1}, 'folder_info_response');
       }, (rcmail.env.files_interval || 60) * 1000);
@@ -3553,8 +3570,12 @@
     if (!this.response(response))
       return;
 
-    if (rcmail.task == 'files' && rcmail.env.action == 'edit')
-      window.close();
+    if (rcmail.task == 'files' && rcmail.env.action == 'edit') {
+      if (document_editor && document_editor.terminate)
+        document_editor.terminate();
+      // use timeout to have a chance to properly propagate termination request
+      setTimeout(function() { window.close(); }, 500);
+    }
 
     // @todo: force sessions info update
 
@@ -3567,10 +3588,10 @@
     }
 
     // remove session from the list (if sessions list exist)
-    if (list) {
-      list.remove(this.deleted_session);
+    if (list)
+      list.remove_row(this.deleted_session);
+    if (win.file_api && win.file_api.env.sessions_list)
       delete win.file_api.env.sessions_list[this.deleted_session];
-    }
   };
 
   // Invite document session participants

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

@@ -127,6 +127,11 @@
                 ), 'taskbar');
         }
 
+        if ($_SESSION['kolab_files_caps']['MANTICORE'] || $_SESSION['kolab_files_caps']['WOPI']) {
+            $_SESSION['kolab_files_caps']['DOCEDIT'] = true;
+            $_SESSION['kolab_files_caps']['DOCTYPE'] = $_SESSION['kolab_files_caps']['MANTICORE'] ? 'manticore' : 'wopi';
+        }
+
         $this->plugin->include_stylesheet($this->plugin->local_skin_path().'/style.css');
         $this->plugin->include_script($this->url . '/js/files_api.js');
         $this->plugin->include_script('kolab_files.js');
@@ -136,7 +141,7 @@
         $this->rc->output->set_env('files_caps', $_SESSION['kolab_files_caps']);
         $this->rc->output->set_env('files_user', $this->rc->get_user_name());
 
-        if ($_SESSION['kolab_files_caps']['MANTICORE']) {
+        if ($_SESSION['kolab_files_caps']['DOCEDIT']) {
             $this->plugin->add_label('declinednotice', 'invitednotice', 'acceptedownernotice',
                 'declinedownernotice', 'requestednotice', 'acceptednotice', 'declinednotice',
                 'more', 'accept', 'decline', 'join', 'status', 'when', 'file', 'comment',
@@ -445,16 +450,11 @@
         $select_type   = new html_select(array('id' => 'file-create-type', 'name' => 'type'));
         $table         = new html_table(array('cols' => 2, 'class' => 'propform'));
 
-        // @TODO: get this list from Chwala API
-        $types = array(
-            'application/vnd.oasis.opendocument.text' => 'odt',
-            'text/plain' => 'txt',
-            'text/html'  => 'html',
-        );
-        foreach (array_keys($types) as $type) {
-            list ($app, $label) = explode('/', $type);
-            $label = preg_replace('/[^a-z]/', '', $label);
-            $select_type->add($this->plugin->gettext('type.' . $label), $type);
+        $types = array();
+
+        foreach ($this->get_mimetypes('edit') as $type => $mimetype) {
+            $types[$type] = $mimetype['ext'];
+            $select_type->add($mimetype['label'], $type);
         }
 
         $table->add('title', html::label('file-create-name', rcube::Q($this->plugin->gettext('filename'))));
@@ -769,7 +769,27 @@
         $attrib['src']             = $href;
         $attrib['onload']          = 'kolab_files_frame_load(this)';
 
-        return html::iframe($attrib);
+        // editor requires additional arguments via POST
+        if (!empty($this->file_data['viewer']['post'])) {
+            $attrib['src'] = $this->rc->output->asset_url('program/resources/blank.gif');
+
+            $form_content = new html_hiddenfield();
+            $form_attrib  = array(
+                'action' => $href,
+                'id'     => $attrib['id'] . '-form',
+                'target' => $attrib['name'],
+                'method' => 'post',
+            );
+
+            foreach ($this->file_data['viewer']['post'] as $name => $value) {
+                $form_content->add(array('name' => $name, 'value' => $value));
+            }
+
+            $form = html::tag('form', $form_attrib, $form_content->show())
+                . html::script(array(), "\$('#{$attrib['id']}-form').submit()");
+        }
+
+        return html::iframe($attrib) . $form;
     }
 
     /**
@@ -916,6 +936,14 @@
         // some HTTP server configurations require this header
         $this->request->setHeader('accept', "application/json,text/javascript,*/*");
 
+        // Localization
+        $this->request->setHeader('accept-language', $_SESSION['language']);
+
+        // set Referer which is used as an origin for cross-window
+        // communication with document editor iframe
+        $host = $_SERVER['REQUEST_SCHEME'] . '://' . $_SERVER['HTTP_HOST'];
+        $this->request->setHeader('referer', $host);
+
         return $this->request;
     }
 
@@ -1349,36 +1377,77 @@
         ));
 
         $placeholder = $this->rc->output->asset_url('program/resources/blank.gif');
-        $manticore = ($viewer & 4) && $this->file_data['viewer']['manticore'];
+
+        if ($this->file_data['viewer']['wopi']) {
+            $editor_type = 'wopi';
+            $got_editor  = ($viewer & 4);
+        }
+        else if ($this->file_data['viewer']['manticore']) {
+            $editor_type = 'manticore';
+            $got_editor = ($viewer & 4);
+        }
 
         // this one is for styling purpose
         $this->rc->output->set_env('extwin', true);
         $this->rc->output->set_env('file', $file);
         $this->rc->output->set_env('file_data', $this->file_data);
+        $this->rc->output->set_env('editor_type', $editor_type);
         $this->rc->output->set_env('photo_placeholder', $placeholder);
         $this->rc->output->set_pagetitle(rcube::Q($file));
-        $this->rc->output->send('kolab_files.' . ($manticore ? 'docedit' : 'filepreview'));
+        $this->rc->output->send('kolab_files.' . ($got_editor ? 'docedit' : 'filepreview'));
     }
 
     /**
      * Returns mimetypes supported by File API viewers
      */
-    protected function get_mimetypes()
+    protected function get_mimetypes($type = 'view')
     {
-        $token   = $this->get_api_token();
-        $request = $this->get_request(array('method' => 'mimetypes'), $token);
+        $mimetypes = array();
 
         // send request to the API
         try {
-            $response = $request->send();
-            $status   = $response->getStatus();
-            $body     = @json_decode($response->getBody(), true);
+            if ($this->mimetypes === null) {
+                $this->mimetypes = false;
 
-            if ($status == 200 && $body['status'] == 'OK') {
-                $mimetypes = $body['result'];
+                $token    = $this->get_api_token();
+                $request  = $this->get_request(array('method' => 'mimetypes'), $token);
+                $response = $request->send();
+                $status   = $response->getStatus();
+                $body     = @json_decode($response->getBody(), true);
+
+                if ($status == 200 && $body['status'] == 'OK') {
+                    $this->mimetypes = $body['result'];
+                }
+                else {
+                    throw new Exception($body['reason'] ?: "Failed to get mimetypes. Status: $status");
+                }
             }
-            else {
-                throw new Exception($body['reason'] ?: "Failed to get mimetypes. Status: $status");
+
+            if (is_array($this->mimetypes)) {
+                if (array_key_exists($type, $this->mimetypes)) {
+                    $mimetypes = $this->mimetypes[$type];
+                }
+                else {
+                    $mimetypes = $this->mimetypes;
+                }
+            }
+
+            // fallback to static definition if old Chwala is used
+            if ($type == 'edit' && empty($mimetypes)) {
+                $mimetypes = array(
+                    'application/vnd.oasis.opendocument.text' => 'odt',
+                    'text/plain' => 'txt',
+                    'text/html'  => 'html',
+                );
+
+                foreach (array_keys($mimetypes) as $type) {
+                    list ($app, $label) = explode('/', $type);
+                    $label = preg_replace('/[^a-z]/', '', $label);
+                    $mimetypes[$type] = array(
+                        'ext'   => $mimetypes[$type],
+                        'label' => $this->plugin->gettext('type.' . $label),
+                    );
+                }
             }
         }
         catch (Exception $e) {

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

@@ -41,3 +41,99 @@
 $labels['owner'] = 'Eigentümer';
 $labels['comment'] = 'Kommentar';
 $labels['open'] = 'Öffnen';
+$labels['filepreview'] = 'Datei Vorschau';
+$labels['saveall'] = 'Alles in die Cloud speichern...';
+$labels['saveto'] = 'In die Cloud speichern...';
+$labels['saveas'] = 'Speichern als:';
+$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['folderedit'] = 'Verzeichnis ändern';
+$labels['foldermount'] = 'Speicher hinzufügen';
+$labels['folderdelete'] = 'Ordner löschen';
+$labels['foldername'] = 'Ordnername';
+$labels['upload'] = 'Hochladen';
+$labels['uploadfile'] = 'Datei(en) hochladen';
+$labels['getfile'] = 'Datei herunterladen';
+$labels['view'] = 'Ansehen';
+$labels['viewfile'] = 'Datei ansehen';
+$labels['deletefile'] = 'Datei(en) löschen';
+$labels['editfile'] = 'Datei bearbeiten';
+$labels['savefile'] = 'Datei speichern';
+$labels['printfile'] = 'Datei drucken';
+$labels['renamefile'] = 'Datei umbenennen';
+$labels['createfile'] = 'Datei erstellen';
+$labels['createandedit'] = 'Erstellen und Bearbeiten';
+$labels['copyfile'] = 'Datei kopieren';
+$labels['copyandedit'] = 'Kopieren und Bearbeiten';
+$labels['documenttitle'] = 'Titel:';
+$labels['sessions'] = 'Sitzungen';
+$labels['uploading'] = 'Lade Datei(en) hoch...';
+$labels['attaching'] = 'Hänge Datei(en) an...';
+$labels['authenticating'] = 'Authentifiziere...';
+$labels['foldercreating'] = 'Erstelle Ordner...';
+$labels['folderupdating'] = 'Aktualisiere Verzeichnis...';
+$labels['foldermounting'] = 'Hinzufügen externen Speichers...';
+$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['folderupdatenotice'] = 'Verzeichnis erfolgreich aktualisiert.';
+$labels['foldercreatenotice'] = 'Ordner erfolgreich erstellt.';
+$labels['foldermountnotice'] = 'Speicher erfolgreich hinzugefügt.';
+$labels['folderauthtitle'] = 'Einloggen zu $title';
+$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['filecreating'] = 'Datei wird erstellt...';
+$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['uploadsizeerror'] = 'Maimale Dateigröße ($size) überschritten!';
+$labels['additionalfolders'] = 'Zusätzliche Ordner';
+$labels['allfolders'] = 'suche in allen Ordnern';
+$labels['editfiledialog'] = 'Bearbeitungsaktion bestätigen';
+$labels['newsession'] = 'Neue Sitzung erstellen';
+$labels['editfilerotitle'] = 'Schreibgeschützte Datei';
+$labels['terminatesession'] = 'Sitzung beenden';
+$labels['sessionterminatedtitle'] = 'Sitzung beendet';
+$labels['terminate'] = 'Beenden';
+$labels['sessionterminating'] = 'Sitzung wird beendet...';
+$labels['delparticipant'] = 'Teilnehmer entfernen';
+$labels['statusinvited'] = 'Eingeladen';
+$labels['statusaccepted'] = 'Akzeptiert';
+$labels['statusdeclined'] = 'Abgelehnt';
+$labels['documentinviting'] = 'Teilnehmer wird/werden eingeladen...';
+$labels['documentcancelling'] = 'Teilnehmer wird/werden entfernt...';
+$labels['sessiondialog'] = 'Dokumentbearbeitungssitzung';
+$labels['when'] = 'Wenn';
+$labels['file'] = 'Datei';
+$labels['invitationtitle'] = 'Einladung für $file';
+$labels['storepasswords'] = 'Passwort merken';
+$labels['storepasswordsdesc'] = 'Gespeicherte Passwörter werden verschlüsselt. Aktivieren Sie dies, wenn Sie nicht bei jedem Login nach dem Passwort gefragt werden möchten oder wenn dieser Speicher via WebDAV verfügbar sein soll.';
+$labels['arialabelsearchform'] = 'Suchformular für Dateien';
+$labels['arialabelquicksearchbox'] = 'Sucheingabe';
+$labels['arialabellistoptions'] = 'Dateilisten Optionen';
+$labels['arialabelfolderoptions'] = 'Ordner Aktionen';
+$labels['arialabelfileeditform'] = 'Datei Bearbeiten Maske';
+$labels['arialabelfilecreateform'] = 'Datei Erstellen Maske';
+$labels['arialabelfilelist'] = 'Dateiliste';
+$labels['arialabelfoldercreateform'] = 'Ordner Erstellen Maske';
+$labels['arialabelfoldereditform'] = 'Formular Verzeichnis ändern';
+$labels['arialabelfoldermountform'] = 'Formular Externer Speicher';
+$labels['arialabelfolderauthform'] = 'Formular Authentifizierung Externer Speicher';
+$labels['arialabelfolderlist'] = 'Ordner / Sammlungs Auswahl';
+$labels['arialabelfileselectdialog'] = 'Datei Auswahl Dialog';
+$labels['arialabelattachmentoptions'] = 'Anhänge speichern Optionen';
+$labels['arialabelfilesavedialog'] = 'Datei(en) speichern Dialog';
+$labels['arialabelfileprops'] = 'Dateieigenschaften';
+$labels['arialabelfilecontent'] = 'Datei Inhalt';
+$labels['arialabelfileeditdialog'] = 'Dateibearbeitungsdialog';
+$labels['type.plain'] = 'Klartextdokument';
+$labels['type.vndoasisopendocumenttext'] = 'Textdokument (ODF)';
+$labels['type.html'] = 'HTML-Dokument';

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

roundcubemail-plugins-kolab-3.3.tar.gz/plugins/kolab_files/localization/es_AR.inc Changed

@@ -18,6 +18,8 @@
 $labels['selectfiles'] = 'Seleccionar archivo(s) para adjuntar...';
 $labels['attachsel'] = 'Adjunto seleccionado';
 $labels['foldercreate'] = 'Crear carpeta';
+$labels['folderedit'] = 'Editar carpeta';
+$labels['foldermount'] = 'Agregar almacenamiento';
 $labels['folderdelete'] = 'Eliminar carpeta';
 $labels['folderinside'] = 'Insertar dentro';
 $labels['foldername'] = 'Nombre de carpeta';
@@ -30,28 +32,43 @@
 $labels['getfile'] = 'Descargar archivo';
 $labels['view'] = 'Ver';
 $labels['viewfile'] = 'Ver archivo';
+$labels['rename'] = 'Renombrar';
 $labels['deletefile'] = 'Eliminar archivo(s)';
 $labels['edit'] = 'Editar';
 $labels['editfile'] = 'Editar archivo';
 $labels['save'] = 'Guardar';
 $labels['savefile'] = 'Guardar archivo';
 $labels['printfile'] = 'Imprimir archivo';
+$labels['renamefile'] = 'Renombrar un archivo';
+$labels['createfile'] = 'Crear un archivo';
+$labels['createandedit'] = 'Crear y Editar';
+$labels['copyfile'] = 'Copiar un archivo';
+$labels['copyandedit'] = 'Copiar y Editar';
+$labels['documenttitle'] = 'Título:';
 $labels['close'] = 'Cerrar';
 $labels['collection_audio'] = 'Audio';
 $labels['collection_video'] = 'Vídeo';
 $labels['collection_image'] = 'Imágenes';
 $labels['collection_document'] = 'Documentos';
+$labels['sessions'] = 'Sesiones';
 $labels['uploading'] = 'Subiendo archivo(s)...';
 $labels['attaching'] = 'Adjuntando archivo(s)...';
+$labels['authenticating'] = 'Autenticando...';
 $labels['foldercreating'] = 'Creando carpeta...';
+$labels['folderupdating'] = 'Actualizando carpeta...';
+$labels['foldermounting'] = 'Agregando almacenamiento externo...';
 $labels['folderdeleting'] = 'Eliminando carpeta...';
 $labels['folderdeleteconfirm'] = 'Confirme que desea eliminar la carpeta seleccionada';
 $labels['folderdeletenotice'] = 'La carpeta fue eliminada exitosamente.';
+$labels['folderupdatenotice'] = 'Carpeta actualizada exitosamente.';
 $labels['foldercreatenotice'] = 'La carpeta fue creada exitosamente.';
+$labels['foldermountnotice'] = 'Almacenamiento agregado exitosamente.';
+$labels['folderauthtitle'] = 'Ingresar a $title';
 $labels['saveallnotice'] = 'Se guardaron $n archivo(s) exitosamente.';
 $labels['saveallerror'] = 'Fallo guardando $n archivos.';
 $labels['attacherror'] = 'Fallo adjuntando archivo(s) de la nube';
 $labels['fileupdating'] = 'Actualizando archivo...';
+$labels['filecreating'] = 'Creando archivo...';
 $labels['filemoving'] = 'Moviendo archivo(s)...';
 $labels['filecopying'] = 'Copiando archivo(s)...';
 $labels['filedeleting'] = 'Eliminando archivo(s)...';
@@ -61,32 +78,86 @@
 $labels['filecopynotice'] = 'Archivo(s) copiados exitosamente.';
 $labels['uploadsizeerror'] = 'Ha excedido el tamaño máximo de archivo ($size)';
 $labels['listpermanent'] = 'Listar permanentemente';
+$labels['additionalfolders'] = 'Carpetas adicionales';
 $labels['allfolders'] = 'buscar en todas las carpetas';
 $labels['fileskip'] = 'Omitir';
 $labels['fileskipall'] = 'Omitir todo';
 $labels['fileoverwrite'] = 'Sobreescribir';
 $labels['fileoverwriteall'] = 'Sobreescribir todo';
 $labels['filemoveconfirm'] = 'Esta acción sobreescribirá el archivo de destino: <b>$file</b>';
+$labels['editfiledialog'] = 'Confirmar la acción de edición';
+$labels['editfilesessions'] = 'Hay sesiones activas para el archivo seleccionado. Por favor, seleccione la acción que quiere realizar.';
+$labels['newsession'] = 'Crear una nueva sesión';
+$labels['newsessionro'] = 'Crear una nueva sesión (copiar el archivo en una ubicación de sólo lectura)';
+$labels['ownedsession'] = 'Continuar con la sesión existente';
+$labels['invitedsession'] = 'Unirse a la sesión de $user';
+$labels['joinsession'] = 'Requerir una invitación de $user';
+$labels['editfilero'] = 'Este archivo es de sólo lectura. Confirme que quiere crear y editar una copia del archivo.';
+$labels['editfilerotitle'] = 'Archivo de sólo lectura';
 $labels['select'] = 'Seleccionar';
+$labels['terminatesession'] = 'Terminar la sesión';
+$labels['sessionterminatedtitle'] = 'Sesión terminada';
+$labels['sessionterminated'] = 'La sesión ha sido terminada. La ventana será cerrada.';
+$labels['terminate'] = 'Terminar';
+$labels['sessionterminating'] = 'Terminando la sesión...';
+$labels['unsavedchanges'] = 'Hay cambios sin guardad en el documento que serán perdidos. ¿Desea terminar la sesión de todos modos?';
+$labels['manageeditors'] = 'Invitar al documento';
 $labels['participant'] = 'Participante';
 $labels['status'] = 'Estado';
 $labels['addparticipant'] = 'Agregar participante';
+$labels['delparticipant'] = 'Remover participante';
+$labels['invitationtexttitle'] = 'Este comentario será adjuntado al mensaje de invitación/notificación enviado al participante';
 $labels['invitationtextlabel'] = 'Comentario de la invitación/notificación';
 $labels['statusorganizer'] = 'Organizador';
+$labels['statusinvited'] = 'Invitado';
+$labels['statusaccepted'] = 'Aceptado';
+$labels['statusdeclined'] = 'Rechazado';
+$labels['statusrequested'] = 'Requerido';
+$labels['documentinviting'] = 'Invitando participante(s)...';
+$labels['documentcancelling'] = 'Removiendo participante(s)...';
 $labels['removeparticipant'] = 'Elminiar';
+$labels['invitednotice'] = 'Ha sido invitado a la sesión de edición por $owner.';
+$labels['acceptedownernotice'] = '$owner ha aceptado su requerimiento de unirse a la sesión de edición.';
+$labels['declinedownernotice'] = '$owner rechazó su requerimiento de unirse a la sesión de edición.';
+$labels['acceptednotice'] = '$user ha aceptado su invitación a la sesión de edición.';
+$labels['declinednotice'] = '$user rechazó su invitación a la sesión de edición.';
+$labels['requestednotice'] = '$user ha requerido unirse a la sesión de edición.';
+$labels['sessiondialog'] = 'Sesión de edición del documento';
+$labels['sessiondialogcontent'] = 'Hay una sesión de edición de $file creada por $owner.';
+$labels['more'] = 'Más.';
 $labels['accept'] = 'Aceptar';
+$labels['join'] = 'Unirse a la sesión';
 $labels['decline'] = 'Rechazar';
 $labels['owner'] = 'Propietario';
+$labels['when'] = 'Cuando';
+$labels['file'] = 'Archivo';
 $labels['comment'] = 'Comentario';
+$labels['open'] = 'Abrir';
+$labels['request'] = 'Requerir una invitación';
+$labels['invitationtitle'] = 'Invitación para $file';
+$labels['ivitationaccepting'] = 'Aceptando una invitación...';
+$labels['ivitationdeclining'] = 'Rechazando una invitación...';
+$labels['ivitationrequesting'] = 'Requiriendo una invitación...';
+$labels['storepasswords'] = 'recordar contraseña';
+$labels['storepasswordsdesc'] = 'Las contraseñas almacenadas serán encriptadas. Habilite esto si no desea que se le pida su contraseña con cada ingreso o si quiere que este almacenamiento esté disponible vía WebDAV.';
 $labels['arialabelsearchform'] = 'Formulario de búsqueda de archivos';
 $labels['arialabelquicksearchbox'] = 'Entrada de búsqueda';
 $labels['arialabellistoptions'] = 'Opciones de lista de archivos';
 $labels['arialabelfolderoptions'] = 'Acciones de carpeta';
 $labels['arialabelfileeditform'] = 'Formulario de edición de archivo';
+$labels['arialabelfilecreateform'] = 'Formulario de creación de archivo';
+$labels['arialabelfilelist'] = 'Lista de archivos';
 $labels['arialabelfoldercreateform'] = 'Formulario de creación de carpeta';
+$labels['arialabelfoldereditform'] = 'Formulario de edición de carpeta';
+$labels['arialabelfoldermountform'] = 'Formulario de almacenamiento externo';
+$labels['arialabelfolderauthform'] = 'Formulario de autenticación de almacenamiento externo';
 $labels['arialabelfolderlist'] = 'Selección de carpeta/colección';
 $labels['arialabelfileselectdialog'] = 'Diálogo de selección de archivo';
 $labels['arialabelattachmentoptions'] = 'Opciones para guardar adjunto';
 $labels['arialabelfilesavedialog'] = 'Diálogo de guardado de archivo(s)';
 $labels['arialabelfileprops'] = 'Propiedades del archivo';
 $labels['arialabelfilecontent'] = 'Contenido del archivo';
+$labels['arialabelfileeditdialog'] = 'Dialogo de edición de archivo';
+$labels['type.plain'] = 'Documento de Texto Plano';
+$labels['type.vndoasisopendocumenttext'] = 'Documento de Texto (ODF)';
+$labels['type.html'] = 'Documento HTML';

roundcubemail-plugins-kolab-3.3.tar.gz/plugins/kolab_files/localization/pt_PT.inc Changed

roundcubemail-plugins-kolab-3.3.tar.gz/plugins/kolab_files/localization/zh_CN.inc Changed

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

roundcubemail-plugins-kolab-3.3.tar.gz/plugins/kolab_files/skins/larry/templates/docedit.html Changed

@@ -9,7 +9,7 @@
 
 <roundcube:include file="/includes/header.html" />
 
-<div id="mainscreen" class="manticore">
+<div id="mainscreen" class="<roundcube:var name="env:editor_type" />">
 
 <h1 class="voice"><roundcube:label name="kolab_files.docedit" /></h1>
 
@@ -23,13 +23,14 @@
         <roundcube:button command="document-export" type="link" class="button export disabled" classAct="button export" classSel="button export pressed" label="kolab_files.get" title="kolab_files.getfile" />
         <a href="#export" class="dropbuttontip" id="exportmenulink" onclick="UI.toggle_popup('exportmenu',event);return false" aria-haspopup="true" aria-expanded="false" aria-owns="exportmenu-menu" tabindex="0">Export options</a>
     </span>
-
+<roundcube:endif />
     <roundcube:button command="document-save" type="link" class="button save disabled" classAct="button save" classSel="button save pressed" label="kolab_files.save" title="kolab_files.savefile" />
+<roundcube:if condition="env:editor_type != 'wopi'" />
     <span class="spacer"></span>
     <label for="document-title"><roundcube:label name="kolab_files.documenttitle" />&nbsp;<input id="document-title" type="text" value="" /></label>
+<roundcube:endif />
 </div>
 
 <h2 id="aria-label-collaborators" class="voice"><roundcube:label name="kolab_files.arialabelcollaborators" /></h2>

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

roundcubemail-plugins-kolab-3.3.tar.gz/plugins/kolab_folders/localization/es_AR.inc Changed

roundcubemail-plugins-kolab-3.3.tar.gz/plugins/kolab_folders/localization/pt_PT.inc Changed

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

roundcubemail-plugins-kolab-3.3.tar.gz/plugins/kolab_notes/localization/de_CH.inc Changed

@@ -15,7 +15,48 @@
 $labels['listname'] = 'Name';
 $labels['tabsharing'] = 'Freigabe';
 $labels['abort'] = 'Abbrechen';
-$labels['foldersubscribe'] = 'List permanently';
-$labels['removelist'] = 'Remove from list';
 $labels['removelink'] = 'E-Mail-Referenz entfernen';
 $labels['savingdata'] = 'Speichere...';
+$labels['lists'] = 'Notizbücher';
+$labels['create'] = 'Neue Notiz';
+$labels['createnote'] = 'Neue Notiz erstellen';
+$labels['send'] = 'Senden';
+$labels['sendnote'] = 'Notiz über E-Mail versenden';
+$labels['newnote'] = 'Neue Notiz';
+$labels['notags'] = 'Keine Schlagworte';
+$labels['removetag'] = 'Schlagwort entfernen';
+$labels['now'] = 'Jetzt';
+$labels['sortby'] = 'Sortieren nach';
+$labels['newnotebook'] = 'Neues Notizbuch erstellen';
+$labels['addnotebook'] = 'Notizbuch hinzufügen';
+$labels['editlist'] = 'Notizbuch bearbeiten';
+$labels['discard'] = 'Verwerfen';
+$labels['unsavedchanges'] = 'Nicht gespeicherte Änderungen!';
+$labels['appendnote'] = 'Eine Notiz hinzufügen';
+$labels['editnote'] = 'Notiz bearbeiten';
+$labels['savein'] = 'Speichern in';
+$labels['foldersubscribe'] = 'Permanent anzeigen';
+$labels['findnotebooks'] = 'Suche Notizbücher...';
+$labels['listsearchresults'] = 'Zusätzliche Notizbücher';
+$labels['nrnotebooksfound'] = '$nr Notizbücher gefunden';
+$labels['nonotebooksfound'] = 'Keine Notizbücher gefunden';
+$labels['removelist'] = 'Von der Liste entfernen';
+$labels['recordnotfound'] = 'Eintrag nicht gefunden';
+$labels['norecordsfound'] = 'Keine Notizen gefunden';
+$labels['nochanges'] = 'Keine Änderungen werden gespeichert';
+$labels['entertitle'] = 'Bitte geben Sie einen Titel für diese Notiz ein!';
+$labels['deletenotesconfirm'] = 'Willst du wirklich die ausgewählten Notizen löschen?';
+$labels['deletenotebookconfirm'] = 'Willst du wirklich die ausgewählten Notizbücher löschen? Diese Aktion kann nicht rückgängig gemacht werden.';
+$labels['discardunsavedchanges'] = 'Die aktuelle Notiz wurde noch nicht gespeichert. Die Änderungen verwerfen?';
+$labels['invalidlistproperties'] = 'Ungültige Notizbuch Eigenschaften! Bitte gebe einen gültigen Namen ein.';
+$labels['entertitle'] = 'Bitte geben Sie einen Titel für diese Notiz ein!';
+$labels['aclnorights'] = 'Dir fehlen die Administrationsrechte für dieses Notizbuch.';
+$labels['arialabelnoteslist'] = 'Notizliste';
+$labels['arialabelnotesearchform'] = 'Notizen-Suchmaske';
+$labels['arialabelnotesquicksearchbox'] = 'Notiz-Sucheingabe';
+$labels['arialabelnotessortmenu'] = 'Sortieroptionen für Notizen';
+$labels['arialabelnotesoptionsmenu'] = 'Notizbuch Aktionsmenü';
+$labels['arialabelnotebookform'] = 'Notizbucheigenschaften';
+$labels['arialabelmessagereferences'] = 'Verknüpfte E-Mail-Mitteilungen';
+$labels['arialabelfolderearchform'] = 'Notizbücher-Suchmaske';
+$labels['arialabelnoteform'] = 'Notizbearbeitungsmaske';

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

roundcubemail-plugins-kolab-3.3.tar.gz/plugins/kolab_notes/localization/es_AR.inc Changed

roundcubemail-plugins-kolab-3.3.tar.gz/plugins/kolab_notes/localization/ru_RU.inc Changed

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

@@ -521,8 +521,7 @@
                 // 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 (!?)
+                $dialog.dialog('option', { height: Math.min(h-20, form.height()+130), width: Math.min(w-20, form.width()+50) });
 
                 name = $('#noteslist-name').prop('disabled', !has_permission(list, 'a')).val(list.editname || list.name);
                 name.select();
@@ -1234,7 +1233,7 @@
                 }
             }
 
-            $(printwin).load(function(){
+            $(printwin).on('load', function() {
                 printwin.document.title = data.title;
                 $('#notetitle', printwin.document).html(Q(data.title));
                 $('#notebody',  printwin.document).html(data.description);

roundcubemail-plugins-kolab-3.3.tar.gz/plugins/kolab_tags/localization/de_CH.inc Changed

@@ -13,3 +13,21 @@
 $labels['tagname'] = 'Name';
 $labels['tagcolor'] = 'Farbe';
 $labels['saving'] = 'Speichere...';
+$labels['unset'] = 'Alle abwählen';
+$labels['manage'] = 'Schlagworte verwalten...';
+$labels['tagactions'] = 'Schlagwort Aktion...';
+$labels['tagadd'] = 'Vergebe Schlagwort...';
+$labels['tagremove'] = 'Entferne Schlagwort..';
+$labels['untag'] = 'Entferne Schlagwort';
+$labels['tagremoveall'] = 'Entferne alle Schlagworte';
+$labels['nameempty'] = 'Schlagwort kann nicht leer sein!';
+$labels['nameexists'] = 'Das Schlagwort existiert bereits';
+$labels['colorinvalid'] = 'Ungültige Farbangabe';
+$labels['updatesuccess'] = 'Schlagworte wurden erfolgreich aktualisiert.';
+$labels['updateerror'] = 'Schlagworte konnten nicht aktualisiert werden.';
+$labels['taggingsuccess'] = 'Schlagwort wurde erfolgreich zugewiesen.';
+$labels['taggingerror'] = 'Konnte Schlagwort nicht zuweisen.';
+$labels['untaggingsuccess'] = 'Schlagwort(e) wurden erfolgreich entfernt.';
+$labels['untaggingerror'] = 'Schlagwort konnte nicht entfernt werden.';
+$labels['newtag'] = 'Neues Schlagwort';
+$labels['tagsearchnew'] = 'Text eingeben zur Suche oder für die Anlage eines neuen Schlagworts';

roundcubemail-plugins-kolab-3.3.tar.gz/plugins/kolab_tags/localization/de_DE.inc Changed

roundcubemail-plugins-kolab-3.3.tar.gz/plugins/kolab_tags/localization/es_AR.inc Changed

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

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

@@ -1004,6 +1004,37 @@
 
 //////  static methods
 
+// render HTML code for displaying an attendee record
+rcube_libcalendaring.attendee_html = function(data)
+{
+    var name, tooltip = '', context = 'libcalendaring',
+        dispname = data.name || data.email,
+        status = data.role == 'ORGANIZER' ? 'ORGANIZER' : data.status;
+
+    if (status)
+        status = status.toLowerCase();
+
+    if (data.email) {
+        tooltip = data.email;
+        name = $('<a>').attr({href: 'mailto:' + data.email, 'class': 'mailtolink', 'data-cutype': data.cutype})
+
+        if (status)
+            tooltip += ' (' + rcmail.gettext('status' + status, context) + ')';
+    }
+    else {
+        name = $('<span>');
+    }
+
+    if (data['delegated-to'])
+        tooltip = rcmail.gettext('delegatedto', context) + data['delegated-to'];
+    else if (data['delegated-from'])
+        tooltip = rcmail.gettext('delegatedfrom', context) + data['delegated-from'];
+
+    return $('<span>').append(
+            $('<span>').attr({'class': 'attendee ' + status, title: tooltip}).append(name.text(dispname))
+        ).html();
+};
+
 /**
  *
  */

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

@@ -59,7 +59,6 @@
     );
 
     private static $instance;
-    private static $email_regex = '/([a-z0-9][a-z0-9\-\.\+\_]*@[^&@"\'.][^@&"\']*\\.([^\\x00-\\x40\\x5b-\\x60\\x7b-\\x7f]{2,}|xn--[a-z0-9]{2,}))/';
 
     private $mail_ical_parser;
 
@@ -131,6 +130,14 @@
             $this->rc->output->set_env('libcal_settings', $this->load_settings());
             $this->include_script('libcalendaring.js');
             $this->include_stylesheet($this->local_skin_path() . '/libcal.css');
+
+            $this->rc->output->add_label(
+                'libcalendaring.itipaccepted', 'libcalendaring.itiptentative', 'libcalendaring.itipdeclined',
+                'libcalendaring.itipdelegated', 'libcalendaring.expandattendeegroup', 'libcalendaring.expandattendeegroupnodata',
+                'libcalendaring.statusorganizer', 'libcalendaring.statusaccepted', 'libcalendaring.statusdeclined',
+                'libcalendaring.statusdelegated', 'libcalendaring.statusunknown', 'libcalendaring.statusneeds-action',
+                'libcalendaring.statustentative', 'libcalendaring.statuscompleted', 'libcalendaring.statusin-process'
+            );
         }
 
         if ($args['task'] == 'mail') {
@@ -1356,13 +1363,16 @@
                     $this->mail_ical_parser->mime_id = $mime_id;
 
                     // store the message's sender address for comparisons
-                    $this->mail_ical_parser->sender = preg_match(self::$email_regex, $this->ical_message->headers->from, $m) ? $m[1] : '';
+                    $from = rcube_mime::decode_address_list($this->ical_message->headers->from, 1, true, null, true);
+                    $this->mail_ical_parser->sender = !empty($from) ? $from[1] : '';
+
                     if (!empty($this->mail_ical_parser->sender)) {
                         foreach ($this->mail_ical_parser->objects as $i => $object) {
                             $this->mail_ical_parser->objects[$i]['_sender'] = $this->mail_ical_parser->sender;
                             $this->mail_ical_parser->objects[$i]['_sender_utf'] = rcube_utils::idn_to_utf8($this->mail_ical_parser->sender);
                         }
                     }
+
                     break;
                 }
             }
@@ -1411,7 +1421,8 @@
                 $object['_method'] = $parser->method;
 
             // store the message's sender address for comparisons
-            $object['_sender'] = preg_match(self::$email_regex, $headers->from, $m) ? $m[1] : '';
+            $from = rcube_mime::decode_address_list($headers->from, 1, true, null, true);
+            $object['_sender'] = !empty($from) ? $from[1] : '';
             $object['_sender_utf'] = rcube_utils::idn_to_utf8($object['_sender']);
 
             // check if this is an instance of a recurring event/task
@@ -1554,43 +1565,61 @@
      * Merge attendees of the old and new event version
      * with keeping current user and his delegatees status
      *
-     * @param array &$new New object data
-     * @param array $old  Old object data
+     * @param array &$new   New object data
+     * @param array $old    Old object data
+     * @param bool  $status New status of the current user
      */
-    public function merge_attendees(&$new, $old)
+    public function merge_attendees(&$new, $old, $status = null)
     {
-        $emails    = $this->get_user_emails();
-        $delegates = array();
-        $attendees = array();
+        if (empty($status)) {
+            $emails    = $this->get_user_emails();
+            $delegates = array();
+            $attendees = array();
+
+            // keep attendee status of the current user
+            foreach ((array) $new['attendees'] as $i => $attendee) {
+                if (empty($attendee['email'])) {
+                    continue;
+                }
 
-        // keep attendee status of the current user
-        foreach ((array) $new['attendees'] as $i => $attendee) {
-            if (empty($attendee['email'])) {
-                continue;
-            }
+                $attendees[] = $email = strtolower($attendee['email']);
 
-            $attendees[] = $email = strtolower($attendee['email']);
+                if (in_array($email, $emails)) {
+                    foreach ($old['attendees'] as $_attendee) {
+                        if ($attendee['email'] == $_attendee['email']) {
+                            $new['attendees'][$i] = $_attendee;
+                            if ($_attendee['status'] == 'DELEGATED' && ($email = $_attendee['delegated-to'])) {
+                                $delegates[] = strtolower($email);
+                            }
 
-            if (in_array($email, $emails)) {
-                foreach ($old['attendees'] as $_attendee) {
-                    if ($attendee['email'] == $_attendee['email']) {
-                        $new['attendees'][$i] = $_attendee;
-                        if ($_attendee['status'] == 'DELEGATED' && ($email = $_attendee['delegated-to'])) {
-                            $delegates[] = strtolower($email);
+                            break;
                         }
+                    }
+                }
+            }
 
-                        break;
+            // make sure delegated attendee is not lost
+            foreach ($delegates as $delegatee) {
+                if (!in_array($delegatee, $attendees)) {
+                    foreach ((array) $old['attendees'] as $attendee) {
+                        if ($attendee['email'] && ($email = strtolower($attendee['email'])) && $email == $delegatee) {
+                            $new['attendees'][] = $attendee;
+                            break;
+                        }
                     }
                 }
             }
         }
 
-        // make sure delegated attendee is not lost
-        foreach ($delegates as $delegatee) {
-            if (!in_array($delegatee, $attendees)) {
-                foreach ((array) $old['attendees'] as $attendee) {
-                    if ($attendee['email'] && ($email = strtolower($attendee['email'])) && $email == $delegatee) {
-                        $new['attendees'][] = $attendee;
+        // We also make sure that status of any attendee
+        // is not overriden by NEEDS-ACTION if it was already set
+        // which could happen if you work with shared events
+        foreach ((array) $new['attendees'] as $i => $attendee) {
+            if ($attendee['email'] && $attendee['status'] == 'NEEDS-ACTION') {
+                foreach ($old['attendees'] as $_attendee) {
+                    if ($attendee['email'] == $_attendee['email']) {
+                        $new['attendees'][$i]['status'] = $_attendee['status'];
+                        unset($new['attendees'][$i]['rsvp']);
                         break;
                     }
                 }

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

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

roundcubemail-plugins-kolab-3.3.tar.gz/plugins/libcalendaring/localization/ca_ES.inc Changed

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

roundcubemail-plugins-kolab-3.3.tar.gz/plugins/libcalendaring/localization/da_DK.inc Changed

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

@@ -10,16 +10,32 @@
 $labels['at'] = 'um';
 $labels['alarmemail'] = 'E-Mail senden';
 $labels['alarmdisplay'] = 'Nachricht anzeigen';
+$labels['alarmaudio'] = 'Audio abspielen';
 $labels['alarmdisplayoption'] = 'Nachricht';
 $labels['alarmemailoption'] = 'E-Mail';
+$labels['alarmaudiooption'] = 'Audio';
 $labels['alarmat'] = 'um $datetime';
-$labels['trigger@'] = 'genau um';
+$labels['trigger@'] = 'genau am';
 $labels['trigger-M'] = 'Minuten davor';
 $labels['trigger-H'] = 'Stunden davor';
 $labels['trigger-D'] = 'Tage davor';
 $labels['trigger+M'] = 'Minuten danach';
 $labels['trigger+H'] = 'Stunden danach';
 $labels['trigger+D'] = 'Tage danach';
+$labels['triggerend-M'] = 'Minuten vor dem Ende';
+$labels['triggerend-H'] = 'Stunden vor dem Ende';
+$labels['triggerend-D'] = 'Tage vor dem Ende';
+$labels['triggerend+M'] = 'Minuten nach dem Ende';
+$labels['triggerend+H'] = 'Stunden nach dem Ende';
+$labels['triggerend+D'] = 'Tage nach dem Ende';
+$labels['trigger0'] = 'um exakt';
+$labels['triggerattime'] = 'zur Startzeit';
+$labels['triggerattimeend'] = 'zur Endzeit';
+$labels['relatedstart'] = 'Beginn';
+$labels['relatedendevent'] = 'Ende';
+$labels['relatedendtask'] = 'Frist';
+$labels['addalarm'] = 'Erinnerung hinzufügen';
+$labels['removealarm'] = 'Erinnerung entfernen';
 $labels['alarmtitle'] = 'Anstehende Termine';
 $labels['dismissall'] = 'Alle ignorieren';
 $labels['dismiss'] = 'Ignorieren';
@@ -30,13 +46,14 @@
 $labels['repeattomorrow'] = 'Wiederholung morgen';
 $labels['repeatinweek'] = 'Wiederholung in einer Woche';
 $labels['showmore'] = 'Mehr anzeigen...';
+$labels['recurring'] = 'Wiederholungen';
 $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['rdate'] = 'genau um';
 $labels['every'] = 'Alle';
 $labels['days'] = 'Tag(e)';
 $labels['weeks'] = 'Woche(n)';
@@ -49,6 +66,7 @@
 $labels['onsamedate'] = 'Am gleichen Tag';
 $labels['forever'] = 'unendlich';
 $labels['recurrencend'] = 'bis';
+$labels['untilenddate'] = 'bis am';
 $labels['forntimes'] = '$nr Wiederholungen';
 $labels['first'] = 'erster';
 $labels['second'] = 'zweiter';
@@ -57,6 +75,16 @@
 $labels['last'] = 'letzter';
 $labels['dayofmonth'] = 'Tag des Montats';
 $labels['addrdate'] = 'Datum hinzufügen';
+$labels['except'] = 'ausser';
+$labels['statusorganizer'] = 'Organisator';
+$labels['statusaccepted'] = 'Akzeptiert';
+$labels['statustentative'] = 'Mit Vorbehalt';
+$labels['statusdeclined'] = 'Abgelehnt';
+$labels['statusdelegated'] = 'Delegiert';
+$labels['statusneeds-action'] = 'Braucht Aktion';
+$labels['statusunknown'] = 'Unbekannt';
+$labels['statuscompleted'] = 'Abgeschlossen';
+$labels['statusin-process'] = 'In Bearbeitung';
 $labels['itipinvitation'] = 'Einladung zu';
 $labels['itipupdate'] = 'Aktialisiert:';
 $labels['itipcancellation'] = 'Abgesagt:';
@@ -65,17 +93,67 @@
 $labels['itiptentative'] = 'Mit Vorbehalt';
 $labels['itipdeclined'] = 'Ablehnen';
 $labels['itipdelegated'] = 'Vertreter';
+$labels['itipneeds-action'] = 'Aufschieben';
+$labels['itipcomment'] = 'Ihre Antwort';
+$labels['itipeditresponse'] = 'Antwort eingeben';
+$labels['itipsendercomment'] = 'Kommentar des Absenders:';
+$labels['itipsuppressreply'] = 'Keine Antwort senden';
+$labels['itipobjectnotfound'] = 'Das Objekt auf welches sich diese Nachricht bezieht, wurde in Ihrem Konto nicht gefunden.';
 $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['itipsubjectin-process'] = '"$title" ist nun in Bearbeitung von $name';
+$labels['itipsubjectcompleted'] = '"$title" wurde vom $name fertiggestellt';
+$labels['itipsubjectcancel'] = 'Ihre Teilnahme in "$title" wurde aufgehoben';
+$labels['itipsubjectdelegated'] = '"$title" wurde durch $name delegiert';
+$labels['itipsubjectdelegatedto'] = '"$title" wurde durch $name an Sie delegiert';
+$labels['itipnewattendee'] = 'Dies ist eine Antwort von einem neuen Teilnehmer';
 $labels['updateattendeestatus'] = 'Teilnehmerstatus aktualisieren';
 $labels['acceptinvitation'] = 'Möchten Sie die Einladung zu diesem Termin annehmen?';
+$labels['acceptattendee'] = 'Teilnehmer akzeptieren';
+$labels['declineattendee'] = 'Teilnehmer ablehnen';
+$labels['declineattendeeconfirm'] = 'Nachricht an den abgelehnten Teilnehmer verfassen (optional):';
+$labels['rsvpmodeall'] = 'Die gesamte Reihe';
+$labels['rsvpmodecurrent'] = 'Nur dieses Ereignis';
+$labels['rsvpmodefuture'] = 'Dieses und zukünftige Ereignisse';
+$labels['itipsingleoccurrence'] = 'Dieses ist eine <em>einzelne Wiederholung</emaußerhalb einer Serie von Ereignissen';
+$labels['itipfutureoccurrence'] = 'Bezieht sich auf <em>diese and alle zukünftigen Wiederholungen</emeiner Serie von Ereignissen';
+$labels['itipmessagesingleoccurrence'] = 'Diese Nachricht bezieht sich nur auf eine einzelne Wiederholung';
+$labels['itipmessagefutureoccurrence'] = 'Diese Nachricht bezieht sich auf diese und alle zukünftigen Wiederholungen';
 $labels['youhaveaccepted'] = 'Sie haben die Einladung angenommen';
 $labels['youhavetentative'] = 'Sie haben die Einladung mit Vorbehalt angenommen';
 $labels['youhavedeclined'] = 'Sie haben die Einladung abgelehnt';
+$labels['youhavedelegated'] = 'Sie haben diese Einladung abgelehnt';
+$labels['youhavein-process'] = 'Sie arbeiten an dieser Aufgabe';
+$labels['youhavecompleted'] = 'Sie haben diese Aufgabe erledigt';
+$labels['youhaveneeds-action'] = 'Ihre Antwort auf diese Einladung ist noch ausstehend';
+$labels['youhavepreviouslyaccepted'] = 'Sie haben diese Einladung zuvor angenommen';
+$labels['youhavepreviouslytentative'] = 'Sie haben diese Einladung zuvor mit Vorbehalt angenommen';
+$labels['youhavepreviouslydeclined'] = 'Sie haben diese Einladung zuvor abgelehnt';
+$labels['youhavepreviouslydelegated'] = 'Sie haben diese Einladung zuvor delegiert';
+$labels['youhavepreviouslyin-process'] = 'Sie haben diese Aufgabe zuvor als In Bearbeitung gemeldet';
+$labels['youhavepreviouslycompleted'] = 'Sie haben diese Einladung zuvor erledigt';
+$labels['youhavepreviouslyneeds-action'] = 'Ihre Antwort auf diese Einladung ist noch ausstehend';
+$labels['attendeeaccepted'] = 'Teilnehmer hat akzeptiert';
+$labels['attendeetentative'] = 'Teilnehmer hat mit Vorbehalt akzeptiert';
+$labels['attendeedeclined'] = 'Teilnehmer hat abgelehnt';
+$labels['attendeedelegated'] = 'Teilnehmer hat an $delegatedto delegiert';
+$labels['attendeein-process'] = 'Teilnehmer arbeitet an dieser Aufgabe';
+$labels['attendeecompleted'] = 'Teilnehmer hat die Aufgabe erledigt';
 $labels['notanattendee'] = 'Sie sind nicht in der Liste der Teilnehmer aufgeführt';
+$labels['outdatedinvitation'] = 'Diese Einladung wurde durch eine neuere Version ersetzt';
 $labels['importtocalendar'] = 'In Kalender übernehmen';
 $labels['removefromcalendar'] = 'Aus meinem Kalender löschen';
+$labels['updatemycopy'] = 'Meine Kopie aktualisieren';
+$labels['openpreview'] = 'Vorschau öffnen';
 $labels['deleteobjectconfirm'] = 'Möchten Sie dieses Objekt wirklich löschen?';
 $labels['declinedeleteconfirm'] = 'Soll das abgelehnte Objekt ebenfalls aus Ihrem Konto gelöscht werden?';
+$labels['delegateinvitation'] = 'Einladung delegieren';
+$labels['delegateto'] = 'Delegieren an';
+$labels['delegatersvpme'] = 'Informiere mich über Aktualisierungen dieses Termins';
+$labels['delegateinvalidaddress'] = 'Geben Sie eine gültige E-Mail-Adresse für den Delegierten ein';
 $labels['savingdata'] = 'Speichere...';
+$labels['expandattendeegroup'] = 'Mit Gruppenmitgliedern ersetzen';
+$labels['expandattendeegroupnodata'] = 'Diese Gruppe konnte nicht ersetzt werden. Keine Gruppenmitglieder gefunden.';
+$labels['expandattendeegrouperror'] = 'Diese Gruppe konnte nicht ersetzt werden. Sie hat möglicherweise zuviele Mitglieder.';
+$labels['expandattendeegroupsizelimit'] = 'Die Gruppe hat zuviele Mitglieder und konnte deshalb nicht ersetzt werden.';

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

@@ -15,7 +15,7 @@
 $labels['alarmemailoption'] = 'E-Mail';
 $labels['alarmaudiooption'] = 'Audio';
 $labels['alarmat'] = 'um $datetime';
-$labels['trigger@'] = 'genau um';
+$labels['trigger@'] = 'genau am';
 $labels['trigger-M'] = 'Minuten davor';
 $labels['trigger-H'] = 'Stunden davor';
 $labels['trigger-D'] = 'Tage davor';
@@ -29,6 +29,8 @@
 $labels['triggerend+H'] = 'Stunden nach dem Ende';
 $labels['triggerend+D'] = 'Tage nach dem Ende';
 $labels['trigger0'] = 'um exakt';
+$labels['triggerattime'] = 'zur Startzeit';
+$labels['triggerattimeend'] = 'zur Endzeit';
 $labels['relatedstart'] = 'Beginn';
 $labels['relatedendevent'] = 'Ende';
 $labels['relatedendtask'] = 'Frist';
@@ -51,7 +53,7 @@
 $labels['weekly'] = 'wöchentlich';
 $labels['monthly'] = 'monatlich';
 $labels['yearly'] = 'jährlich';
-$labels['rdate'] = 'genau um';
+$labels['rdate'] = 'genau am';
 $labels['every'] = 'Alle';
 $labels['days'] = 'Tag(e)';
 $labels['weeks'] = 'Woche(n)';
@@ -74,6 +76,15 @@
 $labels['dayofmonth'] = 'Tag des Montats';
 $labels['addrdate'] = 'Datum hinzufügen';
 $labels['except'] = 'ausser';
+$labels['statusorganizer'] = 'Organisator';
+$labels['statusaccepted'] = 'Akzeptiert';
+$labels['statustentative'] = 'Mit Vorbehalt';
+$labels['statusdeclined'] = 'Abgelehnt';
+$labels['statusdelegated'] = 'Delegiert';
+$labels['statusneeds-action'] = 'Braucht Aktion';
+$labels['statusunknown'] = 'Unbekannt';
+$labels['statuscompleted'] = 'Abgeschlossen';
+$labels['statusin-process'] = 'In Bearbeitung';
 $labels['itipinvitation'] = 'Einladung zu';
 $labels['itipupdate'] = 'Aktialisiert:';
 $labels['itipcancellation'] = 'Abgesagt:';
@@ -105,7 +116,7 @@
 $labels['rsvpmodeall'] = 'Die gesamte Reihe';
 $labels['rsvpmodecurrent'] = 'Nur dieses Ereignis';
 $labels['rsvpmodefuture'] = 'Dieses und zukünftige Ereignisse';
-$labels['itipsingleoccurrence'] = 'Dieses ist eine <em>einzelne Wiederholung</em> außerhalb einer Serie von Ereignissen';
+$labels['itipsingleoccurrence'] = 'Dieses ist eine <em>einzelne Wiederholung</em> einer Serie von Ereignissen';
 $labels['itipfutureoccurrence'] = 'Bezieht sich auf <em>diese and alle zukünftigen Wiederholungen</em> einer Serie von Ereignissen';
 $labels['itipmessagesingleoccurrence'] = 'Diese Nachricht bezieht sich nur auf eine einzelne Wiederholung';
 $labels['itipmessagefutureoccurrence'] = 'Diese Nachricht bezieht sich auf diese und alle zukünftigen Wiederholungen';

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

roundcubemail-plugins-kolab-3.3.tar.gz/plugins/libcalendaring/localization/es_AR.inc Changed

@@ -22,6 +22,18 @@
 $labels['trigger+M'] = 'minutos después';
 $labels['trigger+H'] = 'horas después';
 $labels['trigger+D'] = 'días después';
+$labels['triggerend-M'] = 'minutos antes de finalizar';
+$labels['triggerend-H'] = 'horas antes de finalizar';
+$labels['triggerend-D'] = 'días antes de finalizar';
+$labels['triggerend+M'] = 'minutos después de finalizar';
+$labels['triggerend+H'] = 'horas después de finalizar';
+$labels['triggerend+D'] = 'días despues de finalizar';
+$labels['trigger0'] = 'en hora';
+$labels['triggerattime'] = 'en hora de inicio';
+$labels['triggerattimeend'] = 'en hora de finalización';
+$labels['relatedstart'] = 'inicio';
+$labels['relatedendevent'] = 'fin';
+$labels['relatedendtask'] = 'fecha de vencimiento';
 $labels['addalarm'] = 'Agregar alarma';
 $labels['removealarm'] = 'Eliminar alarma';
 $labels['alarmtitle'] = 'Eventos próximos';
@@ -34,6 +46,7 @@
 $labels['repeattomorrow'] = 'Repetir mañana';
 $labels['repeatinweek'] = 'Repetir en una semana';
 $labels['showmore'] = 'Mostrar más...';
+$labels['recurring'] = 'Repite';
 $labels['frequency'] = 'Repetir';
 $labels['never'] = 'nunca';
 $labels['daily'] = 'diariamente';
@@ -63,6 +76,14 @@
 $labels['dayofmonth'] = 'Día del mes';
 $labels['addrdate'] = 'Agregar fecha de repetición';
 $labels['except'] = 'excepto';
+$labels['statusorganizer'] = 'Organizador';
+$labels['statusaccepted'] = 'Aceptado';
+$labels['statustentative'] = 'Tentativo';
+$labels['statusdeclined'] = 'Rechazado';
+$labels['statusneeds-action'] = 'Necesita acción';
+$labels['statusunknown'] = 'Desconocido';
+$labels['statuscompleted'] = 'Completo';
+$labels['statusin-process'] = 'En proceso';
 $labels['itipinvitation'] = 'Invitación a';
 $labels['itipupdate'] = 'Actualizar de';
 $labels['itipcancellation'] = 'Cancelado:';
@@ -83,12 +104,21 @@
 $labels['itipsubjectin-process'] = '"$title" está en proceso por $name';
 $labels['itipsubjectcompleted'] = '"$title" fue completado por $name';
 $labels['itipsubjectcancel'] = 'Su participación en "$title" ha sido cancelada';
+$labels['itipsubjectdelegated'] = '"$title" ha sido delegado por $name';
+$labels['itipsubjectdelegatedto'] = '"$title" ha sido delegado a usted por $name';
 $labels['itipnewattendee'] = 'Esta es una respuesta de un nuevo participante';
 $labels['updateattendeestatus'] = 'Actualizar el estado del participante';
 $labels['acceptinvitation'] = '¿Acepta esta invitación?';
 $labels['acceptattendee'] = 'Aceptar participante';
 $labels['declineattendee'] = 'Rechazar participante';
 $labels['declineattendeeconfirm'] = 'Ingresar un mensaje para el participante rechazado (opcional):';
+$labels['rsvpmodeall'] = 'La serie completa';
+$labels['rsvpmodecurrent'] = 'Esta ocurrencia sola';
+$labels['rsvpmodefuture'] = 'Esta y futuras ocurrencias';
+$labels['itipsingleoccurrence'] = 'Esta es una <em>ocurrencia individual</em> de una serie de eventos';
+$labels['itipfutureoccurrence'] = 'Refiere a <em>esta y todas las futuras ocurrencias</em> de una serie de eventos';
+$labels['itipmessagesingleoccurrence'] = 'El mensaje solamente refiere a esta ocurrencia individual';
+$labels['itipmessagefutureoccurrence'] = 'El mensaje refiere a esta y todas las futuras ocurrencias';
 $labels['youhaveaccepted'] = 'Ha aceptado esta invitación';
 $labels['youhavetentative'] = 'Ha aceptado tentativamente esta invitación';
 $labels['youhavedeclined'] = 'Ha rechazado esta invitación';
@@ -117,6 +147,10 @@
 $labels['openpreview'] = 'Abrir Vista Preliminar';
 $labels['deleteobjectconfirm'] = 'Confirme que desea eliminar este objeto';
 $labels['declinedeleteconfirm'] = '¿Quiere también eliminar este objeto rechazado de su cuenta?';
+$labels['delegateinvitation'] = 'Delegar Invitación';
+$labels['delegateto'] = 'Delegar a';
+$labels['delegatersvpme'] = 'Mantenerme informado acerca de las actualizaciones de esta incidencia';
+$labels['delegateinvalidaddress'] = 'Por favor, ingrese una dirección de correo electrónico válida para la delegación';
 $labels['savingdata'] = 'Guardando...';
 $labels['expandattendeegroup'] = 'Sustituir con miembros del grupo';
 $labels['expandattendeegroupnodata'] = 'No se puede sustituir este grupo. No se encontraron miembros.';

roundcubemail-plugins-kolab-3.3.tar.gz/plugins/libcalendaring/localization/es_ES.inc Changed

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

roundcubemail-plugins-kolab-3.3.tar.gz/plugins/libcalendaring/localization/fi_FI.inc Changed

@@ -61,6 +61,14 @@
 $labels['dayofmonth'] = 'Kuukaudenpäivä';
 $labels['addrdate'] = 'Lisää toiston pvm';
 $labels['except'] = 'paitsi';
+$labels['statusorganizer'] = 'Järjestäjä';
+$labels['statusaccepted'] = 'Hyväksytty';
+$labels['statustentative'] = 'Alustava';
+$labels['statusdeclined'] = 'Kieltäydytty';
+$labels['statusneeds-action'] = 'Vaatii toimenpiteitä';
+$labels['statusunknown'] = 'Tuntematon';
+$labels['statuscompleted'] = 'Valmis';
+$labels['statusin-process'] = 'Prosessissa';
 $labels['itipinvitation'] = 'Kutsu';
 $labels['itipupdate'] = 'Päivitys';
 $labels['itipcancellation'] = 'Peruttu:';
@@ -92,6 +100,8 @@
 $labels['rsvpmodeall'] = 'Koko sarja';
 $labels['rsvpmodecurrent'] = 'Vain tämä esiintymä';
 $labels['rsvpmodefuture'] = 'Tämä ja tulevat esiintymät';
+$labels['itipsingleoccurrence'] = 'Tämä on <em>yksittäinen esiintymä</em> tapahtumasarjassa';
+$labels['itipfutureoccurrence'] = 'Viittaa <em>tähän ja kaikkiin tuleviin esiintymiin</em> tapahtumasarjassa';
 $labels['itipmessagesingleoccurrence'] = 'Tämä viesti viittaa vain yhteen esiintymään';
 $labels['itipmessagefutureoccurrence'] = 'Tämä viesti viittaa tähän ja kaikkiin tuleviin esiintymiin';
 $labels['youhaveaccepted'] = 'Olet hyväksynyt tämän kutsun';

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

roundcubemail-plugins-kolab-3.3.tar.gz/plugins/libcalendaring/localization/he_IL.inc Added

roundcubemail-plugins-kolab-3.3.tar.gz/plugins/libcalendaring/localization/hr_HR.inc Changed

roundcubemail-plugins-kolab-3.3.tar.gz/plugins/libcalendaring/localization/hu_HU.inc Changed

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

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

roundcubemail-plugins-kolab-3.3.tar.gz/plugins/libcalendaring/localization/ko_KR.inc Changed

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

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

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

roundcubemail-plugins-kolab-3.3.tar.gz/plugins/libcalendaring/localization/pt_PT.inc Changed

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

@@ -33,7 +33,6 @@
 $labels['triggerattimeend'] = 'в момент окончания';
 $labels['relatedstart'] = 'начало';
 $labels['relatedendevent'] = 'окончание';
-$labels['addalarm'] = 'Добавить уведомление';
 $labels['removealarm'] = 'Удалить уведомление';
 $labels['alarmtitle'] = 'Предстоящие события';
 $labels['dismissall'] = 'Отменить все';
@@ -75,6 +74,12 @@
 $labels['dayofmonth'] = 'День месяца';
 $labels['addrdate'] = 'Add repeat date';
 $labels['except'] = 'исключая';
+$labels['statusorganizer'] = 'Организатор';
+$labels['statustentative'] = 'Неопределённо';
+$labels['statusneeds-action'] = 'Требует действия';
+$labels['statusunknown'] = 'Неизвестно';
+$labels['statuscompleted'] = 'Завершенные';
+$labels['statusin-process'] = 'В процессе';
 $labels['itipinvitation'] = 'Приглашение на';
 $labels['itipupdate'] = 'Обновление';
 $labels['itipcancellation'] = 'Отменённый:';
@@ -100,8 +105,6 @@
 $labels['itipnewattendee'] = 'Это ответ от нового участника';
 $labels['updateattendeestatus'] = 'Обновить статус участника';
 $labels['acceptinvitation'] = 'Вы принимаете это приглашение?';
-$labels['acceptattendee'] = 'Принять участника';
-$labels['declineattendee'] = 'Отказать участнику';
 $labels['declineattendeeconfirm'] = 'Введите сообщение для отклонённого участника (не обязательно):';
 $labels['rsvpmodeall'] = 'Вся серия';
 $labels['rsvpmodecurrent'] = 'Только это событие';
@@ -124,7 +127,6 @@
 $labels['youhavepreviouslyin-process'] = 'Вы уже предоставили отчет о проделанной работе на это задание';
 $labels['youhavepreviouslycompleted'] = 'Вы уже завершили это задание';
 $labels['youhavepreviouslyneeds-action'] = 'Ваш ответ на это приглашение всё ещё ожидается';
-$labels['attendeeaccepted'] = 'Участник принял приглашение';
 $labels['attendeetentative'] = 'Участник предварительно принял приглашение';
 $labels['attendeedeclined'] = 'Участник отказался от приглашения';
 $labels['attendeedelegated'] = 'Участник делегировал приглашение $delegatedto';

roundcubemail-plugins-kolab-3.3.tar.gz/plugins/libcalendaring/localization/sk_SK.inc Added

roundcubemail-plugins-kolab-3.3.tar.gz/plugins/libcalendaring/localization/sl_SI.inc Changed

roundcubemail-plugins-kolab-3.3.tar.gz/plugins/libcalendaring/localization/sv_SE.inc Changed

roundcubemail-plugins-kolab-3.3.tar.gz/plugins/libcalendaring/localization/th_TH.inc Changed

roundcubemail-plugins-kolab-3.3.tar.gz/plugins/libcalendaring/localization/uk_UA.inc Changed

roundcubemail-plugins-kolab-3.3.tar.gz/plugins/libcalendaring/localization/vi_VN.inc Added

roundcubemail-plugins-kolab-3.3.tar.gz/plugins/libcalendaring/localization/zh_CN.inc Changed

roundcubemail-plugins-kolab-3.3.tar.gz/plugins/libcalendaring/localization/zh_TW.inc Changed

roundcubemail-plugins-kolab-3.3.tar.gz/plugins/libkolab/js/audittrail.js Changed

roundcubemail-plugins-kolab-3.3.tar.gz/plugins/libkolab/lib/kolab_date_recurrence.php Changed

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

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

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

roundcubemail-plugins-kolab-3.3.tar.gz/plugins/libkolab/lib/kolab_storage_cache_event.php Changed

roundcubemail-plugins-kolab-3.3.tar.gz/plugins/libkolab/localization/es_AR.inc Changed

roundcubemail-plugins-kolab-3.3.tar.gz/plugins/libkolab/localization/pl_PL.inc Changed

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

@@ -254,19 +254,19 @@
             join(',', $list_ids)
         ));
 
-        $counts = array('all' => 0, 'flagged' => 0, 'today' => 0, 'tomorrow' => 0, 'overdue' => 0, 'nodate' => 0);
+        $counts = array('all' => 0, 'today' => 0, 'tomorrow' => 0, 'overdue' => 0, 'later' => 0);
         while ($result && ($rec = $this->rc->db->fetch_assoc($result))) {
             $counts['all']++;
-            if ($rec['flagged'])
-                $counts['flagged']++;
             if (empty($rec['date']))
-                $counts['nodate']++;
+                $counts['later']++;
             else if ($rec['date'] == $today)
                 $counts['today']++;
             else if ($rec['date'] == $tomorrow)
                 $counts['tomorrow']++;
             else if ($rec['date'] < $today)
                 $counts['overdue']++;
+            else if ($rec['date'] > $tomorrow)
+                $counts['later']++;
         }
 
         return $counts;
@@ -333,7 +333,7 @@
         }
 
         if ($filter['uid']) {
-            $sql_add .= ' AND `uid` IN (' . implode(',', array_map(array($this->rc->db, 'quote'), $filter['uid'])) . ')');
+            $sql_add .= ' AND `uid` IN (' . implode(',', array_map(array($this->rc->db, 'quote'), $filter['uid'])) . ')';
         }
 
         $tasks = array();

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

@@ -507,7 +507,7 @@
         $tomorrow_date = new DateTime('now + 1 day', $this->plugin->timezone);
         $tomorrow      = $tomorrow_date->format('Y-m-d');
 
-        $counts = array('all' => 0, 'flagged' => 0, 'today' => 0, 'tomorrow' => 0, 'overdue' => 0, 'nodate' => 0, 'mytasks' => 0);
+        $counts = array('all' => 0, 'today' => 0, 'tomorrow' => 0, 'later' => 0, 'overdue'  => 0);
 
         foreach ($lists as $list_id) {
             if (!$folder = $this->get_folder($list_id)) {
@@ -521,18 +521,16 @@
                     continue;
 
                 $counts['all']++;
-                if ($rec['flagged'])
-                    $counts['flagged']++;
                 if (empty($rec['date']))
-                    $counts['nodate']++;
+                    $counts['later']++;
                 else if ($rec['date'] == $today)
                     $counts['today']++;
                 else if ($rec['date'] == $tomorrow)
                     $counts['tomorrow']++;
                 else if ($rec['date'] < $today)
                     $counts['overdue']++;
-                if ($this->plugin->is_attendee($rec) !== false)
-                    $counts['mytasks']++;
+                else if ($rec['date'] > $tomorrow)
+                    $counts['later']++;
             }
         }

roundcubemail-plugins-kolab-3.3.tar.gz/plugins/tasklist/helpdocs/locale/de_DE/LC_MESSAGES/index.po Changed

roundcubemail-plugins-kolab-3.3.tar.gz/plugins/tasklist/helpdocs/locale/de_DE/LC_MESSAGES/manage.po Changed

roundcubemail-plugins-kolab-3.3.tar.gz/plugins/tasklist/helpdocs/locale/de_DE/LC_MESSAGES/overview.po Changed

roundcubemail-plugins-kolab-3.3.tar.gz/plugins/tasklist/helpdocs/locale/nl_NL/LC_MESSAGES/index.po Changed

roundcubemail-plugins-kolab-3.3.tar.gz/plugins/tasklist/helpdocs/locale/tr_TR/LC_MESSAGES/index.po Changed

roundcubemail-plugins-kolab-3.3.tar.gz/plugins/tasklist/helpdocs/locale/tr_TR/LC_MESSAGES/manage.po Changed

roundcubemail-plugins-kolab-3.3.tar.gz/plugins/tasklist/helpdocs/locale/tr_TR/LC_MESSAGES/overview.po Changed

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

roundcubemail-plugins-kolab-3.3.tar.gz/plugins/tasklist/localization/ca_ES.inc Changed

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

roundcubemail-plugins-kolab-3.3.tar.gz/plugins/tasklist/localization/da_DK.inc Changed

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

@@ -10,9 +10,9 @@
 $labels['lists'] = 'Aufgabenlisten';
 $labels['list'] = 'Liste';
 $labels['tags'] = 'Tags';
-$labels['tasklistsubscribe'] = 'List permanently';
-$labels['searchterms'] = 'Search terms';
-$labels['removelist'] = 'Remove from list';
+$labels['export'] = 'Exportieren';
+$labels['exporttitle'] = 'Kalender als iCalendar exportieren';
+$labels['exportattachments'] = 'Mit Anhängen';
 $labels['newtask'] = 'Neue Aufgabe';
 $labels['createnewtask'] = 'Neue Aufgabe eingeben (z.B. Samstag, Rasenmähen)';
 $labels['createfrommail'] = 'Als Aufgabe speichern';
@@ -61,7 +61,7 @@
 $labels['createlist'] = 'Neue Liste';
 $labels['listactions'] = 'Listenoptionen...';
 $labels['listname'] = 'Name';
-$labels['showalarms'] = 'Show reminders';
+$labels['showalarms'] = 'Erinnerungen anzeigen';
 $labels['import'] = 'Importieren';
 $labels['on'] = 'am';
 $labels['at'] = 'um';
@@ -84,6 +84,7 @@
 $labels['rolechair'] = 'Chair';
 $labels['sendinvitations'] = 'Einladungen versenden';
 $labels['itipupdatesubject'] = '"$title" wurde aktualisiert';
+$labels['itipcancelsubject'] = '"$title" wurde abgesagt';
 $labels['taskhistory'] = 'Verlauf';
 $labels['objectchangelog'] = 'Änderungsverlauf';
 $labels['objectdiff'] = 'Änderungen aus $rev1 nach $rev2';
@@ -97,3 +98,96 @@
 $labels['comment'] = 'Kommentar';
 $labels['attendeupdateesuccess'] = 'Teilnehmerstatus erfolgreich aktualisiert';
 $labels['itipinvalidrequest'] = 'Diese Einladung ist nicht mehr gültig';
+$labels['currentview'] = 'Aktuelle Ansicht';
+$labels['tasklistsubscribe'] = 'Permanent anzeigen';
+$labels['listsearchresults'] = 'Verfügbare Aufgaben';
+$labels['findlists'] = 'Finde Aufgabenlisten,..';
+$labels['searchterms'] = 'Suchbegriffe';
+$labels['notasklistsfound'] = 'Keine Aufgabenlisten gefunden';
+$labels['nrtasklistsfound'] = '$nr Aufgabenlisten gefunden';
+$labels['removelist'] = 'Von der Liste entfernen';
+$labels['showcaldavurl'] = 'CalDAV URL anzeigen';
+$labels['caldavurldescription'] = 'Kopieren dieser Adresse in eine <a href="http://en.wikipedia.org/wiki/CalDAV" target="_blank">CalDAV</aClient-Anwendung (z.B. Evolution oder Mozilla Thunderbird), um diese spezifische Aufgabenliste mit Ihrem Computer oder Mobilgerät zu synchronisieren.';
+$labels['createtask'] = 'Aufgabe erstellen <Enter>';
+$labels['printtitle'] = 'Aufgaben drucken';
+$labels['datetime'] = 'Fällig';
+$labels['duetime'] = 'Frist';
+$labels['status-needs-action'] = 'Braucht Aktion';
+$labels['status-in-process'] = 'In Bearbeitung';
+$labels['status-completed'] = 'Abgeschlossen';
+$labels['assignedto'] = 'Zugewiesen an';
+$labels['completeness'] = 'Fortschritt';
+$labels['assigned'] = 'Zugewiesen';
+$labels['assignedtitle'] = 'Aufgaben, welche an andere vergeben wurden';
+$labels['mytasks'] = 'Meine Aufgaben';
+$labels['mytaskstitle'] = 'An mich übertragene Aufgaben';
+$labels['auto'] = 'Automatisch';
+$labels['saveandnotify'] = 'Speichern und Benachrichtigen';
+$labels['taskactions'] = 'Aufgabeneinstellungen...';
+$labels['tabassignments'] = 'Zuweisungen';
+$labels['viewactions'] = 'Ansicht-Aktionen';
+$labels['focusview'] = 'Nur diese Liste anzeigen';
+$labels['invalidstartduetimes'] = 'Start- und Enddatum müssen entweder beide oder keins eine Zeit enthalten.';
+$labels['recurrencerequiresdate'] = 'Wiederkehrende Aufgaben erfordern entweder ein Start- oder Enddatum.';
+$labels['deletelistconfirmrecursive'] = 'Soll diese Liste wirklich mit allen Aufgaben und Unterlisten gelöscht werden?';
+$labels['aclnorights'] = 'Der Zugriff auf diese Aufgabenliste erfordert Administrator-Rechte.';
+$labels['changetaskconfirm'] = 'Aufgabe ändern';
+$labels['changeconfirmnotifications'] = 'Wollen Sie die beauftragten Teilnehmer über diese Änderung informieren?';
+$labels['partstatupdatenotification'] = 'Wollen Sie den Organisator über die Statusänderung benachrichtigen?';
+$labels['quickaddinput'] = 'Neue Aufgabe Datum und Titel';
+$labels['arialabelquickaddbox'] = 'Neue Aufgabe schnell hinzufügen';
+$labels['arialabelsearchform'] = 'Suchformular für Aufgaben';
+$labels['arialabelquicksearchbox'] = 'Sucheingabe für Aufgaben';
+$labels['arialabellistsearchform'] = 'Sucheingabe für Aufgabenlisten';
+$labels['arialabeltaskselector'] = 'Listenmodus';
+$labels['arialabeltasklisting'] = 'Aufgabenauflistung';
+$labels['attendee'] = 'Beauftragter';
+$labels['addattendee'] = 'Beauftragten hinzufügen';
+$labels['rolenonparticipant'] = 'Beobachter';
+$labels['sendnotifications'] = 'Beauftragte Teilnehmer über die Änderung informieren';
+$labels['sendcancellation'] = 'Beauftragte Teilnehmer über die Stornierung informieren';
+$labels['invitationsubject'] = 'Ihnen wurde "$title" zugewiesen';
+$labels['invitationmailbody'] = "*\$title*\n\nFällig: \$date\n\nTeilnehmer: \$attendees\n\nAngehängt finden Sie eine iCalendar-Datei mit allen Aufgabendetails, welche in Ihre Aufgabenanwendung importiert werden kann.";
+$labels['itipupdatesubjectempty'] = 'Eine ihrer Aufgabe wurde aktualisiert';
+$labels['itipupdatemailbody'] = "*\$title*\n\nFällig: \$date\n\nTeilnehmer: \$attendees\n\nAngehängt finden Sie eine iCalendar-Datei mit den aktualisierten Aufgabendetails, welche in Ihre Aufgabenanwendung importiert werden kann.";
+$labels['itipcancelmailbody'] = "*\$title*\n\nFällig: \$date\n\nTeilnehmer: \$attendees\n\nDie Aufgabe wurde durch \$organizer storniert.\n\nAngehängt finden Sie eine iCalendar-Datei mit den aktualisierten Aufgabendetails.";
+$labels['saveintasklist'] = 'speichern in';
+$labels['objectnotfound'] = 'Fehler beim Laden der Aufgabendaten';
+$labels['objectchangelognotavailable'] = 'Änderung der Historie ist nicht verfügbar für diese Aufgabe.';
+$labels['revisionrestoreconfirm'] = 'Möchten Sie wirklich die Version $rev dieser Aufgabe wiederherstellen? Dies wird die aktuelle Aufgabe mit der alten Version ersetzen.';
+$labels['itipobjectnotfound'] = 'Die Aufgabe, auf welche sich diese Nachricht bezieht, wurde nicht in Ihrer Aufgabenliste gefunden.';
+$labels['itipmailbodyaccepted'] = "\$sender hat die Zuweisung folgender Aufgabe akzeptiert:\n\n*\$title*\n\nFällig: \$date\n\nVerantwortlich: \$attendees";
+$labels['itipmailbodytentative'] = "\$sender hat die Zuweisung folgender Aufgabe unter Vorbehalt akzeptiert:\n\n*\$title*\n\nFällig: \$date\n\nVerantwortlich: \$attendees";
+$labels['itipmailbodydeclined'] = "\$sender hat die Zuweisung folgender Aufgabe abgeleht:\n\n*\$title*\n\nFällig: \$date\n\nVerantwortlich: \$attendees";
+$labels['itipmailbodycancel'] = "\$sender hat die Zuweisung folgender Aufgabe abgeleht:\n\n*\$title*\n\nFällig: \$date";
+$labels['itipmailbodyin-process'] = "\$sender hat den Status folgender Aufgabe auf in-Bearbeitung gesetzt:\n\n*\$title*\n\nFällig: \$date";
+$labels['itipmailbodycompleted'] = "\$sender hat folgende Aufgabe abgeschlossen:\n\n*\$title*\n\nFällig: \$date";
+$labels['itipmailbodydelegated'] = "\$sender hat folgende Aufgabe delegiert:\n\n*\$title*\n\nFällig: \$date";
+$labels['itipmailbodydelegatedto'] = "\$sender hat folgende Aufgabe an Sie delegiert:\n\n*\$title*\n\nFällig: \$date";
+$labels['attendeeaccepted'] = 'Delegierter hat akzeptiert';
+$labels['attendeetentative'] = 'Delegierter hat unter Vorbehalt akzeptiert';
+$labels['attendeedeclined'] = 'Delegierter hat abgelehnt';
+$labels['attendeedelegated'] = 'Zugewiesener hat zu $delegatedto delegiert';
+$labels['attendeein-process'] = 'Delegierter ist in Bearbeitung ';
+$labels['attendeecompleted'] = 'Delegierter hat abgeschlossen';
+$labels['acceptinvitation'] = 'Akzeptieren Sie die Zuweisung?';
+$labels['itipdeclinetask'] = 'Lehnen Sie to Zuweisung dieser Aufgabe ab';
+$labels['declinedeleteconfirm'] = 'Möchten Sie diese abgelehnete Aufgabe aus Ihrer Aufgabenliste löschen?';
+$labels['itipcommenttitle'] = 'Dieser Kommentar wird der Benachrichtigung an andere Delegierte hinzugefügt';
+$labels['itipsendsuccess'] = 'Benachrichtigung an Delegierte gesendet';
+$labels['errornotifying'] = 'Senden der Benachrichtigung an Delegierte fehlgeschlagen';
+$labels['removefromcalendar'] = 'Aus meinen Aufgaben entfernen';
+$labels['delegateinvitation'] = 'Zuweisung delegieren';
+$labels['savetotasklist'] = 'In den Aufgaben speichern';
+$labels['errorimportingtask'] = 'Fehler beim Importieren der Aufgabe(n)';
+$labels['importwarningexists'] = 'Eine Kopie dieser Aufgabe exisistiert bereits in Ihrer Aufgabenliste';
+$labels['importsuccess'] = '$nr Aufgaben erfolgreich importiert';
+$labels['newerversionexists'] = 'Eine neuere Version dieser Aufgabe existiert bereits! Abbruch.';
+$labels['nowritetasklistfound'] = 'Keine Aufgabenliste zum Speichern der Aufgabe gefunden';
+$labels['importedsuccessfully'] = 'Die Aufgabe wurde erfolgreich unter \'$list\' gespeichert';
+$labels['updatedsuccessfully'] = 'Die Aufgabe wurde erfolgreich in \'$list\' aktualisiert';
+$labels['itipresponseerror'] = 'Senden der Antwort auf diese Aufgabenzuweisung fehlgeschlagen';
+$labels['sentresponseto'] = 'Antwort auf Aufgabenzuweisung erfolgreich an $mailto versendet';
+$labels['successremoval'] = 'Diese Aufgabe wurde erfolgreich gelöscht.';
+$labels['invalidlistproperties'] = 'Ungültige Listeneigenschaften! Bitte einen gültigen Namen eingeben.';
+$labels['arialabelsortmenu'] = 'Aufgaben-Sortierungsoptionen';

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

@@ -10,6 +10,10 @@
 $labels['lists'] = 'Aufgabenlisten';
 $labels['list'] = 'Aufgabenliste';
 $labels['tags'] = 'Schlagworte';
+$labels['export'] = 'Exportieren';
+$labels['exporttitle'] = 'Kalender als iCalendar exportieren';
+$labels['exportattachments'] = 'Mit Anhängen';
+$labels['currentview'] = 'Aktuelle Ansicht';
 $labels['tasklistsubscribe'] = 'Permanent anzeigen';
 $labels['listsearchresults'] = 'Verfügbare Aufgaben';
 $labels['findlists'] = 'Finde Aufgabenlisten,..';
@@ -24,7 +28,7 @@
 $labels['createnewtask'] = 'Neue Aufgabe erstellen (z.B. Samstag, Rasen mähen)';
 $labels['createfrommail'] = 'Aufgabe speichern';
 $labels['printtitle'] = 'Aufgaben drucken';
-$labels['printdescriptions'] = 'Beschreibung drucken';
+$labels['printdescriptions'] = 'Beschreibungen drucken';
 $labels['mark'] = 'Markieren';
 $labels['unmark'] = 'Markierung entfernen';
 $labels['edit'] = 'Bearbeiten';
@@ -42,10 +46,10 @@
 $labels['status-needs-action'] = 'Braucht Aktion';
 $labels['status-in-process'] = 'In Bearbeitung';
 $labels['status-completed'] = 'Abgeschlossen';
-$labels['status-cancelled'] = 'Hinfällig';
+$labels['status-cancelled'] = 'Abgesagt';
 $labels['assignedto'] = 'Zugewiesen an';
 $labels['created'] = 'Erstellt';
-$labels['changed'] = 'Geändert';
+$labels['changed'] = 'Zuletzt geändert';
 $labels['taskoptions'] = 'Optionen';
 $labels['all'] = 'Alle';
 $labels['flagged'] = 'Markiert';
@@ -84,7 +88,7 @@
 $labels['createlist'] = 'Liste hinzufügen';
 $labels['listactions'] = 'Listeneinstellungen…';
 $labels['listname'] = 'Name';
-$labels['showalarms'] = 'Show reminders';
+$labels['showalarms'] = 'Erinnerungen anzeigen';
 $labels['import'] = 'Importieren';
 $labels['viewactions'] = 'Ansicht-Aktionen';
 $labels['focusview'] = 'Nur diese Liste anzeigen';
@@ -128,12 +132,12 @@
 $labels['sendnotifications'] = 'Beauftragte Teilnehmer über die Änderung informieren';
 $labels['sendcancellation'] = 'Beauftragte Teilnehmer über die Stornierung informieren';
 $labels['invitationsubject'] = 'Ihnen wurde "$title" zugewiesen';
-$labels['invitationmailbody'] = "*\$title*\n\nDue: \$date\n\nAssignees: \$attendees\n\nAngehängt finden Sie eine iCalendar-Datei mit allen Aufgabendetails, welche in Ihre Aufgabenanwendung importiert werden kann.";
+$labels['invitationmailbody'] = "*\$title*\n\nFällig: \$date\n\nTeilnehmer: \$attendees\n\nAngehängt finden Sie eine iCalendar-Datei mit allen Aufgabendetails, welche in Ihre Aufgabenanwendung importiert werden kann.";
 $labels['itipupdatesubject'] = '"$title" wurde aktualisiert';
 $labels['itipupdatesubjectempty'] = 'Eine ihrer Aufgabe wurde aktualisiert';
-$labels['itipupdatemailbody'] = "*\$title*\n\nDue: \$date\n\nAssignees: \$attendees\n\nAngehängt finden Sie eine iCalendar-Datei mit den aktualisierten Aufgabendetails, welche in Ihre Aufgabenanwendung importiert werden kann.";
+$labels['itipupdatemailbody'] = "*\$title*\n\nFällig: \$date\n\nTeilnehmer: \$attendees\n\nAngehängt finden Sie eine iCalendar-Datei mit den aktualisierten Aufgabendetails, welche in Ihre Aufgabenanwendung importiert werden kann.";
 $labels['itipcancelsubject'] = '"$title" wurde abgesagt';
-$labels['itipcancelmailbody'] = "*\$title*\n\nDue: \$date\n\nAssignees: \$attendees\n\nDie Aufgabe wurde durch \$organizer storniert.\n\nAngehängt finden Sie eine iCalendar-Datei mit den aktualisierten Aufgabendetails.";
+$labels['itipcancelmailbody'] = "*\$title*\n\nFällig: \$date\n\nTeilnehmer: \$attendees\n\nDie Aufgabe wurde durch \$organizer storniert.\n\nAngehängt finden Sie eine iCalendar-Datei mit den aktualisierten Aufgabendetails.";
 $labels['saveintasklist'] = 'speichern in';
 $labels['taskhistory'] = 'Historie';
 $labels['objectchangelog'] = 'Änderungshistorie';

roundcubemail-plugins-kolab-3.3.tar.gz/plugins/tasklist/localization/es_AR.inc Changed

@@ -10,6 +10,10 @@
 $labels['lists'] = 'Listas de tareas';
 $labels['list'] = 'Lista de tareas';
 $labels['tags'] = 'Etiquetas';
+$labels['export'] = 'Exportar';
+$labels['exporttitle'] = 'Exportar a iCalendar';
+$labels['exportattachments'] = 'Con adjunto';
+$labels['currentview'] = 'vista actual';
 $labels['tasklistsubscribe'] = 'Listar permanentemente';
 $labels['listsearchresults'] = 'Listas de tareas disponibles';
 $labels['findlists'] = 'Encontrar listas de tareas...';
@@ -17,10 +21,13 @@
 $labels['notasklistsfound'] = 'No se encontraron listas de tareas';
 $labels['nrtasklistsfound'] = '$nr listas de tareas encontradas';
 $labels['removelist'] = 'Eliminar de la lista';
+$labels['showcaldavurl'] = 'Mostrar URL CalDAV';
+$labels['caldavurldescription'] = 'Copie esta direccion a su aplicación cliente <a href="http://en.wikipedia.org/wiki/CalDAV" target="_blank">CalDAV</a> (por ejemplo, Evolution o Mozilla Thunderbird) para sincronizar esta lista de tareas específica con su ordenador o dispositivo móvil.';
 $labels['newtask'] = 'Nueva Tarea';
 $labels['createtask'] = 'Crear Tarea <Enter>';
 $labels['createnewtask'] = 'Crear nueva Tarea (ej. Sábado, Cortar el césped)';
 $labels['createfrommail'] = 'Guardar como tarea';
+$labels['printtitle'] = 'Imprimir tareas';
 $labels['printdescriptions'] = 'Imprimir descripciones';
 $labels['mark'] = 'Marcar';
 $labels['unmark'] = 'Desmarcar';
@@ -34,6 +41,7 @@
 $labels['starttime'] = 'Hora de inicio';
 $labels['alarms'] = 'Recordatorio';
 $labels['repeat'] = 'Repetir';
+$labels['links'] = 'Referencia';
 $labels['status'] = 'Estado';
 $labels['status-needs-action'] = 'Necesita acción';
 $labels['status-in-process'] = 'En proceso';
@@ -58,6 +66,7 @@
 $labels['mytaskstitle'] = 'Tareas asignadas a usted';
 $labels['nodate'] = 'sin fecha';
 $labels['removetag'] = 'Elminiar';
+$labels['removelink'] = 'Eliminar referencia de correo';
 $labels['auto'] = 'Auto';
 $labels['taskdetails'] = 'Detalles';
 $labels['newtask'] = 'Nueva Tarea';
@@ -92,6 +101,8 @@
 $labels['errorsaving'] = 'Fallo al guardar datos.';
 $labels['notasksfound'] = 'No se encontraron tareas para la búsqueda seleccionada';
 $labels['invalidstartduedates'] = 'La fecha de inicio no debe ser superior a la fecha de vencimiento';
+$labels['invalidstartduetimes'] = 'Las fechas de inicio o límite deben especificar un valor ambos o ninguno';
+$labels['recurrencerequiresdate'] = 'Las tareas recurrentes requieren una fecha de inicio o una fecha límite';
 $labels['deletetasktconfirm'] = 'Confirme que desea eliminar esta tarea';
 $labels['deleteparenttasktconfirm'] = 'Confirme que desea eliminar esta tarea junto con todas sus subtareas';
 $labels['deletelistconfirm'] = 'Confirme que desea eliminar esta lista con todas sus tareas';
@@ -125,11 +136,18 @@
 $labels['itipupdatesubject'] = '"$title" ha sido actualizado';
 $labels['itipupdatesubjectempty'] = 'Una tarea que le interesa ha sido actualizada';
 $labels['itipupdatemailbody'] = "*\$title*\n\nVencimiento: \$date\n\nAsignados: \$attendees\n\Encontrará adjunto un archivo iCalendar con todos los detalles de la tarea, el cual puede importar a su aplicación de tareas.";
+$labels['itipcancelsubject'] = '"$title" ha sido cancelado';
 $labels['itipcancelmailbody'] = "*\$title*\n\nVencimiento: \$date\n\nAsignados: \$attendees\n\La tarea ha sido cancelada por \$organizer.\n\nEncontrará adjunto un archivo iCalendar con todos los detalles actualizados de la tarea.";
 $labels['saveintasklist'] = 'guardar en';
 $labels['taskhistory'] = 'Historial';
 $labels['objectchangelog'] = 'Cambiar Historial';
+$labels['objectdiff'] = 'Cambios de $rev1 a $rev2';
+$labels['objectnotfound'] = 'Fallo al cargar datos de la tarea';
+$labels['objectchangelognotavailable'] = 'Cambiar historial no está disponible para esta tarea';
 $labels['objectdiffnotavailable'] = 'No es posible comparar las revisiones seleccionadas';
+$labels['revisionrestoreconfirm'] = 'Confirme que quiere recuperar la revisión $rev de esta tarea. Esta acción reemplazará la tarea actual con la versión anterior.';
+$labels['objectrestoresuccess'] = 'Revisión $rev recuperada exitosamente';
+$labels['objectrestoreerror'] = 'Fallo al restaurar el evento anterior';
 $labels['itipobjectnotfound'] = 'La tarea referida por este mensaje no fue encontrada en su lista de tareas.';
 $labels['itipmailbodyaccepted'] = "\$sender ha aceptado la asignación a la siguiente tarea:\n\n*\$title*\n\nVencimiento: \$date\n\nAsignados: \$attendees";
 $labels['itipmailbodytentative'] = "\$sender ha tentativamente aceptado la asignación a la siguiente tarea:\n\n*\$title*\n\nVencimiento: \$date\n\nAsignados: \$attendees";
@@ -137,6 +155,8 @@
 $labels['itipmailbodycancel'] = "\$sender ha rechazado tu asignación a la siguiente tarea:\n\n*\$title*\n\nVencimiento: \$date";
 $labels['itipmailbodyin-process'] = "\$sender ha cambiado el estado de la siguiente tarea a en proceso:\n\n*\$title*\n\nVencimiento: \$date";
 $labels['itipmailbodycompleted'] = "\$sender ha completado la siguiente tarea:\n\n*\$title*\n\nVencimiento: \$date";
+$labels['itipmailbodydelegated'] = "\$sender ha delegado la siguiente tarea:\n\n*\$title*\n\nVencimiento: \$date";
+$labels['itipmailbodydelegatedto'] = "\$sender ha delegado la siguiente tarea a usted:\n\n*\$title*\n\nVencimiento: \$date";
 $labels['attendeeaccepted'] = 'La persona asignada ha aceptado';
 $labels['attendeetentative'] = 'La persona asignada ha aceptado tentativamente';
 $labels['attendeedeclined'] = 'La persona asignada ha rechazado';
@@ -148,8 +168,10 @@
 $labels['declinedeleteconfirm'] = '¿Quiere también eliminar esta tarea rechazado de su lista de tareas?';
 $labels['itipcomment'] = 'Comentario de la invitación/notificación';
 $labels['itipcommenttitle'] = 'Este comentario será adjuntado al mensaje de invitación/notificación enviado a las personas asignadas';
+$labels['itipsendsuccess'] = 'Notificación enviada a las personas asignadas';
 $labels['errornotifying'] = 'Fallo al enviar las notificaciones de la tarea a las personas asignadas';
 $labels['removefromcalendar'] = 'Eliminar de mis tareas';
+$labels['delegateinvitation'] = 'Delegar asignación';
 $labels['andnmore'] = '$nr más...';
 $labels['delegatedto'] = 'Delegado a:';
 $labels['delegatedfrom'] = 'Delegado de:';
@@ -167,4 +189,5 @@
 $labels['itipinvalidrequest'] = 'Esta invitación no es válida';
 $labels['sentresponseto'] = 'Se envió la respuesta a la asignación a $mailto exitosamente';
 $labels['successremoval'] = 'La tarea ha sido eliminada exitosamente.';
+$labels['invalidlistproperties'] = 'Propiedades de la lista erroneas. Por favor ingrese un nombre válido.';
 $labels['arialabelsortmenu'] = 'Opciones de orden de tareas';

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

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

roundcubemail-plugins-kolab-3.3.tar.gz/plugins/tasklist/localization/fi_FI.inc Changed

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

roundcubemail-plugins-kolab-3.3.tar.gz/plugins/tasklist/localization/he_IL.inc Changed

roundcubemail-plugins-kolab-3.3.tar.gz/plugins/tasklist/localization/hr_HR.inc Changed

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

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

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

roundcubemail-plugins-kolab-3.3.tar.gz/plugins/tasklist/localization/ko_KR.inc Changed

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

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

@@ -10,6 +10,9 @@
 $labels['lists'] = 'Lista zadań';
 $labels['list'] = 'Lista zadań';
 $labels['tags'] = 'Tagi';
+$labels['export'] = 'Eksport';
+$labels['exporttitle'] = 'Eksport w formacie iCalendar';
+$labels['exportattachments'] = 'Z załącznikami';
 $labels['tasklistsubscribe'] = 'Dodaj do listy na stałe';
 $labels['listsearchresults'] = 'Dostępne listy zadań';
 $labels['findlists'] = 'Szukaj list zadań...';
@@ -77,9 +80,13 @@
 $labels['rolechair'] = 'Przewodniczący';
 $labels['sendinvitations'] = 'Wyślij zaproszenia';
 $labels['itipupdatesubject'] = '"$title" zostało zaktualizowane';
+$labels['itipcancelsubject'] = '"$title" zostało anulowane';
 $labels['taskhistory'] = 'Historia';
 $labels['objectchangelog'] = 'Historia zmian';
+$labels['objectdiff'] = 'Zmiany od $rev1 do $rev2';
 $labels['objectdiffnotavailable'] = 'Nie można porównać wybranych wersji';
+$labels['objectrestoresuccess'] = 'Wersja $rev została pomyślnie przywrócona';
+$labels['objectrestoreerror'] = 'Nie udało się przywrócić starej wersji';
 $labels['itipcomment'] = 'Komentarz zaproszenia/powiadomienia';
 $labels['andnmore'] = '$nr więcej...';
 $labels['delegatedto'] = 'Oddelegowany do:';

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

roundcubemail-plugins-kolab-3.3.tar.gz/plugins/tasklist/localization/pt_PT.inc Changed

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

roundcubemail-plugins-kolab-3.3.tar.gz/plugins/tasklist/localization/sk_SK.inc Changed

roundcubemail-plugins-kolab-3.3.tar.gz/plugins/tasklist/localization/sl_SI.inc Changed

roundcubemail-plugins-kolab-3.3.tar.gz/plugins/tasklist/localization/sv_SE.inc Changed

roundcubemail-plugins-kolab-3.3.tar.gz/plugins/tasklist/localization/th_TH.inc Changed

roundcubemail-plugins-kolab-3.3.tar.gz/plugins/tasklist/localization/uk_UA.inc Changed

roundcubemail-plugins-kolab-3.3.tar.gz/plugins/tasklist/localization/vi_VN.inc Changed

roundcubemail-plugins-kolab-3.3.tar.gz/plugins/tasklist/localization/zh_CN.inc Changed

roundcubemail-plugins-kolab-3.3.tar.gz/plugins/tasklist/localization/zh_TW.inc Changed

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

@@ -87,18 +87,18 @@
 		<div class="boxtitle buttonbar">
 			<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="all selected" role="radio" aria-checked="true" aria-labelledby="aria-radio-all"><a href="#all" id="aria-radio-all"><roundcube:label name="tasklist.all" /></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>
 				<roundcube:if condition="env:tasklist_driver != 'kolab'" />
 				<li class="week" role="radio" aria-checked="false" aria-labelledby="aria-radio-week"><a href="#week" id="aria-radio-week"><roundcube:label name="tasklist.next7days" /></a></li>
 				<roundcube:endif />
-				<li class="later" role="radio" aria-checked="false" aria-labelledby="aria-radio-later"><a href="#later" id="aria-radio-later"><roundcube:label name="tasklist.later" /></a></li>
+				<li class="later" role="radio" aria-checked="false" aria-labelledby="aria-radio-later"><a href="#later" id="aria-radio-later"><roundcube:label name="tasklist.later" /><span class="count"></span></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="flagged" role="radio" aria-checked="false" aria-labelledby="aria-radio-flagged"><a href="#flagged" id="aria-radio-flagged"><roundcube:label name="tasklist.flagged" /></a></li>
 				<roundcube:if condition="env:tasklist_driver == 'kolab'" />
-				<li class="mytasks" role="radio" aria-checked="false" aria-labelledby="aria-radio-mytasks"><a href="#mytasks" id="aria-radio-mytasks" title="<roundcube:label name='tasklist.mytaskstitle'/>"><roundcube:label name="tasklist.mytasks" /><span class="count"></span></a></li>
+				<li class="mytasks" role="radio" aria-checked="false" aria-labelledby="aria-radio-mytasks"><a href="#mytasks" id="aria-radio-mytasks" title="<roundcube:label name='tasklist.mytaskstitle'/>"><roundcube:label name="tasklist.mytasks" /></a></li>
 				<li class="assigned" role="radio" aria-checked="false" aria-labelledby="aria-radio-assigned"><a href="#assigned" id="aria-radio-assigned" title="<roundcube:label name='tasklist.assignedtitle'/>"><roundcube:label name="tasklist.assigned" /></a></li>
 				<roundcube:endif />
 				<li class="complete" role="radio" aria-checked="false" aria-labelledby="aria-radio-complete"><a href="#complete" id="aria-radio-complete"><roundcube:label name="tasklist.complete" /><span class="count"></span></a></li>

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

@@ -139,6 +139,7 @@
     function init()
     {
         if (rcmail.env.action == 'print' && rcmail.task == 'tasks') {
+            filtermask = rcmail.env.filtermask;
             data_ready({data: rcmail.env.tasks});
             return;
         }
@@ -650,9 +651,7 @@
         $('#taskedit').tabs({
             activate: function(event, ui) {
                 // reset autocompletion on tab change (#3389)
-                if (ui.oldPanel.selector == '#taskedit-panel-attendees') {
-                    rcmail.ksearch_blur();
-                }
+                rcmail.ksearch_blur();
             }
         });
 
@@ -837,7 +836,9 @@
       $("#task-export-list").val('');
 
       buttons[rcmail.gettext('export', 'tasklist')] = function() {
-        var source = $('#task-export-list option:selected').val();
+        var data = {},
+            source = $('#task-export-list option:selected').val(),
+            form_elements = $('select, input', form);
 
         // "current view" export, use hidden form to POST task IDs
         if (source === '') {
@@ -852,7 +853,7 @@
           });
 
           // copy form inputs, there may be controls added by other plugins
-          $('#tasksexport select, #tasksexport input').each(function() {
+          form_elements.each(function() {
             if (this.type != 'checkbox' || this.checked)
               inputs.push($('<input>').attr({type: 'hidden', name: this.name, value: this.value}));
           });
@@ -869,7 +870,12 @@
         }
         // otherwise we can use simple GET
         else {
-          rcmail.goto_url('export', {source: source, attachments: attach});
+          form_elements.each(function() {
+            if (this.type != 'checkbox' || this.checked)
+              data[this.name] = $(this).val();
+          });
+
+          rcmail.goto_url('export', data);
         }
 
         $dialog.dialog("close");
@@ -1181,9 +1187,9 @@
         // iterate over all selector links and update counts
         $('#taskselector a').each(function(i, elem){
             var link = $(elem),
-                f = link.parent().attr('class').replace(/\s\w+/, '');
+                f = link.parent().attr('class').replace(/\s\w+/g, '');
             if (f != 'all')
-                link.children('span').html(taskcounts[f] || '')[(taskcounts[f] ? 'show' : 'hide')]();
+                link.children('span').html('+' + (taskcounts[f] || ''))[(taskcounts[f] ? 'show' : 'hide')]();
         });
 
         // spacial case: overdue
@@ -1278,7 +1284,7 @@
             $('button.ui-button:ui-button').button('option', 'disabled', rcmail.busy);
             return true;
         }
-        
+
         return false;
     }
 
@@ -1872,7 +1878,8 @@
         // delete icon
         var icon = rcmail.env.deleteicon ? '<img src="' + rcmail.env.deleteicon + '" alt="" />' : rcmail.gettext('delete');
         var dellink = '<a href="#delete" class="iconlink delete deletelink" title="' + Q(rcmail.gettext('delete')) + '">' + icon + '</a>';
-        var tooltip = data.status || '';
+        var tooltip, status = (data.status || '').toLowerCase(),
+            status_label = rcmail.gettext('status' + status, 'libcalendaring');
 
         // send invitation checkbox
         var invbox = '<input type="checkbox" class="edit-attendee-reply" value="' + Q(data.email) +'" title="' + Q(rcmail.gettext('tasklist.sendinvitations')) + '" '
@@ -1882,6 +1889,8 @@
             tooltip = rcmail.gettext('delegatedto', 'tasklist') + data['delegated-to'];
         else if (data['delegated-from'])
             tooltip = rcmail.gettext('delegatedfrom', 'tasklist') + data['delegated-from'];
+        else if (status)
+            tooltip = status_label;
 
         // add expand button for groups
         if (data.cutype == 'GROUP') {
@@ -1890,7 +1899,7 @@
         }
 
         var html = '<td class="name"><span class="attendee-name">' + dispname + '</span></td>' +
-            '<td class="confirmstate"><span class="' + String(data.status).toLowerCase() + '" title="' + Q(tooltip) + '">' + Q(data.status || '') + '</span></td>' +
+            '<td class="confirmstate"><span class="' + status + '" title="' + Q(tooltip) + '">' + Q(status ? status_label : '') + '</span></td>' +
             (data.cutype != 'RESOURCE' ? '<td class="invite">' + (readonly || !invbox ? '' : invbox) + '</td>' : '') +
             '<td class="options">' + (readonly ? '' : dellink) + '</td>';
 
@@ -2046,7 +2055,7 @@
                         rsvp = mystatus;
                 }
 
-                line = task_attendee_html(data);
+                line = rcube_libcalendaring.attendee_html(data);
 
                 if (morelink)
                     overflow += line;
@@ -2086,7 +2095,7 @@
                     .removeClass('accepted tentative declined delegated needs-action')
                     .addClass(mystatus)
                     .children('.task-text')
-                    .html(Q(rcmail.gettext('itip' + mystatus, 'libcalendaring')));
+                    .html(rcmail.gettext('status' + mystatus, 'libcalendaring'));
             }
 */
             var show_rsvp = !temp && rsvp && list.editable && !is_organizer(rec) && rec.status != 'CANCELLED';
@@ -2100,7 +2109,7 @@
             $('#task-rsvp .itip-reply-comment textarea').hide().val('');
 
             if (rec.organizer && !organizer) {
-                $('#task-organizer').show().children('.task-text').html(task_attendee_html($.extend(rec.organizer, { role:'ORGANIZER' })));
+                $('#task-organizer').show().children('.task-text').html(rcube_libcalendaring.attendee_html($.extend(rec.organizer, { role:'ORGANIZER' })));
             }
         }
 
@@ -2156,24 +2165,6 @@
         me.dialog_resize($dialog.get(0), $dialog.height(), 580);
     }
 
-    // render HTML code for displaying an attendee record
-    function task_attendee_html(data)
-    {
-        var dispname = Q(data.name || data.email), tooltip = '';
-
-        if (data.email) {
-          tooltip = data.email;
-          dispname = '<a href="mailto:' + data.email + '" class="mailtolink" data-cutype="' + data.cutype + '">' + dispname + '</a>';
-        }
-
-        if (data['delegated-to'])
-          tooltip = rcmail.gettext('delegatedto', 'tasklist') + data['delegated-to'];
-        else if (data['delegated-from'])
-          tooltip = rcmail.gettext('delegatedfrom', 'tasklist') + data['delegated-from'];
-
-        return '<span class="attendee ' + String(data.role == 'ORGANIZER' ? 'organizer' : data.status).toLowerCase() + '" title="' + Q(tooltip) + '">' + dispname + '</span> ';
-    }
-
     /**
      *
      */
@@ -2278,8 +2269,8 @@
               }
               // format attendees struct
               else if (prop == 'attendees') {
-                  if (change['old']) change.old_ = task_attendee_html(change['old']);
-                  if (change['new']) change.new_ = task_attendee_html($.extend({}, change['old'] || {}, change['new']));
+                  if (change['old']) change.old_ = rcube_libcalendaring.attendee_html(change['old']);
+                  if (change['new']) change.new_ = rcube_libcalendaring.attendee_html($.extend({}, change['old'] || {}, change['new']));
                   html = true;
               }
               // localize status
@@ -3341,8 +3332,7 @@
     this.dialog_resize = function(id, height, width)
     {
         var win = $(window), w = win.width(), h = win.height();
-            $(id).dialog('option', { height: Math.min(h-20, height+130), width: Math.min(w-20, width+50) })
-                .dialog('option', 'position', ['center', 'center']);  // only works in a separate call (!?)
+        $(id).dialog('option', { height: Math.min(h-20, height+130), width: Math.min(w-20, width+50) });
     };
 
     /**

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

@@ -1097,49 +1097,19 @@
      */
     public function fetch_tasks()
     {
-        $f = intval(rcube_utils::get_input_value('filter', rcube_utils::INPUT_GPC));
+        $mask   = intval(rcube_utils::get_input_value('filter', rcube_utils::INPUT_GPC));
         $search = rcube_utils::get_input_value('q', rcube_utils::INPUT_GPC);
         $lists  = rcube_utils::get_input_value('lists', rcube_utils::INPUT_GPC);
-        $filter = array('mask' => $f, 'search' => $search);
-/*
-        // convert magic date filters into a real date range
-        switch ($f) {
-        case self::FILTER_MASK_TODAY:
-            $today = new DateTime('now', $this->timezone);
-            $filter['from'] = $filter['to'] = $today->format('Y-m-d');
-            break;
+        $filter = array('mask' => $mask, 'search' => $search);
 
-        case self::FILTER_MASK_TOMORROW:
-            $tomorrow = new DateTime('now + 1 day', $this->timezone);
-            $filter['from'] = $filter['to'] = $tomorrow->format('Y-m-d');
-            break;
+        $data = $this->tasks_data($this->driver->list_tasks($filter, $lists));
 
-        case self::FILTER_MASK_OVERDUE:
-            $yesterday = new DateTime('yesterday', $this->timezone);
-            $filter['to'] = $yesterday->format('Y-m-d');
-            break;
-
-        case self::FILTER_MASK_WEEK:
-            $today = new DateTime('now', $this->timezone);
-            $filter['from'] = $today->format('Y-m-d');
-            $weekend = new DateTime('now + 7 days', $this->timezone);
-            $filter['to'] = $weekend->format('Y-m-d');
-            break;
-
-        case self::FILTER_MASK_LATER:
-            $date = new DateTime('now + 8 days', $this->timezone);
-            $filter['from'] = $date->format('Y-m-d');
-            break;
-
-        }
-*/
-        $data = $this->tasks_data($this->driver->list_tasks($filter, $lists), $f);
         $this->rc->output->command('plugin.data_ready', array(
-            'filter' => $f,
-            'lists' => $lists,
-            'search' => $search,
-            'data' => $data,
-            'tags' => $this->driver->get_tags(),
+                'filter' => $mask,
+                'lists'  => $lists,
+                'search' => $search,
+                'data'   => $data,
+                'tags'   => $this->driver->get_tags(),
         ));
     }
 
@@ -1167,16 +1137,17 @@
      */
     public function print_tasks_list($attrib)
     {
-        $f      = intval(rcube_utils::get_input_value('filter', rcube_utils::INPUT_GPC));
+        $mask   = intval(rcube_utils::get_input_value('filter', rcube_utils::INPUT_GPC));
         $search = rcube_utils::get_input_value('q', rcube_utils::INPUT_GPC);
         $lists  = rcube_utils::get_input_value('lists', rcube_utils::INPUT_GPC);
-        $filter = array('mask' => $f, 'search' => $search);
+        $filter = array('mask' => $mask, 'search' => $search);
 
-        $data = $this->tasks_data($this->driver->list_tasks($filter, $lists), $f);
+        $data = $this->tasks_data($this->driver->list_tasks($filter, $lists));
 
         // we'll build the tasks table in javascript on page load
         // where we have sorting methods, etc.
         $this->rc->output->set_env('tasks', $data);
+        $this->rc->output->set_env('filtermask', $mask);
 
         return $this->ui->tasks_resultview($attrib);
     }
@@ -1184,7 +1155,7 @@
     /**
      * Prepare and sort the given task records to be sent to the client
      */
-    private function tasks_data($records, $f)
+    private function tasks_data($records)
     {
         $data = $this->task_tree = $this->task_titles = array();
 
@@ -1195,9 +1166,7 @@
 
             $this->encode_task($rec);
 
-            // apply filter; don't trust the driver on this :-)
-            if ((!$f && !$this->driver->is_complete($rec)) || ($rec['mask'] & $f))
-                $data[] = $rec;
+            $data[] = $rec;
         }
 
         // assign hierarchy level indicators for later sorting
@@ -1472,7 +1441,7 @@
         $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', 'delete', 'close', 'libcalendaring.expandattendeegroup', 'libcalendaring.expandattendeegroupnodata');
+        $this->rc->output->add_label('autocompletechars', 'autocompletemore', 'delete', 'close');
 
         $this->rc->output->set_pagetitle($this->gettext('navtitle'));
         $this->rc->output->send('tasklist.mainview');
@@ -1535,7 +1504,7 @@
 
         $updates = $this->driver->list_tasks($filter, $lists);
         if (!empty($updates)) {
-            $this->rc->output->command('plugin.refresh_tasks', $this->tasks_data($updates, 255), true);
+            $this->rc->output->command('plugin.refresh_tasks', $this->tasks_data($updates), true);
 
             // update counts
             $counts = $this->driver->count_tasks($lists);
@@ -1647,7 +1616,7 @@
         header("Content-Type: text/calendar");
         header("Content-Disposition: inline; filename=\"". $plugin['filename'] ."\"");
 
-        $this->get_ical()->export($plugin['tasks'], '', true,
+        $this->get_ical()->export($plugin['result'], '', true,
             $plugins['attachments'] ? array($this->driver, 'get_attachment_body') : null);
         exit;
     }

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

roundcubemail-plugins-kolab.dsc Changed

Changes of Revision 41