Extension ext-earning introduced (unfinished), renamings:

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

diff --git a/inc/modules/sponsor/settings.php b/inc/modules/sponsor/settings.php
index f71ee51a3bce7d2f82b382fed6f428d53a731ef8..bd55fb1dfd7c6eefcbae235b486520bed3c4e2d7 100644 (file)
--- a/inc/modules/sponsor/settings.php
+++ b/inc/modules/sponsor/settings.php
@@ -39,7 +39,7 @@
 if (!defined('__SECURITY')) {
        die();
 } elseif (!isExtensionActive('sponsor')) {
-       displayMessage(generateExtensionInactiveNotInstalledMessage('sponsor'));
+       displayMessage('{%pipe,generateExtensionInactiveNotInstalledMessage=sponsor%}');
        return;
 } elseif (!isSponsor()) {
        // No sponsor!
@@ -52,7 +52,7 @@ $message = '';
 
 // Data for the formular
 $result = SQL_QUERY_ESC("SELECT
-       `status`, `receive_warnings`, `warning_interval`, `email`, `surname`, `family`, `gender`
+       `status`,`receive_warnings`,`warning_interval`,`email`,`surname`,`family`,`gender`
 FROM
        `{?_MYSQL_PREFIX?}_sponsor_data`
 WHERE
@@ -71,10 +71,10 @@ if (SQL_NUMROWS($result) == 1) {
                // Check if form was submitted or not
                if (isFormSent()) {
                        // Check passwords
-                       if (!isPostRequestParameterSet('password')) {
+                       if (!isPostRequestElementSet('password')) {
                                // No current password entered
                                $message = SPONSOR_NO_CURRENT_PASSWORD_ENTERED;
-                       } elseif (md5(postRequestParameter('password')) != getSession('sponsorpass')) {
+                       } elseif (md5(postRequestElement('password')) != getSession('sponsorpass')) {
                                // Entered password didn't match password in DB
                                $message = '{--SPONSOR_CURRENT_PASSWORD_DIDNOT_MATCH_DB--}';
                        } else {
@@ -87,11 +87,11 @@ if (SQL_NUMROWS($result) == 1) {
 
                                // Remove all (maybe spoofed) unsafe data from array
                                foreach ($UNSAFE as $remove) {
-                                       unsetPostRequestParameter($remove);
+                                       unsetPostRequestElement($remove);
                                } // END - if
 
                                // Set last change timestamp
-                               setPostRequestParameter('last_change', 'UNIX_TIMESTAMP()');
+                               setPostRequestElement('last_change', 'UNIX_TIMESTAMP()');
 
                                // Save data
                                $message = saveSponsorData(postRequestArray(), $content);
@@ -115,8 +115,7 @@ if (SQL_NUMROWS($result) == 1) {
                }
        } else {
                // Locked or so?
-               $STATUS = sponsorTranslateUserStatus($content['status']);
-               $GLOBALS['sponsor_output'] = displayMessage('{%message,SPONSOR_ACCOUNT_FAILED=' . $STATUS . '%}', true);
+               $GLOBALS['sponsor_output'] = displayMessage('{%message,SPONSOR_ACCOUNT_FAILED=' . $content['status'] . '%}', true);
        }
 } else {
        // Sponsor account not found