X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=index.php;h=9eba4f069cf7d8f0e8f2e662ebb401e3fd1bcd31;hb=0cd00c8303f7d42b7da32139d5a22463d525ded7;hp=58e4a6f3968a2592893fe9bb6b918b4852515cfa;hpb=55e57dc0b0041d58c671cfdcb9fb183f0b868969;p=contagged

diff --git a/index.php b/index.php
index 58e4a6f..9eba4f0 100644
--- a/index.php
+++ b/index.php
@@ -3,24 +3,6 @@
   require_once('inc/init.php');
   ldap_login();
 
-  //prepare filter
-  $ldapfilter = _makeldapfilter();
-
-  //check public addressbook
-  $sr = ldap_list($LDAP_CON,$conf['publicbook'],$ldapfilter);
-  $result1 = ldap_get_binentries($LDAP_CON, $sr);
-  //check users private addressbook
-  if(!empty($_SESSION['ldapab']['binddn'])){
-    $sr = @ldap_list($LDAP_CON,
-                    $conf['privatebook'].','.$_SESSION['ldapab']['binddn'],
-                    $ldapfilter);
-    $result2 = ldap_get_binentries($LDAP_CON, $sr);
-  }else{
-    $result2 = '';
-  }
-
-  $result = array_merge((array)$result1,(array)$result2);
-
   // select entry template
   if(!empty($_REQUEST['export']) && $_REQUEST['export'] == 'csv'){
     $entrytpl = 'list_csv_entry.tpl';
@@ -30,6 +12,16 @@
     $entrytpl = 'list_entry.tpl';
   }
 
+  // check which fields are needed
+  $fields = get_fields_from_template($entrytpl);
+
+
+  //prepare filter
+  $ldapfilter = _makeldapfilter();
+
+  // fetch results
+  $result = ldap_queryabooks($ldapfilter,$fields);
+
   $list = '';
   if(count($result)==1 && $_REQUEST['search']){
     //only one result on a search -> display page