X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=inc%2Fmodules%2Fmember%2Fwhat-mydata.php;h=0ccaac089a003d159093696ea1b5951b7bb6930b;hb=5b90ab389309595fde01542842169d6cbd2fc562;hp=d79da153624b55bf40f5590cb1dda081a4c46bdd;hpb=00790481119eefa7a54a8dda1cb191fdf4f29226;p=mailer.git

diff --git a/inc/modules/member/what-mydata.php b/inc/modules/member/what-mydata.php
index d79da15362..0ccaac089a 100644
--- a/inc/modules/member/what-mydata.php
+++ b/inc/modules/member/what-mydata.php
@@ -16,7 +16,7 @@
  * $Author::                                                          $ *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
- * Copyright (c) 2009 - 2012 by Mailer Developer Team                   *
+ * Copyright (c) 2009 - 2013 by Mailer Developer Team                   *
  * For more information visit: http://mxchange.org                      *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -73,7 +73,7 @@ switch ($mode) {
 		// How far is last change on his profile away from now?
 		if ((($content['last_update'] + getProfileLock()) > time()) && (!isAdmin()) && (getProfileLock() > 0)) {
 			// You cannot change your account
-			$content['change'] = displayMessage('<div class="notice">{%message,MEMBER_PROFILE_LOCKED=' . generateDateTime($content['last_update'] + getProfileLock(), 0) . '%}</div>', TRUE);
+			$content['change'] = returnMessage('<div class="notice">{%message,MEMBER_PROFILE_LOCKED=' . generateDateTime($content['last_update'] + getProfileLock(), 0) . '%}</div>');
 		} else {
 			// He is allowed to change his profile
 			$content['change'] = loadTemplate('member_mydata_button', TRUE);
@@ -97,7 +97,7 @@ switch ($mode) {
 	case 'edit': // Edit data
 		if (isExtensionActive('country', TRUE)) {
 			// New way
-			$result = SQL_QUERY_ESC('SELECT
+			$result = sqlQueryEscaped('SELECT
 	`surname`,
 	`family`,
 	`street_nr`,
@@ -120,7 +120,7 @@ LIMIT 1',
 			array(getMemberId()), __FILE__, __LINE__);
 		} else {
 			// Old way
-			$result = SQL_QUERY_ESC('SELECT
+			$result = sqlQueryEscaped('SELECT
 	`surname`,
 	`family`,
 	`street_nr`,
@@ -144,10 +144,10 @@ LIMIT 1',
 		}
 
 		// Get line
-		$content = merge_array($content, SQL_FETCHARRAY($result));
+		$content = merge_array($content, sqlFetchArray($result));
 
 		// Free result
-		SQL_FREERESULT($result);
+		sqlFreeResult($result);
 
 		$content['update_check'] = $content['last_update'] + getProfileLock();
 
@@ -246,15 +246,17 @@ LIMIT 1',
 				if (postRequestElement('email') != $content['email']) {
 					// Yes, but is it maybe blacklisted?
 					$filterData = array(
-						'init_done' => TRUE,
-						'post_data' => postRequestArray()
+						'init_done'   => TRUE,
+						'post_data'   => postRequestArray(),
+						'blacklisted' => '',
+						'message'     => '{--PRE_UPDATE_USER_DATA_FAILED--}',
 					);
 					$filterData = runFilterChain('pre_update_user_data', $filterData);
 
 					// Is it blacklisted?
 					if ($filterData['init_done'] === FALSE) {
-						// Blacklisted email address found
-						displayMessage('{--MEMBER_EMAIL_BLACKLISTED--}');
+						// Found something blacklisted
+						displayMessage($filterData['message']);
 						return;
 					} // END - if
 
@@ -269,7 +271,7 @@ LIMIT 1',
 				// Update member's profile
 				if (isExtensionActive('country')) {
 					// New way
-					SQL_QUERY_ESC("UPDATE
+					sqlQueryEscaped("UPDATE
 	`{?_MYSQL_PREFIX?}_user_data`
 SET
 	`gender`='%s',
@@ -307,7 +309,7 @@ LIMIT 1",
 						), __FILE__, __LINE__);
 				} else {
 					// Old way
-					SQL_QUERY_ESC("UPDATE
+					sqlQueryEscaped("UPDATE
 	`{?_MYSQL_PREFIX?}_user_data`
 SET
 	`gender`='%s',
@@ -346,7 +348,7 @@ LIMIT 1",
 				}
 
 				// Did something change?
-				if (!SQL_HASZEROAFFECTED()) {
+				if (!ifSqlHasZeroAffectedRows()) {
 					// Get all modes ...
 					$modes = explode(';', $mode);
 
@@ -358,13 +360,13 @@ LIMIT 1",
 				}
 			} else {
 				// Entered wrong pass for updating profile
-				displayMessage('{--MEBER_UPDATE_PWD_WRONG--}');
+				displayMessage('{--MEMBER_UPDATE_WRONG_PASSWORD--}');
 			}
 		}
 		break;
 
 	case 'notify': // Switch off notfication
-		SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_user_data` SET `notified`='N',`last_update`=UNIX_TIMESTAMP() WHERE `userid`=%s LIMIT 1",
+		sqlQueryEscaped("UPDATE `{?_MYSQL_PREFIX?}_user_data` SET `notified`='N',`last_update`=UNIX_TIMESTAMP() WHERE `userid`=%s LIMIT 1",
 			array(getMemberId()), __FILE__, __LINE__);
 		$url = 'modules.php?module=login&amp;what=mydata&amp;code=' . getCode('PROFILE_UPDATED');
 		break;