From 8cd9708e12a7a03cfd7e7ebacc5a8ac57aa2fa2f Mon Sep 17 00:00:00 2001
From: jim-p <jimp@pfsense.org>
Date: Tue, 4 Dec 2012 11:05:54 -0500
Subject: Fix test to see if DHCP Relay is enabled.

---
 usr/local/www/services_dhcp.php | 13 +------------
 1 file changed, 1 insertion(+), 12 deletions(-)

diff --git a/usr/local/www/services_dhcp.php b/usr/local/www/services_dhcp.php
index 0d968b5..268542e 100755
--- a/usr/local/www/services_dhcp.php
+++ b/usr/local/www/services_dhcp.php
@@ -201,17 +201,6 @@ $ifcfgsn = $config['interfaces'][$if]['subnet'];
  *   the two are not compatible with each other.
  */
 
-$dhcrelay_enabled = false;
-$dhcrelaycfg = $config['dhcrelay'];
-
-if(is_array($dhcrelaycfg)) {
-	foreach ($dhcrelaycfg as $dhcrelayif => $dhcrelayifconf) {
-		if (isset($dhcrelayifconf['enable']) && isset($iflist[$dhcrelayif]) &&
-			(!link_interface_to_bridge($dhcrelayif)))
-			$dhcrelay_enabled = true;
-	}
-}
-
 function is_inrange($test, $start, $end) {
 	if ( (ip2ulong($test) < ip2ulong($end)) && (ip2ulong($test) > ip2ulong($start)) )
 		return true;
@@ -641,7 +630,7 @@ include("head.inc");
 <?php if ($input_errors) print_input_errors($input_errors); ?>
 <?php if ($savemsg) print_info_box($savemsg); ?>
 <?php
-	if ($dhcrelay_enabled) {
+	if ($config['dhcrelay']['enable']) {
 		echo gettext("DHCP Relay is currently enabled. Cannot enable the DHCP Server service while the DHCP Relay is enabled on any interface.");
 		include("fend.inc");
 		echo "</body>";
-- 
cgit v1.1