Seit Revision 26 ist die Konfigurationsvariable $no_tld nicht mehr sinnvoll

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

diff --git a/form-email/mailer.php b/form-email/mailer.php
index ff431129b89265199abe1236fb219d987436d8c7..5330f1c5b927cf86d6970ee69e60b9cf17456336 100644 (file)
--- a/form-email/mailer.php
+++ b/form-email/mailer.php
@@ -7,7 +7,7 @@
 # geschrieben wurde.\r
 #\r
 # Autor:            Patrick Canterino <patrick@patshaping.de>\r
-# Letzte Aenderung: 12.12.2011\r
+# Letzte Aenderung: 16.12.2011\r
 #\r
 # Copyright (C) 2002-2011 Patrick Canterino\r
 #\r
@@ -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);\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
-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
@@ -170,9 +165,18 @@ while(list($user_field,$user_field_data) = each($user_fields)) {
         }\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
     # Fertige Formulardaten wegkopieren und fuer spaeter zur Verfuegung stellen\r
 \r
-    $prepared_user_fields[$user_field_data['tpl_var']] = $user_field_content;\r
+    $prepared_user_fields[$tpl_var] = $user_field_content;\r
 }\r
 \r
 # Captcha ueberpruefen\r
@@ -344,14 +348,15 @@ if($captcha_enable) session_destroy();
 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
+        $path      = '';\r
 \r
-        if($_SERVER['HTTPS']) {\r
+        if(isset($_SERVER['HTTPS'])) {\r
             # SSL-verschluesseltes HTTP\r
 \r
             $protocol = 'https://';\r
@@ -364,13 +369,13 @@ if($return_url) {
             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
-            if(preg_match('!/$!',$_SERVER['SCRIPT_NAME'])) $path = substr($_SERVER['SCRIPT_NAME'],0,-1);\r
+            if(substr($_SERVER['SCRIPT_NAME'],-1,1) == '/') $path = substr($_SERVER['SCRIPT_NAME'],0,-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