X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fwhat-list_links.php;h=e082040a1374417d2b72d5b11bdf304e647e362e;hp=7da4f58d3c93464eb65fc1555d45c5f0a5f647f4;hb=c47144dd555bbab4acdf9085e4623900dedb0e7c;hpb=fc7f4d7fd71c718503c2af305276f5a374ae24da

diff --git a/inc/modules/admin/what-list_links.php b/inc/modules/admin/what-list_links.php
index 7da4f58d3c..e082040a13 100644
--- a/inc/modules/admin/what-list_links.php
+++ b/inc/modules/admin/what-list_links.php
@@ -36,7 +36,7 @@ if ((!defined('__SECURITY')) || (!IS_ADMIN())) {
 	$INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php";
 	require($INC);
 } elseif (!EXT_IS_ACTIVE("mailid")) {
-	ADD_FATAL(sprintf(EXTENSION_PROBLEM_NOT_INSTALLED, "mailid"));
+	addFatalMessage(sprintf(EXTENSION_PROBLEM_NOT_INSTALLED, "mailid"));
 	return;
 }
 
@@ -47,7 +47,7 @@ if (empty($_GET['del'])) $_GET['del'] = "";
 
 if (!empty($_GET['u_id'])) {
 	// Check if the user already exists
-	$result = SQL_QUERY_ESC("SELECT surname, family, email FROM "._MYSQL_PREFIX."_user_data WHERE userid=%s LIMIT 1",
+	$result = SQL_QUERY_ESC("SELECT surname, family, email FROM `{!_MYSQL_PREFIX!}_user_data` WHERE userid=%s LIMIT 1",
 	 array(bigintval($_GET['u_id'])), __FILE__, __LINE__);
 
 	 // Is there an entry?
@@ -59,11 +59,11 @@ if (!empty($_GET['u_id'])) {
 		// Grab user's all unconfirmed mails
 		if (EXT_IS_ACTIVE("bonus")) {
 			// Load bonus ID
-			$result = SQL_QUERY_ESC("SELECT stats_id, bonus_id, link_type FROM "._MYSQL_PREFIX."_user_links WHERE userid=%s ORDER BY id",
+			$result = SQL_QUERY_ESC("SELECT stats_id, bonus_id, link_type FROM `{!_MYSQL_PREFIX!}_user_links` WHERE userid=%s ORDER BY `id`",
 			 array(bigintval($_GET['u_id'])), __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",
+			$result = SQL_QUERY_ESC("SELECT stats_id, stats_id, link_type FROM `{!_MYSQL_PREFIX!}_user_links` WHERE userid=%s ORDER BY `id`",
 			 array(bigintval($_GET['u_id'])), __FILE__, __LINE__);
 		}
 
@@ -74,35 +74,45 @@ if (!empty($_GET['u_id'])) {
 			// Some unconfirmed mails left
 			if ($_GET['del'] == "all") {
 				// Delete all unconfirmed mails by this user
-				$result_del = SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM "._MYSQL_PREFIX."_user_links WHERE userid=%s LIMIT %s",
-				 array(bigintval($_GET['u_id']), $nums), __FILE__, __LINE__);
+				SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_user_links` WHERE userid=%s LIMIT %s",
+					array(bigintval($_GET['u_id']), $nums), __FILE__, __LINE__);
 
 				// Prepare mail and send it away
 				$msg = LOAD_EMAIL_TEMPLATE("admin-del_links", $nums, bigintval($_GET['u_id']));
-				SEND_EMAIL($email, ADMIN_DEL_LINK_SUBJ, $msg);
+				SEND_EMAIL($email, getMessage('ADMIN_DEL_LINK_SUBJ'), $msg);
 
 				// Display message
-				LOAD_TEMPLATE("admin_settings_saved", false, ADMIN_LINKS_DELETED);
+				LOAD_TEMPLATE("admin_settings_saved", false, getMessage('ADMIN_LINKS_DELETED'));
 			} else {
 				// List all unconfirmed mails
 				$SW = 2; $OUT = "";
 				while (list($id, $id2, $type) = SQL_FETCHROW($result)) {
-					// Load data from stats table...
+					// Initializes some variables
 					$cat = "";
+					$DATA = "";
+					$PROBLEM = GENERAL_MAIL_PROBLEM;
+					$result_data = false; // Closes Bug #58
+
+					// Load data from stats table...
 					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 = NORMAL_MAIL_PROBLEM;
-						$LINK = "<A href=\"".URL."/mailid.php?uid=".$_GET['u_id']."&amp;mailid=".$id."\" target=\"_blank\">".$id."</A>";
+						$LINK = "<a href=\"{!URL!}/mailid.php?uid=".$_GET['u_id']."&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 = BONUS_MAIL_PROBLEM;
-						$LINK = "<A href=\"".URL."/mailid.php?uid=".$_GET['u_id']."&amp;bonusid=".$id2."\" target=\"_blank\">".$id2."</A>";
+						$LINK = "<a href=\"{!URL!}/mailid.php?uid=".$_GET['u_id']."&amp;bonusid=".$id2."\" target=\"_blank\">".$id2."</a>";
+						break;
+
+					default: // Problem in application detected!
+						// Log the error
+						DEBUG_LOG(__FILE__, __LINE__, sprintf("Invalid email type %s detected.", $type));
 						break;
 					}
 
@@ -110,7 +120,7 @@ if (!empty($_GET['u_id'])) {
 						// Mail was found!
 						list($subject, $timestamp, $cat) = SQL_FETCHROW($result_data);
 						SQL_FREERESULT($result_data);
-						if (empty($subject)) $subject = DEFAULT_SUBJECT_LINE;
+						if (empty($subject)) $subject = getMessage('DEFAULT_SUBJECT_LINE');
 
 						// Prepare data for the row template
 						$content = array(
@@ -142,7 +152,7 @@ if (!empty($_GET['u_id'])) {
 				// Remember list in constant for the template
 				define('__SNAME_VALUE', $sname);
 				define('__FNAME_VALUE', $fname);
-				define('__EMAIL_VALUE', "<A href=\"".CREATE_EMAIL_LINK($email, "user_data")."\">".$email."</A>");
+				define('__EMAIL_VALUE', "<a href=\"".CREATE_EMAIL_LINK($email, "user_data")."\">".$email."</a>");
 				define('__EMAIL_LIST' , $OUT);
 				define('__NUMS_VALUE' , $nums);
 				define('__UID'        , bigintval($_GET['u_id']));