pfSense

Re-generate broken .mo files, it fixes #4705

Clean up, organize, and expand the info presented by status.php. Save the output to individual text files and compress them into a .tgz for later download.

Conflicts:
usr/local/www/status.php

Also sanitize OpenVPN static/tls keys in status.php

Merge pull request #1706 from phil-davis/setupwizardlan

Improve setup wizard host name check

Redmine #4712
It seems good enough to make the regex strings here be "reasonable". The full checks are done after pressing Next and the correct routines are called that do an exhaustive check. There seems not much point in trying to re-engineer all that here also....

Merge pull request #1705 from phil-davis/wizard-text

Merge pull request #1704 from phil-davis/bug4713

Setup Wizard can result in invalid LAN DHCP pool calculation

1) consider where the LAN IP is in the subnet range and then put the
DHCP pool in the biggest remaining segment, either above or below.
2) Check the size of the available segment. If it is reasonably big then...

Clarify DNS Forwarder and Resolver both apply in these places. partially Ticket #3730

Minor wizard text fixups

Supply current WAN gateway name to wizard

As the name of the WAN gateway is not always WANGW.
Should fix redmine #4713

Merge pull request #1702 from phil-davis/system-usermanger

Code style system user manager

Allow option to specify just 1 of user and pass in OpenVPN .up file

As per comment in https://redmine.pfsense.org/issues/3633 sometimes the
server end only requires a password, no username. Usually 1 long string
that serves as the hard-to-guess authentication. OpenVPN expects...

remove pointless filter on dhcp static mappings table

Merge pull request #1585 from jlduran/dnsmadeeasy

Merge pull request #1700 from phil-davis/system-hr

Code style system h and r

Merge pull request #1699 from phil-davis/system-g

Merge pull request #1698 from phil-davis/system-firmware

Merge pull request #1697 from phil-davis/patch-3

Merge pull request #1696 from phil-davis/system-c

Merge pull request #1695 from phil-davis/system-a

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

Code style system g

Code style system firmware

system_firmware_restorefullbackup add missing p end tag

and format this block so it is clear which tags start and end where.

Code style system C

Code style system a

system_authservers text typo

system_advanced_network small grammar changes

"to tunnel" instead of "to tunneling"
Text for "prefer IPv4" reads better as 2 sentences.

Code style services unbound

Merge pull request #1471 from Talyrius/master

L7 protocols: add rtmp, sync bittorrent, finger and quake-halflife with l7-protocols

Merge pull request #1444 from oliwel/feature/easyrule-unblock

Merge pull request #1033 from aqueeb/master

Code style services r s w

Fix comment style

Merge pull request #1081 from PiBa-NL/cert_usage

Code style www diag more bits

Code style diag logs again

while making a fix today I noticed that I had done these early-on and
had not tabbed out the HTML nicely...

Add tracker rule number to dynamic firewall log

Bug #4730 - the code was not there yet.

Add support for DNS Made Easy

Documentation:

http://www.dnsmadeeasy.com/dynamic-dns/

Call htmlspecialchars() to remove dangerouns chars from zone parameter. Also redirect user to services_captiveportal_zones.php when an invalid zone is passed

Merge pull request #1686 from phil-davis/service-rfc2136

Merge pull request #1685 from phil-davis/services-ntp

Merge pull request #1684 from phil-davis/services-igmp

Merge pull request #1683 from phil-davis/www-services-dyndns

Merge pull request #1682 from phil-davis/www-services-dnsmasq

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

Merge pull request #1680 from phil-davis/www-services-cp

Merge pull request #1679 from phil-davis/services_dhcp

Merge pull request #1678 from phil-davis/patch-1

Merge pull request #1677 from phil-davis/vpn_ipsec

Code style services RFC2136

Code style services NTP

Code style services igmpproxy

Code style services dyndns

Code style services dnsmasq

Unbalanced td tag in services_dnsmasq

Code style www services captive portal

Code style services DHCP

Consistent clear_subsystem_dirty after unbound restart

from services_dhcp.
This looks like it is wanting curlies to put all clear_subsytem_dirty inside the "if".

Code style VPN IPsec

Code style www vpn_openvpn

Update/correct wireless status flags and capabilities list.
There are many more possible flags, documented on the wiki: https://doc.pfsense.org/index.php/Wireless_Status

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

Code style vpn_pppoe

Be smarter about combinations of combinedfields and usecolspan2

a) When we are doing combined fields and usecolspan2 is in effect, then usecolspan2 is also a signal that we want to spread the combined fields horizontally in a single row. In that case we want the combined fields to all be in a single "tr" tag enclosing them all. That was already working in that way....

Correct descriptions on Key Rotation and Master Key Regeneration for wireless.

More combinedfields and usecolspan2 fixes

Actually the "tr" tag needs to be a single tag-pair that encloses all of the set of fields with combinedfields specified - combinedfields=begin is where the "tr" tag starts and combinedfields=end is where the "tr" tag ends, enclosing a whole set of combined fields....

Fix tr use for combinedfields in pkg xml

When specifying combinedfields begin and end in a package XML file, IE reports some unexpected start tag messages. This is because some "td" tags are not enclosed in "tr" tags in these cases, both at the begin and end of the combinedfields table that is generated. Firefox seems to be forgiving of this....

Too many left curlies in pkg_edit.php

I broke the syntax!

Merge pull request #1662 from phil-davis/www-pkg

Merge pull request #1665 from phil-davis/www-vpn-l2tp

Code style vpn_l2tp

Remove artifacts from latin1 to utf8 conversions

String replacement:

s/Ermal L.../Ermal Luçi/g

Code style WWW pkg

The syntax of these all seems good. Because the 2.3-DEVELOPMENT master
does not currently have get_pkg_info implemented, the available packages
tab always says "Unable to retrieve package info...".
But I don't think I broke any code.
This is integrated with the little changes for startdisplayingat var in...

Merge pull request #1660 from phil-davis/www-status-rrd

Remove excess tabs status_rrd_graph

Merge pull request #1659 from phil-davis/www-status

Use correct variable to fix pagination

Fix startingat var name typo in pkp.php

Even with this fix, the code does not make sense. The first test is:
if ($startingat > -1)

if it gets into the else, then $startingat must be negative. But the test in the "else" tests for >1 ???

Someone who knows what it really is supposed to do could fix it!

Code style WWW Status RRD

Code style WWW Status

Remove the "insert my MAC" feature from interfaces.php. It hasn't worked in a while (credit sbeaver for noticing), and the only thing it tends to accomplish is breaking people's connectivity from the system where they end up duplicating the MAC of their local system.

Move pt_BR translation from ISO to UTF-8

Move pt_BR directory, it's moving from ISO to UTF-8

Merge pull request #1658 from phil-davis/patch-4

Merge pull request #1657 from phil-davis/patch-3

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

Merge pull request #1655 from phil-davis/patch-1

Add some curlies in status_rrd_graph_img

These "if data" tests look like they should apply to all 4 lines below them.
After sorting out this real-looking issue, I can mess with the rest of the formatting...

Cleanup code logic status_upnp

1) Variable $i is was set, incremented and not used.
2) "if preg_match" at line 94 had no curlies after it, so it was only applying to the first line after it ($rdr_proto = ...) It really looks like "if preg_match"should apply to the whole code chunk - settings the various "rdr*" vars and then spitting out the "tr" with the various matches values in the row....

Remove unused nentries from status_lb_pool

Remove unused var from status_gateways.php

I cannot see where "counter" is used.

Fix alias rename and delete bug #4701

The old advancedoutbound key in config.xml is now called outbound.

Delete load_balancer_relay*.php, they are not being used

Merge pull request #1653 from phil-davis/lb-work

Merge pull request #1651 from phil-davis/interfaces-other