X-Git-Url: https://git.sur5r.net/?p=contagged;a=blobdiff_plain;f=index.php;h=5a9ab819da54fab7dd2615819abf63be3d31c1bf;hp=5bd4fca712ba37020553766e7bde7e8841b1b763;hb=HEAD;hpb=64fca63a29fb2a863d159734627795acfb17c853 diff --git a/index.php b/index.php index 5bd4fca..5a9ab81 100644 --- a/index.php +++ b/index.php @@ -3,35 +3,31 @@ 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 = 'export_list_csv_entry.tpl'; + $entrytpl = 'list_csv_entry.tpl'; + }elseif(!empty($_REQUEST['export']) && $_REQUEST['export'] == 'map'){ + $entrytpl = 'list_map_entry.tpl'; }else{ $entrytpl = 'list_entry.tpl'; } + tpl_std(); + + // 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 - header("Location: entry.php?dn=".$result[0]['dn']); + header("Location: entry.php?dn=".rawurlencode($result[0]['dn'])); exit; }elseif(count($result)){ $keys = array_keys($result); @@ -43,7 +39,6 @@ } //prepare templates - tpl_std(); if (empty($_REQUEST['filter'])) $_REQUEST['filter']=''; if (empty($_REQUEST['marker'])) $_REQUEST['marker']=''; if (empty($_REQUEST['search'])) $_REQUEST['search']=''; @@ -51,16 +46,24 @@ $smarty->assign('filter',$_REQUEST['filter']); $smarty->assign('marker',$_REQUEST['marker']); $smarty->assign('search',$_REQUEST['search']); + $smarty->assign('org',$_REQUEST['org']); //display templates - if(!empty($_REQUEST['export']) && $_REQUEST['export'] == 'csv'){ - if ($conf['userlogreq'] == 1 && $user == '') - { - header("HTTP/1.1 401 ACCESS DENIED"); + if(!empty($_REQUEST['export'])){ + if ($conf['userlogreq'] && $user == ''){ + header("HTTP/1.1 401 Access Denied"); + echo '