Even more rewritten

[mailer.git] / inc / modules / sponsor / account.php

diff --git a/inc/modules/sponsor/account.php b/inc/modules/sponsor/account.php
index dea2bdb1565b24c5879bbd61f111816157437db6..5adea29d742a49fcd9caa40884db18e0ad40fea7 100644 (file)
--- a/inc/modules/sponsor/account.php
+++ b/inc/modules/sponsor/account.php
@@ -39,8 +39,8 @@
 if (!defined('__SECURITY')) {
        $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4)."/security.php";
        require($INC);
-} elseif ((!EXT_IS_ACTIVE("sponsor"))
-       addFatalMessage(__FILE__, __LINE__, getMessage('EXTENSION_PROBLEM_EXT_INACTIVE'), "sponsor");
+} elseif ((!EXT_IS_ACTIVE('sponsor'))
+       addFatalMessage(__FILE__, __LINE__, getMessage('EXTENSION_PROBLEM_EXT_INACTIVE'), 'sponsor');
        return;
 } elseif (!IS_SPONSOR()) {
        // No sponsor!
@@ -67,25 +67,25 @@ if (SQL_NUMROWS($result) == 1) {
                        // Check passwords
                        if (!REQUEST_ISSET_POST(('pass_old'))) {
                                // No current password entered
-                               $MSG = getMessage('SPONSOR_NO_CURRENT_PASSWORD_ENTERED');
+                               $message = getMessage('SPONSOR_NO_CURRENT_PASSWORD_ENTERED');
                        } elseif (md5(REQUEST_POST('pass_old')) != get_session('sponsorpass')) {
                                // Entered password didn't match password in DB
-                               $MSG = getMessage('SPONSOR_CURRENT_PASSWORD_DIDNOT_MATCH_DB');
+                               $message = getMessage('SPONSOR_CURRENT_PASSWORD_DIDNOT_MATCH_DB');
                        } elseif ((REQUEST_ISSET_POST(('pass1'))) && (REQUEST_ISSET_POST(('pass2'))) && (REQUEST_POST('pass1') != REQUEST_POST('pass2'))) {
                                // Both new passwords did not match
-                               $MSG = getMessage('SPONSOR_BOTH_NEW_PASSWORDS_DIDNOT_MATCH');
+                               $message = getMessage('SPONSOR_BOTH_NEW_PASSWORDS_DIDNOT_MATCH');
                        } elseif ((!REQUEST_ISSET_POST(('pass1'))) && (REQUEST_ISSET_POST(('pass2')))) {
                                // No password one entered
-                               $MSG = getMessage('SPONSOR_PASSWORD_ONE_EMPTY');
+                               $message = getMessage('SPONSOR_PASSWORD_ONE_EMPTY');
                        } elseif ((REQUEST_ISSET_POST(('pass1'))) && (!REQUEST_ISSET_POST(('pass2')))) {
                                // No password two entered
-                               $MSG = getMessage('SPONSOR_PASSWORD_TWO_EMPTY');
+                               $message = getMessage('SPONSOR_PASSWORD_TWO_EMPTY');
                        } elseif ((REQUEST_ISSET_POST(('pass1'))) && (strlen(REQUEST_POST('pass1')) < getConfig('pass_len'))) {
                                // Too short password
-                               $MSG = sprintf(getMessage('SPONSOR_PASSWORD_TOO_SHORT'), getConfig('pass_len'));
+                               $message = sprintf(getMessage('SPONSOR_PASSWORD_TOO_SHORT'), getConfig('pass_len'));
                        } else {
                                // Default is we don't want to change password!
-                               $PASS_AND = ""; $PASS_DATA = "";
+                               $PASS_AND = ''; $PASS_DATA = '';
 
                                // Check if we want to change password or not
                                if ((REQUEST_POST('pass1') == REQUEST_POST('pass2')) && (REQUEST_ISSET_POST(('pass1'))) && (REQUEST_POST('pass1') != REQUEST_POST('pass_old'))) {
@@ -106,36 +106,36 @@ if (SQL_NUMROWS($result) == 1) {
                                REQUEST_SET_POST('last_change', "UNIX_TIMESTAMP()");
 
                                // Save data
-                               $MSG = SPONSOR_SAVE_DATA(REQUEST_POST_ARRAY(), $content);
+                               $message = SPONSOR_SAVE_DATA(REQUEST_POST_ARRAY(), $content);
                        }
 
-                       if (!empty($MSG)) {
+                       if (!empty($message)) {
                                // Output message
-                               $OUT = LOAD_TEMPLATE("admin_settings_saved", true, $MSG);
+                               $OUT = LOAD_TEMPLATE('admin_settings_saved', true, $message);
                        } else {
                                // No message generated
-                               $OUT = LOAD_TEMPLATE("admin_settings_saved", true, getMessage('SPONSOR_NO_MESSAGE_GENERATED'));
+                               $OUT = LOAD_TEMPLATE('admin_settings_saved', true, getMessage('SPONSOR_NO_MESSAGE_GENERATED'));
                        }
                } else {
                        // Check for gender selection
                        switch ($content['gender'])
                        {
                        case "M": // Male
-                               define('__GENDER_M', " selected=\"selected\"");
-                               define('__GENDER_F', "");
-                               define('__GENDER_C', "");
+                               define('__GENDER_M', ' selected="selected"');
+                               define('__GENDER_F', '');
+                               define('__GENDER_C', '');
                                break;
 
                        case "F": // Female
-                               define('__GENDER_M', "");
-                               define('__GENDER_F', " selected=\"selected\"");
-                               define('__GENDER_C', "");
+                               define('__GENDER_M', '');
+                               define('__GENDER_F', ' selected="selected"');
+                               define('__GENDER_C', '');
                                break;
 
                        case "C": // Company
-                               define('__GENDER_M', "");
-                               define('__GENDER_F', "");
-                               define('__GENDER_C', " selected=\"selected\"");
+                               define('__GENDER_M', '');
+                               define('__GENDER_F', '');
+                               define('__GENDER_C', ' selected="selected"');
                                break;
                        }
 
@@ -145,11 +145,11 @@ if (SQL_NUMROWS($result) == 1) {
        } else {
                // Locked or so?
                $STATUS = SPONSOR_TRANSLATE_STATUS($content['status']);
-               $OUT = LOAD_TEMPLATE("admin_settings_saved", true, sprintf(getMessage('SPONSOR_ACCOUNT_FAILED'), $STATUS));
+               $OUT = LOAD_TEMPLATE('admin_settings_saved', true, sprintf(getMessage('SPONSOR_ACCOUNT_FAILED'), $STATUS));
        }
 } else {
        // Sponsor account not found!
-       $OUT = LOAD_TEMPLATE("admin_settings_saved", true, sprintf(getMessage('SPONSOR_ACCOUNT_404'), get_session('sponsorid')));
+       $OUT = LOAD_TEMPLATE('admin_settings_saved', true, sprintf(getMessage('SPONSOR_ACCOUNT_404'), get_session('sponsorid')));
 }
 
 // Free memory