- Add popup with basic fields selection for addressbook search

git-svn-id: https://svn.roundcube.net/trunk@4823 208e9e7b-5314-0410-a742-e7e81cd9613c

1 files changed, 7 insertions, 8 deletions

diff --git a/roundcubemail/program/include/rcube_ldap.php b/roundcubemail/program/include/rcube_ldap.php
index f166fd23a..7f0ea84fa 100644
--- a/roundcubemail/program/include/rcube_ldap.php
+++ b/roundcubemail/program/include/rcube_ldap.php
@@ -479,21 +479,20 @@ class rcube_ldap extends rcube_addressbook
 
         $filter = '(|';
         $wc = !$strict && $this->prop['fuzzy_search'] ? '*' : '';
-        if ($fields != '*')
+        if ($fields == '*')
         {
             // search_fields are required for fulltext search
-            if (!$this->prop['search_fields'])
+            if (empty($this->prop['search_fields']))
             {
                 $this->set_error(self::ERROR_SEARCH, 'nofulltextsearch');
                 $this->result = new rcube_result_set();
                 return $this->result;
             }
-        }
-        
-        if (is_array($this->prop['search_fields']))
-        {
-            foreach ($this->prop['search_fields'] as $k => $field)
-                $filter .= "($field=$wc" . $this->_quote_string($value) . "$wc)";
+            if (is_array($this->prop['search_fields']))
+            {
+                foreach ($this->prop['search_fields'] as $k => $field)
+                    $filter .= "($field=$wc" . $this->_quote_string($value) . "$wc)";
+            }
         }
         else
         {