X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Flibs%2Fnewsletter_functions.php;h=f6b0dfd4b8f9c3bce97cf5f9730cd208763a2d66;hb=96144a19af504a59b07ff39d378e7da1f6fcf240;hp=5dcf9d87e28c1a9ec380d4743a786da46d398b00;hpb=307a4e11763f0914e73dc756b219356e1c29ab25;p=mailer.git

diff --git a/inc/libs/newsletter_functions.php b/inc/libs/newsletter_functions.php
index 5dcf9d87e2..f6b0dfd4b8 100644
--- a/inc/libs/newsletter_functions.php
+++ b/inc/libs/newsletter_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,65 +37,57 @@
  ************************************************************************/
 
 // Some security stuff...
-if (ereg(basename(__FILE__), $_SERVER['PHP_SELF']))
-{
-	$INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php";
+if (!defined('__SECURITY')) {
+	$INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), '/inc') + 4) . '/security.php';
 	require($INC);
 }
+
 //
-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))
-	{
-		$check = strtolower(substr($test, strpos($test, "<") + 1, strpos($test, ">") - strpos($test, "<") - 1));
-		$check = str_replace("/", "", $check);
-		if (!in_array($check, $HTML_TAGS))
-		{
+	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, $GLOBALS['html_tags'])) {
 			// Invalid tag found!
 			return "";
 		}
-		$test = substr($test, strpos($test, ">") + 1);
+		$test = substr($test, strpos($test, '>') + 1);
 	}
 	// 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))
-	{
-		$check = substr($test, strpos($test, "http://")); $check2 = $check;
+	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));
-		}
+		} // END - foreach
 
 		// Now replace the URL against anchor container and pray...
 		$text = substr($text, 0, strpos($text, $check2)) . DEREFERER($check) . 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));
-	}
+	} // END - while
 
 	// Now do the (nearly) same thing with email addresses
 	// but now we have the problem that email addresses didn't have
@@ -100,25 +97,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 +121,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,38 +141,38 @@ 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)
-	{
+	$text = ''; $PARTS[] = $test;
+	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, $message, $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")) {
+		if ((EXT_IS_ACTIVE('html_mail')) && ($mode == 'html')) {
 			// Send HTML mail
-			SEND_EMAIL($TO, $SUBJECT, HTML_INSERT_URLS($MSG), 'Y');
+			sendEmail($to, $subject, HTML_INSERT_URLS($message), 'Y');
 		} else {
 			// Send normal mail
-			SEND_EMAIL($TO, $SUBJECT, NL_INSERT_URLS($MSG), 'N');
+			sendEmail($to, $subject, NL_INSERT_URLS($message), 'N');
 		}
 	} else {
 		// Regular send-out
-		if ((EXT_IS_ACTIVE("html")) && ($MODE == "html")) {
-			SEND_EMAIL($TO, $SUBJECT, $MSG, 'Y');
+		if ((EXT_IS_ACTIVE('html_mail')) && ($mode == 'html')) {
+			sendEmail($to, $subject, $message, 'Y');
 		} else {
-			SEND_EMAIL($TO, $SUBJECT, $MSG);
+			sendEmail($to, $subject, $message, 'N');
 		}
 	}
 }
+
 //
 ?>