From: Patrick Canterino <patrick@patshaping.de>
Date: Sat, 3 Dec 2011 12:47:55 +0000 (+0000)
Subject: Pruefung ob indiv. Feld gesetzt wurde, funktioniert.
X-Git-Tag: 3.5~59
X-Git-Url: https://git.p6c8.net/form-email.git/commitdiff_plain/6f125a20df39454f1f785075998d0c0751055ba5?hp=2ed757f514862fe67ac1c77af781b6bee3aeb388

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 7818660..fc01978 100644
--- a/form-email/config.php
+++ b/form-email/config.php
@@ -48,8 +48,8 @@ $text_max    = 0;
 
 $user_fields['beruf']['min'] = 5;
 $user_fields['beruf']['max'] = 50;
-$user_fields['beruf']['optional'] = 0;
-$user_fields['beruf']['regex'] = '/^[A-Za-z]$/';
+$user_fields['beruf']['optional'] = 1;
+$user_fields['beruf']['regex'] = '/^[A-Za-z]+$/';
 $user_fields['beruf']['check'] = 'check_beruf';
 $user_fields['beruf']['tpl_var'] = 'BERUF';
 
diff --git a/form-email/mailer.php b/form-email/mailer.php
index b32f095..52e3110 100644
--- a/form-email/mailer.php
+++ b/form-email/mailer.php
@@ -96,6 +96,14 @@ $prepared_user_fields = array();
 
 while(list($user_field,$user_field_data) = each($user_fields)) {
     $user_field_content = formdata($user_field);
+    
+    if((!$user_field_data['optional']) && (!$user_field_content)) {
+        show_user_error($user_field_data['errors']['not_set']);
+    }
+    elseif($user_field_data['optional'] && (!$user_field_content)) {
+        $prepared_user_fields[$user_field_data['tpl_var']] = '';
+        continue;
+    }
 
     if(isset($user_field_data['check']) && $user_field_data['check'] != '') {
         if(function_exists($user_field_data['check']) && call_user_func($user_field_data['check'],$user_field_content) === false) {