X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=inc%2Flibs%2Fhtml_mail_functions.php;h=d7273b06278f6f79ff695a1a15beccdad64e2c44;hb=f03cb5d87e69bb2efc885b5c5f5f3026b24c06f6;hp=ce48a033e29bffa47376def25142399d1f0f3647;hpb=75ad748a68473ace540251427a74fb781b1145e9;p=mailer.git

diff --git a/inc/libs/html_mail_functions.php b/inc/libs/html_mail_functions.php
index ce48a033e2..d7273b0627 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::                                                        $ *
+ * $Date::                                                            $ *
+ * $Tag:: 0.2.1-FINAL                                                 $ *
+ * $Author::                                                          $ *
+ * 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));
@@ -100,25 +97,22 @@ function HTML_INSERT_URLS($text)
 
 	// ... what will the email address be out the @... ;-)
 	$PARTS = array();
-	while (ereg("@", $test))
-	{
+	while (ereg("@", $test)) {
 		$pos = strpos($test, "@");
 		$test2 = substr($test, 0, $pos);
 
 		// First check backwards
 		$idx = $pos - 1;
-		while ($idx > 0)
-		{
+		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;
 			}
 			$idx--;
 		}
-		if ($idx > 0)
-		{
+
+		if ($idx > 0) {
 			// Starting mark is found
 			$check2 = substr($test, 0, ($idx + 1));
 			$test = substr($test, ($idx + 1));
@@ -126,47 +120,45 @@ function HTML_INSERT_URLS($text)
 
 		// And now go forward...
 		$idx = 0;
-		while ($idx < strlen($test))
-		{
+		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;
 			}
 			$idx++;
 		}
-		if ($idx > 0)
-		{
+
+		if ($idx > 0) {
 			// Maybe this is the email address?
 			$check = substr($test, 0, $idx);
 		}
 
 		// 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));
 	}
+
 	// Now put all parts together
 	$text = ""; $PARTS[] = $test;
-	foreach ($PARTS as $part)
-	{
+	foreach ($PARTS as $part) {
 		$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)
-{
-	if (EXT_IS_ACTIVE("html_mail"))
-	{
+function SEND_HTML_EMAIL($to, $subject, $message, $FROM) {
+	if (EXT_IS_ACTIVE("html_mail")) {
 		// Send mail away as HTML
 		$FROM = "Content-Type: text/html\n".$FROM;
-		SEND_EMAIL($TO, $SUBJECT, $MSG, "N", $FROM);
+		SEND_EMAIL($to, $subject, $message, 'N', $FROM);
 	}
 }
+
 //
 ?>