Extension 'yoomedia' now alpha status, some rewrites

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

diff --git a/inc/modules/admin/what-adminedit.php b/inc/modules/admin/what-adminedit.php
index 9ad293ca6586f44a19147ac03acc42c262d6e330..f30250d1d5db7699ce50169397b63af76f72605f 100644 (file)
--- a/inc/modules/admin/what-adminedit.php
+++ b/inc/modules/admin/what-adminedit.php
@@ -32,16 +32,16 @@
  ************************************************************************/
 
 // 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__));
+ADD_DESCR("admin", __FILE__);
 
 // Do we edit/delete/change main menus or sub menus?
-$AND = "what = ''"; $SUB = "";
+$AND = "(what = '' OR what IS NULL)"; $SUB = "";
 if (!empty($_GET['sub']))
 {
        $AND = sprintf("action='%s'", SQL_ESCAPE($_GET['sub']));
@@ -58,7 +58,7 @@ if ((isset($_POST['edit'])) && ($chk > 0) && (!IS_DEMO())) {
        define('__SUB_VALUE', $SUB);
        define('__CHK_VALUE', $chk);
        $cnt = 0; $SW = 2;
-       foreach ($_POST['sel'] as $sel=>$confirm)
+       foreach ($_POST['sel'] as $sel => $confirm)
        {
                if ($confirm == 1)
                {
@@ -107,7 +107,7 @@ if ((isset($_POST['edit'])) && ($chk > 0) && (!IS_DEMO())) {
        define('__CHK_VALUE', $chk);
        // Del menu entries with or without confirmation
        $SW = 2; $cnt = 0; $OUT = "";
-       foreach ($_POST['sel'] as $sel=>$confirm)
+       foreach ($_POST['sel'] as $sel => $confirm)
        {
                if ($confirm == 1)
                {
@@ -153,7 +153,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 ID
                        $sel = bigintval($sel);
@@ -173,14 +173,16 @@ WHERE ".$AND." AND id=%s LIMIT 1",
        $sel,
 ), __FILE__, __LINE__);
                }
+               CACHE_PURGE_ADMIN_MENU(0, $_POST['sel_action'][$sel], $_POST['sel_what'][$sel]);
                LOAD_TEMPLATE("admin_data_saved");
                break;
 
        case "del": // Delete menu
-               foreach ($_POST['sel'] as $sel=>$menu)
+               foreach ($_POST['sel'] as $sel => $menu)
                {
                        $result = SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM "._MYSQL_PREFIX."_admin_menu WHERE ".$AND." AND id=%s LIMIT 1",
                         array(bigintval($sel)), __FILE__, __LINE__);
+                       CACHE_PURGE_ADMIN_MENU(0, "", "", $AND);
                }
                LOAD_TEMPLATE("admin_data_saved");
                break;
@@ -228,6 +230,7 @@ WHERE ".$AND." AND id=%s LIMIT 1",
                         array(bigintval($_GET['tid']), bigintval($fid)), __FILE__, __LINE__);
                        $result_sort = SQL_QUERY_ESC("UPDATE "._MYSQL_PREFIX."_admin_menu SET sort='%s' WHERE ".$AND." AND id=%s LIMIT 1",
                         array(bigintval($_GET['fid']), bigintval($tid)), __FILE__, __LINE__);
+                       CACHE_PURGE_ADMIN_MENU(0, "", "", $AND);
                }
        }
 
@@ -235,7 +238,7 @@ WHERE ".$AND." AND id=%s LIMIT 1",
        if (!empty($SUB))
        {
                // Sub menus of a main menu
-               $result = SQL_QUERY_ESC("SELECT id, action, what, title, sort FROM "._MYSQL_PREFIX."_admin_menu WHERE action='%s' AND what != '' ORDER BY sort ASC",
+               $result = SQL_QUERY_ESC("SELECT id, action, what, title, sort FROM "._MYSQL_PREFIX."_admin_menu WHERE action='%s' AND what != '' AND what IS NOT NULL ORDER BY sort ASC",
                 array($SUB), __FILE__, __LINE__);
        }
         else