pfSense

Typo in pppoe_subnet input error message
(cherry picked from commit 01799e5bd5f363e21c744752760ab0cc591713da)

Captive Portal auth method is required

When creating a new Captive Portal Zone the user can fail to select any of the Authorization Method radio buttons. No default radio button is selected - that is probably good, as the user has to think and click to decide which authorization method they will use....

CP HTTPS Forwards setHelp format

Add full stop and spacing between sentences.
(cherry picked from commit 0046a7da59fb3015512ce181cba6b37516c0b76f)

Changed default state of GPS init command auto correct tool.

(cherry picked from commit 2559f37539cf37221f8fddd7c0b7928e8e3969a8)

Feature #7159 Add GPS initialization command auto correct tool
Corrects malformed NMEA sentences by calculating and appending the checksum and adding missing special characters "$" and "*"

(cherry picked from commit 8c23d92a159c1282e7d185665977f0c45d45f845)

Require at least one tag value in a QinQ entry
(cherry picked from commit 4085eb055850e07540145c87fd6d3b5912a865dd)

Use is_intrange() to validate QinQ tag range

Note: is_intrange() only tells us that the range is good and might be delimited by a "-" or a ":", so if we want to take apart the 2 parts of the range (like is done here) we have to also test the string to decide which separator to use....

QinQ Tag Value Validation

Tags must be in the range 1 to 4094
Flag the various input errors and only report them once each.
(cherry picked from commit e0b7a2e76bddd121bc7f92a6ecb20266c8485ed1)

QinQ Edit fix row add delete

1) Make the row delete button actually work
2) Do not allow ranges that go backwards like 25-20 or just "-" or 1-sided ranges "-42" "42-"
3) Remember the POSTed stuff to redisplay to the user if there were input errors
4) Ranges or numbers entered could overlap - just save a list of the unique members. e.g. If the user enters 5-15 and 10-20...

change opacity on disabled rows to fix #6448

Merge pull request #3166 from NOYB/System_Update_Settings_-_GitSync_Options

Validate POSTed interface description

Copy-paste error from code that used $_REQUEST. This is more correct to use $_POST.
(cherry picked from commit b07adc116c47a2f6a27ae69c84fe0e36a5a27fbd)

Interface description should be required

I was blanking out stuff to see what input error messages came about fields that are required. I was surprised that the Interface Description would save empty. The system did not immediately explode (I was playing with a bonus interface I had created in a VM) but I don't think it is desirable to have interfaces with no description....

Interface Group Name should be required

Do not allow it to be blank. Do not bother with all the other checks on the group name if it is blank.
(At the moment I can enter an Interface Group with blank name)
(cherry picked from commit 3effec3b515a97e3b5820ba8687645868b807463)

traffic-graphs, setting to keep updating them while invisible
- allow showing different graphs to be shown on different browser tabs (dont use localstorage for graphs to query)
- show interface name in graph instead of realname

Parse GPS initialization commands, extended status for GPSs other than SureGPS and make optional.
- Parse GPS initialization commands for explicitly configured GPS commands
- Add extended GPS status if GPGSV or GPGGA are explicitly configured
- Add config option to toggle extended status...

Always force compress when calling Net_IPv6

(cherry picked from commit 587995fb57f91894d1f8eb6b296a9fe2fa111fac)

Interface description must be unique including case

(cherry picked from commit 3692adec74d438eedb41a7be8eae9cd58f6fe5c1)

Required fields in Load Balancer pages

(cherry picked from commit 275d769e0d99e02984e42e2328cbcb681f9b87fb)

firewal_nat_edit function name typo

This unrelated fix is in a big diff listing of other stuff related to a proposed RADIUS enhancement https://github.com/pfsense/pfsense/pull/3407/files#diff-f080be89fa12ff3c28d7467b12985d09
The accidental typo should be fixed, rather than getting stuck in that other PR....

6RD Border Relay input error message

This field is labelled "6RD Border Relay" on the main UI. It confused me for a moment when I got this message "6RD Border Gateway must be an IPv4 address." since there was no field with that label in the 6RD section of the UI....

Add required fields to firewall_aliases_import
(cherry picked from commit b6368b73d921a29e87cc1cd02ab912024ba66d0a)

Display input error when no aliases to import

Currently if you put nothing in the "Aliases to import" box and press Save then the page just reloads - nothing saves and there is no message about the problem. It should tell you to that "Aliases to import" is required....

System Update Settings - GitSync Options

Add GitSync options selectors to post update GitSync.
Minimal, Diff, Verbose, Dry Run

The GitSync options have utility for post update sync also.

Internationalization (getttext)

Please also backport to 2.3

(cherry picked from commit d0718a0f9031f9dc7c6eff3e47e472178c900ece)

Fix copy-paste of ipsec.widget.php file name

Noticed while looking in widget code, might as well fix it.
(cherry picked from commit a80ce1a7e03ca4fa61f83166b747b4f72dddd4ba)

Fix #7134 Interface Stats widget ifdescrs not defined

When doing testing I had the Interfaces widget open as well as Interface Statistics. $ifdescrs was already populated as an array by the Interfaces widget, so Interface Statistics had (accidentally) gained the benefit....

Merge pull request #3391 from NOYB/Status_/_Interfaces_-_Relinquish_DHCP_Lease_2_3

Protect against forech errors if this function does not return an array. Fixes #7134

Add filter to SMART status widget

(cherry picked from commit 22e8fa1f6aec0b1536f0c07e1573ac78a291891f)

Status / Interfaces - Relinquish DHCP Lease

Send gratuitous DHCP release message to server.

Dependency:
To fully relinquish the DHCP lease, the "RELEASE" reason needs to be added to the /sbin/dhclient-script.
s/EXPIRE|FAIL)/EXPIRE|FAIL|RELEASE)/

Without the 'RELEASE' reason, the DHCP release message will still be sent to the server, however the local dhclient leases will not reflect the relinquishment. Therefore, DHCP renewal will do a DHCP request for the previous address rather than doing a DHCP discovery and being more likely to be assigned a different address.

Status / Interfaces - Match Var Names

Match Form Input and Function Parameter Names with associated Var Name.

Use "ifdescr" as form input name instead of "if" since "ifsescr" is the var being passed.
Use "ifdescr" as showDefBtn function var instead of "ifval" since "ifsescr" is the var being passed....

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)