Merge remote-tracking branch 'origin/master'HEADmaster

Conflicts:
	composer.json-dist
	config/defaults.inc.php
	plugins
	plugins/acl/acl.js
	plugins/acl/acl.php
	plugins/acl/skins/classic/templates/table.html
	plugins/acl/skins/larry/templates/table.html
	plugins/enigma/README
	plugins/enigma/config.inc.php.dist
	plugins/enigma/enigma.js
	plugins/enigma/enigma.php
	plugins/enigma/lib/enigma_driver.php
	plugins/enigma/lib/enigma_driver_gnupg.php
	plugins/enigma/lib/enigma_driver_phpssl.php
	plugins/enigma/lib/enigma_engine.php
	plugins/enigma/lib/enigma_error.php
	plugins/enigma/lib/enigma_key.php
	plugins/enigma/lib/enigma_signature.php
	plugins/enigma/lib/enigma_subkey.php
	plugins/enigma/lib/enigma_ui.php
	plugins/enigma/lib/enigma_userid.php
	plugins/enigma/localization/en_US.inc
	plugins/enigma/localization/ja_JP.inc
	plugins/enigma/localization/ru_RU.inc
	plugins/enigma/skins/classic/enigma.css
	plugins/enigma/skins/classic/templates/keys.html
	plugins/help/config.inc.php.dist
	plugins/help/help.php
	plugins/help/localization/en_US.inc
	plugins/jqueryui/jqueryui.php
	plugins/managesieve/Changelog
	plugins/managesieve/composer.json
	plugins/managesieve/config.inc.php.dist
	plugins/managesieve/lib/Roundcube/rcube_sieve.php
	plugins/managesieve/lib/Roundcube/rcube_sieve_engine.php
	plugins/managesieve/lib/Roundcube/rcube_sieve_vacation.php
	plugins/managesieve/localization/en_US.inc
	plugins/managesieve/managesieve.js
	plugins/managesieve/skins/classic/managesieve.css
	plugins/managesieve/skins/larry/managesieve.css
	plugins/password/README
	plugins/password/config.inc.php.dist
	plugins/password/drivers/ldap.php
	plugins/password/drivers/poppassd.php
	plugins/password/drivers/vpopmaild.php
	plugins/vcard_attachments/vcardattach.js
	plugins/zipdownload/zipdownload.php

1 files changed, 42 insertions, 1 deletions

diff --git a/program/lib/Roundcube/rcube_ldap_generic.php b/program/lib/Roundcube/rcube_ldap_generic.php
index a76ad6d06..abe16760d 100644
--- a/program/lib/Roundcube/rcube_ldap_generic.php
+++ b/program/lib/Roundcube/rcube_ldap_generic.php
@@ -6,7 +6,7 @@
  |                                                                       |
  | This file is part of the Roundcube Webmail client                     |
  | Copyright (C) 2006-2014, The Roundcube Dev Team                       |
- | Copyright (C) 2012-2014, Kolab Systems AG                             |
+ | Copyright (C) 2012-2015, Kolab Systems AG                             |
  |                                                                       |
  | Licensed under the GNU General Public License version 3 or            |
  | any later version with exceptions for skins & plugins.                |
@@ -316,6 +316,47 @@ class rcube_ldap_generic extends Net_LDAP3
 
         return $rec;
     }
+
+    /**
+     * Compose an LDAP filter string matching all words from the search string
+     * in the given list of attributes.
+     *
+     * @param string  $value    Search value
+     * @param mixed   $attrs    List of LDAP attributes to search
+     * @param int     $mode     Matching mode:
+     *                          0 - partial (*abc*),
+     *                          1 - strict (=),
+     *                          2 - prefix (abc*)
+     * @return string LDAP filter
+     */
+    public static function fulltext_search_filter($value, $attributes, $mode = 1)
+    {
+        if (empty($attributes)) {
+            $attributes = array('cn');
+        }
+
+        $groups = array();
+        $value = str_replace('*', '', $value);
+        $words = $mode == 0 ? rcube_utils::tokenize_string($value, 1) : array($value);
+
+        // set wildcards
+        $wp = $ws = '';
+        if ($mode != 1) {
+            $ws = '*';
+            $wp = !$mode ? '*' : '';
+        }
+
+        // search each word in all listed attributes
+        foreach ($words as $word) {
+            $parts = array();
+            foreach ($attributes as $attr) {
+                $parts[] = "($attr=$wp" . self::quote_string($word) . "$ws)";
+            }
+            $groups[] = '(|' . join('', $parts) . ')';
+        }
+
+        return count($groups) > 1 ? '(&' . join('', $groups) . ')' : join('', $groups);
+    }
 }
 
 // for backward compat.