More language constants rewritten ({--LANGUAGE--} is for constants)

[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 2e5f885cad2c60de359be6cd8d0a8fdc5582b37f..864299bacb111d08eb1e16b2cafd84593dd6e56e 100644 (file)
--- a/inc/modules/member/what-newsletter.php
+++ b/inc/modules/member/what-newsletter.php
@@ -47,15 +47,14 @@ ADD_DESCR("member", __FILE__);
 
 // Load status
 $result = SQL_QUERY_ESC("SELECT nl_receive, nl_until, nl_timespan FROM `{!_MYSQL_PREFIX!}_user_data` WHERE userid=%s LIMIT 1",
- array($GLOBALS['userid']), __FILE__, __LINE__);
+       array($GLOBALS['userid']), __FILE__, __LINE__);
 list($status, $until, $span) = SQL_FETCHROW($result);
 SQL_FREERESULT($result);
 
 // Remember charge value
 define('__CHARGE_VALUE', TRANSLATE_COMMA(getConfig('nl_charge')));
 
-if ((isset($_POST['ok'])) && ($status == "Y") && ($span == "0"))
-{
+if ((isset($_POST['ok'])) && ($status == "Y") && ($span == "0")) {
        // Save request
        SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_user_data` SET nl_timespan='".(getConfig('one_day') * 30)."' WHERE userid=%s LIMIT 1",
                array($GLOBALS['userid']), __FILE__, __LINE__);
@@ -65,25 +64,21 @@ if ((isset($_POST['ok'])) && ($status == "Y") && ($span == "0"))
 
        // 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($GLOBALS['userid']), __FILE__, __LINE__);
+VALUES ('0','NEW','NL_UNSUBSCRIBE','{--ADMIN_NL_SUBJECT--}','".$admin_msg."', UNIX_TIMESTAMP(),'%s')", array($GLOBALS['userid']), __FILE__, __LINE__);
 
        // Send mail to member
        $msg = LOAD_EMAIL_TEMPLATE("member_newsletter_request", array(), $GLOBALS['userid']);
-       SEND_EMAIL($GLOBALS['userid'], NL_MEMBER_SUBJECT, $msg);
+       SEND_EMAIL($GLOBALS['userid'], getMessage('NL_MEMBER_SUBJECT'), $msg);
 
        // Send mail to all admins
-       SEND_ADMIN_NOTIFICATION(NL_ADMIN_SUBJECT, "admin_newsletter_request", array(), $GLOBALS['userid']);
+       SEND_ADMIN_NOTIFICATION(getMessage('NL_ADMIN_SUBJECT'), "admin_newsletter_request", array(), $GLOBALS['userid']);
 
        // Display message
-       LOAD_TEMPLATE("admin_settings_saved", false, NL_MEMBER_REQUEST_DONE);
-}
- elseif ($span > 0)
-{
+       LOAD_TEMPLATE("admin_settings_saved", false, getMessage('NL_MEMBER_REQUEST_DONE'));
+} elseif ($span > 0) {
        // Already ordered
-       LOAD_TEMPLATE("admin_settings_saved", false, NL_MEMBER_REQUEST_ALREADY);
-}
- else
-{
+       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));
 
@@ -91,21 +86,22 @@ VALUES ('0','NEW','NL_UNSUBSCRIBE','{!ADMIN_NL_SUBJECT!}','".$admin_msg."', UNIX
        switch ($status)
        {
        case "Y": // Receives the newsletter
-               define('__STATUS_VALUE', NL_MEMBER_ON);
-               define('__UNTIL_VALUE', "");
-               define('NL_SUBMIT', NL_MEMBER_SUBMIT_OFF);
+               define('__STATUS_VALUE', getMessage('NL_MEMBER_ON'));
+               define('__UNTIL_VALUE' , "");
+               define('NL_SUBMIT'     , getMessage('NL_MEMBER_SUBMIT_OFF'));
                break;
 
        case "N": // Does not receive the newsletter
-               define('__STATUS_VALUE', NL_MEMBER_OFF);
-               define('__UNTIL_VALUE', MAKE_DATETIME($until, "2"));
-               define('NL_SUBMIT', NL_MEMBER_SUBMIT_ON);
+               define('__STATUS_VALUE', getMessage('NL_MEMBER_OFF'));
+               define('__UNTIL_VALUE' , MAKE_DATETIME($until, "2"));
+               define('NL_SUBMIT'     , getMessage('NL_MEMBER_SUBMIT_ON'));
                break;
        }
 
        // Load template and member settings
        LOAD_TEMPLATE("member_newsletter");
 }
+
 //
 ?>