X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=mailid_top.php;h=0ea9125b67774b82684dd26ab5be120758f5996a;hb=f57261751b221bd64a7dfe96d7a90404e6974d23;hp=29a08b5f24b4a4a7bcbc0dd8f7fedab7bf4e7274;hpb=e45e218c4f629ec63f0788cab231bfc88b3fa46e;p=mailer.git

diff --git a/mailid_top.php b/mailid_top.php
index 29a08b5f24..0ea9125b67 100644
--- a/mailid_top.php
+++ b/mailid_top.php
@@ -80,19 +80,18 @@ if (($url_userid) > 0 && (($url_mid > 0) || ($url_bid > 0)) && (!ifFatalErrorsDe
 
 	// Maybe he wants to confirm an email?
 	if ($url_mid > 0) {
-		$result = SQL_QUERY_ESC("SELECT `id`, `link_type` FROM `{?_MYSQL_PREFIX?}_user_links` WHERE `stats_id`=%s AND `userid`=%s LIMIT 1",
+		$result_main = SQL_QUERY_ESC("SELECT `id`, `link_type` FROM `{?_MYSQL_PREFIX?}_user_links` WHERE `stats_id`=%s AND `userid`=%s LIMIT 1",
 			array($url_mid, $url_userid), __FILE__, __LINE__);
 		$type = 'mailid'; $urlId = $url_mid;
 	} elseif ($url_bid > 0) {
-		$result = SQL_QUERY_ESC("SELECT `id`, `link_type` FROM `{?_MYSQL_PREFIX?}_user_links` WHERE `bonus_id`=%s AND `userid`=%s LIMIT 1",
+		$result_main = SQL_QUERY_ESC("SELECT `id`, `link_type` FROM `{?_MYSQL_PREFIX?}_user_links` WHERE `bonus_id`=%s AND `userid`=%s LIMIT 1",
 			array($url_bid, $url_userid), __FILE__, __LINE__);
 		$type = 'bonusid'; $urlId = $url_bid;
 	}
 
-	if (SQL_NUMROWS($result) == 1) {
+	if (SQL_NUMROWS($result_main) == 1) {
 		// Is the stats id valid?
-		list($lid, $ltype) = SQL_FETCHROW($result);
-		SQL_FREERESULT($result);
+		list($lid, $ltype) = SQL_FETCHROW($result_main);
 
 		// Init result here with invalid to avoid possible missing variable
 		$result_mailid = false;
@@ -110,7 +109,7 @@ if (($url_userid) > 0 && (($url_mid > 0) || ($url_bid > 0)) && (!ifFatalErrorsDe
 				break;
 
 			default: // Unknown type
-				debug_report_bug('Unknown mail type ' . $ltype . ' detected.');
+				debug_report_bug(__FILE__, __LINE__, 'Unknown mail type ' . $ltype . ' detected.');
 				break;
 		}
 
@@ -122,9 +121,6 @@ if (($url_userid) > 0 && (($url_mid > 0) || ($url_bid > 0)) && (!ifFatalErrorsDe
 			// Correct notification switch in non-bonus mails
 			if (($notify != 'Y') && ($notify != 'N')) $notify = 'N';
 
-			// Free some memory
-			SQL_FREERESULT($result_mailid);
-
 			// Set sender to 0 when we have a bonus mail
 			if ($ltype == 'BONUS') $sender = '0';
 
@@ -166,7 +162,7 @@ if (($url_userid) > 0 && (($url_mid > 0) || ($url_bid > 0)) && (!ifFatalErrorsDe
 							break;
 
 						default: // Unknown type
-							debug_report_bug('Unknown mail type ' . $ltype . ' detected.');
+							debug_report_bug(__FILE__, __LINE__, 'Unknown mail type ' . $ltype . ' detected.');
 							break;
 					}
 
@@ -214,7 +210,7 @@ if (($url_userid) > 0 && (($url_mid > 0) || ($url_bid > 0)) && (!ifFatalErrorsDe
 											break;
 
 										default: // Unknown type
-											debug_report_bug('Unknown mail type ' . $ltype . ' detected.');
+											debug_report_bug(__FILE__, __LINE__, 'Unknown mail type ' . $ltype . ' detected.');
 											break;
 									} // END - switch
 
@@ -328,7 +324,7 @@ if (($url_userid) > 0 && (($url_mid > 0) || ($url_bid > 0)) && (!ifFatalErrorsDe
 										loadTemplate($templ, false, $content);
 									} else {
 										// Cannot confirm!
-										debug_report_bug('No code given.');
+										debug_report_bug(__FILE__, __LINE__, 'No code given.');
 									}
 									break;
 
@@ -348,7 +344,7 @@ if (($url_userid) > 0 && (($url_mid > 0) || ($url_bid > 0)) && (!ifFatalErrorsDe
 									break;
 
 								default: // Unknown mode
-									debug_report_bug('Unknown mode ' . $mode . ' detected.');
+									debug_report_bug(__FILE__, __LINE__, 'Unknown mode ' . $mode . ' detected.');
 									break;
 							} // END - switch
 						} else {
@@ -364,21 +360,24 @@ if (($url_userid) > 0 && (($url_mid > 0) || ($url_bid > 0)) && (!ifFatalErrorsDe
 					$mode = 'failed';
 				}
 			} else {
-				SQL_FREERESULT($result);
 				loadTemplate('admin_settings_saved', false, '<div class="member_failed">{--MAIL_ALREADY_CONFIRMED--} (3)</div>');
 				$mode = 'failed';
 			}
 		} else {
-			SQL_FREERESULT($result);
 			loadTemplate('admin_settings_saved', false, '<div class="member_failed">{--MAIL_ALREADY_CONFIRMED--} (2)</div>');
 			$mode = 'failed';
 		}
+
+		// Free result
+		SQL_FREERESULT($result_mailid);
 	} else {
-		SQL_FREERESULT($result);
 		loadTemplate('admin_settings_saved', false, '<div class="member_failed">{--MAIL_ALREADY_CONFIRMED--} (1)</div>');
 		$mode = 'failed';
 	}
 
+	// Free result
+	SQL_FREERESULT($result_main);
+
 	// Insert footer if no image
 	if ($mode != 'img') {
 		// Write footer