Fixed #5497

2 files changed, 29 insertions, 11 deletions

diff --git a/src/usr/local/www/status_rrd_graph.php b/src/usr/local/www/status_rrd_graph.php
index 353a363..3c03b88 100644
--- a/src/usr/local/www/status_rrd_graph.php
+++ b/src/usr/local/www/status_rrd_graph.php
@@ -281,7 +281,7 @@ foreach ($databases as $database) {
 	if (stristr($database, "-dhcpd") && is_array($config['dhcpd'])) {
 		$dhcpd = true;
 	}
-	
+
 }
 /* append the existing array to the header */
 $ui_databases = array_merge($dbheader, $databases);
@@ -424,14 +424,14 @@ function get_dates($curperiod, $graph) {
 }
 
 function make_tabs() {
-	global $curcat, $queues,$wireless,$cellular,$vpnusers, $captiveportal,$dhcpd;
+	global $curcat, $queues,$wireless,$cellular,$vpnusers, $captiveportal,$dhcpd, $ntpd;
 
 	$tab_array = array();
 	$tab_array[] = array(gettext("System"), ($curcat == "system"), "status_rrd_graph.php?cat=system");
 	$tab_array[] = array(gettext("Traffic"), ($curcat == "traffic"), "status_rrd_graph.php?cat=traffic");
 	$tab_array[] = array(gettext("Packets"), ($curcat == "packets"), "status_rrd_graph.php?cat=packets");
 	$tab_array[] = array(gettext("Quality"), ($curcat == "quality"), "status_rrd_graph.php?cat=quality");
-	
+
 
 	if($queues) {
 		$tab_array[] = array(gettext("Queues"), ($curcat == "queues"), "status_rrd_graph.php?cat=queues");
@@ -454,14 +454,17 @@ function make_tabs() {
 		$tab_array[] = array(gettext("Captive Portal"), ($curcat == "captiveportal"), "status_rrd_graph.php?cat=captiveportal");
 	}
 
-	if(isset($config['ntpd']['statsgraph'])) {
+	if($ntpd) {
 		$tab_array[] = array("NTP", ($curcat == "ntpd"), "status_rrd_graph.php?cat=ntpd");
 	}
-	
+
 	if($dhcpd) {
 		$tab_array[] = array(gettext("DHCP Server"), ($curcat == "dhcpd"), "status_rrd_graph.php?cat=dhcpd");
 	}
-	
+
+	if($ntpd) {
+		$tab_array[] = array(gettext("NTP"), ($curcat == "ntpd"), "status_rrd_graph.php?cat=ntpd");
+	}
 
 	$tab_array[] = array(gettext("Custom"), ($curcat == "custom"), "status_rrd_graph.php?cat=custom");
 	$tab_array[] = array(gettext("Settings"), ($curcat == "settings"), "status_rrd_graph_settings.php");
diff --git a/src/usr/local/www/status_rrd_graph_settings.php b/src/usr/local/www/status_rrd_graph_settings.php
index 568e873..0974e0c 100644
--- a/src/usr/local/www/status_rrd_graph_settings.php
+++ b/src/usr/local/www/status_rrd_graph_settings.php
@@ -137,6 +137,12 @@ foreach ($databases as $database) {
 	if (stristr($database, "captiveportal-") && is_array($config['captiveportal'])) {
 		$captiveportal = true;
 	}
+	if (stristr($database, "ntpd") && isset($config['ntpd']['statsgraph'])) {
+		$ntpd = true;
+	}
+	if (stristr($database, "-dhcpd") && is_array($config['dhcpd'])) {
+		$dhcpd = true;
+	}
 }
 
 $pgtitle = array(gettext("Status"), gettext("RRD Graphs"));
@@ -152,20 +158,29 @@ if($queues) {
 	$tab_array[] = array(gettext("QueueDrops"), ($curcat == "queuedrops"), "status_rrd_graph.php?cat=queuedrops");
 }
 
-if($wireless)
+if($wireless) {
 	$tab_array[] = array(gettext("Wireless"), ($curcat == "wireless"), "status_rrd_graph.php?cat=wireless");
+}
 
-if($cellular)
+if($cellular) {
 	$tab_array[] = array(gettext("Cellular"), ($curcat == "cellular"), "status_rrd_graph.php?cat=cellular");
+}
 
-if($vpnusers)
+if($vpnusers) {
 	$tab_array[] = array(gettext("VPN"), ($curcat == "vpnusers"), "status_rrd_graph.php?cat=vpnusers");
+}
 
-if($captiveportal)
+if($captiveportal) {
 	$tab_array[] = array(gettext("Captive Portal"), ($curcat == "captiveportal"), "status_rrd_graph.php?cat=captiveportal");
+}
 
-if(isset($config['ntpd']['statsgraph']))
+if($ntpd) {
 	$tab_array[] = array(gettext("NTP"), ($curcat == "ntpd"), "status_rrd_graph.php?cat=ntpd");
+}
+
+if($dhcpd) {
+	$tab_array[] = array(gettext("DHCP Server"), ($curcat == "dhcpd"), "status_rrd_graph.php?cat=dhcpd");
+}
 
 $tab_array[] = array(gettext("Custom"), ($curcat == "custom"), "status_rrd_graph.php?cat=custom");
 $tab_array[] = array(gettext("Settings"), ($curcat == "settings"), "status_rrd_graph_settings.php");