Kolab Groupware OBS

roundcubemail-plugins-kolab.spec Changed

debian.changelog Changed

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

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

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

@@ -188,29 +188,35 @@
    */
   public function get_event($id)
   {
+    // remove our occurrence identifier if it's there
+    $master_id = preg_replace('/-\d{8}(T\d{6})?$/', '', $id);
+
     // directly access storage object
-    if (!$this->events[$id] && ($record = $this->storage->get_object($id)))
-        $this->events[$id] = $this->_to_driver_event($record, true);
+    if (!$this->events[$id] && $master_id == $id && ($record = $this->storage->get_object($id))) {
+      $this->events[$id] = $this->_to_driver_event($record, true);
+    }
 
-    // event not found, maybe a recurring instance is requested
-    if (!$this->events[$id]) {
-      $master_id = preg_replace('/-\d+(T\d{6})?$/', '', $id);
+    // maybe a recurring instance is requested
+    if (!$this->events[$id] && $master_id != $id) {
       $instance_id = substr($id, strlen($master_id) + 1);
 
-      if ($master_id != $id && ($record = $this->storage->get_object($master_id))) {
-        $master = $this->_to_driver_event($record);
+      if ($record = $this->storage->get_object($master_id)) {
+        $master = $this->_to_driver_event($record, true);
+        $this->events[$master_id] = $master;
       }
 
-      // check for match in top-level exceptions (aka loose single occurrences)
-      if ($master && $master['_formatobj'] && ($instance = $master['_formatobj']->get_instance($instance_id))) {
-        $this->events[$id] = $this->_to_driver_event($instance);
-      }
-      // check for match on the first instance already
-      else if ($master['_instance'] && $master['_instance'] == $instance_id) {
-        $this->events[$id] = $master;
-      }
-      else if ($master && is_array($master['recurrence'])) {
-        $this->get_recurring_events($record, $master['start'], null, $id);
+      if ($master) {
+        // check for match in top-level exceptions (aka loose single occurrences)
+        if ($master['_formatobj'] && ($instance = $master['_formatobj']->get_instance($instance_id))) {
+          $this->events[$id] = $this->_to_driver_event($instance);
+        }
+        // check for match on the first instance already
+        else if ($master['_instance'] && $master['_instance'] == $instance_id) {
+          $this->events[$id] = $master;
+        }
+        else if (is_array($master['recurrence'])) {
+          $this->get_recurring_events($record, $master['start'], null, $id);
+        }
       }
     }
 
@@ -298,13 +304,13 @@
 
     $events = array();
     foreach ($this->storage->select($query) as $record) {
-      $event = $this->_to_driver_event($record, !$virtual);
+      $event = $this->_to_driver_event($record, !$virtual, false);
 
       // remember seen categories
       if ($event['categories']) {
         $cat = is_array($event['categories']) ? $event['categories'][0] : $event['categories'];
         $this->categories[$cat]++;
-    }
+      }
 
       // list events in requested time window
       if ($event['start'] <= $end && $event['end'] >= $start) {
@@ -347,7 +353,7 @@
       // add top-level exceptions (aka loose single occurrences)
       else if (is_array($record['exceptions'])) {
         foreach ($record['exceptions'] as $ex) {
-          $component = $this->_to_driver_event($ex);
+          $component = $this->_to_driver_event($ex, false, false);
           if ($component['start'] <= $end && $component['end'] >= $start) {
             $events[] = $component;
           }
@@ -381,6 +387,10 @@
       return true;
     });
 
+    // Apply event-to-mail relations
+    $config = kolab_storage_config::get_instance();
+    $config->apply_links($events);
+
     // avoid session race conditions that will loose temporary subscriptions
     $this->cal->rc->session->nowrite = true;
 
@@ -451,8 +461,8 @@
 
     //generate new event from RC input
     $object = $this->_from_driver_event($event);
-    $saved = $this->storage->save($object, 'event');
-    
+    $saved  = $this->storage->save($object, 'event');
+
     if (!$saved) {
       rcube::raise_error(array(
         'code' => 600, 'type' => 'php',
@@ -463,11 +473,13 @@
     }
     else {
       // save links in configuration.relation object
-      $this->save_links($event['uid'], $links);
+      if ($this->save_links($event['uid'], $links)) {
+        $object['links'] = $links;
+      }
 
       $this->events = array($event['uid'] => $this->_to_driver_event($object, true));
     }
-    
+
     return $saved;
   }
 
@@ -490,7 +502,7 @@
     unset($event['links']);
 
     $object = $this->_from_driver_event($event, $old);
-    $saved = $this->storage->save($object, 'event', $old['uid']);
+    $saved  = $this->storage->save($object, 'event', $old['uid']);
 
     if (!$saved) {
       rcube::raise_error(array(
@@ -501,7 +513,9 @@
     }
     else {
       // save links in configuration.relation object
-      $this->save_links($event['uid'], $links);
+      if ($this->save_links($event['uid'], $links)) {
+        $object['links'] = $links;
+      }
 
       $updated = true;
       $this->events = array($event['uid'] => $this->_to_driver_event($object, true));
@@ -572,14 +586,8 @@
    */
   protected function save_links($uid, $links)
   {
-    // make sure we have a valid array
-    if (empty($links)) {
-      $links = array();
-    }
-
     $storage = kolab_storage_config::get_instance();
-    $remove = array_diff($storage->get_object_links($uid), $links);
-    return $storage->save_object_links($uid, $links, $remove);
+    return $storage->save_object_links($uid, (array) $links);
   }
 
   /**
@@ -628,7 +636,7 @@
         if (!$exception['_instance'])
           $exception['_instance'] = libcalendaring::recurrence_instance_identifier($exception);
 
-        $rec_event = $this->_to_driver_event($exception);
+        $rec_event = $this->_to_driver_event($exception, false, false);
         $rec_event['id'] = $event['uid'] . '-' . $exception['_instance'];
         $rec_event['isexception'] = 1;
 
@@ -677,7 +685,7 @@
       // add to output if in range
       $rec_id = $event['uid'] . '-' . $instance_id;
       if (($next_event['start'] <= $end && $next_event['end'] >= $start) || ($event_id && $rec_id == $event_id)) {
-        $rec_event = $this->_to_driver_event($next_event);
+        $rec_event = $this->_to_driver_event($next_event, false, false);
         $rec_event['_instance'] = $instance_id;
         $rec_event['_count'] = $i + 1;
 
@@ -709,10 +717,13 @@
   /**
    * Convert from Kolab_Format to internal representation
    */
-  private function _to_driver_event($record, $noinst = false)
+  private function _to_driver_event($record, $noinst = false, $links = true)
   {
     $record['calendar'] = $this->id;
-    $record['links'] = $this->get_links($record['uid']);
+
+    if ($links && !array_key_exists('links', $record)) {
+      $record['links'] = $this->get_links($record['uid']);
+    }
 
     if ($this->get_namespace() == 'other') {
       $record['className'] = 'fc-event-ns-other';

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

@@ -57,12 +57,11 @@
     require_once(dirname(__FILE__) . '/kolab_invitation_calendar.php');
 
     $this->cal = $cal;
-    $this->rc = $cal->rc;
-    $this->_read_calendars();
-    
+    $this->rc  = $cal->rc;
+
     $this->cal->register_action('push-freebusy', array($this, 'push_freebusy'));
     $this->cal->register_action('calendar-acl', array($this, 'calendar_acl'));
-    
+
     $this->freebusy_trigger = $this->rc->config->get('calendar_freebusy_trigger', false);
 
     if (kolab_storage::$version == '2.0') {
@@ -89,11 +88,11 @@
 
     // get all folders that have "event" type, sorted by namespace/name
     $folders = kolab_storage::sort_folders(kolab_storage::get_folders('event') + kolab_storage::get_user_folders('event', true));
-    $this->calendars = array();
 
+    $this->calendars = array();
     foreach ($folders as $folder) {
       if ($folder instanceof kolab_storage_folder_user) {
-        $calendar = new kolab_user_calendar($folder->name, $this->cal);
+        $calendar = new kolab_user_calendar($folder, $this->cal);
         $calendar->subscriptions = count($folder->children) > 0;
       }
       else {
@@ -120,10 +119,12 @@
    */
   public function list_calendars($filter = 0, &$tree = null)
   {
+    $this->_read_calendars();
+
     // attempt to create a default calendar for this user
     if (!$this->has_writeable) {
       if ($this->create_calendar(array('name' => 'Calendar', 'color' => 'cc0000'))) {
-         unset($this->calendars);
+        unset($this->calendars);
         $this->_read_calendars();
       }
     }
@@ -162,8 +163,8 @@
       // special handling for user or virtual folders
       if ($cal instanceof kolab_storage_folder_user) {
         $calendars[$cal->id] = array(
-          'id' => $cal->id,
-          'name' => kolab_storage::object_name($fullname),
+          'id'       => $cal->id,
+          'name'     => $fullname,
           'listname' => $listname,
           'editname' => $cal->get_foldername(),
           'color'    => $cal->get_color(),
@@ -287,6 +288,8 @@
    */
   protected function filter_calendars($filter)
   {
+    $this->_read_calendars();
+
     $calendars = array();
 
     $plugin = $this->rc->plugins->exec_hook('calendar_list_filter', array(
@@ -340,14 +343,19 @@
    */
   public function get_calendar($id)
   {
+    $this->_read_calendars();
+
     // create calendar object if necesary
-    if (!$this->calendars[$id] && in_array($id, array(self::INVITATIONS_CALENDAR_PENDING, self::INVITATIONS_CALENDAR_DECLINED))) {
-      $this->calendars[$id] = new kolab_invitation_calendar($id, $this->cal);
-    }
-    else if (!$this->calendars[$id] && $id !== self::BIRTHDAY_CALENDAR_ID) {
-      $calendar = kolab_calendar::factory($id, $this->cal);
-      if ($calendar->ready)
-        $this->calendars[$calendar->id] = $calendar;
+    if (!$this->calendars[$id]) {
+      if (in_array($id, array(self::INVITATIONS_CALENDAR_PENDING, self::INVITATIONS_CALENDAR_DECLINED))) {
+        $this->calendars[$id] = new kolab_invitation_calendar($id, $this->cal);
+      }
+      else if ($id !== self::BIRTHDAY_CALENDAR_ID) {
+        $calendar = kolab_calendar::factory($id, $this->cal);
+        if ($calendar->ready) {
+          $this->calendars[$calendar->id] = $calendar;
+        }
+      }
     }
 
     return $this->calendars[$id];
@@ -592,8 +600,12 @@
 
     $event = self::from_rcube_event($event);
 
-    $cid = $event['calendar'] ? $event['calendar'] : reset(array_keys($this->calendars));
-    if ($storage = $this->get_calendar($cid)) {
+    if (!$event['calendar']) {
+      $this->_read_calendars();
+      $event['calendar'] = reset(array_keys($this->calendars));
+    }
+
+    if ($storage = $this->get_calendar($event['calendar'])) {
       // if this is a recurrence instance, append as exception to an already existing object for this UID
       if (!empty($event['recurrence_date']) && ($master = $storage->get_event($event['uid']))) {
         self::add_exception($master, $event);
@@ -1012,7 +1024,7 @@
 
         // copy attachment metadata to new event
         $event = self::from_rcube_event($event, $master);
-  
+
         // remove recurrence exceptions on re-scheduling
         if ($reschedule) {
           unset($event['recurrence']['EXCEPTIONS'], $event['exceptions'], $master['recurrence']['EXDATE']);
@@ -1436,8 +1448,10 @@
   {
     if ($calendars && is_string($calendars))
       $calendars = explode(',', $calendars);
-    else if (!$calendars)
+    else if (!$calendars) {
+      $this->_read_calendars();
       $calendars = array_keys($this->calendars);
+    }
 
     $query = array();
     if ($modifiedsince)
@@ -1482,8 +1496,10 @@
 
       if ($calendars && is_string($calendars))
         $calendars = explode(',', $calendars);
-      else if (!$calendars)
+      else if (!$calendars) {
+        $this->_read_calendars();
         $calendars = array_keys($this->calendars);
+      }
 
       foreach ($calendars as $cid) {
         if ($storage = $this->get_calendar($cid)) {
@@ -1521,6 +1537,9 @@
     
     $candidates = array();
     $query = array(array('tags', '=', 'x-has-alarms'));
+
+    $this->_read_calendars();
+
     foreach ($this->calendars as $cid => $calendar) {
       // skip calendars with alarms disabled
       if (!$calendar->alarms || ($calendars && !in_array($cid, $calendars)))
@@ -2317,6 +2336,8 @@
       return parent::calendar_form($action, $calendar, $formfields);
     }
 
+    $this->_read_calendars();
+
     if ($calendar['id'] && ($cal = $this->calendars[$calendar['id']])) {
       $folder = $cal->get_realname(); // UTF7
       $color  = $cal->get_color();

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

@@ -34,6 +34,7 @@
   public $categories = array();
   public $name = 'Invitations';
 
+
   /**
    * Default constructor
    */
@@ -62,7 +63,6 @@
       $this->alarms = $prefs[$this->id]['showalarms'];
   }
 
-
   /**
    * Getter for a nice and human readable name for this calendar
    *
@@ -73,7 +73,6 @@
     return $this->name;
   }
 
-
   /**
    * Getter for the IMAP folder owner
    *
@@ -84,7 +83,6 @@
     return $this->cal->rc->get_user_name();
   }
 
-
   /**
    *
    */
@@ -93,7 +91,6 @@
     return $this->get_name();
   }
 
-
   /**
    * Getter for the name of the namespace to which the IMAP folder belongs
    *
@@ -104,7 +101,6 @@
     return 'x-special';
   }
 
-
   /**
    * Getter for the top-end calendar folder name (not the entire path)
    *
@@ -171,7 +167,6 @@
     return $prop['id'];
   }
 
-
   /**
    * Getter for a single event object
    */
@@ -202,7 +197,7 @@
     else {
       $cal = null;
       foreach (kolab_storage::list_folders('', '*', 'event', null) as $foldername) {
-        $cal = new kolab_calendar($foldername, $this->cal);
+        $cal = $this->_get_calendar($foldername);
         if ($cal->ready && $cal->storage && $cal->get_event($event['id'])) {
           break;
         }
@@ -216,7 +211,6 @@
     return false;
   }
 
-
   /**
    * @param  integer Event's new start (unix timestamp)
    * @param  integer Event's new end (unix timestamp)
@@ -239,7 +233,7 @@
     // aggregate events from all calendar folders
     $events = array();
     foreach (kolab_storage::list_folders('', '*', 'event', null) as $foldername) {
-      $cal = new kolab_calendar($foldername, $this->cal);
+      $cal = $this->_get_calendar($foldername);
       if ($cal->get_namespace() == 'other')
         continue;
 
@@ -293,7 +287,7 @@
     // aggregate counts from all calendar folders
     $count = 0;
     foreach (kolab_storage::list_folders('', '*', 'event', null) as $foldername) {
-      $cal = new kolab_calendar($foldername, $this->cal);
+      $cal = $this->_get_calendar($foldername);
       if ($cal->get_namespace() == 'other')
         continue;
 
@@ -304,6 +298,15 @@
   }
 
   /**
+   * Get calendar object instance (that maybe already initialized)
+   */
+  private function _get_calendar($folder_name)
+  {
+    $id = kolab_storage::folder_id($folder_name, true);
+    return $this->cal->driver->get_calendar($id);
+  }
+
+  /**
    * Helper method to modify some event properties
    */
   private function _mod_event($event)
@@ -318,7 +321,6 @@
     return $event;
   }
 
-
   /**
    * Create a new event record
    *
@@ -337,7 +339,6 @@
    * @see calendar_driver::new_event()
    * @return boolean True on success, False on error
    */
-
   public function update_event($event, $exception_id = null)
   {
     // forward call to the actual storage folder
@@ -372,6 +373,4 @@
   {
     return false;
   }
-
-
 }

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

@@ -5,7 +5,7 @@
  *
  * @author Thomas Bruederli <bruederli@kolabsys.com>
  *
- * Copyright (C) 2014-2015, Kolab Systems AG <contact@kolabsys.com>
+ * Copyright (C) 2014-2016, 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
@@ -45,8 +45,12 @@
       $this->userdata = $user_or_folder;
       $this->storage = new kolab_storage_folder_user($this->userdata['kolabtargetfolder'], '', $this->userdata);
     }
+    else if ($user_or_folder instanceof kolab_storage_folder_user) {
+      $this->storage  = $user_or_folder;
+      $this->userdata = $this->storage->ldaprec;
+    }
     else {  // get user record from LDAP
-      $this->storage = new kolab_storage_folder_user($user_or_folder);
+      $this->storage  = new kolab_storage_folder_user($user_or_folder);
       $this->userdata = $this->storage->ldaprec;
     }
 
@@ -57,7 +61,7 @@
       // ID is derrived from the user's kolabtargetfolder attribute
       $this->id = kolab_storage::folder_id($this->userdata['kolabtargetfolder'], true);
       $this->imap_folder = $this->userdata['kolabtargetfolder'];
-      $this->name = $this->storage->get_name();
+      $this->name = $this->storage->name;
       $this->parent = '';  // user calendars are top level
 
       // user-specific alarms settings win
@@ -67,7 +71,6 @@
     }
   }
 
-
   /**
    * Getter for a nice and human readable name for this calendar
    *
@@ -78,7 +81,6 @@
     return $this->userdata['displayname'] ?: ($this->userdata['name'] ?: $this->userdata['mail']);
   }
 
-
   /**
    * Getter for the IMAP folder owner
    *
@@ -89,7 +91,6 @@
     return $this->userdata['mail'];
   }
 
-
   /**
    *
    */
@@ -98,7 +99,6 @@
     return trim($this->userdata['displayname'] . '; ' . $this->userdata['mail'], '; ');
   }
 
-
   /**
    * Getter for the name of the namespace to which the IMAP folder belongs
    *
@@ -109,7 +109,6 @@
     return 'other user';
   }
 
-
   /**
    * Getter for the top-end calendar folder name (not the entire path)
    *
@@ -164,7 +163,6 @@
     return $prop['id'];
   }
 
-
   /**
    * Getter for a single event object
    */
@@ -370,7 +368,6 @@
     return sprintf('%s/%s', $event['start']->format('U'), is_object($event['end']->format('U')) ?: '0');
   }
 
-
   /**
    * Create a new event record
    *
@@ -389,7 +386,6 @@
    * @see calendar_driver::new_event()
    * @return boolean True on success, False on error
    */
-
   public function update_event($event, $exception_id = null)
   {
     return false;
@@ -417,7 +413,6 @@
     return false;
   }
 
-
   /**
    * Convert from Kolab_Format to internal representation
    */
@@ -428,5 +423,4 @@
 
     return kolab_driver::to_rcube_event($record);
   }
-
 }

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

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

@@ -239,7 +239,7 @@
             else if ($folder->virtual) {
                 $lists[$list_id] = array(
                     'id'       => $list_id,
-                    'name'     => kolab_storage::object_name($fullname),
+                    'name'     => $fullname,
                     'listname' => $listname,
                     'virtual'  => true,
                     'editable' => false,
@@ -441,6 +441,7 @@
     {
         $config = kolab_storage_config::get_instance();
         $tags   = $config->apply_tags($records);
+        $config->apply_links($records);
 
         foreach ($records as $i => $rec) {
             unset($records[$i]['description']);
@@ -557,6 +558,8 @@
         if ($result) {
             // get note tags
             $result['tags'] = $this->get_tags($result['uid']);
+            // get note links
+            $result['links'] = $this->get_links($result['uid']);
         }
 
         return $result;
@@ -565,7 +568,7 @@
     /**
      * Helper method to encode the given note record for use in the client
      */
-    private function _client_encode(&$note, $resolve = false)
+    private function _client_encode(&$note)
     {
         foreach ($note as $key => $prop) {
             if ($key[0] == '_' || $key == 'x-custom') {
@@ -585,10 +588,14 @@
             $note['html'] = $this->_wash_html($note['description']);
         }
 
-        // resolve message links
-        $note['links'] = array_map(function($link) {
-                return kolab_storage_config::get_message_reference($link, 'note') ?: array('uri' => $link);
-            }, $this->get_links($note['uid']));
+        // convert link URIs references into structs
+        if (array_key_exists('links', $note)) {
+            foreach ((array)$note['links'] as $i => $link) {
+                if (strpos($link, 'imap://') === 0 && ($msgref = kolab_storage_config::get_message_reference($link, 'note'))) {
+                    $note['links'][$i] = $msgref;
+                }
+            }
+        }
 
         return $note;
     }
@@ -1045,7 +1052,7 @@
                 $newfolder = kolab_storage::folder_update($list);
 
                 if ($newfolder === false) {
-                  $save_error = $this->gettext(kolab_storage::$last_error);
+                    $save_error = $this->gettext(kolab_storage::$last_error);
                 }
                 else {
                     $success = true;
@@ -1056,7 +1063,7 @@
                     // compose the new display name
                     $delim = $this->rc->get_storage()->get_hierarchy_delimiter();
                     $path_imap = explode($delim, $newfolder);
-                    $list['name'] = kolab_storage::object_name($newfolder);
+                    $list['name']     = kolab_storage::object_name($newfolder);
                     $list['editname'] = rcube_charset::convert(array_pop($path_imap), 'UTF7-IMAP');
                     $list['listname'] = str_repeat('&nbsp;&nbsp;&nbsp;', count($path_imap)) . '&raquo; ' . $list['editname'];
                 }
@@ -1247,12 +1254,8 @@
 
     private function save_links($uid, $links)
     {
-        if (empty($links)) {
-            $links = array();
-        }
         $config = kolab_storage_config::get_instance();
-        $remove = array_diff($config->get_object_links($uid), $links);
-        return $config->save_object_links($uid, $links, $remove);
+        return $config->save_object_links($uid, (array) $links);
     }
 
     /**

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

roundcubemail-plugins-kolab-3.3.tar.gz/plugins/kolab_tags/lib/kolab_tags_engine.php Changed

roundcubemail-plugins-kolab-3.3.tar.gz/plugins/kolab_zpush Deleted

roundcubemail-plugins-kolab-3.3.tar.gz/plugins/kolab_zpush/LICENSE Deleted

@@ -1,661 +0,0 @@
-                    GNU AFFERO GENERAL PUBLIC LICENSE
-                       Version 3, 19 November 2007
-
- Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-                            Preamble
-
-  The GNU Affero General Public License is a free, copyleft license for
-software and other kinds of works, specifically designed to ensure
-cooperation with the community in the case of network server software.
-
-  The licenses for most software and other practical works are designed
-to take away your freedom to share and change the works.  By contrast,
-our General Public Licenses are intended to guarantee your freedom to
-share and change all versions of a program--to make sure it remains free
-software for all its users.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-them if you wish), that you receive source code or can get it if you
-want it, that you can change the software or use pieces of it in new
-free programs, and that you know you can do these things.
-
-  Developers that use our General Public Licenses protect your rights
-with two steps: (1) assert copyright on the software, and (2) offer
-you this License which gives you legal permission to copy, distribute
-and/or modify the software.
-
-  A secondary benefit of defending all users' freedom is that
-improvements made in alternate versions of the program, if they
-receive widespread use, become available for other developers to
-incorporate.  Many developers of free software are heartened and
-encouraged by the resulting cooperation.  However, in the case of
-software used on network servers, this result may fail to come about.
-The GNU General Public License permits making a modified version and
-letting the public access it on a server without ever releasing its
-source code to the public.
-
-  The GNU Affero General Public License is designed specifically to
-ensure that, in such cases, the modified source code becomes available
-to the community.  It requires the operator of a network server to
-provide the source code of the modified version running there to the
-users of that server.  Therefore, public use of a modified version, on
-a publicly accessible server, gives the public access to the source
-code of the modified version.
-
-  An older license, called the Affero General Public License and
-published by Affero, was designed to accomplish similar goals.  This is
-a different license, not a version of the Affero GPL, but Affero has
-released a new version of the Affero GPL which permits relicensing under
-this license.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-                       TERMS AND CONDITIONS
-
-  0. Definitions.
-
-  "This License" refers to version 3 of the GNU Affero General Public License.
-
-  "Copyright" also means copyright-like laws that apply to other kinds of
-works, such as semiconductor masks.
-
-  "The Program" refers to any copyrightable work licensed under this
-License.  Each licensee is addressed as "you".  "Licensees" and
-"recipients" may be individuals or organizations.
-
-  To "modify" a work means to copy from or adapt all or part of the work
-in a fashion requiring copyright permission, other than the making of an
-exact copy.  The resulting work is called a "modified version" of the
-earlier work or a work "based on" the earlier work.
-
-  A "covered work" means either the unmodified Program or a work based
-on the Program.
-
-  To "propagate" a work means to do anything with it that, without
-permission, would make you directly or secondarily liable for
-infringement under applicable copyright law, except executing it on a
-computer or modifying a private copy.  Propagation includes copying,
-distribution (with or without modification), making available to the
-public, and in some countries other activities as well.
-
-  To "convey" a work means any kind of propagation that enables other
-parties to make or receive copies.  Mere interaction with a user through
-a computer network, with no transfer of a copy, is not conveying.
-
-  An interactive user interface displays "Appropriate Legal Notices"
-to the extent that it includes a convenient and prominently visible
-feature that (1) displays an appropriate copyright notice, and (2)
-tells the user that there is no warranty for the work (except to the
-extent that warranties are provided), that licensees may convey the
-work under this License, and how to view a copy of this License.  If
-the interface presents a list of user commands or options, such as a
-menu, a prominent item in the list meets this criterion.
-
-  1. Source Code.
-
-  The "source code" for a work means the preferred form of the work
-for making modifications to it.  "Object code" means any non-source
-form of a work.
-
-  A "Standard Interface" means an interface that either is an official
-standard defined by a recognized standards body, or, in the case of
-interfaces specified for a particular programming language, one that
-is widely used among developers working in that language.
-
-  The "System Libraries" of an executable work include anything, other
-than the work as a whole, that (a) is included in the normal form of
-packaging a Major Component, but which is not part of that Major
-Component, and (b) serves only to enable use of the work with that
-Major Component, or to implement a Standard Interface for which an
-implementation is available to the public in source code form.  A
-"Major Component", in this context, means a major essential component
-(kernel, window system, and so on) of the specific operating system
-(if any) on which the executable work runs, or a compiler used to
-produce the work, or an object code interpreter used to run it.
-
-  The "Corresponding Source" for a work in object code form means all
-the source code needed to generate, install, and (for an executable
-work) run the object code and to modify the work, including scripts to
-control those activities.  However, it does not include the work's
-System Libraries, or general-purpose tools or generally available free
-programs which are used unmodified in performing those activities but
-which are not part of the work.  For example, Corresponding Source
-includes interface definition files associated with source files for
-the work, and the source code for shared libraries and dynamically
-linked subprograms that the work is specifically designed to require,
-such as by intimate data communication or control flow between those
-subprograms and other parts of the work.
-
-  The Corresponding Source need not include anything that users
-can regenerate automatically from other parts of the Corresponding
-Source.
-
-  The Corresponding Source for a work in source code form is that
-same work.
-
-  2. Basic Permissions.
-
-  All rights granted under this License are granted for the term of
-copyright on the Program, and are irrevocable provided the stated
-conditions are met.  This License explicitly affirms your unlimited
-permission to run the unmodified Program.  The output from running a
-covered work is covered by this License only if the output, given its
-content, constitutes a covered work.  This License acknowledges your
-rights of fair use or other equivalent, as provided by copyright law.
-
-  You may make, run and propagate covered works that you do not
-convey, without conditions so long as your license otherwise remains
-in force.  You may convey covered works to others for the sole purpose
-of having them make modifications exclusively for you, or provide you
-with facilities for running those works, provided that you comply with
-the terms of this License in conveying all material for which you do
-not control copyright.  Those thus making or running the covered works
-for you must do so exclusively on your behalf, under your direction
-and control, on terms that prohibit them from making any copies of
-your copyrighted material outside their relationship with you.
-
-  Conveying under any other circumstances is permitted solely under
-the conditions stated below.  Sublicensing is not allowed; section 10
-makes it unnecessary.
-
-  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
-
-  No covered work shall be deemed part of an effective technological
-measure under any applicable law fulfilling obligations under article
-11 of the WIPO copyright treaty adopted on 20 December 1996, or
-similar laws prohibiting or restricting circumvention of such
-measures.
-
-  When you convey a covered work, you waive any legal power to forbid
-circumvention of technological measures to the extent such circumvention
-is effected by exercising rights under this License with respect to
-the covered work, and you disclaim any intention to limit operation or
-modification of the work as a means of enforcing, against the work's
-users, your or third parties' legal rights to forbid circumvention of
-technological measures.
-
-  4. Conveying Verbatim Copies.
-
-  You may convey verbatim copies of the Program's source code as you
-receive it, in any medium, provided that you conspicuously and
-appropriately publish on each copy an appropriate copyright notice;
-keep intact all notices stating that this License and any
-non-permissive terms added in accord with section 7 apply to the code;
-keep intact all notices of the absence of any warranty; and give all
-recipients a copy of this License along with the Program.
-
-  You may charge any price or no price for each copy that you convey,
-and you may offer support or warranty protection for a fee.
-
-  5. Conveying Modified Source Versions.
-
-  You may convey a work based on the Program, or the modifications to
-produce it from the Program, in the form of source code under the

roundcubemail-plugins-kolab-3.3.tar.gz/plugins/kolab_zpush/README Deleted

roundcubemail-plugins-kolab-3.3.tar.gz/plugins/kolab_zpush/kolab_zpush.js Deleted

@@ -1,181 +0,0 @@
-/**
- * Client scripts for the Kolab Z-Push configuration utitlity
- *
- * @version 0.2
- * @author Thomas Bruederli <bruederli@kolabsys.com>
- *
- * Copyright (C) 2011, Kolab Systems AG <contact@kolabsys.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-function kolab_zpush_config()
-{
-    /* private members */
-    var me = this;
-    var http_lock = null;
-    var active_device = null;
-
-
-    /* constructor */
-    var devicelist = new rcube_list_widget(rcmail.gui_objects.devicelist,
-        { multiselect:true, draggable:false, keyboard:true });
-    devicelist.addEventListener('select', select_device);
-    devicelist.init();
-    
-    rcmail.register_command('plugin.save-config', save_config);
-    rcmail.register_command('plugin.delete-device', delete_device_config);
-    rcmail.addEventListener('plugin.zpush_data_ready', device_data_ready);
-    rcmail.addEventListener('plugin.zpush_save_complete', save_complete);
-
-    $('input.alarm').change(function(e){ if (this.checked) $('#'+this.id.replace(/_alarm/, '')).prop('checked', this.checked); });
-    $('input.subscription').change(function(e){ if (!this.checked) $('#'+this.id+'_alarm').prop('checked', false); });
-    $(window).bind('resize', resize_ui);
-
-    $('.subscriptionblock thead td.subscription img, .subscriptionblock thead td.alarm img').click(function(e){
-      var $this = $(this);
-      var classname = $this.parent().get(0).className;
-      var check = !($this.data('checked') || false);
-      $this.css('cursor', 'pointer').data('checked', check)
-        .closest('table').find('input.'+classname).prop('checked', check).change();
-    });
-
-    // select the one and only device from list
-    if (rcmail.env.devicecount == 1) {
-        for (var imei in rcmail.env.devices)
-            break;
-        devicelist.select(imei);
-    }
-
-    /* private methods */
-    function select_device(list)
-    {
-        active_device = list.get_single_selection();
-        rcmail.enable_command('plugin.save-config', 'plugin.delete-device', true);
-        
-        if (active_device) {
-            http_lock = rcmail.set_busy(true, 'loading');
-            rcmail.http_request('plugin.zpushjson', { cmd:'load', id:active_device }, http_lock);
-        }
-        
-        $('#introtext').hide();
-    }
-
-    // callback from server after loading device data
-    function device_data_ready(data)
-    {
-        // reset form first
-        $('input.alarm:checked').prop('checked', false);
-        $('input.subscription:checked').prop('checked', false).change();
-        
-        if (data.id && data.id == active_device) {
-            $('#config-device-alias').val(data.devicealias);
-            $('#config-device-mode').val(data.syncmode);
-            $('#config-device-laxpic').prop('checked', data.laxpic ? true : false);
-            
-            $('input.subscription').each(function(i, elem){
-                var key = elem.value;
-                elem.checked = data.subscribed[key] ? true : false;
-            }).change();
-            $('input.alarm').each(function(i, elem){
-                var key = elem.value;
-                elem.checked = data.subscribed[key] == 2;
-            });
-            
-            $('#configform, #prefs-box .boxtitle').show();
-            resize_ui();
-        }
-        else {
-            $('#configform, #prefs-box .boxtitle').hide();
-        }
-    }
-
-    // submit current configuration form to server
-    function save_config()
-    {
-        // TODO: validate device info
-        var data = {
-            cmd: 'save',
-            id: active_device,
-            devicealias: $('#config-device-alias').val(),
-            syncmode: $('#config-device-mode option:selected').val(),
-            laxpic: $('#config-device-laxpic').get(0).checked ? 1 : 0
-        };
-
-        data.subscribed = {};
-        $('input.subscription:checked').each(function(i, elem){
-            data.subscribed[elem.value] = 1;
-        });
-        $('input.alarm:checked').each(function(i, elem){
-            if (data.subscribed[elem.value])
-                data.subscribed[elem.value] = 2;
-        });
-
-        http_lock = rcmail.set_busy(true, 'kolab_zpush.savingdata');
-        rcmail.http_post('plugin.zpushjson', data, http_lock);
-    }
-
-    // callback function when saving has completed
-    function save_complete(p)
-    {
-        if (p.success && p.devicealias) {
-            $('#devices-table tr.selected span.devicealias').html(p.devicealias);
-            rcmail.env.devices[p.id].ALIAS = p.devicealias;
-        }
-    }
-    
-    // handler for delete commands
-    function delete_device_config()
-    {
-        if (active_device && confirm(rcmail.gettext('devicedeleteconfirm', 'kolab_zpush'))) {
-            http_lock = rcmail.set_busy(true, 'kolab_zpush.savingdata');
-            rcmail.http_post('plugin.zpushjson', { cmd:'delete', id:active_device }, http_lock);
-        }
-    }
-
-    // handler for window resize events: sets max-height of folders list scroll container
-    function resize_ui()
-    {
-        if (active_device) {
-            var h = $(window).height();
-            var pos = $('#foldersubscriptions').offset();
-            $('#foldersubscriptions').css('max-height', (h - pos.top - 90) + 'px');
-        }
-    }
-}
-
-
-window.rcmail && rcmail.addEventListener('init', function(evt) {
-    var ACTION_CONFIG = 'plugin.zpushconfig';
-
-    // add button to tabs list
-    var tab = $('<span>').attr('id', 'settingstabpluginzpushconfig').addClass('tablink');
-    var button = $('<a>').attr('href', rcmail.env.comm_path+'&_action=plugin.zpushconfig').html(rcmail.gettext('tabtitle', 'kolab_zpush')).appendTo(tab);
-    rcmail.add_element(tab, 'tabs');
-
-    if (rcmail.env.action == ACTION_CONFIG)
-        new kolab_zpush_config();
-});
-
-
-// extend jQuery
-(function($){
-  $.fn.serializeJSON = function(){
-    var json = {};
-    jQuery.map($(this).serializeArray(), function(n, i) {
-      json[n['name']] = n['value'];
-    });
-    return json;
-  };
-})(jQuery);

roundcubemail-plugins-kolab-3.3.tar.gz/plugins/kolab_zpush/kolab_zpush.php Deleted

@@ -1,349 +0,0 @@
-<?php
-
-/**
- * Z-Push configuration utility for Kolab accounts
- *
- * @version 0.2
- * @author Thomas Bruederli <bruederli@kolabsys.com>
- *
- * Copyright (C) 2012, Kolab Systems AG <contact@kolabsys.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-class kolab_zpush extends rcube_plugin
-{
-    public $task = 'settings';
-    public $urlbase;
-
-    private $rc;
-    private $ui;
-    private $cache;
-    private $devices;
-    private $folders;
-    private $folders_meta;
-    private $root_meta;
-
-    const ROOT_MAILBOX = 'INBOX';
-    const CTYPE_KEY = '/shared/vendor/kolab/folder-type';
-    const ACTIVESYNC_KEY = '/private/vendor/kolab/activesync';
-
-    /**
-     * Plugin initialization.
-     */
-    public function init()
-    {
-        $this->rc = rcube::get_instance();
-
-        $this->require_plugin('jqueryui');
-        $this->add_texts('localization/', true);
-
-        $this->include_script('kolab_zpush.js');
-
-        $this->register_action('plugin.zpushconfig', array($this, 'config_view'));
-        $this->register_action('plugin.zpushjson', array($this, 'json_command'));
-
-        if ($this->rc->action == 'plugin.zpushconfig') {
-            $this->require_plugin('libkolab');
-        }
-    }
-
-
-    /**
-     * Establish IMAP connection
-     */
-    public function init_imap()
-    {
-        $storage = $this->rc->get_storage();
-
-        // @TODO: Metadata is already cached by rcube storage, get rid of cache here
-
-        $this->cache = $this->rc->get_cache('zpush', 'db', 900);
-        $this->cache->expunge();
-
-        if ($meta = $storage->get_metadata(self::ROOT_MAILBOX, self::ACTIVESYNC_KEY)) {
-            // clear cache if device config changed
-            if (($oldmeta = $this->cache->read('devicemeta')) && $oldmeta != $meta)
-                $this->cache->remove();
-
-            $this->root_meta = $this->unserialize_metadata($meta[self::ROOT_MAILBOX][self::ACTIVESYNC_KEY]);
-            $this->cache->remove('devicemeta');
-            $this->cache->write('devicemeta', $meta);
-        }
-    }
-
-
-    /**
-     * Handle JSON requests
-     */
-    public function json_command()
-    {
-        $storage = $this->rc->get_storage();
-        $cmd     = rcube_utils::get_input_value('cmd', rcube_utils::INPUT_GPC);
-        $imei    = rcube_utils::get_input_value('id', rcube_utils::INPUT_GPC);
-
-        switch ($cmd) {
-        case 'load':
-            $result = array();
-            $devices = $this->list_devices();
-            if ($device = $devices[$imei]) {
-                $result['id'] = $imei;
-                $result['devicealias'] = $device['ALIAS'];
-                $result['syncmode'] = intval($device['MODE']);
-                $result['laxpic'] = intval($device['LAXPIC']);
-                $result['subscribed'] = array();
-
-                foreach ($this->folders_meta() as $folder => $meta) {
-                    if ($meta[$imei]['S'])
-                        $result['subscribed'][$folder] = intval($meta[$imei]['S']);
-                }
-
-                $this->rc->output->command('plugin.zpush_data_ready', $result);
-            }
-            else {
-                $this->rc->output->show_message($this->gettext('devicenotfound'), 'error');
-            }
-            break;
-
-        case 'save':
-            $syncmode     = intval(rcube_utils::get_input_value('syncmode', rcube_utils::INPUT_POST));
-            $laxpic       = intval(rcube_utils::get_input_value('laxpic', rcube_utils::INPUT_POST));
-            $devicealias  = rcube_utils::get_input_value('devicealias', rcube_utils::INPUT_POST, true);
-            $subsciptions = rcube_utils::get_input_value('subscribed', rcube_utils::INPUT_POST);
-            $devices = $this->list_devices();
-            $err     = false;
-
-            if ($device = $devices[$imei]) {
-                // update device config if changed
-                if ($devicealias != $this->root_meta['DEVICE'][$imei]['ALIAS']  ||
-                       $syncmode != $this->root_meta['DEVICE'][$imei]['MODE']   ||
-                       $laxpic   != $this->root_meta['DEVICE'][$imei]['LAXPIC'] ||
-                       $subsciptions[self::ROOT_MAILBOX] != $this->root_meta['FOLDER'][$imei]['S']) {
-                    $this->root_meta['DEVICE'][$imei]['MODE'] = $syncmode;
-                    $this->root_meta['DEVICE'][$imei]['ALIAS'] = $devicealias;
-                    $this->root_meta['DEVICE'][$imei]['LAXPIC'] = $laxpic;
-                    $this->root_meta['FOLDER'][$imei]['S'] = intval($subsciptions[self::ROOT_MAILBOX]);
-
-                    $err = !$storage->set_metadata(self::ROOT_MAILBOX,
-                        array(self::ACTIVESYNC_KEY => $this->serialize_metadata($this->root_meta)));
-
-                    // update cached meta data
-                    if (!$err) {
-                        $this->cache->remove('devicemeta');
-                        $this->cache->write('devicemeta', $storage->get_metadata(self::ROOT_MAILBOX, self::ACTIVESYNC_KEY));
-                    }
-                }
-                // iterate over folders list and update metadata if necessary
-                foreach ($this->folders_meta() as $folder => $meta) {
-                    // skip root folder (already handled above)
-                    if ($folder == self::ROOT_MAILBOX)
-                        continue;
-
-                    if ($subsciptions[$folder] != $meta[$imei]['S']) {
-                        $meta[$imei]['S'] = intval($subsciptions[$folder]);
-                        $this->folders_meta[$folder] = $meta;
-                        unset($meta['TYPE']);
-
-                        // read metadata first
-                        $folderdata = $storage->get_metadata($folder, array(self::ACTIVESYNC_KEY));
-                        if ($asyncdata = $folderdata[$folder][self::ACTIVESYNC_KEY])
-                            $metadata = $this->unserialize_metadata($asyncdata);
-                        $metadata['FOLDER'] = $meta;
-
-                        $err |= !$storage->set_metadata($folder, array(self::ACTIVESYNC_KEY => $this->serialize_metadata($metadata)));
-                    }
-                }
-
-                // update cache
-                $this->cache->remove('folders');
-                $this->cache->write('folders', $this->folders_meta);
-
-                $this->rc->output->command('plugin.zpush_save_complete', array('success' => !$err, 'id' => $imei, 'devicealias' => rcube::Q($devicealias)));
-            }
-
-            if ($err)
-                $this->rc->output->show_message($this->gettext('savingerror'), 'error');
-            else
-                $this->rc->output->show_message($this->gettext('successfullysaved'), 'confirmation');
-
-            break;
-
-        case 'delete':
-            $devices = $this->list_devices();
-
-            if ($device = $devices[$imei]) {
-                unset($this->root_meta['DEVICE'][$imei], $this->root_meta['FOLDER'][$imei]);
-
-                // update annotation and cached meta data
-                if ($success = $storage->set_metadata(self::ROOT_MAILBOX, array(self::ACTIVESYNC_KEY => $this->serialize_metadata($this->root_meta)))) {
-                    $this->cache->remove('devicemeta');
-                    $this->cache->write('devicemeta', $storage->get_metadata(self::ROOT_MAILBOX, self::ACTIVESYNC_KEY));
-
-                    // remove device annotation in every folder
-                    foreach ($this->folders_meta() as $folder => $meta) {
-                        // skip root folder (already handled above)
-                        if ($folder == self::ROOT_MAILBOX)
-                            continue;
-
-                        if (isset($meta[$imei])) {

roundcubemail-plugins-kolab-3.3.tar.gz/plugins/kolab_zpush/kolab_zpush_ui.php Deleted

@@ -1,169 +0,0 @@
-<?php
-
-/**
- * Z-Push configuration user interface builder
- *
- * @version 0.2
- * @author Thomas Bruederli <bruederli@kolabsys.com>
- *
- * Copyright (C) 2011, Kolab Systems AG <contact@kolabsys.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-class kolab_zpush_ui
-{
-    private $rc;
-    private $config;
-
-    public function __construct($config)
-    {
-        $this->config = $config;
-        $this->rc = rcube::get_instance();
-
-        $skin = $this->rc->config->get('skin');
-        $this->config->include_stylesheet('skins/' . $skin . '/config.css');
-        $this->rc->output->include_script('list.js');
-        $this->skin_path = $this->config->urlbase . 'skins/' . $skin . '/';
-    }
-
-
-    public function device_list($attrib = array())
-    {
-        $attrib += array('id' => 'devices-list');
-
-        $devices = $this->config->list_devices();
-        $table = new html_table();
-
-        foreach ($devices as $id => $device) {
-            $name = $device['ALIAS'] ? $device['ALIAS'] : $id;
-            $table->add_row(array('id' => 'rcmrow' . $id));
-            $table->add(null, html::span('devicealias', rcube::Q($name)) . html::span('devicetype', rcube::Q($device['TYPE'])));
-        }
-
-        $this->rc->output->add_gui_object('devicelist', $attrib['id']);
-        $this->rc->output->set_env('devices', $devices);
-
-        return $table->show($attrib);
-    }
-
-
-    public function device_config_form($attrib = array())
-    {
-        $table = new html_table(array('cols' => 2));
-
-        $field_id = 'config-device-alias';
-        $input = new html_inputfield(array('name' => 'devicealias', 'id' => $field_id, 'size' => 40));
-        $table->add('title', html::label($field_id, $this->config->gettext('devicealias')));
-        $table->add(null, $input->show());
-
-        $field_id = 'config-device-mode';
-        $select = new html_select(array('name' => 'syncmode', 'id' => $field_id));
-        $select->add(array($this->config->gettext('modeauto'), $this->config->gettext('modeflat'), $this->config->gettext('modefolder')), array('-1', '0', '1'));
-        $table->add('title', html::label($field_id, $this->config->gettext('syncmode')));
-        $table->add(null, $select->show('-1'));
-
-        $field_id = 'config-device-laxpic';
-        $checkbox = new html_checkbox(array('name' => 'laxpic', 'value' => '1', 'id' => $field_id));
-        $table->add('title', $this->config->gettext('imageformat'));
-        $table->add(null, html::label($field_id, $checkbox->show() . ' ' . $this->config->gettext('laxpiclabel')));
-
-        if ($attrib['form'])
-            $this->rc->output->add_gui_object('editform', $attrib['form']);
-
-        return $table->show($attrib);
-    }
-
-
-    public function folder_subscriptions($attrib = array())
-    {
-        if (!$attrib['id'])
-            $attrib['id'] = 'foldersubscriptions';
-
-        // group folders by type (show only known types)
-        $folder_groups = array('mail' => array(), 'contact' => array(), 'event' => array(), 'task' => array());
-        $folder_meta = $this->config->folders_meta();
-        foreach ($this->config->list_folders() as $folder) {
-            $type = $folder_meta[$folder]['TYPE'] ? $folder_meta[$folder]['TYPE'] : 'mail';
-            if (is_array($folder_groups[$type]))
-                $folder_groups[$type][] = $folder;
-        }
-
-        // build block for every folder type
-        foreach ($folder_groups as $type => $group) {
-            if (empty($group))
-                continue;
-            $attrib['type'] = $type;
-            $html .= html::div('subscriptionblock',
-                html::tag('h3', $type, $this->config->gettext($type)) .
-                $this->folder_subscriptions_block($group, $attrib));
-        }
-        
-        $this->rc->output->add_gui_object('subscriptionslist', $attrib['id']);
-
-        return html::div($attrib, $html);
-    }
-
-    public function folder_subscriptions_block($a_folders, $attrib)
-    {
-        $alarms = ($attrib['type'] == 'event' || $attrib['type'] == 'task');
-
-        $table = new html_table(array('cellspacing' => 0));
-        $table->add_header('subscription', $attrib['syncicon'] ? html::img(array('src' => $this->skin_path . $attrib['syncicon'], 'title' => $this->config->gettext('synchronize'))) : '');
-        $table->add_header('alarm', $alarms && $attrib['alarmicon'] ? html::img(array('src' => $this->skin_path . $attrib['alarmicon'], 'title' => $this->config->gettext('withalarms'))) : '');
-        $table->add_header('foldername', $this->config->gettext('folder'));
-
-        $checkbox_sync = new html_checkbox(array('name' => 'subscribed[]', 'class' => 'subscription'));
-        $checkbox_alarm = new html_checkbox(array('name' => 'alarm[]', 'class' => 'alarm'));
-
-        $names = array();
-        foreach ($a_folders as $folder) {
-            $foldername = $origname = preg_replace('/^INBOX &raquo;\s+/', '', kolab_storage::object_name($folder));
-
-            // find folder prefix to truncate (the same code as in kolab_addressbook plugin)
-            for ($i = count($names)-1; $i >= 0; $i--) {
-                if (strpos($foldername, $names[$i].' &raquo; ') === 0) {
-                    $length = strlen($names[$i].' &raquo; ');
-                    $prefix = substr($foldername, 0, $length);
-                    $count  = count(explode(' &raquo; ', $prefix));
-                    $foldername = str_repeat('&nbsp;&nbsp;', $count-1) . '&raquo; ' . substr($foldername, $length);
-                    break;
-                }
-            }
-
-            $names[] = $origname;
-            $classes = array('mailbox');
-
-            if ($folder_class = $this->rc->folder_classname($folder)) {
-                $foldername = $this->rc->gettext($folder_class);
-                $classes[] = $folder_class;
-            }
-
-            $folder_id = 'rcmf' . rcube_utils::html_identifier($folder);
-
-            $table->add_row();
-            $table->add('subscription', $checkbox_sync->show('', array('value' => $folder, 'id' => $folder_id)));
-
-            if ($alarms)
-                $table->add('alarm', $checkbox_alarm->show('', array('value' => $folder, 'id' => $folder_id.'_alarm')));
-            else
-                $table->add('alarm', '');
-
-            $table->add(join(' ', $classes), html::label($folder_id, rcube::Q($foldername)));
-        }
-
-        return $table->show();
-    }
-
-}

roundcubemail-plugins-kolab-3.3.tar.gz/plugins/kolab_zpush/localization Deleted

roundcubemail-plugins-kolab-3.3.tar.gz/plugins/kolab_zpush/localization/de_CH.inc Deleted

@@ -1,29 +0,0 @@
-<?php
-$labels['tabtitle'] = 'Activesync';
-$labels['devices'] = 'Geräte';
-$labels['devicealias'] = 'Gerätename';
-$labels['syncmode'] = 'Modus';
-$labels['modeauto'] = 'Automatisch';
-$labels['modeflat'] = 'Flache Struktur erzwingen';
-$labels['modefolder'] = 'Ordnerstruktur erzwingen';
-$labels['synchronize'] = 'Synchronisieren';
-$labels['withalarms'] = 'Mit Erinnerungen';
-$labels['syncsettings'] = 'Synchronisationseinstellungen';
-$labels['deviceconfig'] = 'Gerätekonfiguration';
-$labels['folderstosync'] = 'Order zum Synchronisieren';
-$labels['mail'] = 'E-Mail';
-$labels['contact'] = 'Kontakte';
-$labels['event'] = 'Kalender';
-$labels['task'] = 'Aufgaben';
-$labels['note'] = 'Notizen';
-$labels['deletedevice'] = 'Gerät löschen';
-$labels['imageformat'] = 'Bildformat';
-$labels['laxpiclabel'] = 'PNG- und GIF-Bilder erlauben';
-$labels['introtext'] = 'Wählen Sie das zu konfigurierende Gerät aus';
-$labels['nodevices'] = 'Es sind noch keine Geräte registriert.<br/><br/>Um ein neues Gerät anzumelden, verbinden Sie dieses zuerst mit dem Server. Eine Anleitung dazu finden Sie im <a href="http://wiki.kolab.org/Z_push#Clients">Wiki</a>. Anschliessend laden Sie diese Seite neu und das Gerät wird hier aufgelistet.';
-$labels['savingdata'] = 'Daten werden gespeichert...';
-$labels['savingerror'] = 'Fehler beim Speichern';
-$labels['notsupported'] = 'Ihr Server unterstützt keine Activesync-Konfiguration';
-$labels['devicedeleteconfirm'] = 'Wollen Sie wirklich alle Einstellungen für dieses Gerät löschen?';
-$labels['successfullydeleted'] = 'Die Geräteinstellungen wurden erfolgreich gelöscht';
-?>

roundcubemail-plugins-kolab-3.3.tar.gz/plugins/kolab_zpush/localization/de_DE.inc Deleted

@@ -1,29 +0,0 @@
-<?php
-$labels['tabtitle'] = 'Activesync';
-$labels['devices'] = 'Geräte';
-$labels['devicealias'] = 'Gerätename';
-$labels['syncmode'] = 'Modus';
-$labels['modeauto'] = 'Automatisch';
-$labels['modeflat'] = 'Flache Struktur erzwingen';
-$labels['modefolder'] = 'Ordnerstruktur erzwingen';
-$labels['synchronize'] = 'Synchronisieren';
-$labels['withalarms'] = 'Mit Erinnerungen';
-$labels['syncsettings'] = 'Synchronisationseinstellungen';
-$labels['deviceconfig'] = 'Gerätekonfiguration';
-$labels['folderstosync'] = 'Order zum Synchronisieren';
-$labels['mail'] = 'E-Mail';
-$labels['contact'] = 'Kontakte';
-$labels['event'] = 'Kalender';
-$labels['task'] = 'Aufgaben';
-$labels['note'] = 'Notizen';
-$labels['deletedevice'] = 'Gerät löschen';
-$labels['imageformat'] = 'Bildformat';
-$labels['laxpiclabel'] = 'PNG- und GIF-Bilder erlauben';
-$labels['introtext'] = 'Wählen Sie das zu konfigurierende Gerät aus';
-$labels['nodevices'] = 'Es sind noch keine Geräte registriert.<br/><br/>Um ein neues Gerät anzumelden, verbinden Sie dieses zuerst mit dem Server. Eine Anleitung dazu finden Sie im <a href="http://wiki.kolab.org/Z_push#Clients">Wiki</a>. Anschliessend laden Sie diese Seite neu und das Gerät wird hier aufgelistet.';
-$labels['savingdata'] = 'Daten werden gespeichert...';
-$labels['savingerror'] = 'Fehler beim Speichern';
-$labels['notsupported'] = 'Ihr Server unterstützt keine Activesync-Konfiguration';
-$labels['devicedeleteconfirm'] = 'Wollen Sie wirklich alle Einstellungen für dieses Gerät löschen?';
-$labels['successfullydeleted'] = 'Die Geräteinstellungen wurden erfolgreich gelöscht';
-?>

roundcubemail-plugins-kolab-3.3.tar.gz/plugins/kolab_zpush/localization/en_US.inc Deleted

@@ -1,33 +0,0 @@
-<?php
-
-$labels = array();
-$labels['tabtitle'] = 'Activesync';
-$labels['devices'] = 'Devices';
-$labels['devicealias'] = 'Device name';
-$labels['syncmode'] = 'Sync Mode';
-$labels['modeauto'] = 'Determine automatically';
-$labels['modeflat'] = 'Force flat mode';
-$labels['modefolder'] = 'Force folder mode';
-$labels['synchronize'] = 'Synchronize';
-$labels['withalarms'] = 'With alarms';
-$labels['syncsettings'] = 'Synchronization settings';
-$labels['deviceconfig'] = 'Device configuration';
-$labels['folderstosync'] = 'Folders to synchronize';
-$labels['mail'] = 'Email';
-$labels['contact'] = 'Address Books';
-$labels['event'] = 'Calendars';
-$labels['task'] = 'Tasks';
-$labels['note'] = 'Notes';
-$labels['configuration'] = 'Configuration';
-$labels['deletedevice'] = 'Delete device';
-$labels['imageformat'] = 'Image format';
-$labels['laxpiclabel'] = 'Allow PNG and GIF images';
-$labels['introtext'] = 'Select a device to configure';
-$labels['nodevices'] = 'There are currently no devices registered.<br/><br/>In order to register a device, please connect it to the server first, using <a href="http://wiki.kolab.org/Z_push#Clients">the instructions in the Wiki</a>. Afterwards the device should become available for configuration here.';
-$labels['savingdata'] = 'Saving data...';
-$labels['savingerror'] = 'Failed to save configuration';
-$labels['notsupported'] = 'Your server does not support metadata/annotations';
-$labels['devicedeleteconfirm'] = 'Do you really want to delete the configuration for this device?';
-$labels['successfullydeleted'] = 'The device configuration was successfully removed';
-
-?>
\ No newline at end of file

roundcubemail-plugins-kolab-3.3.tar.gz/plugins/kolab_zpush/localization/pl_PL.inc Deleted

@@ -1,29 +0,0 @@
-<?php
-$labels['tabtitle'] = 'ActiveSync';
-$labels['devices'] = 'Urządzenia';
-$labels['devicealias'] = 'Nazwa urządzenia';
-$labels['syncmode'] = 'Tryb synchronizacji';
-$labels['modeauto'] = 'Ustaw automatycznie';
-$labels['modeflat'] = 'Wymuś tryb płaski';
-$labels['modefolder'] = 'Wymuś tryb folderu';
-$labels['synchronize'] = 'Synchronizuj';
-$labels['withalarms'] = 'Z alarmami';
-$labels['syncsettings'] = 'Ustawienia synchronizacji';
-$labels['deviceconfig'] = 'Konfiguracja urządzenia';
-$labels['folderstosync'] = 'Foldery do synchronizacji';
-$labels['mail'] = 'Poczta';
-$labels['contact'] = 'Książki adresowe';
-$labels['event'] = 'Kalendarze';
-$labels['task'] = 'Zadania';
-$labels['note'] = 'Notatki';
-$labels['deletedevice'] = 'Usuń urządzenie';
-$labels['imageformat'] = 'Format obrazka';
-$labels['laxpiclabel'] = 'Zezwalaj na obrazki PNG i GIF';
-$labels['introtext'] = 'Wybierz urządzenie do skonfigurowania';
-$labels['nodevices'] = 'Obecnie brak zarejestrowanych urządzeń.<br/><br/>Aby zarejestrować urządzenie najpierw podłącz je do serwera według <a href="http://wiki.kolab.org/Z_push#Clients">instrukcji z Wiki</a>. Po tym procesie urządzenie powinno dać się skonfigurować tutaj.';
-$labels['savingdata'] = 'Zapisywanie danych...';
-$labels['savingerror'] = 'Nie udało się zapisać konfiguracji';
-$labels['notsupported'] = 'Twój serwer nie obsługuje metadanych (metadata/annotations).';
-$labels['devicedeleteconfirm'] = 'Czy na pewno chcesz usunąć konfigurację dla tego urządzenia?';
-$labels['successfullydeleted'] = 'Konfiguracja urządzenia została pomyślnie usunięta.';
-?>

roundcubemail-plugins-kolab-3.3.tar.gz/plugins/kolab_zpush/package.xml Deleted

@@ -1,72 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<package xmlns="http://pear.php.net/dtd/package-2.0" xmlns:tasks="http://pear.php.net/dtd/tasks-1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" packagerversion="1.9.0" version="2.0" xsi:schemaLocation="http://pear.php.net/dtd/tasks-1.0
-    http://pear.php.net/dtd/tasks-1.0.xsd
-    http://pear.php.net/dtd/package-2.0
-    http://pear.php.net/dtd/package-2.0.xsd">
-	<name>kolab_zpush</name>
-    <uri>http://git.kolab.org/roundcubemail-plugins-kolab/</uri>
-	<summary>Z-Push configuration utility for Kolab accounts</summary>
-	<description></description>
-	<lead>
-		<name>Thomas Bruederli</name>
-		<user>thomasb</user>
-		<email>bruederli@kolabsys.com</email>
-		<active>yes</active>
-	</lead>
-	<date>2012-05-14</date>
-	<version>
-		<release>1.0</release>
-		<api>1.0</api>
-	</version>
-	<stability>
-		<release>stable</release>
-	</stability>
-	<license uri="http://www.gnu.org/licenses/agpl.html">GNU AGPL</license>
-	<notes>-</notes>
-	<contents>
-		<dir baseinstalldir="/" name="/">
-			<file name="kolab_zpush.php" role="php"></file>
-			<file name="kolab_zpush_ui.php" role="php"></file>
-			<file name="kolab_zpush.js" role="data"></file>
-			<file name="localization/de_CH.inc" role="data"></file>
-			<file name="localization/de_DE.inc" role="data"></file>
-			<file name="localization/en_US.inc" role="data"></file>
-			<file name="localization/pl_PL.inc" role="data"></file>
-			<file name="skins/classic/templates/config.html" role="data"></file>
-			<file name="skins/classic/config.css" role="data"></file>
-			<file name="skins/classic/alarm-clock.png" role="data"></file>
-			<file name="skins/classic/deviceactions.png" role="data"></file>
-			<file name="skins/classic/foldertypes.png" role="data"></file>
-			<file name="skins/classic/pointer-left.gif" role="data"></file>
-			<file name="skins/classic/synchronize.png" role="data"></file>
-			<file name="skins/larry/templates/config.html" role="data"></file>
-			<file name="skins/larry/config.css" role="data"></file>
-			<file name="skins/larry/alarm-clock.png" role="data"></file>
-			<file name="skins/larry/deviceactions.png" role="data"></file>
-			<file name="skins/larry/foldertypes.png" role="data"></file>
-			<file name="skins/larry/pointer-left.png" role="data"></file>
-			<file name="skins/larry/synchronize.png" role="data"></file>
-			<file name="README" role="data"></file>
-			<file name="LICENSE" role="data"></file>
-		</dir>
-	</contents>
-	<dependencies>
-		<required>
-			<php>
-				<min>5.2.1</min>
-			</php>
-			<pearinstaller>
-				<min>1.7.0</min>
-			</pearinstaller>
-			<package>
-				<name>kolab_core</name>
-				<uri>http://kolabsys.com</uri>
-			</package>
-			<package>
-				<name>jqueryui</name>
-				<channel>pear.roundcube.net</uri>
-			</package>
-		</required>
-	</dependencies>
-	<phprelease/>
-</package>

roundcubemail-plugins-kolab-3.3.tar.gz/plugins/kolab_zpush/skins Deleted

roundcubemail-plugins-kolab-3.3.tar.gz/plugins/kolab_zpush/skins/classic Deleted

roundcubemail-plugins-kolab-3.3.tar.gz/plugins/kolab_zpush/skins/classic/alarm-clock.png Deleted

roundcubemail-plugins-kolab-3.3.tar.gz/plugins/kolab_zpush/skins/classic/config.css Deleted

@@ -1,119 +0,0 @@
-/* Stylesheets for the Kolab Z-Push configuration UI */
-#configform {
-	padding-top: 15px;
-}
-
-#devices-table {
-	width: 100%;
-	table-layout: fixed;
-}
-
-#devices-table td {
-	cursor: pointer;
-}
-
-#devices-table td span.devicetype {
-	padding-left: 1em;
-	font-style: italic;
-	color: #666;
-}
-
-#devices-table tr.selected td span.devicetype {
-	color: #ccc;
-}
-
-.boxfooter a.button.delete,
-.boxfooter a.buttonPas.delete {
-	background-image: url(deviceactions.png);
-}
-
-div.subscriptionblock {
-	float: left;
-	margin: 0.5em 3em 2em 0;
-	padding: 0;
-	border: 1px solid #ddd;
-}
-
-div.subscriptionblock h3 {
-	font-size: 12px;
-	color: #333;
-	margin: 0 0 0.4em 0;
-	padding: 4px 4px 5px 30px;
-	background: url(foldertypes.png) 4px 4px no-repeat #fbfbfb;
-}
-
-div.subscriptionblock h3.contact {
-	background-position: 4px -16px;
-}
-
-div.subscriptionblock h3.event {
-	background-position: 4px -36px;
-}
-
-div.subscriptionblock h3.task {
-	background-position: 4px -56x;
-}
-
-div.subscriptionblock h3.note {
-	background-position: 4px -76px;
-}
-
-#foldersubscriptions thead td {
-	color: #999;
-	font-weight: bold;
-	padding: 3px 5px;
-	min-width: 2em;
-}
-
-#foldersubscriptions tbody td {
-	padding: 2px 5px;
-	border-top: 1px solid #ddd;
-}
-
-#foldersubscriptions td label {
-	display: block;
-}
-
-#foldersubscriptions td.mailbox {
-	padding-right: 3em;
-	padding-left: 2px;
-	min-width: 12em;
-}
-
-#foldersubscriptions td.virtual {
-	color: #999;
-}
-
-#foldersubscriptions {
-	overflow: auto;
-	max-height: 400px;
-	margin-top: 0.5em;
-}
-
-#introtext {
-	position: absolute;
-	top: 12px;
-	left: 5px;
-	padding-left: 10px;
-	max-width: 40em;
-}
-
-#introtext .pointer-left {
-	position: absolute;
-	top: 0;
-	left: 0;
-	width: 14px;
-	height: 100%;
-	background: url(pointer-left.gif) right center no-repeat;
-}
-
-#introtext .inner {
-	border: 3px solid #e7e7e7;
-	background: #fff;
-}
-
-#introtext .bordered {
-	padding: 12px;
-	border: 1px solid #ccc;
-	background: #fff;
-}

roundcubemail-plugins-kolab-3.3.tar.gz/plugins/kolab_zpush/skins/classic/deviceactions.png Deleted

roundcubemail-plugins-kolab-3.3.tar.gz/plugins/kolab_zpush/skins/classic/foldertypes.png Deleted

roundcubemail-plugins-kolab-3.3.tar.gz/plugins/kolab_zpush/skins/classic/pointer-left.gif Deleted

roundcubemail-plugins-kolab-3.3.tar.gz/plugins/kolab_zpush/skins/classic/synchronize.png Deleted

roundcubemail-plugins-kolab-3.3.tar.gz/plugins/kolab_zpush/skins/classic/templates Deleted

roundcubemail-plugins-kolab-3.3.tar.gz/plugins/kolab_zpush/skins/classic/templates/config.html Deleted

@@ -1,63 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<title><roundcube:object name="pagetitle" /></title>
-<roundcube:include file="/includes/links.html" />
-<script type="text/javascript" src="/functions.js"></script>
-<script type="text/javascript" src="/splitter.js"></script>
-</head>
-<body>
-
-<roundcube:include file="/includes/taskbar.html" />
-<roundcube:include file="/includes/header.html" />
-<roundcube:include file="/includes/settingstabs.html" />
-
-<div id="mainscreen">
-
-<div id="sectionslist">
-<div id="directorylist-title" class="boxtitle"><roundcube:label name="kolab_zpush.devices" /></div>
-<div class="boxlistcontent">
-	<roundcube:object name="plugin.devicelist" id="devices-table" class="records-table" cellspacing="0" />
-</div>
-<div class="boxfooter">
-	<roundcube:button type="link" command="plugin.delete-device" title="kolab_zpush.deletedevice" class="buttonPas delete" classAct="button delete" content=" " />
-</div>
-</div>
-
-<div id="prefs-box">
-	<div class="boxtitle" style="display:none"><roundcube:label name="kolab_zpush.syncsettings"></div>
-	<form action="#" method="post" id="configform" class="boxcontent" style="display:none">
-		<fieldset>
-			<legend><roundcube:label name="kolab_zpush.deviceconfig" /></legend>
-			<roundcube:object name="plugin.deviceconfigform" form="configform" />
-		</fieldset>
-		<fieldset>
-			<legend><roundcube:label name="kolab_zpush.folderstosync" /></legend>
-			<roundcube:object name="plugin.foldersubscriptions" form="configform" id="foldersubscriptions" syncicon="synchronize.png" alarmicon="alarm-clock.png" />
-		</fieldset>
-		<p class="formbuttons">
-			<roundcube:button type="input" class="button mainaction" command="plugin.save-config" label="save" />
-			<roundcube:button type="input" class="button" command="plugin.delete-device" label="kolab_zpush.deletedevice" />
-		</p>
-	</form>
-	<div id="introtext">
-		<div class="inner"><div class="bordered">
-			<roundcube:if condition="env:devicecount" />
-				<roundcube:label name="kolab_zpush.introtext" />
-			<roundcube:else />
-				<roundcube:label name="kolab_zpush.nodevices" html="true" />
-			<roundcube:endif />
-		</div></div>
-		<div class="pointer-left"></div>
-	</div>
-</div>
-
-</div>
-
-<script type="text/javascript">
-	var viewsplit = new rcube_splitter({ id:'devicelistsplitter', p1: 'sectionslist', p2: 'prefs-box', orientation: 'v', relative: true, start: 195 });
-	rcmail.add_onload('viewsplit.init()');
-</script>
-
-</body>
-</html>

roundcubemail-plugins-kolab-3.3.tar.gz/plugins/kolab_zpush/skins/larry Deleted

roundcubemail-plugins-kolab-3.3.tar.gz/plugins/kolab_zpush/skins/larry/alarm-clock.png Deleted

roundcubemail-plugins-kolab-3.3.tar.gz/plugins/kolab_zpush/skins/larry/config.css Deleted

@@ -1,135 +0,0 @@
-/* Stylesheets for the Kolab Z-Push configuration UI */
-
-#configform {
-	padding-top: 15px;
-}
-
-#sectionslist {
-	width: 220px;
-}
-
-#prefs-box {
-	position: absolute;
-	top: 0;
-	left: 232px;
-	right: 0;
-	bottom: 0;
-}
-
-#devices-table {
-	width: 100%;
-	table-layout: fixed;
-}
-
-#devices-table td {
-	cursor: pointer;
-}
-
-#devices-table td span.devicetype {
-	padding-left: 1em;
-	font-style: italic;
-	color: #69939e;
-}
-
-div.subscriptionblock {
-	float: left;
-	margin: 0 3em 2em 0;
-	padding: 0;
-}
-
-div.subscriptionblock h3 {
-	font-size: 14px;
-	color: #333;
-	margin: 0 0 0.6em 0;
-	padding: 2px 4px 2px 30px;
-	background: url(foldertypes.png) 4px 2px no-repeat;
-}
-
-div.subscriptionblock h3.contact {
-	background-position: 4px -18px;
-}
-
-div.subscriptionblock h3.event {
-	background-position: 4px -38px;
-}
-
-div.subscriptionblock h3.task {
-	background-position: 4px -58x;
-}
-
-div.subscriptionblock h3.note {
-	background-position: 4px -78px;
-}
-
-#foldersubscriptions thead td {
-	color: #69939e;
-	font-weight: bold;
-	padding: 3px 5px;
-	min-width: 2em;
-	background: #d6eaf3;
-	border-bottom: 2px solid #fff;
-}
-
-#foldersubscriptions tbody td {
-	background: #eee;
-	padding: 2px 5px;
-	border-bottom: 2px solid #fff;
-}
-
-#foldersubscriptions td label {
-	display: block;
-}
-
-#foldersubscriptions td.mailbox {
-	padding-right: 3em;
-	padding-left: 2px;
-	min-width: 12em;
-}
-
-#foldersubscriptions td.virtual {
-	color: #999;
-}
-
-#foldersubscriptions {
-	overflow: auto;
-	max-height: 400px;
-	margin-top: 0.5em;
-}
-
-#introtext {
-	position: absolute;
-	top: 16px;
-	left: 5px;
-	padding-left: 10px;
-	max-width: 40em;
-}
-
-#introtext .pointer-left {
-	position: absolute;
-	top: 0;
-	left: 0;
-	width: 12px;
-	height: 80%;
-	background: url(pointer-left.png) right center no-repeat;
-}
-
-#introtext .inner {
-	color: #eee;
-	padding: 12px;
-	border: 1px solid #333;
-	border-radius: 4px;
-	text-shadow: 0px 1px 1px #333;
-	background: #5b5b5b;
-	background: -moz-linear-gradient(top, #5b5b5b 0%, #3a3a3a 100%);
-	background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#5b5b5b), color-stop(100%,#3a3a3a));
-	background: -o-linear-gradient(top, #5b5b5b 0%, #3a3a3a 100%);
-	background: -ms-linear-gradient(top, #5b5b5b 0%, #3a3a3a 100%);
-	background: linear-gradient(top, #5b5b5b 0%, #3a3a3a 100%);
-	-webkit-box-shadow: inset 0px 0px 0px 1px #7e7e7e, 0 2px 6px 0 #333;
-	-moz-box-shadow: inset 0px 0px 0px 1px #7e7e7e, 0 2px 6px 0 #333;
-	box-shadow: inset 0px 0px 0px 1px #7e7e7e, 0 2px 6px 0 #333;
-}
-
-#introtext a {
-	color: #b0ccd7;
-}

roundcubemail-plugins-kolab-3.3.tar.gz/plugins/kolab_zpush/skins/larry/foldertypes.png Deleted

roundcubemail-plugins-kolab-3.3.tar.gz/plugins/kolab_zpush/skins/larry/pointer-left.png Deleted

roundcubemail-plugins-kolab-3.3.tar.gz/plugins/kolab_zpush/skins/larry/synchronize.png Deleted

roundcubemail-plugins-kolab-3.3.tar.gz/plugins/kolab_zpush/skins/larry/templates Deleted

roundcubemail-plugins-kolab-3.3.tar.gz/plugins/kolab_zpush/skins/larry/templates/config.html Deleted

@@ -1,71 +0,0 @@
-<roundcube:object name="doctype" value="html5" />
-<html>
-<head>
-<title><roundcube:object name="pagetitle" /></title>
-<roundcube:include file="/includes/links.html" />
-</head>
-<body>
-
-<roundcube:include file="/includes/header.html" />
-
-<div id="mainscreen" class="offset">
-
-<roundcube:include file="/includes/settingstabs.html" />
-
-<div id="settings-right">
-
-<div id="sectionslist" class="uibox listbox">
-<h2 id="directorylist-title" class="boxtitle"><roundcube:label name="kolab_zpush.devices" /></h2>
-<div class="boxlistcontent">
-	<roundcube:object name="plugin.devicelist" id="devices-table" class="listing" cellspacing="0" />
-</div>
-<div class="boxfooter">
-	<roundcube:button type="link" command="plugin.delete-device" title="kolab_zpush.deletedevice" class="listbutton delete disabled" classAct="listbutton delete" innerClass="inner" content="x" />
-</div>
-</div>
-
-<div id="prefs-box" class="uibox contentbox">
-	<h1 class="boxtitle" style="display:none"><roundcube:label name="kolab_zpush.syncsettings"></h1>
-	<form action="#" method="post" id="configform" class="boxcontent tabbed" style="display:none">
-		<fieldset>
-			<legend><roundcube:label name="kolab_zpush.folderstosync" /></legend>
-			<roundcube:object name="plugin.foldersubscriptions" form="configform" id="foldersubscriptions" syncicon="synchronize.png" alarmicon="alarm-clock.png" />
-		</fieldset>
-		<fieldset>
-			<legend><roundcube:label name="kolab_zpush.deviceconfig" /></legend>
-			<roundcube:object name="plugin.deviceconfigform" form="configform" class="propform" />
-		</fieldset>
-
-		<p class="formbuttons">
-			<roundcube:button type="input" class="button mainaction" command="plugin.save-config" label="save" />
-			<roundcube:button type="input" class="button" command="plugin.delete-device" label="kolab_zpush.deletedevice" />
-		</p>
-	</form>
-
-	<div id="introtext">
-		<div class="inner">
-			<roundcube:if condition="env:devicecount" />
-				<roundcube:label name="kolab_zpush.introtext" />
-			<roundcube:else />
-				<roundcube:label name="kolab_zpush.nodevices" html="true" />
-			<roundcube:endif />
-		</div>
-		<div class="pointer-left"></div>
-	</div>
-
-	<roundcube:object name="message" id="message" class="statusbar" />
-</div>
-
-</div>
-
-<roundcube:include file="/includes/footer.html" />
-
-<script type="text/javascript">
-
-	var viewsplit = new rcube_splitter({ id:'devicelistsplitter', p1:'#sectionslist', p2:'#prefs-box', orientation:'v', relative:true, start:226, min:150, size:12 });
-	rcmail.add_onload('viewsplit.init()');
-
-</script>
-
-</body>
-</html>

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

@@ -25,7 +25,7 @@
 
 class kolab_storage
 {
-    const CTYPE_KEY = '/shared/vendor/kolab/folder-type';
+    const CTYPE_KEY         = '/shared/vendor/kolab/folder-type';
     const CTYPE_KEY_PRIVATE = '/private/vendor/kolab/folder-type';
     const COLOR_KEY_SHARED  = '/shared/vendor/kolab/color';
     const COLOR_KEY_PRIVATE = '/private/vendor/kolab/color';
@@ -233,20 +233,23 @@
      *
      * @param array  Pseudo-SQL query as list of filter parameter triplets
      * @param string Object type (contact,event,task,journal,file,note,configuration)
+     * @param int    Expected number of records or limit (for performance reasons)
+     *
      * @return array List of Kolab data objects (each represented as hash array)
      * @see kolab_storage_format::select()
      */
-    public static function select($query, $type)
+    public static function select($query, $type, $limit = null)
     {
         self::setup();
         $folder = null;
         $result = array();
 
         foreach ((array)self::list_folders('', '*', $type, null, $folderdata) as $foldername) {
-            if (!$folder)
-                $folder = new kolab_storage_folder($foldername, $type, $folderdata[$foldername]);
-            else
-                $folder->set_folder($foldername, $type, $folderdata[$foldername]);
+            $folder = new kolab_storage_folder($foldername, $type, $folderdata[$foldername]);
+
+            if ($limit) {
+                $folder->set_order_and_limit(null, $limit);
+            }
 
             foreach ($folder->select($query, '*') as $object) {
                 $result[] = $object;
@@ -551,6 +554,7 @@
 
     /**
      * Getter for human-readable name of Kolab object (folder)
+     * with kolab_custom_display_names support.
      * See http://wiki.kolab.org/UI-Concepts/Folder-Listing for reference
      *
      * @param string $folder    IMAP folder name (UTF7-IMAP)
@@ -560,13 +564,47 @@
      */
     public static function object_name($folder, &$folder_ns=null)
     {
-        self::setup();
-
         // find custom display name in folder METADATA
         if ($name = self::custom_displayname($folder)) {
             return $name;
         }
 
+        return self::object_prettyname($folder, $folder_ns);
+    }
+
+    /**
+     * Get custom display name (saved in metadata) for the given folder
+     */
+    public static function custom_displayname($folder)
+    {
+        // find custom display name in folder METADATA
+        if (self::$config->get('kolab_custom_display_names', true) && self::setup()) {
+            // For performance reasons ask for all folders, it will be cached as one cache entry
+            $metadata = self::$imap->get_metadata("*", array(self::NAME_KEY_PRIVATE, self::NAME_KEY_SHARED));
+
+            if ($data = $metadata[$folder]) {
+                if (($name = $data[self::NAME_KEY_PRIVATE]) || ($name = $data[self::NAME_KEY_SHARED])) {
+                    return $name;
+                }
+            }
+        }
+
+        return false;
+    }
+
+    /**
+     * Getter for human-readable name of Kolab object (folder)
+     * See http://wiki.kolab.org/UI-Concepts/Folder-Listing for reference
+     *
+     * @param string $folder    IMAP folder name (UTF7-IMAP)
+     * @param string $folder_ns Will be set to namespace name of the folder
+     *
+     * @return string Name of the folder-object
+     */
+    public static function object_prettyname($folder, &$folder_ns=null)
+    {
+        self::setup();
+
         $found     = false;
         $namespace = self::$imap->get_namespace();
 
@@ -582,6 +620,7 @@
                 }
             }
         }
+
         if (!$found && !empty($namespace['other'])) {
             foreach ($namespace['other'] as $ns) {
                 if (strlen($ns[0]) && strpos($folder, $ns[0]) === 0) {
@@ -605,6 +644,7 @@
                 }
             }
         }
+
         if (!$found && !empty($namespace['personal'])) {
             foreach ($namespace['personal'] as $ns) {
                 if (strlen($ns[0]) && strpos($folder, $ns[0]) === 0) {
@@ -635,22 +675,6 @@
     }
 
     /**
-     * Get custom display name (saved in metadata) for the given folder
-     */
-    public static function custom_displayname($folder)
-    {
-      // find custom display name in folder METADATA
-      if (self::$config->get('kolab_custom_display_names', true)) {
-          $metadata = self::$imap->get_metadata($folder, array(self::NAME_KEY_PRIVATE, self::NAME_KEY_SHARED));
-          if (($name = $metadata[$folder][self::NAME_KEY_PRIVATE]) || ($name = $metadata[$folder][self::NAME_KEY_SHARED])) {
-              return $name;
-          }
-      }
-
-      return false;
-    }
-
-    /**
      * Helper method to generate a truncated folder name to display.
      * Note: $origname is a string returned by self::object_name()
      */
@@ -745,7 +769,7 @@
                 }
             }
 
-            $names[$name] = self::object_name($name);
+            $names[$name] = $c_folder->get_name();
         }
 
         // Build SELECT field of parent folder
@@ -958,16 +982,16 @@
         $nsnames = array('personal' => array(), 'shared' => array(), 'other' => array());
 
         foreach ($folders as $folder) {
-            $folders[$folder->name] = $folder;
+            $_folders[$folder->name] = $folder;
             $ns = $folder->get_namespace();
-            $nsnames[$ns][$folder->name] = strtolower(html_entity_decode(self::object_name($folder->name, $ns), ENT_COMPAT, RCUBE_CHARSET)) . $pad;  // decode &raquo;
+            $nsnames[$ns][$folder->name] = strtolower(html_entity_decode($folder->get_name(), ENT_COMPAT, RCUBE_CHARSET)) . $pad;  // decode &raquo;
         }
 
         // $folders is a result of get_folders() we can assume folders were already sorted
         foreach (array_keys($nsnames) as $ns) {
             asort($nsnames[$ns], SORT_LOCALE_STRING);
             foreach (array_keys($nsnames[$ns]) as $utf7name) {
-                $out[] = $folders[$utf7name];
+                $out[] = $_folders[$utf7name];
             }
         }
 
@@ -1008,6 +1032,7 @@
                 while (count($path) >= $depth && ($parent = join($delim, $path))) {
                     array_pop($path);
                     $parent_parent = join($delim, $path);
+
                     if (!$refs[$parent]) {
                         if ($folder->type && self::folder_type($parent) == $folder->type) {
                             $refs[$parent] = new kolab_storage_folder($parent, $folder->type, $folder->type);
@@ -1017,7 +1042,7 @@
                             $refs[$parent] = new kolab_storage_folder_user($parent, $parent_parent);
                         }
                         else {
-                            $name = kolab_storage::object_name($parent, $folder->get_namespace());
+                            $name = kolab_storage::object_name($parent);
                             $refs[$parent] = new kolab_storage_folder_virtual($parent, $name, $folder->get_namespace(), $parent_parent);
                         }
                         $parents[] = $refs[$parent];
@@ -1599,5 +1624,31 @@
         $db = rcmail::get_instance()->get_dbh();
         $prefix = 'imap://' . urlencode($args['username']) . '@' . $args['host'] . '/%';
         $db->query("DELETE FROM " . $db->table_name('kolab_folders', true) . " WHERE `resource` LIKE ?", $prefix);
+
+    }
+
+    /**
+     * Get folder METADATA for all supported keys
+     * Do this in one go for better caching performance
+     */
+    public static function folder_metadata($folder)
+    {
+        if (self::setup()) {
+            $keys = array(
+                // For better performance we skip displayname here, see (self::custom_displayname())
+                // self::NAME_KEY_PRIVATE,
+                // self::NAME_KEY_SHARED,
+                self::CTYPE_KEY,

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

@@ -25,6 +25,7 @@
 class kolab_storage_cache
 {
     const DB_DATE_FORMAT = 'Y-m-d H:i:s';
+    const MAX_RECORDS    = 500;
 
     public $sync_complete = false;
 
@@ -428,18 +429,23 @@
     /**
      * Move an existing cache entry to a new resource
      *
-     * @param string Entry's IMAP message UID
-     * @param string Entry's Object UID
-     * @param object kolab_storage_folder Target storage folder instance
+     * @param string               Entry's IMAP message UID
+     * @param string               Entry's Object UID
+     * @param kolab_storage_folder Target storage folder instance
+     * @param string               Target entry's IMAP message UID
      */
-    public function move($msguid, $uid, $target)
+    public function move($msguid, $uid, $target, $new_msguid = null)
     {
-        if ($this->ready) {
+        if ($this->ready && $target) {
             // clear cached uid mapping and force new lookup
             unset($target->cache->uid2msg[$uid]);
 
             // resolve new message UID in target folder
-            if ($new_msguid = $target->cache->uid2msguid($uid)) {
+            if (!$new_msguid) {
+                $new_msguid = $target->cache->uid2msguid($uid);
+            }
+
+            if ($new_msguid) {
                 $this->_read_folder_data();
 
                 $this->db->query(
@@ -528,7 +534,7 @@
             $this->_read_folder_data();
 
             // fetch full object data on one query if a small result set is expected
-            $fetchall = !$uids && ($this->limit ? $this->limit[0] : ($count = $this->count($query))) < 500;
+            $fetchall = !$uids && ($this->limit ? $this->limit[0] : ($count = $this->count($query))) < self::MAX_RECORDS;
 
             // skip SELECT if we know it will return nothing
             if ($count === 0) {
@@ -665,7 +671,12 @@
     public function set_order_by($sortcols)
     {
         if (!empty($sortcols)) {
-            $this->order_by = '`' . join('`, `', (array)$sortcols) . '`';
+            $sortcols = array_map(function($v) {
+                list($column, $order) = explode(' ', $v, 2);
+                return "`$column`" . ($order ? " $order" : '');
+            }, (array) $sortcols);
+
+            $this->order_by = join(', ', $sortcols);
         }
         else {
             $this->order_by = null;

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

@@ -25,8 +25,8 @@
 
 class kolab_storage_config
 {
-    const FOLDER_TYPE = 'configuration';
-
+    const FOLDER_TYPE   = 'configuration';
+    const MAX_RELATIONS = 499; // should be less than kolab_storage_cache::MAX_RECORDS
 
     /**
      * Singleton instace of kolab_storage_config
@@ -58,8 +58,12 @@
     /**
      * Private constructor (finds default configuration folder as a config source)
      */
-    private function __construct()
+    private function _init()
     {
+        if ($this->enabled !== null) {
+            return $this->enabled;
+        }
+
         // get all configuration folders
         $this->folders = kolab_storage::get_folders(self::FOLDER_TYPE, false);
 
@@ -86,9 +90,7 @@
         }
 
         // check if configuration folder exist
-        if ($this->default && $this->default->name) {
-            $this->enabled = true;
-        }
+        return $this->enabled = $this->default && $this->default->name;
     }
 
     /**
@@ -98,7 +100,7 @@
      */
     public function is_enabled()
     {
-        return $this->enabled;
+        return $this->_init();
     }
 
     /**
@@ -114,6 +116,10 @@
     {
         $list = array();
 
+        if (!$this->is_enabled()) {
+            return $list;
+        }
+
         foreach ($this->folders as $folder) {
             // we only want to read from default folder
             if ($default && !$folder->default) {
@@ -144,6 +150,10 @@
      */
     public function get_object($uid, $default = false)
     {
+        if (!$this->is_enabled()) {
+            return;
+        }
+
         foreach ($this->folders as $folder) {
             // we only want to read from default folder
             if ($default && !$folder->default) {
@@ -166,7 +176,7 @@
      */
     public function save(&$object, $type)
     {
-        if (!$this->enabled) {
+        if (!$this->is_enabled()) {
             return false;
         }
 
@@ -201,25 +211,27 @@
     /**
      * Remove configuration object
      *
-     * @param string $uid Object UID
+     * @param string|array $object Object array or its UID
      *
      * @return bool True on success, False on failure
      */
-    public function delete($uid)
+    public function delete($object)
     {
-        if (!$this->enabled) {
+        if (!$this->is_enabled()) {
             return false;
         }
 
         // fetch the object to find folder
-        $object = $this->get_object($uid);
+        if (!is_array($object)) {
+            $object = $this->get_object($object);
+        }
 
         if (!$object) {
             return false;
         }
 
         $folder = $this->find_folder($object);
-        $status = $folder->delete($uid);
+        $status = $folder->delete($object);
 
         // on success, update cached tags list
         if ($status && is_array($this->tags)) {
@@ -239,6 +251,10 @@
      */
     public function find_folder($object = array())
     {
+        if (!$this->is_enabled()) {
+            return;
+        }
+
         // find folder object
         if ($object['_mailbox']) {
             foreach ($this->folders as $folder) {
@@ -551,12 +567,17 @@
     /**
      * Assign tags to kolab objects
      *
-     * @param array $records List of kolab objects
+     * @param array $records   List of kolab objects
+     * @param bool  $no_return Don't return anything
      *
      * @return array List of tags
      */
-    public function apply_tags(&$records)
+    public function apply_tags(&$records, $no_return = false)
     {
+        if (empty($records) && $no_return) {
+            return;
+        }
+
         // first convert categories into tags
         foreach ($records as $i => $rec) {
             if (!empty($rec['categories'])) {
@@ -587,12 +608,84 @@
             $tags[] = $tag['name'];
         }
 
-        $tags = array_unique($tags);
+        $tags = $no_return ? null : array_unique($tags);
 
         return $tags;
     }
 
     /**
+     * Assign links (relations) to kolab objects
+     *
+     * @param array $records List of kolab objects
+     */
+    public function apply_links(&$records)
+    {
+        $links = array();
+        $uids  = array();
+        $ids   = array();
+        $limit = 25;
+
+        // get list of object UIDs and UIRs map
+        foreach ($records as $i => $rec) {
+            $uids[] = $rec['uid'];
+            // there can be many objects with the same uid (recurring events)
+            $ids[self::build_member_url($rec['uid'])][] = $i;
+            $records[$i]['links'] = array();
+        }
+
+        if (!empty($uids)) {
+            $uids = array_unique($uids);
+        }
+
+        // The whole story here is to not do SELECT for every object.
+        // We'll build one SELECT for many (limit above) objects at once
+
+        while (!empty($uids)) {
+            $chunk = array_splice($uids, 0, $limit);
+            $chunk = array_map(function($v) { return array('member', '=', $v); }, $chunk);
+
+            $filter = array(
+                array('type', '=', 'relation'),
+                array('category', '=', 'generic'),
+                array($chunk, 'OR'),
+            );
+
+            $relations = $this->get_objects($filter, true, self::MAX_RELATIONS);
+
+            foreach ($relations as $relation) {
+                $links[$relation['uid']] = $relation;
+            }
+        }
+
+        if (empty($links)) {
+            return;
+        }
+
+        // assign links of related messages
+        foreach ($links as $relation) {

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

@@ -64,15 +64,16 @@
      */
     public function set_folder($name, $type = null, $type_annotation = null)
     {
+        $this->name = $name;
+
         if (empty($type_annotation)) {
-            $type_annotation = kolab_storage::folder_type($name);
+            $type_annotation = $this->get_type();
         }
 
         $oldtype = $this->type;
         list($this->type, $suffix) = explode('.', $type_annotation);
         $this->default      = $suffix == 'default';
         $this->subtype      = $this->default ? '' : $suffix;
-        $this->name         = $name;
         $this->id           = kolab_storage::folder_id($name);
         $this->valid        = !empty($this->type) && $this->type != 'mail' && (!$type || $this->type == $type);
 
@@ -155,7 +156,7 @@
     {
         // UID is defined in folder METADATA
         $metakeys = array(kolab_storage::UID_KEY_SHARED, kolab_storage::UID_KEY_CYRUS);
-        $metadata = $this->get_metadata($metakeys);
+        $metadata = $this->get_metadata();
 
         if ($metadata !== null) {
             foreach ($metakeys as $key) {
@@ -347,6 +348,12 @@
         if ($length !== null) {
             $this->cache->set_limit($length, $offset);
         }
+
+        $this->order_and_limit = array(
+            'cols'   => $sortcols,
+            'limit'  => $length,
+            'offset' => $offset,
+        );
     }
 
     /**
@@ -375,7 +382,6 @@
         return $query;
     }
 
-
     /**
      * Getter for a single Kolab object, identified by its UID
      *
@@ -387,17 +393,35 @@
      */
     public function get_object($uid, $type = null)
     {
-        if (!$this->valid) {
+        if (!$this->valid || !$uid) {
             return false;
         }
 
+        $query = array(array('uid', '=', $uid));
+
+        if ($type) {
+            $query[] = array('type', '=', $type);
+        }
+
         // synchronize caches
         $this->cache->synchronize();
 
-        $msguid = $this->cache->uid2msguid($uid);
+        // we don't use cache->get() here because we don't have msguid
+        // yet, using select() is faster
 
-        if ($msguid && ($object = $this->cache->get($msguid, $type))) {
-            return $object;
+        // set order to make sure we get most recent object version
+        // set limit to skip count query
+        $this->cache->set_order_by('msguid DESC');
+        $this->cache->set_limit(1);
+
+        $list = $this->cache->select($this->_prepare_query($query));
+
+        // set the order/limit back to defined value
+        $this->cache->set_order_by($this->order_and_limit['order']);
+        $this->cache->set_limit($this->order_and_limit['limit'], $this->order_and_limit['offset']);
+
+        if (!empty($list) && !empty($list[0])) {
+            return $list[0];
         }
 
         return false;
@@ -906,7 +930,8 @@
             $this->cache->bypass(false);
 
             if ($result) {
-                $this->cache->move($msguid, $uid, $target_folder);
+                $new_uid = ($copyuid = $this->imap->conn->data['COPYUID']) ? $copyuid[1] : null;
+                $this->cache->move($msguid, $uid, $target_folder, $new_uid);
                 return true;
             }
             else {
@@ -1168,6 +1193,4 @@
 
         return true;
     }
-
 }
-

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

@@ -57,7 +57,7 @@
      * @var array
      */
     public $children = array();
-    
+
     /**
      * Name of the parent folder
      * @var string
@@ -69,6 +69,7 @@
     protected $info;
     protected $idata;
     protected $namespace;
+    protected $metadata;
 
 
     /**
@@ -135,10 +136,10 @@
     {
         if (!isset($this->namespace))
             $this->namespace = $this->imap->folder_namespace($this->name);
+
         return $this->namespace;
     }
 
-
     /**
      * Get the display name value of this folder
      *
@@ -146,10 +147,9 @@
      */
     public function get_name()
     {
-        return kolab_storage::object_name($this->name, $this->get_namespace());
+        return kolab_storage::object_name($this->name);
     }
 
-
     /**
      * Getter for the top-end folder name (not the entire path)
      *
@@ -221,7 +221,7 @@
     public function get_color($default = null)
     {
         // color is defined in folder METADATA
-        $metadata = $this->get_metadata(array(kolab_storage::COLOR_KEY_PRIVATE, kolab_storage::COLOR_KEY_SHARED));
+        $metadata = $this->get_metadata();
         if (($color = $metadata[kolab_storage::COLOR_KEY_PRIVATE]) || ($color = $metadata[kolab_storage::COLOR_KEY_SHARED])) {
             return $color;
         }
@@ -229,19 +229,20 @@
         return $default;
     }
 
-
     /**
      * Returns IMAP metadata/annotations (GETMETADATA/GETANNOTATION)
+     * supported by kolab_storage
      *
-     * @param array List of metadata keys to read
      * @return array Metadata entry-value hash array on success, NULL on error
      */
-    public function get_metadata($keys)
+    public function get_metadata()
     {
-        $metadata = rcube::get_instance()->get_storage()->get_metadata($this->name, (array)$keys);
-        return $metadata[$this->name];
-    }
+        if ($this->metadata === null) {
+            $this->metadata = kolab_storage::folder_metadata($this->name);
+        }
 
+        return $this->metadata;
+    }
 
     /**
      * Sets IMAP metadata/annotations (SETMETADATA/SETANNOTATION)
@@ -251,10 +252,10 @@
      */
     public function set_metadata($entries)
     {
+        $this->metadata = null;
         return $this->imap->set_metadata($this->name, $entries);
     }
 
-
     /**
      *
      */
@@ -277,6 +278,21 @@
         return $this->idata;
     }
 
+    /**
+     * Returns (full) type of IMAP folder
+     *
+     * @return string Folder type
+     */
+    public function get_type()
+    {
+        $metadata = $this->get_metadata();
+
+        if (!empty($metadata)) {
+            return kolab_storage::folder_select_metadata($metadata);
+        }
+
+        return $this->type;
+    }
 
     /**
      * Get IMAP ACL information for this folder
@@ -358,4 +374,3 @@
         return $this->name;
     }
 }
-

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

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

roundcubemail-plugins-kolab-3.3.tar.gz/plugins/owncloud Deleted

roundcubemail-plugins-kolab-3.3.tar.gz/plugins/owncloud/LICENSE Deleted

@@ -1,661 +0,0 @@
-                    GNU AFFERO GENERAL PUBLIC LICENSE
-                       Version 3, 19 November 2007
-
- Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-                            Preamble
-
-  The GNU Affero General Public License is a free, copyleft license for
-software and other kinds of works, specifically designed to ensure
-cooperation with the community in the case of network server software.
-
-  The licenses for most software and other practical works are designed
-to take away your freedom to share and change the works.  By contrast,
-our General Public Licenses are intended to guarantee your freedom to
-share and change all versions of a program--to make sure it remains free
-software for all its users.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-them if you wish), that you receive source code or can get it if you
-want it, that you can change the software or use pieces of it in new
-free programs, and that you know you can do these things.
-
-  Developers that use our General Public Licenses protect your rights
-with two steps: (1) assert copyright on the software, and (2) offer
-you this License which gives you legal permission to copy, distribute
-and/or modify the software.
-
-  A secondary benefit of defending all users' freedom is that
-improvements made in alternate versions of the program, if they
-receive widespread use, become available for other developers to
-incorporate.  Many developers of free software are heartened and
-encouraged by the resulting cooperation.  However, in the case of
-software used on network servers, this result may fail to come about.
-The GNU General Public License permits making a modified version and
-letting the public access it on a server without ever releasing its
-source code to the public.
-
-  The GNU Affero General Public License is designed specifically to
-ensure that, in such cases, the modified source code becomes available
-to the community.  It requires the operator of a network server to
-provide the source code of the modified version running there to the
-users of that server.  Therefore, public use of a modified version, on
-a publicly accessible server, gives the public access to the source
-code of the modified version.
-
-  An older license, called the Affero General Public License and
-published by Affero, was designed to accomplish similar goals.  This is
-a different license, not a version of the Affero GPL, but Affero has
-released a new version of the Affero GPL which permits relicensing under
-this license.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-                       TERMS AND CONDITIONS
-
-  0. Definitions.
-
-  "This License" refers to version 3 of the GNU Affero General Public License.
-
-  "Copyright" also means copyright-like laws that apply to other kinds of
-works, such as semiconductor masks.
-
-  "The Program" refers to any copyrightable work licensed under this
-License.  Each licensee is addressed as "you".  "Licensees" and
-"recipients" may be individuals or organizations.
-
-  To "modify" a work means to copy from or adapt all or part of the work
-in a fashion requiring copyright permission, other than the making of an
-exact copy.  The resulting work is called a "modified version" of the
-earlier work or a work "based on" the earlier work.
-
-  A "covered work" means either the unmodified Program or a work based
-on the Program.
-
-  To "propagate" a work means to do anything with it that, without
-permission, would make you directly or secondarily liable for
-infringement under applicable copyright law, except executing it on a
-computer or modifying a private copy.  Propagation includes copying,
-distribution (with or without modification), making available to the
-public, and in some countries other activities as well.
-
-  To "convey" a work means any kind of propagation that enables other
-parties to make or receive copies.  Mere interaction with a user through
-a computer network, with no transfer of a copy, is not conveying.
-
-  An interactive user interface displays "Appropriate Legal Notices"
-to the extent that it includes a convenient and prominently visible
-feature that (1) displays an appropriate copyright notice, and (2)
-tells the user that there is no warranty for the work (except to the
-extent that warranties are provided), that licensees may convey the
-work under this License, and how to view a copy of this License.  If
-the interface presents a list of user commands or options, such as a
-menu, a prominent item in the list meets this criterion.
-
-  1. Source Code.
-
-  The "source code" for a work means the preferred form of the work
-for making modifications to it.  "Object code" means any non-source
-form of a work.
-
-  A "Standard Interface" means an interface that either is an official
-standard defined by a recognized standards body, or, in the case of
-interfaces specified for a particular programming language, one that
-is widely used among developers working in that language.
-
-  The "System Libraries" of an executable work include anything, other
-than the work as a whole, that (a) is included in the normal form of
-packaging a Major Component, but which is not part of that Major
-Component, and (b) serves only to enable use of the work with that
-Major Component, or to implement a Standard Interface for which an
-implementation is available to the public in source code form.  A
-"Major Component", in this context, means a major essential component
-(kernel, window system, and so on) of the specific operating system
-(if any) on which the executable work runs, or a compiler used to
-produce the work, or an object code interpreter used to run it.
-
-  The "Corresponding Source" for a work in object code form means all
-the source code needed to generate, install, and (for an executable
-work) run the object code and to modify the work, including scripts to
-control those activities.  However, it does not include the work's
-System Libraries, or general-purpose tools or generally available free
-programs which are used unmodified in performing those activities but
-which are not part of the work.  For example, Corresponding Source
-includes interface definition files associated with source files for
-the work, and the source code for shared libraries and dynamically
-linked subprograms that the work is specifically designed to require,
-such as by intimate data communication or control flow between those
-subprograms and other parts of the work.
-
-  The Corresponding Source need not include anything that users
-can regenerate automatically from other parts of the Corresponding
-Source.
-
-  The Corresponding Source for a work in source code form is that
-same work.
-
-  2. Basic Permissions.
-
-  All rights granted under this License are granted for the term of
-copyright on the Program, and are irrevocable provided the stated
-conditions are met.  This License explicitly affirms your unlimited
-permission to run the unmodified Program.  The output from running a
-covered work is covered by this License only if the output, given its
-content, constitutes a covered work.  This License acknowledges your
-rights of fair use or other equivalent, as provided by copyright law.
-
-  You may make, run and propagate covered works that you do not
-convey, without conditions so long as your license otherwise remains
-in force.  You may convey covered works to others for the sole purpose
-of having them make modifications exclusively for you, or provide you
-with facilities for running those works, provided that you comply with
-the terms of this License in conveying all material for which you do
-not control copyright.  Those thus making or running the covered works
-for you must do so exclusively on your behalf, under your direction
-and control, on terms that prohibit them from making any copies of
-your copyrighted material outside their relationship with you.
-
-  Conveying under any other circumstances is permitted solely under
-the conditions stated below.  Sublicensing is not allowed; section 10
-makes it unnecessary.
-
-  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
-
-  No covered work shall be deemed part of an effective technological
-measure under any applicable law fulfilling obligations under article
-11 of the WIPO copyright treaty adopted on 20 December 1996, or
-similar laws prohibiting or restricting circumvention of such
-measures.
-
-  When you convey a covered work, you waive any legal power to forbid
-circumvention of technological measures to the extent such circumvention
-is effected by exercising rights under this License with respect to
-the covered work, and you disclaim any intention to limit operation or
-modification of the work as a means of enforcing, against the work's
-users, your or third parties' legal rights to forbid circumvention of
-technological measures.
-
-  4. Conveying Verbatim Copies.
-
-  You may convey verbatim copies of the Program's source code as you
-receive it, in any medium, provided that you conspicuously and
-appropriately publish on each copy an appropriate copyright notice;
-keep intact all notices stating that this License and any
-non-permissive terms added in accord with section 7 apply to the code;
-keep intact all notices of the absence of any warranty; and give all
-recipients a copy of this License along with the Program.
-
-  You may charge any price or no price for each copy that you convey,
-and you may offer support or warranty protection for a fee.
-
-  5. Conveying Modified Source Versions.
-
-  You may convey a work based on the Program, or the modifications to
-produce it from the Program, in the form of source code under the

roundcubemail-plugins-kolab-3.3.tar.gz/plugins/owncloud/README Deleted

@@ -1,78 +0,0 @@
-Connecting Roundcube with ownCloud
-==================================
-
-ATTENTION: this is just a proof-of-concept and should be be considered for
-production use.
-
-This plugin integrates ownCloud into the Roundcube web UI using iframes.
-Beside giving the user one single location to log-in and get access to all
-his/her data, the integration should also allow one to pick files from
-ownCloud when sending email messages and to store email attachments directly
-to the cloud.
-
-
-HOW IT WORKS
-------------
-
-The plugin embeds the web UI for ownCloud though an iframe into the Roundcube
-user interface. When accessing ownCloud though Roundcube, the user's login
-credentials (username + password) will be handed over to ownCloud in order to
-automatically authenticate the current Roundcube user to ownCloud. This
-exchange happens with HTTP requests directley between the ownCloud server and
-the Roundcube server using signed URLs to prevent from interception.
-
-IMPRTANT: The automatic user authentication only works if both apps use the
-same authentication backend. In the Kolab realm this is LDAP. You therefore
-need to configure the LDAP user authentication backend in ownCloud.
-
-Once authenticated, the user sees the ownCloud file manager within Roundcube
-and can do whether he/she is authorized to do. When composing a new email
-message in Roundcube, an addition button appear to select files from the
-ownCloud storage. (this feaure is not yet fully implemented).
-
-When terminating the session in Roundcube by pressing the Logout button, an
-according message is sent to ownCloud to termiate the user's session there, too.
-
-
-REQUIREMENTS
-------------
-
-* Roundcube version 0.9-beta or higher
-* ownCloud version 4.5 or higher
-* both apps running on the same host (due to browser's XSS protection)
-* both IMAP and ownCloud authenticate users on the same backend
-
-
-INSTALLATION
-------------
-
-Install this plugin in Roundcube and enable it.
-
-Rsync the contents of the copy_to_owncloud folder to the ownCloud installation.
-This will add a new app named "kolab_auth" and a theme "kolab" to ownCloud.
-
-
-Roundcube CONFIGURATION
------------------------
-
-Copy the config.inc.php.dist file to config.inc.php in Roundcube's owncloud
-plugin directory. Then edit the file and set the absolute URL where ownCloud
-is accessible and define a secret string for the authentication credential
-exchange between the swo systems.
-
-
-onwCloud CONFIGURATION
-----------------------
-
-Add the following lines to the ownCloud config array:
-
-  'theme' => 'kolab',
-  'kolaburl' => '<url-to-roundcube>',
-  'kolabsecret' => '<shared-secret-string>',
-
-The value for 'kolabsecret' has to match the 'owncloud_secret' string in
-the Roundcube owncloud plugin configuration.
-
-Log-in to ownCloud as an administrator and enable the kolab_auth app.
-
-

roundcubemail-plugins-kolab-3.3.tar.gz/plugins/owncloud/config.inc.php.dist Deleted

roundcubemail-plugins-kolab-3.3.tar.gz/plugins/owncloud/copy_to_owncloud Deleted

roundcubemail-plugins-kolab-3.3.tar.gz/plugins/owncloud/copy_to_owncloud/apps Deleted

roundcubemail-plugins-kolab-3.3.tar.gz/plugins/owncloud/copy_to_owncloud/apps/kolab_auth Deleted

roundcubemail-plugins-kolab-3.3.tar.gz/plugins/owncloud/copy_to_owncloud/apps/kolab_auth/appinfo Deleted

roundcubemail-plugins-kolab-3.3.tar.gz/plugins/owncloud/copy_to_owncloud/apps/kolab_auth/appinfo/app.php Deleted

@@ -1,51 +0,0 @@
-<?php
-
-/*
-  Requires the following options in ownCloud config:
-
-  'kolaburl' => 'https://<kolab-host>/<webclient-url>',
-  'kolabsecret' => '<a secret key, the same as in Roundcube owncloud plugin>',
-
-*/
-
-
-// check for kolab auth token
-if (!OC_User::isLoggedIn() && !empty($_GET['kolab_auth'])) {
-	OCP\Util::writeLog('kolab_auth', 'got kolab auth token', OCP\Util::INFO);
-
-	// decode auth data from Roundcube
-	parse_str(oc_kolab_decode($_GET['kolab_auth']), $request);
-
-	// send back as POST request with session cookie
-	$postdata = http_build_query($request, '', '&');
-
-	// add request signature using secret key
-	$postdata .= '&hmac=' . hash_hmac('sha256', $postdata, OC_Config::getValue('kolabsecret', '<da-sso-secret-key>'));
-
-	$context = stream_context_create(array(
-		'http' => array(
-			'method' => 'POST',
-				'header'=> "Content-type: application/x-www-form-urlencoded\r\n"
-	 				. "Content-Length: " . strlen($postdata) . "\r\n"
-					. "Cookie: " . $request['cname'] . '=' . $request['session'] . "\r\n",
-				'content' => $postdata,
-			)
-		)
-	);
-
-	$url = !empty($_SERVER['HTTP_REFERER']) ? dirname($_SERVER['HTTP_REFERER']) . '/' : OC_Config::getValue('kolaburl', '');
-	$auth = @json_decode(file_get_contents($url . '?_action=owncloudsso', false, $context), true);
-
-	// fake HTTP authentication with user credentials received from Roundcube
-	if ($auth['user'] && $auth['pass']) {
-		$_SERVER['PHP_AUTH_USER'] = $auth['user'];
-		$_SERVER['PHP_AUTH_PW']   = $auth['pass'];
-	}
-}
-
-function oc_kolab_decode($str)
-{
-	// TODO: chose a more sophisticated encryption method
-	return base64_decode(str_pad(strrev($str), strlen($str) % 4, '=', STR_PAD_RIGHT));
-}
-

roundcubemail-plugins-kolab-3.3.tar.gz/plugins/owncloud/copy_to_owncloud/apps/kolab_auth/appinfo/info.xml Deleted

roundcubemail-plugins-kolab-3.3.tar.gz/plugins/owncloud/copy_to_owncloud/apps/kolab_auth/appinfo/version Deleted

roundcubemail-plugins-kolab-3.3.tar.gz/plugins/owncloud/copy_to_owncloud/themes Deleted

roundcubemail-plugins-kolab-3.3.tar.gz/plugins/owncloud/copy_to_owncloud/themes/kolab Deleted

roundcubemail-plugins-kolab-3.3.tar.gz/plugins/owncloud/copy_to_owncloud/themes/kolab/core Deleted

roundcubemail-plugins-kolab-3.3.tar.gz/plugins/owncloud/copy_to_owncloud/themes/kolab/core/css Deleted

roundcubemail-plugins-kolab-3.3.tar.gz/plugins/owncloud/copy_to_owncloud/themes/kolab/core/css/styles.css Deleted

roundcubemail-plugins-kolab-3.3.tar.gz/plugins/owncloud/copy_to_owncloud/themes/kolab/core/js Deleted

roundcubemail-plugins-kolab-3.3.tar.gz/plugins/owncloud/copy_to_owncloud/themes/kolab/core/js/kolab.js Deleted

@@ -1,58 +0,0 @@
-
-function kolab_connector()
-{
-	var remote;
-
-	// public members
-	this.window = window;
-
-	// export public methods
-	this.init = init;
-	this.init_picker = init_picker;
-	this.list_files = list_files;
-
-	function init(rcube)
-	{
-		remote = rcube;
-	}
-
-	function init_picker(rcube)
-	{
-		remote = rcube;
-		
-		if (window.FileActions) {
-			// reset already registered actions
-			// FileActions.actions.file = {};
-
-			FileActions.register('file','Pick', OC.PERMISSION_READ, '', function(filename){
-				var dir = $('#dir').val();
-				remote.file_picked(dir, filename);
-			});
-			FileActions.setDefault('file', 'Pick');
-		}
-	}
-
-	function list_files()
-	{
-		var files = [];
-		$('#fileList tr').each(function(item){
-			var row = $(item),
-				type = row.attrib('data-type'),
-				file = row.attrib('data-file'),
-				mime = row.attrib('data-mime');
-			
-			if (type == 'file') {
-				files.push(file);
-			}
-		});
-
-		return files;
-	}
-}
-
-$(document).ready(function(){
-	// connect with Roundcube running in parent window
-	if (window.parent && parent.rcmail && parent.rcube_owncloud) {
-		parent.rcube_owncloud.connect(new kolab_connector());
-	}
-});
\ No newline at end of file

roundcubemail-plugins-kolab-3.3.tar.gz/plugins/owncloud/copy_to_owncloud/themes/kolab/core/templates Deleted

roundcubemail-plugins-kolab-3.3.tar.gz/plugins/owncloud/copy_to_owncloud/themes/kolab/core/templates/layout.user.php Deleted

@@ -1,56 +0,0 @@
-<!DOCTYPE html>
-<html>
-	<head>
-		<title><?php echo isset($_['application']) && !empty($_['application'])?$_['application'].' | ':'' ?>ownCloud <?php echo OC_User::getUser()?' ('.OC_User::getUser().') ':'' ?></title>
-		<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-		<link rel="shortcut icon" href="<?php echo image_path('', 'favicon.png'); ?>" /><link rel="apple-touch-icon-precomposed" href="<?php echo image_path('', 'favicon-touch.png'); ?>" />
-		<?php foreach($_['cssfiles'] as $cssfile): ?>
-			<link rel="stylesheet" href="<?php echo $cssfile; ?>" type="text/css" media="screen" />
-		<?php endforeach; ?>
-		<script type="text/javascript">
-			var oc_webroot = '<?php echo OC::$WEBROOT; ?>';
-			var oc_appswebroots = <?php echo $_['apps_paths'] ?>;
-			var oc_current_user = '<?php echo OC_User::getUser() ?>';
-			var oc_requesttoken = '<?php echo $_['requesttoken']; ?>';
-			var oc_requestlifespan = '<?php echo $_['requestlifespan']; ?>';
-		</script>
-		<?php foreach($_['jsfiles'] as $jsfile): ?>
-			<script type="text/javascript" src="<?php echo $jsfile; ?>"></script>
-		<?php endforeach; ?>
-		<script type="text/javascript" src="<?php echo OC::$WEBROOT.'/themes/kolab/core/js/kolab.js'; ?>"></script>
-		<?php foreach($_['headers'] as $header): ?>
-			<?php
-				echo '<'.$header['tag'].' ';
-				foreach($header['attributes'] as $name=>$value) {
-					echo "$name='$value' ";
-				};
-				echo '/>';
-			?>
-		<?php endforeach; ?>
-	</head>
-
-	<body id="<?php echo $_['bodyid'];?>">
-		<nav><div id="navigation">
-			<ul id="apps" class="svg">
-				<?php foreach($_['navigation'] as $entry): ?>
-					<li data-id="<?php echo $entry['id']; ?>"><a style="background-image:url(<?php echo $entry['icon']; ?>)" href="<?php echo $entry['href']; ?>" title="" <?php if( $entry['active'] ): ?> class="active"<?php endif; ?>><?php echo $entry['name']; ?></a>
-					</li>
-				<?php endforeach; ?>
-			</ul>
-
-			<ul id="settings" class="svg">
-				<img role=button tabindex=0 id="expand" class="svg" alt="<?php echo $l->t('Settings');?>" src="<?php echo image_path('', 'actions/settings.svg'); ?>" />
-				<span><?php echo $l->t('Settings');?></span>
-				<div id="expanddiv" <?php if($_['bodyid'] == 'body-user') echo 'style="display:none;"'; ?>>
-				<?php foreach($_['settingsnavigation'] as $entry):?>
-					<li><a style="background-image:url(<?php echo $entry['icon']; ?>)" href="<?php echo $entry['href']; ?>" title="" <?php if( $entry["active"] ): ?> class="active"<?php endif; ?>><?php echo $entry['name'] ?></a></li>
-				<?php endforeach; ?>
-				</div>
-			</ul>
-		</div></nav>
-
-		<div id="content">
-			<?php echo $_['content']; ?>
-		</div>
-	</body>
-</html>

roundcubemail-plugins-kolab-3.3.tar.gz/plugins/owncloud/localization Deleted

roundcubemail-plugins-kolab-3.3.tar.gz/plugins/owncloud/localization/bg_BG.inc Deleted

roundcubemail-plugins-kolab-3.3.tar.gz/plugins/owncloud/localization/ca_ES.inc Deleted

roundcubemail-plugins-kolab-3.3.tar.gz/plugins/owncloud/localization/cs_CZ.inc Deleted

roundcubemail-plugins-kolab-3.3.tar.gz/plugins/owncloud/localization/da_DK.inc Deleted

roundcubemail-plugins-kolab-3.3.tar.gz/plugins/owncloud/localization/de_CH.inc Deleted

roundcubemail-plugins-kolab-3.3.tar.gz/plugins/owncloud/localization/de_DE.inc Deleted

roundcubemail-plugins-kolab-3.3.tar.gz/plugins/owncloud/localization/en_US.inc Deleted

roundcubemail-plugins-kolab-3.3.tar.gz/plugins/owncloud/localization/es_AR.inc Deleted

roundcubemail-plugins-kolab-3.3.tar.gz/plugins/owncloud/localization/es_ES.inc Deleted

roundcubemail-plugins-kolab-3.3.tar.gz/plugins/owncloud/localization/et_EE.inc Deleted

roundcubemail-plugins-kolab-3.3.tar.gz/plugins/owncloud/localization/fi_FI.inc Deleted

roundcubemail-plugins-kolab-3.3.tar.gz/plugins/owncloud/localization/fr_FR.inc Deleted

roundcubemail-plugins-kolab-3.3.tar.gz/plugins/owncloud/localization/he.inc Deleted

roundcubemail-plugins-kolab-3.3.tar.gz/plugins/owncloud/localization/hr.inc Deleted

roundcubemail-plugins-kolab-3.3.tar.gz/plugins/owncloud/localization/hu_HU.inc Deleted

roundcubemail-plugins-kolab-3.3.tar.gz/plugins/owncloud/localization/it_IT.inc Deleted

roundcubemail-plugins-kolab-3.3.tar.gz/plugins/owncloud/localization/ja_JP.inc Deleted

roundcubemail-plugins-kolab-3.3.tar.gz/plugins/owncloud/localization/ku_IQ.inc Deleted

roundcubemail-plugins-kolab-3.3.tar.gz/plugins/owncloud/localization/nl_NL.inc Deleted

roundcubemail-plugins-kolab-3.3.tar.gz/plugins/owncloud/localization/pl.inc Deleted

roundcubemail-plugins-kolab-3.3.tar.gz/plugins/owncloud/localization/pl_PL.inc Deleted

roundcubemail-plugins-kolab-3.3.tar.gz/plugins/owncloud/localization/pt_BR.inc Deleted

roundcubemail-plugins-kolab-3.3.tar.gz/plugins/owncloud/localization/ro.inc Deleted

roundcubemail-plugins-kolab-3.3.tar.gz/plugins/owncloud/localization/ru_RU.inc Deleted

roundcubemail-plugins-kolab-3.3.tar.gz/plugins/owncloud/localization/sk.inc Deleted

roundcubemail-plugins-kolab-3.3.tar.gz/plugins/owncloud/localization/sl.inc Deleted

roundcubemail-plugins-kolab-3.3.tar.gz/plugins/owncloud/localization/sv.inc Deleted

roundcubemail-plugins-kolab-3.3.tar.gz/plugins/owncloud/localization/sv_SE.inc Deleted

roundcubemail-plugins-kolab-3.3.tar.gz/plugins/owncloud/localization/th.inc Deleted

roundcubemail-plugins-kolab-3.3.tar.gz/plugins/owncloud/localization/tr_TR.inc Deleted

roundcubemail-plugins-kolab-3.3.tar.gz/plugins/owncloud/localization/uk.inc Deleted

roundcubemail-plugins-kolab-3.3.tar.gz/plugins/owncloud/localization/vi.inc Deleted

roundcubemail-plugins-kolab-3.3.tar.gz/plugins/owncloud/localization/vi_VN.inc Deleted

roundcubemail-plugins-kolab-3.3.tar.gz/plugins/owncloud/localization/zh_CN.inc Deleted

roundcubemail-plugins-kolab-3.3.tar.gz/plugins/owncloud/localization/zh_TW.inc Deleted

roundcubemail-plugins-kolab-3.3.tar.gz/plugins/owncloud/owncloud.js Deleted

@@ -1,94 +0,0 @@
-/**
- *
- */
-function rcube_owncloud()
-{
-	this.cloud;
-	this.dialog;
-}
-
-// singleton getter
-rcube_owncloud.instance = function()
-{
-	if (!rcube_owncloud._instance) {
-		rcube_owncloud._instance = new rcube_owncloud;
-	}
-
-	return rcube_owncloud._instance;
-};
-
-// remote connector
-rcube_owncloud.connect = function(client)
-{
-	rcube_owncloud.instance().connect(client);
-};
-
-rcube_owncloud.prototype = {
-
-// callback from the ownCloud connector script loaded in the iframe
-connect: function(client)
-{
-	var me = this;
-	this.cloud = client;
-
-	if (this.dialog)
-		client.init_picker(this);
-},
-
-// callback function from FileAction in ownCloud widget
-file_picked: function(dir, file)
-{
-	alert('Picked: ' + dir + '/' + file + '\n\nTODO: get direct access URL and paste it to the email message body.');
-
-	if (this.dialog && this.dialog.is(':ui-dialog'))
-		this.dialog.dialog('close');
-},
-
-// open a dialog showing the ownCloud widget
-open_dialog: function(html)
-{
-	// request iframe code from server
-	if (!this.dialog && !html) {
-		var me = this;
-		rcmail.addEventListener('plugin.owncloudembed', function(html){ me.open_dialog(html); });
-		rcmail.http_request('owncloud/embed');
-		return;
-	}
-	// create jQuery dialog with iframe
-	else if (html) {
-		var height = $(window).height() * 0.8;
-		this.dialog = $('<div>')
-			.addClass('owncloudembed')
-			.css({ width:'100%', height:height+'px' })
-			.appendTo(document.body)
-			.html(html);
-
-		this.dialog.dialog({
-			modal: true,
-			autoOpen: false,
-			title: 'Select a file from the cloud',
-			width: '80%',
-			height: height
-		});
-	}
-
-	// open the dialog
-	if (this.dialog && this.dialog.is(':ui-dialog'))
-		this.dialog.dialog('open');
-}
-
-};
-
-// Roundcube startup
-window.rcmail && rcmail.addEventListener('init', function(){
-	// add a button for ownCloud file selection to compose screen
-	if (rcmail.env.action == 'compose') {
-		$('<a>')
-			.addClass('button owncloudcompose')
-			.html('ownCloud')
-			.click(function(){ rcube_owncloud.instance().open_dialog(); return false; })
-			.insertAfter('#compose-attachments input.button')
-			.before('&nbsp;');
-	}
-})
-

roundcubemail-plugins-kolab-3.3.tar.gz/plugins/owncloud/owncloud.php Deleted

@@ -1,136 +0,0 @@
-<?php
-
-/**
- * OwnCloud Plugin
- *
- * @author Aleksander 'A.L.E.C' Machniak <machniak@kolabsys.com>
- * @author Thomas Bruederli <bruederli@kolabsys.com>
- * @licence GNU AGPL
- *
- * Configuration (see config.inc.php.dist)
- * 
- */
-
-class owncloud extends rcube_plugin
-{
-    // all task excluding 'login'
-   public $task = '?(?!login).*';
-    // skip frames
-    public $noframe = true;
-
-    function init()
-    {
-        // requires kolab_auth plugin
-        if (empty($_SESSION['kolab_uid'])) {
-            // temporary:
-            $_SESSION['kolab_uid'] = $_SESSION['username'];
-            // return;
-        }
-
-        $rcmail = rcube::get_instance();
-
-        $this->add_texts('localization/', false);
-
-        // register task
-        $this->register_task('owncloud');
-
-        // register actions
-        $this->register_action('index', array($this, 'action'));
-        $this->register_action('embed', array($this, 'embed'));
-        $this->add_hook('session_destroy', array($this, 'logout'));
-
-        // handler for sso requests sent by the owncloud kolab_auth app
-        if ($rcmail->action == 'owncloudsso' && !empty($_POST['token'])) {
-            $this->add_hook('startup', array($this, 'sso_request'));
-        }
-
-        // add taskbar button
-        $this->add_button(array(
-            'command'    => 'owncloud',
-            'class'      => 'button-owncloud',
-            'classsel'   => 'button-owncloud button-selected',
-            'innerclass' => 'button-inner',
-            'label'      => 'owncloud.owncloud',
-            ), 'taskbar');
-
-        // add style for taskbar button (must be here) and Help UI
-        $this->include_stylesheet($this->local_skin_path()."/owncloud.css");
-
-        if ($rcmail->task == 'owncloud' || $rcmail->action == 'compose') {
-            $this->include_script('owncloud.js');
-        }
-    }
-
-    function action()
-    {
-        $rcmail = rcube::get_instance();
-
-        $rcmail->output->add_handlers(array('owncloudframe' => array($this, 'frame')));
-        $rcmail->output->set_pagetitle($this->gettext('owncloud'));
-        $rcmail->output->send('owncloud.owncloud');
-    }
-
-    function embed()
-    {
-        $rcmail = rcmail::get_instance();
-        $rcmail->output->command('plugin.owncloudembed', $this->frame());
-        $rcmail->output->send();
-    }
-
-    function frame()
-    {
-        $rcmail = rcube::get_instance();
-        $this->load_config();
-
-        // generate SSO auth token
-        if (empty($_SESSION['owncloudauth']))
-            $_SESSION['owncloudauth'] = md5('ocsso' . $_SESSION['user_id'] . microtime() . $rcmail->config->get('des_key'));
-
-        $src  = $rcmail->config->get('owncloud_url');
-        $src .= '?kolab_auth=' . strrev(rtrim(base64_encode(http_build_query(array(
-            'session' => session_id(),
-            'cname'   => session_name(),
-            'token'   => $_SESSION['owncloudauth'],
-        ))), '='));
-
-        return html::tag('iframe', array('id' => 'owncloudframe', 'src' => $src,
-            'width' => "100%", 'height' => "100%", 'frameborder' => 0));
-    }
-
-    function logout()
-    {
-        $rcmail = rcube::get_instance();
-        $this->load_config();
-
-        // send logout request to owncloud
-        $logout_url = $rcmail->config->get('owncloud_url') . '?logout=true';
-        $rcmail->output->add_script("new Image().src = '$logout_url';", 'foot');
-    }
-
-    function sso_request()
-    {
-        $response = array();
-        $sign_valid = false;
-
-        $rcmail = rcube::get_instance();
-        $this->load_config();
-
-        // check signature
-        if ($hmac = $_POST['hmac']) {
-            unset($_POST['hmac']);
-            $postdata = http_build_query($_POST, '', '&');
-            $sign_valid = ($hmac == hash_hmac('sha256', $postdata, $rcmail->config->get('owncloud_secret', '<undefined-secret>')));
-        }
-
-        // if ownCloud sent a valid auth request, return plain username and password
-        if ($sign_valid && !empty($_POST['token']) && $_POST['token'] == $_SESSION['owncloudauth']) {
-            $user = $_SESSION['kolab_uid']; // requires kolab_auth plugin
-            $pass = $rcmail->decrypt($_SESSION['password']);
-            $response = array('user' => $user, 'pass' => $pass);
-        }
-
-        echo json_encode($response);
-        exit;
-    }
-
-}

roundcubemail-plugins-kolab-3.3.tar.gz/plugins/owncloud/skins Deleted

roundcubemail-plugins-kolab-3.3.tar.gz/plugins/owncloud/skins/classic Deleted

roundcubemail-plugins-kolab-3.3.tar.gz/plugins/owncloud/skins/classic/cloud.png Deleted

roundcubemail-plugins-kolab-3.3.tar.gz/plugins/owncloud/skins/classic/owncloud.css Deleted

roundcubemail-plugins-kolab-3.3.tar.gz/plugins/owncloud/skins/classic/templates Deleted

roundcubemail-plugins-kolab-3.3.tar.gz/plugins/owncloud/skins/classic/templates/owncloud.html Deleted

roundcubemail-plugins-kolab-3.3.tar.gz/plugins/owncloud/skins/larry Deleted

roundcubemail-plugins-kolab-3.3.tar.gz/plugins/owncloud/skins/larry/cloud.png Deleted

roundcubemail-plugins-kolab-3.3.tar.gz/plugins/owncloud/skins/larry/owncloud.css Deleted

roundcubemail-plugins-kolab-3.3.tar.gz/plugins/owncloud/skins/larry/templates Deleted

roundcubemail-plugins-kolab-3.3.tar.gz/plugins/owncloud/skins/larry/templates/owncloud.html Deleted

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

@@ -46,7 +46,7 @@
      */
     public function __construct($plugin)
     {
-        $this->rc = $plugin->rc;
+        $this->rc     = $plugin->rc;
         $this->plugin = $plugin;
 
         if (kolab_storage::$version == '2.0') {
@@ -59,8 +59,6 @@
         // get configuration for the Bonnie API
         $this->bonnie_api = libkolab::get_bonnie_api();
 
-        $this->_read_lists();
-
         $this->plugin->register_action('folder-acl', array($this, 'folder_acl'));
     }
 
@@ -70,8 +68,9 @@
     private function _read_lists($force = false)
     {
         // already read sources
-        if (isset($this->lists) && !$force)
+        if (isset($this->lists) && !$force) {
             return $this->lists;
+        }
 
         // get all folders that have type "task"
         $folders = kolab_storage::sort_folders(kolab_storage::get_folders('task'));
@@ -102,6 +101,8 @@
             $this->folders[$tasklist['id']] = $folder;
             $this->folders[$folder->name] = $folder;
         }
+
+        return $this->lists;
     }
 
     /**
@@ -165,6 +166,8 @@
      */
     public function get_lists(&$tree = null)
     {
+        $this->_read_lists();
+
         // attempt to create a default list for this user
         if (empty($this->lists) && !isset($this->search_more_results)) {
             $prop = array('name' => 'Tasks', 'color' => '0000CC', 'default' => true);
@@ -211,7 +214,7 @@
             if ($folder instanceof kolab_storage_folder_user) {
                 $lists[$list_id] = array(
                     'id'       => $list_id,
-                    'name'     => $folder->get_name(),
+                    'name'     => $fullname,
                     'listname' => $listname,
                     'title'    => $folder->get_title(),
                     'virtual'  => true,
@@ -225,7 +228,7 @@
             else if ($folder->virtual) {
                 $lists[$list_id] = array(
                     'id'       => $list_id,
-                    'name'     => kolab_storage::object_name($fullname),
+                    'name'     => $fullname,
                     'listname' => $listname,
                     'virtual'  => true,
                     'editable' => false,
@@ -256,6 +259,8 @@
      */
     protected function get_folder($id)
     {
+        $this->_read_lists();
+
         // create list and folder instance if necesary
         if (!$this->lists[$id]) {
             $folder = kolab_storage::get_folder(kolab_storage::id_decode($id));
@@ -385,8 +390,10 @@
                         ($prop['active'] ? kolab_storage::folder_activate($subfolder) : kolab_storage::folder_deactivate($subfolder));
                 }
             }
+
             return $ret;
         }
+
         return false;
     }
 
@@ -400,10 +407,11 @@
     public function delete_list($prop)
     {
         if ($prop['id'] && ($folder = $this->get_folder($prop['id']))) {
-          if (kolab_storage::folder_delete($folder->name))
-              return true;
-          else
-              $this->last_error = kolab_storage::$last_error;
+            if (kolab_storage::folder_delete($folder->name)) {
+                return true;
+            }
+
+            $this->last_error = kolab_storage::$last_error;
         }
 
         return false;
@@ -486,21 +494,26 @@
      */
     public function count_tasks($lists = null)
     {
-        if (empty($lists))
-            $lists = array_keys($this->lists);
-        else if (is_string($lists))
+        if (empty($lists)) {
+            $lists = $this->_read_lists();
+            $lists = array_keys($lists);
+        }
+        else if (is_string($lists)) {
             $lists = explode(',', $lists);
+        }
 
-        $today_date = new DateTime('now', $this->plugin->timezone);
-        $today = $today_date->format('Y-m-d');
+        $today_date    = new DateTime('now', $this->plugin->timezone);
+        $today         = $today_date->format('Y-m-d');
         $tomorrow_date = new DateTime('now + 1 day', $this->plugin->timezone);
-        $tomorrow = $tomorrow_date->format('Y-m-d');
+        $tomorrow      = $tomorrow_date->format('Y-m-d');
 
         $counts = array('all' => 0, 'flagged' => 0, 'today' => 0, 'tomorrow' => 0, 'overdue' => 0, 'nodate' => 0, 'mytasks' => 0);
+
         foreach ($lists as $list_id) {
             if (!$folder = $this->get_folder($list_id)) {
                 continue;
             }
+
             foreach ($folder->select(array(array('tags','!~','x-complete'))) as $record) {
                 $rec = $this->_to_rcube_task($record, $list_id, false);
 
@@ -542,11 +555,15 @@
      */
     public function list_tasks($filter, $lists = null)
     {
-        if (empty($lists))
-            $lists = array_keys($this->lists);
-        else if (is_string($lists))
+        if (empty($lists)) {
+            $lists = $this->_read_lists();
+            $lists = array_keys($lists);
+        }
+        else if (is_string($lists)) {
             $lists = explode(',', $lists);
+        }
 
+        $config  = kolab_storage_config::get_instance();
         $results = array();
 
         // query Kolab storage
@@ -568,23 +585,25 @@
             $query[] = array('changed', '>=', $filter['since']);
         }
 
-        // load all tags into memory first
-        kolab_storage_config::get_instance()->get_tags();
-
         foreach ($lists as $list_id) {
             if (!$folder = $this->get_folder($list_id)) {
                 continue;
             }
-            foreach ($folder->select($query) as $record) {
-                $this->load_tags($record);
-                $task = $this->_to_rcube_task($record, $list_id);
 
+            foreach ($folder->select($query) as $record) {
                 // TODO: post-filter tasks returned from storage
-
-                $results[] = $task;
+                $record['list_id'] = $list_id;
+                $results[] = $record;
             }
         }
 
+        $config->apply_tags($results, true);
+        $config->apply_links($results);
+
+        foreach (array_keys($results) as $idx) {
+            $results[$idx] = $this->_to_rcube_task($results[$idx], $results[$idx]['list_id']);
+        }
+
         // avoid session race conditions that will loose temporary subscriptions
         $this->plugin->rc->session->nowrite = true;
 
@@ -599,7 +618,9 @@
      */
     public function get_task($prop)
     {
+        $this->_read_lists();
         $this->_parse_id($prop);
+
         $id      = $prop['uid'];
         $list_id = $prop['list'];
         $folders = $list_id ? array($list_id => $this->get_folder($list_id)) : $this->folders;
@@ -745,7 +766,7 @@
         $list_id = $prop['list'];
         list($uid, $mailbox, $msguid) = $this->_resolve_task_identity($prop);

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

roundcubemail-plugins-kolab.dsc Changed

Changes of Revision 22