More fixes for what/action deprecation in modules.php

[mailer.git] / inc / mysql-manager.php

diff --git a/inc/mysql-manager.php b/inc/mysql-manager.php
index 2b93a5cbf0def4dfd2cde1c6b56997691c0da71b..1c0185e5208437b16bb785f9fb75388587382cc3 100644 (file)
--- a/inc/mysql-manager.php
+++ b/inc/mysql-manager.php
@@ -883,7 +883,10 @@ function GET_ACTION ($MODE, &$wht) {
 
        if ($MODE == "admin") {
                // Action value for admin area
-               if (!empty($GLOBALS['action'])) {
+               if (REQUEST_ISSET_GET('action')) {
+                       // Use from request!
+                       return REQUEST_GET('action');
+               } elseif (!empty($GLOBALS['action'])) {
                        // Get it directly from URL
                        return $GLOBALS['action'];
                } elseif (($wht == "overview") || (empty($GLOBALS['what']))) {
@@ -1660,7 +1663,13 @@ function LOAD_CONFIG ($no="0") {
        return $CFG_DUMMY;
 }
 // Gets the matching what name from module
-function GET_WHAT($modCheck) {
+function GET_WHAT ($modCheck) {
+       // Is the request element set?
+       if (REQUEST_ISSET_GET('what')) {
+               // Then return this!
+               return REQUEST_GET('what');
+       } // END - if
+
        $wht = "";
        //* DEBUG: */ echo __LINE__."!".$modCheck."!<br />\n";
        switch ($modCheck)