Surfbar now has admin menu (dummy extension!), menu system rebuilded for unique key...

[mailer.git] / inc / modules / admin / admin-inc.php

diff --git a/inc/modules/admin/admin-inc.php b/inc/modules/admin/admin-inc.php
index 2fc9b17210f64f4a2e8239b30a437c47fc30c500..a56c7a10f131cd5d7387b1ec97c0c73453b96966 100644 (file)
--- a/inc/modules/admin/admin-inc.php
+++ b/inc/modules/admin/admin-inc.php
@@ -300,7 +300,7 @@ function ADMIN_DO_ACTION($wht)
 
        // Check if action/what pair is valid
        $result = SQL_QUERY_ESC("SELECT id FROM "._MYSQL_PREFIX."_admin_menu
 
        // Check if action/what pair is valid
        $result = SQL_QUERY_ESC("SELECT id FROM "._MYSQL_PREFIX."_admin_menu

-WHERE action='%s' AND ((what='%s' AND what != 'overview') OR (what='' AND '%s'='overview'))
+WHERE action='%s' AND ((what='%s' AND what != 'overview') OR ((what='' OR what IS NULL) AND '%s'='overview'))

 LIMIT 1", array($act, $wht, $wht), __FILE__, __LINE__);
        if (SQL_NUMROWS($result) == 1)
        {
 LIMIT 1", array($act, $wht, $wht), __FILE__, __LINE__);
        if (SQL_NUMROWS($result) == 1)
        {


@@ -346,7 +346,7 @@ function ADD_ADMIN_MENU($act, $wht,$return=false)
        $menuTitle = array();
 
        // Build main menu
        $menuTitle = array();
 
        // Build main menu

-       $result_main = SQL_QUERY("SELECT action, title, descr FROM "._MYSQL_PREFIX."_admin_menu WHERE what='' ORDER BY sort, id DESC", __FILE__, __LINE__);
+       $result_main = SQL_QUERY("SELECT action, title, descr FROM "._MYSQL_PREFIX."_admin_menu WHERE (what='' OR what IS NULL) ORDER BY sort, id DESC", __FILE__, __LINE__);

        $OUT = "";
        if (SQL_NUMROWS($result_main) > 0)
        {
        $OUT = "";
        if (SQL_NUMROWS($result_main) > 0)
        {


@@ -522,7 +522,7 @@ function ADD_MEMBER_SELECTION_BOX($add_all = false, $return = false, $none = fal
 //
 function ADMIN_MENU_SELECTION($MODE, $default="", $defid="") {
        $wht = "what != ''";
 //
 function ADMIN_MENU_SELECTION($MODE, $default="", $defid="") {
        $wht = "what != ''";

-       if ($MODE == "action") $wht = "what='' AND action !='login'";
+       if ($MODE == "action") $wht = "(what='' OR what IS NULL) AND action !='login'";

        $result = SQL_QUERY_ESC("SELECT %s, title FROM "._MYSQL_PREFIX."_admin_menu WHERE ".$wht." ORDER BY sort",
         array($MODE), __FILE__, __LINE__);
        if (SQL_NUMROWS($result) > 0)
        $result = SQL_QUERY_ESC("SELECT %s, title FROM "._MYSQL_PREFIX."_admin_menu WHERE ".$wht." ORDER BY sort",
         array($MODE), __FILE__, __LINE__);
        if (SQL_NUMROWS($result) > 0)