Merge pull request #3663 from doktornotor/patch-7

16 files changed, 37 insertions, 29 deletions

diff --git a/src/usr/local/www/firewall_aliases.php b/src/usr/local/www/firewall_aliases.php
index 54ac0d8..f932acd 100644
--- a/src/usr/local/www/firewall_aliases.php
+++ b/src/usr/local/www/firewall_aliases.php
@@ -97,7 +97,7 @@ if ($_POST['act'] == "del") {
 				unlink_if_exists("/var/db/aliastables/" . $a_aliases[$_POST['id']]['name'] . ".txt");
 			}
 			unset($a_aliases[$_POST['id']]);
-			if (write_config()) {
+			if (write_config(gettext("Deleted a firewall alias."))) {
 				filter_configure();
 				mark_subsystem_dirty('aliases');
 			}
diff --git a/src/usr/local/www/firewall_aliases_edit.php b/src/usr/local/www/firewall_aliases_edit.php
index 4761d9f..de2d201 100644
--- a/src/usr/local/www/firewall_aliases_edit.php
+++ b/src/usr/local/www/firewall_aliases_edit.php
@@ -523,7 +523,7 @@ if ($_POST['save']) {
 		// Sort list
 		$a_aliases = msort($a_aliases, "name");
 
-		if (write_config()) {
+		if (write_config(gettext("Edited a firewall alias."))) {
 			mark_subsystem_dirty('aliases');
 		}
 
diff --git a/src/usr/local/www/firewall_aliases_import.php b/src/usr/local/www/firewall_aliases_import.php
index d3928ee..1350eeb 100644
--- a/src/usr/local/www/firewall_aliases_import.php
+++ b/src/usr/local/www/firewall_aliases_import.php
@@ -183,7 +183,7 @@ if ($_POST) {
 		// Sort list
 		$a_aliases = msort($a_aliases, "name");
 
-		if (write_config()) {
+		if (write_config(gettext("Imported a firewall alias."))) {
 			mark_subsystem_dirty('aliases');
 		}
 
diff --git a/src/usr/local/www/firewall_nat_1to1.php b/src/usr/local/www/firewall_nat_1to1.php
index d779da8..77684cd 100644
--- a/src/usr/local/www/firewall_nat_1to1.php
+++ b/src/usr/local/www/firewall_nat_1to1.php
@@ -53,7 +53,7 @@ if (array_key_exists('order-store', $_POST)) {
 
 		$a_1to1 = $a_1to1_new;
 
-		if (write_config()) {
+		if (write_config(gettext("Firewall: NAT: 1:1 - reordered NAT 1:1 mappings."))) {
 			mark_subsystem_dirty('natconf');
 		}
 
@@ -76,7 +76,7 @@ if ($_POST['apply']) {
 if ($_POST['act'] == "del") {
 	if ($a_1to1[$_POST['id']]) {
 		unset($a_1to1[$_POST['id']]);
-		if (write_config()) {
+		if (write_config(gettext("Firewall: NAT: 1:1 - deleted NAT 1:1 mapping."))) {
 			mark_subsystem_dirty('natconf');
 		}
 
@@ -92,7 +92,7 @@ if (isset($_POST['del_x'])) {
 			unset($a_1to1[$rulei]);
 		}
 
-		if (write_config()) {
+		if (write_config(gettext("Firewall: NAT: 1:1 - deleted selected NAT 1:1 mappings."))) {
 			mark_subsystem_dirty('natconf');
 		}
 
@@ -104,10 +104,12 @@ if (isset($_POST['del_x'])) {
 	if ($a_1to1[$_POST['id']]) {
 		if (isset($a_1to1[$_POST['id']]['disabled'])) {
 			unset($a_1to1[$_POST['id']]['disabled']);
+			$wc_msg = gettext('Firewall: NAT: 1:1 - enabled a NAT 1:1 rule.');
 		} else {
 			$a_1to1[$_POST['id']]['disabled'] = true;
+			$wc_msg = gettext('Firewall: NAT: 1:1 - disabled a NAT 1:1 rule.');
 		}
-		if (write_config(gettext("Firewall: NAT: 1:1, enable/disable NAT rule"))) {
+		if (write_config($wc_msg)) {
 			mark_subsystem_dirty('natconf');
 		}
 		header("Location: firewall_nat_1to1.php");
diff --git a/src/usr/local/www/firewall_nat_1to1_edit.php b/src/usr/local/www/firewall_nat_1to1_edit.php
index d16f4ce..f3f3734 100644
--- a/src/usr/local/www/firewall_nat_1to1_edit.php
+++ b/src/usr/local/www/firewall_nat_1to1_edit.php
@@ -279,7 +279,7 @@ if ($_POST['save']) {
 			}
 		}
 
-		if (write_config()) {
+		if (write_config(gettext("Firewall: NAT: 1:1 - saved/edited NAT 1:1 mapping."))) {
 			mark_subsystem_dirty('natconf');
 		}
 		header("Location: firewall_nat_1to1.php");
diff --git a/src/usr/local/www/firewall_nat_edit.php b/src/usr/local/www/firewall_nat_edit.php
index a77d6c1..8a1e029 100644
--- a/src/usr/local/www/firewall_nat_edit.php
+++ b/src/usr/local/www/firewall_nat_edit.php
@@ -520,7 +520,7 @@ if ($_POST['save']) {
 			}
 		}
 
-		if (write_config()) {
+		if (write_config(gettext("Firewall: NAT: Port Forward - saved/edited a port forward rule."))) {
 			mark_subsystem_dirty('natconf');
 		}
 
diff --git a/src/usr/local/www/firewall_nat_npt.php b/src/usr/local/www/firewall_nat_npt.php
index a12fe40..503b8c5 100644
--- a/src/usr/local/www/firewall_nat_npt.php
+++ b/src/usr/local/www/firewall_nat_npt.php
@@ -54,7 +54,7 @@ if (array_key_exists('order-store', $_REQUEST)) {
 
 		$a_npt = $a_npt_new;
 
-		if (write_config()) {
+		if (write_config(gettext("Firewall: NAT: NPt - reordered NPt mappings."))) {
 			mark_subsystem_dirty('natconf');
 		}
 
@@ -76,7 +76,7 @@ if ($_POST['apply']) {
 if ($_POST['act'] == "del") {
 	if ($a_npt[$_POST['id']]) {
 		unset($a_npt[$_POST['id']]);
-		if (write_config()) {
+		if (write_config(gettext("Firewall: NAT: NPt - deleted NPt mapping."))) {
 			mark_subsystem_dirty('natconf');
 		}
 		header("Location: firewall_nat_npt.php");
@@ -91,7 +91,7 @@ if (isset($_POST['del_x'])) {
 			unset($a_npt[$rulei]);
 		}
 
-		if (write_config()) {
+		if (write_config(gettext("Firewall: NAT: NPt - deleted selected NPt mappings."))) {
 			mark_subsystem_dirty('natconf');
 		}
 
@@ -103,10 +103,12 @@ if (isset($_POST['del_x'])) {
 	if ($a_npt[$_POST['id']]) {
 		if (isset($a_npt[$_POST['id']]['disabled'])) {
 			unset($a_npt[$_POST['id']]['disabled']);
+			$wc_msg = gettext('Firewall: NAT: NPt - enabled NPt rule.');
 		} else {
 			$a_npt[$_POST['id']]['disabled'] = true;
+			$wc_msg = gettext('Firewall: NAT: NPt - disabled NPt rule.');
 		}
-		if (write_config(gettext("Firewall: NAT: NPt, enable/disable NAT rule"))) {
+		if (write_config($wc_msg)) {
 			mark_subsystem_dirty('natconf');
 		}
 		header("Location: firewall_nat_npt.php");
diff --git a/src/usr/local/www/firewall_nat_npt_edit.php b/src/usr/local/www/firewall_nat_npt_edit.php
index 8bc53bd..f0958e4 100644
--- a/src/usr/local/www/firewall_nat_npt_edit.php
+++ b/src/usr/local/www/firewall_nat_npt_edit.php
@@ -128,7 +128,7 @@ if ($_POST['save']) {
 			}
 		}
 
-		if (write_config()) {
+		if (write_config(gettext("Firewall: NAT: NPt - saved/edited NPt mapping."))) {
 			mark_subsystem_dirty('natconf');
 		}
 
diff --git a/src/usr/local/www/firewall_nat_out.php b/src/usr/local/www/firewall_nat_out.php
index 44e0cea..d08eb30 100644
--- a/src/usr/local/www/firewall_nat_out.php
+++ b/src/usr/local/www/firewall_nat_out.php
@@ -62,7 +62,7 @@ if (isset($_REQUEST['order-store'])) {
 
 		$a_out = $a_out_new;
 
-		if (write_config()) {
+		if (write_config(gettext("Firewall: NAT: Outbound - reordered outbound NAT mappings."))) {
 			mark_subsystem_dirty('natconf');
 		}
 
@@ -139,7 +139,7 @@ if ($_POST['save']) {
 
 	$config['nat']['outbound']['mode'] = $_POST['mode'];
 
-	if (write_config()) {
+	if (write_config(gettext("Firewall: NAT: Outbound - saved outbound NAT settings."))) {
 		mark_subsystem_dirty('natconf');
 	}
 
@@ -152,7 +152,7 @@ if ($_POST['act'] == "del") {
 
 	if ($a_out[$_POST['id']]) {
 		unset($a_out[$_POST['id']]);
-		if (write_config()) {
+		if (write_config(gettext("Firewall: NAT: Outbound - deleted outbound NAT mapping."))) {
 			mark_subsystem_dirty('natconf');
 		}
 
@@ -173,7 +173,7 @@ if (isset($_POST['del_x'])) {
 			unset($a_out[$rulei]);
 		}
 
-		if (write_config()) {
+		if (write_config(gettext("Firewall: NAT: Outbound - deleted selected outbound NAT mappings."))) {
 			mark_subsystem_dirty('natconf');
 		}
 
@@ -185,10 +185,12 @@ if (isset($_POST['del_x'])) {
 	if ($a_out[$_POST['id']]) {
 		if (isset($a_out[$_POST['id']]['disabled'])) {
 			unset($a_out[$_POST['id']]['disabled']);
+			$wc_msg = gettext('Firewall: NAT: Outbound - enabled outbound NAT rule.');
 		} else {
 			$a_out[$_POST['id']]['disabled'] = true;
+			$wc_msg = gettext('Firewall: NAT: Outbound - disabled outbound NAT rule.');
 		}
-		if (write_config("Firewall: NAT: Outbound, enable/disable NAT rule")) {
+		if (write_config($wc_msg)) {
 			mark_subsystem_dirty('natconf');
 		}
 
diff --git a/src/usr/local/www/firewall_nat_out_edit.php b/src/usr/local/www/firewall_nat_out_edit.php
index f9579d2..786188d 100644
--- a/src/usr/local/www/firewall_nat_out_edit.php
+++ b/src/usr/local/www/firewall_nat_out_edit.php
@@ -382,7 +382,7 @@ if ($_POST['save']) {
 			}
 		}
 
-		if (write_config()) {
+		if (write_config(gettext("Firewall: NAT: Outbound - saved/edited outbound NAT mapping."))) {
 			mark_subsystem_dirty('natconf');
 		}
 		header("Location: firewall_nat_out.php");
diff --git a/src/usr/local/www/firewall_rules.php b/src/usr/local/www/firewall_rules.php
index b6087af..e97c63a 100644
--- a/src/usr/local/www/firewall_rules.php
+++ b/src/usr/local/www/firewall_rules.php
@@ -187,7 +187,7 @@ if ($_POST['act'] == "del") {
 		$mvnrows = -1;
 		move_separators($a_separators, $ridx, $mvnrows);
 
-		if (write_config()) {
+		if (write_config(gettext("Firewall: Rules - deleted a firewall rule."))) {
 			mark_subsystem_dirty('filter');
 		}
 
@@ -223,7 +223,7 @@ if (isset($_POST['del_x'])) {
 		}
 
 		if ($deleted) {
-			if (write_config()) {
+			if (write_config(gettext("Firewall: Rules - deleted selected firewall rules."))) {
 				mark_subsystem_dirty('filter');
 			}
 		}
@@ -235,10 +235,12 @@ if (isset($_POST['del_x'])) {
 	if ($a_filter[$_POST['id']]) {
 		if (isset($a_filter[$_POST['id']]['disabled'])) {
 			unset($a_filter[$_POST['id']]['disabled']);
+			$wc_msg = gettext('Firewall: Rules - enabled a firewall rule.');
 		} else {
 			$a_filter[$_POST['id']]['disabled'] = true;
+			$wc_msg = gettext('Firewall: Rules - disabled a firewall rule.');
 		}
-		if (write_config()) {
+		if (write_config($wc_msg)) {
 			mark_subsystem_dirty('filter');
 		}
 
@@ -289,7 +291,7 @@ if (isset($_POST['del_x'])) {
 			}
 		}
 
-		if (write_config()) {
+		if (write_config(gettext("Firewall: Rules - reordered firewall rules."))) {
 			mark_subsystem_dirty('filter');
 		}
 
diff --git a/src/usr/local/www/firewall_rules_edit.php b/src/usr/local/www/firewall_rules_edit.php
index 1c11768..dcc96de 100644
--- a/src/usr/local/www/firewall_rules_edit.php
+++ b/src/usr/local/www/firewall_rules_edit.php
@@ -1012,7 +1012,7 @@ if ($_POST['save']) {
 
 		filter_rules_sort();
 
-		if (write_config()) {
+		if (write_config(gettext("Firewall: Rules - saved/edited a firewall rule."))) {
 			mark_subsystem_dirty('filter');
 		}
 
diff --git a/src/usr/local/www/firewall_schedule.php b/src/usr/local/www/firewall_schedule.php
index 066ae24..a803341 100644
--- a/src/usr/local/www/firewall_schedule.php
+++ b/src/usr/local/www/firewall_schedule.php
@@ -69,7 +69,7 @@ if ($_POST['act'] == "del") {
 			$savemsg = sprintf(gettext("Cannot delete schedule. Currently in use by %s."), $referenced_by);
 		} else {
 			unset($a_schedules[$_POST['id']]);
-			write_config();
+			write_config(gettext("Firewall schedule deleted."));
 			header("Location: firewall_schedule.php");
 			exit;
 		}
diff --git a/src/usr/local/www/firewall_schedule_edit.php b/src/usr/local/www/firewall_schedule_edit.php
index 7267079..ce62b81 100644
--- a/src/usr/local/www/firewall_schedule_edit.php
+++ b/src/usr/local/www/firewall_schedule_edit.php
@@ -186,7 +186,7 @@ if ($_POST['save']) {
 
 		schedule_sort();
 
-		if (write_config()) {
+		if (write_config(gettext("Firewall schedule configured."))) {
 			filter_configure();
 		}
 
diff --git a/src/usr/local/www/firewall_virtual_ip.php b/src/usr/local/www/firewall_virtual_ip.php
index d4ea401..183337e 100644
--- a/src/usr/local/www/firewall_virtual_ip.php
+++ b/src/usr/local/www/firewall_virtual_ip.php
@@ -215,7 +215,7 @@ if ($_POST['act'] == "del") {
 			if (count($config['virtualip']['vip']) == 0) {
 				unset($config['virtualip']['vip']);
 			}
-			write_config();
+			write_config(gettext("Deleted a virtual IP."));
 			header("Location: firewall_virtual_ip.php");
 			exit;
 		}
diff --git a/src/usr/local/www/firewall_virtual_ip_edit.php b/src/usr/local/www/firewall_virtual_ip_edit.php
index 6a76e0b..f550d83 100644
--- a/src/usr/local/www/firewall_virtual_ip_edit.php
+++ b/src/usr/local/www/firewall_virtual_ip_edit.php
@@ -270,7 +270,7 @@ if ($_POST['save']) {
 
 		$a_vip[$id] = $vipent;
 
-		if (write_config()) {
+		if (write_config(gettext("Saved/edited a virtual IP."))) {
 			mark_subsystem_dirty('vip');
 			file_put_contents("{$g['tmp_path']}/.firewall_virtual_ip.apply", serialize($toapplylist));
 		}