From 85d29bf517efab756aec40bee067ced4efa5075d Mon Sep 17 00:00:00 2001 From: Stephen Beaver Date: Mon, 11 Jan 2016 13:51:03 -0500 Subject: Allow thee use of multiple infoblock on a page --- src/usr/local/www/diag_confbak.php | 2 +- src/usr/local/www/diag_sockets.php | 2 +- src/usr/local/www/diag_tables.php | 4 +-- src/usr/local/www/firewall_aliases.php | 2 +- src/usr/local/www/firewall_nat_1to1.php | 2 +- src/usr/local/www/firewall_nat_out.php | 2 +- src/usr/local/www/firewall_schedule.php | 2 +- src/usr/local/www/firewall_shaper.php | 2 +- src/usr/local/www/firewall_virtual_ip.php | 2 +- src/usr/local/www/firewall_virtual_ip_edit.php | 2 +- src/usr/local/www/guiconfig.inc | 9 +++---- src/usr/local/www/interfaces_groups.php | 2 +- src/usr/local/www/interfaces_qinq.php | 2 +- src/usr/local/www/interfaces_vlan.php | 2 +- src/usr/local/www/jquery/pfSenseHelpers.js | 31 +++++++++++++++------- .../local/www/services_captiveportal_hostname.php | 2 +- src/usr/local/www/services_captiveportal_ip.php | 2 +- src/usr/local/www/services_captiveportal_mac.php | 2 +- src/usr/local/www/services_dnsmasq.php | 12 ++++----- src/usr/local/www/services_igmpproxy.php | 2 +- src/usr/local/www/services_unbound.php | 2 +- src/usr/local/www/status_logs_filter.php | 2 +- src/usr/local/www/status_logs_filter_dynamic.php | 2 +- src/usr/local/www/status_logs_filter_summary.php | 2 +- src/usr/local/www/system_gateway_groups.php | 2 +- src/usr/local/www/system_usermanager.php | 2 +- src/usr/local/www/vpn_ipsec.php | 2 +- 27 files changed, 57 insertions(+), 45 deletions(-) (limited to 'src/usr') diff --git a/src/usr/local/www/diag_confbak.php b/src/usr/local/www/diag_confbak.php index cc8d137..a14bdcd 100644 --- a/src/usr/local/www/diag_confbak.php +++ b/src/usr/local/www/diag_confbak.php @@ -214,7 +214,7 @@ if (is_array($confvers)) { 'To view the differences between an older configuration and a newer configuration, ' . 'select the older configuration using the left column of radio options and select the newer configuration in the right column, ' . 'then press the "Diff" button.'), - 'info')?> + 'info', false)?> ADDRESS
(UNIX sockets only) For bound sockets, this is the file-name of the socket. For other sockets, it is the name, PID and file descriptor number of the peer, or "(none)" if the socket is neither bound nor connected.
' . '
LOCAL ADDRESS
(Internet sockets only) The address the local end of the socket is bound to (see getsockname(2)).
' . '
FOREIGN ADDRESS
(Internet sockets only) The address the foreign end of the socket is bound to (see getpeername(2)).
' . - ''), 'info'); + ''), 'info', false); ?> diff --git a/src/usr/local/www/diag_tables.php b/src/usr/local/www/diag_tables.php index 4bd9319..1eaa306 100644 --- a/src/usr/local/www/diag_tables.php +++ b/src/usr/local/www/diag_tables.php @@ -163,9 +163,9 @@ if ($bogons || !empty($entries)) { diff --git a/src/usr/local/www/firewall_aliases.php b/src/usr/local/www/firewall_aliases.php index d0ff400..8a5b675 100644 --- a/src/usr/local/www/firewall_aliases.php +++ b/src/usr/local/www/firewall_aliases.php @@ -315,7 +315,7 @@ display_top_tabs($tab_array); ' . 'You can enter the name of an alias instead of the host, network or port where indicated. The alias will be resolved according to the list above.' . '
' . - 'If an alias cannot be resolved (e.g. because you deleted it), the corresponding element (e.g. filter/NAT/shaper rule) will be considered invalid and skipped.'), 'info')?> + 'If an alias cannot be resolved (e.g. because you deleted it), the corresponding element (e.g. filter/NAT/shaper rule) will be considered invalid and skipped.'), 'info', false)?> diff --git a/src/usr/local/www/firewall_nat_1to1.php b/src/usr/local/www/firewall_nat_1to1.php index 320bad4..e1859bb 100644 --- a/src/usr/local/www/firewall_nat_1to1.php +++ b/src/usr/local/www/firewall_nat_1to1.php @@ -283,7 +283,7 @@ display_top_tabs($tab_array); gettext('If you add a 1:1 NAT entry for any of the interface IPs on this system, ' . 'it will make this system inaccessible on that IP address. i.e. if ' . 'you use your WAN IP address, any services on this system (IPsec, OpenVPN server, etc.) ' . - 'using the WAN IP address will no longer function.'), 'info')?> + 'using the WAN IP address will no longer function.'), 'info', false)?> diff --git a/src/usr/local/www/firewall_nat_out.php b/src/usr/local/www/firewall_nat_out.php index cf61565..f5ab98f 100644 --- a/src/usr/local/www/firewall_nat_out.php +++ b/src/usr/local/www/firewall_nat_out.php @@ -670,7 +670,7 @@ endif; 'If disable outbound NAT is selected, no rules will be used.' . '
' . 'If a target address other than an interface\'s IP address is used, then depending on the way the WAN connection is setup, a ') . '' . gettext("Virtual IP") . '' . gettext(" may also be required."), - info); + 'info', false); ?> diff --git a/src/usr/local/www/firewall_schedule.php b/src/usr/local/www/firewall_schedule.php index 53ee0f4..0f4ba12 100644 --- a/src/usr/local/www/firewall_schedule.php +++ b/src/usr/local/www/firewall_schedule.php @@ -280,7 +280,7 @@ endforeach;
- +
- +
' . gettext('NAT') . '' . gettext(' mappings.') . '
' . - gettext('You can check the status of your CARP Virtual IPs and interfaces ') . '' . gettext('here') . '', 'info')?> + gettext('You can check the status of your CARP Virtual IPs and interfaces ') . '' . gettext('here') . '', 'info', false)?> ' . - sprintf(gettext("For more information on CARP and the above values, visit the OpenBSD %s"), 'CARP FAQ.'), 'info')?> + sprintf(gettext("For more information on CARP and the above values, visit the OpenBSD %s"), 'CARP FAQ.'), 'info', false)?> -
+
+ 'Only one "upstream" interface can be configured.'), 'info', false)?>
', ''), 'info')?> + " is checked."), '', ''), 'info', false)?> ' . gettext("TCP Flags") . ': F - FIN, S - SYN, A or . - ACK, R - RST, P - PSH, U - URG, E - ECE, C - CWR' . '
' . - ' = Add to block list., = Pass traffic, = Resolve'); + ' = Add to block list., = Pass traffic, = Resolve', 'info', false); ?> diff --git a/src/usr/local/www/status_logs_filter_dynamic.php b/src/usr/local/www/status_logs_filter_dynamic.php index c72b2f8..4a8b6d6 100755 --- a/src/usr/local/www/status_logs_filter_dynamic.php +++ b/src/usr/local/www/status_logs_filter_dynamic.php @@ -480,7 +480,7 @@ if ($tcpcnt > 0) {
' . - gettext("TCP Flags") . ': F - FIN, S - SYN, A or . - ACK, R - RST, P - PSH, U - URG, E - ECE, C - CWR'); + gettext("TCP Flags") . ': F - FIN, S - SYN, A or . - ACK, R - RST, P - PSH, U - URG, E - ECE, C - CWR', 'info', false); ?>
- +
diff --git a/src/usr/local/www/system_gateway_groups.php b/src/usr/local/www/system_gateway_groups.php index c4c98b0..8240de1 100644 --- a/src/usr/local/www/system_gateway_groups.php +++ b/src/usr/local/www/system_gateway_groups.php @@ -204,7 +204,7 @@ endforeach;
' . - 'Without rules directing traffic into the Gateway Groups, they will not be used.'), 'info')?> + 'Without rules directing traffic into the Gateway Groups, they will not be used.'), 'info', false)?>
$userent): "Some system object properties can be modified but they cannot be deleted.") . '

' . gettext("Accounts added here are also used for other parts of the system " . - "such as OpenVPN, IPsec, and Captive Portal."), 'info')?> + "such as OpenVPN, IPsec, and Captive Portal."), 'info', false)?> ' . gettext("Note:") . '
' . gettext("You can check your IPsec status at ") . '' . gettext("Status:IPsec") . '.
' . gettext("IPsec Debug Mode can be enabled at ") . '' .gettext("VPN:IPsec:Advanced Settings") . '.
' . - gettext("IPsec can be set to prefer older SAs at ") . '' . gettext("VPN:IPsec:Advanced Settings") . '', 'info')?> + gettext("IPsec can be set to prefer older SAs at ") . '' . gettext("VPN:IPsec:Advanced Settings") . '', 'info', false)?>