Auch mit Traditionen sollte man irgendwann mal brechen:

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

diff --git a/form-email/mailer.php b/form-email/mailer.php
index 52e3110305c00e306a8f7c0477926dfcad14bbb1..3c1d3ce355c22668f6a6c3d1ef9f08f2b37db41c 100644 (file)
--- a/form-email/mailer.php
+++ b/form-email/mailer.php
@@ -7,7 +7,7 @@
 # geschrieben wurde.\r
 #\r
 # Autor:            Patrick Canterino <patrick@patshaping.de>\r
-# Letzte Aenderung: 7.11.2011\r
+# Letzte Aenderung: 15.12.2011\r
 #\r
 # Copyright (C) 2002-2011 Patrick Canterino\r
 #\r
@@ -21,11 +21,13 @@
 #  Hauptteil\r
 # ===========\r
 \r
+$VERSION = '3.5-dev';\r
+\r
 require('config.php');\r
 require('functions.php');\r
 require('class.Template.php');\r
 \r
-if($only_post && $_SERVER['REQUEST_METHOD'] != 'POST') show_fatal($err_only_post);\r
+if($_SERVER['REQUEST_METHOD'] != 'POST') show_fatal($err_only_post);\r
 \r
 # Wenn Captchas aktiviert sind, Session starten\r
 \r
@@ -82,13 +84,8 @@ if($subject_max && strlen($subject) > $subject_max) show_user_error($err_subject
 if($text_max    && strlen($text)    > $text_max)    show_user_error($err_text_long);\r
 \r
 # Pruefen, ob eingegebene E-Mail-Adresse gueltig ist\r
-# Danke an "ich" aus dem SELFHTML Forum fuer die Muehe\r
-\r
-$mail_regexp = ($no_tld)\r
-             ? '/^([a-z0-9]+([\.]?|[-]?|[_]?)?)*([a-z0-9]+([\.]?[_]?)?)@([a-z0-9]+([\.]?|[-]?)?)*[a-z0-9]$/i'\r
-             : '/^([a-z0-9]+([\.]?|[-]?|[_]?)?)*([a-z0-9]+([\.]?[_]?)?)@([a-z0-9]+([\.]?|[-]?)?)*[a-z0-9]+\.{1}[a-z]{2,6}$/i';\r
 \r
-if(!preg_match($mail_regexp,$email)) show_user_error($err_invalid_email);\r
+if(!filter_var($email,FILTER_VALIDATE_EMAIL)) show_user_error($err_invalid_email);\r
 \r
 # Individuelle Felder einlesen\r
 \r
@@ -97,27 +94,89 @@ $prepared_user_fields = array();
 while(list($user_field,$user_field_data) = each($user_fields)) {\r
     $user_field_content = formdata($user_field);\r
     \r
+    # Pruefung, ob das Feld gesetzt wurde und ob es optional ist\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
+        # Wenn das Feld optional ist und nicht gesetzt wurde, brechen wir hier ab\r
+        # und machen mit dem naechsten Feld weiter\r
+        \r
         $prepared_user_fields[$user_field_data['tpl_var']] = '';\r
         continue;\r
     }\r
+    \r
+    # Laengen-Pruefung\r
+    \r
+    if(isset($user_field_data['min']) && $user_field_data['min']) {\r
+        if(strlen($user_field_content) < $user_field_data['min']) {\r
+            if(isset($user_field_data['errors']['too_short'])) {\r
+                show_user_error($user_field_data['errors']['too_short']);\r
+            }\r
+            else {\r
+                show_fatal($err_indiv_errmsg_miss,array('ERRMSG' => 'too_short', 'INDIVIDUAL' => $user_field));\r
+            }\r
+        }\r
+    }\r
+    \r
+    if(isset($user_field_data['min']) && $user_field_data['max']) {\r
+        if(strlen($user_field_content) > $user_field_data['max']) {\r
+            if(isset($user_field_data['errors']['too_long'])) {\r
+                show_user_error($user_field_data['errors']['too_long']);\r
+            }\r
+            else {\r
+                show_fatal($err_indiv_errmsg_miss,array('ERRMSG' => 'too_long', 'INDIVIDUAL' => $user_field));\r
+            }\r
+        }\r
+    }\r
+    \r
+    # Pruefung gegen frei definierbare Pruef-Funktion\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
-            show_user_error($user_field_data['errors']['check_fail']);\r
+            if(isset($user_field_data['errors']['check_fail'])) {\r
+                show_user_error($user_field_data['errors']['check_fail']);\r
+            }\r
+            else {\r
+                show_fatal($err_indiv_errmsg_miss,array('ERRMSG' => 'check_fail', 'INDIVIDUAL' => $user_field));\r
+            }\r
         }\r
     }\r
+    \r
+    # Pruefung gegen frei definierbaren regulaeren Ausdruck\r
 \r
     if(isset($user_field_data['regex']) && $user_field_data['regex'] != '') {\r
         if(!preg_match($user_field_data['regex'],$user_field_content)) {\r
-            show_user_error($user_field_data['errors']['match_fail']);\r
+            if(isset($user_field_data['errors']['match_fail'])) {\r
+                show_user_error($user_field_data['errors']['match_fail']);\r
+            }\r
+            else {\r
+                show_fatal($err_indiv_errmsg_miss,array('ERRMSG' => 'match_fail', 'INDIVIDUAL' => $user_field));\r
+            }\r
         }\r
     }\r
+    \r
+    # Formularfeld durch frei definierbare Funktion bearbeiten\r
+\r
+    if(isset($user_field_data['prepare']) && $user_field_data['prepare'] != '') {\r
+        if(function_exists($user_field_data['check'])) {\r
+            $user_field_content = call_user_func($user_field_data['prepare'],$user_field_content);\r
+        }\r
+    }\r
+    \r
+    # Name der Template-Variable ermitteln\r
+\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
+    # Fertige Formulardaten wegkopieren und fuer spaeter zur Verfuegung stellen\r
 \r
-    $prepared_user_fields[$user_field_data['tpl_var']] = $user_field_content;\r
+    $prepared_user_fields[$tpl_var] = $user_field_content;\r
 }\r
 \r
 # Captcha ueberpruefen\r
@@ -211,7 +270,7 @@ if($add_header) {
     $header .= 'Content-Type: text/plain; charset="'.$charset.'"'."\n";\r
     $header .= 'Content-Transfer-Encoding: 8bit'."\n";\r
     $header .= 'MIME-Version: 1.0'."\n";\r
-    $header .= 'X-Mailer: Form E-Mail 3.4.1'."\n";\r
+    $header .= 'X-Mailer: Form E-Mail '.$VERSION."\n";\r
     $header .= 'X-Sender-IP: ['.$_SERVER['REMOTE_ADDR'].']';\r
 }\r
 else $header .= "Reply-To: $email";\r