X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fwhat-adminedit.php;h=d8c339cfdc4938e6d60c3c05a603514bc31b1f24;hp=d6d95ec5a3d29d0a25bfed0500564dd9f5a79ac8;hb=6914ebaaae909093df86d010e4c754a43d1a1aed;hpb=30ae22f62ae87c53a56baf0d134569ba91011111

diff --git a/inc/modules/admin/what-adminedit.php b/inc/modules/admin/what-adminedit.php
index d6d95ec5a3..d8c339cfdc 100644
--- a/inc/modules/admin/what-adminedit.php
+++ b/inc/modules/admin/what-adminedit.php
@@ -48,7 +48,7 @@ addMenuDescription('admin', __FILE__);
 // Do we edit/delete/change main menus or sub menus?
 $AND = "(`what` = '' OR `what` IS NULL)"; $SUB = '';
 if (isGetRequestParameterSet('sub')) {
-	$AND = sprintf("`action`='%s' AND `what` IS NOT NULL", getRequestParameter('sub'));
+	$AND = sprintf("`action`='%s' AND `what` != '' AND `what` IS NOT NULL", getRequestParameter('sub'));
 	$SUB = getRequestParameter('sub');
 } // END - if
 
@@ -79,7 +79,7 @@ if ((isFormSent('edit')) && (ifPostContainsSelections()) && (!isDemoModeActive()
 				);
 
 				// Load row template
-				$OUT .= loadTemplate('admin_amenu_edit_row', true, $data);
+				$OUT .= loadTemplate('form_submit_admin_menu_row', true, $data);
 			} else {
 				// Entry not found?
 				$data = array(
@@ -99,7 +99,7 @@ if ((isFormSent('edit')) && (ifPostContainsSelections()) && (!isDemoModeActive()
 	$content['cnt'] = $cnt;
 
 	// Load template
-	loadTemplate('admin_amenu_edit_form', false, $content);
+	loadTemplate('form_submit_admin_menu_form', false, $content);
 } elseif ((isFormSent('del')) && (ifPostContainsSelections()) && (!isDemoModeActive())) {
 	// Prepare misc content
 	$content['sub'] = $SUB;
@@ -122,7 +122,7 @@ if ((isFormSent('edit')) && (ifPostContainsSelections()) && (!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')) && (ifPostContainsSelections()) && (!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')) {
@@ -147,18 +147,23 @@ if ((isFormSent('edit')) && (ifPostContainsSelections()) && (!isDemoModeActive()
 				$sel = bigintval($sel);
 
 				// Update entry
-				SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_admin_menu` SET
-`title`='%s',
-`action`='%s',
-`what`='%s',
-`descr`='%s'
-WHERE ".$AND." AND `id`=%s LIMIT 1",
+				SQL_QUERY_ESC("UPDATE
+	`{?_MYSQL_PREFIX?}_admin_menu`
+SET
+	`title`='%s',
+	`action`='%s',
+	`what`='%s',
+	`descr`='%s'
+WHERE
+	".$AND." AND
+	`id`=%s
+LIMIT 1",
 				array(
-				$menu,
-				postRequestParameter('sel_action', $sel),
-				postRequestParameter('sel_what', $sel),
-				postRequestParameter('sel_desc', $sel),
-				$sel,
+					$menu,
+					postRequestParameter('sel_action', $sel),
+					postRequestParameter('sel_what', $sel),
+					postRequestParameter('sel_desc', $sel),
+					$sel,
 				), __FILE__, __LINE__);
 			}
 
@@ -182,51 +187,63 @@ 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__);
+			$result = SQL_QUERY_ESC("SELECT `id` FROM `{?_MYSQL_PREFIX?}_admin_menu` WHERE ".$AND." AND `what` != '%s' AND `sort`=%s LIMIT 1",
+				array(
+					getRequestParameter('w'),
+					bigintval(getRequestParameter('tid'))
+				), __FILE__, __LINE__);
 			list($tid) = SQL_FETCHROW($result);
 			SQL_FREERESULT($result);
-			$result = SQL_QUERY("SELECT `id` FROM `{?_MYSQL_PREFIX?}_admin_menu` WHERE `action`='%s' AND `sort`='%s' LIMIT 1",
-			array(getRequestParameter('act'), bigintval(getRequestParameter('fid'))), __FILE__, __LINE__);
+			$result = SQL_QUERY_ESC("SELECT `id` FROM `{?_MYSQL_PREFIX?}_admin_menu` WHERE ".$AND." AND `what`='%s' AND `sort`=%s LIMIT 1",
+				array(
+					getRequestParameter('w'),
+					bigintval(getRequestParameter('fid'))
+				), __FILE__, __LINE__);
 			list($fid) = SQL_FETCHROW($result);
 			SQL_FREERESULT($result);
 		} else {
 			// Main menu selected
-			$result = SQL_QUERY_ESC("SELECT `id` FROM `{?_MYSQL_PREFIX?}_admin_menu` WHERE (`what`='' OR `what` IS NULL) AND `sort`='%s' LIMIT 1",
-			array(bigintval(getRequestParameter('tid'))), __FILE__, __LINE__);
+			$result = SQL_QUERY_ESC("SELECT `id` FROM `{?_MYSQL_PREFIX?}_admin_menu` WHERE `action` != %s AND ".$AND." AND `sort`=%s LIMIT 1",
+				array(
+					getRequestParameter('act'),
+					bigintval(getRequestParameter('tid'))
+				), __FILE__, __LINE__);
 			list($tid) = SQL_FETCHROW($result);
 			SQL_FREERESULT($result);
-			$result = SQL_QUERY_ESC("SELECT `id` FROM `{?_MYSQL_PREFIX?}_admin_menu` WHERE (`what`='' OR `what` IS NULL) AND `sort`='%s' LIMIT 1",
-			array(bigintval(getRequestParameter('fid'))), __FILE__, __LINE__);
+			$result = SQL_QUERY_ESC("SELECT `id` FROM `{?_MYSQL_PREFIX?}_admin_menu` WHERE `action`=%s AND ".$AND." AND `sort`=%s LIMIT 1",
+				array(
+					getRequestParameter('act'),
+					bigintval(getRequestParameter('fid'))
+				), __FILE__, __LINE__);
 			list($fid) = SQL_FETCHROW($result);
 			SQL_FREERESULT($result);
 		}
 
+		// Do we have entries found?
 		if ((!empty($tid)) && (!empty($fid))) {
 			// Sort menu
-			SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_admin_menu` SET `sort`='%s' 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__);
-		}
-	}
+			SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_admin_menu` SET `sort`=%s 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)) {
-		// 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` != '' AND `what` IS NOT NULL ORDER BY `sort` ASC",
-		array($SUB), __FILE__, __LINE__);
-	} else {
-		// Main menus
-		$result = SQL_QUERY("SELECT id, action, what, title, sort FROM `{?_MYSQL_PREFIX?}_admin_menu` WHERE (`what`='' OR `what` IS NULL) ORDER BY `sort` ASC", __FILE__, __LINE__);
-	}
+	// Run SQL
+	$result = SQL_QUERY("SELECT id, action, what, title, sort FROM `{?_MYSQL_PREFIX?}_admin_menu` WHERE ".$AND." ORDER BY `sort` ASC", __FILE__, __LINE__);
 
-	$max = SQL_NUMROWS($result);
-	if ($max > 0) {
+	// Do we have entries?
+	if (SQL_NUMROWS($result) > 0) {
 		// Remember sub value
 		$content['sub'] = $SUB;
 
@@ -243,7 +260,7 @@ WHERE ".$AND." AND `id`=%s LIMIT 1",
 			if (($data['sort'] == '0') || (($data['sort'] == 1) && (!empty($SUB)))) {
 				// Is highest position
 				$data['navi'] = '<a href="{%url=modules.php?module=admin&amp;what=adminedit&amp;sub=' . $content['sub'] . '&amp;act=' . $data['action'] . '&amp;w=' . $data['what'] . '&amp;tid=' . ($data['sort']+1) . '&amp;fid=' . $data['sort'] . '%}">{--LOWER--}</a>';
-			} elseif ($cnt == $max) {
+			} elseif ($cnt == SQL_NUMROWS($result)) {
 				// Is lowest position
 				$data['navi'] = '<a href="{%url=modules.php?module=admin&amp;what=adminedit&amp;sub=' . $content['sub'] . '&amp;act=' . $data['action'] . '&amp;w=' . $data['what'] . '&amp;tid=' . ($data['sort']-1) . '&amp;fid=' . $data['sort'] . '%}">{--HIGHER--}</a>';
 			} elseif ($data['sort'] > 0) {
@@ -265,7 +282,7 @@ WHERE ".$AND." AND `id`=%s LIMIT 1",
 		SQL_FREERESULT($result);
 
 		// Load template
-		loadTemplate('admin_amenu_edit', false, $content);
+		loadTemplate('form_submit_admin_menu', false, $content);
 	} else {
 		// Menu entries are missing... (???)
 		loadTemplate('admin_settings_saved', false, '{--ADMIN_NO_MENUS_FOUND--}');