X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=inc%2Fmodules%2Fadmin%2Fwhat-adminedit.php;h=5f0ec0c4fa340d5fc2a50b5e5ab2625aaf068ea1;hb=7db85bc0c45b62c28ba49e728f489ad4bc1c115f;hp=023110a00f83f95e4a97d549dbb73d6b3f206353;hpb=c9b17a86f4d62b50b8b1fbe6f9d88e6092430526;p=mailer.git

diff --git a/inc/modules/admin/what-adminedit.php b/inc/modules/admin/what-adminedit.php
index 023110a00f..5f0ec0c4fa 100644
--- a/inc/modules/admin/what-adminedit.php
+++ b/inc/modules/admin/what-adminedit.php
@@ -56,10 +56,10 @@ if ((isFormSent('edit')) && (ifPostContainsSelections()) && (!isDemoModeActive()
 	// @TODO Kill all constants in this file
 	$content['sub'] = $SUB;
 	$content['chk'] = countPostSelection();
-	$cnt = '0'; $OUT = '';
+	$count = '0'; $OUT = '';
 	foreach (postRequestParameter('sel') as $sel => $confirm) {
 		if ($confirm == 1) {
-			$cnt++;
+			$count++;
 			$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) {
@@ -73,7 +73,7 @@ if ((isFormSent('edit')) && (ifPostContainsSelections()) && (!isDemoModeActive()
 					'sel'    => $sel,
 					'menu'   => $data['title'],
 					'descr'  => $data['descr'],
-					'cnt'    => $cnt,
+					'cnt'    => $count,
 				);
 
 				// Load row template
@@ -94,7 +94,7 @@ if ((isFormSent('edit')) && (ifPostContainsSelections()) && (!isDemoModeActive()
 	} // END - foreach
 
 	$content['rows'] = $OUT;
-	$content['cnt'] = $cnt;
+	$content['cnt'] = $count;
 
 	// Load template
 	loadTemplate('admin_edit_admin_menu_form', false, $content);
@@ -104,10 +104,10 @@ if ((isFormSent('edit')) && (ifPostContainsSelections()) && (!isDemoModeActive()
 	$content['chk'] = countPostSelection();
 
 	// Del menu entries with or without confirmation
-	$cnt = '0'; $OUT = '';
+	$count = '0'; $OUT = '';
 	foreach (postRequestParameter('sel') as $sel => $confirm) {
 		if ($confirm == 1) {
-			$cnt++;
+			$count++;
 			$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) {
@@ -117,7 +117,7 @@ if ((isFormSent('edit')) && (ifPostContainsSelections()) && (!isDemoModeActive()
 				// Prepare data for the row template
 				$data = array(
 					'menu' => $data['title'],
-					'cnt'  => $cnt,
+					'cnt'  => $count,
 					'sel'  => $sel,
 				);
 				$OUT .= loadTemplate('admin_delete_admin_menu_row', true, $data);
@@ -132,7 +132,7 @@ if ((isFormSent('edit')) && (ifPostContainsSelections()) && (!isDemoModeActive()
 		} // END - if
 	} // END - switch
 	$content['rows'] = $OUT;
-	$content['cnt'] = $cnt;
+	$content['cnt'] = $count;
 
 	// Load template
 	loadTemplate('admin_delete_admin_menu', false, $content);
@@ -185,80 +185,31 @@ LIMIT 1",
 			break;
 	}
 } 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?}_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_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 `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 `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__);
-		} // END - if
-	} // END - if
+	// Handle weightning
+	doAdminProcessMenuWeightning('guest');
 
 	// Run SQL
 	$result = SQL_QUERY("SELECT id, action, what, title, sort FROM `{?_MYSQL_PREFIX?}_admin_menu` WHERE ".$AND." ORDER BY `sort` ASC", __FILE__, __LINE__);
 
 	// Do we have entries?
-	if (SQL_NUMROWS($result) > 0) {
+	if (!SQL_HASZERONUMS($result)) {
 		// Remember sub value
 		$content['sub'] = $SUB;
 
 		// Init variables
-		$OUT = ''; $cnt = '0';
+		$OUT = ''; $count = '0';
 
 		// Process all entries
 		while ($data = SQL_FETCHARRAY($result)) {
 			// Count this entry
-			$cnt++;
+			$count++;
 
 			// Init navigation variable
 			$data['navi'] = '';
 			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 == SQL_NUMROWS($result)) {
+			} elseif ($count == 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) {