Status code added

[mailer.git] / mailid.php

diff --git a/mailid.php b/mailid.php
index a573a245ff2cb018b2cf62dd7b51a8a55e9cd8ab..9ee907a62c7f07f26199305e0dfc274a85ad12b0 100644 (file)
--- a/mailid.php
+++ b/mailid.php
@@ -97,7 +97,7 @@ if (($url_userid) > 0 && (($url_mid > 0) || ($url_bid > 0)) && (getTotalFatalErr
                        case 'NORMAL':
                                // Is the stats ID valid?
                                $result = SQL_QUERY_ESC("SELECT pool_id, url, subject FROM `{?_MYSQL_PREFIX?}_user_stats` WHERE `id`=%s LIMIT 1",
-                               array($url_mid), __FILE__, __LINE__);
+                                       array($url_mid), __FILE__, __LINE__);
                                break;
 
                        case 'BONUS':
@@ -106,7 +106,7 @@ if (($url_userid) > 0 && (($url_mid > 0) || ($url_bid > 0)) && (getTotalFatalErr
 
                                // Bonus-Mails
                                $result = SQL_QUERY_ESC("SELECT id, url, subject FROM `{?_MYSQL_PREFIX?}_bonus` WHERE `id`=%s LIMIT 1",
-                               array($url_bid), __FILE__, __LINE__);
+                                       array($url_bid), __FILE__, __LINE__);
                                break;
 
                        default: // Invalid mail type
@@ -125,7 +125,7 @@ if (($url_userid) > 0 && (($url_mid > 0) || ($url_bid > 0)) && (getTotalFatalErr
                        setExtraTitle($title);
 
                        // Is the user's ID unlocked?
-                       $result = SQL_QUERY_ESC("SELECT `status`, `gender`, `surname`,` family` FROM `{?_MYSQL_PREFIX?}_user_data` WHERE `userid`=%s LIMIT 1",
+                       $result = SQL_QUERY_ESC("SELECT `status`, `gender`, `surname`, `family` FROM `{?_MYSQL_PREFIX?}_user_data` WHERE `userid`=%s LIMIT 1",
                                array($url_userid), __FILE__, __LINE__);
                        if (SQL_NUMROWS($result) == 1) {
                                list($status, $gender, $surname, $family) = SQL_FETCHROW($result);
@@ -133,10 +133,9 @@ if (($url_userid) > 0 && (($url_mid > 0) || ($url_bid > 0)) && (getTotalFatalErr
                                if ($status == 'CONFIRMED') {
                                        // User has confirmed his account so we can procede...
                                        // @TODO Rewrite this to a filter
-                                       switch ($ltype)
-                                       {
+                                       switch ($ltype) {
                                                case 'NORMAL':
-                                                       $result = SQL_QUERY_ESC("SELECT payment_id FROM `{?_MYSQL_PREFIX?}_user_stats` WHERE pool_id=%s LIMIT 1",
+                                                       $result = SQL_QUERY_ESC("SELECT payment_id FROM `{?_MYSQL_PREFIX?}_user_stats` WHERE `pool_id`=%s LIMIT 1",
                                                                array(bigintval($pool)), __FILE__, __LINE__);
                                                        if (SQL_NUMROWS($result) == 1) {
                                                                list($pay) = SQL_FETCHROW($result);
@@ -173,7 +172,7 @@ if (($url_userid) > 0 && (($url_mid > 0) || ($url_bid > 0)) && (getTotalFatalErr
                                        // Was that mail a valid one?
                                        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 = getConfig('URL'); $time = '1'; }
+                                               if (($time == 0) && ($payment > 0)) { $URL = getConfig('URL'); $time = 1; }
                                                if (($time > 0) && (($payment > 0) || ($points > 0))) {
                                                        // Export data into constants for the template
                                                        $content = array(
@@ -184,7 +183,7 @@ if (($url_userid) > 0 && (($url_mid > 0) || ($url_bid > 0)) && (getTotalFatalErr
                                                        );
 
                                                        // Load template
-                                                       loadTemplate('mailid_frames');
+                                                       loadTemplate('mailid_frames', false, $content);
                                                } else {
                                                        $errorCode = getCode('DATA_INVALID');
                                                }
@@ -192,7 +191,7 @@ if (($url_userid) > 0 && (($url_mid > 0) || ($url_bid > 0)) && (getTotalFatalErr
                                                $errorCode = getCode('POSSIBLE_INVALID');
                                        }
                                } else {
-                                       $errorCode = getCode('ACCOUNT_LOCKED');
+                                       $errorCode = getCode('ACCOUNT_' . $status);
                                }
                        } else {
                                SQL_FREERESULT($result);