X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Fmember%2Fwhat-mydata.php;h=39b6d3f0a9c2359062efed44934c0fd4b2630bbb;hb=4b93525eb57c07b89c127494a45ec3d5666fa71a;hp=8988575b7edea498f1f4f34a9a3c95af8b3cc951;hpb=e8ca54fe91872ab95a6ffdc4f1268bf18889021d;p=mailer.git

diff --git a/inc/modules/member/what-mydata.php b/inc/modules/member/what-mydata.php
index 8988575b7e..39b6d3f0a9 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, 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 *
@@ -46,7 +46,7 @@ if (!defined('__SECURITY')) {
 addYouAreHereLink('member', __FILE__);
 
 if ((!isExtensionActive('mydata')) && (!isAdmin())) {
-	loadTemplate('admin_settings_saved', false, generateExtensionInactiveNotInstalledMessage('mydata'));
+	displayMessage('{%pipe,generateExtensionInactiveNotInstalledMessage=mydata%}');
 	return;
 } // END - if
 
@@ -71,9 +71,9 @@ switch ($mode) {
 		$content['last_update'] = generateDateTime($content['last_update'], 0);
 
 		// How far is last change on his profile away from now?
-		if ((($content['last_update'] + getConfig('profile_lock')) > time()) && (!isAdmin()) && (getConfig('profile_lock') > 0)) {
+		if ((($content['last_update'] + getProfileLock()) > time()) && (!isAdmin()) && (getProfileLock() > 0)) {
 			// You cannot change your account
-			$content['change'] = loadTemplate('admin_settings_saved', true, '<div class="notice">' . getMaskedMessage('MEMBER_PROFILE_LOCKED', generateDateTime($content['last_update'] + getConfig('profile_lock'), 0)) . '</div>');
+			$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);
@@ -123,21 +123,16 @@ LIMIT 1",
 		// Free result
 		SQL_FREERESULT($result);
 
-		$content['update_check'] = $content['last_update'] + getConfig('profile_lock');
+		$content['update_check'] = $content['last_update'] + getProfileLock();
 
 		// How far is last change on his profile away from now?
-		if (($content['update_check'] > time()) && (!isAdmin()) && (getConfig('profile_lock') > 0)) {
-			$content['update_check'] = getMaskedMessage('MEMBER_PROFILE_LOCKED', generateDateTime($content['update_check'] + getConfig('profile_lock'), 0));
+		if (($content['update_check'] > time()) && (!isAdmin()) && (getProfileLock() > 0)) {
+			$content['update_check'] = '{%message,MEMBER_PROFILE_LOCKED=' . generateDateTime($content['update_check'] + getProfileLock(), '0') . '%}';
 
 			// You cannot change your account
-			loadTemplate('admin_settings_saved', false, $content['update_check']);
+			displayMessage($content['update_check']);
 		} else {
-			// He is allowed to change his profile
-			foreach (array('gender_m','gender_f','gender_c') as $entry) {
-				$content[$entry] = '';
-			} // END - foreach
-
-			$content['gender_' . strtolower($content['gender'])] = ' selected="selected"';
+			// Init elements
 			$content['dob'] = '';
 
 			switch (getLanguage()) {
@@ -189,17 +184,20 @@ LIMIT 1",
 		$content = merge_array($content, getUserDataArray());
 
 		// Calculate time to check
-		$content['update_check'] = $content['last_update'] + getConfig('profile_lock');
+		$content['update_check'] = $content['last_update'] + getProfileLock();
 
 		// How far is last change on his profile away from now?
-		if (($content['update_check'] > time()) && (!isAdmin()) && (getConfig('profile_lock') > 0)) {
-			$content['update_check'] = generateDateTime($content['update_check'] + getConfig('profile_lock'), 0);
-
+		if (($content['update_check'] > time()) && (!isAdmin()) && (getProfileLock() > 0)) {
 			// You cannot change your account
-			loadTemplate('admin_settings_saved', false, $content['update_check']);
+			$content['update_check'] = generateDateTime($content['update_check'] + getProfileLock(), 0);
+
+			displayMessage($content['update_check']);
 		} elseif ((!isEmailValid(postRequestParameter('email'))) && (!isAdmin())) {
 			// Invalid email address!
-			loadTemplate('admin_settings_saved', false, '{--INVALID_EMAIL_ENTERED--}');
+			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));
@@ -301,11 +299,11 @@ LIMIT 1",
 					sendModeMails ('mydata', $modes);
 				} else {
 					// Something went wrong
-					loadTemplate('admin_settings_saved', false, '{--MEMBER_UPDATE_FAILED--}');
+					displayMessage('{--MEMBER_UPDATE_FAILED--}');
 				}
 			} else {
 				// Entered wrong pass for updating profile
-				loadTemplate('admin_settings_saved', false, '{--MEBER_UPDATE_PWD_WRONG--}');
+				displayMessage('{--MEBER_UPDATE_PWD_WRONG--}');
 			}
 		}
 		break;