Deprecated variables for templates removed, mor EL-rewrites, getMessage() rewritten:

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

diff --git a/inc/modules/sponsor/account.php b/inc/modules/sponsor/account.php
index d337eb7479b3f8f0eb9d0f4384e837ed6fc427d8..62d18a26c106b6ab526902dc327fecfd4fdf1373 100644 (file)
--- a/inc/modules/sponsor/account.php
+++ b/inc/modules/sponsor/account.php
@@ -18,6 +18,7 @@
  * svn:keywords Date Revision" (autoprobset!) at least!!!!!!            *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
+ * Copyright (c) 2009, 2010 by Mailer Developer Team                    *
  * For more information visit: http://www.mxchange.org                  *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -65,33 +66,33 @@ if (SQL_NUMROWS($result) == 1) {
                // Check if form was submitted or not
                if (isFormSent()) {
                        // Check passwords
-                       if (!isPostRequestElementSet('pass_old')) {
+                       if (!isPostRequestParameterSet('pass_old')) {
                                // No current password entered
                                $message = getMessage('SPONSOR_NO_CURRENT_PASSWORD_ENTERED');
-                       } elseif (md5(postRequestElement('pass_old')) != getSession('sponsorpass')) {
+                       } elseif (md5(postRequestParameter('pass_old')) != getSession('sponsorpass')) {
                                // Entered password didn't match password in DB
                                $message = getMessage('SPONSOR_CURRENT_PASSWORD_DIDNOT_MATCH_DB');
-                       } elseif ((isPostRequestElementSet('pass1')) && (isPostRequestElementSet('pass2')) && (postRequestElement('pass1') != postRequestElement('pass2'))) {
+                       } elseif ((isPostRequestParameterSet('pass1')) && (isPostRequestParameterSet('pass2')) && (postRequestParameter('pass1') != postRequestParameter('pass2'))) {
                                // Both new passwords did not match
                                $message = getMessage('SPONSOR_BOTH_NEW_PASSWORDS_DIDNOT_MATCH');
-                       } elseif ((!isPostRequestElementSet('pass1')) && (isPostRequestElementSet('pass2'))) {
+                       } elseif ((!isPostRequestParameterSet('pass1')) && (isPostRequestParameterSet('pass2'))) {
                                // No password one entered
                                $message = getMessage('SPONSOR_PASSWORD_ONE_EMPTY');
-                       } elseif ((isPostRequestElementSet('pass1')) && (!isPostRequestElementSet('pass2'))) {
+                       } elseif ((isPostRequestParameterSet('pass1')) && (!isPostRequestParameterSet('pass2'))) {
                                // No password two entered
                                $message = getMessage('SPONSOR_PASSWORD_TWO_EMPTY');
-                       } elseif ((isPostRequestElementSet('pass1')) && (strlen(postRequestElement('pass1')) < getConfig('pass_len'))) {
+                       } elseif ((isPostRequestParameterSet('pass1')) && (strlen(postRequestParameter('pass1')) < getConfig('pass_len'))) {
                                // Too short password
-                               $message = sprintf(getMessage('SPONSOR_PASSWORD_TOO_SHORT'), getConfig('pass_len'));
+                               $message = getMessage('SPONSOR_PASSWORD_TOO_SHORT');
                        } else {
                                // Default is we don't want to change password!
                                $PASS_AND = ''; $PASS_DATA = '';
 
                                // Check if we want to change password or not
-                               if ((postRequestElement('pass1') == postRequestElement('pass2')) && (isPostRequestElementSet('pass1')) && (postRequestElement('pass1') != postRequestElement('pass_old'))) {
+                               if ((postRequestParameter('pass1') == postRequestParameter('pass2')) && (isPostRequestParameterSet('pass1')) && (postRequestParameter('pass1') != postRequestParameter('pass_old'))) {
                                        // Change current password
                                        $PASS_AND  = ", `password`='%s'";
-                                       $PASS_DATA = md5(postRequestElement('pass1'));
+                                       $PASS_DATA = md5(postRequestParameter('pass1'));
                                }
 
                                // Unsecure data which we don't want here
@@ -99,11 +100,11 @@ if (SQL_NUMROWS($result) == 1) {
 
                                // Remove all (maybe spoofed) unsafe data from array
                                foreach ($UNSAFE as $remove) {
-                                       unsetPostRequestElement($remove);
+                                       unsetPostRequestParameter($remove);
                                }
 
                                // Set last change timestamp
-                               setRequestPostElement('last_change', 'UNIX_TIMESTAMP()');
+                               setPostRequestParameter('last_change', 'UNIX_TIMESTAMP()');
 
                                // Save data
                                $message = saveSponsorData(postRequestArray(), $content);
@@ -114,7 +115,7 @@ if (SQL_NUMROWS($result) == 1) {
                                $OUT = loadTemplate('admin_settings_saved', true, $message);
                        } else {
                                // No message generated
-                               $OUT = loadTemplate('admin_settings_saved', true, getMessage('SPONSOR_NO_MESSAGE_GENERATED'));
+                               $OUT = loadTemplate('admin_settings_saved', true, '{--SPONSOR_NO_MESSAGE_GENERATED--}');
                        }
                } else {
                        // Init gender
@@ -131,11 +132,11 @@ if (SQL_NUMROWS($result) == 1) {
        } else {
                // Locked or so?
                $STATUS = sponsorTranslateUserStatus($content['status']);
-               $OUT = loadTemplate('admin_settings_saved', true, sprintf(getMessage('SPONSOR_ACCOUNT_FAILED'), $STATUS));
+               $OUT = loadTemplate('admin_settings_saved', true, getMaskedMessage('SPONSOR_ACCOUNT_FAILED', $STATUS));
        }
 } else {
        // Sponsor account not found!
-       $OUT = loadTemplate('admin_settings_saved', true, sprintf(getMessage('SPONSOR_ACCOUNT_404'), getSession('sponsorid')));
+       $OUT = loadTemplate('admin_settings_saved', true, getMaskedMessage('SPONSOR_ACCOUNT_404', getSession('sponsorid')));
 }
 
 // Free memory