Cache class rewritten to better convention

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

diff --git a/inc/libs/newsletter_functions.php b/inc/libs/newsletter_functions.php
index 5dcf9d87e28c1a9ec380d4743a786da46d398b00..2b03a73f11db3ee23eee893ff35f514d59b71bfc 100644 (file)
--- a/inc/libs/newsletter_functions.php
+++ b/inc/libs/newsletter_functions.php
@@ -32,11 +32,11 @@
  ************************************************************************/
 
 // Some security stuff...
-if (ereg(basename(__FILE__), $_SERVER['PHP_SELF']))
-{
+if (!defined('__SECURITY')) {
        $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php";
        require($INC);
 }
+
 //
 function NL_ADD_VALID_TAGS()
 {
@@ -167,17 +167,17 @@ function SEND_NEWSLETTER($TO, $SUBJECT, $MSG, $MODE)
                // Automatically insert URLs into newsletter
                if ((EXT_IS_ACTIVE("html")) && ($MODE == "html")) {
                        // Send HTML mail
-                       SEND_EMAIL($TO, $SUBJECT, HTML_INSERT_URLS($MSG), 'Y');
+                       SEND_EMAIL($TO, $SUBJECT, HTML_INSERT_URLS($MSG), "Y");
                } else {
                        // Send normal mail
-                       SEND_EMAIL($TO, $SUBJECT, NL_INSERT_URLS($MSG), 'N');
+                       SEND_EMAIL($TO, $SUBJECT, NL_INSERT_URLS($MSG), "N");
                }
        } else {
                // Regular send-out
                if ((EXT_IS_ACTIVE("html")) && ($MODE == "html")) {
-                       SEND_EMAIL($TO, $SUBJECT, $MSG, 'Y');
+                       SEND_EMAIL($TO, $SUBJECT, $MSG, "Y");
                } else {
-                       SEND_EMAIL($TO, $SUBJECT, $MSG);
+                       SEND_EMAIL($TO, $SUBJECT, $MSG, "N");
                }
        }
 }