2 commits - plugins/calendar plugins/libkolab

Thomas Brüderli bruederli at kolabsys.com
Mon Jul 21 09:59:37 CEST 2014


 plugins/calendar/skins/larry/calendar.css |    2 +-
 plugins/libkolab/js/folderlist.js         |    2 +-
 plugins/libkolab/lib/kolab_storage.php    |    7 +++++--
 3 files changed, 7 insertions(+), 4 deletions(-)

New commits:
commit 0a75bfb02350c88ff87e17805a2543058a66496e
Author: Thomas Bruederli <bruederli at kolabsys.com>
Date:   Mon Jul 21 09:59:30 2014 +0200

    Fix selector for active calendar list item

diff --git a/plugins/calendar/skins/larry/calendar.css b/plugins/calendar/skins/larry/calendar.css
index 9546a13..391f4c1 100644
--- a/plugins/calendar/skins/larry/calendar.css
+++ b/plugins/calendar/skins/larry/calendar.css
@@ -349,7 +349,7 @@ pre {
 	margin-left: 48px;
 }
 
-#calendars .treelist li.selected {
+#calendars .treelist li.selected > div.calendar {
 	background-color: #c7e3ef;
 }
 


commit 3f74eeb4e0849826560e50783fcd8d8bb361d073
Author: Thomas Bruederli <bruederli at kolabsys.com>
Date:   Mon Jul 21 09:54:46 2014 +0200

    List all unsubscribed with magic search term '*'

diff --git a/plugins/libkolab/js/folderlist.js b/plugins/libkolab/js/folderlist.js
index df522f6..7710570 100644
--- a/plugins/libkolab/js/folderlist.js
+++ b/plugins/libkolab/js/folderlist.js
@@ -200,7 +200,7 @@ function kolab_folderlist(node, p)
         // send search request(s) to server
         if (search.query && search.execute) {
             // require a minimum length for the search string
-            if (rcmail.env.autocomplete_min_length && search.query.length < rcmail.env.autocomplete_min_length) {
+            if (rcmail.env.autocomplete_min_length && search.query.length < rcmail.env.autocomplete_min_length && search.query != '*') {
                 search_messagebox = rcmail.display_message(
                     rcmail.get_label('autocompletechars').replace('$min', rcmail.env.autocomplete_min_length));
                 return;
diff --git a/plugins/libkolab/lib/kolab_storage.php b/plugins/libkolab/lib/kolab_storage.php
index 0897428..d2412af 100644
--- a/plugins/libkolab/lib/kolab_storage.php
+++ b/plugins/libkolab/lib/kolab_storage.php
@@ -874,12 +874,13 @@ class kolab_storage
         }
 
         $folders = array();
+        $query = str_replace('*', '', $query);
 
         // find unsubscribed IMAP folders of the given type
         foreach ((array)self::list_folders('', '*', $type, false, $folderdata) as $foldername) {
             // FIXME: only consider the last part of the folder path for searching?
             $realname = strtolower(rcube_charset::convert($foldername, 'UTF7-IMAP'));
-            if (strpos($realname, $query) !== false &&
+            if (($query == '' || strpos($realname, $query) !== false) &&
                 !self::folder_is_subscribed($foldername, true) &&
                 !in_array(self::$imap->folder_namespace($foldername), (array)$exclude_ns)
               ) {
@@ -1423,8 +1424,10 @@ class kolab_storage
      */
     public static function search_users($query, $mode = 1, $required = array(), $limit = 0, &$count = 0)
     {
+        $query = str_replace('*', '', $query);
+
         // requires a working LDAP setup
-        if (!self::ldap()) {
+        if (!self::ldap() || strlen($query) == 0) {
             return array();
         }
 




More information about the commits mailing list