diff --git a/usr/local/www/diag_backup.php b/usr/local/www/diag_backup.php index c266b780ca..4545d32a9c 100755 --- a/usr/local/www/diag_backup.php +++ b/usr/local/www/diag_backup.php @@ -271,7 +271,7 @@ include("head.inc");   Open a pfSense configuration XML file and click the button below to restore the configuration.

Restore area: -

+

Note:
The firewall will reboot after restoring the configuration.

@@ -314,4 +314,4 @@ if($reboot_needed == true) { exit; } -?> \ No newline at end of file +?> diff --git a/usr/local/www/diag_logs_settings.php b/usr/local/www/diag_logs_settings.php index 2f4cfc2796..58783571d6 100755 --- a/usr/local/www/diag_logs_settings.php +++ b/usr/local/www/diag_logs_settings.php @@ -157,7 +157,7 @@ function enable_change(enable_over) {   Number of log entries to show: - +   @@ -186,7 +186,7 @@ function enable_change(enable_over) { Remote syslog server - +
IP address of remote syslog server

> system events
> diff --git a/usr/local/www/diag_packet_capture.php b/usr/local/www/diag_packet_capture.php index 210b1895a4..8f056d8138 100644 --- a/usr/local/www/diag_packet_capture.php +++ b/usr/local/www/diag_packet_capture.php @@ -140,7 +140,7 @@ include("head.inc"); ?> Host Address - +
This value is either the Source or Destination IP address. The packet capture will look for this address in either field.
This value can be a domain name or IP address.
If you leave this field blank all packets on the specified interface will be captured @@ -149,7 +149,7 @@ include("head.inc"); ?> Port - +
The port can be either the source or destination port. The packet capture will look for this port in either field.
Leave blank if you do not want to the capture to filter by port. @@ -157,7 +157,7 @@ include("head.inc"); ?> Packet Length - +
The Packet length is the number of bytes the packet will capture for each payload. Default value is 1500.
This value should be the same as the MTU of the Interface selected above. @@ -165,13 +165,13 @@ include("head.inc"); ?> Count - +
This is the number of packets the packet capture will grab. Default value is 100.
Enter 0 (zero) for no count limit. Level of Detail - diff --git a/usr/local/www/edit.php b/usr/local/www/edit.php index 073105c12b..f249890ed7 100755 --- a/usr/local/www/edit.php +++ b/usr/local/www/edit.php @@ -152,7 +152,7 @@ function sf() { document.forms[0].savetopath.focus(); }
- Save/Load from path: + Save/Load from path:
diff --git a/usr/local/www/exec.php b/usr/local/www/exec.php index a03caa4b41..d0f52759f5 100755 --- a/usr/local/www/exec.php +++ b/usr/local/www/exec.php @@ -218,7 +218,7 @@ if (!isBlank($_POST['txtPHPCommand'])) { Command: - +     @@ -239,7 +239,7 @@ if (!isBlank($_POST['txtPHPCommand'])) { File to download: - +     @@ -256,7 +256,7 @@ if (!isBlank($_POST['txtPHPCommand'])) { File to upload: - +     diff --git a/usr/local/www/firewall_aliases_edit.php b/usr/local/www/firewall_aliases_edit.php index 90143c1f31..d153637fb8 100755 --- a/usr/local/www/firewall_aliases_edit.php +++ b/usr/local/www/firewall_aliases_edit.php @@ -451,7 +451,7 @@ EOD; Name - +
The name of the alias may only consist of the characters a-z, A-Z and 0-9. @@ -462,7 +462,7 @@ EOD; Description - +
You may enter a description here for your reference (not parsed). @@ -515,7 +515,7 @@ EOD; ?> - + - + Interface - 'WAN'); for ($i = 1; isset($config['interfaces']['opt' . $i]); $i++) { @@ -161,9 +161,8 @@ include("head.inc"); External subnet - - / - + +
Enter the internal (LAN) subnet for the 1:1 mapping. The subnet size specified for the external subnet also applies to the internal subnet (they have to be the same). Description - +
You may enter a description here for your reference (not parsed). diff --git a/usr/local/www/firewall_nat_edit.php b/usr/local/www/firewall_nat_edit.php index 7508768fae..a10a76534d 100755 --- a/usr/local/www/firewall_nat_edit.php +++ b/usr/local/www/firewall_nat_edit.php @@ -270,7 +270,7 @@ include("fbegin.inc"); ?> Interface - 'WAN', 'lan' => 'LAN', 'pptp' => 'PPTP', 'pppoe' => 'PPPOE'); for ($i = 1; isset($config['interfaces']['opt' . $i]); $i++) { @@ -288,7 +288,7 @@ include("fbegin.inc"); ?> External address - @@ -305,7 +305,7 @@ include("fbegin.inc"); ?> Protocol - @@ -320,7 +320,7 @@ include("fbegin.inc"); ?> - - diff --git a/usr/local/www/firewall_nat_out_edit.php b/usr/local/www/firewall_nat_out_edit.php index ff3ddebe47..5c5863d2a0 100755 --- a/usr/local/www/firewall_nat_out_edit.php +++ b/usr/local/www/firewall_nat_out_edit.php @@ -300,7 +300,7 @@ function sourcesel_change() { - - +
from:  
to:
Local port - $wkportdesc): ?>
Description - +
You may enter a description here for your reference (not parsed).
Interface - 'WAN', 'lan' => 'LAN'); for ($i = 1; isset($config['interfaces']['opt' . $i]); $i++) { @@ -322,13 +322,13 @@ function sourcesel_change() {
Type:   -
Address:  //
Source port:   (leave blank for any) (leave +blank for any)
@@ -354,7 +355,7 @@ function sourcesel_change() { - - - +
Type:  
Address:   + / - = 0; $i--): ?> @@ -378,7 +379,8 @@ function sourcesel_change() {
Destination port:   (leave blank for any) (leave blank for +any)
@@ -389,7 +391,7 @@ function sourcesel_change() { - - + @@ -432,7 +434,7 @@ function sourcesel_change() { diff --git a/usr/local/www/firewall_nat_server_edit.php b/usr/local/www/firewall_nat_server_edit.php index 89cdfb403b..b2be22f70a 100755 --- a/usr/local/www/firewall_nat_server_edit.php +++ b/usr/local/www/firewall_nat_server_edit.php @@ -125,14 +125,14 @@ include("head.inc"); diff --git a/usr/local/www/firewall_rules_edit.php b/usr/local/www/firewall_rules_edit.php index c188a84c86..69e1ae44e3 100755 --- a/usr/local/www/firewall_rules_edit.php +++ b/usr/local/www/firewall_rules_edit.php @@ -364,7 +364,7 @@ include("head.inc"); diff --git a/usr/local/www/firewall_schedule_edit.php b/usr/local/www/firewall_schedule_edit.php index df0fff29ee..4120e0a665 100644 --- a/usr/local/www/firewall_schedule_edit.php +++ b/usr/local/www/firewall_schedule_edit.php @@ -749,7 +749,7 @@ EOD; NOTE: This schedule is in use so the name may not be modified!

-
+
The name of the alias may only consist of the characters a-z, A-Z and 0-9 @@ -758,7 +758,7 @@ EOD; - -
Address:  
Port:  
Static-port:  
Description - +
You may enter a description here for your reference (not parsed).
External IP address - +
Description - +
You may enter a description here for your reference (not parsed).
Action -
Interface - 'WAN', 'lan' => 'LAN', 'pptp' => 'PPTP', 'pppoe' => 'PPPOE', 'enc0' => 'IPSEC'); for ($i = 1; isset($config['interfaces']['opt' . $i]); $i++) { @@ -406,7 +406,7 @@ include("head.inc");
Protocol - @@ -420,7 +420,7 @@ include("head.inc");
ICMP type - "any", @@ -463,7 +463,7 @@ include("head.inc");
Type:   - @@ -488,7 +488,7 @@ include("head.inc"); Address:   / - 0; $i--): ?> @@ -509,7 +509,7 @@ include("head.inc");
from:   - $wkportdesc): ?> @@ -522,7 +522,7 @@ include("head.inc");
to: - $wkportdesc): ?> @@ -541,7 +541,7 @@ include("head.inc");
Source OS OS Type:  - "any", @@ -578,7 +578,7 @@ include("head.inc");
Type:   - @@ -603,7 +603,7 @@ include("head.inc"); / - 0; $i--): ?> @@ -622,7 +622,7 @@ include("head.inc");
from:   - $wkportdesc): ?> @@ -635,7 +635,7 @@ include("head.inc");
to: - $wkportdesc): ?> @@ -815,7 +815,7 @@ include("head.inc");
Description - +
You may enter a description here for your reference (not parsed).
Description
+
You may enter a description here for your reference (not parsed). @@ -882,7 +882,7 @@ EOD;
-  Hr   - @@ -902,7 +902,7 @@ EOD; -  Hr   - @@ -932,7 +932,7 @@ EOD;
Time Range Description
+
You may enter a description here for your reference (not parsed). @@ -1130,4 +1130,4 @@ EOD;
- \ No newline at end of file + diff --git a/usr/local/www/firewall_shaper_edit.php b/usr/local/www/firewall_shaper_edit.php index 0083f13fac..b043db4057 100755 --- a/usr/local/www/firewall_shaper_edit.php +++ b/usr/local/www/firewall_shaper_edit.php @@ -402,7 +402,7 @@ function dst_rep_change() { - - - -
Target //
In Interface
Out Interface
Protocol -
Type:  Address:   / - 0; $i--): ?> - -
from:  
to: -
Type:  Address:   / - 0; $i--): ?> - - - - diff --git a/usr/local/www/firewall_shaper_queues_edit.php b/usr/local/www/firewall_shaper_queues_edit.php index c47eef4c3d..d33002329f 100755 --- a/usr/local/www/firewall_shaper_queues_edit.php +++ b/usr/local/www/firewall_shaper_queues_edit.php @@ -308,7 +308,7 @@ function enable_attachtoqueue(enable_over) { - - diff --git a/usr/local/www/firewall_virtual_ip_edit.php b/usr/local/www/firewall_virtual_ip_edit.php index 86025bca32..d693800efe 100755 --- a/usr/local/www/firewall_virtual_ip_edit.php +++ b/usr/local/www/firewall_virtual_ip_edit.php @@ -300,7 +300,7 @@ function typesel_change() { @@ -396,17 +397,17 @@ to access after they've authenticated. - - - @@ -417,16 +418,17 @@ to access after they've authenticated. - - + - + @@ -442,7 +444,7 @@ to access after they've authenticated. - @@ -481,7 +483,7 @@ to access after they've authenticated. - + @@ -526,7 +528,7 @@ to access after they've authenticated. @@ -546,7 +548,7 @@ to access after they've authenticated. - diff --git a/usr/local/www/services_captiveportal_mac_edit.php b/usr/local/www/services_captiveportal_mac_edit.php index fcf72355a7..048b94e736 100755 --- a/usr/local/www/services_captiveportal_mac_edit.php +++ b/usr/local/www/services_captiveportal_mac_edit.php @@ -102,14 +102,14 @@ include("head.inc"); diff --git a/usr/local/www/services_captiveportal_users_edit.php b/usr/local/www/services_captiveportal_users_edit.php index ba51e6c2c6..f03e830e30 100755 --- a/usr/local/www/services_captiveportal_users_edit.php +++ b/usr/local/www/services_captiveportal_users_edit.php @@ -142,14 +142,14 @@ include("head.inc"); diff --git a/usr/local/www/services_dhcp.php b/usr/local/www/services_dhcp.php index e401a3a20f..596f018060 100755 --- a/usr/local/www/services_dhcp.php +++ b/usr/local/www/services_dhcp.php @@ -407,7 +407,7 @@ function show_netboot_config() { @@ -524,7 +524,7 @@ function show_netboot_config() { >  Enable registration of DHCP client names in DNS.

-
+
Note: Leave blank to disable dynamic DNS registration.
Enter the dynamic DNS domain which will be used to register client names in the DNS server. @@ -537,8 +537,8 @@ function show_netboot_config() { - Show NTP configuration

@@ -549,7 +549,7 @@ function show_netboot_config() { - Show TFTP configuration @@ -561,7 +561,7 @@ function show_netboot_config() { - Show LDAP configuration @@ -577,13 +577,13 @@ function show_netboot_config() { Enables network booting.

Enter the IP of the next-server - + and the filename -
+
Note: You need both a filename and a boot server configured for this to work!

Enter the root-path-string -
+
Note: string-format: iscsi:(servername):(protocol):(port):(LUN):targetname diff --git a/usr/local/www/services_dhcp_edit.php b/usr/local/www/services_dhcp_edit.php index 370b9b6803..6cbd77e344 100755 --- a/usr/local/www/services_dhcp_edit.php +++ b/usr/local/www/services_dhcp_edit.php @@ -159,7 +159,7 @@ include("head.inc");

diff --git a/usr/local/www/services_dhcp_relay.php b/usr/local/www/services_dhcp_relay.php index 326a343b42..3d798ed405 100755 --- a/usr/local/www/services_dhcp_relay.php +++ b/usr/local/www/services_dhcp_relay.php @@ -210,7 +210,7 @@ function enable_change(enable_over) { diff --git a/usr/local/www/services_dnsmasq_domainoverride_edit.php b/usr/local/www/services_dnsmasq_domainoverride_edit.php index 730da167b1..a795c9f20b 100755 --- a/usr/local/www/services_dnsmasq_domainoverride_edit.php +++ b/usr/local/www/services_dnsmasq_domainoverride_edit.php @@ -108,21 +108,21 @@ include("head.inc"); diff --git a/usr/local/www/services_dyndns.php b/usr/local/www/services_dyndns.php index a9633d5539..d1b5f6ba5d 100755 --- a/usr/local/www/services_dyndns.php +++ b/usr/local/www/services_dyndns.php @@ -174,7 +174,7 @@ function enable_change(enable_change) { @@ -244,19 +244,19 @@ function enable_change(enable_change) { @@ -270,7 +270,7 @@ function enable_change(enable_change) { diff --git a/usr/local/www/services_proxyarp_edit.php b/usr/local/www/services_proxyarp_edit.php index 922906a260..22444ba78f 100755 --- a/usr/local/www/services_proxyarp_edit.php +++ b/usr/local/www/services_proxyarp_edit.php @@ -172,7 +172,7 @@ function typesel_change() { diff --git a/usr/local/www/services_snmp.php b/usr/local/www/services_snmp.php index 0fee7b89b7..10d5698154 100755 --- a/usr/local/www/services_snmp.php +++ b/usr/local/www/services_snmp.php @@ -263,7 +263,7 @@ function enable_change(whichone) { @@ -271,21 +271,21 @@ function enable_change(whichone) { @@ -303,7 +303,7 @@ function enable_change(whichone) { @@ -324,7 +324,7 @@ function enable_change(whichone) { @@ -332,7 +332,7 @@ function enable_change(whichone) { @@ -340,7 +340,7 @@ function enable_change(whichone) { diff --git a/usr/local/www/services_usermanager.php b/usr/local/www/services_usermanager.php index 8ab5cd3259..d0675b0c7d 100755 --- a/usr/local/www/services_usermanager.php +++ b/usr/local/www/services_usermanager.php @@ -112,35 +112,35 @@ if($_GET['act']=="new" || $_GET['act']=="edit"){ diff --git a/usr/local/www/services_wol.php b/usr/local/www/services_wol.php index 6ddcf786f5..6153faf074 100755 --- a/usr/local/www/services_wol.php +++ b/usr/local/www/services_wol.php @@ -105,7 +105,7 @@ include("head.inc"); diff --git a/usr/local/www/status_graph.php b/usr/local/www/status_graph.php index 4c87ba496b..e4b57d0dc0 100755 --- a/usr/local/www/status_graph.php +++ b/usr/local/www/status_graph.php @@ -76,7 +76,7 @@ if((isset($config['ipsec']['enable'])) || (isset($config['ipsec']['mobileclients ?> Interface: - $ifd) { echo " - - - - - - - - - - - - @@ -333,4 +317,4 @@ include("head.inc"); if ($restart_webgui) { touch("/tmp/restart_webgui"); } -?> \ No newline at end of file +?> diff --git a/usr/local/www/system_advanced.php b/usr/local/www/system_advanced.php index 32d5e995b5..feab1900b8 100755 --- a/usr/local/www/system_advanced.php +++ b/usr/local/www/system_advanced.php @@ -373,7 +373,7 @@ include("head.inc"); onclick="enable_change(false)" /> NAT encapsulated IPv6 packets (IP protocol 41/RFC2893) to:

- +  (IP address)
Don't forget to add a firewall rule to permit IPv6 packets! @@ -488,7 +488,7 @@ include("head.inc"); diff --git a/usr/local/www/system_routes_edit.php b/usr/local/www/system_routes_edit.php index e2457b88d9..da09d99625 100755 --- a/usr/local/www/system_routes_edit.php +++ b/usr/local/www/system_routes_edit.php @@ -124,7 +124,7 @@ include("head.inc"); diff --git a/usr/local/www/vpn_ipsec_ca_edit.php b/usr/local/www/vpn_ipsec_ca_edit.php index 2a0d776a47..124897ad69 100755 --- a/usr/local/www/vpn_ipsec_ca_edit.php +++ b/usr/local/www/vpn_ipsec_ca_edit.php @@ -106,7 +106,7 @@ include("head.inc"); diff --git a/usr/local/www/vpn_ipsec_edit.php b/usr/local/www/vpn_ipsec_edit.php index bee6c6afce..4e2b8b2b5f 100755 --- a/usr/local/www/vpn_ipsec_edit.php +++ b/usr/local/www/vpn_ipsec_edit.php @@ -355,7 +355,7 @@ function methodsel_change() { - - - @@ -443,7 +443,7 @@ function methodsel_change() { @@ -557,7 +557,7 @@ function methodsel_change() { @@ -616,7 +616,7 @@ function methodsel_change() { + IP address diff --git a/usr/local/www/vpn_ipsec_mobile.php b/usr/local/www/vpn_ipsec_mobile.php index cd7892f32c..71d94fb37f 100755 --- a/usr/local/www/vpn_ipsec_mobile.php +++ b/usr/local/www/vpn_ipsec_mobile.php @@ -228,7 +228,7 @@ function methodsel_change() { diff --git a/usr/local/www/vpn_openvpn_create_certs.php b/usr/local/www/vpn_openvpn_create_certs.php index c9e3351f65..62f9ba1ee1 100755 --- a/usr/local/www/vpn_openvpn_create_certs.php +++ b/usr/local/www/vpn_openvpn_create_certs.php @@ -286,42 +286,42 @@ function f(ta_id){ @@ -329,7 +329,7 @@ function f(ta_id){ --> diff --git a/usr/local/www/vpn_pppoe.php b/usr/local/www/vpn_pppoe.php index 7d941c040f..24ba1e57e9 100755 --- a/usr/local/www/vpn_pppoe.php +++ b/usr/local/www/vpn_pppoe.php @@ -297,7 +297,7 @@ function enable_change(enable_over) { @@ -359,7 +359,7 @@ function enable_change(enable_over) { @@ -367,9 +367,9 @@ function enable_change(enable_over) { @@ -394,14 +394,14 @@ function enable_change(enable_over) { @@ -414,32 +414,32 @@ function enable_change(enable_over) { diff --git a/usr/local/www/vpn_pppoe_users_edit.php b/usr/local/www/vpn_pppoe_users_edit.php index 3542c182ea..32c53a6e2e 100755 --- a/usr/local/www/vpn_pppoe_users_edit.php +++ b/usr/local/www/vpn_pppoe_users_edit.php @@ -125,13 +125,13 @@ include("head.inc"); @@ -139,7 +139,7 @@ include("head.inc"); diff --git a/usr/local/www/vpn_pptp.php b/usr/local/www/vpn_pptp.php index ae54418bef..742e4a0861 100755 --- a/usr/local/www/vpn_pptp.php +++ b/usr/local/www/vpn_pptp.php @@ -317,7 +317,7 @@ function enable_change(enable_over) { @@ -330,7 +330,7 @@ function enable_change(enable_over) { @@ -339,7 +339,7 @@ function enable_change(enable_over) { @@ -380,9 +380,9 @@ function enable_change(enable_over) { @@ -413,13 +413,13 @@ function enable_change(enable_over) { @@ -432,16 +432,16 @@ function enable_change(enable_over) { @@ -449,16 +449,16 @@ function enable_change(enable_over) { diff --git a/usr/local/www/vpn_pptp_users_edit.php b/usr/local/www/vpn_pptp_users_edit.php index 3949f28772..0d831b712e 100755 --- a/usr/local/www/vpn_pptp_users_edit.php +++ b/usr/local/www/vpn_pptp_users_edit.php @@ -122,13 +122,13 @@ include("head.inc"); @@ -136,7 +136,7 @@ include("head.inc");
from:  
to:
Direction
Description +
You may enter a description here for your reference (not parsed).
Bandwidth +
Name +
Enter the name of the queue here. Do not use spaces and limit the size to 15 characters.
Interface - 'WAN', 'lan' => 'LAN'); for ($i = 1; isset($config['interfaces']['opt' . $i]); $i++) { $interfaces['opt' . $i] = $config['interfaces']['opt' . $i]['descr']; @@ -319,7 +319,7 @@ function typesel_change() { - - - */ @@ -388,7 +387,7 @@ function typesel_change() { diff --git a/usr/local/www/interfaces.php b/usr/local/www/interfaces.php index 15cda1ae72..d4dc2d165c 100755 --- a/usr/local/www/interfaces.php +++ b/usr/local/www/interfaces.php @@ -723,7 +723,7 @@ function show_mon_config() { - - - - - @@ -799,7 +799,7 @@ function show_mon_config() { - - - - - @@ -853,7 +853,8 @@ function show_mon_config() { + +seconds
If no qualifying outgoing packets are transmitted for the specified number of seconds, the connection is brought down. An idle timeout of zero disables this feature. @@ -920,19 +921,21 @@ function show_mon_config() { - - - - @@ -954,7 +957,8 @@ function show_mon_config() { + +seconds
If no qualifying outgoing packets are transmitted for the specified number of seconds, the connection is brought down. An idle timeout of zero disables this feature. @@ -964,23 +968,23 @@ function show_mon_config() { - - - - + seconds
Setting this to a sensible value (e.g. 60 seconds) can protect against DoS attacks. diff --git a/usr/local/www/interfaces_lan.php b/usr/local/www/interfaces_lan.php index c6c6b9580d..a7c066730c 100755 --- a/usr/local/www/interfaces_lan.php +++ b/usr/local/www/interfaces_lan.php @@ -170,7 +170,7 @@ function enable_change(enable_over) { @@ -322,7 +322,7 @@ function show_mon_config() { - - - - - diff --git a/usr/local/www/interfaces_wan.php b/usr/local/www/interfaces_wan.php index 15cda1ae72..d4dc2d165c 100755 --- a/usr/local/www/interfaces_wan.php +++ b/usr/local/www/interfaces_wan.php @@ -723,7 +723,7 @@ function show_mon_config() { - - - - - @@ -799,7 +799,7 @@ function show_mon_config() { - - - - - @@ -853,7 +853,8 @@ function show_mon_config() { + +seconds
If no qualifying outgoing packets are transmitted for the specified number of seconds, the connection is brought down. An idle timeout of zero disables this feature. @@ -920,19 +921,21 @@ function show_mon_config() { - - - - @@ -954,7 +957,8 @@ function show_mon_config() { + +seconds
If no qualifying outgoing packets are transmitted for the specified number of seconds, the connection is brought down. An idle timeout of zero disables this feature. @@ -964,23 +968,23 @@ function show_mon_config() { - - - - + seconds
Setting this to a sensible value (e.g. 60 seconds) can protect against DoS attacks. diff --git a/usr/local/www/services_captiveportal.php b/usr/local/www/services_captiveportal.php index 4cc54bae49..0c7d2ba64a 100755 --- a/usr/local/www/services_captiveportal.php +++ b/usr/local/www/services_captiveportal.php @@ -278,7 +278,7 @@ function enable_change(enable_change) { @@ -328,7 +329,7 @@ Clients will be disconnected after this amount of inactivity. They may log in ag @@ -359,11 +360,11 @@ to access after they've authenticated.
Type:  
Address:   -/ - + /
Range:   + - - +
Description - +
You may enter a description here for your reference (not parsed).
Type
MAC address +
MTU +
If you enter a value in this field, then MSS clamping for TCP connections to the value entered above minus 40 (TCP/IP @@ -766,9 +766,9 @@ function show_mon_config() {
IP address + / - 0; $i--) { if($i <> 31) { @@ -783,12 +783,12 @@ function show_mon_config() {
Point-to-point IP address - +
Gateway +
Hostname +
The value in this field is sent as the DHCP client identifier and hostname when requesting a DHCP lease. Some ISPs may require @@ -807,7 +807,7 @@ function show_mon_config() {
Alias IP address +
Username +
Password +
Service name +
Hint: this field can usually be left empty
Idle timeout - seconds
If no qualifying outgoing packets are transmitted for the specified number of seconds, the connection is brought down. An idle timeout of zero disables this feature.
Username +
Password +
Local IP address + / - 0; $i--): ?>
Remote IP address +
Idle timeout - seconds
If no qualifying outgoing packets are transmitted for the specified number of seconds, the connection is brought down. An idle timeout of zero disables this feature.
Username +
Password +
Authentication server +
If this field is left empty, the default ("dce-server") is used.
Authentication domain +
If this field is left empty, the domain name assigned via DHCP will be used.

@@ -989,7 +993,7 @@ function show_mon_config() {
Min. heartbeat interval - seconds
Setting this to a sensible value (e.g. 60 seconds) can protect against DoS attacks.
Bridge with - "WAN"); for ($i = 1; isset($config['interfaces']['opt' . $i]); $i++) { @@ -188,9 +188,9 @@ function enable_change(enable_over) {
IP address - + / - 0; $i--) { if($i <> 31) { @@ -271,4 +271,4 @@ if ($_POST['apply'] <> "") { } -?> \ No newline at end of file +?> diff --git a/usr/local/www/interfaces_opt.php b/usr/local/www/interfaces_opt.php index 66a26a3ca1..261f374c2c 100755 --- a/usr/local/www/interfaces_opt.php +++ b/usr/local/www/interfaces_opt.php @@ -309,7 +309,7 @@ function show_mon_config() {
Description - +
Enter a description (name) for the interface here.
Type
MAC address +
MTU +
If you enter a value in this field, then MSS clamping for TCP connections to the value entered above minus 40 (TCP/IP @@ -367,7 +367,7 @@ function show_mon_config() {
Bridge with - "LAN", 'wan' => "WAN"); for ($i = 1; isset($config['interfaces']['opt' . $i]); $i++) { @@ -385,9 +385,9 @@ function show_mon_config() {
IP address - + / - 0; $i--) { if($i <> 31) { @@ -449,7 +449,7 @@ function show_mon_config() {
Hostname +
The value in this field is sent as the DHCP client identifier and hostname when requesting a DHCP lease. Some ISPs may require @@ -457,7 +457,7 @@ function show_mon_config() {
Alias IP address +
Parent interface - $ifinfo) if (is_jumbo_capable($ifn)) { @@ -129,14 +129,14 @@ include("head.inc");
VLAN tag - +
802.1Q VLAN tag (between 1 and 4094)
Description - +
You may enter a description here for your reference (not parsed).
Type
MAC address +
MTU +
If you enter a value in this field, then MSS clamping for TCP connections to the value entered above minus 40 (TCP/IP @@ -766,9 +766,9 @@ function show_mon_config() {
IP address + / - 0; $i--) { if($i <> 31) { @@ -783,12 +783,12 @@ function show_mon_config() {
Point-to-point IP address - +
Gateway +
Hostname +
The value in this field is sent as the DHCP client identifier and hostname when requesting a DHCP lease. Some ISPs may require @@ -807,7 +807,7 @@ function show_mon_config() {
Alias IP address +
Username +
Password +
Service name +
Hint: this field can usually be left empty
Idle timeout - seconds
If no qualifying outgoing packets are transmitted for the specified number of seconds, the connection is brought down. An idle timeout of zero disables this feature.
Username +
Password +
Local IP address + / - 0; $i--): ?>
Remote IP address +
Idle timeout - seconds
If no qualifying outgoing packets are transmitted for the specified number of seconds, the connection is brought down. An idle timeout of zero disables this feature.
Username +
Password +
Authentication server +
If this field is left empty, the default ("dce-server") is used.
Authentication domain +
If this field is left empty, the domain name assigned via DHCP will be used.

@@ -989,7 +993,7 @@ function show_mon_config() {
Min. heartbeat interval - seconds
Setting this to a sensible value (e.g. 60 seconds) can protect against DoS attacks.
Interface - 'LAN'); for ($i = 1; isset($config['interfaces']['opt' . $i]); $i++) { if (isset($config['interfaces']['opt' . $i]['enable'])) @@ -297,7 +297,8 @@ function enable_change(enable_change) { - +
per client IP address (0 = no limit) per client IP address (0 = no limit)
This setting limits the number of concurrent connections to the captive portal HTTP(S) server. This does not set how many users can be logged in @@ -307,14 +308,14 @@ Default is 4 connections per client IP address, with a total maximum of 16 conne
Idle timeout - + minutes
Clients will be disconnected after this amount of inactivity. They may log in again immediately, though. Leave this field blank for no idle timeout.
Hard timeout - + minutes
Clients will be disconnected after this amount of time, regardless of activity. They may log in again immediately, though. Leave this field blank for no hard timeout (not recommended unless an idle timeout is set).
Redirection URL - +
If you provide a URL here, clients will be redirected to that URL instead of the one they initially tried to access after they've authenticated.
- + - +
Default download Kbit/s Kbit/s
Default upload Kbit/s Kbit/s

If this option is set, the captive portal will restrict each user who logs in to the specified default bandwidth. RADIUS can override the default settings. Leave empty or set to 0 for no limit. You will need to enable the traffic shaper for this to be effective.
IP address
+
Enter the IP address of the RADIUS server which users of the captive portal have to authenticate against.
Port
+
Leave this field blank to use the default port (1812).
Shared secret  
+
Leave this field blank to not use a RADIUS shared secret (not recommended).
IP address
+
If you have a second RADIUS server, you can activate it by entering its IP address here.
Port
Shared secret  
Accounting port
+
Leave blank to use the default port (1813).
Shared secret
HTTPS server name -
+
This name will be used in the form action for the HTTPS POST and should match the Common Name (CN) in your certificate (otherwise, the client browser will most likely display a security warning). Make sure captive portal clients can resolve this name in DNS.
Portal page contents -
+
error page
contents		 -
+
View current page
diff --git a/usr/local/www/services_captiveportal_filemanager.php b/usr/local/www/services_captiveportal_filemanager.php index 760c1be40c..f0fca53c57 100755 --- a/usr/local/www/services_captiveportal_filemanager.php +++ b/usr/local/www/services_captiveportal_filemanager.php @@ -151,7 +151,7 @@ include("head.inc");
+ diff --git a/usr/local/www/services_captiveportal_ip_edit.php b/usr/local/www/services_captiveportal_ip_edit.php index d38e0bc607..5d1abcadb2 100755 --- a/usr/local/www/services_captiveportal_ip_edit.php +++ b/usr/local/www/services_captiveportal_ip_edit.php @@ -104,7 +104,7 @@ include("head.inc");
Direction - @@ -120,14 +120,14 @@ include("head.inc");
IP address - +
IP address
Description - +
You may enter a description here for your reference (not parsed).
MAC address - +
MAC address (6 hex octets separated by colons)
Description - +
You may enter a description here for your reference (not parsed).
Username - +
Password -
- +
+  (confirmation)
If you want to change the users' password, enter it here twice. @@ -158,14 +158,14 @@ include("head.inc");
Full name - +
User's full name, for your own information only
Expiration date - + Pick a date
Leave blank if the account shouldn't expire, otherwise enter the expiration date in the following format: mm/dd/yyyy
Subnet Mask - 0; $i--) { if($i <> 31) { @@ -424,50 +424,50 @@ function show_netboot_config() {
Range - -  to  + +  to 
WINS servers -
- +
+
DNS servers -
-
+
+
NOTE: leave blank to use the system default DNS servers. This option is handy when your doing CARP+DHCP Failover, etc.
Gateway -
+
The default is to use the IP of the firewall as the gateway. Specify an alternate gateway here if this is not the correct gateway for your network.
Domain-Name -
+
The default is to use the domainname of the router as DNS-Search string that is served via DHCP. Specify an alternate DNS-Search string here.
Domain-Searchlist -
+
DNS-Searchlist: the DHCP server can serve a list of domains to be searched.
Default lease time - + seconds
This is used for clients that do not ask for a specific expiration time.
@@ -477,7 +477,7 @@ function show_netboot_config() {
Maximum lease time - + seconds
This is the maximum lease time for clients that ask for a specific expiration time.
@@ -487,7 +487,7 @@ function show_netboot_config() {
Failover peer IP: -
+
Leave blank to disable. Enter the REAL address of the other machine. Machines must be using CARP.
MAC address - + IP address - +
If no IP address is given, one will be dynamically allocated from the pool.
Hostname - +
Name of the host, without domain part.
Description - +
You may enter a description here for your reference (not parsed).
Destination server onClick="enable_change(false)"> Proxy requests to DHCP server on WAN subnet -

+


This is the IP address of the server to which the DHCP packet is relayed. Select "Proxy requests to DHCP server on WAN subnet" to relay DHCP packets to the server that was used on the WAN interface.
Domain - +
Domain to override (NOTE: this does not have to be a valid TLD!)
e.g. test
IP address - +
IP address of the authoritative dns server for this domain
e.g. 192.168.100.100
Description - +
You may enter a description here for your reference (not parsed).
Service type - Hostname - +
Note:
 @@ -200,7 +200,7 @@ function enable_change(enable_change) {
MX - +
Note: With DynDNS service you can only use a hostname, not an IP address.
@@ -216,13 +216,13 @@ function enable_change(enable_change) {
Username - +
Password - +
Hostname - +
TTL - + seconds
Key name - +
This must match the setting on the DNS server.
Key - +
Paste an HMAC-MD5 key here.
Interface - 'WAN', 'lan' => 'LAN'); for ($i = 1; isset($config['interfaces']['opt' . $i]); $i++) { $interfaces['opt' . $i] = $config['interfaces']['opt' . $i]['descr']; @@ -190,7 +190,7 @@ function typesel_change() { - - -
Type:  
Address:   + / - = 0; $i--): ?>
Range:   + - - +
@@ -225,7 +225,7 @@ function typesel_change() {
Description - +
You may enter a description here for your reference (not parsed).
Polling Port - +
Enter the port to accept polling events on (default 161)
System location - +
System contact - +
Read Community String - +
In most cases, "public" is used here
Write community string - +
Please use something other then "private" here
Trap server - +
Enter trap server name
Trap server port - +
Enter the port to send the traps to (default 162)
Enter the SNMP trap string - +
Trap string
Username - +
Enter the desired username.
Password - "> + ">
Enter the desired password.
Password confirmation - "> + ">
Confirm the above password.
Full name - +
Enter the user's full name.
Expiration Date - + Pick a date
Enter this acocunt's expiration date in us-format (mm/dd/yyyy) or leave this field empty for no expiration.
Interface - 'LAN'); for ($i = 1; isset($config['interfaces']['opt' . $i]); $i++) { if (isset($config['interfaces']['opt' . $i]['enable']) && @@ -123,7 +123,7 @@ include("head.inc");
MAC address - +
Enter a MAC address in the following format: xx:xx:xx:xx:xx:xx
Hostname +
name of the firewall host, without domain part
e.g. firewall
Domain +
e.g. mycorp.com
DNS servers

- +
- +
IP addresses; these are also used for the DHCP service, DNS forwarder and for PPTP VPN clients
@@ -230,22 +230,6 @@ include("head.inc"); the DNS forwarder). They will not be assigned to DHCP and PPTP VPN clients, though.
Username -
- If you want - to change the username for accessing the webGUI, enter it - here.
Password -
-  (confirmation)
If you want - to change the password for accessing the webGUI, enter it - here twice.
webGUI protocol > @@ -254,7 +238,7 @@ include("head.inc");
webGUI port +
Enter a custom port number for the webGUI above if you want to override the default (80 for HTTP, 443 @@ -274,14 +258,14 @@ include("head.inc");
NTP time server +
Use a space to separate multiple hosts (only one required). Remember to set up at least one DNS server if you enter a host name here!
Hard disk standby time - > Use a different XMLRPC server for firmware upgrades
- - + +
Base URL:
Path:
Base URL:
Path:
This is where pfSense will check for newer firmware versions when the System: Firmware: Auto Update page is viewed.
Interface - 'LAN', 'wan' => 'WAN', 'pptp' => 'PPTP'); for ($i = 1; isset($config['interfaces']['opt' . $i]); $i++) { $interfaces['opt' . $i] = $config['interfaces']['opt' . $i]['descr']; @@ -140,9 +140,9 @@ include("head.inc");
Destination network - + / - = 1; $i--): ?>
Gateway - +
Gateway to be used to reach the destination network
Description - +
You may enter a description here for your reference (not parsed).
Identifier - +
This can be any text to describe the certificate authority.
Interface
Type:  
Address:   + / - = 0; $i--): ?>
Remote subnet - + / - = 0; $i--): ?>
Remote gateway - +
Enter the public IP address of the remote gateway
Description - +
You may enter a description here for your reference (not parsed).
Negotiation mode -
My identifier - $modename): ?> - +
Encryption algorithm - $algoname): ?>
Hash algorithm - $algoname): ?>
DH key group -
Lifetime - + seconds
Authentication method - $methodname): ?>
Pre-Shared Key - +
Protocol - $protoname): ?>
PFS key group - $keygroupname): ?>
Lifetime - + seconds
Automatically ping host - IP address
 
Negotiation mode -
My identifier - $modename): ?> - +
Encryption algorithm - $algoname): ?>
Hash algorithm - $algoname): ?>
DH key group -
Lifetime - + seconds
Authentication method - $methodname): ?>
Protocol - $protoname): ?>
PFS key group - $keygroupname): ?>
Lifetime - + seconds
Country Code (2 Letters) - +
State or Province name - +
City name - +
Organization name - +
Organization department - +
Common Name (Your name) - +
E-Mail address - +
Interface - 'LAN', 'wan' => 'WAN'); for ($i = 1; isset($config['interfaces']['opt' . $i]); $i++) { @@ -351,7 +351,7 @@ function enable_change(enable_over) {
Server address - +
Enter the IP address the PPPoE server should use on its side for all clients.
Remote address range - +
Specify the starting address for the client IP address subnet.
DNS servers - +
- +
If entered they will be given to all pppoe clients else lan dns and one wan dns will go to all clients
NAS IP ADDRESS - +
radius server NAS ip Address
Radius Accounting Update - +
Radius accounting update period in seconds
RADIUS server Primary - - - + + +
Enter the IP address and portof the RADIUS server. Format ip auth_port acct_port

standard port 1812 and 1813 accounting
RADIUS primary shared secret - +
Enter the shared secret that will be used to authenticate to the RADIUS server.
RADIUS server Secondary - - - + + +
Enter the IP address and port of the BACKUP RADIUS server. Format ip auth_port acct_port

standard port 1812 and 1813 accounting
RADIUS secondary shared secret - +
Enter the shared secret that will be used to authenticate to the RADIUS server.
Username - +
Password - -
+ +
 (confirmation)
If you want to change the users' password, enter it here twice.
IP address - +
If you want the user to be assigned a specific IP address, enter it here.
PPTP redirection - +
Enter the IP address of a host which will accept incoming PPTP connections.
Server address - +
Enter the IP address the PPTP server should use on its side for all clients.		Remote address range - +
Specify the starting address for the client IP address subnet.
PPTP DNS Servers - +
- +
primary and secondary dns servers for pptp clients
@@ -390,7 +390,7 @@ function enable_change(enable_over) {
WINS Server - +
Radius NAS IP - +
Radius Accounting Update - +
RADIUS server - - - + + +
Enter the IP address of the RADIUS server.
RADIUS shared secret - +
Enter the shared secret that will be used to authenticate to the RADIUS server.
BACKUP RADIUS server - - - + + +
Enter the IP address of the RADIUS server.
BACKUP RADIUS shared secret - +
Enter the shared secret that will be used to authenticate to the RADIUS server.
Username - +
Password - -
+ +
 (confirmation)
If you want to change the users' password, enter it here twice.
IP address - +
If you want the user to be assigned a specific IP address, enter it here.