prefix now safely replaced

[mailer.git] / mailid.php

diff --git a/mailid.php b/mailid.php
index e6002741710f8754ef42212b11f27a81534d473b..0823734e6f2cc1ce85e1e9c996e5d2838db0c7a4 100644 (file)
--- a/mailid.php
+++ b/mailid.php
@@ -35,29 +35,27 @@
 require("inc/libs/security_functions.php");
 
 // Init "action" and "what"
-global $what, $action;
-$GLOBALS['what'] = ""; $GLOBALS['action'] = "";
+$GLOBALS['what'] = "";
+$GLOBALS['action'] = "";
 
 // Tell everyone we are in this module
-$GLOBALS['module'] = "mailid"; $CSS = -1;
+$GLOBALS['module'] = "mailid";
+$GLOBALS['output_mode'] = -1;
 
 // Load the required file(s)
 require("inc/config.php");
 
-if (isBooleanConstantAndTrue('mxchange_installed')) {
-       // Is the extension active
-       if (!EXT_IS_ACTIVE("mailid", true)) {
-               // Is not activated/installed yet!
-               LOAD_URL("modules.php?module=index&msg=".constant('CODE_EXTENSION_PROBLEM')."&ext=mailid");
-       } // END - if
+if (isInstalled()) {
+       // Is the extension active?
+       REDIRECT_ON_UNINSTALLED_EXTENSION("mailid");
 
        // Init
        $url_uid = 0; $url_bid = 0; $url_mid = 0;
 
        // Secure all data
-       if (!empty($_GET['uid']))     $url_uid = bigintval($_GET['uid']);
-       if (!empty($_GET['mailid']))  $url_mid = bigintval($_GET['mailid']);
-       if (!empty($_GET['bonusid'])) $url_bid = bigintval($_GET['bonusid']);
+       if (REQUEST_ISSET_GET(('uid')))     $url_uid = bigintval(REQUEST_GET('uid'));
+       if (REQUEST_ISSET_GET(('mailid')))  $url_mid = bigintval(REQUEST_GET('mailid'));
+       if (REQUEST_ISSET_GET(('bonusid'))) $url_bid = bigintval(REQUEST_GET('bonusid'));
 
        // 01        1        12            3    32           21    1                   22     10
        if (($url_uid) > 0 && (($url_mid > 0) || ($url_bid > 0)) && (getTotalFatalErrors() == 0)) {
@@ -94,10 +92,7 @@ if (isBooleanConstantAndTrue('mxchange_installed')) {
 
                        case "BONUS":
                                // Is the bonus extension active?
-                               if (!EXT_IS_ACTIVE("bonus")) {
-                                       // Abort here
-                                       LOAD_URL("modules.php?module=index&msg=".constant('CODE_EXTENSION_PROBLEM')."&ext=mailid");
-                               } // END - if
+                               REDIRECT_ON_UNINSTALLED_EXTENSION("bonus");
 
                                // Bonus-Mails
                                $result = SQL_QUERY_ESC("SELECT id, url, subject FROM `{!_MYSQL_PREFIX!}_bonus` WHERE id=%s LIMIT 1",