diff options
-rwxr-xr-x | usr/local/www/firewall_aliases.php | 12 | ||||
-rwxr-xr-x | usr/local/www/firewall_nat_1to1.php | 10 | ||||
-rwxr-xr-x | usr/local/www/firewall_nat_out.php | 9 | ||||
-rwxr-xr-x | usr/local/www/firewall_nat_server.php | 10 | ||||
-rwxr-xr-x | usr/local/www/firewall_virtual_ip.php | 16 | ||||
-rwxr-xr-x | usr/local/www/load_balancer_pool.php | 12 | ||||
-rwxr-xr-x | usr/local/www/services_captiveportal_ip.php | 6 | ||||
-rwxr-xr-x | usr/local/www/services_captiveportal_mac.php | 6 | ||||
-rwxr-xr-x | usr/local/www/services_dnsmasq.php | 10 | ||||
-rwxr-xr-x | usr/local/www/services_snmp.php | 10 | ||||
-rwxr-xr-x | usr/local/www/vpn_pppoe_users.php | 10 |
11 files changed, 55 insertions, 56 deletions
diff --git a/usr/local/www/firewall_aliases.php b/usr/local/www/firewall_aliases.php index 62722c9..173946c 100755 --- a/usr/local/www/firewall_aliases.php +++ b/usr/local/www/firewall_aliases.php @@ -46,12 +46,12 @@ if ($_POST) { if ($_POST['apply']) { $retval = 0; - if (!file_exists($d_sysrebootreqd_path)) { - config_lock(); - /* reload all components that use aliases */ - $retval = filter_configure(); - config_unlock(); - } + + config_lock(); + /* reload all components that use aliases */ + $retval = filter_configure(); + config_unlock(); + if(stristr($retval, "error") <> true) $savemsg = get_std_save_message($retval); else diff --git a/usr/local/www/firewall_nat_1to1.php b/usr/local/www/firewall_nat_1to1.php index 342bdac..0602af8 100755 --- a/usr/local/www/firewall_nat_1to1.php +++ b/usr/local/www/firewall_nat_1to1.php @@ -44,11 +44,11 @@ if ($_POST) { if ($_POST['apply']) { $retval = 0; - if (!file_exists($d_sysrebootreqd_path)) { - config_lock(); - $retval |= filter_configure(); - config_unlock(); - } + + config_lock(); + $retval |= filter_configure(); + config_unlock(); + $savemsg = get_std_save_message($retval); if ($retval == 0) { diff --git a/usr/local/www/firewall_nat_out.php b/usr/local/www/firewall_nat_out.php index df69d8a..1f5f58b 100755 --- a/usr/local/www/firewall_nat_out.php +++ b/usr/local/www/firewall_nat_out.php @@ -49,11 +49,10 @@ if ($_POST) { $retval = 0; - if (!file_exists($d_sysrebootreqd_path)) { - config_lock(); - $retval |= filter_configure(); - config_unlock(); - } + config_lock(); + $retval |= filter_configure(); + config_unlock(); + if(stristr($retval, "error") <> true) $savemsg = get_std_save_message($retval); else diff --git a/usr/local/www/firewall_nat_server.php b/usr/local/www/firewall_nat_server.php index 3336f1b..61dfcc8 100755 --- a/usr/local/www/firewall_nat_server.php +++ b/usr/local/www/firewall_nat_server.php @@ -44,11 +44,11 @@ if ($_POST) { if ($_POST['apply']) { $retval = 0; - if (!file_exists($d_sysrebootreqd_path)) { - config_lock(); - $retval |= filter_configure(); - config_unlock(); - } + + config_lock(); + $retval |= filter_configure(); + config_unlock(); + $savemsg = get_std_save_message($retval); if ($retval == 0) { diff --git a/usr/local/www/firewall_virtual_ip.php b/usr/local/www/firewall_virtual_ip.php index e009afe..48a5e8b 100755 --- a/usr/local/www/firewall_virtual_ip.php +++ b/usr/local/www/firewall_virtual_ip.php @@ -50,14 +50,14 @@ if ($_POST) { if ($_POST['apply']) { $retval = 0; - if (!file_exists($d_sysrebootreqd_path)) { - config_lock(); - $retval = services_proxyarp_configure(); - /* Bring up any configured CARP interfaces */ - interfaces_carp_configure(); - $retval |= filter_configure(); - config_unlock(); - } + + config_lock(); + $retval = services_proxyarp_configure(); + /* Bring up any configured CARP interfaces */ + interfaces_carp_configure(); + $retval |= filter_configure(); + config_unlock(); + $savemsg = get_std_save_message($retval); unlink_if_exists($d_vipconfdirty_path); } diff --git a/usr/local/www/load_balancer_pool.php b/usr/local/www/load_balancer_pool.php index 27133c3..d1d7979 100755 --- a/usr/local/www/load_balancer_pool.php +++ b/usr/local/www/load_balancer_pool.php @@ -42,12 +42,12 @@ if ($_POST) { if ($_POST['apply']) { $retval = 0; - if (!file_exists($d_sysrebootreqd_path)) { - config_lock(); - $retval |= filter_configure(); - $retval |= slbd_configure(); - config_unlock(); - } + + config_lock(); + $retval |= filter_configure(); + $retval |= slbd_configure(); + config_unlock(); + $savemsg = get_std_save_message($retval); //unlink_if_exists($d_poolconfdirty_path); } diff --git a/usr/local/www/services_captiveportal_ip.php b/usr/local/www/services_captiveportal_ip.php index ef486da..d0eaf27 100755 --- a/usr/local/www/services_captiveportal_ip.php +++ b/usr/local/www/services_captiveportal_ip.php @@ -44,9 +44,9 @@ if ($_POST) { if ($_POST['apply']) { $retval = 0; - if (!file_exists($d_sysrebootreqd_path)) { - $retval = captiveportal_allowedip_configure(); - } + + $retval = captiveportal_allowedip_configure(); + $savemsg = get_std_save_message($retval); if ($retval == 0) { if (file_exists($d_allowedipsdirty_path)) { diff --git a/usr/local/www/services_captiveportal_mac.php b/usr/local/www/services_captiveportal_mac.php index b4a48b5..9f16c51 100755 --- a/usr/local/www/services_captiveportal_mac.php +++ b/usr/local/www/services_captiveportal_mac.php @@ -44,9 +44,9 @@ if ($_POST) { if ($_POST['apply']) { $retval = 0; - if (!file_exists($d_sysrebootreqd_path)) { - $retval = captiveportal_passthrumac_configure(); - } + + $retval = captiveportal_passthrumac_configure(); + $savemsg = get_std_save_message($retval); if ($retval == 0) { if (file_exists($d_passthrumacsdirty_path)) { diff --git a/usr/local/www/services_dnsmasq.php b/usr/local/www/services_dnsmasq.php index 7e64e14..6c78434 100755 --- a/usr/local/www/services_dnsmasq.php +++ b/usr/local/www/services_dnsmasq.php @@ -56,11 +56,11 @@ if ($_POST) { write_config(); $retval = 0; - if (!file_exists($d_sysrebootreqd_path)) { - config_lock(); - $retval = services_dnsmasq_configure(); - config_unlock(); - } + + config_lock(); + $retval = services_dnsmasq_configure(); + config_unlock(); + $savemsg = get_std_save_message($retval); if ($retval == 0) { diff --git a/usr/local/www/services_snmp.php b/usr/local/www/services_snmp.php index 8573fee..8a38ebf 100755 --- a/usr/local/www/services_snmp.php +++ b/usr/local/www/services_snmp.php @@ -133,11 +133,11 @@ if ($_POST) { write_config(); $retval = 0; - if (!file_exists($d_sysrebootreqd_path)) { - config_lock(); - $retval = services_snmpd_configure(); - config_unlock(); - } + + config_lock(); + $retval = services_snmpd_configure(); + config_unlock(); + $savemsg = get_std_save_message($retval); } } diff --git a/usr/local/www/vpn_pppoe_users.php b/usr/local/www/vpn_pppoe_users.php index 56c49c4..78f2c71 100755 --- a/usr/local/www/vpn_pppoe_users.php +++ b/usr/local/www/vpn_pppoe_users.php @@ -43,11 +43,11 @@ if ($_POST) { if ($_POST['apply']) { $retval = 0; - if (!file_exists($d_sysrebootreqd_path)) { - config_lock(); - $retval = vpn_pppoe_configure(); - config_unlock(); - } + + config_lock(); + $retval = vpn_pppoe_configure(); + config_unlock(); + $savemsg = get_std_save_message($retval); if ($retval == 0) { if (file_exists($d_pppoeuserdirty_path)) |