Kleine Ergaenzung

[form-email.git] / form-email / functions.php

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