X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fmodules%2Fsponsor%2Faccount.php;h=d7c7d8f8b6cf7a68d145d76cd9e9fbdeba14aa1c;hp=6888a955a991749cb8c986e86655d6e2c752e533;hb=61621983cc6d7195fcc7eab29b5f6080ff283b34;hpb=63f159414369b5ea19a8ca75d8cd8033c45d8341

diff --git a/inc/modules/sponsor/account.php b/inc/modules/sponsor/account.php
index 6888a955a9..d7c7d8f8b6 100644
--- a/inc/modules/sponsor/account.php
+++ b/inc/modules/sponsor/account.php
@@ -10,13 +10,8 @@
  * -------------------------------------------------------------------- *
  * Kurzbeschreibung  : Der Sponsor kann sein Account verwalten          *
  * -------------------------------------------------------------------- *
- * $Revision::                                                        $ *
- * $Date::                                                            $ *
- * $Tag:: 0.2.1-FINAL                                                 $ *
- * $Author::                                                          $ *
- * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
- * Copyright (c) 2009 - 2012 by Mailer Developer Team                   *
+ * Copyright (c) 2009 - 2016 by Mailer Developer Team                   *
  * For more information visit: http://mxchange.org                      *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -48,11 +43,11 @@ 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`
+$result = sqlQueryEscaped("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
@@ -65,9 +60,9 @@ LIMIT 1",
 	), __FILE__, __LINE__);
 
 // Entry found?
-if (SQL_NUMROWS($result) == 1) {
+if (sqlNumRows($result) == 1) {
 	// Load sponsor data
-	$content = SQL_FETCHARRAY($result);
+	$content = sqlFetchArray($result);
 	if ($content['status'] == 'CONFIRMED') {
 		// Check if form was submitted or not
 		if (isFormSent()) {
@@ -78,27 +73,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')) < getMinPasswordLength())) {
 				// 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_DATA = md5(postRequestElement('password1'));
 				} // END - if
 
 				// Unsecure data which we don't want here
@@ -118,26 +113,26 @@ if (SQL_NUMROWS($result) == 1) {
 
 			if (!empty($message)) {
 				// Output message
-				$GLOBALS['sponsor_output'] = displayMessage($message, true);
+				$GLOBALS['sponsor_output'] = returnMessage($message);
 			} else {
 				// No message generated
-				$GLOBALS['sponsor_output'] = displayMessage('{--SPONSOR_NO_MESSAGE_GENERATED--}', true);
+				$GLOBALS['sponsor_output'] = returnMessage('{--SPONSOR_NO_MESSAGE_GENERATED--}');
 			}
 		} 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'] = returnMessage('{%message,SPONSOR_ACCOUNT_FAILED=' . $content['status'] . '%}');
 	}
 } else {
 	// Sponsor account not found
-	$GLOBALS['sponsor_output'] = displayMessage('{%message,SPONSOR_ACCOUNT_404=' . getSession('sponsor_id') . '%}', true);
+	$GLOBALS['sponsor_output'] = returnMessage('{%message,SPONSOR_ACCOUNT_404=' . getSession('sponsor_id') . '%}');
 }
 
 // Free memory
-SQL_FREERESULT($result);
+sqlFreeResult($result);
 
 // [EOF]
 ?>