X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Flibs%2Fnewsletter_functions.php;h=1cb6390749e8ad16c4cbc38ba3d61736ae86f332;hp=e2f9b722709802685e3a10ed108d4497463e91e1;hb=8e1fd7e3be3811cb108a074bece2eecd5bcced8f;hpb=64c8349613addc3da2242c5cd6b99d64e3fb5f8e

diff --git a/inc/libs/newsletter_functions.php b/inc/libs/newsletter_functions.php
index e2f9b72270..1cb6390749 100644
--- a/inc/libs/newsletter_functions.php
+++ b/inc/libs/newsletter_functions.php
@@ -1,10 +1,10 @@
 <?php
 /************************************************************************
- * MXChange v0.2.1                                    Start: 04/25/2004 *
- * ================                             Last change: 04/29/2004 *
+ * Mailer v0.2.1-FINAL                                Start: 04/25/2004 *
+ * ===================                          Last change: 04/29/2004 *
  *                                                                      *
  * -------------------------------------------------------------------- *
- * File              : newsletter_functions.php                          *
+ * File              : newsletter_functions.php                         *
  * -------------------------------------------------------------------- *
  * Short description : Functions for the HTML extension                 *
  * -------------------------------------------------------------------- *
@@ -14,10 +14,9 @@
  * $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 - 2009 by Roland Haeder                           *
+ * Copyright (c) 2009 - 2011 by Mailer Developer Team                   *
  * For more information visit: http://www.mxchange.org                  *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -46,12 +45,14 @@ function insertNewsletterUrls ($text) {
 	$test = $text;
 
 	// First replace URLs...
-	while (ereg('http://', $test)) {
+	while (isInString('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));
+			if (isInString($end, $check)) {
+				$check = substr($check, 0, strpos($check, $end));
+			} // END - if
 		} // END - foreach
 
 		// Now replace the URL against anchor container and pray...
@@ -69,7 +70,7 @@ function insertNewsletterUrls ($text) {
 
 	// ... what will the email address be out the @... ;-)
 	$PARTS = array();
-	while (ereg('@', $test)) {
+	while (isInString('@', $test)) {
 		$pos = strpos($test, '@');
 		$test2 = substr($test, 0, $pos);
 
@@ -92,7 +93,7 @@ function insertNewsletterUrls ($text) {
 		}
 
 		// And now go forward...
-		$idx = 0;
+		$idx = '0';
 		while ($idx < strlen($test)) {
 			$check = substr($test, $idx, 1);
 			if ((!in_array($check, $GLOBALS['valid_email_chars'])) && ($check != '@')) {
@@ -120,14 +121,14 @@ function insertNewsletterUrls ($text) {
 		$text .= $part;
 	}
 
-	// Compile possible own HTML tags out...
-	return compileCode($text);
+	// Pre-ompile possible own HTML tags out...
+	return preCompileCode($text);
 }
 
 // Wrapper for sending newsletter and wrapping URLs / HTML mail
 function sendNewsletter ($to, $subject, $message, $mode) {
 	// Send mail away as HTML
-	if (postRequestElement('auto_urls') == 'Y') {
+	if (postRequestParameter('auto_urls') == 'Y') {
 		// Automatically insert URLs into newsletter
 		if ((isExtensionActive('html_mail')) && ($mode == 'html')) {
 			// Send HTML mail