Several bugfixes/improvements: (again)

[mailer.git] / mailid.php

diff --git a/mailid.php b/mailid.php
index 746217aa62b50c21fe68ea0c6e3818398dc56d4e..523d319c1969087c59416f97595aa4eb39b04a2b 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,10 +110,15 @@ 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",
+                               $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, $gender, $sname, $fname) = SQL_FETCHROW($result);
@@ -198,16 +202,17 @@ if (isBooleanConstantAndTrue('mxchange_installed'))
 
        // 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."&ext=mailid");
                                break;
 
                        case "REJECT": // Redirect to rejection page
-                               LOAD_URL($_CONFIG['reject_url']);
+                               LOAD_URL(getConfig('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&msg=".CODE_UNKNOWN_STATUS."&ext=mailid");
                                break;
                }