use the organization attribute from namedentries() instead of hardcoded o

[contagged] / index.php

diff --git a/index.php b/index.php
index 72a84b0154e914a131f43d0843c2fd248b4fd71a..ae8912952a83281c4d9eb2267938d8d61e8464f5 100644 (file)
--- a/index.php
+++ b/index.php
@@ -62,7 +62,7 @@
       exit();
     } else {
       header("Content-Type: text/csv");
-      header('Content-Disposition: Attachement; filename="ldapabexport.csv"');
+      header('Content-Disposition: Attachement; filename="contagged_export.csv"');
       $smarty->display('export_list_csv.tpl');
     }
   }else{
@@ -93,6 +93,9 @@
    * Creates an LDAP filter from given request variables search or filter
    */
   function _makeldapfilter(){
+
+    $f_entries = namedentries(true);
+
     //handle given filter
 
     if (empty($_REQUEST['filter'])) { $_REQUEST['filter']=''; }
@@ -123,11 +126,11 @@
       $words=preg_split('/\s+/',$search);
       $filter='';
       foreach($words as $word){
-        $filter .= "(|(|(sn=*$word*)(givenName=*$word*))(o=*$word*))";
+        $filter .= "(|(|(sn=*$word*)(givenName=*$word*))(".$f_entries['organization']."=*$word*))";
       }
       $ldapfilter = "(&(objectClass=inetOrgPerson)$filter)";
     }elseif(!empty($org)){
-      $ldapfilter = "(&(objectClass=inetOrgPerson)(o=$org))";
+      $ldapfilter = "(&(objectClass=inetOrgPerson)(".$f_entries['organization']."=$org))";
     }elseif($filter=='other'){
       $other='';
       for ($i=ord('a');$i<=ord('z');$i++){