firewall: finish disabled banner

o Deduplicate inside guiconfig.inc, one word needs to be changed...
o No spurious functions unless needed, it will likely linger forever.
o Be less specific about what the function will do, it may change.
o Remove "dismissable", there's no use dismissing static alerts.
o Zap filter switch case, firewall is used in the GUI anyway.
o Mop up the manual instances of the early pull request still present.
o Transform gettext(html) into sprintf(gettext, html).

src/www/diag_logs_filter.php

@@ -603,7 +603,7 @@ include("head.inc");
 		<div class="container-fluid">
 			<div class="row">
 
-				<?php print_service_disabled_banner('firewall'); ?>
+				<?php print_service_banner('firewall'); ?>
 				<?php if (isset($input_errors) && count($input_errors) > 0) print_input_errors($input_errors); ?>
 
 			    <section class="col-xs-12">

src/www/diag_logs_filter_dynamic.php

@@ -85,7 +85,7 @@ include("head.inc");
 		<div class="container-fluid">
 			<div class="row">
 
-				<?php print_service_disabled_banner('firewall'); ?>
+				<?php print_service_banner('firewall'); ?>
 				<?php if (isset($input_errors) && count($input_errors) > 0) print_input_errors($input_errors); ?>
 
 			    <section class="col-xs-12">

src/www/diag_logs_filter_plain.php

@@ -61,7 +61,7 @@ include("head.inc");
 		<div class="container-fluid">
 			<div class="row">
 
-				<?php print_service_disabled_banner('firewall'); ?>
+				<?php print_service_banner('firewall'); ?>
 				<?php if (isset($input_errors) && count($input_errors) > 0) print_input_errors($input_errors); ?>
 
 			     <section class="col-xs-12">

src/www/diag_logs_filter_summary.php

@@ -111,7 +111,7 @@ include("head.inc"); ?>
 	<section class="page-content-main">
 		<div class="container-fluid">
 			<div class="row">
-				<?php print_service_disabled_banner('firewall'); ?>
+				<?php print_service_banner('firewall'); ?>
 				<?php if (isset($input_errors) && count($input_errors) > 0) print_input_errors($input_errors); ?>
 			    <section class="col-xs-12">
 						<div class="tab-content content-box col-xs-12">

src/www/diag_pf_info.php

@@ -70,7 +70,7 @@ $( document ).ready(function() {
 <section class="page-content-main">
   <div class="container-fluid col-xs-12">
     <div class="row">
-        <?php print_service_disabled_banner('firewall'); ?>
+        <?php print_service_banner('firewall'); ?>
         <section class="col-xs-12">
           <ul class="nav nav-tabs" data-tabs="tabs" id="maintabs">
 <?php

src/www/firewall_nat.php

@@ -226,9 +226,7 @@ $( document ).ready(function() {
   <section class="page-content-main">
     <div class="container-fluid">
       <div class="row">
-        <?php if (isset($config['system']['disablefilter'])): ?>
-        <?php print_warning_box(gettext("The firewall has globally been disabled. Configured rules are currently not enforced."));?>
-        <?php endif; ?>
+<?php   print_service_banner('firewall'); ?>
 <?php   if (isset($savemsg)) print_info_box($savemsg); ?>
 <?php   if (is_subsystem_dirty('natconf')): ?>
 <?php     print_info_box_apply(gettext("The NAT configuration has been changed") . ".<br />" . gettext("You must apply the changes in order for them to take effect."));?><br />

src/www/firewall_nat_1to1.php

@@ -176,10 +176,8 @@ $main_buttons = array(
   <section class="page-content-main">
     <div class="container-fluid">
       <div class="row">
-        <?php if (isset($config['system']['disablefilter'])): ?>
-        <?php print_warning_box(gettext("The firewall has globally been disabled. Configured rules are currently not enforced."));?>
-        <?php endif; ?>
 <?php
+        print_service_banner('firewall');
         if (isset($savemsg))
           print_info_box($savemsg);
         if (is_subsystem_dirty('natconf'))

src/www/firewall_nat_npt.php

@@ -177,9 +177,7 @@ $main_buttons = array(
   <section class="page-content-main">
     <div class="container-fluid">
       <div class="row">
-        <?php if (isset($config['system']['disablefilter'])): ?>
-        <?php print_warning_box(gettext("The firewall has globally been disabled. Configured rules are currently not enforced."));?>
-        <?php endif; ?>
+        <?php print_service_banner('firewall'); ?>
         <?php if (isset($savemsg)) print_info_box($savemsg); ?>
         <?php if (is_subsystem_dirty('natconf')): ?>
         <?php print_info_box_apply(gettext("The NAT configuration has been changed") . ".<br />" . gettext("You must apply the changes in order for them to take effect."));?><br />

src/www/firewall_nat_out.php

@@ -247,10 +247,8 @@ include("head.inc");
   <section class="page-content-main">
     <div class="container-fluid">
       <div class="row">
-        <?php if (isset($config['system']['disablefilter'])): ?>
-        <?php print_warning_box(gettext("The firewall has globally been disabled. Configured rules are currently not enforced."));?>
-        <?php endif; ?>
 <?php
+        print_service_banner('firewall');
         if (isset($savemsg))
             print_info_box($savemsg);
         if (is_subsystem_dirty('natconf'))

src/www/firewall_rules.php

@@ -199,7 +199,7 @@ $( document ).ready(function() {
   <section class="page-content-main">
     <div class="container-fluid">
       <div class="row">
-        <?php print_service_disabled_banner('firewall'); ?>
+        <?php print_service_banner('firewall'); ?>
         <?php if (isset($savemsg)) print_info_box($savemsg); ?>
         <?php if (is_subsystem_dirty('filter')): ?><p>
         <?php print_info_box_apply(gettext("The firewall rule configuration has been changed.<br />You must apply the changes in order for them to take effect."));?>

src/www/guiconfig.inc

@@ -189,8 +189,9 @@ function do_input_validation($postdata, $reqdfields, $reqdfieldsn, &$input_error
 	}
 }
 
-function print_input_errors($input_errors) {
-	echo '<div class="col-xs-12"><div class="alert alert-danger alert-dismissible" role="alert">
+function print_input_errors($input_errors)
+{
+	echo '<div class="col-xs-12"><div class="alert alert-danger" role="alert">
             <button type="button" class="close" data-dismiss="alert"><span aria-hidden="true">&times;</span><span class="sr-only">Close</span></button>
 	';
 
@@ -201,6 +202,18 @@ function print_input_errors($input_errors) {
 	echo "</ul></div></div>";
 }
 
+function print_alert_box($msg, $alert = 'warning', $button = '')
+{
+	echo <<<EOFnp
+<div class="col-xs-12">
+	<div class="alert alert-{$alert}" role="alert">
+		{$button}
+		<p>{$msg}</p>
+	</div>
+</div>
+EOFnp;
+}
+
 function print_info_box_apply($msg)
 {
 	$value = gettext('Apply changes');
@@ -215,63 +228,35 @@ function print_info_box_apply($msg)
 	}
 	$savebutton .= '</form>';
 
-	echo <<<EOFnp
-	    <div class="col-xs-12">
-		<div class="alert alert-info alert-dismissible" role="alert">
-			{$savebutton}
-            <p>{$msg}</p>
-		</div>
-		</div>
-EOFnp;
+	print_alert_box($msg, 'info', $savebutton);
 }
 
 function print_info_box($msg)
 {
-	$savebutton = '<button type="button" class="close" data-dismiss="alert"><span aria-hidden="true">&times;</span><span class="sr-only">Close</span></button>';
-
-	echo <<<EOFnp
-<div class="col-xs-12">
-	<div class="alert alert-info alert-dismissible" role="alert">
-		{$savebutton}
-		<p>{$msg}</p>
-	</div>
-</div>
-EOFnp;
+	print_alert_box($msg, 'info');
 }
 
-function print_warning_box($msg) {
-	echo <<<EOFnp
-<div class="col-xs-12">
-	<div class="alert alert-warning alert-dismissible" role="alert">
-		<p>{$msg}</p>
-	</div>
-</div>
-EOFnp;
-}
-
-function is_service_enabled($service) {
+function print_service_banner($service)
+{
 	global $config;
 
 	switch ($service) {
 		case 'firewall':
-		case 'filter':
-			return !isset($config['system']['disablefilter']);
-		default:
-			return false;
+			if (!isset($config['system']['disablefilter'])) {
+				break;
 			}
-}
-
-function print_service_disabled_banner($service) {
-	if (!is_service_enabled($service)) {
-		switch ($service) {
-			case 'firewall':
-			case 'filter':
-				print_warning_box(gettext(
-					"The firewall has globally been disabled and configured rules are currently not enforced. " .
-					"It can be enabled in the <a href=\"system_advanced_firewall.php\">Firewall and NAT settings</a> page."
+			print_alert_box(sprintf(
+				gettext(
+					'The firewall has globally been disabled and configured rules are ' .
+					'currently not enforced. It can be enabled in the %sFirewall/NAT%s ' .
+					'settings.'
+				),
+				'<a href="/system_advanced_firewall.php">',
+				'</a>'
 			));
 			break;
-		}
+		default:
+			break;
 	}
 }
 

src/www/status_filter_reload.php

@@ -62,7 +62,7 @@ include("head.inc");
 	<section class="page-content-main">
 		<div class="container-fluid">
 			<div class="row">
-				<?php print_service_disabled_banner('firewall'); ?>
+				<?php print_service_banner('firewall'); ?>
 				<?php if (isset($input_errors) && count($input_errors) > 0) print_input_errors($input_errors); ?>
 
 			    <section class="col-xs-12">