X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Flibs%2Fnewsletter_functions.php;h=ea035521c2b8a034fd77123b82e21f4d3e9415a0;hp=0de1fe33cce94385978980d2608de5d321eb2e0a;hb=0715fa7aa8e5e70bcf1d957fb09ae655c3896c4e;hpb=e2148142f8b1a8f40fd6e7ca32185569c5a9083e diff --git a/inc/libs/newsletter_functions.php b/inc/libs/newsletter_functions.php index 0de1fe33cc..ea035521c2 100644 --- a/inc/libs/newsletter_functions.php +++ b/inc/libs/newsletter_functions.php @@ -18,6 +18,7 @@ * svn:keywords Date Revision" (autoprobset!) at least!!!!!! * * -------------------------------------------------------------------- * * Copyright (c) 2003 - 2009 by Roland Haeder * + * Copyright (c) 2009, 2010 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 +47,12 @@ 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 - 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); @@ -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