Some typos fixed

[mailer.git] / mailid.php

diff --git a/mailid.php b/mailid.php
index c9a28889f1dab9bf4b8e557e47a8b4e6c6aabe3c..3fb1eaafab8b25fef84e5b702206972939a6853e 100644 (file)
--- a/mailid.php
+++ b/mailid.php
@@ -42,18 +42,14 @@ $GLOBALS['what'] = ""; $GLOBALS['action'] = "";
 $GLOBALS['module'] = "mailid"; $CSS = -1;
 
 // Load the required file(s)
-require ("inc/config.php");
+require("inc/config.php");
 
-if (defined('mxchange_installed') && (isBooleanConstantAndTrue('mxchange_installed')))
-{
+if (isBooleanConstantAndTrue('mxchange_installed')) {
        // Is the extension active
        if (!EXT_IS_ACTIVE("mailid", true)) {
                // Is not activated/installed yet!
-               ADD_FATAL(sprintf(EXTENSION_PROBLEM_NOT_INSTALLED, "mailid"));
-       }
-
-       // Add header
-       require_once(PATH."inc/header.php");
+               LOAD_URL("modules.php?module=index&msg=".CODE_EXTENSION_PROBLEM."&ext=mailid");
+       } // END - if
 
        // Init
        $url_uid = 0; $url_bid = 0; $url_mid = 0;
@@ -63,10 +59,8 @@ if (defined('mxchange_installed') && (isBooleanConstantAndTrue('mxchange_install
        if (!empty($_GET['mailid']))  $url_mid = bigintval($_GET['mailid']);
        if (!empty($_GET['bonusid'])) $url_bid = bigintval($_GET['bonusid']);
 
-       //* DEBUG: */ die("*".$url_uid."/".$url_bid."/".$url_mid."*<pre>".print_r($FATAL, true)."</pre>");
-
-       // 01        1        12            3    32           21    1     2      2     10
-       if (($url_uid) > 0 && (($url_mid > 0) || ($url_bid > 0)) && (count($FATAL) == 0)) {
+       // 01        1        12            3    32           21    1                   22     10
+       if (($url_uid) > 0 && (($url_mid > 0) || ($url_bid > 0)) && (getTotalFatalErrors() == 0)) {
                // Maybe he wants to confirm an email?
                if ($url_mid > 0) {
                        // Normal-Mails
@@ -89,31 +83,43 @@ if (defined('mxchange_installed') && (isBooleanConstantAndTrue('mxchange_install
 
                        // Clean result
                        SQL_FREERESULT($result);
+
                        switch ($ltype)
                        {
                        case "NORMAL":
                                // Is the stats ID valid?
-                               $result = SQL_QUERY_ESC("SELECT pool_id, url FROM "._MYSQL_PREFIX."_user_stats WHERE id=%s LIMIT 1",
+                               $result = SQL_QUERY_ESC("SELECT pool_id, url, subject FROM "._MYSQL_PREFIX."_user_stats WHERE id=%s LIMIT 1",
                                 array($url_mid), __FILE__, __LINE__);
                                break;
 
                        case "BONUS":
+                               // Is the bonus extension active?
+                               if (!EXT_IS_ACTIVE("bonus")) {
+                                       // Abort here
+                                       LOAD_URL("modules.php?module=index&amp;msg=".CODE_EXTENSION_PROBLEM."&amp;ext=mailid");
+                               } // END - if
+
                                // Bonus-Mails
-                               $result = SQL_QUERY_ESC("SELECT id, url FROM "._MYSQL_PREFIX."_bonus WHERE id=%s LIMIT 1",
+                               $result = SQL_QUERY_ESC("SELECT id, url, subject FROM "._MYSQL_PREFIX."_bonus WHERE id=%s LIMIT 1",
                                 array($url_bid), __FILE__, __LINE__);
                                break;
                        }
 
                        if (SQL_NUMROWS($result) == 1) {
                                // Load data
-                               list($pool, $URL) = SQL_FETCHROW($result);
+                               list($pool, $URL, $EXTRA_TITLE) = SQL_FETCHROW($result);
+
+                               // Free result
                                SQL_FREERESULT($result);
 
+                               // Compile extra title
+                               $EXTRA_TITLE = COMPILE_CODE($EXTRA_TITLE);
+
                                // Is the user's ID unlocked?
-                               $result = SQL_QUERY_ESC("SELECT status, sex, 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_uid), __FILE__, __LINE__);
                                if (SQL_NUMROWS($result) == 1) {
-                                       list($status, $sex, $sname, $fname) = SQL_FETCHROW($result);
+                                       list($status, $gender, $sname, $fname) = SQL_FETCHROW($result);
                                        SQL_FREERESULT($result);
                                        if ($status == "CONFIRMED") {
                                                // User has confirmed his account so we can procede...
@@ -149,6 +155,9 @@ if (defined('mxchange_installed') && (isBooleanConstantAndTrue('mxchange_install
                                                        break;
                                                }
 
+                                               // Add header
+                                               require_once(PATH."inc/header.php");
+
                                                // Was that mail a valid one?
                                                if ($VALID) {
                                                        // If time is zero seconds we have a sponsor mail. 1 Second shall be set to avoid problems
@@ -191,13 +200,18 @@ if (defined('mxchange_installed') && (isBooleanConstantAndTrue('mxchange_install
 
        // Error code is set?
        if (!empty($msg)) {
-               switch ($_CONFIG['mailid_error_redirect']) {
+               switch (getConfig('mailid_error_redirect')) {
                        case "INDEX": // Redirect to index page
-                               LOAD_URL("modules.php?module=index&msg=".$msg);
+                               LOAD_URL("modules.php?module=index&amp;msg=".$msg."&amp;ext=mailid");
                                break;
 
                        case "REJECT": // Redirect to rejection page
-                               LOAD_URL($_CONFIG['reject_url']);
+                               LOAD_CONFIGURED_URL('reject_url');
+                               break;
+
+                       default:
+                               DEBUG_LOG(__FILE__, __LINE__, sprintf("Unknown status %s detected in mailid_error_redirect.", getConfig('mailid_error_redirect')));
+                               LOAD_URL("modules.php?module=index&amp;msg=".CODE_UNKNOWN_STATUS."&amp;ext=mailid");
                                break;
                }
        } else {
@@ -205,14 +219,9 @@ if (defined('mxchange_installed') && (isBooleanConstantAndTrue('mxchange_install
                require_once(PATH."inc/footer.php");
        }
 } else {
-       // You have to configure first!
+       // You have to install first!
        LOAD_URL("install.php");
 }
 
-// Shutdown database link
-if (is_resource($link)) {
-       SQL_CLOSE($link, __FILE__, __LINE__);
-}
-
 //
 ?>