X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fadmin-inc.php;h=8e583b643686f84c4c268eb5eddcc8fb45215eb1;hp=528da4a94afb2b6b95ac47f15c86e594f54766d9;hb=dbeb4ef1dc2e59d0c6bfab9d9666cdfa515f58e7;hpb=b4f4d77fb247153f3097ad20c01f33cd8c426a56

diff --git a/inc/modules/admin/admin-inc.php b/inc/modules/admin/admin-inc.php
index 528da4a94a..8e583b6436 100644
--- a/inc/modules/admin/admin-inc.php
+++ b/inc/modules/admin/admin-inc.php
@@ -298,24 +298,20 @@ function admin_WriteData ($file, $comment, $prefix, $suffix, $DATA, $seek=0) {
 }
 
 //
-function ADMIN_DO_ACTION($wht)
-{
+function ADMIN_DO_ACTION($wht) {
 	global $menuDesription, $menuTitle, $_CONFIG, $cacheArray, $DATA, $DEPTH;
+
 	//* DEBUG: */ echo __LINE__."*".$wht."/".$GLOBALS['module']."/".$GLOBALS['action']."/".$GLOBALS['what']."*<br />\n";
-	if (EXT_IS_ACTIVE("cache"))
-	{
+	if (EXT_IS_ACTIVE("cache")) {
 		// Include cache instance
 		global $cacheInstance;
 	}
 
 	// Remove any spaces from variable
-	if (empty($wht))
-	{
+	if (empty($wht)) {
 		// Default admin action is the overview page
 		$wht = "overview";
-	}
-	 else
-	{
+	} else {
 		// Compile out some chars
 		$wht = COMPILE_CODE($wht, false, false, false);
 	}
@@ -340,29 +336,21 @@ function ADMIN_DO_ACTION($wht)
 	LOAD_TEMPLATE("admin_main_header");
 
 	// Check if action/what pair is valid
-	$result = SQL_QUERY_ESC("SELECT id FROM "._MYSQL_PREFIX."_admin_menu
+	$result_action = SQL_QUERY_ESC("SELECT id FROM "._MYSQL_PREFIX."_admin_menu
 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)
-	{
-		// Free memory
-		SQL_FREERESULT($result);
+	if (SQL_NUMROWS($result_action) == 1) {
 
 		// Is valid but does the inlcude file exists?
 		$INC = sprintf("%sinc/modules/admin/action-%s.php", PATH, $act);
-		if ((FILE_READABLE($INC)) && (VALIDATE_MENU_ACTION("admin", $act, $wht)) && (__ACL_ALLOW == true))
-		{
+		if ((FILE_READABLE($INC)) && (VALIDATE_MENU_ACTION("admin", $act, $wht)) && (__ACL_ALLOW == true)) {
 			// Ok, we finally load the admin action module
 			include($INC);
-		}
-		 elseif (__ACL_ALLOW == false)
-		{
+		} elseif (__ACL_ALLOW == false) {
 			// Access denied
 			LOAD_TEMPLATE("admin_menu_failed", false, ADMINS_ACCESS_DENIED);
 			ADD_FATAL(ADMINS_ACCESS_DENIED);
-		}
-		 else
-		{
+		} else {
 			// Include file not found! :-(
 			LOAD_TEMPLATE("admin_menu_failed", false, ADMIN_404_ACTION);
 			ADD_FATAL(ADMIN_404_ACTION_1.$act.ADMIN_404_ACTION_2);
@@ -373,6 +361,9 @@ LIMIT 1", array($act, $wht, $wht), __FILE__, __LINE__);
 		ADD_FATAL(ADMIN_INVALID_ACTION_1.$act."/".$wht.ADMIN_INVALID_ACTION_2);
 	}
 
+	// Free memory
+	SQL_FREERESULT($result_action);
+
 	// Tableset footer
 	LOAD_TEMPLATE("admin_main_footer");
 }