X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fwhat-lock_user.php;h=bfd2f3b8b9826982c68234bc005d48927df4533a;hb=49248176a5638be80b148ef55d0dc8c334522bf3;hp=8cae8cbff328864ac88dec4a1b80d11223691311;hpb=fb7120ffa230b62b54895bcf95952e1cf30f8594;p=mailer.git

diff --git a/inc/modules/admin/what-lock_user.php b/inc/modules/admin/what-lock_user.php
index 8cae8cbff3..bfd2f3b8b9 100644
--- a/inc/modules/admin/what-lock_user.php
+++ b/inc/modules/admin/what-lock_user.php
@@ -38,18 +38,18 @@
 
 // Some security stuff...
 if ((!defined('__SECURITY')) || (!IS_ADMIN())) {
-	$INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php";
+	$INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), '/inc') + 4) . '/security.php';
 	require($INC);
-}
+} // END - if
 
 // Add description as navigation point
-ADD_DESCR("admin", __FILE__);
+ADD_DESCR('admin', __FILE__);
 
 // Is a userid set?
-if (REQUEST_ISSET_GET(('uid'))) {
+if (REQUEST_ISSET_GET('uid')) {
 	// Load user's data
 	$result_user = SQL_QUERY_ESC("SELECT status, gender, surname, family, email FROM `{!_MYSQL_PREFIX!}_user_data` WHERE userid=%s LIMIT 1",
-	 array(bigintval(REQUEST_GET('uid'))), __FILE__, __LINE__);
+	array(bigintval(REQUEST_GET('uid'))), __FILE__, __LINE__);
 	$ACT = false;
 	if (SQL_NUMROWS($result_user) == 1) {
 		// User found
@@ -59,16 +59,16 @@ if (REQUEST_ISSET_GET(('uid'))) {
 		SQL_FREERESULT($result_user);
 
 		// Is a lock reason set?
-		if ((REQUEST_ISSET_POST(('lock'))) && ($status != "LOCKED")) {
+		if ((REQUEST_ISSET_POST(('lock'))) && ($status != 'LOCKED')) {
 			// Ok, lock the account!
-			if (GET_EXT_VERSION("user") >= "0.3.5") {
+			if (GET_EXT_VERSION('user') >= '0.3.5') {
 				// Lock with reason
 				SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_user_data` SET `status`='LOCKED',lock_reason='%s',lock_timestamp=NOW() WHERE userid=%s LIMIT 1",
-					array(REQUEST_POST('reason'), bigintval(REQUEST_GET('uid'))), __FILE__, __LINE__);
+				array(REQUEST_POST('reason'), bigintval(REQUEST_GET('uid'))), __FILE__, __LINE__);
 			} else {
 				// Lock with no lock reason saved
 				SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_user_data` SET `status`='LOCKED' WHERE userid=%s LIMIT 1",
-					array(bigintval(REQUEST_GET('uid'))), __FILE__, __LINE__);
+				array(bigintval(REQUEST_GET('uid'))), __FILE__, __LINE__);
 			}
 
 			// Entry updated?
@@ -77,22 +77,22 @@ if (REQUEST_ISSET_GET(('uid'))) {
 				$msg = LOAD_EMAIL_TEMPLATE("lock-user", array('text' => REQUEST_POST('reason')), bigintval(REQUEST_GET('uid')));
 
 				// Send away...
-				SEND_EMAIL(bigintval(REQUEST_GET('uid')), ADMIN_LOCKED_SUBJ, $msg);
+				sendEmail(bigintval(REQUEST_GET('uid')), ADMIN_LOCKED_SUBJ, $msg);
 			} // 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")) {
+		} elseif ((REQUEST_ISSET_POST(('unlock'))) && ($status == 'LOCKED')) {
 			// Ok, unlock the account!
-			if (GET_EXT_VERSION("user") >= "0.3.5") {
+			if (GET_EXT_VERSION('user') >= '0.3.5') {
 				// Reset lock reason as well
 				SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_user_data` SET `status`='CONFIRMED',lock_reason='',lock_timestamp='0000-00-00 00:00' WHERE userid=%s LIMIT 1",
-					array(bigintval(REQUEST_GET('uid'))), __FILE__, __LINE__);
+				array(bigintval(REQUEST_GET('uid'))), __FILE__, __LINE__);
 			} else {
 				// No lock reason to reset
 				SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_user_data` SET `status`='CONFIRMED' WHERE userid=%s LIMIT 1",
-					array(bigintval(REQUEST_GET('uid'))), __FILE__, __LINE__);
+				array(bigintval(REQUEST_GET('uid'))), __FILE__, __LINE__);
 			}
 
 			// Entry updated?
@@ -101,25 +101,25 @@ if (REQUEST_ISSET_GET(('uid'))) {
 				$msg = LOAD_EMAIL_TEMPLATE("unlock-user", array('text' => REQUEST_POST('reason')), bigintval(REQUEST_GET('uid')));
 
 				// Send away...
-				SEND_EMAIL(bigintval(REQUEST_GET('uid')), getMessage('ADMIN_UNLOCKED_SUBJ'), $msg);
-				if (EXT_IS_ACTIVE("rallye")) {
+				sendEmail(bigintval(REQUEST_GET('uid')), getMessage('ADMIN_UNLOCKED_SUBJ'), $msg);
+				if (EXT_IS_ACTIVE('rallye')) {
 					RALLYE_AUTOADD_USER(REQUEST_GET('uid'));
 				} // END - if
 			} // 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
 			$ACT = true;
-			LOAD_INC_ONCE("inc/modules/admin/what-del_user.php");
-		} elseif (REQUEST_ISSET_POST(('no'))) {
+			loadIncludeOnce("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__);
+			array(bigintval(REQUEST_GET('uid'))), __FILE__, __LINE__);
 
 			// Entry found?
 			if (SQL_NUMROWS($result) == 1) {
@@ -130,7 +130,8 @@ if (REQUEST_ISSET_GET(('uid'))) {
 				SQL_FREERESULT($result);
 
 				// Transfer data to constants for the template
-				define('__EMAIL', CREATE_EMAIL_LINK($email, "user_data"));
+				// @TODO Rewrite these all constants
+				define('__EMAIL', generateMemberEmailLink($email, 'user_data'));
 				define('__SNAME', $sname);
 				define('__FNAME', $fname);
 				define('__UID'  , bigintval(REQUEST_GET('uid')));
@@ -138,48 +139,48 @@ if (REQUEST_ISSET_GET(('uid'))) {
 				// Realy want to lock?
 				switch ($status)
 				{
-				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);
-					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);
-					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);
-					break;
+					case 'CONFIRMED': // Yes, lock him down... ;-)
+						define('__OK_VALUE'    , 'lock');
+						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', 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', sprintf(getMessage('ADMIN_HEADER_DEL_ACCOUNT'), constant('__UID')));
+						define('__TEXT_VALUE'  , sprintf(getMessage('ADMIN_TEXT_DEL_ACCOUNT'), constant('__UID')));
+						break;
 				}
 
 				// Output form
-				LOAD_TEMPLATE("admin_lock_user");
+				LOAD_TEMPLATE('admin_lock_user');
 			} else {
 				// Account does not exists!
-				LOAD_TEMPLATE("admin_settings_saved", false, "<div class=\"admin_failed\">".sprintf(getMessage('ADMIN_MEMBER_404'), REQUEST_GET('uid'))."</div>");
+				LOAD_TEMPLATE('admin_settings_saved', false, "<div class=\"admin_failed\">".sprintf(getMessage('ADMIN_MEMBER_404'), REQUEST_GET('uid'))."</div>");
 			}
 		}
 
 		// Is an URL set?
 		if (!empty($URL)) {
 			// Reload and die...
-			LOAD_URL($URL);
+			redirectToUrl($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>");
+				LOAD_TEMPLATE('admin_settings_saved', false, "<div class=\"admin_green\">".getMessage('ADMIN_USER_UPDATED')."</div>");
 			}
 		}
 	} else {
 		// Account does not exists!
-		LOAD_TEMPLATE("admin_settings_saved", false, "<div class=\"admin_failed\">".sprintf(getMessage('ADMIN_MEMBER_404'), REQUEST_GET('uid'))."</div>");
+		LOAD_TEMPLATE('admin_settings_saved', false, "<div class=\"admin_failed\">".sprintf(getMessage('ADMIN_MEMBER_404'), REQUEST_GET('uid'))."</div>");
 	}
 } else {
 	// List all users