changed layout, some HTML cleanup

[contagged] / index.php

diff --git a/index.php b/index.php
index 3f095738d55e8403b1cf8a959085305e9c5f9043..04ab99662fb6fc638eee1ce6bb572fbc9a5b9ebe 100644 (file)
--- a/index.php
+++ b/index.php
@@ -18,6 +18,13 @@
   
   $result = array_merge($result1,$result2);
 
+  // select entry template
+  if($_REQUEST['export'] == 'csv'){
+    $entrytpl = 'export_list_csv_entry.tpl';
+  }else{
+    $entrytpl = 'list_entry.tpl';
+  }
+
   $list = '';
   if(count($result)==1 && $_REQUEST[search]){
     //only one result on a search -> display page
@@ -28,22 +35,32 @@
     uksort($keys,"_namesort");
     foreach($keys as $key){
       tpl_entry($result[$key]);
-      $list .= $smarty->fetch('list_entry.tpl');
+      $list .= $smarty->fetch($entrytpl);
     }
   }
 
-  //save location in session
-  $_SESSION[ldapab][lastlocation]=$_SERVER["REQUEST_URI"];
-   
   //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']);
+  $smarty->assign('search',$_REQUEST['search']);
   //display templates
-  $smarty->display('header.tpl');
-  $smarty->display('list_filter.tpl');
-  $smarty->display('list.tpl');
-  $smarty->display('footer.tpl');
+  if($_REQUEST['export'] == 'csv'){
+    header("Content-Type: text/csv");
+    header('Content-Disposition: Attachement; filename="ldapabexport.csv"');
+    $smarty->display('export_list_csv.tpl');
+  }else{
+    //save location in session
+    $_SESSION[ldapab][lastlocation]=$_SERVER["REQUEST_URI"];
+
+    header('Content-Type: text/html; charset=utf-8');
+    $smarty->display('list.tpl');
+  }
 
   //------- functions -----------//
 
@@ -65,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='';
@@ -93,8 +116,9 @@
         $other .= '(!(sn='.chr($i).'*))';
       }
       $ldapfilter = "(&(objectClass=inetOrgPerson)$other)";
+    }elseif($filter=='*'){
+      $ldapfilter = "(objectClass=inetOrgPerson)";
     }else{
-      $filter = utf8_encode($filter);
       $ldapfilter = "(&(objectClass=inetOrgPerson)(sn=$filter*))";
     }
     return $ldapfilter;