X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Flibs%2Fnewsletter_functions.php;h=a2b3c0ae62356affc623318eb8a9aa1cb90159a1;hb=63f159414369b5ea19a8ca75d8cd8033c45d8341;hp=d50037e4f8389346b4a52fe59af78ff1ed3a3c73;hpb=9afd6ec5878544a7982c50ed9c0dd7de37606d5b;p=mailer.git

diff --git a/inc/libs/newsletter_functions.php b/inc/libs/newsletter_functions.php
index d50037e4f8..a2b3c0ae62 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,11 +14,10 @@
  * $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                           *
- * For more information visit: http://www.mxchange.org                  *
+ * Copyright (c) 2009 - 2012 by Mailer Developer Team                   *
+ * For more information visit: http://mxchange.org                      *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
  * it under the terms of the GNU General Public License as published by *
@@ -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 != '@')) {
@@ -108,20 +109,21 @@ function insertNewsletterUrls ($text) {
 		}
 
 		// Now replace the email against anchor with mailto and pray...
-		$PARTS[] = $check2 . $check;
+		array_push($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 = '';
+	array_push($PARTS, $test);
 	foreach ($PARTS as $part) {
 		$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