From ba800ae6c8be6d321b4bf47dcbd6a9e43a1f97c7 Mon Sep 17 00:00:00 2001 From: Ad Schellevis Date: Mon, 6 Jul 2015 14:43:02 +0000 Subject: [PATCH] (legacy) fix check on $savemsg and $input_errors --- src/www/carp_status.php | 2 +- src/www/diag_authentication.php | 4 ++-- src/www/diag_backup.php | 4 ++-- src/www/diag_dns.php | 2 +- src/www/diag_gmirror.php | 2 +- src/www/diag_ipsec.php | 2 +- src/www/diag_ipsec_leases.php | 2 +- src/www/diag_ipsec_sad.php | 2 +- src/www/diag_ipsec_spd.php | 2 +- src/www/diag_limiter_info.php | 2 +- src/www/diag_logs.php | 2 +- src/www/diag_logs_auth.php | 2 +- src/www/diag_logs_dhcp.php | 2 +- src/www/diag_logs_filter.php | 2 +- src/www/diag_logs_filter_dynamic.php | 2 +- src/www/diag_logs_filter_summary.php | 2 +- src/www/diag_logs_gateways.php | 2 +- src/www/diag_logs_ipsec.php | 2 +- src/www/diag_logs_ntpd.php | 2 +- src/www/diag_logs_openvpn.php | 2 +- src/www/diag_logs_ppp.php | 2 +- src/www/diag_logs_relayd.php | 2 +- src/www/diag_logs_resolver.php | 2 +- src/www/diag_logs_routing.php | 2 +- src/www/diag_logs_settings.php | 4 ++-- src/www/diag_logs_vpn.php | 2 +- src/www/diag_logs_wireless.php | 2 +- src/www/diag_packet_capture.php | 2 +- src/www/diag_pf_info.php | 2 +- src/www/diag_ping.php | 2 +- src/www/diag_resetstate.php | 8 ++++---- src/www/diag_routes.php | 2 +- src/www/diag_smart.php | 4 ++-- src/www/diag_sockets.php | 2 +- src/www/diag_system_activity.php | 2 +- src/www/diag_system_pftop.php | 2 +- src/www/diag_tables.php | 2 +- src/www/diag_testport.php | 2 +- src/www/diag_traceroute.php | 2 +- src/www/easyrule.php | 2 +- src/www/firewall_aliases.php | 2 +- src/www/firewall_aliases_edit.php | 2 +- src/www/firewall_aliases_import.php | 2 +- src/www/firewall_nat.php | 2 +- src/www/firewall_nat_1to1.php | 2 +- src/www/firewall_nat_1to1_edit.php | 2 +- src/www/firewall_nat_edit.php | 2 +- src/www/firewall_nat_npt.php | 2 +- src/www/firewall_nat_npt_edit.php | 2 +- src/www/firewall_nat_out.php | 2 +- src/www/firewall_nat_out_edit.php | 2 +- src/www/firewall_rules.php | 2 +- src/www/firewall_rules_edit.php | 2 +- src/www/firewall_schedule.php | 2 +- src/www/firewall_schedule_edit.php | 2 +- src/www/firewall_virtual_ip.php | 4 ++-- src/www/firewall_virtual_ip_edit.php | 2 +- src/www/interfaces.php | 4 ++-- src/www/interfaces_assign.php | 2 +- src/www/interfaces_bridge.php | 2 +- src/www/interfaces_bridge_edit.php | 2 +- src/www/interfaces_gif.php | 2 +- src/www/interfaces_gif_edit.php | 2 +- src/www/interfaces_gre.php | 2 +- src/www/interfaces_gre_edit.php | 2 +- src/www/interfaces_groups_edit.php | 2 +- src/www/interfaces_lagg.php | 2 +- src/www/interfaces_lagg_edit.php | 2 +- src/www/interfaces_ppps.php | 2 +- src/www/interfaces_ppps_edit.php | 2 +- src/www/interfaces_qinq.php | 2 +- src/www/interfaces_qinq_edit.php | 2 +- src/www/interfaces_vlan.php | 2 +- src/www/interfaces_vlan_edit.php | 2 +- src/www/interfaces_wireless.php | 2 +- src/www/interfaces_wireless_edit.php | 2 +- src/www/load_balancer_monitor.php | 4 ++-- src/www/load_balancer_monitor_edit.php | 2 +- src/www/load_balancer_pool.php | 4 ++-- src/www/load_balancer_pool_edit.php | 2 +- src/www/load_balancer_relay_action.php | 4 ++-- src/www/load_balancer_relay_action_edit.php | 2 +- src/www/load_balancer_relay_protocol.php | 4 ++-- src/www/load_balancer_relay_protocol_edit.php | 2 +- src/www/load_balancer_setting.php | 4 ++-- src/www/load_balancer_virtual_server.php | 4 ++-- src/www/load_balancer_virtual_server_edit.php | 2 +- src/www/services_captiveportal.php | 4 ++-- src/www/services_captiveportal_filemanager.php | 2 +- src/www/services_captiveportal_ip.php | 2 +- src/www/services_captiveportal_ip_edit.php | 2 +- src/www/services_captiveportal_mac.php | 2 +- src/www/services_captiveportal_mac_edit.php | 2 +- src/www/services_captiveportal_vouchers.php | 4 ++-- src/www/services_captiveportal_vouchers_edit.php | 4 ++-- src/www/services_captiveportal_zones.php | 2 +- src/www/services_captiveportal_zones_edit.php | 2 +- src/www/services_dhcp.php | 4 ++-- src/www/services_dhcp_edit.php | 2 +- src/www/services_dhcp_relay.php | 4 ++-- src/www/services_dhcpv6.php | 4 ++-- src/www/services_dhcpv6_edit.php | 2 +- src/www/services_dhcpv6_relay.php | 4 ++-- src/www/services_dnsmasq.php | 4 ++-- src/www/services_dnsmasq_domainoverride_edit.php | 2 +- src/www/services_dnsmasq_edit.php | 2 +- src/www/services_dyndns.php | 2 +- src/www/services_dyndns_edit.php | 4 ++-- src/www/services_igmpproxy.php | 2 +- src/www/services_igmpproxy_edit.php | 2 +- src/www/services_ntpd.php | 4 ++-- src/www/services_ntpd_gps.php | 4 ++-- src/www/services_ntpd_pps.php | 4 ++-- src/www/services_opendns.php | 4 ++-- src/www/services_rfc2136.php | 2 +- src/www/services_rfc2136_edit.php | 4 ++-- src/www/services_router_advertisements.php | 4 ++-- src/www/services_snmp.php | 4 ++-- src/www/services_unbound.php | 4 ++-- src/www/services_unbound_acls.php | 4 ++-- src/www/services_unbound_advanced.php | 4 ++-- src/www/services_unbound_domainoverride_edit.php | 2 +- src/www/services_unbound_host_edit.php | 2 +- src/www/services_wol.php | 4 ++-- src/www/services_wol_edit.php | 2 +- src/www/status_filter_reload.php | 2 +- src/www/status_gateway_groups.php | 2 +- src/www/status_gateways.php | 2 +- src/www/status_graph.php | 2 +- src/www/status_rrd_graph_settings.php | 4 ++-- src/www/status_services.php | 2 +- src/www/status_upnp.php | 2 +- src/www/status_wireless.php | 4 ++-- src/www/system_advanced_admin.php | 4 ++-- src/www/system_advanced_firewall.php | 4 ++-- src/www/system_advanced_misc.php | 4 ++-- src/www/system_advanced_network.php | 4 ++-- src/www/system_advanced_notifications.php | 4 ++-- src/www/system_advanced_sysctl.php | 4 ++-- src/www/system_authservers.php | 4 ++-- src/www/system_camanager.php | 4 ++-- src/www/system_certmanager.php | 4 ++-- src/www/system_crlmanager.php | 4 ++-- src/www/system_gateway_groups.php | 2 +- src/www/system_gateway_groups_edit.php | 2 +- src/www/system_gateways.php | 4 ++-- src/www/system_gateways_edit.php | 2 +- src/www/system_general.php | 4 ++-- src/www/system_groupmanager.php | 4 ++-- src/www/system_groupmanager_addprivs.php | 4 ++-- src/www/system_routes.php | 2 +- src/www/system_routes_edit.php | 2 +- src/www/system_usermanager.php | 4 ++-- src/www/system_usermanager_addprivs.php | 4 ++-- src/www/system_usermanager_settings.php | 4 ++-- src/www/vpn_ipsec.php | 2 +- src/www/vpn_ipsec_keys.php | 2 +- src/www/vpn_ipsec_keys_edit.php | 2 +- src/www/vpn_ipsec_mobile.php | 4 ++-- src/www/vpn_ipsec_phase1.php | 2 +- src/www/vpn_ipsec_phase2.php | 2 +- src/www/vpn_ipsec_settings.php | 4 ++-- src/www/vpn_l2tp.php | 4 ++-- src/www/vpn_l2tp_users.php | 2 +- src/www/vpn_l2tp_users_edit.php | 2 +- src/www/vpn_openvpn_client.php | 4 ++-- src/www/vpn_openvpn_csc.php | 4 ++-- src/www/vpn_openvpn_export.php | 4 ++-- src/www/vpn_openvpn_export_shared.php | 4 ++-- src/www/vpn_openvpn_server.php | 4 ++-- src/www/vpn_pppoe.php | 2 +- src/www/vpn_pppoe_edit.php | 4 ++-- src/www/vpn_pptp.php | 4 ++-- src/www/vpn_pptp_users.php | 2 +- src/www/vpn_pptp_users_edit.php | 2 +- src/www/wizard.php | 4 ++-- 176 files changed, 241 insertions(+), 241 deletions(-) diff --git a/src/www/carp_status.php b/src/www/carp_status.php index 147266fc7..c36a91226 100644 --- a/src/www/carp_status.php +++ b/src/www/carp_status.php @@ -90,7 +90,7 @@ include("head.inc");
- + " . gettext("Check link status on all interfaces with configured CARP VIPs.")); ?> diff --git a/src/www/diag_authentication.php b/src/www/diag_authentication.php index ec6ba71e3..24cc32cf0 100644 --- a/src/www/diag_authentication.php +++ b/src/www/diag_authentication.php @@ -64,14 +64,14 @@ include("head.inc"); - +
- +
diff --git a/src/www/diag_backup.php b/src/www/diag_backup.php index 187bc20a7..18ef3c060 100644 --- a/src/www/diag_backup.php +++ b/src/www/diag_backup.php @@ -574,7 +574,7 @@ function backuparea_change(obj) { - +
@@ -588,7 +588,7 @@ function backuparea_change(obj) {
- +
diff --git a/src/www/diag_dns.php b/src/www/diag_dns.php index 762dac9b0..e0343624d 100644 --- a/src/www/diag_dns.php +++ b/src/www/diag_dns.php @@ -175,7 +175,7 @@ include("head.inc"); ?>
- +

diff --git a/src/www/diag_gmirror.php b/src/www/diag_gmirror.php index b914da9c4..e0bd655ac 100644 --- a/src/www/diag_gmirror.php +++ b/src/www/diag_gmirror.php @@ -157,7 +157,7 @@ foreach ($unused_disks as $disk) {
- +
diff --git a/src/www/diag_ipsec_leases.php b/src/www/diag_ipsec_leases.php index af49fec1e..a063567f6 100644 --- a/src/www/diag_ipsec_leases.php +++ b/src/www/diag_ipsec_leases.php @@ -44,7 +44,7 @@ $mobile = ipsec_dump_mobile();
- +
diff --git a/src/www/diag_ipsec_sad.php b/src/www/diag_ipsec_sad.php index 5ec677ad0..46fe04efa 100644 --- a/src/www/diag_ipsec_sad.php +++ b/src/www/diag_ipsec_sad.php @@ -46,7 +46,7 @@ $sad = ipsec_dump_sad();
- +
diff --git a/src/www/diag_ipsec_spd.php b/src/www/diag_ipsec_spd.php index 2face8d0c..0b5eb9e1e 100644 --- a/src/www/diag_ipsec_spd.php +++ b/src/www/diag_ipsec_spd.php @@ -45,7 +45,7 @@ $spd = ipsec_dump_spd();
- +
diff --git a/src/www/diag_limiter_info.php b/src/www/diag_limiter_info.php index 1defcc07c..ad20fb052 100644 --- a/src/www/diag_limiter_info.php +++ b/src/www/diag_limiter_info.php @@ -84,7 +84,7 @@ include("head.inc"); print_info_box($savemsg); echo "
"; } - if ($input_errors) + if (isset($input_errors)) print_input_errors($input_errors); ?> diff --git a/src/www/diag_logs.php b/src/www/diag_logs.php index 619cf4831..d17809b74 100644 --- a/src/www/diag_logs.php +++ b/src/www/diag_logs.php @@ -66,7 +66,7 @@ include("head.inc");
- +
diff --git a/src/www/diag_logs_auth.php b/src/www/diag_logs_auth.php index 4e42654c9..b9007b6c5 100644 --- a/src/www/diag_logs_auth.php +++ b/src/www/diag_logs_auth.php @@ -54,7 +54,7 @@ include("head.inc");
- +
diff --git a/src/www/diag_logs_dhcp.php b/src/www/diag_logs_dhcp.php index 55b148714..c6873da06 100644 --- a/src/www/diag_logs_dhcp.php +++ b/src/www/diag_logs_dhcp.php @@ -56,7 +56,7 @@ include("head.inc");
- +
diff --git a/src/www/diag_logs_filter.php b/src/www/diag_logs_filter.php index cd075b6f8..b8fda7818 100644 --- a/src/www/diag_logs_filter.php +++ b/src/www/diag_logs_filter.php @@ -122,7 +122,7 @@ include("head.inc");
- +
diff --git a/src/www/diag_logs_filter_dynamic.php b/src/www/diag_logs_filter_dynamic.php index e69522c60..75d064bf1 100644 --- a/src/www/diag_logs_filter_dynamic.php +++ b/src/www/diag_logs_filter_dynamic.php @@ -85,7 +85,7 @@ include("head.inc");
- +
diff --git a/src/www/diag_logs_filter_summary.php b/src/www/diag_logs_filter_summary.php index 9ba72aa9c..309d8a679 100644 --- a/src/www/diag_logs_filter_summary.php +++ b/src/www/diag_logs_filter_summary.php @@ -182,7 +182,7 @@ include("head.inc"); ?>
- +
diff --git a/src/www/diag_logs_gateways.php b/src/www/diag_logs_gateways.php index b0955747a..28bc195df 100644 --- a/src/www/diag_logs_gateways.php +++ b/src/www/diag_logs_gateways.php @@ -68,7 +68,7 @@ include("head.inc");
- +
diff --git a/src/www/diag_logs_ipsec.php b/src/www/diag_logs_ipsec.php index 96cfae9f1..b894e3db7 100644 --- a/src/www/diag_logs_ipsec.php +++ b/src/www/diag_logs_ipsec.php @@ -58,7 +58,7 @@ include("head.inc");
- +
diff --git a/src/www/diag_logs_ntpd.php b/src/www/diag_logs_ntpd.php index 603651b43..7d0e53784 100644 --- a/src/www/diag_logs_ntpd.php +++ b/src/www/diag_logs_ntpd.php @@ -55,7 +55,7 @@ include("head.inc");
- +
diff --git a/src/www/diag_logs_openvpn.php b/src/www/diag_logs_openvpn.php index 887a07a37..c9070fc5e 100644 --- a/src/www/diag_logs_openvpn.php +++ b/src/www/diag_logs_openvpn.php @@ -57,7 +57,7 @@ include("head.inc");
- +
diff --git a/src/www/diag_logs_ppp.php b/src/www/diag_logs_ppp.php index 019c28e82..2b87ac46c 100644 --- a/src/www/diag_logs_ppp.php +++ b/src/www/diag_logs_ppp.php @@ -54,7 +54,7 @@ include("head.inc");
- +
diff --git a/src/www/diag_logs_relayd.php b/src/www/diag_logs_relayd.php index a40f91761..e455b0450 100644 --- a/src/www/diag_logs_relayd.php +++ b/src/www/diag_logs_relayd.php @@ -56,7 +56,7 @@ include("head.inc");
- +
diff --git a/src/www/diag_logs_resolver.php b/src/www/diag_logs_resolver.php index a8c5b4f40..806d3d971 100644 --- a/src/www/diag_logs_resolver.php +++ b/src/www/diag_logs_resolver.php @@ -68,7 +68,7 @@ include("head.inc");
- +
diff --git a/src/www/diag_logs_routing.php b/src/www/diag_logs_routing.php index 42518d964..94dcd1174 100644 --- a/src/www/diag_logs_routing.php +++ b/src/www/diag_logs_routing.php @@ -54,7 +54,7 @@ include("head.inc");
- +
diff --git a/src/www/diag_logs_settings.php b/src/www/diag_logs_settings.php index cbb77952e..8678ed740 100644 --- a/src/www/diag_logs_settings.php +++ b/src/www/diag_logs_settings.php @@ -245,8 +245,8 @@ function check_everything() {
- - + +
diff --git a/src/www/diag_logs_vpn.php b/src/www/diag_logs_vpn.php index 285f33889..d2962afd3 100644 --- a/src/www/diag_logs_vpn.php +++ b/src/www/diag_logs_vpn.php @@ -110,7 +110,7 @@ include("head.inc");
- +
diff --git a/src/www/diag_logs_wireless.php b/src/www/diag_logs_wireless.php index fca39f427..065850504 100644 --- a/src/www/diag_logs_wireless.php +++ b/src/www/diag_logs_wireless.php @@ -56,7 +56,7 @@ include("head.inc");
- +
diff --git a/src/www/diag_packet_capture.php b/src/www/diag_packet_capture.php index bdcb56e52..f90b6b8a1 100644 --- a/src/www/diag_packet_capture.php +++ b/src/www/diag_packet_capture.php @@ -220,7 +220,7 @@ include("fbegin.inc");
- +

diff --git a/src/www/diag_pf_info.php b/src/www/diag_pf_info.php index a319ea6af..d810b59ca 100644 --- a/src/www/diag_pf_info.php +++ b/src/www/diag_pf_info.php @@ -79,7 +79,7 @@ jQuery(document).ready(function() {setTimeout('getpfinfo()', 5000);}); print_info_box($savemsg); echo "
"; } - if ($input_errors) + if (isset($input_errors)) print_input_errors($input_errors); ?> diff --git a/src/www/diag_ping.php b/src/www/diag_ping.php index d3fb3eeab..d4bded324 100644 --- a/src/www/diag_ping.php +++ b/src/www/diag_ping.php @@ -77,7 +77,7 @@ include("head.inc"); ?>
- +
diff --git a/src/www/diag_resetstate.php b/src/www/diag_resetstate.php index ad407703d..711582d01 100644 --- a/src/www/diag_resetstate.php +++ b/src/www/diag_resetstate.php @@ -35,13 +35,13 @@ if ($_POST) { $savemsg = ""; if ($_POST['statetable']) { filter_flush_state_table(); - if ($savemsg) + if (isset($savemsg)) $savemsg .= " "; $savemsg .= gettext("The state table has been flushed successfully."); } if ($_POST['sourcetracking']) { mwexec("/sbin/pfctl -F Sources"); - if ($savemsg) + if (isset($savemsg)) $savemsg .= "
"; $savemsg .= gettext("The source tracking table has been flushed successfully."); } @@ -77,8 +77,8 @@ include("head.inc");
- - + + diff --git a/src/www/diag_routes.php b/src/www/diag_routes.php index 9d1f2d003..8b96d05ce 100644 --- a/src/www/diag_routes.php +++ b/src/www/diag_routes.php @@ -153,7 +153,7 @@ include('head.inc');
- +
diff --git a/src/www/diag_smart.php b/src/www/diag_smart.php index 805afcda5..f9d662a54 100644 --- a/src/www/diag_smart.php +++ b/src/www/diag_smart.php @@ -194,7 +194,7 @@ switch($action) { } } // Was the config changed? if so , print the message - if ($savemsg) print_info_box($savemsg); + if (isset($savemsg)) print_info_box($savemsg); // Get users email from the xml file $pconfig['smartmonemail'] = $config['system']['smartmonemail']; @@ -276,7 +276,7 @@ switch($action) { - +
diff --git a/src/www/diag_sockets.php b/src/www/diag_sockets.php index 29d96bec1..fe6fb54e0 100644 --- a/src/www/diag_sockets.php +++ b/src/www/diag_sockets.php @@ -53,7 +53,7 @@ $showAllOption = $showAll ? "" : "?showAll";

For explanation about the meaning of the information listed for each socket click here.


To show information about both listening and connected sockets click this.

- +
diff --git a/src/www/diag_system_activity.php b/src/www/diag_system_activity.php index db602a72c..d973d57dc 100644 --- a/src/www/diag_system_activity.php +++ b/src/www/diag_system_activity.php @@ -78,7 +78,7 @@ include("head.inc"); print_info_box($savemsg); echo "
"; } - if ($input_errors) + if (isset($input_errors)) print_input_errors($input_errors); ?> diff --git a/src/www/diag_system_pftop.php b/src/www/diag_system_pftop.php index 839cd94e0..269e506ca 100644 --- a/src/www/diag_system_pftop.php +++ b/src/www/diag_system_pftop.php @@ -170,7 +170,7 @@ if($_REQUEST['sorttype'] && in_array($_REQUEST['sorttype'], $sorttypes) print_info_box($savemsg); echo "
"; } - if ($input_errors) + if (isset($input_errors)) print_input_errors($input_errors); ?> diff --git a/src/www/diag_tables.php b/src/www/diag_tables.php index 1bed2baee..551a5a51f 100644 --- a/src/www/diag_tables.php +++ b/src/www/diag_tables.php @@ -112,7 +112,7 @@ include("head.inc");
- +