X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fwhat-lock_user.php;h=b2ad76d35de0d65c37002f6226f321ea75e81c68;hp=e6cbb0019b0f9dd14eab8fe7a39a334063690ea0;hb=fad1ea280c27f9ba8ae818b87b0ba29d2c113b1b;hpb=508228c85fba8448d00865b1639cb8cd7a69e457

diff --git a/inc/modules/admin/what-lock_user.php b/inc/modules/admin/what-lock_user.php
index e6cbb0019b..b2ad76d35d 100644
--- a/inc/modules/admin/what-lock_user.php
+++ b/inc/modules/admin/what-lock_user.php
@@ -10,7 +10,7 @@
  * -------------------------------------------------------------------- *
  * Kurzbeschreibung  : Mitglieder sperren                               *
  * -------------------------------------------------------------------- *
- * $Revision:: 856                                                    $ *
+ * $Revision::                                                        $ *
  * $Date::                                                            $ *
  * $Tag:: 0.2.1-FINAL                                                 $ *
  * $Author::                                                          $ *
@@ -81,7 +81,7 @@ if (REQUEST_ISSET_GET(('uid'))) {
 			} // END - if
 
 			// Prepare message
-			$MSG = USER_ACCOUNT_LOCKED_1.REQUEST_GET('uid').USER_ACCOUNT_LOCKED_2;
+			$message = sprintf(getMessage('USER_ACCOUNT_LOCKED'), REQUEST_GET('uid'));
 			$ACT = true;
 		} elseif ((REQUEST_ISSET_POST(('unlock'))) && ($status == "LOCKED")) {
 			// Ok, unlock the account!
@@ -108,7 +108,7 @@ if (REQUEST_ISSET_GET(('uid'))) {
 			} // END - if
 
 			// Prepare message
-			$MSG = USER_ACCOUNT_UNLOCKED_1.REQUEST_GET('uid').USER_ACCOUNT_UNLOCKED_2;
+			$message = sprintf(getMessage('USER_ACCOUNT_UNLOCKED'), REQUEST_GET('uid'));
 			$ACT = true;
 		} elseif (REQUEST_ISSET_POST('del')) {
 			// Delete the account
@@ -116,7 +116,7 @@ if (REQUEST_ISSET_GET(('uid'))) {
 			LOAD_INC_ONCE("inc/modules/admin/what-del_user.php");
 		} elseif (REQUEST_ISSET_POST(('no'))) {
 			// Do not lock him...
-			$URL = "modules.php?module=admin&what=list_user&uid=".bigintval(REQUEST_GET('uid'));
+			$URL = ADMIN_CREATE_USERID_LINK(REQUEST_GET('uid'));
 		} else {
 			$result = SQL_QUERY_ESC("SELECT email, surname, family FROM `{!_MYSQL_PREFIX!}_user_data` WHERE userid=%s LIMIT 1",
 				array(bigintval(REQUEST_GET('uid'))), __FILE__, __LINE__);
@@ -130,6 +130,7 @@ if (REQUEST_ISSET_GET(('uid'))) {
 				SQL_FREERESULT($result);
 
 				// Transfer data to constants for the template
+				// @TODO Rewrite these all constants
 				define('__EMAIL', CREATE_EMAIL_LINK($email, "user_data"));
 				define('__SNAME', $sname);
 				define('__FNAME', $fname);
@@ -140,20 +141,20 @@ if (REQUEST_ISSET_GET(('uid'))) {
 				{
 				case "CONFIRMED": // Yes, lock him down... ;-)
 					define('__OK_VALUE'    , "lock");
-					define('__HEADER_VALUE', ADMIN_HEADER_LOCK_ACCOUNT_1.__UID.ADMIN_HEADER_LOCK_ACCOUNT_2);
-					define('__TEXT_VALUE'  , ADMIN_TEXT_LOCK_ACCOUNT_1.__UID.ADMIN_TEXT_LOCK_ACCOUNT_2);
+					define('__HEADER_VALUE', sprintf(getMessage('ADMIN_HEADER_LOCK_ACCOUNT'), constant('__UID')));
+					define('__TEXT_VALUE'  , sprintf(getMessage('ADMIN_TEXT_LOCK_ACCOUNT'), constant('__UID')));
 					break;
 
 				case "LOCKED": // Unlock the user
 					define('__OK_VALUE'    , "unlock");
-					define('__HEADER_VALUE', ADMIN_HEADER_UNLOCK_ACCOUNT_1.__UID.ADMIN_HEADER_UNLOCK_ACCOUNT_2);
-					define('__TEXT_VALUE'  , ADMIN_TEXT_UNLOCK_ACCOUNT_1.__UID.ADMIN_TEXT_UNLOCK_ACCOUNT_2);
+					define('__HEADER_VALUE', sprintf(getMessage('ADMIN_HEADER_UNLOCK_ACCOUNT'), constant('__UID')));
+					define('__TEXT_VALUE'  , sprintf(getMessage('ADMIN_TEXT_UNLOCK_ACCOUNT'), constant('__UID')));
 					break;
 
 				case "UNCONFIRMED": // Unconfirmed accounts cannot be unlocked!
 					define('__OK_VALUE'    , "del");
-					define('__HEADER_VALUE', ADMIN_HEADER_DEL_ACCOUNT_1.__UID.ADMIN_HEADER_DEL_ACCOUNT_2);
-					define('__TEXT_VALUE'  , ADMIN_TEXT_DEL_ACCOUNT_1.__UID.ADMIN_TEXT_DEL_ACCOUNT_2);
+					define('__HEADER_VALUE', sprintf(getMessage('ADMIN_HEADER_DEL_ACCOUNT'), constant('__UID')));
+					define('__TEXT_VALUE'  , sprintf(getMessage('ADMIN_TEXT_DEL_ACCOUNT'), constant('__UID')));
 					break;
 				}
 
@@ -171,8 +172,8 @@ if (REQUEST_ISSET_GET(('uid'))) {
 			LOAD_URL($URL);
 		} elseif ($ACT) {
 			// An action was performed...
-			if (!empty($MSG)) {
-				LOAD_TEMPLATE("admin_settings_saved", false, "<div class=\"admin_green\">".$MSG."</div>");
+			if (!empty($message)) {
+				LOAD_TEMPLATE("admin_settings_saved", false, "<div class=\"admin_green\">".$message."</div>");
 			} else {
 				LOAD_TEMPLATE("admin_settings_saved", false, "<div class=\"admin_green\">".getMessage('ADMIN_USER_UPDATED')."</div>");
 			}