diff options
author | Scott Ullrich <sullrich@pfsense.org> | 2005-02-07 05:00:50 +0000 |
---|---|---|
committer | Scott Ullrich <sullrich@pfsense.org> | 2005-02-07 05:00:50 +0000 |
commit | b2774343a3e9d0a3533c7b71f42b6595252ed209 (patch) | |
tree | 61a6b767d071944adf55a997bea7b2a65613502c /usr/local | |
parent | a46b841a2e33c9d55bd5de62384c52a902d6efcf (diff) | |
download | pfsense-b2774343a3e9d0a3533c7b71f42b6595252ed209.zip pfsense-b2774343a3e9d0a3533c7b71f42b6595252ed209.tar.gz |
If an error occurs during the rule loading, report the error to the user.
Diffstat (limited to 'usr/local')
-rwxr-xr-x | usr/local/www/firewall_aliases.php | 5 | ||||
-rwxr-xr-x | usr/local/www/firewall_nat.php | 2 | ||||
-rwxr-xr-x | usr/local/www/firewall_rules.php | 4 | ||||
-rwxr-xr-x | usr/local/www/firewall_shaper.php | 2 |
4 files changed, 8 insertions, 5 deletions
diff --git a/usr/local/www/firewall_aliases.php b/usr/local/www/firewall_aliases.php index 770a7df..eaf0639 100755 --- a/usr/local/www/firewall_aliases.php +++ b/usr/local/www/firewall_aliases.php @@ -51,7 +51,10 @@ if ($_POST) { $retval = filter_configure(); config_unlock(); } - $savemsg = get_std_save_message($retval); + if(stristr($retval, "error") <> true) + $savemsg = get_std_save_message($retval); + else + $savemsg = $retval; if ($retval == 0) { if (file_exists($d_aliasesdirty_path)) unlink($d_aliasesdirty_path); diff --git a/usr/local/www/firewall_nat.php b/usr/local/www/firewall_nat.php index ee1c83a..11e6058 100755 --- a/usr/local/www/firewall_nat.php +++ b/usr/local/www/firewall_nat.php @@ -50,7 +50,7 @@ if ($_POST) { $retval |= filter_configure(); config_unlock(); } - if($retval == 0) + if(stristr($retval, "error") <> true) $savemsg = get_std_save_message($retval); else $savemsg = $retval; diff --git a/usr/local/www/firewall_rules.php b/usr/local/www/firewall_rules.php index 0634a66..ca1edc2 100755 --- a/usr/local/www/firewall_rules.php +++ b/usr/local/www/firewall_rules.php @@ -60,13 +60,13 @@ if ($_POST) { $pconfig = $_POST; if ($_POST['apply']) { - $retval = 0; + $retval = "Reboot is currently required."; if (!file_exists($d_sysrebootreqd_path)) { config_lock(); $retval = filter_configure(); config_unlock(); } - if($retval == 0) + if(stristr($retval, "error") <> true) $savemsg = get_std_save_message($retval); else $savemsg = $retval; diff --git a/usr/local/www/firewall_shaper.php b/usr/local/www/firewall_shaper.php index 267772f..8eb10e8 100755 --- a/usr/local/www/firewall_shaper.php +++ b/usr/local/www/firewall_shaper.php @@ -62,7 +62,7 @@ if ($_POST) { config_lock(); $retval = filter_configure(); config_unlock(); - if($retval == 0) + if(stristr($retval, "error") <> true) $savemsg = get_std_save_message($retval); else $savemsg = $retval; |