X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=index.php;h=17240acffdd52721e427600539cb6f852143d700;hb=b923ce87e422780c66bc65d048e130e29f72109f;hp=93954d4f19fa8ada557417972313c4d5fb927fbc;hpb=61df6ac99c1deff1fdc4078ae6f1a7c985bf8e06;p=contagged
diff --git a/index.php b/index.php
index 93954d4..17240ac 100644
--- a/index.php
+++ b/index.php
@@ -1,36 +1,31 @@
-
- require_once('init.php');
- ldap_login();
+ 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,10 +38,6 @@
//prepare templates
tpl_std();
- tpl_markers(); //FIXME not needed anymore!?
- tpl_categories();
- tpl_timezone();
- tpl_country();
if (empty($_REQUEST['filter'])) $_REQUEST['filter']='';
if (empty($_REQUEST['marker'])) $_REQUEST['marker']='';
if (empty($_REQUEST['search'])) $_REQUEST['search']='';
@@ -54,16 +45,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 '
Access Denied
';
exit();
- } else {
+ }
+
+ if($_REQUEST['export'] == 'csv'){
header("Content-Type: text/csv");
header('Content-Disposition: Attachement; filename="contagged_export.csv"');
- $smarty->display('export_list_csv.tpl');
+ $smarty->display('list_csv.tpl');
+ exit;
+ }elseif($_REQUEST['export'] == 'map'){
+ header('Content-Type: text/html; charset=utf-8');
+ $smarty->display('list_map.tpl');
+ exit;
}
}else{
//save location in session
@@ -81,10 +80,11 @@
*/
function _namesort($a,$b){
global $result;
- if (empty($result[$a]['givenName'])) { $result[$a]['givenName']=''; }
- if (empty($result[$b]['givenName'])) { $result[$b]['givenName']=''; }
- $x = $result[$a]['sn'][0].$result[$a]['givenName'][0];
- $y = $result[$b]['sn'][0].$result[$b]['givenName'][0];
+ global $FIELDS;
+ if (empty($result[$a][$FIELDS['givenname']])) { $result[$a][$FIELDS['givenname']]=''; }
+ if (empty($result[$b][$FIELDS['givenname']])) { $result[$b][$FIELDS['givenname']]=''; }
+ $x = $result[$a][$FIELDS['name']][0].$result[$a][$FIELDS['givenname']][0];
+ $y = $result[$b][$FIELDS['name']][0].$result[$b][$FIELDS['givenname']][0];
return(strcasecmp($x,$y));
}
@@ -93,51 +93,83 @@
* Creates an LDAP filter from given request variables search or filter
*/
function _makeldapfilter(){
+ global $FIELDS;
+ global $conf;
+
//handle given filter
if (empty($_REQUEST['filter'])) { $_REQUEST['filter']=''; }
if (empty($_REQUEST['search'])) { $_REQUEST['search']=''; }
if (empty($_REQUEST['org'])) { $_REQUEST['org']=''; }
if (empty($_REQUEST['marker'])) { $_REQUEST['marker']=''; }
- if (empty($_REQUEST['categories'])) { $_REQUEST['categories']=''; }
+ if(is_numeric($_REQUEST['search'])) $number = $_REQUEST['search'];
$filter = ldap_filterescape($_REQUEST['filter']);
$search = ldap_filterescape($_REQUEST['search']);
$org = ldap_filterescape($_REQUEST['org']);
$marker = ldap_filterescape($_REQUEST['marker']);
- $categories = ldap_filterescape($_REQUEST['categories']);
$_SESSION['ldapab']['filter'] = $_REQUEST['filter'];
if(empty($filter)) $filter='a';
if(!empty($marker)){
+ // Search by tag
$ldapfilter = '(&(objectClass=contactPerson)';
$marker = explode(',',$marker);
foreach($marker as $m){
$m = trim($m);
- $ldapfilter .= "(marker=$m)";
+ $ldapfilter .= '('.$FIELDS['_marker'].'='.$m.')';
}
$ldapfilter .= ')';
- }elseif(!empty($categories)){
- $ldapfilter = "(&(objectClass=OXUserObject)(OXUserCategories=$categories))";
+ }elseif($number){
+ // Search by telephone number
+ $filter = '';
+ // add wildcards between digits to compensate for any formatting
+ $length = strlen($number);
+ for($i=0; $i <$length; $i++){
+ $filter .= '*'.$number{$i};
+ }
+ $filter .= '*';
+ $ldapfilter = '(&'.
+ '(objectClass=inetOrgPerson)'.
+ '(|'.
+ '(|'.
+ '('.$FIELDS['phone'].'='.$filter.')'.
+ '('.$FIELDS['homephone'].'='.$filter.')'.
+ ')'.
+ '('.$FIELDS['mobile'].'='.$filter.')'.
+ ')'.
+ ')';
}elseif(!empty($search)){
+ // Search name and organization
$search = trim($search);
$words=preg_split('/\s+/',$search);
$filter='';
foreach($words as $word){
- $filter .= "(|(|(sn=*$word*)(givenName=*$word*))(o=*$word*))";
+ $wordfilter='';
+ foreach($conf['searchfields'] as $field) {
+ $wordfilter .= '('.$field.'=*'.$word.'*)';
+ }
+ for($i=0; $i