diff options
| author | Vinicius Coque <vinicius.coque@bluepex.com> | 2011-03-25 08:49:04 -0300 |
|---|---|---|
| committer | Vinicius Coque <vinicius.coque@bluepex.com> | 2011-03-25 08:49:04 -0300 |
| commit | 54bdff758f68e2e1b1ebd42b8b0b629b68ed1a3d (patch) | |
| tree | 27b7d45e582e3d84cdf8d0fa0f3bc93b65f3c986 /usr/local/www/guiconfig.inc | |
| parent | b845290619244e8cfe3bc2aa6271c6629eeb86b5 (diff) | |
| parent | 401fb0ad8fa7ad06743435808dac8e913b3c16bb (diff) | |
| download | pfsense-54bdff758f68e2e1b1ebd42b8b0b629b68ed1a3d.zip pfsense-54bdff758f68e2e1b1ebd42b8b0b629b68ed1a3d.tar.gz | |
Merge remote-tracking branch 'mainline/master' into inc
Conflicts:
etc/inc/auth.inc
etc/inc/config.lib.inc
etc/inc/filter.inc
etc/inc/pfsense-utils.inc
etc/inc/pkg-utils.inc
etc/inc/priv.defs.inc
etc/inc/services.inc
etc/inc/shaper.inc
etc/inc/voucher.inc
etc/inc/vpn.inc
usr/local/www/fbegin.inc
Diffstat (limited to 'usr/local/www/guiconfig.inc')
| -rwxr-xr-x | usr/local/www/guiconfig.inc | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/usr/local/www/guiconfig.inc b/usr/local/www/guiconfig.inc index c6a58b3..6b3aefd 100755 --- a/usr/local/www/guiconfig.inc +++ b/usr/local/www/guiconfig.inc @@ -418,8 +418,15 @@ function print_info_box($msg) { function get_std_save_message($ok) { global $d_sysrebootreqd_path; - - return "The changes have been applied successfully. You can also <a href='status_filter_reload.php'>monitor</a> the filter reload progress."; + $filter_related = false; + $filter_pages = array("nat", "filter"); + $to_return = "The changes have been applied successfully."; + foreach($filter_pages as $fp) + if(stristr($_SERVER['SCRIPT_FILENAME'], $fp)) + $filter_related = true; + if($filter_related) + $to_return .= "<br/>You can also <a href='status_filter_reload.php'>monitor</a> the filter reload progress."; + return $to_return; } function pprint_address($adr) { |
