pfSense

Only allow the DHCP registration options to be enabled when DHCP server is enabled as well
(cherry picked from commit c6d03f09e035806dca8ac3314b41a3eaf523ab3f)

Only allow the DHCP registration options to be enabled when DHCP server is enabled as well
(cherry picked from commit 13fca9bcb3fdecfb6f9707e621b49f89569abfd7)

Only start dhcpleases if DHCP server is enabled (Bug #6750)
(cherry picked from commit 3d8b01e8c6392b4177572d540c8160c7e6e071ca)

Captive portal: fix "Disconnect All" button

(cherry picked from commit 4fb2b17772928f39add5fc0529e94ed07a09de31)

User Manager - Status Icon

Use icon for status rather than textual asterisk to indicate disabled account.

(2.4, 2.3)

(cherry picked from commit edd88334dbe95af4600ae493fa86d45244cbaecb)

Merge pull request #3528 from phil-davis/system-information-widget-filter-2_3

Merge pull request #3527 from phil-davis/breadcrumbs-2_3

fix colspan background on dark theme

Add "required field" highlighting

Only save valid widget locations in config

Some widgets create extra panels, e.g. the widgets that now have the filter functionality. Those panels are processed in the ".each" at line 424. They do not have an id in the form "widget-*" and when the old code tries to find the "*" part it gets "undefined". This results in the layout being saved like:...

Allow 5 dashboard columns to work

Selecting 1,2,3,4 or 6 dashboards columns results in an exact integer result here and all is good. But 5 columns results in "2.4" and "col-sm-2.4" is not a thing in bootstrap.
We need just the best int we can choose here, which is one that is just the int part of the division. That ensures that the 5 columns extend over less than the standard bootstrap total of 12 "units" wide....

Fix #7257: Use pfSense-upgrade to look for new versions

Fix saving Hybrid RSA + Xauth. Fixes #7258

Revert "Add privs to control display of notices"

Fix #7051

This reverts commit 04665e78537906f7375668ca665cba17f95a4864.

Revert "Use cached groups in get_user_privileges"

This reverts commit 855826896509a1a0bec77a51535a8f004b4ca570.

Use cached groups in get_user_privileges

(cherry picked from commit 7abc3f992e5dd5bff53495844ce944163d6d1d9b)

Fix ldap_get_groups return value when down

In some places ldap_get_groups has:
```
return memberof;
```
It should have the "$" in front, so it will return the $memberof array (that is empty when this happens).

This causes issues for callers that expect to have a return value that is either false, an empty array, or an array of the groups....

IPv4 Tunnel Network is required for OpenVPN server

(cherry picked from commit e4488e51cf424907e06ef7cc73370aa0657e5e25)

Update version string at end of boot RELENG_2_3

When there is an upgrade, the echo here was outputting a stale value of the version. For example, on first upgrade from 2.3.3-DEVELOPMENT to 2.3.3-RC the console had:

pfSense (pfSense) 2.3.3-DEVELOPMENT amd6 Sat Feb 11 14:24:27 CST 2017...

System Information widget filter gettext()

(cherry picked from commit f5d762f90924510c097a9065dff135dab01f46f0)

System Information Widget Filter

(cherry picked from commit 718b3b0b1b75de09a87866cb37b5a0752643283a)

Fix cut-paste error in Breadcrumb Links
(cherry picked from commit 0e5ee5ae260c42a05b79edf74fb491fca52bacb4)

Breadcrumb links

(cherry picked from commit edcd75357f0e93b124159314d3306197d5312e6c)

Breadcrumb links support

(cherry picked from commit c50f228a1583fe694993778e8576322877a15bba)

Add foot.inc back to status.php

Bump version to 2.3.4-DEVELOPMENT

5th try
- change $do_ping default value to 'true' (which emulates the previous default behavior) to avoid any unexpected results

(cherry picked from commit 20cf8d8e20fa28c16e86ce0d91e57e4d78427d26)

4th attempt!
- Reworked based on recent comments from @rbgarga

(cherry picked from commit c516cb287a78f7b05459e7fcba410f443d8eb8af)

3rd try!
- incorporate suggestions from @rbgarga with slight modification

(cherry picked from commit 6c2f093000b05285546e81dd1a578fc9b573b72b)

2nd try. . .

/etc/inc/util.inc:
- arp_get_mac_by_ip() updated to support IPv6
- attempt at code streamline

/usr/local/www/services_dhcp_edit.php:
- streamline code, now just a simple call to arp_get_mac_by_ip()

(cherry picked from commit dd83f869b79a858bd74c7a8bb4adcd49217445b0)

enhancements to services_dhcp_edit.php
- added ndp call to get MAC addr if remote client is connected via IPv6
- automatically hide `Copy MAC` button if arp/ndp returns null
- switch to exec() instead of backticks for calls to arp
- uses builtin is_ipaddr() function from util.inc...

Sync up status.php with master, but keep the 2.3/10.3-specific parts. Fixes #7246

Do not output PHP shell starup message unless it is run interactively. Fixes #7045

Add a pfSense php shell playback script to show the gateway status. Ticket #7046

Add a function to format and return plain text output showing the gateway status, for use by a shell script and status.php. Ticket #7046

Add playback scripts to drill into pf tables and anchors to list their contents.

Fix for bug 6966 https://redmine.pfsense.org/issues/6966

Change-Id: I9471c2bbd8941e70965a86d369c8de87be9a4417
(cherry picked from commit 109a304e154a179bd340b06880ce95baec4dab03)

Revert "Fixed #6753"
User feedback suggests the sorted menu was better, despite the lack of consistency elsewhere.
This reverts commit 96ff627ff95e0fcadf8c15dbd6fe681309cb0fd8.

Mark missing parameter as required. It got lost during backport from master as spotted by @phil-davis

Required fields - Alias Type

should be a required field. And this 1-char change can also be backported to RELENG_2_3. I noticed this while looking at GUI pages in 2.3.3
(cherry picked from commit 8ea10c11441b5aed0b10eb14038aa8f8adbfb3de)

Fix #7157

trafficgraph: Don't update the on screen visual graph while invisible,
which avoids creating a large queue of pending timer objects waiting
for the next requestAnimationFrame to happen.

Submitted by: PiBa-NL at https://github.com/pfsense/pfsense/pull/3450

Ticket #7157: Backport upstream fix from https://github.com/novus/nvd3/commit/305cbad96e94f61a3c0bae02d16c28e09249fbc0

Example of setting required items

(cherry picked from commit 32a85c63c9411463c98a0605772b3e2c01702971)

Require Name field in Shaper

(cherry picked from commit 40dcb4b61a2c1213a0b3e213c78fddac845a0117)

Revise setHelpText to accommodate required fields

Provide Javascript set_Required function

Provide CSS for required fields

Add "Required field" capability to Groups.class.php

status_upnp remove nested getext()

I don't think this does anything useful.
(cherry picked from commit 3224663a3759935b47406c789b9f5cea3eb88136)

Part fix #7233 keep correct staticmap_array_index

The index needs to be incremented even for entries that were skipped for display because they (for whatever reason) have no MAC or CID set. So use the key directly from the array.
(cherry picked from commit 9aa3c5e84984958caa19ac76ecba849b94a8b360)

Part Fix #7233 Allow deletion of empty static map entries
(cherry picked from commit 2ea70e1a474fd871a007c76841f2a33f34082c58)

diag_backup do not use button text for comparisons

(cherry picked from commit 9a7e1c9580c5779c86bc97d6d82c43401c7a4b12)

Rather than setting the value directly, minimize exposure to eval() in update_config_field() from wizard.php by constructing a variable reference, then set the value using the reference rather than passing user input through eval(). Fixes #7230

Convert easyrule.php to use a confirmation landing page so that the parameters can be submitted via POST. Also, remove the JavaScript confirmation box since it is now redundant. Fixes #7228
The confirmation page displays the submitted parameters for an extra user sanity check. Also fixed a bunch of page formatting issues that were not apparent because users rarely if ever saw output from the page.

interfaces_ppps_edit fixes that will work on 2.3.3 also

1) Make "The MTU is too big" message actually come out. The code around line 300 was rubbish (maybe from before bootstrap?).
2) Show friendly description rather than 'wan' 'lan' opt1' in interface link list....

Fix #7226 Package installation message is incomplete

This makes it remember pkgname after the install finishes and the form is re-submitted.
(cherry picked from commit d12bc864ceb5d656fc094bde7cf5ec96e24bdde9)

pkg_mgr_install remove embedded HTML from result strings
(cherry picked from commit 682008ff758b942d85ed007b485e0b2fa8e3a11c)

Encode the contents of pkg_filter before output. Fixes #7227

Encode 'from' and 'to' before output on pkg_mgr_install.php. Fixes #7225

Revert "setHelp formatting for interfaces.php"

This reverts commit e6068596baf4307fe3eb9866072800e4c23b6840.

setHelp formatting for interfaces.php

There was a fair bit of it, so I have put this in its own pull request.
1) Gets HTML out of the strings that go for translation.
2) Line 3365 - the words here about "hexadecimal" now go in the text directly in the setHelp so the translators will get access to them....

fbegin.inc and fend.inc obsolete

(cherry picked from commit 5af0922d75724e1eac89017173457f57842387f8)

fbegin.inc and fend.inc are no longer used

(cherry picked from commit c09188a21938f7b1d19fd845fa7e5b0712dd4a83)

Internationalization graph.php

1) A few extra strings to be translated.
2) The scale_type code values 'up' and 'follow' need to be kept as those strings in the JS scale_type variable. The text to be translated needs to be in a different variable that can be in translated form for display. Otherwise things go wrong when in a different language....

Update help message for Zone ID for new region requirement

(cherry picked from commit 49f90f17bfaf2422d56160ad06ef5e2513beb1ba)

implement AWS API v4 signing

(cherry picked from commit ac5ee07ee1daef2f43e728895290ca6d11efe0f3)

commit initial fix; need to add hooks for region to zone id

(cherry picked from commit cb5961d1fa64a45cbec5ef5d677b57f8d62f50b5)

certificatemanager, don't show information from previous certificate if no cert or csr is present in the cert

(cherry picked from commit 1048585a08ac824057eea35c57fe359b9e6a48fe)

Use unique var names in Input.class.php

(cherry picked from commit a66177645191359e5ce854d733e9be40ada3535b)

Simplify logic

Set ntp gps mode for pgrmf even if no other modes are being set.

(cherry picked from commit 821110e8ff76564c23783c554fc89cd9458683ac)

Add to NTP GPS processing of PGRMF sentence

(cherry picked from commit 6924a2bf34a70cd33284a28ca3575f33f9834375)

Provide info on services_checkip.php about what the server must return, and provide two examples of server-side code to return the client address. Fixes #6374

diag_reseststate sourcetablehelp escape of double-quotes not needed

The backslash escaping of the double-quotes here displays the backslashes literal on the GUI. Escaping is not needed in this single-quoted string.
(cherry picked from commit 4ede308c615508a7b70074f56a3ca77cae7b68f1)

get_service_status_icon fix description_state format

If "description_state" is requested here, there are too many "%s" substitutions in the string for sprintf().

Also, to help translators, number all the "%s" substitutions. Then translators can rearrange the text and variable order if they need to....

Redmine #7173 Do not allow pkg_ for If, IfGroup, Alias

(cherry picked from commit c9d93b62b0cc559d1ed4326212b6385cae2eb398)

Fix #7183 Do not allow Interface Groups with the same name

I should stop trying bad stuff, there seem to be so many holes to find in the validation :)
(cherry picked from commit 89ac71d38a4c49e1537e4afe2b34b2457d9817a7)

Merge pull request #3455 from VPSrv/v2_3-patch-1

Remove unused broken functions

Not sure what was the idea here, but these are not used anywhere, do nothing as they immediately call ```return false;``` plus the second one is also misnamed.
(cherry picked from commit edba33b5a567ab8c9d4827fa26a25bd9649e3fac)

vpn_openvpn_server: fix missing parameter

Fixed #7180

Required fields for VPN pages

(cherry picked from commit 1bbdab13e436f5f2b9e381886be4d9c2d1a4e44f)

Fix #7173 Interface Group Name cannot contain dash

Required fields for System pages

(cherry picked from commit 153c3aa61fe65c51d584a57c032a4805048e3062)

Misc cleanups at get_pkg_info()

• rename function args to be clearer what they do ($local_only was quite ambiguous, at first sight it could mean any of: "don't update local catalog copy", "only check local catalog copy", or "only report local installed pkgs")...

fix copy/paste - I think!
(cherry picked from commit 2f633b526075b2ed5e0e160ef6f0d025b509bd70)

use wrapped version of pkg info -e instead
(cherry picked from commit e5f96a2cb3c0cad0c828148bd7b8d45c130a9b17)

get_pkg_info() fallback using pkg info if no local copy of repo catalog (resubmit)

Resubmit of PR #3157 with fix.

The issue in #3157 was that `pkg info` and `pkg search`, undocumented in man pages, seem to handle things differently if no packages match the pattern string. `pkg search` gives an error "No packages match [$pkgs]", whereas `pkg search` doesn't give an error....

More required fields for NAT pages

(cherry picked from commit 877be5e6205ada2608b364f57150010ba473e66d)

Required fields in NAT pages

(cherry picked from commit f2e58c16307795f572ff443e999c54eb6a9839e7)

Required fields in diagnostics

(cherry picked from commit 3e2028f4dca359e715058d2c35ae0df5b939657e)

More required fields for Interface pages

(cherry picked from commit fb572e810abe247c273c27ffafb129430b13be1f)

Use gettext on Username and Password

(cherry picked from commit e52b5a409faa41222a4ff0c917355eb66d0ff19a)

Required fields in Interfaces pages

(cherry picked from commit 1095b20410963e748fe13268e6fa8f35ccce2319)

Required fields in Status pages

(cherry picked from commit f311d3ba11572364488ee25ca9df08a33e42a089)

Remaining required fields for Diag pages

(cherry picked from commit fe54f09154f4116ceea6897bff54a624f1eb63bc)

Required fields for firewall*.php

(cherry picked from commit 8a1b5c561f93611b711eb4e7b58ccb4990577d8e)

Required fields for Captive Portal

(cherry picked from commit c06865be6de6b164d06ee9bb1768dfe6829d783c)

Required fields in Services pages

(cherry picked from commit 24b82516e0baac87316245427e870a36fbcda4ac)

Fix indentation

(cherry picked from commit c18d0d12b3e683f07b4bac933240332cd4d95829)