X-Git-Url: https://git.p6c8.net/form-email.git/blobdiff_plain/ad6042b879140a482f06a0ccd3536bac95754dab..193da7105bd4c70771bfd3560efcaf9dfba06315:/form-email/mailer.php

diff --git a/form-email/mailer.php b/form-email/mailer.php
index 87c301f..4d2e500 100644
--- a/form-email/mailer.php
+++ b/form-email/mailer.php
@@ -7,7 +7,7 @@
 # geschrieben wurde.
 #
 # Autor:            Patrick Canterino <patrick@patshaping.de>
-# Letzte Aenderung: 09.01.2012
+# Letzte Aenderung: 05.02.2012
 #
 # Copyright (C) 2002-2012 Patrick Canterino
 #
@@ -21,7 +21,7 @@
 #  Hauptteil
 # ===========
 
-$VERSION = '3.5-dev';
+$VERSION = '3.5';
 
 require('config.php');
 require('functions.php');
@@ -347,19 +347,19 @@ 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 = '.';
-    if(!isset($store_mails_prefix)) $store_mails_prefix = '';
-    
+
+    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
@@ -368,37 +368,33 @@ if(isset($store_mails) && $store_mails) {
     $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);
-    
+
+    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);
-        
-        #print sizeof($stored_mail_files);
-        
-        #print_r($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);
             }