X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Flibs%2Fnewsletter_functions.php;h=f6b0dfd4b8f9c3bce97cf5f9730cd208763a2d66;hb=98077af43126dd7c274fe57f6ea0494e906e8943;hp=7fccd6fa40c83f3e62448bbffeb51dce04cf005a;hpb=d016e24dd4686f613a17733b96bc28fac936a4ac;p=mailer.git

diff --git a/inc/libs/newsletter_functions.php b/inc/libs/newsletter_functions.php
index 7fccd6fa40..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                  *
@@ -33,13 +38,13 @@
 
 // Some security stuff...
 if (!defined('__SECURITY')) {
-	$INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php";
+	$INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), '/inc') + 4) . '/security.php';
 	require($INC);
 }
 
 //
 function NL_ADD_VALID_TAGS () {
-	$OUT = "";
+	$OUT = '';
 	if (!is_array($GLOBALS['html_tags'])) return "";
 	foreach ($GLOBALS['html_tags'] as $tag) {
 		$OUT .= ", ".strtoupper($tag);
@@ -51,14 +56,14 @@ function NL_ADD_VALID_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);
+	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;
@@ -69,20 +74,20 @@ 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 ($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
@@ -138,7 +143,7 @@ function NL_INSERT_URLS ($text) {
 	}
 
 	// Now put all parts together
-	$text = ""; $PARTS[] = $test;
+	$text = ''; $PARTS[] = $test;
 	foreach ($PARTS as $part) {
 		$text .= $part;
 	}
@@ -148,23 +153,23 @@ function NL_INSERT_URLS ($text) {
 }
 
 //
-function SEND_NEWSLETTER ($TO, $SUBJECT, $MSG, $MODE) {
+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, "N");
+			sendEmail($to, $subject, $message, 'N');
 		}
 	}
 }