Mail confirmation frameset now shows subject line as extra browser title

diff --git a/inc/databases.php b/inc/databases.php
index a1c05443618efeef8e188f4099056e78d8f50bc7..7db0047ad7454d6f0ee0cd392dbde8072abc698f 100644 (file)
--- a/inc/databases.php
+++ b/inc/databases.php
@@ -114,7 +114,7 @@ define('USAGE_BASE', "usage");
 define('SERVER_URL', "http://www.mxchange.org");
 
 // This current patch level
-define('CURR_SVN_REVISION', "314");
+define('CURR_SVN_REVISION', "315");
 
 // Take a prime number which is long (if you know a longer one please try it out!)
 define('_PRIME', 591623);

diff --git a/inc/header.php b/inc/header.php
index ce152eaad04333294e4453eb6674f5563558365b..b64cebb75e38e33240eca0ddff17c25d259a1e9d 100644 (file)
--- a/inc/header.php
+++ b/inc/header.php
@@ -54,6 +54,14 @@ if (($header != "1") && ($header != "2")) {
                        if ((isset($_CONFIG)) && (is_array($_CONFIG)) && (count($_CONFIG) > 1) && (is_resource($link)) && (isset($db))) {
                                // Title decoration enabled?
                                if (($_CONFIG['enable_title_deco'] == "Y") && (!empty($_CONFIG['title_left']))) $TITLE .= trim($_CONFIG['title_left'])." ";
+
+                               // Do we have some extra title?
+                               if (!empty($EXTRA_TITLE)) {
+                                       // Then prepent it
+                                       $TITLE .= $EXTRA_TITLE." by ";
+                               } // END - if
+
+                               // Add main title
                                $TITLE .= MAIN_TITLE;
 
                                // Add title of module? (middle decoration will also be added!)

diff --git a/mailid.php b/mailid.php
index 93def066643699a349048f69eaeebdb894aff149..027898174b21f05a2f4dc0a3b4f71f54419d7ef5 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,24 +86,31 @@ 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?
@@ -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