PHP5 compatibility and code cleanup

[contagged] / index.php

diff --git a/index.php b/index.php
index 7ff0f0761287e736a7700499ea5eadf1648de527..128bd3dd4d93a2d5631ea5ec2106e816336d238f 100644 (file)
--- a/index.php
+++ b/index.php
@@ -6,17 +6,17 @@
   $ldapfilter = _makeldapfilter();
 
   //check public addressbook
-  $sr = ldap_list($LDAP_CON,$conf[publicbook],$ldapfilter);
+  $sr = ldap_list($LDAP_CON,$conf['publicbook'],$ldapfilter);
   $result1 = ldap_get_binentries($LDAP_CON, $sr);
   //check users private addressbook
-  if(!empty($_SESSION[ldapab][binddn])){
+  if(!empty($_SESSION['ldapab']['binddn'])){
     $sr = @ldap_list($LDAP_CON,
-                    $conf[privatebook].','.$_SESSION[ldapab][binddn],
+                    $conf['privatebook'].','.$_SESSION['ldapab']['binddn'],
                     $ldapfilter);
     $result2 = ldap_get_binentries($LDAP_CON, $sr);
   }
   
-  $result = array_merge($result1,$result2);
+  $result = array_merge((array)$result1,(array)$result2);
 
   // select entry template
   if($_REQUEST['export'] == 'csv'){
@@ -26,9 +26,9 @@
   }
 
   $list = '';
-  if(count($result)==1 && $_REQUEST[search]){
+  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=".$result[0]['dn']);
     exit;
   }elseif(count($result)){
     $keys = array_keys($result);
@@ -41,7 +41,10 @@
 
   //prepare templates
   tpl_std();
-  tpl_markers();
+  tpl_markers(); //FIXME not needed anymore!?
+  tpl_categories();
+  tpl_timezone();
+  tpl_country();
   $smarty->assign('list',$list);
   $smarty->assign('filter',$_REQUEST['filter']);
   $smarty->assign('marker',$_REQUEST['marker']);
@@ -53,11 +56,10 @@
     $smarty->display('export_list_csv.tpl');
   }else{
     //save location in session
-    $_SESSION[ldapab][lastlocation]=$_SERVER["REQUEST_URI"];
-    $smarty->display('header.tpl');
-    $smarty->display('list_filter.tpl');
+    $_SESSION['ldapab']['lastlocation']=$_SERVER["REQUEST_URI"];
+
+    header('Content-Type: text/html; charset=utf-8');
     $smarty->display('list.tpl');
-    $smarty->display('footer.tpl');
   }
 
   //------- functions -----------//
@@ -68,8 +70,8 @@
    */
   function _namesort($a,$b){
     global $result;
-    $x = $result[$a][sn][0].$result[$a][givenName][0];
-    $y = $result[$b][sn][0].$result[$b][givenName][0];
+    $x = $result[$a]['sn'][0].$result[$a]['givenName'][0];
+    $y = $result[$b]['sn'][0].$result[$b]['givenName'][0];
     return(strcasecmp($x,$y));
   }
 
@@ -80,27 +82,33 @@
   function _makeldapfilter(){
     //handle given filter
 
-    $filter = $_REQUEST['filter'];
-    $search = $_REQUEST['search'];
-    $org    = $_REQUEST['org'];
-    $marker = $_REQUEST['marker'];
-    $_SESSION[ldapab][filter] = $filter;
+    $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)){
-      $marker = utf8_encode($marker);
-      $ldapfilter = "(&(objectClass=contactPerson)(marker=$marker))";
+      $ldapfilter = '(&(objectClass=contactPerson)';
+      $marker = explode(',',$marker);
+      foreach($marker as $m){
+        $m = trim($m);
+        $ldapfilter .= "(marker=$m)";
+      }
+      $ldapfilter .= ')';
+    }elseif(!empty($categories)){
+      $ldapfilter = "(&(objectClass=OXUserObject)(OXUserCategories=$categories))";
     }elseif(!empty($search)){
       $search = trim($search);
       $words=preg_split('/\s+/',$search);
       $filter='';
       foreach($words as $word){
-        $word = utf8_encode($word);
         $filter .= "(|(|(sn=*$word*)(givenName=*$word*))(o=*$word*))";
       }
       $ldapfilter = "(&(objectClass=inetOrgPerson)$filter)";
     }elseif(!empty($org)){
-      $org = utf8_encode($org);
       $ldapfilter = "(&(objectClass=inetOrgPerson)(o=$org))";
     }elseif($filter=='other'){
       $other='';
@@ -111,7 +119,6 @@
     }elseif($filter=='*'){
       $ldapfilter = "(objectClass=inetOrgPerson)";
     }else{
-      $filter = utf8_encode($filter);
       $ldapfilter = "(&(objectClass=inetOrgPerson)(sn=$filter*))";
     }
     return $ldapfilter;