X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fwhat-adminedit.php;h=9cfb7b94e81698f3fd7aaf9b8332d5a6de92b3ac;hb=0b26d5d64d95a8001bc8ba27a2d27ca4888d5d80;hp=8e6b10bc6e62010fc5f06b9a34b0a81e11dadbef;hpb=1e6a6da913a6c4cc58b4360aa2283aedb2a6744c;p=mailer.git

diff --git a/inc/modules/admin/what-adminedit.php b/inc/modules/admin/what-adminedit.php
index 8e6b10bc6e..9cfb7b94e8 100644
--- a/inc/modules/admin/what-adminedit.php
+++ b/inc/modules/admin/what-adminedit.php
@@ -53,7 +53,7 @@ if (isGetRequestParameterSet('sub')) {
 } // END - if
 
 // List all menu points and make them editable
-if ((isFormSent('edit')) && (countPostSelection() > 0) && (!isDemoModeActive())) {
+if ((isFormSent('edit')) && (ifPostContainsSelections()) && (!isDemoModeActive())) {
 	// Edit menu entries
 	// @TODO Kill all constants in this file
 	$content['sub'] = $SUB;
@@ -79,7 +79,7 @@ if ((isFormSent('edit')) && (countPostSelection() > 0) && (!isDemoModeActive()))
 				);
 
 				// Load row template
-				$OUT .= loadTemplate('admin_amenu_edit_row', true, $data);
+				$OUT .= loadTemplate('admin_edit_admin_menu_row', true, $data);
 			} else {
 				// Entry not found?
 				$data = array(
@@ -99,8 +99,8 @@ if ((isFormSent('edit')) && (countPostSelection() > 0) && (!isDemoModeActive()))
 	$content['cnt'] = $cnt;
 
 	// Load template
-	loadTemplate('admin_amenu_edit_form', false, $content);
-} elseif ((isFormSent('del')) && (countPostSelection() > 0) && (!isDemoModeActive())) {
+	loadTemplate('admin_edit_admin_menu_form', false, $content);
+} elseif ((isFormSent('del')) && (ifPostContainsSelections()) && (!isDemoModeActive())) {
 	// Prepare misc content
 	$content['sub'] = $SUB;
 	$content['chk'] = countPostSelection();
@@ -122,7 +122,7 @@ if ((isFormSent('edit')) && (countPostSelection() > 0) && (!isDemoModeActive()))
 					'cnt'  => $cnt,
 					'sel'  => $sel,
 				);
-				$OUT .= loadTemplate('admin_amenu_delete_row', true, $data);
+				$OUT .= loadTemplate('admin_del_admin_menu_row', true, $data);
 			} else {
 				// Entry not found?
 				$data = array(
@@ -137,7 +137,7 @@ if ((isFormSent('edit')) && (countPostSelection() > 0) && (!isDemoModeActive()))
 	$content['cnt'] = $cnt;
 
 	// Load template
-	loadTemplate('admin_amenu_delete', false, $content);
+	loadTemplate('admin_del_admin_menu', false, $content);
 } elseif ((isFormSent()) && (!isDemoModeActive())) {
 	// An action is done...
 	switch (postRequestParameter('ok')) {
@@ -182,9 +182,9 @@ WHERE ".$AND." AND `id`=%s LIMIT 1",
 			break;
 	}
 } else {
-	if ((isGetRequestParameterSet(('act'))) && (isGetRequestParameterSet(('tid'))) && (isGetRequestParameterSet(('fid')))) {
+	if ((isGetRequestParameterSet('act')) && (isGetRequestParameterSet('tid')) && (isGetRequestParameterSet('fid'))) {
 		// Get ids
-		if (isGetRequestParameterSet(('w'))) {
+		if (isGetRequestParameterSet('w')) {
 			// Sub menus selected
 			$result = SQL_QUERY_ESC("SELECT `id` FROM `{?_MYSQL_PREFIX?}_admin_menu` WHERE `action`='%s' AND `sort`='%s' LIMIT 1",
 			array(getRequestParameter('act'), bigintval(getRequestParameter('tid'))), __FILE__, __LINE__);
@@ -212,8 +212,8 @@ WHERE ".$AND." AND `id`=%s LIMIT 1",
 				array(bigintval(getRequestParameter('tid')), bigintval($fid)), __FILE__, __LINE__);
 			SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_admin_menu` SET `sort`='%s' WHERE ".$AND." AND `id`=%s LIMIT 1",
 				array(bigintval(getRequestParameter('fid')), bigintval($tid)), __FILE__, __LINE__);
-		}
-	}
+		} // END - if
+	} // END - if
 
 	// By default list menus
 	if (!empty($SUB)) {
@@ -265,7 +265,7 @@ WHERE ".$AND." AND `id`=%s LIMIT 1",
 		SQL_FREERESULT($result);
 
 		// Load template
-		loadTemplate('admin_amenu_edit', false, $content);
+		loadTemplate('admin_edit_admin_menu', false, $content);
 	} else {
 		// Menu entries are missing... (???)
 		loadTemplate('admin_settings_saved', false, '{--ADMIN_NO_MENUS_FOUND--}');