config.php partly solved, see #117

[mailer.git] / mailid.php

diff --git a/mailid.php b/mailid.php
index de8018f6bca925c267dcbb8204e140b0f334fd4e..b08e29be383a28fbf8ecaa9270a371c5168be1cf 100644 (file)
--- a/mailid.php
+++ b/mailid.php
@@ -48,11 +48,11 @@ $GLOBALS['module'] = 'mailid';
 $GLOBALS['output_mode'] = -1;
 
 // Load the required file(s)
-require('inc/config.php');
+require('inc/config-global.php');
 
 if (isInstalled()) {
        // Is the extension active?
-       REDIRECT_ON_UNINSTALLED_EXTENSION('mailid');
+       redirectOnUninstalledExtension('mailid');
 
        // Init
        $url_uid = 0; $url_bid = 0; $url_mid = 0;
@@ -97,7 +97,7 @@ if (isInstalled()) {
 
                        case 'BONUS':
                                // Is the bonus extension active?
-                               REDIRECT_ON_UNINSTALLED_EXTENSION('bonus');
+                               redirectOnUninstalledExtension('bonus');
 
                                // Bonus-Mails
                                $result = SQL_QUERY_ESC("SELECT id, url, subject FROM `{!_MYSQL_PREFIX!}_bonus` WHERE `id`=%s LIMIT 1",
@@ -107,13 +107,16 @@ if (isInstalled()) {
 
                        if (SQL_NUMROWS($result) == 1) {
                                // Load data
-                               list($pool, $URL, $EXTRA_TITLE) = SQL_FETCHROW($result);
+                               list($pool, $URL, $title) = SQL_FETCHROW($result);
 
                                // Free result
                                SQL_FREERESULT($result);
 
                                // Compile extra title
-                               $EXTRA_TITLE = COMPILE_CODE($EXTRA_TITLE);
+                               $title = COMPILE_CODE($title);
+
+                               // Set it
+                               setExtraTitle($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",
@@ -204,7 +207,7 @@ if (isInstalled()) {
                                break;
 
                        case 'REJECT': // Redirect to rejection page
-                               LOAD_CONFIGURED_URL('reject_url');
+                               redirectToConfiguredUrl('reject_url');
                                break;
 
                        default: