Unnoetige regulaere Ausdruecke entfernt (String-Funktionen sind schneller)

diff --git a/form-email/mailer.php b/form-email/mailer.php
index 3c1d3ce355c22668f6a6c3d1ef9f08f2b37db41c..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: 15.12.2011\r
+# Letzte Aenderung: 16.12.2011\r
 #\r
 # Copyright (C) 2002-2011 Patrick Canterino\r
 #\r
@@ -348,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
@@ -368,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