Correcting two additional bugs then re-release

Cacti · Mar 1, 2020 · 3eede02 · 3eede02
1 parent 3a1a5a6
commit 3eede02
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 7 deletions.
diff --git a/includes/settings.php b/includes/settings.php
@@ -31,8 +31,10 @@ function thold_draw_navigation_text($nav) {
 	$nav['thold.php:save'] = array('title' => __('(save)', 'thold'), 'mapping' => 'index.php:,thold.php:', 'url' => 'thold.php', 'level' => '2');
 	$nav['thold.php:add'] = array('title' => __('(add)', 'thold'), 'mapping' => 'index.php:,thold.php:', 'url' => 'thold.php', 'level' => '2');
 	$nav['thold.php:autocreate'] = array('title' => __('Thresholds', 'thold'), 'mapping' => 'index.php:', 'url' => 'thold.php', 'level' => '2');
-	$nav['thold_graph.php:'] = array('title' => __('Thresholds', 'thold'), 'mapping' => 'index.php:', 'url' => 'thold_graph.php', 'level' => '1');
-	$nav['thold_graph.php:thold'] = array('title' => __('Thresholds', 'thold'), 'mapping' => $config['url_path'] . 'graph_view.php:', 'url' => 'thold_graph.php', 'level' => '1');
+	$nav['thold_graph.php:'] = array('title' => __('Thresholds', 'thold'), 'mapping' => '', 'url' => 'thold_graph.php', 'level' => '0');
+	$nav['thold_graph.php:thold'] = array('title' => __('Thresholds', 'thold'), 'mapping' => '', 'url' => 'thold_graph.php', 'level' => '0');
+	$nav['thold_graph.php:log'] = array('title' => __('Threshold Logs', 'thold'), 'mapping' => '', 'url' => 'thold_graph.php', 'level' => '0');
+	$nav['thold_graph.php:hoststat'] = array('title' => __('Device Status', 'thold'), 'mapping' => '', 'url' => 'thold_graph.php', 'level' => '0');
 	$nav['thold_view_failures.php:'] = array('title' => __('Thresholds - Failures', 'thold'), 'mapping' => 'index.php:', 'url' => 'thold_view_failures.php', 'level' => '1');
 	$nav['thold_view_normal.php:'] = array('title' => __('Thresholds - Normal', 'thold'), 'mapping' => 'index.php:', 'url' => 'thold_view_normal.php', 'level' => '1');
 	$nav['thold_view_recover.php:'] = array('title' => __('Thresholds - Recovering', 'thold'), 'mapping' => 'index.php:', 'url' => 'thold_view_recover.php', 'level' => '1');

diff --git a/thold_functions.php b/thold_functions.php
@@ -3493,11 +3493,11 @@ function thold_set_environ($text, &$thold, &$h, $currentval, $local_graph_id, $d
 	putenv('THOLD_CURRENTVALUE='    . $currentval);
 	putenv('THOLD_THRESHOLDNAME='   . $thold['name_cache']);
 	putenv('THOLD_DSNAME='          . $data_source_name);
-	putenv('THOLD_TIMEINSTATE='     . get_timeinstate($h);
-	putenv('THOLD_HOST_STATUS='     . $h['status'];
-	putenv('THOLD_HOST_FAIL_DATE='  . $h['status_fail_date'];
-	putenv('THOLD_HOST_REC_DATE='   . $h['status_rec_date'];
-	putenv('THOLD_HOST_LAST_ERROR=' . $h['status_last_error'];
+	putenv('THOLD_TIMEINSTATE='     . get_timeinstate($h));
+	putenv('THOLD_HOST_STATUS='     . $h['status']);
+	putenv('THOLD_HOST_FAIL_DATE='  . $h['status_fail_date']);
+	putenv('THOLD_HOST_REC_DATE='   . $h['status_rec_date']);
+	putenv('THOLD_HOST_LAST_ERROR=' . $h['status_last_error']);
 
 	if (isset($thold_types[$thold['thold_type']])) {
 		putenv('THOLD_THOLDTYPE=' . $thold_types[$thold['thold_type']]);