X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fmodules%2Fmember%2Fwhat-mydata.php;h=270d746505598f81015eef939c8a6e350de12fe5;hp=3d87be6e11ad5b766e7da221bc9623a38cb856d6;hb=b624e45282e31944d7b72742ba0aa826862850dd;hpb=49a9663311b732d12ba0c53af2f9eb39a7850fbc

diff --git a/inc/modules/member/what-mydata.php b/inc/modules/member/what-mydata.php
index 3d87be6e11..270d746505 100644
--- a/inc/modules/member/what-mydata.php
+++ b/inc/modules/member/what-mydata.php
@@ -58,9 +58,9 @@ $url = '';
 
 // Detect what the member wants to do
 $mode = 'show'; // Show his data
-if (isPostRequestElementSet('save'))   $mode = 'save';   // Save entered data
+if (isFormSent('save'))   $mode = 'save';   // Save entered data
 if (isFormSent('edit'))   $mode = 'edit';   // Edit data
-if (isPostRequestElementSet('notify')) $mode = 'notify'; // Switch off notification
+if (isFormSent('notify')) $mode = 'notify'; // Switch off notification
 
 switch ($mode) {
 	case 'show': // Show his data
@@ -73,18 +73,16 @@ 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'] = displayMessage('<div class="notice">{%message,MEMBER_PROFILE_LOCKED=' . generateDateTime($content['last_update'] + getProfileLock(), 0) . '%}</div>', TRUE);
 		} else {
 			// He is allowed to change his profile
-			$content['change'] = loadTemplate('member_mydata_button', true);
+			$content['change'] = loadTemplate('member_mydata_button', TRUE);
 		}
 
-		if (strlen($content['birth_day'])   == 1) $content['birth_day']   = '0' . $content['birth_day'];
-		if (strlen($content['birth_month']) == 1) $content['birth_month'] = '0' . $content['birth_month'];
-
+		// @TODO Move this to a function (for better EL code)
 		switch (getLanguage()) {
-			case 'de': $content['dob'] = $content['birth_day']   . '.' . $content['birth_month'] . '.' . $content['birth_year']; break;
-			default  : $content['dob'] = $content['birth_month'] . '-' . $content['birth_day']   . '-' . $content['birth_year']; break;
+			case 'de': $content['dob'] = '{%pipe,padLeftZero=' . $content['birth_day']   . '%}.{%pipe,padLeftZero=' . $content['birth_month'] . '%}.' . $content['birth_year']; break;
+			default  : $content['dob'] = '{%pipe,padLeftZero=' . $content['birth_month'] . '%}-{%pipe,padLeftZero=' . $content['birth_day']   . '%}-' . $content['birth_year']; break;
 		} // END - switch
 
 		if (isExtensionActive('country')) {
@@ -93,13 +91,13 @@ switch ($mode) {
 		} // END - if
 
 		// Load template
-		loadTemplate('member_mydata_overview', false, $content);
+		loadTemplate('member_mydata_overview', FALSE, $content);
 		break;
 
 	case 'edit': // Edit data
-		if (isExtensionActive('country', true)) {
+		if (isExtensionActive('country', TRUE)) {
 			// New way
-			$result = SQL_QUERY_ESC("SELECT
+			$result = SQL_QUERY_ESC('SELECT
 	`surname`,
 	`family`,
 	`street_nr`,
@@ -118,11 +116,11 @@ FROM
 	`{?_MYSQL_PREFIX?}_user_data`
 WHERE
 	`userid`=%s
-LIMIT 1",
+LIMIT 1',
 			array(getMemberId()), __FILE__, __LINE__);
 		} else {
 			// Old way
-			$result = SQL_QUERY_ESC("SELECT
+			$result = SQL_QUERY_ESC('SELECT
 	`surname`,
 	`family`,
 	`street_nr`,
@@ -141,7 +139,7 @@ FROM
 	`{?_MYSQL_PREFIX?}_user_data`
 WHERE
 	`userid`=%s
-LIMIT 1",
+LIMIT 1',
 				array(getMemberId()), __FILE__, __LINE__);
 		}
 
@@ -167,24 +165,24 @@ LIMIT 1",
 			switch (getLanguage()) {
 				case 'de': // German date format
 					// Day
-					$content['dob'] .= addSelectionBox('day', $content['birth_day']);
+					$content['dob'] .= addSelectionBox('da', $content['birth_day']);
 
 					// Month
-					$content['dob'] .= addSelectionBox('month', $content['birth_month']);
+					$content['dob'] .= addSelectionBox('mo', $content['birth_month']);
 
 					// Year
-					$content['dob'] .= addSelectionBox('year', $content['birth_year']);
+					$content['dob'] .= addSelectionBox('ye', $content['birth_year']);
 					break;
 
 				default: // Default is the US date format... :)
 					// Month
-					$content['dob'] .= addSelectionBox('month', $content['birth_month']);
+					$content['dob'] .= addSelectionBox('mo', $content['birth_month']);
 
 					// Day
-					$content['dob'] .= addSelectionBox('day', $content['birth_day']);
+					$content['dob'] .= addSelectionBox('da', $content['birth_day']);
 
 					// Year
-					$content['dob'] .= addSelectionBox('year', $content['birth_year']);
+					$content['dob'] .= addSelectionBox('ye', $content['birth_year']);
 					break;
 			} // END - if
 
@@ -192,7 +190,7 @@ LIMIT 1",
 
 			if (isExtensionActive('country')) {
 				// Init WHERE statement
-				$whereStatement = "WHERE `is_active`='Y'";
+				$whereStatement = " WHERE `is_active`='Y'";
 				if (isAdmin()) $whereStatement = '';
 
 				// Generate selection box
@@ -206,7 +204,7 @@ LIMIT 1",
 			}
 
 			// Load template
-			loadTemplate('member_mydata_edit', false, $content);
+			loadTemplate('member_mydata_edit', FALSE, $content);
 		}
 		break;
 
@@ -226,26 +224,42 @@ LIMIT 1",
 		} elseif ((!isEmailValid(postRequestElement('email'))) && (!isAdmin())) {
 			// Invalid email address!
 			displayMessage('{--INVALID_EMAIL_ENTERED--}');
-		} elseif ((isEmailTaken(postRequestElement('email'))) && (isCheckDoubleEmailEnabled()) && (!isAdmin())) {
+		} elseif ((isExtensionInstalledAndNewer('other', '0.3.0')) && (isCheckDoubleEmailEnabled()) && (!isAdmin()) && (isEmailTaken(postRequestElement('email')))) {
 			// Email address is already registered
 			displayMessage('{--MEMBER_EMAIL_IS_ALREADY_REGISTERED--}');
 		} else {
 			// Generate hash
-			$hash = generateHash(postRequestElement('pass1'), substr($content['password'], 0, -40));
-			if ((($hash == $content['password']) || (postRequestElement('pass1') == postRequestElement('pass2'))) && (isPostRequestElementSet('pass1'))) {
+			$hash = generateHash(postRequestElement('password1'), substr($content['password'], 0, -40));
+			if ((($hash == $content['password']) || (postRequestElement('password1') == postRequestElement('password2'))) && (isPostRequestElementSet('password1'))) {
 				// Only on simple changes normal mode is active = no email or password changed
 				$mode = 'normal';
 				$AND = '';
 
 				// Did the user changed the password?
 				if ($hash != $content['password']) {
+					// Yes
 					$AND = ",`password`='" . $hash . "'";
 					$mode = 'password';
 				} // END - if
 
-				// Or did he changed his password?
+				// Or did he changed his email address?
 				if (postRequestElement('email') != $content['email']) {
-					// Jupp
+					// Yes, but is it maybe blacklisted?
+					$filterData = array(
+						'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) {
+						// Found something blacklisted
+						displayMessage($filterData['message']);
+						return;
+					} // END - if
+
 					if ($mode == 'normal') {
 						$mode = 'email';
 					} else {