Kolab Groupware OBS

roundcubemail-plugins-kolab.spec Changed

debian.changelog Changed

roundcubemail-plugins-kolab-3.1.5.tar.gz/plugins/calendar/calendar.php -> roundcubemail-plugins-kolab-3.1.6.tar.gz/plugins/calendar/calendar.php Changed

roundcubemail-plugins-kolab-3.1.5.tar.gz/plugins/calendar/calendar_ui.js -> roundcubemail-plugins-kolab-3.1.6.tar.gz/plugins/calendar/calendar_ui.js Changed

@@ -332,7 +332,7 @@
 
       // list event attendees
       if (calendar.attendees && event.attendees) {
-        var data, dispname, organizer = false, rsvp = false, html = '';
+        var data, dispname, organizer = false, rsvp = false, line,  morelink, html = '',overflow = '';
         for (var j=0; j < event.attendees.length; j++) {
           data = event.attendees[j];
           dispname = Q(data.name || data.email);
@@ -343,12 +343,16 @@
             else if ((data.status == 'NEEDS-ACTION' || data.status == 'TENTATIVE') && settings.identity.emails.indexOf(';'+data.email) >= 0)
               rsvp = data.status.toLowerCase();
           }
-          html += '<span class="attendee ' + String(data.role == 'ORGANIZER' ? 'organizer' : data.status).toLowerCase() + '">' + dispname + '</span> ';
+          
+          line = '<span class="attendee ' + String(data.role == 'ORGANIZER' ? 'organizer' : data.status).toLowerCase() + '">' + dispname + '</span> ';
+          if (morelink)
+            overflow += line;
+          else
+            html += line;
           
           // stop listing attendees
           if (j == 7 && event.attendees.length >= 7) {
-            html += ' <em>' + rcmail.gettext('andnmore', 'calendar').replace('$nr', event.attendees.length - j - 1) + '</em>';
-            break;
+            morelink = $('<a href="#more" class="morelink"></a>').html(rcmail.gettext('andnmore', 'calendar').replace('$nr', event.attendees.length - j - 1));
           }
         }
         
@@ -357,6 +361,20 @@
             .children('.event-text')
             .html(html)
             .find('a.mailtolink').click(function(e) { rcmail.redirect(rcmail.url('mail/compose', { _to:this.href.substr(7) })); return false; });
+
+          // display all attendees in a popup when clicking the "more" link
+          if (morelink) {
+            $('#event-attendees .event-text').append(morelink);
+            morelink.click(function(e){
+              rcmail.show_popup_dialog(
+                '<div id="all-event-attendees" class="event-attendees">' + html + overflow + '</div>',
+                rcmail.gettext('tabattendees','calendar'),
+                null,
+                { width:450, modal:false });
+              $('#all-event-attendees a.mailtolink').click(function(e) { rcmail.redirect(rcmail.url('mail/compose', { _to:this.href.substr(7) })); return false; });
+              return false;
+            })
+          }
         }
         
         $('#event-rsvp')[(rsvp&&!organizer?'show':'hide')]();

roundcubemail-plugins-kolab-3.1.5.tar.gz/plugins/calendar/drivers/database/database_driver.php -> roundcubemail-plugins-kolab-3.1.6.tar.gz/plugins/calendar/drivers/database/database_driver.php Changed

roundcubemail-plugins-kolab-3.1.5.tar.gz/plugins/calendar/drivers/kolab/kolab_calendar.php -> roundcubemail-plugins-kolab-3.1.6.tar.gz/plugins/calendar/drivers/kolab/kolab_calendar.php Changed

roundcubemail-plugins-kolab-3.1.5.tar.gz/plugins/calendar/drivers/kolab/kolab_driver.php -> roundcubemail-plugins-kolab-3.1.6.tar.gz/plugins/calendar/drivers/kolab/kolab_driver.php Changed

roundcubemail-plugins-kolab-3.1.5.tar.gz/plugins/calendar/lib/calendar_ui.php -> roundcubemail-plugins-kolab-3.1.6.tar.gz/plugins/calendar/lib/calendar_ui.php Changed

roundcubemail-plugins-kolab-3.1.5.tar.gz/plugins/calendar/skins/classic/calendar.css -> roundcubemail-plugins-kolab-3.1.6.tar.gz/plugins/calendar/skins/classic/calendar.css Changed

@@ -374,37 +374,44 @@
 	margin: 0.5em 0;
 }
 
-#event-attendees span.attendee {
+.event-attendees span.attendee {
 	padding-right: 18px;
 	margin-right: 0.5em;
 	background: url(images/attendee-status.gif) right 0 no-repeat;
 }
 
-#event-attendees span.attendee a.mailtolink {
+.event-attendees span.attendee a.mailtolink {
 	text-decoration: none;
 	white-space: nowrap;
 }
 
-#event-attendees span.attendee a.mailtolink:hover {
+.event-attendees span.attendee a.mailtolink:hover {
 	text-decoration: underline;
 }
 
-#event-attendees span.accepted {
+.event-attendees span.accepted {
 	background-position: right -20px;
 }
 
-#event-attendees span.declined {
+.event-attendees span.declined {
 	background-position: right -40px;
 }
 
-#event-attendees span.tentative {
+.event-attendees span.tentative {
 	background-position: right -60px;
 }
 
-#event-attendees span.organizer {
+.event-attendees span.organizer {
 	background-position: right -80px;
 }
 
+#all-event-attendees span.attendee {
+	display: block;
+	margin-bottom: 4px;
+	padding-bottom: 3px;
+	border-bottom: 1px solid #ddd;
+}
+
 /* jQuery UI overrides */
 
 #eventshow h1 {

roundcubemail-plugins-kolab-3.1.5.tar.gz/plugins/calendar/skins/classic/templates/calendar.html -> roundcubemail-plugins-kolab-3.1.6.tar.gz/plugins/calendar/skins/classic/templates/calendar.html Changed

roundcubemail-plugins-kolab-3.1.5.tar.gz/plugins/calendar/skins/larry/calendar.css -> roundcubemail-plugins-kolab-3.1.6.tar.gz/plugins/calendar/skins/larry/calendar.css Changed

@@ -428,37 +428,45 @@
 	outline: none;
 }
 
-#event-attendees span.attendee {
+.event-attendees span.attendee {
 	padding-right: 18px;
 	margin-right: 0.5em;
 	background: url(images/attendee-status.gif) right 0 no-repeat;
 }
 
-#event-attendees span.attendee a.mailtolink {
+.event-attendees span.attendee a.mailtolink {
 	text-decoration: none;
 	white-space: nowrap;
+	outline: none;
 }
 
-#event-attendees span.attendee a.mailtolink:hover {
+.event-attendees span.attendee a.mailtolink:hover {
 	text-decoration: underline;
 }
 
-#event-attendees span.accepted {
+.event-attendees span.accepted {
 	background-position: right -20px;
 }
 
-#event-attendees span.declined {
+.event-attendees span.declined {
 	background-position: right -40px;
 }
 
-#event-attendees span.tentative {
+.event-attendees span.tentative {
 	background-position: right -60px;
 }
 
-#event-attendees span.organizer {
+.event-attendees span.organizer {
 	background-position: right -80px;
 }
 
+#all-event-attendees span.attendee {
+	display: block;
+	margin-bottom: 0.4em;
+	padding-bottom: 0.3em;
+	border-bottom: 1px solid #ddd;
+}
+
 .calendarmain .fc-view-table td.fc-list-header,
 #attendees-freebusy-table h3.boxtitle,
 #schedule-freebusy-times thead th,

roundcubemail-plugins-kolab-3.1.5.tar.gz/plugins/calendar/skins/larry/templates/calendar.html -> roundcubemail-plugins-kolab-3.1.6.tar.gz/plugins/calendar/skins/larry/templates/calendar.html Changed

roundcubemail-plugins-kolab-3.1.5.tar.gz/plugins/libcalendaring/libcalendaring.php -> roundcubemail-plugins-kolab-3.1.6.tar.gz/plugins/libcalendaring/libcalendaring.php Changed

roundcubemail-plugins-kolab-3.1.5.tar.gz/plugins/libcalendaring/libvcalendar.php -> roundcubemail-plugins-kolab-3.1.6.tar.gz/plugins/libcalendaring/libvcalendar.php Changed

@@ -426,15 +426,15 @@
         }
 
         // find alarms
-        if ($valarms = $ve->select('VALARM')) {
+        foreach ($ve->select('VALARM') as $valarm) {
             $action = 'DISPLAY';
             $trigger = null;
 
-            $valarm = reset($valarms);
             foreach ($valarm->children as $prop) {
                 switch ($prop->name) {
                 case 'TRIGGER':
                     foreach ($prop->parameters as $param) {
+                        console(strval($param->name), strval($param->value));
                         if ($param->name == 'VALUE' && $param->value == 'DATE-TIME') {
                             $trigger = '@' . $prop->getDateTime()->format('U');
                         }
@@ -450,8 +450,10 @@
                 }
             }
 
-            if ($trigger)
+            if ($trigger && strtoupper($action) != 'NONE') {
                 $event['alarms'] = $trigger . ':' . $action;
+                break;
+            }
         }
 
         // assign current timezone to event start/end

roundcubemail-plugins-kolab-3.1.5.tar.gz/plugins/libcalendaring/tests/libvcalendar.php -> roundcubemail-plugins-kolab-3.1.6.tar.gz/plugins/libcalendaring/tests/libvcalendar.php Changed

roundcubemail-plugins-kolab-3.1.6.tar.gz/plugins/libcalendaring/tests/resources/apple-alarms.ics Added

@@ -0,0 +1,50 @@
+BEGIN:VCALENDAR
+VERSION:2.0
+PRODID:-//Apple Inc.//Mac OS X 10.9//EN
+CALSCALE:GREGORIAN
+BEGIN:VTIMEZONE
+TZID:Europe/Zurich
+BEGIN:DAYLIGHT
+TZOFFSETFROM:+0100
+RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU
+DTSTART:19810329T020000
+TZNAME:MESZ
+TZOFFSETTO:+0200
+END:DAYLIGHT
+BEGIN:STANDARD
+TZOFFSETFROM:+0200
+RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU
+DTSTART:19961027T030000
+TZNAME:MEZ
+TZOFFSETTO:+0100
+END:STANDARD
+END:VTIMEZONE
+BEGIN:VEVENT
+TRANSP:OPAQUE
+DTEND;TZID=Europe/Zurich:20131106T100000
+UID:EF185A2A-55FA-4FF3-9B02-56B0914FC79A
+DTSTAMP:20131029T123927Z
+LOCATION:
+DESCRIPTION:With alarm
+STATUS:CONFIRMED
+SEQUENCE:4
+X-APPLE-TRAVEL-DURATION:PT30M
+SUMMARY:Testing Bug 2415
+LAST-MODIFIED:20131029T123819Z
+DTSTART;TZID=Europe/Zurich:20131106T090000
+CREATED:20131029T123819Z
+BEGIN:VALARM
+X-WR-ALARMUID:C4A26F1A-A433-4102-82D5-A3347FC126D4
+UID:C4A26F1A-A433-4102-82D5-A3347FC126D4
+TRIGGER;VALUE=DATE-TIME:19760401T005545Z
+ACTION:NONE
+END:VALARM
+BEGIN:VALARM
+X-WR-ALARMUID:DEF5F23D-98FC-4510-BC99-F877CD9A9F8B
+UID:DEF5F23D-98FC-4510-BC99-F877CD9A9F8B
+TRIGGER;X-APPLE-RELATED-TRAVEL=-PT15M:-PT45M
+ATTACH;VALUE=URI:Basso
+ACTION:AUDIO
+END:VALARM
+END:VEVENT
+END:VCALENDAR
\ No newline at end of file

roundcubemail-plugins-kolab-3.1.5.tar.gz/plugins/libkolab/lib/kolab_date_recurrence.php -> roundcubemail-plugins-kolab-3.1.6.tar.gz/plugins/libkolab/lib/kolab_date_recurrence.php Changed

@@ -101,16 +101,35 @@
     /**
      * Get the end date of the occurence of this recurrence cycle
      *
-     * @param string Date limit (where infinite recurrences should abort)
      * @return mixed Timestamp with end date of the last event or False if recurrence exceeds limit
      */
-    public function end($limit = 'now +1 year')
+    public function end()
     {
-        $limit_dt = new DateTime($limit);
-        if ($this->engine && ($cend = $this->engine->getLastOccurrence()) && ($end_dt = kolab_format::php_datetime(new cDateTime($cend))) && $end_dt < $limit_dt) {
+        $event = $this->object->to_array();
+
+        // recurrence end date is given
+        if ($event['recurrence']['UNTIL'] instanceof DateTime) {
+            return $event['recurrence']['UNTIL']->format('U');
+        }
+
+        // let libkolab do the work
+        if ($this->engine && ($cend = $this->engine->getLastOccurrence()) && ($end_dt = kolab_format::php_datetime(new cDateTime($cend)))) {
             return $end_dt->format('U');
         }
 
+        // determine a reasonable end date if none given
+        if (!$event['recurrence']['COUNT']) {
+          switch ($event['recurrence']['FREQ']) {
+            case 'YEARLY':  $intvl = 'P100Y'; break;
+            case 'MONTHLY': $intvl = 'P20Y';  break;
+            default:        $intvl = 'P10Y';  break;
+          }
+
+          $end_dt = clone $event['start'];
+          $end_dt->add(new DateInterval($intvl));
+          return $end_dt->format('U');
+        }
+
         return false;
     }
 }

roundcubemail-plugins-kolab-3.1.5.tar.gz/plugins/libkolab/lib/kolab_format.php -> roundcubemail-plugins-kolab-3.1.6.tar.gz/plugins/libkolab/lib/kolab_format.php Changed

@@ -40,6 +40,7 @@
     protected $data;
     protected $xmldata;
     protected $xmlobject;
+    protected $formaterror;
     protected $loaded = false;
     protected $version = '3.0';
 
@@ -248,7 +249,7 @@
                 $log = "Error";
         }
 
-        if ($log) {
+        if ($log && !isset($this->formaterror)) {
             rcube::raise_error(array(
                 'code' => 660,
                 'type' => 'php',
@@ -256,6 +257,8 @@
                 'line' => __LINE__,
                 'message' => "kolabformat $log: " . kolabformat::errorMessage(),
             ), true);
+
+            $this->formaterror = $ret;
         }
 
         return $ret;
@@ -342,6 +345,7 @@
      */
     public function load($xml)
     {
+        $this->formaterror = null;
         $read_func = $this->libfunc($this->read_func);
 
         if (is_array($read_func))
@@ -365,6 +369,8 @@
      */
     public function write($version = null)
     {
+        $this->formaterror = null;
+
         $this->init();
         $write_func = $this->libfunc($this->write_func);
         if (is_array($write_func))
@@ -395,13 +401,13 @@
         // set some automatic values if missing
         if (empty($object['created']) && method_exists($this->obj, 'setCreated')) {
             $cdt = $this->obj->created();
-            $object['created'] = $cdt && $cdt->isValid() ? self::php_datetime($cdt) : new DateTime('now', self::$timezone);
+            $object['created'] = $cdt && $cdt->isValid() ? self::php_datetime($cdt) : new DateTime('now', new DateTimeZone('UTC'));
             if (!$cdt || !$cdt->isValid())
                 $this->obj->setCreated(self::get_datetime($object['created']));
         }
 
-        $object['changed'] = new DateTime('now', self::$timezone);
-        $this->obj->setLastModified(self::get_datetime($object['changed'], new DateTimeZone('UTC')));
+        $object['changed'] = new DateTime('now', new DateTimeZone('UTC'));
+        $this->obj->setLastModified(self::get_datetime($object['changed']));
 
         // Save custom properties of the given object
         if (isset($object['x-custom'])) {

roundcubemail-plugins-kolab-3.1.5.tar.gz/plugins/libkolab/lib/kolab_format_contact.php -> roundcubemail-plugins-kolab-3.1.6.tar.gz/plugins/libkolab/lib/kolab_format_contact.php Changed

roundcubemail-plugins-kolab-3.1.5.tar.gz/plugins/libkolab/lib/kolab_format_distributionlist.php -> roundcubemail-plugins-kolab-3.1.6.tar.gz/plugins/libkolab/lib/kolab_format_distributionlist.php Changed

roundcubemail-plugins-kolab-3.1.5.tar.gz/plugins/libkolab/lib/kolab_format_event.php -> roundcubemail-plugins-kolab-3.1.6.tar.gz/plugins/libkolab/lib/kolab_format_event.php Changed

roundcubemail-plugins-kolab-3.1.5.tar.gz/plugins/libkolab/lib/kolab_format_file.php -> roundcubemail-plugins-kolab-3.1.6.tar.gz/plugins/libkolab/lib/kolab_format_file.php Changed

roundcubemail-plugins-kolab-3.1.5.tar.gz/plugins/libkolab/lib/kolab_format_journal.php -> roundcubemail-plugins-kolab-3.1.6.tar.gz/plugins/libkolab/lib/kolab_format_journal.php Changed

roundcubemail-plugins-kolab-3.1.5.tar.gz/plugins/libkolab/lib/kolab_format_note.php -> roundcubemail-plugins-kolab-3.1.6.tar.gz/plugins/libkolab/lib/kolab_format_note.php Changed

roundcubemail-plugins-kolab-3.1.5.tar.gz/plugins/libkolab/lib/kolab_format_task.php -> roundcubemail-plugins-kolab-3.1.6.tar.gz/plugins/libkolab/lib/kolab_format_task.php Changed

roundcubemail-plugins-kolab-3.1.5.tar.gz/plugins/libkolab/lib/kolab_storage.php -> roundcubemail-plugins-kolab-3.1.6.tar.gz/plugins/libkolab/lib/kolab_storage.php Changed

roundcubemail-plugins-kolab-3.1.5.tar.gz/plugins/libkolab/lib/kolab_storage_cache_event.php -> roundcubemail-plugins-kolab-3.1.6.tar.gz/plugins/libkolab/lib/kolab_storage_cache_event.php Changed

roundcubemail-plugins-kolab-3.1.5.tar.gz/plugins/tasklist/drivers/database/tasklist_database_driver.php -> roundcubemail-plugins-kolab-3.1.6.tar.gz/plugins/tasklist/drivers/database/tasklist_database_driver.php Changed

roundcubemail-plugins-kolab-3.1.5.tar.gz/plugins/tasklist/drivers/kolab/tasklist_kolab_driver.php -> roundcubemail-plugins-kolab-3.1.6.tar.gz/plugins/tasklist/drivers/kolab/tasklist_kolab_driver.php Changed

@@ -95,14 +95,15 @@
             $path_imap = join($delim, $path_imap);
 
             $fullname = kolab_storage::object_name($utf7name);
-            $name = kolab_storage::folder_displayname($fullname, $listnames);
+            $listname = kolab_storage::folder_displayname($fullname, $listnames);
 
             // special handling for virtual folders
             if ($folder->virtual) {
                 $list_id = kolab_storage::folder_id($utf7name);
                 $this->lists[$list_id] = array(
                     'id' => $list_id,
-                    'name' => $name,
+                    'name' => $fullname,
+                    'listname' => $listname,
                     'virtual' => true,
                 );
                 continue;
@@ -127,8 +128,8 @@
             $list_id = kolab_storage::folder_id($utf7name);
             $tasklist = array(
                 'id' => $list_id,
-                'name' => $name,
-                'altname' => $fullname,
+                'name' => $fullname,
+                'listname' => $listname,
                 'editname' => $editname,
                 'color' => $folder->get_color('0000CC'),
                 'showalarms' => isset($prefs[$list_id]['showalarms']) ? $prefs[$list_id]['showalarms'] : $alarms,

roundcubemail-plugins-kolab-3.1.5.tar.gz/plugins/tasklist/tasklist_ui.php -> roundcubemail-plugins-kolab-3.1.6.tar.gz/plugins/tasklist/tasklist_ui.php Changed

@@ -106,7 +106,7 @@
 
             $html_id = html_identifier($id);
             $class = 'tasks-'  . asciiwords($id, true);
-            $title = !empty($prop['altname']) && $prop['altname'] != $prop['name'] ? html_entity_decode($prop['altname'], ENT_COMPAT, RCMAIL_CHARSET) : '';
+            $title = $prop['name'] != $prop['listname'] ? html_entity_decode($prop['name'], ENT_COMPAT, RCMAIL_CHARSET) : '';
 
             if ($prop['virtual'])
                 $class .= ' virtual';
@@ -118,7 +118,7 @@
             $li .= html::tag('li', array('id' => 'rcmlitasklist' . $html_id, 'class' => $class),
                 ($prop['virtual'] ? '' : html::tag('input', array('type' => 'checkbox', 'name' => '_list[]', 'value' => $id, 'checked' => $prop['active']))) .
                 html::span('handle', '&nbsp;') .
-                html::span(array('class' => 'listname', 'title' => $title), $prop['name']));
+                html::span(array('class' => 'listname', 'title' => $title), $prop['listname']));
         }
 
         $this->rc->output->set_env('tasklists', $jsenv);

roundcubemail-plugins-kolab.dsc Changed

Changes of Revision 19