X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mailid_top.php;h=e9afe997ddc1b326fb1f7472949e5d798a2af586;hb=6adf9546c2bdd2ff125671025a4ea714691743c4;hp=ff1cecd9a49baebb0d4b6f54676f8b3e72271cb5;hpb=c85ddc06cc16f2cd38ddd7d4c142a3f578bbab69;p=mailer.git

diff --git a/mailid_top.php b/mailid_top.php
index ff1cecd9a4..e9afe997dd 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;
 					}
 
@@ -194,7 +190,7 @@ if (($url_userid) > 0 && (($url_mid > 0) || ($url_bid > 0)) && (!ifFatalErrorsDe
 												array($url_mid), __FILE__, __LINE__);
 
 											// Update mediadata as well
-											if (getExtensionVersion('mediadata') >= '0.0.4') {
+											if (isExtensionInstalledAndNewer('mediadata', '0.0.4')) {
 												// Update database
 												updateMediadataEntry(array('total_clicks', 'normal_clicks'), 'add', 1);
 											} // END - if
@@ -206,7 +202,7 @@ if (($url_userid) > 0 && (($url_mid > 0) || ($url_bid > 0)) && (!ifFatalErrorsDe
 												array($url_bid), __FILE__, __LINE__);
 
 											// Update mediadata as well
-											if (getExtensionVersion('mediadata') >= '0.0.4') {
+											if (isExtensionInstalledAndNewer('mediadata', '0.0.4')) {
 												// Update database
 												updateMediadataEntry(array('total_clicks', 'bonus_clicks'), 'add', 1);
 											} // END - if
@@ -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
 
@@ -224,15 +220,15 @@ if (($url_userid) > 0 && (($url_mid > 0) || ($url_bid > 0)) && (!ifFatalErrorsDe
 
 									// Only when user extension = v0.1.2: Update mails-confirmed counter
 									// @TODO Rewrite these blocks to filter
-									if (getExtensionVersion('user') >= '0.1.2') {
+									if (isExtensionInstalledAndNewer('user', '0.1.2')) {
 										// Update counter
 										SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_user_data` SET mails_confirmed=mails_confirmed + 1 WHERE `userid`=%s LIMIT 1",
 											array($url_userid), __FILE__, __LINE__);
 
 										// Update random confirmed as well?
-										if (getExtensionVersion('user') >= '0.3.4') {
+										if (isExtensionInstalledAndNewer('user', '0.3.4')) {
 											// Update second counter
-											SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_user_data` SET rand_confirmed=rand_confirmed + 1 WHERE `userid`=%s LIMIT 1",
+											SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_user_data` SET `rand_confirmed`=`rand_confirmed` + 1 WHERE `userid`=%s LIMIT 1",
 												array($url_userid), __FILE__, __LINE__);
 										} // END - if
 									} // END - if
@@ -263,7 +259,7 @@ if (($url_userid) > 0 && (($url_mid > 0) || ($url_bid > 0)) && (!ifFatalErrorsDe
 										addPointsThroughReferalSystem('mailid_okay', $url_userid, $payment, false, 0, $locked);
 
 										// Shall I add bonus points for "turbo clickers" ?
-										if (getExtensionVersion('bonus') >= '0.2.2') {
+										if (isExtensionInstalledAndNewer('bonus', '0.2.2')) {
 											// Is an active-rallye running and this is not a notification mail?
 											if ((getConfig('bonus_active') == 'Y') && ($notify != 'Y')) {
 												// Shall I exclude the webmaster's own userid from the active-rallye?
@@ -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