X-Git-Url: https://git.p6c8.net/form-email.git/blobdiff_plain/c715b5507a92eea0180b640db399e0144e100bf6..1fc1799dba2372c7fd001fe06936ab977192bd8d:/form-email/functions.php?ds=sidebyside

diff --git a/form-email/functions.php b/form-email/functions.php
index 2374b7b..d9f3482 100644
--- a/form-email/functions.php
+++ b/form-email/functions.php
@@ -7,9 +7,9 @@
 # geschrieben wurde.
 #
 # Autor:            Patrick Canterino <patrick@patshaping.de>
-# Letzte Aenderung: 12.12.2011
+# Letzte Aenderung: 17.12.2011
 #
-# Copyright (C) 2002-2011 Patrick Canterino
+# Copyright (C) 2002-2012 Patrick Canterino
 #
 # Diese Datei kann unter den Bedingungen der "Artistic License 2.0"
 # weitergegeben und / oder veraendert werden.
@@ -66,7 +66,7 @@ function formdata($param) {
 #
 # Rueckgabe: Bearbeiteter Text (String)
 
-function &plain(&$text,$linebreak='<br>') {
+function plain($text,$linebreak='<br>') {
     $htmltext = htmlspecialchars($text);
     $htmltext = preg_replace("/\015\012|\012|\015/",$linebreak,$htmltext);
 
@@ -103,7 +103,7 @@ function semicolon_split($string) {
 #
 # Parameter: Fehlermeldung
 
-function show_fatal(&$errmsg,$vars=array()) {
+function show_fatal($errmsg,$vars=array()) {
     global $tpl_fatal;
 
     $tpl = new Template;
@@ -111,7 +111,7 @@ function show_fatal(&$errmsg,$vars=array()) {
 
     if(sizeof($vars) > 0) {
         while(list($var,$content) = each($vars)) {
-            $errmsg = str_replace('{'.htmlspecialchars($var).'}',htmlspecialchars($content),$errmsg);
+            $errmsg = str_replace('{'.$var.'}',htmlspecialchars($content),$errmsg);
         }
     }
 
@@ -130,7 +130,7 @@ function show_fatal(&$errmsg,$vars=array()) {
 #
 # Parameter: Fehlermeldung
 
-function show_user_error(&$errmsg) {
+function show_user_error($errmsg) {
     global $captcha_enable, $email, $name, $subject, $text, $user_fields, $tpl_user_error;
 
     $tpl = new Template;
@@ -147,7 +147,14 @@ function show_user_error(&$errmsg) {
     reset($user_fields);
 
     while(list($user_field,$user_field_data) = each($user_fields)) {
-        $tpl->set_var($user_field_data['tpl_var'],htmlspecialchars(formdata($user_field)));
+        if(isset($user_field_data['tpl_var']) && $user_field_data['tpl_var'] != '') {
+            $tpl_var = $user_field_data['tpl_var'];
+        }
+        else {
+            $tpl_var = 'USER_'.$user_field;
+        }
+
+        $tpl->set_var($tpl_var,htmlspecialchars(formdata($user_field)));
     }
 
     $tpl->parse();