X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fwhat-adminedit.php;h=f30250d1d5db7699ce50169397b63af76f72605f;hb=2142149f3f72f1a2476f95a87937c044d63bbaf2;hp=562040fcced59bf9b3d9bddfc525f8b4159e1aa3;hpb=0c030e7ade850b0e42a434f4b02ca69fbffd504f;p=mailer.git

diff --git a/inc/modules/admin/what-adminedit.php b/inc/modules/admin/what-adminedit.php
index 562040fcce..f30250d1d5 100644
--- 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']));
@@ -173,6 +173,7 @@ 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;
 
@@ -181,6 +182,7 @@ WHERE ".$AND." AND id=%s LIMIT 1",
 		{
 			$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