Merge pull request #15 from cweiske/master

[contagged] / index.php

diff --git a/index.php b/index.php
index ef38ad4fd66f4e3d7790466238e295ce12be0de3..5a9ab819da54fab7dd2615819abf63be3d31c1bf 100644 (file)
--- a/index.php
+++ b/index.php
@@ -12,6 +12,8 @@
     $entrytpl = 'list_entry.tpl';
   }
 
+  tpl_std();
+
   // check which fields are needed
   $fields = get_fields_from_template($entrytpl);
 
@@ -37,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']='';
@@ -60,16 +61,6 @@
       $smarty->display('list_csv.tpl');
       exit;
     }elseif($_REQUEST['export'] == 'map'){
-        require_once 'inc/Geocoder.php';
-        $geocoder = new Geocoder();
-        $coords = array();
-        foreach ($result as $ldapEntry) {
-            tpl_entry($ldapEntry);
-            $entry = $smarty->get_template_vars('entry');
-            addCoords($coords, $entry, $geocoder);
-        }
-        $smarty->assign('coords', $coords);
-
       header('Content-Type: text/html; charset=utf-8');
       $smarty->display('list_map.tpl');
       exit;
@@ -122,7 +113,7 @@
 
     if(!empty($marker)){
       // Search by tag
-      $ldapfilter = '(&(objectClass=evolutionPerson)';
+      $ldapfilter = '(&( |(objectClass=evolutionPerson)(objectClass=contactPerson) )';
       $marker = explode(',',$marker);
       foreach($marker as $m){
         $m = trim($m);