Kolab Groupware OBS

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

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

@@ -2961,6 +2961,15 @@
       return false;
     };
 
+    this.calendar_refresh_source = function(id)
+    {
+      // got race-conditions fc.currentFetchID when using refetchEvents,
+      // so we remove and add the source instead
+      // fc.fullCalendar('refetchEvents', me.calendars[id]);
+      fc.fullCalendar('removeEventSource', me.calendars[id]);
+      fc.fullCalendar('addEventSource', me.calendars[id]);
+    };
+
     this.calendar_destroy_source = function(id)
     {
       var delete_ids = [];
@@ -4238,6 +4247,7 @@
   rcmail.register_command('add-resource', function(){ cal.add_resource2event(); }, false);
 
   // register callback commands
+  rcmail.addEventListener('plugin.refresh_source', function(data) { cal.calendar_refresh_source(data); });
   rcmail.addEventListener('plugin.destroy_source', function(p){ cal.calendar_destroy_source(p.id); });
   rcmail.addEventListener('plugin.unlock_saving', function(p){ cal.unlock_saving(); });
   rcmail.addEventListener('plugin.refresh_calendar', function(p){ cal.refresh(p); });

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

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

@@ -825,11 +825,7 @@
         if (!$filter) {
             // Get ALL folders list, standard way
             if ($subscribed) {
-                $folders = self::$imap->list_folders_subscribed($root, $mbox);
-                // add temporarily subscribed folders
-                if (self::$with_tempsubs && is_array($_SESSION['kolab_subscribed_folders'])) {
-                    $folders = array_unique(array_merge($folders, $_SESSION['kolab_subscribed_folders']));
-                }
+                $folders = self::_imap_list_subscribed($root, $mbox);
             }
             else {
                 $folders = self::_imap_list_folders($root, $mbox);
@@ -866,12 +862,7 @@
 
         // Get folders list
         if ($subscribed) {
-            $folders = self::$imap->list_folders_subscribed($root, $mbox);
-
-            // add temporarily subscribed folders
-            if (self::$with_tempsubs && is_array($_SESSION['kolab_subscribed_folders'])) {
-                $folders = array_unique(array_merge($folders, $_SESSION['kolab_subscribed_folders']));
-            }
+            $folders = self::_imap_list_subscribed($root, $mbox);
         }
         else {
             $folders = self::_imap_list_folders($root, $mbox);
@@ -934,6 +925,21 @@
         return $folders;
     }
 
+    /**
+     * Wrapper for rcube_imap::list_folders_subscribed()
+     * with support for temporarily subscribed folders
+     */
+    protected static function _imap_list_subscribed($root, $mbox)
+    {
+        $folders = self::$imap->list_folders_subscribed($root, $mbox);
+
+        // add temporarily subscribed folders
+        if (self::$with_tempsubs && is_array($_SESSION['kolab_subscribed_folders'])) {
+            $folders = array_unique(array_merge($folders, $_SESSION['kolab_subscribed_folders']));
+        }
+
+        return $folders;
+    }
 
     /**
      * Search for shared or otherwise not listed groupware folders the user has access
@@ -1538,12 +1544,12 @@
      *
      * @param array   User entry from LDAP
      * @param string  Data type to list folders for (contact,event,task,journal,file,note,mail,configuration)
-     * @param boolean Return subscribed folders only (null to use configured subscription mode)
+     * @param int     1 - subscribed folders only, 0 - all folders, 2 - all non-active
      * @param array   Will be filled with folder-types data
      *
      * @return array List of folders
      */
-    public static function list_user_folders($user, $type, $subscribed = null, &$folderdata = array())
+    public static function list_user_folders($user, $type, $subscribed = 0, &$folderdata = array())
     {
         self::setup();
 
@@ -1554,9 +1560,19 @@
         if (!empty($user[$user_attrib])) {
             list($mbox) = explode('@', $user[$user_attrib]);
 
-            $delimiter = self::$imap->get_hierarchy_delimiter();
-            $other_ns = self::namespace_root('other');
-            $folders = self::list_folders($other_ns . $mbox . $delimiter, '*', $type, $subscribed, $folderdata);
+            $delimiter  = self::$imap->get_hierarchy_delimiter();
+            $other_ns   = self::namespace_root('other');
+            $prefix     = $other_ns . $mbox . $delimiter;
+            $subscribed = (int) $subscribed;
+            $subs       = $subscribed < 2 ? (bool) $subscribed : false;
+            $folders    = self::list_folders($prefix, '*', $type, $subs, $folderdata);
+
+            if ($subscribed === 2 && !empty($folders)) {
+                $active = self::get_states();
+                if (!empty($active)) {
+                    $folders = array_diff($folders, $active);
+                }
+            }
         }
 
         return $folders;

Changes of Revision 38