fixed handling of mail and tag arrays with gaps

[contagged] / entry.php

diff --git a/entry.php b/entry.php
index 594e1eb2b95fb54d8b9e1474eb4e3749413816ee..00fa82c616bae39f442986118aceb28b19d695ed 100644 (file)
--- a/entry.php
+++ b/entry.php
@@ -19,7 +19,20 @@
 
   //save data if asked for
   if($_SESSION[ldapab][username] && $_REQUEST[save]){
-    $_REQUEST[entry][jpegPhoto][]=_getUploadData();
+    // prepare special data
+    $_REQUEST['entry']['jpegPhoto'][]=_getUploadData();
+    $_REQUEST['entry']['marker'] = explode(',',$_REQUEST['entry']['markers']);
+    $_REQUEST['entry']['marker'] = array_map('trim',$_REQUEST['entry']['marker']);
+    $_REQUEST['entry']['marker'] = array_unique($_REQUEST['entry']['marker']);
+    $_REQUEST['entry']['marker'] = array_filter($_REQUEST['entry']['marker']);
+    sort($_REQUEST['entry']['marker']);
+    unset($_REQUEST['entry']['markers']);
+    
+    $_REQUEST['entry']['mail'] = array_map('trim',$_REQUEST['entry']['mail']);
+    $_REQUEST['entry']['mail'] = array_unique($_REQUEST['entry']['mail']);
+    $_REQUEST['entry']['mail'] = array_filter($_REQUEST['entry']['mail']);
+    sort($_REQUEST['entry']['mail']);
+    
     $dn = _saveData();
   }
 
@@ -49,12 +62,11 @@
     $entry = $smarty->get_template_vars('entry');
     $filename = $entry[givenname].'_'.$entry[name].'.vcf';
     header("Content-Disposition: attachment; filename=\"$filename\"");
-    header("Content-type: text/x-vcard; name=\"$filename\"");
+    header("Content-type: text/x-vcard; name=\"$filename\"; charset=utf-8");
     $smarty->display($template);
   }else{
-    $smarty->display('header.tpl');
+    header('Content-Type: text/html; charset=utf-8');
     $smarty->display($template);
-    $smarty->display('footer.tpl');
   }
 
   //--------------------------------------------------------------
@@ -120,9 +132,11 @@ print '</pre>';*/
     $entry[cn]          = $entry[givenname].' '.$entry[name];;
     $entry = prepare_ldap_entry($entry);
 
-/*print '<pre>';
+/*
+print '<pre>';
 print_r($entry);
-print '</pre>';*/
+print '</pre>';
+*/
 
     if(empty($dn)){
       //new entry