From 4e82cebf52022a4ab4ba3fe5ae6226fbf29864f1 Mon Sep 17 00:00:00 2001
From: Chris Buechler <cmb@pfsense.org>
Date: Sun, 16 Nov 2014 01:18:46 -0600
Subject: Don't show a big red "alarm"-looking message on every visit to the
 DHCP/DHCPv6 Server pages. Confuses people in that context, and it's not
 something that justifies highlighting in such a fashion. Move the message to
 show when you have no eligible interfaces.

---
 usr/local/www/services_dhcp.php   | 6 ++----
 usr/local/www/services_dhcpv6.php | 5 +----
 2 files changed, 3 insertions(+), 8 deletions(-)

(limited to 'usr/local/www')

diff --git a/usr/local/www/services_dhcp.php b/usr/local/www/services_dhcp.php
index ab0219d..730dc77 100644
--- a/usr/local/www/services_dhcp.php
+++ b/usr/local/www/services_dhcp.php
@@ -107,10 +107,7 @@ if($config['installedpackages']['olsrd']) {
 				break;
 			}
 	}
-}
-
-if (!$_GET['if'])
-	$savemsg = gettext("The DHCP Server can only be enabled on interfaces configured with static IP addresses") . ".<br/><br/>" . gettext("Only interfaces configured with a static IP will be shown") . ".";
+}	
 
 $iflist = get_configured_interface_with_descr();
 
@@ -758,6 +755,7 @@ include("head.inc");
 		$tabscounter++;
 	}
 	if ($tabscounter == 0) {
+		echo "<b>" . gettext("The DHCP Server can only be enabled on interfaces configured with a static IPv4 address. This system has none.") . "<br/><br/>";
 		echo "</td></tr></table></form>";
 		include("fend.inc");
 		echo "</body>";
diff --git a/usr/local/www/services_dhcpv6.php b/usr/local/www/services_dhcpv6.php
index 6281618..0a15f83 100644
--- a/usr/local/www/services_dhcpv6.php
+++ b/usr/local/www/services_dhcpv6.php
@@ -72,10 +72,6 @@ if($config['installedpackages']['olsrd']) {
 	}
 }
 
-if (!$_GET['if'])
-	$savemsg = gettext("The DHCPv6 Server can only be enabled on interfaces configured with static IP addresses") .
-		   gettext("Only interfaces configured with a static IP will be shown") . ".";
-
 $iflist = get_configured_interface_with_descr();
 $iflist = array_merge($iflist, get_configured_pppoe_server_interfaces());
 
@@ -521,6 +517,7 @@ include("head.inc");
 		}
 	}
 	if ($tabscounter == 0) {
+		echo "<b>" . gettext("The DHCPv6 Server can only be enabled on interfaces configured with a static IPv6 address. This system has none.") . "<br/><br/>";
 		echo "</td></tr></table></form>";
 		include("fend.inc");
 		echo "</body>";
-- 
cgit v1.1