A lot calls saved, expression language rewritten:

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

diff --git a/inc/libs/sponsor_functions.php b/inc/libs/sponsor_functions.php
index 80d000c93f146ec5dacd31c1f1fe10583686e2c9..76296b04e9743e337a4296953d98e6edf9c277d7 100644 (file)
--- a/inc/libs/sponsor_functions.php
+++ b/inc/libs/sponsor_functions.php
@@ -141,8 +141,8 @@ function handlSponsorRequest (&$postData, $update=false, $messageArray=array(),
                                $DATA['values'][] = bigintval(getRequestParameter('id'));
 
                                // Generate message
-                               $message = getMessageFromIndexedArray(getMessage('ADMIN_SPONSOR_UPDATED'), 'updated', $messageArray);
-                               $ret = "updated";
+                               $message = getMessageFromIndexedArray('{--ADMIN_SPONSOR_UPDATED--}', 'updated', $messageArray);
+                               $ret = 'updated';
                        } elseif (($ALREADY === false) || (($postData['force'] == 1) && (isAdmin()))) {
                                // Add new sponsor, first add more data
                                $DATA['keys'][] = 'sponsor_created'; $DATA['values'][] = time();
@@ -162,14 +162,14 @@ function handlSponsorRequest (&$postData, $update=false, $messageArray=array(),
                                }
 
                                // Implode all data into strings
-                               $keyArray   = implode("`, `"  , $DATA['keys']);
+                               $keyArray   = implode('`, `'  , $DATA['keys']);
                                $valueArray = str_repeat("%s', '", count($DATA['values']) - 1);
 
                                // Generate string
-                               $sql = "INSERT INTO `{?_MYSQL_PREFIX?}_sponsor_data` (`" . $keyArray . "`) VALUES ('" . $valueArray . "%s')";
+                               $sql = 'INSERT INTO `{?_MYSQL_PREFIX?}_sponsor_data` (`' . $keyArray . "`) VALUES ('" . $valueArray . "%s')";
 
                                // Generate message
-                               $message = getMessageFromIndexedArray(getMessage('ADMIN_SPONSOR_ADDED'), 'added', $messageArray);
+                               $message = getMessageFromIndexedArray('{--ADMIN_SPONSOR_ADDED--}', 'added', $messageArray);
                                $ret = 'added';
                        } elseif (($update === true) && (isAdmin())) {
                                // Add all data as hidden data
@@ -205,7 +205,7 @@ function handlSponsorRequest (&$postData, $update=false, $messageArray=array(),
                        } // END - if
                } else {
                        // Error found!
-                       $message = getMessageFromIndexedArray(getMessage('SPONSOR_DATA_NOT_SAVED'), 'failed', $messageArray);
+                       $message = getMessageFromIndexedArray('{--SPONSOR_DATA_NOT_SAVED--}', 'failed', $messageArray);
                        loadTemplate('admin_settings_saved', false, $message);
                }
 
@@ -444,11 +444,11 @@ function saveSponsorData ($postData, $content) {
                        if ($EMAIL === true) {
                                $message = '{--SPONSOR_ACCOUNT_EMAIL_CHANGED--}';
                                $templ   = 'admin_sponsor_change_email';
-                               $subj    = '{--ADMIN_SPONSOR_ACC_EMAIL_SUBJ--}';
+                               $subj    = '{--ADMIN_SPONSOR_ACC_EMAIL_SUBJECT--}';
                        } else {
                                $message = '{--SPONSOR_ACCOUNT_DATA_SAVED--}';
                                $templ   = 'admin_sponsor_change_data';
-                               $subj    = '{--ADMIN_SPONSOR_ACC_DATA_SUBJ--}';
+                               $subj    = '{--ADMIN_SPONSOR_ACC_DATA_SUBJECT--}';
                        }
                        break;
 
@@ -456,7 +456,7 @@ function saveSponsorData ($postData, $content) {
                        // Set message template and subject for admin
                        $message = '{--SPONSOR_SETTINGS_SAVED--}';
                        $templ   = 'admin_sponsor_settings';
-                       $subj    = '{--ADMIN_SPONSOR_SETTINGS_SUBJ--}';
+                       $subj    = '{--ADMIN_SPONSOR_SETTINGS_SUBJECT--}';
                        break;
 
                default: // Unknown sponsor what value!
@@ -491,7 +491,7 @@ function saveSponsorData ($postData, $content) {
                                switch (getWhat()) {
                                        case 'account': // Change account data
                                                $email_msg = loadEmailTemplate('sponsor_change_data', $content);
-                                               sendEmail($content['email'], '{--SPONSOR_ACC_DATA_SUBJ--}', $email_msg);
+                                               sendEmail($content['email'], '{--SPONSOR_ACC_DATA_SUBJECT--}', $email_msg);
 
                                                if ($EMAIL === true) {
                                                        // Add hash code to content array
@@ -499,14 +499,14 @@ function saveSponsorData ($postData, $content) {
 
                                                        // Second mail goes to the new address
                                                        $email_msg = loadEmailTemplate('sponsor_change_email', $content);
-                                                       sendEmail($content['email'], '{--SPONSOR_ACC_EMAIL_SUBJ--}', $email_msg);
+                                                       sendEmail($content['email'], '{--SPONSOR_ACC_EMAIL_SUBJECT--}', $email_msg);
                                                } // END - if
                                                break;
 
                                        case 'settings': // Change settings
                                                // Send email
                                                $email_msg = loadEmailTemplate('sponsor_settings', $content);
-                                               sendEmail($content['email'], '{--SPONSOR_SETTINGS_SUBJ--}', $email_msg);
+                                               sendEmail($content['email'], '{--SPONSOR_SETTINGS_SUBJECT--}', $email_msg);
                                                break;
                                } // END - switch
                        } // END - if