AJAX installation is 'basicly finished' :) Plus I threw in a small christmas present...

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

diff --git a/inc/modules/sponsor/account.php b/inc/modules/sponsor/account.php
index 71d578866c79ab4d9753f53684895184154325f0..167c65eeb1e1bb3620962bc5f6342c0b5357613e 100644 (file)
--- a/inc/modules/sponsor/account.php
+++ b/inc/modules/sponsor/account.php
@@ -16,7 +16,7 @@
  * $Author::                                                          $ *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
- * Copyright (c) 2009 - 2011 by Mailer Developer Team                   *
+ * 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 *
@@ -37,7 +37,7 @@
 
 // Some security stuff...
 if (!defined('__SECURITY')) {
-       die();
+       exit();
 } elseif (!isExtensionActive('sponsor')) {
        displayMessage('{%pipe,generateExtensionInactiveNotInstalledMessage=sponsor%}');
        return;
@@ -49,10 +49,10 @@ if (!defined('__SECURITY')) {
 
 // Data for the formular
 $result = SQL_QUERY_ESC("SELECT
-       `id`,`company`,`position`,`tax_ident`,
-       `gender`,`surname`,`family`,`street_nr1`,`street_nr2`,`zip`,`city`,`country`,
-       `phone`,`fax`,`cell`,`email`,`url`,
-       `status`,`receive_warnings`
+       `id`, `company`, `position`, `tax_ident`,
+       `gender`, `surname`, `family`, `street_nr1`, `street_nr2`, `zip`, `city`, `country`,
+       `phone`, `fax`, `cell`, `email`, `url`,
+       `status`, `receive_warnings`
 FROM
        `{?_MYSQL_PREFIX?}_sponsor_data`
 WHERE
@@ -78,27 +78,27 @@ if (SQL_NUMROWS($result) == 1) {
                        } elseif (md5(postRequestElement('pass_old')) != getSession('sponsorpass')) {
                                // Entered password didn't match password in DB
                                $message = '{--SPONSOR_CURRENT_PASSWORD_DIDNOT_MATCH_DB--}';
-                       } elseif ((isPostRequestElementSet('pass1')) && (isPostRequestElementSet('pass2')) && (postRequestElement('pass1') != postRequestElement('pass2'))) {
+                       } elseif ((isPostRequestElementSet('password1')) && (isPostRequestElementSet('password2')) && (postRequestElement('password1') != postRequestElement('password2'))) {
                                // Both new passwords did not match
                                $message = '{--SPONSOR_BOTH_NEW_PASSWORDS_DIDNOT_MATCH--}';
-                       } elseif ((!isPostRequestElementSet('pass1')) && (isPostRequestElementSet('pass2'))) {
+                       } elseif ((!isPostRequestElementSet('password1')) && (isPostRequestElementSet('password2'))) {
                                // No password one entered
                                $message = '{--SPONSOR_PASSWORD_ONE_EMPTY--}';
-                       } elseif ((isPostRequestElementSet('pass1')) && (!isPostRequestElementSet('pass2'))) {
+                       } elseif ((isPostRequestElementSet('password1')) && (!isPostRequestElementSet('password2'))) {
                                // No password two entered
                                $message = '{--SPONSOR_PASSWORD_TWO_EMPTY--}';
-                       } elseif ((isPostRequestElementSet('pass1')) && (strlen(postRequestElement('pass1')) < getPassLen())) {
+                       } elseif ((isPostRequestElementSet('password1')) && (strlen(postRequestElement('password1')) < getPassLen())) {
                                // Too short password
                                $message = '{--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'))) {
+                               // Check if the sponsor wants to change his/her password
+                               if ((postRequestElement('password1') == postRequestElement('password2')) && (isPostRequestElementSet('password1')) && (postRequestElement('password1') != postRequestElement('pass_old'))) {
                                        // Change current password
-                                       $PASS_AND  = ", `password`='%s'";
-                                       $PASS_DATA = md5(postRequestElement('pass1'));
+                                       $PASS_AND  = ",`password`='%s'";
+                                       $PASS_DATA = md5(postRequestElement('password1'));
                                } // END - if
 
                                // Unsecure data which we don't want here
@@ -118,22 +118,22 @@ if (SQL_NUMROWS($result) == 1) {
 
                        if (!empty($message)) {
                                // Output message
-                               $GLOBALS['sponsor_output'] = displayMessage($message, true);
+                               $GLOBALS['sponsor_output'] = displayMessage($message, TRUE);
                        } else {
                                // No message generated
-                               $GLOBALS['sponsor_output'] = displayMessage('{--SPONSOR_NO_MESSAGE_GENERATED--}', true);
+                               $GLOBALS['sponsor_output'] = displayMessage('{--SPONSOR_NO_MESSAGE_GENERATED--}', TRUE);
                        }
                } else {
                        // Output formular
-                       $GLOBALS['sponsor_output'] = loadTemplate('sponsor_account_form', true, $content);
+                       $GLOBALS['sponsor_output'] = loadTemplate('sponsor_account_form', TRUE, $content);
                }
        } else {
                // Locked or so?
-               $GLOBALS['sponsor_output'] = displayMessage('{%message,SPONSOR_ACCOUNT_FAILED=' . $content['status'] . '%}', true);
+               $GLOBALS['sponsor_output'] = displayMessage('{%message,SPONSOR_ACCOUNT_FAILED=' . $content['status'] . '%}', TRUE);
        }
 } else {
        // Sponsor account not found
-       $GLOBALS['sponsor_output'] = displayMessage('{%message,SPONSOR_ACCOUNT_404=' . getSession('sponsor_id') . '%}', true);
+       $GLOBALS['sponsor_output'] = displayMessage('{%message,SPONSOR_ACCOUNT_404=' . getSession('sponsor_id') . '%}', TRUE);
 }
 
 // Free memory