Kolab Groupware OBS

roundcubemail-plugins-kolab.spec Changed

@@ -23,7 +23,7 @@
 %global tmpdir %{_var}/lib/roundcubemail
 
 Name:           roundcubemail-plugins-kolab
-Version:        3.2.2
+Version:        3.2.3
 Release:        1%{?dist}
 Summary:        Kolab Groupware plugins for Roundcube Webmail
 
@@ -33,7 +33,6 @@
 
 Source0:        http://mirror.kolabsys.com/pub/releases/%{name}-%{version}.tar.gz
 Source1:        comm.py
-Source10:       kolab_logo.png
 
 BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 BuildArch:      noarch
@@ -1241,6 +1240,9 @@
         pushd %{buildroot}%{plugindir}/${plugin}/
         ln -s ../../../../..%{tmpdir}/${plugin} files
         popd
+        pushd %{buildroot}%{datadir}/public_html/assets/plugins/${plugin}/
+        ln -s ../../../../../../%{tmpdir}/${plugin} files
+        popd
     fi
 
     new_files > plugin-${plugin}.files
@@ -1285,10 +1287,6 @@
 # Provide the rpm state directory
 %{__mkdir_p} %{buildroot}/%{_localstatedir}/lib/rpm-state/roundcubemail/
 
-# Install the logo
-%{__mkdir_p} ${asset_path}/skins/kolab/images/
-%{__install} -pm 644 %{SOURCE10} ${asset_path}/skins/kolab/images/kolab_logo.png
-
 %{__sed} -r -i \
     -e 's|%{buildroot}||g' \
     -e '/^%dir\s*$/d' \
@@ -1971,8 +1969,11 @@
 %defattr(-,root,root,-)
 
 %changelog
+* Wed Jan 21 2015 Jeroen van Meeuwen <vanmeeuwen@kolabsys.com> - 3.2.3-1
+- Release of version 3.2.3
+
 * Thu Jan  1 2015 Jeroen van Meeuwen <vanmeeuwen@kolabsys.com> - 3.2.2-1
-- Release 0f 3.2.2
+- Release of 3.2.2
 - Fix reference to blank.gif (#4115)
 - Fix folder navigation when splitting assets (#4114)
 - Clarify configuring login as functionality to limit impersonation to settings only (#4113)

debian.changelog Changed

debian.rules Changed

debian.tar.gz/install Changed

debian.tar.gz/kolab_logo.png Deleted

debian.tar.gz/links Changed

debian.tar.gz/source Deleted

debian.tar.gz/source/format Deleted

debian.tar.gz/source/include-binaries Deleted

kolab_logo.png Deleted

roundcubemail-plugins-kolab-3.2.2.tar.gz/plugins/kolab_notes/jquery.tagedit.js Deleted

roundcubemail-plugins-kolab-3.2.2.tar.gz/plugins/kolab_notes/skins/larry/tagedit.css Deleted

roundcubemail-plugins-kolab-3.2.2.tar.gz/plugins/tasklist/jquery.tagedit.js Deleted

@@ -1,683 +0,0 @@
-/*
-* Tagedit - jQuery Plugin
-* The Plugin can be used to edit tags from a database the easy way
-*
-* Examples and documentation at: tagedit.webwork-albrecht.de
-*
-* License:
-* This work is licensed under a MIT License
-*
-* @licstart  The following is the entire license notice for the
-* JavaScript code in this file.
-*
-* Copyright (c) 2010 Oliver Albrecht <info@webwork-albrecht.de>
-* Copyright (c) 2014 Thomas Brüderli <thomas@roundcube.net>
-*
-* Licensed under the MIT licenses
-*
-* Permission is hereby granted, free of charge, to any person obtaining
-* a copy of this software and associated documentation files (the
-* "Software"), to deal in the Software without restriction, including
-* without limitation the rights to use, copy, modify, merge, publish,
-* distribute, sublicense, and/or sell copies of the Software, and to
-* permit persons to whom the Software is furnished to do so, subject to
-* the following conditions:
-*
-* The above copyright notice and this permission notice shall be
-* included in all copies or substantial portions of the Software.
-*
-* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-* NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-* LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-* OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-* WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-*
-* @licend  The above is the entire license notice
-* for the JavaScript code in this file.
-*
-* @author Oliver Albrecht Mial: info@webwork-albrecht.de Twitter: @webworka
-* @version 1.5.2 (06/2014)
-* Requires: jQuery v1.4+, jQueryUI v1.8+, jQuerry.autoGrowInput
-*
-* Example of usage:
-*
-* $( "input.tag" ).tagedit();
-*
-* Possible options:
-*
-*  autocompleteURL: '', // url for a autocompletion
-*  deleteEmptyItems: true, // Deletes items with empty value
-*  deletedPostfix: '-d', // will be put to the Items that are marked as delete
-*  addedPostfix: '-a', // will be put to the Items that are choosem from the database
-*  additionalListClass: '', // put a classname here if the wrapper ul shoud receive a special class
-*  allowEdit: true, // Switch on/off edit entries
-*  allowDelete: true, // Switch on/off deletion of entries. Will be ignored if allowEdit = false
-*  allowAdd: true, // switch on/off the creation of new entries
-*  direction: 'ltr' // Sets the writing direction for Outputs and Inputs
-*  animSpeed: 500 // Sets the animation speed for effects
-*  autocompleteOptions: {}, // Setting Options for the jquery UI Autocomplete (http://jqueryui.com/demos/autocomplete/)
-*  breakKeyCodes: [ 13, 44 ], // Sets the characters to break on to parse the tags (defaults: return, comma)
-*  checkNewEntriesCaseSensitive: false, // If there is a new Entry, it is checked against the autocompletion list. This Flag controlls if the check is (in-)casesensitive
-*  texts: { // some texts
-*      removeLinkTitle: 'Remove from list.',
-*      saveEditLinkTitle: 'Save changes.',
-*      deleteLinkTitle: 'Delete this tag from database.',
-*      deleteConfirmation: 'Are you sure to delete this entry?',
-*      deletedElementTitle: 'This Element will be deleted.',
-*      breakEditLinkTitle: 'Cancel'
-*  }
-*/
-
-(function($) {
-
-	$.fn.tagedit = function(options) {
-		/**
-		* Merge Options with defaults
-		*/
-		options = $.extend(true, {
-			// default options here
-			autocompleteURL: null,
-			checkToDeleteURL: null,
-			deletedPostfix: '-d',
-			addedPostfix: '-a',
-			additionalListClass: '',
-			allowEdit: true,
-			allowDelete: true,
-			allowAdd: true,
-			direction: 'ltr',
-			animSpeed: 500,
-			autocompleteOptions: {
-				select: function( event, ui ) {
-					$(this).val(ui.item.value).trigger('transformToTag', [ui.item.id]);
-					return false;
-				}
-			},
-			breakKeyCodes: [ 13, 44 ],
-			checkNewEntriesCaseSensitive: false,
-			texts: {
-				removeLinkTitle: 'Remove from list.',
-				saveEditLinkTitle: 'Save changes.',
-				deleteLinkTitle: 'Delete this tag from database.',
-				deleteConfirmation: 'Are you sure to delete this entry?',
-				deletedElementTitle: 'This Element will be deleted.',
-				breakEditLinkTitle: 'Cancel',
-                forceDeleteConfirmation: 'There are more records using this tag, are you sure do you want to remove it?'
-			},
-			tabindex: false
-		}, options || {});
-
-		// no action if there are no elements
-		if(this.length == 0) {
-			return;
-		}
-
-		// set the autocompleteOptions source
-		if(options.autocompleteURL) {
-			options.autocompleteOptions.source = options.autocompleteURL;
-		}
-
-		// Set the direction of the inputs
-		var direction= this.attr('dir');
-		if(direction && direction.length > 0) {
-			options.direction = this.attr('dir');
-		}
-
-		var elements = this;
-		var focusItem = null;
-
-		var baseNameRegexp = new RegExp("^(.*)\\[([0-9]*?("+options.deletedPostfix+"|"+options.addedPostfix+")?)?\]$", "i");
-
-		var baseName = elements.eq(0).attr('name').match(baseNameRegexp);
-		if(baseName && baseName.length == 4) {
-			baseName = baseName[1];
-		}
-		else {
-			// Elementname does not match the expected format, exit
-			alert('elementname dows not match the expected format (regexp: '+baseNameRegexp+')')
-			return;
-		}
-
-		// read tabindex from source element
-		var ti;
-		if (!options.tabindex && (ti = elements.eq(0).attr('tabindex')))
-			options.tabindex = ti;
-
-		// init elements
-		inputsToList();
-
-		/**
-		* Creates the tageditinput from a list of textinputs
-		*
-		*/
-		function inputsToList() {
-			var html = '<ul class="tagedit-list '+options.additionalListClass+'">';
-
-			elements.each(function(i) {
-				var element_name = $(this).attr('name').match(baseNameRegexp);
-				if(element_name && element_name.length == 4 && (options.deleteEmptyItems == false || $(this).val().length > 0)) {
-					if(element_name[1].length > 0) {
-						var elementId = typeof element_name[2] != 'undefined'? element_name[2]: '',
-							domId = 'tagedit-' + baseName + '-' + (elementId || i);
-
-						html += '<li class="tagedit-listelement tagedit-listelement-old" aria-labelledby="'+domId+'">';
-						html += '<span dir="'+options.direction+'" id="'+domId+'">' + $(this).val() + '</span>';
-						html += '<input type="hidden" name="'+baseName+'['+elementId+']" value="'+$(this).val()+'" />';
-						if (options.allowDelete)
-							html += '<a class="tagedit-close" title="'+options.texts.removeLinkTitle+'" aria-label="'+options.texts.removeLinkTitle+' '+$(this).val()+'">x</a>';
-						html += '</li>';
-					}
-				}
-			});
-
-			// replace Elements with the list and save the list in the local variable elements
-			elements.last().after(html)
-			var newList = elements.last().next();
-			elements.remove();
-			elements = newList;
-
-			// Check if some of the elementshav to be marked as deleted
-			if(options.deletedPostfix.length > 0) {
-				elements.find('input[name$="'+options.deletedPostfix+'\]"]').each(function() {
-					markAsDeleted($(this).parent());
-				});
-			}
-
-			// put an input field at the End
-			// Put an empty element at the end
-			html = '<li class="tagedit-listelement tagedit-listelement-new">';
-			if (options.allowAdd)
-				html += '<input type="text" name="'+baseName+'[]" value="" id="tagedit-input" disabled="disabled" class="tagedit-input-disabled" dir="'+options.direction+'"/>';
-			html += '</li>';
-			html += '</ul>';
-
-			elements
-				.append(html)
-				.attr('tabindex', options.tabindex) // set tabindex to <ul> to recieve focus
-
-				// Set function on the input

roundcubemail-plugins-kolab-3.2.2.tar.gz/plugins/tasklist/skins/larry/tagedit.css Deleted

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

roundcubemail-plugins-kolab-3.2.2.tar.gz/plugins/calendar/calendar.php -> roundcubemail-plugins-kolab-3.2.3.tar.gz/plugins/calendar/calendar.php Changed

@@ -1636,6 +1636,15 @@
       $event['attachments'][$k]['classname'] = rcube_utils::file2class($attachment['mimetype'], $attachment['name']);
     }
 
+    // convert link URIs references into structs
+    if (array_key_exists('links', $event)) {
+      foreach ((array)$event['links'] as $i => $link) {
+        if (strpos($link, 'imap://') === 0 && ($msgref = $this->driver->get_message_reference($link))) {
+          $event['links'][$i] = $msgref;
+        }
+      }
+    }
+
     // check for organizer in attendees list
     $organizer = null;
     foreach ((array)$event['attendees'] as $i => $attendee) {
@@ -1824,6 +1833,13 @@
 
     $event['attachments'] = $attachments;
 
+    // convert link references into simple URIs
+    if (array_key_exists('links', $event)) {
+      $event['links'] = array_map(function($link) {
+          return is_array($link) ? $link['uri'] : strval($link);
+        }, (array)$event['links']);
+    }
+
     // check for organizer in attendees
     if ($action == 'new' || $action == 'edit') {
       if (!$event['attendees'])
@@ -2932,9 +2948,15 @@
     if ($message->headers) {
       $event['title'] = trim($message->subject);
       $event['description'] = trim($message->first_text_part());
-      
+
+      $this->load_driver();
+
+      // add a reference to the email message
+      if ($msgref = $this->driver->get_message_reference($message->headers, $mbox)) {
+        $event['links'] = array($msgref);
+      }
       // copy mail attachments to event
-      if ($message->attachments) {
+      else if ($message->attachments) {
         $eventid = 'cal:';
         if (!is_array($_SESSION[self::SESSION_KEY]) || $_SESSION[self::SESSION_KEY]['id'] != $eventid) {
           $_SESSION[self::SESSION_KEY] = array();

roundcubemail-plugins-kolab-3.2.2.tar.gz/plugins/calendar/calendar_base.js -> roundcubemail-plugins-kolab-3.2.3.tar.gz/plugins/calendar/calendar_base.js Changed

roundcubemail-plugins-kolab-3.2.2.tar.gz/plugins/calendar/calendar_ui.js -> roundcubemail-plugins-kolab-3.2.3.tar.gz/plugins/calendar/calendar_ui.js Changed

@@ -187,6 +187,7 @@
     var fromunixtime = this.fromunixtime;
     var parseISO8601 = this.parseISO8601;
     var date2servertime = this.date2ISO8601;
+    var render_message_links = this.render_message_links;
 
 
     /***  private methods  ***/
@@ -321,7 +322,9 @@
         }
       }
 
-      rcmail.goto_url('get-attachment', qstring+'&_download=1', false);
+      query._frame = null;
+      query._download = 1;
+      rcmail.goto_url('get-attachment', query, false);
     };
 
     // build event attachments list
@@ -471,6 +474,13 @@
         // fetch attachments, some drivers doesn't set 'attachments' prop of the event?
       }
 
+      // build attachments list
+      $('#event-links').hide();
+      if ($.isArray(event.links) && event.links.length) {
+          render_message_links(event.links || [], $('#event-links').children('.event-text'), false, 'calendar');
+          $('#event-links').show();
+      }
+
       // list event attendees
       if (calendar.attendees && event.attendees) {
         // sort resources to the end
@@ -546,20 +556,30 @@
         $('#event-rsvp .itip-reply-comment textarea').hide().val('');
       }
 
-      var buttons = {};
+      var buttons = [];
       if (!temp && calendar.editable && event.editable !== false) {
-        buttons[rcmail.gettext('edit', 'calendar')] = function() {
-          event_edit_dialog('edit', event);
-        };
-        buttons[rcmail.gettext('delete', 'calendar')] = function() {
-          me.delete_event(event);
-          $dialog.dialog('close');
-        };
+        buttons.push({
+          text: rcmail.gettext('edit', 'calendar'),
+          click: function() {
+            event_edit_dialog('edit', event);
+          }
+        });
+        buttons.push({
+          text: rcmail.gettext('delete', 'calendar'),
+          'class': 'delete',
+          click: function() {
+            me.delete_event(event);
+            $dialog.dialog('close');
+          }
+        });
       }
       else {
-        buttons[rcmail.gettext('close', 'calendar')] = function(){
-          $dialog.dialog('close');
-        };
+        buttons.push({
+          text: rcmail.gettext('close', 'calendar'),
+          click: function(){
+            $dialog.dialog('close');
+          }
+        });
       }
 
       // open jquery UI dialog
@@ -712,6 +732,14 @@
         $('<option>').attr('value', event.categories).text(event.categories).appendTo(categories).prop('selected', true);
       }
 
+      if ($.isArray(event.links) && event.links.length) {
+          render_message_links(event.links, $('#edit-event-links .event-text'), true, 'calendar');
+          $('#edit-event-links').show();
+      }
+      else {
+          $('#edit-event-links').hide();
+      }
+
       // show warning if editing a recurring event
       if (event.id && event.recurrence) {
         var sel = event.thisandfuture ? 'future' : (event.isexception ? 'current' : 'all');
@@ -778,10 +806,13 @@
       };
       
       // init dialog buttons
-      var buttons = {};
+      var buttons = [];
       
       // save action
-      buttons[rcmail.gettext('save', 'calendar')] = function() {
+      buttons.push({
+        text: rcmail.gettext('save', 'calendar'),
+        'class': 'mainaction',
+        click: function() {
         var start = parse_datetime(allday.checked ? '12:00' : starttime.val(), startdate.val());
         var end   = parse_datetime(allday.checked ? '13:00' : endtime.val(), enddate.val());
         
@@ -809,6 +840,7 @@
           recurrence: me.serialize_recurrence(endtime.val()),
           valarms: me.serialize_alarms('#edit-alarms'),
           attendees: event_attendees,
+          links: me.selected_event.links,
           deleted_attachments: rcmail.env.deleted_attachments,
           attachments: []
         };
@@ -865,18 +897,26 @@
 
         update_event(action, data);
         $dialog.dialog("close");
-      };
+      }  // end click:
+      });
 
       if (event.id) {
-        buttons[rcmail.gettext('delete', 'calendar')] = function() {
-          me.delete_event(event);
-          $dialog.dialog('close');
-        };
+        buttons.push({
+          text: rcmail.gettext('delete', 'calendar'),
+          'class': 'delete',
+          click: function() {
+            me.delete_event(event);
+            $dialog.dialog('close');
+          }
+        });
       }
 
-      buttons[rcmail.gettext('cancel', 'calendar')] = function() {
-        $dialog.dialog("close");
-      };
+      buttons.push({
+        text: rcmail.gettext('cancel', 'calendar'),
+        click: function() {
+          $dialog.dialog("close");
+        }
+      });
 
       // show/hide tabs according to calendar's feature support
       $('#edit-tab-attendees')[(calendar.attendees?'show':'hide')]();
@@ -900,7 +940,6 @@
         title: rcmail.gettext((action == 'edit' ? 'edit_event' : 'new_event'), 'calendar'),
         open: function() {
           editform.attr('aria-hidden', 'false');
-          $dialog.parent().find('.ui-dialog-buttonset .ui-button').first().addClass('mainaction');
         },
         close: function() {
           editform.hide().attr('aria-hidden', 'true').appendTo(document.body);
@@ -2414,7 +2453,18 @@
       })
       $.each(listitems, function(idx, item) { mylist.append(item); });
     }
-    
+
+    // remove the link reference matching the given uri
+    function remove_link(elem)
+    {
+      var $elem = $(elem), uri = $elem.attr('data-uri');
+
+      me.selected_event.links = $.grep(me.selected_event.links, function(link) { return link.uri != uri; });
+
+      // remove UI list item
+      $elem.hide().closest('li').addClass('deleted');
+    }
+
     // post the given event data to server
     var update_event = function(action, data, add)
     {
@@ -3962,6 +4012,17 @@
       me.init_alarms_edit('#edit-alarms');
       me.init_recurrence_edit('#eventedit');
 
+      // reload free-busy status when changing the organizer identity
+      $('#eventedit').on('change', '#edit-identities-list', function(e) {
+        var email = settings.identities[$(this).val()],
+          icon = $(this).closest('tr').find('img.availabilityicon');
+
+        if (email && icon.length) {
+          icon.attr('data-email', email);
+          check_freebusy_status(icon, email, me.selected_event);
+        }
+      });
+
       $('#event-export-startdate').datepicker(datepicker_settings);
 
       // init attendees autocompletion
@@ -4054,6 +4115,20 @@
         return false;
       })
 
+      // register click handler for message links

roundcubemail-plugins-kolab-3.2.2.tar.gz/plugins/calendar/composer.json -> roundcubemail-plugins-kolab-3.2.3.tar.gz/plugins/calendar/composer.json Changed

roundcubemail-plugins-kolab-3.2.2.tar.gz/plugins/calendar/drivers/calendar_driver.php -> roundcubemail-plugins-kolab-3.2.3.tar.gz/plugins/calendar/drivers/calendar_driver.php Changed

roundcubemail-plugins-kolab-3.2.2.tar.gz/plugins/calendar/drivers/kolab/kolab_calendar.php -> roundcubemail-plugins-kolab-3.2.3.tar.gz/plugins/calendar/drivers/kolab/kolab_calendar.php Changed

@@ -237,7 +237,7 @@
     $query[] = array('dtend',   '>=', $start);
 
     // add query to exclude pending/declined invitations
-    if (empty($filter_query)) {
+    if (empty($filter_query) && $this->get_namespace() != 'other') {
       foreach ($user_emails as $email) {
         $query[] = array('tags', '!=', 'x-partstat:' . $email . ':needs-action');
         $query[] = array('tags', '!=', 'x-partstat:' . $email . ':declined');
@@ -257,7 +257,7 @@
     $events = array();
     foreach ($this->storage->select($query) as $record) {
       // post-filter events to skip pending and declined invitations
-      if (empty($filter_query) && is_array($record['attendees'])) {
+      if (empty($filter_query) && is_array($record['attendees']) && $this->get_namespace() != 'other') {
         foreach ($record['attendees'] as $attendee) {
           if (in_array($attendee['email'], $user_emails) && in_array($attendee['status'], array('NEEDS-ACTION','DECLINED'))) {
             continue 2;
@@ -391,6 +391,10 @@
     if (!is_array($event))
       return false;
 
+    // email links are stored separately
+    $links = $event['links'];
+    unset($event['links']);
+
     //generate new event from RC input
     $object = $this->_from_rcube_event($event);
     $saved = $this->storage->save($object, 'event');
@@ -404,6 +408,9 @@
       $saved = false;
     }
     else {
+      // save links in configuration.relation object
+      $this->save_links($event['uid'], $links);
+
       $event['id'] = $event['uid'];
       $this->events = array($event['uid'] => $this->_to_rcube_event($object));
     }
@@ -425,6 +432,10 @@
     if (!$old || PEAR::isError($old))
       return false;
 
+    // email links are stored separately
+    $links = $event['links'];
+    unset($event['links']);
+
     $object = $this->_from_rcube_event($event, $old);
     $saved = $this->storage->save($object, 'event', $event['id']);
 
@@ -436,6 +447,9 @@
         true, false);
     }
     else {
+      // save links in configuration.relation object
+      $this->save_links($event['uid'], $links);
+
       $updated = true;
       $this->events[$event['id']] = $this->_to_rcube_event($object);
 
@@ -491,6 +505,29 @@
     return false;
   }
 
+  /**
+   * Find messages linked with an event
+   */
+  protected function get_links($uid)
+  {
+    $storage = kolab_storage_config::get_instance();
+    return $storage->get_object_links($uid);
+  }
+
+  /**
+   *
+   */
+  protected function save_links($uid, $links)
+  {
+    // make sure we have a valid array
+    if (empty($links)) {
+      $links = array();
+    }
+
+    $storage = kolab_storage_config::get_instance();
+    $remove = array_diff($storage->get_object_links($uid), $links);
+    return $storage->save_object_links($uid, $links, $remove);
+  }
 
   /**
    * Create instances of a recurring event
@@ -635,6 +672,12 @@
   {
     $record['id'] = $record['uid'];
     $record['calendar'] = $this->id;
+    $record['links'] = $this->get_links($record['uid']);
+
+    if ($this->get_namespace() == 'other') {
+      $record['className'] = 'fc-event-ns-other';
+      $record = kolab_driver::add_partstat_class($record, array('NEEDS-ACTION','DECLINED'), $this->get_owner());
+    }
 
     return kolab_driver::to_rcube_event($record);
   }

roundcubemail-plugins-kolab-3.2.2.tar.gz/plugins/calendar/drivers/kolab/kolab_driver.php -> roundcubemail-plugins-kolab-3.2.3.tar.gz/plugins/calendar/drivers/kolab/kolab_driver.php Changed

@@ -772,7 +772,7 @@
           break;
       }
     }
-
+    
     if ($success && $this->freebusy_trigger)
       $this->rc->output->command('plugin.ping_url', array('action' => 'calendar/push-freebusy', 'source' => $storage->id));
 
@@ -980,7 +980,7 @@
         $success = $storage->update_event($event);
         break;
     }
-    
+
     if ($success && $this->freebusy_trigger)
       $this->rc->output->command('plugin.ping_url', array('action' => 'calendar/push-freebusy', 'source' => $storage->id));
     
@@ -1216,6 +1216,24 @@
   }
 
   /**
+   * Build a struct representing the given message reference
+   *
+   * @see calendar_driver::get_message_reference()
+   */
+  public function get_message_reference($uri_or_headers, $folder = null)
+  {
+      if (is_object($uri_or_headers)) {
+          $uri_or_headers = kolab_storage_config::get_message_uri($uri_or_headers, $folder);
+      }
+
+      if (is_string($uri_or_headers)) {
+          return kolab_storage_config::get_message_reference($uri_or_headers, 'event');
+      }
+
+      return false;
+  }
+
+  /**
    * List availabale categories
    * The default implementation reads them from config/user prefs
    */
@@ -1351,7 +1369,7 @@
     $record['id'] = $record['uid'];
 
     // all-day events go from 12:00 - 13:00
-    if ($record['end'] <= $record['start'] && $record['allday']) {
+    if (is_a($record['start'], 'DateTime') && $record['end'] <= $record['start'] && $record['allday']) {
       $record['end'] = clone $record['start'];
       $record['end']->add(new DateInterval('PT1H'));
     }
@@ -1403,6 +1421,29 @@
     return $record;
   }
 
+  /**
+   * Set CSS class according to the event's attendde partstat
+   */
+  public static function add_partstat_class($event, $partstats, $user = null)
+  {
+    // set classes according to PARTSTAT
+    if (is_array($event['attendees'])) {
+      $user_emails = libcalendaring::get_instance()->get_user_emails($user);
+      $partstat = 'UNKNOWN';
+      foreach ($event['attendees'] as $attendee) {
+        if (in_array($attendee['email'], $user_emails)) {
+          $partstat = $attendee['status'];
+          break;
+        }
+      }
+
+      if (in_array($partstat, $partstats)) {
+        $event['className'] = trim($event['className'] . ' fc-invitation-' . strtolower($partstat));
+      }
+    }
+
+    return $event;
+  }
 
   /**
    * Provide a list of revisions for the given event

roundcubemail-plugins-kolab-3.2.2.tar.gz/plugins/calendar/drivers/kolab/kolab_invitation_calendar.php -> roundcubemail-plugins-kolab-3.2.3.tar.gz/plugins/calendar/drivers/kolab/kolab_invitation_calendar.php Changed

roundcubemail-plugins-kolab-3.2.2.tar.gz/plugins/calendar/localization/en_US.inc -> roundcubemail-plugins-kolab-3.2.3.tar.gz/plugins/calendar/localization/en_US.inc Changed

roundcubemail-plugins-kolab-3.2.2.tar.gz/plugins/calendar/skins/classic/templates/attachment.html -> roundcubemail-plugins-kolab-3.2.3.tar.gz/plugins/calendar/skins/classic/templates/attachment.html Changed

roundcubemail-plugins-kolab-3.2.2.tar.gz/plugins/calendar/skins/larry/calendar.css -> roundcubemail-plugins-kolab-3.2.3.tar.gz/plugins/calendar/skins/larry/calendar.css Changed

@@ -34,10 +34,6 @@
 	}
 }
 
-body.calendar.attachmentwin #mainscreen {
-	top: 32px;
-}
-
 #calendarsidebar {
 	position: absolute;
 	top: 0;
@@ -568,15 +564,21 @@
 	margin-top: -3px;
 }
 
-#attachmentcontainer {
+.calendar.attachmentwin #attachmenttoolbar {
+	position: relative;
+	top: -6px;
+	height: 40px;
+}
+
+.calendar.attachmentwin #attachmentcontainer {
 	position: absolute;
-	top: 60px;
-	left: 0px;
-	right: 0px;
-	bottom: 0px;
+	top: 0;
+	left: 232px;
+	right: 0;
+	bottom: 0;
 }
 
-#attachmentframe {
+.calendar.attachmentwin #attachmentframe {
 	width: 100%;
 	height: 100%;
 	border: 0;
@@ -584,29 +586,33 @@
 	border-radius: 4px;
 }
 
-#partheader {
-	position: relative;
-	padding: 3px 0;
-	background: #f9f9f9;
-	background: -moz-linear-gradient(top, #fff 0%, #e9e9e9 100%);
-	background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#fff), color-stop(100%,#e9e9e9));
-	background: -o-linear-gradient(top, #fff 0%, #e9e9e9 100%);
-	background: -ms-linear-gradient(top, #fff 0%, #e9e9e9 100%);
-	background: linear-gradient(top, #fff 0%, #e9e9e9 100%);
+.calendar.attachmentwin #partheader {
+	position: absolute;
+	top: 0;
+	left: 0;
+	width: 220px;
+	bottom: 0;
 }
 
-#partheader table td {
+.calendar.attachmentwin #partheader table {
+	table-layout: fixed;
+	overflow: hidden;
+}
+
+.calendar.attachmentwin #partheader table td {
 	color: #666;
-	padding: 2px 8px;
+	padding: 4px 6px;
+	text-overflow: ellipsis;
+	overflow: hidden;
 }
 
-#partheader table td.header {
+.calendar.attachmentwin #partheader table td.header {
 	font-weight: bold;
 }
 
-#partheader table td.title a {
-	color: #666;
-	text-decoration: none;
+.calendar.attachmentwin #partheader table td.title {
+	width: 60px;
+	padding-right: 0;
 }
 
 #edit-attachments {
@@ -958,6 +964,37 @@
 	text-overflow: ellipsis;
 }
 
+#event-links .attachmentslist {
+	display: inline-block;
+}
+
+#event-links label,
+#edit-event-links label {
+	float: left;
+	margin-top: 0.3em;
+	padding-right: 0.75em;
+}
+
+#edit-event-links .event-text {
+	margin-left: 8em;
+	min-height: 22px;
+}
+
+#edit-event-links .attachmentslist li.message a.messagelink,
+#event-links .attachmentslist li.message a.messagelink {
+	padding: 0 0 0 24px;
+}
+
+#edit-event-links .attachmentslist li a.delete {
+	top: 0;
+	background-position: -6px -378px;
+}
+
+#edit-event-links .attachmentslist li.deleted a.messagelink,
+#edit-event-links .attachmentslist li.deleted a.messagelink:hover {
+	text-decoration: line-through;
+}
+
 #eventedit .formtable td.label {
 	min-width: 6em;
 }
@@ -1846,6 +1883,15 @@
 	border: 1px dashed #c00 !important;
 }
 
+.fc-event-vert.fc-event-ns-other.fc-invitation-declined,
+.fc-event-hori.fc-event-ns-other.fc-invitation-declined {
+	opacity: 0.7;
+}
+
+.fc-event-ns-other.fc-invitation-declined .fc-event-title {
+	text-decoration: line-through;
+}
+
 .fc-event-vert.fc-invitation-tentative .fc-event-head,
 .fc-event-vert.fc-invitation-declined .fc-event-head,
 .fc-event-vert.fc-invitation-needs-action .fc-event-head {

roundcubemail-plugins-kolab-3.2.2.tar.gz/plugins/calendar/skins/larry/templates/attachment.html -> roundcubemail-plugins-kolab-3.2.3.tar.gz/plugins/calendar/skins/larry/templates/attachment.html Changed

@@ -7,26 +7,58 @@
 <body class="extwin calendar attachmentwin">
 
 <div id="header">
-	<div id="topnav">
-		<div class="topright">
-			<a href="#close" class="closelink" onclick="self.close()"><roundcube:label name="close" /></a>
-		</div>
+<div id="topline" role="banner" aria-labelledby="aria-label-topnav">
+	<div class="topleft">
+		<roundcube:container name="topline-left" id="topline-left" />
 	</div>
-
-	<br style="clear:both" />
+	<roundcube:container name="topline-center" id="topline-center" />
+	<div class="topright">
+		<roundcube:container name="topline-right" id="topline-right" />
+		<roundcube:button name="close" type="link" label="close" class="closelink" onclick="self.close()" />
+	</div>
+</div>
 </div>
 
 <div id="mainscreen">
-	<div id="partheader" class="uibox">
-	<roundcube:object name="plugin.attachmentcontrols" class="headers-table" />
+
+<h1 class="voice"><roundcube:label name="attachment" />: <roundcube:var name="env:filename" /></h1>
+
+<h2 id="aria-label-toolbar" class="voice"><roundcube:label name="arialabeltoolbar" /></h2>
+<div id="attachmenttoolbar" class="toolbar fullwidth" role="toolbar" aria-labelledby="aria-label-toolbar">
+	<roundcube:button command="download-attachment" type="link" class="button download disabled" classAct="button download" classSel="button download pressed" label="download" title="download" />
+	<roundcube:button command="print-attachment" type="link" class="button print disabled" classAct="button print" classSel="button print pressed" label="print" title="print" />
+	<roundcube:container name="toolbar" id="messagetoolbar" />
+</div>
+
+<div id="mainscreencontent">
+
+	<div id="partheader" class="uibox listbox" role="contentinfo" aria-labelledby="aria-label-contentinfo">
+		<h2 class="boxtitle" id="aria-label-contentinfo"><roundcube:label name="properties" /></h2>
+		<div class="scroller">
+			<roundcube:object name="plugin.attachmentcontrols" class="listing" />
+		</div>
 	</div>
 
-	<div id="attachmentcontainer" class="uibox">
-	<roundcube:object name="plugin.attachmentframe" id="attachmentframe" class="header-table" style="width:100%" />
+	<div id="attachmentcontainer" class="uibox" role="main" aria-labelledby="aria-label-messagepart">
+		<h2 id="aria-label-messagepart" class="voice"><roundcube:label name="arialabelattachmentpreview" /></h2>
+		<div class="iframebox">
+		<roundcube:object name="plugin.attachmentframe" id="attachmentframe" frameborder="0" title="arialabelattachmentpreview" />
+		</div>
 	</div>
 
 </div>
 
+</div>
+
+<script type="text/javascript">
+
+$(document).ready(function() {
+	if (window.rcube_splitter) {
+		new rcube_splitter({ id:'mailpartsplitterv', p1:'#partheader', p2:'#attachmentcontainer',
+			orientation:'v', relative:true, start:226, min:150, size:12}).init();
+	}
+});
+
+</script>
 </body>
 </html>
-

roundcubemail-plugins-kolab-3.2.2.tar.gz/plugins/calendar/skins/larry/templates/calendar.html -> roundcubemail-plugins-kolab-3.2.3.tar.gz/plugins/calendar/skins/larry/templates/calendar.html Changed

roundcubemail-plugins-kolab-3.2.2.tar.gz/plugins/calendar/skins/larry/templates/eventedit.html -> roundcubemail-plugins-kolab-3.2.3.tar.gz/plugins/calendar/skins/larry/templates/eventedit.html Changed

roundcubemail-plugins-kolab-3.2.2.tar.gz/plugins/kolab_activesync/composer.json -> roundcubemail-plugins-kolab-3.2.3.tar.gz/plugins/kolab_activesync/composer.json Changed

roundcubemail-plugins-kolab-3.2.2.tar.gz/plugins/kolab_activesync/kolab_activesync_ui.php -> roundcubemail-plugins-kolab-3.2.3.tar.gz/plugins/kolab_activesync/kolab_activesync_ui.php Changed

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

roundcubemail-plugins-kolab-3.2.2.tar.gz/plugins/kolab_activesync/skins/larry/config.css -> roundcubemail-plugins-kolab-3.2.3.tar.gz/plugins/kolab_activesync/skins/larry/config.css Changed

roundcubemail-plugins-kolab-3.2.2.tar.gz/plugins/kolab_activesync/skins/larry/templates/configedit.html -> roundcubemail-plugins-kolab-3.2.3.tar.gz/plugins/kolab_activesync/skins/larry/templates/configedit.html Changed

roundcubemail-plugins-kolab-3.2.2.tar.gz/plugins/kolab_addressbook/composer.json -> roundcubemail-plugins-kolab-3.2.3.tar.gz/plugins/kolab_addressbook/composer.json Changed

roundcubemail-plugins-kolab-3.2.2.tar.gz/plugins/kolab_config/composer.json -> roundcubemail-plugins-kolab-3.2.3.tar.gz/plugins/kolab_config/composer.json Changed

roundcubemail-plugins-kolab-3.2.2.tar.gz/plugins/kolab_delegation/composer.json -> roundcubemail-plugins-kolab-3.2.3.tar.gz/plugins/kolab_delegation/composer.json Changed

roundcubemail-plugins-kolab-3.2.2.tar.gz/plugins/kolab_delegation/kolab_delegation.js -> roundcubemail-plugins-kolab-3.2.3.tar.gz/plugins/kolab_delegation/kolab_delegation.js Changed

@@ -7,7 +7,7 @@
  * @licstart  The following is the entire license notice for the
  * JavaScript code in this file.
  *
- * Copyright (C) 2011-2012, Kolab Systems AG <contact@kolabsys.com>
+ * Copyright (C) 2011-2015, Kolab Systems AG <contact@kolabsys.com>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as
@@ -260,13 +260,10 @@
 {
   var d, delegator;
 
-  $.each(this.env.namespace, function(i, v) {
-    var delim = v[v.length-1], pos;
-    if (calendar.indexOf(v) === 0 && (pos = calendar.indexOf(delim, v.length))) {
-      delegator = calendar.substr(v.length, pos - v.length)
-      return false;
-    }
-  });
+  // derive delegator from the calendar owner property
+  if (this.env.calendars[calendar] && this.env.calendars[calendar].owner) {
+    delegator = this.env.calendars[calendar].owner.replace(/@.+$/, '');
+  }
 
   if (delegator && (d = this.env.delegators[delegator])) {
     // find delegator's identity id
@@ -299,9 +296,8 @@
 
   // change organizer identity in identity selector
   if (select.length && old != this.env.calendar_settings.identity) {
-    // @TODO: run freebusy update?
     var id = this.env.calendar_settings.identity.identity_id;
-    select.val(id ? id : '');
+    select.val(id || select.find('option').first().val()).change();
   }
 };

roundcubemail-plugins-kolab-3.2.2.tar.gz/plugins/kolab_delegation/kolab_delegation_engine.php -> roundcubemail-plugins-kolab-3.2.3.tar.gz/plugins/kolab_delegation/kolab_delegation_engine.php Changed

@@ -743,6 +743,13 @@
     {
         $context = $this->delegator_context();
 
+        // try to derive context from the given user email
+        if (!$context && !empty($args['emails'])) {
+            if (($user = preg_replace('/@.+$/', '', $args['emails'][0])) && isset($_SESSION['delegators'][$user])) {
+                $context = $user;
+            }
+        }
+
         // return delegator's addresses
         if ($context) {
             $args['emails'] = $_SESSION['delegators'][$context];
@@ -792,7 +799,6 @@
             }
             if ($args['personal']) {
                 $ns   = $cal->get_namespace();
-                $name = $cal->get_realname(); // UTF-7 IMAP folder name
 
                 if (empty($context)) {
                     if ($ns != 'personal') {
@@ -806,7 +812,7 @@
 
                     foreach ($other_ns as $ns) {
                         $folder = $ns[0] . $context . $delim;
-                        if (strpos($name, $folder) !== 0) {
+                        if (strpos($cal->name, $folder) !== 0) {
                             continue;
                         }
                     }

roundcubemail-plugins-kolab-3.2.2.tar.gz/plugins/kolab_files/composer.json -> roundcubemail-plugins-kolab-3.2.3.tar.gz/plugins/kolab_files/composer.json Changed

roundcubemail-plugins-kolab-3.2.2.tar.gz/plugins/kolab_folders/composer.json -> roundcubemail-plugins-kolab-3.2.3.tar.gz/plugins/kolab_folders/composer.json Changed

roundcubemail-plugins-kolab-3.2.2.tar.gz/plugins/kolab_notes/composer.json -> roundcubemail-plugins-kolab-3.2.3.tar.gz/plugins/kolab_notes/composer.json Changed

roundcubemail-plugins-kolab-3.2.2.tar.gz/plugins/kolab_notes/kolab_notes.php -> roundcubemail-plugins-kolab-3.2.3.tar.gz/plugins/kolab_notes/kolab_notes.php Changed

@@ -394,7 +394,10 @@
                 $this->rc->output->set_env('kolab_notes_template', array(
                     '_from_mail' => true,
                     'title' => $message->get('subject'),
-                    'links' => array($this->get_message_reference(kolab_storage_config::get_message_uri($message, $folder))),
+                    'links' => array(kolab_storage_config::get_message_reference(
+                        kolab_storage_config::get_message_uri($message, $folder),
+                        'note'
+                    )),
                 ));
             }
         }
@@ -573,9 +576,8 @@
         }
 
         // resolve message links
-        $me = $this;
-        $note['links'] = array_map(function($link) use ($me, $resolve) {
-                return $me->get_message_reference($link, $resolve) ?: array('uri' => $link);
+        $note['links'] = array_map(function($link) {
+                return kolab_storage_config::get_message_reference($link, 'note') ?: array('uri' => $link);
             }, $this->get_links($note['uid']));
 
         return $note;
@@ -1043,28 +1045,6 @@
     }
 
     /**
-     * Resolve the email message reference from the given URI
-     */
-    public function get_message_reference($uri, $resolve = false)
-    {
-        if ($linkref = kolab_storage_config::parse_member_url($uri)) {
-            $linkref['subject'] = $linkref['params']['subject'];
-            $linkref['uri']     = $uri;
-            $linkref['mailurl'] = $this->rc->url(array(
-                'task'   => 'mail',
-                'action' => 'show',
-                'mbox'   => $linkref['folder'],
-                'uid'    => $linkref['uid'],
-                'rel'    => 'note',
-            ));
-
-            unset($linkref['params']);
-        }
-
-        return $linkref;
-    }
-
-    /**
      * Update note tags
      */
     private function save_tags($uid, $tags)

roundcubemail-plugins-kolab-3.2.2.tar.gz/plugins/kolab_notes/kolab_notes_ui.php -> roundcubemail-plugins-kolab-3.2.3.tar.gz/plugins/kolab_notes/kolab_notes_ui.php Changed

roundcubemail-plugins-kolab-3.2.2.tar.gz/plugins/kolab_tags/composer.json -> roundcubemail-plugins-kolab-3.2.3.tar.gz/plugins/kolab_tags/composer.json Changed

roundcubemail-plugins-kolab-3.2.2.tar.gz/plugins/kolab_tags/kolab_tags.js -> roundcubemail-plugins-kolab-3.2.3.tar.gz/plugins/kolab_tags/kolab_tags.js Changed

@@ -345,6 +345,9 @@
 {
     var list = rcmail.message_list;
 
+    // reset tag selector popup
+    tag_selector_reset();
+
     // remove deleted tags
     remove_tags(response['delete']);
 
@@ -352,6 +355,9 @@
     $.each(response.add || [], function() {
         rcmail.env.tags.push(this);
         add_tag_element($('#taglist'), this, list);
+        if (response.mark) {
+            tag_add_callback(this);
+        }
     });
 
     // update existing tag
@@ -396,9 +402,6 @@
         message_list_select(list);
     }
 
-    // reset tag selector popup
-    tag_selector_element = null;
-
     // @TODO: sort tags by name/prio
 }
 
@@ -471,17 +474,43 @@
         return tag_selector(event, function(props) { rcmail.command('tag-add', props); });
     }
 
-    var postdata = rcmail.selection_post_data(),
-        tag = this.tag_find(props),
-        frame_window = rcmail.get_frame_window(rcmail.env.contentframe);
+    var tag, postdata = rcmail.selection_post_data();
+
+    // requested new tag?
+    if (props.name) {
+        postdata._tag = props.name;
+        // find the tag by name to be sure it exists or not
+        if (props = tag_find(props.name, 'name')) {
+            postdata._tag = props.uid;
+        }
+        else {
+            postdata._new = 1;
+        }
+    }
+    else {
+        postdata._tag = props;
+    }
 
-    postdata._tag = props;
     postdata._act = 'add';
 
     rcmail.http_post('plugin.kolab_tags', postdata, true);
 
     // add tags to message(s) without waiting to a response
     // in case of an error the list will be refreshed
+    // this is possible if we use existing tag
+    if (!postdata._new && (tag = this.tag_find(props))) {
+        tag_add_callback(tag);
+    }
+}
+
+// update messages list and message frame after tagging
+function tag_add_callback(tag)
+{
+    if (!tag)
+        return;
+
+    var frame_window = rcmail.get_frame_window(rcmail.env.contentframe);
+
     if (rcmail.message_list) {
         $.each(rcmail.message_list.get_selection(), function (i, uid) {
             var row = rcmail.message_list.rows[uid];
@@ -508,6 +537,16 @@
         return tag_selector(event, function(props) { rcmail.command('tag-remove', props); });
     }
 
+    if (props.name) {
+        // find the tag by name, make sure it exists
+        props = tag_find(props.name, 'name');
+        if (!props) {
+            return;
+        }
+
+        props = props.uid;
+    }
+
     var postdata = rcmail.selection_post_data(),
         tags = props != '*' ? [props] : $.map(rcmail.env.tags, function(tag) { return tag.uid; })
         win = window.parent && parent.rcmail && parent.remove_tags ? parent : window;
@@ -602,10 +641,14 @@
 }
 
 // return tag info by tag uid
-function tag_find(uid)
+function tag_find(search, key)
 {
+    if (!key) {
+        key = 'uid';
+    }
+
     for (var i in rcmail.env.tags)
-        if (rcmail.env.tags[i].uid == uid)
+        if (rcmail.env.tags[i][key] == search)
             return rcmail.env.tags[i];
 }
 
@@ -659,9 +702,24 @@
             link = document.createElement('a'),
             span = document.createElement('span');
 
-        container = $('<div id="tag-selector" class="popupmenu"></div>');
         link.href = '#';
         link.className = 'active';
+        container = $('<div id="tag-selector" class="popupmenu"></div>')
+            .keydown(function(e) {
+                var focused = $('*:focus', container).parent();
+
+                if (e.which == 40) { // Down
+                    focused.nextAll('li:visible').first().find('a').focus();
+                    return false;
+                }
+                else if (e.which == 38) { // Up
+                    focused.prevAll('li:visible').first().find('input,a').focus();
+                    return false;
+                }
+            });
+
+        // add tag search/create input
+        rows.push(tag_selector_search_element(container));
 
         // loop over tags list
         $.each(rcmail.env.tags, function(i, tag) {
@@ -697,4 +755,51 @@
     container.data('callback', callback);
 
     rcmail.show_menu('tag-selector', true, event);
+
+    // reset list and search input
+    $('li', container).show();
+    $('input', container).val('').focus();
+}
+
+// remove tag selector element (e.g. after adding/removing a tag)
+function tag_selector_reset()
+{
+    $(tag_selector_element).remove();
+    tag_selector_element = null;
+}
+
+function tag_selector_search_element(container)
+{
+    var title = rcmail.gettext('kolab_tags.tagsearchnew'),
+        placeholder = rcmail.gettext('kolab_tags.newtag');
+
+    var input = $('<input>').attr({'type': 'text', title: title, placeholder: placeholder})
+        .keyup(function(e) {
+            if (this.value) {
+                // execute action on Enter
+                if (e.which == 13) {
+                    container.data('callback')({name: this.value});
+                    rcmail.hide_menu('tag-selector', e);
+                    if ($('#markmessagemenu').is(':visible')) {
+                        rcmail.hide_menu('markmessagemenu', e);
+                    }
+                }
+                // search tags
+                else {
+                    var search = this.value.toUpperCase();
+                    $('li:not(.search)', container).each(function() {
+                        var tag_name = $(this).text().toUpperCase();
+                        $(this)[tag_name.indexOf(search) >= 0 ? 'show' : 'hide']();
+                    });
+                }
+            }
+            else {
+                // reset search
+                $('li', container).show();
+            }
+        });
+
+    return $('<li class="search">').append(input)
+        // prevents from closing the menu on click in the input/row
+        .mouseup(function(e) { return false; });
 }

roundcubemail-plugins-kolab-3.2.2.tar.gz/plugins/kolab_tags/lib/kolab_tags_engine.php -> roundcubemail-plugins-kolab-3.2.3.tar.gz/plugins/kolab_tags/lib/kolab_tags_engine.php Changed

@@ -54,7 +54,8 @@
             $this->plugin->include_script('kolab_tags.js');
             $this->rc->output->add_label('cancel', 'save');
             $this->plugin->add_label('tags', 'add', 'edit', 'delete', 'saving',
-                'nameempty', 'nameexists', 'colorinvalid', 'untag', 'tagname', 'tagcolor');
+                'nameempty', 'nameexists', 'colorinvalid', 'untag', 'tagname',
+                'tagcolor', 'tagsearchnew', 'newtag');
 
             $this->rc->output->add_handlers(array(
                 'plugin.taglist' => array($this, 'taglist'),
@@ -199,8 +200,6 @@
     public function action_add()
     {
         $tag     = rcube_utils::get_input_value('_tag', rcube_utils::INPUT_POST);
-        $filter  = array(array('uid', '=', explode(',', $tag)));
-        $taglist = $this->backend->list_tags($filter);
         $storage = $this->rc->get_storage();
         $members = array();
 
@@ -218,24 +217,45 @@
             $members = array_merge($members, $this->build_members($mbox, $msgs));
         }
 
-        // for every tag...
-        foreach ($taglist as $tag) {
-            $tag['members'] = array_unique(array_merge((array) $tag['members'], $members));
+        // create a new tag?
+        if (!empty($_POST['_new'])) {
+            $object = array(
+                'name'    => $tag,
+                'members' => $members,
+            );
 
-            // update tag object
-            if (!$this->backend->update($tag)) {
-                $error = true;
+            $object = $this->backend->create($object);
+            $error  = $object === false;
+        }
+        // use existing tags (by UID)
+        else {
+            $filter  = array(array('uid', '=', explode(',', $tag)));
+            $taglist = $this->backend->list_tags($filter);
+
+            // for every tag...
+            foreach ($taglist as $tag) {
+                $tag['members'] = array_unique(array_merge((array) $tag['members'], $members));
+
+                // update tag object
+                if (!$this->backend->update($tag)) {
+                    $error = true;
+                }
             }
         }
 
         if ($error) {
+            $this->rc->output->show_message($this->plugin->gettext('taggingerror'), 'error');
+
             if ($_POST['_from'] != 'show') {
-                $this->rc->output->show_message($this->plugin->gettext('taggingerror'), 'error');
                 $this->rc->output->command('list_mailbox');
             }
         }
         else {
             $this->rc->output->show_message($this->plugin->gettext('taggingsuccess'), 'confirmation');
+
+            if (isset($object)) {
+                $this->rc->output->command('plugin.kolab_tags', array('mark' => 1, 'add' => array($this->parse_tag($object))));
+            }
         }
     }

roundcubemail-plugins-kolab-3.2.2.tar.gz/plugins/kolab_tags/localization/en_US.inc -> roundcubemail-plugins-kolab-3.2.3.tar.gz/plugins/kolab_tags/localization/en_US.inc Changed

roundcubemail-plugins-kolab-3.2.2.tar.gz/plugins/kolab_tags/skins/larry/style.css -> roundcubemail-plugins-kolab-3.2.3.tar.gz/plugins/kolab_tags/skins/larry/style.css Changed

roundcubemail-plugins-kolab-3.2.2.tar.gz/plugins/libcalendaring/composer.json -> roundcubemail-plugins-kolab-3.2.3.tar.gz/plugins/libcalendaring/composer.json Changed

roundcubemail-plugins-kolab-3.2.2.tar.gz/plugins/libcalendaring/libcalendaring.js -> roundcubemail-plugins-kolab-3.2.3.tar.gz/plugins/libcalendaring/libcalendaring.js Changed

@@ -788,6 +788,39 @@
         }
     };
 
+
+    // Render message reference links to the given container
+    this.render_message_links = function(links, container, edit, plugin)
+    {
+        var ul = $('<ul>').addClass('attachmentslist');
+
+        $.each(links, function(i, link) {
+            if (!link.mailurl)
+                return true;  // continue
+
+            var li = $('<li>').addClass('link')
+                .addClass('message eml')
+                .append($('<a>')
+                    .attr('href', link.mailurl)
+                    .addClass('messagelink')
+                    .text(link.subject || link.uri)
+                )
+                .appendTo(ul);
+
+            // add icon to remove the link
+            if (edit) {
+                $('<a>')
+                    .attr('href', '#delete')
+                    .attr('title', rcmail.gettext('removelink', plugin))
+                    .attr('data-uri', link.uri)
+                    .addClass('delete')
+                    .text(rcmail.gettext('delete'))
+                    .appendTo(li);
+            }
+        });
+
+        container.empty().append(ul);
+    }
 }
 
 //////  static methods
@@ -1107,4 +1140,18 @@
   $('.rsvp-buttons').on('click', 'a.reply-comment-toggle', function(e){
     $(this).hide().parent().find('textarea').show().focus();
   });
+
+  if (rcmail.env.action == 'get-attachment' && rcmail.gui_objects['attachmentframe']) {
+    rcmail.register_command('print-attachment', function() {
+      var frame = rcmail.get_frame_window(rcmail.gui_objects['attachmentframe'].id);
+      if (frame) frame.print();
+    }, true);
+  }
+
+  if (rcmail.env.action == 'get-attachment' && rcmail.env.attachment_download_url) {
+    rcmail.register_command('download-attachment', function() {
+      rcmail.location_href(rcmail.env.attachment_download_url, window);
+    }, true);
+  }
+
 });

roundcubemail-plugins-kolab-3.2.2.tar.gz/plugins/libcalendaring/libcalendaring.php -> roundcubemail-plugins-kolab-3.2.3.tar.gz/plugins/libcalendaring/libcalendaring.php Changed

@@ -98,12 +98,6 @@
 
         // include client scripts and styles
         if ($this->rc->output) {
-            if ($this->rc->output->type == 'html') {
-                $this->rc->output->set_env('libcal_settings', $this->load_settings());
-                $this->include_script('libcalendaring.js');
-                $this->include_stylesheet($this->local_skin_path() . '/libcal.css');
-            }
-
             // add hook to display alarms
             $this->add_hook('refresh', array($this, 'refresh'));
             $this->register_action('plugin.alarms', array($this, 'alarms_action'));
@@ -119,6 +113,12 @@
      */
     public function startup($args)
     {
+        if ($this->rc->output && $this->rc->output->type == 'html') {
+            $this->rc->output->set_env('libcal_settings', $this->load_settings());
+            $this->include_script('libcalendaring.js');
+            $this->include_stylesheet($this->local_skin_path() . '/libcal.css');
+        }
+
         if ($args['task'] == 'mail') {
             if ($args['action'] == 'show' || $args['action'] == 'preview') {
                 $this->add_hook('message_load', array($this, 'mail_message_load'));
@@ -361,32 +361,37 @@
     }
 
     /**
-     * Get a list of email addresses of the current user (from login and identities)
+     * Get a list of email addresses of the given user (from login and identities)
+     *
+     * @param string User Email (default to current user)
+     * @return array Email addresses related to the user
      */
-    public function get_user_emails()
+    public function get_user_emails($user = null)
     {
-        static $emails;
+        static $_emails = array();
+
+        if (empty($user)) {
+            $user = $this->rc->user->get_username();
+        }
 
         // return cached result
-        if (is_array($emails)) {
-            return $emails;
+        if (is_array($_emails[$user])) {
+            return $_emails[$user];
         }
 
-        $emails = array();
+        $emails = array($user);
         $plugin = $this->rc->plugins->exec_hook('calendar_user_emails', array('emails' => $emails));
         $emails = array_map('strtolower', $plugin['emails']);
 
-        if ($plugin['abort']) {
-            return $emails;
-        }
-
-        $emails[] = $this->rc->user->get_username();
-        foreach ($this->rc->user->list_emails() as $identity) {
-            $emails[] = strtolower($identity['email']);
+        // add all emails from the current user's identities
+        if (!$plugin['abort'] && ($user == $this->rc->user->get_username())) {
+            foreach ($this->rc->user->list_emails() as $identity) {
+                $emails[] = strtolower($identity['email']);
+            }
         }
 
-        $emails = array_unique($emails);
-        return $emails;
+        $_emails[$user] = array_unique($emails);
+        return $_emails[$user];
     }
 
     /**
@@ -609,7 +614,7 @@
                 }
             }
 
-            if ($notify_time && (!$notify_at || ($notify_time < $notify_at && $notify_time > $expires))) {
+            if ($notify_time && (!$notify_at || ($notify_time > $notify_at && $notify_time > $expires))) {
                 $notify_at = $notify_time;
                 $action = $alarm['action'];
                 $alarm_prop = $alarm;
@@ -1217,6 +1222,8 @@
 
         $attrib['src'] = './?' . str_replace('_frame=', ($ctype_primary == 'text' ? '_show=' : '_preload='), $_SERVER['QUERY_STRING']);
 
+        $this->rc->output->add_gui_object('attachmentframe', $attrib['id']);
+
         return html::iframe($attrib);
     }
 
@@ -1225,12 +1232,23 @@
      */
     public function attachment_header($attrib = array())
     {
-        $table = new html_table(array('cols' => 3));
+        $rcmail = rcmail::get_instance();
+        $dl_link = strtolower($attrib['downloadlink']) == 'true';
+        $dl_url = $this->rc->url(array('_frame' => null, '_download' => 1) + $_GET);
+
+        $table = new html_table(array('cols' => $dl_link ? 3 : 2));
 
         if (!empty($this->attachment['name'])) {
             $table->add('title', Q($this->rc->gettext('filename')));
             $table->add('header', Q($this->attachment['name']));
-            $table->add('download-link', html::a('?'.str_replace('_frame=', '_download=', $_SERVER['QUERY_STRING']), Q($this->rc->gettext('download'))));
+            if ($dl_link) {
+                $table->add('download-link', html::a($dl_url, Q($this->rc->gettext('download'))));
+            }
+        }
+
+        if (!empty($this->attachment['mimetype'])) {
+            $table->add('title', Q($this->rc->gettext('type')));
+            $table->add('header', Q($this->attachment['mimetype']));
         }
 
         if (!empty($this->attachment['size'])) {
@@ -1238,6 +1256,8 @@
             $table->add('header', Q(show_bytes($this->attachment['size'])));
         }
 
+        $this->rc->output->set_env('attachment_download_url', $dl_url);
+
         return $table->show($attrib);
     }
 
@@ -1440,7 +1460,12 @@
             $k = strtoupper($k);
             switch ($k) {
             case 'UNTIL':
-                $val = $val->format('Ymd\THis');
+                // convert to UTC according to RFC 5545
+                if (is_a($val, 'DateTime')) {
+                    $until = clone $val;
+                    $until->setTimezone(new DateTimeZone('UTC'));
+                    $val = $until->format('Ymd\THis\Z');
+                }
                 break;
             case 'RDATE':
             case 'EXDATE':

roundcubemail-plugins-kolab-3.2.2.tar.gz/plugins/libcalendaring/libvcalendar.php -> roundcubemail-plugins-kolab-3.2.3.tar.gz/plugins/libcalendaring/libvcalendar.php Changed

roundcubemail-plugins-kolab-3.2.3.tar.gz/plugins/libcalendaring/tests/libcalendaring.php Added

@@ -0,0 +1,164 @@
+<?php
+
+/**
+ * libcalendaring plugin's utility functions tests
+ *
+ * @author Thomas Bruederli <bruederli@kolabsys.com>
+ *
+ * Copyright (C) 2015, Kolab Systems AG <contact@kolabsys.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+class libcalendaring_test extends PHPUnit_Framework_TestCase
+{
+    function setUp()
+    {
+        require_once __DIR__ . '/../libcalendaring.php';
+    }
+
+    /**
+     * libcalendaring::parse_alaram_value()
+     */
+    function test_parse_alaram_value()
+    {
+        $alarm = libcalendaring::parse_alaram_value('-15M');
+        $this->assertEquals('15', $alarm[0]);
+        $this->assertEquals('-M', $alarm[1]);
+        $this->assertEquals('-PT15M', $alarm[3]);
+
+        $alarm = libcalendaring::parse_alaram_value('-PT5H');
+        $this->assertEquals('5',  $alarm[0]);
+        $this->assertEquals('-H', $alarm[1]);
+
+        $alarm = libcalendaring::parse_alaram_value('P0DT1H0M0S');
+        $this->assertEquals('1',  $alarm[0]);
+        $this->assertEquals('+H', $alarm[1]);
+
+        // FIXME: this should return something like (1140 + 120 + 30)M
+        $alarm = libcalendaring::parse_alaram_value('-P1DT2H30M');
+        // $this->assertEquals('1590', $alarm[0]);
+        // $this->assertEquals('-M',   $alarm[1]);
+
+        $alarm = libcalendaring::parse_alaram_value('@1420722000');
+        $this->assertInstanceOf('DateTime', $alarm[0]);
+    }
+
+    /**
+     * libcalendaring::get_next_alarm()
+     */
+    function test_get_next_alarm()
+    {
+        // alarm 10 minutes before event
+        $date = date('Ymd', strtotime('today + 2 days'));
+        $event = array(
+            'start' => new DateTime($date . 'T160000Z'),
+            'end'   => new DateTime($date . 'T180000Z'),
+            'valarms' => array(
+                array(
+                    'trigger' => '-PT10M',
+                    'action'  => 'DISPLAY',
+                ),
+            ),
+        );
+        $alarm = libcalendaring::get_next_alarm($event);
+        $this->assertEquals($event['valarms'][0]['action'], $alarm['action']);
+        $this->assertEquals(strtotime($date . 'T155000Z'), $alarm['time']);
+
+        // alarm 1 hour after before event
+        $event['valarms'] = array(
+            array(
+                'trigger' => '+PT1H',
+            ),
+        );
+        $alarm = libcalendaring::get_next_alarm($event);
+        $this->assertEquals('DISPLAY', $alarm['action']);
+        $this->assertEquals(strtotime($date . 'T190000Z'), $alarm['time']);
+
+        // ignore past alarms
+        $event['start'] = new DateTime('today 22:00:00');
+        $event['end']   = new DateTime('today 23:00:00');
+        $event['valarms'] = array(
+            array(
+                'trigger' => '-P2D',
+                'action'  => 'EMAIL',
+            ),
+            array(
+                'trigger' => '-PT30M',
+                'action'  => 'DISPLAY',
+            ),
+        );
+        $alarm = libcalendaring::get_next_alarm($event);
+        $this->assertEquals('DISPLAY', $alarm['action']);
+        $this->assertEquals(strtotime('today 21:30:00'), $alarm['time']);
+
+        // absolute alarm date/time
+        $event['valarms'] = array(
+            array('trigger' => new DateTime('today 20:00:00'))
+        );
+        $alarm = libcalendaring::get_next_alarm($event);
+        $this->assertEquals($event['valarms'][0]['trigger']->format('U'), $alarm['time']);
+
+        // no alarms for cancelled events
+        $event['status'] = 'CANCELLED';
+        $alarm = libcalendaring::get_next_alarm($event);
+        $this->assertEquals(null, $alarm);
+    }
+
+    /**
+     * libcalendaring::part_is_vcalendar()
+     */
+    function test_part_is_vcalendar()
+    {
+        $part = new StdClass;
+        $part->mimetype = 'text/plain';
+        $part->filename = 'event.ics';
+
+        $this->assertFalse(libcalendaring::part_is_vcalendar($part));
+
+        $part->mimetype = 'text/calendar';
+        $this->assertTrue(libcalendaring::part_is_vcalendar($part));
+
+        $part->mimetype = 'text/x-vcalendar';
+        $this->assertTrue(libcalendaring::part_is_vcalendar($part));
+
+        $part->mimetype = 'application/ics';
+        $this->assertTrue(libcalendaring::part_is_vcalendar($part));
+
+        $part->mimetype = 'application/x-any';
+        $this->assertTrue(libcalendaring::part_is_vcalendar($part));
+    }
+
+    /**
+     * libcalendaring::to_rrule()
+     */
+    function test_to_rrule()
+    {
+        $rrule = array(
+            'FREQ' => 'MONTHLY',
+            'BYDAY' => '2WE',
+            'INTERVAL' => 2,
+            'UNTIL' => new DateTime('2025-05-01 18:00:00 CEST'),
+        );
+
+        $s = libcalendaring::to_rrule($rrule);
+
+        $this->assertRegExp('/FREQ='.$rrule['FREQ'].'/',          $s, "Recurrence Frequence");
+        $this->assertRegExp('/INTERVAL='.$rrule['INTERVAL'].'/',  $s, "Recurrence Interval");
+        $this->assertRegExp('/BYDAY='.$rrule['BYDAY'].'/',        $s, "Recurrence BYDAY");
+        $this->assertRegExp('/UNTIL=20250501T160000Z/',           $s, "Recurrence End date (in UTC)");
+    }
+
+}
+

roundcubemail-plugins-kolab-3.2.2.tar.gz/plugins/libcalendaring/tests/libvcalendar.php -> roundcubemail-plugins-kolab-3.2.3.tar.gz/plugins/libcalendaring/tests/libvcalendar.php Changed

@@ -322,6 +322,7 @@
         $this->assertEquals('IN-PROCESS',   $task['status'],  "Task status property");
         $this->assertEquals(1, count($task['x-custom']),      "Custom properties");
         $this->assertEquals(4, count($task['categories']));
+        $this->assertEquals('1234567890-12345678-PARENT', $task['parent_id'], "Parent Relation");
     }
 
     /**
@@ -370,7 +371,7 @@
         $rrule = $event['recurrence'];
         $this->assertRegExp('/RRULE:.*FREQ='.$rrule['FREQ'].'/',          $ics, "Export Recurrence Frequence");
         $this->assertRegExp('/RRULE:.*INTERVAL='.$rrule['INTERVAL'].'/',  $ics, "Export Recurrence Interval");
-        $this->assertRegExp('/RRULE:.*UNTIL=20140718/',                   $ics, "Export Recurrence End date");
+        $this->assertRegExp('/RRULE:.*UNTIL=20140718T215959Z/',           $ics, "Export Recurrence End date");
         $this->assertRegExp('/RRULE:.*BYDAY='.$rrule['BYDAY'].'/',        $ics, "Export Recurrence BYDAY");
         $this->assertRegExp('/EXDATE.*:20131218/',     $ics, "Export Recurrence EXDATE");

roundcubemail-plugins-kolab-3.2.2.tar.gz/plugins/libcalendaring/tests/resources/vtodo.ics -> roundcubemail-plugins-kolab-3.2.3.tar.gz/plugins/libcalendaring/tests/resources/vtodo.ics Changed

roundcubemail-plugins-kolab-3.2.2.tar.gz/plugins/libkolab/SQL/mysql.initial.sql -> roundcubemail-plugins-kolab-3.2.3.tar.gz/plugins/libkolab/SQL/mysql.initial.sql Changed

@@ -31,7 +31,7 @@
   `changed` DATETIME DEFAULT NULL,
   `data` LONGTEXT NOT NULL,
   `xml` LONGBLOB NOT NULL,
-  `tags` VARCHAR(255) NOT NULL,
+  `tags` TEXT NOT NULL,
   `words` TEXT NOT NULL,
   `type` VARCHAR(32) CHARACTER SET ascii NOT NULL,
   `name` VARCHAR(255) NOT NULL,
@@ -55,7 +55,7 @@
   `changed` DATETIME DEFAULT NULL,
   `data` LONGTEXT NOT NULL,
   `xml` LONGBLOB NOT NULL,
-  `tags` VARCHAR(255) NOT NULL,
+  `tags` TEXT NOT NULL,
   `words` TEXT NOT NULL,
   `dtstart` DATETIME,
   `dtend` DATETIME,
@@ -75,7 +75,7 @@
   `changed` DATETIME DEFAULT NULL,
   `data` LONGTEXT NOT NULL,
   `xml` LONGBLOB NOT NULL,
-  `tags` VARCHAR(255) NOT NULL,
+  `tags` TEXT NOT NULL,
   `words` TEXT NOT NULL,
   `dtstart` DATETIME,
   `dtend` DATETIME,
@@ -95,7 +95,7 @@
   `changed` DATETIME DEFAULT NULL,
   `data` LONGTEXT NOT NULL,
   `xml` LONGBLOB NOT NULL,
-  `tags` VARCHAR(255) NOT NULL,
+  `tags` TEXT NOT NULL,
   `words` TEXT NOT NULL,
   `dtstart` DATETIME,
   `dtend` DATETIME,
@@ -115,7 +115,7 @@
   `changed` DATETIME DEFAULT NULL,
   `data` LONGTEXT NOT NULL,
   `xml` LONGBLOB NOT NULL,
-  `tags` VARCHAR(255) NOT NULL,
+  `tags` TEXT NOT NULL,
   `words` TEXT NOT NULL,
   CONSTRAINT `fk_kolab_cache_note_folder` FOREIGN KEY (`folder_id`)
     REFERENCES `kolab_folders`(`folder_id`) ON DELETE CASCADE ON UPDATE CASCADE,
@@ -133,7 +133,7 @@
   `changed` DATETIME DEFAULT NULL,
   `data` LONGTEXT NOT NULL,
   `xml` LONGBLOB NOT NULL,
-  `tags` VARCHAR(255) NOT NULL,
+  `tags` TEXT NOT NULL,
   `words` TEXT NOT NULL,
   `filename` varchar(255) DEFAULT NULL,
   CONSTRAINT `fk_kolab_cache_file_folder` FOREIGN KEY (`folder_id`)
@@ -153,7 +153,7 @@
   `changed` DATETIME DEFAULT NULL,
   `data` LONGTEXT NOT NULL,
   `xml` LONGBLOB NOT NULL,
-  `tags` VARCHAR(255) NOT NULL,
+  `tags` TEXT NOT NULL,
   `words` TEXT NOT NULL,
   `type` VARCHAR(32) CHARACTER SET ascii NOT NULL,
   CONSTRAINT `fk_kolab_cache_configuration_folder` FOREIGN KEY (`folder_id`)
@@ -173,7 +173,7 @@
   `changed` DATETIME DEFAULT NULL,
   `data` LONGTEXT NOT NULL,
   `xml` LONGBLOB NOT NULL,
-  `tags` VARCHAR(255) NOT NULL,
+  `tags` TEXT NOT NULL,
   `words` TEXT NOT NULL,
   `dtstart` DATETIME,
   `dtend` DATETIME,
@@ -184,4 +184,4 @@
 ) /*!40000 ENGINE=INNODB */ /*!40101 CHARACTER SET utf8 COLLATE utf8_general_ci */;
 
 
-INSERT INTO `system` (`name`, `value`) VALUES ('libkolab-version', '2014021000');
+INSERT INTO `system` (`name`, `value`) VALUES ('libkolab-version', '2015011600');

roundcubemail-plugins-kolab-3.2.3.tar.gz/plugins/libkolab/SQL/mysql/2015011600.sql Added

roundcubemail-plugins-kolab-3.2.3.tar.gz/plugins/libkolab/SQL/oracle Added

roundcubemail-plugins-kolab-3.2.2.tar.gz/plugins/libkolab/SQL/oracle.initial.sql -> roundcubemail-plugins-kolab-3.2.3.tar.gz/plugins/libkolab/SQL/oracle.initial.sql Changed

@@ -36,7 +36,7 @@
     "changed" timestamp DEFAULT NULL,
     "data" clob NOT NULL,
     "xml" clob NOT NULL,
-    "tags" varchar(255) DEFAULT NULL,
+    "tags" clob DEFAULT NULL,
     "words" clob DEFAULT NULL,
     "type" varchar(32) NOT NULL,
     "name" varchar(255) DEFAULT NULL,
@@ -59,7 +59,7 @@
     "changed" timestamp DEFAULT NULL,
     "data" clob NOT NULL,
     "xml" clob NOT NULL,
-    "tags" varchar(255) DEFAULT NULL,
+    "tags" clob DEFAULT NULL,
     "words" clob DEFAULT NULL,
     "dtstart" timestamp DEFAULT NULL,
     "dtend" timestamp DEFAULT NULL,
@@ -78,7 +78,7 @@
     "changed" timestamp DEFAULT NULL,
     "data" clob NOT NULL,
     "xml" clob NOT NULL,
-    "tags" varchar(255) DEFAULT NULL,
+    "tags" clob DEFAULT NULL,
     "words" clob DEFAULT NULL,
     "dtstart" timestamp DEFAULT NULL,
     "dtend" timestamp DEFAULT NULL,
@@ -97,7 +97,7 @@
     "changed" timestamp DEFAULT NULL,
     "data" clob NOT NULL,
     "xml" clob NOT NULL,
-    "tags" varchar(255) DEFAULT NULL,
+    "tags" clob DEFAULT NULL,
     "words" clob DEFAULT NULL,
     "dtstart" timestamp DEFAULT NULL,
     "dtend" timestamp DEFAULT NULL,
@@ -116,7 +116,7 @@
     "changed" timestamp DEFAULT NULL,
     "data" clob NOT NULL,
     "xml" clob NOT NULL,
-    "tags" varchar(255) DEFAULT NULL,
+    "tags" clob DEFAULT NULL,
     "words" clob DEFAULT NULL,
     PRIMARY KEY ("folder_id", "msguid")
 );
@@ -133,7 +133,7 @@
     "changed" timestamp DEFAULT NULL,
     "data" clob NOT NULL,
     "xml" clob NOT NULL,
-    "tags" varchar(255) DEFAULT NULL,
+    "tags" clob DEFAULT NULL,
     "words" clob DEFAULT NULL,
     "filename" varchar(255) DEFAULT NULL,
     PRIMARY KEY ("folder_id", "msguid")
@@ -152,7 +152,7 @@
     "changed" timestamp DEFAULT NULL,
     "data" clob NOT NULL,
     "xml" clob NOT NULL,
-    "tags" varchar(255) DEFAULT NULL,
+    "tags" clob DEFAULT NULL,
     "words" clob DEFAULT NULL,
     "type" varchar(32) NOT NULL,
     PRIMARY KEY ("folder_id", "msguid")
@@ -171,7 +171,7 @@
     "changed" timestamp DEFAULT NULL,
     "data" clob NOT NULL,
     "xml" clob NOT NULL,
-    "tags" varchar(255) DEFAULT NULL,
+    "tags" clob DEFAULT NULL,
     "words" clob DEFAULT NULL,
     "dtstart" timestamp DEFAULT NULL,
     "dtend" timestamp DEFAULT NULL,
@@ -181,4 +181,4 @@
 CREATE INDEX "kolab_cache_fb_uid2msguid" ON "kolab_cache_freebusy" ("folder_id", "uid", "msguid");
 
 
-INSERT INTO "system" ("name", "value") VALUES ('libkolab-version', '2014021000');
+INSERT INTO "system" ("name", "value") VALUES ('libkolab-version', '2015011600');

roundcubemail-plugins-kolab-3.2.3.tar.gz/plugins/libkolab/SQL/oracle/2015011600.sql Added

@@ -0,0 +1,40 @@
+-- direct change from varchar to clob does not work, need temp column (#4257)
+ALTER TABLE "kolab_cache_contact" ADD "tags1" clob DEFAULT NULL;
+UPDATE "kolab_cache_contact" SET "tags1" = "tags";
+ALTER TABLE "kolab_cache_contact" DROP COLUMN "tags";
+ALTER TABLE "kolab_cache_contact" RENAME COLUMN "tags1" TO "tags";
+
+ALTER TABLE "kolab_cache_event" ADD "tags1" clob DEFAULT NULL;
+UPDATE "kolab_cache_event" SET "tags1" = "tags";
+ALTER TABLE "kolab_cache_event" DROP COLUMN "tags";
+ALTER TABLE "kolab_cache_event" RENAME COLUMN "tags1" TO "tags";
+
+ALTER TABLE "kolab_cache_task" ADD "tags1" clob DEFAULT NULL;
+UPDATE "kolab_cache_task" SET "tags1" = "tags";
+ALTER TABLE "kolab_cache_task" DROP COLUMN "tags";
+ALTER TABLE "kolab_cache_task" RENAME COLUMN "tags1" TO "tags";
+
+ALTER TABLE "kolab_cache_journal" ADD "tags1" clob DEFAULT NULL;
+UPDATE "kolab_cache_journal" SET "tags1" = "tags";
+ALTER TABLE "kolab_cache_journal" DROP COLUMN "tags";
+ALTER TABLE "kolab_cache_journal" RENAME COLUMN "tags1" TO "tags";
+
+ALTER TABLE "kolab_cache_note" ADD "tags1" clob DEFAULT NULL;
+UPDATE "kolab_cache_note" SET "tags1" = "tags";
+ALTER TABLE "kolab_cache_note" DROP COLUMN "tags";
+ALTER TABLE "kolab_cache_note" RENAME COLUMN "tags1" TO "tags";
+
+ALTER TABLE "kolab_cache_file" ADD "tags1" clob DEFAULT NULL;
+UPDATE "kolab_cache_file" SET "tags1" = "tags";
+ALTER TABLE "kolab_cache_file" DROP COLUMN "tags";
+ALTER TABLE "kolab_cache_file" RENAME COLUMN "tags1" TO "tags";
+
+ALTER TABLE "kolab_cache_configuration" ADD "tags1" clob DEFAULT NULL;
+UPDATE "kolab_cache_configuration" SET "tags1" = "tags";
+ALTER TABLE "kolab_cache_configuration" DROP COLUMN "tags";
+ALTER TABLE "kolab_cache_configuration" RENAME COLUMN "tags1" TO "tags";
+
+ALTER TABLE "kolab_cache_freebusy" ADD "tags1" clob DEFAULT NULL;
+UPDATE "kolab_cache_freebusy" SET "tags1" = "tags";
+ALTER TABLE "kolab_cache_freebusy" DROP COLUMN "tags";
+ALTER TABLE "kolab_cache_freebusy" RENAME COLUMN "tags1" TO "tags";

roundcubemail-plugins-kolab-3.2.2.tar.gz/plugins/libkolab/composer.json -> roundcubemail-plugins-kolab-3.2.3.tar.gz/plugins/libkolab/composer.json Changed

roundcubemail-plugins-kolab-3.2.2.tar.gz/plugins/libkolab/lib/kolab_storage_cache.php -> roundcubemail-plugins-kolab-3.2.3.tar.gz/plugins/libkolab/lib/kolab_storage_cache.php Changed

roundcubemail-plugins-kolab-3.2.2.tar.gz/plugins/libkolab/lib/kolab_storage_config.php -> roundcubemail-plugins-kolab-3.2.3.tar.gz/plugins/libkolab/lib/kolab_storage_config.php Changed

roundcubemail-plugins-kolab-3.2.2.tar.gz/plugins/odfviewer/composer.json -> roundcubemail-plugins-kolab-3.2.3.tar.gz/plugins/odfviewer/composer.json Changed

roundcubemail-plugins-kolab-3.2.2.tar.gz/plugins/odfviewer/odfviewer.php -> roundcubemail-plugins-kolab-3.2.3.tar.gz/plugins/odfviewer/odfviewer.php Changed

roundcubemail-plugins-kolab-3.2.2.tar.gz/plugins/pdfviewer/composer.json -> roundcubemail-plugins-kolab-3.2.3.tar.gz/plugins/pdfviewer/composer.json Changed

roundcubemail-plugins-kolab-3.2.2.tar.gz/plugins/tasklist/composer.json -> roundcubemail-plugins-kolab-3.2.3.tar.gz/plugins/tasklist/composer.json Changed

roundcubemail-plugins-kolab-3.2.2.tar.gz/plugins/tasklist/drivers/kolab/tasklist_kolab_driver.php -> roundcubemail-plugins-kolab-3.2.3.tar.gz/plugins/tasklist/drivers/kolab/tasklist_kolab_driver.php Changed

@@ -825,7 +825,7 @@
     private function get_links($uid)
     {
         $config = kolab_storage_config::get_instance();
-        return array_map(array($this, '_convert_message_uri'), $config->get_object_links($uid));
+        return $config->get_object_links($uid);
     }
 
     /**
@@ -838,41 +838,12 @@
             $links = array();
         }
 
-        // convert the given (simplified) message links into absolute IMAP URIs
-        $links = array_map(function($link) {
-            $url = parse_url(substr($link, 8));
-            parse_str($url['query'], $linkref);
-
-            $path = explode('/', $url['path']);
-            $linkref['uid'] = array_pop($path);
-            $linkref['folder'] = join('/', array_map('rawurldecode', $path));
-
-            return kolab_storage_config::build_member_url($linkref);
-        }, $links);
-
         $config = kolab_storage_config::get_instance();
         $remove = array_diff($config->get_object_links($uid), $links);
         return $config->save_object_links($uid, $links, $remove);
     }
 
     /**
-     * Simplify the given message URI by converting the mailbox
-     * part into a relative IMAP path valid for the current user.
-     */
-    protected function _convert_message_uri($uri)
-    {
-        if (strpos($uri, 'imap:///') === 0) {
-            $linkref = kolab_storage_config::parse_member_url($uri);
-
-            return 'imap:///' . implode('/', array_map('rawurlencode', explode('/', $linkref['folder']))) .
-                '/' . $linkref['uid'] .
-                '?' . http_build_query($linkref['params'], '', '&');
-        }
-
-        return $uri;
-    }
-
-    /**
      * Extract uid + list identifiers from the given input
      *
      * @param mixed array or string with task identifier(s)
@@ -1289,14 +1260,21 @@
     }
 
     /**
-     * Build a URI representing the given message reference
+     * Build a struct representing the given message reference
      *
-     * @see tasklist_driver::get_message_uri()
+     * @see tasklist_driver::get_message_reference()
      */
-    public function get_message_uri($headers, $folder)
+    public function get_message_reference($uri_or_headers, $folder = null)
     {
-        $uri = kolab_storage_config::get_message_uri($headers, $folder);
-        return $this->_convert_message_uri($uri);
+        if (is_object($uri_or_headers)) {
+            $uri_or_headers = kolab_storage_config::get_message_uri($uri_or_headers, $folder);
+        }
+
+        if (is_string($uri_or_headers)) {
+            return kolab_storage_config::get_message_reference($uri_or_headers, 'task');
+        }
+
+        return false;
     }
 
     /**

roundcubemail-plugins-kolab-3.2.2.tar.gz/plugins/tasklist/drivers/tasklist_driver.php -> roundcubemail-plugins-kolab-3.2.3.tar.gz/plugins/tasklist/drivers/tasklist_driver.php Changed

roundcubemail-plugins-kolab-3.2.2.tar.gz/plugins/tasklist/skins/larry/tasklist.css -> roundcubemail-plugins-kolab-3.2.3.tar.gz/plugins/tasklist/skins/larry/tasklist.css Changed

@@ -30,10 +30,6 @@
 	display: none;
 }
 
-body.tasklist.attachmentwin #mainscreen {
-	top: 32px;
-}
-
 .tasklistview #mainscreen {
 	min-width: 1000px !important;
 	min-height: 520px !important;
@@ -1393,6 +1389,58 @@
 }
 
 
+.tasklist.attachmentwin #attachmenttoolbar {
+	position: relative;
+	top: -6px;
+	height: 40px;
+}
+
+.tasklist.attachmentwin #attachmentcontainer {
+	position: absolute;
+	top: 0;
+	left: 232px;
+	right: 0;
+	bottom: 0;
+}
+
+.tasklist.attachmentwin #attachmentframe {
+	width: 100%;
+	height: 100%;
+	border: 0;
+	background-color: #fff;
+	border-radius: 4px;
+}
+
+.tasklist.attachmentwin #partheader {
+	position: absolute;
+	top: 0;
+	left: 0;
+	width: 220px;
+	bottom: 0;
+}
+
+.tasklist.attachmentwin #partheader table {
+	table-layout: fixed;
+	overflow: hidden;
+}
+
+.tasklist.attachmentwin #partheader table td {
+	color: #666;
+	padding: 4px 6px;
+	text-overflow: ellipsis;
+	overflow: hidden;
+}
+
+.tasklist.attachmentwin #partheader table td.header {
+	font-weight: bold;
+}
+
+.tasklist.attachmentwin #partheader table td.title {
+	width: 60px;
+	padding-right: 0;
+}
+
+
 /** Special hacks for IE7 **/
 /** They need to be in this file to also affect the task-create dialog embedded in mail view **/

roundcubemail-plugins-kolab-3.2.2.tar.gz/plugins/tasklist/skins/larry/templates/attachment.html -> roundcubemail-plugins-kolab-3.2.3.tar.gz/plugins/tasklist/skins/larry/templates/attachment.html Changed

@@ -7,26 +7,59 @@
 <body class="extwin tasklist attachmentwin">
 
 <div id="header">
-	<div id="topnav">
-		<div class="topright">
-			<a href="#close" class="closelink" onclick="self.close()"><roundcube:label name="close" /></a>
-		</div>
+<div id="topline" role="banner" aria-labelledby="aria-label-topnav">
+	<div class="topleft">
+		<roundcube:container name="topline-left" id="topline-left" />
+	</div>
+	<roundcube:container name="topline-center" id="topline-center" />
+	<div class="topright">
+		<roundcube:container name="topline-right" id="topline-right" />
+		<roundcube:button name="close" type="link" label="close" class="closelink" onclick="self.close()" />
 	</div>
-
-	<br style="clear:both" />
+</div>
 </div>
 
 <div id="mainscreen">
-	<div id="partheader" class="uibox">
-	<roundcube:object name="plugin.attachmentcontrols" class="headers-table" />
+
+<h1 class="voice"><roundcube:label name="attachment" />: <roundcube:var name="env:filename" /></h1>
+
+<h2 id="aria-label-toolbar" class="voice"><roundcube:label name="arialabeltoolbar" /></h2>
+<div id="attachmenttoolbar" class="toolbar fullwidth" role="toolbar" aria-labelledby="aria-label-toolbar">
+	<roundcube:button command="download-attachment" type="link" class="button download disabled" classAct="button download" classSel="button download pressed" label="download" title="download" />
+	<roundcube:button command="print-attachment" type="link" class="button print disabled" classAct="button print" classSel="button print pressed" label="print" title="print" />
+	<roundcube:container name="toolbar" id="messagetoolbar" />
+</div>
+
+<div id="mainscreencontent">
+
+	<div id="partheader" class="uibox listbox" role="contentinfo" aria-labelledby="aria-label-contentinfo">
+		<h2 class="boxtitle" id="aria-label-contentinfo"><roundcube:label name="properties" /></h2>
+		<div class="scroller">
+			<roundcube:object name="plugin.attachmentcontrols" class="listing" />
+		</div>
 	</div>
 
-	<div id="attachmentcontainer" class="uibox">
-	<roundcube:object name="plugin.attachmentframe" id="attachmentframe" class="header-table" style="width:100%" />
+	<div id="attachmentcontainer" class="uibox" role="main" aria-labelledby="aria-label-messagepart">
+		<h2 id="aria-label-messagepart" class="voice"><roundcube:label name="arialabelattachmentpreview" /></h2>
+		<div class="iframebox">
+		<roundcube:object name="plugin.attachmentframe" id="attachmentframe" frameborder="0" title="arialabelattachmentpreview" />
+		</div>
 	</div>
 
 </div>
 
+</div>
+
+<script type="text/javascript">
+
+$(document).ready(function() {
+	if (window.rcube_splitter) {
+		new rcube_splitter({ id:'mailpartsplitterv', p1:'#partheader', p2:'#attachmentcontainer',
+			orientation:'v', relative:true, start:226, min:150, size:12}).init();
+	}
+});
+
+</script>
+
 </body>
 </html>
-

roundcubemail-plugins-kolab-3.2.2.tar.gz/plugins/tasklist/tasklist.js -> roundcubemail-plugins-kolab-3.2.3.tar.gz/plugins/tasklist/tasklist.js Changed

@@ -129,6 +129,7 @@
     var parse_datetime = this.parse_datetime;
     var date2unixtime = this.date2unixtime;
     var fromunixtime = this.fromunixtime;
+    var render_message_links = this.render_message_links;
 
     /**
      * initialize the tasks UI
@@ -597,6 +598,12 @@
             return false;
         });
 
+        // register click handler for message delete buttons
+        $('#taskedit-links').on('click', 'li a.delete', function(e) {
+            remove_link(e.target);
+            return false;
+        });
+
         // handle global document clicks: close popup menus
         $(document.body).click(clear_popups);
 
@@ -1840,7 +1847,7 @@
         // build attachments list
         $('#task-links').hide();
         if ($.isArray(rec.links) && rec.links.length) {
-            task_show_links(rec.links || [], $('#task-links').children('.task-text'));
+            render_message_links(rec.links || [], $('#task-links').children('.task-text'), false, 'tasklist');
             $('#task-links').show();
         }
 
@@ -1937,7 +1944,7 @@
 
             buttons.push({
                 text: rcmail.gettext('delete','tasklist'),
-                'class':'delete',
+                'class': 'delete',
                 click: function() {
                     if (delete_task(me.selected_task.id))
                         $dialog.dialog('close');
@@ -2052,7 +2059,7 @@
         me.set_alarms_edit('#taskedit-alarms', action != 'new' && rec.valarms ? rec.valarms : []);
 
         if ($.isArray(rec.links) && rec.links.length) {
-            task_show_links(rec.links, $('#taskedit-links .task-text'), true);
+            render_message_links(rec.links, $('#taskedit-links .task-text'), true, 'tasklist');
             $('#taskedit-links').show();
         }
         else {
@@ -2127,8 +2134,11 @@
         $('#taskedit').tabs('option', 'active', 0);
 
         // define dialog buttons
-        var buttons = {};
-        buttons[rcmail.gettext('save', 'tasklist')] = function() {
+        var buttons = [];
+        buttons.push({
+            text: rcmail.gettext('save', 'tasklist'),
+            'class': 'mainaction',
+            click: function() {
             var data = me.selected_task;
             data._status_before = me.selected_task.status + '';
 
@@ -2222,18 +2232,26 @@
 
             if (save_task(data, action))
                 $dialog.dialog('close');
-        };
+        }  // end click:
+        });
 
         if (action != 'new') {
-            buttons[rcmail.gettext('delete', 'tasklist')] = function() {
-                if (delete_task(rec.id))
-                    $dialog.dialog('close');
-            };
+            buttons.push({
+                text: rcmail.gettext('delete', 'tasklist'),
+                'class': 'delete',
+                click: function() {
+                    if (delete_task(rec.id))
+                        $dialog.dialog('close');
+                }
+            });
         }
 
-        buttons[rcmail.gettext('cancel', 'tasklist')] = function() {
-            $dialog.dialog('close');
-        };
+        buttons.push({
+            text: rcmail.gettext('cancel', 'tasklist'),
+            click: function() {
+                $dialog.dialog('close');
+            }
+        });
 
         // open jquery UI dialog
         $dialog.dialog({
@@ -2241,9 +2259,6 @@
           resizable: (!bw.ie6 && !bw.ie7),  // disable for performance reasons
           closeOnEscape: false,
           title: rcmail.gettext((action == 'edit' ? 'edittask' : 'newtask'), 'tasklist'),
-          open: function() {
-              $dialog.parent().find('.ui-button:not(.ui-dialog-titlebar-close)').first().addClass('mainaction');
-          },
           close: function() {
               rcmail.ksearch_blur();
               editform.hide().appendTo(document.body);
@@ -2350,48 +2365,15 @@
     /**
      *
      */
-    function task_show_links(links, container, edit)
+    function remove_link(elem)
     {
-        var dellink, ul = $('<ul>').addClass('attachmentslist');
+        var $elem = $(elem), uri = $elem.attr('data-uri');
 
-        $.each(links, function(i, link) {
-            var li = $('<li>').addClass('link')
-                .addClass('message eml')
-                .append($('<a>')
-                    .attr('href', link.mailurl)
-                    .addClass('messagelink')
-                    .text(link.subject || link.uri)
-                )
-                .appendTo(ul);
-
-            // add icon to remove the link
-            if (edit) {
-                $('<a>')
-                    .attr('href', '#delete')
-                    .attr('title', rcmail.gettext('removelink','tasklist'))
-                    .addClass('delete')
-                    .text(rcmail.gettext('delete'))
-                    .click({ uri:link.uri }, function(e) {
-                        remove_link(this, e.data.uri);
-                        return false;
-                    })
-                    .appendTo(li);
-            }
-        });
-
-        container.empty().append(ul);
-    }
-
-    /**
-     *
-     */
-    function remove_link(elem, uri)
-    {
         // remove the link item matching the given uri
         me.selected_task.links = $.grep(me.selected_task.links, function(link) { return link.uri != uri; });
 
         // remove UI list item
-        $(elem).hide().closest('li').addClass('deleted');
+        $elem.hide().closest('li').addClass('deleted');
     }
 
     /**
@@ -2465,6 +2447,7 @@
             html = rcmail.gettext('deletetasktconfirm','tasklist');
             buttons.push({
                 text: rcmail.gettext('delete','tasklist'),
+                'class': 'delete',
                 click: function() {
                     _delete_task(id, 0);
                     $(this).dialog('close');
@@ -2653,9 +2636,12 @@
         });
 
         // dialog buttons
-        var buttons = {};
+        var buttons = [];
 
-        buttons[rcmail.gettext('save','tasklist')] = function() {
+        buttons.push({
+            text: rcmail.gettext('save','tasklist'),
+            'class': 'mainaction',
+            click: function() {
             // do some input validation
             if (!name.val() || name.val().length < 2) {
                 alert(rcmail.gettext('invalidlistproperties', 'tasklist'));
@@ -2673,11 +2659,15 @@
             saving_lock = rcmail.set_busy(true, 'tasklist.savingdata');
             rcmail.http_post('tasklist', { action:(list.id ? 'edit' : 'new'), l:data });
             $dialog.dialog('close');
-        };
+        }  // end click:
+        });
 
-        buttons[rcmail.gettext('cancel','tasklist')] = function() {
-            $dialog.dialog('close');
-        };
+        buttons.push({
+            text: rcmail.gettext('cancel','tasklist'),
+            click: function() {
+                $dialog.dialog('close');
+            }
+        });

roundcubemail-plugins-kolab-3.2.2.tar.gz/plugins/tasklist/tasklist.php -> roundcubemail-plugins-kolab-3.2.3.tar.gz/plugins/tasklist/tasklist.php Changed

@@ -72,6 +72,7 @@
     function init()
     {
         $this->require_plugin('libcalendaring');
+        $this->require_plugin('jqueryui');
 
         $this->rc  = rcube::get_instance();
         $this->lib = libcalendaring::get_instance();
@@ -1098,8 +1099,8 @@
         // convert link URIs references into structs
         if (array_key_exists('links', $rec)) {
             foreach ((array)$rec['links'] as $i => $link) {
-                if (strpos($link, 'imap://') === 0) {
-                    $rec['links'][$i] = $this->get_message_reference($link);
+                if (strpos($link, 'imap://') === 0 && ($msgref = $this->driver->get_message_reference($link))) {
+                    $rec['links'][$i] = $msgref;
                 }
             }
         }
@@ -1253,7 +1254,6 @@
             $script_add .= rcmail_output::JS_OBJECT_NAME . ".gui_object('$obj', '$id');\n";
         }
 
-        echo html::tag('link', array('rel' => 'stylesheet', 'type' => 'text/css', 'href' => $this->url($this->local_skin_path() . '/tagedit.css'), 'nl' => true));
         echo html::tag('script', array('type' => 'text/javascript'),
             rcmail_output::JS_OBJECT_NAME . ".set_env(" . json_encode($env) . ");\n".
             rcmail_output::JS_OBJECT_NAME . ".add_label(" . json_encode($texts) . ");\n".
@@ -1395,8 +1395,8 @@
             $this->load_driver();
 
             // add a reference to the email message
-            if ($msguri = $this->driver->get_message_uri($message->headers, $mbox)) {
-                $task['links'] = array($this->get_message_reference($msguri));
+            if ($msgref = $this->driver->get_message_reference($message->headers, $mbox)) {
+                $task['links'] = array($msgref);
             }
             // copy mail attachments to task
             else if ($message->attachments && $this->driver->attachments) {
@@ -1603,45 +1603,6 @@
     }
 
     /**
-     * Resolve the email message reference from the given URI
-     */
-    public function get_message_reference($uri)
-    {
-        if (strpos($uri, 'imap:///') === 0) {
-            $url = parse_url(substr($uri, 8));
-            parse_str($url['query'], $params);
-
-            $path = explode('/', $url['path']);
-            $uid  = array_pop($path);
-            $folder = join('/', array_map('rawurldecode', $path));
-        }
-
-        if ($folder && $uid) {
-            // TODO: check if folder/uid still references an existing message
-            // TODO: validate message or resovle the new URI using the message-id parameter
-
-            $linkref = array(
-                'folder'  => $folder,
-                'uid'     => $uid,
-                'subject' => $params['subject'],
-                'uri'     => $uri,
-                'mailurl' => $this->rc->url(array(
-                    'task'   => 'mail',
-                    'action' => 'show',
-                    'mbox'   => $folder,
-                    'uid'    => $uid,
-                    'rel'    => 'task',
-                ))
-            );
-        }
-        else {
-            $linkref = array();
-        }
-
-        return $linkref;
-    }
-
-    /**
      * Import the full payload from a mail message attachment
      */
     public function mail_import_attachment()

roundcubemail-plugins-kolab-3.2.2.tar.gz/plugins/tasklist/tasklist_base.js -> roundcubemail-plugins-kolab-3.2.3.tar.gz/plugins/tasklist/tasklist_base.js Changed

roundcubemail-plugins-kolab-3.2.2.tar.gz/plugins/tasklist/tasklist_ui.php -> roundcubemail-plugins-kolab-3.2.3.tar.gz/plugins/tasklist/tasklist_ui.php Changed

@@ -32,34 +32,40 @@
     function __construct($plugin)
     {
         $this->plugin = $plugin;
-        $this->rc = $plugin->rc;
+        $this->rc     = $plugin->rc;
     }
 
     /**
-    * Calendar UI initialization and requests handlers
-    */
+     * Calendar UI initialization and requests handlers
+     */
     public function init()
     {
-        if ($this->ready)  // already done
+        if ($this->ready) {
             return;
+        }
 
         // add taskbar button
         $this->plugin->add_button(array(
-            'command' => 'tasks',
-            'class'   => 'button-tasklist',
-            'classsel' => 'button-tasklist button-selected',
+            'command'    => 'tasks',
+            'class'      => 'button-tasklist',
+            'classsel'   => 'button-tasklist button-selected',
             'innerclass' => 'button-inner',
-            'label'   => 'tasklist.navtitle',
+            'label'      => 'tasklist.navtitle',
         ), 'taskbar');
 
         $this->plugin->include_stylesheet($this->plugin->local_skin_path() . '/tasklist.css');
-        $this->plugin->include_script('tasklist_base.js');
 
-        // copy config to client
-        $this->rc->output->set_env('tasklist_settings', $this->load_settings());
+        if ($this->rc->task == 'mail' || $this->rc->task == 'tasks') {
+            jqueryui::tagedit();
+
+            $this->plugin->include_script('tasklist_base.js');
 
-        // initialize attendees autocompletion
-        $this->rc->autocomplete_init();
+            // copy config to client
+            $this->rc->output->set_env('tasklist_settings', $this->load_settings());
+
+            // initialize attendees autocompletion
+            $this->rc->autocomplete_init();
+        }
 
         $this->ready = true;
     }
@@ -151,7 +157,8 @@
         $this->plugin->register_handler('plugin.edit_attendees_notify', array($this, 'edit_attendees_notify'));
         $this->plugin->register_handler('plugin.task_rsvp_buttons', array($this->plugin->itip, 'itip_rsvp_buttons'));
 
-        $this->plugin->include_script('jquery.tagedit.js');
+        jqueryui::tagedit();
+
         $this->plugin->include_script('tasklist.js');
         $this->rc->output->include_script('treelist.js');
 
@@ -159,8 +166,6 @@
         if (in_array('libkolab', $this->plugin->api->loaded_plugins())) {
             $this->plugin->api->include_script('libkolab/js/folderlist.js');
         }
-
-        $this->plugin->include_stylesheet($this->plugin->local_skin_path() . '/tagedit.css');
     }
 
     /**

roundcubemail-plugins-kolab.dsc Changed

Changes of Revision 96