X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fwhat-guestedit.php;h=f027f7f0f5f5697c41a8d919bce73d6927da0337;hp=b631bf8781dad399fd8d742db552e46af82fc191;hb=903f539b5aac6171fdfee9ad252565531e8dd4e2;hpb=a28637f0eb7975f2240c42d349e5f08a9722d9bb

diff --git a/inc/modules/admin/what-guestedit.php b/inc/modules/admin/what-guestedit.php
index b631bf8781..f027f7f0f5 100644
--- a/inc/modules/admin/what-guestedit.php
+++ b/inc/modules/admin/what-guestedit.php
@@ -18,6 +18,7 @@
  * svn:keywords Date Revision" (autoprobset!) at least!!!!!!            *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
+ * Copyright (c) 2009, 2010 by Mailer Developer Team                    *
  * For more information visit: http://www.mxchange.org                  *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -53,12 +54,12 @@ if (isGetRequestParameterSet('sub')) {
 } // END - if
 
 // List all menu points and make them editable
-if ((isPostRequestParameterSet('edit')) && (countPostSelection() > 0) && (!isDemoModeActive())) {
+if ((isFormSent('edit')) && (ifPostContainsSelections()) && (!isDemoModeActive())) {
 	// Edit menu entries
 	$content['sub'] = $SUB;
 	$content['chk'] = countPostSelection();
 
-	$cnt = '0'; $OUT = ''; $SW = 2;
+	$cnt = '0'; $OUT = '';
 	foreach (postRequestParameter('sel') as $sel => $confirm) {
 		if ($confirm == 1) {
 			$cnt++;
@@ -75,15 +76,13 @@ if ((isPostRequestParameterSet('edit')) && (countPostSelection() > 0) && (!isDem
 					'action' => adminAddMenuSelectionBox('guest', 'action', 'sel_action[' . $sel . ']', $DATA['action']),
 					'what'   => adminAddMenuSelectionBox('guest', 'what'  , 'sel_what['   . $sel . ']', $DATA['what']),
 					'menu'   => $DATA['title'],
-					'sw'     => $SW,
 				);
 
 				// Load row template
-				$OUT .= loadTemplate('admin_gmenu_edit_row', true, $DATA);
+				$OUT .= loadTemplate('admin_edit_guest_menu_row', true, $DATA);
 			} else {
 				// Entry not found
 				$DATA = array(
-					'sw'  => $SW,
 					'sel' => $sel
 				);
 				$OUT .= loadTemplate('admin_menu_404_row', true, $DATA);
@@ -91,7 +90,6 @@ if ((isPostRequestParameterSet('edit')) && (countPostSelection() > 0) && (!isDem
 
 			// Free result and switch color
 			SQL_FREERESULT($result);
-			$SW = 3 - $SW;
 		} // END - if
 	} // END - foreach
 
@@ -99,15 +97,14 @@ if ((isPostRequestParameterSet('edit')) && (countPostSelection() > 0) && (!isDem
 	$content['cnt']  = $cnt;
 
 	// Load template
-	loadTemplate('admin_gmenu_edit_form', false, $content);
-} elseif ((isPostRequestParameterSet('del')) && (countPostSelection() > 0) && (!isDemoModeActive())) {
+	loadTemplate('admin_edit_guest_menu_form', false, $content);
+} elseif ((isFormSent('delete')) && (ifPostContainsSelections()) && (!isDemoModeActive())) {
 	// Del menu entries with or without confirmation
 	$content['sub'] = $SUB;
 	$content['chk'] = countPostSelection();
 
 	$cnt = '0';
 	$OUT = '';
-	$SW  = 2;
 
 	foreach (postRequestParameter('sel') as $sel => $confirm) {
 		if ($confirm == 1) {
@@ -121,26 +118,23 @@ if ((isPostRequestParameterSet('edit')) && (countPostSelection() > 0) && (!isDem
 					'cnt'  => $cnt,
 					'menu' => $DATA['title'],
 					'sel'  => $sel,
-					'sw'   => $SW,
 				);
-				$OUT .= loadTemplate('admin_gmenu_delete_row', true, $DATA);
+				$OUT .= loadTemplate('admin_delete_guest_menu_row', true, $DATA);
 			} else {
 				// Entry not found?
 				$DATA = array(
-					'sw'  => $SW,
 					'sel' => $sel
 				);
 				$OUT .= loadTemplate('admin_menu_404_row', true, $DATA);
 			}
 			SQL_FREERESULT($result);
-			$SW = 3 - $SW;
-		}
-	}
+		} // END - if
+	} // END - foreach
 	$content['rows'] = $OUT;
 	$content['cnt']  = $cnt;
 
 	// Load template
-	loadTemplate('admin_gmenu_delete', false, $content);
+	loadTemplate('admin_delete_guest_menu', false, $content);
 } elseif ((isFormSent()) && (!isDemoModeActive())) {
 	// An action is done...
 	switch (postRequestParameter('ok')) {
@@ -153,16 +147,16 @@ if ((isPostRequestParameterSet('edit')) && (countPostSelection() > 0) && (!isDem
 				SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_guest_menu` SET `title`='%s', `action`='%s', `what`='%s' WHERE ".$AND." AND `id`=%s LIMIT 1",
 					array($menu, postRequestParameter('sel_action', $sel), postRequestParameter('sel_what', $sel), $sel),__FILE__, __LINE__);
 			} // END - foreach
-			loadTemplate('admin_settings_saved', false, getMessage('SETTINGS_SAVED'));
+			loadTemplate('admin_settings_saved', false, '{--SETTINGS_SAVED--}');
 			break;
 
-		case 'del': // Delete menu
+		case 'delete': // Delete menu
 			foreach (postRequestParameter('sel') as $sel => $menu) {
 				// Delete enty
 				SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_guest_menu` WHERE ".$AND." AND `id`=%s LIMIT 1",
 					array(bigintval($sel)), __FILE__, __LINE__);
 			} // END - foreach
-			loadTemplate('admin_settings_saved', false, getMessage('SETTINGS_SAVED'));
+			loadTemplate('admin_settings_saved', false, '{--SETTINGS_SAVED--}');
 			break;
 
 		case 'status': // Change access levels
@@ -174,7 +168,7 @@ if ((isPostRequestParameterSet('edit')) && (countPostSelection() > 0) && (!isDem
 				SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_guest_menu` SET `visible`='%s', `locked`='%s' WHERE ".$AND." AND `id`=%s LIMIT 1",
 					array(postRequestParameter('visible', $sel), postRequestParameter('locked', $sel), $sel), __FILE__, __LINE__);
 			} // END - foreach
-			loadTemplate('admin_settings_saved', false, getMessage('SETTINGS_SAVED'));
+			loadTemplate('admin_settings_saved', false, '{--SETTINGS_SAVED--}');
 			break;
 
 		default: // Unexpected action
@@ -182,13 +176,13 @@ if ((isPostRequestParameterSet('edit')) && (countPostSelection() > 0) && (!isDem
 			loadTemplate('admin_settings_saved', false, getMaskedMessage('ADMIN_UNKNOWN_OKAY', postRequestParameter('ok')));
 			break;
 	} // END - switch
-} elseif ((isPostRequestParameterSet('status')) && (countPostSelection() > 0) && (!isDemoModeActive())) {
+} elseif ((isPostRequestParameterSet('status')) && (ifPostContainsSelections()) && (!isDemoModeActive())) {
 	// Change status (visible / locked)
 	$content['sub'] = $SUB;
 	$content['chk'] = countPostSelection();
 
 	// Load template
-	$SW = 2; $cnt = '0'; $OUT = '';
+	$cnt = '0'; $OUT = '';
 	foreach (postRequestParameter('sel') as $sel => $confirm) {
 		if ($confirm == 1) {
 			$cnt++;
@@ -201,7 +195,6 @@ if ((isPostRequestParameterSet('edit')) && (countPostSelection() > 0) && (!isDem
 					'cnt'     => $cnt,
 					'menu'    => $data['title'],
 					'sel'     => $sel,
-					'sw'      => $SW,
 					'visible' => addSelectionBox('yn', $data['visible'], 'visible', $sel),
 					'locked'  => addSelectionBox('yn', $data['locked'] , 'locked' , $sel),
 				);
@@ -211,41 +204,39 @@ if ((isPostRequestParameterSet('edit')) && (countPostSelection() > 0) && (!isDem
 			} else {
 				// Entry not found?
 				$data = array(
-					'sw'  => $SW,
 					'sel' => $sel
 				);
 				$OUT .= loadTemplate('admin_menu_404_row', true, $data);
 			}
 
 			SQL_FREERESULT($result);
-			$SW = 3 - $SW;
 		} // END - if
 	} // END - foreach
 	$content['cnt']  = $cnt;
 	$content['rows'] = $OUT;
 
 	// Load template
-	loadTemplate('admin_gmenu_status', false, $content);
+	loadTemplate('admin_guest_menu_status', false, $content);
 } else {
 	if ((isGetRequestParameterSet('act')) && (isGetRequestParameterSet('tid')) && (isGetRequestParameterSet('fid'))) {
 		// Get ids
 		if (isGetRequestParameterSet('w')) {
 			// Sub menus selected
-			$result = SQL_QUERY_ESC("SELECT `id` FROM `{?_MYSQL_PREFIX?}_guest_menu` WHERE `action`='%s' AND `sort`='%s' LIMIT 1",
+			$result = SQL_QUERY_ESC("SELECT `id` FROM `{?_MYSQL_PREFIX?}_guest_menu` WHERE `action`='%s' 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?}_guest_menu` WHERE `action`='%s' AND `sort`='%s' LIMIT 1",
+			$result = SQL_QUERY_ESC("SELECT `id` FROM `{?_MYSQL_PREFIX?}_guest_menu` WHERE `action`='%s' AND `sort`=%s LIMIT 1",
 				array(getRequestParameter('act'), 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?}_guest_menu` WHERE (`what`='' OR `what` IS NULL) AND `sort`='%s' LIMIT 1",
+			$result = SQL_QUERY_ESC("SELECT `id` FROM `{?_MYSQL_PREFIX?}_guest_menu` WHERE (`what`='' OR `what` IS NULL) AND `sort`=%s LIMIT 1",
 				array(bigintval(getRequestParameter('tid'))), __FILE__, __LINE__);
 			list($tid) = SQL_FETCHROW($result);
 			SQL_FREERESULT($result);
-			$result = SQL_QUERY_ESC("SELECT `id` FROM `{?_MYSQL_PREFIX?}_guest_menu` WHERE (`what`='' OR `what` IS NULL) AND `sort`='%s' LIMIT 1",
+			$result = SQL_QUERY_ESC("SELECT `id` FROM `{?_MYSQL_PREFIX?}_guest_menu` WHERE (`what`='' OR `what` IS NULL) AND `sort`=%s LIMIT 1",
 				array(bigintval(getRequestParameter('fid'))), __FILE__, __LINE__);
 			list($fid) = SQL_FETCHROW($result);
 			SQL_FREERESULT($result);
@@ -253,9 +244,9 @@ if ((isPostRequestParameterSet('edit')) && (countPostSelection() > 0) && (!isDem
 
 		if ((!empty($tid)) && (!empty($fid))) {
 			// Sort menu
-			SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_guest_menu` SET `sort`='%s' WHERE ".$AND." AND `id`=%s LIMIT 1",
+			SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_guest_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?}_guest_menu` SET `sort`='%s' WHERE ".$AND." AND `id`=%s LIMIT 1",
+			SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_guest_menu` SET `sort`=%s WHERE ".$AND." AND `id`=%s LIMIT 1",
 				array(bigintval(getRequestParameter('fid')), bigintval($tid)), __FILE__, __LINE__);
 		} // END - if
 	} // END - if
@@ -270,14 +261,12 @@ if ((isPostRequestParameterSet('edit')) && (countPostSelection() > 0) && (!isDem
 			array($SUB), __FILE__, __LINE__);
 	}
 
-	// Get number of menu entries
-	$max = SQL_NUMROWS($result);
-	if ($max > 0) {
+	// Do we have entries?
+	if (SQL_NUMROWS($result) > 0) {
 		// Set sub value
 		$content['sub'] = $SUB;
 
 		// Init variables
-		$SW = 2;
 		$cnt = '0';
 		$OUT = '';
 
@@ -287,7 +276,7 @@ if ((isPostRequestParameterSet('edit')) && (countPostSelection() > 0) && (!isDem
 			if (($data['sort'] == '0') || (($data['sort'] == 1) && (!empty($SUB)))) {
 				// Is highest position
 				$NAVI = '<a href="{%url=modules.php?module=admin&amp;what=guestedit&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
 				$NAVI = '<a href="{%url=modules.php?module=admin&amp;what=guestedit&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) {
@@ -301,7 +290,6 @@ if ((isPostRequestParameterSet('edit')) && (countPostSelection() > 0) && (!isDem
 
 			// Prepapre content
 			$row = array(
-				'sw'     => $SW,
 				'id'     => $data['id'],
 				'action' => $data['action'],
 				'what'   => $data['what'],
@@ -312,7 +300,6 @@ if ((isPostRequestParameterSet('edit')) && (countPostSelection() > 0) && (!isDem
 
 			// Load row template
 			$OUT .= loadTemplate('admin_menu_overview_row', true, $row);
-			$SW = 3 - $SW;
 		} // END - while
 
 		// Add rows
@@ -322,10 +309,10 @@ if ((isPostRequestParameterSet('edit')) && (countPostSelection() > 0) && (!isDem
 		SQL_FREERESULT($result);
 
 		// Load template
-		loadTemplate('admin_gmenu_edit', false, $content);
+		loadTemplate('admin_edit_guest_menu', false, $content);
 	} else {
 		// Menu entries are missing... (???)
-		loadTemplate('admin_settings_saved', false, getMessage('ADMIN_NO_MENUS_FOUND'));
+		loadTemplate('admin_settings_saved', false, '{--ADMIN_NO_MENUS_FOUND--}');
 	}
 }