Project

General

Profile

« Previous | Next » 

Revision 9c06758b

Added by k-paulius over 9 years ago

Fix DHCPv6 Relay detection on DHCPv6 Server page. It broke due to dhcrelay6 config format changes.

View differences:

src/usr/local/www/services_dhcpv6.php
157 157
$dhcrelay_enabled = false;
158 158
$dhcrelaycfg = $config['dhcrelay6'];
159 159

  
160
if (is_array($dhcrelaycfg)) {
161
	foreach ($dhcrelaycfg as $dhcrelayif => $dhcrelayifconf) {
162
		if (isset($dhcrelayifconf['enable']) && isset($iflist[$dhcrelayif]) &&
163
		    (!link_interface_to_bridge($dhcrelayif))) {
160
if (is_array($dhcrelaycfg) && isset($dhcrelaycfg['enable']) && isset($dhcrelaycfg['interface']) && !empty($dhcrelaycfg['interface'])) {
161
	$dhcrelayifs = explode(",", $dhcrelaycfg['interface']);
162

  
163
	foreach ($dhcrelayifs as $dhcrelayif) {
164

  
165
		if (isset($iflist[$dhcrelayif]) && (!link_interface_to_bridge($dhcrelayif))) {
164 166
			$dhcrelay_enabled = true;
167
			break;
165 168
		}
166 169
	}
167 170
}
......
440 443

  
441 444
if (!empty($if) && !$dhcrelay_enabled && isset($iflist[$if])) {
442 445
	$pgtitle[] = $iflist[$if];
446
	$pgtitle[] = gettext("DHCPv6 Server");
443 447
}
444
$pgtitle[] = gettext("DHCPv6 Server");
445 448
$shortcut_section = "dhcp6";
446 449

  
447 450
include("head.inc");
......
455 458
}
456 459

  
457 460
if ($dhcrelay_enabled) {
458
	print_info_box(gettext("DHCP Relay is currently enabled. Cannot enable the DHCP Server service while the DHCP Relay is enabled on any interface."), 'danger');
461
	print_info_box(gettext("DHCPv6 Relay is currently enabled. Cannot enable the DHCPv6 Server service while the DHCPv6 Relay is enabled on any interface."), 'danger', false);
459 462
	include("foot.inc");
460 463
	exit;
461 464
}

Also available in: Unified diff