From ca4acbcdd84195c9917363fceabcd4b5294bf1d0 Mon Sep 17 00:00:00 2001 From: Scott Ullrich Date: Thu, 23 Jun 2011 14:08:38 -0400 Subject: After an interface mismatch and apply actually show when we are rebooting instead of the same message that the interface mismatch exists when really the system is rebooting. --- usr/local/www/interfaces_assign.php | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) (limited to 'usr/local/www') diff --git a/usr/local/www/interfaces_assign.php b/usr/local/www/interfaces_assign.php index 3e35b0e..88efcbd 100755 --- a/usr/local/www/interfaces_assign.php +++ b/usr/local/www/interfaces_assign.php @@ -154,9 +154,10 @@ if (is_array($config['openvpn'])) { } if ($_POST['apply']) { - if (file_exists("/var/run/interface_mismatch_reboot_needed")) + if (file_exists("/var/run/interface_mismatch_reboot_needed")) { system_reboot(); - else { + $rebootingnow = true; + } else { write_config(); $retval = 0; @@ -370,11 +371,14 @@ if ($_GET['act'] == "add" && (count($config['interfaces']) < count($portlist))) include("head.inc"); if(file_exists("/var/run/interface_mismatch_reboot_needed")) - if ($_POST) - $savemsg = gettext("Reboot is needed. Please apply the settings in order to reboot."); - else + if ($_POST) { + if($rebootingnow) + $savemsg = gettext("The system is now rebooting. Please wait."); + else + $savemsg = gettext("Reboot is needed. Please apply the settings in order to reboot."); + } else { $savemsg = gettext("Interface mismatch detected. Please resolve the mismatch and click Save. The firewall will reboot afterwards."); - + } ?> -- cgit v1.1