X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=inc%2Fmodules%2Fadmin%2Fwhat-list_links.php;h=7db6c8f734f3b1a0eade4c48e324878dfb4508c1;hb=f928ad2bed60fa256d0641eaf6d2c027a2944688;hp=12058cc1027b7a5387e2c1ba72568e9a4b724f33;hpb=49248176a5638be80b148ef55d0dc8c334522bf3;p=mailer.git

diff --git a/inc/modules/admin/what-list_links.php b/inc/modules/admin/what-list_links.php
index 12058cc102..7db6c8f734 100644
--- a/inc/modules/admin/what-list_links.php
+++ b/inc/modules/admin/what-list_links.php
@@ -68,8 +68,8 @@ if (REQUEST_ISSET_GET('uid')) {
 			array(bigintval(REQUEST_GET('uid'))), __FILE__, __LINE__);
 		} else {
 			// Load stats ID (2nd will be ignored later! But it is needed for the same fetchrow command)
-			$result = SQL_QUERY_ESC("SELECT stats_id, stats_id, link_type FROM `{!_MYSQL_PREFIX!}_user_links` WHERE userid=%s ORDER BY `id`",
-			array(bigintval(REQUEST_GET('uid'))), __FILE__, __LINE__);
+			$result = SQL_QUERY_ESC("SELECT stats_id, stats_id, link_type FROM `{!_MYSQL_PREFIX!}_user_links` WHERE `userid`=%s ORDER BY `id` ASC",
+				array(bigintval(REQUEST_GET('uid'))), __FILE__, __LINE__);
 		}
 
 		// Get number of rows from the query
@@ -79,12 +79,12 @@ if (REQUEST_ISSET_GET('uid')) {
 			// Some unconfirmed mails left
 			if (REQUEST_GET('del') == "all") {
 				// Delete all unconfirmed mails by this user
-				SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_user_links` WHERE userid=%s LIMIT %s",
-				array(bigintval(REQUEST_GET('uid')), $nums), __FILE__, __LINE__);
+				SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_user_links` WHERE `userid`=%s LIMIT %s",
+					array(bigintval(REQUEST_GET('uid')), $nums), __FILE__, __LINE__);
 
 				// Prepare mail and send it away
-				$msg = LOAD_EMAIL_TEMPLATE("admin-del_links", $nums, bigintval(REQUEST_GET('uid')));
-				sendEmail($email, getMessage('ADMIN_DEL_LINK_SUBJ'), $msg);
+				$message = LOAD_EMAIL_TEMPLATE('admin-del_links', $nums, bigintval(REQUEST_GET('uid')));
+				sendEmail($email, getMessage('ADMIN_DEL_LINK_SUBJ'), $message);
 
 				// Display message
 				LOAD_TEMPLATE('admin_settings_saved', false, getMessage('ADMIN_LINKS_DELETED'));
@@ -105,15 +105,15 @@ if (REQUEST_ISSET_GET('uid')) {
 					// @TODO Rewrite this to includes/filter
 					switch ($type) {
 						case 'NORMAL':
-							$result_data = SQL_QUERY_ESC("SELECT subject, timestamp_ordered, cat_id FROM `{!_MYSQL_PREFIX!}_user_stats` WHERE `id`=%s LIMIT 1",
-							array(bigintval($id)), __FILE__, __LINE__);
+							$result_data = SQL_QUERY_ESC("SELECT `subject`, `timestamp_ordered`, `cat_id` FROM `{!_MYSQL_PREFIX!}_user_stats` WHERE `id`=%s LIMIT 1",
+								array(bigintval($id)), __FILE__, __LINE__);
 							$type = 'mailid'; $DATA = $id; $PROBLEM = getMessage('NORMAL_MAIL_PROBLEM');
 							$LINK = "<a href=\"{!URL!}/mailid.php?uid=".REQUEST_GET('uid')."&amp;mailid=".$id."\" target=\"_blank\">".$id."</a>";
 							break;
 
 						case 'BONUS':
-							$result_data = SQL_QUERY_ESC("SELECT subject, timestamp, cat_id FROM `{!_MYSQL_PREFIX!}_bonus` WHERE `id`=%s LIMIT 1",
-							array(bigintval($id2)), __FILE__, __LINE__);
+							$result_data = SQL_QUERY_ESC("SELECT `subject`, `timestamp`, `cat_id` FROM `{!_MYSQL_PREFIX!}_bonus` WHERE `id`=%s LIMIT 1",
+								array(bigintval($id2)), __FILE__, __LINE__);
 							$type = 'bonusid'; $DATA = $id2; $PROBLEM = getMessage('BONUS_MAIL_PROBLEM');
 							$LINK = "<a href=\"{!URL!}/mailid.php?uid=".REQUEST_GET('uid')."&amp;bonusid=".$id2."\" target=\"_blank\">".$id2."</a>";
 							break;
@@ -140,10 +140,10 @@ if (REQUEST_ISSET_GET('uid')) {
 						);
 
 						// Load row template
-						$OUT .= LOAD_TEMPLATE("admin_list_links_row", true, $content);
+						$OUT .= LOAD_TEMPLATE('admin_list_links_row', true, $content);
 					} else {
 						// Load template for error
-						$OUT .= LOAD_TEMPLATE("admin_list_links_problem",
+						$OUT .= LOAD_TEMPLATE('admin_list_links_problem',
 						array(
 								'sw'		=> $SW,
 								'problem'	=> $PROBLEM,
@@ -160,13 +160,13 @@ if (REQUEST_ISSET_GET('uid')) {
 				// Remember list in constant for the template
 				define('__SNAME_VALUE', $sname);
 				define('__FNAME_VALUE', $fname);
-				define('__EMAIL_VALUE', "<a href=\"".generateMemberEmailLink($email, "user_data")."\">".$email."</a>");
+				define('__EMAIL_VALUE', "<a href=\"" . generateEmailLink($email, 'user_data') . "\">".$email."</a>");
 				define('__EMAIL_LIST' , $OUT);
 				define('__NUMS_VALUE' , $nums);
 				define('__UID'        , bigintval(REQUEST_GET('uid')));
 
 				// Load final template
-				LOAD_TEMPLATE("admin_list_links");
+				LOAD_TEMPLATE('admin_list_links');
 			}
 		} else {
 			// No mails left to confirm