X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fwhat-list_user.php;h=d3020a6a0a26c6c38342ac557c7e05eb2149b9f0;hb=d016e24dd4686f613a17733b96bc28fac936a4ac;hp=ca6a77dbd33eeb682b3f506013c01e5b74612b93;hpb=5bdeaf8b452206598b6c6cd4f941145b11a0eccc;p=mailer.git

diff --git a/inc/modules/admin/what-list_user.php b/inc/modules/admin/what-list_user.php
index ca6a77dbd3..d3020a6a0a 100644
--- a/inc/modules/admin/what-list_user.php
+++ b/inc/modules/admin/what-list_user.php
@@ -37,7 +37,7 @@ if ((!defined('__SECURITY')) || (!IS_ADMIN())) {
 	require($INC);
 } elseif ((!EXT_IS_ACTIVE("user")) || (GET_EXT_VERSION("user") == "")) {
 	// Missing extension!
-	addFatalMessage(sprintf(EXTENSION_PROBLEM_NOT_INSTALLED, "user"));
+	addFatalMessage(getMessage('EXTENSION_PROBLEM_EXT_INACTIVE'), "user");
 	return;
 }
 
@@ -45,13 +45,13 @@ if ((!defined('__SECURITY')) || (!IS_ADMIN())) {
 ADD_DESCR("admin", __FILE__);
 
 // Init title with "all accounts"
-$listHeader = ADMIN_ALL_ACCOUNTS;
+$listHeader = getMessage('ADMIN_ALL_ACCOUNTS');
 if (!empty($_GET['status'])) {
 	// Set title according to the "status"
-	$listHeader = constant(sprintf("ADMIN_LIST_STATUS_%s_ACCOUNTS", strtoupper(SQL_ESCAPE($_GET['status']))));
+	$listHeader = getMessage(sprintf("ADMIN_LIST_STATUS_%s_ACCOUNTS", strtoupper(SQL_ESCAPE($_GET['status']))));
 } elseif (!empty($_GET['mode'])) {
 	// Set title according to the "mode"
-	$listHeader = constant(sprintf("ADMIN_LIST_MODE_%s_ACCOUNTS", strtoupper(SQL_ESCAPE($_GET['mode']))));
+	$listHeader = getMessage(sprintf("ADMIN_LIST_MODE_%s_ACCOUNTS", strtoupper(SQL_ESCAPE($_GET['mode']))));
 }
 
 // Remember it
@@ -152,12 +152,13 @@ LIMIT 1",
 		if (!isset($DATA['lock_reason'])) $DATA['lock_reason'] = "---";
 
 		// Nickname inclusion?
+		// @TODO Rewrite these to filters
 		if (EXT_IS_ACTIVE("nickname")) {
 			// Nickname not set or invalid? Then 
 			if ((empty($DATA['nickname'])) || ($DATA['nickname'] == $uid)) $DATA['nickname'] = "---";
 		} else {
 			// Extension not found
-			$DATA['nickname'] = EXT_NICKNAME_404;
+			$DATA['nickname'] = getMessage('EXT_NICKNAME_404');
 		}
 
 		// Is the user extension newer?
@@ -189,7 +190,7 @@ LIMIT 1",
 		LOAD_TEMPLATE("admin_user_details", false, $uid);
 	} else {
 		// Account does not exist!
-		LOAD_TEMPLATE("admin_settings_saved", false, ADMIN_MEMBER_404_1.$uid.ADMIN_MEMBER_404_2);
+		LOAD_TEMPLATE("admin_settings_saved", false, sprintf(getMessage('ADMIN_MEMBER_404'), $uid));
 	}
 
 	// Free the result
@@ -207,10 +208,10 @@ LIMIT 1",
 		// Is a WHERE statement already there?
 		if (!empty($whereStatement)) {
 			// Then append the status column
-			$whereStatement .= sprintf(" AND status='%s'", SQL_ESCAPE(strip_tags(strtoupper($_GET['status']))));
+			$whereStatement .= sprintf(" AND `status`='%s'", SQL_ESCAPE(strip_tags(strtoupper($_GET['status']))));
 		} else {
 			// Start a new one
-			$whereStatement = sprintf(" WHERE status='%s'", SQL_ESCAPE(strip_tags(strtoupper($_GET['status']))));
+			$whereStatement = sprintf(" WHERE `status`='%s'", SQL_ESCAPE(strip_tags(strtoupper($_GET['status']))));
 		}
 	} elseif (isset($_GET['mode'])) {
 		// Choose what we need to list
@@ -237,8 +238,8 @@ LIMIT 1",
 
 	// Calculate page count (0.5 fixes a bug with page count)
 	if (getConfig('user_limit') == 0) {
-		$_CONFIG['user_limit'] = 100;
-		LOAD_TEMPLATE("admin_settings_saved", false, EXTENSION_WARNING_USER_LIMIT);
+		setConfigEntry('user_limit', 100);
+		LOAD_TEMPLATE("admin_settings_saved", false, getMessage('EXTENSION_WARNING_USER_LIMIT'));
 	} // END - if
 
 	// Activate the extension please!
@@ -251,7 +252,7 @@ LIMIT 1",
 	$SQL .= " LIMIT ".($_GET['offset'] * $_GET['page'] - $_GET['offset']).", ".$_GET['offset'];
 	$result = SQL_QUERY($SQL, __FILE__, __LINE__);
 
-	$result_user = SQL_QUERY("SELECT emails_sent FROM `{!_MYSQL_PREFIX!}_user_data` WHERE status='CONFIRMED'", __FILE__, __LINE__);
+	$result_user = SQL_QUERY("SELECT emails_sent FROM `{!_MYSQL_PREFIX!}_user_data` WHERE `status`='CONFIRMED'", __FILE__, __LINE__);
 	$user_count = SQL_NUMROWS($result_user);
 	SQL_FREERESULT($result_user);
 
@@ -276,13 +277,11 @@ LIMIT 1",
 		}
 
 		// Column with nickname when nickname extension is present
-		if (EXT_IS_ACTIVE("nickname"))
-		{
+		// @TODO Rewrite this into a  filter
+		if (EXT_IS_ACTIVE("nickname")) {
 			// Nickname extension found
-			define('__NICKNAME_TH', "  <td class=\"admin_title bottom2\" align=\"center\">".NICKNAME."</td>");
-		}
-		 else
-		{
+			define('__NICKNAME_TH', "  <td class=\"admin_title bottom2\" align=\"center\">{--NICKNAME--}</td>");
+		} else {
 			// Not found
 			define('__NICKNAME_TH', "");
 		}
@@ -330,6 +329,7 @@ LIMIT 1",
 			if (!isset($content['lock_reason'])) $content['lock_reason'] = "---";
 
 			// Is the extension "country" installed?
+			// @TODO Rewrite this into a filter
 			if (EXT_IS_ACTIVE("country")) {
 				// Then overwrite country information
 				$content['country'] = COUNTRY_GENERATE_INFO($content['country_code']);