Again some missing CSS classes added

[mailer.git] / mailid.php

diff --git a/mailid.php b/mailid.php
index c9a28889f1dab9bf4b8e557e47a8b4e6c6aabe3c..97f943890e53dc2699f34a4b03a805d07015891e 100644 (file)
--- a/mailid.php
+++ b/mailid.php
@@ -49,11 +49,8 @@ if (defined('mxchange_installed') && (isBooleanConstantAndTrue('mxchange_install
        // 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);
+       } // END - if
 
        // Init
        $url_uid = 0; $url_bid = 0; $url_mid = 0;
@@ -89,31 +86,38 @@ 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&msg=".CODE_EXTENSION_PROBLEM);
+                               } // 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);
                                SQL_FREERESULT($result);
 
                                // 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 +153,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
@@ -209,10 +216,5 @@ if (defined('mxchange_installed') && (isBooleanConstantAndTrue('mxchange_install
        LOAD_URL("install.php");
 }
 
-// Shutdown database link
-if (is_resource($link)) {
-       SQL_CLOSE($link, __FILE__, __LINE__);
-}
-
 //
 ?>