X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Flibs%2Fnewsletter_functions.php;h=f0626fb3b234b1efbfed36216348d6d224a02787;hp=2b03a73f11db3ee23eee893ff35f514d59b71bfc;hb=4001187f22197f55e5a1f211fc8defcc180f7c32;hpb=7f104f6fe558bb56b4205241435a2357c2feece1

diff --git a/inc/libs/newsletter_functions.php b/inc/libs/newsletter_functions.php
index 2b03a73f11..f0626fb3b2 100644
--- a/inc/libs/newsletter_functions.php
+++ b/inc/libs/newsletter_functions.php
@@ -38,28 +38,23 @@ if (!defined('__SECURITY')) {
 }
 
 //
-function NL_ADD_VALID_TAGS()
-{
-	global $HTML_TAGS; $OUT = "";
-	if (!is_array($HTML_TAGS)) return "";
-	foreach ($HTML_TAGS as $tag)
-	{
+function NL_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 NL_CHECK_TAGS($html)
-{
-	global $HTML_TAGS;
+function NL_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 "";
 		}
@@ -68,20 +63,17 @@ function NL_CHECK_TAGS($html)
 	// Return tested code
 	return $html;
 }
+
 //
-function NL_INSERT_URLS($text)
-{
-	global $URL_ENDS, $VALID_EMAIL_CHARS;
+function NL_INSERT_URLS ($text) {
 	$test = $text;
 
 	// First replace URLs...
-	while (ereg("http://", $test))
-	{
+	while (ereg("http://", $test)) {
 		$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));
 		}
 
@@ -100,25 +92,23 @@ function NL_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,18 +116,16 @@ function NL_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);
 		}
@@ -148,22 +136,21 @@ function NL_INSERT_URLS($text)
 		// 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;
 	}
 
 	// Compile possible own HTML tags out...
 	return COMPILE_CODE($text);
 }
+
 //
-function SEND_NEWSLETTER($TO, $SUBJECT, $MSG, $MODE)
-{
-	global $_POST;
+function SEND_NEWSLETTER ($TO, $SUBJECT, $MSG, $MODE) {
 	// Send mail away as HTML
-	if ($_POST['auto_urls'] == "Y") {
+	if (REQUEST_POST('auto_urls') == "Y") {
 		// Automatically insert URLs into newsletter
 		if ((EXT_IS_ACTIVE("html")) && ($MODE == "html")) {
 			// Send HTML mail
@@ -181,5 +168,6 @@ function SEND_NEWSLETTER($TO, $SUBJECT, $MSG, $MODE)
 		}
 	}
 }
+
 //
 ?>