X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fwhat-adminedit.php;h=6949d19c984204b01818f63016a322ff110fed98;hp=577c13c802fb4371348b06c2e5ae28743def24b3;hb=3f51c40f4fede87228216f9285b745a339e3891d;hpb=f97a999e0737c0007ae9c3c26dfef49f75a175ac

diff --git a/inc/modules/admin/what-adminedit.php b/inc/modules/admin/what-adminedit.php
index 577c13c802..6949d19c98 100644
--- a/inc/modules/admin/what-adminedit.php
+++ b/inc/modules/admin/what-adminedit.php
@@ -47,80 +47,71 @@ ADD_DESCR('admin', __FILE__);
 
 // Do we edit/delete/change main menus or sub menus?
 $AND = "(`what` = '' OR `what` IS NULL)"; $SUB = '';
-if (REQUEST_ISSET_GET('sub'))
-{
+if (REQUEST_ISSET_GET('sub')) {
 	$AND = sprintf("`action`='%s' AND `what` IS NOT NULL", REQUEST_GET('sub'));
 	$SUB = REQUEST_GET('sub');
-}
+} // END - if
 
 // Get count of (maybe) selected menu points
 $chk = 0;
-if (REQUEST_ISSET_POST('sel')) $chk = SELECTION_COUNT(REQUEST_POST('sel'));
+if (REQUEST_ISSET_POST('sel')) $chk = countPostSelection();
 
 // List all menu points and make them editable
 if ((REQUEST_ISSET_POST('edit')) && ($chk > 0) && (!IS_DEMO())) {
 	// Edit menu entries
+	// @TODO Kill all constants in this file
 	define('__SUB_VALUE', $SUB);
 	define('__CHK_VALUE', $chk);
 	$cnt = 0; $SW = 2;
-	foreach (REQUEST_POST('sel') as $sel => $confirm)
-	{
-		if ($confirm == 1)
-		{
+	foreach (REQUEST_POST('sel') as $sel => $confirm) {
+		if ($confirm == 1) {
 			$cnt++;
 			$result = SQL_QUERY_ESC("SELECT title, action, what, descr FROM `{!_MYSQL_PREFIX!}_admin_menu` WHERE ".$AND." AND id=%s LIMIT 1",
-			 array(bigintval($sel)), __FILE__, __LINE__);
-			if (SQL_NUMROWS($result) == 1)
-			{
+			array(bigintval($sel)), __FILE__, __LINE__);
+			if (SQL_NUMROWS($result) == 1) {
 				// Entry found so we load the stuff...
 				list($menu, $act, $wht, $descr) = SQL_FETCHROW($result);
 				SQL_FREERESULT($result);
 
 				// Prepare data for the row template
 				$content = array(
-					'action' => ADMIN_MAKE_MENU_SELECTION('admin', "action", "sel_action[".$sel."]", $act),
-					'what'   => ADMIN_MAKE_MENU_SELECTION('admin', "what", "sel_what[".$sel."]", $wht),
+					'action' => ADMIN_MAKE_MENU_SELECTION('admin', 'action', 'sel_action[' . $sel . ']', $act),
+					'what'   => ADMIN_MAKE_MENU_SELECTION('admin', 'what', 'sel_what[' . $sel . ']', $wht),
 					'sw'     => $SW,
 					'sel'    => $sel,
 					'menu'   => $menu,
 					'descr'  => $descr,
 					'cnt'    => $cnt,
 				);
-				$OUT .= LOAD_TEMPLATE("admin_amenu_edit_row", true, $content);
-			}
-			 else
-			{
+				$OUT .= LOAD_TEMPLATE('admin_amenu_edit_row', true, $content);
+			} else {
 				// Entry not found?
 				$content = array(
 					'sw'  => $SW,
 					'sel' => $sel
 				);
-				$OUT .= LOAD_TEMPLATE("admin_menu_404_row", true, $content);
+				$OUT .= LOAD_TEMPLATE('admin_menu_404_row', true, $content);
 			}
 			$SW = 3 - $SW;
-		}
-	}
+		} // END - if
+	} // END - foreach
+
 	define('__MENU_ROWS', $OUT);
 	define('__CNT_VALUE', $cnt);
 
 	// Load template
-	LOAD_TEMPLATE("admin_amenu_edit_form");
-}
- elseif ((REQUEST_ISSET_POST('del')) && (!IS_DEMO()))
-{
+	LOAD_TEMPLATE('admin_amenu_edit_form');
+} elseif ((REQUEST_ISSET_POST('del')) && (!IS_DEMO())) {
 	define('__SUB_VALUE', $SUB);
 	define('__CHK_VALUE', $chk);
 	// Del menu entries with or without confirmation
 	$SW = 2; $cnt = 0; $OUT = '';
-	foreach (REQUEST_POST('sel') as $sel => $confirm)
-	{
-		if ($confirm == 1)
-		{
+	foreach (REQUEST_POST('sel') as $sel => $confirm) {
+		if ($confirm == 1) {
 			$cnt++;
 			$result = SQL_QUERY_ESC("SELECT title FROM `{!_MYSQL_PREFIX!}_admin_menu` WHERE ".$AND." AND id=%s LIMIT 1",
-			 array(bigintval($sel)), __FILE__, __LINE__);
-			if (SQL_NUMROWS($result) == 1)
-			{
+			array(bigintval($sel)), __FILE__, __LINE__);
+			if (SQL_NUMROWS($result) == 1) {
 				// Entry found so we load the stuff...
 				list($menu) = SQL_FETCHROW($result);
 				SQL_FREERESULT($result);
@@ -132,16 +123,14 @@ if ((REQUEST_ISSET_POST('edit')) && ($chk > 0) && (!IS_DEMO())) {
 					'sel'  => $sel,
 					'sw'   => $SW
 				);
-				$OUT .= LOAD_TEMPLATE("admin_amenu_delete_row", true, $content);
-			}
-			 else
-			{
+				$OUT .= LOAD_TEMPLATE('admin_amenu_delete_row', true, $content);
+			} else {
 				// Entry not found?
 				$content = array(
 					'sw'  => $SW,
 					'sel' => $sel
 				);
-				$OUT .= LOAD_TEMPLATE("admin_menu_404_row", true, $content);
+				$OUT .= LOAD_TEMPLATE('admin_menu_404_row', true, $content);
 			}
 			$SW = 3 - $SW;
 		}
@@ -150,77 +139,76 @@ if ((REQUEST_ISSET_POST('edit')) && ($chk > 0) && (!IS_DEMO())) {
 	define('__CNT_VALUE', $cnt);
 
 	// Load template
-	LOAD_TEMPLATE("admin_amenu_delete");
-} elseif ((IS_FORM_SENT()) && (!IS_DEMO())) {
+	LOAD_TEMPLATE('admin_amenu_delete');
+} elseif ((isFormSent()) && (!IS_DEMO())) {
 	// An action is done...
-	switch (REQUEST_POST('ok'))
-	{
-	case "edit": // Edit menu
-		foreach (REQUEST_POST('sel') as $sel => $menu) {
-			// Secure ID
-			$sel = bigintval($sel);
+	switch (REQUEST_POST('ok')) {
+		case 'edit': // Edit menu
+			foreach (REQUEST_POST('sel') as $sel => $menu) {
+				// Secure ID
+				$sel = bigintval($sel);
 
-			// Update entry
-			SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_admin_menu` SET
+				// 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",
- array(
-	$menu,
-	REQUEST_POST('sel_action', $sel),
-	REQUEST_POST('sel_what', $sel),
-	REQUEST_POST('sel_desc', $sel),
-	$sel,
-), __FILE__, __LINE__);
-		}
+				array(
+				$menu,
+				REQUEST_POST('sel_action', $sel),
+				REQUEST_POST('sel_what', $sel),
+				REQUEST_POST('sel_desc', $sel),
+				$sel,
+				), __FILE__, __LINE__);
+			}
 
-		// Purge admin menu cache
-		CACHE_PURGE_ADMIN_MENU(0, REQUEST_POST('sel_action', $sel), REQUEST_POST('sel_what', $sel));
+			// Purge admin menu cache
+			cachePurgeAdminMenu(0, REQUEST_POST('sel_action', $sel), REQUEST_POST('sel_what', $sel));
 
-		// Load template
-		LOAD_TEMPLATE('admin_settings_saved', false, getMessage('SETTINGS_SAVED'));
-		break;
+			// Load template
+			LOAD_TEMPLATE('admin_settings_saved', false, getMessage('SETTINGS_SAVED'));
+			break;
 
-	case "del": // Delete menu
-		foreach (REQUEST_POST('sel') as $sel => $menu) {
-			SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_admin_menu` WHERE ".$AND." AND id=%s LIMIT 1",
+		case 'del': // Delete menu
+			foreach (REQUEST_POST('sel') as $sel => $menu) {
+				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);
-		} // END - foreach
+				cachePurgeAdminMenu(0, '', '', $AND);
+			} // END - foreach
 
-		// Load template
-		LOAD_TEMPLATE('admin_settings_saved', false, getMessage('SETTINGS_SAVED'));
-		break;
+			// Load template
+			LOAD_TEMPLATE('admin_settings_saved', false, getMessage('SETTINGS_SAVED'));
+			break;
 
-	default: // Unexpected action
-		DEBUG_LOG(__FILE__, __LINE__, sprintf("Unsupported action %s detected.", REQUEST_POST('ok')));
-		define('__OK_VALUE', REQUEST_POST('ok'));
-		LOAD_TEMPLATE("admin_menu_unknown_okay");
-		break;
+		default: // Unexpected action
+			DEBUG_LOG(__FILE__, __LINE__, sprintf("Unsupported action %s detected.", REQUEST_POST('ok')));
+			define('__OK_VALUE', REQUEST_POST('ok'));
+			LOAD_TEMPLATE("admin_menu_unknown_okay");
+			break;
 	}
 } else {
 	if ((REQUEST_ISSET_GET(('act'))) && (REQUEST_ISSET_GET(('tid'))) && (REQUEST_ISSET_GET(('fid')))) {
 		// Get IDs
 		if (REQUEST_ISSET_GET(('w'))) {
 			// Sub menus selected
-			$result = SQL_QUERY_ESC("SELECT id FROM `{!_MYSQL_PREFIX!}_admin_menu` WHERE `action`='%s' AND `sort`='%s' LIMIT 1",
-				array(REQUEST_GET('act'), bigintval(REQUEST_GET('tid'))), __FILE__, __LINE__);
+			$result = SQL_QUERY_ESC("SELECT `id` FROM `{!_MYSQL_PREFIX!}_admin_menu` WHERE `action`='%s' AND `sort`='%s' LIMIT 1",
+			array(REQUEST_GET('act'), bigintval(REQUEST_GET('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(REQUEST_GET('act'), bigintval(REQUEST_GET('fid'))), __FILE__, __LINE__);
+			$result = SQL_QUERY("SELECT `id` FROM `{!_MYSQL_PREFIX!}_admin_menu` WHERE `action`='%s' AND `sort`='%s' LIMIT 1",
+			array(REQUEST_GET('act'), bigintval(REQUEST_GET('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(REQUEST_GET('tid'))), __FILE__, __LINE__);
+			$result = SQL_QUERY_ESC("SELECT `id` FROM `{!_MYSQL_PREFIX!}_admin_menu` WHERE (`what`='' OR `what` IS NULL) AND `sort`='%s' LIMIT 1",
+			array(bigintval(REQUEST_GET('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(REQUEST_GET('fid'))), __FILE__, __LINE__);
+			$result = SQL_QUERY_ESC("SELECT `id` FROM `{!_MYSQL_PREFIX!}_admin_menu` WHERE (`what`='' OR `what` IS NULL) AND `sort`='%s' LIMIT 1",
+			array(bigintval(REQUEST_GET('fid'))), __FILE__, __LINE__);
 			list($fid) = SQL_FETCHROW($result);
 			SQL_FREERESULT($result);
 		}
@@ -228,10 +216,10 @@ WHERE ".$AND." AND id=%s LIMIT 1",
 		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(REQUEST_GET('tid')), bigintval($fid)), __FILE__, __LINE__);
+			array(bigintval(REQUEST_GET('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(REQUEST_GET('fid')), bigintval($tid)), __FILE__, __LINE__);
-			CACHE_PURGE_ADMIN_MENU(0, '', '', $AND);
+			array(bigintval(REQUEST_GET('fid')), bigintval($tid)), __FILE__, __LINE__);
+			cachePurgeAdminMenu(0, '', '', $AND);
 		}
 	}
 
@@ -239,7 +227,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` != '' AND `what` IS NOT NULL ORDER BY `sort` ASC",
-		 array($SUB), __FILE__, __LINE__);
+		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__);
@@ -272,16 +260,16 @@ WHERE ".$AND." AND id=%s LIMIT 1",
 			}
 
 			// Fix empty elements for constant (fixes display bugs in Firefox)
-			if (empty($content['action'])) $content['action'] = " ";
-			if (empty($content['what']))   $content['what']   = " ";
-			if (empty($content['title']))  $content['title']  = " ";
+			if (empty($content['action'])) $content['action'] = ' ';
+			if (empty($content['what']))   $content['what']   = ' ';
+			if (empty($content['title']))  $content['title']  = ' ';
 
 			// Add more data to $content
 			$content['sw']   = $SW;
 			$content['mode'] = 'admin';
 
 			// Load row template and switch colors
-			$OUT .= LOAD_TEMPLATE("admin_menu_overview_row", true, $content);
+			$OUT .= LOAD_TEMPLATE('admin_menu_overview_row', true, $content);
 			$SW = 3 - $SW;
 		} // END - switch
 
@@ -292,7 +280,7 @@ WHERE ".$AND." AND id=%s LIMIT 1",
 		define('__MENU_ROWS', $OUT);
 
 		// Load template
-		LOAD_TEMPLATE("admin_amenu_edit");
+		LOAD_TEMPLATE('admin_amenu_edit');
 	} else {
 		// Menu entries are missing... (???)
 		LOAD_TEMPLATE('admin_settings_saved', false, getMessage('ADMIN_NO_MENUS_FOUND'));