pfSense

Add filter to SMART status widget

(cherry picked from commit 22e8fa1f6aec0b1536f0c07e1573ac78a291891f)

The confirmation checkboxes on diag_resetstate.php should not be checked by default.

Remove get_openvpnent_key()

(cherry picked from commit 27bf84fc10d723deebb814a38ee9303014b41711)

Add Filter to OpenVPN Widget

(cherry picked from commit a670560bf9a3de550e9e4e20df4ffe1ed2d4f05c)

Do not nag people about passwords mismatch when SMTP notifications are disabled (Bug #7129)
(cherry picked from commit 3988cfa7d281370500a7f58cb5f73f28a931f0ae)

Do not nag people about passwords mismatch when growl is disabled (Bug #7129)

These fields tend to get "helpfully" pre-filled with random crap by built-in browser password managers or extensions such as LastPass. No need to bother people with these when the feature is disabled....

Only show the DHCP Leases Status link if DHCP server is enabled

Does not make sense otherwise, can only contain stale data.
(cherry picked from commit 8ed692516534248e58a20aec70f8cf3035d35348)

Fix #7126 RFC2136 links

(cherry picked from commit 47b35618f025082b5504eae5518d89c772ae8bd5)

Add filter to Dynamic DNS Status Widget

(cherry picked from commit 5f8a3dc09e550f3aa2ef086c03e7133f78756913)

Add filter to Interfaces Widget

(cherry picked from commit 35310a493f19d6758747cbc8e9961c2ca3395246)

Add filter to Interface Statistics widget

(cherry picked from commit 84a7e840eac8f62a95ccb900089faf14a9a9fc65)

Add filter to WoL widget

(cherry picked from commit d82c5cbf4f693d70e55b5a484a34ea84f88fa250)

Redmine #5549 Allow variable number of DNS Servers

(cherry picked from commit a2d23e88596deab6bbed2818385a0b72c913843a)

Check for duplicate Wake on LAN entries

Currently it is posible to enter an interface+MAC combination that is already in the WoL list. That seems silly.
(cherry picked from commit 257dd20749a235538855cc5e5fc7484e4fbfbf68)

Tidy up "<script>" tags

Tidy up <script> tags by adding TYPE attribute

(https://doc.pfsense.org/index.php/Developer_Style_Guide#HTML_Specific_Rules)

(cherry picked from commit 463456964709015d4b1c591aa4251c831a39c71d)

Display Dyn DNS type if description not found

(cherry picked from commit 7b3d8a4b8cee0588ed2ccd272588026002369433)

Remove excess loops in DynDNS Widget

(cherry picked from commit b84126b5e74473b1e6a576f38da2149a95ab03fc)

Add IPsec to the state table interface list.

Display client id in DHCP Mapping list

(cherry picked from commit 6e3e95a538c4dda9c9f14b2ab78435eec0debf46)

Add requirestatefilter. Implements #7069.

(cherry picked from commit 88081ea257fa683ed28b588c4c35260589604741)

Add requirestatefilter. Implements #7069.

(cherry picked from commit 0a3150896bc412868cfb79473293ed81c87a50a7)

Services widget filter checkboxes

(cherry picked from commit ada6bfa7ca68169408b80af6325afe3948ee85f7)

Merge branch 'RELENG_2_3' of git.netgate.com:pfsense/pfsense into RELENG_2_3

Crash Reporter report when no data found

The glob for $crash_files always returns an array - an empty one in the case when there are no matching crash files. So the echo at old line 115 never happened. In any case, if the echo happens, it is spat out as plain text on the GUI outside of all the nice boxes and menus....

clarify type of firewall rule needed

A comment on the original PR says that it's not clear if the rule for this needs to be IPv6 or IPv4 with protocol IPv6, and users get confused. I've tried to clarify it here. I've also tried to "de-mystify" it, because it's not that tunneling needs special rules, it's just that any traffic needs rules and tunneled traffic is handled as IPv6 for rules purposes, so it needs an IPv6 rule. But the user may want other rules, or selective rules, so I'[ve tried to be clear this isn't about some "special" IPv6 rule, but rather, just that any traffic desired to pass, will need one or more IPv6 rules permitting it....

change as commented and remove redundant help text
(cherry picked from commit 16fbe9b7ee1abfb8b9504a8d1e90dcd7592f9fe2)

left label as comment above
(cherry picked from commit a0052ea3a5fe74246795d90bcacadd025801134a)

Various wording changes
(cherry picked from commit a075265e0a076419813622e0d69556915b6f40f2)

Improve labels + help text for IPv6 tunneling options

• Move the help message to be on the group as a whole not just the IP input field
• Clarify the IP field (label states "IP address and explains tunelling, but whgat address should be entered and should it be IPv4, IPv6 or either? This isn't made clear....

Remove unusued $heading in genhtmltitle()

It came into use in https://github.com/pfsense/pfsense/commit/45eebe10a93fa1e2399c6cdf133ad88dc21ee6e7 but genhtmltitle() has changed since then and no longer uses $heading
(cherry picked from commit f93e9098abc0d490a4f9fca2eef69396eb5bb099)

Merge branch 'RELENG_2_3' of git.netgate.com:pfsense/pfsense into RELENG_2_3

Fix #7100

Etc/GMT timezone text using ngettext()

(cherry picked from commit 88de4ab06c8a330a3cedf474b3e218a941f6db66)

Ticket #7089 Enhance Etc/GMT timezone descriptions

These work opposite to the way mere mortals expect.
Read: https://github.com/eggert/tz/blob/master/etcetera

Based on @phil-davis' patch from https://github.com/pfsense/pfsense/pull/3354

Redmine #7089 Add extra help about timezone

We could also add some text like this to encourage users to choose the "Continent/City" time zones.
(cherry picked from commit 0436b9a5197ac8c4646a006c0e351ecf66059193)

Correctly report unmonitored gateway status

If an alternate monitor IP has been entered and saved, then the user
checks "Disable Gateway Monitoring" and saves, the alternate monitor IP
is retained in the config - that is handy for when unchecking "Disable...

Fix a probably copy/paste error

As done on OpenVPN Server, delete tunnel when dev_mode changes so new device is created accordingly

Fix conditional to work as expected when $id == 0

Remove direct calls to /sbin/ifconfig destroy by pfSense_interface_destroy()

Fix ntp gps status
- trim sat in use
- gps ok for GPGLL
- lat & lon direction for GPGGA & GPGLL
- sat in use text position fixed

(cherry picked from commit fdb0479758339e083f7745d738c9999d86af150f)

Make appropriate success or danger boxes in system_crlmanager

When there is a problem, the messages should be in a "danger" box.
Note: It is a bit difficult to actual get the danger messages to appear in the UI, because the relevant "delete" buttons are not shown in the UI when delete is not valid. But it can be tested by starting to edit a CRL that is in use, then change the "edit=" to "del=" in the URL bar and send it....

Remove unused print_info_box($savemsg)

These are files that make no use of $savemsg.
May as well remove the print_info_box($savemsg) to avoid future
confusion for maintainers wondering why it is there.

(cherry picked from commit 24a4f2ef15a09740a1c13850f85dc345f08cd653)

Change wording
(cherry picked from commit 6c1e85e544814d336b47fbc782a6aff77ea7301f)

Update format
(cherry picked from commit 3d116b5c8d5c6474821d3a6607f9fa929df2f481)

Improve Unbound forwarding mode description

Make this consistent with System - General Setup - DNS Server Settings.
(cherry picked from commit 58523c575f9d075f0a8195e0889606955c76b227)

Improve - System - General - DNS Server Settings descriptions

- Add missing DNS Resolver references
- Nuke PPTP VPN mentions
- Use letter case consistently.

The "Disable DNS Forwarder" option naming is rather unfortunate as well (would be much better with something like "Use local DNS server"), but changing that would require documentation changes....

firewall_rules_edit stop Floating field displaying

Seems to fix https://redmine.pfsense.org/issues/7057
But I have not looked underneath the hood - just copied the way other hidden fields are done in that code.
(cherry picked from commit 76895c7f1d77c8e17913a3ddf87636fc4d50058d)

Added support for CloudFlares Proxy.
Included a checkbox to enable and disable this feature when CloudeFlare
type is selected.
Included proxied variable in the update script as well.

Defaults to false, as the is the current functionality

Added help text...

Fixed #6972
I was only able to reproduce tis issue using Chrome, but it should now be resolved

Check if array key exist before read its value

Fix indent

Fix #7059 Set expected icmptypes format

icmptype is a comma-separated list in the config. When attempting to save, the array in $_POST['icmptype'] needs to be put into this format in $pconfig in case there are input errors and the user-entered data need to be re-displayed for correction....

Remove redundant gettext() in firewall_rules_edit

The 'helpmsg' here is already translated with gettext() when the 'helpmsg' array entries are set up, so IMHO there is no need to attempt translation again.
(cherry picked from commit cffe1271c962ac9159c43fd214c735ceb4b5e1b8)

firewall_rules_edit whitespace
(cherry picked from commit da391430080cb0e1b2054c6f676c9c678164f957)

Standardize privilege name capitalization

While looking at some privilege stuff, I noticed that various
capitlization looked inconsistent down the list. This makes the list
look more consistent.

(cherry picked from commit 48157a04dde7b3a56776417cdc7b5e457a660733)

Fix IPv4/IPv6 copy paste error in OpenVPN client-specific overrides. Ticket #7053

capitalise "Any"
(cherry picked from commit b1cff5815344220340a218938cd7f3df64687203)

"Any" moved to top of list in new blank rules

@jim-p wanted this split out from PR 3159 as it wasn't related to that PR.

Puts "any" at the logical place people look for it (top of list not 2/3 down it at random) while ensuring that for new rules default is tcp and extra ports etc fields are visible....

Remove and replace white spaces

Safari doesn't seem to have editing issues (or else they very quickly fixed it). Removed all white spaces and re-entered, hopefully this fixes any incorrect extraneous characters that existed? If not you'll have to let me know where exactly they are....

Put back "any" in same place it came from in dropdown
(cherry picked from commit 43a0cf73f2c2f951b9a1c5e777551de1b82c25f2)

revert protocol order change (unrelated to PR)

Will pu in separate PR afterwards as requested
(cherry picked from commit 86554b5aecb1d219e2f72c97b14de8b5fef495aa)

Data sanitation - check IP protocol in form data

Code doesn't seem to check that IP protocol is valid (IPv4/6/4+6) or report via $input_errors[] if not. Simple fix. Only spotted recently. Should be fixed whatever else?
(cherry picked from commit 202e23a81613c5810679e9b119ad4cc53977dbea)

Alternate fix for jim-p's point that seems to resolve everything neatly

@jim-p commented on the PR that:

This change is unwarranted. The protocol default should remain TCP, it is set that way on purpose (otherwise people get confused by the lack of port options being visible). It's also not relevant to the other changes being made on this PR....

improve CSS handling for icmp types (overflow/table)

Minor CSS and formatting improvement to layout for icmp types in rules table. With this change, if several icmp types are specified in the rule, if they won't fit into 2 lines the GUI automatically switches to a scrollable overflow instead, to preserve the table layout. Also underlining is per icmptype so commas etc aren't underlined which is much easier to read...

Fix the Safari issue mentioned by Renato Botelho

https://github.com/pfsense/pfsense/pull/3139#pullrequestreview-156718

I ended up having to remove the select element and re-create it (along with the options) in order to get around what appears to be a bug in Safari....

coding layout fix
(cherry picked from commit 97eebb23531bc95af2cde686641080851107c42c)

remove gettext() not needed
(cherry picked from commit c7e31e37c1aa0a8e4154528a99a121c46ebf018d)

move implode() to same line as previous change
(cherry picked from commit 91822dc6d0b829a34254638c5d15db72fe70932d)

simplify avoiding loop. Also localise with gettext()
(cherry picked from commit 16b91b19e08e0778522c16e811754c22f03b5150)

Bugfixes

1. On creating a new rule, $pconfig['ipprotocol'] is undefined, rather than defaults to what is seen in GUI (IPv4). Form generation logic for the ICMPType list box can't rely on a good value. It was fixed late here and missed when copying changes to Github. Very likely responsible for above issue by @rbgarga . Please confirm if this fixes it for you. On the off-chance that it still doesn't, can you let me know if editing an existing rule works, which will help....

Improve icmptype input sanitising
(cherry picked from commit 0e782e9f576aee02d4e2e5147e24bc5def261355)

Enhance ICMP types in rules

See main PR for details
(cherry picked from commit cf1aaf9c5afcd34ed6d2bebc577fd527c42c80b4)

Enhance ICMP type handling in rules

See main PR for details
(cherry picked from commit 7a4b11b6a495ddc747db5e44f5a62891ef86398c)

Add privs to control display of notices

This is a suggested way to allow control of the display and clearing of
notices. The use case is:
1) A user with minimal page privs (e.g. can just change their password,
or access a few status pages or...) should not be automatically able to...

Put print_info_box severity class in quotes

These should be strings in quotes, otherwise PHP looks for them to be
constants and would be issuing notice level "errors" underneath.

(cherry picked from commit 499adf7352647e401fbaf496ebac8dfb9591ad97)

Fix #3454 Do not show Mark All as Read button when no priv

If the user does not have access to index.php then the "Mark All as Read" button for the notices popup does not work for them anyway, so do not show it.
This fixes the obvious UI inconsistency - where the user has a button that they press, but it is not effective....

Change system admin to firewall admin
(cherry picked from commit 6f4323f3d3cc7066e833f8a898f0608e6527871d)

Fix #7043 Do not display crash reporter link when no crash_reporter access
(cherry picked from commit c87eeb08acc6d5d0fd642e50990b93b7137657ee)

Captive portal: add button to disconnect all users

Add a function to disconnect all logged in users and a button to call it in the captive portal status page.

(cherry picked from commit feab4e54a446050555f4708d173977968f58918d)

Add new "Ignore client identifiers" DHCP feature

Exposes the underlying dhcpd configuration option "ignore-client-uids"
in the pfSense "Services / DHCP Server" GUI by adding an "Ignore client
identifiers" checkbox.

As of ISC dhcpd version 4.3.0+, there is a new configuration statement...

IPv6, allow DHCP6 server to use a prefix size of /59 and /61 like dhcp client does

(cherry picked from commit 19d905bcaecfed47abdf5e3854f54684d19c3b8f)

IPv6, allow DHCP6 client to use a prefix size of /59

(cherry picked from commit 260f60a9b60d42be7a274b29a8c217c2b4b53507)

PPTP Remote IP is host or V4

Now that Form_IpAddress() supports a range of types of input, this can be specified as HOSTV4.
(cherry picked from commit 4890b6ecb6e2928b4f5c7d4e485c39a9def42a0b)

Form_IpAddress add types remove patterns

1) Add alias and host types to Form_IpAddress with the appropriate hover
text.
2) Remove the patterns - the UI of those is not so effective anyway, so
leave the validation of input to the back end.
3) Update uses of Form_IpAddress to use the appropriate Alias or Host...

Captive portal: add popup with session details to the active sessions list in the status page

(cherry picked from commit 081a46fe3bc2393778c4e270cd8388230d39b38c)

Fix DNS Server Gateway Check

If I enter a DNS server IP address that is on a locally connected network, and choose a gateway for it, this code was supposed to give an error message. But no error was given because $_POST[$dnsgwitem] is actually the name of the gateway, but old line 197 called interface_has_gateway() which was expecting an interface to be passed....

Modify DHCP Server messages

(cherry picked from commit 12e08722bd9264f649e76030dce24259430f2832)

Customize DHCP Server on interfaces message

(cherry picked from commit b70904493917a5213ee4b752c5466b7d36f884b8)

Captive portal: hide empty MAC column in status page

When MAC filtering is disabled the client MAC address isn't recorded and the relative column is empty. In this case, hide it.

(cherry picked from commit d08f68e2b2f9032cca9968a225cd8868320ed50b)

Fix field type for TFTP in DHCP server settings

Fix variable name used to pre-fill the NTP orphan mode field, add placeholder with the default while I'm here. Fixes #7034

Fix #7031 Allow interfaces that use DHCP for OpenVPN

even though the interface (or gateway group) has not yet actually
received an IP address.
This is useful when setting up a new system that is currently offline.

(cherry picked from commit 0f2cf2a1c47192e8394cbcec6ee291b7e753ac4b)

Fix typo in grouping/$grouping

Captive portal: convert tables to sortable tables

Convert the used vouchers table from the old GET order method to a sortable table, and make the other tables (allowed IPs, hostnames, zones) sortable too.

(cherry picked from commit 0122f1d05b24ff8160b9ec42af382185572788c4)

Fix "<onchange>" tag processing in package XML handling

Use sprintf()
(cherry picked from commit ea0a3f9ced58ab872e8cf83fb3c6200a5409bdb8)

gettext-ize this while here
(cherry picked from commit 2f7cd36737b4e1b1ba02061c6c25f538bf9ed2b3)

Add enable link to Status > UPnP & NAT-PMP error message if disabled (Todo #6689)
(cherry picked from commit cbe5405f70c8f1443b90d35a16890bcd9dc22714)

Use empty()
(cherry picked from commit 605a9e6c1f1fae786468b81bf7c911a874048fad)