Many rewrites to get rid of dublicate modreg inserts while ext-cache is registered

[mailer.git] / inc / libs / newsletter_functions.php

diff --git a/inc/libs/newsletter_functions.php b/inc/libs/newsletter_functions.php
index e44554ef0367efc048a767bbdf4ea207e5b90744..f6b0dfd4b8f9c3bce97cf5f9730cd208763a2d66 100644 (file)
--- a/inc/libs/newsletter_functions.php
+++ b/inc/libs/newsletter_functions.php
@@ -56,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;
@@ -74,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
@@ -153,23 +153,23 @@ function NL_INSERT_URLS ($text) {
 }
 
 //
-function SEND_NEWSLETTER ($to, $subject, $message, $MODE) {
+function SEND_NEWSLETTER ($to, $subject, $message, $mode) {
        // Send mail away as HTML
        if (REQUEST_POST('auto_urls') == 'Y') {
                // Automatically insert URLs into newsletter
-               if ((EXT_IS_ACTIVE('html_mail')) && ($MODE == 'html')) {
+               if ((EXT_IS_ACTIVE('html_mail')) && ($mode == 'html')) {
                        // Send HTML mail
-                       SEND_EMAIL($to, $subject, HTML_INSERT_URLS($message), "Y");
+                       sendEmail($to, $subject, HTML_INSERT_URLS($message), 'Y');
                } else {
                        // Send normal mail
-                       SEND_EMAIL($to, $subject, NL_INSERT_URLS($message), "N");
+                       sendEmail($to, $subject, NL_INSERT_URLS($message), 'N');
                }
        } else {
                // Regular send-out
-               if ((EXT_IS_ACTIVE('html_mail')) && ($MODE == 'html')) {
-                       SEND_EMAIL($to, $subject, $message, "Y");
+               if ((EXT_IS_ACTIVE('html_mail')) && ($mode == 'html')) {
+                       sendEmail($to, $subject, $message, 'Y');
                } else {
-                       SEND_EMAIL($to, $subject, $message, "N");
+                       sendEmail($to, $subject, $message, 'N');
                }
        }
 }