refresh interval for each panel, fix #116, fix #95

Author: xmacan

display.php

@@ -307,10 +307,10 @@ function display_information() {
 	}
 	else	{	// intropage in console or in tab
 		if ($lopts == 4) {	// in tab
-       			print "<option value='loginopt_console'>" . __('Display intropage in console', 'intropage') . '</option>';
+       			print "<option value='loginopt_console'>" . __('Display intropage in console (needs relogin)', 'intropage') . '</option>';
                 }
 		else {
-			print "<option value='loginopt_tab'>" . __('Display intropage in tab as default page', 'intropage') . '</option>';
+			print "<option value='loginopt_tab'>" . __('Display intropage in tab as default page (needs relogin)', 'intropage') . '</option>';
 		}
 	}
 

include/actions.php

@@ -33,6 +33,10 @@
 
 if (isset_request_var('intropage_settings'))	{
 
+	if (get_request_var('intropage_cancel'))	{
+		return;	
+	}
+	
 	// dashboard names
 	$number_of_dashboards = read_user_setting('intropage_number_of_dashboards',1);
 
@@ -50,7 +54,8 @@
 	// panel refresh
         $panels = db_fetch_assoc_prepared('SELECT t1.panel_id AS panel_name,t1.id AS id FROM plugin_intropage_panel_data AS t1
                         JOIN plugin_intropage_panel_dashboard AS t2
-                        ON t1.id=t2.panel_id WHERE t2.user_id= ?',
+                        ON t1.id=t2.panel_id WHERE t2.user_id= ?
+                        AND t1.fav_graph_id IS NULL',
                         array($_SESSION['sess_user_id']));
 
 	if (cacti_sizeof($panels))      {

include/data.php

@@ -327,8 +327,8 @@ function top5_ping($display=false, $update=false, $force_update=false) {
 			array($user['id'],$panel_id));
 
 		$update_interval = db_fetch_cell_prepared('SELECT refresh_interval FROM plugin_intropage_panel_data
-					WHERE panel_id= ? AND user_id= 0',
-					array($panel_id));
+					WHERE panel_id= ? AND user_id= ?',
+					array($panel_id, $user['id']));
 
 
 		if ( $force_update || time() > ($last_update + $update_interval)) {
@@ -513,7 +513,7 @@ function cpuload($display=false, $update=false, $force_update=false) {
 
         if ($display)    {
 	        $result = db_fetch_row_prepared("SELECT id, data, alarm, last_update,
-	        	concatfloor(TIME_FORMAT(SEC_TO_TIME(refresh_interval), '%H') / 24), 'd ',
+	        	concat(floor(TIME_FORMAT(SEC_TO_TIME(refresh_interval), '%H') / 24), 'd ',
 			MOD(TIME_FORMAT(SEC_TO_TIME(refresh_interval), '%H'), 24), 'h:',
 			TIME_FORMAT(SEC_TO_TIME(refresh_interval), '%im')) AS recheck
 	        	FROM plugin_intropage_panel_data
@@ -2779,7 +2779,7 @@ function boost($display=false, $update=false, $force_update=false) {
         	$next_run_time   = read_config_option('boost_next_run_time', true);
         	$max_records     = read_config_option('boost_rrd_update_max_records', true);
         	$max_runtime     = read_config_option('boost_rrd_update_max_runtime', true);
-        	$update_interval = read_config_option('boost_rrd_update_interval', true);
+        	$update_int = read_config_option('boost_rrd_update_interval', true);
         	$peak_memory     = read_config_option('boost_peak_memory', true);
         	$detail_stats    = read_config_option('stats_detail_boost', true);
 
@@ -2885,7 +2885,7 @@ function boost($display=false, $update=false, $force_update=false) {
         	$result['data'] .= __('Last run duration: %s', $lastduration, 'intropage') . '<br/>';
 
         	$result['data'] .= __('RRD Updates / Max: %s / %s', $boost_rrds_updated != '' ? number_format_i18n($boost_rrds_updated, -1) : '-', number_format_i18n($max_records, -1), 'intropage')  . '<br/>';
-        	$result['data'] .= __('Update Frequency: %s', $rrd_updates == '' ? __('N/A') : $boost_refresh_interval[$update_interval], 'intropage') . '<br/>';
+        	$result['data'] .= __('Update Frequency: %s', $rrd_updates == '' ? __('N/A') : $boost_refresh_interval[$update_int], 'intropage') . '<br/>';
         	$result['data'] .= __('Next Start Time: %s', $next_run_time, 'intropage') . '<br/>';
 
 	    	db_execute_prepared('REPLACE INTO plugin_intropage_panel_data 

include/functions.php

@@ -315,8 +315,6 @@ function intropage_display_data($panel_id,$dispdata) {
 
 			print '<br/>' . __('Last update','intropage') . ': ' . $dispdata['last_update'] . '/' . 
 				 __('Recheck every','intropage') .': ' . $dispdata['recheck'];
-//			print '<br/>' . __('Last update','intropage') . ': ' . $dispdata['last_update'];
-//			print '<br/>' . __('Recheck every','intropage') .': ' . $dispdata['recheck'];
 		}
 	}
 }
@@ -420,6 +418,7 @@ function display_setting ()	{
                         JOIN plugin_intropage_panel_dashboard AS t2
                         ON t1.id=t2.panel_id 
                         WHERE t2.user_id= ?
+                        AND t1.fav_graph_id IS NULL 
                         ORDER BY t2.dashboard_id',
                         array($_SESSION['sess_user_id']));
 
@@ -434,6 +433,10 @@ function display_setting ()	{
 			print ucwords(str_replace('_', ' ', $panel['panel_id'])) . " :  ";
 			print '</td><td>';
 			print '<input type="text" name="crefresh_' . $panel['id'] . '" value="' . $panel['refresh_interval']  . '"> ';
+			if ($panel['panel_id'] == 'analyse_db')	{
+				print __('Only admin can set this in Console -> Configuration -> Settings');
+			
+			}
 			if ($panel['user_id'] == 0)	{
 
 				print __('Common panel - refresh interval is the same for all users!');
@@ -446,7 +449,9 @@ function display_setting ()	{
 
 	print '<br/><br/>';
 	print '<input type="hidden" name="intropage_settings" value="true">';
+	print '<input type="submit" name="cancel" value="' . __('Cancel', 'intropage') . '"> ';
 	print '<input type="submit" value="' . __('Save', 'intropage') . '">';
+
 	print '</div>';
 
 }