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

diff --git a/form-email/mailer.php b/form-email/mailer.php
index 9ff120d..c85d206 100644
--- a/form-email/mailer.php
+++ b/form-email/mailer.php
@@ -1,20 +1,20 @@
 <?php
 
 #
-# Form E-Mail 3.4.1
+# Form E-Mail 3.5
 #
 # Versenden einer E-Mail, die ueber ein Kontaktformular
 # geschrieben wurde.
 #
 # Autor:            Patrick Canterino <patrick@patshaping.de>
-# Letzte Aenderung: 24.2.2011
+# Letzte Aenderung: 7.11.2011
 #
 # Copyright (C) 2002-2011 Patrick Canterino
 #
-# Diese Datei kann unter den Bedingungen der "Artistic License 1.0"
+# Diese Datei kann unter den Bedingungen der "Artistic License 2.0"
 # weitergegeben und / oder veraendert werden.
 # Siehe:
-# http://www.opensource.org/licenses/artistic-license-1.0.php
+# http://www.opensource.org/licenses/artistic-license-2.0
 #
 
 # ===========
@@ -29,16 +29,14 @@ if($only_post && $_SERVER['REQUEST_METHOD'] != 'POST') show_fatal($err_only_post
 
 # Wenn Captchas aktiviert sind, Session starten
 
-if($captcha_enable)
-{
- session_start();
+if($captcha_enable) {
+    session_start();
 
- # Pruefen, ob die zulaessige Zahl der Falscheingaben bei Captchas ueberschritten wurde
+    # Pruefen, ob die zulaessige Zahl der Falscheingaben bei Captchas ueberschritten wurde
 
- if($captcha_max && isset($_SESSION['captcha_failed']) && $_SESSION['captcha_failed'] >= $captcha_max)
- {
-  show_fatal($err_captcha_max);
- }
+    if($captcha_max && isset($_SESSION['captcha_failed']) && $_SESSION['captcha_failed'] >= $captcha_max) {
+        show_fatal($err_captcha_max);
+    }
 }
 
 # Bestimmte Werte in Integers umwandeln
@@ -92,64 +90,74 @@ $mail_regexp = ($no_tld)
 
 if(!preg_match($mail_regexp,$email)) show_user_error($err_invalid_email);
 
+# Individuelle Felder einlesen
+
+$prepared_user_fields = array();
+
+while(list($user_field,$user_field_data) = each($user_fields)) {
+    $user_field_content = formdata($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)) {
+            show_user_error($user_field_data['errors']['check_fail']);
+        }
+    }
+
+    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']);
+        }
+    }
+
+    $prepared_user_fields[$user_field_data['tpl_var']] = $user_field_content;
+}
+
 # Captcha ueberpruefen
 
-if($captcha_enable)
-{
- $captcha_input     = formdata('captcha');
- $captcha_incorrect = false;
-
- if(isset($_SESSION) && isset($_SESSION['captcha']))
- {
-  if($captcha_case)
-  {
-   if(!$captcha_input || empty($captcha_input) || $captcha_input != $_SESSION['captcha']) $captcha_incorrect = true;
-  }
-  else
-  {
-   if(!$captcha_input || empty($captcha_input) || strtolower($captcha_input) != strtolower($_SESSION['captcha'])) $captcha_incorrect = true;
-  }
+if($captcha_enable) {
+    $captcha_input     = formdata('captcha');
+    $captcha_incorrect = false;
+
+    if(isset($_SESSION) && isset($_SESSION['captcha'])) {
+        if($captcha_case) {
+            if(!$captcha_input || empty($captcha_input) || $captcha_input != $_SESSION['captcha']) $captcha_incorrect = true;
+        }
+        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'])
-    {
-     $_SESSION['captcha_failed']++;
+        if($captcha_incorrect) {
+            if($captcha_max) {
+                if(isset($_SESSION['captcha_failed']) && $_SESSION['captcha_failed']) {
+                    $_SESSION['captcha_failed']++;
+                }
+                else {
+                    $_SESSION['captcha_failed'] = 1;
+                }
+            }
+
+            if($captcha_max && isset($_SESSION['captcha_failed']) && $_SESSION['captcha_failed'] >= $captcha_max) {
+                show_fatal($err_captcha_max);
+            }
+            else {   
+                show_user_error($err_captcha_incorrect);
+            }
+        }
     }
-    else
-    {
-     $_SESSION['captcha_failed'] = 1;
+    else {
+        show_fatal($err_captcha_session_failure);
     }
-   }
-
-   if($captcha_max && isset($_SESSION['captcha_failed']) && $_SESSION['captcha_failed'] >= $captcha_max)
-   {
-    show_fatal($err_captcha_max);
-   }
-   else
-   {   
-    show_user_error($err_captcha_incorrect);
-   }
-  }
- }
- else
- {
-  show_fatal($err_captcha_session_failure);
- }
 }
 
 # Referer ueberpruefen
 
-if($check_referer)
-{
- $referer_ok = semicolon_split($referer_ok);
+if($check_referer) {
+    $referer_ok = semicolon_split($referer_ok);
 
- $referer_parts = parse_url($_SERVER['HTTP_REFERER']);
- $referer_host  = $referer_parts['host'];
+    $referer_parts = parse_url($_SERVER['HTTP_REFERER']);
+    $referer_host  = $referer_parts['host'];
 
- if(in_array($referer_host,$referer_ok) === false) show_fatal($err_referer_not_ok);
+    if(in_array($referer_host,$referer_ok) === false) show_fatal($err_referer_not_ok);
 }
 
 # Zeilenumbrueche in Namen und Betreff durch Leerzeichen ersetzen
@@ -166,42 +174,37 @@ $time = strftime($timeformat);
 
 $header = '';
 
-if($friendly_sender)
-{
- if($friendly_sender == 2)
- {
-  if(preg_match("/[\200-\377]/",$name))
-  {
-   # Absendernamen mit Base64 codieren
-
-   $encoded_name = base64_encode($name);
-   $encoded_name = wordwrap($encoded_name,56,"\015\012",1);
-   $encoded_name = "=?$charset?B?$encoded_name?=";
-   $encoded_name = str_replace("\015\012","?=\015\012      =?$charset?B?",$encoded_name);
-  }
-  else
-  {
-   # Bestimmte Zeichen im Absendernamen codieren
-
-   $encoded_name = str_replace('"','\"',$name);
-   $encoded_name = str_replace('(','\\(',$encoded_name);
-   $encoded_name = str_replace(')','\\)',$encoded_name);
-   $encoded_name = '"'.$encoded_name.'"';
-  }
-
-  $header = "From: $encoded_name <$email>\n";
- }
- else $header = "From: $email\n";
+if($friendly_sender) {
+    if($friendly_sender == 2) {
+        if(preg_match("/[\200-\377]/",$name)) {
+            # Absendernamen mit Base64 codieren
+
+            $encoded_name = base64_encode($name);
+            $encoded_name = wordwrap($encoded_name,56,"\015\012",1);
+            $encoded_name = "=?$charset?B?$encoded_name?=";
+            $encoded_name = str_replace("\015\012","?=\015\012      =?$charset?B?",$encoded_name);
+        }
+        else {
+            # Bestimmte Zeichen im Absendernamen codieren
+
+            $encoded_name = str_replace('"','\"',$name);
+            $encoded_name = str_replace('(','\\(',$encoded_name);
+            $encoded_name = str_replace(')','\\)',$encoded_name);
+            $encoded_name = '"'.$encoded_name.'"';
+        }
+
+        $header = "From: $encoded_name <$email>\n";
+    }
+    else $header = "From: $email\n";
 }
 
-if($add_header)
-{
- if(!$friendly_sender) $header .= "Reply-To: $email\n";
- $header .= 'Content-Type: text/plain; charset="'.$charset.'"'."\n";
- $header .= 'Content-Transfer-Encoding: 8bit'."\n";
- $header .= 'MIME-Version: 1.0'."\n";
- $header .= 'X-Mailer: Form E-Mail 3.4.1'."\n";
- $header .= 'X-Sender-IP: ['.$_SERVER['REMOTE_ADDR'].']';
+if($add_header) {
+    if(!$friendly_sender) $header .= "Reply-To: $email\n";
+    $header .= 'Content-Type: text/plain; charset="'.$charset.'"'."\n";
+    $header .= 'Content-Transfer-Encoding: 8bit'."\n";
+    $header .= 'MIME-Version: 1.0'."\n";
+    $header .= 'X-Mailer: Form E-Mail 3.4.1'."\n";
+    $header .= 'X-Sender-IP: ['.$_SERVER['REMOTE_ADDR'].']';
 }
 else $header .= "Reply-To: $email";
 
@@ -210,12 +213,11 @@ $header = preg_replace("/\015\012|\012|\015/","\n",$header);
 # Betreff mit Base64 codieren, wenn er Zeichen enthaelt,
 # die nicht aus dem ASCII-Zeichensatz stammen
 
-if(preg_match("/[\200-\377]/",$subject))
-{
- $encoded_subject = base64_encode($subject);
- $encoded_subject = wordwrap($encoded_subject,56,"\015\012",1);
- $encoded_subject = "=?$charset?B?$encoded_subject?=";
- $encoded_subject = str_replace("\015\012","?=\015\012         =?$charset?B?",$encoded_subject);
+if(preg_match("/[\200-\377]/",$subject)) {
+    $encoded_subject = base64_encode($subject);
+    $encoded_subject = wordwrap($encoded_subject,56,"\015\012",1);
+    $encoded_subject = "=?$charset?B?$encoded_subject?=";
+    $encoded_subject = str_replace("\015\012","?=\015\012         =?$charset?B?",$encoded_subject);
 }
 else $encoded_subject = $subject;
 
@@ -229,21 +231,23 @@ $mtpl->set_var('NAME',   $name);
 $mtpl->set_var('SUBJECT',$subject);
 $mtpl->set_var('TIME',   $time);
 
-# ... Umgebungsvariablen einfuegen
-
-if(isset($allowed_envs) && is_array($allowed_envs))
-{
- foreach($allowed_envs as $allowed_env)
- {
-  if(isset($_SERVER[$allowed_env]))
-  {
-   $mtpl->set_var('ENV_'.$allowed_env,$_SERVER[$allowed_env]);
-  }
-  else
-  {
-   $mtpl->set_var('ENV_'.$allowed_env,'');
-  }
- }
+# ... Umgebungsvariablen einfuegen...
+
+if(isset($allowed_envs) && is_array($allowed_envs)) {
+    foreach($allowed_envs as $allowed_env) {
+        if(isset($_SERVER[$allowed_env])) {
+            $mtpl->set_var('ENV_'.$allowed_env,$_SERVER[$allowed_env]);
+        }
+        else {
+            $mtpl->set_var('ENV_'.$allowed_env,'');
+        }
+    }
+}
+
+# ... eigene Felder einfuegen
+
+while(list($tpl_var,$user_field_content) = each($prepared_user_fields)) {
+    $mtpl->set_var($tpl_var,$user_field_content);
 }
 
 $mtpl->set_var('TEXT',$text);
@@ -258,85 +262,76 @@ $mailtext = preg_replace("/\015\012|\012|\015/","\n",$mailtext);
 
 # ... und die Mail abschicken (bei einem Fehler erscheint eine Meldung)
 
-if($recipient && is_array($aliases) && $aliases[$recipient])
-{
- # Empfaenger mit Alias-Namen
+if($recipient && is_array($aliases) && $aliases[$recipient]) {
+    # Empfaenger mit Alias-Namen
 
- $mailto = $aliases[$recipient];
+    $mailto = $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);
+for($x=0;$x<count($mailto);$x++) {
+    mail($mailto[$x],$encoded_subject,$mailtext,$header) or die($err_send_error);
 }
 
 if($captcha_enable) session_destroy();
 
 # Mail wurde erfolgreich versendet, also wird die Dankesseite angezeigt
 
-if($return_url)
-{
- # Per Redirect auf Seite umleiten
-
- if(!preg_match('!://!',$return_url))
- {
-  # URL vervollstaendigen
-
-  $http_host = ($_SERVER['HTTP_HOST']) ? $_SERVER['HTTP_HOST'] : $_SERVER['SERVER_NAME'];
-  $protocol  = '';
-  $port      = '';
-
-  if($_SERVER['HTTPS'])
-  {
-   # SSL-verschluesseltes HTTP
-
-   $protocol = 'https://';
-   if($_SERVER['SERVER_PORT'] != 443) $port = ':'.$_SERVER['SERVER_PORT'];
-  }
-  else
-  {
-   # Normales HTTP
-
-   $protocol = 'http://';
-   if($_SERVER['SERVER_PORT'] != 80) $port = ':'.$_SERVER['SERVER_PORT'];
-  }
-
-  if(preg_match('!^/!',$return_url))
-  {
-   $return_url = $protocol.$http_host.$port.$return_url;
-  }
-  else
-  {
-   if(preg_match('!/$!',$_SERVER['SCRIPT_NAME'])) $path = substr($_SERVER['SCRIPT_NAME'],0,-1);
-   $path = substr($path,0,strrpos($path,'/')+1);
-   if(!preg_match('!^/!',$path)) $path = '/'.$path;
-
-   $return_url = $protocol.$http_host.$port.$path.$return_url;
-  }
- }
-
- header('Status: 303 See Other');
- header('Location: '.$return_url);
+if($return_url) {
+    # Per Redirect auf Seite umleiten
+
+    if(!preg_match('!://!',$return_url)) {
+        # URL vervollstaendigen
+
+        $http_host = ($_SERVER['HTTP_HOST']) ? $_SERVER['HTTP_HOST'] : $_SERVER['SERVER_NAME'];
+        $protocol  = '';
+        $port      = '';
+
+        if($_SERVER['HTTPS']) {
+            # SSL-verschluesseltes HTTP
+
+            $protocol = 'https://';
+            if($_SERVER['SERVER_PORT'] != 443) $port = ':'.$_SERVER['SERVER_PORT'];
+        }
+        else {
+            # Normales HTTP
+
+            $protocol = 'http://';
+            if($_SERVER['SERVER_PORT'] != 80) $port = ':'.$_SERVER['SERVER_PORT'];
+        }
+
+        if(preg_match('!^/!',$return_url)) {
+            $return_url = $protocol.$http_host.$port.$return_url;
+        }
+        else {
+            if(preg_match('!/$!',$_SERVER['SCRIPT_NAME'])) $path = substr($_SERVER['SCRIPT_NAME'],0,-1);
+            $path = substr($path,0,strrpos($path,'/')+1);
+            if(!preg_match('!^/!',$path)) $path = '/'.$path;
+
+            $return_url = $protocol.$http_host.$port.$path.$return_url;
+        }
+    }
+
+    header('Status: 303 See Other');
+    header('Location: '.$return_url);
 }
-else
-{
- # Mit Template formatierte Seite anzeigen
+else {
+    # Mit Template formatierte Seite anzeigen
 
- $stpl = new Template;
- $stpl->read_file($tpl_sent);
+    $stpl = new Template;
+    $stpl->read_file($tpl_sent);
 
- $stpl->set_var('EMAIL',  plain($email));
- $stpl->set_var('MAIL',   plain($mailtext));
- $stpl->set_var('NAME',   plain($name));
- $stpl->set_var('SUBJECT',plain($subject));
- $stpl->set_var('TEXT',   plain($text));
- $stpl->set_var('TIME',   plain($time));
+    $stpl->set_var('EMAIL',  plain($email));
+    $stpl->set_var('MAIL',   plain($mailtext));
+    $stpl->set_var('NAME',   plain($name));
+    $stpl->set_var('SUBJECT',plain($subject));
+    $stpl->set_var('TEXT',   plain($text));
+    $stpl->set_var('TIME',   plain($time));
 
- $stpl->parse();
+    $stpl->parse();
 
- print $stpl->get_template();
+    print $stpl->get_template();
 }
 
 #