X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fmodules%2Fsponsor%2Faccount.php;h=8e98ea28f5f3c77bbaa2cf1c4c22c5f059dbac3b;hp=ea1bb7c60b0e743b8289710f1c25316d7dad31ab;hb=330dbb3e2b34450cd1665497506455e195a0a166;hpb=09f5758c42a33a56bdd461c946ffe759a59c54aa

diff --git a/inc/modules/sponsor/account.php b/inc/modules/sponsor/account.php
index ea1bb7c60b..8e98ea28f5 100644
--- a/inc/modules/sponsor/account.php
+++ b/inc/modules/sponsor/account.php
@@ -14,11 +14,9 @@
  * $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                    *
+ * Copyright (c) 2009 - 2011 by Mailer Developer Team                   *
  * For more information visit: http://www.mxchange.org                  *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -41,22 +39,30 @@
 if (!defined('__SECURITY')) {
 	die();
 } elseif (!isExtensionActive('sponsor')) {
-	loadTemplate('admin_settings_saved', false, generateExtensionInactiveNotInstalledMessage('sponsor'));
+	displayMessage(generateExtensionInactiveNotInstalledMessage('sponsor'));
 	return;
 } elseif (!isSponsor()) {
 	// No sponsor!
-	addFatalMessage(__FILE__, __LINE__, getMessage('SPONSOR_ONLY_AREA_ENTERED'));
+	addFatalMessage(__FILE__, __LINE__, '{--SPONSOR_ONLY_AREA_ENTERED--}');
 	return;
 }
 
 // Data for the formular
-$result = SQL_QUERY_ESC("SELECT `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 `id`='%s' AND `password`='%s' LIMIT 1",
-	array(bigintval(getSession('sponsorid')), getSession('sponsorpass')), __FILE__, __LINE__);
+$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`
+FROM
+	`{?_MYSQL_PREFIX?}_sponsor_data`
+WHERE
+	`id`=%s AND
+	`password`='%s'
+LIMIT 1",
+	array(
+		bigintval(getSession('sponsor_id')),
+		getSession('sponsorpass')
+	), __FILE__, __LINE__);
 
 // Entry found?
 if (SQL_NUMROWS($result) == 1) {
@@ -68,22 +74,22 @@ if (SQL_NUMROWS($result) == 1) {
 			// Check passwords
 			if (!isPostRequestParameterSet('pass_old')) {
 				// No current password entered
-				$message = getMessage('SPONSOR_NO_CURRENT_PASSWORD_ENTERED');
+				$message = '{--SPONSOR_NO_CURRENT_PASSWORD_ENTERED--}';
 			} elseif (md5(postRequestParameter('pass_old')) != getSession('sponsorpass')) {
 				// Entered password didn't match password in DB
-				$message = getMessage('SPONSOR_CURRENT_PASSWORD_DIDNOT_MATCH_DB');
+				$message = '{--SPONSOR_CURRENT_PASSWORD_DIDNOT_MATCH_DB--}';
 			} elseif ((isPostRequestParameterSet('pass1')) && (isPostRequestParameterSet('pass2')) && (postRequestParameter('pass1') != postRequestParameter('pass2'))) {
 				// Both new passwords did not match
-				$message = getMessage('SPONSOR_BOTH_NEW_PASSWORDS_DIDNOT_MATCH');
+				$message = '{--SPONSOR_BOTH_NEW_PASSWORDS_DIDNOT_MATCH--}';
 			} elseif ((!isPostRequestParameterSet('pass1')) && (isPostRequestParameterSet('pass2'))) {
 				// No password one entered
-				$message = getMessage('SPONSOR_PASSWORD_ONE_EMPTY');
+				$message = '{--SPONSOR_PASSWORD_ONE_EMPTY--}';
 			} elseif ((isPostRequestParameterSet('pass1')) && (!isPostRequestParameterSet('pass2'))) {
 				// No password two entered
-				$message = getMessage('SPONSOR_PASSWORD_TWO_EMPTY');
-			} elseif ((isPostRequestParameterSet('pass1')) && (strlen(postRequestParameter('pass1')) < getConfig('pass_len'))) {
+				$message = '{--SPONSOR_PASSWORD_TWO_EMPTY--}';
+			} elseif ((isPostRequestParameterSet('pass1')) && (strlen(postRequestParameter('pass1')) < getPassLen())) {
 				// Too short password
-				$message = getMessage('SPONSOR_PASSWORD_TOO_SHORT');
+				$message = '{--SPONSOR_PASSWORD_TOO_SHORT--}';
 			} else {
 				// Default is we don't want to change password!
 				$PASS_AND = ''; $PASS_DATA = '';
@@ -93,7 +99,7 @@ if (SQL_NUMROWS($result) == 1) {
 					// Change current password
 					$PASS_AND  = ", `password`='%s'";
 					$PASS_DATA = md5(postRequestParameter('pass1'));
-				}
+				} // END - if
 
 				// Unsecure data which we don't want here
 				$UNSAFE = array('receive_warnings', 'warning_interval');
@@ -101,7 +107,7 @@ if (SQL_NUMROWS($result) == 1) {
 				// Remove all (maybe spoofed) unsafe data from array
 				foreach ($UNSAFE as $remove) {
 					unsetPostRequestParameter($remove);
-				}
+				} // END - foreach
 
 				// Set last change timestamp
 				setPostRequestParameter('last_change', 'UNIX_TIMESTAMP()');
@@ -112,31 +118,23 @@ 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, getMessage('SPONSOR_NO_MESSAGE_GENERATED'));
+				$GLOBALS['sponsor_output'] = displayMessage('{--SPONSOR_NO_MESSAGE_GENERATED--}', true);
 			}
 		} else {
-			// Init gender
-			foreach (array('m', 'f', 'c') as $gender) {
-				$content['gender_' . $gender] = '';
-			} // END - foreach
-
-			// Check for gender selection
-			$content['gender_' . strtolower($content['gender'])] = ' selected="selected"';
-
 			// Output formular
-			$OUT = loadTemplate('sponsor_account_form', true, $content);
+			$GLOBALS['sponsor_output'] = loadTemplate('sponsor_account_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=' . $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