More misc fixes and rewrites (sorry, lame description)

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

diff --git a/inc/libs/newsletter_functions.php b/inc/libs/newsletter_functions.php
index ee7663e7aa6c9cc43ed782c17c369daf05f93123..2c77e3a802cb06159ceccc11ae9673143c4549ab 100644 (file)
--- a/inc/libs/newsletter_functions.php
+++ b/inc/libs/newsletter_functions.php
@@ -38,13 +38,13 @@
 
 // Some security stuff...
 if (!defined('__SECURITY')) {
-       $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php";
+       $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), '/inc') + 4) . '/security.php';
        require($INC);
 }
 
 //
 function NL_ADD_VALID_TAGS () {
-       $OUT = "";
+       $OUT = '';
        if (!is_array($GLOBALS['html_tags'])) return "";
        foreach ($GLOBALS['html_tags'] as $tag) {
                $OUT .= ", ".strtoupper($tag);
@@ -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
@@ -97,8 +97,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 +123,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,14 +136,14 @@ 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;
        }
@@ -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") {
+       if (REQUEST_POST('auto_urls') == 'Y') {
                // Automatically insert URLs into newsletter
-               if ((EXT_IS_ACTIVE("html")) && ($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")) && ($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');
                }
        }
 }