Huge rewrite:

[mailer.git] / inc / modules / member / what-newsletter.php

diff --git a/inc/modules/member/what-newsletter.php b/inc/modules/member/what-newsletter.php
index 1e815de44523942417d3a495bdd3029dc5dda0c0..2d83f42f3a5785e50cbcfe8c23a7526b528fee76 100644 (file)
--- a/inc/modules/member/what-newsletter.php
+++ b/inc/modules/member/what-newsletter.php
@@ -65,18 +65,17 @@ if ((isFormSent()) && ($status == 'Y') && ($span == '0')) {
        array(getUserId()), __FILE__, __LINE__);
 
        // Load admin message
-       $admin_msg = LOAD_EMAIL_TEMPLATE("admin_newsletter_request", array(), getUserId());
+       $admin_msg = LOAD_EMAIL_TEMPLATE('admin_newsletter_request', array(), getUserId());
 
        // Add task
-       SQL_QUERY_ESC("INSERT INTO `{!_MYSQL_PREFIX!}_task_system` (assigned_admin, status, task_type, subject, text, task_created, userid)
-VALUES ('0','NEW','NL_UNSUBSCRIBE','{--ADMIN_NL_SUBJECT--}','".$admin_msg."', UNIX_TIMESTAMP(),'%s')", array(getUserId()), __FILE__, __LINE__);
+       createNewTask('{--ADMIN_NL_SUBJECT--}', $admin_msg, 'NL_UNSUBSCRIBE', getUserId());
 
        // Send mail to member
-       $msg = LOAD_EMAIL_TEMPLATE("member_newsletter_request", array(), getUserId());
-       sendEmail(getUserId(), getMessage('NL_MEMBER_SUBJECT'), $msg);
+       $message = LOAD_EMAIL_TEMPLATE('member_newsletter_request', array(), getUserId());
+       sendEmail(getUserId(), getMessage('NL_MEMBER_SUBJECT'), $message);
 
        // Send mail to all admins
-       sendAdminNotification(getMessage('NL_ADMIN_SUBJECT'), "admin_newsletter_request", array(), getUserId());
+       sendAdminNotification(getMessage('NL_ADMIN_SUBJECT'), 'admin_newsletter_request', array(), getUserId());
 
        // Display message
        LOAD_TEMPLATE('admin_settings_saved', false, getMessage('NL_MEMBER_REQUEST_DONE'));
@@ -85,11 +84,10 @@ VALUES ('0','NEW','NL_UNSUBSCRIBE','{--ADMIN_NL_SUBJECT--}','".$admin_msg."', UN
        LOAD_TEMPLATE('admin_settings_saved', false, getMessage('NL_MEMBER_REQUEST_ALREADY'));
 } else {
        // Load template for the note
-       define('NL_MEMBER_NOTE', LOAD_TEMPLATE("member_newsletter_note", true));
+       define('NL_MEMBER_NOTE', LOAD_TEMPLATE('member_newsletter_note', true));
 
        // Set status message and submit button
-       switch ($status)
-       {
+       switch ($status) {
                case 'Y': // Receives the newsletter
                        define('__STATUS_VALUE', getMessage('NL_MEMBER_ON'));
                        define('__UNTIL_VALUE' , '');
@@ -101,12 +99,12 @@ VALUES ('0','NEW','NL_UNSUBSCRIBE','{--ADMIN_NL_SUBJECT--}','".$admin_msg."', UN
                        define('__UNTIL_VALUE' , generateDateTime($until, '2'));
                        define('NL_SUBMIT'     , getMessage('NL_MEMBER_SUBMIT_ON'));
                        break;
-       }
+       } // END - switch
 
        // Load template and member settings
-       LOAD_TEMPLATE("member_newsletter");
+       LOAD_TEMPLATE('member_newsletter');
 }
 
-//
+// [EOF]
 ?>