Way more usage of EL code:

[mailer.git] / inc / modules / guest / what-sponsor_reg.php

diff --git a/inc/modules/guest/what-sponsor_reg.php b/inc/modules/guest/what-sponsor_reg.php
index f78c2da510161d74989ae9d2a7d486a61df33010..9dd8629eb339a35435bfdea5f4c7b51173254b96 100644 (file)
--- a/inc/modules/guest/what-sponsor_reg.php
+++ b/inc/modules/guest/what-sponsor_reg.php
@@ -44,7 +44,7 @@ if (!defined('__SECURITY')) {
 addYouAreHereLink('guest', __FILE__);
 
 if ((!isExtensionActive('sponsor'))) {
-       loadTemplate('admin_settings_saved', false, generateExtensionInactiveNotInstalledMessage('sponsor'));
+       displayMessage(generateExtensionInactiveNotInstalledMessage('sponsor'));
        return;
 } // END - if
 
@@ -206,7 +206,7 @@ if ((isFormSent()) && (count($formErrors) == 0)) {
 
        // Calulate points
        $result = SQL_QUERY_ESC("SELECT
-       (`pay_rate` * `pay_min_count`) AS points, `pay_min_count` AS pay, `pay_currency` AS curr
+       (`pay_rate` * `pay_min_count`) AS `points`, `pay_min_count`, `pay_currency`
 FROM
        `{?_MYSQL_PREFIX?}_sponsor_paytypes`
 WHERE
@@ -228,7 +228,7 @@ LIMIT 1",
        $message = doProcessSponsorFormRequest($messageArray);
 
        // Display message
-       loadTemplate('admin_settings_saved', false, $message);
+       displayMessage($message);
 } else {
        // Check for payment types
        $result = SQL_QUERY('SELECT
@@ -260,17 +260,9 @@ ORDER BY
                if (count($formErrors) > 0) {
                        // Some found... :-(
                        foreach (array('company','position','tax_ident','surname','family','street_nr1','street_nr2','country','zip','city','phone','fax','cell','email','url') as $entry) {
-                               $content[$entry]    = secureString(postRequestParameter($entry));
+                               $content[$entry]    = postRequestParameter($entry);
                        } // END - foreach
 
-                       // Init gender
-                       foreach (array('m', 'f', 'c') as $gender) {
-                               $content['gender_' . $gender] = '';
-                       } // END - foreach
-
-                       // Check for gender selection
-                       $content['gender_' . strtolower(postRequestParameter('gender'))] = ' selected="selected"';
-
                        // Init receive selection
                        $content['receive_warnings_y'] = '';
                        $content['receive_warnings_n'] = '';
@@ -281,7 +273,7 @@ ORDER BY
 
                        // Errors found?
                        if (count($formErrors) > 0) {
-                               $OUT = loadTemplate('admin_settings_saved', true, '{--SPONSOR_REGISTER_SOMETHING_MISSING--}');
+                               $OUT = displayMessage('{--SPONSOR_REGISTER_SOMETHING_MISSING--}', true);
                                $OUT .= '<ol>';
                                foreach ($formErrors as $error) {
                                        $OUT .= '<li>' . $error . '</li>';
@@ -306,7 +298,7 @@ ORDER BY
                loadTemplate('guest_sponsor_reg', false, $content);
        } else {
                // Nothing added so far
-               loadTemplate('admin_settings_saved', false, '{--SPONSOR_PAYMENT_LIST_IS_EMPTY--}');
+               displayMessage('{--SPONSOR_PAYMENT_LIST_IS_EMPTY--}');
        }
 
        // Free memory