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

diff --git a/form-email/mailer.php b/form-email/mailer.php
index 14611ed..6520dcb 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: 17.12.2011
+# Letzte Aenderung: 03.03.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.
@@ -21,7 +21,7 @@
 #  Hauptteil
 # ===========
 
-$VERSION = '3.5-dev';
+$VERSION = '3.5';
 
 require('config.php');
 require('functions.php');
@@ -91,92 +91,101 @@ if(!filter_var($email,FILTER_VALIDATE_EMAIL)) show_user_error($err_invalid_email
 
 $prepared_user_fields = array();
 
-while(list($user_field,$user_field_data) = each($user_fields)) {
-    $user_field_content = formdata($user_field);
+if(isset($user_fields)) {
+    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
+        # Pruefung, ob es ein Pflichtfeld 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;
-    }
-
-    # Laengen-Pruefung
-
-    if(isset($user_field_data['min']) && $user_field_data['min']) {
-        if(strlen($user_field_content) < $user_field_data['min']) {
-            if(isset($user_field_data['errors']['too_short'])) {
-                show_user_error($user_field_data['errors']['too_short']);
+        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 {
-                show_fatal($err_indiv_errmsg_miss,array('ERRMSG' => 'too_short', 'INDIVIDUAL' => $user_field));
+                # 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;
             }
         }
-    }
 
-    if(isset($user_field_data['min']) && $user_field_data['max']) {
-        if(strlen($user_field_content) > $user_field_data['max']) {
-            if(isset($user_field_data['errors']['too_long'])) {
-                show_user_error($user_field_data['errors']['too_long']);
+        # Laengen-Pruefung
+
+        if(isset($user_field_data['min']) && $user_field_data['min']) {
+            if(strlen($user_field_content) < $user_field_data['min']) {
+                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));
+                }
             }
-            else {
-                show_fatal($err_indiv_errmsg_miss,array('ERRMSG' => 'too_long', 'INDIVIDUAL' => $user_field));
+        }
+
+        if(isset($user_field_data['min']) && $user_field_data['max']) {
+            if(strlen($user_field_content) > $user_field_data['max']) {
+                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
+        # 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) {
-            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));
+        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) {
+                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
+        # 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)) {
-            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));
+        if(isset($user_field_data['regex']) && $user_field_data['regex'] != '') {
+            if(!preg_match($user_field_data['regex'],$user_field_content)) {
+                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
+        # Formularfeld durch frei definierbare Funktion bearbeiten
 
-    if(isset($user_field_data['prepare']) && $user_field_data['prepare'] != '') {
-        if(function_exists($user_field_data['check'])) {
-            $user_field_content = call_user_func($user_field_data['prepare'],$user_field_content);
+        if(isset($user_field_data['prepare']) && $user_field_data['prepare'] != '') {
+            if(function_exists($user_field_data['check'])) {
+                $user_field_content = call_user_func($user_field_data['prepare'],$user_field_content);
+            }
         }
-    }
 
-    # Name der Template-Variable ermitteln
+        # 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;
-    }
+        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
+        # Fertige Formulardaten wegkopieren und fuer spaeter zur Verfuegung stellen
 
-    $prepared_user_fields[$tpl_var] = $user_field_content;
+        $prepared_user_fields[$tpl_var] = $user_field_content;
+    }
 }
 
 # Captcha ueberpruefen
@@ -234,8 +243,10 @@ $subject = preg_replace("/\015\012|\012|\015/",' ',$subject);
 
 # Uhrzeit formatieren
 
+$timestamp = time();
+
 date_default_timezone_set($timezone);
-$time = strftime($timeformat);
+$time = strftime($timeformat,$timestamp);
 
 # Header der Mail
 
@@ -338,7 +349,59 @@ if($recipient && is_array($aliases) && $aliases[$recipient]) {
 $mailto = semicolon_split($mailto);
 
 for($x=0;$x<count($mailto);$x++) {
-    mail($mailto[$x],$encoded_subject,$mailtext,$header) or die($err_send_error);
+    mail($mailto[$x],$encoded_subject,$mailtext,$header) or show_fatal($err_send_error);
+}
+
+# Mails auf Festplatte speichern
+
+if(isset($store_mails) && $store_mails) {
+    # Standard-Werte fuer einige Variablen
+
+    if(!isset($store_mails_dir)    || $store_mails_dir    == '') $store_mails_dir = 'stored_mails';
+    if(!isset($store_mails_prefix) || $store_mails_prefix == '') $store_mails_prefix = 'feml_';
+
+    # Verzeichnis ggf. anlegen
+
+    if(!is_dir($store_mails_dir))   mkdir($store_mails_dir);
+
+    # Betreff saeubern
+
+    $clean_subject = str_replace(' ','_',$subject);
+    $clean_subject = preg_replace('/[^a-z0-9\-_]/i','',$clean_subject);
+
+    # Eindeutigen Dateinamen der Mail zusammensetzen
+
+    $file_name = $store_mails_dir.'/'.uniqid($store_mails_prefix.$email.'_'.$clean_subject.'_'.strftime('%d%m%Y-%H%M%S',$timestamp));
+
+    # Daten in Datei schreiben
+
+    file_put_contents($file_name,$mailtext) or show_fatal($err_store_error);
+
+    # Alte Dateien loeschen
+
+    if(isset($store_mails_max) && $store_mails_max > 0) {
+        $dp = opendir($store_mails_dir);
+
+        while($stored_mail_file = readdir($dp)) {
+            if($stored_mail_file != '.' && $stored_mail_file != '..' && substr($stored_mail_file,0,strlen($store_mails_prefix)) == $store_mails_prefix) {
+                $stored_mail_files[$store_mails_dir.'/'.$stored_mail_file] = filemtime($store_mails_dir.'/'.$stored_mail_file);
+            }
+        }
+
+        closedir($dp);
+
+        arsort($stored_mail_files);
+
+        $x = 0;
+
+        foreach(array_keys($stored_mail_files) as $stored_mail_filename) {
+            $x++;
+
+            if($x > $store_mails_max) {
+                unlink($stored_mail_filename);
+            }
+        }
+    }
 }
 
 if($captcha_enable) session_destroy();
@@ -384,8 +447,6 @@ if($return_url) {
             if(substr($path,0,1) != '/') $path = '/'.$path;
 
             $return_url = $protocol.$http_host.$port.$path.$return_url;
-
-            die($return_url);
         }
     }
 
@@ -405,6 +466,21 @@ else {
     $stpl->set_var('TEXT',   plain($text));
     $stpl->set_var('TIME',   plain($time));
 
+    if(isset($user_fields)) {
+        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();