X-Git-Url: https://git.p6c8.net/form-email.git/blobdiff_plain/a12d1127380f326264a1cb6b76fbee6fa31319c8..c11340f2adaf46b0294d96a9a18740dfcdbd1e24:/form-email/mailer.php

diff --git a/form-email/mailer.php b/form-email/mailer.php
index 11061d4..5ad8407 100644
--- a/form-email/mailer.php
+++ b/form-email/mailer.php
@@ -7,9 +7,9 @@
 # geschrieben wurde.
 #
 # Autor:            Patrick Canterino <patrick@patshaping.de>
-# Letzte Aenderung: 4.12.2011
+# Letzte Aenderung: 02.01.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.
@@ -84,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);
 
 # Pruefen, ob eingegebene E-Mail-Adresse gueltig ist
-# Danke an "ich" aus dem SELFHTML Forum fuer die Muehe
 
-$mail_regexp = ($no_tld)
-             ? '/^([a-z0-9]+([\.]?|[-]?|[_]?)?)*([a-z0-9]+([\.]?[_]?)?)@([a-z0-9]+([\.]?|[-]?)?)*[a-z0-9]$/i'
-             : '/^([a-z0-9]+([\.]?|[-]?|[_]?)?)*([a-z0-9]+([\.]?[_]?)?)@([a-z0-9]+([\.]?|[-]?)?)*[a-z0-9]+\.{1}[a-z]{2,6}$/i';
-
-if(!preg_match($mail_regexp,$email)) show_user_error($err_invalid_email);
+if(!filter_var($email,FILTER_VALIDATE_EMAIL)) show_user_error($err_invalid_email);
 
 # Individuelle Felder einlesen
 
@@ -98,50 +93,77 @@ $prepared_user_fields = array();
 
 while(list($user_field,$user_field_data) = each($user_fields)) {
     $user_field_content = formdata($user_field);
-    
-    # Pruefung, ob das Feld gesetzt wurde und ob es optional ist
-    
-    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)) {
-        # Wenn das Feld optional ist und nicht gesetzt wurde, brechen wir hier ab
-        # und machen mit dem naechsten Feld weiter
-        
-        $prepared_user_fields[$user_field_data['tpl_var']] = '';
-        continue;
+
+    # Pruefung, ob es ein Pflichtfeld ist
+
+    if(!$user_field_content) {
+        if(isset($user_field_data['required']) && $user_field_data['required']) {
+            if(isset($user_field_data['errors']['not_set'])) {
+                show_user_error($user_field_data['errors']['not_set']);
+            }
+            else {
+                show_fatal($err_indiv_errmsg_miss,array('ERRMSG' => 'not_set', 'INDIVIDUAL' => $user_field));
+            }
+        }
+        else {
+            # Wenn das Feld optional ist und nicht gesetzt wurde, brechen wir hier ab
+            # und machen mit dem naechsten Feld weiter
+
+            $prepared_user_fields[$user_field_data['tpl_var']] = '';
+            continue;
+        }
     }
-    
+
     # Laengen-Pruefung
-    
+
     if(isset($user_field_data['min']) && $user_field_data['min']) {
         if(strlen($user_field_content) < $user_field_data['min']) {
-            show_user_error($user_field_data['errors']['too_short']);
+            if(isset($user_field_data['errors']['too_short'])) {
+                show_user_error($user_field_data['errors']['too_short']);
+            }
+            else {
+                show_fatal($err_indiv_errmsg_miss,array('ERRMSG' => 'too_short', 'INDIVIDUAL' => $user_field));
+            }
         }
     }
-    
+
     if(isset($user_field_data['min']) && $user_field_data['max']) {
         if(strlen($user_field_content) > $user_field_data['max']) {
-            show_user_error($user_field_data['errors']['too_long']);
+            if(isset($user_field_data['errors']['too_long'])) {
+                show_user_error($user_field_data['errors']['too_long']);
+            }
+            else {
+                show_fatal($err_indiv_errmsg_miss,array('ERRMSG' => 'too_long', 'INDIVIDUAL' => $user_field));
+            }
         }
     }
-    
+
     # Pruefung gegen frei definierbare Pruef-Funktion
 
     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) {
-            show_user_error($user_field_data['errors']['check_fail']);
+            if(isset($user_field_data['errors']['check_fail'])) {
+                show_user_error($user_field_data['errors']['check_fail']);
+            }
+            else {
+                show_fatal($err_indiv_errmsg_miss,array('ERRMSG' => 'check_fail', 'INDIVIDUAL' => $user_field));
+            }
         }
     }
-    
+
     # Pruefung gegen frei definierbaren regulaeren Ausdruck
 
     if(isset($user_field_data['regex']) && $user_field_data['regex'] != '') {
         if(!preg_match($user_field_data['regex'],$user_field_content)) {
-            show_user_error($user_field_data['errors']['match_fail']);
+            if(isset($user_field_data['errors']['match_fail'])) {
+                show_user_error($user_field_data['errors']['match_fail']);
+            }
+            else {
+                show_fatal($err_indiv_errmsg_miss,array('ERRMSG' => 'match_fail', 'INDIVIDUAL' => $user_field));
+            }
         }
     }
-    
+
     # Formularfeld durch frei definierbare Funktion bearbeiten
 
     if(isset($user_field_data['prepare']) && $user_field_data['prepare'] != '') {
@@ -149,10 +171,19 @@ while(list($user_field,$user_field_data) = each($user_fields)) {
             $user_field_content = call_user_func($user_field_data['prepare'],$user_field_content);
         }
     }
-    
+
+    # Name der Template-Variable ermitteln
+
+    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;
+    }
+
     # Fertige Formulardaten wegkopieren und fuer spaeter zur Verfuegung stellen
 
-    $prepared_user_fields[$user_field_data['tpl_var']] = $user_field_content;
+    $prepared_user_fields[$tpl_var] = $user_field_content;
 }
 
 # Captcha ueberpruefen
@@ -168,7 +199,7 @@ if($captcha_enable) {
         else {
             if(!$captcha_input || empty($captcha_input) || strtolower($captcha_input) != strtolower($_SESSION['captcha'])) $captcha_incorrect = true;
         }
-  
+
         if($captcha_incorrect) {
             if($captcha_max) {
                 if(isset($_SESSION['captcha_failed']) && $_SESSION['captcha_failed']) {
@@ -182,7 +213,7 @@ if($captcha_enable) {
             if($captcha_max && isset($_SESSION['captcha_failed']) && $_SESSION['captcha_failed'] >= $captcha_max) {
                 show_fatal($err_captcha_max);
             }
-            else {   
+            else {
                 show_user_error($err_captcha_incorrect);
             }
         }
@@ -324,14 +355,15 @@ if($captcha_enable) session_destroy();
 if($return_url) {
     # Per Redirect auf Seite umleiten
 
-    if(!preg_match('!://!',$return_url)) {
+    if(strpos($return_url,'://') === false) {
         # URL vervollstaendigen
 
         $http_host = ($_SERVER['HTTP_HOST']) ? $_SERVER['HTTP_HOST'] : $_SERVER['SERVER_NAME'];
         $protocol  = '';
         $port      = '';
+        $path      = '';
 
-        if($_SERVER['HTTPS']) {
+        if(isset($_SERVER['HTTPS'])) {
             # SSL-verschluesseltes HTTP
 
             $protocol = 'https://';
@@ -344,13 +376,19 @@ if($return_url) {
             if($_SERVER['SERVER_PORT'] != 80) $port = ':'.$_SERVER['SERVER_PORT'];
         }
 
-        if(preg_match('!^/!',$return_url)) {
+        if(substr($return_url,0,1) == '/') {
             $return_url = $protocol.$http_host.$port.$return_url;
         }
         else {
-            if(preg_match('!/$!',$_SERVER['SCRIPT_NAME'])) $path = substr($_SERVER['SCRIPT_NAME'],0,-1);
+            if(substr($_SERVER['SCRIPT_NAME'],-1,1) == '/') {
+                $path = substr($_SERVER['SCRIPT_NAME'],0,-1);
+            }
+            else {
+                $path = $_SERVER['SCRIPT_NAME'];
+            }
+
             $path = substr($path,0,strrpos($path,'/')+1);
-            if(!preg_match('!^/!',$path)) $path = '/'.$path;
+            if(substr($path,0,1) != '/') $path = '/'.$path;
 
             $return_url = $protocol.$http_host.$port.$path.$return_url;
         }
@@ -372,6 +410,19 @@ else {
     $stpl->set_var('TEXT',   plain($text));
     $stpl->set_var('TIME',   plain($time));
 
+    reset($user_fields);
+
+    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;
+        }
+
+        $stpl->set_var($tpl_var,htmlspecialchars(formdata($user_field)));
+    }
+
     $stpl->parse();
 
     print $stpl->get_template();