Kolab Groupware OBS

Changes of Revision 41

roundcubemail-plugins-kolab.spec Changed

@@ -24,20 +24,17 @@
 
 Name:       roundcubemail-plugins-kolab
 Version:    3.2
-Release:    0.2.dev20140214.git351f7d%{?dist}
+Release:    0.3.dev20140404.gitb86a301d%{?dist}
 Summary:    Kolab Groupware plugins for Roundcube Webmail
 
 Group:      Applications/Internet
 License:    AGPLv3+ and GPLv3+
 URL:        http://www.kolab.org
 
-# From git 351f7d61539ffd9b0e964d5349ba93cbd4f96b7b
+# From git b86a301d616a36a7a917b83d1ab8447f103b0ad8
 Source0:    http://git.kolab.org/%{name}/snapshot/%{name}-%{version}.tar.gz
 Source1:    kolab_logo.png
 
-Patch0:     roundcubemail-plugins-kolab-3.2-2863-kolab-storage-cache.patch
-Patch1:     roundcubemail-plugins-kolab-3.2-2867-mysql-initial.patch
-
 BuildRoot:  %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 BuildArch:  noarch
 
@@ -53,8 +50,6 @@
 
 %prep
 %setup -q
-%patch0 -p1
-%patch1 -p1
 
 %build
 
@@ -215,6 +210,9 @@
 %attr(0770,root,%{httpd_group}) %{roundcube_lib}/plugins/odfviewer
 
 %changelog
+* Fri Apr  4 2014 Jeroen van Meeuwen <vanmeeuwen@kolabsys.com> - 3.2-0.3.git
+- New git master head snapshot
+
 * Tue Feb 25 2014 Daniel Hoffend <dh@dotlan.net> - 3.2-0.2.git
 -  Apply patch for #2867 oudated mysql initial
 -  Apply patch for #2863 kolab_storage_cache::save()

roundcubemail-plugins-kolab-3.2-2863-kolab-storage-cache.patch Deleted

roundcubemail-plugins-kolab-3.2-2867-mysql-initial.patch Deleted

@@ -1,21 +0,0 @@
-diff --git a/plugins/libkolab/SQL/mysql.initial.sql b/plugins/libkolab/SQL/mysql.initial.sql
-index 40b8631..89b7244 100644
---- a/plugins/libkolab/SQL/mysql.initial.sql
-+++ b/plugins/libkolab/SQL/mysql.initial.sql
-@@ -34,6 +34,10 @@ CREATE TABLE `kolab_cache_contact` (
-   `tags` VARCHAR(255) NOT NULL,
-   `words` TEXT NOT NULL,
-   `type` VARCHAR(32) CHARACTER SET ascii NOT NULL,
-+  `name` VARCHAR(255) NOT NULL,
-+  `firstname` VARCHAR(255) NOT NULL,
-+  `surname` VARCHAR(255) NOT NULL,
-+  `email` VARCHAR(255) NOT NULL,
-   CONSTRAINT `fk_kolab_cache_contact_folder` FOREIGN KEY (`folder_id`)
-     REFERENCES `kolab_folders`(`folder_id`) ON DELETE CASCADE ON UPDATE CASCADE,
-   PRIMARY KEY(`folder_id`,`msguid`),
-@@ -172,4 +176,4 @@ CREATE TABLE `kolab_cache_freebusy` (
- ) /*!40000 ENGINE=INNODB */ /*!40101 CHARACTER SET utf8 COLLATE utf8_general_ci */;
- 
- 
--INSERT INTO `system` (`name`, `value`) VALUES ('libkolab-version', '2013121100');
-+INSERT INTO `system` (`name`, `value`) VALUES ('libkolab-version', '2014021000');

debian.changelog Changed

roundcubemail-plugins-kolab-3.2.tar.gz/.tx/config Changed

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

@@ -37,14 +37,12 @@
   public $task = '?(?!logout).*';
   public $rc;
   public $lib;
-  public $driver;
+  public $resources_dir;
   public $home;  // declare public to be used in other classes
   public $urlbase;
   public $timezone;
   public $timezone_offset;
   public $gmt_offset;
-
-  public $ical;
   public $ui;
 
   public $defaults = array(
@@ -59,6 +57,9 @@
     'calendar_allow_invite_shared' => false,
   );
 
+  private $ical;
+  private $itip;
+  private $driver;
   private $ics_parts = array();
 
 
@@ -111,7 +112,7 @@
         return;
 
     // load Calendar user interface
-    if (!$this->rc->output->ajax_call && !$this->rc->output->env['framed']) {
+    if (!$this->rc->output->ajax_call && (!$this->rc->output->env['framed'] || $args['action'] == 'preview')) {
       $this->ui->init();
 
       // settings are required in (almost) every GUI step
@@ -137,10 +138,18 @@
       $this->register_action('freebusy-times', array($this, 'freebusy_times'));
       $this->register_action('randomdata', array($this, 'generate_randomdata'));
       $this->register_action('print', array($this,'print_view'));
-      $this->register_action('mailimportevent', array($this, 'mail_import_event'));
+      $this->register_action('mailimportitip', array($this, 'mail_import_itip'));
+      $this->register_action('mailimportattach', array($this, 'mail_import_attachment'));
       $this->register_action('mailtoevent', array($this, 'mail_message2event'));
       $this->register_action('inlineui', array($this, 'get_inline_ui'));
       $this->register_action('check-recent', array($this, 'check_recent'));
+      $this->register_action('itip-status', array($this, 'event_itip_status'));
+      $this->register_action('itip-remove', array($this, 'event_itip_remove'));
+      $this->register_action('itip-decline-reply', array($this, 'mail_itip_decline_reply'));
+      $this->register_action('resources-list', array($this, 'resources_list'));
+      $this->register_action('resources-owner', array($this, 'resources_owner'));
+      $this->register_action('resources-calendar', array($this, 'resources_calendar'));
+      $this->register_action('resources-autocomplete', array($this, 'resources_autocomplete'));
       $this->add_hook('refresh', array($this, 'refresh'));
 
       // remove undo information...
@@ -208,16 +217,10 @@
     require_once($this->home . '/drivers/calendar_driver.php');
     require_once($this->home . '/drivers/' . $driver_name . '/' . $driver_class . '.php');
 
-    switch ($driver_name) {
-      case "kolab":
-        $this->require_plugin('libkolab');
-      default:
-        $this->driver = new $driver_class($this);
-        break;
-     }
+    $this->driver = new $driver_class($this);
 
-     if ($this->driver->undelete)
-        $this->driver->undelete = $this->rc->config->get('undo_timeout', 0) > 0;
+    if ($this->driver->undelete)
+      $this->driver->undelete = $this->rc->config->get('undo_timeout', 0) > 0;
   }
 
   /**
@@ -227,11 +230,7 @@
   {
     if (!$this->itip) {
       require_once($this->home . '/lib/calendar_itip.php');
-
-      $plugin = $this->rc->plugins->exec_hook('calendar_load_itip',
-        array('identity' => null));
-
-      $this->itip = new calendar_itip($this, $plugin['identity']);
+      $this->itip = new calendar_itip($this);
     }
 
     return $this->itip;
@@ -287,13 +286,14 @@
     $this->ui->addJS();
 
     $this->ui->init_templates();
-    $this->rc->output->add_label('lowest','low','normal','high','highest','delete','cancel','uploading','noemailwarning');
+    $this->rc->output->add_label('lowest','low','normal','high','highest','delete','cancel','uploading','noemailwarning','close');
 
     // initialize attendees autocompletion
     rcube_autocomplete_init();
 
     $this->rc->output->set_env('timezone', $this->timezone->getName());
     $this->rc->output->set_env('calendar_driver', $this->rc->config->get('calendar_driver'), false);
+    $this->rc->output->set_env('calendar_resources', (bool)$this->rc->config->get('calendar_resources_driver'));
     $this->rc->output->set_env('mscolors', $this->driver->get_color_values());
     $this->rc->output->set_env('identities-selector', $this->ui->identity_select(array('id' => 'edit-identities-list')));
 
@@ -858,63 +858,6 @@
 
         break;
 
-      case "rsvp-status":
-        $action = 'rsvp';
-        $status = $event['fallback'];
-        $latest = false;
-        $html = html::div('rsvp-status', $status != 'CANCELLED' ? $this->gettext('acceptinvitation') : '');
-        if (is_numeric($event['changed']))
-          $event['changed'] = new DateTime('@'.$event['changed']);
-        $this->load_driver();
-        if ($existing = $this->driver->get_event($event, true, false, true)) {
-          $latest = ($event['sequence'] && $existing['sequence'] == $event['sequence']) || (!$event['sequence'] && $existing['changed'] && $existing['changed'] >= $event['changed']);
-          $emails = $this->get_user_emails();
-          foreach ($existing['attendees'] as $i => $attendee) {
-            if ($attendee['email'] && in_array(strtolower($attendee['email']), $emails)) {
-              $status = $attendee['status'];
-              break;
-            }
-          }
-        }
-        else {
-          // get a list of writeable calendars
-          $calendars = $this->driver->list_calendars(false, true);
-          $calendar_select = new html_select(array('name' => 'calendar', 'id' => 'calendar-saveto', 'is_escaped' => true));
-          $numcals = 0;
-          foreach ($calendars as $calendar) {
-            if (!$calendar['readonly']) {
-              $calendar_select->add($calendar['name'], $calendar['id']);
-              $numcals++;
-            }
-          }
-          if ($numcals <= 1)
-            $calendar_select = null;
-        }
-
-        if ($status == 'unknown' && !$this->rc->config->get('calendar_allow_itip_uninvited', true)) {
-          $html = html::div('rsvp-status', $this->gettext('notanattendee'));
-          $action = 'import';
-        }
-        else if (in_array($status, array('ACCEPTED','TENTATIVE','DECLINED'))) {
-          $html = html::div('rsvp-status ' . strtolower($status), $this->gettext('youhave'.strtolower($status)));
-          if ($existing['sequence'] > $event['sequence'] || (!$event['sequence'] && $existing['changed'] && $existing['changed'] > $event['changed'])) {
-            $action = '';  // nothing to do here, outdated invitation
-         }
-        }
-
-        $default_calendar = $calendar_select ? $this->get_default_calendar(true) : null;
-        $this->rc->output->command('plugin.update_event_rsvp_status', array(
-          'uid' => $event['uid'],
-          'id' => asciiwords($event['uid'], true),
-          'saved' => $existing ? true : false,
-          'latest' => $latest,
-          'status' => $status,
-          'action' => $action,
-          'html' => $html,
-          'select' => $calendar_select ? html::span('calendar-select', $this->gettext('saveincalendar') . '&nbsp;' . $calendar_select->show($this->rc->config->get('calendar_default_calendar', $default_calendar['id']))) : '',
-        ));
-        return;
-
       case "rsvp":
         $ev = $this->driver->get_event($event);
         $ev['attendees'] = $event['attendees'];
@@ -1392,6 +1335,14 @@
       if ($event['recurrence']['UNTIL'])
         $event['recurrence']['UNTIL'] = $this->lib->adjust_timezone($event['recurrence']['UNTIL'], $event['allday'])->format('c');
       unset($event['recurrence']['EXCEPTIONS']);
+
+      // format RDATE values
+      if (is_array($event['recurrence']['RDATE'])) {
+        $libcal = $this->lib;
+        $event['recurrence']['RDATE'] = array_map(function($rdate) use ($libcal) {
+          return $libcal->adjust_timezone($rdate, true)->format('c');
+        }, $event['recurrence']['RDATE']);
+      }
     }
 
     foreach ((array)$event['attachments'] as $k => $attachment) {
@@ -1425,6 +1376,7 @@
       'end'   => $this->lib->adjust_timezone($event['end'], $event['allday'])->format('c'),
       // 'changed' might be empty for event recurrences (Bug #2185)
       'changed' => $event['changed'] ? $this->lib->adjust_timezone($event['changed'])->format('c') : null,
+      'created' => $event['created'] ? $this->lib->adjust_timezone($event['created'])->format('c') : null,
       'title'       => strval($event['title']),
       'description' => strval($event['description']),
       'location'    => strval($event['location']),
@@ -1439,6 +1391,34 @@
    */
   private function _recurrence_text($rrule)
   {
+    // derive missing FREQ and INTERVAL from RDATE list
+    if (empty($rrule['FREQ']) && !empty($rrule['RDATE'])) {
+      $first = $rrule['RDATE'][0];
+      $second = $rrule['RDATE'][1];
+      $third  = $rrule['RDATE'][2];
+      if (is_a($first, 'DateTime') && is_a($second, 'DateTime')) {
+        $diff = $first->diff($second);
+        foreach (array('y' => 'YEARLY', 'm' => 'MONTHLY', 'd' => 'DAILY') as $k => $freq) {
+          if ($diff->$k != 0) {
+            $rrule['FREQ'] = $freq;
+            $rrule['INTERVAL'] = $diff->$k;
+
+            // verify interval with next item
+            if (is_a($third, 'DateTime')) {
+              $diff2 = $second->diff($third);
+              if ($diff2->$k != $diff->$k) {
+                unset($rrule['INTERVAL']);
+              }
+            }
+            break;
+          }
+        }
+      }
+      if (!$rrule['INTERVAL'])
+        $rrule['FREQ'] = 'RDATE';
+      $rrule['UNTIL'] = end($rrule['RDATE']);
+    }
+
     // TODO: finish this
     $freq = sprintf('%s %d ', $this->gettext('every'), $rrule['INTERVAL']);
     $details = '';
@@ -1590,6 +1570,21 @@
     if (is_array($event['recurrence']) && !empty($event['recurrence']['UNTIL']))
       $event['recurrence']['UNTIL'] = new DateTime($event['recurrence']['UNTIL'], $this->timezone);
 
+    if (is_array($event['recurrence']) && is_array($event['recurrence']['RDATE'])) {
+      $tz = $this->timezone;
+      $start = $event['start'];
+      $event['recurrence']['RDATE'] = array_map(function($rdate) use ($tz, $start) {
+        try {
+          $dt = new DateTime($rdate, $tz);
+          $dt->setTime($start->format('G'), $start->format('i'));
+          return $dt;
+        }
+        catch (Exception $e) {
+          return null;
+        }
+      }, $event['recurrence']['RDATE']);
+    }
+
     $attachments = array();
     $eventid = 'cal:'.$event['id'];
     if (is_array($_SESSION[self::SESSION_KEY]) && $_SESSION[self::SESSION_KEY]['id'] == $eventid) {
@@ -1637,8 +1632,10 @@
     }
 
     // mapping url => vurl because of the fullcalendar client script
-    $event['url'] = $event['vurl'];
-    unset($event['vurl']);
+    if (array_key_exists('vurl', $event)) {
+      $event['url'] = $event['vurl'];
+      unset($event['vurl']);
+    }
   }
 
   /**
@@ -1677,8 +1674,10 @@
     }
 
     // send to every attendee
-    $sent = 0;
+    $sent = 0; $current = array();
     foreach ((array)$event['attendees'] as $attendee) {
+      $current[] = strtolower($attendee['email']);
+      
       // skip myself for obvious reasons
       if (!$attendee['email'] || in_array(strtolower($attendee['email']), $emails))
         continue;
@@ -1694,7 +1693,21 @@
       else
         $sent = -100;
     }
-    
+
+    // send CANCEL message to removed attendees
+    foreach ((array)$old['attendees'] as $attendee) {
+      if ($attendee['ROLE'] == 'ORGANIZER' || !$attendee['email'] || in_array(strtolower($attendee['email']), $current))
+        continue;
+
+      $vevent = $old;
+      $vevent['cancelled'] = $is_cancelled;
+      $vevent['attendees'] = array($attendee);
+      if ($itip->send_itip_message($vevent, 'CANCEL', $attendee, 'eventcancelsubject', 'eventcancelmailbody'))
+        $sent++;
+      else
+        $sent = -100;
+    }
+
     return $sent;
   }
 
@@ -1911,14 +1924,171 @@
   }
 
 
+  /****  Resource management functions  ****/
+
+  /**
+   * Getter for the configured implementation of the resource directory interface
+   */
+  private function resources_directory()
+  {
+    if (is_object($this->resources_dir)) {
+      return $this->resources_dir;
+    }
+
+    if ($driver_name = $this->rc->config->get('calendar_resources_driver')) {
+      $driver_class = 'resources_driver_' . $driver_name;
+
+      require_once($this->home . '/drivers/resources_driver.php');
+      require_once($this->home . '/drivers/' . $driver_name . '/' . $driver_class . '.php');
+
+      $this->resources_dir = new $driver_class($this);
+    }
+
+    return $this->resources_dir;
+  }
+
+  /**
+   * Handler for resoruce autocompletion requests
+   */
+  public function resources_autocomplete()
+  {
+    $search = rcube_utils::get_input_value('_search', rcube_utils::INPUT_GPC, true);
+    $sid    = rcube_utils::get_input_value('_id', rcube_utils::INPUT_GPC);
+    $maxnum = (int)$this->rc->config->get('autocomplete_max', 15);
+    $results = array();
+
+    if ($directory = $this->resources_directory()) {
+      foreach ($directory->load_resources($search, $maxnum) as $rec) {
+        $results[]  = array(
+            'name'  => $rec['name'],
+            'email' => $rec['email'],
+            'type'  => $rec['_type'],
+        );
+      }
+    }
+
+    $this->rc->output->command('ksearch_query_results', $results, $search, $sid);
+    $this->rc->output->send();
+  }
+
+  /**
+   * Handler for load-requests for resource data
+   */
+  function resources_list()
+  {
+    $data = array();
+
+    if ($directory = $this->resources_directory()) {
+      foreach ($directory->load_resources() as $rec) {
+        $data[] = $rec;
+      }
+    }
+
+    $this->rc->output->command('plugin.resource_data', $data);
+    $this->rc->output->send();
+  }
+
+  /**
+   * Handler for requests loading resource owner information
+   */
+  function resources_owner()
+  {
+    if ($directory = $this->resources_directory()) {
+      $id = rcube_utils::get_input_value('_id', rcube_utils::INPUT_GPC);
+      $data = $directory->get_resource_owner($id);
+    }
+
+    $this->rc->output->command('plugin.resource_owner', $data);
+    $this->rc->output->send();
+  }
+
+  /**
+   * Deliver event data for a resource's calendar
+   */
+  function resources_calendar()
+  {
+    $events = array();
+
+    if ($directory = $this->resources_directory()) {
+      $events = $directory->get_resource_calendar(
+        rcube_utils::get_input_value('_id', rcube_utils::INPUT_GPC),
+        rcube_utils::get_input_value('start', RCUBE_INPUT_GET),
+        rcube_utils::get_input_value('end', RCUBE_INPUT_GET));
+    }
+
+    echo $this->encode($events);
+    exit;
+  }
+
+
   /****  Event invitation plugin hooks ****/
-  
+
+  /**
+   * Handler for calendar/itip-status requests
+   */
+  function event_itip_status()
+  {
+    $data = get_input_value('data', RCUBE_INPUT_POST, true);
+
+    // find local copy of the referenced event
+    $this->load_driver();
+    $existing = $this->driver->get_event($data, true, false, true);
+
+    $itip = $this->load_itip();
+    $response = $itip->get_itip_status($data, $existing);
+
+    // get a list of writeable calendars to save new events to
+    if (!$existing && $response['action'] == 'rsvp' || $response['action'] == 'import') {
+      $calendars = $this->driver->list_calendars(false, true);
+      $calendar_select = new html_select(array('name' => 'calendar', 'id' => 'itip-saveto', 'is_escaped' => true));
+      $numcals = 0;
+      foreach ($calendars as $calendar) {
+        if (!$calendar['readonly']) {
+          $calendar_select->add($calendar['name'], $calendar['id']);
+          $numcals++;
+        }
+      }
+      if ($numcals <= 1)
+        $calendar_select = null;
+    }
+
+    if ($calendar_select) {
+      $default_calendar = $this->get_default_calendar(true);
+      $response['select'] = html::span('folder-select', $this->gettext('saveincalendar') . '&nbsp;' .
+        $calendar_select->show($this->rc->config->get('calendar_default_calendar', $default_calendar['id'])));
+    }
+
+    $this->rc->output->command('plugin.update_itip_object_status', $response);
+  }
+
+  /**
+   * Handler for calendar/itip-remove requests
+   */
+  function event_itip_remove()
+  {
+    $success = false;
+
+    // search for event if only UID is given
+    if ($event = $this->driver->get_event(array('uid' => get_input_value('uid', RCUBE_INPUT_POST)), true)) {
+      $success = $this->driver->remove_event($event, true);
+    }
+    
+    if ($success) {
+      $this->rc->output->show_message('calendar.successremoval', 'confirmation');
+    }
+    else {
+      $this->rc->output->show_message('calendar.errorsaving', 'error');
+    }
+  }
+
   /**
    * Handler for URLs that allow an invitee to respond on his invitation mail
    */
   public function itip_attend_response($p)
   {
     if ($p['action'] == 'attend') {
+      $this->ui->init();
+
       $this->rc->output->set_env('task', 'calendar');  // override some env vars
       $this->rc->output->set_env('refresh_interval', 0);
       $this->rc->output->set_pagetitle($this->gettext('calendar'));
@@ -1933,13 +2103,13 @@
 
         // show message about cancellation
         if ($invitation['cancelled']) {
-          $this->invitestatus = html::div('rsvp-status declined', $this->gettext('eventcancelled'));
+          $this->invitestatus = html::div('rsvp-status declined', $itip->gettext('eventcancelled'));
         }
         // save submitted RSVP status
         else if (!empty($_POST['rsvp'])) {
           $status = null;
           foreach (array('accepted','tentative','declined') as $method) {
-            if ($_POST['rsvp'] == $this->gettext('itip' . $method)) {
+            if ($_POST['rsvp'] == $itip->gettext('itip' . $method)) {
               $status = $method;
               break;
             }
@@ -1947,7 +2117,7 @@
 
           // send itip reply to organizer
           if ($status && $itip->update_invitation($invitation, $invitation['attendee'], strtoupper($status))) {
-            $this->invitestatus = html::div('rsvp-status ' . strtolower($status), $this->gettext('youhave'.strtolower($status)));
+            $this->invitestatus = html::div('rsvp-status ' . strtolower($status), $itip->gettext('youhave'.strtolower($status)));
           }
           else
             $this->rc->output->command('display_message', $this->gettext('errorsaving'), 'error', -1);
@@ -1972,7 +2142,7 @@
         if (!$this->invitestatus)
           $this->register_handler('plugin.event_rsvp_buttons', array($this->ui, 'event_rsvp_buttons'));
         
-        $this->rc->output->set_pagetitle($this->gettext('itipinvitation') . ' ' . $this->event['title']);
+        $this->rc->output->set_pagetitle($itip->gettext('itipinvitation') . ' ' . $this->event['title']);
       }
       else
         $this->rc->output->command('display_message', $this->gettext('itipinvalidrequest'), 'error', -1);
@@ -2021,6 +2191,7 @@
     // load iCalendar functions (if necessary)
     if (!empty($this->ics_parts)) {
       $this->get_ical();
+      $this->load_itip();
     }
 
     $html = '';
@@ -2029,7 +2200,6 @@
       $charset = $part->ctype_parameters['charset'] ? $part->ctype_parameters['charset'] : RCMAIL_CHARSET;
       $events  = $this->ical->import($this->message->get_part_content($mime_id), $charset);
       $title   = $this->gettext('title');
-      $date    = rcube_utils::anytodatetime($this->message->headers->date);
 
       // successfully parsed events?
       if (empty($events))
@@ -2037,104 +2207,20 @@
 
       // show a box for every event in the file
       foreach ($events as $idx => $event) {
-        // define buttons according to method
-        if ($this->ical->method == 'REPLY') {
-          $title = $this->gettext('itipreply');
-          $buttons = html::tag('input', array(
-            'type' => 'button',
-            'class' => 'button',
-            'onclick' => "rcube_calendar.add_event_from_mail('" . JQ($mime_id.':'.$idx) . "')",
-            'value' => $this->gettext('updateattendeestatus'),
-          ));
-        }
-        else if ($this->ical->method == 'REQUEST') {
-          $emails = $this->get_user_emails();
-          $title = $event['sequence'] > 0 ? $this->gettext('itipupdate') : $this->gettext('itipinvitation');
-          
-          // add (hidden) buttons and activate them from asyncronous request
-          foreach (array('accepted','tentative','declined') as $method) {
-            $rsvp_buttons .= html::tag('input', array(
-              'type' => 'button',
-              'class' => "button $method",
-              'onclick' => "rcube_calendar.add_event_from_mail('" . JQ($mime_id.':'.$idx) . "', '$method')",
-              'value' => $this->gettext('itip' . $method),
-            ));
-          }
-          $import_button = html::tag('input', array(
-            'type' => 'button',
-            'class' => 'button',
-            'onclick' => "rcube_calendar.add_event_from_mail('" . JQ($mime_id.':'.$idx) . "')",
-            'value' => $this->gettext('importtocalendar'),
-          ));
-          
-          // check my status
-          $status = 'unknown';
-          foreach ($event['attendees'] as $attendee) {
-            if ($attendee['email'] && in_array(strtolower($attendee['email']), $emails)) {
-              $status = strtoupper($attendee['status']);
-              break;
-            }
-          }
-
-          $dom_id      = asciiwords($event['uid'], true);
-          $buttons     = html::div(array('id' => 'rsvp-'.$dom_id, 'style' => 'display:none'), $rsvp_buttons);
-          $buttons    .= html::div(array('id' => 'import-'.$dom_id, 'style' => 'display:none'), $import_button);
-          $buttons_pre = html::div(array('id' => 'loading-'.$dom_id, 'class' => 'rsvp-status loading'), $this->gettext('loading'));
-          $changed     = is_object($event['changed']) ? $event['changed'] : $date;
-
-          $script = json_serialize(array(
-            'uid'      => $event['uid'],
-            'changed'  => $changed ? $changed->format('U') : 0,
-            'sequence' => intval($event['sequence']),
-            'fallback' => $status,
-          ));
+        if ($event['_type'] != 'event')  // skip non-event objects (#2928)
+          continue;
 
-          $this->rc->output->add_script("rcube_calendar.fetch_event_rsvp_status($script)", 'docready');
-        }
-        else if ($this->ical->method == 'CANCEL') {
-          $title = $this->gettext('itipcancellation');
-          
-          // create buttons to be activated from async request checking existence of this event in local calendars
-          $button_import = html::tag('input', array(
-            'type' => 'button',
-            'class' => 'button',
-            'onclick' => "rcube_calendar.add_event_from_mail('" . JQ($mime_id.':'.$idx) . "')",
-            'value' => $this->gettext('importtocalendar'),
-          ));
-          $button_remove = html::tag('input', array(
-            'type' => 'button',
-            'class' => 'button',
-            'onclick' => "rcube_calendar.remove_event_from_mail('" . JQ($event['uid']) . "', '" . JQ($event['title']) . "')",
-            'value' => $this->gettext('removefromcalendar'),
-          ));
-
-          $dom_id      = asciiwords($event['uid'], true);
-          $buttons     = html::div(array('id' => 'rsvp-'.$dom_id, 'style' => 'display:none'), $button_remove);
-          $buttons    .= html::div(array('id' => 'import-'.$dom_id, 'style' => 'display:none'), $button_import);
-          $buttons_pre = html::div(array('id' => 'loading-'.$dom_id, 'class' => 'rsvp-status loading'), $this->gettext('loading'));
-          $changed     = is_object($event['changed']) ? $event['changed'] : $date;
-
-          $script = json_serialize(array(
-            'uid'      => $event['uid'],
-            'changed'  => $changed ? $changed->format('U') : 0,
-            'sequence' => intval($event['sequence']),
-            'fallback' => 'CANCELLED',
-          ));
+        // get prepared inline UI for this event object
+        $html .= html::div('calendar-invitebox',
+          $this->itip->mail_itip_inline_ui(
+            $event,
+            $this->ical->method,
+            $mime_id.':'.$idx,
+            'calendar',
+            rcube_utils::anytodatetime($this->message->headers->date)
+          )
+        );
 
-          $this->rc->output->add_script("rcube_calendar.fetch_event_rsvp_status($script)", 'docready');
-        }
-        else {
-          $buttons = html::tag('input', array(
-            'type' => 'button',
-            'class' => 'button',
-            'onclick' => "rcube_calendar.add_event_from_mail('" . JQ($mime_id.':'.$idx) . "')",
-            'value' => $this->gettext('importtocalendar'),
-          ));
-        }
-        
-        // show event details with buttons
-        $html .= html::div('calendar-invitebox', $this->ui->event_details_table($event, $title) . $buttons_pre . html::div('rsvp-buttons', $buttons));
-        
         // limit listing
         if ($idx >= 3)
           break;
@@ -2148,22 +2234,31 @@
       $this->rc->output->add_label('calendar.savingdata','calendar.deleteventconfirm','calendar.declinedeleteconfirm');
     }
 
+    // add "Save to calendar" button into attachment menu
+    if (!empty($this->ics_parts)) {
+      $this->add_button(array(
+        'id'         => 'attachmentsavecal',
+        'name'       => 'attachmentsavecal',
+        'type'       => 'link',
+        'wrapper'    => 'li',
+        'command'    => 'attachment-save-calendar',
+        'class'      => 'icon calendarlink',
+        'classact'   => 'icon calendarlink active',
+        'innerclass' => 'icon calendar',
+        'label'      => 'calendar.savetocalendar',
+        ), 'attachmentmenu');
+    }
+
     return $p;
   }
 
-
   /**
-   * Handler for POST request to import an event attached to a mail message
+   * Read the given mime message from IMAP and parse ical data
    */
-  public function mail_import_event()
+  private function mail_get_itip_event($mbox, $uid, $mime_id)
   {
-    $uid = get_input_value('_uid', RCUBE_INPUT_POST);
-    $mbox = get_input_value('_mbox', RCUBE_INPUT_POST);
-    $mime_id = get_input_value('_part', RCUBE_INPUT_POST);
-    $status = get_input_value('_status', RCUBE_INPUT_POST);
-    $delete = intval(get_input_value('_del', RCUBE_INPUT_POST));
     $charset = RCMAIL_CHARSET;
-    
+
     // establish imap connection
     $imap = $this->rc->get_storage();
     $imap->set_mailbox($mbox);
@@ -2174,20 +2269,54 @@
       if ($part->ctype_parameters['charset'])
         $charset = $part->ctype_parameters['charset'];
       $headers = $imap->get_message_headers($uid);
+
+      if ($part) {
+        $events = $this->get_ical()->import($part, $charset);
+      }
     }
 
-    $events = $this->get_ical()->import($part, $charset);
+    // successfully parsed events?
+    if (!empty($events) && ($event = $events[$index])) {
+      // store the message's sender address for comparisons
+      $event['_sender'] = preg_match('/([a-z0-9][a-z0-9\-\.\+\_]*@[^&@"\'.][^@&"\']*\\.([^\\x00-\\x40\\x5b-\\x60\\x7b-\\x7f]{2,}|xn--[a-z0-9]{2,}))/', $headers->from, $m) ? $m[1] : '';
+      $event['_sender_utf'] = rcube_idn_to_utf8($event['_sender']);
+
+      return $event;
+    }
+
+    return null;
+  }
+
+  /**
+   * Handler for POST request to import an event attached to a mail message
+   */
+  public function mail_import_itip()
+  {
+    $uid = get_input_value('_uid', RCUBE_INPUT_POST);
+    $mbox = get_input_value('_mbox', RCUBE_INPUT_POST);
+    $mime_id = get_input_value('_part', RCUBE_INPUT_POST);
+    $status = get_input_value('_status', RCUBE_INPUT_POST);
+    $delete = intval(get_input_value('_del', RCUBE_INPUT_POST));
 
     $error_msg = $this->gettext('errorimportingevent');
     $success = false;
 
     // successfully parsed events?
-    if (!empty($events) && ($event = $events[$index])) {
+    if ($event = $this->mail_get_itip_event($mbox, $uid, $mime_id)) {
       // find writeable calendar to store event
-      $cal_id = !empty($_REQUEST['_calendar']) ? get_input_value('_calendar', RCUBE_INPUT_POST) : null;
+      $cal_id = !empty($_REQUEST['_folder']) ? get_input_value('_folder', RCUBE_INPUT_POST) : null;
       $calendars = $this->driver->list_calendars(false, true);
       $calendar = $calendars[$cal_id] ?: $this->get_default_calendar(true);
 
+      $metadata = array(
+        'uid' => $event['uid'],
+        'changed' => is_object($event['changed']) ? $event['changed']->format('U') : 0,
+        'sequence' => intval($event['sequence']),
+        'fallback' => strtoupper($status),
+        'method' => $this->ical->method,
+        'task' => 'calendar',
+      );
+
       // update my attendee status according to submitted method
       if (!empty($status)) {
         $organizer = null;
@@ -2198,6 +2327,8 @@
           }
           else if ($attendee['email'] && in_array(strtolower($attendee['email']), $emails)) {
             $event['attendees'][$i]['status'] = strtoupper($status);
+            $metadata['attendee'] = $attendee['email'];
+            $metadata['rsvp'] = $attendee['rsvp'] || $attendee['role'] != 'NON-PARTICIPANT';
             $reply_sender = $attendee['email'];
           }
         }
@@ -2210,7 +2341,9 @@
             'email' => $sender_identity['email'],
             'role' => 'OPT-PARTICIPANT',
             'status' => strtoupper($status),
+            'rsvp' => true,
           );
+          $metadata['attendee'] = $sender_identity['email'];
         }
       }
       
@@ -2225,20 +2358,20 @@
           // only update attendee status
           if ($this->ical->method == 'REPLY') {
             // try to identify the attendee using the email sender address
-            $sender = preg_match('/([a-z0-9][a-z0-9\-\.\+\_]*@[^&@"\'.][^@&"\']*\\.([^\\x00-\\x40\\x5b-\\x60\\x7b-\\x7f]{2,}|xn--[a-z0-9]{2,}))/', $headers->from, $m) ? $m[1] : '';
-            $sender_utf = rcube_idn_to_utf8($sender);
-            
             $existing_attendee = -1;
             foreach ($existing['attendees'] as $i => $attendee) {
-              if ($sender && ($attendee['email'] == $sender || $attendee['email'] == $sender_utf)) {
+              if ($event['_sender'] && ($attendee['email'] == $event['_sender'] || $attendee['email'] == $event['_sender_utf'])) {
                 $existing_attendee = $i;
                 break;
               }
             }
             $event_attendee = null;
             foreach ($event['attendees'] as $attendee) {
-              if ($sender && ($attendee['email'] == $sender || $attendee['email'] == $sender_utf)) {
+              if ($event['_sender'] && ($attendee['email'] == $event['_sender'] || $attendee['email'] == $event['_sender_utf'])) {
                 $event_attendee = $attendee;
+                $metadata['fallback'] = $attendee['status'];
+                $metadata['attendee'] = $attendee['email'];
+                $metadata['rsvp'] = $attendee['rsvp'] || $attendee['role'] != 'NON-PARTICIPANT';
                 break;
               }
             }
@@ -2266,7 +2399,7 @@
           else if ($event['sequence'] >= $existing['sequence'] || $event['changed'] >= $existing['changed']) {
             $event['id'] = $existing['id'];
             $event['calendar'] = $existing['calendar'];
-            if ($status == 'declined')  // show me as free when declined (#1670)
+            if ($status == 'declined' || $event['status'] == 'CANCELLED')  // show me as free when declined (#1670)
               $event['free_busy'] = 'free';
             $success = $this->driver->edit_event($event);
           }
@@ -2294,7 +2427,9 @@
     if ($success) {
       $message = $this->ical->method == 'REPLY' ? 'attendeupdateesuccess' : ($deleted ? 'successremoval' : 'importedsuccessfully');
       $this->rc->output->command('display_message', $this->gettext(array('name' => $message, 'vars' => array('calendar' => $calendar['name']))), 'confirmation');
-      $this->rc->output->command('plugin.fetch_event_rsvp_status', array('uid' => $event['uid'], 'changed' => $event['changed']->format('U'), 'sequence' => intval($event['sequence']), 'fallback' => strtoupper($status)));
+
+      $metadata['rsvp'] = intval($metadata['rsvp']);
+      $this->rc->output->command('plugin.fetch_itip_object_status', $metadata);
       $error_msg = null;
     }
     else if ($error_msg)
@@ -2303,6 +2438,7 @@
 
     // send iTip reply
     if ($this->ical->method == 'REQUEST' && $organizer && !in_array(strtolower($organizer['email']), $emails) && !$error_msg) {
+      $event['comment'] = get_input_value('_comment', RCUBE_INPUT_POST);
       $itip = $this->load_itip();
       $itip->set_sender_email($reply_sender);
       if ($itip->send_itip_message($event, 'REPLY', $organizer, 'itipsubject' . $status, 'itipmailbody' . $status))
@@ -2316,6 +2452,97 @@
 
 
   /**
+   * Handler for calendar/itip-remove requests
+   */
+  function mail_itip_decline_reply()
+  {
+    $uid = get_input_value('_uid', RCUBE_INPUT_POST);
+    $mbox = get_input_value('_mbox', RCUBE_INPUT_POST);
+    $mime_id = get_input_value('_part', RCUBE_INPUT_POST);
+
+    if (($event = $this->mail_get_itip_event($mbox, $uid, $mime_id)) && $this->ical->method == 'REPLY') {
+      $event['comment'] = get_input_value('_comment', RCUBE_INPUT_POST);
+
+      foreach ($event['attendees'] as $_attendee) {
+        if ($_attendee['role'] != 'ORGANIZER') {
+          $attendee = $_attendee;
+          break;
+        }
+      }
+
+      $itip = $this->load_itip();
+      if ($itip->send_itip_message($event, 'CANCEL', $attendee, 'itipsubjectcancel', 'itipmailbodycancel'))
+        $this->rc->output->command('display_message', $this->gettext(array('name' => 'sentresponseto', 'vars' => array('mailto' => $attendee['name'] ? $attendee['name'] : $attendee['email']))), 'confirmation');
+      else
+        $this->rc->output->command('display_message', $this->gettext('itipresponseerror'), 'error');
+    }
+    else {
+      $this->rc->output->command('display_message', $this->gettext('itipresponseerror'), 'error');
+    }
+  }
+
+  /**
+   * Import the full payload from a mail message attachment
+   */
+  public function mail_import_attachment()
+  {
+    $uid = get_input_value('_uid', RCUBE_INPUT_POST);
+    $mbox = get_input_value('_mbox', RCUBE_INPUT_POST);
+    $mime_id = get_input_value('_part', RCUBE_INPUT_POST);
+    $charset = RCMAIL_CHARSET;
+
+    // establish imap connection
+    $imap = $this->rc->get_storage();
+    $imap->set_mailbox($mbox);
+
+    if ($uid && $mime_id) {
+      $part = $imap->get_message_part($uid, $mime_id);
+      if ($part->ctype_parameters['charset'])
+        $charset = $part->ctype_parameters['charset'];
+      $headers = $imap->get_message_headers($uid);
+
+      if ($part) {
+        $events = $this->get_ical()->import($part, $charset);
+      }
+    }
+
+    $success = $existing = 0;
+    if (!empty($events)) {
+      // find writeable calendar to store event
+      $cal_id = !empty($_REQUEST['_calendar']) ? get_input_value('_calendar', RCUBE_INPUT_POST) : null;
+      $calendars = $this->driver->list_calendars(false, true);
+      $calendar = $calendars[$cal_id] ?: $this->get_default_calendar(true);
+
+      foreach ($events as $event) {
+        // save to calendar
+        if ($calendar && !$calendar['readonly'] && $event['_type'] == 'event') {
+          $event['calendar'] = $calendar['id'];
+
+          if (!$this->driver->get_event($event['uid'], true, false)) {
+            $success += (bool)$this->driver->new_event($event);
+          }
+          else {
+            $existing++;
+          }
+        }
+      }
+    }
+
+    if ($success) {
+      $this->rc->output->command('display_message', $this->gettext(array(
+        'name' => 'importsuccess',
+        'vars' => array('nr' => $success),
+      )), 'confirmation');
+    }
+    else if ($existing) {
+      $this->rc->output->command('display_message', $this->gettext('importwarningexists'), 'warning');
+    }
+    else {
+      $this->rc->output->command('display_message', $this->gettext('errorimportingevent'), 'error');
+    }
+  }
+
+  /**
    * Read email message and return contents for a new event based on that message
    */
   public function mail_message2event()
@@ -2398,19 +2625,7 @@
    */
   private function get_user_emails()
   {
-    $emails = array();
-    $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_identities() as $identity)
-      $emails[] = strtolower($identity['email']);
-    
-    return array_unique($emails);
+    return $this->lib->get_user_emails();
   }
 
 
@@ -2443,4 +2658,24 @@
     return base64_encode($this->rc->user->get_username() . ':' . $source);
   }
 
+  /**
+   * Magic getter for public access to protected members
+   */
+  public function __get($name)
+  {
+    switch ($name) {
+      case 'ical':
+        return $this->get_ical();
+
+      case 'itip':
+        return $this->load_itip();
+
+      case 'driver':
+        $this->load_driver();
+        return $this->driver;
+    }
+
+    return null;
+  }
+
 }

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

@@ -31,6 +31,7 @@
     // member vars
     this.ui;
     this.ui_loaded = false;
+    this.selected_attachment = null;
 
     // private vars
     var me = this;
@@ -48,7 +49,7 @@
           ).then(function() {
             // disable attendees feature (autocompletion and stuff is not initialized)
             for (var c in rcmail.env.calendars)
-              rcmail.env.calendars[c].attendees = false;
+              rcmail.env.calendars[c].attendees = rcmail.env.calendars[c].resources = false;
             
             me.ui_loaded = true;
             me.ui = new rcube_calendar_ui(me.settings);
@@ -75,53 +76,21 @@
         rcmail.message_list.blur();
       }
     };
-}
-
-// static methods
-rcube_calendar.add_event_from_mail = function(mime_id, status)
-{
-  // ask user to delete the declined event from the local calendar (#1670)
-  var del = false;
-  if (rcmail.env.rsvp_saved && status == 'declined') {
-    del = confirm(rcmail.gettext('calendar.declinedeleteconfirm'));
-  }
-
-  var lock = rcmail.set_busy(true, 'calendar.savingdata');
-  rcmail.http_post('calendar/mailimportevent', {
-      '_uid': rcmail.env.uid,
-      '_mbox': rcmail.env.mailbox,
-      '_part': mime_id,
-      '_calendar': $('#calendar-saveto').val(),
-      '_status': status,
-      '_del': del?1:0
-    }, lock);
-
-  return false;
-};
-
-rcube_calendar.remove_event_from_mail = function(uid, title)
-{
-  if (confirm(rcmail.gettext('calendar.deleteventconfirm'))) {
-    var lock = rcmail.set_busy(true, 'calendar.savingdata');
-    rcmail.http_post('calendar/event', {
-        e:{ uid:uid },
-        action: 'remove'
-      }, lock);
-  }
-};
 
-rcube_calendar.fetch_event_rsvp_status = function(event)
-{
-/*
-  var id = event.uid.replace(rcmail.identifier_expr, '');
-  $('#import-'+id+', #rsvp-'+id+', div.rsvp-status').hide();
-  $('#loading-'+id).show();
-*/
-  rcmail.http_post('calendar/event', {
-    e:event,
-    action:'rsvp-status'
-  });
-};
+    // handler for attachment-save-calendar commands
+    this.save_to_calendar = function(p)
+    {
+      // TODO: show dialog to select the calendar for importing
+      if (this.selected_attachment && window.rcube_libcalendaring) {
+        rcmail.http_post('calendar/mailimportattach', {
+            _uid: rcmail.env.uid,
+            _mbox: rcmail.env.mailbox,
+            _part: this.selected_attachment,
+            // _calendar: $('#calendar-attachment-saveto').val(),
+          }, rcmail.set_busy(true, 'itip.savingdata'));
+      }
+    }
+}
 
 
 /* calendar plugin initialization (for non-calendar tasks) */
@@ -129,33 +98,10 @@
   if (rcmail.task != 'calendar') {
     var cal = new rcube_calendar($.extend(rcmail.env.calendar_settings, rcmail.env.libcal_settings));
 
-    rcmail.addEventListener('plugin.update_event_rsvp_status', function(p){
-      rcmail.env.rsvp_saved = p.saved;
-
-      if (p.html) {
-        // append/replace rsvp status display
-        $('#loading-'+p.id).next('.rsvp-status').remove();
-        $('#loading-'+p.id).hide().after(p.html);
-      }
-      else {
-        $('#loading-'+p.id).hide();
-      }
-
-      // enable/disable rsvp buttons
-      $('.rsvp-buttons input.button').prop('disabled', false)
-        .filter('.'+String(p.status).toLowerCase()).prop('disabled', p.latest);
-
-      // show rsvp/import buttons with or without calendar selector
-      if (!p.select)
-        $('#rsvp-'+p.id+' .calendar-select').remove();
-      $('#'+p.action+'-'+p.id).show().append(p.select);
-    });
-
-    rcmail.addEventListener('plugin.fetch_event_rsvp_status', rcube_calendar.fetch_event_rsvp_status);
-    
     // register create-from-mail command to message_commands array
     if (rcmail.env.task == 'mail') {
       rcmail.register_command('calendar-create-from-mail', function() { cal.create_from_mail() });
+      rcmail.register_command('attachment-save-calendar', function() { cal.save_to_calendar() });
       rcmail.addEventListener('plugin.mail2event_dialog', function(p){ cal.mail2event_dialog(p) });
       rcmail.addEventListener('plugin.unlock_saving', function(p){ cal.ui && cal.ui.unlock_saving(); });
       
@@ -163,8 +109,17 @@
         rcmail.env.message_commands.push('calendar-create-from-mail');
         rcmail.add_element($('<a>'));
       }
-      else
+      else {
         rcmail.enable_command('calendar-create-from-mail', true);
+      }
+
+      rcmail.addEventListener('beforemenu-open', function(p) {
+        if (p.menu == 'attachmentmenu') {
+          cal.selected_attachment = p.id;
+          var mimetype = rcmail.env.attachments[p.id];
+          rcmail.enable_command('attachment-save-calendar', mimetype == 'text/calendar' || mimetype == 'text/x-vcalendar' || mimetype == 'application/ics');
+        }
+      });
 
       // add contextmenu item
       if (window.rcm_contextmenu_register_command) {

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

@@ -47,6 +47,12 @@
     var event_defaults = { free_busy:'busy', alarms:'' };
     var event_attendees = [];
     var attendees_list;
+    var resources_list;
+    var resources_treelist;
+    var resources_data = {};
+    var resources_index = [];
+    var resource_owners = {};
+    var resources_events_source = { url:null, editable:false };
     var freebusy_ui = { workinhoursonly:false, needsupdate:false };
     var freebusy_data = {};
     var current_view = null;
@@ -103,6 +109,11 @@
       return result;
     };
 
+    // Change the first charcter to uppercase
+    var ucfirst = function(str)
+    {
+        return str.charAt(0).toUpperCase() + str.substr(1);
+    };
 
     // clone the given date object and optionally adjust time
     var clone_date = function(date, adjust)
@@ -276,7 +287,7 @@
     // event details dialog (show only)
     var event_show_dialog = function(event)
     {
-      var $dialog = $("#eventshow").removeClass().addClass('uidialog');
+      var $dialog = $("#eventshow").attr('class', 'uidialog');
       var calendar = event.calendar && me.calendars[event.calendar] ? me.calendars[event.calendar] : { editable:false };
       me.selected_event = event;
 
@@ -304,9 +315,9 @@
         $('#event-alarm').show().children('.event-text').html(Q(event.alarms_text));
       
       if (calendar.name)
-        $('#event-calendar').show().children('.event-text').html(Q(calendar.name)).removeClass().addClass('event-text').addClass('cal-'+calendar.id);
+        $('#event-calendar').show().children('.event-text').html(Q(calendar.name)).attr('class', 'event-text').addClass('cal-'+calendar.id);
       if (event.categories)
-        $('#event-category').show().children('.event-text').html(Q(event.categories)).removeClass().addClass('event-text cat-'+String(event.categories).toLowerCase().replace(rcmail.identifier_expr, ''));
+        $('#event-category').show().children('.event-text').html(Q(event.categories)).attr('class', 'event-text cat-'+String(event.categories).toLowerCase().replace(rcmail.identifier_expr, ''));
       if (event.free_busy)
         $('#event-free-busy').show().children('.event-text').html(Q(rcmail.gettext(event.free_busy, 'calendar')));
       if (event.priority > 0) {
@@ -332,19 +343,33 @@
 
       // list event attendees
       if (calendar.attendees && event.attendees) {
-        var data, dispname, organizer = false, rsvp = false, line,  morelink, html = '',overflow = '';
+        // sort resources to the end
+        event.attendees.sort(function(a,b) {
+          var j = a.cutype == 'RESOURCE' ? 1 : 0,
+              k = b.cutype == 'RESOURCE' ? 1 : 0;
+          return (j - k);
+        });
+
+        var data, dispname, tooltip, organizer = false, rsvp = false, line,  morelink, html = '',overflow = '';
         for (var j=0; j < event.attendees.length; j++) {
           data = event.attendees[j];
           dispname = Q(data.name || data.email);
+          tooltip = '';
           if (data.email) {
-            dispname = '<a href="mailto:' + data.email + '" title="' + Q(data.email) + '" class="mailtolink">' + dispname + '</a>';
+            tooltip = data.email;
+            dispname = '<a href="mailto:' + data.email + '" class="mailtolink" data-cutype="' + data.cutype + '">' + dispname + '</a>';
             if (data.role == 'ORGANIZER')
               organizer = true;
-            else if ((data.status == 'NEEDS-ACTION' || data.status == 'TENTATIVE') && settings.identity.emails.indexOf(';'+data.email) >= 0)
+            else if ((data.status == 'NEEDS-ACTION' || data.status == 'TENTATIVE' || data.rsvp) && settings.identity.emails.indexOf(';'+data.email) >= 0)
               rsvp = data.status.toLowerCase();
           }
           
-          line = '<span class="attendee ' + String(data.role == 'ORGANIZER' ? 'organizer' : data.status).toLowerCase() + '">' + dispname + '</span> ';
+          if (data['delegated-to'])
+            tooltip = rcmail.gettext('delegatedto', 'calendar') + data['delegated-to'];
+          else if (data['delegated-from'])
+            tooltip = rcmail.gettext('delegatedfrom', 'calendar') + data['delegated-from'];
+          
+          line = '<span class="attendee ' + String(data.role == 'ORGANIZER' ? 'organizer' : data.status).toLowerCase() + '" title="' + Q(tooltip) + '">' + dispname + '</span> ';
           if (morelink)
             overflow += line;
           else
@@ -360,7 +385,7 @@
           $('#event-attendees').show()
             .children('.event-text')
             .html(html)
-            .find('a.mailtolink').click(function(e) { rcmail.redirect(rcmail.url('mail/compose', { _to:this.href.substr(7) })); return false; });
+            .find('a.mailtolink').click(event_attendee_click);
 
           // display all attendees in a popup when clicking the "more" link
           if (morelink) {
@@ -371,7 +396,7 @@
                 rcmail.gettext('tabattendees','calendar'),
                 null,
                 { width:450, modal:false });
-              $('#all-event-attendees a.mailtolink').click(function(e) { rcmail.redirect(rcmail.url('mail/compose', { _to:this.href.substr(7) })); return false; });
+              $('#all-event-attendees a.mailtolink').click(event_attendee_click);
               return false;
             })
           }
@@ -427,6 +452,20 @@
 */
     };
 
+    // event handler for clicks on an attendee link
+    var event_attendee_click = function(e)
+    {
+      var cutype = $(this).attr('data-cutype'),
+        mailto = this.href.substr(7);
+      if (rcmail.env.calendar_resources && cutype == 'RESOURCE') {
+        event_resources_dialog(mailto);
+      }
+      else {
+        rcmail.redirect(rcmail.url('mail/compose', { _to:mailto }));
+      }
+      return false;
+    };
+
     // bring up the event dialog (jquery-ui popup)
     var event_edit_dialog = function(action, event)
     {
@@ -514,11 +553,12 @@
       var recurrence, interval, rrtimes, rrenddate;
       var load_recurrence_tab = function()
       {
-        recurrence = $('#edit-recurrence-frequency').val(event.recurrence ? event.recurrence.FREQ : '').change();
+        recurrence = $('#edit-recurrence-frequency').val(event.recurrence ? event.recurrence.FREQ || (event.recurrence.RDATE ? 'RDATE' : '') : '').change();
         interval = $('#eventedit select.edit-recurrence-interval').val(event.recurrence ? event.recurrence.INTERVAL : 1);
         rrtimes = $('#edit-recurrence-repeat-times').val(event.recurrence ? event.recurrence.COUNT : 1);
         rrenddate = $('#edit-recurrence-enddate').val(event.recurrence && event.recurrence.UNTIL ? $.fullCalendar.formatDate(parseISO8601(event.recurrence.UNTIL), settings['date_format']) : '');
         $('#eventedit input.edit-recurrence-until:checked').prop('checked', false);
+        $('#edit-recurrence-rdates').html('');
       
         var weekdays = ['SU','MO','TU','WE','TH','FR','SA'];
         var rrepeat_id = '#edit-recurrence-repeat-forever';
@@ -551,6 +591,11 @@
         else if (event.start) {
           $('input.edit-recurrence-yearly-bymonth').val([String(event.start.getMonth()+1)]);
         }
+        if (event.recurrence && event.recurrence.RDATE) {
+          $.each(event.recurrence.RDATE, function(i,rdate){
+            add_rdate(parseISO8601(rdate));
+          });
+        }
       };
       
       // show warning if editing a recurring event
@@ -567,6 +612,7 @@
         allow_invitations = organizer || (calendar.owner && calendar.owner == 'anonymous') || settings.invite_shared;
       event_attendees = [];
       attendees_list = $('#edit-attendees-table > tbody').html('');
+      resources_list = $('#edit-resources-table > tbody').html('');
       $('#edit-attendees-notify')[(notify.checked && allow_invitations ? 'show' : 'hide')]();
       $('#edit-localchanges-warning')[(has_attendees(event) && !(allow_invitations || (calendar.owner && is_organizer(event, calendar.owner))) ? 'show' : 'hide')]();
 
@@ -715,6 +761,16 @@
             if ((byday = $('#edit-recurrence-yearly-byday').val()))
               data.recurrence.BYDAY = $('#edit-recurrence-yearly-prefix').val() + byday;
           }
+          else if (freq == 'RDATE') {
+            data.recurrence = { RDATE:[] };
+            // take selected but not yet added date into account
+            if ($('#edit-recurrence-rdate-input').val() != '') {
+              $('#recurrence-form-rdate input.button.add').click();
+            }
+            $('#edit-recurrence-rdates li').each(function(i, li){
+              data.recurrence.RDATE.push($(li).attr('data-value'));
+            });
+          }
         }
 
         data.calendar = calendars.val();
@@ -744,6 +800,7 @@
 
       // show/hide tabs according to calendar's feature support
       $('#edit-tab-attendees')[(calendar.attendees?'show':'hide')]();
+      $('#edit-tab-resources')[(rcmail.env.calendar_resources?'show':'hide')]();
       $('#edit-tab-attachments')[(calendar.attachments?'show':'hide')]();
 
       // activate the first tab
@@ -761,6 +818,9 @@
         resizable: (!bw.ie6 && !bw.ie7),  // disable for performance reasons
         closeOnEscape: false,
         title: rcmail.gettext((action == 'edit' ? 'edit_event' : 'new_event'), 'calendar'),
+        open: function() {
+          $dialog.parent().find('.ui-dialog-buttonset .ui-button').first().addClass('mainaction');
+        },
         close: function() {
           editform.hide().appendTo(document.body);
           $dialog.dialog("destroy").remove();
@@ -856,16 +916,17 @@
         .bind('click.roleicons', function(e){
           // toggle attendee status upon click on icon
           if (e.target.id && e.target.id.match(/rcmlia(.+)/)) {
-            var attendee, domid = RegExp.$1, roles = [ 'REQ-PARTICIPANT', 'OPT-PARTICIPANT', 'CHAIR' ];
+            var attendee, domid = RegExp.$1,
+                roles = [ 'REQ-PARTICIPANT', 'OPT-PARTICIPANT', 'NON-PARTICIPANT', 'CHAIR' ];
             if ((attendee = freebusy_ui.attendees[domid]) && attendee.role != 'ORGANIZER') {
-              var req = attendee.role != 'OPT-PARTICIPANT';
+              var req = attendee.role != 'OPT-PARTICIPANT' && attendee.role != 'NON-PARTICIPANT';
               var j = $.inArray(attendee.role, roles);
               j = (j+1) % roles.length;
               attendee.role = roles[j];
-              $(e.target).parent().removeClass().addClass('attendee '+String(attendee.role).toLowerCase());
+              $(e.target).parent().attr('class', 'attendee '+String(attendee.role).toLowerCase());
               
               // update total display if required-status changed
-              if (req != (roles[j] != 'OPT-PARTICIPANT')) {
+              if (req != (roles[j] != 'OPT-PARTICIPANT' && roles[j] != 'NON-PARTICIPANT')) {
                 compute_freebusy_totals();
                 update_freebusy_display(attendee.email);
               }
@@ -1295,7 +1356,7 @@
       var event = me.selected_event,
         eventstart = clone_date(event.start, event.allDay ? 1 : 0).getTime(),  // calculate with integers
         eventend = clone_date(event.end, event.allDay ? 2 : 0).getTime(),
-        duration = eventend - eventstart - (event.allDay ? HOUR_MS : 0),  // make sure we don't cross day borders on DST change
+        duration = eventend - eventstart - (event.allDay ? HOUR_MS : 0),  /* make sure we don't cross day borders on DST change */
         sinterval = freebusy_data.interval * 60000,
         intvlslots = 1,
         numslots = Math.ceil(duration / sinterval),
@@ -1404,9 +1465,10 @@
         $('#edit-startdate').data('duration', Math.round((me.selected_event.end.getTime() - me.selected_event.start.getTime()) / 1000));
       }
     };
-    
+
+
     // add the given list of participants
-    var add_attendees = function(names)
+    var add_attendees = function(names, params)
     {
       names = explode_quoted_string(names.replace(/,\s*$/, ''), ',');
 
@@ -1429,9 +1491,8 @@
           email = RegExp.$1;
           name = item.replace(email, '').replace(/^["\s<>]+/, '').replace(/["\s<>]+$/, '');
         }
-        
         if (email) {
-          add_attendee({ email:email, name:name, role:'REQ-PARTICIPANT', status:'NEEDS-ACTION' });
+          add_attendee($.extend({ email:email, name:name }, params));
           success = true;
         }
         else {
@@ -1441,19 +1502,24 @@
       
       return success;
     };
-    
+
     // add the given attendee to the list
     var add_attendee = function(data, readonly)
     {
+      if (!me.selected_event)
+        return false;
+
       // check for dupes...
       var exists = false;
       $.each(event_attendees, function(i, v){ exists |= (v.email == data.email); });
       if (exists)
         return false;
       
+      var calendar = me.selected_event && me.calendars[me.selected_event.calendar] ? me.calendars[me.selected_event.calendar] : me.calendars[me.selected_calendar];
+
       var dispname = Q(data.name || data.email);
       if (data.email)
-        dispname = '<a href="mailto:' + data.email + '" title="' + Q(data.email) + '" class="mailtolink">' + dispname + '</a>';
+        dispname = '<a href="mailto:' + data.email + '" title="' + Q(data.email) + '" class="mailtolink" data-cutype="' + data.cutype + '">' + dispname + '</a>';
       
       // role selection
       var organizer = data.role == 'ORGANIZER';
@@ -1462,8 +1528,11 @@
         opts.ORGANIZER = rcmail.gettext('calendar.roleorganizer');
       opts['REQ-PARTICIPANT'] = rcmail.gettext('calendar.rolerequired');
       opts['OPT-PARTICIPANT'] = rcmail.gettext('calendar.roleoptional');
-      opts['CHAIR'] =  rcmail.gettext('calendar.rolechair');
-      
+      opts['NON-PARTICIPANT'] = rcmail.gettext('calendar.rolenonparticipant');
+
+      if (data.cutype != 'RESOURCE')
+        opts['CHAIR'] =  rcmail.gettext('calendar.rolechair');
+
       if (organizer && !readonly)
           dispname = rcmail.env['identities-selector'];
       
@@ -1478,20 +1547,27 @@
       // delete icon
       var icon = rcmail.env.deleteicon ? '<img src="' + rcmail.env.deleteicon + '" alt="" />' : rcmail.gettext('delete');
       var dellink = '<a href="#delete" class="iconlink delete deletelink" title="' + Q(rcmail.gettext('delete')) + '">' + icon + '</a>';
-      
+      var tooltip = data.status || '';
+
+      if (data['delegated-to'])
+        tooltip = rcmail.gettext('delegatedto', 'calendar') + data['delegated-to'];
+      else if (data['delegated-from'])
+        tooltip = rcmail.gettext('delegatedfrom', 'calendar') + data['delegated-from'];
+
       var html = '<td class="role">' + select + '</td>' +
         '<td class="name">' + dispname + '</td>' +
-        '<td class="availability"><img src="./program/resources/blank.gif" class="availabilityicon ' + avail + '" /></td>' +
-        '<td class="confirmstate"><span class="' + String(data.status).toLowerCase() + '">' + Q(data.status) + '</span></td>' +
+        '<td class="availability"><img src="./program/resources/blank.gif" class="availabilityicon ' + avail + '" data-email="' + data.email + '" /></td>' +
+        '<td class="confirmstate"><span class="' + String(data.status).toLowerCase() + '" title="' + Q(tooltip) + '">' + Q(data.status || '') + '</span></td>' +
         '<td class="options">' + (organizer || readonly ? '' : dellink) + '</td>';
-      
+
+      var table = rcmail.env.calendar_resources && data.cutype == 'RESOURCE' ? resources_list : attendees_list;
       var tr = $('<tr>')
         .addClass(String(data.role).toLowerCase())
         .html(html)
-        .appendTo(attendees_list);
-      
+        .appendTo(table);
+
       tr.find('a.deletelink').click({ id:(data.email || data.name) }, function(e) { remove_attendee(this, e.data.id); return false; });
-      tr.find('a.mailtolink').click(function(e) { rcmail.redirect(rcmail.url('mail/compose', { _to:this.href.substr(7) })); return false; });
+      tr.find('a.mailtolink').click(event_attendee_click);
 
       // select organizer identity
       if (data.identity_id)
@@ -1503,16 +1579,17 @@
       }
       
       event_attendees.push(data);
+      return true;
     };
     
     // iterate over all attendees and update their free-busy status display
     var update_freebusy_status = function(event)
     {
-      var icons = attendees_list.find('img.availabilityicon');
-      for (var i=0; i < event_attendees.length; i++) {
-        if (icons.get(i) && event_attendees[i].email)
-          check_freebusy_status(icons.get(i), event_attendees[i].email, event);
-      }
+      attendees_list.find('img.availabilityicon').each(function(i,v) {
+        var email, icon = $(this);
+        if (email = icon.attr('data-email'))
+          check_freebusy_status(icon, email, event);
+      });
       
       freebusy_ui.needsupdate = false;
     };
@@ -1522,11 +1599,11 @@
     {
       var calendar = event.calendar && me.calendars[event.calendar] ? me.calendars[event.calendar] : { freebusy:false };
       if (!calendar.freebusy) {
-        $(icon).removeClass().addClass('availabilityicon unknown');
+        $(icon).attr('class', 'availabilityicon unknown');
         return;
       }
       
-      icon = $(icon).removeClass().addClass('availabilityicon loading');
+      icon = $(icon).attr('class', 'availabilityicon loading');
       
       $.ajax({
         type: 'GET',
@@ -1548,7 +1625,313 @@
       $(elem).closest('tr').remove();
       event_attendees = $.grep(event_attendees, function(data){ return (data.name != id && data.email != id) });
     };
-    
+
+    // open a dialog to display detailed free-busy information and to find free slots
+    var event_resources_dialog = function(search)
+    {
+      var $dialog = $('#eventresourcesdialog');
+
+      if ($dialog.is(':ui-dialog'))
+        $dialog.dialog('close');
+  
+      // dialog buttons
+      var buttons = {};
+  
+      buttons[rcmail.gettext('addresource', 'calendar')] = function() {
+        rcmail.command('add-resource');
+      };
+  
+      buttons[rcmail.gettext('close')] = function() {
+        $dialog.dialog("close");
+      };
+
+      // open jquery UI dialog
+      $dialog.dialog({
+        modal: true,
+        resizable: true,
+        closeOnEscape: true,
+        title: rcmail.gettext('findresources', 'calendar'),
+        close: function() {
+          $dialog.dialog('destroy').hide();
+        },
+        resize: function(e) {
+          var container = $(rcmail.gui_objects.resourceinfocalendar)
+          container.fullCalendar('option', 'height', container.height() + 4);
+        },
+        buttons: buttons,
+        width: 900,
+        height: 500
+      }).show();
+
+      // define add-button as main action
+      $('.ui-dialog-buttonset .ui-button', $dialog.parent()).first().addClass('mainaction').attr('id', 'rcmbtncalresadd');
+
+      me.dialog_resize($dialog.get(0), 540, Math.min(1000, $(window).width() - 50));
+
+      // set search query
+      $('#resourcesearchbox').val(search || '');
+
+      // initialize the treelist widget
+      if (!resources_treelist) {
+        resources_treelist = new rcube_treelist_widget(rcmail.gui_objects.resourceslist, {
+          id_prefix: 'rcres',
+          id_encode: rcmail.html_identifier_encode,
+          id_decode: rcmail.html_identifier_decode,
+          selectable: true
+        });
+        resources_treelist.addEventListener('select', function(node) {
+          if (resources_data[node.id]) {
+            resource_showinfo(resources_data[node.id]);
+            rcmail.enable_command('add-resource', me.selected_event && $("#eventedit").is(':visible') ? true : false);
+          }
+          else {
+            rcmail.enable_command('add-resource', false);
+            $(rcmail.gui_objects.resourceinfo).hide();
+            $(rcmail.gui_objects.resourceownerinfo).hide();
+            $(rcmail.gui_objects.resourceinfocalendar).fullCalendar('removeEventSource', resources_events_source);
+          }
+        });
+
+        // fetch (all) resource data from server
+        me.loading_lock = rcmail.set_busy(true, 'loading', me.loading_lock);
+        rcmail.http_request('resources-list', {}, me.loading_lock);
+
+        // register button
+        rcmail.register_button('add-resource', 'rcmbtncalresadd', 'uibutton');
+
+        // initialize resource calendar display
+        var resource_cal = $(rcmail.gui_objects.resourceinfocalendar);
+        resource_cal.fullCalendar({
+          header: { left: '', center: '', right: '' },
+          height: resource_cal.height() + 4,
+          defaultView: 'agendaWeek',
+          ignoreTimezone: true,
+          eventSources: [],
+          monthNames: settings['months'],
+          monthNamesShort: settings['months_short'],
+          dayNames: settings['days'],
+          dayNamesShort : settings['days_short'],
+          firstDay: settings['first_day'],
+          firstHour: settings['first_hour'],
+          slotMinutes: 60,
+          allDaySlot: false,
+          timeFormat: { '': settings['time_format'] },
+          axisFormat: settings['time_format'],
+          columnFormat: { day: 'dddd ' + settings['date_short'] },
+          titleFormat: { day: 'dddd ' + settings['date_long'] },
+          currentTimeIndicator: settings.time_indicator,
+          eventRender: function(event, element, view) {
+            element.addClass('status-' + event.status);
+            element.find('.fc-event-head').hide();
+            element.find('.fc-event-title').text(rcmail.get_label(event.status, 'calendar'));
+          }
+        });
+
+        $('#resource-calendar-prev').click(function(){
+          resource_cal.fullCalendar('prev');
+          return false;
+        });
+        $('#resource-calendar-next').click(function(){
+          resource_cal.fullCalendar('next');
+          return false;
+        });
+      }
+      else if (search) {
+        resource_search();
+      }
+      else {
+        resource_render_list(resources_index);
+      }
+
+      if (me.selected_event && me.selected_event.start) {
+        $(rcmail.gui_objects.resourceinfocalendar).fullCalendar('gotoDate', me.selected_event.start);
+      }
+    };
+
+    // render the resource details UI box
+    var resource_showinfo = function(resource)
+    {
+      // inline function to render a resource attribute
+      function render_attrib(value) {
+        if (typeof value == 'boolean') {
+          return value ? rcmail.get_label('yes') : rcmail.get_label('no');
+        }
+
+        return value;
+      }
+
+      if (rcmail.gui_objects.resourceinfo) {
+        var tr, table = $(rcmail.gui_objects.resourceinfo).show().find('tbody').html(''),
+          attribs = $.extend({ name:resource.name }, resource.attributes||{})
+          attribs.description = resource.description;
+
+        for (var k in attribs) {
+          if (typeof attribs[k] == 'undefined')
+            continue;
+          table.append($('<tr>').addClass(k)
+            .append('<td class="title">' + Q(ucfirst(rcmail.get_label(k, 'calendar'))) + '</td>')
+            .append('<td class="value">' + text2html(render_attrib(attribs[k])) + '</td>')
+          );
+        }
+
+        $(rcmail.gui_objects.resourceownerinfo).hide();
+        $(rcmail.gui_objects.resourceinfocalendar).fullCalendar('removeEventSource', resources_events_source);
+
+        if (resource.owner) {
+          // display cached data
+          if (resource_owners[resource.owner]) {
+            resource_owner_load(resource_owners[resource.owner]);
+          }
+          else {
+            // fetch owner data from server
+            me.loading_lock = rcmail.set_busy(true, 'loading', me.loading_lock);
+            rcmail.http_request('resources-owner', { _id: resource.owner }, me.loading_lock);
+          }
+        }
+
+        // load resource calendar
+        resources_events_source.url = "./?_task=calendar&_action=resources-calendar&_id="+escape(resource.ID);
+        $(rcmail.gui_objects.resourceinfocalendar).fullCalendar('addEventSource', resources_events_source);
+      }
+    };
+
+    // callback from server for resource listing
+    var resource_data_load = function(data)
+    {
+      var resources_tree = {};
+
+      // store data by ID
+      $.each(data, function(i, rec) {
+        resources_data[rec.ID] = rec;
+
+        // assign parent-relations
+        if (rec.members) {
+          $.each(rec.members, function(j, m){
+            resources_tree[m] = rec.ID;
+          });
+        }
+      });
+
+      // walk the parent-child tree to determine the depth of each node
+      $.each(data, function(i, rec) {
+        rec._depth = 0;
+        if (resources_tree[rec.ID])
+          rec.parent_id = resources_tree[rec.ID];
+
+        var parent_id = resources_tree[rec.ID];
+        while (parent_id) {
+          rec._depth++;
+          parent_id = resources_tree[parent_id];
+        }
+      });
+
+      // sort by depth, collection and name
+      data.sort(function(a,b) {
+        var j = a._type == 'collection' ? 1 : 0,
+            k = b._type == 'collection' ? 1 : 0,
+            d = a._depth - b._depth;
+        if (!d) d = (k - j);
+        if (!d) d = b.name < a.name ? 1 : -1;
+        return d;
+      });
+
+      $.each(data, function(i, rec) {
+        resources_index.push(rec.ID);
+      });
+
+      // apply search filter...
+      if ($('#resourcesearchbox').val() != '')
+        resource_search();
+      else  // ...or render full list
+        resource_render_list(resources_index);
+
+      rcmail.set_busy(false, null, me.loading_lock);
+    };
+
+    // renders the given list of resource records into the treelist
+    var resource_render_list = function(index) {
+      var rec, link;
+
+      resources_treelist.reset();
+
+      $.each(index, function(i, dn) {
+        if (rec = resources_data[dn]) {
+          link = $('<a>').attr('href', '#')
+            .attr('rel', rec.ID)
+            .html(Q(rec.name));
+
+          resources_treelist.insert({ id:rec.ID, html:link, classes:[rec._type], collapsed:true }, rec.parent_id, false);
+        }
+      });
+    };
+
+    // callback from server for owner information display
+    var resource_owner_load = function(data)
+    {
+      if (data) {
+        // cache this!
+        resource_owners[data.ID] = data;
+
+        var table = $(rcmail.gui_objects.resourceownerinfo).find('tbody').html('');
+
+        for (var k in data) {
+          if (k == 'event' || k == 'ID')
+            continue;
+
+          table.append($('<tr>').addClass(k)
+            .append('<td class="title">' + Q(ucfirst(rcmail.get_label(k, 'calendar'))) + '</td>')
+            .append('<td class="value">' + text2html(data[k]) + '</td>')
+          );
+        }
+
+        table.parent().show();
+      }
+    }
+
+    // quick-filter the loaded resource data
+    var resource_search = function()
+    {
+      var dataset, rec, q = $('#resourcesearchbox').val().toLowerCase();
+      if (q.length && resources_data) {
+        dataset = [];
+
+        // search by iterating over all resource records
+        for (var dn in resources_data) {
+          rec = resources_data[dn];
+          if (String(rec.name).toLowerCase().indexOf(q) >= 0 || String(rec.email).toLowerCase() == q) {
+            dataset.push(rec.ID);
+          }
+        }
+
+        resource_render_list(dataset);
+
+        // select single match
+        if (dataset.length == 1) {
+          resources_treelist.select(dataset[0]);
+        }
+      }
+      else {
+        $('#resourcesearchbox').val('');
+      }
+    };
+
+    // 
+    var reset_resource_search = function()
+    {
+      $('#resourcesearchbox').val('').focus();
+      resource_render_list(resources_index);
+    };
+
+    // 
+    var add_resource2event = function()
+    {
+      var resource = resources_data[resources_treelist.get_selection()];
+      if (resource) {
+        if (add_attendee($.extend({ role:'REQ-PARTICIPANT', status:'NEEDS-ACTION', cutype:'RESOURCE' }, resource)))
+          rcmail.display_message(rcmail.get_label('resourceadded', 'calendar'), 'confirmation');
+      }
+    }
+
     // when the user accepts or declines an event invitation
     var event_rsvp = function(response)
     {
@@ -1565,6 +1948,34 @@
         me.saving_lock = rcmail.set_busy(true, 'calendar.savingdata');
         rcmail.http_post('event', { action:'rsvp', e:me.selected_event, status:response });
       }
+    };
+    
+    // add the given date to the RDATE list
+    var add_rdate = function(date)
+    {
+      var li = $('<li>')
+        .attr('data-value', date2servertime(date))
+        .html('<span>' + Q($.fullCalendar.formatDate(date, settings['date_format'])) + '</span>')
+        .appendTo('#edit-recurrence-rdates');
+
+      $('<a>').attr('href', '#del')
+        .addClass('iconbutton delete')
+        .html(rcmail.get_label('delete', 'calendar'))
+        .attr('title', rcmail.get_label('delete', 'calendar'))
+        .appendTo(li);
+    };
+
+    // re-sort the list items by their 'data-value' attribute
+    var sort_rdates = function()
+    {
+      var mylist = $('#edit-recurrence-rdates'),
+        listitems = mylist.children('li').get();
+      listitems.sort(function(a, b) {
+         var compA = $(a).attr('data-value');
+         var compB = $(b).attr('data-value');
+         return (compA < compB) ? -1 : (compA > compB) ? 1 : 0;
+      })
+      $.each(listitems, function(idx, item) { mylist.append(item); });
     }
     
     // post the given event data to server
@@ -1660,13 +2071,8 @@
           return false;
         });
         
-        var buttons = [{
-          text: rcmail.gettext('cancel', 'calendar'),
-          click: function() {
-            $(this).dialog("close");
-          }
-        }];
-        
+        var buttons = [];
+
         if (!event.recurrence) {
           buttons.push({
             text: rcmail.gettext((action == 'remove' ? 'remove' : 'save'), 'calendar'),
@@ -1678,13 +2084,23 @@
             }
           });
         }
-      
+
+        buttons.push({
+          text: rcmail.gettext('cancel', 'calendar'),
+          click: function() {
+            $(this).dialog("close");
+          }
+        });
+
         $dialog.dialog({
           modal: true,
           width: 460,
           dialogClass: 'warning',
           title: rcmail.gettext((action == 'remove' ? 'removeeventconfirm' : 'changeeventconfirm'), 'calendar'),
           buttons: buttons,
+          open: function() {
+            $dialog.parent().find('.ui-button').first().focus();
+          },
           close: function(){
             $dialog.dialog("destroy").hide();
             if (!rcmail.busy)
@@ -1792,7 +2208,7 @@
           date: date.getDate(),
           month: date.getMonth(),
           year: date.getFullYear(),
-          ignoreTimezone: true,  // will treat the given date strings as in local (browser's) timezone
+          ignoreTimezone: true,  /* will treat the given date strings as in local (browser's) timezone */
           eventSources: sources,
           monthNames : settings['months'],
           monthNamesShort : settings['months_short'],
@@ -1917,6 +2333,9 @@
         resizable: true,
         closeOnEscape: false,
         title: rcmail.gettext((calendar.id ? 'editcalendar' : 'createcalendar'), 'calendar'),
+        open: function() {
+          $dialog.parent().find('.ui-dialog-buttonset .ui-button').first().addClass('mainaction');
+        },
         close: function() {
           $dialog.html('').dialog("destroy").hide();
         },
@@ -1957,7 +2376,7 @@
       for (var i=0; i < delete_ids.length; i++) {
         id = delete_ids[i];
         fc.fullCalendar('removeEventSource', this.calendars[id]);
-        $(rcmail.get_folder_li(id, 'rcmlical')).remove();
+        $('#rcmlical' + id).remove();
         $('#edit-calendar option[value="'+id+'"]').remove();
         delete this.calendars[id];
       }
@@ -2010,6 +2429,9 @@
         resizable: false,
         closeOnEscape: false,
         title: rcmail.gettext('importevents', 'calendar'),
+        open: function() {
+          $dialog.parent().find('.ui-dialog-buttonset .ui-button').first().addClass('mainaction');
+        },
         close: function() {
           $('.ui-dialog-buttonpane button', $dialog.parent()).button('enable');
           $dialog.dialog("destroy").hide();
@@ -2071,7 +2493,7 @@
           if (range == 'custom')
             start = date2unixtime(parse_datetime('00:00', $('#event-export-startdate').val()));
           else if (range > 0)
-            start = 'today -' + range + '^months';
+            start = 'today -' + range + ' months';
 
           rcmail.goto_url('export_events', { source:source, start:start, attachments:attachmt?1:0 });
         }
@@ -2087,6 +2509,9 @@
         resizable: false,
         closeOnEscape: false,
         title: rcmail.gettext('exporttitle', 'calendar'),
+        open: function() {
+          $dialog.parent().find('.ui-dialog-buttonset .ui-button').first().addClass('mainaction');
+        },
         close: function() {
           $('.ui-dialog-buttonpane button', $dialog.parent()).button('enable');
           $dialog.dialog("destroy").hide();
@@ -2138,7 +2563,7 @@
         if (!source.active) {
           source.active = true;
           fc.fullCalendar('addEventSource', source);
-          $('#' + rcmail.get_folder_li(source.id, 'rcmlical').id + ' input').prop('checked', true);
+          $('#rcmlical' + source.id + ' input').prop('checked', true);
         }
         else
           fc.fullCalendar('refetchEvents', source);
@@ -2209,6 +2634,12 @@
         window.history.replaceState({}, document.title, rcmail.url('', query).replace('&_action=', ''));
     };
 
+    this.resource_search = resource_search;
+    this.reset_resource_search = reset_resource_search;
+    this.add_resource2event = add_resource2event;
+    this.resource_data_load = resource_data_load;
+    this.resource_owner_load = resource_owner_load;
+
 
     /***  event searching  ***/
 
@@ -2355,6 +2786,22 @@
       fc.fullCalendar('option', 'height', $('#calendar').height() - footer);
     };
 
+    // mark the given calendar folder as selected
+    this.select_calendar = function(id)
+    {
+      var prefix = 'rcmlical';
+
+      $(rcmail.gui_objects.calendarslist).find('li.selected')
+        .removeClass('selected').addClass('unfocused');
+      $('#' + prefix + id, rcmail.gui_objects.calendarslist)
+        .removeClass('unfocused').addClass('selected');
+
+      // trigger event hook
+      rcmail.triggerEvent('selectfolder', { folder:name, prefix:prefix });
+
+      this.selected_calendar = id;
+    };
+
 
     /***  startup code  ***/
 
@@ -2388,7 +2835,7 @@
       }
 
       // init event handler on calendar list checkbox
-      if ((li = rcmail.get_folder_li(id, 'rcmlical'))) {
+      if ((li = rcube_find_object('rcmlical' + id))) {
         $('#'+li.id+' input').click(function(e){
           var id = $(this).data('id');
           if (me.calendars[id]) {  // add or remove event source on click
@@ -2409,11 +2856,9 @@
         }).data('id', id).get(0).checked = active;
         
         $(li).click(function(e){
-          var id = $(this).data('id');
-          rcmail.select_folder(id, 'rcmlical');
+          me.select_calendar($(this).data('id'));
           rcmail.enable_command('calendar-edit', true);
           rcmail.enable_command('calendar-remove', 'calendar-showurl', true);
-          me.selected_calendar = id;
         })
         .dblclick(function(){ me.calendar_edit_dialog(me.calendars[me.selected_calendar]); })
         .data('id', id);
@@ -2429,6 +2874,9 @@
     if (settings.default_calendar && this.calendars[settings.default_calendar] && !this.calendars[settings.default_calendar].readonly)
       this.selected_calendar = settings.default_calendar;
     
+    if (this.selected_calendar)
+      this.select_calendar(this.selected_calendar);
+    
     var viewdate = new Date();
     if (rcmail.env.date)
       viewdate.setTime(fromunixtime(rcmail.env.date));
@@ -2757,8 +3205,9 @@
       // init event dialog
       $('#eventtabs').tabs({
         show: function(event, ui) {
-          if (ui.panel.id == 'event-tab-3') {
-            $('#edit-attendee-name').select();
+          if (ui.panel.id == 'event-panel-attendees' || ui.panel.id == 'event-panel-resources') {
+            var tab = ui.panel.id == 'event-panel-resources' ? 'resource' : 'attendee';
+            $('#edit-'+tab+'-name').select();
             // update free-busy status if needed
             if (freebusy_ui.needsupdate && me.selected_event)
               update_freebusy_status(me.selected_event);
@@ -2807,13 +3256,31 @@
       $('#edit-recurrence-frequency').change(function(e){
         var freq = $(this).val().toLowerCase();
         $('.recurrence-form').hide();
-        if (freq)
-          $('#recurrence-form-'+freq+', #recurrence-form-until').show();
+        if (freq) {
+          $('#recurrence-form-'+freq).show();
+          if (freq != 'rdate')
+            $('#recurrence-form-until').show();
+        }
+      });
+      $('#recurrence-form-rdate input.button.add').click(function(e){
+        var dt, dv = $('#edit-recurrence-rdate-input').val();
+        if (dv && (dt = parse_datetime('12:00', dv))) {
+          add_rdate(dt);
+          sort_rdates();
+          $('#edit-recurrence-rdate-input').val('')
+        }
+        else {
+          $('#edit-recurrence-rdate-input').select();
+        }
+      });
+      $('#edit-recurrence-rdates').on('click', 'a.delete', function(e){
+        $(this).closest('li').remove();
+        return false;
       });
       $('#edit-recurrence-enddate').datepicker(datepicker_settings).click(function(){ $("#edit-recurrence-repeat-until").prop('checked', true) });
       $('#edit-recurrence-repeat-times').change(function(e){ $('#edit-recurrence-repeat-count').prop('checked', true); });
 
-      $('#event-export-startdate').datepicker(datepicker_settings);
+      $('#edit-recurrence-rdate-input, #event-export-startdate').datepicker(datepicker_settings);
 
       // init attendees autocompletion
       var ac_props;
@@ -2825,16 +3292,39 @@
         };
       }
       rcmail.init_address_input_events($('#edit-attendee-name'), ac_props);
-      rcmail.addEventListener('autocomplete_insert', function(e){ $('#edit-attendee-add').click(); });
+      rcmail.addEventListener('autocomplete_insert', function(e){
+        if (e.field.name == 'participant') {
+          $('#edit-attendee-add').click();
+        }
+        else if (e.field.name == 'resource' && e.data && e.data.email) {
+          add_attendee($.extend(e.data, { role:'REQ-PARTICIPANT', status:'NEEDS-ACTION', cutype:'RESOURCE' }));
+          e.field.value = '';
+        }
+      });
 
       $('#edit-attendee-add').click(function(){
         var input = $('#edit-attendee-name');
         rcmail.ksearch_blur();
-        if (add_attendees(input.val())) {
+        if (add_attendees(input.val(), { role:'REQ-PARTICIPANT', status:'NEEDS-ACTION', cutype:'INDIVIDUAL' })) {
           input.val('');
         }
       });
 
+      rcmail.init_address_input_events($('#edit-resource-name'), { action:'calendar/resources-autocomplete' });
+
+      $('#edit-resource-add').click(function(){
+        var input = $('#edit-resource-name');
+        rcmail.ksearch_blur();
+        if (add_attendees(input.val(), { role:'REQ-PARTICIPANT', status:'NEEDS-ACTION', cutype:'RESOURCE' })) {
+          input.val('');
+        }
+      });
+      
+      $('#edit-resource-find').click(function(){
+        event_resources_dialog();
+        return false;
+      });
+
       // keep these two checkboxes in sync
       $('#edit-attendees-donotify, #edit-attendees-invite').click(function(){
         $('#edit-attendees-donotify, #edit-attendees-invite').prop('checked', this.checked);
@@ -2917,6 +3407,11 @@
   rcmail.register_command('search', function(){ cal.quicksearch(); }, true);
   rcmail.register_command('reset-search', function(){ cal.reset_quicksearch(); }, true);
 
+  // resource invitation dialog
+  rcmail.register_command('search-resource', function(){ cal.resource_search(); }, true);
+  rcmail.register_command('reset-resource-search', function(){ cal.reset_resource_search(); }, true);
+  rcmail.register_command('add-resource', function(){ cal.add_resource2event(); }, false);
+
   // register callback commands
   rcmail.addEventListener('plugin.destroy_source', function(p){ cal.calendar_destroy_source(p.id); });
   rcmail.addEventListener('plugin.unlock_saving', function(p){ cal.unlock_saving(); });
@@ -2924,6 +3419,8 @@
   rcmail.addEventListener('plugin.import_success', function(p){ cal.import_success(p); });
   rcmail.addEventListener('plugin.import_error', function(p){ cal.import_error(p); });
   rcmail.addEventListener('plugin.reload_view', function(p){ cal.reload_view(p); });
+  rcmail.addEventListener('plugin.resource_data', function(p){ cal.resource_data_load(p); });
+  rcmail.addEventListener('plugin.resource_owner', function(p){ cal.resource_owner_load(p); });
   rcmail.addEventListener('requestrefresh', function(q){ return cal.before_refresh(q); });
 
   // let's go

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

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

@@ -54,7 +54,18 @@
  *     'free_busy' => 'free|busy|outofoffice|tentative',  // Show time as
  *      'priority' => 0-9,     // Event priority (0=undefined, 1=highest, 9=lowest)
  *   'sensitivity' => 'public|private|confidential',   // Event sensitivity
- *        'alarms' => '-15M:DISPLAY',  // Reminder settings inspired by valarm definition (e.g. display alert 15 minutes before event)
+ *        'alarms' => '-15M:DISPLAY',  // DEPRECATED Reminder settings inspired by valarm definition (e.g. display alert 15 minutes before event)
+ *       'valarms' => array(           // List of reminders (new format), each represented as a hash array:
+ *                  array(
+ *                     'trigger' => '-PT90M',     // ISO 8601 period string prefixed with '+' or '-', or DateTime object
+ *                      'action' => 'DISPLAY|EMAIL|AUDIO',
+ *                    'duration' => 'PT15M',      // ISO 8601 period string
+ *                      'repeat' => 0,            // number of repetitions
+ *                 'description' => '',        // text to display for DISPLAY actions
+ *                     'summary' => '',        // message text for EMAIL actions
+ *                   'attendees' => array(),   // list of email addresses to receive alarm messages
+ *                  ),
+ *   ),
  *   'attachments' => array(   // List of attachments
  *            'name' => 'File name',
  *        'mimetype' => 'Content type',
@@ -529,23 +540,4 @@
     return $events;
   }
 
-  /**
-   * Store alarm dismissal for birtual birthay events
-   *
-   * @param  string  Event identifier
-   * @param  integer Suspend the alarm for this number of seconds
-   */
-  public function dismiss_birthday_alarm($event_id, $snooze = 0)
-  {
-    $rcmail = rcmail::get_instance();
-    $cache  = $rcmail->get_cache('calendar.birthdayalarms', 'db', 86400 * 30);
-    $cache->remove($event_id);
-
-    // compute new notification time or disable if not snoozed
-    $notifyat = $snooze > 0 ? time() + $snooze : null;
-    $cache->set($event_id, array('snooze' => $snooze, 'notifyat' => $notifyat));
-
-    return true;
-  }
-
 }

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

@@ -793,13 +793,12 @@
     $events = array();
     if (!empty($calendar_ids)) {
       $result = $this->rc->db->query(sprintf(
-        "SELECT e.*, (SELECT COUNT(attachment_id) FROM " . $this->db_attachments . " 
-           WHERE event_id = e.event_id OR event_id = e.recurrence_id) AS _attachments
-         FROM " . $this->db_events . " AS e
+        "SELECT e.*, (SELECT COUNT(attachment_id) FROM " . $this->db_attachments . "
+            WHERE event_id = e.event_id OR event_id = e.recurrence_id) AS _attachments
+         FROM " . $this->db_events . " e
          WHERE e.calendar_id IN (%s)
-         AND e.start <= %s AND e.end >= %s
-         %s
-         GROUP BY e.event_id",
+            AND e.start <= %s AND e.end >= %s
+            %s",
          join(',', $calendar_ids),
          $this->rc->db->fromunixtime($end),
          $this->rc->db->fromunixtime($start),
@@ -846,6 +845,8 @@
           $rr[2] = intval($rr[2]);
         else if ($rr[1] == 'UNTIL')
           $rr[2] = date_create($rr[2]);
+        else if ($rr[1] == 'RDATE')
+          $rr[2] = array_map('date_create', explode(',', $rr[2]));
         else if ($rr[1] == 'EXDATE')
           $rr[2] = array_map('date_create', explode(',', $rr[2]));
         $event['recurrence'][$rr[1]] = $rr[2];

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

@@ -218,8 +218,18 @@
   public function list_events($start, $end, $search = null, $virtual = 1, $query = array())
   {
     // convert to DateTime for comparisons
-    $start = new DateTime('@'.$start);
-    $end = new DateTime('@'.$end);
+    try {
+      $start = new DateTime('@'.$start);
+    }
+    catch (Exception $e) {
+      $start = new DateTime('@0');
+    }
+    try {
+      $end = new DateTime('@'.$end);
+    }
+    catch (Exception $e) {
+      $end = new DateTime('today +10 years');
+    }
 
     // query Kolab storage
     $query[] = array('dtstart', '<=', $end);
@@ -346,7 +356,6 @@
     if (!$old || PEAR::isError($old))
       return false;
 
-    $old['recurrence'] = '';  # clear old field, could have been removed in new, too
     $object = $this->_from_rcube_event($event, $old);
     $saved = $this->storage->save($object, 'event', $event['id']);
 
@@ -597,7 +606,7 @@
       unset($record['recurrence']);
 
     // remove internals
-    unset($record['_mailbox'], $record['_msguid'], $record['_formatobj'], $record['_attachments']);
+    unset($record['_mailbox'], $record['_msguid'], $record['_formatobj'], $record['_attachments'], $record['x-custom']);
 
     return $record;
   }
@@ -648,6 +657,16 @@
 
     $event['_owner'] = $identity['email'];
 
+    // remove EXDATE values if RDATE is given
+    if (!empty($event['recurrence']['RDATE'])) {
+      $event['recurrence']['EXDATE'] = array();
+    }
+
+    // remove recurrence information (e.g. EXDATES and EXCEPTIONS) entirely
+    if ($event['recurrence'] && empty($event['recurrence']['FREQ']) && empty($event['recurrence']['RDATE'])) {
+      $event['recurrence'] = array();
+    }
+
     // remove some internal properties which should not be saved
     unset($event['_savemode'], $event['_fromcalendar'], $event['_identity']);

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

@@ -47,6 +47,8 @@
    */
   public function __construct($cal)
   {
+    $cal->require_plugin('libkolab');
+
     $this->cal = $cal;
     $this->rc = $cal->rc;
     $this->_read_calendars();
@@ -500,6 +502,15 @@
             if ($master['recurrence']['COUNT'])
               $master['recurrence']['COUNT']--;
           }
+          // remove the matching RDATE entry
+          else if ($master['recurrence']['RDATE']) {
+            foreach ($master['recurrence']['RDATE'] as $j => $rdate) {
+              if ($rdate->format('Ymd') == $event['start']->format('Ymd')) {
+                unset($master['recurrence']['RDATE'][$j]);
+                break;
+              }
+            }
+          }
           else {  // add exception to master event
             $master['recurrence']['EXDATE'][] = $event['start'];
           }
@@ -516,8 +527,18 @@
             unset($master['recurrence']['COUNT']);
 
             // if all future instances are deleted, remove recurrence rule entirely (bug #1677)
-            if ($master['recurrence']['UNTIL']->format('Ymd') == $master['start']->format('Ymd'))
+            if ($master['recurrence']['UNTIL']->format('Ymd') == $master['start']->format('Ymd')) {
               $master['recurrence'] = array();
+            }
+            // remove matching RDATE entries
+            else if ($master['recurrence']['RDATE']) {
+              foreach ($master['recurrence']['RDATE'] as $j => $rdate) {
+                if ($rdate->format('Ymd') == $event['start']->format('Ymd')) {
+                  $master['recurrence']['RDATE'] = array_slice($master['recurrence']['RDATE'], 0, $j);
+                  break;
+                }
+              }
+            }
 
             $success = $storage->update_event($master);
             break;
@@ -674,8 +695,24 @@
             }
         }
 
+        $add_exception = true;
+
+        // adjust matching RDATE entry if dates changed
+        if ($savemode == 'current' && $master['recurrence']['RDATE'] && ($old_date = $old['start']->format('Ymd')) != $event['start']->format('Ymd')) {
+          foreach ($master['recurrence']['RDATE'] as $j => $rdate) {
+            if ($rdate->format('Ymd') == $old_date) {
+              $master['recurrence']['RDATE'][$j] = $event['start'];
+              sort($master['recurrence']['RDATE']);
+              $add_exception = false;
+              break;
+            }
+          }
+        }
+
         // save as new exception to master event
-        $master['recurrence']['EXCEPTIONS'][] = $event;
+        if ($add_exception) {
+          $master['recurrence']['EXCEPTIONS'][] = $event;
+        }
         $success = $storage->update_event($master);
         break;
 
@@ -763,7 +800,7 @@
 
     // add new categories to user prefs
     $old_categories = $this->rc->config->get('calendar_categories', $this->default_categories);
-    if ($newcats = array_diff(array_map('strtolower', array_keys($categories)), array_map('strtolower', array_keys($old_categories)))) {
+    if ($newcats = array_udiff(array_keys($categories), array_keys($old_categories), function($a, $b){ return strcasecmp($a, $b); })) {
       foreach ($newcats as $category)
         $old_categories[$category] = '';  // no color set yet
       $this->rc->user->save_prefs(array('calendar_categories' => $old_categories));

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

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

@@ -0,0 +1,150 @@
+<?php
+
+/**
+ * LDAP-based resource directory class using rcube_ldap functionality
+ *
+ * @author Thomas Bruederli <bruederli@kolabsys.com>
+ *
+ * Copyright (C) 2014, Kolab Systems AG <contact@kolabsys.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/**
+ * LDAP-based resource directory implementation
+ */
+class resources_driver_ldap extends resources_driver
+{
+    private $rc;
+    private $ldap;
+
+    /**
+     * Default constructor
+     */
+    function __construct($cal)
+    {
+        $this->cal = $cal;
+        $this->rc = $cal->rc;
+    }
+
+    /**
+     * Fetch resource objects to be displayed for booking
+     *
+     * @param  string  Search query (optional)
+     * @return array  List of resource records available for booking
+     */
+    public function load_resources($query = null, $num = 5000)
+    {
+      if (!($ldap = $this->connect())) {
+        return array();
+      }
+
+      // TODO: apply paging
+      $ldap->set_pagesize($num);
+
+      if (isset($query)) {
+        $results = $ldap->search('*', $query, 0, true, true);
+      }
+      else {
+        $results = $ldap->list_records();
+      }
+
+      if ($results instanceof ArrayAccess) {
+        foreach ($results as $i => $rec) {
+          $results[$i] = $this->decode_resource($rec);
+        }
+      }
+
+      return $results;
+    }
+
+    /**
+     * Return properties of a single resource
+     *
+     * @param string  Unique resource identifier
+     * @return array Resource object as hash array
+     */
+    public function get_resource($dn)
+    {
+      $rec = null;
+
+      if ($ldap = $this->connect()) {
+        $rec = $ldap->get_record(rcube_ldap::dn_encode($dn), true);
+
+        if (!empty($rec)) {
+          $rec = $this->decode_resource($rec);
+        }
+      }
+
+      return $rec;
+    }
+
+    /**
+     * Return properties of a resource owner
+     *
+     * @param string  Owner identifier
+     * @return array  Resource object as hash array
+     */
+    public function get_resource_owner($dn)
+    {
+      $owner = null;
+
+      if ($ldap = $this->connect()) {
+        $owner = $ldap->get_record(rcube_ldap::dn_encode($dn), true);
+        $owner['ID'] = rcube_ldap::dn_decode($owner['ID']);
+        unset($owner['_raw_attrib'], $owner['_type']);
+      }
+
+      return $owner;
+    }
+
+    /**
+     * Extract JSON-serialized attributes
+     */
+    private function decode_resource($rec)
+    {
+      $rec['ID'] = rcube_ldap::dn_decode($rec['ID']);
+
+      if (is_array($rec['attributes']) && $rec['attributes'][0]) {
+        $attributes = array();
+
+        foreach ($rec['attributes'] as $sattr) {
+          $attr = @json_decode($sattr, true);
+          $attributes += $attr;
+        }
+
+        $rec['attributes'] = $attributes;
+      }
+
+      // force $rec['members'] to be an array
+      if (!empty($rec['members']) && !is_array($rec['members'])) {
+        $rec['members'] = array($rec['members']);
+      }
+
+      // remove unused cruft
+      unset($rec['_raw_attrib']);
+
+      return $rec;
+    }
+
+    private function connect()
+    {
+      if (!isset($this->ldap)) {
+        $this->ldap = new rcube_ldap($this->rc->config->get('calendar_resources_directory'), true);
+      }
+
+      return $this->ldap->ready ? $this->ldap : null;
+    }
+
+}
\ No newline at end of file

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

@@ -0,0 +1,114 @@
+<?php
+
+/**
+ * Resources directory interface definition
+ *
+ * @author Thomas Bruederli <bruederli@kolabsys.com>
+ *
+ * Copyright (C) 2014, Kolab Systems AG <contact@kolabsys.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+
+/**
+ * Interface definition for a resources directory driver classe
+ */
+abstract class resources_driver
+{
+  protected$cal;
+
+  /**
+   * Default constructor
+   */
+  function __construct($cal)
+  {
+      $this->cal = $cal;
+  }
+
+  /**
+   * Fetch resource objects to be displayed for booking
+   *
+   * @param  string  Search query (optional)
+   * @return array  List of resource records available for booking
+   */
+  abstract public function load_resources($query = null);
+
+  /**
+   * Return properties of a single resource
+   *
+   * @param string  Unique resource identifier
+   * @return array  Resource object as hash array
+   */
+  abstract public function get_resource($id);
+
+  /**
+   * Return properties of a resource owner
+   *
+   * @param string  Owner identifier
+   * @return array  Resource object as hash array
+   */
+  public function get_resource_owner($id)
+  {
+      return null;
+  }
+
+  /**
+   * Get event data to display a resource's calendar
+   *
+   * The default implementation extracts the resource's email address
+   * and fetches free-busy data using the calendar backend driver.
+   *
+   * @param  integer Event's new start (unix timestamp)
+   * @param  integer Event's new end (unix timestamp)
+   * @return array A list of event objects (see calendar_driver specification)
+   */
+  public function get_resource_calendar($id, $start, $end)
+  {
+      $events = array();
+      $rec = $this->get_resource($id);
+      if ($rec && !empty($rec['email']) && $this->cal->driver) {
+          $fbtypemap = array(
+              calendar::FREEBUSY_BUSY => 'busy',
+              calendar::FREEBUSY_TENTATIVE => 'tentative',
+              calendar::FREEBUSY_OOF => 'outofoffice',
+          );
+
+          // if the backend has free-busy information
+          $fblist = $this->cal->driver->get_freebusy_list($rec['email'], $start, $end);
+          if (is_array($fblist)) {
+              foreach ($fblist as $slot) {
+                  list($from, $to, $type) = $slot;
+                  if ($type == calendar::FREEBUSY_FREE || $type == calendar::FREEBUSY_UNKNOWN) {
+                      continue;
+                  }
+                  if ($from < $end && $to > $start) {
+                      $event = array(
+                          'id'     => sha1($id . $from . $to),
+                          'title'  => $rec['name'],
+                          'start'  => new DateTime('@' . $from),
+                          'end'    => new DateTime('@' . $to),
+                          'status' => $fbtypemap[$type],
+                          'calendar' => '_resource',
+                      );
+                      $events[] = $event;
+                  }
+              }
+          }
+      }
+
+      return $events;
+  }
+
+}

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

@@ -127,6 +127,13 @@
     public $recurMonths = array();
 
     /**
+     * RDATE recurrence values
+     *
+     * @var array
+     */
+    public $rdates = array();
+
+    /**
      * All the exceptions from recurrence for this event.
      *
      * @var array
@@ -427,7 +434,7 @@
             return clone $this->start;
         }
 
-        if ($this->recurInterval == 0) {
+        if ($this->recurInterval == 0 && empty($this->rdates)) {
             return false;
         }
 
@@ -779,6 +786,19 @@
             return $next;
         }
 
+        // fall-back to RDATE properties
+        if (!empty($this->rdates)) {
+            $next = clone $this->start;
+            foreach ($this->rdates as $rdate) {
+                $next->year  = $rdate->year;
+                $next->month = $rdate->month;
+                $next->mday  = $rdate->mday;
+                if ($next->compareDateTime($after) >= 0) {
+                    return $next;
+                }
+            }
+        }
+
         // We didn't find anything, the recurType was bad, or something else
         // went wrong - return false.
         return false;
@@ -835,6 +855,18 @@
     }
 
     /**
+     * Adds an absolute recurrence date.
+     *
+     * @param integer $year   The year of the instance.
+     * @param integer $month  The month of the instance.
+     * @param integer $mday   The day of the month of the instance.
+     */
+    public function addRDate($year, $month, $mday)
+    {
+        $this->rdates[] = new Horde_Date($year, $month, $mday);
+    }
+
+    /**
      * Adds an exception to a recurring event.
      *
      * @param integer $year   The year of the execption.

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

@@ -1,5 +1,7 @@
 <?php
 
+require_once realpath(__DIR__ . '/../../libcalendaring/lib/libcalendaring_itip.php');
+
 /**
  * iTIP functions for the Calendar plugin
  *
@@ -24,189 +26,17 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-class calendar_itip
+class calendar_itip extends libcalendaring_itip
 {
-  private $rc;
-  private $cal;
-  private $sender;
-  private $itip_send = false;
-
-  function __construct($cal, $identity = null)
-  {
-    $this->cal = $cal;
-    $this->rc = $cal->rc;
-    $this->sender = $identity ? $identity : $this->rc->user->get_identity();
-
-    $this->cal->add_hook('message_before_send', array($this, 'before_send_hook'));
-    $this->cal->add_hook('smtp_connect', array($this, 'smtp_connect_hook'));
-  }
-
-  function set_sender_email($email)
-  {
-    if (!empty($email))
-      $this->sender['email'] = $email;
-  }
-
   /**
-   * Send an iTip mail message
-   *
-   * @param array   Event object to send
-   * @param string  iTip method (REQUEST|REPLY|CANCEL)
-   * @param array   Hash array with recipient data (name, email)
-   * @param string  Mail subject
-   * @param string  Mail body text label
-   * @param object  Mail_mime object with message data
-   * @return boolean True on success, false on failure
+   * Constructor to set text domain to calendar
    */
-  public function send_itip_message($event, $method, $recipient, $subject, $bodytext, $message = null)
+  function __construct($plugin, $domain = 'calendar')
   {
-    if (!$this->sender['name'])
-      $this->sender['name'] = $this->sender['email'];
-    
-    if (!$message)
-      $message = $this->compose_itip_message($event, $method);
-    
-    $mailto = rcube_idn_to_ascii($recipient['email']);
-    
-    $headers = $message->headers();
-    $headers['To'] = format_email_recipient($mailto, $recipient['name']);
-    $headers['Subject'] = $this->cal->gettext(array(
-      'name' => $subject,
-      'vars' => array('title' => $event['title'], 'name' => $this->sender['name'])
-    ));
-    
-    // compose a list of all event attendees
-    $attendees_list = array();
-    foreach ((array)$event['attendees'] as $attendee) {
-      $attendees_list[] = ($attendee['name'] && $attendee['email']) ?
-        $attendee['name'] . ' <' . $attendee['email'] . '>' :
-        ($attendee['name'] ? $attendee['name'] : $attendee['email']);
-    }
-    
-    $mailbody = $this->cal->gettext(array(
-      'name' => $bodytext,
-      'vars' => array(
-        'title' => $event['title'],
-        'date' => $this->cal->lib->event_date_text($event, true),
-        'attendees' => join(', ', $attendees_list),
-        'sender' => $this->sender['name'],
-        'organizer' => $this->sender['name'],
-      )
-    ));
-    
-    // append links for direct invitation replies
-    if ($method == 'REQUEST' && ($token = $this->store_invitation($event, $recipient['email']))) {
-      $mailbody .= "\n\n" . $this->cal->gettext(array(
-        'name' => 'invitationattendlinks',
-        'vars' => array('url' => $this->cal->get_url(array('action' => 'attend', 't' => $token))),
-      ));
-    }
-    else if ($method == 'CANCEL') {
-      $this->cancel_itip_invitation($event);
-    }
-    
-    $message->headers($headers, true);
-    $message->setTXTBody(rcube_mime::format_flowed($mailbody, 79));
-
-    // finally send the message
-    $this->itip_send = true;
-    $sent = $this->rc->deliver_message($message, $headers['X-Sender'], $mailto, $smtp_error);
-    $this->itip_send = false;
-
-    return $sent;
-  }
-
-  /**
-   * Plugin hook triggered by rcube::deliver_message() before delivering a message.
-   * Here we can set the 'smtp_server' config option to '' in order to use
-   * PHP's mail() function for unauthenticated email sending.
-   */
-  public function before_send_hook($p)
-  {
-    if ($this->itip_send && !$this->rc->user->ID && $this->rc->config->get('calendar_itip_smtp_server', null) === '') {
-      $this->rc->config->set('smtp_server', '');
-    }
-
-    return $p;
+    parent::__construct($plugin, $domain);
   }
 
   /**
-   * Plugin hook to alter SMTP authentication.
-   * This is used if iTip messages are to be sent from an unauthenticated session
-   */
-  public function smtp_connect_hook($p)
-  {
-    // replace smtp auth settings if we're not in an authenticated session
-    if ($this->itip_send && !$this->rc->user->ID) {
-      foreach (array('smtp_server', 'smtp_user', 'smtp_pass') as $prop) {
-        $p[$prop] = $this->rc->config->get("calendar_itip_$prop", $p[$prop]);
-      }
-    }
-
-    return $p;
-  }
-
-  /**
-   * Helper function to build a Mail_mime object to send an iTip message
-   *
-   * @param array   Event object to send
-   * @param string  iTip method (REQUEST|REPLY|CANCEL)
-   * @return object Mail_mime object with message data
-   */
-  public function compose_itip_message($event, $method)
-  {
-    $from = rcube_idn_to_ascii($this->sender['email']);
-    $from_utf = rcube_idn_to_utf8($from);
-    $sender = format_email_recipient($from, $this->sender['name']);
-    
-    // truncate list attendees down to the recipient of the iTip Reply.
-    // constraints for a METHOD:REPLY according to RFC 5546
-    if ($method == 'REPLY') {
-      $replying_attendee = null; $reply_attendees = array();
-      foreach ($event['attendees'] as $attendee) {
-        if ($attendee['role'] == 'ORGANIZER') {
-          $reply_attendees[] = $attendee;
-        }
-        else if (strcasecmp($attedee['email'], $from) == 0 || strcasecmp($attendee['email'], $from_utf) == 0) {
-          $replying_attendee = $attendee;
-        }
-      }
-      if ($replying_attendee) {
-        $reply_attendees[] = $replying_attendee;
-        $event['attendees'] = $reply_attendees;
-      }
-    }
-    
-    // compose multipart message using PEAR:Mail_Mime
-    $message = new Mail_mime("\r\n");
-    $message->setParam('text_encoding', 'quoted-printable');
-    $message->setParam('head_encoding', 'quoted-printable');
-    $message->setParam('head_charset', RCMAIL_CHARSET);
-    $message->setParam('text_charset', RCMAIL_CHARSET . ";\r\n format=flowed");
-    $message->setContentType('multipart/alternative');
-    
-    // compose common headers array
-    $headers = array(
-      'From' => $sender,
-      'Date' => $this->rc->user_date(),
-      'Message-ID' => $this->rc->gen_message_id(),
-      'X-Sender' => $from,
-    );
-    if ($agent = $this->rc->config->get('useragent'))
-      $headers['User-Agent'] = $agent;
-    
-    $message->headers($headers);
-    
-    // attach ics file for this event
-    $ical = $this->cal->get_ical();
-    $ics = $ical->export(array($event), $method, false, $method == 'REQUEST' ? array($this->cal->driver, 'get_attachment_body') : false);
-    $message->addAttachment($ics, 'text/calendar', 'event.ics', false, '8bit', '', RCMAIL_CHARSET . "; method=" . $method);
-    
-    return $message;
-  }
-
-
-  /**
    * Find invitation record by token
    *
    * @param string Invitation token
@@ -259,9 +89,9 @@
       if ($organizer) {
         $status = strtolower($newstatus);
         if ($this->send_itip_message($invitation['event'], 'REPLY', $organizer, 'itipsubject' . $status, 'itipmailbody' . $status))
-          $this->rc->output->command('display_message', $this->cal->gettext(array('name' => 'sentresponseto', 'vars' => array('mailto' => $organizer['name'] ? $organizer['name'] : $organizer['email']))), 'confirmation');
+          $this->rc->output->command('display_message', $this->plugin->gettext(array('name' => 'sentresponseto', 'vars' => array('mailto' => $organizer['name'] ? $organizer['name'] : $organizer['email']))), 'confirmation');
         else
-          $this->rc->output->command('display_message', $this->cal->gettext('itipresponseerror'), 'error');
+          $this->rc->output->command('display_message', $this->plugin->gettext('itipresponseerror'), 'error');
       }
       
       // update record in DB
@@ -314,7 +144,7 @@
       $event['uid'],
       $this->rc->user->ID,
       self::serialize_event($event),
-      date('Y-m-d H:i:s', $event['end'] + 86400 * 2)
+      date('Y-m-d H:i:s', $event['end']->format('U') + 86400 * 2)
     );
     
     if ($this->rc->db->affected_rows($query)) {

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

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

@@ -84,6 +84,11 @@
     $this->cal->register_handler('plugin.filedroparea', array($this, 'file_drop_area'));
     $this->cal->register_handler('plugin.attendees_list', array($this, 'attendees_list'));
     $this->cal->register_handler('plugin.attendees_form', array($this, 'attendees_form'));
+    $this->cal->register_handler('plugin.resources_form', array($this, 'resources_form'));
+    $this->cal->register_handler('plugin.resources_list', array($this, 'resources_list'));
+    $this->cal->register_handler('plugin.resources_searchform', array($this, 'resources_search_form'));
+    $this->cal->register_handler('plugin.resource_info', array($this, 'resource_info'));
+    $this->cal->register_handler('plugin.resource_calendar', array($this, 'resource_calendar'));
     $this->cal->register_handler('plugin.attendees_freebusy_table', array($this, 'attendees_freebusy_table'));
     $this->cal->register_handler('plugin.edit_attendees_notify', array($this, 'edit_attendees_notify'));
     $this->cal->register_handler('plugin.edit_recurring_warning', array($this, 'recurring_event_warning'));
@@ -112,6 +117,7 @@
     $this->cal->include_script('calendar_ui.js');
     $this->cal->include_script('lib/js/fullcalendar.js');
     $this->cal->include_script('lib/js/jquery.miniColors.min.js');
+    $this->rc->output->include_script('treelist.js');
   }
 
   /**
@@ -217,7 +223,7 @@
     }
 
     $this->rc->output->set_env('calendars', $jsenv);
-    $this->rc->output->add_gui_object('folderlist', $attrib['id']);
+    $this->rc->output->add_gui_object('calendarslist', $attrib['id']);
 
     return html::tag('ul', $attrib, $li, html::$common_attrib);
   }
@@ -392,6 +398,7 @@
         $select->add($this->cal->gettext('weekly'), 'WEEKLY');
         $select->add($this->cal->gettext('monthly'), 'MONTHLY');
         $select->add($this->cal->gettext('yearly'), 'YEARLY');
+        $select->add($this->cal->gettext('rdate'), 'RDATE');
         $html = html::label('edit-frequency', $this->cal->gettext('frequency')) . $select->show('');
         break;
 
@@ -480,6 +487,13 @@
           $this->cal->gettext('untildate') . ' ' . $input->show(''));
         $html = $table->show();
         break;
+
+      case 'rdate':
+        $ul = html::tag('ul', array('id' => 'edit-recurrence-rdates'), '');
+        $input = new html_inputfield(array('name' => 'rdate', 'id' => 'edit-recurrence-rdate-input', 'size' => "10"));
+        $button = new html_inputfield(array('type' => 'button', 'class' => 'button add', 'value' => $this->cal->gettext('addrdate')));
+        $html .= html::div($attrib, $ul . html::div('inputform', $input->show() . $button->show()));
+        break;
     }
 
     return $html;
@@ -732,7 +746,7 @@
   {
     $table = new html_table(array('cols' => 5, 'border' => 0, 'cellpadding' => 0, 'class' => 'rectable'));
     $table->add_header('role', $this->cal->gettext('role'));
-    $table->add_header('name', $this->cal->gettext('attendee'));
+    $table->add_header('name', $this->cal->gettext($attrib['coltitle'] ?: 'attendee'));
     $table->add_header('availability', $this->cal->gettext('availability'));
     $table->add_header('confirmstate', $this->cal->gettext('confirmstate'));
     $table->add_header('options', '');
@@ -755,7 +769,97 @@
       html::p('attendees-invitebox', html::label(null, $checkbox->show(1) . $this->cal->gettext('sendinvitations')))
       );
   }
-  
+
+  /**
+   *
+   */
+  function resources_form($attrib = array())
+  {
+    $input = new html_inputfield(array('name' => 'resource', 'id' => 'edit-resource-name', 'size' => 30));
+
+    return html::div($attrib,
+      html::div(null, $input->show() . " " .
+        html::tag('input', array('type' => 'button', 'class' => 'button', 'id' => 'edit-resource-add', 'value' => $this->cal->gettext('addresource'))) . " " .
+        html::tag('input', array('type' => 'button', 'class' => 'button', 'id' => 'edit-resource-find', 'value' => $this->cal->gettext('findresources').'...')))
+      );
+  }
+
+  /**
+   *
+   */
+  function resources_list($attrib = array())
+  {
+    $attrib += array('id' => 'calendar-resources-list');
+
+    $this->rc->output->add_gui_object('resourceslist', $attrib['id']);
+
+    return html::tag('ul', $attrib, '', html::$common_attrib);
+  }
+
+  /**
+   *
+   */
+  public function resource_info($attrib = array())
+  {
+    $attrib += array('id' => 'calendar-resources-info');
+
+    $this->rc->output->add_gui_object('resourceinfo', $attrib['id']);
+    $this->rc->output->add_gui_object('resourceownerinfo', $attrib['id'] . '-owner');
+
+    // copy address book labels for owner details to client
+    $this->rc->output->add_label('name','firstname','surname','department','jobtitle','email','phone','address');
+
+    $table_attrib = array('id','class','style','width','summary','cellpadding','cellspacing','border');
+
+    return html::tag('table', $attrib,
+        html::tag('tbody', null, ''), $table_attrib) .
+
+      html::tag('table', array('id' => $attrib['id'] . '-owner', 'style' => 'display:none') + $attrib,
+        html::tag('thead', null,
+          html::tag('tr', null,
+            html::tag('td', array('colspan' => 2), Q($this->cal->gettext('resourceowner')))
+          )
+        ) .
+        html::tag('tbody', null, ''),
+        $table_attrib);
+  }
+
+  /**
+   *
+   */
+  public function resource_calendar($attrib = array())
+  {
+    $attrib += array('id' => 'calendar-resources-calendar');
+
+    $this->rc->output->add_gui_object('resourceinfocalendar', $attrib['id']);
+
+    return html::div($attrib, '');
+  }
+
+  /**
+   * GUI object 'searchform' for the resource finder dialog
+   *
+   * @param array Named parameters
+   * @return string HTML code for the gui object
+   */
+  function resources_search_form($attrib)
+  {
+    $attrib += array('command' => 'search-resource', 'id' => 'rcmcalresqsearchbox', 'autocomplete' => 'off');
+    $attrib['name'] = '_q';
+
+    $input_q = new html_inputfield($attrib);
+    $out = $input_q->show();
+
+    // add form tag around text field
+    $out = $this->rc->output->form_tag(array(
+      'name' => "rcmcalresoursqsearchform",
+      'onsubmit' => rcmail_output::JS_OBJECT_NAME . ".command('" . $attrib['command'] . "'); return false",
+      'style' => "display:inline"),
+      $out);
+
+    return $out;
+  }
+
   /**
    *
    */
@@ -778,31 +882,13 @@
   }
 
   /**
-   * Render event details in a table
-   */
-  function event_details_table($event, $title)
-  {
-    $table = new html_table(array('cols' => 2, 'border' => 0, 'class' => 'calendar-eventdetails'));
-    $table->add('ititle', $title);
-    $table->add('title', Q($event['title']));
-    $table->add('label', $this->cal->gettext('date'));
-    $table->add('location', Q($this->cal->lib->event_date_text($event)));
-    if ($event['location']) {
-      $table->add('label', $this->cal->gettext('location'));
-      $table->add('location', Q($event['location']));
-    }
-    
-    return $table->show();
-  }
-
-  /**
    *
    */
   function event_invitebox($attrib = array())
   {
     if ($this->cal->event) {
       return html::div($attrib,
-        $this->event_details_table($this->cal->event, $this->cal->gettext('itipinvitation')) .
+        $this->cal->itip->itip_object_details_table($this->cal->event, $this->cal->itip->gettext('itipinvitation')) .
         $this->cal->invitestatus
       );
     }
@@ -819,12 +905,12 @@
         'name' => $attrib['iname'],
         'class' => 'button',
         'rel' => $method,
-        'value' => $this->cal->gettext('itip' . $method),
+        'value' => $this->cal->itip->gettext('itip' . $method),
       ));
     }
     
     return html::div($attrib,
-      html::div('label', $this->cal->gettext('acceptinvitation')) .
+      html::div('label', $this->cal->itip->gettext('acceptinvitation')) .
       html::div('rsvp-buttons', $buttons));
   }

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

@@ -1,7 +1,11 @@
 <?php
+
+$labels = array();
+
+// preferences
 $labels['default_view'] = 'Изглед по подразбиране';
 $labels['time_format'] = 'Формат на часовете';
-$labels['timeslots'] = 'Полета на час';
+$labels['timeslots'] = 'Time slots per hour';
 $labels['first_day'] = 'Първи ден от седмицата';
 $labels['first_hour'] = 'Първи час при показване';
 $labels['workinghours'] = 'Работни часове';
@@ -13,6 +17,8 @@
 $labels['coloringmode1'] = 'Относно категорията';
 $labels['coloringmode2'] = 'Календар за очертание, категория за съдържание';
 $labels['coloringmode3'] = 'Категория за очертание, календар за съдържание';
+
+// calendar
 $labels['calendar'] = 'Календар';
 $labels['calendars'] = 'Календари';
 $labels['category'] = 'Категория';
@@ -40,7 +46,9 @@
 $labels['all-day'] = 'цял ден';
 $labels['export'] = 'Извличане';
 $labels['exporttitle'] = 'Извличане към iCalendar';
+$labels['exportrange'] = 'Събития от';
 $labels['location'] = 'Местоположение';
+$labels['url'] = 'URL';
 $labels['date'] = 'Дата';
 $labels['start'] = 'Начало';
 $labels['end'] = 'Край';
@@ -69,6 +77,8 @@
 $labels['nmonthsback'] = '$nr месеца назад';
 $labels['showurl'] = 'Показване на URL на календара';
 $labels['showurldescription'] = 'Използвайте следния адрес, за да достъпвате (само за четене) вашия календар от други приложения. Можете да копирате и поставяте това във всеки календарен софтуер, поддържащ форматът iCal';
+
+// agenda view
 $labels['listrange'] = 'Оразмеряване към екран:';
 $labels['listsections'] = 'Разделяне на:';
 $labels['smartsections'] = 'Интелигентни секции';
@@ -82,11 +92,16 @@
 $labels['weekofyear'] = 'Седмица';
 $labels['pastevents'] = 'Минали';
 $labels['futureevents'] = 'Бъдещи';
-$labels['showalarms'] = 'Показване на аларми';
+
+// alarm/reminder settings
+$labels['showalarms'] = 'Show reminders';
 $labels['defaultalarmtype'] = 'Настройка за напомняне по подразбиране';
 $labels['defaultalarmoffset'] = 'Време за напомняне по подразбиране';
+
+// attendees
 $labels['attendee'] = 'Участник';
 $labels['role'] = 'Роля';
+$labels['availability'] = 'Avail.';
 $labels['confirmstate'] = 'Статус';
 $labels['addattendee'] = 'Добавяне на участник';
 $labels['roleorganizer'] = 'Организатор';
@@ -100,8 +115,22 @@
 $labels['sendinvitations'] = 'Изпращане на покани';
 $labels['sendnotifications'] = 'Известяване на участниците относно промените';
 $labels['sendcancellation'] = 'Известяване на участниците относно отмяна на събития';
+
+// invitation handling
+$labels['itipdeclineevent'] = 'Искате ли да отхвърлите поканата за това събитие?';
+$labels['saveincalendar'] = 'запазване в';
+
+// event dialog tabs
 $labels['tabsummary'] = 'Заглавие';
+$labels['tabrecurrence'] = 'Recurrence';
+$labels['tabattendees'] = 'Участници';
+$labels['tabattachments'] = 'Прикрепени файлове';
+$labels['tabsharing'] = 'Споделяне';
+
+// messages
+$labels['deleteventconfirm'] = 'Наистина ли искате да премахнете това събитие?';
+$labels['deletecalendarconfirm'] = 'Наистина ли искате да премахнете този календар с всичките му събития?';
 $labels['savingdata'] = 'Запазване на данни...';
-$labels['recurrencend'] = 'до';
-$labels['futurevents'] = 'Бъдещи';
+$labels['errorsaving'] = 'Неуспешно записването на промените.';
+
 ?>

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

@@ -1,7 +1,11 @@
 <?php
+
+$labels = array();
+
+// preferences
 $labels['default_view'] = 'Výchozí pohled';
 $labels['time_format'] = 'Formát data';
-$labels['timeslots'] = 'Slotů na hodinu';
+$labels['timeslots'] = 'Time slots per hour';
 $labels['first_day'] = 'První den v týdnu';
 $labels['first_hour'] = 'První hodina k zobrazení';
 $labels['workinghours'] = 'Pracovní hodiny';
@@ -13,6 +17,8 @@
 $labels['coloringmode1'] = 'Podle kategorie';
 $labels['coloringmode2'] = 'Kalendář pro orámování, kategorie pro obsah';
 $labels['coloringmode3'] = 'Kategorie pro orámování, kalendář pro obsah';
+
+// calendar
 $labels['calendar'] = 'Kalendář';
 $labels['calendars'] = 'Kalendáře';
 $labels['category'] = 'Kategorie';
@@ -40,7 +46,9 @@
 $labels['all-day'] = 'celý den';
 $labels['export'] = 'Exportovat do ICS';
 $labels['exporttitle'] = 'Exportovat souhrn do ICS';
+$labels['exportrange'] = 'Události od';
 $labels['location'] = 'Místo';
+$labels['url'] = 'URL';
 $labels['date'] = 'Datum';
 $labels['start'] = 'Začátek';
 $labels['end'] = 'Konec';
@@ -70,6 +78,8 @@
 $labels['nmonthsback'] = '$nr měsíců nazpátek';
 $labels['showurl'] = 'Ukázat URL kalendáře';
 $labels['showurldescription'] = 'Tuto adresu použijte pro přístup (jen ke čtení) ke kalendáři z jiných aplikací. Můžete ji zkopírovat a vložit do jakéhokoli kalendářového softwaru, který podporuje formát iCal.';
+
+// agenda view
 $labels['listrange'] = 'Rozsah k zobrazení:';
 $labels['listsections'] = 'Rozdělit na:';
 $labels['smartsections'] = 'Chytré sekce';
@@ -83,17 +93,21 @@
 $labels['weekofyear'] = 'Týden';
 $labels['pastevents'] = 'Minulost';
 $labels['futureevents'] = 'Budoucnost';
-$labels['showalarms'] = 'Zobrazit upozornění';
+
+// alarm/reminder settings
+$labels['showalarms'] = 'Show reminders';
 $labels['defaultalarmtype'] = 'Výchozí nastavení připomenutí';
 $labels['defaultalarmoffset'] = 'Výchozí čas připomenutí';
+
+// attendees
 $labels['attendee'] = 'Účastník';
-$labels['role'] = 'Role';
 $labels['availability'] = 'Dost.';
 $labels['confirmstate'] = 'Stav';
 $labels['addattendee'] = 'Přidat účastníka';
 $labels['roleorganizer'] = 'Organizátor';
 $labels['rolerequired'] = 'Povinný';
 $labels['roleoptional'] = 'Nepovinný';
+$labels['cutyperesource'] = 'Prostředek';
 $labels['availfree'] = 'volno';
 $labels['availbusy'] = 'obsazeno';
 $labels['availunknown'] = 'neznámý';
@@ -116,37 +130,27 @@
 $labels['eventupdatemailbody'] = "*\$title*\n\nKdy: \$date\n\nPozváni: \$attendees\n\nPodrobnosti o aktualizované události najdete v přiloženém souboru typu iCalendar. Můžete si ho naimportovat do kalendářového programu.";
 $labels['eventcancelsubject'] = 'Událost "$title" byla zrušena';
 $labels['eventcancelmailbody'] = "*\$title*\n\nKdy: \$date\n\nPozváni: \$attendees\n\nUdálost byla zrušena organizátorem (\$organizer).\n\nPodrobnosti najdete v přiloženém souboru ve formátu iCalendar.";
-$labels['itipinvitation'] = 'Pozvání na událost';
-$labels['itipupdate'] = 'Aktualizace události';
-$labels['itipcancellation'] = 'Zrušeno:';
-$labels['itipreply'] = 'Odpověď na';
-$labels['itipaccepted'] = 'Potvrdit';
-$labels['itiptentative'] = 'Možná';
-$labels['itipdeclined'] = 'Odmítnout';
-$labels['itipsubjectaccepted'] = '$name potvrdil(a) účas na události "$title"';
-$labels['itipsubjecttentative'] = '$name nezávazně potvrdil(a) účast na události "$title"';
-$labels['itipsubjectdeclined'] = '$name odmítl(a) účast na události "$title"';
+
+// invitation handling
 $labels['itipmailbodyaccepted'] = "\$sender přijal(a) pozvání na tuto událost:\n\n*\$title*\n\nKdy: \$date\n\nPozváni: \$attendees";
 $labels['itipmailbodytentative'] = "\$sender nezávazně přijal(a) pozvání na tuto událost:\n\n*\$title*\n\nKdy: \$date\n\nPozváni: \$attendees";
 $labels['itipmailbodydeclined'] = "\$sender odmítl(a) pozvání na tuto událost:\n\n*\$title*\n\nKdy: \$date\n\nPozváni: \$attendees";
 $labels['itipdeclineevent'] = 'Opravdu chcete odmítnout pozvání na tuto událost?';
-$labels['importtocalendar'] = 'Uložit do kalendáře';
-$labels['removefromcalendar'] = 'Odstranit z kalendáře';
-$labels['updateattendeestatus'] = 'Aktualizovat stav účastníka';
-$labels['acceptinvitation'] = 'Chcete přijmout toto pozvání (potvrdit účast)?';
-$labels['youhaveaccepted'] = 'Přijal(a) jste toto pozvání';
-$labels['youhavetentative'] = 'Nezávazně jste přijal(a) toto pozvání';
-$labels['youhavedeclined'] = 'Odmítl(a) jste toto pozvání';
 $labels['notanattendee'] = 'Nejste na seznamu účastníků této události';
 $labels['eventcancelled'] = 'Tato událost byla zrušena';
 $labels['saveincalendar'] = 'uložit do';
+
+// event dialog tabs
 $labels['tabsummary'] = 'Souhrn';
 $labels['tabrecurrence'] = 'Opakování';
 $labels['tabattendees'] = 'Účastníci';
 $labels['tabattachments'] = 'Přílohy';
 $labels['tabsharing'] = 'Sdílení';
+
+// messages
 $labels['deleteventconfirm'] = 'Opravdu chcete smazat tuto událost?';
 $labels['deletecalendarconfirm'] = 'Opravdu chcete smazat tento kalendář se všemi událostmi?';
+$labels['deletecalendarconfirmrecursive'] = 'Do you really want to delete this calendar with all its events and sub-calendars?';
 $labels['savingdata'] = 'Ukládám data...';
 $labels['errorsaving'] = 'Nelze uložit změny.';
 $labels['operationfailed'] = 'Požavovaná operace selhala.';
@@ -169,6 +173,8 @@
 $labels['importnone'] = 'Nebyly nalezeny žádné události k importu';
 $labels['importerror'] = 'Při importu došlo k chybě';
 $labels['aclnorights'] = 'Nemáte administrátorská práva k tomuto kalendáři.';
+
+// recurrence form
 $labels['repeat'] = 'Opakování';
 $labels['frequency'] = 'Opakovat';
 $labels['never'] = 'nikdy';
@@ -176,11 +182,13 @@
 $labels['weekly'] = 'týdně';
 $labels['monthly'] = 'měsíčně';
 $labels['yearly'] = 'ročně';
+$labels['rdate'] = 'on dates';
 $labels['every'] = 'Každý';
 $labels['days'] = 'den (dny)';
 $labels['weeks'] = 'týden (týdny)';
 $labels['months'] = 'měsíc(e/ů)';
 $labels['years'] = 'rok(y/ů) v:';
+$labels['bydays'] = 'On';
 $labels['untildate'] = 'do';
 $labels['each'] = 'Každý';
 $labels['onevery'] = 'Vždy v';
@@ -194,6 +202,7 @@
 $labels['fourth'] = 'čtvrtý';
 $labels['last'] = 'poslední';
 $labels['dayofmonth'] = 'Den v měsíci';
+
 $labels['changeeventconfirm'] = 'Změnit událost';
 $labels['removeeventconfirm'] = 'Odstranit událost';
 $labels['changerecurringeventwarning'] = 'Toto je opakovaná událost. Chcete upravit jen toto konání, toto a všechna následující konání, úplně všechna konání nebo uložit událost jako novou?';
@@ -202,4 +211,5 @@
 $labels['futurevents'] = 'Budoucí';
 $labels['allevents'] = 'Všechny';
 $labels['saveasnew'] = 'Uložit jako novou';
+
 ?>

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

@@ -0,0 +1,230 @@
+<?php
+
+$labels = array();
+
+// preferences
+$labels['default_view'] = 'Standardvisning';
+$labels['time_format'] = 'Tidsformat';
+$labels['timeslots'] = '';
+$labels['first_day'] = 'Første ugedag';
+$labels['first_hour'] = 'Første time som vises';
+$labels['workinghours'] = 'Arbejdstider';
+$labels['add_category'] = 'Tilføj kategori';
+$labels['remove_category'] = 'Fjern kategori';
+$labels['defaultcalendar'] = 'Opret nye arragementer i';
+$labels['eventcoloring'] = 'Farver for arrangementer';
+$labels['coloringmode0'] = 'Ifølge kalender';
+$labels['coloringmode1'] = 'Ifølge kategori';
+$labels['coloringmode2'] = 'Kalender til oversigt, kategori til indhold';
+$labels['coloringmode3'] = 'Kategori til oversigt, kalender til indhold';
+
+// calendar
+$labels['calendar'] = 'Kalender';
+$labels['calendars'] = 'Kalendere';
+$labels['category'] = 'Kategori';
+$labels['categories'] = 'Kategorier';
+$labels['createcalendar'] = 'Opret ny kalender';
+$labels['editcalendar'] = 'Redigér kalenderegenskaber';
+$labels['name'] = 'Navn';
+$labels['color'] = 'Farve';
+$labels['day'] = 'Dag';
+$labels['week'] = 'Uge';
+$labels['month'] = 'Måned';
+$labels['agenda'] = 'Dagsorden';
+$labels['new'] = 'Ny';
+$labels['new_event'] = 'Nyt arrangement';
+$labels['edit_event'] = 'Redigér arrangement';
+$labels['edit'] = 'Redigér';
+$labels['save'] = 'Gem';
+$labels['remove'] = 'Fjern';
+$labels['cancel'] = 'Annullér';
+$labels['select'] = 'Vælg';
+$labels['print'] = 'Udskriv';
+$labels['printtitle'] = 'Udskriv kalendere';
+$labels['title'] = 'Resumé';
+$labels['description'] = 'Beskrivelse';
+$labels['all-day'] = 'hele-dagen';
+$labels['export'] = 'Eksport';
+$labels['exporttitle'] = 'Eksportér til iCalendar';
+$labels['exportrange'] = 'Arrangementer fra';
+$labels['exportattachments'] = 'Med vedhæftninger';
+$labels['customdate'] = 'Brugerdefineret dato';
+$labels['location'] = 'Placering';
+$labels['url'] = 'URL';
+$labels['date'] = 'Dato';
+$labels['start'] = 'Start';
+$labels['end'] = 'Slut';
+$labels['selectdate'] = 'Vælg dato';
+$labels['freebusy'] = 'Vis mig som';
+$labels['free'] = 'Ledig';
+$labels['busy'] = 'Optaget';
+$labels['outofoffice'] = 'Ikke på kontoret';
+$labels['tentative'] = 'Forsøgsvis';
+$labels['priority'] = 'Prioritet';
+$labels['sensitivity'] = 'Privatliv';
+$labels['public'] = 'offentlig';
+$labels['private'] = 'privat';
+$labels['confidential'] = 'fortrolig';
+$labels['alarms'] = 'Påmindelse';
+$labels['comment'] = '';
+$labels['generated'] = 'oprettet per';
+$labels['printdescriptions'] = 'Udskriv beskrivelser';
+$labels['parentcalendar'] = 'Indsæt indeni';
+$labels['searchearlierdates'] = '« Søg efter tidligere arrangementer';
+$labels['searchlaterdates'] = 'Søg efter senere arrangementer »';
+$labels['andnmore'] = '$nr flere...';
+$labels['togglerole'] = 'Klik for at vise eller skjule rolle';
+$labels['createfrommail'] = 'Gem som arrangement';
+$labels['importevents'] = 'Importér arrangement';
+$labels['importrange'] = 'Arrangementer fra';
+$labels['onemonthback'] = '1 måned tilbage';
+$labels['nmonthsback'] = '$nr måneder tilbage';
+$labels['showurl'] = 'Vis kalenderens URL';
+$labels['showurldescription'] = 'Brug følgende adresse for at tilgå din kalender (skrivebeskyttet) fra andre programmer.  Du kan kopiere og indsætet denne i ethvert kalenderprogram, der understøtter iCal-formatet.';
+$labels['caldavurldescription'] = 'Kopiér denne adresse til en <a href="http://en.wikipedia.org/wiki/CalDAV" target="_blank">CalDAV</a>-klientprogram (eks. Evolution eller Mozilla Thunderbird) for at synkronisere denne kalender komplet med din computer eller mobilenhed.';
+
+// agenda view
+$labels['listrange'] = 'Interval som skal vises:';
+$labels['listsections'] = 'Del op i:';
+$labels['smartsections'] = 'Smarte sektioner';
+$labels['until'] = 'indtil';
+$labels['today'] = 'I dag';
+$labels['tomorrow'] = 'I morgen';
+$labels['thisweek'] = 'Denne uge';
+$labels['nextweek'] = 'Næste uge';
+$labels['thismonth'] = 'Denne måned';
+$labels['nextmonth'] = 'Næste måned';
+$labels['weekofyear'] = 'Uge';
+$labels['pastevents'] = 'Tidligere';
+$labels['futureevents'] = 'Fremtid';
+
+// alarm/reminder settings
+$labels['showalarms'] = '';
+$labels['defaultalarmtype'] = 'Standardindstilling for påmindelse';
+$labels['defaultalarmoffset'] = 'Standardtidspunkt for påmindelse';
+
+// attendees
+$labels['attendee'] = 'Deltager';
+$labels['role'] = 'Rolle';
+$labels['availability'] = 'Tilg.';
+$labels['confirmstate'] = 'Status';
+$labels['addattendee'] = 'Tilføj deltager';
+$labels['roleorganizer'] = 'Organisator';
+$labels['rolerequired'] = 'Påkrævet';
+$labels['roleoptional'] = 'Valgfri';
+$labels['rolechair'] = 'Formand';
+$labels['rolenonparticipant'] = '';
+$labels['cutypeindividual'] = 'Individuel';
+$labels['cutypegroup'] = 'Gruppe';
+$labels['cutyperesource'] = 'Ressource';
+$labels['cutyperoom'] = 'Lokale';
+$labels['availfree'] = 'Ledig';
+$labels['availbusy'] = 'Optaget';
+$labels['availunknown'] = 'Ukendt';
+$labels['availtentative'] = 'Forsøgsvis';
+$labels['availoutofoffice'] = 'Ikke på kontoret';
+$labels['scheduletime'] = 'Find ledigt tidspunkt';
+$labels['sendinvitations'] = 'Send invitationer';
+$labels['sendnotifications'] = 'Gør deltagere opmærksom på ændringer';
+$labels['sendcancellation'] = 'Giv deltagere besked om aflysning af arrangementer';
+$labels['onlyworkinghours'] = 'Find ledigt tidspunkt inden for mine arbejdstider';
+$labels['reqallattendees'] = 'Påkrævet/alle deltagere';
+$labels['prevslot'] = 'Forrige blok';
+$labels['nextslot'] = 'Næste blok';
+$labels['noslotfound'] = 'Kunne ikke finde en ledig tidsblok';
+$labels['invitationsubject'] = 'Du er blevet inviteret til "$title"';
+$labels['invitationmailbody'] = "*\$title*\n\nTidspunkt: \$date\n\nInviterede: \$attendees\n\nBemærk venligst vedhæftede iCalendar-fil med alle detaljer om arrangementet, som du kan importere til dit kalenderprogram.";
+$labels['invitationattendlinks'] = "Hvis dit e-postprogram ikke understøtter iTip-forespørgsler, så kan du benytte følgende henvisning til enten at acceptere eller afvise denne invitation:\n\$url";
+$labels['eventupdatesubject'] = '"$title" er blevet opdateret';
+$labels['eventupdatesubjectempty'] = 'Et arrangement der vedrører dig er blevet opdateret';
+$labels['eventupdatemailbody'] = "*\$title*\n\nTidspunkt: \$date\n\nInviterede: \$attendees\n\nBemærk venligst vedhæftede iCalendar-fil med alle detaljer om arrangementet, som du kan importere til dit kalenderprogram.";
+$labels['eventcancelsubject'] = '"$title" er blevet aflyst';
+$labels['eventcancelmailbody'] = "*\$title*\n\nTidspunkt: \$date\n\nInviterede: \$attendees\n\nDette arrangement er blevet aflyst af \$organizer.\n\nBemærk venligst vedhæftede iCalendard-fil med de opdaterede detaljer om arrangementet.";
+
+// invitation handling (overrides labels from libcalendaring)
+$labels['itipobjectnotfound'] = '';
+
+$labels['itipmailbodyaccepted'] = "\$sender har accepteret invitationen til det følgende arrangement:\n\n*\$title*\n\nTidspunkt: \$date\n\nInviterede: \$attendees";
+$labels['itipmailbodytentative'] = "\$sender har forsøgsvist accepteret invitationen til det følgende arrangement:\n\n*\$title*\n\nTidspunkt: \$date\n\nInviterede: \$attendees";
+$labels['itipmailbodydeclined'] = "\$sender har afvist invitationen til det følgende arrangement:\n\n*\$title*\n\nTidspunkt: \$date\n\nInviterede: \$attendees";
+$labels['itipdeclineevent'] = 'Sikker på at du vil afvise dette arrangement?';
+$labels['declinedeleteconfirm'] = 'Vil du også slette dette afviste arrangement fra din kalender?';
+
+$labels['notanattendee'] = 'Du er ikke opført som deltager for dette arrangement';
+$labels['eventcancelled'] = 'Arrangementet er blevet aflyst';
+$labels['saveincalendar'] = 'gem i';
+
+// event dialog tabs
+$labels['tabsummary'] = 'Resumé';
+$labels['tabrecurrence'] = 'Gentagelse';
+$labels['tabattendees'] = 'Deltagere';
+$labels['tabattachments'] = 'Vedhæftninger';
+$labels['tabsharing'] = 'Deling';
+
+// messages
+$labels['deleteobjectconfirm'] = 'Sikker på at du vil slette dette arrangement?';
+$labels['deleteventconfirm'] = 'Sikker på at du vil slette dette arrangement?';
+$labels['deletecalendarconfirm'] = 'Sikker på at du vil slette denne kalender med alle dets arrangementer?';
+$labels['deletecalendarconfirmrecursive'] = 'Sikker på du vil slette denne kalender med alle dens arrangementer og delkalendere?';
+$labels['savingdata'] = 'Gemmer data...';
+$labels['errorsaving'] = 'Kunne ikke gemme ændringer.';
+$labels['operationfailed'] = 'Den forespurgte handling mislykkedes.';
+$labels['invalideventdates'] = 'Ugyldig dato indtastet! Tjek venligst dit input.';
+$labels['invalidcalendarproperties'] = 'Ugyldige kalenderegenskaber! Angiv venligst et gyldigt navn.';
+$labels['searchnoresults'] = 'Der blev ikke fundet arrangementer i de valgte kalendere.';
+$labels['successremoval'] = 'Sletning af arrangementet blev gennemført.';
+$labels['successrestore'] = 'Gendannelse af arrangementet blev gennemført.';
+$labels['errornotifying'] = 'Kunne ikke sende notifikation til arrangementets deltagere';
+$labels['errorimportingevent'] = 'Kunne ikke importere arrangementet';
+$labels['newerversionexists'] = 'Der findes allerede en nyere version af arrangementet! Afbrød.';
+$labels['nowritecalendarfound'] = 'Ingen funden kalender til lagring af arrangementet';
+$labels['importedsuccessfully'] = 'Arrangementet blev tilføjet til \'$calendar\'';
+$labels['attendeupdateesuccess'] = 'Opdatering af deltagernes status blev gennemført';
+$labels['itipsendsuccess'] = 'Invitation blev sendt til deltagerne.';
+$labels['itipresponseerror'] = 'Kunne ikke sende svar til denne arrangementsinvitation';
+$labels['itipinvalidrequest'] = 'Denne invitation er ikke længere gyldig';
+$labels['sentresponseto'] = 'Gennemførte afsendelse af invitationssvar til $mailto';
+$labels['localchangeswarning'] = 'Du er i færd med at foretage ændringer, der vil påvirke din kalender og som ikke vil blive sendt til afholderen af arrangementet.';
+$labels['importsuccess'] = 'Gennemførte import af $nr arrangementer';
+$labels['importnone'] = 'Fandt ingen arrangementer som kunne importeres';
+$labels['importerror'] = 'Der opstod en fejl under import';
+$labels['aclnorights'] = 'Du har ikke administratorrettigheder for denne kalender.';
+
+// recurrence form
+$labels['repeat'] = 'Gentag';
+$labels['frequency'] = 'Gentag';
+$labels['never'] = 'aldrig';
+$labels['daily'] = 'dagligt';
+$labels['weekly'] = 'ugentligt';
+$labels['monthly'] = 'månedligt';
+$labels['yearly'] = 'årligt';
+$labels['every'] = 'Hver';
+$labels['days'] = 'dag(e)';
+$labels['weeks'] = 'uge(r)';
+$labels['months'] = 'måned(er)';
+$labels['years'] = 'år i:';
+$labels['bydays'] = 'Per';
+$labels['untildate'] = 'den';
+$labels['each'] = 'Hver';
+$labels['onevery'] = 'På hver';
+$labels['onsamedate'] = 'På samme dato';
+$labels['forever'] = 'for altid';
+$labels['recurrencend'] = 'indtil';
+$labels['forntimes'] = 'for $nr gang(e)';
+$labels['first'] = 'første';
+$labels['second'] = 'anden';
+$labels['third'] = 'tredje';
+$labels['fourth'] = 'fjerde';
+$labels['last'] = 'sidste';
+$labels['dayofmonth'] = 'Dag på måneden';
+
+$labels['changeeventconfirm'] = 'Tilpas arrangement';
+$labels['removeeventconfirm'] = 'Fjern arrangement';
+$labels['changerecurringeventwarning'] = 'Dette er et tilbagevendende arrangement. Ønsker du kun at redige det aktuelle arrangement, dette og alle fremtidige forekomster, alle forekomster eller gemme det som et nyt arrangement?';
+$labels['removerecurringeventwarning'] = 'Dette er et tilbagevendende arrangement. Ønsker du kun at fjerne det aktuelle arrangement, dette og alle fremtidige forekomster for dette arrangement?';
+$labels['currentevent'] = 'Nuværende';
+$labels['futurevents'] = 'Fremtid';
+$labels['allevents'] = 'Alle';
+$labels['saveasnew'] = 'Gem som ny';
+
+?>

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

@@ -1,7 +1,11 @@
 <?php
+
+$labels = array();
+
+// preferences
 $labels['default_view'] = 'Ansicht';
 $labels['time_format'] = 'Zeitformatierung';
-$labels['timeslots'] = 'Zeitraster pro Stunde';
+$labels['timeslots'] = 'Time slots per hour';
 $labels['first_day'] = 'Erster Wochentag';
 $labels['first_hour'] = 'Erste angezeigte Stunde';
 $labels['workinghours'] = 'Arbeitszeiten';
@@ -13,6 +17,8 @@
 $labels['coloringmode1'] = 'Farbe der Kategorie';
 $labels['coloringmode2'] = 'Kalenderfarbe aussen, Kategoriefarbe innen';
 $labels['coloringmode3'] = 'Kategoriefarbe aussen, Kalenderfarbe innen';
+
+// calendar
 $labels['calendar'] = 'Kalender';
 $labels['calendars'] = 'Kalender';
 $labels['category'] = 'Kategorie';
@@ -41,9 +47,10 @@
 $labels['export'] = 'Exportieren';
 $labels['exporttitle'] = 'Kalender als iCalendar exportieren';
 $labels['exportrange'] = 'Termine ab';
-$labels['exportattachments'] = 'Mit Anhängen';
-$labels['customdate'] = 'Eigenes Datum';
+$labels['exportattachments'] = 'With attachments';
+$labels['customdate'] = 'Custom date';
 $labels['location'] = 'Ort';
+$labels['url'] = 'URL';
 $labels['date'] = 'Datum';
 $labels['start'] = 'Beginn';
 $labels['end'] = 'Ende';
@@ -73,6 +80,9 @@
 $labels['nmonthsback'] = '$nr Monate zurück';
 $labels['showurl'] = 'URL anzeigen';
 $labels['showurldescription'] = 'Über die folgende Adresse können Sie mit einem beliebigen Kalenderprogramm Ihren Kalender abrufen (nur lesend), sofern dieses das iCal-Format unterstützt.';
+$labels['caldavurldescription'] = 'Copy this address to a <a href="http://en.wikipedia.org/wiki/CalDAV" target="_blank">CalDAV</a> client application (e.g. Evolution or Mozilla Thunderbird) to fully synchronize this specific calendar with your computer or mobile device.';
+
+// agenda view
 $labels['listrange'] = 'Angezeigter Bereich:';
 $labels['listsections'] = 'Unterteilung:';
 $labels['smartsections'] = 'Intelligent';
@@ -86,9 +96,13 @@
 $labels['weekofyear'] = 'KW';
 $labels['pastevents'] = 'Vergangene';
 $labels['futureevents'] = 'Zukünftige';
-$labels['showalarms'] = 'Erinnerungen anzeigen';
+
+// alarm/reminder settings
+$labels['showalarms'] = 'Show reminders';
 $labels['defaultalarmtype'] = 'Standard-Erinnerungseinstellung';
 $labels['defaultalarmoffset'] = 'Standard-Erinnerungszeit';
+
+// attendees
 $labels['attendee'] = 'Teilnehmer';
 $labels['role'] = 'Rolle';
 $labels['availability'] = 'Verfüg.';
@@ -97,6 +111,11 @@
 $labels['roleorganizer'] = 'Organisator';
 $labels['rolerequired'] = 'Erforderlich';
 $labels['roleoptional'] = 'Optional';
+$labels['rolechair'] = 'Chair';
+$labels['rolenonparticipant'] = 'Absent';
+$labels['cutypeindividual'] = 'Individual';
+$labels['cutypegroup'] = 'Group';
+$labels['cutyperesource'] = 'Ressource';
 $labels['availfree'] = 'Frei';
 $labels['availbusy'] = 'Gebucht';
 $labels['availunknown'] = 'Unbekannt';
@@ -119,35 +138,25 @@
 $labels['eventupdatemailbody'] = "*\$title*\n\nWann: \$date\n\nTeilnehmer: \$attendees\n\nIm Anhang finden Sie eine iCalendar-Datei mit den aktualisiereten Termindaten. Diese können Sie in Ihre Kalenderanwendung importieren.";
 $labels['eventcancelsubject'] = '"$title" wurde abgesagt';
 $labels['eventcancelmailbody'] = "*\$title*\n\nWann: \$date\n\nTeilnehmer: \$attendees\n\nDer Termin wurde von \$organizer abgesagt.\n\nIm Anhang finden Sie eine iCalendar-Datei mit den Termindaten.";
-$labels['itipinvitation'] = 'Einladung zu';
-$labels['itipupdate'] = 'Aktialisiert:';
-$labels['itipcancellation'] = 'Abgesagt:';
-$labels['itipreply'] = 'Antwort zu';
-$labels['itipaccepted'] = 'Akzeptieren';
-$labels['itiptentative'] = 'Mit Vorbehalt';
-$labels['itipdeclined'] = 'Ablehnen';
-$labels['itipsubjectaccepted'] = 'Einladung zu "$title" wurde von $name angenommen';
-$labels['itipsubjecttentative'] = 'Einladung zu "$title" wurde von $name mit Vorbehalt angenommen';
-$labels['itipsubjectdeclined'] = 'Einladung zu "$title" wurde von $name abgelehnt';
+
+// invitation handling
 $labels['itipmailbodyaccepted'] = "\$sender hat die Einladung zum folgenden Termin angenommen:\n\n*\$title*\n\nWann: \$date\n\nTeilnehmer: \$attendees";
 $labels['itipmailbodytentative'] = "\$sender hat die Einladung mit Vorbehalt zum folgenden Termin angenommen:\n\n*\$title*\n\nWann: \$date\n\nTeilnehmer: \$attendees";
 $labels['itipmailbodydeclined'] = "\$sender hat die Einladung zum folgenden Termin abgelehnt:\n\n*\$title*\n\nWann: \$date\n\nTeilnehmer: \$attendees";
 $labels['itipdeclineevent'] = 'Möchten Sie die Einladung zu diesem Termin ablehnen?';
-$labels['importtocalendar'] = 'In Kalender übernehmen';
-$labels['removefromcalendar'] = 'Aus meinem Kalender löschen';
-$labels['updateattendeestatus'] = 'Teilnehmerstatus aktualisieren';
-$labels['acceptinvitation'] = 'Möchten Sie die Einladung zu diesem Termin annehmen?';
-$labels['youhaveaccepted'] = 'Sie haben die Einladung angenommen';
-$labels['youhavetentative'] = 'Sie haben die Einladung mit Vorbehalt angenommen';
-$labels['youhavedeclined'] = 'Sie haben die Einladung abgelehnt';
+
 $labels['notanattendee'] = 'Sie sind nicht in der Liste der Teilnehmer aufgeführt';
 $labels['eventcancelled'] = 'Der Termin wurde vom Organisator abgesagt';
 $labels['saveincalendar'] = 'speichern in';
+
+// event dialog tabs
 $labels['tabsummary'] = 'Übersicht';
 $labels['tabrecurrence'] = 'Wiederholung';
 $labels['tabattendees'] = 'Teilnehmer';
 $labels['tabattachments'] = 'Anhänge';
 $labels['tabsharing'] = 'Freigabe';
+
+// messages
 $labels['deleteventconfirm'] = 'Möchten Sie diesen Termin wirklich löschen?';
 $labels['deletecalendarconfirm'] = 'Möchten Sie diesen Kalender mit allen Terminen wirklich löschen?';
 $labels['savingdata'] = 'Speichere Daten...';
@@ -172,6 +181,8 @@
 $labels['importnone'] = 'Keine Termine zum Importieren gefunden';
 $labels['importerror'] = 'Fehler beim Importieren';
 $labels['aclnorights'] = 'Sie haben keine Administrator-Rechte für diesen Kalender.';
+
+// recurrence form
 $labels['repeat'] = 'Wiederholung';
 $labels['frequency'] = 'Wiederholung';
 $labels['never'] = 'nie';
@@ -198,6 +209,7 @@
 $labels['fourth'] = 'vierter';
 $labels['last'] = 'letzter';
 $labels['dayofmonth'] = 'Tag des Montats';
+
 $labels['changeeventconfirm'] = 'Termin ändern';
 $labels['removeeventconfirm'] = 'Termin löschen';
 $labels['changerecurringeventwarning'] = 'Dies ist eine Terminreihe. Möchten Sie nur den aktuellen, diesen und alle zukünftigen oder alle Termine bearbeiten oder die Änderungen als neuen Termin speichern?';
@@ -206,4 +218,13 @@
 $labels['futurevents'] = 'Zukünftige';
 $labels['allevents'] = 'Alle';
 $labels['saveasnew'] = 'Als neu speichern';
+
+// birthdays calendar
+$labels['birthdays'] = 'Geburtstage';
+$labels['birthdayscalendar'] = 'Geburtstags-Kalender';
+$labels['displaybirthdayscalendar'] = 'Geburtstags-Kalender anzeigen';
+$labels['birthdayscalendarsources'] = 'Für diese Adressbücher';
+$labels['birthdayeventtitle'] = '$names Geburtstag';
+$labels['birthdayage'] = 'Alter $age';
+
 ?>

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

@@ -1,18 +1,24 @@
 <?php
-$labels['default_view'] = 'Ansicht';
+
+$labels = array();
+
+// preferences
+$labels['default_view'] = 'Standardansicht';
 $labels['time_format'] = 'Zeitformatierung';
-$labels['timeslots'] = 'Zeitraster pro Stunde';
+$labels['timeslots'] = 'Time slots per hour';
 $labels['first_day'] = 'Erster Wochentag';
 $labels['first_hour'] = 'Erste angezeigte Stunde';
 $labels['workinghours'] = 'Arbeitszeiten';
-$labels['add_category'] = 'Katgorie hinzufügen';
-$labels['remove_category'] = 'Katgorie entfernen';
+$labels['add_category'] = 'Kategorie hinzufügen';
+$labels['remove_category'] = 'Kategorie entfernen';
 $labels['defaultcalendar'] = 'Neue Termine erstellen in';
 $labels['eventcoloring'] = 'Färbung der Termine';
 $labels['coloringmode0'] = 'Farbe des Kalenders';
 $labels['coloringmode1'] = 'Farbe der Kategorie';
 $labels['coloringmode2'] = 'Kalenderfarbe außen, Kategoriefarbe innen';
 $labels['coloringmode3'] = 'Kategoriefarbe außen, Kalenderfarbe innen';
+
+// calendar
 $labels['calendar'] = 'Kalender';
 $labels['calendars'] = 'Kalender';
 $labels['category'] = 'Kategorie';
@@ -42,8 +48,9 @@
 $labels['exporttitle'] = 'Kalender als iCalendar exportieren';
 $labels['exportrange'] = 'Termine ab';
 $labels['exportattachments'] = 'Mit Anhängen';
-$labels['customdate'] = 'Eigenes Datum';
+$labels['customdate'] = 'Benutzerdefiniertes Datum';
 $labels['location'] = 'Ort';
+$labels['url'] = 'URL';
 $labels['date'] = 'Datum';
 $labels['start'] = 'Beginn';
 $labels['end'] = 'Ende';
@@ -73,6 +80,9 @@
 $labels['nmonthsback'] = '$nr Monate zurück';
 $labels['showurl'] = 'URL anzeigen';
 $labels['showurldescription'] = 'Über die folgende Adresse können Sie mit einem beliebigen Kalenderprogramm Ihren Kalender abrufen (nur lesend), sofern dieses das iCal-Format unterstützt.';
+$labels['caldavurldescription'] = 'Diese Adresse in einen <a href="http://en.wikipedia.org/wiki/CalDAV" target="_blank">CalDAV</a>-Klienten (z.B. Evolution oder Mozilla Thunderbird) kopieren, um den Kalender in Gänze mit einem mobilen Gerät zu synchronisieren.';
+
+// agenda view
 $labels['listrange'] = 'Angezeigter Bereich:';
 $labels['listsections'] = 'Unterteilung:';
 $labels['smartsections'] = 'Intelligent';
@@ -86,9 +96,12 @@
 $labels['weekofyear'] = 'Woche';
 $labels['pastevents'] = 'Vergangene';
 $labels['futureevents'] = 'Zukünftige';
-$labels['showalarms'] = 'Erinnerungen anzeigen';
+
+// alarm/reminder settings
 $labels['defaultalarmtype'] = 'Standard-Erinnerungseinstellung';
 $labels['defaultalarmoffset'] = 'Standard-Erinnerungszeit';
+
+// attendees
 $labels['attendee'] = 'Teilnehmer';
 $labels['role'] = 'Rolle';
 $labels['availability'] = 'Verfüg.';
@@ -97,6 +110,12 @@
 $labels['roleorganizer'] = 'Organisator';
 $labels['rolerequired'] = 'Erforderlich';
 $labels['roleoptional'] = 'Optional';
+$labels['rolechair'] = 'Stuhl';
+$labels['rolenonparticipant'] = 'Absent';
+$labels['cutypeindividual'] = 'Person';
+$labels['cutypegroup'] = 'Gruppe';
+$labels['cutyperesource'] = 'Ressource';
+$labels['cutyperoom'] = 'Raum';
 $labels['availfree'] = 'Frei';
 $labels['availbusy'] = 'Gebucht';
 $labels['availunknown'] = 'Unbekannt';
@@ -119,37 +138,28 @@
 $labels['eventupdatemailbody'] = "*\$title*\n\nWann: \$date\n\nTeilnehmer: \$attendees\n\nIm Anhang finden Sie eine iCalendar-Datei mit den aktualisiereten Termindaten. Diese können Sie in Ihre Kalenderanwendung importieren.";
 $labels['eventcancelsubject'] = '"$title" wurde abgesagt';
 $labels['eventcancelmailbody'] = "*\$title*\n\nWann: \$date\n\nTeilnehmer: \$attendees\n\nDer Termin wurde von \$organizer abgesagt.\n\nIm Anhang finden Sie eine iCalendar-Datei mit den Termindaten.";
-$labels['itipinvitation'] = 'Einladung zu';
-$labels['itipupdate'] = 'Aktialisiert:';
-$labels['itipcancellation'] = 'Abgesagt:';
-$labels['itipreply'] = 'Antwort zu';
-$labels['itipaccepted'] = 'Akzeptieren';
-$labels['itiptentative'] = 'Mit Vorbehalt';
-$labels['itipdeclined'] = 'Ablehnen';
-$labels['itipsubjectaccepted'] = 'Einladung zu "$title" wurde von $name angenommen';
-$labels['itipsubjecttentative'] = 'Einladung zu "$title" wurde von $name mit Vorbehalt angenommen';
-$labels['itipsubjectdeclined'] = 'Einladung zu "$title" wurde von $name abgelehnt';
+
+// invitation handling
 $labels['itipmailbodyaccepted'] = "\$sender hat die Einladung zum folgenden Termin angenommen:\n\n*\$title*\n\nWann: \$date\n\nTeilnehmer: \$attendees";
 $labels['itipmailbodytentative'] = "\$sender hat die Einladung mit Vorbehalt zum folgenden Termin angenommen:\n\n*\$title*\n\nWann: \$date\n\nTeilnehmer: \$attendees";
 $labels['itipmailbodydeclined'] = "\$sender hat die Einladung zum folgenden Termin abgelehnt:\n\n*\$title*\n\nWann: \$date\n\nTeilnehmer: \$attendees";
 $labels['itipdeclineevent'] = 'Möchten Sie die Einladung zu diesem Termin ablehnen?';
-$labels['importtocalendar'] = 'In Kalender übernehmen';
-$labels['removefromcalendar'] = 'Aus meinem Kalender löschen';
-$labels['updateattendeestatus'] = 'Teilnehmerstatus aktualisieren';
-$labels['acceptinvitation'] = 'Möchten Sie die Einladung zu diesem Termin annehmen?';
-$labels['youhaveaccepted'] = 'Sie haben die Einladung angenommen';
-$labels['youhavetentative'] = 'Sie haben die Einladung mit Vorbehalt angenommen';
-$labels['youhavedeclined'] = 'Sie haben die Einladung abgelehnt';
+$labels['declinedeleteconfirm'] = 'Soll der abgelehnte Termin zusätzlich aus dem Kalender gelöscht werden?';
 $labels['notanattendee'] = 'Sie sind nicht in der Liste der Teilnehmer aufgeführt';
 $labels['eventcancelled'] = 'Der Termin wurde vom Organisator abgesagt';
 $labels['saveincalendar'] = 'speichern in';
+
+// event dialog tabs
 $labels['tabsummary'] = 'Übersicht';
 $labels['tabrecurrence'] = 'Wiederholung';
 $labels['tabattendees'] = 'Teilnehmer';
 $labels['tabattachments'] = 'Anhänge';
 $labels['tabsharing'] = 'Freigabe';
+
+// messages
 $labels['deleteventconfirm'] = 'Möchten Sie diesen Termin wirklich löschen?';
 $labels['deletecalendarconfirm'] = 'Möchten Sie diesen Kalender mit allen Terminen wirklich löschen?';
+$labels['deletecalendarconfirmrecursive'] = 'Soll dieser Kalender wirklich mit allen Terminen und Unterkalendern gelöscht werden?';
 $labels['savingdata'] = 'Speichere Daten...';
 $labels['errorsaving'] = 'Fehler beim Speichern.';
 $labels['operationfailed'] = 'Die Aktion ist fehlgeschlagen.';
@@ -168,10 +178,13 @@
 $labels['itipresponseerror'] = 'Die Antwort auf diese Einladung konnte nicht versendet werden';
 $labels['itipinvalidrequest'] = 'Diese Einladung ist nicht mehr gültig.';
 $labels['sentresponseto'] = 'Antwort auf diese Einladung erfolgreich an $mailto gesendet';
+$labels['localchangeswarning'] = 'Die auszuführenden Änderungen werden sich nur auf den persönlichen Kalender auswirken und nicht an den Organisator des Termins weitergeleitet.';
 $labels['importsuccess'] = 'Es wurden $nr Termine erfolgreich importiert';
 $labels['importnone'] = 'Keine Termine zum Importieren gefunden';
 $labels['importerror'] = 'Fehler beim Importieren';
 $labels['aclnorights'] = 'Der Zugriff auf diesen Kalender erfordert Administrator-Rechte.';
+
+// recurrence form
 $labels['repeat'] = 'Wiederholung';
 $labels['frequency'] = 'Wiederholung';
 $labels['never'] = 'nie';
@@ -198,6 +211,7 @@
 $labels['fourth'] = 'vierter';
 $labels['last'] = 'letzter';
 $labels['dayofmonth'] = 'Tag des Montats';
+
 $labels['changeeventconfirm'] = 'Termin ändern';
 $labels['removeeventconfirm'] = 'Termin löschen';
 $labels['changerecurringeventwarning'] = 'Dies ist eine Terminreihe. Möchten Sie nur den aktuellen, diesen und alle zukünftigen oder alle Termine bearbeiten oder die Änderungen als neuen Termin speichern?';
@@ -206,4 +220,13 @@
 $labels['futurevents'] = 'Zukünftige';
 $labels['allevents'] = 'Alle';
 $labels['saveasnew'] = 'Als neu speichern';
+
+// birthdays calendar
+$labels['birthdays'] = 'Geburtstage';
+$labels['birthdayscalendar'] = 'Geburtstags-Kalender';
+$labels['displaybirthdayscalendar'] = 'Geburtstags-Kalender anzeigen';
+$labels['birthdayscalendarsources'] = 'Für diese Adressbücher';
+$labels['birthdayeventtitle'] = '$names Geburtstag';
+$labels['birthdayage'] = 'Alter $age';
+
 ?>

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

@@ -66,6 +66,7 @@
 $labels['private'] = 'private';
 $labels['confidential'] = 'confidential';
 $labels['alarms'] = 'Reminder';
+$labels['comment'] = 'Comment';
 $labels['generated'] = 'generated at';
 $labels['printdescriptions'] = 'Print descriptions';
 $labels['parentcalendar'] = 'Insert inside';
@@ -112,6 +113,7 @@
 $labels['rolerequired'] = 'Required';
 $labels['roleoptional'] = 'Optional';
 $labels['rolechair'] = 'Chair';
+$labels['rolenonparticipant'] = 'Absent';
 $labels['cutypeindividual'] = 'Individual';
 $labels['cutypegroup'] = 'Group';
 $labels['cutyperesource'] = 'Resource';
@@ -121,6 +123,8 @@
 $labels['availunknown'] = 'Unknown';
 $labels['availtentative'] = 'Tentative';
 $labels['availoutofoffice'] = 'Out of Office';
+$labels['delegatedto'] = 'Delegated to: ';
+$labels['delegatedfrom'] = 'Delegated from: ';
 $labels['scheduletime'] = 'Find availability';
 $labels['sendinvitations'] = 'Send invitations';
 $labels['sendnotifications'] = 'Notify participants about modifications';
@@ -139,41 +143,42 @@
 $labels['eventcancelsubject'] = '"$title" has been canceled';
 $labels['eventcancelmailbody'] = "*\$title*\n\nWhen: \$date\n\nInvitees: \$attendees\n\nThe event has been cancelled by \$organizer.\n\nPlease find attached an iCalendar file with the updated event details.";
 
-// invitation handling
-$labels['itipinvitation'] = 'Invitation to';
-$labels['itipupdate'] = 'Update of';
-$labels['itipcancellation'] = 'Cancelled:';
-$labels['itipreply'] = 'Reply to';
-$labels['itipaccepted'] = 'Accept';
-$labels['itiptentative'] = 'Maybe';
-$labels['itipdeclined'] = 'Decline';
-$labels['itipsubjectaccepted'] = '"$title" has been accepted by $name';
-$labels['itipsubjecttentative'] = '"$title" has been tentatively accepted by $name';
-$labels['itipsubjectdeclined'] = '"$title" has been declined by $name';
+// invitation handling (overrides labels from libcalendaring)
+$labels['itipobjectnotfound'] = 'The event referred by this message was not found in your calendar.';
+
 $labels['itipmailbodyaccepted'] = "\$sender has accepted the invitation to the following event:\n\n*\$title*\n\nWhen: \$date\n\nInvitees: \$attendees";
 $labels['itipmailbodytentative'] = "\$sender has tentatively accepted the invitation to the following event:\n\n*\$title*\n\nWhen: \$date\n\nInvitees: \$attendees";
 $labels['itipmailbodydeclined'] = "\$sender has declined the invitation to the following event:\n\n*\$title*\n\nWhen: \$date\n\nInvitees: \$attendees";
+$labels['itipmailbodycancel'] = "\$sender has rejected your participation in the following event:\n\n*\$title*\n\nWhen: \$date";
+
 $labels['itipdeclineevent'] = 'Do you want to decline your invitation to this event?';
 $labels['declinedeleteconfirm'] = 'Do you also want to delete this declined event from your calendar?';
-$labels['importtocalendar'] = 'Save to my calendar';
-$labels['removefromcalendar'] = 'Remove from my calendar';
-$labels['updateattendeestatus'] = 'Update the participant\'s status';
-$labels['acceptinvitation'] = 'Do you accept this invitation?';
-$labels['youhaveaccepted'] = 'You have accepted this invitation';
-$labels['youhavetentative'] = 'You have tentatively accepted this invitation';
-$labels['youhavedeclined'] = 'You have declined this invitation';
+
 $labels['notanattendee'] = 'You\'re not listed as an attendee of this event';
 $labels['eventcancelled'] = 'The event has been cancelled';
 $labels['saveincalendar'] = 'save in';
+$labels['updatemycopy'] = 'Update in my calendar';
+$labels['savetocalendar'] = 'Save to calendar';
+
+// resources
+$labels['resource'] = 'Resource';
+$labels['addresource'] = 'Book resource';
+$labels['findresources'] = 'Find resources';
+$labels['resourcedetails'] = 'Details';
+$labels['resourceavailability'] = 'Availability';
+$labels['resourceowner'] = 'Owner';
+$labels['resourceadded'] = 'The resource was added to your event';
 
 // event dialog tabs
 $labels['tabsummary'] = 'Summary';
 $labels['tabrecurrence'] = 'Recurrence';
 $labels['tabattendees'] = 'Participants';
+$labels['tabresources'] = 'Resources';
 $labels['tabattachments'] = 'Attachments';
 $labels['tabsharing'] = 'Sharing';
 
 // messages
+$labels['deleteobjectconfirm'] = 'Do you really want to delete this event?';
 $labels['deleteventconfirm'] = 'Do you really want to delete this event?';
 $labels['deletecalendarconfirm'] = 'Do you really want to delete this calendar with all its events?';
 $labels['deletecalendarconfirmrecursive'] = 'Do you really want to delete this calendar with all its events and sub-calendars?';
@@ -187,6 +192,7 @@
 $labels['successrestore'] = 'The event has been restored successfully.';
 $labels['errornotifying'] = 'Failed to send notifications to event participants';
 $labels['errorimportingevent'] = 'Failed to import the event';
+$labels['importwarningexists'] = 'A copy of this event already exists in your calendar.';
 $labels['newerversionexists'] = 'A newer version of this event already exists! Aborted.';
 $labels['nowritecalendarfound'] = 'No calendar found to save the event';
 $labels['importedsuccessfully'] = 'The event was successfully added to \'$calendar\'';
@@ -209,6 +215,7 @@
 $labels['weekly'] = 'weekly';
 $labels['monthly'] = 'monthly';
 $labels['yearly'] = 'annually';
+$labels['rdate'] = 'on dates';
 $labels['every'] = 'Every';
 $labels['days'] = 'day(s)';
 $labels['weeks'] = 'week(s)';
@@ -228,6 +235,7 @@
 $labels['fourth'] = 'fourth';
 $labels['last'] = 'last';
 $labels['dayofmonth'] = 'Day of month';
+$labels['addrdate'] = 'Add repeat date';
 
 $labels['changeeventconfirm'] = 'Change event';
 $labels['removeeventconfirm'] = 'Remove event';

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

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

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

@@ -0,0 +1,165 @@
+<?php
+
+$labels = array();
+
+// preferences
+$labels['default_view'] = 'Oletusnäkymä';
+$labels['time_format'] = 'Aikamuoto';
+$labels['first_day'] = 'Viikon ensimmäinen päivä';
+$labels['first_hour'] = 'Ensimmäinen näytettävä tunti';
+$labels['workinghours'] = 'Työaika';
+$labels['add_category'] = 'Lisää luokka';
+$labels['remove_category'] = 'Poista luokka';
+$labels['defaultcalendar'] = 'Luo uudet tapahtumat kohteeseen';
+$labels['eventcoloring'] = 'Tapahtuman väritys';
+$labels['coloringmode0'] = 'Kalenterin mukaan';
+$labels['coloringmode1'] = 'Luokan mukaan';
+
+// calendar
+$labels['calendar'] = 'Kalenteri';
+$labels['calendars'] = 'Kalenterit';
+$labels['category'] = 'Luokka';
+$labels['categories'] = 'Luokat';
+$labels['createcalendar'] = 'Luo uusi kalenteri';
+$labels['editcalendar'] = 'Muokkaa kalenterin ominaisuuksia';
+$labels['name'] = 'Nimi';
+$labels['color'] = 'Väri';
+$labels['day'] = 'Päivä';
+$labels['week'] = 'Viikko';
+$labels['month'] = 'Kuukausi';
+$labels['agenda'] = 'Asialista';
+$labels['new'] = 'Uusi';
+$labels['new_event'] = 'Uusi tapahtuma';
+$labels['edit_event'] = 'Muokkaa tapahtumaa';
+$labels['edit'] = 'Muokkaa';
+$labels['save'] = 'Tallenna';
+$labels['remove'] = 'Poista';
+$labels['cancel'] = 'Peru';
+$labels['select'] = 'Valitse';
+$labels['print'] = 'Tulosta';
+$labels['printtitle'] = 'Tulosta kalenterit';
+$labels['title'] = 'Yhteenveto';
+$labels['description'] = 'Kuvaus';
+$labels['all-day'] = 'koko päivä';
+$labels['export'] = 'Vie';
+$labels['exporttitle'] = 'Vie iCalendar-muotoon';
+$labels['exportrange'] = 'Tapahtumat';
+$labels['location'] = 'Sijainti';
+$labels['url'] = 'Osoite';
+$labels['date'] = 'Päiväys';
+$labels['start'] = 'Alkaa';
+$labels['end'] = 'Päättyy';
+$labels['selectdate'] = 'Valitse päiväys';
+$labels['freebusy'] = 'Aseta tilakseni';
+$labels['free'] = 'Vapaa';
+$labels['busy'] = 'Varattu';
+$labels['priority'] = 'Tärkeys';
+$labels['sensitivity'] = 'Yksityisyys';
+$labels['public'] = 'julkinen';
+$labels['private'] = 'yksityinen';
+$labels['confidential'] = 'luottamuksellinen';
+$labels['alarms'] = 'Muistutus';
+$labels['comment'] = 'Kommentti';
+$labels['printdescriptions'] = 'Tulosta kuvaukset';
+$labels['searchearlierdates'] = '« Etsi aiempia tapahtumia';
+$labels['searchlaterdates'] = 'Etsi myöhempiä tapahtumia »';
+$labels['andnmore'] = '$nr lisää...';
+$labels['createfrommail'] = 'Tallenna tapahtumana';
+$labels['importevents'] = 'Tuo tapahtumat';
+$labels['importrange'] = 'Tapahtumat';
+$labels['onemonthback'] = '1 kuukauden ajalta';
+$labels['nmonthsback'] = '$nr kuukauden ajalta';
+$labels['showurl'] = 'Näytä kalenterin osoite';
+$labels['showurldescription'] = 'Käytä seuraavia osoitteita avataksesi kalenterisi pelkässä lukumuodossa muissa sovelluksissa. Voit kopioida ja liittää osoitteen mihin tahansa iCal-muotoa tukevaan kalenterisovellukseen.';
+$labels['caldavurldescription'] = 'Kopioi tämä osoite <a href="http://en.wikipedia.org/wiki/CalDAV" target="_blank">CalDAV</a-asiakassovellukseen (esim. Evolution tai Mozilla Thunderbird) synkronoidaksesi tämän kalenterin tietokoneesi tai mobiililaitteesi kanssa.';
+
+// agenda view
+$labels['until'] = 'kunnes';
+$labels['today'] = 'Tänään';
+$labels['tomorrow'] = 'Huomenna';
+$labels['thisweek'] = 'Tällä viikolla';
+$labels['nextweek'] = 'Ensi viikolla';
+$labels['thismonth'] = 'Tässä kuussa';
+$labels['nextmonth'] = 'Ensi kuussa';
+$labels['weekofyear'] = 'Viikko';
+
+// alarm/reminder settings
+$labels['defaultalarmtype'] = 'Muistutuksen oletusasetus';
+$labels['defaultalarmoffset'] = 'Muistutuksen oletusaika';
+
+// attendees
+$labels['role'] = 'Rooli';
+$labels['confirmstate'] = 'Tila';
+$labels['addattendee'] = 'Lisää osallistuja';
+$labels['roleorganizer'] = 'Järjestäjä';
+$labels['rolerequired'] = 'Vaadittu';
+$labels['roleoptional'] = 'Valinnainen';
+$labels['cutypegroup'] = 'Ryhmä';
+$labels['cutyperesource'] = 'Resurssi';
+$labels['cutyperoom'] = 'Huone';
+$labels['availfree'] = 'Vapaa';
+$labels['availbusy'] = 'Varattu';
+$labels['availunknown'] = 'Tuntematon';
+$labels['scheduletime'] = 'Etsi saatavuus';
+$labels['sendinvitations'] = 'Lähetä kutsut';
+$labels['sendnotifications'] = 'Ilmoita osallistujille muutoksista';
+$labels['sendcancellation'] = 'Ilmoita osallistujille tapahtuman perumisesta';
+$labels['prevslot'] = 'Edellinen ajankohta';
+$labels['nextslot'] = 'Seuraava ajankohta';
+$labels['noslotfound'] = 'Vapaata ajankohtaa ei löytynyt';
+$labels['invitationsubject'] = 'Sinut on kutsuttu tapahtumaan "$title"';
+$labels['eventupdatesubject'] = '"$title" on päivitetty';
+$labels['eventupdatesubjectempty'] = 'Sinua koskeva tapahtuma on päivitetty';
+$labels['eventcancelsubject'] = '"$title" on peruttu';
+
+// invitation handling (overrides labels from libcalendaring)
+$labels['declinedeleteconfirm'] = 'Haluatko poistaa tämän hylätyn tapahtuman kalenteristasi?';
+
+$labels['notanattendee'] = 'Sinua ei ole määritetty tapahtuman osanottajaksi';
+$labels['eventcancelled'] = 'Tapahtuma on peruttu';
+
+// event dialog tabs
+$labels['tabsummary'] = 'Yhteenveto';
+$labels['tabrecurrence'] = 'Toistuminen';
+$labels['tabattendees'] = 'Osallistujat';
+$labels['tabattachments'] = 'Liitteet';
+$labels['tabsharing'] = 'Jakaminen';
+
+// messages
+$labels['deleteobjectconfirm'] = 'Haluatko varmasti poistaa tämän tapahtuman?';
+$labels['deleteventconfirm'] = 'Haluatko varmasti poistaa tämän tapahtuman?';
+$labels['deletecalendarconfirm'] = 'Haluatko varmasti poistaa tämän kalenterin ja kaikki sen tapahtumat?';
+$labels['deletecalendarconfirmrecursive'] = 'Haluatko varmasti poistaa tämän kalenterin ja kaikki sen tapahtumat sekä alikalenterit?';
+$labels['savingdata'] = 'Tallennetaan tietoja...';
+$labels['errorsaving'] = 'Muutosten tallentaminen epäonnistui.';
+$labels['operationfailed'] = 'Pyydetty toiminto epäonnistui.';
+$labels['invalidcalendarproperties'] = 'Kalenterin ominaisuudet ovat virheelliset. Aseta kelvollinen nimi.';
+$labels['searchnoresults'] = 'Valituista kalentereista ei löytynyt tapahtumia.';
+$labels['successremoval'] = 'Tapahtuma on poistettu onnistuneesti.';
+$labels['successrestore'] = 'Tapahtuma on palautettu onnistuneesti.';
+$labels['errorimportingevent'] = 'Tapahtuman tuonti epäonnistui';
+$labels['newerversionexists'] = 'Uudempi versio tästä tapahtumasta on jo olemassa! Keskeytetty.';
+$labels['nowritecalendarfound'] = 'Tapahtuman tallentamiseksi ei löytynyt kalenteria';
+$labels['importedsuccessfully'] = 'Tapahtuma lisättiin onnistuneesti kalenteriin \'$calendar\'';
+$labels['itipsendsuccess'] = 'Kutsu lähetetty osallistujille.';
+$labels['itipresponseerror'] = 'Vastauksen lähettäminen tapahtumakutsuun epäonnistui';
+$labels['itipinvalidrequest'] = 'Kutsu ei ole enää kelvollinen';
+$labels['localchangeswarning'] = 'Olet tekemässä muutoksia, jotka vaikuttavat ainoastaan omaan kalenteriisi. Muutoksia ei lähetetä tapahtuman järjestäjälle.';
+$labels['importsuccess'] = '$nr tapahtumaa tuotiin onnistuneesti';
+$labels['importnone'] = 'Tuotavaksi tarkoitettuja tapahtumia ei löytynyt';
+$labels['importerror'] = 'Tuotaessa tapahtui virhe';
+$labels['aclnorights'] = 'Sinulla ei ole ylläpitäjän oikeuksia tähän kalenteriin.';
+
+// recurrence form
+$labels['daily'] = 'päivittäin';
+$labels['weekly'] = 'viikottain';
+$labels['monthly'] = 'kuukausittain';
+$labels['yearly'] = 'vuosittain';
+$labels['forever'] = 'ikuisesti';
+$labels['recurrencend'] = 'kunnes';
+
+$labels['removeeventconfirm'] = 'Poista tapahtuma';
+$labels['allevents'] = 'Kaikki';
+$labels['saveasnew'] = 'Tallenna uutena';
+
+?>

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

@@ -1,7 +1,10 @@
 <?php
+
+$labels = array();
+
+// preferences
 $labels['default_view'] = 'Vue par défaut';
 $labels['time_format'] = 'Format de l\'heure';
-$labels['timeslots'] = 'Nombre d\'intervalle par heure';
 $labels['first_day'] = 'Premier jour de la semaine';
 $labels['first_hour'] = 'Première heure à afficher';
 $labels['workinghours'] = 'Heures de travail';
@@ -13,6 +16,8 @@
 $labels['coloringmode1'] = 'Selon la catégorie';
 $labels['coloringmode2'] = 'Calendrier en contour, catégorie en contenu';
 $labels['coloringmode3'] = 'Catégorie en contour, calendrier en contenu';
+
+// calendar
 $labels['calendar'] = 'Agenda';
 $labels['calendars'] = 'Agendas';
 $labels['category'] = 'Catégorie';
@@ -40,7 +45,10 @@
 $labels['all-day'] = 'Toute la journée';
 $labels['export'] = 'Exporter';
 $labels['exporttitle'] = 'Exporter vers iCalendar';
+$labels['exportrange'] = 'Évènements depuis';
+$labels['exportattachments'] = 'With attachments';
 $labels['location'] = 'Lieu';
+$labels['url'] = 'URL';
 $labels['date'] = 'Date';
 $labels['start'] = 'Début';
 $labels['end'] = 'Fin';
@@ -70,6 +78,9 @@
 $labels['nmonthsback'] = '$nr mois précédents';
 $labels['showurl'] = 'Afficher l\'URL de l\'agenda';
 $labels['showurldescription'] = 'Utilisez l\'adresse suivante pour accéder(lecture seule) à votre agenda depuis une autre application. Vous pouvez copier/coller celle-ci dans n\'importe quel agenda électronique gérant le format iCal.';
+$labels['caldavurldescription'] = 'Copiez cette adresse vers une application client (comme Evolution ou Mozilla Thunderbird) compatible <a href="http://fr.wikipedia.org/wiki/CalDAV" target="_blank">CalDAV</a> pour synchroniser ce calendrier avec votre ordinateur ou votre smartphone.';
+
+// agenda view
 $labels['listrange'] = 'Intervalle à afficher :';
 $labels['listsections'] = 'Diviser en :';
 $labels['smartsections'] = 'Section intelligente';
@@ -83,9 +94,13 @@
 $labels['weekofyear'] = 'Semaine';
 $labels['pastevents'] = 'Passé';
 $labels['futureevents'] = 'Futur';
-$labels['showalarms'] = 'Afficher les alarmes';
+
+// alarm/reminder settings
+$labels['showalarms'] = 'Afficher les rappels';
 $labels['defaultalarmtype'] = 'Paramètre de rappel par défaut';
 $labels['defaultalarmoffset'] = 'Durée de rappel par défaut';
+
+// attendees
 $labels['attendee'] = 'Participant';
 $labels['role'] = 'Rôle';
 $labels['availability'] = 'Dispo.';
@@ -94,6 +109,11 @@
 $labels['roleorganizer'] = 'Organisateur';
 $labels['rolerequired'] = 'Requis';
 $labels['roleoptional'] = 'Optionel';
+$labels['rolechair'] = 'Chair';
+$labels['rolenonparticipant'] = 'Absent';
+$labels['cutypeindividual'] = 'Individual';
+$labels['cutypegroup'] = 'Groupe';
+$labels['cutyperesource'] = 'Ressource';
 $labels['availfree'] = 'Disponible';
 $labels['availbusy'] = 'Occupé';
 $labels['availunknown'] = 'Inconnu';
@@ -108,7 +128,7 @@
 $labels['prevslot'] = 'Créneau précédent';
 $labels['nextslot'] = 'Créneau suivant';
 $labels['noslotfound'] = 'Impossible de trouver un créneau disponible';
-$labels['invitationsubject'] = 'Vous avez invité à "$title"';
+$labels['invitationsubject'] = 'Vous avez été invité à "$title"';
 $labels['invitationmailbody'] = "*\$title*\n\nQuand: \$date\n\nParticipants: \$attendees\n\nVous trouverez ci-joint un fichier iCalendar avec tous les détails de l'évènement que vous pourrez importer dans votre agenda électronique.";
 $labels['invitationattendlinks'] = "Dans le cas où votre application de messagerie ne gère pas les demandes \"iTip\". Vous pouvez utiliser ce lien pour accepter ou refuser l'invitation : \n\$url";
 $labels['eventupdatesubject'] = '"$title" a été modifié';
@@ -116,35 +136,25 @@
 $labels['eventupdatemailbody'] = "*\$title*\n\nQuand: \$date\n\nParticipants: \$attendees\n\nVous trouverez ci-joint un fichier iCalendar avec tous les modifications de l'évènement que vous pourrez importer dans votre agenda électronique.";
 $labels['eventcancelsubject'] = '"$title" a été annulé';
 $labels['eventcancelmailbody'] = "*\$title*\n\nQuand: \$date\n\nParticipants: \$attendees\n\nL'évènement a été annulé par \$organizer.\n\nVous trouverez en pièce jointe un fichier iCalendar avec les modifications de l'évènement que vous pourrez importer dans votre agenda électronique.";
-$labels['itipinvitation'] = 'Invitation à';
-$labels['itipupdate'] = 'Mise à jour de';
-$labels['itipcancellation'] = 'Annulation:';
-$labels['itipreply'] = 'Répondre à';
-$labels['itipaccepted'] = 'Accepter';
-$labels['itiptentative'] = 'Peut-être';
-$labels['itipdeclined'] = 'Refuser';
-$labels['itipsubjectaccepted'] = '"$title" a été accepté par $name';
-$labels['itipsubjecttentative'] = '"$title" a été accepté provisoirement par $name';
-$labels['itipsubjectdeclined'] = '"$title" a été refusé par $name';
+
+// invitation handling
 $labels['itipmailbodyaccepted'] = "\$sender a accepté l'invitation à l'évènement suivant :\n\n*\$title*\n\nQuand: \$date\n\nParticipants: \$attendees";
 $labels['itipmailbodytentative'] = "\$sender a accepté provisoirement l'invitation à l'évènement suivant :\n\n*\$title*\n\nQuand: \$date\n\nParticipants: \$attendees";
 $labels['itipmailbodydeclined'] = "\$sender a refusé l'invitation à l'évènement suivant :\n\n*\$title*\n\nQuand: \$date\n\nParticipants: \$attendees";
 $labels['itipdeclineevent'] = 'Voulez-vous refuser l\'invitation à cet évènement?';
-$labels['importtocalendar'] = 'Enregistrer mon agenda';
-$labels['removefromcalendar'] = 'Supprimer de mon agenda';
-$labels['updateattendeestatus'] = 'Modifier le statut des participants';
-$labels['acceptinvitation'] = 'Acceptez-vous cette invitation?';
-$labels['youhaveaccepted'] = 'Vous avez accepté cette invitation';
-$labels['youhavetentative'] = 'Vous avez accepté provisoirement cette invitation';
-$labels['youhavedeclined'] = 'Vous avez refusé cette invitation';
+$labels['declinedeleteconfirm'] = 'Voulez-vous aussi supprimer cet évènement annulé, de votre calendrier ?';
 $labels['notanattendee'] = 'Vous n\'êtes pas dans la liste des participants à cet évènement';
 $labels['eventcancelled'] = 'L\'évènement a été annulé';
 $labels['saveincalendar'] = 'Enregistrer sous';
+
+// event dialog tabs
 $labels['tabsummary'] = 'Résumé';
 $labels['tabrecurrence'] = 'Récurrence';
 $labels['tabattendees'] = 'Participants';
 $labels['tabattachments'] = 'Pièces jointes';
 $labels['tabsharing'] = 'Partage';
+
+// messages
 $labels['deleteventconfirm'] = 'Voulez-vous vraiment supprimer cet évènement?';
 $labels['deletecalendarconfirm'] = 'Voulez-vous vraiment supprimer cet agenda et tous ses évènements?';
 $labels['savingdata'] = 'Enregistrer...';
@@ -169,6 +179,8 @@
 $labels['importnone'] = 'Pas d\'évènements à importer';
 $labels['importerror'] = 'Une erreur est arrivée lors de l\'import';
 $labels['aclnorights'] = 'Vous n\'avez pas les droits d\'administration sur cet agenda.';
+
+// recurrence form
 $labels['repeat'] = 'Répéter';
 $labels['frequency'] = 'Répéter';
 $labels['never'] = 'Jamais';
@@ -195,6 +207,7 @@
 $labels['fourth'] = 'quatrième';
 $labels['last'] = 'dernier';
 $labels['dayofmonth'] = 'Jour du mois';
+
 $labels['changeeventconfirm'] = 'Modifier l\'évènement';
 $labels['removeeventconfirm'] = 'Supprimer l\'évènement';
 $labels['changerecurringeventwarning'] = 'Ceci est un évènement récurant. Voulez vous éditer seulement cette occurrence, celle-ci et toutes les suivantes, toutes les occurrences ou l\'enregistrer comme un nouvel évènement? ';
@@ -203,4 +216,5 @@
 $labels['futurevents'] = 'Cette occurrence et toutes les suivantes';
 $labels['allevents'] = 'Toutes les occurrences';
 $labels['saveasnew'] = 'Enregistrer comme un nouvel évènement';
+
 ?>

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

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

@@ -1,21 +1,228 @@
 <?php
-$labels['default_view'] = 'Visualizzazine di default';
+
+$labels = array();
+
+// preferences
+$labels['default_view'] = 'Visualizzazione predefinita';
 $labels['time_format'] = 'Formato ora';
 $labels['timeslots'] = 'Timeslots per ora';
 $labels['first_day'] = 'Inizio settimana';
+$labels['first_hour'] = 'Prima ora da mostrare';
+$labels['workinghours'] = 'Orario lavorativo';
+$labels['add_category'] = 'Aggiungi categoria';
+$labels['remove_category'] = 'Rimuovi categoria';
+$labels['defaultcalendar'] = 'Crea nuovi eventi in';
+$labels['eventcoloring'] = 'Colorazione evento';
+$labels['coloringmode0'] = 'Secondo il calendario';
+$labels['coloringmode1'] = 'Secondo la categoria';
+
+// calendar
 $labels['calendar'] = 'Calendario';
+$labels['calendars'] = 'Calendari';
 $labels['category'] = 'Categoria';
+$labels['categories'] = 'Categorie';
+$labels['createcalendar'] = 'Crea nuovo calendario';
+$labels['editcalendar'] = 'Modifica proprietà calendario';
+$labels['name'] = 'Nome';
+$labels['color'] = 'Colore';
 $labels['day'] = 'Giorno';
 $labels['week'] = 'Settimana';
 $labels['month'] = 'Mese';
+$labels['agenda'] = 'Agenda';
+$labels['new'] = 'Nuovo';
 $labels['new_event'] = 'Nuovo evento';
 $labels['edit_event'] = 'Modifica evento';
+$labels['edit'] = 'Modifica';
 $labels['save'] = 'Salva';
 $labels['remove'] = 'Elimina';
 $labels['cancel'] = 'Annulla';
+$labels['select'] = 'Seleziona';
+$labels['print'] = 'Stampa';
+$labels['printtitle'] = 'Stampa calendari';
 $labels['title'] = 'Oggetto';
 $labels['description'] = 'Descrizione';
-$labels['all-day'] = 'Giorno intero';
-$labels['export'] = 'Esporta in ICS';
-$labels['tabsummary'] = 'Oggetto';
+$labels['all-day'] = 'Tutto il giorno';
+$labels['export'] = 'Esporta';
+$labels['exporttitle'] = 'Esporta come iCalendar';
+$labels['exportrange'] = 'Eventi di';
+$labels['exportattachments'] = 'Con allegati';
+$labels['customdate'] = 'Data personalizzata';
+$labels['location'] = 'Luogo';
+$labels['url'] = 'URL';
+$labels['date'] = 'Data';
+$labels['start'] = 'Inizio';
+$labels['end'] = 'Fine';
+$labels['selectdate'] = 'Scegliere la data';
+$labels['freebusy'] = 'Mostrami come';
+$labels['free'] = 'Libero';
+$labels['busy'] = 'Occupato';
+$labels['outofoffice'] = 'Fuori Ufficio';
+$labels['tentative'] = 'Provvisorio';
+$labels['priority'] = 'Priorità';
+$labels['sensitivity'] = 'Privacy';
+$labels['public'] = 'pubblico';
+$labels['private'] = 'privato';
+$labels['confidential'] = 'confidenziale';
+$labels['alarms'] = 'Promemoria';
+$labels['generated'] = 'generato il';
+$labels['printdescriptions'] = 'Stampa descrizioni';
+$labels['parentcalendar'] = 'Inserisci dentro';
+$labels['searchearlierdates'] = '« Cerca eventi precedenti';
+$labels['searchlaterdates'] = 'Cerca eventi successivi »';
+$labels['andnmore'] = 'Altri $nr...';
+$labels['togglerole'] = 'Fare clic per cambiare il ruolo';
+$labels['createfrommail'] = 'Salva come evento';
+$labels['importevents'] = 'Importa eventi';
+$labels['importrange'] = 'Eventi di';
+$labels['onemonthback'] = '1 mese prima';
+$labels['nmonthsback'] = '$nr mesi prima';
+$labels['showurl'] = 'Mostra URL calendario';
+$labels['showurldescription'] = 'Usare il seguente indirizzo per accedere (in sola lettura) al calendario da altre applicazioni. È possibile copiarlo e incollarlo in qualsiasi software che supporta il formato iCal.';
+$labels['caldavurldescription'] = 'Copiare questo indirizzo in un\'applicazione client <a href="http://en.wikipedia.org/wiki/CalDAV" target="_blank">CalDAV</a> (es. Evolution o Mozilla Thunderbird) per sincronizzare completamente questo specifico calendario con il proprio computer o dispositivo mobile.';
+
+// agenda view
+$labels['listrange'] = 'Intervallo da visualizzare:';
+$labels['listsections'] = 'Dividi in:';
+$labels['smartsections'] = 'Sezioni intelligenti';
+$labels['until'] = 'fino a';
+$labels['today'] = 'Oggi';
+$labels['tomorrow'] = 'Domani';
+$labels['thisweek'] = 'Questa settimana';
+$labels['nextweek'] = 'Prossima settimana';
+$labels['thismonth'] = 'Questo mese';
+$labels['nextmonth'] = 'Prossimo mese';
+$labels['weekofyear'] = 'Settimana';
+$labels['pastevents'] = 'Passato';
+$labels['futureevents'] = 'Futuro';
+
+// alarm/reminder settings
+$labels['showalarms'] = 'Mostra promemoria';
+$labels['defaultalarmtype'] = 'Impostazioni predefinite dei promemoria';
+$labels['defaultalarmoffset'] = 'Tempo predefinito per i promemoria';
+
+// attendees
+$labels['attendee'] = 'Partecipante';
+$labels['role'] = 'Ruolo';
+$labels['availability'] = 'Dispon.';
+$labels['confirmstate'] = 'Stato';
+$labels['addattendee'] = 'Aggiungi partecipante';
+$labels['roleorganizer'] = 'Organizzatore';
+$labels['rolerequired'] = 'Necessario';
+$labels['roleoptional'] = 'Facoltativo';
+$labels['rolechair'] = 'Presidente';
+$labels['rolenonparticipant'] = 'Assente';
+$labels['cutypeindividual'] = 'Individual';
+$labels['cutypegroup'] = 'Gruppo';
+$labels['cutyperesource'] = 'Risorsa';
+$labels['availfree'] = 'Libero';
+$labels['availbusy'] = 'Occupato';
+$labels['availunknown'] = 'Sconosciuto';
+$labels['availtentative'] = 'Provvisorio';
+$labels['availoutofoffice'] = 'Fuori sede';
+$labels['scheduletime'] = 'Trova disponibilità';
+$labels['sendinvitations'] = 'Manda inviti';
+$labels['sendnotifications'] = 'Notifica le modifiche ai partecipanti';
+$labels['sendcancellation'] = 'Notifica ai partecipanti la cancellazione dell\'evento';
+$labels['onlyworkinghours'] = 'Trova disponibilità durante le ore lavorative';
+$labels['reqallattendees'] = 'Necessario/tutti i partecipanti';
+$labels['prevslot'] = 'Spazio precedente';
+$labels['nextslot'] = 'Spazio successivo';
+$labels['noslotfound'] = 'Impossibile trovare uno spazio di tempo libero';
+$labels['invitationsubject'] = 'Sei stato invitato a "$title"';
+$labels['invitationmailbody'] = "*\$title*\n\nQuando: \$date\n\nInvitati: \$attendees\n\nIn allegato un file iCalendar con tutti i dettagli dell'evento, che puoi importare nella tua applicazione calendario.";
+$labels['invitationattendlinks'] = "Se il tuo client di posta elettronica non supporta le richieste iTip, puoi seguire il seguente collegamento per accettare o rifiutare l'invito:\n\$url";
+$labels['eventupdatesubject'] = '"$title" è stato aggiornato';
+$labels['eventupdatesubjectempty'] = 'Un evento che ti riguarda è stato aggiornato';
+$labels['eventupdatemailbody'] = "*\$title*\n\nQuando: \$date\n\nInvitati: \$attendees\n\nIn allegato un file iCalendar con i dettagli aggiornati dell'evento che puoi importare nella tua applicazione calendario.";
+$labels['eventcancelsubject'] = '"$title" è stato annullato';
+$labels['eventcancelmailbody'] = "*\$title*\n\nQuando: \$date\n\nInvitati: \$attendees\n\nL'evento è stato cancellato da \$organizer.\n\nIn allegato un file iCalendar con i dettagli aggiornati dell'evento .";
+
+// invitation handling
+$labels['itipmailbodyaccepted'] = "\$sender ha accettato l'invito al seguente evento:\n\n*\$title*\n\nQuando: \$date\n\nInvitati: \$attendees";
+$labels['itipmailbodytentative'] = "\$sender ha accettato con riserva l'invito al seguente evento:\n\n*\$title*\n\nQuando: \$date\n\nInvitati: \$attendees";
+$labels['itipmailbodydeclined'] = "\$sender ha rifiutato l'invito al seguente evento:\n\n*\$title*\n\nQuando: \$date\n\nInvitati: \$attendees";
+$labels['itipdeclineevent'] = 'Vuoi rifiutare l\'invito a questo evento?';
+$labels['declinedeleteconfirm'] = 'Vuoi anche cancellare dal calendario l\'evento rifiutato?';
+$labels['notanattendee'] = 'Non sei elencato tra i partecipanti a questo evento';
+$labels['eventcancelled'] = 'L\'evento è stato annullato';
+$labels['saveincalendar'] = 'salva in';
+
+// event dialog tabs
+$labels['tabsummary'] = 'Riepilogo';
+$labels['tabrecurrence'] = 'Ricorrenza';
+$labels['tabattendees'] = 'Partecipanti';
+$labels['tabattachments'] = 'Allegati';
+$labels['tabsharing'] = 'Condivisione';
+
+// messages
+$labels['deleteventconfirm'] = 'Cancellare davvero questo evento?';
+$labels['deletecalendarconfirm'] = 'Cancellare davvero questo calendario con tutti i suoi eventi?';
+$labels['deletecalendarconfirmrecursive'] = 'Vuoi veramente eliminare questo calendario con tutti i suoi eventi e i suoi sotto-calendari?';
+$labels['savingdata'] = 'Salvataggio dati...';
+$labels['errorsaving'] = 'Impossibile salvare le modifiche.';
+$labels['operationfailed'] = 'L\'operazione richiesta è fallita.';
+$labels['invalideventdates'] = 'Le date inserite non sono valide. Controllare l\'inserimento.';
+$labels['invalidcalendarproperties'] = 'Proprietà del calendario non valide. Impostare un nome valido.';
+$labels['searchnoresults'] = 'Nessun evento trovato nel calendario selezionato.';
+$labels['successremoval'] = 'L\'evento è stato cancellato correttamente.';
+$labels['successrestore'] = 'L\'evento è stato ripristinato correttamente.';
+$labels['errornotifying'] = 'Spedizione delle notifiche ai partecipanti dell\'evento fallita';
+$labels['errorimportingevent'] = 'Importazione evento fallita';
+$labels['newerversionexists'] = 'Esiste già una versione più recente di questo evento. Abortito.';
+$labels['nowritecalendarfound'] = 'Non c\'è nessun calendario dove salvare l\'evento';
+$labels['importedsuccessfully'] = 'Evento aggiunto correttamente a \'$calendar\'';
+$labels['attendeupdateesuccess'] = 'Stato dei partecipanti aggiornato correttamente';
+$labels['itipsendsuccess'] = 'Invito spedito ai partecipanti.';
+$labels['itipresponseerror'] = 'Spedizione della risposta all\'invito fallita';
+$labels['itipinvalidrequest'] = 'Questo invito non è più valido';
+$labels['sentresponseto'] = 'Risposta all\'invito inviata correttamente a $mailto';
+$labels['localchangeswarning'] = 'Stai per fare dei cambiamenti che compariranno solo nel tuo calendario e non saranno spediti all\'organizzatore dell\'evento.';
+$labels['importsuccess'] = '$nr eventi importati correttamente';
+$labels['importnone'] = 'Nessun evento trovato da importare';
+$labels['importerror'] = 'Si è verificato un errore durante l\'importazione';
+$labels['aclnorights'] = 'Non hai i diritti di amministratore per questo calendario.';
+
+// recurrence form
+$labels['repeat'] = 'Ricorrenza';
+$labels['frequency'] = 'Frequenza';
+$labels['never'] = 'una volta';
+$labels['daily'] = 'quotidiana';
+$labels['weekly'] = 'settimanale';
+$labels['monthly'] = 'mensile';
+$labels['yearly'] = 'annuale';
+$labels['every'] = 'Ogni';
+$labels['days'] = 'giorno/i';
+$labels['weeks'] = 'settimana/e';
+$labels['months'] = 'mese/i';
+$labels['years'] = 'anno/i in:';
+$labels['bydays'] = 'Di';
+$labels['untildate'] = 'il';
+$labels['each'] = 'Nei giorni';
+$labels['onevery'] = 'Ogni';
+$labels['onsamedate'] = 'Alla stessa data';
+$labels['forever'] = 'per sempre';
+$labels['recurrencend'] = 'fino al';
+$labels['forntimes'] = 'per $nr volte';
+$labels['first'] = 'primo';
+$labels['second'] = 'secondo';
+$labels['third'] = 'terzo';
+$labels['fourth'] = 'quarto';
+$labels['last'] = 'ultimo';
+$labels['dayofmonth'] = 'Giorno del mese';
+
+$labels['changeeventconfirm'] = 'Cambia evento';
+$labels['removeeventconfirm'] = 'Rimuovi evento';
+$labels['currentevent'] = 'Current';
+$labels['futurevents'] = 'Futuro';
+$labels['allevents'] = 'Tutto';
+$labels['saveasnew'] = 'Salva come nuovo';
+
+// birthdays calendar
+$labels['birthdays'] = 'Compleanni';
+$labels['birthdayscalendar'] = 'Calendario compleanni';
+$labels['displaybirthdayscalendar'] = 'Mostra il calendario compleanni';
+$labels['birthdayscalendarsources'] = 'Da queste rubriche';
+$labels['birthdayeventtitle'] = 'Compleanno di $name';
+$labels['birthdayage'] = 'Età: $age anni';
+
 ?>

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

@@ -1,7 +1,10 @@
 <?php
+
+$labels = array();
+
+// preferences
 $labels['default_view'] = 'デフォルトビュー';
 $labels['time_format'] = '時刻表示形式';
-$labels['timeslots'] = '1時間毎';
 $labels['first_day'] = '最初の平日';
 $labels['first_hour'] = '最初の時間を表示';
 $labels['workinghours'] = '労働時間';
@@ -13,6 +16,8 @@
 $labels['coloringmode1'] = 'カテゴリの説明';
 $labels['coloringmode2'] = 'アウトライン用カレンダー、コンテンツ用カテゴリ';
 $labels['coloringmode3'] = 'アウトライン用カレンダー、コンテンツ用カテゴリ';
+
+// calendar
 $labels['calendar'] = 'カレンダー';
 $labels['calendars'] = 'カレンダー';
 $labels['category'] = 'カテゴリ';
@@ -40,7 +45,9 @@
 $labels['all-day'] = '全日';
 $labels['export'] = 'エクスポート';
 $labels['exporttitle'] = 'iカレンダーへエクスポート';
+$labels['exportrange'] = 'イベント元';
 $labels['location'] = '場所';
+$labels['url'] = 'URL';
 $labels['date'] = '期日';
 $labels['start'] = '開始';
 $labels['end'] = '終了';
@@ -70,6 +77,8 @@
 $labels['nmonthsback'] = '$nr ヶ月戻る';
 $labels['showurl'] = 'カレンダーURL表示';
 $labels['showurldescription'] = '以下のアドレスを使用して他のアプリケーションからカレンダーにアクセス(読込のみ)できます。iCal形式をサポートしたカレンダーソフトウェアへコピーアンドペーストができます。';
+
+// agenda view
 $labels['listrange'] = '表示範囲:';
 $labels['listsections'] = '分割:';
 $labels['smartsections'] = 'スマートセクション';
@@ -83,9 +92,12 @@
 $labels['weekofyear'] = '週';
 $labels['pastevents'] = '以前';
 $labels['futureevents'] = '以降';
-$labels['showalarms'] = 'アラーム表示';
+
+// alarm/reminder settings
 $labels['defaultalarmtype'] = 'デフォルト通知設定';
 $labels['defaultalarmoffset'] = 'デフォルト通知時間';
+
+// attendees
 $labels['attendee'] = '参加者';
 $labels['role'] = 'ロール';
 $labels['availability'] = '利用可';
@@ -94,6 +106,8 @@
 $labels['roleorganizer'] = '編成者';
 $labels['rolerequired'] = '要件';
 $labels['roleoptional'] = 'オプション';
+$labels['cutypegroup'] = 'グループ';
+$labels['cutyperesource'] = 'リソース';
 $labels['availfree'] = '空';
 $labels['availbusy'] = 'ビジー';
 $labels['availunknown'] = '不明';
@@ -116,35 +130,23 @@
 $labels['eventupdatemailbody'] = "*\$title*\n\nいつ: \$date\n\n招待者: \$attendees\n\nあなたのカレンダーアプリケーションにインポートできるアップデートされた全イベントの詳細が添付されたiカレンダーファイルを見つけてください。";
 $labels['eventcancelsubject'] = '"$title" は変更されました';
 $labels['eventcancelmailbody'] = "*\$title*\n\nいつ: \$date\n\n招待者: \$attendees\n\nイベントが \$organizer によってキャンセルされました。\n\n更新されたイベントの詳細とともに添付されたiカレンダーファイルを見つけてください。";
-$labels['itipinvitation'] = '招待する';
-$labels['itipupdate'] = '更新';
-$labels['itipcancellation'] = 'キャンセル';
-$labels['itipreply'] = '返信';
-$labels['itipaccepted'] = '承諾';
-$labels['itiptentative'] = 'たぶん';
-$labels['itipdeclined'] = '辞退';
-$labels['itipsubjectaccepted'] = '$name が "$title" を承諾しました';
-$labels['itipsubjecttentative'] = '$name が "$title" を仮承諾しました';
-$labels['itipsubjectdeclined'] = '$name が "$title" を辞退しました';
+
+// invitation handling
 $labels['itipmailbodyaccepted'] = "\$sender は以下のイベントへの招待を承諾しました:\n\n*\$title*\n\nいつ: \$date\n\n招待者: \$attendees";
 $labels['itipmailbodytentative'] = "\$sender は以下のイベントへの招待を仮承諾しました:\n\n*\$title*\n\nいつ: \$date\n\n招待者: \$attendees";
 $labels['itipmailbodydeclined'] = "\$sender は以下のイベントへの招待を辞退しました:\n\n*\$title*\n\nいつ: \$date\n\n招待者: \$attendees";
 $labels['itipdeclineevent'] = 'このイベントへの招待を辞退しますか?';
-$labels['importtocalendar'] = 'カレンダーに保存';
-$labels['removefromcalendar'] = 'カレンダーから削除';
-$labels['updateattendeestatus'] = '参加者の状況更新';
-$labels['acceptinvitation'] = 'この招待を承諾しますか?';
-$labels['youhaveaccepted'] = 'この招待を承諾しました';
-$labels['youhavetentative'] = 'この招待を仮承諾しました。';
-$labels['youhavedeclined'] = 'この招待を辞退しました。';
-$labels['notanattendee'] = 'このイベントの出席者として一覧にありません';
 $labels['eventcancelled'] = 'このイベントはキャンセルされました';
 $labels['saveincalendar'] = '保存';
+
+// event dialog tabs
 $labels['tabsummary'] = '要約';
 $labels['tabrecurrence'] = '繰返し';
 $labels['tabattendees'] = '参加者';
 $labels['tabattachments'] = '添付';
 $labels['tabsharing'] = '共有';
+
+// messages
 $labels['deleteventconfirm'] = '本当にこのイベントを削除しますか?';
 $labels['deletecalendarconfirm'] = '本当にこのカレンダーを全イベントとともに削除しますか?';
 $labels['savingdata'] = 'データを保存中…';
@@ -169,6 +171,8 @@
 $labels['importnone'] = 'インポートされたイベントはありません';
 $labels['importerror'] = 'インポート中にエラーが発生しました。';
 $labels['aclnorights'] = 'このカレンダーの管理権限がありません。';
+
+// recurrence form
 $labels['repeat'] = '繰返し';
 $labels['frequency'] = '繰返し';
 $labels['never'] = '繰返さない';
@@ -195,6 +199,7 @@
 $labels['fourth'] = '第4週';
 $labels['last'] = '最終週';
 $labels['dayofmonth'] = '日';
+
 $labels['changeeventconfirm'] = 'イベント変更';
 $labels['removeeventconfirm'] = 'イベント削除';
 $labels['changerecurringeventwarning'] = 'これは繰返しイベントです。現在のイベントのみ、このイベントと今後の全イベント、全イベント、編集したい、もしくは新しいイベントとして保存したい?';
@@ -203,4 +208,5 @@
 $labels['futurevents'] = '今後';
 $labels['allevents'] = '全て';
 $labels['saveasnew'] = '新規保存';
+
 ?>

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

@@ -1,17 +1,23 @@
 <?php
+
+$labels = array();
+
+// preferences
 $labels['default_view'] = 'Standaard agenda';
 $labels['time_format'] = 'Tijdsformaat';
-$labels['timeslots'] = 'Timeslots per uur';
 $labels['first_day'] = 'Eerste weekdag';
 $labels['first_hour'] = 'Eerste uur om weer te geven';
 $labels['workinghours'] = 'Werkuren';
 $labels['add_category'] = 'Categorie toevoegen';
 $labels['remove_category'] = 'Categorie verwijderen';
-$labels['eventcoloring'] = 'Evenement kleuren';
+$labels['defaultcalendar'] = 'Maak nieuwe afspraken in';
+$labels['eventcoloring'] = 'Kleuren van afspraken';
 $labels['coloringmode0'] = 'Volgens kalender';
 $labels['coloringmode1'] = 'Volgens categorie';
 $labels['coloringmode2'] = 'Kalender voor omtrek, categorie voor inhoud';
 $labels['coloringmode3'] = 'Categorie voor omtrek, kalender voor inhoud';
+
+// calendar
 $labels['calendar'] = 'Agenda';
 $labels['calendars'] = 'Kalenders';
 $labels['category'] = 'Categorie';
@@ -25,7 +31,7 @@
 $labels['month'] = 'Maand';
 $labels['agenda'] = 'Agenda';
 $labels['new'] = 'Nieuw';
-$labels['new_event'] = 'Nieuw evenement';
+$labels['new_event'] = 'Nieuwe afspraak';
 $labels['edit_event'] = 'Wijzig evenement';
 $labels['edit'] = 'Wijzig';
 $labels['save'] = 'Bewaar';
@@ -39,7 +45,9 @@
 $labels['all-day'] = 'hele dag';
 $labels['export'] = 'Exporteer naar ICS';
 $labels['exporttitle'] = 'Als iCalender exporteren';
+$labels['exportrange'] = 'Events from';
 $labels['location'] = 'Locatie';
+$labels['url'] = 'URL';
 $labels['date'] = 'Datum';
 $labels['start'] = 'Begin';
 $labels['end'] = 'Eind';
@@ -57,14 +65,24 @@
 $labels['alarms'] = 'Herinnering';
 $labels['generated'] = 'gegenereerd op';
 $labels['printdescriptions'] = 'Print beschrijvingen';
+$labels['parentcalendar'] = 'Insert inside';
 $labels['searchearlierdates'] = '« Zoek voor eerdere evenementen';
 $labels['searchlaterdates'] = 'Zoek voor latere evenementen »';
 $labels['andnmore'] = '$nr meer...';
+$labels['togglerole'] = 'Click to toggle role';
 $labels['createfrommail'] = 'Bewaar als evenement';
 $labels['importevents'] = 'Evenementen importeren';
+$labels['importrange'] = 'Events from';
 $labels['onemonthback'] = '1 maand terug';
 $labels['nmonthsback'] = '$nr maanden terug';
 $labels['showurl'] = 'Toon kalender URL';
+$labels['showurldescription'] = 'Use the following address to access (read only) your calendar from other applications. You can copy and paste this into any calendar software that supports the iCal format.';
+$labels['caldavurldescription'] = 'Copy this address to a <a href="http://en.wikipedia.org/wiki/CalDAV" target="_blank">CalDAV</a> client application (e.g. Evolution or Mozilla Thunderbird) to fully synchronize this specific calendar with your computer or mobile device.';
+
+// agenda view
+$labels['listrange'] = 'Range to display:';
+$labels['listsections'] = 'Verdeel in:';
+$labels['smartsections'] = 'Smart sections';
 $labels['until'] = 'tot';
 $labels['today'] = 'Vandaag';
 $labels['tomorrow'] = 'Morgen';
@@ -75,7 +93,13 @@
 $labels['weekofyear'] = 'Week';
 $labels['pastevents'] = 'Verleden';
 $labels['futureevents'] = 'Toekomst';
-$labels['showalarms'] = 'Alarmen tonen';
+
+// alarm/reminder settings
+$labels['showalarms'] = 'Show reminders';
+$labels['defaultalarmtype'] = 'Standaard herinnering instelling';
+$labels['defaultalarmoffset'] = 'Standaard herinnering tijd';
+
+// attendees
 $labels['attendee'] = 'Deelnemer';
 $labels['role'] = 'Rol';
 $labels['availability'] = 'Beschikb.';
@@ -84,6 +108,11 @@
 $labels['roleorganizer'] = 'Organisatie';
 $labels['rolerequired'] = 'Verplicht';
 $labels['roleoptional'] = 'Optioneel';
+$labels['rolechair'] = 'Chair';
+$labels['rolenonparticipant'] = 'Absent';
+$labels['cutypeindividual'] = 'Individual';
+$labels['cutypegroup'] = 'Groep';
+$labels['cutyperesource'] = 'Middel';
 $labels['availfree'] = 'Vrij';
 $labels['availbusy'] = 'Bezig';
 $labels['availunknown'] = 'Onbekend';
@@ -91,26 +120,22 @@
 $labels['availoutofoffice'] = 'Niet Aanwezig';
 $labels['scheduletime'] = 'Vind beschikbaarheid';
 $labels['sendinvitations'] = 'Verzend uitnodigingen';
-$labels['itipinvitation'] = 'Uitnodiging voor';
-$labels['itipupdate'] = 'Update van';
-$labels['itipcancellation'] = 'Afgelast:';
-$labels['itipaccepted'] = 'Accepteer';
-$labels['itiptentative'] = 'Misschien';
-$labels['itipdeclined'] = 'Afwijzen';
-$labels['importtocalendar'] = 'Bewaar in mijn kalender';
-$labels['removefromcalendar'] = 'Verwijder van mijn kalender';
-$labels['updateattendeestatus'] = 'Update status van deelnemer';
-$labels['acceptinvitation'] = 'Accepteer je deze uitnodiging?';
-$labels['youhaveaccepted'] = 'Je hebt de uitnodiging geaccepteerd';
-$labels['youhavedeclined'] = 'Je hebt deze uitnodiging afgewezen';
+$labels['invitationsubject'] = 'U bent uitgenodigd voor "$title"';
+
 $labels['eventcancelled'] = 'Dit evenement is afgelast';
 $labels['saveincalendar'] = 'bewaar in';
+
+// event dialog tabs
 $labels['tabsummary'] = 'Samenvatting';
 $labels['tabrecurrence'] = 'Herhaling';
 $labels['tabattendees'] = 'Deelnemers';
 $labels['tabattachments'] = 'Toebehoren';
 $labels['tabsharing'] = 'Delen';
+
+// messages
 $labels['savingdata'] = 'Data wordt opgeslagen...';
+
+// recurrence form
 $labels['repeat'] = 'Herhaal';
 $labels['frequency'] = 'Herhaal';
 $labels['never'] = 'nooit';
@@ -122,6 +147,7 @@
 $labels['days'] = 'dag(en)';
 $labels['weeks'] = 'week / weken';
 $labels['months'] = 'maand(en)';
+$labels['years'] = 'year(s) in:';
 $labels['bydays'] = 'Op';
 $labels['untildate'] = 'de';
 $labels['each'] = 'Elke';
@@ -136,10 +162,12 @@
 $labels['fourth'] = 'vierde';
 $labels['last'] = 'laatste';
 $labels['dayofmonth'] = 'Dag van de maand';
+
 $labels['changeeventconfirm'] = 'Wijzig evenement';
 $labels['removeeventconfirm'] = 'Verwijder evenement';
 $labels['currentevent'] = 'Huidige';
 $labels['futurevents'] = 'Toekomst';
 $labels['allevents'] = 'Alle';
 $labels['saveasnew'] = 'Bewaar als nieuw';
+
 ?>

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

@@ -1,22 +1,224 @@
 <?php
+
+$labels = array();
+
+// preferences
+$labels['default_view'] = 'Domyślny widok';
+$labels['time_format'] = 'Format czasu';
+$labels['first_day'] = 'Pierwszy dzień tygodnia';
+$labels['first_hour'] = 'Pierwsza godzina';
+$labels['workinghours'] = 'Godziny robocze';
+$labels['add_category'] = 'Dodaj kategorię';
+$labels['remove_category'] = 'Usuń kategorię';
+$labels['defaultcalendar'] = 'Twórz nowe zdarzenia w';
+$labels['eventcoloring'] = 'Kolor zdarzenia';
+$labels['coloringmode0'] = 'Zgodnie z kalendarzem';
+$labels['coloringmode1'] = 'Zgodnie z kategorią';
+$labels['coloringmode2'] = 'Kalendarz dla obramowania, kategoria dla środka';
+$labels['coloringmode3'] = 'Kategoria dla obramowania, kalendarz dla środka';
+
+// calendar
 $labels['calendar'] = 'Kalendarz';
 $labels['calendars'] = 'Kalendarze';
+$labels['category'] = 'Kategoria';
+$labels['categories'] = 'Kategorie';
+$labels['createcalendar'] = 'Utwórz nowy kalendarz';
+$labels['editcalendar'] = 'Edytuj właściwości kalendarza';
 $labels['name'] = 'Nazwa';
+$labels['color'] = 'Kolor';
+$labels['day'] = 'Dzień';
+$labels['week'] = 'Tydzień';
+$labels['month'] = 'Miesiąc';
+$labels['agenda'] = 'Agenda';
+$labels['new'] = 'Nowy';
+$labels['new_event'] = 'Nowe zdarzenie';
+$labels['edit_event'] = 'Edytuj zdarzenie';
 $labels['edit'] = 'Edytuj';
 $labels['save'] = 'Zapisz';
 $labels['remove'] = 'Usuń';
 $labels['cancel'] = 'Anuluj';
+$labels['select'] = 'Wybierz';
+$labels['print'] = 'Drukuj';
+$labels['printtitle'] = 'Drukuj kalendarze';
 $labels['title'] = 'Podsumowanie';
 $labels['description'] = 'Opis';
-$labels['start'] = 'Start';
+$labels['all-day'] = 'cały dzień';
+$labels['export'] = 'Eksport';
+$labels['exporttitle'] = 'Eksport w formacie iCalendar';
+$labels['exportrange'] = 'Zdarzenia z';
+$labels['exportattachments'] = 'Z załącznikami';
+$labels['customdate'] = 'Własna data';
+$labels['location'] = 'Położenie';
+$labels['url'] = 'Adres URL';
+$labels['date'] = 'Data';
+$labels['start'] = 'Początek';
+$labels['end'] = 'Koniec';
+$labels['selectdate'] = 'Wybierz datę';
+$labels['freebusy'] = 'Pokaż mnie jako';
+$labels['free'] = 'Wolny';
+$labels['busy'] = 'Zajęty';
+$labels['outofoffice'] = 'Poza biurem';
+$labels['tentative'] = 'Niepewny';
+$labels['priority'] = 'Priorytet';
+$labels['sensitivity'] = 'Poufność';
+$labels['public'] = 'publiczny';
+$labels['private'] = 'prywatny';
+$labels['confidential'] = 'poufny';
 $labels['alarms'] = 'Przypomnienie';
+$labels['generated'] = 'wygenerowano';
+$labels['printdescriptions'] = 'Drukuj opisy';
+$labels['parentcalendar'] = 'Wstaw wewnątrz';
+$labels['searchearlierdates'] = '« Szukaj wcześniejszych zdarzeń';
+$labels['searchlaterdates'] = 'Szukaj późniejszych zdarzeń »';
+$labels['andnmore'] = '$nr więcej...';
+$labels['togglerole'] = 'Kliknuj aby przestawić rolę';
+$labels['createfrommail'] = 'Zapisz jako zdarzenie';
+$labels['importevents'] = 'Importuj zdarzenia';
+$labels['importrange'] = 'Zdarzenia z';
+$labels['onemonthback'] = '1 miesiąc wstecz';
+$labels['nmonthsback'] = '$nr miesięcy wstecz';
+$labels['showurl'] = 'Pokaż adres URL kalendarza';
+$labels['showurldescription'] = 'Używaj tego adresu aby dostać się do kalendarza z innych programów (w trybie tylko-do-odczytu). Możesz wkleić go do dowolnej aplikacji obsługującej format iCal.';
+$labels['caldavurldescription'] = 'Skopiuj ten adres do aplikacji obsługującej format <a href="http://en.wikipedia.org/wiki/CalDAV" target="_blank">CalDAV</a> (np. Evolution lub Mozilla Thunderbird) aby zsynchronizować wybrany kalendarz z twoim komputerem lub urządzeniem przenośnym.';
+
+// agenda view
+$labels['listrange'] = 'Zakres do pokazania:';
+$labels['listsections'] = 'Podziel na:';
+$labels['smartsections'] = 'Inteligentne sekcje';
+$labels['until'] = 'dopóki';
 $labels['today'] = 'Dzisiaj';
 $labels['tomorrow'] = 'Jutro';
-$labels['showalarms'] = 'Pokaż alarmy';
+$labels['thisweek'] = 'Bieżący tydzień';
+$labels['nextweek'] = 'Następny tydzień';
+$labels['thismonth'] = 'Bieżący miesiąc';
+$labels['nextmonth'] = 'Następny miesiąc';
+$labels['weekofyear'] = 'Tydzień';
+$labels['pastevents'] = 'Przeszłe';
+$labels['futureevents'] = 'Przyszłe';
+
+// alarm/reminder settings
+$labels['showalarms'] = 'Show reminders';
+$labels['defaultalarmtype'] = 'Domyślne powiadomienie';
+$labels['defaultalarmoffset'] = 'Domyślny czas powiadomienia';
+
+// attendees
+$labels['attendee'] = 'Uczestnik';
 $labels['role'] = 'Rola';
+$labels['availability'] = 'Dostępny';
+$labels['confirmstate'] = 'Status';
+$labels['addattendee'] = 'Dodaj uczestnika';
+$labels['roleorganizer'] = 'Organizator';
+$labels['rolerequired'] = 'Wymagany';
 $labels['roleoptional'] = 'Opcjonalny';
+$labels['rolechair'] = 'Przewodniczący';
+$labels['rolenonparticipant'] = 'Absent';
+$labels['cutypeindividual'] = 'Osoba';
+$labels['cutypegroup'] = 'Grupa';
+$labels['cutyperesource'] = 'Zasób';
+$labels['cutyperoom'] = 'Pokój';
+$labels['availfree'] = 'Wolny';
+$labels['availbusy'] = 'Zajęty';
+$labels['availunknown'] = 'Nieznany';
+$labels['availtentative'] = 'Niepewny';
+$labels['availoutofoffice'] = 'Poza biurem';
+$labels['scheduletime'] = 'Sprawdź dostępność';
+$labels['sendinvitations'] = 'Wyślij zaproszenia';
+$labels['sendnotifications'] = 'Powiadom uczestników o zmianach';
+$labels['sendcancellation'] = 'Powiadom uczestników o anulowaniu zdarzenia';
+$labels['onlyworkinghours'] = 'Sprawdź dostępność w moich godzinach pracy';
+$labels['reqallattendees'] = 'Wymagany/wszyscy uczestnicy';
+$labels['prevslot'] = 'Poprzedni przedział';
+$labels['nextslot'] = 'Następny przedział';
+$labels['noslotfound'] = 'Nie znaleziono wolnego przedziału czasu';
+$labels['invitationsubject'] = 'Zostałeś zaproszony do "$title"';
+$labels['invitationmailbody'] = "*\$title*\n\nKiedy: \$date\n\nZaproszeni: \$attendees\n\nW załączeniu plik w formacie iCalendar ze szczegółami zdarzenia, który możesz zaimportować do twojej aplikacji kalendarza.";
+$labels['invitationattendlinks'] = "W przypadku gdy klient poczty elektronicznej nie obsługuje rządań w formacie iTip, aby zaakceptować lub odrzucić to zaproszenie, można skorzystać z następującego linku:\n\$url ";
+$labels['eventupdatesubject'] = '"$title" zostało zaktualizowane';
+$labels['eventupdatesubjectempty'] = 'Zdarzenie które cię dotyczy zostało zaktualizowane';
+$labels['eventupdatemailbody'] = "*\$title*\n\nKiedy: \$date\n\nZaproszeni: \$attendees\n\nW załączeniu plik w formacie iCalendar zawierający zaktualizowane szczegóły zdarzenia, które możesz zaimportować do swojej aplikacji kalendarza.";
+$labels['eventcancelsubject'] = '"$title" zostało anulowane';
+$labels['eventcancelmailbody'] = "*\$title*\n\nKiedy: \$date\n\nZaproszeni: \$attendees\n\nZdarzenie zostało anulowane przez \$organizer.\n\nW załączeniu plik w formacie iCalendar ze zaktualizowanymi szczegółami zdarzenia.";
+
+// invitation handling
+$labels['itipmailbodyaccepted'] = "\$sender zaakceptował zaproszenie do następującego zdarzenia:\n\n*\$title*\n\nKiedy: \$date\n\nZaproszeni: \$attendees";
+$labels['itipmailbodytentative'] = "\$sender warunkowo zaakceptował zaproszenie do następującego zdarzenia:\n\n*\$title*\n\nKiedy: \$date\n\nZaproszeni: \$attendees";
+$labels['itipmailbodydeclined'] = "\$sender odrzucił zaproszenie na następujące zdarzenie:\n\n*\$title*\n\nKiedy: \$date\n\nZaproszeni: \$attendees";
+$labels['itipdeclineevent'] = 'Czy chcesz odrzucić zaproszenie na to zdarzenie?';
+$labels['declinedeleteconfirm'] = 'Czy chcesz także usunąć to odrzucone zdarzenie ze swojego kalendarza?';
+$labels['notanattendee'] = 'Nie jesteś na liście uczestników tego zdarzenia';
+$labels['eventcancelled'] = 'Zdarzenie zostało anulowane';
+$labels['saveincalendar'] = 'zapisz w';
+
+// event dialog tabs
 $labels['tabsummary'] = 'Podsumowanie';
+$labels['tabrecurrence'] = 'Powtarzalność';
+$labels['tabattendees'] = 'Uczestnicy';
 $labels['tabattachments'] = 'Załączniki';
+$labels['tabsharing'] = 'Udostępnianie';
+
+// messages
+$labels['deleteventconfirm'] = 'Czy na pewno chcesz usunąć to zdarzenie?';
+$labels['deletecalendarconfirm'] = 'Czy na pewno chcesz usunąć ten kalendarz z wszystkimi zadaniami?';
+$labels['deletecalendarconfirmrecursive'] = 'Czy na pewno chcesz usunąć ten kalendarz ze wszystkimi zdarzeniami i pod-kalendarzami?';
 $labels['savingdata'] = 'Zapisuję dane...';
+$labels['errorsaving'] = 'Błąd podczas zapisu danych.';
+$labels['operationfailed'] = 'Żądana operacja nie powiodła się.';
+$labels['invalideventdates'] = 'Błędna data! Proszę sprawdzić wprowadzone dane.';
+$labels['invalidcalendarproperties'] = 'Błędna właściwość kalendarza! Proszę podać poprawną nazwę.';
+$labels['searchnoresults'] = 'Nie znaleziono zdarzeń w wybranym kalendarzu.';
+$labels['successremoval'] = 'Zdarzenie zostało usunięte.';
+$labels['successrestore'] = 'Zdarzenie zostało przywrócone.';
+$labels['errornotifying'] = 'Nie udało się wysłać powiadomień do uczestników zdarzenia';
+$labels['errorimportingevent'] = 'Nie udało się zaimportować zdarzenia';
+$labels['newerversionexists'] = 'Istnieje nowsza wersja tego zdarzenia ! Przerwano.';
+$labels['nowritecalendarfound'] = 'Nie znaleziono kalendarza aby zapisać zdarzenie.';
+$labels['importedsuccessfully'] = 'Zdarzenie dodano do \'$calendar\'';
+$labels['attendeupdateesuccess'] = 'Zaktualizowano status uczestnika.';
+$labels['itipsendsuccess'] = 'Wysłano zaproszenia do uczestników.';
+$labels['itipresponseerror'] = 'Nie udało się wysłać odpowiedzi na to zaproszenie.';
+$labels['itipinvalidrequest'] = 'To zaproszenie nie jest już aktualne.';
+$labels['sentresponseto'] = 'Wysłano odpowiedź na zaproszenie do $mailto.';
+$labels['localchangeswarning'] = 'Zamierzasz dokonać zmian, które mogą zostać wykonane tylko w twoim kalendarzu i nie zostaną wysłane do organizatora zdarzenia.';
+$labels['importsuccess'] = 'Zaimportowano $nr zdarzeń.';
+$labels['importnone'] = 'Nie znaleziono zdarzeń do zaimportowania.';
+$labels['importerror'] = 'Wystąpił błąd podczas importu.';
+$labels['aclnorights'] = 'Nie masz uprawnień administracyjnych dla tego kalendarza.';
+
+// recurrence form
+$labels['repeat'] = 'Powtórz';
+$labels['frequency'] = 'Powtórz';
+$labels['never'] = 'nigdy';
+$labels['daily'] = 'codziennie';
+$labels['weekly'] = 'cotygodniowo';
+$labels['monthly'] = 'miesięcznie';
+$labels['yearly'] = 'corocznie';
+$labels['every'] = 'Każdy';
+$labels['days'] = 'dnia';
+$labels['weeks'] = 'tygodnia';
+$labels['months'] = 'miesiąca';
+$labels['years'] = 'roku w:';
+$labels['bydays'] = 'W';
+$labels['untildate'] = 'do';
+$labels['each'] = 'Każdy';
+$labels['onevery'] = 'W każdy';
+$labels['onsamedate'] = 'W tej samej dacie';
+$labels['forever'] = 'zawsze';
+$labels['recurrencend'] = 'dopóki';
+$labels['forntimes'] = '$nr raz(y)';
+$labels['first'] = 'pierwszy';
+$labels['second'] = 'drugi';
+$labels['third'] = 'trzeci';
+$labels['fourth'] = 'czwarty';
+$labels['last'] = 'ostatni';
+$labels['dayofmonth'] = 'Dzień miesiąca';
+
+$labels['changeeventconfirm'] = 'Zmień zdarzenie';
+$labels['removeeventconfirm'] = 'Usuń zdarzenie';
+$labels['changerecurringeventwarning'] = 'To jest zdarzenie powtarzalne. Czy chcesz zmienić bieżące zdarzenie, bieżące i przyszłe, wszystkie, a może zapisać je jako nowe zdarzenie?';
+$labels['removerecurringeventwarning'] = 'To jest zdarzenie powtarzalne. Czy chcesz usunąć tylko bieżące zdarzenie, bieżące i przyszłe, a może wszystkie wystąpienia?';
+$labels['currentevent'] = 'Bieżące';
+$labels['futurevents'] = 'Przyszłe';
 $labels['allevents'] = 'Wszystkie';
+$labels['saveasnew'] = 'Zapisz jako nowe';
+
 ?>

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

@@ -1,7 +1,10 @@
 <?php
+
+$labels = array();
+
+// preferences
 $labels['default_view'] = 'Visualização padrão';
 $labels['time_format'] = 'Formato da hora';
-$labels['timeslots'] = 'Alocações de tempo por hora';
 $labels['first_day'] = 'Primeiro dia da semana';
 $labels['first_hour'] = 'Primeira hora a mostrar';
 $labels['workinghours'] = 'Horário de trabalho';
@@ -13,6 +16,8 @@
 $labels['coloringmode1'] = 'De acordo com a categoria';
 $labels['coloringmode2'] = 'Calendário para esboço, categoria para conteúdo';
 $labels['coloringmode3'] = 'Categoria para esboço, calendário para conteúdo';
+
+// calendar
 $labels['calendar'] = 'Calendário';
 $labels['calendars'] = 'Calendários';
 $labels['category'] = 'Categoria';
@@ -40,7 +45,9 @@
 $labels['all-day'] = 'dia todo';
 $labels['export'] = 'Exportar';
 $labels['exporttitle'] = 'Exportar para iCalendar';
+$labels['exportrange'] = 'Eventos de';
 $labels['location'] = 'Local';
+$labels['url'] = 'URL';
 $labels['date'] = 'Data';
 $labels['start'] = 'Início';
 $labels['end'] = 'Término';
@@ -70,6 +77,9 @@
 $labels['nmonthsback'] = '$nr meses atrás';
 $labels['showurl'] = 'Mostrar URL do calendário';
 $labels['showurldescription'] = 'Use o seguinte endereço para acessar (somente leitura) seu calendário em outras aplicações. Você pode copiar e colar este endereço em qualquer software de calendário que suporte o formato iCal.';
+$labels['caldavurldescription'] = 'Copy this address to a <a href="http://en.wikipedia.org/wiki/CalDAV" target="_blank">CalDAV</a> client application (e.g. Evolution or Mozilla Thunderbird) to fully synchronize this specific calendar with your computer or mobile device.';
+
+// agenda view
 $labels['listrange'] = 'Intervalo para exibir:';
 $labels['listsections'] = 'Dividir em:';
 $labels['smartsections'] = 'Seções inteligentes';
@@ -83,9 +93,13 @@
 $labels['weekofyear'] = 'Semana';
 $labels['pastevents'] = 'Passado';
 $labels['futureevents'] = 'Futuro';
-$labels['showalarms'] = 'Mostrar alarmes';
+
+// alarm/reminder settings
+$labels['showalarms'] = 'Show reminders';
 $labels['defaultalarmtype'] = 'Configuração de lembrete padrão';
 $labels['defaultalarmoffset'] = 'Horário padrão de lembrete';
+
+// attendees
 $labels['attendee'] = 'Participante';
 $labels['role'] = 'Papel';
 $labels['availability'] = 'Disp.';
@@ -94,6 +108,11 @@
 $labels['roleorganizer'] = 'Organizador';
 $labels['rolerequired'] = 'Obrigatório';
 $labels['roleoptional'] = 'Opcional';
+$labels['rolechair'] = 'Chair';
+$labels['rolenonparticipant'] = 'Absent';
+$labels['cutypeindividual'] = 'Individual';
+$labels['cutypegroup'] = 'Grupo';
+$labels['cutyperesource'] = 'Recurso';
 $labels['availfree'] = 'Disponível';
 $labels['availbusy'] = 'Ocupado';
 $labels['availunknown'] = 'Desconhecido';
@@ -116,35 +135,24 @@
 $labels['eventupdatemailbody'] = "*\$title*\n\nQuando: \$date\n\nConvidados: \$attendees\n\nSegue em anexo um arquivo iCalendar com os detalhes atualizados do evento na qual você pode importar para sua aplicação de calendário.";
 $labels['eventcancelsubject'] = '"$title" foi cancelado';
 $labels['eventcancelmailbody'] = "*\$title*\n\nQuando: \$date\n\nConvidados: \$attendees\n\nO evento foi cancelado por \$organizer.\n\nSegue em anexo um arquivo iCalendar com os detalhes atualizados do evento.";
-$labels['itipinvitation'] = 'Convite para';
-$labels['itipupdate'] = 'Atualização de';
-$labels['itipcancellation'] = 'Cancelado:';
-$labels['itipreply'] = 'Responder para';
-$labels['itipaccepted'] = 'Aceitar';
-$labels['itiptentative'] = 'Talvez';
-$labels['itipdeclined'] = 'Rejeitar';
-$labels['itipsubjectaccepted'] = '"$title" foi aceito por $name';
-$labels['itipsubjecttentative'] = '"$title" foi aceito como tentativa por $name';
-$labels['itipsubjectdeclined'] = '"$title" foi recusado por $name';
+
+// invitation handling
 $labels['itipmailbodyaccepted'] = "\$sender aceitou o convite para o seguinte evento:\n\n*\$title*\n\nQuando: \$date\n\nConvidados: \$attendees";
 $labels['itipmailbodytentative'] = "\$sender aceitou como tentativa o convite para o seguinte evento:\n\n*\$title*\n\nQuando: \$date\n\nConvidados: \$attendees";
 $labels['itipmailbodydeclined'] = "\$sender recusou o convite para o seguinte evento:\n\n*\$title*\n\nQuando: \$date\n\nConvidados: \$attendees";
 $labels['itipdeclineevent'] = 'Você deseja recusar o convite para este evento?';
-$labels['importtocalendar'] = 'Salvar em meu calendário';
-$labels['removefromcalendar'] = 'Remover do meu calendário';
-$labels['updateattendeestatus'] = 'Atualizar o estado dos participantes';
-$labels['acceptinvitation'] = 'Você aceita este convite?';
-$labels['youhaveaccepted'] = 'Você aceitou este convite';
-$labels['youhavetentative'] = 'Você aceitou como tentativa este convite';
-$labels['youhavedeclined'] = 'Você recusou este convite';
 $labels['notanattendee'] = 'Você não está listado como um participante deste evento';
 $labels['eventcancelled'] = 'O evento foi cancelado';
 $labels['saveincalendar'] = 'salvar em';
+
+// event dialog tabs
 $labels['tabsummary'] = 'Sumário';
 $labels['tabrecurrence'] = 'Repetição';
 $labels['tabattendees'] = 'Participantes';
 $labels['tabattachments'] = 'Anexos';
 $labels['tabsharing'] = 'Compartilhamento';
+
+// messages
 $labels['deleteventconfirm'] = 'Você realmente deseja remover este evento?';
 $labels['deletecalendarconfirm'] = 'Você realmente deseja excluir este calendário com todos os seus eventos?';
 $labels['savingdata'] = 'Salvando dados...';
@@ -169,6 +177,8 @@
 $labels['importnone'] = 'Não há eventos a serem importados';
 $labels['importerror'] = 'Ocorreu um erro na importação';
 $labels['aclnorights'] = 'Você não tem permissão de administrador neste calendário.';
+
+// recurrence form
 $labels['repeat'] = 'Repetir';
 $labels['frequency'] = 'Repetir';
 $labels['never'] = 'nunca';
@@ -195,6 +205,7 @@
 $labels['fourth'] = 'quarta';
 $labels['last'] = 'última';
 $labels['dayofmonth'] = 'Dia do mês';
+
 $labels['changeeventconfirm'] = 'Trocar evento';
 $labels['removeeventconfirm'] = 'Remover evento';
 $labels['changerecurringeventwarning'] = 'Este é um evento com repetição. Você gostaria de editar o evento atual somente, estas e todas as futuras ocorrências ou salvar este como um novo evento?';
@@ -203,4 +214,5 @@
 $labels['futurevents'] = 'Futuro';
 $labels['allevents'] = 'Todos';
 $labels['saveasnew'] = 'Salvar como novo';
+
 ?>

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

@@ -1,7 +1,11 @@
 <?php
+
+$labels = array();
+
+// preferences
 $labels['default_view'] = 'Вид по умолчанию';
 $labels['time_format'] = 'Формат времени';
-$labels['timeslots'] = 'Промежутков в часу';
+$labels['timeslots'] = 'Промежутков в час';
 $labels['first_day'] = 'Первый день недели';
 $labels['first_hour'] = 'Показывать начиная с';
 $labels['workinghours'] = 'Рабочие часы';
@@ -13,6 +17,8 @@
 $labels['coloringmode1'] = 'Согласно цвета категории';
 $labels['coloringmode2'] = 'Цвет календаря для рамки, цвет категории для фона';
 $labels['coloringmode3'] = 'Цвет категории для рамки, цвет календаря для фона';
+
+// calendar
 $labels['calendar'] = 'Календарь';
 $labels['calendars'] = 'Календари';
 $labels['category'] = 'Категория';
@@ -40,7 +46,11 @@
 $labels['all-day'] = 'весь день';
 $labels['export'] = 'Экспорт';
 $labels['exporttitle'] = 'Экспорт в iCalendar';
+$labels['exportrange'] = 'События начиная с';
+$labels['exportattachments'] = 'С вложениями';
+$labels['customdate'] = 'Специальная дата';
 $labels['location'] = 'Место';
+$labels['url'] = 'URL';
 $labels['date'] = 'Дата';
 $labels['start'] = 'Начало';
 $labels['end'] = 'Конец';
@@ -70,6 +80,9 @@
 $labels['nmonthsback'] = '$nr месяца(ев) назад';
 $labels['showurl'] = 'Показать URL календаря';
 $labels['showurldescription'] = 'Используйте следующий адрес для просмотра Вашего календаря из других приложений. Вы можете скопировать и вставить это в любое приложение которое поддерживает формат iCal.';
+$labels['caldavurldescription'] = 'Скопируйте этот адрес в клиент, <a href="http://en.wikipedia.org/wiki/CalDAV" target="_blank">поддерживающий CalDAV</a> (например, Evolution или Mozilla Thunderbird) для полной синхронизации данного календаря со своим компьютером или мобильным устройством.';
+
+// agenda view
 $labels['listrange'] = 'Диапазон:';
 $labels['listsections'] = 'Разделить на:';
 $labels['smartsections'] = 'Умные секции';
@@ -83,9 +96,13 @@
 $labels['weekofyear'] = 'Неделя';
 $labels['pastevents'] = 'Прошедшее';
 $labels['futureevents'] = 'Будущее';
+
+// alarm/reminder settings
 $labels['showalarms'] = 'Показывать напоминания';
 $labels['defaultalarmtype'] = 'Настройки напоминания по умолчанию';
 $labels['defaultalarmoffset'] = 'Время напоминания по умолчанию';
+
+// attendees
 $labels['attendee'] = 'Участник';
 $labels['role'] = 'Роль';
 $labels['availability'] = 'Доступность';
@@ -94,6 +111,12 @@
 $labels['roleorganizer'] = 'Организатор';
 $labels['rolerequired'] = 'Обязательный';
 $labels['roleoptional'] = 'Необязательный';
+$labels['rolechair'] = 'Место';
+$labels['rolenonparticipant'] = 'Absent';
+$labels['cutypeindividual'] = 'Индивидуум';
+$labels['cutypegroup'] = 'Группа';
+$labels['cutyperesource'] = 'Ресурс';
+$labels['cutyperoom'] = 'Комната';
 $labels['availfree'] = 'Свободен';
 $labels['availbusy'] = 'Занят';
 $labels['availunknown'] = 'Неизвестно';
@@ -116,37 +139,28 @@
 $labels['eventupdatemailbody'] = "*\$title*\n\nКогда: \$date\n\nПриглашенные: \$attendees\n\nВо вложении вы найдёте файл iCalendar со всеми изменениями в событии, который Вы можете импортировать в Вашу программу-ежедневник.";
 $labels['eventcancelsubject'] = '"$title" было отменено';
 $labels['eventcancelmailbody'] = "*\$title*\n\nКогда: \$date\n\nПриглашенные: \$attendees\n\nЭто событие отменено \$organizer.\n\nВо вложении вы найдёте файл iCalendar со всеми изменениями в событии.";
-$labels['itipinvitation'] = 'Приглашение на';
-$labels['itipupdate'] = 'Обновление';
-$labels['itipcancellation'] = 'Отменённый:';
-$labels['itipreply'] = 'Ответить';
-$labels['itipaccepted'] = 'Принять';
-$labels['itiptentative'] = 'Может быть';
-$labels['itipdeclined'] = 'Отклонить';
-$labels['itipsubjectaccepted'] = '"$title" принято $name';
-$labels['itipsubjecttentative'] = '"$title" предварительно принято $name';
-$labels['itipsubjectdeclined'] = '"$title" отклонено $name';
+
+// invitation handling
 $labels['itipmailbodyaccepted'] = "\$sender принял(а) приглашение на следующее событие:\n\n*\$title*\n\nКогда: \$date\n\nПриглашенные: \$attendees";
 $labels['itipmailbodytentative'] = "\$sender предварительно принял(а) приглашение на следующее событие:\n\n*\$title*\n\nКогда: \$date\n\nПриглашенные: \$attendees";
 $labels['itipmailbodydeclined'] = "\$sender отклонил(а) приглашение на следующее событие:\n\n*\$title*\n\nКогда: \$date\n\nПриглашенные: \$attendees";
 $labels['itipdeclineevent'] = 'Вы хотите отклонить приглашение на это событие?';
-$labels['importtocalendar'] = 'Сохранить в мой календарь';
-$labels['removefromcalendar'] = 'Удалить из моего календаря';
-$labels['updateattendeestatus'] = 'Обновить статус участника';
-$labels['acceptinvitation'] = 'Вы принимаете это приглашение?';
-$labels['youhaveaccepted'] = 'Вы приняли это приглашение';
-$labels['youhavetentative'] = 'Вы предварительно приняли это приглашение';
-$labels['youhavedeclined'] = 'Вы отклонили это приглашение';
+$labels['declinedeleteconfirm'] = 'Хотите ли вы так же удалить это отклонённое событие из вашего календаря?';
 $labels['notanattendee'] = 'Вы не в списке участников этого события';
 $labels['eventcancelled'] = 'Это событие отменено';
 $labels['saveincalendar'] = 'сохранить в';
+
+// event dialog tabs
 $labels['tabsummary'] = 'Сводка';
 $labels['tabrecurrence'] = 'Повторение';
 $labels['tabattendees'] = 'Участники';
 $labels['tabattachments'] = 'Вложения';
 $labels['tabsharing'] = 'Совместное использование';
+
+// messages
 $labels['deleteventconfirm'] = 'Вы действительно хотите удалить это событие?';
 $labels['deletecalendarconfirm'] = 'Вы действительно хотите удалить этот календарь со всеми его событиями?';
+$labels['deletecalendarconfirmrecursive'] = 'Вы действительно хотите удалить этот календарь со всеми его событиями и вложенными календарями?';
 $labels['savingdata'] = 'Сохранение данных...';
 $labels['errorsaving'] = 'Ошибка сохранения изменений.';
 $labels['operationfailed'] = 'Не удалось выполнить запрошенную операцию.';
@@ -165,10 +179,13 @@
 $labels['itipresponseerror'] = 'Не удалось послать ответ на это приглашение';
 $labels['itipinvalidrequest'] = 'Это приглашение больше не действительно';
 $labels['sentresponseto'] = 'Успешно отправлен ответ на приглашение на $mailto';
+$labels['localchangeswarning'] = 'Вы собираетесь внести изменения, которые отразятся только на Вашем личном календаре и не будут отправлены организатору события.';
 $labels['importsuccess'] = 'Успешно импортировано $nr событий';
 $labels['importnone'] = 'Не найдено событий для импорта';
 $labels['importerror'] = 'Ошибка при импорте';
 $labels['aclnorights'] = 'Вы не имеете прав администратора для этого календаря.';
+
+// recurrence form
 $labels['repeat'] = 'Повторить';
 $labels['frequency'] = 'Повторить';
 $labels['never'] = 'никогда';
@@ -176,6 +193,7 @@
 $labels['weekly'] = 'еженедельно';
 $labels['monthly'] = 'ежемесячно';
 $labels['yearly'] = 'ежегодно';
+$labels['rdate'] = 'on dates';
 $labels['every'] = 'Каждый(ую)';
 $labels['days'] = 'день';
 $labels['weeks'] = 'неделю';
@@ -195,6 +213,8 @@
 $labels['fourth'] = 'четвертый(ую)';
 $labels['last'] = 'последний(ую)';
 $labels['dayofmonth'] = 'День месяца';
+$labels['addrdate'] = 'Add repeat date';
+
 $labels['changeeventconfirm'] = 'Изменить событие';
 $labels['removeeventconfirm'] = 'Удалить событие';
 $labels['changerecurringeventwarning'] = 'Это - повторяющееся событие. Хотели бы Вы редактировать только текущее событие, это и все будущие повторения, все события или сохранять его как новое событие?';
@@ -203,4 +223,13 @@
 $labels['futurevents'] = 'Будущие';
 $labels['allevents'] = 'Все';
 $labels['saveasnew'] = 'Сохранить как новое';
+
+// birthdays calendar
+$labels['birthdays'] = 'Дни рождения';
+$labels['birthdayscalendar'] = 'Календарь Дней Рождения';
+$labels['displaybirthdayscalendar'] = 'Показывать календарь Дней Рождения';
+$labels['birthdayscalendarsources'] = 'Из этих адресных книг';
+$labels['birthdayeventtitle'] = 'День рождения $name';
+$labels['birthdayage'] = 'Возраст $age';
+
 ?>

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

@@ -16,7 +16,7 @@
 #main {
 	position: absolute;
 	clear: both;
-	top: 90px;
+	top: 72px;
 	left: 0;
 	right: 0;
 	bottom: 10px;
@@ -24,13 +24,15 @@
 
 #calendarsidebar {
 	position: absolute;
-	top: 37px;
+	top: 0px;
 	left: 10px;
 	bottom: 0;
 	width: 230px;
 }
 
 #datepicker {
+	position: relative;
+	top: 42px;
 	width: 100%;
 }
 
@@ -62,7 +64,7 @@
 	position: absolute;
 	left: 244px;
 	width: 8px;
-	top: 37px;
+	top: 4px;
 	bottom: 0;
 	background: url(images/toggle.gif) 0 48% no-repeat transparent;
 	cursor: pointer;
@@ -78,7 +80,7 @@
 
 #calendar {
 	position: absolute;
-	top: 0;
+	top: 4px;
 	left: 256px;
 	right: 10px;
 	bottom: 0;
@@ -94,7 +96,7 @@
 
 #calendars {
 	position: absolute;
-	top: 220px;
+	top: 228px;
 	left: 0;
 	bottom: 0;
 	right: 0;
@@ -207,8 +209,8 @@
 
 #calendartoolbar {
 	position: absolute;
-	top: 45px;
-	left: 256px;
+	top: 0px;
+	left: 0px;
 	height: 35px;
 }
 
@@ -269,7 +271,8 @@
 	background-position: -128px -32px;
 }
 
-#quicksearchbar {
+.calendarmain #quicksearchbar {
+	top: 82px;
 	right: 4px;
 }
 
@@ -409,6 +412,10 @@
 	background-position: right -60px;
 }
 
+.event-attendees span.delegated {
+	background-position: right -180px;
+}
+
 .event-attendees span.organizer {
 	background-position: right -80px;
 }
@@ -537,6 +544,28 @@
 	margin-left: 7.5em;
 }
 
+#edit-recurrence-rdates {
+	display: block;
+	list-style: none;
+	margin: 0 0 0.8em 0;
+	padding: 0;
+	max-height: 300px;
+	overflow: auto;
+}
+
+#edit-recurrence-rdates li {
+	display: block;
+	position: relative;
+	width: 14em;
+	padding: 1px;
+}
+
+#edit-recurrence-rdates li a.delete {
+	position: absolute;
+	top: 1px;
+	right: 0;
+}
+
 #eventedit .recurrence-form {
 	display: none;
 }
@@ -595,7 +624,7 @@
 	border: 1px solid #C2D071;
 }
 
-#edit-attendees-table {
+.edit-attendees-table {
 	width: 100%;
 	display: table;
 	table-layout: fixed;
@@ -603,49 +632,51 @@
 	border: 1px solid #ccc;
 }
 
-#edit-attendees-table td {
+.edit-attendees-table td {
 	padding: 3px;
 	border-bottom: 1px solid #ccc;
 }
 
-#edit-attendees-table td.role {
+.edit-attendees-table td.role {
 	width: 8em;
 }
 
-#edit-attendees-table td.availability,
-#edit-attendees-table td.confirmstate {
+.edit-attendees-table td.availability,
+.edit-attendees-table td.confirmstate {
 	width: 4em;
 }
 
-#edit-attendees-table td.options {
+.edit-attendees-table td.options {
 	width: 3em;
 	text-align: right;
 	padding-right: 4px;
 }
 
-#edit-attendees-table td.name {
+.edit-attendees-table td.name {
 	width: auto;
 	white-space: nowrap;
 	overflow: hidden;
 	text-overflow: ellipsis;
 }
 
-#edit-attendees-table thead td {
+.edit-attendees-table thead td {
 	background: url(images/listheader.gif) top left repeat-x #CCC;
 }
 
-#edit-attendees-form {
+#edit-attendees-form,
+#edit-resources-form {
 	position: relative;
 	margin-top: 1em;
 }
 
-#edit-attendees-form #edit-attendee-schedule {
+#edit-attendees-form #edit-attendee-schedule,
+#edit-resources-form #edit-resource-find {
 	position: absolute;
 	top: 0;
 	right: 0;
 }
 
-#edit-attendees-table select.edit-attendee-role {
+.edit-attendees-table select.edit-attendee-role {
 	border: 0;
 	padding: 2px;
 	background: white;
@@ -718,33 +749,37 @@
 	vertical-align: middle;
 }
 
-#edit-attendees-table tbody td.confirmstate {
+.edit-attendees-table tbody td.confirmstate {
 	overflow: hidden;
 	white-space: nowrap;
 	text-indent: -2000%;
 }
 
-#edit-attendees-table td.confirmstate span {
+.edit-attendees-table td.confirmstate span {
 	display: block;
 	width: 20px;
 	background: url(images/attendee-status.gif) 5px 0 no-repeat;
 }
 
-#edit-attendees-table td.confirmstate span.needs-action {
+.edit-attendees-table td.confirmstate span.needs-action {
 }
 
-#edit-attendees-table td.confirmstate span.accepted {
+.edit-attendees-table td.confirmstate span.accepted {
 	background-position: 5px -20px;
 }
 
-#edit-attendees-table td.confirmstate span.declined {
+.edit-attendees-table td.confirmstate span.declined {
 	background-position: 5px -40px;
 }
 
-#edit-attendees-table td.confirmstate span.tentative {
+.edit-attendees-table td.confirmstate span.tentative {
 	background-position: 5px -60px;
 }
 
+.edit-attendees-table td.confirmstate span.delegated {
+	background-position: 5px -180px;
+}
+
 #attendees-freebusy-table {
 	width: 100%;
 	table-layout: fixed;
@@ -806,10 +841,14 @@
 	background-position: 2px -117px;
 }
 
-.attendees-list .chair {
+.attendees-list .non-participant {
 	background-position: 2px -137px;
 }
 
+.attendees-list .chair {
+	background-position: 2px -157px;
+}
+
 .attendees-list .loading {
 	background: url(images/loading_blue.gif) 1px 50% no-repeat;
 }
@@ -1055,12 +1094,159 @@
   padding-right: 10px;
 }
 
+#resource-dialog-right {
+	position: absolute;
+	top: 10px;
+	left: 300px;
+	right: 8px;
+	bottom: 10px;
+}
+
+#resource-info,
+#resource-availability {
+	position: absolute;
+	top: 0;
+	left: 0;
+	right: 0;
+	height: 48%;
+	border: 1px solid #999;
+	background-color: #F9F9F9;
+	overflow: auto;
+}
+
+#resource-availability {
+	top: auto;
+	bottom: 0;
+	height: 49%;
+	overflow: hidden;
+}
+
+#resource-info .boxtitle,
+#resource-availability .boxtitle {
+	margin-top: 0;
+}
+
+#resource-freebusy-calendar {
+	position: absolute;
+	top: 20px;
+	left: -1px;
+	right: -1px;
+	bottom: -1px;
+}
+
+#resource-freebusy-calendar .fc-content {
+	top: 0;
+}
+
+#resource-freebusy-calendar .fc-content .fc-event-bg {
+	background: 0;
+}
+
+#resource-freebusy-calendar .fc-event.status-busy,
+#resource-freebusy-calendar .status-busy .fc-event-skin {
+	border-color: #e26569;
+	background-color: #e26569;
+}
+
+#resource-freebusy-calendar .fc-event.status-tentative,
+#resource-freebusy-calendar .status-tentative .fc-event-skin {
+	border-color: #8383fc;
+	background: #8383fc;
+}
+
+#resource-freebusy-calendar .fc-event.status-outofoffice,
+#resource-freebusy-calendar .status-outofoffice .fc-event-skin {
+	border-color: #fbaa68;
+	background: #fbaa68;
+}
+
+#resources-list div.treetoggle {
+	left: 3px !important;
+	top: -2px;
+}
+
+#resources-list li ul div.treetoggle {
+	left: 23px !important;
+}
+
+#resource-selection {
+  position: absolute;
+	top: 10px;
+	bottom: 10px;
+	left: 8px;
+	width: 280px;
+	border: 1px solid #999999;
+	background-color: #F9F9F9;
+	overflow: hidden;
+}
+
+#resource-selection .boxlistcontent {
+	top: 25px;
+	border-top: 1px solid #eee;
+}
+
+#resourcequicksearch {
+	position: absolute;
+	top: 3px;
+	left: 7px;
+	right: 4px;
+	height: 17px;
+	background: #fff;
+	border: 1px solid #888;
+	border-radius: 10px;
+	-webkit-box-shadow: inset 1px 1px 1px 0px rgba(0, 0, 0, 0.3);
+	-moz-box-shadow: inset 1px 1px 1px 0px rgba(0, 0, 0, 0.3);
+	box-shadow: inset 1px 1px 1px 0px rgba(0, 0, 0, 0.3);
+}
+
+#resourcesearchbox {
+	position: absolute;
+	top: 1px;
+	left: 24px;
+	width: 140px;
+	height: 15px;
+	font-size: 11px;
+	padding: 0px;
+	border: none;
+	outline: none;
+	background: #fff;
+}
+
+#resourcesearchreset {
+	position: absolute;
+	top: 2px;
+	right: 2px;
+	text-decoration: none;
+}
+
+#resource-details,
+#resource-details-owner {
+	margin: 8px;
+}
+
+#resource-details td.title,
+#resource-details-owner td.title {
+	color: #666;
+	padding-right: 10px;
+	min-width: 10em;
+}
+
+#resource-details-owner thead td {
+	color: #333;
+	font-size: 13px;
+	font-weight: bold;
+}
 
 /* fullcalendar style overrides */
 
+#calendar .fc-header-right {
+	padding-right: 200px;
+	padding-top: 4px;
+}
+
 .rcube-fc-content {
 	position: absolute !important;
-	top: 37px;
+	top: 38px;
 	left: 0;
 	right: 0;
 	bottom: 0;
@@ -1139,7 +1325,7 @@
 
 .fc-view-list div.fc-list-header,
 .fc-view-table td.fc-list-header,
-#edit-attendees-table thead td {
+.edit-attendees-table thead td {
 	padding: 3px;
 	background: #dddddd;
 	background-image: -moz-linear-gradient(center top, #f4f4f4, #d2d2d2);
@@ -1193,7 +1379,8 @@
 
 /* Invitation UI in mail */
 
-#messagemenu li a.calendarlink {
+#messagemenu li a.calendarlink,
+#attachmentmenu li a.calendarlink {
 	background-image: url(images/calendars.png);
 	background-position: 7px -109px;
 	background-repeat: no-repeat;
@@ -1218,8 +1405,7 @@
 }
 
 #event-rsvp .rsvp-buttons,
-div.calendar-invitebox .rsvp-status,
-div.calendar-invitebox .rsvp-buttons {
+div.calendar-invitebox .itip-buttons div {
 	margin-top: 0.5em;
 }
 
@@ -1230,7 +1416,7 @@
 	margin-right: 0.5em;
 }
 
-div.calendar-invitebox .calendar-select {
+div.calendar-invitebox .folder-select {
 	font-size: 11px;
 	margin-left: 1em;
 }
@@ -1243,6 +1429,7 @@
 
 div.calendar-invitebox .rsvp-status.declined,
 div.calendar-invitebox .rsvp-status.tentative,
+div.calendar-invitebox .rsvp-status.delegated,
 div.calendar-invitebox .rsvp-status.accepted {
 	padding: 0 0 1px 22px;
 	background: url(images/attendee-status.gif) 2px -20px no-repeat;
@@ -1256,6 +1443,10 @@
 	background-position: 2px -60px;
 }
 
+div.calendar-invitebox .rsvp-status.delegated {
+	background-position: 2px -180px;
+}
+
 /* iTIP attend reply page */
 
 .calendaritipattend .centerbox {

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

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

@@ -13,6 +13,14 @@
 
 <div id="main">
   <div id="calendarsidebar">
+    <div id="calendartoolbar">
+      <roundcube:button command="addevent" type="link" class="buttonPas addevent" classAct="button addevent" classSel="button addeventSel" title="calendar.new_event" content=" " />
+      <roundcube:button command="print" type="link" class="buttonPas print" classAct="button print" classSel="button printSel" title="calendar.print" content=" " />
+      <roundcube:button command="events-import" type="link" class="buttonPas import" classAct="button import" classSel="button importSel" title="calendar.importevents" content=" " />
+      <roundcube:button command="export" type="link" class="buttonPas export" classAct="button export" classSel="button exportSel" title="calendar.export" content=" " />
+      <roundcube:container name="toolbar" id="calendartoolbar" />
+    </div>
+
     <div id="datepicker"></div>
     <div id="calendars" style="visibility:hidden">
       <div class="boxtitle"><roundcube:label name="calendar.calendars" /></div>
@@ -96,6 +104,32 @@
 
 <roundcube:include file="/templates/eventedit.html" />
 
+<div id="eventresourcesdialog" class="uidialog">
+  <div id="resource-dialog-left">
+    <div id="resource-selection" class="">
+      <div id="resourcequicksearch">
+        <roundcube:object name="plugin.resources_searchform" id="resourcesearchbox" />
+        <roundcube:button command="reset-resource-search" id="resourcesearchreset" image="/images/icons/reset.gif" title="resetsearch" width="13" height="13" />
+      </div>
+      <div class="boxlistcontent">
+        <roundcube:object name="plugin.resources_list" id="resources-list" class="treelist" />
+      </div>
+    </div>
+  </div>
+
+  <div id="resource-dialog-right">
+    <div id="resource-info">
+      <h2 class="boxtitle"><roundcube:label name="calendar.resourcedetails" /></h2>
+      <roundcube:object name="plugin.resource_info" id="resource-details" />
+    </div>
+
+    <div id="resource-availability">
+      <h2 class="boxtitle"><roundcube:label name="calendar.resourceavailability" /></h2>
+      <roundcube:object name="plugin.resource_calendar" id="resource-freebusy-calendar" />
+    </div>
+  </div>
+</div>
+
 <div id="eventfreebusy" class="uidialog">
   <roundcube:object name="plugin.attendees_freebusy_table" id="attendees-freebusy-table" cellspacing="0" cellpadding="0" border="0" />
   
@@ -134,6 +168,7 @@
     <span class="attendee organizer"><roundcube:label name="calendar.roleorganizer" /></span>
     <span class="attendee req-participant"><roundcube:label name="calendar.rolerequired" /></span>
     <span class="attendee opt-participant"><roundcube:label name="calendar.roleoptional" /></span>
+    <span class="attendee non-participant"><roundcube:label name="calendar.rolenonparticipant" /></span>
     <span class="attendee chair"><roundcube:label name="calendar.rolechair" /></span>
   </div>
 </div>
@@ -159,14 +194,6 @@
   </div>
 </div>
 
-<div id="calendartoolbar">
-  <roundcube:button command="addevent" type="link" class="buttonPas addevent" classAct="button addevent" classSel="button addeventSel" title="calendar.new_event" content=" " />
-  <roundcube:button command="print" type="link" class="buttonPas print" classAct="button print" classSel="button printSel" title="calendar.print" content=" " />
-  <roundcube:button command="events-import" type="link" class="buttonPas import" classAct="button import" classSel="button importSel" title="calendar.importevents" content=" " />
-  <roundcube:button command="export" type="link" class="buttonPas export" classAct="button export" classSel="button exportSel" title="calendar.export" content=" " />
-  <roundcube:container name="toolbar" id="calendartoolbar" />
-</div>
-
 <div id="quicksearchbar">
 <roundcube:button name="searchmenulink" id="searchmenulink" image="/images/icons/glass.png" />
 <roundcube:object name="plugin.searchform" id="quicksearchbox" />

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

@@ -1,13 +1,14 @@
 <div id="eventedit" class="uidialog">
   <form id="eventtabs" action="#" method="post" enctype="multipart/form-data">
     <ul>
-      <li><a href="#event-tab-1"><roundcube:label name="calendar.tabsummary" /></a></li>
-      <li id="edit-tab-recurrence"><a href="#event-tab-2"><roundcube:label name="calendar.tabrecurrence" /></a></li>
-      <li id="edit-tab-attendees"><a href="#event-tab-3"><roundcube:label name="calendar.tabattendees" /></a></li>
-      <li id="edit-tab-attachments"><a href="#event-tab-4"><roundcube:label name="calendar.tabattachments" /></a></li>
+      <li><a href="#event-panel-1"><roundcube:label name="calendar.tabsummary" /></a></li>
+      <li id="edit-tab-recurrence"><a href="#event-panel-recurrence"><roundcube:label name="calendar.tabrecurrence" /></a></li>
+      <li id="edit-tab-attendees"><a href="#event-panel-attendees"><roundcube:label name="calendar.tabattendees" /></a></li>
+      <li id="edit-tab-resources"><a href="#event-panel-resources"><roundcube:label name="calendar.tabresources" /></a></li>
+      <li id="edit-tab-attachments"><a href="#event-panel-attachments"><roundcube:label name="calendar.tabattachments" /></a></li>
     </ul>
     
-    <div id="event-tab-1">
+    <div id="event-panel-1">
       <div class="event-section">
         <label for="edit-title"><roundcube:label name="calendar.title" /></label>
         <br />
@@ -65,7 +66,7 @@
       </div>
     </div>
     
-    <div id="event-tab-2">
+    <div id="event-panel-recurrence">
       <div class="event-section border-after">
         <roundcube:object name="plugin.recurrence_form" part="frequency" />
       </div>
@@ -84,15 +85,24 @@
       <div class="recurrence-form" id="recurrence-form-until">
         <roundcube:object name="plugin.recurrence_form" part="until" class="event-section" />
       </div>
+      <div class="recurrence-form" id="recurrence-form-rdate">
+        <roundcube:object name="plugin.recurrence_form" part="rdate" class="event-section" />
+      </div>
     </div>
     
-    <div id="event-tab-3">
-      <roundcube:object name="plugin.attendees_list" id="edit-attendees-table" cellspacing="0" cellpadding="0" border="0" />
+    <div id="event-panel-attendees">
+      <roundcube:object name="plugin.attendees_list" id="edit-attendees-table" class="edit-attendees-table" cellspacing="0" cellpadding="0" border="0" />
       <roundcube:object name="plugin.attendees_form" id="edit-attendees-form" />
       <roundcube:include file="/templates/freebusylegend.html" />
     </div>
+    
+    <div id="event-panel-resources">
+      <roundcube:object name="plugin.attendees_list" id="edit-resources-table" class="edit-attendees-table" cellspacing="0" cellpadding="0" border="0" coltitle="resource" />
+      <roundcube:object name="plugin.resources_form" id="edit-resources-form" />
+      <roundcube:include file="/templates/freebusylegend.html" />
+    </div>
     
-    <div id="event-tab-4">
+    <div id="event-panel-attachments">
       <div id="edit-attachments" class="attachments-list">
         <roundcube:object name="plugin.attachments_list" id="attachmentlist" deleteIcon="/images/icons/delete.png" cancelIcon="/images/icons/delete.png" loadingIcon="/images/display/loading_blue.gif" />
       </div>

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

@@ -18,6 +18,22 @@
 	left: 0;
 }
 
+/* overrides for tablets and mobile phones */
+@media screen and (max-device-width: 1024px){
+	body.calendarmain {
+		overflow: visible;
+	}
+
+	body.calendarmain #mainscreen {
+		min-width: 1000px !important;
+		min-height: 520px !important;
+	}
+
+	body.calendarmain #header {
+		min-width: 1020px !important;
+	}
+}
+
 body.attachmentwin #mainscreen {
 	top: 60px;
 }
@@ -386,7 +402,7 @@
 	display: block;
 	color: #333;
 	font-weight: bold;
-	padding: 8px 4px 3px 30px;
+	padding: 4px 4px 3px 30px;
 	text-shadow: 0px 1px 1px #fff;
 	text-decoration: none;
 	white-space: nowrap;
@@ -441,7 +457,7 @@
 .event-attendees span.attendee {
 	padding-right: 18px;
 	margin-right: 0.5em;
-	background: url(images/attendee-status.gif) right 0 no-repeat;
+	background: url(images/attendee-status.png) right 0 no-repeat;
 }
 
 .event-attendees span.attendee a.mailtolink {
@@ -466,6 +482,10 @@
 	background-position: right -60px;
 }
 
+.event-attendees span.delegated {
+	background-position: right -180px;
+}
+
 .event-attendees span.organizer {
 	background-position: right -80px;
 }
@@ -480,7 +500,7 @@
 .calendarmain .fc-view-table td.fc-list-header,
 #attendees-freebusy-table h3.boxtitle,
 #schedule-freebusy-times thead th,
-#edit-attendees-table thead td
+.edit-attendees-table thead td
  {
 	color: #69939e;
 	font-size: 11px;
@@ -602,6 +622,31 @@
 	display: none;
 }
 
+#edit-recurrence-rdates {
+	display: block;
+	list-style: none;
+	margin: 0 0 0.8em 0;
+	padding: 0;
+	max-height: 300px;
+	overflow: auto;
+}
+
+#edit-recurrence-rdates li {
+	display: block;
+	position: relative;
+	width: 12em;
+	padding: 4px 0 4px 0;
+}
+
+#edit-recurrence-rdates li a.delete {
+	position: absolute;
+	top: 2px;
+	right: 0;
+	width: 20px;
+	height: 18px;
+	background-position: -7px -337px;
+}
+
 #eventedit .formtable td {
 	padding: 0.2em 0;
 }
@@ -654,34 +699,34 @@
 	padding: 0.5em;
 }
 
-#edit-attendees-table {
+.edit-attendees-table {
 	width: 100%;
 	margin-top: 0.5em;
 }
 
-#edit-attendees-table td.role {
+.edit-attendees-table td.role {
 	width: 9em;
 }
 
-#edit-attendees-table td.availability,
-#edit-attendees-table td.confirmstate {
+.edit-attendees-table td.availability,
+.edit-attendees-table td.confirmstate {
 	width: 4em;
 }
 
-#edit-attendees-table td.options {
+.edit-attendees-table td.options {
 	width: 3em;
 	text-align: right;
 	padding-right: 4px;
 }
 
-#edit-attendees-table td.name {
+.edit-attendees-table td.name {
 	width: auto;
 	white-space: nowrap;
 	overflow: hidden;
 	text-overflow: ellipsis;
 }
 
-#edit-attendees-table a.deletelink {
+.edit-attendees-table a.deletelink {
 	display: block;
 	width: 17px;
 	height: 17px;
@@ -690,18 +735,20 @@
 	text-indent: 1000px;
 }
 
-#edit-attendees-form {
+#edit-attendees-form,
+#edit-resources-form {
 	position: relative;
 	margin-top: 1em;
 }
 
-#edit-attendees-form #edit-attendee-schedule {
+#edit-attendees-form #edit-attendee-schedule,
+#edit-resources-form #edit-resource-find {
 	position: absolute;
 	top: 0;
 	right: 0;
 }
 
-#edit-attendees-table select.edit-attendee-role {
+.edit-attendees-table select.edit-attendee-role {
 	border: 0;
 	padding: 2px;
 	background: white;
@@ -774,33 +821,37 @@
 	vertical-align: middle;
 }
 
-#edit-attendees-table tbody td.confirmstate {
+.edit-attendees-table tbody td.confirmstate {
 	overflow: hidden;
 	white-space: nowrap;
 	text-indent: -2000%;
 }
 
-#edit-attendees-table td.confirmstate span {
+.edit-attendees-table td.confirmstate span {
 	display: block;
 	width: 20px;
-	background: url(images/attendee-status.gif) 5px 0 no-repeat;
+	background: url(images/attendee-status.png) 5px 0 no-repeat;
 }
 
-#edit-attendees-table td.confirmstate span.needs-action {
+.edit-attendees-table td.confirmstate span.needs-action {
 }
 
-#edit-attendees-table td.confirmstate span.accepted {
+.edit-attendees-table td.confirmstate span.accepted {
 	background-position: 5px -20px;
 }
 
-#edit-attendees-table td.confirmstate span.declined {
+.edit-attendees-table td.confirmstate span.declined {
 	background-position: 5px -40px;
 }
 
-#edit-attendees-table td.confirmstate span.tentative {
+.edit-attendees-table td.confirmstate span.tentative {
 	background-position: 5px -60px;
 }
 
+.edit-attendees-table td.confirmstate span.delegated {
+	background-position: 5px -180px;
+}
+
 #attendees-freebusy-table {
 	width: 100%;
 	table-layout: fixed;
@@ -830,7 +881,7 @@
 
 .attendees-list .attendee {
 	padding: 4px 4px 4px 1px;
-	background: url(images/attendee-status.gif) 2px -97px no-repeat;
+	background: url(images/attendee-status.png) 2px -97px no-repeat;
 	white-space: nowrap;
 }
 
@@ -858,10 +909,14 @@
 	background-position: 2px -117px;
 }
 
-.attendees-list .chair {
+.attendees-list .non-participant {
 	background-position: 2px -137px;
 }
 
+.attendees-list .chair {
+	background-position: 2px -157px;
+}
+
 .attendees-list .loading {
 	background: url(images/loading_blue.gif) 1px 50% no-repeat;
 }
@@ -1027,13 +1082,129 @@
 	padding-right: 10px;
 }
 
-.propform fieldset.tab {
+#calendar-kolabform fieldset.tab {
 	background: #efefef;
 	display: block;
 	margin-top: 0.5em;
 	padding: 0.5em 1em;
 }
 
+#resource-selection {
+	position: absolute;
+	top: 0;
+	left: 8px;
+	right: 0;
+	bottom: 0;
+}
+
+#resource-selection .scroller {
+	top: 34px;
+}
+
+#resource-dialog-left {
+	position: absolute;
+	top: 10px;
+	left: 0;
+	width: 380px;
+	bottom: 10px;
+}
+
+#resource-dialog-right {
+	position: absolute;
+	top: 10px;
+	left: 392px;
+	right: 8px;
+	bottom: 10px;
+}
+
+#resource-info {
+	position: absolute;
+	top: 0;
+	left: 0;
+	right: 0;
+	height: 48%;
+}
+
+#resource-info table {
+	margin: 8px;
+	width: 97%;
+}
+
+#resource-info thead td {
+	background: none;
+	font-weight: bold;
+	font-size: 14px;
+}
+
+#resource-availability {
+	position: absolute;
+	bottom: 0;
+	left: 0;
+	right: 0;
+	height: 49%;
+}
+
+#resource-freebusy-calendar {
+	position: absolute;
+	top: 33px;
+	left: -1px;
+	right: -1px;
+	bottom: -1px;
+}
+
+#resource-freebusy-calendar .fc-content {
+	top: 0;
+}
+
+#resource-freebusy-calendar .fc-content .fc-event-bg {
+	background: 0;
+}
+
+#resource-freebusy-calendar .fc-event.status-busy,
+#resource-freebusy-calendar .status-busy .fc-event-skin {
+	border-color: #e26569;
+	background-color: #e26569;
+}
+
+#resource-freebusy-calendar .fc-event.status-tentative,
+#resource-freebusy-calendar .status-tentative .fc-event-skin {
+	border-color: #8383fc;
+	background: #8383fc;
+}
+
+#resource-freebusy-calendar .fc-event.status-outofoffice,
+#resource-freebusy-calendar .status-outofoffice .fc-event-skin {
+	border-color: #fbaa68;
+	background: #fbaa68;
+}
+
+#resourcequicksearch {
+	padding: 4px;
+	background: #c7e3ef;
+}
+
+#resourcesearchbox {
+	width: 100%;
+	height: 26px;
+	-moz-box-sizing: border-box;
+	     box-sizing: border-box;
+}
+
+#resourcequicksearch .iconbutton.searchoptions {
+	position: absolute;
+	top: 5px;
+	left: 6px;
+	width: 16px;
+}
+
+.searchbox .iconbutton.reset {
+	position: absolute;
+	top: 4px;
+	right: 1px;
+}
+
+
+
 /* fullcalendar style overrides */
 
 .rcube-fc-content {
@@ -1380,7 +1551,8 @@
 
 /* Invitation UI in mail */
 
-#messagemenu li a.calendarlink span.calendar {
+#messagemenu li a.calendarlink span.calendar,
+#attachmentmenu li a.calendarlink span.calendar {
 	background-position: 0px -2197px;
 }
 
@@ -1403,8 +1575,7 @@
 }
 
 #event-rsvp .rsvp-buttons,
-div.calendar-invitebox .rsvp-status,
-div.calendar-invitebox .rsvp-buttons {
+div.calendar-invitebox .itip-buttons div {
 	margin-top: 0.5em;
 }
 
@@ -1414,22 +1585,33 @@
 	margin-right: 0.5em;
 }
 
-div.calendar-invitebox .calendar-select {
+div.calendar-invitebox .folder-select {
 	font-weight: 10px;
 	margin-left: 1em;
 }
 
+div.calendar-invitebox .rsvp-status {
+	padding-left: 2px;
+}
+
 div.calendar-invitebox .rsvp-status.loading {
 	color: #666;
 	padding: 1px 0 2px 24px;
 	background: url(images/loading_blue.gif) top left no-repeat;
 }
 
+div.calendar-invitebox .rsvp-status.hint {
+	color: #666;
+	text-shadow: none;
+	font-style: italic;
+}
+
 div.calendar-invitebox .rsvp-status.declined,
 div.calendar-invitebox .rsvp-status.tentative,
-div.calendar-invitebox .rsvp-status.accepted {
+div.calendar-invitebox .rsvp-status.accepted,
+div.calendar-invitebox .rsvp-status.delegated  {
 	padding: 0 0 1px 22px;
-	background: url(images/attendee-status.gif) 2px -20px no-repeat;
+	background: url(images/attendee-status.png) 2px -20px no-repeat;
 }
 
 div.calendar-invitebox .rsvp-status.declined {
@@ -1440,10 +1622,15 @@
 	background-position: 2px -60px;
 }
 
+div.calendar-invitebox .rsvp-status.delegated {
+	background-position: 2px -180px;
+}
+
 /* iTIP attend reply page */
 
 .calendaritipattend .centerbox {
 	width: 40em;
+	min-height: 7em;
 	margin: 80px auto 0 auto;
 	padding: 10px 10px 10px 90px;
 	background: url(images/invitation.png) 10px 10px no-repeat #fff;

roundcubemail-plugins-kolab-3.2.tar.gz/plugins/calendar/skins/larry/images/attendee-status.gif Deleted

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

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

@@ -5,7 +5,7 @@
 <roundcube:include file="/includes/links.html" />
 
 </head>
-<body class="calendarmain noscroll">
+<body class="calendarmain">
 
 <roundcube:include file="/includes/header.html" />
 
@@ -113,6 +113,41 @@
 
 <roundcube:include file="/templates/eventedit.html" />
 
+<div id="eventresourcesdialog" class="uidialog">
+	<div id="resource-dialog-left">
+		<div id="resource-selection" class="uibox listbox">
+			<div id="resourcequicksearch">
+				<div class="searchbox">
+					<roundcube:object name="plugin.resources_searchform" id="resourcesearchbox" />
+					<a id="resourcesearchmenulink" class="iconbutton searchoptions"> </a>
+					<roundcube:button command="reset-resource-search" id="resourcesearchreset" class="iconbutton reset" title="resetsearch" content=" " />
+				</div>
+			</div>
+			<div class="scroller">
+				<roundcube:object name="plugin.resources_list" id="resources-list" class="listing treelist" />
+			</div>
+		</div>
+	</div>
+
+	<div id="resource-dialog-right">
+		<div id="resource-info" class="uibox contentbox">
+			<h2 class="boxtitle"><roundcube:label name="calendar.resourcedetails" /></h2>
+			<div class="scroller">
+				<roundcube:object name="plugin.resource_info" id="resource-details" class="propform" />
+			</div>
+		</div>
+
+		<div id="resource-availability" class="uibox contentbox">
+			<h2 class="boxtitle"><roundcube:label name="calendar.resourceavailability" /></h2>
+			<roundcube:object name="plugin.resource_calendar" id="resource-freebusy-calendar" />
+			<div class="boxpagenav">
+				<roundcube:button name="resource-cal-prev" id="resource-calendar-prev" type="link" class="icon prevpage" title="calendar.prevslot" content="&amp;lt;" />
+				<roundcube:button name="resource-cal-next" id="resource-calendar-next" type="link" class="icon nextpage" title="calendar.nextslot" content="&amp;gt;" />
+			</div>
+		</div>
+	</div>
+</div>
+
 <div id="eventfreebusy" class="uidialog">
 	<roundcube:object name="plugin.attendees_freebusy_table" id="attendees-freebusy-table" cellpadding="0" />
 
@@ -151,6 +186,7 @@
 		<span class="attendee organizer"><roundcube:label name="calendar.roleorganizer" /></span>
 		<span class="attendee req-participant"><roundcube:label name="calendar.rolerequired" /></span>
 		<span class="attendee opt-participant"><roundcube:label name="calendar.roleoptional" /></span>
+		<span class="attendee non-participant"><roundcube:label name="calendar.rolenonparticipant" /></span>
 		<span class="attendee chair"><roundcube:label name="calendar.rolechair" /></span>
 	</div>
 </div>
@@ -205,6 +241,9 @@
 	})
 	.data('offset', $('#calendarsidebartoggle').position().left)
 	.data('sidebarwidth', $('#calendarsidebar').width() + $('#calendarsidebar').position().left);
+
+	new rcube_splitter({ id:'calresourceviewsplitter', p1:'#resource-dialog-left', p2:'#resource-dialog-right',
+		orientation:'v', relative:true, start:380, min:220, size:10, offset:-3 }).init();
 });
 
 </script>

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

@@ -1,10 +1,10 @@
 <div id="eventedit" class="uidialog uidialog-tabbed">
 	<form id="eventtabs" action="#" method="post" enctype="multipart/form-data">
 		<ul>
-			<li><a href="#event-tab-1"><roundcube:label name="calendar.tabsummary" /></a></li><li id="edit-tab-recurrence"><a href="#event-tab-2"><roundcube:label name="calendar.tabrecurrence" /></a></li><li id="edit-tab-attendees"><a href="#event-tab-3"><roundcube:label name="calendar.tabattendees" /></a></li><li id="edit-tab-attachments"><a href="#event-tab-4"><roundcube:label name="calendar.tabattachments" /></a></li>
+			<li><a href="#event-panel-summary"><roundcube:label name="calendar.tabsummary" /></a></li><li id="edit-tab-recurrence"><a href="#event-panel-recurrence"><roundcube:label name="calendar.tabrecurrence" /></a></li><li id="edit-tab-attendees"><a href="#event-panel-attendees"><roundcube:label name="calendar.tabattendees" /></a></li><li id="edit-tab-resources"><a href="#event-panel-resources"><roundcube:label name="calendar.tabresources" /></a></li><li id="edit-tab-attachments"><a href="#event-panel-attachments"><roundcube:label name="calendar.tabattachments" /></a></li>
 		</ul>
 		
-		<div id="event-tab-1">
+		<div id="event-panel-summary">
 			<div class="event-section">
 				<label for="edit-title"><roundcube:label name="calendar.title" /></label>
 				<br />
@@ -62,7 +62,7 @@
 			</div>
 		</div>
 		
-		<div id="event-tab-2">
+		<div id="event-panel-recurrence">
 			<div class="event-section border-after">
 				<roundcube:object name="plugin.recurrence_form" part="frequency" />
 			</div>
@@ -81,22 +81,31 @@
 			<div class="recurrence-form" id="recurrence-form-until">
 				<roundcube:object name="plugin.recurrence_form" part="until" class="event-section" />
 			</div>
+			<div class="recurrence-form" id="recurrence-form-rdate">
+				<roundcube:object name="plugin.recurrence_form" part="rdate" class="event-section" />
+			</div>
 		</div>
 		
-		<div id="event-tab-3">
-			<roundcube:object name="plugin.attendees_list" id="edit-attendees-table" class="records-table" />
+		<div id="event-panel-attendees">
+			<roundcube:object name="plugin.attendees_list" id="edit-attendees-table" class="records-table edit-attendees-table" coltitle="attendee" />
 			<roundcube:object name="plugin.attendees_form" id="edit-attendees-form" />
 			<roundcube:include file="/templates/freebusylegend.html" />
 		</div>
+		
+		<div id="event-panel-resources">
+			<roundcube:object name="plugin.attendees_list" id="edit-resources-table" class="records-table edit-attendees-table" coltitle="resource" />
+			<roundcube:object name="plugin.resources_form" id="edit-resources-form" />
+			<roundcube:include file="/templates/freebusylegend.html" />
+		</div>
 		
-		<div id="event-tab-4">
+		<div id="event-panel-attachments">
 			<div id="edit-attachments">
 				<roundcube:object name="plugin.attachments_list" id="attachment-list" class="attachmentslist" />
 			</div>
 			<div id="edit-attachments-form">
 				<roundcube:object name="plugin.attachments_form" id="calendar-attachment-form" attachmentFieldSize="30" />
 			</div>
-			<roundcube:object name="plugin.filedroparea" id="event-tab-4" />
+			<roundcube:object name="plugin.filedroparea" id="event-panel-attachments" />
 		</div>
 	</form>

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

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

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

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

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

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

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

@@ -65,9 +65,15 @@
             $this->register_action('plugin.delegation-save',         array($this, 'controller_action'));
             $this->register_action('plugin.delegation-autocomplete', array($this, 'controller_action'));
 
+            $this->add_hook('settings_actions', array($this, 'settings_actions'));
+
             if ($this->rc->action == 'plugin.delegation' || empty($_REQUEST['_framed'])) {
-                $this->add_texts('localization/', array('tabtitle', 'deleteconfirm', 'savingdata', 'yes', 'no'));
-                $this->include_script('kolab_delegation.js');
+                $this->add_texts('localization/', array('deleteconfirm', 'savingdata', 'yes', 'no'));
+
+                if ($this->rc->action == 'plugin.delegation') {
+                    $this->include_script('kolab_delegation.js');
+                }
+
                 $this->skin_path = $this->local_skin_path();
                 $this->include_stylesheet($this->skin_path . '/style.css');
             }
@@ -79,6 +85,21 @@
     }
 
     /**
+     * Adds Delegation section in Settings
+     */
+    function settings_actions($args)
+    {
+        $args['actions'][] = array(
+            'action' => 'plugin.delegation',
+            'class'  => 'delegation',
+            'label'  => 'tabtitle',
+            'domain' => 'kolab_delegation',
+        );
+
+        return $args;
+    }
+
+    /**
      * Engine object getter
      */
     private function engine()

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

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

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

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

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

@@ -331,16 +331,7 @@
             return $args;
         }
 
-        // Load configuration
-        $this->load_config();
-
-        // Check that configuration is not disabled
-        $dont_override  = (array) $this->rc->config->get('dont_override', array());
-
-        // special handling for 'default_folders'
-        if (in_array('default_folders', $dont_override)) {
-            return $args;
-        }
+        $dont_override = (array) $this->rc->config->get('dont_override', array());
 
         // map config option name to kolab folder type annotation
         $opts = array(
@@ -354,7 +345,7 @@
         foreach ($opts as $opt_name => $type) {
             $new = $args['prefs'][$opt_name];
             $old = $this->rc->config->get($opt_name);
-            if ($new === $old) {
+            if (!strlen($new) || $new === $old || in_array($opt_name, $dont_override)) {
                 unset($opts[$opt_name]);
             }
         }
@@ -371,24 +362,22 @@
 
         foreach ($opts as $opt_name => $type) {
             $foldername = $args['prefs'][$opt_name];
-            if (strlen($foldername)) {
 
-                // get all folders of specified type
-                $folders = array_intersect($folderdata, array($type));
+            // get all folders of specified type
+            $folders = array_intersect($folderdata, array($type));
 
-                // folder already annotated with specified type
-                if (!empty($folders[$foldername])) {
-                    continue;
-                }
+            // folder already annotated with specified type
+            if (!empty($folders[$foldername])) {
+                continue;
+            }
 
-                // set type to the new folder
-                $this->set_folder_type($foldername, $type);
+            // set type to the new folder
+            $this->set_folder_type($foldername, $type);
 
-                // unset old folder(s) type annotation
-                list($maintype, $subtype) = explode('.', $type);
-                foreach (array_keys($folders) as $folder) {
-                    $this->set_folder_type($folder, $maintype);
-                }
+            // unset old folder(s) type annotation
+            list($maintype, $subtype) = explode('.', $type);
+            foreach (array_keys($folders) as $folder) {
+                $this->set_folder_type($folder, $maintype);
             }
         }

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

@@ -0,0 +1,540 @@
+<?php
+
+/**
+ * iTIP functions for the calendar-based Roudncube plugins
+ *
+ * Class providing functionality to manage iTIP invitations
+ *
+ * @author Thomas Bruederli <bruederli@kolabsys.com>
+ *
+ * Copyright (C) 2011-2014, Kolab Systems AG <contact@kolabsys.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+class libcalendaring_itip
+{
+    protected $rc;
+    protected $lib;
+    protected $plugin;
+    protected $sender;
+    protected $domain;
+    protected $itip_send = false;
+
+    function __construct($plugin, $domain = 'libcalendaring')
+    {
+        $this->plugin = $plugin;
+        $this->rc = rcube::get_instance();
+        $this->lib = libcalendaring::get_instance();
+        $this->domain = $domain;
+
+        $hook = $this->rc->plugins->exec_hook('calendar_load_itip',
+            array('identity' => $this->rc->user->get_identity()));
+        $this->sender = $hook['identity'];
+
+        $this->plugin->add_hook('message_before_send', array($this, 'before_send_hook'));
+        $this->plugin->add_hook('smtp_connect', array($this, 'smtp_connect_hook'));
+    }
+
+    public function set_sender_email($email)
+    {
+        if (!empty($email))
+            $this->sender['email'] = $email;
+    }
+
+    /**
+     * Wrapper for rcube_plugin::gettext()
+     * Checking for a label in different domains
+     *
+     * @see rcube::gettext()
+     */
+    public function gettext($p)
+    {
+        $label = is_array($p) ? $p['name'] : $p;
+        $domain = $this->domain;
+        if (!$this->rc->text_exists($label, $domain)) {
+            $domain = 'libcalendaring';
+        }
+        return $this->rc->gettext($p, $domain);
+    }
+
+    /**
+     * Send an iTip mail message
+     *
+     * @param array   Event object to send
+     * @param string  iTip method (REQUEST|REPLY|CANCEL)
+     * @param array   Hash array with recipient data (name, email)
+     * @param string  Mail subject
+     * @param string  Mail body text label
+     * @param object  Mail_mime object with message data
+     * @return boolean True on success, false on failure
+     */
+    public function send_itip_message($event, $method, $recipient, $subject, $bodytext, $message = null)
+    {
+        if (!$this->sender['name'])
+            $this->sender['name'] = $this->sender['email'];
+
+        if (!$message)
+            $message = $this->compose_itip_message($event, $method);
+
+        $mailto = rcube_idn_to_ascii($recipient['email']);
+
+        $headers = $message->headers();
+        $headers['To'] = format_email_recipient($mailto, $recipient['name']);
+        $headers['Subject'] = $this->gettext(array(
+            'name' => $subject,
+            'vars' => array(
+                'title' => $event['title'],
+                'name' => $this->sender['name']
+            )
+        ));
+
+        // compose a list of all event attendees
+        $attendees_list = array();
+        foreach ((array)$event['attendees'] as $attendee) {
+            $attendees_list[] = ($attendee['name'] && $attendee['email']) ?
+                $attendee['name'] . ' <' . $attendee['email'] . '>' :
+                ($attendee['name'] ? $attendee['name'] : $attendee['email']);
+        }
+
+        $mailbody = $this->gettext(array(
+            'name' => $bodytext,
+            'vars' => array(
+                'title' => $event['title'],
+                'date' => $this->lib->event_date_text($event, true),
+                'attendees' => join(', ', $attendees_list),
+                'sender' => $this->sender['name'],
+                'organizer' => $this->sender['name'],
+            )
+        ));
+
+        // append sender's comment
+        if (!empty($event['comment'])) {
+            $mailbody .= "\n\n" . $this->gettext('itipsendercomment') . $event['comment'];
+        }
+
+        // append links for direct invitation replies
+        if ($method == 'REQUEST' && ($token = $this->store_invitation($event, $recipient['email']))) {
+            $mailbody .= "\n\n" . $this->gettext(array(
+                'name' => 'invitationattendlinks',
+                'vars' => array('url' => $this->plugin->get_url(array('action' => 'attend', 't' => $token))),
+            ));
+        }
+        else if ($method == 'CANCEL' && $event['cancelled']) {
+            $this->cancel_itip_invitation($event);
+        }
+
+        $message->headers($headers, true);
+        $message->setTXTBody(rcube_mime::format_flowed($mailbody, 79));
+
+        // finally send the message
+        $this->itip_send = true;
+        $sent = $this->rc->deliver_message($message, $headers['X-Sender'], $mailto, $smtp_error);
+        $this->itip_send = false;
+
+        return $sent;
+    }
+
+    /**
+     * Plugin hook triggered by rcube::deliver_message() before delivering a message.
+     * Here we can set the 'smtp_server' config option to '' in order to use
+     * PHP's mail() function for unauthenticated email sending.
+     */
+    public function before_send_hook($p)
+    {
+        if ($this->itip_send && !$this->rc->user->ID && $this->rc->config->get('calendar_itip_smtp_server', null) === '') {
+            $this->rc->config->set('smtp_server', '');
+        }
+
+        return $p;
+    }
+
+    /**
+     * Plugin hook to alter SMTP authentication.
+     * This is used if iTip messages are to be sent from an unauthenticated session
+     */
+    public function smtp_connect_hook($p)
+    {
+        // replace smtp auth settings if we're not in an authenticated session
+        if ($this->itip_send && !$this->rc->user->ID) {
+            foreach (array('smtp_server', 'smtp_user', 'smtp_pass') as $prop) {
+                $p[$prop] = $this->rc->config->get("calendar_itip_$prop", $p[$prop]);
+            }
+        }
+
+      return $p;
+    }
+
+    /**
+     * Helper function to build a Mail_mime object to send an iTip message
+     *
+     * @param array   Event object to send
+     * @param string  iTip method (REQUEST|REPLY|CANCEL)
+     * @return object Mail_mime object with message data
+     */
+    public function compose_itip_message($event, $method)
+    {
+        $from = rcube_idn_to_ascii($this->sender['email']);
+        $from_utf = rcube_idn_to_utf8($from);
+        $sender = format_email_recipient($from, $this->sender['name']);
+
+        // truncate list attendees down to the recipient of the iTip Reply.
+        // constraints for a METHOD:REPLY according to RFC 5546
+        if ($method == 'REPLY') {
+            $replying_attendee = null; $reply_attendees = array();
+            foreach ($event['attendees'] as $attendee) {
+                if ($attendee['role'] == 'ORGANIZER') {
+                    $reply_attendees[] = $attendee;
+                }
+                else if (strcasecmp($attedee['email'], $from) == 0 || strcasecmp($attendee['email'], $from_utf) == 0) {
+                    $replying_attendee = $attendee;
+                }
+            }
+            if ($replying_attendee) {
+                $reply_attendees[] = $replying_attendee;
+                $event['attendees'] = $reply_attendees;
+            }
+        }
+
+        // compose multipart message using PEAR:Mail_Mime
+        $message = new Mail_mime("\r\n");
+        $message->setParam('text_encoding', 'quoted-printable');
+        $message->setParam('head_encoding', 'quoted-printable');
+        $message->setParam('head_charset', RCMAIL_CHARSET);
+        $message->setParam('text_charset', RCMAIL_CHARSET . ";\r\n format=flowed");
+        $message->setContentType('multipart/alternative');
+
+        // compose common headers array
+        $headers = array(
+            'From' => $sender,
+            'Date' => $this->rc->user_date(),
+            'Message-ID' => $this->rc->gen_message_id(),
+            'X-Sender' => $from,
+        );
+        if ($agent = $this->rc->config->get('useragent')) {
+            $headers['User-Agent'] = $agent;
+        }
+
+        $message->headers($headers);
+
+        // attach ics file for this event
+        $ical = $this->plugin->get_ical();
+        $ics = $ical->export(array($event), $method, false, $method == 'REQUEST' && $this->plugin->driver ? array($this->plugin->driver, 'get_attachment_body') : false);
+        $message->addAttachment($ics, 'text/calendar', 'event.ics', false, '8bit', '', RCMAIL_CHARSET . "; method=" . $method);
+
+        return $message;
+    }
+
+
+    /**
+     * Handler for calendar/itip-status requests
+     */
+    public function get_itip_status($event, $existing = null)
+    {
+      $action = $event['rsvp'] ? 'rsvp' : '';
+      $status = $event['fallback'];
+      $latest = false;
+      $html = '';
+
+      if (is_numeric($event['changed']))
+        $event['changed'] = new DateTime('@'.$event['changed']);
+
+      // check if the given itip object matches the last state
+      if ($existing) {
+        $latest = ($event['sequence'] && $existing['sequence'] == $event['sequence']) ||
+                  (!$event['sequence'] && $existing['changed'] && $existing['changed'] >= $event['changed']);
+      }
+
+      // determine action for REQUEST
+      if ($event['method'] == 'REQUEST') {
+        $html = html::div('rsvp-status', $this->gettext('acceptinvitation'));
+
+        if ($existing) {
+          $rsvp = $event['rsvp'];
+          $emails = $this->lib->get_user_emails();
+          foreach ($existing['attendees'] as $i => $attendee) {
+            if ($attendee['email'] && in_array(strtolower($attendee['email']), $emails)) {
+              $status = strtoupper($attendee['status']);
+              break;
+            }
+          }
+        }
+        else {
+          $rsvp = $event['rsvp'] && $this->rc->config->get('calendar_allow_itip_uninvited', true);
+        }
+
+        if ($status == 'unknown' && !$this->rc->config->get('calendar_allow_itip_uninvited', true)) {
+          $html = html::div('rsvp-status', $this->gettext('notanattendee'));
+          $action = 'import';
+        }
+        else if (in_array($status, array('ACCEPTED','TENTATIVE','DECLINED','DELEGATED'))) {
+          $html = html::div('rsvp-status ' . strtolower($status), $this->gettext('youhave'.strtolower($status)));
+
+          if ($existing && ($existing['sequence'] > $event['sequence'] || (!$event['sequence'] && $existing['changed'] && $existing['changed'] > $event['changed']))) {
+            $action = '';  // nothing to do here, outdated invitation
+          }
+          else if (!$existing && !$rsvp) {
+            $action = 'import';
+          }
+        }
+      }
+      // determine action for REPLY
+      else if ($event['method'] == 'REPLY') {
+        // check whether the sender already is an attendee
+        if ($existing) {
+          $action = $this->rc->config->get('calendar_allow_itip_uninvited', true) ? 'accept' : '';
+          $listed = false;
+          foreach ($existing['attendees'] as $attendee) {
+            if ($attendee['role'] != 'ORGANIZER' && strcasecmp($attendee['email'], $event['attendee']) == 0) {
+              if (in_array($status, array('ACCEPTED','TENTATIVE','DECLINED','DELEGATED'))) {
+                $html = html::div('rsvp-status ' . strtolower($status), $this->gettext(array(
+                    'name' => 'attendee'.strtolower($status),
+                    'vars' => array(
+                        'delegatedto' => Q($attendee['delegated-to'] ?: '?'),
+                    )
+                )));
+              }
+              $action = $attendee['status'] == $status ? '' : 'update';
+              $listed = true;
+              break;
+            }
+          }
+
+          if (!$listed) {
+            $html = html::div('rsvp-status', $this->gettext('itipnewattendee'));
+          }
+        }
+        else {
+          $html = html::div('rsvp-status hint', $this->gettext('itipobjectnotfound'));
+          $action = '';
+        }
+      }
+      else if ($event['method'] == 'CANCEL') {
+        if (!$existing) {
+          $html = html::div('rsvp-status hint', $this->gettext('itipobjectnotfound'));
+          $action = '';
+        }
+      }
+
+      return array(
+          'uid' => $event['uid'],
+          'id' => asciiwords($event['uid'], true),
+          'saved' => $existing ? true : false,
+          'latest' => $latest,
+          'status' => $status,
+          'action' => $action,
+          'html' => $html,
+      );
+    }
+
+    /**
+     * Build inline UI elements for iTip messages
+     */
+    public function mail_itip_inline_ui($event, $method, $mime_id, $task, $message_date = null)
+    {
+        $buttons = array();
+        $dom_id = asciiwords($event['uid'], true);
+        $rsvp_status = 'unknown';
+
+        // pass some metadata about the event and trigger the asynchronous status check
+        $changed = is_object($event['changed']) ? $event['changed'] : $message_date;
+        $metadata = array(
+            'uid'      => $event['uid'],
+            'changed'  => $changed ? $changed->format('U') : 0,
+            'sequence' => intval($event['sequence']),
+            'method'   => $method,
+            'task'     => $task,
+        );
+
+        // create buttons to be activated from async request checking existence of this event in local calendars
+        $buttons[] = html::div(array('id' => 'loading-'.$dom_id, 'class' => 'rsvp-status loading'), $this->gettext('loading'));
+
+        // on iTip REPLY we have two options:
+        if ($method == 'REPLY') {
+            $title = $this->gettext('itipreply');
+
+            foreach ($event['attendees'] as $attendee) {
+                if (!empty($attendee['email']) && $attendee['role'] != 'ORGANIZER') {
+                    $metadata['attendee'] = $attendee['email'];
+                    $rsvp_status = strtoupper($attendee['status']);
+                    break;
+                }
+            }
+
+            // 1. update the attendee status on our copy
+            $update_button = html::tag('input', array(
+                'type' => 'button',
+                'class' => 'button',
+                'onclick' => "rcube_libcalendaring.add_from_itip_mail('" . JQ($mime_id) . "', '$task')",
+                'value' => $this->gettext('updateattendeestatus'),
+            ));
+
+            // 2. accept or decline a new or delegate attendee
+            $accept_buttons = html::tag('input', array(
+                'type' => 'button',
+                'class' => "button accept",
+                'onclick' => "rcube_libcalendaring.add_from_itip_mail('" . JQ($mime_id) . "', '$task')",
+                'value' => $this->gettext('acceptattendee'),
+            ));
+            $accept_buttons .= html::tag('input', array(
+                'type' => 'button',
+                'class' => "button decline",
+                'onclick' => "rcube_libcalendaring.decline_attendee_reply('" . JQ($mime_id) . "', '$task')",
+                'value' => $this->gettext('declineattendee'),
+            ));
+
+            $buttons[] = html::div(array('id' => 'update-'.$dom_id, 'style' => 'display:none'), $update_button);
+            $buttons[] = html::div(array('id' => 'accept-'.$dom_id, 'style' => 'display:none'), $accept_buttons);
+        }
+        // when receiving iTip REQUEST messages:
+        else if ($method == 'REQUEST') {
+            $emails = $this->lib->get_user_emails();
+            $title = $event['sequence'] > 0 ? $this->gettext('itipupdate') : $this->gettext('itipinvitation');
+            $metadata['rsvp'] = true;
+
+            // 1. display RSVP buttons (if the user was invited)
+            foreach (array('accepted','tentative','declined') as $method) {
+                $rsvp_buttons .= html::tag('input', array(
+                    'type' => 'button',
+                    'class' => "button $method",
+                    'onclick' => "rcube_libcalendaring.add_from_itip_mail('" . JQ($mime_id) . "', '$task', '$method', '$dom_id')",
+                    'value' => $this->gettext('itip' . $method),
+                ));
+            }
+
+            // 2. Simply import the event without replying
+            $import_button = html::tag('input', array(
+                'type' => 'button',
+                'class' => 'button',
+                'onclick' => "rcube_libcalendaring.add_from_itip_mail('" . JQ($mime_id) . "', '$task')",
+                'value' => $this->gettext('importtocalendar'),
+            ));
+
+            // check my status
+            foreach ($event['attendees'] as $attendee) {
+                if ($attendee['email'] && in_array(strtolower($attendee['email']), $emails)) {
+                    $metadata['attendee'] = $attendee['email'];
+                    $metadata['rsvp'] = $attendee['rsvp'] || $attendee['role'] != 'NON-PARTICIPANT';
+                    $rsvp_status = !empty($attendee['status']) ? strtoupper($attendee['status']) : 'NEEDS-ACTION';
+                    break;
+                }
+            }
+
+            // add input field for reply comment
+            $rsvp_buttons .= html::a(array('href' => '#toggle', 'class' => 'reply-comment-toggle'), $this->gettext('itipeditresponse'));
+            $rsvp_buttons .= html::div('itip-reply-comment',
+                html::tag('textarea', array('id' => 'reply-comment-'.$dom_id, 'cols' => 40, 'rows' => 6, 'style' => 'display:none', 'placeholder' => $this->gettext('itipcomment')), '')
+            );
+
+            $buttons[] = html::div(array('id' => 'rsvp-'.$dom_id, 'class' => 'rsvp-buttons', 'style' => 'display:none'), $rsvp_buttons);
+        }
+        // for CANCEL messages, we can:
+        else if ($method == 'CANCEL') {
+            $title = $this->gettext('itipcancellation');
+
+            // 1. remove the event from our calendar
+            $button_remove = html::tag('input', array(
+                'type' => 'button',
+                'class' => 'button',
+                'onclick' => "rcube_libcalendaring.remove_from_itip('" . JQ($event['uid']) . "', '$task', '" . JQ($event['title']) . "')",
+                'value' => $this->gettext('removefromcalendar'),
+            ));
+
+            // 2. update our copy with status=cancelled
+            /* TODO: implement CANCELLED status in calendar UI first
+            $button_update = html::tag('input', array(
+              'type' => 'button',
+              'class' => 'button',
+              'onclick' => "rcube_libcalendaring.add_from_itip_mail('" . JQ($mime_id) . "')",
+              'value' => $this->gettext('updatemycopy'),
+            ));
+            */
+
+            $buttons[] = html::div(array('id' => 'rsvp-'.$dom_id, 'style' => 'display:none'), $button_remove . $button_update);
+
+            $rsvp_status = 'CANCELLED';
+            $metadata['rsvp'] = true;
+        }
+
+        // append generic import button
+        if ($import_button) {
+            $buttons[] = html::div(array('id' => 'import-'.$dom_id, 'style' => 'display:none'), $import_button);
+        }
+
+        // TODO: add field for COMMENT on iTip replies
+        // TODO: add option/checkbox to delete this message after update
+
+        // pass some metadata about the event and trigger the asynchronous status check
+        $metadata['fallback'] = $rsvp_status;
+        $metadata['rsvp'] = intval($metadata['rsvp']);
+
+        $this->rc->output->add_script("rcube_libcalendaring.fetch_itip_object_status(" . json_serialize($metadata) . ")", 'docready');
+
+        // get localized texts from the right domain
+        foreach (array('savingdata','deleteobjectconfirm','declinedeleteconfirm','declineattendee','declineattendeeconfirm','cancel') as $label) {
+          $this->rc->output->command('add_label', "itip.$label", $this->gettext($label));
+        }
+
+        // show event details with buttons
+        return $this->itip_object_details_table($event, $title) .
+            html::div(array('class' => 'itip-buttons', 'id' => 'itip-buttons-' . asciiwords($metadata['uid'], true)), join('', $buttons));
+    }
+
+    /**
+     * Render event details in a table
+     */
+    function itip_object_details_table($event, $title)
+    {
+        $table = new html_table(array('cols' => 2, 'border' => 0, 'class' => 'calendar-eventdetails'));
+        $table->add('ititle', $title);
+        $table->add('title', Q($event['title']));
+        $table->add('label', $this->plugin->gettext('date'), $this->domain);
+        $table->add('date', Q($this->lib->event_date_text($event)));
+        if ($event['location']) {
+            $table->add('label', $this->plugin->gettext('location'), $this->domain);
+            $table->add('location', Q($event['location']));
+        }
+        if ($event['comment']) {
+            $table->add('label', $this->plugin->gettext('comment'), $this->domain);
+            $table->add('location', Q($event['comment']));
+        }
+
+        return $table->show();
+    }
+
+
+    /**
+     * Create iTIP invitation token for later replies via URL
+     *
+     * @param array Hash array with event properties
+     * @param string Attendee email address
+     * @return string Invitation token
+     */
+    public function store_invitation($event, $attendee)
+    {
+        // empty stub
+        return false;
+    }
+
+    /**
+     * Mark invitations for the given event as cancelled
+     *
+     * @param array Hash array with event properties
+     */
+    public function cancel_itip_invitation($event)
+    {
+        // empty stub
+        return false;
+    }
+
+}

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

@@ -1,10 +1,9 @@
 /**
  * Basic Javascript utilities for calendar-related plugins
  *
- * @version @package_version@
  * @author Thomas Bruederli <bruederli@kolabsys.com>
  *
- * Copyright (C) 2012, Kolab Systems AG <contact@kolabsys.com>
+ * Copyright (C) 2012-2014, Kolab Systems AG <contact@kolabsys.com>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as
@@ -436,6 +435,126 @@
     };
 }
 
+//////  static methods
+
+/**
+ *
+ */
+rcube_libcalendaring.add_from_itip_mail = function(mime_id, task, status, dom_id)
+{
+    // ask user to delete the declined event from the local calendar (#1670)
+    var del = false;
+    if (rcmail.env.rsvp_saved && status == 'declined') {
+        del = confirm(rcmail.gettext('itip.declinedeleteconfirm'));
+    }
+
+    var comment = '';
+    if (dom_id) {
+      comment = $('#reply-comment-'+dom_id).val();
+    }
+
+    rcmail.http_post(task + '/mailimportitip', {
+        _uid: rcmail.env.uid,
+        _mbox: rcmail.env.mailbox,
+        _part: mime_id,
+        _folder: $('#itip-saveto').val(),
+        _status: status,
+        _del: del?1:0,
+        _comment: comment
+      }, rcmail.set_busy(true, 'itip.savingdata'));
+
+    return false;
+};
+
+/**
+ *
+ */
+rcube_libcalendaring.remove_from_itip = function(uid, task, title)
+{
+    if (confirm(rcmail.gettext('itip.deleteobjectconfirm').replace('$title', title))) {
+        rcmail.http_post(task + '/itip-remove',
+            { uid: uid },
+            rcmail.set_busy(true, 'itip.savingdata')
+        );
+    }
+};
+
+/**
+ *
+ */
+rcube_libcalendaring.decline_attendee_reply = function(mime_id, task)
+{
+    // show dialog for entering a comment and send to server
+    var html = '<div class="itip-dialog-confirm-text">' + rcmail.gettext('itip.declineattendeeconfirm') + '</div>' +
+        '<textarea id="itip-decline-comment" class="itip-comment" cols="40" rows="8"></textarea>';
+
+    var dialog, buttons = [];
+    buttons.push({
+        text: rcmail.gettext('declineattendee', 'itip'),
+        click: function() {
+            rcmail.http_post(task + '/itip-decline-reply', {
+                _uid: rcmail.env.uid,
+                _mbox: rcmail.env.mailbox,
+                _part: mime_id,
+                _comment: $('#itip-decline-comment', window.parent.document).val()
+            }, rcmail.set_busy(true, 'itip.savingdata'));
+          dialog.dialog("close");
+        }
+    });
+
+    buttons.push({
+        text: rcmail.gettext('cancel', 'itip'),
+        click: function() {
+          dialog.dialog('close');
+        }
+    });
+
+    dialog = rcmail.show_popup_dialog(html, rcmail.gettext('declineattendee', 'itip'), buttons, {
+        width: 460,
+        open: function() {
+            $(this).parent().find('.ui-button').first().addClass('mainaction');
+            $('#itip-decline-comment').focus();
+        }
+    });
+
+    return false;
+};
+
+/**
+ *
+ */
+rcube_libcalendaring.fetch_itip_object_status = function(p)
+{
+  rcmail.http_post(p.task + '/itip-status', { data: p });
+};
+
+/**
+ *
+ */
+rcube_libcalendaring.update_itip_object_status = function(p)
+{
+  rcmail.env.rsvp_saved = p.saved;
+
+  // hide all elements first
+  $('#itip-buttons-'+p.id+' > div').hide();
+  $('#rsvp-'+p.id+' .folder-select').remove();
+
+  if (p.html) {
+    // append/replace rsvp status display
+    $('#loading-'+p.id).next('.rsvp-status').remove();
+    $('#loading-'+p.id).hide().after(p.html);
+  }
+
+  // enable/disable rsvp buttons
+  if (p.action == 'rsvp') {
+    $('#rsvp-'+p.id+' input.button').prop('disabled', false)
+      .filter('.'+String(p.status||'unknown').toLowerCase()).prop('disabled', p.latest);
+  }
+ 
+  // show rsvp/import buttons (with calendar selector)
+  $('#'+p.action+'-'+p.id).show().find('input.button').last().after(p.select);
+};
+
 
 // extend jQuery
 (function($){
@@ -455,4 +574,11 @@
     var libcal = new rcube_libcalendaring(rcmail.env.libcal_settings);
     rcmail.addEventListener('plugin.display_alarms', function(alarms){ libcal.display_alarms(alarms); });
   }
+
+  rcmail.addEventListener('plugin.update_itip_object_status', rcube_libcalendaring.update_itip_object_status);
+  rcmail.addEventListener('plugin.fetch_itip_object_status', rcube_libcalendaring.fetch_itip_object_status);
+
+  $('.rsvp-buttons').on('click', 'a.reply-comment-toggle', function(e){
+    $(this).hide().parent().find('textarea').show().focus();
+  });
 });

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

@@ -113,7 +113,17 @@
         require_once($self->home . '/libvcalendar.php');
         return new libvcalendar();
     }
-    
+
+    /**
+     * Load iTip functions
+     */
+    public static function get_itip($domain = 'libcalendaring')
+    {
+        $self = self::get_instance();
+        require_once($self->home . '/lib/libcalendaring_itip.php');
+        return new libcalendaring_itip($self, $domain);
+    }
+
     /**
      * Shift dates into user's current timezone
      *
@@ -304,6 +314,27 @@
         return $html;
     }
 
+    /**
+     * Get a list of email addresses of the current user (from login and identities)
+     */
+    public function get_user_emails()
+    {
+        $emails = array();
+        $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_identities() as $identity) {
+            $emails[] = strtolower($identity['email']);
+        }
+
+        return array_unique($emails);
+    }
+
 
     /*********  Alarms handling  *********/
 
@@ -697,10 +728,10 @@
         $url = str_replace('&_preload=1', '', $_SERVER['REQUEST_URI']);
         $message = $this->rc->gettext('loadingdata');
 
-        header('Content-Type: text/html; charset=' . RCMAIL_CHARSET);
+        header('Content-Type: text/html; charset=' . RCUBE_CHARSET);
         print "<html>\n<head>\n"
             . '<meta http-equiv="refresh" content="0; url='.Q($url).'">' . "\n"
-            . '<meta http-equiv="content-type" content="text/html; charset='.RCMAIL_CHARSET.'">' . "\n"
+            . '<meta http-equiv="content-type" content="text/html; charset='.RCUBE_CHARSET.'">' . "\n"
             . "</head>\n<body>\n$message\n</body>\n</html>";
         exit;
     }
@@ -757,6 +788,7 @@
             case 'UNTIL':
                 $val = $val->format('Ymd\THis');
                 break;
+            case 'RDATE':
             case 'EXDATE':
                 foreach ((array)$val as $i => $ex)
                     $val[$i] = $ex->format('Ymd\THis');

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

@@ -43,10 +43,12 @@
     private $attach_uri = null;
     private $prodid = '-//Roundcube//Roundcube libcalendaring//Sabre//Sabre VObject//EN';
     private $type_component_map = array('event' => 'VEVENT', 'task' => 'VTODO');
-    private $attendee_keymap = array('name' => 'CN', 'status' => 'PARTSTAT', 'role' => 'ROLE', 'cutype' => 'CUTYPE', 'rsvp' => 'RSVP');
+    private $attendee_keymap = array('name' => 'CN', 'status' => 'PARTSTAT', 'role' => 'ROLE',
+        'cutype' => 'CUTYPE', 'rsvp' => 'RSVP', 'delegated-from' => 'DELEGATED-FROM', 'delegated-to' => 'DELEGATED-TO');
     private $iteratorkey = 0;
     private $charset;
     private $forward_exceptions;
+    private $vhead;
     private $fp;
 
     public $method;
@@ -100,6 +102,7 @@
      */
     public function reset()
     {
+        $this->vhead = '';
         $this->method = '';
         $this->objects = array();
         $this->freebusy = array();
@@ -126,7 +129,7 @@
         try {
             // estimate the memory usage and try to avoid fatal errors when allowed memory gets exhausted
             if ($memcheck) {
-                $count = substr_count($vcal, 'BEGIN:VEVENT');
+                $count = substr_count($vcal, 'BEGIN:VEVENT') + substr_count($vcal, 'BEGIN:VTODO');
                 $expected_memory = $count * 70*1024;  // assume ~ 70K per event (empirically determined)
 
                 if (!rcube_utils::mem_check($expected_memory)) {
@@ -201,16 +204,7 @@
             return false;
         }
 
-        // read vcalendar header (with timezone defintion)
-        $this->vhead = '';
         fseek($this->fp, 0);
-        while (($line = fgets($this->fp, 512)) !== false) {
-            if (preg_match('/BEGIN:(VEVENT|VTODO|VFREEBUSY)/i', $line))
-                break;
-            $this->vhead .= $line;
-        }
-        fseek($this->fp, -strlen($line), SEEK_CUR);
-
         return $this->_parse_next();
     }
 
@@ -268,10 +262,31 @@
     private function _next_component()
     {
         $buffer = '';
+        $vcalendar_head = false;
         while (($line = fgets($this->fp, 1024)) !== false) {
-            $buffer .= $line;
-            if (preg_match('/END:(VEVENT|VTODO|VFREEBUSY)/i', $line)) {
-                break;
+            // ignore END:VCALENDAR lines
+            if (preg_match('/END:VCALENDAR/i', $line)) {
+                continue;
+            }
+            // read vcalendar header (with timezone defintion)
+            if (preg_match('/BEGIN:VCALENDAR/i', $line)) {
+                $this->vhead = '';
+                $vcalendar_head = true;
+            }
+
+            // end of VCALENDAR header part
+            if ($vcalendar_head && preg_match('/BEGIN:(VEVENT|VTODO|VFREEBUSY)/i', $line)) {
+                $vcalendar_head = false;
+            }
+
+            if ($vcalendar_head) {
+                $this->vhead .= $line;
+            }
+            else {
+                $buffer .= $line;
+                if (preg_match('/END:(VEVENT|VTODO|VFREEBUSY)/i', $line)) {
+                    break;
+                }
             }
         }
 
@@ -353,8 +368,8 @@
     private function _to_array($ve)
     {
         $event = array(
-            'uid'     => strval($ve->UID),
-            'title'   => strval($ve->SUMMARY),
+            'uid'     => self::convert_string($ve->UID),
+            'title'   => self::convert_string($ve->SUMMARY),
             '_type'   => $ve->name == 'VTODO' ? 'task' : 'event',
             // set defaults
             'priority' => 0,
@@ -397,6 +412,8 @@
                     $event['cancelled'] = true;
                 else if ($prop->value == 'COMPLETED')
                     $event['complete'] = 100;
+                else
+                    $event['status'] = strval($prop->value);
                 break;
 
             case 'PRIORITY':
@@ -420,7 +437,11 @@
                 break;
 
             case 'EXDATE':
-                $event['recurrence']['EXDATE'] = array_merge((array)$event['recurrence']['EXDATE'], (array)self::convert_datetime($prop));
+                $event['recurrence']['EXDATE'] = array_merge((array)$event['recurrence']['EXDATE'], self::convert_datetime($prop, true));
+                break;
+
+            case 'RDATE':
+                $event['recurrence']['RDATE'] = array_merge((array)$event['recurrence']['RDATE'], self::convert_datetime($prop, true));
                 break;
 
             case 'RECURRENCE-ID':
@@ -443,14 +464,8 @@
 
             case 'LOCATION':
             case 'DESCRIPTION':
-                if ($this->is_apple()) {
-                    $event[strtolower($prop->name)] = str_replace('\,', ',', $prop->value);
-                    break;
-                }
-                // else: fall through
-
             case 'URL':
-                $event[strtolower($prop->name)] = $prop->value;
+                $event[strtolower($prop->name)] = self::convert_string($prop);
                 break;
 
             case 'CATEGORY':
@@ -505,6 +520,10 @@
                 }
                 break;
 
+            case 'COMMENT':
+                $event['comment'] = $prop->value;
+                break;
+
             default:
                 if (substr($prop->name, 0, 2) == 'X-')
                     $event['x-custom'][] = array($prop->name, strval($prop->value));
@@ -532,8 +551,12 @@
                 $event['allday'] = true;
             }
 
+            // all-day events may lack the DTEND property
+            if ($event['allday'] && empty($event['end'])) {
+                $event['end'] = clone $event['start'];
+            }
             // shift end-date by one day (except Thunderbird)
-            if ($event['allday'] && is_object($event['end'])) {
+            else if ($event['allday'] && is_object($event['end'])) {
                 $event['end']->sub(new \DateInterval('PT23H'));
             }
 
@@ -552,6 +575,7 @@
         foreach ($ve->select('VALARM') as $valarm) {
             $action = 'DISPLAY';
             $trigger = null;
+            $alarm = array();
 
             foreach ($valarm->children as $prop) {
                 switch ($prop->name) {
@@ -559,22 +583,55 @@
                     foreach ($prop->parameters as $param) {
                         if ($param->name == 'VALUE' && $param->value == 'DATE-TIME') {
                             $trigger = '@' . $prop->getDateTime()->format('U');
+                            $alarm['trigger'] = $prop->getDateTime();
                         }
                     }
                     if (!$trigger && ($values = libcalendaring::parse_alaram_value($prop->value))) {
                         $trigger = $values[2];
                     }
+
+                    if (!$alarm['trigger']) {
+                        $alarm['trigger'] = rtrim(preg_replace('/([A-Z])0[WDHMS]/', '\\1', $prop->value), 'T');
+                        // if all 0-values have been stripped, assume 'at time'
+                        if ($alarm['trigger'] == 'P')
+                            $alarm['trigger'] = 'PT0S';
+                    }
                     break;
 
                 case 'ACTION':
-                    $action = $prop->value;
+                    $action = $alarm['action'] = strtoupper($prop->value);
+                    break;
+
+                case 'SUMMARY':
+                case 'DESCRIPTION':
+                case 'DURATION':
+                    $alarm[strtolower($prop->name)] = self::convert_string($prop);
+                    break;
+
+                case 'REPEAT':
+                    $alarm['repeat'] = intval($prop->value);
+                    break;
+
+                case 'ATTENDEE':
+                    $alarm['attendees'][] = preg_replace('/^mailto:/i', '', $prop->value);
+                    break;
+
+                case 'ATTACH':
+                    $params = self::parameters_array($prop);
+                    if (strlen($prop->value) && (preg_match('/^[a-z]+:/', $prop->value) || strtoupper($params['VALUE']) == 'URI')) {
+                        // we only support URI-type of attachments here
+                        $alarm['uri'] = $prop->value;
+                    }
                     break;
                 }
             }
 
-            if ($trigger && strtoupper($action) != 'NONE') {
-                $event['alarms'] = $trigger . ':' . $action;
-                break;
+            if ($action != 'NONE') {
+                if ($trigger && !$event['alarms']) // store first alarm in legacy property
+                    $event['alarms'] = $trigger . ':' . $action;
+
+                if ($alarm['trigger'])
+                    $event['valarms'][] = $alarm;
             }
         }
 
@@ -663,12 +720,20 @@
     }
 
     /**
+     *
+     */
+    public static function convert_string($prop)
+    {
+        return str_replace('\,', ',', strval($prop->value));
+    }
+
+    /**
      * Helper method to correctly interpret an all-day date value
      */
-    public static function convert_datetime($prop)
+    public static function convert_datetime($prop, $as_array = false)
     {
         if (empty($prop)) {
-            return null;
+            return $as_array ? array() : null;
         }
         else if ($prop instanceof VObject\Property\MultiDateTime) {
             $dt = array();
@@ -684,10 +749,38 @@
                 $dt->_dateonly = true;
             }
         }
+        else if ($prop instanceof VObject\Property && ($prop['VALUE'] == 'DATE' || $prop['VALUE'] == 'DATE-TIME')) {
+            try {
+                list($type, $dt) = VObject\Property\DateTime::parseData($prop->value, $prop);
+                $dt->_dateonly = ($type & VObject\Property\DateTime::DATE);
+            }
+            catch (Exception $e) {
+                // ignore date parse errors
+            }
+        }
+        else if ($prop instanceof VObject\Property && $prop['VALUE'] == 'PERIOD') {
+            $dt = array();
+            foreach(explode(',', $prop->value) as $val) {
+                try {
+                    list($start, $end) = explode('/', $val);
+                    list($type, $item) = VObject\Property\DateTime::parseData($start, $prop);
+                    $item->_dateonly = ($type & VObject\Property\DateTime::DATE);
+                    $dt[] = $item;
+                }
+                catch (Exception $e) {
+                    // ignore single date parse errors
+                }
+            }
+        }
         else if ($prop instanceof DateTime) {
             $dt = $prop;
         }
 
+        // force return value to array if requested
+        if ($as_array && !is_array($dt)) {
+            $dt = empty($dt) ? array() : array($dt);
+        }
+
         return $dt;
     }
 
@@ -716,7 +809,7 @@
         $out = array();
         foreach ($map as $from => $to) {
             if (isset($values[$from]))
-                $out[$to] = $values[$from];
+                $out[$to] = is_array($values[$from]) ? join(',', $values[$from]) : $values[$from];
         }
         return $out;
     }
@@ -830,8 +923,13 @@
             if ($exdates = $event['recurrence']['EXDATE']) {
                 unset($event['recurrence']['EXDATE']);  // don't serialize EXDATEs into RRULE value
             }
+            if ($rdates = $event['recurrence']['RDATE']) {
+                unset($event['recurrence']['RDATE']);  // don't serialize RDATEs into RRULE value
+            }
 
-            $ve->add('RRULE', libcalendaring::to_rrule($event['recurrence']));
+            if ($event['recurrence']['FREQ']) {
+                $ve->add('RRULE', libcalendaring::to_rrule($event['recurrence']));
+            }
 
             // add EXDATEs each one per line (for Thunderbird Lightning)
             if ($exdates) {
@@ -844,6 +942,13 @@
                     }
                 }
             }
+            // add RDATEs
+            if (!empty($rdates)) {
+                $sample = self::datetime_prop('RDATE', $rdates[0]);
+                $rdprop = new VObject\Property\MultiDateTime('RDATE', null);
+                $rdprop->setDateTimes($rdates, $sample->getDateType());
+                $ve->add($rdprop);
+            }
         }
 
         if ($event['categories']) {
@@ -870,6 +975,8 @@
             $ve->add('STATUS', 'TENTATIVE');
         else if ($event['complete'] == 100)
             $ve->add('STATUS', 'COMPLETED');
+        else if (!empty($event['status']))
+            $ve->add('STATUS', $event['status']);
 
         if (!empty($event['sensitivity']))
             $ve->add('CLASS', strtoupper($event['sensitivity']));
@@ -881,7 +988,40 @@
                 $ve->add(self::datetime_prop('COMPLETED', $event['changed'] ?: new DateTime('now - 1 hour'), true));
         }
 
-        if ($event['alarms']) {
+        if ($event['valarms']) {
+            foreach ($event['valarms'] as $alarm) {
+                $va = VObject\Component::create('VALARM');
+                $va->action = $alarm['action'];
+                if ($alarm['trigger'] instanceof DateTime) {
+                    $va->add(self::datetime_prop('TRIGGER', $alarm['trigger'], true));
+                }
+                else {
+                    $va->add('TRIGGER', $alarm['trigger']);
+                }
+
+                if ($alarm['action'] == 'EMAIL') {
+                    foreach ((array)$alarm['attendees'] as $attendee) {
+                        $va->add('ATTENDEE', 'mailto:' . $attendee);
+                    }
+                }
+                if ($alarm['description']) {
+                    $va->add('DESCRIPTION', $alarm['description'] ?: $event['title']);
+                }
+                if ($alarm['summary']) {
+                    $va->add('SUMMARY', $alarm['summary']);
+                }
+                if ($alarm['duration']) {
+                    $va->add('DURATION', $alarm['duration']);
+                    $va->add('REPEAT', intval($alarm['repeat']));
+                }
+                if ($alarm['uri']) {
+                    $va->add('ATTACH', $alarm['uri'], array('VALUE' => 'URI'));
+                }
+                $ve->add($va);
+            }
+        }
+        // legacy support
+        else if ($event['alarms']) {
             $va = VObject\Component::create('VALARM');
             list($trigger, $va->action) = explode(':', $event['alarms']);
             $val = libcalendaring::parse_alaram_value($trigger);
@@ -898,7 +1038,7 @@
             }
             else if (!empty($attendee['email'])) {
                 $attendee['rsvp'] = $attendee['rsvp'] ? 'TRUE' : null;
-                $ve->add('ATTENDEE', 'mailto:' . $attendee['email'], self::map_keys($attendee, $this->attendee_keymap));
+                $ve->add('ATTENDEE', 'mailto:' . $attendee['email'], array_filter(self::map_keys($attendee, $this->attendee_keymap)));
             }
         }
 
@@ -916,6 +1056,9 @@
             $ve->add('RELATED-TO', $event['parent_id'], array('RELTYPE' => 'PARENT'));
         }
 
+        if ($event['comment'])
+            $ve->add('COMMENT', $event['comment']);
+
         // export attachments
         if (!empty($event['attachments'])) {
             foreach ((array)$event['attachments'] as $attach) {
@@ -929,7 +1072,7 @@
                     // embed attachments for iCal
                     $ve->add('ATTACH',
                         base64_encode($data),
-                        array('VALUE' => 'BINARY', 'ENCODING' => 'BASE64', 'FMTTYPE' => $attach['mimetype'], 'X-LABEL' => $attach['name']));
+                        array_filter(array('VALUE' => 'BINARY', 'ENCODING' => 'BASE64', 'FMTTYPE' => $attach['mimetype'], 'X-LABEL' => $attach['name'])));
                     unset($data);  // attempt to free memory
                 }
                 // list attachments as absolute URIs

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

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

@@ -1,4 +1,7 @@
 <?php
+
+$labels = array();
+
 $labels['alarmemail'] = 'Poslat e-mail';
 $labels['alarmdisplay'] = 'Zobrazit zprávu';
 $labels['alarmdisplayoption'] = 'Zpráva';
@@ -12,6 +15,7 @@
 $labels['trigger+H'] = 'hodin po';
 $labels['trigger+D'] = 'dnů po';
 $labels['addalarm'] = 'přidat upozornění';
+
 $labels['alarmtitle'] = 'Blížící se události';
 $labels['dismissall'] = 'Zrušit vše';
 $labels['dismiss'] = 'Zrušit';
@@ -21,4 +25,29 @@
 $labels['repeatinhrs'] = 'Zopakovat za $hrs hodin';
 $labels['repeattomorrow'] = 'Zopakovat zítra';
 $labels['repeatinweek'] = 'Zopakovat za týden';
+
 $labels['showmore'] = 'Ukázat víc...';
+
+// itip related labels
+$labels['itipinvitation'] = 'Pozvání na událost';
+$labels['itipupdate'] = 'Aktualizace události';
+$labels['itipcancellation'] = 'Zrušeno:';
+$labels['itipreply'] = 'Odpověď na';
+$labels['itipaccepted'] = 'Potvrdit';
+$labels['itiptentative'] = 'Možná';
+$labels['itipdeclined'] = 'Odmítnout';
+
+$labels['itipsubjectaccepted'] = '$name potvrdil(a) účas na události "$title"';
+$labels['itipsubjecttentative'] = '$name nezávazně potvrdil(a) účast na události "$title"';
+$labels['itipsubjectdeclined'] = '$name odmítl(a) účast na události "$title"';
+
+$labels['importtocalendar'] = 'Uložit do kalendáře';
+$labels['removefromcalendar'] = 'Odstranit z kalendáře';
+$labels['updateattendeestatus'] = 'Aktualizovat stav účastníka';
+$labels['acceptinvitation'] = 'Chcete přijmout toto pozvání (potvrdit účast)?';
+$labels['youhaveaccepted'] = 'Přijal(a) jste toto pozvání';
+$labels['youhavetentative'] = 'Nezávazně jste přijal(a) toto pozvání';
+$labels['youhavedeclined'] = 'Odmítl(a) jste toto pozvání';
+$labels['notanattendee'] = 'Nejste na seznamu účastníků této události';
+
+$labels['savingdata'] = 'Ukládám data...';
\ No newline at end of file

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

@@ -1,4 +1,7 @@
 <?php
+
+$labels = array();
+
 $labels['alarmemail'] = 'E-Mail senden';
 $labels['alarmdisplay'] = 'Nachricht anzeigen';
 $labels['alarmdisplayoption'] = 'Nachricht';
@@ -12,6 +15,7 @@
 $labels['trigger+H'] = 'Stunden danach';
 $labels['trigger+D'] = 'Tage danach';
 $labels['addalarm'] = 'Erinnerung hinzufügen';
+
 $labels['alarmtitle'] = 'Anstehende Termine';
 $labels['dismissall'] = 'Alle ignorieren';
 $labels['dismiss'] = 'Ignorieren';
@@ -21,4 +25,32 @@
 $labels['repeatinhrs'] = 'Wiederholung in $hrs Stunden';
 $labels['repeattomorrow'] = 'Wiederholung morgen';
 $labels['repeatinweek'] = 'Wiederholung in einer Woche';
+
 $labels['showmore'] = 'Mehr anzeigen...';
+
+// itip related labels
+$labels['itipinvitation'] = 'Einladung zu';
+$labels['itipupdate'] = 'Aktialisiert:';
+$labels['itipcancellation'] = 'Abgesagt:';
+$labels['itipreply'] = 'Antwort zu';
+$labels['itipaccepted'] = 'Akzeptieren';
+$labels['itiptentative'] = 'Mit Vorbehalt';
+$labels['itipdeclined'] = 'Ablehnen';
+
+$labels['itipsubjectaccepted'] = 'Einladung zu "$title" wurde von $name angenommen';
+$labels['itipsubjecttentative'] = 'Einladung zu "$title" wurde von $name mit Vorbehalt angenommen';
+$labels['itipsubjectdeclined'] = 'Einladung zu "$title" wurde von $name abgelehnt';
+
+$labels['importtocalendar'] = 'In Kalender übernehmen';
+$labels['removefromcalendar'] = 'Aus meinem Kalender löschen';
+$labels['updateattendeestatus'] = 'Teilnehmerstatus aktualisieren';
+$labels['acceptinvitation'] = 'Möchten Sie die Einladung zu diesem Termin annehmen?';
+$labels['youhaveaccepted'] = 'Sie haben die Einladung angenommen';
+$labels['youhavetentative'] = 'Sie haben die Einladung mit Vorbehalt angenommen';
+$labels['youhavedeclined'] = 'Sie haben die Einladung abgelehnt';
+$labels['notanattendee'] = 'Sie sind nicht in der Liste der Teilnehmer aufgeführt';
+
+$labels['deleteobjectconfirm'] = 'Möchten Sie dieses Objekt wirklich löschen?';
+$labels['declinedeleteconfirm'] = 'Soll das abgelehnte Objekt ebenfalls aus Ihrem Konto gelöscht werden?';
+
+$labels['savingdata'] = 'Speichere...';

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

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

@@ -28,3 +28,47 @@
 
 $labels['showmore'] = 'Show more...';
 
+// itip related labels
+$labels['itipinvitation'] = 'Invitation to';
+$labels['itipupdate'] = 'Update of';
+$labels['itipcancellation'] = 'Cancelled:';
+$labels['itipreply'] = 'Reply to';
+$labels['itipaccepted'] = 'Accept';
+$labels['itiptentative'] = 'Maybe';
+$labels['itipdeclined'] = 'Decline';
+$labels['itipcomment'] = 'Your response';
+$labels['itipeditresponse'] = 'Enter a response text';
+$labels['itipsendercomment'] = 'Sender\'s comment: ';
+
+$labels['itipobjectnotfound'] = 'The object referred by this message was not found in your account.';
+$labels['itipsubjectaccepted'] = '"$title" has been accepted by $name';
+$labels['itipsubjecttentative'] = '"$title" has been tentatively accepted by $name';
+$labels['itipsubjectdeclined'] = '"$title" has been declined by $name';
+$labels['itipsubjectcancel'] = 'Your participation in "$title" has been cancelled';
+
+$labels['itipnewattendee'] = 'This is a reply from a new participant';
+$labels['updateattendeestatus'] = 'Update the participant\'s status';
+$labels['acceptinvitation'] = 'Do you accept this invitation?';
+$labels['acceptattendee'] = 'Accept participant';
+$labels['declineattendee'] = 'Decline participant';
+$labels['declineattendeeconfirm'] = 'Enter a message to the declined participant (optional):';
+
+$labels['youhaveaccepted'] = 'You have accepted this invitation';
+$labels['youhavetentative'] = 'You have tentatively accepted this invitation';
+$labels['youhavedeclined'] = 'You have declined this invitation';
+$labels['youhavedelegated'] = 'You have delegated this invitation';
+$labels['attendeeaccepted'] = 'Participant has accepted';
+$labels['attendeetentative'] = 'Participant has tentatively accepted';
+$labels['attendeedeclined'] = 'Participant has declined';
+$labels['attendeedelegated'] = 'Participant has delegated to $delegatedto';
+$labels['notanattendee'] = 'You\'re not listed as an attendee of this object';
+
+$labels['importtocalendar'] = 'Save to my calendar';
+$labels['removefromcalendar'] = 'Remove from my calendar';
+$labels['updatemycopy'] = 'Update my copy';
+
+$labels['deleteobjectconfirm'] = 'Do you really want to delete this object?';
+$labels['declinedeleteconfirm'] = 'Do you also want to delete this declined object from your account?';
+
+$labels['savingdata'] = 'Saving data...';
+

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

@@ -1,4 +1,7 @@
 <?php
+
+$labels = array();
+
 $labels['alarmemail'] = 'Envoyer un email';
 $labels['alarmdisplay'] = 'Voir le message';
 $labels['alarmdisplayoption'] = 'Message';
@@ -12,6 +15,7 @@
 $labels['trigger+H'] = 'heures après';
 $labels['trigger+D'] = 'jours après';
 $labels['addalarm'] = 'ajouter alarme';
+
 $labels['alarmtitle'] = 'Evénements à venir';
 $labels['dismissall'] = 'Tout supprimer';
 $labels['dismiss'] = 'Abandonner';
@@ -21,4 +25,30 @@
 $labels['repeatinhrs'] = 'Répéter dans $hrs heures';
 $labels['repeattomorrow'] = 'Répéter demain';
 $labels['repeatinweek'] = 'Répéter dans une semaine';
+
 $labels['showmore'] = 'Afficher plus...';
+
+// itip related labels
+$labels['itipinvitation'] = 'Invitation à';
+$labels['itipupdate'] = 'Mise à jour de';
+$labels['itipcancellation'] = 'Annulation:';
+$labels['itipreply'] = 'Répondre à';
+$labels['itipaccepted'] = 'Accepter';
+$labels['itiptentative'] = 'Peut-être';
+$labels['itipdeclined'] = 'Refuser';
+
+$labels['itipsubjectaccepted'] = '"$title" a été accepté par $name';
+$labels['itipsubjecttentative'] = '"$title" a été accepté provisoirement par $name';
+$labels['itipsubjectdeclined'] = '"$title" a été refusé par $name';
+
+$labels['importtocalendar'] = 'Enregistrer mon agenda';
+$labels['removefromcalendar'] = 'Supprimer de mon agenda';
+$labels['updateattendeestatus'] = 'Modifier le statut des participants';
+$labels['acceptinvitation'] = 'Acceptez-vous cette invitation?';
+$labels['youhaveaccepted'] = 'Vous avez accepté cette invitation';
+$labels['youhavetentative'] = 'Vous avez accepté provisoirement cette invitation';
+$labels['youhavedeclined'] = 'Vous avez refusé cette invitation';
+$labels['notanattendee'] = 'Vous n\'êtes pas dans la liste des participants à cet évènement';
+
+$labels['savingdata'] = 'Enregistrer...';
+

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

@@ -0,0 +1,28 @@
+<?php
+
+$labels = array();
+
+// itip related labels
+$labels['itipinvitation'] = 'Invito a';
+$labels['itipupdate'] = 'Aggiornamento di';
+$labels['itipcancellation'] = 'Annullato:';
+$labels['itipreply'] = 'Rispondi a';
+$labels['itipaccepted'] = 'Accetta';
+$labels['itiptentative'] = 'Forse';
+$labels['itipdeclined'] = 'Rifiuta';
+
+$labels['itipsubjectaccepted'] = '"$title" è stato accettato da $name';
+$labels['itipsubjecttentative'] = '"$title" è stato accettato con riserva da $name';
+$labels['itipsubjectdeclined'] = '"$title" è stato rifiutato da $name';
+
+$labels['importtocalendar'] = 'Salva nel mio calendario';
+$labels['removefromcalendar'] = 'Rimuovi dal mio calendario';
+$labels['updateattendeestatus'] = 'Aggiorna lo stato dei partecipanti';
+$labels['acceptinvitation'] = 'Accetti questo invito?';
+$labels['youhaveaccepted'] = 'Hai accettato questo invito';
+$labels['youhavetentative'] = 'Hai accettato con riserva questo invito';
+$labels['youhavedeclined'] = 'Hai rifiutato questo invito';
+
+$labels['savingdata'] = 'Salvataggio dati...';
+
+?>
\ No newline at end of file

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

@@ -1,4 +1,7 @@
 <?php
+
+$labels = array();
+
 $labels['alarmemail'] = 'メール送信';
 $labels['alarmdisplay'] = 'メッセージ表示';
 $labels['alarmdisplayoption'] = 'メッセージ';
@@ -12,6 +15,7 @@
 $labels['trigger+H'] = '時間後';
 $labels['trigger+D'] = '日後';
 $labels['addalarm'] = 'アラーム追加';
+
 $labels['alarmtitle'] = '今後のイベント';
 $labels['dismissall'] = '全て削除';
 $labels['dismiss'] = '削除';
@@ -21,4 +25,29 @@
 $labels['repeatinhrs'] = '$hrs で繰返し';
 $labels['repeattomorrow'] = '明日繰返し';
 $labels['repeatinweek'] = '1週間で繰返し';
+
 $labels['showmore'] = 'さらに表示…';
+
+// itip related labels
+$labels['itipinvitation'] = '招待する';
+$labels['itipupdate'] = '更新';
+$labels['itipcancellation'] = 'キャンセル';
+$labels['itipreply'] = '返信';
+$labels['itipaccepted'] = '承諾';
+$labels['itiptentative'] = 'たぶん';
+$labels['itipdeclined'] = '辞退';
+
+$labels['itipsubjectaccepted'] = '$name が "$title" を承諾しました';
+$labels['itipsubjecttentative'] = '$name が "$title" を仮承諾しました';
+$labels['itipsubjectdeclined'] = '$name が "$title" を辞退しました';
+
+$labels['importtocalendar'] = 'カレンダーに保存';
+$labels['removefromcalendar'] = 'カレンダーから削除';
+$labels['updateattendeestatus'] = '参加者の状況更新';
+$labels['acceptinvitation'] = 'この招待を承諾しますか?';
+$labels['youhaveaccepted'] = 'この招待を承諾しました';
+$labels['youhavetentative'] = 'この招待を仮承諾しました。';
+$labels['youhavedeclined'] = 'この招待を辞退しました。';
+$labels['notanattendee'] = 'このイベントの出席者として一覧にありません';
+
+$labels['savingdata'] = 'データを保存中…';

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

@@ -1,4 +1,7 @@
 <?php
+
+$labels = array();
+
 $labels['alarmemail'] = 'Verzend E-mail';
 $labels['alarmdisplay'] = 'Bericht weergeven';
 $labels['alarmdisplayoption'] = 'Bericht';
@@ -12,11 +15,39 @@
 $labels['trigger+H'] = 'uren na';
 $labels['trigger+D'] = 'dagen na';
 $labels['addalarm'] = 'alarm toevoegen';
+
 $labels['alarmtitle'] = 'Aankomende evenementen';
+$labels['dismissall'] = 'Dismiss all';
+$labels['dismiss'] = 'Dismiss';
 $labels['snooze'] = 'Snooze';
 $labels['repeatinmin'] = 'Herhaal over $min minuten';
 $labels['repeatinhr'] = 'Herhaal over 1 uur';
 $labels['repeatinhrs'] = 'Herhaal over $hrs uur';
 $labels['repeattomorrow'] = 'Herhaal morgen';
 $labels['repeatinweek'] = 'Herhaal over een week';
+
 $labels['showmore'] = 'Toon meer...';
+
+// itip related labels
+$labels['itipinvitation'] = 'Uitnodiging voor';
+$labels['itipupdate'] = 'Update van';
+$labels['itipcancellation'] = 'Afgelast:';
+$labels['itipreply'] = 'Reply to';
+$labels['itipaccepted'] = 'Accepteer';
+$labels['itiptentative'] = 'Misschien';
+$labels['itipdeclined'] = 'Afwijzen';
+
+$labels['itipsubjectaccepted'] = '"$title" is geaccepteerd door $name';
+$labels['itipsubjecttentative'] = '"$title" has been tentatively accepted by $name';
+$labels['itipsubjectdeclined'] = '"$title" has been declined by $name';
+
+$labels['importtocalendar'] = 'Bewaar in mijn kalender';
+$labels['removefromcalendar'] = 'Verwijder van mijn kalender';
+$labels['updateattendeestatus'] = 'Update status van deelnemer';
+$labels['acceptinvitation'] = 'Accepteer je deze uitnodiging?';
+$labels['youhaveaccepted'] = 'Je hebt de uitnodiging geaccepteerd';
+$labels['youhavetentative'] = 'You have tentatively accepted this invitation';
+$labels['youhavedeclined'] = 'Je hebt deze uitnodiging afgewezen';
+$labels['notanattendee'] = 'You\'re not listed as an attendee of this event';
+
+$labels['savingdata'] = 'Data wordt opgeslagen...';

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

@@ -1,4 +1,7 @@
 <?php
+
+$labels = array();
+
 $labels['alarmemail'] = 'Wyślij e-mail';
 $labels['alarmdisplay'] = 'Pokaż wiadomość';
 $labels['alarmdisplayoption'] = 'Wiadomość';
@@ -12,6 +15,7 @@
 $labels['trigger+H'] = 'godzin(y) po';
 $labels['trigger+D'] = 'dni po';
 $labels['addalarm'] = 'dodaj alarm';
+
 $labels['alarmtitle'] = 'Nadchodzące zdarzenia';
 $labels['dismissall'] = 'Odrzuć wszystkie';
 $labels['dismiss'] = 'Odrzuć';
@@ -21,4 +25,29 @@
 $labels['repeatinhrs'] = 'Powtórz po $hrs godzinach';
 $labels['repeattomorrow'] = 'Powtórz jutro';
 $labels['repeatinweek'] = 'Powtórz za tydzień';
+
 $labels['showmore'] = 'Pokaż więcej...';
+
+// itip related labels
+$labels['itipinvitation'] = 'Zaproszenie do';
+$labels['itipupdate'] = 'Aktualizacja';
+$labels['itipcancellation'] = 'Anulowano:';
+$labels['itipreply'] = 'Odpowiedź do';
+$labels['itipaccepted'] = 'Akceptuj';
+$labels['itiptentative'] = 'Może';
+$labels['itipdeclined'] = 'Odrzuć';
+
+$labels['itipsubjectaccepted'] = '"$title" zostało zaakceptowane przez $name';
+$labels['itipsubjecttentative'] = '"$title" zostało warunkowo zaakceptowane przez $name';
+$labels['itipsubjectdeclined'] = '"$title" zostało odrzucone przez $name';
+
+$labels['importtocalendar'] = 'Zapisz w moim kalendarzu';
+$labels['removefromcalendar'] = 'Usuń z mojego kalendarza';
+$labels['updateattendeestatus'] = 'Zaktualizuj status uczestnika';
+$labels['acceptinvitation'] = 'Czy akceptujesz to zdarzenie?';
+$labels['youhaveaccepted'] = 'Zaakceptowałeś to zaproszenie';
+$labels['youhavetentative'] = 'Zaakceptowałeś to zdarzenie warunkowo';
+$labels['youhavedeclined'] = 'Odrzuciłeś to zdarzenie';
+$labels['notanattendee'] = 'Nie jesteś na liście uczestników tego zdarzenia';
+
+$labels['savingdata'] = 'Zapisuję dane...';

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

@@ -1,4 +1,7 @@
 <?php
+
+$labels = array();
+
 $labels['alarmemail'] = 'Enviar Email';
 $labels['alarmdisplay'] = 'Mostrar mensagem';
 $labels['alarmdisplayoption'] = 'Mensagem';
@@ -12,6 +15,7 @@
 $labels['trigger+H'] = 'horas depois';
 $labels['trigger+D'] = 'dias depois';
 $labels['addalarm'] = 'adicionar alarme';
+
 $labels['alarmtitle'] = 'Próximos eventos';
 $labels['dismissall'] = 'Dispensar tudo';
 $labels['dismiss'] = 'Dispensar';
@@ -21,4 +25,28 @@
 $labels['repeatinhrs'] = 'Repetir em $hrs horas';
 $labels['repeattomorrow'] = 'Repetir amanhã';
 $labels['repeatinweek'] = 'Repetir em uma semana';
+
 $labels['showmore'] = 'Mostrar mais...';
+
+// itip related labels
+$labels['itipinvitation'] = 'Convite para';
+$labels['itipupdate'] = 'Atualização de';
+$labels['itipcancellation'] = 'Cancelado:';
+$labels['itipreply'] = 'Responder para';
+$labels['itipaccepted'] = 'Aceitar';
+$labels['itiptentative'] = 'Talvez';
+$labels['itipdeclined'] = 'Rejeitar';
+
+$labels['itipsubjectaccepted'] = '"$title" foi aceito por $name';
+$labels['itipsubjecttentative'] = '"$title" foi aceito como tentativa por $name';
+$labels['itipsubjectdeclined'] = '"$title" foi recusado por $name';
+
+$labels['importtocalendar'] = 'Salvar em meu calendário';
+$labels['removefromcalendar'] = 'Remover do meu calendário';
+$labels['updateattendeestatus'] = 'Atualizar o estado dos participantes';
+$labels['acceptinvitation'] = 'Você aceita este convite?';
+$labels['youhaveaccepted'] = 'Você aceitou este convite';
+$labels['youhavetentative'] = 'Você aceitou como tentativa este convite';
+$labels['youhavedeclined'] = 'Você recusou este convite';
+
+$labels['savingdata'] = 'Salvando dados...';
\ No newline at end of file

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

@@ -1,4 +1,7 @@
 <?php
+
+$labels = array();
+
 $labels['alarmemail'] = 'Послать e-mail';
 $labels['alarmdisplay'] = 'Показать сообщение';
 $labels['alarmdisplayoption'] = 'Сообщение';
@@ -12,6 +15,7 @@
 $labels['trigger+H'] = 'часов после';
 $labels['trigger+D'] = 'дней после';
 $labels['addalarm'] = 'добавить уведомление';
+
 $labels['alarmtitle'] = 'Предстоящие события';
 $labels['dismissall'] = 'Отменить все';
 $labels['dismiss'] = 'Отменить';
@@ -21,4 +25,29 @@
 $labels['repeatinhrs'] = 'Повторить через $hrs часов';
 $labels['repeattomorrow'] = 'Повторить завтра';
 $labels['repeatinweek'] = 'Повторить через неделю';
+
 $labels['showmore'] = 'Показать больше...';
+
+// itip related labels
+$labels['itipinvitation'] = 'Приглашение на';
+$labels['itipupdate'] = 'Обновление';
+$labels['itipcancellation'] = 'Отменённый:';
+$labels['itipreply'] = 'Ответить';
+$labels['itipaccepted'] = 'Принять';
+$labels['itiptentative'] = 'Может быть';
+$labels['itipdeclined'] = 'Отклонить';
+
+$labels['itipsubjectaccepted'] = '"$title" принято $name';
+$labels['itipsubjecttentative'] = '"$title" предварительно принято $name';
+$labels['itipsubjectdeclined'] = '"$title" отклонено $name';
+
+$labels['importtocalendar'] = 'Сохранить в мой календарь';
+$labels['removefromcalendar'] = 'Удалить из моего календаря';
+$labels['updateattendeestatus'] = 'Обновить статус участника';
+$labels['acceptinvitation'] = 'Вы принимаете это приглашение?';
+$labels['youhaveaccepted'] = 'Вы приняли это приглашение';
+$labels['youhavetentative'] = 'Вы предварительно приняли это приглашение';
+$labels['youhavedeclined'] = 'Вы отклонили это приглашение';
+
+$labels['savingdata'] = 'Сохранение данных...';
+

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

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

@@ -74,6 +74,23 @@
         $this->assertEmpty($events);
     }
 
+    /**
+     * Test parsing from files with multiple VCALENDAR blocks (#2884)
+     */
+    function test_import_from_file_multiple()
+    {
+        $ical = new libvcalendar();
+        $ical->fopen(__DIR__ . '/resources/multiple-rdate.ics', 'UTF-8');
+        $events = array();
+        foreach ($ical as $event) {
+            $events[] = $event;
+        }
+
+        $this->assertEquals(2, count($events));
+        $this->assertEquals("AAAA6A8C3CCE4EE2C1257B5C00FFFFFF-Lotus_Notes_Generated", $events[0]['uid']);
+        $this->assertEquals("AAAA1C572093EC3FC125799C004AFFFF-Lotus_Notes_Generated", $events[1]['uid']);
+    }
+
     function test_invalid_dates()
     {
         $ical = new libvcalendar();
@@ -150,7 +167,7 @@
     }
 
     /**
-     * @depends test_import_from_file
+     * 
      */
     function test_alarms()
     {
@@ -164,6 +181,9 @@
         $this->assertEquals('12', $alarm[0], "Alarm value");
         $this->assertEquals('-H', $alarm[1], "Alarm unit");
 
+        $this->assertEquals('DISPLAY', $event['valarms'][0]['action'],  "Full alarm item (action)");
+        $this->assertEquals('-PT12H',   $event['valarms'][0]['trigger'], "Full alarm item (trigger)");
+
         // alarm trigger with 0 values
         $events = $ical->import_from_file(__DIR__ . '/resources/alarms.ics', 'UTF-8');
         $event = $events[0];
@@ -173,6 +193,25 @@
         $this->assertEquals('30', $alarm[0], "Alarm value");
         $this->assertEquals('-M', $alarm[1], "Alarm unit");
         $this->assertEquals('-30M', $alarm[2], "Alarm string");
+
+        $this->assertEquals('DISPLAY', $event['valarms'][0]['action'],  "First alarm action");
+        $this->assertEquals('This is the first event reminder', $event['valarms'][0]['description'],  "First alarm text");
+
+        $this->assertEquals(2, count($event['valarms']), "List all VALARM blocks");
+
+        $valarm = $event['valarms'][1];
+        $this->assertEquals(1, count($valarm['attendees']), "Email alarm attendees");
+        $this->assertEquals('EMAIL', $valarm['action'],  "Second alarm item (action)");
+        $this->assertEquals('-P1D',  $valarm['trigger'], "Second alarm item (trigger)");
+        $this->assertEquals('This is the reminder message',  $valarm['summary'], "Email alarm text");
+
+        // test alarms export
+        $ics = $ical->export(array($event));
+        $this->assertContains('ACTION:DISPLAY',   $ics, "Display alarm block");
+        $this->assertContains('ACTION:EMAIL',     $ics, "Email alarm block");
+        $this->assertContains('DESCRIPTION:This is the first event reminder',    $ics, "Alarm description");
+        $this->assertContains('SUMMARY:This is the reminder message',            $ics, "Email alarm summary");
+        $this->assertContains('ATTENDEE:mailto:reminder-recipient@example.org',  $ics, "Email alarm recipient");
     }
 
     /**
@@ -205,6 +244,37 @@
         $alarm = libcalendaring::parse_alaram_value($event['alarms']);
         $this->assertEquals('45', $alarm[0], "Alarm value");
         $this->assertEquals('-M', $alarm[1], "Alarm unit");
+
+        $this->assertEquals(1, count($event['valarms']), "Ignore invalid alarm blocks");
+        $this->assertEquals('AUDIO', $event['valarms'][0]['action'],   "Full alarm item (action)");
+        $this->assertEquals('-PT45M', $event['valarms'][0]['trigger'], "Full alarm item (trigger)");
+        $this->assertEquals('Basso',  $event['valarms'][0]['uri'],     "Full alarm item (attachment)");
+    }
+
+    /**
+     * 
+     */
+    function test_escaped_values()
+    {
+        $ical = new libvcalendar();
+        $events = $ical->import_from_file(__DIR__ . '/resources/escaped.ics', 'UTF-8');
+        $event = $events[0];
+
+        $this->assertEquals("House, Street, Zip Place", $event['location'], "Decode escaped commas in location value");
+        $this->assertEquals("Me, meets Them\nThem, meet Me", $event['description'], "Decode description value");
+    }
+
+    /**
+     * Parse RDATE properties (#2885)
+     */
+    function test_rdate()
+    {
+        $ical = new libvcalendar();
+        $events = $ical->import_from_file(__DIR__ . '/resources/multiple-rdate.ics', 'UTF-8');
+        $event = $events[0];
+
+        $this->assertEquals(9, count($event['recurrence']['RDATE']));
+        $this->assertInstanceOf('DateTime', $event['recurrence']['RDATE'][0]);
     }
 
     /**
@@ -244,6 +314,7 @@
         $this->assertInstanceOf('DateTime', $task['start'],   "'start' property is DateTime object");
         $this->assertInstanceOf('DateTime', $task['due'],     "'due' property is DateTime object");
         $this->assertEquals('-1D:DISPLAY',  $task['alarms'],  "Taks alarm value");
+        $this->assertEquals('IN-PROCESS',   $task['status'],  "Task status property");
         $this->assertEquals(1, count($task['x-custom']),      "Custom properties");
     }
 
@@ -358,7 +429,19 @@
         $this->assertContains('RECURRENCE-ID;VALUE=DATE-TIME:20131113', $ics, "Recurrence-ID (2) being the exception date");
         $this->assertContains('SUMMARY:'.$exception2['title'], $ics, "Exception title");
     }
-    
+
+    /**
+     *
+     */
+    function test_export_rdate()
+    {
+        $ical = new libvcalendar();
+        $events = $ical->import_from_file(__DIR__ . '/resources/multiple-rdate.ics', 'UTF-8');
+        $ics = $ical->export($events, null, false);
+
+        $this->assertContains('RDATE;VALUE=DATE-TIME:20140520T020000Z', $ics, "VALUE=PERIOD is translated into single DATE-TIME values");
+    }
+
     /**
      * @depends test_export
      */

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

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

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

roundcubemail-plugins-kolab-3.2.tar.gz/plugins/libcalendaring/tests/resources/multiple-rdate.ics Added

@@ -0,0 +1,80 @@
+BEGIN:VCALENDAR
+X-LOTUS-CHARSET:UTF-8
+VERSION:2.0
+PRODID:-//Lotus Development Corporation//NONSGML Notes 8.5.3//EN_C
+METHOD:PUBLISH
+BEGIN:VTIMEZONE
+TZID:W. Europe
+BEGIN:STANDARD
+DTSTART:19501029T020000
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0100
+RRULE:FREQ=YEARLY;BYMINUTE=0;BYHOUR=2;BYDAY=-1SU;BYMONTH=10
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19500326T020000
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0200
+RRULE:FREQ=YEARLY;BYMINUTE=0;BYHOUR=2;BYDAY=-1SU;BYMONTH=3
+END:DAYLIGHT
+END:VTIMEZONE
+
+BEGIN:VEVENT
+DTSTART;TZID="W. Europe":20140520T040000
+DTEND;TZID="W. Europe":20140520T200000
+TRANSP:TRANSPARENT
+RDATE;VALUE=DATE-TIME:20140520T020000Z
+RDATE;VALUE=PERIOD:20150520T020000Z/20150520T180000Z
+ ,20160520T020000Z/20160520T180000Z,20170520T020000Z/20170520T180000Z
+ ,20180520T020000Z/20180520T180000Z,20190520T020000Z/20190520T180000Z
+ ,20200520T020000Z/20200520T180000Z,20210520T020000Z/20210520T180000Z
+ ,20220520T020000Z/20220520T180000Z
+DTSTAMP:20140227T123549Z
+CLASS:PUBLIC
+SUMMARY:Feiertag - Pfingsmontag
+UID:AAAA6A8C3CCE4EE2C1257B5C00FFFFFF-Lotus_Notes_Generated
+X-LOTUS-PARITAL-REPEAT:TRUE
+X-LOTUS-NOTESVERSION:2
+X-LOTUS-APPTTYPE:1
+END:VEVENT
+
+END:VCALENDAR
+
+BEGIN:VCALENDAR
+X-LOTUS-CHARSET:UTF-8
+VERSION:2.0
+PRODID:-//Lotus Development Corporation//NONSGML Notes 8.5.3//EN_C
+METHOD:PUBLISH
+BEGIN:VTIMEZONE
+TZID:W. Europe
+BEGIN:STANDARD
+DTSTART:19501029T020000
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0100
+RRULE:FREQ=YEARLY;BYMINUTE=0;BYHOUR=2;BYDAY=-1SU;BYMONTH=10
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:19500326T020000
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0200
+RRULE:FREQ=YEARLY;BYMINUTE=0;BYHOUR=2;BYDAY=-1SU;BYMONTH=3
+END:DAYLIGHT
+END:VTIMEZONE
+
+BEGIN:VEVENT
+DTSTART;TZID="W. Europe":20120330T040000
+DTEND;TZID="W. Europe":20120330T200000
+TRANSP:TRANSPARENT
+RDATE;VALUE=PERIOD:20120330T020000Z/20120330T180000Z
+ ,20130330T030000Z/20130330T190000Z,20140330T020000Z/20140330T180000Z
+ ,20150330T020000Z/20150330T180000Z,20160330T020000Z/20160330T180000Z
+ ,20170330T020000Z/20170330T180000Z,20180330T020000Z/20180330T180000Z
+ ,20190330T030000Z/20190330T190000Z,20200330T020000Z/20200330T180000Z
+ ,20210330T020000Z/20210330T180000Z
+DTSTAMP:20140227T123547Z
+CLASS:PUBLIC
+SUMMARY:Another RDATE repeating event
+UID:AAAA1C572093EC3FC125799C004AFFFF-Lotus_Notes_Generated
+END:VEVENT
+
+END:VCALENDAR

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

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

@@ -45,7 +45,7 @@
     protected $version = '3.0';
 
     const KTYPE_PREFIX = 'application/x-vnd.kolab.';
-    const PRODUCT_ID = 'Roundcube-libkolab-0.9';
+    const PRODUCT_ID   = 'Roundcube-libkolab-0.9';
 
     /**
      * Factory method to instantiate a kolab_format object of the given type and version
@@ -208,7 +208,11 @@
      */
     public static function mime2object_type($x_kolab_type)
     {
-        return preg_replace('/dictionary.[a-z.]+$/', 'dictionary', substr($x_kolab_type, strlen(self::KTYPE_PREFIX)));
+        return preg_replace(
+            array('/dictionary.[a-z.]+$/', '/contact.distlist$/'),
+            array( 'dictionary',            'distribution-list'),
+            substr($x_kolab_type, strlen(self::KTYPE_PREFIX))
+        );
     }
 
 
@@ -242,7 +246,8 @@
                 break;
             case kolabformat::Warning:
                 $ret = false;
-                $log = "Warning";
+                $uid = is_object($this->obj) ? $this->obj->uid() : $this->data['uid'];
+                $log = "Warning @ $uid";
                 break;
             default:
                 $ret = true;
@@ -496,4 +501,61 @@
     {
         return array();
     }
+
+    protected function get_attachments(&$object)
+    {
+        // handle attachments
+        $vattach = $this->obj->attachments();
+        for ($i=0; $i < $vattach->size(); $i++) {
+            $attach = $vattach->get($i);
+
+            // skip cid: attachments which are mime message parts handled by kolab_storage_folder
+            if (substr($attach->uri(), 0, 4) != 'cid:' && $attach->label()) {
+                $name    = $attach->label();
+                $content = $attach->data();
+                $object['_attachments'][$name] = array(
+                    'name'     => $name,
+                    'mimetype' => $attach->mimetype(),
+                    'size'     => strlen($content),
+                    'content'  => $content,
+                );
+            }
+            else if (substr($attach->uri(), 0, 4) == 'http') {
+                $object['links'][] = $attach->uri();
+            }
+        }
+    }
+
+    protected function set_attachments($object)
+    {
+        // save attachments
+        $vattach = new vectorattachment;
+        foreach ((array) $object['_attachments'] as $cid => $attr) {
+            if (empty($attr))
+                continue;
+            $attach = new Attachment;
+            $attach->setLabel((string)$attr['name']);
+            $attach->setUri('cid:' . $cid, $attr['mimetype'] ?: 'application/octet-stream');
+            if ($attach->isValid()) {
+              $vattach->push($attach);
+            }
+            else {
+              rcube::raise_error(array(
+                  'code' => 660,
+                  'type' => 'php',
+                  'file' => __FILE__,
+                  'line' => __LINE__,
+                  'message' => "Invalid attributes for attachment $cid: " . var_export($attr, true),
+              ), true);
+            }
+        }
+
+        foreach ((array) $object['links'] as $link) {
+            $attach = new Attachment;
+            $attach->setUri($link, 'unknown');
+            $vattach->push($attach);
+        }
+
+        $this->obj->setAttachments($vattach);
+    }
 }

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

@@ -44,17 +44,29 @@
 
         $this->obj->setName($object['name']);
 
+        $seen = array();
         $members = new vectorcontactref;
-        foreach ((array)$object['member'] as $member) {
-            if ($member['uid'])
+        foreach ((array)$object['member'] as $i => $member) {
+            if ($member['uid']) {
+                $key = 'uid:' . $member['uid'];
                 $m = new ContactReference(ContactReference::UidReference, $member['uid']);
-            else if ($member['email'])
+            }
+            else if ($member['email']) {
+                $key = 'mailto:' . $member['email'];
                 $m = new ContactReference(ContactReference::EmailReference, $member['email']);
-            else
+                $m->setName($member['name']);
+            }
+            else {
                 continue;
-
-            $m->setName($member['name']);
-            $members->push($m);
+            }
+
+            if (!$seen[$key]++) {
+                $members->push($m);
+            }
+            else {
+                // remove dupes for caching
+                unset($object['member'][$i]);
+            }
         }
 
         $this->obj->setMembers($members);

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

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

@@ -31,6 +31,11 @@
     protected $read_func = 'readNote';
     protected $write_func = 'writeNote';
 
+    protected $sensitivity_map = array(
+        'public'       => kolabformat::ClassPublic,
+        'private'      => kolabformat::ClassPrivate,
+        'confidential' => kolabformat::ClassConfidential,
+    );
 
     /**
      * Set properties to the kolabformat object
@@ -42,7 +47,12 @@
         // set common object properties
         parent::set($object);
 
-        // TODO: set object propeties
+        $this->obj->setSummary($object['title']);
+        $this->obj->setDescription($object['description']);
+        $this->obj->setClassification($this->sensitivity_map[$object['sensitivity']]);
+        $this->obj->setCategories(self::array2vector($object['categories']));
+
+        $this->set_attachments($object);
 
         // cache this data
         $this->data = $object;
@@ -73,10 +83,35 @@
         // read common object props into local data object
         $object = parent::to_array($data);
 
-        // TODO: read object properties
+        $sensitivity_map = array_flip($this->sensitivity_map);
 
-        $this->data = $object;
-        return $this->data;
+        // read object properties
+        $object += array(
+            'sensitivity' => $sensitivity_map[$this->obj->classification()],
+            'categories'  => self::vector2array($this->obj->categories()),
+            'title'       => $this->obj->summary(),
+            'description' => $this->obj->description(),
+        );
+
+        $this->get_attachments($object);
+
+        return $this->data = $object;
+    }
+
+    /**
+     * Callback for kolab_storage_cache to get object specific tags to cache
+     *
+     * @return array List of tags to save in cache
+     */
+    public function get_tags()
+    {
+        $tags = array();
+
+        foreach ((array) $this->data['categories'] as $cat) {
+            $tags[] = rcube_utils::normalize_string($cat);
+        }
+
+        return $tags;
     }
 
 }

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

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

@@ -81,6 +81,10 @@
         'IN-PROCESS'   => kolabformat::StatusInProcess,
         'COMPLETED'    => kolabformat::StatusCompleted,
         'CANCELLED'    => kolabformat::StatusCancelled,
+        'TENTATIVE'    => kolabformat::StatusTentative,
+        'CONFIRMED'    => kolabformat::StatusConfirmed,
+        'DRAFT'        => kolabformat::StatusDraft,
+        'FINAL'        => kolabformat::StatusFinal,
     );
 
     protected $part_status_map = array(
@@ -137,6 +141,16 @@
             $attendee = $attvec->get($i);
             $cr = $attendee->contact();
             if ($cr->email() != $object['organizer']['email']) {
+                $delegators = $delegatees = array();
+                $vdelegators = $attendee->delegatedFrom();
+                for ($j=0; $j < $vdelegators->size(); $j++) {
+                    $delegators[] = $vdelegators->get($j)->email();
+                }
+                $vdelegatees = $attendee->delegatedTo();
+                for ($j=0; $j < $vdelegatees->size(); $j++) {
+                    $delegatees[] = $vdelegatees->get($j)->email();
+                }
+
                 $object['attendees'][] = array(
                     'role' => $role_map[$attendee->role()],
                     'cutype' => $cutype_map[$attendee->cutype()],
@@ -144,6 +158,8 @@
                     'rsvp' => $attendee->rsvp(),
                     'email' => $cr->email(),
                     'name' => $cr->name(),
+                    'delegated-from' => $delegators,
+                    'delegated-to' => $delegatees,
                 );
             }
         }
@@ -191,54 +207,83 @@
             }
         }
 
+        if ($rdates = $this->obj->recurrenceDates()) {
+            for ($i=0; $i < $rdates->size(); $i++) {
+                if ($rdate = self::php_datetime($rdates->get($i)))
+                    $object['recurrence']['RDATE'][] = $rdate;
+            }
+        }
+
         // read alarm
         $valarms = $this->obj->alarms();
         $alarm_types = array_flip($this->alarm_type_map);
+        $object['valarms'] = array();
         for ($i=0; $i < $valarms->size(); $i++) {
             $alarm = $valarms->get($i);
             $type = $alarm_types[$alarm->type()];
 
-            if ($type == 'DISPLAY' || $type == 'EMAIL') {  // only DISPLAY and EMAIL alarms are supported
+            if ($type == 'DISPLAY' || $type == 'EMAIL' || $type == 'AUDIO') {  // only some alarms are supported
+                $valarm = array(
+                    'action' => $type,
+                    'summary' => $alarm->summary(),
+                    'description' => $alarm->description(),
+                );
+
+                if ($type == 'EMAIL') {
+                    $valarm['attendees'] = array();
+                    $attvec = $this->obj->attendees();
+                    for ($j=0; $j < $attvec->size(); $j++) {
+                        $cr = $attvec->get($j);
+                        $valarm['attendees'][] = $cr->email();
+                    }
+                }
+                else if ($type == 'AUDIO') {
+                    $attach = $alarm->audioFile();
+                    $valarm['uri'] = $attach->uri();
+                }
+
                 if ($start = self::php_datetime($alarm->start())) {
                     $object['alarms'] = '@' . $start->format('U');
+                    $valarm['trigger'] = $start;
                 }
                 else if ($offset = $alarm->relativeStart()) {
-                    $value = $alarm->relativeTo() == kolabformat::End ? '+' : '-';
+                    $prefix = $alarm->relativeTo() == kolabformat::End ? '+' : '-';
+                    $value = $time = '';
                     if      ($w = $offset->weeks())     $value .= $w . 'W';
                     else if ($d = $offset->days())      $value .= $d . 'D';
-                    else if ($h = $offset->hours())     $value .= $h . 'H';
-                    else if ($m = $offset->minutes())   $value .= $m . 'M';
-                    else if ($s = $offset->seconds())   $value .= $s . 'S';
-                    else continue;
+                    else if ($h = $offset->hours())     $time  .= $h . 'H';
+                    else if ($m = $offset->minutes())   $time  .= $m . 'M';
+                    else if ($s = $offset->seconds())   $time  .= $s . 'S';
+
+                    // assume 'at event time'
+                    if (empty($value) && empty($time)) {
+                        $prefix = '';
+                        $time = '0S';
+                    }
 
-                    $object['alarms'] = $value;
+                    $object['alarms'] = $prefix . $value . $time;
+                    $valarm['trigger'] = $prefix . 'P' . $value . ($time ? 'T' . $time : '');
                 }
-                $object['alarms']  .= ':' . $type;
-                break;
-            }
-        }
 
-        // handle attachments
-        $vattach = $this->obj->attachments();
-        for ($i=0; $i < $vattach->size(); $i++) {
-            $attach = $vattach->get($i);
-
-            // skip cid: attachments which are mime message parts handled by kolab_storage_folder
-            if (substr($attach->uri(), 0, 4) != 'cid:' && $attach->label()) {
-                $name    = $attach->label();
-                $content = $attach->data();
-                $object['_attachments'][$name] = array(
-                    'name'     => $name,
-                    'mimetype' => $attach->mimetype(),
-                    'size'     => strlen($content),
-                    'content'  => $content,
-                );
-            }
-            else if (substr($attach->uri(), 0, 4) == 'http') {
-                $object['links'][] = $attach->uri();
+                // read alarm duration and repeat properties
+                if (($duration = $alarm->duration()) && $duration->isValid()) {
+                    $value = $time = '';
+                    if      ($w = $duration->weeks())     $value .= $w . 'W';
+                    else if ($d = $duration->days())      $value .= $d . 'D';
+                    else if ($h = $duration->hours())     $time  .= $h . 'H';
+                    else if ($m = $duration->minutes())   $time  .= $m . 'M';
+                    else if ($s = $duration->seconds())   $time  .= $s . 'S';
+                    $valarm['duration'] = 'P' . $value . ($time ? 'T' . $time : '');
+                    $valarm['repeat'] = $alarm->numrepeat();
+                }
+
+                $object['alarms']  .= ':' . $type;  // legacy property
+                $object['valarms'][] = array_filter($valarm);
             }
         }
 
+        $this->get_attachments($object);
+
         return $object;
     }
 
@@ -287,6 +332,21 @@
                 $att->setCutype($this->cutype_map[$attendee['cutype']] ? $this->cutype_map[$attendee['cutype']] : kolabformat::CutypeIndividual);
                 $att->setRSVP((bool)$attendee['rsvp']);
 
+                if (!empty($attendee['delegated-from'])) {
+                    $vdelegators = new vectorcontactref;
+                    foreach ((array)$attendee['delegated-from'] as $delegator) {
+                        $vdelegators->push(new ContactReference(ContactReference::EmailReference, $delegator));
+                    }
+                    $att->setDelegatedFrom($vdelegators);
+                }
+                if (!empty($attendee['delegated-to'])) {
+                    $vdelegatees = new vectorcontactref;
+                    foreach ((array)$attendee['delegated-to'] as $delegatee) {
+                        $vdelegatees->push(new ContactReference(ContactReference::EmailReference, $delegatee));
+                    }
+                    $att->setDelegatedTo($vdelegatees);
+                }
+
                 if ($att->isValid()) {
                     $attendees->push($att);
                 }
@@ -311,7 +371,7 @@
         $rr = new RecurrenceRule;
         $rr->setFrequency(RecurrenceRule::FreqNone);
 
-        if ($object['recurrence']) {
+        if ($object['recurrence'] && !empty($object['recurrence']['FREQ'])) {
             $rr->setFrequency($this->rrule_type_map[$object['recurrence']['FREQ']]);
 
             if ($object['recurrence']['INTERVAL'])
@@ -368,9 +428,77 @@
 
         $this->obj->setRecurrenceRule($rr);
 
+        // save recurrence dates (aka RDATE)
+        if (!empty($object['recurrence']['RDATE'])) {
+            $rdates = new vectordatetime;
+            foreach ((array)$object['recurrence']['RDATE'] as $rdate)
+                $rdates->push(self::get_datetime($rdate, null, true));
+            $this->obj->setRecurrenceDates($rdates);
+        }
+
         // save alarm
         $valarms = new vectoralarm;
-        if ($object['alarms']) {
+        if ($object['valarms']) {
+            foreach ($object['valarms'] as $valarm) {
+                if (!array_key_exists($valarm['action'], $this->alarm_type_map)) {
+                    continue;  // skip unknown alarm types
+                }
+
+                if ($valarm['action'] == 'EMAIL') {
+                    $recipients = new vectorcontactref;
+                    foreach (($valarm['attendees'] ?: array($object['_owner'])) as $email) {
+                        $recipients->push(new ContactReference(ContactReference::EmailReference, $email));
+                    }
+                    $alarm = new Alarm(
+                        strval($valarm['summary'] ?: $object['title']),
+                        strval($valarm['description'] ?: $object['description']),
+                        $recipients
+                    );
+                }
+                else if ($valarm['action'] == 'AUDIO') {
+                    $attach = new Attachment;
+                    $attach->setUri($valarm['uri'] ?: 'null', 'unknown');
+                    $alarm = new Alarm($attach);
+                }
+                else {
+                    // action == DISPLAY
+                    $alarm = new Alarm(strval($valarm['summary'] ?: $object['title']));
+                }
+
+                if (is_object($valarm['trigger']) && $valarm['trigger'] instanceof DateTime) {
+                    $alarm->setStart(self::get_datetime($valarm['trigger'], new DateTimeZone('UTC')));
+                }
+                else {
+                    try {
+                        $prefix = $valarm['trigger'][0];
+                        $period = new DateInterval(preg_replace('/[^0-9PTWDHMS]/', '', $valarm['trigger']));
+                        $duration = new Duration($period->d, $period->h, $period->i, $period->s, $prefix == '-');
+                    }
+                    catch (Exception $e) {
+                        // skip alarm with invalid trigger values
+                        rcube::raise_error($e, true);
+                        continue;
+                    }
+
+                    $alarm->setRelativeStart($duration, $prefix == '-' ? kolabformat::Start : kolabformat::End);
+                }
+
+                if ($valarm['duration']) {
+                    try {
+                        $d = new DateInterval($valarm['duration']);
+                        $duration = new Duration($d->d, $d->h, $d->i, $d->s);
+                        $alarm->setDuration($duration, intval($valarm['repeat']));
+                    }
+                    catch (Exception $e) {
+                        // ignore
+                    }
+                }
+
+                $valarms->push($alarm);
+            }
+        }
+        // legacy support
+        else if ($object['alarms']) {
             list($offset, $type) = explode(":", $object['alarms']);
 
             if ($type == 'EMAIL' && !empty($object['_owner'])) {  // email alarms implicitly go to event owner
@@ -401,24 +529,7 @@
         }
         $this->obj->setAlarms($valarms);
 
-        // save attachments
-        $vattach = new vectorattachment;
-        foreach ((array)$object['_attachments'] as $cid => $attr) {
-            if (empty($attr))
-                continue;
-            $attach = new Attachment;
-            $attach->setLabel((string)$attr['name']);
-            $attach->setUri('cid:' . $cid, $attr['mimetype']);
-            $vattach->push($attach);
-        }
-
-        foreach ((array)$object['links'] as $link) {
-            $attach = new Attachment;
-            $attach->setUri($link, 'unknown');
-            $vattach->push($attach);
-        }
-
-        $this->obj->setAttachments($vattach);
+        $this->set_attachments($object);
     }
 
     /**

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

roundcubemail-plugins-kolab-3.2.tar.gz/plugins/pdfviewer/pdfjs-viewer.diff Changed

@@ -1,5 +1,5 @@
---- viewer/viewer.html.orig	2014-01-20 16:22:49.000000000 +0100
-+++ viewer/viewer.html	2014-01-20 16:38:37.000000000 +0100
+--- viewer/viewer.html.orig	2014-03-07 11:40:58.000000000 +0100
++++ viewer/viewer.html	2014-03-07 11:44:02.000000000 +0100
 @@ -31,12 +31,12 @@
  
  <link rel="resource" type="application/l10n" href="locale/locale.properties"/>
@@ -61,8 +61,8 @@
                    <span data-l10n-id="bookmark_label">Current View</span>
                  </a>
  
---- viewer/viewer.js.orig	2014-01-20 16:22:49.000000000 +0100
-+++ viewer/viewer.js	2014-01-20 16:32:24.000000000 +0100
+--- viewer/viewer.js.orig	2014-03-07 11:40:40.000000000 +0100
++++ viewer/viewer.js	2014-03-07 11:32:44.000000000 +0100
 @@ -23,7 +23,7 @@
  
  'use strict';
@@ -81,45 +81,3 @@
  
  var mozL10n = document.mozL10n || document.webL10n;
  
-@@ -1581,9 +1581,9 @@
-       // (except for toggleHandTool, hand_tool.js is responsible for it):
-       { element: this.presentationModeButton,
-         handler: this.presentationModeClick },
--      { element: this.openFile, handler: this.openFileClick },
-+      //{ element: this.openFile, handler: this.openFileClick },
-       { element: this.print, handler: this.printClick },
--      { element: this.download, handler: this.downloadClick },
-+      //{ element: this.download, handler: this.downloadClick },
-       { element: this.firstPage, handler: this.firstPageClick },
-       { element: this.lastPage, handler: this.lastPageClick },
-       { element: this.pageRotateCw, handler: this.pageRotateCwClick },
-@@ -4806,8 +4806,8 @@
-   document.body.appendChild(fileInput);
- 
-   if (!window.File || !window.FileReader || !window.FileList || !window.Blob) {
--    document.getElementById('openFile').setAttribute('hidden', 'true');
--    document.getElementById('secondaryOpenFile').setAttribute('hidden', 'true');
-+    //document.getElementById('openFile').setAttribute('hidden', 'true');
-+    //document.getElementById('secondaryOpenFile').setAttribute('hidden', 'true');
-   } else {
-     document.getElementById('fileInput').value = null;
-   }
-@@ -4970,14 +4970,14 @@
-   document.getElementById('presentationMode').addEventListener('click',
-     SecondaryToolbar.presentationModeClick.bind(SecondaryToolbar));
- 
--  document.getElementById('openFile').addEventListener('click',
--    SecondaryToolbar.openFileClick.bind(SecondaryToolbar));
-+//  document.getElementById('openFile').addEventListener('click',
-+//    SecondaryToolbar.openFileClick.bind(SecondaryToolbar));
- 
-   document.getElementById('print').addEventListener('click',
-     SecondaryToolbar.printClick.bind(SecondaryToolbar));
- 
--  document.getElementById('download').addEventListener('click',
--    SecondaryToolbar.downloadClick.bind(SecondaryToolbar));
-+//  document.getElementById('download').addEventListener('click',
-+//    SecondaryToolbar.downloadClick.bind(SecondaryToolbar));
- 
- 
-   PDFView.open(file, 0);

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

roundcubemail-plugins-kolab-3.2.tar.gz/plugins/pdfviewer/viewer/viewer.js Changed

@@ -1581,9 +1581,9 @@
       // (except for toggleHandTool, hand_tool.js is responsible for it):
       { element: this.presentationModeButton,
         handler: this.presentationModeClick },
-      //{ element: this.openFile, handler: this.openFileClick },
+      { element: this.openFile, handler: this.openFileClick },
       { element: this.print, handler: this.printClick },
-      //{ element: this.download, handler: this.downloadClick },
+      { element: this.download, handler: this.downloadClick },
       { element: this.firstPage, handler: this.firstPageClick },
       { element: this.lastPage, handler: this.lastPageClick },
       { element: this.pageRotateCw, handler: this.pageRotateCwClick },
@@ -4806,8 +4806,8 @@
   document.body.appendChild(fileInput);
 
   if (!window.File || !window.FileReader || !window.FileList || !window.Blob) {
-    //document.getElementById('openFile').setAttribute('hidden', 'true');
-    //document.getElementById('secondaryOpenFile').setAttribute('hidden', 'true');
+    document.getElementById('openFile').setAttribute('hidden', 'true');
+    document.getElementById('secondaryOpenFile').setAttribute('hidden', 'true');
   } else {
     document.getElementById('fileInput').value = null;
   }
@@ -4970,14 +4970,14 @@
   document.getElementById('presentationMode').addEventListener('click',
     SecondaryToolbar.presentationModeClick.bind(SecondaryToolbar));
 
-//  document.getElementById('openFile').addEventListener('click',
-//    SecondaryToolbar.openFileClick.bind(SecondaryToolbar));
+  document.getElementById('openFile').addEventListener('click',
+    SecondaryToolbar.openFileClick.bind(SecondaryToolbar));
 
   document.getElementById('print').addEventListener('click',
     SecondaryToolbar.printClick.bind(SecondaryToolbar));
 
-//  document.getElementById('download').addEventListener('click',
-//    SecondaryToolbar.downloadClick.bind(SecondaryToolbar));
+  document.getElementById('download').addEventListener('click',
+    SecondaryToolbar.downloadClick.bind(SecondaryToolbar));
 
 
   PDFView.open(file, 0);

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

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

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

@@ -1307,7 +1307,7 @@
 
             // task assigned to a new list
             if (me.selected_task.list && listdata[id] && me.selected_task.list != listdata[id].list) {
-                me.selected_task._fromlist = rec.list;
+                me.selected_task._fromlist = list.id;
             }
 
             me.selected_task.complete = complete.val() / 100;
@@ -1341,6 +1341,9 @@
           resizable: (!bw.ie6 && !bw.ie7),  // disable for performance reasons
           closeOnEscape: false,
           title: rcmail.gettext((action == 'edit' ? 'edittask' : 'newtask'), 'tasklist'),
+          open: function() {
+            $dialog.parent().find('.ui-dialog-buttonset .ui-button').first().addClass('mainaction');
+          },
           close: function() {
               editform.hide().appendTo(document.body);
               $dialog.dialog('destroy').remove();
@@ -1664,7 +1667,12 @@
           resizable: true,
           closeOnEscape: false,
           title: rcmail.gettext((list.id ? 'editlist' : 'createlist'), 'tasklist'),
-          close: function() { $dialog.dialog('destroy').hide(); },
+          open: function() {
+            $dialog.parent().find('.ui-dialog-buttonset .ui-button').first().addClass('mainaction');
+          },
+          close: function() {
+            $dialog.dialog('destroy').hide();
+          },
           buttons: buttons,
           minWidth: 400,
           width: 420

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

@@ -196,8 +196,21 @@
         case 'edit':
             $rec = $this->prepare_task($rec);
             if ($success = $this->driver->edit_task($rec)) {
-                $refresh = $this->driver->get_task($rec);
+                $refresh[] = $this->driver->get_task($rec);
                 $this->cleanup_task($rec);
+
+                // move all childs if list assignment was changed
+                if (!empty($rec['_fromlist']) && !empty($rec['list']) && $rec['_fromlist'] != $rec['list']) {
+                    foreach ($this->driver->get_childs(array('id' => $rec['id'], 'list' => $rec['_fromlist']), true) as $cid) {
+                        $child = array('id' => $cid, 'list' => $rec['list'], '_fromlist' => $rec['_fromlist']);
+                        if ($this->driver->move_task($child)) {
+                            $r = $this->driver->get_task($child);
+                            if ((bool)($filter & self::FILTER_MASK_COMPLETE) == ($r['complete'] == 1.0)) {
+                                $refresh[] = $r;
+                            }
+                        }
+                    }
+                }
             }
             break;
 
@@ -210,7 +223,7 @@
                       $success = true;
 
                       // move all childs, too
-                      foreach ($this->driver->get_childs(array('id' => $rec['id'], 'list' => $rec['_fromlist'])) as $cid) {
+                      foreach ($this->driver->get_childs(array('id' => $rec['id'], 'list' => $rec['_fromlist']), true) as $cid) {
                           $child = $rec;
                           $child['id'] = $cid;
                           if ($this->driver->move_task($child)) {

roundcubemail-plugins-kolab.dsc Changed