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

1 files changed, 9 insertions, 6 deletions

diff --git a/src/usr/local/www/services_dhcpv6.php b/src/usr/local/www/services_dhcpv6.php
index d890787..e1c3e8c 100644
--- a/src/usr/local/www/services_dhcpv6.php
+++ b/src/usr/local/www/services_dhcpv6.php
@@ -157,11 +157,14 @@ $ifcfgsn = get_interface_subnetv6($if);
 $dhcrelay_enabled = false;
 $dhcrelaycfg = $config['dhcrelay6'];
 
-if (is_array($dhcrelaycfg)) {
-	foreach ($dhcrelaycfg as $dhcrelayif => $dhcrelayifconf) {
-		if (isset($dhcrelayifconf['enable']) && isset($iflist[$dhcrelayif]) &&
-		    (!link_interface_to_bridge($dhcrelayif))) {
+if (is_array($dhcrelaycfg) && isset($dhcrelaycfg['enable']) && isset($dhcrelaycfg['interface']) && !empty($dhcrelaycfg['interface'])) {
+	$dhcrelayifs = explode(",", $dhcrelaycfg['interface']);
+
+	foreach ($dhcrelayifs as $dhcrelayif) {
+
+		if (isset($iflist[$dhcrelayif]) && (!link_interface_to_bridge($dhcrelayif))) {
 			$dhcrelay_enabled = true;
+			break;
 		}
 	}
 }
@@ -440,8 +443,8 @@ $pgtitle = array(gettext("Services"), htmlspecialchars(gettext("DHCPv6 Server &
 
 if (!empty($if) && !$dhcrelay_enabled && isset($iflist[$if])) {
 	$pgtitle[] = $iflist[$if];
+	$pgtitle[] = gettext("DHCPv6 Server");
 }
-$pgtitle[] = gettext("DHCPv6 Server");
 $shortcut_section = "dhcp6";
 
 include("head.inc");
@@ -455,7 +458,7 @@ if ($savemsg) {
 }
 
 if ($dhcrelay_enabled) {
-	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');
+	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);
 	include("foot.inc");
 	exit;
 }