Complete rewrite and debug message surpressed:

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

diff --git a/inc/modules/sponsor/account.php b/inc/modules/sponsor/account.php
index ba9a45360eacd2a846a7aecfd604492b7b4281b0..1052d83b0cddc4294bbc01baea1311c9c600608d 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__, sprintf(getMessage('EXTENSION_PROBLEM_EXT_INACTIVE'), 'sponsor'));
+} elseif (!EXT_IS_ACTIVE('sponsor')) {
+       addFatalMessage(__FILE__, __LINE__, generateExtensionInactiveNotInstalledMessage('sponsor'));
        return;
 } elseif (!IS_SPONSOR()) {
        // No sponsor!
@@ -54,21 +54,21 @@ gender, surname, family, street_nr1, street_nr2, zip, city, country,
 phone, fax, cell, email, url,
 status, receive_warnings
 FROM `{!_MYSQL_PREFIX!}_sponsor_data`
-WHERE id='%s' AND password='%s' LIMIT 1",
-       array(bigintval(get_session('sponsorid')), get_session('sponsorpass')), __FILE__, __LINE__);
+WHERE `id`='%s' AND password='%s' LIMIT 1",
+array(bigintval(getSession('sponsorid')), getSession('sponsorpass')), __FILE__, __LINE__);
 
 // Entry found?
 if (SQL_NUMROWS($result) == 1) {
        // Load sponsor data
        $content = SQL_FETCHARRAY($result);
-       if ($content['status'] == "CONFIRMED") {
+       if ($content['status'] == 'CONFIRMED') {
                // Check if form was submitted or not
-               if (IS_FORM_SENT()) {
+               if (isFormSent()) {
                        // Check passwords
                        if (!REQUEST_ISSET_POST(('pass_old'))) {
                                // No current password entered
                                $message = getMessage('SPONSOR_NO_CURRENT_PASSWORD_ENTERED');
-                       } elseif (md5(REQUEST_POST('pass_old')) != get_session('sponsorpass')) {
+                       } elseif (md5(REQUEST_POST('pass_old')) != getSession('sponsorpass')) {
                                // Entered password didn't match password in DB
                                $message = getMessage('SPONSOR_CURRENT_PASSWORD_DIDNOT_MATCH_DB');
                        } elseif ((REQUEST_ISSET_POST(('pass1'))) && (REQUEST_ISSET_POST(('pass2'))) && (REQUEST_POST('pass1') != REQUEST_POST('pass2'))) {
@@ -95,7 +95,7 @@ if (SQL_NUMROWS($result) == 1) {
                                }
 
                                // Unsecure data which we don't want here
-                                       $UNSAFE = array('receive_warnings', 'warning_interval');
+                               $UNSAFE = array('receive_warnings', 'warning_interval');
 
                                // Remove all (maybe spoofed) unsafe data from array
                                foreach ($UNSAFE as $remove) {
@@ -120,23 +120,23 @@ if (SQL_NUMROWS($result) == 1) {
                        // Check for gender selection
                        switch ($content['gender'])
                        {
-                       case "M": // Male
-                               define('__GENDER_M', ' selected="selected"');
-                               define('__GENDER_F', '');
-                               define('__GENDER_C', '');
-                               break;
+                               case "M": // Male
+                                       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', '');
-                               break;
+                               case "F": // Female
+                                       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"');
-                               break;
+                               case "C": // Company
+                                       define('__GENDER_M', '');
+                                       define('__GENDER_F', '');
+                                       define('__GENDER_C', ' selected="selected"');
+                                       break;
                        }
 
                        // Output formular
@@ -144,12 +144,12 @@ if (SQL_NUMROWS($result) == 1) {
                }
        } else {
                // Locked or so?
-               $STATUS = SPONSOR_TRANSLATE_STATUS($content['status']);
+               $STATUS = sponsorTranslateUserStatus($content['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'), getSession('sponsorid')));
 }
 
 // Free memory