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

[mailer.git] / inc / modules / admin / what-send_newsletter.php

diff --git a/inc/modules/admin/what-send_newsletter.php b/inc/modules/admin/what-send_newsletter.php
index d63e71c103e58c6c64c82d8637a21ddb7a2c4150..285fc0f0592fae93d72367f5ccd3090008bf5bdd 100644 (file)
--- a/inc/modules/admin/what-send_newsletter.php
+++ b/inc/modules/admin/what-send_newsletter.php
@@ -43,7 +43,7 @@ if ((!defined('__SECURITY')) || (!IS_ADMIN())) {
 }
 
 // Add description as navigation point
 }
 
 // Add description as navigation point

-ADD_DESCR("admin", __FILE__);
+ADD_DESCR('admin', __FILE__);

 
 if (IS_FORM_SENT()) {
        $result = SQL_QUERY("SELECT userid, email
 
 if (IS_FORM_SENT()) {
        $result = SQL_QUERY("SELECT userid, email


@@ -54,13 +54,13 @@ ORDER BY userid ASC", __FILE__, __LINE__);
                // Members are available so we can send out the newsletter!
                while ($content = SQL_FETCHARRAY($result)) {
                        // Construct mail...
                // Members are available so we can send out the newsletter!
                while ($content = SQL_FETCHARRAY($result)) {
                        // Construct mail...

-                       $template = "newsletter";
+                       $template = 'newsletter';

 
                        // Check for extension and sending-mode
 
                        // Check for extension and sending-mode

-                       if (!EXT_IS_ACTIVE("html_mail", true) && (REQUEST_POST('mode') == "html")) {
+                       if (!EXT_IS_ACTIVE('html_mail', true) && (REQUEST_POST('mode') == 'html')) {

                                // Set mode to text mode
                                REQUEST_POST('mode') == "text";
                                // Set mode to text mode
                                REQUEST_POST('mode') == "text";

-                       } elseif (REQUEST_POST('mode') == "html") {
+                       } elseif (REQUEST_POST('mode') == 'html') {

                                // Set HTML templates
                                $template = "newsletter_html";
                        }
                                // Set HTML templates
                                $template = "newsletter_html";
                        }


@@ -79,13 +79,13 @@ ORDER BY userid ASC", __FILE__, __LINE__);
                SQL_FREERESULT($result);
 
                // Output message
                SQL_FREERESULT($result);
 
                // Output message

-               LOAD_TEMPLATE("admin_settings_saved", false, getMessage('ADMIN_NL_SEND_DONE'));
+               LOAD_TEMPLATE('admin_settings_saved', false, getMessage('ADMIN_NL_SEND_DONE'));

        }
 } else {
        // Copy data into constants for the template and load it
        // @TODO Rewrite this constant
        define('_DATESTAMP', MAKE_DATETIME(time(), "3"));
        }
 } else {
        // Copy data into constants for the template and load it
        // @TODO Rewrite this constant
        define('_DATESTAMP', MAKE_DATETIME(time(), "3"));

-       if (EXT_IS_ACTIVE("html_mail")) {
+       if (EXT_IS_ACTIVE('html_mail')) {

                // Load template with HTML mode
                LOAD_TEMPLATE("admin_newsletter");
        } else {
                // Load template with HTML mode
                LOAD_TEMPLATE("admin_newsletter");
        } else {