New wrapper functions introduced, TODOs.txt updated

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

diff --git a/inc/modules/guest/what-sponsor_login.php b/inc/modules/guest/what-sponsor_login.php
index e2c967fa34b3fb2fc39ce0cc80aefc6a4e67fe01..b86614b9b24d1670c99b9b893b05ffa91d648cef 100644 (file)
--- a/inc/modules/guest/what-sponsor_login.php
+++ b/inc/modules/guest/what-sponsor_login.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;
 } elseif (isSponsor()) {
        // Is already a logged-in sponsor
@@ -108,10 +108,10 @@ LIMIT 1",
                                sendAdminNotification('{--ADMIN_NEW_SPONSOR--}', 'admin_sponsor_pending', $data);
 
                                // Sponsor account set to pending
-                               loadTemplate('admin_settings_saved', false, '{--SPONSOR_ACCOUNT_IS_PENDING--}');
+                               displayMessage('{--SPONSOR_ACCOUNT_IS_PENDING--}');
                        } else {
                                // Could not unlock account!
-                               loadTemplate('admin_settings_saved', false, '{--SPONSOR_ACCOUNT_PENDING_FAILED--}');
+                               displayMessage('{--SPONSOR_ACCOUNT_PENDING_FAILED--}');
                        }
                } elseif ($data['status'] == 'EMAIL') {
                        // Changed email adress need to be confirmed
@@ -130,18 +130,18 @@ LIMIT 1",
                        // Check on success
                        if (!SQL_HASZEROAFFECTED()) {
                                // Sponsor account is unlocked again
-                               loadTemplate('admin_settings_saved', false, '{--SPONSOR_ACCOUNT_IS_CONFIRMED_AGAIN--}');
+                               displayMessage('{--SPONSOR_ACCOUNT_IS_CONFIRMED_AGAIN--}');
                        } else {
                                // Could not unlock account!
-                               loadTemplate('admin_settings_saved', false, '{--SPONSOR_ACCOUNT_EMAIL_FAILED--}');
+                               displayMessage('{--SPONSOR_ACCOUNT_EMAIL_FAILED--}');
                        }
                } else {
                        /// ??? Other status?
-                       loadTemplate('admin_settings_saved', false, '{--SPONSOR_ACCOUNT_STATUS_FAILED--}');
+                       displayMessage('{--SPONSOR_ACCOUNT_STATUS_FAILED--}');
                }
        } else {
                // No sponsor found
-               loadTemplate('admin_settings_saved', false, getMaskedMessage('SPONSOR_ACCOUNT_404', getRequestParameter('hash')));
+               displayMessage(getMaskedMessage('SPONSOR_ACCOUNT_404', getRequestParameter('hash')));
        }
 
        // Free memory
@@ -185,10 +185,10 @@ LIMIT 1",
                        sendEmail(postRequestParameter('email'), '{--SPONSOR_ACTIVATION_LINK_SUBJECT--}', $message_sponsor);
 
                        // Output message
-                       loadTemplate('admin_settings_saved', false, '{--SPONSOR_ACTIVATION_LINK_SENT--}');
+                       displayMessage('{--SPONSOR_ACTIVATION_LINK_SENT--}');
                } else {
                        // No account found or not UNCONFIRMED
-                       loadTemplate('admin_settings_saved', false, '{--SPONSOR_ACTIVATION_LINK_404--}');
+                       displayMessage('{--SPONSOR_ACTIVATION_LINK_404--}');
                }
 
                // Free memory
@@ -242,10 +242,10 @@ LIMIT 1",
                                array(md5($DATA['password']), bigintval($DATA['id'])), __FILE__, __LINE__);
 
                        // Output message
-                       loadTemplate('admin_settings_saved', false, '{--SPONSOR_LOST_PASSWORD_SENT--}');
+                       displayMessage('{--SPONSOR_LOST_PASSWORD_SENT--}');
                } else {
                        // No account found or not UNCONFIRMED
-                       loadTemplate('admin_settings_saved', false, '{--SPONSOR_LOST_PASSWORD_404--}');
+                       displayMessage('{--SPONSOR_LOST_PASSWORD_404--}');
                }
 
                // Free memory
@@ -283,21 +283,21 @@ LIMIT 1",
                                redirectToUrl('modules.php?module=sponsor');
                        } else {
                                // Cookie setup failed!
-                               loadTemplate('admin_settings_saved', false, '{--SPONSOR_COOKIE_SETUP_FAILED--}');
+                               displayMessage('{--SPONSOR_COOKIE_SETUP_FAILED--}');
 
                                // Login formular and other links
                                loadTemplate('guest_sponsor_login');
                        }
                } else {
                        // Status is not fine
-                       loadTemplate('admin_settings_saved', false, '{--SPONSOR_LOGIN_FAILED_' . strtoupper($status) . '--}');
+                       displayMessage('{--SPONSOR_LOGIN_FAILED_' . strtoupper($status) . '--}');
 
                        // Login formular and other links
                        loadTemplate('guest_sponsor_login');
                }
        } else {
                // Account missing or wrong pass! We shall not find this out for the "cracker folks"...
-               loadTemplate('admin_settings_saved', false, '{--SPONSOR_LOGIN_FAILED_404_WRONG_PASS--}');
+               displayMessage('{--SPONSOR_LOGIN_FAILED_404_WRONG_PASS--}');
 
                // Login formular and other links
                loadTemplate('guest_sponsor_login');