Some improvements

[mailer.git] / mailid_top.php

diff --git a/mailid_top.php b/mailid_top.php
index e60943d5b44768fbe44b1334912bfeda952ff475..0209f2e52cdc6d4f56dcf5972d6d245aa3c2c56e 100644 (file)
--- a/mailid_top.php
+++ b/mailid_top.php
@@ -44,7 +44,7 @@ $GLOBALS['startTime'] = microtime(true);
 
 // Tell everyone we are in this module
 $GLOBALS['module'] = 'mailid';
-$GLOBALS['output_mode'] = 0;
+$GLOBALS['output_mode'] = -1;
 
 // Load the required file(s)
 require('inc/config-global.php');
@@ -52,23 +52,27 @@ require('inc/config-global.php');
 // Set content type
 setContentType('text/html');
 
-// Is the extension active
+// Is the extension mailid active?
 redirectOnUninstalledExtension('mailid');
 
-// Secure all data
+// Is the extension other active?
+redirectOnUninstalledExtension('other');
+
+// Init variables
 $url_userid = 0;
 $url_bid = 0;
 $url_mid = 0;
 $code = 0;
 $mode = '';
 
+// Secure all data
 if (isGetRequestElementSet('userid'))  $url_userid = bigintval(getRequestElement('userid'));
 if (isGetRequestElementSet('mailid'))  $url_mid    = bigintval(getRequestElement('mailid'));
 if (isGetRequestElementSet('bonusid')) $url_bid    = bigintval(getRequestElement('bonusid'));
 if (isGetRequestElementSet('code'))    $code       = bigintval(getRequestElement('code'));
 if (isGetRequestElementSet('mode'))    $mode       = getRequestElement('mode');
 
-// 01        1        12            2    2            21    1                   22     10
+// 01           1        12            2    2            21    1                   22     10
 if (($url_userid) > 0 && (($url_mid > 0) || ($url_bid > 0)) && (getTotalFatalErrors() == 0)) {
        // No image? Then output header
        if ($mode != 'img') loadIncludeOnce('inc/header.php');
@@ -79,7 +83,7 @@ if (($url_userid) > 0 && (($url_mid > 0) || ($url_bid > 0)) && (getTotalFatalErr
                        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 = 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;
        }
@@ -89,6 +93,9 @@ if (($url_userid) > 0 && (($url_mid > 0) || ($url_bid > 0)) && (getTotalFatalErr
                list($lid, $ltype) = SQL_FETCHROW($result);
                SQL_FREERESULT($result);
 
+               // Init result here with invalid to avoid possible missing variable
+               $result_mailid = false;
+
                // @TODO Rewrite this to a filter
                switch ($ltype) {
                        case 'NORMAL':
@@ -97,7 +104,7 @@ if (($url_userid) > 0 && (($url_mid > 0) || ($url_bid > 0)) && (getTotalFatalErr
                                break;
 
                        case 'BONUS':
-                               $result_mailid = SQL_QUERY_ESC("SELECT `id, `id`, `is_notify` FROM `{?_MYSQL_PREFIX?}_bonus` WHERE `id`=%s LIMIT 1",
+                               $result_mailid = SQL_QUERY_ESC("SELECT `id`, `id`, `is_notify` FROM `{?_MYSQL_PREFIX?}_bonus` WHERE `id`=%s LIMIT 1",
                                        array($url_bid), __FILE__, __LINE__);
                                break;
 
@@ -171,7 +178,7 @@ if (($url_userid) > 0 && (($url_mid > 0) || ($url_bid > 0)) && (getTotalFatalErr
 
                                        // Is this entry valid?
                                        if ($isValid === true) {
-                                               if (($time == '0') && ($payment > 0)) $time = '1';
+                                               if (($time == 0) && ($payment > 0)) $time = 1;
                                                if (($time > 0) && ($payment > 0)) {
                                                        $img_code = 0;
                                                        if (!empty($code)) {
@@ -259,7 +266,7 @@ if (($url_userid) > 0 && (($url_mid > 0) || ($url_bid > 0)) && (getTotalFatalErr
                                                                                // Add points
                                                                                // @TODO Try to rewrite the following unset()
                                                                                unset($GLOBALS['ref_level']);
-                                                                               addPointsThroughReferalSystem('mailid_okay', $url_userid, $payment, false, '0', $locked);
+                                                                               addPointsThroughReferalSystem('mailid_okay', $url_userid, $payment, false, 0, $locked);
 
                                                                                // Shall I add bonus points for "turbo clickers" ?
                                                                                if (getExtensionVersion('bonus') >= '0.2.2') {