fixed tag export in lists (CSV)

diff --git a/inc/functions.php b/inc/functions.php
index e97472913ae63548089029ed1f66e09e9a10f8f5..bbae2701b2f18402547082e66515a8d8548bdf80 100644 (file)
--- a/inc/functions.php
+++ b/inc/functions.php
@@ -519,6 +519,8 @@ function get_fields_from_template($tpl){
             $return[] = $FIELDS[$f];
         }elseif($FIELDS["_$f"]){
             $return[] = $FIELDS["_$f"];
             $return[] = $FIELDS[$f];
         }elseif($FIELDS["_$f"]){
             $return[] = $FIELDS["_$f"];

+        }elseif($f = 'markers'){
+            $return[] = 'marker';

         }
     }
     return $return;
         }
     }
     return $return;

diff --git a/index.php b/index.php
index 17240acffdd52721e427600539cb6f852143d700..2e13d655f74ab843ab8f727db47824a5c573b7e2 100644 (file)
--- a/index.php
+++ b/index.php
@@ -144,13 +144,13 @@
       $words=preg_split('/\s+/',$search);
       $filter='';
       foreach($words as $word){
       $words=preg_split('/\s+/',$search);
       $filter='';
       foreach($words as $word){

-       $wordfilter='';
+        $wordfilter='';

         foreach($conf['searchfields'] as $field) {
           $wordfilter .= '('.$field.'=*'.$word.'*)';
         foreach($conf['searchfields'] as $field) {
           $wordfilter .= '('.$field.'=*'.$word.'*)';

-       }
+        }

         for($i=0; $i <count($conf['searchfields']); $i++){
           $wordfilter = '(|'.$wordfilter.')';
         for($i=0; $i <count($conf['searchfields']); $i++){
           $wordfilter = '(|'.$wordfilter.')';

-       }
+        }

         $filter .= '(&'.$wordfilter.')';
       }
       $ldapfilter = "(&(objectClass=inetOrgPerson)$filter)";
         $filter .= '(&'.$wordfilter.')';
       }
       $ldapfilter = "(&(objectClass=inetOrgPerson)$filter)";