Pruefung ob indiv. Feld gesetzt wurde, funktioniert.

Feld laesst sich jetzt auch als optional definieren.

diff --git a/form-email/config.php b/form-email/config.php
index 7818660509cf1e247aa5089e8cbc389891ef706a..fc019785fd965ec2669c669b89c5ef1767e3c628 100644 (file)
--- a/form-email/config.php
+++ b/form-email/config.php
@@ -48,8 +48,8 @@ $text_max    = 0;
 \r
 $user_fields['beruf']['min'] = 5;\r
 $user_fields['beruf']['max'] = 50;\r
 \r
 $user_fields['beruf']['min'] = 5;\r
 $user_fields['beruf']['max'] = 50;\r

-$user_fields['beruf']['optional'] = 0;\r
-$user_fields['beruf']['regex'] = '/^[A-Za-z]$/';\r
+$user_fields['beruf']['optional'] = 1;\r
+$user_fields['beruf']['regex'] = '/^[A-Za-z]+$/';\r

 $user_fields['beruf']['check'] = 'check_beruf';\r
 $user_fields['beruf']['tpl_var'] = 'BERUF';\r
 \r
 $user_fields['beruf']['check'] = 'check_beruf';\r
 $user_fields['beruf']['tpl_var'] = 'BERUF';\r
 \r

diff --git a/form-email/mailer.php b/form-email/mailer.php
index b32f095ca6efd6f911c8ab76183e19ee2e751ff7..52e3110305c00e306a8f7c0477926dfcad14bbb1 100644 (file)
--- a/form-email/mailer.php
+++ b/form-email/mailer.php
@@ -96,6 +96,14 @@ $prepared_user_fields = array();
 \r
 while(list($user_field,$user_field_data) = each($user_fields)) {\r
     $user_field_content = formdata($user_field);\r
 \r
 while(list($user_field,$user_field_data) = each($user_fields)) {\r
     $user_field_content = formdata($user_field);\r

+    \r
+    if((!$user_field_data['optional']) && (!$user_field_content)) {\r
+        show_user_error($user_field_data['errors']['not_set']);\r
+    }\r
+    elseif($user_field_data['optional'] && (!$user_field_content)) {\r
+        $prepared_user_fields[$user_field_data['tpl_var']] = '';\r
+        continue;\r
+    }\r

 \r
     if(isset($user_field_data['check']) && $user_field_data['check'] != '') {\r
         if(function_exists($user_field_data['check']) && call_user_func($user_field_data['check'],$user_field_content) === false) {\r
 \r
     if(isset($user_field_data['check']) && $user_field_data['check'] != '') {\r
         if(function_exists($user_field_data['check']) && call_user_func($user_field_data['check'],$user_field_content) === false) {\r