More references to removed (still some left)

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

diff --git a/inc/libs/sponsor_functions.php b/inc/libs/sponsor_functions.php
index 868ff4386286fa8e384b113105375158043706a7..5ef940265a065abbe5fdcd415fe9bf860e9f76f6 100644 (file)
--- a/inc/libs/sponsor_functions.php
+++ b/inc/libs/sponsor_functions.php
@@ -352,7 +352,6 @@ ORDER BY `sort`", array($action), __FILE__, __LINE__);
 //
 function GENERATE_SPONSOR_CONTENT($what)
 {
-       global $_CONFIG;
        $OUT = "";
        $INC = sprintf("inc/modules/sponsor/%s.php", $what);
        if (FILE_READABLE($INC)) {
@@ -456,16 +455,14 @@ function SPONSOR_SAVE_DATA ($POST, $content) {
        switch ($GLOBALS['what'])
        {
        case "account": // Change account data
-               if ($EMAIL) {
-                       $MSG   = SPONSOR_ACCOUNT_EMAIL_CHANGED;
+               if ($EMAIL === true) {
+                       $MSG   = getMessage('SPONSOR_ACCOUNT_EMAIL_CHANGED');
                        $templ = "admin_sponsor_change_email";
-                       $subj  = ADMIN_SPONSOR_ACC_EMAIL_SUBJ;
-               }
-                else
-               {
-                       $MSG   = SPONSOR_ACCOUNT_DATA_SAVED;
+                       $subj  = getMessage('ADMIN_SPONSOR_ACC_EMAIL_SUBJ');
+               } else {
+                       $MSG   = getMessage('SPONSOR_ACCOUNT_DATA_SAVED');
                        $templ = "admin_sponsor_change_data";
-                       $subj  = ADMIN_SPONSOR_ACC_DATA_SUBJ;
+                       $subj  = getMessage('ADMIN_SPONSOR_ACC_DATA_SUBJ');
                }
                break;
 
@@ -475,9 +472,9 @@ function SPONSOR_SAVE_DATA ($POST, $content) {
                $content['interval'] = CREATE_FANCY_TIME($content['warning_interval']);
 
                // Set message template and subject for admin
-               $MSG   = SPONSOR_SETTINGS_SAVED;
+               $MSG   = getMessage('SPONSOR_SETTINGS_SAVED');
                $templ = "admin_sponsor_settings";
-               $subj  = ADMIN_SPONSOR_SETTINGS_SUBJ;
+               $subj  = getMessage('ADMIN_SPONSOR_SETTINGS_SUBJ');
                break;
 
        default: // Unknown sponsor what value!
@@ -487,10 +484,8 @@ function SPONSOR_SAVE_DATA ($POST, $content) {
                break;
        }
 
-       if (SQL_AFFECTEDROWS() == 1)
-       {
-               if (!empty($templ) && !empty($subj))
-               {
+       if (SQL_AFFECTEDROWS() == 1) {
+               if (!empty($templ) && !empty($subj)) {
                        // Run SQL command and check for success
                        $result = SQL_QUERY_ESC($SQL, $DATA, __FILE__, __LINE__);
 
@@ -508,8 +503,7 @@ function SPONSOR_SAVE_DATA ($POST, $content) {
                        SEND_ADMIN_NOTIFICATION($subj, $templ, $content);
 
                        // Shall we send mail to the sponsor's new email address?
-                       if ($content['receive_warnings'] == "Y")
-                       {
+                       if ($content['receive_warnings'] == "Y") {
                                // Okay send email with confirmation link to new address and with no confirmation link
                                // to the old address
 
@@ -518,23 +512,22 @@ function SPONSOR_SAVE_DATA ($POST, $content) {
                                {
                                case "account": // Change account data
                                        $email_msg = LOAD_EMAIL_TEMPLATE("sponsor_change_data", $content);
-                                       SEND_EMAIL($content['email'], SPONSOR_ACC_DATA_SUBJ, $email_msg);
+                                       SEND_EMAIL($content['email'], getMessage('SPONSOR_ACC_DATA_SUBJ'), $email_msg);
 
-                                       if ($EMAIL)
-                                       {
+                                       if ($EMAIL === true) {
                                                // Add hash code to content array
                                                $content['hash'] = $HASH;
 
                                                // Second mail goes to the new address
                                                $email_msg = LOAD_EMAIL_TEMPLATE("sponsor_change_email", $content);
-                                               SEND_EMAIL($content['email'], SPONSOR_ACC_EMAIL_SUBJ, $email_msg);
+                                               SEND_EMAIL($content['email'], getMessage('SPONSOR_ACC_EMAIL_SUBJ'), $email_msg);
                                        }
                                        break;
 
                                case "settings": // Change settings
                                        // Send email
                                        $email_msg = LOAD_EMAIL_TEMPLATE("sponsor_settings", $content);
-                                       SEND_EMAIL($content['email'], SPONSOR_SETTINGS_SUBJ, $email_msg);
+                                       SEND_EMAIL($content['email'], getMessage('SPONSOR_SETTINGS_SUBJ'), $email_msg);
                                        break;
                                }
                        }
@@ -544,5 +537,6 @@ function SPONSOR_SAVE_DATA ($POST, $content) {
        // Return final message
        return $MSG;
 }
+
 //
 ?>