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

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

diff --git a/inc/modules/admin/what-memedit.php b/inc/modules/admin/what-memedit.php
index ed7673bb21c052734736ab2fa2590d912914b8ef..d240fc7d6349596bb412307850310f1f7cbeebcd 100644 (file)
--- a/inc/modules/admin/what-memedit.php
+++ b/inc/modules/admin/what-memedit.php
@@ -41,7 +41,7 @@ if ((ereg(basename(__FILE__), $_SERVER['PHP_SELF'])) || (!IS_ADMIN()))
 ADD_DESCR("admin", basename(__FILE__));
 
 // Do we edit/delete/change main menus or sub menus?
-$AND = "what=''"; $SUB = "";
+$AND = "what = ''"; $SUB = "";
 
 if (!empty($_GET['sub']))
 {
@@ -55,7 +55,7 @@ if (!empty($_POST['sel'])) $chk = SELECTION_COUNT($_POST['sel']);
 
 OPEN_TABLE("100%", "admin_content admin_content_align", "");
 // List all menu points and make them editable
-OUTPUT_HTML ("<BR><BR></FONT>
+OUTPUT_HTML("<br /><br /></FONT>
 <DIV align=\"center\">");
 if ((isset($_POST['edit'])) && ($chk > 0) && (!IS_DEMO()))
 {
@@ -198,7 +198,7 @@ if ((isset($_POST['edit'])) && ($chk > 0) && (!IS_DEMO()))
        // An act is done...
        foreach ($_POST['sel'] as $sel=>$menu)
        {
-               $AND = "what=''";
+               $AND = "what = ''";
                $sel = bigintval($sel);
                if (!empty($SUB)) $AND = "action='".$SUB."'";
                switch ($_POST['ok'])
@@ -244,10 +244,10 @@ if ((isset($_POST['edit'])) && ($chk > 0) && (!IS_DEMO()))
                 else
                {
                        // Main menu selected
-                       $result = SQL_QUERY_ESC("SELECT id FROM "._MYSQL_PREFIX."_member_menu WHERE what='' AND sort='%s' LIMIT 1",
+                       $result = SQL_QUERY_ESC("SELECT id FROM "._MYSQL_PREFIX."_member_menu WHERE (what='' OR what IS NULL) AND sort='%s' LIMIT 1",
                         array(bigintval($_GET['tid'])), __FILE__, __LINE__);
                        list($tid) = SQL_FETCHROW($result);
-                       $result = SQL_QUERY_ESC("SELECT id FROM "._MYSQL_PREFIX."_member_menu WHERE what='' AND sort='%s' LIMIT 1",
+                       $result = SQL_QUERY_ESC("SELECT id FROM "._MYSQL_PREFIX."_member_menu WHERE (what='' OR what IS NULL) AND sort='%s' LIMIT 1",
                         array(bigintval($_GET['fid'])), __FILE__, __LINE__);
                        list($fid) = SQL_FETCHROW($result);
                }
@@ -270,7 +270,7 @@ if ((isset($_POST['edit'])) && ($chk > 0) && (!IS_DEMO()))
         else
        {
                // Edit main menus
-               $result = SQL_QUERY("SELECT id, action, what, title, sort FROM "._MYSQL_PREFIX."_member_menu WHERE what='' ORDER BY sort ASC", __FILE__, __LINE__);
+               $result = SQL_QUERY("SELECT id, action, what, title, sort FROM "._MYSQL_PREFIX."_member_menu WHERE (what='' OR what IS NULL) ORDER BY sort ASC", __FILE__, __LINE__);
        }
        $max = SQL_NUMROWS($result);
        if ($max > 0)
@@ -325,7 +325,7 @@ if ((isset($_POST['edit'])) && ($chk > 0) && (!IS_DEMO()))
                LOAD_TEMPLATE("admin_settings_saved", false, ADMIN_NO_MENUS_FOUND);
        }
 }
-OUTPUT_HTML ("</DIV>");
+OUTPUT_HTML("</DIV>");
 CLOSE_TABLE();
 //
 ?>