X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Fmember%2Fwhat-mydata.php;h=39b6d3f0a9c2359062efed44934c0fd4b2630bbb;hb=f56e66ab8aa96c783596b0f391bfb252c12db30e;hp=d30f62a40fe1a999c45a4b4d8baf628d0b22ff2a;hpb=544aa3fb48613160f812515673e64c46d18d2e1d;p=mailer.git

diff --git a/inc/modules/member/what-mydata.php b/inc/modules/member/what-mydata.php
index d30f62a40f..39b6d3f0a9 100644
--- a/inc/modules/member/what-mydata.php
+++ b/inc/modules/member/what-mydata.php
@@ -46,7 +46,7 @@ if (!defined('__SECURITY')) {
 addYouAreHereLink('member', __FILE__);
 
 if ((!isExtensionActive('mydata')) && (!isAdmin())) {
-	displayMessage(generateExtensionInactiveNotInstalledMessage('mydata'));
+	displayMessage('{%pipe,generateExtensionInactiveNotInstalledMessage=mydata%}');
 	return;
 } // END - if
 
@@ -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">' . getMaskedMessage('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);
@@ -127,7 +127,7 @@ LIMIT 1",
 
 		// How far is last change on his profile away from now?
 		if (($content['update_check'] > time()) && (!isAdmin()) && (getProfileLock() > 0)) {
-			$content['update_check'] = getMaskedMessage('MEMBER_PROFILE_LOCKED', generateDateTime($content['update_check'] + getProfileLock(), 0));
+			$content['update_check'] = '{%message,MEMBER_PROFILE_LOCKED=' . generateDateTime($content['update_check'] + getProfileLock(), '0') . '%}';
 
 			// You cannot change your account
 			displayMessage($content['update_check']);
@@ -188,13 +188,16 @@ LIMIT 1",
 
 		// How far is last change on his profile away from now?
 		if (($content['update_check'] > time()) && (!isAdmin()) && (getProfileLock() > 0)) {
+			// You cannot change your account
 			$content['update_check'] = generateDateTime($content['update_check'] + getProfileLock(), 0);
 
-			// You cannot change your account
 			displayMessage($content['update_check']);
 		} elseif ((!isEmailValid(postRequestParameter('email'))) && (!isAdmin())) {
 			// Invalid email address!
 			displayMessage('{--INVALID_EMAIL_ENTERED--}');
+		} elseif ((isEmailTaken(postRequestParameter('email'))) && (isCheckDoubleEmailEnabled()) && (!isAdmin())) {
+			// Email address is already registered
+			displayMessage('{--MEMBER_EMAIL_IS_ALREADY_REGISTERED--}');
 		} else {
 			// Generate hash
 			$hash = generateHash(postRequestParameter('pass1'), substr($content['password'], 0, -40));