X-Git-Url: https://git.p6c8.net/form-email.git/blobdiff_plain/b35242cfdec82aed47f23ac4051ccd53e958f13a..HEAD:/form-email/functions.php

diff --git a/form-email/functions.php b/form-email/functions.php
index e746a7e..ad330eb 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: 03.03.2012
 #
-# 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.
@@ -144,10 +144,19 @@ function show_user_error($errmsg) {
     $tpl->set_var('SUBJECT',htmlspecialchars($subject));
     $tpl->set_var('TEXT',   htmlspecialchars($text));
 
-    reset($user_fields);
+    if(isset($user_fields)) {
+        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)));
+        while(list($user_field,$user_field_data) = each($user_fields)) {
+            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();