A lot rewrites from double-quote to single-quote, some fixes for extension handling...

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

diff --git a/inc/libs/newsletter_functions.php b/inc/libs/newsletter_functions.php
index ba15c4c4c25d1d9483176bc2101aea4d31829cb9..1d249d29d49641c49e4770469d85c8da7f10c56b 100644 (file)
--- a/inc/libs/newsletter_functions.php
+++ b/inc/libs/newsletter_functions.php
@@ -44,7 +44,7 @@ if (!defined('__SECURITY')) {
 
 //
 function NL_ADD_VALID_TAGS () {
-       $OUT = "";
+       $OUT = '';
        if (!is_array($GLOBALS['html_tags'])) return "";
        foreach ($GLOBALS['html_tags'] as $tag) {
                $OUT .= ", ".strtoupper($tag);
@@ -58,7 +58,7 @@ 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);
+               $check = str_replace("/", '', $check);
                if (!in_array($check, $GLOBALS['html_tags'])) {
                        // Invalid tag found!
                        return "";
@@ -143,7 +143,7 @@ function NL_INSERT_URLS ($text) {
        }
 
        // Now put all parts together
-       $text = ""; $PARTS[] = $test;
+       $text = ''; $PARTS[] = $test;
        foreach ($PARTS as $part) {
                $text .= $part;
        }
@@ -155,9 +155,9 @@ function NL_INSERT_URLS ($text) {
 //
 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");
                } else {
@@ -166,7 +166,7 @@ function SEND_NEWSLETTER ($to, $subject, $message, $MODE) {
                }
        } else {
                // Regular send-out
-               if ((EXT_IS_ACTIVE("html")) && ($MODE == "html")) {
+               if ((EXT_IS_ACTIVE('html_mail')) && ($MODE == 'html')) {
                        SEND_EMAIL($to, $subject, $message, "Y");
                } else {
                        SEND_EMAIL($to, $subject, $message, "N");