pfSense

Welcome 2015

Merge pull request #1412 from phil-davis/patch-2

Allow for old settings that have no iketype

This bit of code looks like it could do with the same test as https://github.com/pfsense/pfsense/pull/1412
This is executed when the "Connect" button is pressed from Status->IPsec
Somebody with these problematic old IPsec entries could test this - with current code I suspect that disconnect followed by connect - it will not connect. With this change it will (might?) connect again.

IPsec Widget allow for old settings that have no iketype

as mentioned in https://forum.pfsense.org/index.php?topic=84527.msg471919#msg471919
This change makes it work like similar if tests in /usr/local/wwwvpn_ipsec.php, and code in /etc/inc/vpn.inc that effectively defaults to ikev1 when iketype is not specified....

Captive portal spelling

Merge pull request #1408 from ExolonDX/master

Backout pull request #1391

https://forum.pfsense.org/index.php?topic=85944.0

Backout pull request #13191

Fix unbound shortcut links

Fixes redmine #4151
1) Make the naming in shortcuts.inc more clear - forwarder=dnsmasq
resolver=unbound
2) Make the value of $shortcuts_section correct in each dnsmasq and
unbound php code
3) Make diag_logs_resolver.php smarter, so if dnsmasq is enabled, then...

clarify message here after customer feedback, it wasn't meant to imply "only a reboot will re-enable" but that's how some people have read it.

Move this check before full sync to disable dnsmasq/unbound in the first time it's sync'd