X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=inc%2Fmodules%2Fadmin%2Fwhat-list_unconfirmed.php;h=9dff0083b289d476f6235b8394b35f1e061703bb;hb=5298a98f56b4d62bf6a463d5b8a2b63fb0e453c2;hp=a5731afdc987ab34635cd81d075c2186e24b1a45;hpb=de454a4f3cba4ac73cb9a0bc4dc02f81bdd4e53f;p=mailer.git

diff --git a/inc/modules/admin/what-list_unconfirmed.php b/inc/modules/admin/what-list_unconfirmed.php
index a5731afdc9..9dff0083b2 100644
--- a/inc/modules/admin/what-list_unconfirmed.php
+++ b/inc/modules/admin/what-list_unconfirmed.php
@@ -38,10 +38,10 @@
 
 // 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);
 } elseif (!EXT_IS_ACTIVE('mailid')) {
-	addFatalMessage(__FILE__, __LINE__, getMessage('EXTENSION_PROBLEM_EXT_INACTIVE'), 'mailid');
+	addFatalMessage(__FILE__, __LINE__, sprintf(getMessage('EXTENSION_PROBLEM_EXT_INACTIVE'), 'mailid'));
 	return;
 }
 
@@ -60,7 +60,7 @@ ON p.id=s.pool_id
 WHERE p.id='".REQUEST_GET('mid')."' LIMIT 1";
 
 	// Column, type and ID for member's mail
-	$col = "stats_id"; $type = "NORMAL"; $ID = "-1";
+	$col = "stats_id"; $type = "NORMAL"; $ID = '-1';
 
 	// Load admin_list_unconfirmed template
 	$listed = true; $DATA = REQUEST_GET('mid'); $LINK = 'mailid';
@@ -69,7 +69,7 @@ WHERE p.id='".REQUEST_GET('mid')."' LIMIT 1";
 	define('__LIST_UNCON_TITLE', getMessage('LIST_UNCONFIRMED_BONUS_LINKS'));
 
 	// SQL query for mail data (both ids are required for compatiblity to above normal mail
-	$sql = "SELECT id, id, subject, text, url, timestamp, mails_sent FROM `{!_MYSQL_PREFIX!}_bonus` WHERE id='".REQUEST_GET('bid')."' LIMIT 1";
+	$sql = "SELECT id, id, subject, text, url, timestamp, mails_sent FROM `{!_MYSQL_PREFIX!}_bonus` WHERE `id`='".REQUEST_GET('bid')."' LIMIT 1";
 
 	// Column, type and ID for member's mail
 	$col = 'bonus_id'; $type = "BONUS"; $ID = REQUEST_GET('bid');
@@ -92,7 +92,7 @@ if ($listed === true) {
 		SQL_FREERESULT($result);
 
 		// Transfer data to constants for the template
-		if (($stats_id > 0) && ($ID == "-1")) $ID = $stats_id;
+		if (($stats_id > 0) && ($ID == '-1')) $ID = $stats_id;
 		if ($col == 'bonus_id') $sender = 0;
 
 		// Load unconfirmed mail links. Hmmm, this select query is pretty cool
@@ -104,7 +104,7 @@ FROM `{!_MYSQL_PREFIX!}_user_links` AS l
 LEFT JOIN `{!_MYSQL_PREFIX!}_user_data` AS u
 ON l.userid=u.userid
 WHERE l.%s='%s' ORDER BY l.userid LIMIT %s",
-			array($col, $ID, bigintval($max)),__FILE__, __LINE__);
+		array($col, $ID, bigintval($max)),__FILE__, __LINE__);
 		$unconfirmed = SQL_NUMROWS($result);
 
 		if ($unconfirmed > 0) {
@@ -116,12 +116,12 @@ WHERE l.%s='%s' ORDER BY l.userid LIMIT %s",
 				// @TODO Rewritings: uid->userid
 				$content = array(
 					'sw'     => $SW,
-					'u_link' => ADMIN_USER_PROFILE_LINK($content['userid']),
+					'u_link' => generateUserProfileLink($content['userid']),
 					'uid'    => $content['userid'],
 					'link'   => $LINK,
 					'id'     => $ID,
-					'email'  => "<a href=\"".CREATE_EMAIL_LINK($content['email'], "user_data")."\">".TRANSLATE_GENDER($content['gender'])." ".$content['surname']." ".$content['family']."</a>",
-					'status' => TRANSLATE_STATUS($content['status']),
+					'email'  => "<a href=\"".generateMemberEmailLink($content['email'], "user_data")."\">".translateGender($content['gender'])." ".$content['surname']." ".$content['family']."</a>",
+					'status' => translateUserStatus($content['status']),
 				);
 
 				// Load row template and switch colors
@@ -147,7 +147,7 @@ WHERE l.%s='%s' ORDER BY l.userid LIMIT %s",
 			'text'          => COMPILE_CODE($text),
 			'url'           => FRAMETESTER($url),
 			'unconfirmed'   => $unconfirmed,
-			'stamp'         => MAKE_DATETIME($stamp, "2"),
+			'stamp'         => generateDateTime($stamp, '2'),
 			'rows'          => $OUT
 		);
 
@@ -155,10 +155,10 @@ WHERE l.%s='%s' ORDER BY l.userid LIMIT %s",
 		LOAD_TEMPLATE("admin_list_unconfirmed", false, $content);
 	} elseif (REQUEST_GET('mid') > 0) {
 		// Data in pool or in user_stats not found, so let's find out where data is missing
-		$result1 = SQL_QUERY_ESC("SELECT id FROM `{!_MYSQL_PREFIX!}_pool` WHERE id=%s LIMIT 1",
-			array(bigintval($ID)), __FILE__, __LINE__);
-		$result2 = SQL_QUERY_ESC("SELECT id FROM `{!_MYSQL_PREFIX!}_user_stats` WHERE pool_id=%s LIMIT 1",
-			array(bigintval($ID)), __FILE__, __LINE__);
+		$result1 = SQL_QUERY_ESC("SELECT `id` FROM `{!_MYSQL_PREFIX!}_pool` WHERE `id`=%s LIMIT 1",
+		array(bigintval($ID)), __FILE__, __LINE__);
+		$result2 = SQL_QUERY_ESC("SELECT `id` FROM `{!_MYSQL_PREFIX!}_user_stats` WHERE pool_id=%s LIMIT 1",
+		array(bigintval($ID)), __FILE__, __LINE__);
 		if (SQL_NUMROWS($result1) == 1) {
 			// pool table
 			LOAD_TEMPLATE('admin_settings_saved', false, sprintf(getMessage('ADMIN_UNCONFIRMED_POOL_MISSING'), $ID));