Mailer project continued:

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

diff --git a/inc/modules/sponsor/settings.php b/inc/modules/sponsor/settings.php
index d5d9b78ac5408fabd7666ddd13241dfb8e9845bd..662cd1641a36890c7e8d0e837c34551d37fef528 100644 (file)
--- a/inc/modules/sponsor/settings.php
+++ b/inc/modules/sponsor/settings.php
@@ -14,12 +14,10 @@
  * $Date::                                                            $ *
  * $Tag:: 0.2.1-FINAL                                                 $ *
  * $Author::                                                          $ *
- * Needs to be in all Files and every File needs "svn propset           *
- * 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                  *
+ * Copyright (c) 2009 - 2012 by Mailer Developer Team                   *
+ * For more information visit: http://mxchange.org                      *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
  * it under the terms of the GNU General Public License as published by *
@@ -39,9 +37,9 @@
 
 // Some security stuff...
 if (!defined('__SECURITY')) {
-       die();
+       exit();
 } elseif (!isExtensionActive('sponsor')) {
-       loadTemplate('admin_settings_saved', false, generateExtensionInactiveNotInstalledMessage('sponsor'));
+       displayMessage('{%pipe,generateExtensionInactiveNotInstalledMessage=sponsor%}');
        return;
 } elseif (!isSponsor()) {
        // No sponsor!
@@ -54,7 +52,13 @@ $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
@@ -62,7 +66,7 @@ WHERE
        `password`='%s'
 LIMIT 1",
        array(
-               bigintval(getSession('sponsorid')),
+               bigintval(getSession('sponsor_id')),
                getSession('sponsorpass')
        ), __FILE__, __LINE__);
 
@@ -73,12 +77,12 @@ 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;
+                               $message = '{--SPONSOR_CURRENT_PASSWORD_DIDNOT_MATCH_DB--}';
                        } else {
                                // Unsecure data which we don't want here
                                $UNSAFE = array(
@@ -89,11 +93,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);
@@ -101,10 +105,10 @@ if (SQL_NUMROWS($result) == 1) {
 
                        if (!empty($message)) {
                                // Output message
-                               $OUT = loadTemplate('admin_settings_saved', true, $message);
+                               $GLOBALS['sponsor_output'] = displayMessage($message, true);
                        } else {
                                // No message generated
-                               $OUT = loadTemplate('admin_settings_saved', true, '{--SPONSOR_NO_MESSAGE_GENERATED--}');
+                               $GLOBALS['sponsor_output'] = displayMessage('{--SPONSOR_NO_MESSAGE_GENERATED--}', true);
                        }
                } else {
                        // Make yes/no selection
@@ -113,16 +117,15 @@ if (SQL_NUMROWS($result) == 1) {
                        $content['receive_warnings_' . strtolower($content['receive_warnings'])] = ' checked="checked"';
 
                        // Output formular
-                       $OUT = loadTemplate('sponsor_settings_form', true, $content);
+                       $GLOBALS['sponsor_output'] = loadTemplate('sponsor_settings_form', true, $content);
                }
        } else {
                // Locked or so?
-               $STATUS = sponsorTranslateUserStatus($content['status']);
-               $OUT = loadTemplate('admin_settings_saved', true, getMaskedMessage('SPONSOR_ACCOUNT_FAILED', $STATUS));
+               $GLOBALS['sponsor_output'] = displayMessage('{%message,SPONSOR_ACCOUNT_FAILED=' . $content['status'] . '%}', true);
        }
 } else {
-       // Sponsor account not found!
-       $OUT = loadTemplate('admin_settings_saved', true, getMaskedMessage('SPONSOR_ACCOUNT_404', getSession('sponsorid')));
+       // Sponsor account not found
+       $GLOBALS['sponsor_output'] = displayMessage('{%message,SPONSOR_ACCOUNT_404=' . getSession('sponsor_id') . '%}', true);
 }
 
 // Free memory