Mailer project rwritten:

[mailer.git] / mailid.php

diff --git a/mailid.php b/mailid.php
index fcf1e3beac9f0375ece5a96a985ade1fe4df60e3..6ca76095ad8eed7e5fd6384f8568fb7d2dd09f4e 100644 (file)
--- a/mailid.php
+++ b/mailid.php
@@ -39,7 +39,7 @@
 require('inc/libs/security_functions.php');
 
 // Init start time
-$GLOBALS['__start_time'] = microtime(true);
+$GLOBALS['__start_time'] = microtime(TRUE);
 
 // Tell everyone we are in this module
 $GLOBALS['__module']      = 'mailid';
@@ -47,7 +47,7 @@ $GLOBALS['__output_mode'] = '0';
 $errorCode = '';
 
 // This is a frameset module
-$GLOBALS['frameset_mode'] = true;
+$GLOBALS['frameset_mode'] = TRUE;
 
 // Disable copyright footer which would break the frameset
 $GLOBALS['__copyright_enabled'] = 'N';
@@ -72,19 +72,18 @@ if (isGetRequestElementSet('userid'))  $userId  = bigintval(getRequestElement('u
 if (isGetRequestElementSet('mailid'))  $mailId  = bigintval(getRequestElement('mailid'));
 if (isGetRequestElementSet('bonusid')) $bonusId = bigintval(getRequestElement('bonusid'));
 
-// 01           1        12            2    2            21    1                      2210
-if ((isValidUserId($userId)) && (($mailId > 0) || ($bonusId > 0)) && (!ifFatalErrorsDetected())) {
+if ((isValidId($userId)) && ((isValidId($mailId)) || (isValidId($bonusId))) && (!ifFatalErrorsDetected())) {
        // Init result
-       $result_link = false;
+       $result_link = FALSE;
 
        // Maybe he wants to confirm an email?
-       if ($mailId > 0) {
+       if (isValidId($mailId)) {
                // Member mail
                $result_link = SQL_QUERY_ESC("SELECT `link_type` FROM `{?_MYSQL_PREFIX?}_user_links` WHERE `stats_id`=%s AND `userid`=%s LIMIT 1",
                        array($mailId, $userId), __FILE__, __LINE__);
                $type = 'mailid';
                $urlId = $mailId;
-       } elseif ($bonusId > 0) {
+       } elseif (isValidId($bonusId)) {
                // Bonus mail
                $result_link = SQL_QUERY_ESC("SELECT `link_type` FROM `{?_MYSQL_PREFIX?}_user_links` WHERE `bonus_id`=%s AND `userid`=%s LIMIT 1",
                        array($bonusId, $userId), __FILE__, __LINE__);
@@ -112,7 +111,7 @@ if ((isValidUserId($userId)) && (($mailId > 0) || ($bonusId > 0)) && (!ifFatalEr
                                redirectOnUninstalledExtension('bonus');
 
                                // Bonus-Mails
-                               $result = SQL_QUERY_ESC("SELECT `id`, `url`, `subject` FROM `{?_MYSQL_PREFIX?}_bonus` WHERE `id`=%s LIMIT 1",
+                               $result = SQL_QUERY_ESC("SELECT `id` AS `pool_id`, `url`, `subject` FROM `{?_MYSQL_PREFIX?}_bonus` WHERE `id`=%s LIMIT 1",
                                        array($bonusId), __FILE__, __LINE__);
                                break;
 
@@ -151,7 +150,7 @@ if ((isValidUserId($userId)) && (($mailId > 0) || ($bonusId > 0)) && (!ifFatalEr
                                                                list($pay) = SQL_FETCHROW($result);
                                                                $time      = getPaymentData($pay, 'time');
                                                                $payment   = getPaymentData($pay, 'payment');
-                                                               $isValid   = true;
+                                                               $isValid   = TRUE;
                                                        } // END - if
 
                                                        // Free memory
@@ -164,7 +163,7 @@ if ((isValidUserId($userId)) && (($mailId > 0) || ($bonusId > 0)) && (!ifFatalEr
                                                        if (SQL_NUMROWS($result) == 1) {
                                                                list($points, $time) = SQL_FETCHROW($result);
                                                                $payment = '0.00000';
-                                                               $isValid = true;
+                                                               $isValid = TRUE;
                                                        } // END - if
 
                                                        // Free memory
@@ -174,16 +173,16 @@ if ((isValidUserId($userId)) && (($mailId > 0) || ($bonusId > 0)) && (!ifFatalEr
                                                default: // Invalid mail type
                                                        reportBug(__FILE__, __LINE__, 'Invalid mail type ' . $ltype . ' detected.');
                                                        break;
-                                       }
+                                       } // END - switch
 
                                        // Add header
                                        loadIncludeOnce('inc/header.php');
 
                                        // Was that mail a valid one?
-                                       if ($isValid === true) {
+                                       if ($isValid === TRUE) {
                                                // If time is zero seconds we have a sponsor mail. 1 Second shall be set to avoid problems
-                                               if (($time == '0') && ($payment > 0)) { 
-                                                       $url = getUrl();
+                                               if (($time == '0') && ($payment > 0)) {
+                                                       $url  = getUrl();
                                                        $time = 1; 
                                                } // END - if
 
@@ -200,7 +199,7 @@ if ((isValidUserId($userId)) && (($mailId > 0) || ($bonusId > 0)) && (!ifFatalEr
                                                        );
 
                                                        // Load template
-                                                       loadTemplate('mailid_frames', false, $content);
+                                                       loadTemplate('mailid_frames', FALSE, $content);
                                                } else {
                                                        $errorCode = getCode('DATA_INVALID');
                                                }