From 8f037d84216bbfb25603d7cd3c68d385c49b8c4a Mon Sep 17 00:00:00 2001
From: Benjamin Renard <brenard@easter-eggs.com>
Date: Thu, 23 Mar 2017 16:30:14 +0100
Subject: [PATCH] LSattr_html :: select_object : Fix handling filter parameter

---
 .../LSattribute/LSattr_html/LSattr_html_select_object.docbook    | 1 +
 public_html/includes/class/class.LSattr_html_select_object.php   | 1 +
 2 files changed, 2 insertions(+)

diff --git a/doc/conf/LSattribute/LSattr_html/LSattr_html_select_object.docbook b/doc/conf/LSattribute/LSattr_html/LSattr_html_select_object.docbook
index 1f6bfb48..15b6416d 100644
--- a/doc/conf/LSattribute/LSattr_html/LSattr_html_select_object.docbook
+++ b/doc/conf/LSattribute/LSattr_html/LSattr_html_select_object.docbook
@@ -12,6 +12,7 @@
      'object_type' => '[Type d'LSobject selectionnable]',
      'display_name_format' => '[LSformat du nom d'affichage des LSobjects]',
      'value_attribute' => '[Nom de l'attribut clé des LSobjects]',
+     'filter' => '[Filtre de recherche]',
      'onlyAccessible' => '[Booléen]'
    ),
    'ordered' => [Booléen],
diff --git a/public_html/includes/class/class.LSattr_html_select_object.php b/public_html/includes/class/class.LSattr_html_select_object.php
index 45ee9968..5d9c33ac 100644
--- a/public_html/includes/class/class.LSattr_html_select_object.php
+++ b/public_html/includes/class/class.LSattr_html_select_object.php
@@ -165,6 +165,7 @@ class LSattr_html_select_object extends LSattr_html{
           foreach($values as $val) {
             if (!empty($val)) {
               $filter=Net_LDAP2_Filter::create($conf['value_attribute'],'equals',$val);
+              if (isset($conf['filter'])) $filter = LSldap::combineFilters('and',array($filter,$conf['filter']));
               $sparams=array();
               $sparams['onlyAccessible'] = (isset($conf['onlyAccessible'])?$conf['onlyAccessible']:False);
               $listobj = $obj -> listObjectsName($filter,NULL,$sparams,$conf['display_name_format']);