X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fwhat-lock_user.php;h=ffb7175830f28f7f3924a18752c59f1fa93ec320;hb=0ddf8f6c578aa2c1ff1db9fb8eb0b93a1e247b73;hp=9eb4635bf8172b07e8e256eb0e2511557df585b6;hpb=fc162164725588cf75969f707faead9c9cd8e68b;p=mailer.git

diff --git a/inc/modules/admin/what-lock_user.php b/inc/modules/admin/what-lock_user.php
index 9eb4635bf8..ffb7175830 100644
--- a/inc/modules/admin/what-lock_user.php
+++ b/inc/modules/admin/what-lock_user.php
@@ -14,8 +14,6 @@
  * $Date::                                                            $ *
  * $Tag:: 0.2.1-FINAL                                                 $ *
  * $Author::                                                          $ *
- * Needs to be in all Files and every File needs "svn propset           *
- * svn:keywords Date Revision" (autoprobset!) at least!!!!!!            *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
  * Copyright (c) 2009, 2010 by Mailer Developer Team                    *
@@ -48,7 +46,7 @@ addMenuDescription('admin', __FILE__);
 // Is a userid set?
 if (isGetRequestParameterSet('userid')) {
 	// Action not performed by default
-	$ACT = false;
+	$isActive = false;
 
 	// Load user's data
 	if (fetchUserData(getRequestParameter('userid'))) {
@@ -71,12 +69,12 @@ if (isGetRequestParameterSet('userid')) {
 				$message = loadEmailTemplate('lock-user', array('text' => postRequestParameter('reason')), bigintval(getRequestParameter('userid')));
 
 				// Send away...
-				sendEmail(bigintval(getRequestParameter('userid')), '{--ADMIN_LOCKED_SUBJ--}', $message);
+				sendEmail(bigintval(getRequestParameter('userid')), '{--ADMIN_LOCKED_SUBJECT--}', $message);
 			} // END - if
 
 			// Prepare message
-			$message = getMaskedMessage('USER_ACCOUNT_LOCKED', bigintval(getRequestParameter('userid')));
-			$ACT = true;
+			$message = getMaskedMessage('ADMIN_USER_ACCOUNT_LOCKED', bigintval(getRequestParameter('userid')));
+			$isActive = true;
 		} elseif ((isPostRequestParameterSet('unlock')) && (getUserData('status') == 'LOCKED')) {
 			// Ok, unlock the account!
 			if (isExtensionInstalledAndNewer('user', '0.3.5')) {
@@ -103,18 +101,18 @@ LIMIT 1",
 				$message = loadEmailTemplate('unlock-user', array('text' => postRequestParameter('reason')), bigintval(getRequestParameter('userid')));
 
 				// Send away...
-				sendEmail(bigintval(getRequestParameter('userid')), '{--ADMIN_UNLOCKED_SUBJ--}', $message);
+				sendEmail(bigintval(getRequestParameter('userid')), '{--ADMIN_UNLOCKED_SUBJECT--}', $message);
 				if (isExtensionActive('rallye')) {
 					addUserToReferalRallye(getRequestParameter('userid'));
 				} // END - if
 			} // END - if
 
 			// Prepare message
-			$message = getMaskedMessage('USER_ACCOUNT_UNLOCKED', bigintval(getRequestParameter('userid')));
-			$ACT = true;
-		} elseif (isFormSent('del')) {
+			$message = getMaskedMessage('ADMIN_USER_ACCOUNT_UNLOCKED', bigintval(getRequestParameter('userid')));
+			$isActive = true;
+		} elseif (isFormSent('delete')) {
 			// Delete the account
-			$ACT = true;
+			$isActive = true;
 			loadIncludeOnce('inc/modules/admin/what-del_user.php');
 		} elseif (isPostRequestParameterSet('no')) {
 			// Do not lock him...
@@ -140,9 +138,9 @@ LIMIT 1",
 						break;
 
 					case 'UNCONFIRMED': // Unconfirmed accounts cannot be unlocked!
-						$content['ok'] = 'del';
-						$content['header'] = getMaskedMessage('ADMIN_HEADER_DEL_ACCOUNT', $content['userid']);
-						$content['text']   = getMaskedMessage('ADMIN_TEXT_DEL_ACCOUNT', $content['userid']);
+						$content['ok'] = 'delete';
+						$content['header'] = getMaskedMessage('ADMIN_HEADER_DELETE_ACCOUNT', $content['userid']);
+						$content['text']   = getMaskedMessage('ADMIN_TEXT_DELETE_ACCOUNT', $content['userid']);
 						break;
 				}
 
@@ -150,7 +148,7 @@ LIMIT 1",
 				loadTemplate('admin_lock_user', false, $content);
 			} else {
 				// Account does not exists!
-				loadTemplate('admin_settings_saved', false, '<div class="admin_failed">' . getMaskedMessage('ADMIN_MEMBER_404', bigintval(getRequestParameter('userid'))) . '</div>');
+				loadTemplate('admin_settings_unsaved', false, getMaskedMessage('ADMIN_MEMBER_404', bigintval(getRequestParameter('userid'))) . '</div>');
 			}
 		}
 
@@ -158,17 +156,17 @@ LIMIT 1",
 		if (!empty($url)) {
 			// Reload and die...
 			redirectToUrl($url);
-		} elseif ($ACT) {
+		} elseif ($isActive) {
 			// An action was performed...
 			if (!empty($message)) {
-				loadTemplate('admin_settings_saved', false, '<div class="admin_failed">' . $message . '</div>');
+				loadTemplate('admin_settings_unsaved', false, $message);
 			} else {
-				loadTemplate('admin_settings_saved', false, '<div class="admin_failed">{--ADMIN_USER_UPDATED--}</div>');
+				loadTemplate('admin_settings_saved', false, '{--ADMIN_USER_UPDATED--}');
 			}
 		}
 	} else {
 		// Account does not exists!
-		loadTemplate('admin_settings_saved', false, '<div class="admin_failed">' . getMaskedMessage('ADMIN_MEMBER_404', bigintval(getRequestParameter('userid'))) . '</div>');
+		loadTemplate('admin_settings_unsaved', false, getMaskedMessage('ADMIN_MEMBER_404', bigintval(getRequestParameter('userid'))));
 	}
 } else {
 	// List all users