Merge pull request #74 from Worteks/issue-42

Provide a new type (list)
ltb-project · Jul 23, 2019 · 3959bb7 · 3959bb7
2 parents a02d54f + 056ee22
commit 3959bb7
Show file tree

Hide file tree

Showing 6 changed files with 60 additions and 1 deletion.
diff --git a/conf/config.inc.php b/conf/config.inc.php
@@ -71,6 +71,8 @@
     'uniquemember' => array( 'attribute' => 'uniquemember', 'faclass' => 'user', 'type' => 'usergroup_dn_link' ),
 );
 
+$attributes_list = array();
+
 # Quick search
 $use_quick_search = true;
 $quick_search_attributes = array('uid', 'cn', 'mail');

diff --git a/htdocs/advancedsearch.php b/htdocs/advancedsearch.php
@@ -15,6 +15,26 @@
 if (!isset($_POST["submit"])) {
     $smarty->assign('advanced_search_criteria', $advanced_search_criteria);
     $smarty->assign('advanded_search_display_search_objects', $advanded_search_display_search_objects);
+
+    # Check if an attribute is a list type and prepare the list
+    require_once("../lib/ldap.inc.php");
+
+    # Connect to LDAP
+    $ldap_connection = wp_ldap_connect($ldap_url, $ldap_starttls, $ldap_binddn, $ldap_bindpw);
+
+    $ldap = $ldap_connection[0];
+    $result = $ldap_connection[1];
+
+    if ($ldap) {
+        $item_list = array();
+        foreach ( $advanced_search_criteria as $criteria ) {
+            if ( $attributes_map[$criteria]["type"] === "list" ) {
+                $item_list[$criteria] = wp_ldap_get_list( $ldap, $attributes_list[$criteria]["base"], $attributes_list[$criteria]["filter"], $attributes_list[$criteria]["key"], $attributes_list[$criteria]["value"]  );
+            }
+        }
+        $smarty->assign('item_list', $item_list);
+    }
+
     $result = "displayform";
 }
 

diff --git a/lib/ldap.inc.php b/lib/ldap.inc.php
@@ -33,4 +33,29 @@ function wp_ldap_connect($ldap_url, $ldap_starttls, $ldap_binddn, $ldap_bindpw)
     return array($ldap, false);
 }
 
+function wp_ldap_get_list($ldap, $ldap_base, $ldap_filter, $key, $value) {
+
+    $return = array();
+
+    if ($ldap) {
+
+        # Search entry
+        $search = ldap_search($ldap, $ldap_base, $ldap_filter, array($key, $value) );
+
+        $errno = ldap_errno($ldap);
+
+        if ( $errno ) {
+            error_log("LDAP - Search error $errno  (".ldap_error($ldap).")");
+        } else {
+            $entries = ldap_get_entries($ldap, $search);
+            for ($i=0; $i<$entries["count"]; $i++) {
+                if(isset($entries[$i][$key][0])) {
+                    $return[$entries[$i][$key][0]] = isset($entries[$i][$value][0]) ? $entries[$i][$value][0] : $entries[$i][$key][0];
+                }
+            }
+        }
+    }
+
+    return $return;
+}
 ?>
diff --git a/templates/advancedsearch.tpl b/templates/advancedsearch.tpl
@@ -20,7 +20,7 @@
     {foreach $advanced_search_criteria as $item}
     {$type=$attributes_map.{$item}.type}
     {$faclass=$attributes_map.{$item}.faclass}
-    {include 'search_displayer.tpl' label="{$msg_label_{$item}}" item=$item type=$type faclass=$faclass ldap_params=$ldap_params}
+    {include 'search_displayer.tpl' label="{$msg_label_{$item}}" item=$item type=$type faclass=$faclass ldap_params=$ldap_params list=$item_list.{$item}}
     {/foreach}
     <div class="form-group">
         <div class="col-sm-offset-3 col-sm-9">

diff --git a/templates/search_displayer.tpl b/templates/search_displayer.tpl
@@ -16,6 +16,14 @@
             <input type="text" class="form-control" id="{$item}to" name="{$item}to" data-provide="datepicker" data-date-language="{$lang}">
             {elseif $type eq 'guid' or $type eq 'dn_link' or $type eq 'group_dn_link' or $type eq 'usergroup_dn_link' }
             <input type="text" class="form-control" id="{$item}" name="{$item}" placeholder="{$label}">
+            {elseif $type eq 'list'}
+            <select class="form-control" id="{$item}" name="{$item}" placeholder="{$label}">
+                <option></option>
+                {foreach $list as $value}
+                <option value="{$value@key}">{$value}</option>
+                {/foreach}
+            </select>
+            <span class="input-group-addon"><input type="checkbox" name="{$item}match" value="exact" data-toggle="popover" data-content="{$msg_exactmatch}"></span>
             {else}
             <input type="text" class="form-control" id="{$item}" name="{$item}" placeholder="{$label}">
             <span class="input-group-addon"><input type="checkbox" name="{$item}match" value="exact" data-toggle="popover" data-content="{$msg_exactmatch}"></span>

diff --git a/templates/value_displayer.tpl b/templates/value_displayer.tpl
@@ -43,3 +43,7 @@
 {if $type eq 'guid'}
     {convert_guid_value($value)|truncate:{$truncate_value_after}}<br />
 {/if}
+
+{if $type eq 'list'}
+    {$value|truncate:{$truncate_value_after}}<br />
+{/if}