From 6e7ec82f72bfd87a7a4c6875dd61fba94707c6d8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=B4me=20Chilliet?= <come@opensides.be>
Date: Thu, 4 Jan 2018 14:14:42 +0100
Subject: [PATCH] :sparkles: feat(core) Added a title listing fields that
 search affects

Now the search field icon will have a title listing which fields are
 searched for when doing a text search.

issue #4567
---
 ihtml/themes/breezy/simple-filter.tpl | 2 +-
 include/class_filter.inc              | 1 +
 plugins/admin/groups/group-filter.xml | 1 +
 plugins/admin/users/user-filter.tpl   | 2 +-
 plugins/admin/users/user-filter.xml   | 3 +++
 5 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/ihtml/themes/breezy/simple-filter.tpl b/ihtml/themes/breezy/simple-filter.tpl
index ce7a74c7b..86b432d45 100644
--- a/ihtml/themes/breezy/simple-filter.tpl
+++ b/ihtml/themes/breezy/simple-filter.tpl
@@ -13,7 +13,7 @@
   {$SCOPE}
   <hr/>
 
-  <label for="NAME"><img src="geticon.php?context=actions&amp;icon=system-search&amp;size=16" alt="Search"/></label>{$NAME}
+  <label for="NAME" title="{$NAMEDESC}"><img src="geticon.php?context=actions&amp;icon=system-search&amp;size=16" alt="Search"/></label>{$NAME}
 
   <div>
     {$APPLY}
diff --git a/include/class_filter.inc b/include/class_filter.inc
index 9b17226f8..d88f8e107 100644
--- a/include/class_filter.inc
+++ b/include/class_filter.inc
@@ -375,6 +375,7 @@ class filter
       switch ($element['type']) {
         case "textfield":
           $htmlCode = $this->getTextfield($element);
+          $smarty->assign($tag.'DESC', sprintf(_('Searches in %s'), implode(', ', $element['autocomplete']['attribute'])));
           break;
 
         case "checkbox":
diff --git a/plugins/admin/groups/group-filter.xml b/plugins/admin/groups/group-filter.xml
index 1ad1ba94b..72c4977ea 100644
--- a/plugins/admin/groups/group-filter.xml
+++ b/plugins/admin/groups/group-filter.xml
@@ -149,6 +149,7 @@
       <backend>LDAP</backend>
       <filter>(&amp;(|(objectClass=posixGroup)$ROLE$FILTERTEMPLATE(objectClass=groupOfNames))(|(cn=*$NAME*)(description=*$NAME*)))</filter>
       <attribute>cn</attribute>
+      <attribute>description</attribute>
       <frequency>0.5</frequency>
       <characters>3</characters>
     </autocomplete>
diff --git a/plugins/admin/users/user-filter.tpl b/plugins/admin/users/user-filter.tpl
index b75b215e0..e99124f3f 100644
--- a/plugins/admin/users/user-filter.tpl
+++ b/plugins/admin/users/user-filter.tpl
@@ -19,7 +19,7 @@
   {$SCOPE}
   <hr/>
 
-  <label for="NAME"><img src="geticon.php?context=actions&amp;icon=system-search&amp;size=16" alt="Search"/></label>{$NAME}
+  <label for="NAME" title="{$NAMEDESC}"><img src="geticon.php?context=actions&amp;icon=system-search&amp;size=16" alt="Search"/></label>{$NAME}
 
   <div>
     {$APPLY}
diff --git a/plugins/admin/users/user-filter.xml b/plugins/admin/users/user-filter.xml
index ef78f3fa5..0160c9940 100644
--- a/plugins/admin/users/user-filter.xml
+++ b/plugins/admin/users/user-filter.xml
@@ -29,7 +29,10 @@
       <backend>LDAP</backend>
       <filter>(&amp;(objectClass=inetOrgPerson)(|(cn=*$NAME*)(sn=*$NAME*)(givenName=*$NAME*)(uid=*$NAME*)(mail=*$NAME*)))</filter>
       <attribute>cn</attribute>
+      <attribute>sn</attribute>
+      <attribute>givenName</attribute>
       <attribute>uid</attribute>
+      <attribute>mail</attribute>
       <frequency>0.5</frequency>
       <characters>3</characters>
     </autocomplete>
-- 
GitLab