Project

General

Profile

« Previous | Next » 

Revision 8cd9708e

Added by Jim Pingle over 12 years ago

Fix test to see if DHCP Relay is enabled.

View differences:

usr/local/www/services_dhcp.php
201 201
 *   the two are not compatible with each other.
202 202
 */
203 203

  
204
$dhcrelay_enabled = false;
205
$dhcrelaycfg = $config['dhcrelay'];
206

  
207
if(is_array($dhcrelaycfg)) {
208
	foreach ($dhcrelaycfg as $dhcrelayif => $dhcrelayifconf) {
209
		if (isset($dhcrelayifconf['enable']) && isset($iflist[$dhcrelayif]) &&
210
			(!link_interface_to_bridge($dhcrelayif)))
211
			$dhcrelay_enabled = true;
212
	}
213
}
214

  
215 204
function is_inrange($test, $start, $end) {
216 205
	if ( (ip2ulong($test) < ip2ulong($end)) && (ip2ulong($test) > ip2ulong($start)) )
217 206
		return true;
......
641 630
<?php if ($input_errors) print_input_errors($input_errors); ?>
642 631
<?php if ($savemsg) print_info_box($savemsg); ?>
643 632
<?php
644
	if ($dhcrelay_enabled) {
633
	if ($config['dhcrelay']['enable']) {
645 634
		echo gettext("DHCP Relay is currently enabled. Cannot enable the DHCP Server service while the DHCP Relay is enabled on any interface.");
646 635
		include("fend.inc");
647 636
		echo "</body>";

Also available in: Unified diff