Zwei Tippfehler korrigiert

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

diff --git a/form-email/functions.php b/form-email/functions.php
index e353da8f6556f967f2c694db9126a7578ac95504..ad330eb421d98407c663205fab84b06b2245eea0 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: 3.12.2011\r
+# Letzte Aenderung: 03.03.2012\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,8 +66,8 @@ function formdata($param) {
 #\r
 # Rueckgabe: Bearbeiteter Text (String)\r
 \r
-function &plain(&$text,$linebreak='<br>') {\r
-    $htmltext = htmlentities($text);\r
+function plain($text,$linebreak='<br>') {\r
+    $htmltext = htmlspecialchars($text);\r
     $htmltext = preg_replace("/\015\012|\012|\015/",$linebreak,$htmltext);\r
 \r
     for($x=0;$x<strlen($htmltext);$x++) {\r
@@ -103,13 +103,21 @@ function semicolon_split($string) {
 #\r
 # Parameter: Fehlermeldung\r
 \r
-function show_fatal(&$errmsg) {\r
+function show_fatal($errmsg,$vars=array()) {\r
     global $tpl_fatal;\r
 \r
     $tpl = new Template;\r
     $tpl->read_file($tpl_fatal);\r
 \r
-    $tpl->fillin('ERROR',$errmsg);\r
+    if(sizeof($vars) > 0) {\r
+        while(list($var,$content) = each($vars)) {\r
+            $errmsg = str_replace('{'.$var.'}',htmlspecialchars($content),$errmsg);\r
+        }\r
+    }\r
+\r
+    $tpl->set_var('ERROR',$errmsg);\r
+\r
+    $tpl->parse();\r
 \r
     print $tpl->get_template();\r
     exit;\r
@@ -122,19 +130,34 @@ function show_fatal(&$errmsg) {
 #\r
 # Parameter: Fehlermeldung\r
 \r
-function show_user_error(&$errmsg) {\r
-    global $captcha_enable, $email, $name, $subject, $text, $tpl_user_error;\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
     $tpl->read_file($tpl_user_error);\r
 \r
     $tpl->parse_if_block('CAPTCHA',$captcha_enable);\r
 \r
-    $tpl->set_var('EMAIL',  htmlentities($email));\r
+    $tpl->set_var('EMAIL',  htmlspecialchars($email));\r
     $tpl->set_var('ERROR',  $errmsg);\r
-    $tpl->set_var('NAME',   htmlentities($name));\r
-    $tpl->set_var('SUBJECT',htmlentities($subject));\r
-    $tpl->set_var('TEXT',   htmlentities($text));\r
+    $tpl->set_var('NAME',   htmlspecialchars($name));\r
+    $tpl->set_var('SUBJECT',htmlspecialchars($subject));\r
+    $tpl->set_var('TEXT',   htmlspecialchars($text));\r
+\r
+    if(isset($user_fields)) {\r
+        reset($user_fields);\r
+\r
+        while(list($user_field,$user_field_data) = each($user_fields)) {\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
 \r
     $tpl->parse();\r
 \r