X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fwhat-guestedit.php;h=3e92946f101d4e26e48b6a9ac5bcf5afd24652c4;hb=c81276edfc54bdaca50489f739d67ad592825197;hp=eded88276c2f4d56a33b7d5cf4d4ce7d4e64301e;hpb=db0c6702086eea2c44d0aae1702dc2e77a0afc4e;p=mailer.git

diff --git a/inc/modules/admin/what-guestedit.php b/inc/modules/admin/what-guestedit.php
index eded88276c..3e92946f10 100644
--- a/inc/modules/admin/what-guestedit.php
+++ b/inc/modules/admin/what-guestedit.php
@@ -38,7 +38,7 @@
 // Some security stuff...
 if ((!defined('__SECURITY')) || (!isAdmin())) {
 	die();
-}
+} // END - if
 
 // Add description as navigation point
 addYouAreHereLink('admin', __FILE__);
@@ -65,25 +65,25 @@ if ((isFormSent('edit')) && (ifPostContainsSelections()) && (!isDemoModeActive()
 				array(bigintval($sel)), __FILE__, __LINE__);
 			if (SQL_NUMROWS($result) == 1) {
 				// Entry found so we load the stuff...
-				$DATA = SQL_FETCHARRAY($result);
+				$content = SQL_FETCHARRAY($result);
 
 				// Prepapre content
-				$DATA = array(
-					'cnt'    => $count,
+				$content = array(
+					'count'  => $count,
 					'sel'    => $sel,
-					'action' => adminAddMenuSelectionBox('guest', 'action', 'sel_action[' . $sel . ']', $DATA['action']),
-					'what'   => adminAddMenuSelectionBox('guest', 'what'  , 'sel_what['   . $sel . ']', $DATA['what']),
-					'menu'   => $DATA['title'],
+					'action' => adminAddMenuSelectionBox('guest', 'action', 'sel_action[' . $sel . ']', $content['action']),
+					'what'   => adminAddMenuSelectionBox('guest', 'what'  , 'sel_what['   . $sel . ']', $content['what']),
+					'menu'   => $content['title'],
 				);
 
 				// Load row template
-				$OUT .= loadTemplate('admin_edit_guest_menu_row', true, $DATA);
+				$OUT .= loadTemplate('admin_edit_guest_menu_row', true, $content);
 			} else {
 				// Entry not found
-				$DATA = array(
+				$content = array(
 					'sel' => $sel
 				);
-				$OUT .= loadTemplate('admin_menu_404_row', true, $DATA);
+				$OUT .= loadTemplate('admin_menu_404_row', true, $content);
 			}
 
 			// Free result and switch color
@@ -92,7 +92,7 @@ if ((isFormSent('edit')) && (ifPostContainsSelections()) && (!isDemoModeActive()
 	} // END - foreach
 
 	$content['rows'] = $OUT;
-	$content['cnt']  = $count;
+	$content['count'] = $count;
 
 	// Load template
 	loadTemplate('admin_edit_guest_menu_form', false, $content);
@@ -111,25 +111,25 @@ if ((isFormSent('edit')) && (ifPostContainsSelections()) && (!isDemoModeActive()
 				array(bigintval($sel)), __FILE__, __LINE__);
 			if (SQL_NUMROWS($result) == 1) {
 				// Entry found so we load the stuff...
-				$DATA = SQL_FETCHARRAY($result);
-				$DATA = array(
-					'cnt'  => $count,
-					'menu' => $DATA['title'],
-					'sel'  => $sel,
+				$content = SQL_FETCHARRAY($result);
+				$content = array(
+					'count' => $count,
+					'menu'  => $content['title'],
+					'sel'   => $sel,
 				);
-				$OUT .= loadTemplate('admin_delete_guest_menu_row', true, $DATA);
+				$OUT .= loadTemplate('admin_delete_guest_menu_row', true, $content);
 			} else {
 				// Entry not found?
-				$DATA = array(
+				$content = array(
 					'sel' => $sel
 				);
-				$OUT .= loadTemplate('admin_menu_404_row', true, $DATA);
+				$OUT .= loadTemplate('admin_menu_404_row', true, $content);
 			}
 			SQL_FREERESULT($result);
 		} // END - if
 	} // END - foreach
 	$content['rows'] = $OUT;
-	$content['cnt']  = $count;
+	$content['count'] = $count;
 
 	// Load template
 	loadTemplate('admin_delete_guest_menu', false, $content);
@@ -147,29 +147,29 @@ if ((isFormSent('edit')) && (ifPostContainsSelections()) && (!isDemoModeActive()
 				array(bigintval($sel)), __FILE__, __LINE__);
 			if (SQL_NUMROWS($result) == 1) {
 				// Entry found so we load the stuff...
-				$data = SQL_FETCHARRAY($result);
-				$data = array(
-					'cnt'     => $count,
-					'menu'    => $data['title'],
+				$content = SQL_FETCHARRAY($result);
+				$content = array(
+					'count'   => $count,
+					'menu'    => $content['title'],
 					'sel'     => $sel,
-					'visible' => addSelectionBox('yn', $data['visible'], 'visible', $sel),
-					'locked'  => addSelectionBox('yn', $data['locked'] , 'locked' , $sel),
+					'visible' => addSelectionBox('yn', $content['visible'], 'visible', $sel),
+					'locked'  => addSelectionBox('yn', $content['locked'] , 'locked' , $sel),
 				);
 
 				// Load template
-				$OUT .= loadTemplate('admin_menu_status_row', true, $data);
+				$OUT .= loadTemplate('admin_menu_status_row', true, $content);
 			} else {
 				// Entry not found?
-				$data = array(
+				$content = array(
 					'sel' => $sel
 				);
-				$OUT .= loadTemplate('admin_menu_404_row', true, $data);
+				$OUT .= loadTemplate('admin_menu_404_row', true, $content);
 			}
 
 			SQL_FREERESULT($result);
 		} // END - if
 	} // END - foreach
-	$content['cnt']  = $count;
+	$content['count'] = $count;
 	$content['rows'] = $OUT;
 
 	// Load template
@@ -179,15 +179,15 @@ if ((isFormSent('edit')) && (ifPostContainsSelections()) && (!isDemoModeActive()
 	adminProcessMenuEditForm('guest', $subMenu);
 } else {
 	// Handle weightning
-	doAdminProcessMenuWeightning('guest');
+	doAdminProcessMenuWeightning('guest', $AND);
 
 	// By default list menus
 	if (empty($subMenu)) {
 		// List only main menus
-		$result = SQL_QUERY("SELECT `id`,`action`,`what`,`title`,`sort` FROM `{?_MYSQL_PREFIX?}_guest_menu` WHERE (`what`='' OR `what` IS NULL) ORDER BY `sort` ASC", __FILE__, __LINE__);
+		$result = SQL_QUERY("SELECT `id`, `action`, `what`, `title`, `sort` FROM `{?_MYSQL_PREFIX?}_guest_menu` WHERE (`what`='' OR `what` IS NULL) ORDER BY `sort` ASC", __FILE__, __LINE__);
 	} else {
 		// List sub menus
-		$result = SQL_QUERY_ESC("SELECT `id`,`action`,`what`,`title`,`sort` FROM `{?_MYSQL_PREFIX?}_guest_menu` WHERE `action`='%s' AND `what` != '' AND `what` IS NOT NULL ORDER BY `sort` ASC",
+		$result = SQL_QUERY_ESC("SELECT `id`, `action`, `what`, `title`, `sort` FROM `{?_MYSQL_PREFIX?}_guest_menu` WHERE `action`='%s' AND `what` != '' AND `what` IS NOT NULL ORDER BY `sort` ASC",
 			array($subMenu), __FILE__, __LINE__);
 	}
 
@@ -201,35 +201,31 @@ if ((isFormSent('edit')) && (ifPostContainsSelections()) && (!isDemoModeActive()
 		$OUT = '';
 
 		// Process all menu entries
-		while ($data = SQL_FETCHARRAY($result)) {
+		while ($content = SQL_FETCHARRAY($result)) {
 			$count++;
-			if (($data['sort'] == '0') || (($data['sort'] == 1) && (!empty($subMenu)))) {
+			if (($content['sort'] == '0') || (($content['sort'] == 1) && (!empty($subMenu)))) {
 				// 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>';
+				$NAVI = '<a href="{%url=modules.php?module=admin&amp;what=guestedit&amp;sub=' . $content['sub'] . '&amp;act=' . $content['action'] . '&amp;w=' . $content['what'] . '&amp;tid=' . ($content['sort']+1) . '&amp;fid=' . $content['sort'] . '%}">{--LOWER--}</a>';
 			} elseif ($count == 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) {
+				$NAVI = '<a href="{%url=modules.php?module=admin&amp;what=guestedit&amp;sub=' . $content['sub'] . '&amp;act=' . $content['action'] . '&amp;w=' . $content['what'] . '&amp;tid=' . ($content['sort']-1) . '&amp;fid=' . $content['sort'] . '%}">{--HIGHER--}</a>';
+			} elseif ($content['sort'] > 0) {
 				// Anything else between highest and lowest
-				$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>/<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>';
+				$NAVI = '<a href="{%url=modules.php?module=admin&amp;what=guestedit&amp;sub=' . $content['sub'] . '&amp;act=' . $content['action'] . '&amp;w=' . $content['what'] . '&amp;tid=' . ($content['sort']-1) . '&amp;fid=' . $content['sort'] . '%}">{--HIGHER--}</a>|<a href=\"{%url=modules.php?module=admin&amp;what=guestedit&amp;sub=' . $content['sub'] . '&amp;act=' . $content['action'] . '&amp;w=' . $content['what'] . '&amp;tid=' . ($content['sort']+1) . '&amp;fid=' . $content['sort'] . '%}">{--LOWER--}</a>';
 			}
 
-			if (empty($data['action'])) $data['action'] = '&nbsp;';
-			if (empty($data['what']))   $data['what']   = '&nbsp;';
-			if (empty($data['title']))  $data['title']  = '&nbsp;';
-
 			// Prepapre content
-			$row = array(
-				'id'     => $data['id'],
-				'action' => $data['action'],
-				'what'   => $data['what'],
-				'title'  => $data['title'],
+			$content = array(
+				'id'     => $content['id'],
+				'action' => $content['action'],
+				'what'   => $content['what'],
+				'title'  => $content['title'],
 				'navi'   => $NAVI,
 				'mode'   => 'guest'
 			);
 
 			// Load row template
-			$OUT .= loadTemplate('admin_menu_overview_row', true, $row);
+			$OUT .= loadTemplate('admin_menu_overview_row', true, $content);
 		} // END - while
 
 		// Add rows