Project

General

Profile

« Previous | Next » 

Revision 31194ebd

Added by Stephen Beaver over 9 years ago

Fixed #5497

View differences:

src/usr/local/www/status_rrd_graph.php
281 281
	if (stristr($database, "-dhcpd") && is_array($config['dhcpd'])) {
282 282
		$dhcpd = true;
283 283
	}
284
	
284

  
285 285
}
286 286
/* append the existing array to the header */
287 287
$ui_databases = array_merge($dbheader, $databases);
......
424 424
}
425 425

  
426 426
function make_tabs() {
427
	global $curcat, $queues,$wireless,$cellular,$vpnusers, $captiveportal,$dhcpd;
427
	global $curcat, $queues,$wireless,$cellular,$vpnusers, $captiveportal,$dhcpd, $ntpd;
428 428

  
429 429
	$tab_array = array();
430 430
	$tab_array[] = array(gettext("System"), ($curcat == "system"), "status_rrd_graph.php?cat=system");
431 431
	$tab_array[] = array(gettext("Traffic"), ($curcat == "traffic"), "status_rrd_graph.php?cat=traffic");
432 432
	$tab_array[] = array(gettext("Packets"), ($curcat == "packets"), "status_rrd_graph.php?cat=packets");
433 433
	$tab_array[] = array(gettext("Quality"), ($curcat == "quality"), "status_rrd_graph.php?cat=quality");
434
	
434

  
435 435

  
436 436
	if($queues) {
437 437
		$tab_array[] = array(gettext("Queues"), ($curcat == "queues"), "status_rrd_graph.php?cat=queues");
......
454 454
		$tab_array[] = array(gettext("Captive Portal"), ($curcat == "captiveportal"), "status_rrd_graph.php?cat=captiveportal");
455 455
	}
456 456

  
457
	if(isset($config['ntpd']['statsgraph'])) {
457
	if($ntpd) {
458 458
		$tab_array[] = array("NTP", ($curcat == "ntpd"), "status_rrd_graph.php?cat=ntpd");
459 459
	}
460
	
460

  
461 461
	if($dhcpd) {
462 462
		$tab_array[] = array(gettext("DHCP Server"), ($curcat == "dhcpd"), "status_rrd_graph.php?cat=dhcpd");
463 463
	}
464
	
464

  
465
	if($ntpd) {
466
		$tab_array[] = array(gettext("NTP"), ($curcat == "ntpd"), "status_rrd_graph.php?cat=ntpd");
467
	}
465 468

  
466 469
	$tab_array[] = array(gettext("Custom"), ($curcat == "custom"), "status_rrd_graph.php?cat=custom");
467 470
	$tab_array[] = array(gettext("Settings"), ($curcat == "settings"), "status_rrd_graph_settings.php");
src/usr/local/www/status_rrd_graph_settings.php
137 137
	if (stristr($database, "captiveportal-") && is_array($config['captiveportal'])) {
138 138
		$captiveportal = true;
139 139
	}
140
	if (stristr($database, "ntpd") && isset($config['ntpd']['statsgraph'])) {
141
		$ntpd = true;
142
	}
143
	if (stristr($database, "-dhcpd") && is_array($config['dhcpd'])) {
144
		$dhcpd = true;
145
	}
140 146
}
141 147

  
142 148
$pgtitle = array(gettext("Status"), gettext("RRD Graphs"));
......
152 158
	$tab_array[] = array(gettext("QueueDrops"), ($curcat == "queuedrops"), "status_rrd_graph.php?cat=queuedrops");
153 159
}
154 160

  
155
if($wireless)
161
if($wireless) {
156 162
	$tab_array[] = array(gettext("Wireless"), ($curcat == "wireless"), "status_rrd_graph.php?cat=wireless");
163
}
157 164

  
158
if($cellular)
165
if($cellular) {
159 166
	$tab_array[] = array(gettext("Cellular"), ($curcat == "cellular"), "status_rrd_graph.php?cat=cellular");
167
}
160 168

  
161
if($vpnusers)
169
if($vpnusers) {
162 170
	$tab_array[] = array(gettext("VPN"), ($curcat == "vpnusers"), "status_rrd_graph.php?cat=vpnusers");
171
}
163 172

  
164
if($captiveportal)
173
if($captiveportal) {
165 174
	$tab_array[] = array(gettext("Captive Portal"), ($curcat == "captiveportal"), "status_rrd_graph.php?cat=captiveportal");
175
}
166 176

  
167
if(isset($config['ntpd']['statsgraph']))
177
if($ntpd) {
168 178
	$tab_array[] = array(gettext("NTP"), ($curcat == "ntpd"), "status_rrd_graph.php?cat=ntpd");
179
}
180

  
181
if($dhcpd) {
182
	$tab_array[] = array(gettext("DHCP Server"), ($curcat == "dhcpd"), "status_rrd_graph.php?cat=dhcpd");
183
}
169 184

  
170 185
$tab_array[] = array(gettext("Custom"), ($curcat == "custom"), "status_rrd_graph.php?cat=custom");
171 186
$tab_array[] = array(gettext("Settings"), ($curcat == "settings"), "status_rrd_graph_settings.php");

Also available in: Unified diff