X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=mailid_top.php;h=0ea9125b67774b82684dd26ab5be120758f5996a;hp=927610b030de67121626f827ce3019d8f363ccd7;hb=f57261751b221bd64a7dfe96d7a90404e6974d23;hpb=57227d33e870ec5cd271209c4a978a52b45c2dd6
diff --git a/mailid_top.php b/mailid_top.php
index 927610b030..0ea9125b67 100644
--- a/mailid_top.php
+++ b/mailid_top.php
@@ -18,6 +18,7 @@
* svn:keywords Date Revision" (autoprobset!) at least!!!!!! *
* -------------------------------------------------------------------- *
* Copyright (c) 2003 - 2009 by Roland Haeder *
+ * Copyright (c) 2009, 2010 by Mailer Developer Team *
* For more information visit: http://www.mxchange.org *
* *
* This program is free software; you can redistribute it and/or modify *
@@ -73,25 +74,24 @@ if (isGetRequestParameterSet('code')) $code = bigintval(getRequestParam
if (isGetRequestParameterSet('mode')) $mode = getRequestParameter('mode');
// 01 1 12 2 2 21 1 22 10
-if (($url_userid) > 0 && (($url_mid > 0) || ($url_bid > 0)) && (getTotalFatalErrors() == '0')) {
+if (($url_userid) > 0 && (($url_mid > 0) || ($url_bid > 0)) && (!ifFatalErrorsDetected())) {
// No image? Then output header
if ($mode != 'img') loadIncludeOnce('inc/header.php');
// 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;
@@ -109,7 +109,7 @@ if (($url_userid) > 0 && (($url_mid > 0) || ($url_bid > 0)) && (getTotalFatalErr
break;
default: // Unknown type
- debug_report_bug('Unknown mail type ' . $ltype . ' detected.');
+ debug_report_bug(__FILE__, __LINE__, 'Unknown mail type ' . $ltype . ' detected.');
break;
}
@@ -121,9 +121,6 @@ if (($url_userid) > 0 && (($url_mid > 0) || ($url_bid > 0)) && (getTotalFatalErr
// 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';
@@ -165,7 +162,7 @@ if (($url_userid) > 0 && (($url_mid > 0) || ($url_bid > 0)) && (getTotalFatalErr
break;
default: // Unknown type
- debug_report_bug('Unknown mail type ' . $ltype . ' detected.');
+ debug_report_bug(__FILE__, __LINE__, 'Unknown mail type ' . $ltype . ' detected.');
break;
}
@@ -193,7 +190,7 @@ if (($url_userid) > 0 && (($url_mid > 0) || ($url_bid > 0)) && (getTotalFatalErr
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
@@ -205,7 +202,7 @@ if (($url_userid) > 0 && (($url_mid > 0) || ($url_bid > 0)) && (getTotalFatalErr
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
@@ -213,7 +210,7 @@ if (($url_userid) > 0 && (($url_mid > 0) || ($url_bid > 0)) && (getTotalFatalErr
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
@@ -223,13 +220,13 @@ if (($url_userid) > 0 && (($url_mid > 0) || ($url_bid > 0)) && (getTotalFatalErr
// 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",
array($url_userid), __FILE__, __LINE__);
@@ -262,7 +259,7 @@ if (($url_userid) > 0 && (($url_mid > 0) || ($url_bid > 0)) && (getTotalFatalErr
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?
@@ -327,7 +324,7 @@ if (($url_userid) > 0 && (($url_mid > 0) || ($url_bid > 0)) && (getTotalFatalErr
loadTemplate($templ, false, $content);
} else {
// Cannot confirm!
- debug_report_bug('No code given.');
+ debug_report_bug(__FILE__, __LINE__, 'No code given.');
}
break;
@@ -347,7 +344,7 @@ if (($url_userid) > 0 && (($url_mid > 0) || ($url_bid > 0)) && (getTotalFatalErr
break;
default: // Unknown mode
- debug_report_bug('Unknown mode ' . $mode . ' detected.');
+ debug_report_bug(__FILE__, __LINE__, 'Unknown mode ' . $mode . ' detected.');
break;
} // END - switch
} else {
@@ -363,21 +360,24 @@ if (($url_userid) > 0 && (($url_mid > 0) || ($url_bid > 0)) && (getTotalFatalErr
$mode = 'failed';
}
} else {
- SQL_FREERESULT($result);
loadTemplate('admin_settings_saved', false, '{--MAIL_ALREADY_CONFIRMED--} (3)
');
$mode = 'failed';
}
} else {
- SQL_FREERESULT($result);
loadTemplate('admin_settings_saved', false, '{--MAIL_ALREADY_CONFIRMED--} (2)
');
$mode = 'failed';
}
+
+ // Free result
+ SQL_FREERESULT($result_mailid);
} else {
- SQL_FREERESULT($result);
loadTemplate('admin_settings_saved', false, '{--MAIL_ALREADY_CONFIRMED--} (1)
');
$mode = 'failed';
}
+ // Free result
+ SQL_FREERESULT($result_main);
+
// Insert footer if no image
if ($mode != 'img') {
// Write footer