Issue: Intropage was not saving the users desired priority

* Really it was saving it in the wrong table.  As we discuss the ordering more, there will likely be additional changes though.

Author: TheWitness

CHANGELOG.md

@@ -6,6 +6,7 @@
 * issue#316: Fix php error when db check skip huge db
 * issue#327: Move Timespan from action menu
 * issue: Fix support for Cacti 1.3+
+* issue: Intropage was not remembering the users desired panel order
 * feature: Add 24h averages for CPU and poller stats panel
 * feature: Add Boost graphs panels - memory usage, pending records
 * feature: Add Syslog graphs panels - levels, number of messages 

INFO

@@ -21,7 +21,7 @@
 
 [info]
 name = intropage
-version = 4.0.4
+version = 4.0.5
 longname = Intropage/Dashboard
 author = The Cacti Group, Petr Macek
 email = [email protected], [email protected]

display.php

@@ -97,7 +97,6 @@ function display_information() {
 		array($_SESSION['sess_user_id'], $dashboard_id));
 
 	if (cacti_sizeof($panels)) {
-
 		$removed = 0;
 
 		foreach ($panels as $one) {
@@ -126,23 +125,23 @@ function display_information() {
 	}
 
 	// User allowed panels
-	$panels = db_fetch_assoc_prepared("SELECT pd.*
+	$panels = db_fetch_assoc_prepared("SELECT pd.*, pda.priority AS user_priority
 		FROM plugin_intropage_panel_data AS pd
 		INNER JOIN plugin_intropage_panel_dashboard AS pda
 		ON pd.id = pda.panel_id
 		WHERE pd.user_id in (0, ?)
 		AND pda.dashboard_id = ?
 		AND pd.panel_id != 'favourite_graph'
 		UNION
-		SELECT t3.*
+		SELECT t3.*, t4.priority AS user_priority
 		FROM plugin_intropage_panel_data as t3
 		INNER JOIN plugin_intropage_panel_dashboard AS t4
 		ON t3.id = t4.panel_id
 		WHERE t3.user_id = ?
 		AND t4.dashboard_id = ?
 		AND t3.panel_id = 'favourite_graph'
 		AND t3.fav_graph_id IS NOT NULL
-		ORDER BY priority DESC",
+		ORDER BY user_priority DESC",
 		array(
 			$_SESSION['sess_user_id'],
 			$dashboard_id,
@@ -577,7 +576,8 @@ function display_information() {
 	var intropage_autorefresh = <?php print $autorefresh;?>;
 	var intropage_drag = true;
 	var intropage_square = true;
-	var intropage_page = '';
+	var callbackPage = '';
+	var redirectPage = '';
 	var dashboard_id = <?php print $dashboard_id;?>;
 	var intropage_text_panel_details = '<?php print __('Panel Details', 'intropage');?>';
 	var intropage_text_panel_disable = '<?php print __esc('Disable panel move/Enable copy text from panel', 'intropage');?>';

include/database.php

@@ -87,6 +87,7 @@ function intropage_initialize_database() {
 	$data['columns'][] = array('name' => 'panel_id', 'type' => 'int(11)', 'NULL' => false);
 	$data['columns'][] = array('name' => 'user_id', 'type' => 'int(11)', 'NULL' => false);
 	$data['columns'][] = array('name' => 'dashboard_id', 'type' => 'int(11)', 'NULL' => false);
+	$data['columns'][] = array('name' => 'priority', 'type' => 'int(11)', 'NULL' => false, 'default' => 0);
 	$data['type']      = 'InnoDB';
 	$data['primary']   = 'panel_id`, `user_id`, `dashboard_id';
 	$data['comment']   = 'panel x dashboard dependency';

include/functions.php

@@ -199,6 +199,7 @@ function intropage_actions() {
 	} else {
 		$value = '';
 	}
+
 	if (isset($values[2])) {
 		$value_ext = trim($values[2]);
 	}
@@ -334,11 +335,20 @@ function intropage_actions() {
 						AND id = ?',
 						array ($priority, $_SESSION['sess_user_id'], $b));
 
+					db_execute_prepared('UPDATE plugin_intropage_panel_dashboard
+						SET priority = ?
+						WHERE user_id = ?
+						AND panel_id = ?
+						AND dashboard_id = ?',
+						array ($priority, $_SESSION['sess_user_id'], $b, get_request_var('dashboard_id')));
+
   					$priority--;
 				}
 			}
 		}
 
+		exit;
+
 		break;
 	case 'refresh':
 		if (filter_var($value, FILTER_VALIDATE_INT)) {
@@ -464,7 +474,6 @@ function intropage_actions() {
 					array($value, $value_ext));
 
 				foreach ($ids_panels as $id_panel) {
-
 					$result = db_execute_prepared('INSERT INTO plugin_intropage_panel_data
 						(panel_id,user_id,data,priority,refresh_interval,trend_interval,fav_graph_id,fav_graph_timespan)
 						SELECT panel_id, ? ,data,priority,refresh_interval,trend_interval,fav_graph_id,fav_graph_timespan
@@ -487,11 +496,11 @@ function intropage_actions() {
 				header('Location: ' . html_escape("$redirectPage?header=false&dashboard_id=$new_dashboard_id"));
 
 				exit;
-
 			} else {
 				raise_message('share_panel_error', __('Error - trying share non-shared dashboard', 'intropage'), MESSAGE_LEVEL_INFO);
 			}
 		}
+
 		break;
 	}
 }

include/intropage.js

@@ -276,7 +276,14 @@ function initPage() {
 				xdata.push($(this).attr('id'));
 			});
 
-			$.get(callbackPage, { xdata:xdata, intropage_action:'order' });
+			var post = {
+				'intropage_action': 'order',
+				'dashboard_id': dashboard_id,
+				'xdata': xdata,
+				__csrf_magic: csrfMagicToken
+			}
+
+			$.post(callbackPage, post);
 		}
 	});