Zwei Tippfehler korrigiert

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

diff --git a/form-email/mailer.php b/form-email/mailer.php
index b32f095ca6efd6f911c8ab76183e19ee2e751ff7..6520dcb595a98277c306dfdf1c34ac31cb1f63a9 100644 (file)
--- a/form-email/mailer.php
+++ b/form-email/mailer.php
@@ -7,9 +7,9 @@
 # geschrieben wurde.\r
 #\r
 # Autor:            Patrick Canterino <patrick@patshaping.de>\r
 # geschrieben wurde.\r
 #\r
 # Autor:            Patrick Canterino <patrick@patshaping.de>\r

-# Letzte Aenderung: 7.11.2011\r
+# Letzte Aenderung: 03.03.2012\r

 #\r
 #\r

-# Copyright (C) 2002-2011 Patrick Canterino\r
+# Copyright (C) 2002-2012 Patrick Canterino\r

 #\r
 # Diese Datei kann unter den Bedingungen der "Artistic License 2.0"\r
 # weitergegeben und / oder veraendert werden.\r
 #\r
 # Diese Datei kann unter den Bedingungen der "Artistic License 2.0"\r
 # weitergegeben und / oder veraendert werden.\r


@@ -21,11 +21,13 @@
 #  Hauptteil\r
 # ===========\r
 \r
 #  Hauptteil\r
 # ===========\r
 \r

+$VERSION = '3.5';\r
+\r

 require('config.php');\r
 require('functions.php');\r
 require('class.Template.php');\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
 \r
 # Wenn Captchas aktiviert sind, Session starten\r
 \r


@@ -82,34 +84,108 @@ 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
 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
 \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
 $prepared_user_fields = array();\r
 \r
 \r
 # Individuelle Felder einlesen\r
 \r
 $prepared_user_fields = array();\r
 \r

-while(list($user_field,$user_field_data) = each($user_fields)) {\r
-    $user_field_content = formdata($user_field);\r
+if(isset($user_fields)) {\r
+    while(list($user_field,$user_field_data) = each($user_fields)) {\r
+        $user_field_content = formdata($user_field);\r
+\r
+        # Pruefung, ob es ein Pflichtfeld ist\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
-            show_user_error($user_field_data['errors']['check_fail']);\r
+        if(!$user_field_content) {\r
+            if(isset($user_field_data['required']) && $user_field_data['required']) {\r
+                if(isset($user_field_data['errors']['not_set'])) {\r
+                    show_user_error($user_field_data['errors']['not_set']);\r
+                }\r
+                else {\r
+                    show_fatal($err_indiv_errmsg_miss,array('ERRMSG' => 'not_set', 'INDIVIDUAL' => $user_field));\r
+                }\r
+            }\r
+            else {\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
         }\r

-    }\r

 \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
+        # 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
+                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
+                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

-    }\r

 \r
 \r

-    $prepared_user_fields[$user_field_data['tpl_var']] = $user_field_content;\r
+        # Fertige Formulardaten wegkopieren und fuer spaeter zur Verfuegung stellen\r
+\r
+        $prepared_user_fields[$tpl_var] = $user_field_content;\r
+    }\r

 }\r
 \r
 # Captcha ueberpruefen\r
 }\r
 \r
 # Captcha ueberpruefen\r


@@ -125,7 +201,7 @@ if($captcha_enable) {
         else {\r
             if(!$captcha_input || empty($captcha_input) || strtolower($captcha_input) != strtolower($_SESSION['captcha'])) $captcha_incorrect = true;\r
         }\r
         else {\r
             if(!$captcha_input || empty($captcha_input) || strtolower($captcha_input) != strtolower($_SESSION['captcha'])) $captcha_incorrect = true;\r
         }\r

-  \r
+\r

         if($captcha_incorrect) {\r
             if($captcha_max) {\r
                 if(isset($_SESSION['captcha_failed']) && $_SESSION['captcha_failed']) {\r
         if($captcha_incorrect) {\r
             if($captcha_max) {\r
                 if(isset($_SESSION['captcha_failed']) && $_SESSION['captcha_failed']) {\r


@@ -139,7 +215,7 @@ if($captcha_enable) {
             if($captcha_max && isset($_SESSION['captcha_failed']) && $_SESSION['captcha_failed'] >= $captcha_max) {\r
                 show_fatal($err_captcha_max);\r
             }\r
             if($captcha_max && isset($_SESSION['captcha_failed']) && $_SESSION['captcha_failed'] >= $captcha_max) {\r
                 show_fatal($err_captcha_max);\r
             }\r

-            else {   \r
+            else {\r

                 show_user_error($err_captcha_incorrect);\r
             }\r
         }\r
                 show_user_error($err_captcha_incorrect);\r
             }\r
         }\r


@@ -167,8 +243,10 @@ $subject = preg_replace("/\015\012|\012|\015/",' ',$subject);
 \r
 # Uhrzeit formatieren\r
 \r
 \r
 # Uhrzeit formatieren\r
 \r

+$timestamp = time();\r
+\r

 date_default_timezone_set($timezone);\r
 date_default_timezone_set($timezone);\r

-$time = strftime($timeformat);\r
+$time = strftime($timeformat,$timestamp);\r

 \r
 # Header der Mail\r
 \r
 \r
 # Header der Mail\r
 \r


@@ -203,7 +281,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 .= '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
     $header .= 'X-Sender-IP: ['.$_SERVER['REMOTE_ADDR'].']';\r
 }\r
 else $header .= "Reply-To: $email";\r


@@ -271,7 +349,59 @@ if($recipient && is_array($aliases) && $aliases[$recipient]) {
 $mailto = semicolon_split($mailto);\r
 \r
 for($x=0;$x<count($mailto);$x++) {\r
 $mailto = semicolon_split($mailto);\r
 \r
 for($x=0;$x<count($mailto);$x++) {\r

-    mail($mailto[$x],$encoded_subject,$mailtext,$header) or die($err_send_error);\r
+    mail($mailto[$x],$encoded_subject,$mailtext,$header) or show_fatal($err_send_error);\r
+}\r
+\r
+# Mails auf Festplatte speichern\r
+\r
+if(isset($store_mails) && $store_mails) {\r
+    # Standard-Werte fuer einige Variablen\r
+\r
+    if(!isset($store_mails_dir)    || $store_mails_dir    == '') $store_mails_dir = 'stored_mails';\r
+    if(!isset($store_mails_prefix) || $store_mails_prefix == '') $store_mails_prefix = 'feml_';\r
+\r
+    # Verzeichnis ggf. anlegen\r
+\r
+    if(!is_dir($store_mails_dir))   mkdir($store_mails_dir);\r
+\r
+    # Betreff saeubern\r
+\r
+    $clean_subject = str_replace(' ','_',$subject);\r
+    $clean_subject = preg_replace('/[^a-z0-9\-_]/i','',$clean_subject);\r
+\r
+    # Eindeutigen Dateinamen der Mail zusammensetzen\r
+\r
+    $file_name = $store_mails_dir.'/'.uniqid($store_mails_prefix.$email.'_'.$clean_subject.'_'.strftime('%d%m%Y-%H%M%S',$timestamp));\r
+\r
+    # Daten in Datei schreiben\r
+\r
+    file_put_contents($file_name,$mailtext) or show_fatal($err_store_error);\r
+\r
+    # Alte Dateien loeschen\r
+\r
+    if(isset($store_mails_max) && $store_mails_max > 0) {\r
+        $dp = opendir($store_mails_dir);\r
+\r
+        while($stored_mail_file = readdir($dp)) {\r
+            if($stored_mail_file != '.' && $stored_mail_file != '..' && substr($stored_mail_file,0,strlen($store_mails_prefix)) == $store_mails_prefix) {\r
+                $stored_mail_files[$store_mails_dir.'/'.$stored_mail_file] = filemtime($store_mails_dir.'/'.$stored_mail_file);\r
+            }\r
+        }\r
+\r
+        closedir($dp);\r
+\r
+        arsort($stored_mail_files);\r
+\r
+        $x = 0;\r
+\r
+        foreach(array_keys($stored_mail_files) as $stored_mail_filename) {\r
+            $x++;\r
+\r
+            if($x > $store_mails_max) {\r
+                unlink($stored_mail_filename);\r
+            }\r
+        }\r
+    }\r

 }\r
 \r
 if($captcha_enable) session_destroy();\r
 }\r
 \r
 if($captcha_enable) session_destroy();\r


@@ -281,14 +411,15 @@ if($captcha_enable) session_destroy();
 if($return_url) {\r
     # Per Redirect auf Seite umleiten\r
 \r
 if($return_url) {\r
     # Per Redirect auf Seite umleiten\r
 \r

-    if(!preg_match('!://!',$return_url)) {\r
+    if(strpos($return_url,'://') === false) {\r

         # URL vervollstaendigen\r
 \r
         $http_host = ($_SERVER['HTTP_HOST']) ? $_SERVER['HTTP_HOST'] : $_SERVER['SERVER_NAME'];\r
         $protocol  = '';\r
         $port      = '';\r
         # URL vervollstaendigen\r
 \r
         $http_host = ($_SERVER['HTTP_HOST']) ? $_SERVER['HTTP_HOST'] : $_SERVER['SERVER_NAME'];\r
         $protocol  = '';\r
         $port      = '';\r

+        $path      = '';\r

 \r
 \r

-        if($_SERVER['HTTPS']) {\r
+        if(isset($_SERVER['HTTPS'])) {\r

             # SSL-verschluesseltes HTTP\r
 \r
             $protocol = 'https://';\r
             # SSL-verschluesseltes HTTP\r
 \r
             $protocol = 'https://';\r


@@ -301,13 +432,19 @@ if($return_url) {
             if($_SERVER['SERVER_PORT'] != 80) $port = ':'.$_SERVER['SERVER_PORT'];\r
         }\r
 \r
             if($_SERVER['SERVER_PORT'] != 80) $port = ':'.$_SERVER['SERVER_PORT'];\r
         }\r
 \r

-        if(preg_match('!^/!',$return_url)) {\r
+        if(substr($return_url,0,1) == '/') {\r

             $return_url = $protocol.$http_host.$port.$return_url;\r
         }\r
         else {\r
             $return_url = $protocol.$http_host.$port.$return_url;\r
         }\r
         else {\r

-            if(preg_match('!/$!',$_SERVER['SCRIPT_NAME'])) $path = substr($_SERVER['SCRIPT_NAME'],0,-1);\r
+            if(substr($_SERVER['SCRIPT_NAME'],-1,1) == '/') {\r
+                $path = substr($_SERVER['SCRIPT_NAME'],0,-1);\r
+            }\r
+            else {\r
+                $path = $_SERVER['SCRIPT_NAME'];\r
+            }\r
+\r

             $path = substr($path,0,strrpos($path,'/')+1);\r
             $path = substr($path,0,strrpos($path,'/')+1);\r

-            if(!preg_match('!^/!',$path)) $path = '/'.$path;\r
+            if(substr($path,0,1) != '/') $path = '/'.$path;\r

 \r
             $return_url = $protocol.$http_host.$port.$path.$return_url;\r
         }\r
 \r
             $return_url = $protocol.$http_host.$port.$path.$return_url;\r
         }\r


@@ -329,6 +466,21 @@ else {
     $stpl->set_var('TEXT',   plain($text));\r
     $stpl->set_var('TIME',   plain($time));\r
 \r
     $stpl->set_var('TEXT',   plain($text));\r
     $stpl->set_var('TIME',   plain($time));\r
 \r

+    if(isset($user_fields)) {\r
+        reset($user_fields);\r
+\r
+        while(list($user_field,$user_field_data) = each($user_fields)) {\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
+            $stpl->set_var($tpl_var,htmlspecialchars(formdata($user_field)));\r
+        }\r
+    }\r
+\r

     $stpl->parse();\r
 \r
     print $stpl->get_template();\r
     $stpl->parse();\r
 \r
     print $stpl->get_template();\r