X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Flibs%2Fhtml_mail_functions.php;h=1b1027654f6f085469b1bad59aceed0e4e22b7b9;hp=3d08472af546526b408f64228c395a90d0c9a626;hb=f3e4c2c048761589836fdbe6bd2e46599a1833a7;hpb=e1653405d28923c78b2e292125306ccf61138f24

diff --git a/inc/libs/html_mail_functions.php b/inc/libs/html_mail_functions.php
index 3d08472af5..1b1027654f 100644
--- a/inc/libs/html_mail_functions.php
+++ b/inc/libs/html_mail_functions.php
@@ -10,7 +10,12 @@
  * -------------------------------------------------------------------- *
  * Kurzbeschreibung  : Funktionen fuer die HTML-Erweiterung             *
  * -------------------------------------------------------------------- *
- *                                                                      *
+ * $Revision:: 856                                                    $ *
+ * $Date:: 2009-03-06 20:24:32 +0100 (Fr, 06. Mär 2009)              $ *
+ * $Tag:: 0.2.1-FINAL                                                 $ *
+ * $Author:: stelzi                                                   $ *
+ * Needs to be in all Files and every File needs "svn propset           *
+ * svn:keywords Date Revision" (autoprobset!) at least!!!!!!            *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2008 by Roland Haeder                           *
  * For more information visit: http://www.mxchange.org                  *
@@ -32,34 +37,28 @@
  ************************************************************************/
 
 // Some security stuff...
-if (ereg(basename(__FILE__), $_SERVER['PHP_SELF']))
-{
+if (!defined('__SECURITY')) {
 	$INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php";
 	require($INC);
 }
+
 //
-function HTML_ADD_VALID_TAGS()
-{
-	global $HTML_TAGS; $OUT = "";
-	if (!is_array($HTML_TAGS)) return "";
-	foreach ($HTML_TAGS as $tag)
-	{
+function HTML_ADD_VALID_TAGS() {
+	$OUT = "";
+	if (!is_array($GLOBALS['html_tags'])) return "";
+	foreach ($GLOBALS['html_tags'] as $tag) {
 		$OUT .= ", ".strtoupper($tag);
 	}
 	$OUT = substr($OUT, 2);
 	return $OUT;
 }
 //
-function HTML_CHECK_TAGS($html)
-{
-	global $HTML_TAGS;
+function HTML_CHECK_TAGS ($html) {
 	$test = stripslashes($html);
-	while (ereg("<", $test) && ereg(">", $test))
-	{
+	while (ereg("<", $test) && ereg(">", $test)) {
 		$check = strtolower(substr($test, strpos($test, "<") + 1, strpos($test, ">") - strpos($test, "<") - 1));
 		$check = str_replace("/", "", $check);
-		if (!in_array($check, $HTML_TAGS))
-		{
+		if (!in_array($check, $GLOBALS['html_tags'])) {
 			// Invalid tag found!
 			return "";
 		}
@@ -69,9 +68,7 @@ function HTML_CHECK_TAGS($html)
 	return $html;
 }
 //
-function HTML_INSERT_URLS($text)
-{
-	global $URL_ENDS, $VALID_EMAIL_CHARS;
+function HTML_INSERT_URLS ($text) {
 	$test = $text;
 
 	// First replace URLs...
@@ -80,13 +77,13 @@ function HTML_INSERT_URLS($text)
 		$check = substr($test, strpos($test, "http://")); $check2 = $check;
 
 		// See ext-html.php if you want to add more URL ends...
-		foreach ($URL_ENDS as $end)
+		foreach ($GLOBALS['url_ends'] as $end)
 		{
 			if (ereg($end, $check)) $check = substr($check, 0, strpos($check, $end));
 		}
 
 		// Now replace the URL against anchor container and pray...
-		$text = substr($text, 0, strpos($text, $check2))."<A href=\"".DEREFERER($check)."\" target=\"_blank\">".$check."</A>".substr($text, strpos($text, $check2) + strlen($check));
+		$text = substr($text, 0, strpos($text, $check2))."<a href=\"".DEREFERER($check)."\" target=\"_blank\">".$check."</a>".substr($text, strpos($text, $check2) + strlen($check));
 
 		// Finally remove the url from testing string (or we have a loop and maybe server overload!)
 		$test = substr($test, strpos($test, $check) + strlen($check));
@@ -110,7 +107,7 @@ function HTML_INSERT_URLS($text)
 		while ($idx > 0)
 		{
 			$check = substr($test2, $idx, 1);
-			if (!in_array($check, $VALID_EMAIL_CHARS))
+			if (!in_array($check, $GLOBALS['valid_email_chars']))
 			{
 				// Char found so we end here
 				break;
@@ -129,7 +126,7 @@ function HTML_INSERT_URLS($text)
 		while ($idx < strlen($test))
 		{
 			$check = substr($test, $idx, 1);
-			if ((!in_array($check, $VALID_EMAIL_CHARS)) && ($check != "@"))
+			if ((!in_array($check, $GLOBALS['valid_email_chars'])) && ($check != "@"))
 			{
 				// Char found so end here again
 				break;
@@ -143,7 +140,7 @@ function HTML_INSERT_URLS($text)
 		}
 
 		// Now replace the email against anchor with mailto and pray...
-		$PARTS[] = $check2."<A href=\"mailto:".$check."\">".$check."</A>";
+		$PARTS[] = $check2."<a href=\"mailto:".$check."\">".$check."</a>";
 
 		// Remove email from testing string (see above why...)
 		$test = substr($test, strlen($check));
@@ -155,8 +152,8 @@ function HTML_INSERT_URLS($text)
 		$text .= $part;
 	}
 
-	// Replace new-lines agains <BR>-s and finally compile possible own HTML tags out...
-	return COMPILE_CODE(str_replace("\n", "<BR>\n", $text));
+	// Replace new-lines agains <br />-s and finally compile possible own HTML tags out...
+	return COMPILE_CODE(str_replace("\n", "<br />\n", $text));
 }
 //
 function SEND_HTML_EMAIL($TO, $SUBJECT, $MSG, $FROM)