X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fwhat-lock_user.php;h=7d0068360b343bb6922774075d5d9bdd56936aa2;hb=96dfdd6b8e6a56d6594c3525e5fd2a066697a6de;hp=4c341400e1d4c62ada0457b076048899ab2579dc;hpb=e5fe5afb17a5c8106f4c890234dfa39419e70f5d;p=mailer.git

diff --git a/inc/modules/admin/what-lock_user.php b/inc/modules/admin/what-lock_user.php
index 4c341400e1..7d0068360b 100644
--- a/inc/modules/admin/what-lock_user.php
+++ b/inc/modules/admin/what-lock_user.php
@@ -52,7 +52,7 @@ if (isGetRequestElementSet('userid')) {
 	// Load user's data
 	if (fetchUserData(getRequestElement('userid'))) {
 		// Is a lock reason set?
-		if ((isPostRequestElementSet('lock')) && ($status != 'LOCKED')) {
+		if ((isPostRequestElementSet('lock')) && (getUserData('status') != 'LOCKED')) {
 			// Ok, lock the account!
 			if (getExtensionVersion('user') >= '0.3.5') {
 				// Lock with reason
@@ -74,9 +74,9 @@ if (isGetRequestElementSet('userid')) {
 			} // END - if
 
 			// Prepare message
-			$message = sprintf(getMessage('USER_ACCOUNT_LOCKED'), getRequestElement('userid'));
+			$message = getMaskedMessage('USER_ACCOUNT_LOCKED', getRequestElement('userid'));
 			$ACT = true;
-		} elseif ((isPostRequestElementSet(('unlock'))) && ($status == 'LOCKED')) {
+		} elseif ((isPostRequestElementSet('unlock')) && (getUserData('status') == 'LOCKED')) {
 			// Ok, unlock the account!
 			if (getExtensionVersion('user') >= '0.3.5') {
 				// Reset lock reason as well
@@ -109,7 +109,7 @@ LIMIT 1",
 			} // END - if
 
 			// Prepare message
-			$message = sprintf(getMessage('USER_ACCOUNT_UNLOCKED'), getRequestElement('userid'));
+			$message = getMaskedMessage('USER_ACCOUNT_UNLOCKED', getRequestElement('userid'));
 			$ACT = true;
 		} elseif (isPostRequestElementSet('del')) {
 			// Delete the account
@@ -125,34 +125,38 @@ LIMIT 1",
 				$content['email']   = generateEmailLink(getUserData('email'), 'user_data');
 				$content['surname'] = getUserData('surname');
 				$content['family']  = getUserData('family');
+				$content['status']  = getUserData('status');
 				$content['userid']  = bigintval(getRequestElement('userid'));
 
 				// Realy want to lock?
-				switch ($status) {
+				switch ($content['status']) {
 					case 'CONFIRMED': // Yes, lock him down... ;-)
 						$content['ok']     = 'lock';
-						$content['header'] = sprintf(getMessage('ADMIN_HEADER_LOCK_ACCOUNT'), $content['userid']);
-						$content['text']   = sprintf(getMessage('ADMIN_TEXT_LOCK_ACCOUNT'), $content['userid']);
+						$content['header'] = getMaskedMessage('ADMIN_HEADER_LOCK_ACCOUNT', $content['userid']);
+						$content['text']   = getMaskedMessage('ADMIN_TEXT_LOCK_ACCOUNT', $content['userid']);
 						break;
 
 					case 'LOCKED': // Unlock the user
-						$content['ok']     = $lock;
-						$content['header'] = sprintf(getMessage('ADMIN_HEADER_UNLOCK_ACCOUNT'), $content['userid']);
-						$content['text']   = sprintf(getMessage('ADMIN_TEXT_UNLOCK_ACCOUNT'), $content['userid']);
+						$content['ok']     = 'unlock';
+						$content['header'] = getMaskedMessage('ADMIN_HEADER_UNLOCK_ACCOUNT', $content['userid']);
+						$content['text']   = getMaskedMessage('ADMIN_TEXT_UNLOCK_ACCOUNT', $content['userid']);
 						break;
 
 					case 'UNCONFIRMED': // Unconfirmed accounts cannot be unlocked!
 						$content['ok'] = 'del';
-						$content['header'] = sprintf(getMessage('ADMIN_HEADER_DEL_ACCOUNT'), $content['userid']);
-						$content['text']   = sprintf(getMessage('ADMIN_TEXT_DEL_ACCOUNT'), $content['userid']);
+						$content['header'] = getMaskedMessage('ADMIN_HEADER_DEL_ACCOUNT', $content['userid']);
+						$content['text']   = getMaskedMessage('ADMIN_TEXT_DEL_ACCOUNT', $content['userid']);
 						break;
 				}
 
+				// Translate user status
+				$content['status'] = translateUserStatus($content['status']);
+
 				// Output form
 				loadTemplate('admin_lock_user', false, $content);
 			} else {
 				// Account does not exists!
-				loadTemplate('admin_settings_saved', false, "<div class=\"admin_failed\">".sprintf(getMessage('ADMIN_MEMBER_404'), getRequestElement('userid'))."</div>");
+				loadTemplate('admin_settings_saved', false, '<div class="admin_failed">' . getMaskedMessage('ADMIN_MEMBER_404', getRequestElement('userid')) . '</div>');
 			}
 		}
 
@@ -163,14 +167,14 @@ LIMIT 1",
 		} elseif ($ACT) {
 			// An action was performed...
 			if (!empty($message)) {
-				loadTemplate('admin_settings_saved', false, "<div class=\"admin_green\">".$message."</div>");
+				loadTemplate('admin_settings_saved', false, '<div class="admin_failed">' . $message . '</div>');
 			} else {
-				loadTemplate('admin_settings_saved', false, "<div class=\"admin_green\">".getMessage('ADMIN_USER_UPDATED')."</div>");
+				loadTemplate('admin_settings_saved', false, '<div class="admin_failed">' . getMessage('ADMIN_USER_UPDATED') . '</div>');
 			}
 		}
 	} else {
 		// Account does not exists!
-		loadTemplate('admin_settings_saved', false, "<div class=\"admin_failed\">".sprintf(getMessage('ADMIN_MEMBER_404'), getRequestElement('userid'))."</div>");
+		loadTemplate('admin_settings_saved', false, '<div class="admin_failed">' . getMaskedMessage('ADMIN_MEMBER_404', getRequestElement('userid')) . '</div>');
 	}
 } else {
 	// List all users