- Surfbar further extended, currently broken!

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

diff --git a/inc/modules/admin/what-guestedit.php b/inc/modules/admin/what-guestedit.php
index 72736ee6265e96dd8b9fc7a5056d82dbf3c50408..b7ee2ea99a71f0ecc50dbd00f3c40558318889cf 100644 (file)
--- a/inc/modules/admin/what-guestedit.php
+++ b/inc/modules/admin/what-guestedit.php
@@ -32,19 +32,18 @@
  ************************************************************************/
 
 // Some security stuff...
-if ((ereg(basename(__FILE__), $_SERVER['PHP_SELF'])) || (!IS_ADMIN()))
-{
+if ((!defined('__SECURITY')) || (!IS_ADMIN())) {
        $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php";
        require($INC);
 }
+
 // Add description as navigation point
 ADD_DESCR("admin", basename(__FILE__));
 
 // Do we edit/delete/change main menus or sub menus?
 $AND = "what = ''"; $SUB = "";
 
-if (!empty($_GET['sub']))
-{
+if (!empty($_GET['sub'])) {
        $AND = sprintf("action='%s'", SQL_ESCAPE($_GET['sub']));
        $SUB = SQL_ESCAPE($_GET['sub']);
 }
@@ -53,10 +52,7 @@ if (!empty($_GET['sub']))
 $chk = 0;
 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>
-<DIV align=\"center\">");
 if ((isset($_POST['edit'])) && ($chk > 0) && (!IS_DEMO()))
 {
        // Edit menu entries
@@ -64,7 +60,7 @@ if ((isset($_POST['edit'])) && ($chk > 0) && (!IS_DEMO()))
        define('__CHK_VALUE', $chk);
 
        $cnt = 0; $SW = 2; $OUT = "";
-       foreach ($_POST['sel'] as $sel=>$confirm)
+       foreach ($_POST['sel'] as $sel => $confirm)
        {
                if ($confirm == 1)
                {
@@ -111,7 +107,7 @@ if ((isset($_POST['edit'])) && ($chk > 0) && (!IS_DEMO()))
        define('__CHK_VALUE', $chk);
 
        $cnt = 0; $OUT = ""; $SW = 2;
-       foreach ($_POST['sel'] as $sel=>$confirm)
+       foreach ($_POST['sel'] as $sel => $confirm)
        {
                if ($confirm == 1)
                {
@@ -155,7 +151,7 @@ if ((isset($_POST['edit'])) && ($chk > 0) && (!IS_DEMO()))
        switch ($_POST['ok'])
        {
        case "edit": // Edit menu
-               foreach ($_POST['sel'] as $sel=>$menu)
+               foreach ($_POST['sel'] as $sel => $menu)
                {
                        // Secure selector
                        $sel = bigintval($sel);
@@ -168,7 +164,7 @@ if ((isset($_POST['edit'])) && ($chk > 0) && (!IS_DEMO()))
                break;
 
        case "del": // Delete menu
-               foreach ($_POST['sel'] as $sel=>$menu)
+               foreach ($_POST['sel'] as $sel => $menu)
                {
                        // Delete enty
                        $query = SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM "._MYSQL_PREFIX."_guest_menu WHERE ".$AND." AND id=%s LIMIT 1",
@@ -178,7 +174,7 @@ if ((isset($_POST['edit'])) && ($chk > 0) && (!IS_DEMO()))
                break;
 
        case "status": // Change access levels
-               foreach ($_POST['sel'] as $sel=>$menu)
+               foreach ($_POST['sel'] as $sel => $menu)
                {
                        // Secure selector
                        $sel = bigintval($sel);
@@ -204,7 +200,7 @@ if ((isset($_POST['edit'])) && ($chk > 0) && (!IS_DEMO()))
 
        // Load template
        $SW = 2; $cnt = 0; $OUT = "";
-       foreach ($_POST['sel'] as $sel=>$confirm)
+       foreach ($_POST['sel'] as $sel => $confirm)
        {
                if ($confirm == 1)
                {
@@ -295,7 +291,7 @@ if ((isset($_POST['edit'])) && ($chk > 0) && (!IS_DEMO()))
         else
        {
                // List sub menus
-               $query = SQL_QUERY_ESC("SELECT id, action, what, title, sort FROM "._MYSQL_PREFIX."_guest_menu WHERE action='%s' AND what != '' ORDER BY sort ASC",
+               $query = SQL_QUERY_ESC("SELECT id, action, what, title, sort FROM "._MYSQL_PREFIX."_guest_menu WHERE action='%s' AND what != '' AND what IS NOT NULL ORDER BY sort ASC",
                 array($SUB), __FILE__, __LINE__);
        }
 
@@ -363,7 +359,6 @@ if ((isset($_POST['edit'])) && ($chk > 0) && (!IS_DEMO()))
                LOAD_TEMPLATE("admin_settings_saved", false, ADMIN_NO_MENUS_FOUND);
        }
 }
-OUTPUT_HTML("</DIV>");
-CLOSE_TABLE();
+
 //
 ?>