Surfbar continued and some rewrites/fixes:

[mailer.git] / mailid.php

diff --git a/mailid.php b/mailid.php
index 09b03ff3831477d70e5e0845e9e86e19c967a4be..fe2c59e7ab54ee16c4c52073eacb77fa80a43c6a 100644 (file)
--- a/mailid.php
+++ b/mailid.php
@@ -42,10 +42,9 @@ $GLOBALS['what'] = ""; $GLOBALS['action'] = "";
 $GLOBALS['module'] = "mailid"; $CSS = -1;
 
 // Load the required file(s)
-require ("inc/config.php");
+require("inc/config.php");
 
-if (isBooleanConstantAndTrue('mxchange_installed'))
-{
+if (isBooleanConstantAndTrue('mxchange_installed')) {
        // Is the extension active
        if (!EXT_IS_ACTIVE("mailid", true)) {
                // Is not activated/installed yet!
@@ -111,8 +110,13 @@ if (isBooleanConstantAndTrue('mxchange_installed'))
                        if (SQL_NUMROWS($result) == 1) {
                                // Load data
                                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, gender, surname, family FROM "._MYSQL_PREFIX."_user_data WHERE userid=%s LIMIT 1",
                                 array($url_uid), __FILE__, __LINE__);
@@ -206,6 +210,11 @@ if (isBooleanConstantAndTrue('mxchange_installed'))
                        case "REJECT": // Redirect to rejection page
                                LOAD_URL($_CONFIG['reject_url']);
                                break;
+
+                       default:
+                               DEBUG_LOG(__FILE__, __LINE__, sprintf("Unknown status %s detected in mailid_error_redirect.", $_CONFIG['mailid_error_redirect']));
+                               LOAD_URL("modules.php?module=index&msg=".CODE_UNKNOWN_STATUS."&ext=mailid");
+                               break;
                }
        } else {
                // Include footer