From 824edb6c68ff7745db37baf7facf463eae75e433 Mon Sep 17 00:00:00 2001 From: Scott Ullrich Date: Tue, 9 Aug 2005 22:44:28 +0000 Subject: Eliminate reboots and correct messages --- usr/local/www/interfaces.php | 2 +- usr/local/www/interfaces_lan.php | 1 + usr/local/www/interfaces_opt.php | 2 +- usr/local/www/interfaces_wan.php | 2 +- usr/local/www/services_dhcp.php | 13 +++---------- 5 files changed, 7 insertions(+), 13 deletions(-) (limited to 'usr') diff --git a/usr/local/www/interfaces.php b/usr/local/www/interfaces.php index 4482680..3bcb47e 100755 --- a/usr/local/www/interfaces.php +++ b/usr/local/www/interfaces.php @@ -262,7 +262,7 @@ if ($_POST) { /* bring up carp interfaces */ interfaces_carp_bringup(); - $savemsg = "The changes have been applied."; + $savemsg = get_std_save_message($retval); } } diff --git a/usr/local/www/interfaces_lan.php b/usr/local/www/interfaces_lan.php index ce99047..0f99a6c 100755 --- a/usr/local/www/interfaces_lan.php +++ b/usr/local/www/interfaces_lan.php @@ -128,6 +128,7 @@ if ($_POST) { write_config($changedesc); + $savemsg = get_std_save_message($retval); if ($dhcpd_was_enabled) $savemsg .= "
Note that the DHCP server has been disabled.
Please review its configuration " . diff --git a/usr/local/www/interfaces_opt.php b/usr/local/www/interfaces_opt.php index 458f7ef..cf4755e 100755 --- a/usr/local/www/interfaces_opt.php +++ b/usr/local/www/interfaces_opt.php @@ -190,7 +190,7 @@ if ($_POST) { /* sync filter configuration */ filter_configure(); - $savemsg = "The changes have been applied."; + $savemsg = get_std_save_message($retval); } } diff --git a/usr/local/www/interfaces_wan.php b/usr/local/www/interfaces_wan.php index 4482680..3bcb47e 100755 --- a/usr/local/www/interfaces_wan.php +++ b/usr/local/www/interfaces_wan.php @@ -262,7 +262,7 @@ if ($_POST) { /* bring up carp interfaces */ interfaces_carp_bringup(); - $savemsg = "The changes have been applied."; + $savemsg = get_std_save_message($retval); } } diff --git a/usr/local/www/services_dhcp.php b/usr/local/www/services_dhcp.php index 85b5e33..e0d01ce 100755 --- a/usr/local/www/services_dhcp.php +++ b/usr/local/www/services_dhcp.php @@ -145,17 +145,10 @@ if ($_POST) { interfaces_staticarp_configure($if); $retval = 0; - if (!file_exists($d_sysrebootreqd_path)) { - config_lock(); - $retval = services_dhcpd_configure(); - config_unlock(); - } + config_lock(); + $retval = services_dhcpd_configure(); + config_unlock(); $savemsg = get_std_save_message($retval); - - if ($retval == 0) { - if (file_exists($d_staticmapsdirty_path)) - unlink($d_staticmapsdirty_path); - } } } -- cgit v1.1