Fix in CREATE_EXTENSION_DEACTIVATION_TASK() and coding-style updated

[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 7dd4140d33e51d9dfb9dd326132b53caaab10130..d0897250351d3fb8d262413f4051edc7779f12ae 100644 (file)
--- a/inc/modules/member/what-newsletter.php
+++ b/inc/modules/member/what-newsletter.php
@@ -52,19 +52,19 @@ list($status, $until, $span) = SQL_FETCHROW($result);
 SQL_FREERESULT($result);
 
 // Remember charge value
-define('__CHARGE_VALUE', TRANSLATE_COMMA($_CONFIG['nl_charge']));
+define('__CHARGE_VALUE', TRANSLATE_COMMA(getConfig('nl_charge')));
 
 if ((isset($_POST['ok'])) && ($status == "Y") && ($span == "0"))
 {
        // Save request
-       $result = SQL_QUERY_ESC("UPDATE `"._MYSQL_PREFIX."_user_data` SET nl_timespan='".($_CONFIG['one_day'] * 30)."' WHERE userid=%s LIMIT 1",
-        array($GLOBALS['userid']), __FILE__, __LINE__);
+       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__);
 
        // Load admin message
        $admin_msg = LOAD_EMAIL_TEMPLATE("admin_newsletter_request", array(), $GLOBALS['userid']);
 
        // Add task
-       $result = SQL_QUERY_ESC("INSERT INTO "._MYSQL_PREFIX."_task_system (assigned_admin, status, task_type, subject, text, task_created, userid)
+       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__);
 
        // Send mail to member
@@ -90,13 +90,13 @@ VALUES ('0','NEW','NL_UNSUBSCRIBE','".ADMIN_NL_SUBJECT."','".$admin_msg."', UNIX
        // Set status message and submit button
        switch ($status)
        {
-       case 'Y': // Receives the newsletter
+       case "Y": // Receives the newsletter
                define('__STATUS_VALUE', NL_MEMBER_ON);
                define('__UNTIL_VALUE', "");
                define('NL_SUBMIT', NL_MEMBER_SUBMIT_OFF);
                break;
 
-       case 'N': // Does not receive the newsletter
+       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);