Heavily rewritten API:

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

diff --git a/inc/mysql-manager.php b/inc/mysql-manager.php
index 4647c5a00f06e52214d44d34a71742ba287ec004..9d357e6dadcc14ddd7c92c97547e75994b5b96de 100644 (file)
--- a/inc/mysql-manager.php
+++ b/inc/mysql-manager.php
@@ -945,7 +945,7 @@ function GET_ACTION ($MODE, &$wht)
                // Get it directly from URL
                return $GLOBALS['action'];
        }
-       //* DEBUG: */ echo __LINE__."*".$ret."*<br />\n";
+       //* DEBUG: */ echo __FUNCTION__."(<font color=\"#0000aa\">".__LINE__."</font>): ret=".$ret."<br />\n";
 
        if (MODULE_HAS_MENU($MODE)) {
                // Rewriting modules to menu
@@ -959,7 +959,7 @@ function GET_ACTION ($MODE, &$wht)
 
                // Load from database
                $result = SQL_QUERY_ESC("SELECT action FROM "._MYSQL_PREFIX."_%s_menu WHERE what='%s' LIMIT 1",
-                array($MODE, $wht), __FILE__, __LINE__);
+                       array($MODE, $wht), __FILE__, __LINE__);
                if (SQL_NUMROWS($result) == 1) {
                        // Load action value and pray that this one is the right you want... ;-)
                        list($ret) = SQL_FETCHROW($result);
@@ -1700,7 +1700,7 @@ function ADD_JACKPOT($points) {
 
                // Update points
                $result = SQL_QUERY_ESC("UPDATE "._MYSQL_PREFIX."_jackpot SET points=points+%s WHERE ok='ok' LIMIT 1",
-                array($points), __FILE__, __LINE__);
+                       array($points), __FILE__, __LINE__);
        }
 }
 //
@@ -1792,8 +1792,9 @@ function GET_WHAT($modCheck) {
        // Return what value
        return $wht;
 }
-//
-function MODULE_HAS_MENU($mod, $forceDb = false) {
+
+// Checks if the module has a menu
+function MODULE_HAS_MENU ($mod, $forceDb = false) {
        global $cacheArray, $_CONFIG;
 
        // All is false by default
@@ -1809,12 +1810,18 @@ function MODULE_HAS_MENU($mod, $forceDb = false) {
                        // Check cache and count hit
                        $ret = ($cacheArray['extensions']['ext_menu'][$mod] == "Y");
                        if (isset($_CONFIG['cache_hits'])) { $_CONFIG['cache_hits']++; } else { $_CONFIG['cache_hits'] = 1; }
+               } elseif ((IS_ADMIN()) && ($mod == "admin")) {
+                       // Admin module has always a menu!
+                       $ret = true;
                }
        } elseif ((GET_EXT_VERSION("sql_patches") >= "0.3.6") && ((!EXT_IS_ACTIVE("cache")) || ($forceDb === true))) {
                // Check database for entry
                $result = SQL_QUERY_ESC("SELECT has_menu FROM "._MYSQL_PREFIX."_mod_reg WHERE module='%s' LIMIT 1",
-                array($mod), __FILE__, __LINE__);
+                       array($mod), __FILE__, __LINE__);
+
+               // Entry found?
                if (SQL_NUMROWS($result) == 1) {
+                       // Load "has_menu" column
                        list($has_menu) = SQL_FETCHROW($result);
 
                        // Fake cache... ;-)
@@ -1832,6 +1839,7 @@ function MODULE_HAS_MENU($mod, $forceDb = false) {
        }
 
        // Return status
+       //* DEBUG: */ var_dump($ret);
        return $ret;
 }