X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Flibs%2Fnewsletter_functions.php;h=e2f9b722709802685e3a10ed108d4497463e91e1;hb=4fb64ee12fc856499810421c13c55893e7a00bdf;hp=d7326670553f78fd4f927b7d04e7cd7a4a605ee3;hpb=508228c85fba8448d00865b1639cb8cd7a69e457;p=mailer.git

diff --git a/inc/libs/newsletter_functions.php b/inc/libs/newsletter_functions.php
index d732667055..e2f9b72270 100644
--- a/inc/libs/newsletter_functions.php
+++ b/inc/libs/newsletter_functions.php
@@ -10,14 +10,14 @@
  * -------------------------------------------------------------------- *
  * Kurzbeschreibung  : Funktionen fuer die HTML-Erweiterung             *
  * -------------------------------------------------------------------- *
- * $Revision:: 856                                                    $ *
+ * $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                           *
+ * Copyright (c) 2003 - 2009 by Roland Haeder                           *
  * For more information visit: http://www.mxchange.org                  *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -38,56 +38,28 @@
 
 // Some security stuff...
 if (!defined('__SECURITY')) {
-	$INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php";
-	require($INC);
+	die();
 }
 
 //
-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) {
-	$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, $GLOBALS['html_tags'])) {
-			// Invalid tag found!
-			return "";
-		}
-		$test = substr($test, strpos($test, ">") + 1);
-	}
-	// Return tested code
-	return $html;
-}
-
-//
-function NL_INSERT_URLS ($text) {
+function insertNewsletterUrls ($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));
+		$text = substr($text, 0, strpos($text, $check2)) . generateDerefererUrl($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
@@ -97,8 +69,8 @@ function NL_INSERT_URLS ($text) {
 
 	// ... what will the email address be out the @... ;-)
 	$PARTS = array();
-	while (ereg("@", $test)) {
-		$pos = strpos($test, "@");
+	while (ereg('@', $test)) {
+		$pos = strpos($test, '@');
 		$test2 = substr($test, 0, $pos);
 
 		// First check backwards
@@ -123,7 +95,7 @@ function NL_INSERT_URLS ($text) {
 		$idx = 0;
 		while ($idx < strlen($test)) {
 			$check = substr($test, $idx, 1);
-			if ((!in_array($check, $GLOBALS['valid_email_chars'])) && ($check != "@")) {
+			if ((!in_array($check, $GLOBALS['valid_email_chars'])) && ($check != '@')) {
 				// Char found so end here again
 				break;
 			}
@@ -136,40 +108,40 @@ function NL_INSERT_URLS ($text) {
 		}
 
 		// Now replace the email against anchor with mailto and pray...
-		$PARTS[] = $check2.$check;
+		$PARTS[] = $check2 . $check;
 
 		// Remove email from testing string (see above why...)
 		$test = substr($test, strlen($check));
 	}
 
 	// Now put all parts together
-	$text = ""; $PARTS[] = $test;
+	$text = ''; $PARTS[] = $test;
 	foreach ($PARTS as $part) {
 		$text .= $part;
 	}
 
 	// Compile possible own HTML tags out...
-	return COMPILE_CODE($text);
+	return compileCode($text);
 }
 
-//
-function SEND_NEWSLETTER ($TO, $SUBJECT, $MSG, $MODE) {
+// Wrapper for sending newsletter and wrapping URLs / HTML mail
+function sendNewsletter ($to, $subject, $message, $mode) {
 	// Send mail away as HTML
-	if (REQUEST_POST('auto_urls') == "Y") {
+	if (postRequestElement('auto_urls') == 'Y') {
 		// Automatically insert URLs into newsletter
-		if ((EXT_IS_ACTIVE("html")) && ($MODE == "html")) {
+		if ((isExtensionActive('html_mail')) && ($mode == 'html')) {
 			// Send HTML mail
-			SEND_EMAIL($TO, $SUBJECT, HTML_INSERT_URLS($MSG), "Y");
+			sendEmail($to, $subject, insertUrlsIntoHtml($message), 'Y');
 		} else {
 			// Send normal mail
-			SEND_EMAIL($TO, $SUBJECT, NL_INSERT_URLS($MSG), "N");
+			sendEmail($to, $subject, insertNewsletterUrls($message), 'N');
 		}
 	} else {
 		// Regular send-out
-		if ((EXT_IS_ACTIVE("html")) && ($MODE == "html")) {
-			SEND_EMAIL($TO, $SUBJECT, $MSG, "Y");
+		if ((isExtensionActive('html_mail')) && ($mode == 'html')) {
+			sendEmail($to, $subject, $message, 'Y');
 		} else {
-			SEND_EMAIL($TO, $SUBJECT, $MSG, "N");
+			sendEmail($to, $subject, $message, 'N');
 		}
 	}
 }