* Reorganize the 'apply' button infrustructure in the GUI.

	- Present three new functions is/mark/clear_subsystem_dirty('name_of_subsystem'). This makes easier to create such things without needing to introduce new globals.
	- Convert all pages to the new infrustructure
	- This improves a lot the control on this notification

1 files changed, 6 insertions, 7 deletions

diff --git a/usr/local/www/firewall_rules.php b/usr/local/www/firewall_rules.php
index d4b7312..a4da1e0 100755
--- a/usr/local/www/firewall_rules.php
+++ b/usr/local/www/firewall_rules.php
@@ -100,8 +100,7 @@ if ($_POST) {
 		$retval = 0;
 		$retval = filter_configure();
 
-		if (file_exists($d_filterconfdirty_path))
-			unlink($d_filterconfdirty_path);
+		clear_subsystem_dirty('filter');
 
 		$savemsg = "The settings have been applied.  The firewall rules are now reloading in the background.  You can also <a href='status_filter_reload.php'>monitor</a> the reload progress.";
 	}
@@ -111,7 +110,7 @@ if ($_GET['act'] == "del") {
         if ($a_filter[$_GET['id']]) {
                 unset($a_filter[$_GET['id']]);
                 write_config();
-                touch($d_filterconfdirty_path);
+		mark_subsystem_dirty('filter');
                 header("Location: firewall_rules.php?if={$if}");
                 exit;
         }
@@ -124,7 +123,7 @@ if (isset($_POST['del_x'])) {
 			unset($a_filter[$rulei]);
 		}
 		write_config();
-		touch($d_filterconfdirty_path);
+		mark_subsystem_dirty('filter');
 		header("Location: firewall_rules.php?if={$if}");
 		exit;
 	}
@@ -135,7 +134,7 @@ if (isset($_POST['del_x'])) {
                 else
                         $a_filter[$_GET['id']]['disabled'] = true;
 		write_config();
-		touch($d_filterconfdirty_path);
+		mark_subsystem_dirty('filter');
 		header("Location: firewall_rules.php?if={$if}");
 		exit;
 	}
@@ -179,7 +178,7 @@ if (isset($_POST['del_x'])) {
 
 		$a_filter = $a_filter_new;
 		write_config();
-		touch($d_filterconfdirty_path);
+		mark_subsystem_dirty('filter');
 		header("Location: firewall_rules.php?if={$if}");
 		exit;
 	}
@@ -201,7 +200,7 @@ echo "<script type=\"text/javascript\" language=\"javascript\" src=\"/javascript
 <script type="text/javascript" language="javascript" src="/javascript/row_toggle.js">
 </script>
 <?php if ($savemsg) print_info_box($savemsg); ?>
-<?php if (file_exists($d_filterconfdirty_path)): ?><p>
+<?php if (is_subsystem_dirty('filter')): ?><p>
 <?php print_info_box_np("The firewall rule configuration has been changed.<br>You must apply the changes in order for them to take effect.");?><br>
 <?php endif; ?>
 <table width="100%" border="0" cellpadding="0" cellspacing="0">