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
Merge pull request #1650 from phil-davis/interfaces-php
Code style Load Balancer
Slash-select should be inside if in load_balancer_pool_edit
otherwise there is an unbalanced slash-select when the else happens (if there are no load-balancer monitors defined)
Code style interfaces miscellaneous files
Code style interfaces.php
Handle extra column on floating rules tab
when there are no floating rules to display.The box needs to span 11 columns.
Merge pull request #1646 from phil-davis/firewall-rules
Merge with master
Merge pull request #1647 from phil-davis/firewall-shaper
Code style firewall shaper
Merge pull request #1637 from alex-berger/dhcp-staticleases-unique-check
Merge pull request #1616 from Robert-Nelson/floating-interfaces
Code style Firewall Rules
Merge pull request #1645 from phil-davis/wizard
Merge pull request #1644 from phil-davis/firewall-virtual-ip
Merge pull request #1643 from phil-davis/firewall-schedule
Merge pull request #1642 from phil-davis/firewall-nat
Merge pull request #1641 from phil-davis/firewall-aliases
Merge pull request #1640 from phil-davis/patch-2
Code style Wizard
Code style Firewall VIP
fixed indent according to the style guide.
Code style Firewall Schedule
Code style Firewall NAT
Code style firewall_aliases
Minor changes to firewall_shaper_layer7
The tabbing of this code is not so good, so it is difficult to see what is going on. I will format that in a later pull request.These things look unbalanced but actually were not at run time. These changes make it easier to check the code in an editor that can show the balanced "table" "/table", "selected" "/selected"....
Firewall Rules Edit missing slash
This should be the end of a "tr" here.Browsers seem to be forgiving of this stuff - I don't see any difference in rendering in Firefox before or after this change.
Merge pull request #1635 from Robert-Nelson/staticmap-bug
Merge pull request #1636 from phil-davis/patch-1
Fix syntax
Remove package_skip_tests(), it won't be necessary anymore with pkg
Use 'interfaces_selection' type to miniupnp fields
Currently pfsense enforces unique unqualified hostnames for static dhcp leases, which is not correct as only the fully qualified hostname (hostname + domainname) must be unique. With this commit the old validation logic for uniqeness is modified such that hostnames no longer need to be unique and at the same time the fully qualified hostname hast to be unique....
Remove unused functions get_pkg_sizes() and get_package_install_size()
Rename get_pkg_id() to get_package_id() and get_pkg_internal_name() to get_package_internal_name(). Try to use more standard parameter names and simplify logic while here
Pass correct package name to add_package_tabs()
Read tab information from package xml file instead of config.xml
Unmatched td in firewall_nat
This file seems to have an unmatched "td" ending. Adding the line here matches the "td" at line 320 and this embraces the little table that has the 4 icons in it in a square that comes at the right hand end of each port-forward entry in the main table....
Call clear_subsystem_dirty('staticmaps') if using Unbound
Encode server name before displaying back to the user.
Fixes #4633 Enable carp packets to flow on the first carp interface creation. This is needed only when the system is booted up without any carp vip configured
Ticket #4131 before formatting the mac extract the needed statistics from below
Show correct selection for noshuntlan option. Ticket #4655
Merge pull request #1631 from phil-davis/patch-5
Merge pull request #1630 from phil-davis/patch-4
Merge pull request #1629 from ExolonDX/master
Merge pull request #1625 from phil-davis/www-e
Merge pull request #1623 from phil-davis/code-style-diag
Merge pull request #1622 from phil-davis/usr-local-www
Merge pull request #1618 from phil-davis/www-widgets
Merge branch 'master' into floating-interfaces
Remove the DHCP static lease overlap cleanup and associated function and kill, as it can cause problems with failover scenarios.
Add static mapping interface not set when IP in a pool
If the DHCP IP address is in a pool (not in the main DHCP range for the interface) then the interface that corresponds to the IP address is not found. This results in the link to "add static mapping for this MAC address" not having any value for "if=" and thus clicking on the "+" button does not work....
Do not process dhcpd implementation if input errors
If I go to Service->DHCP Server, make some edits that are invalid (e.g. change range start or end to some invalid string) and press Save then the page comes back displaying the input error(s). But it also says:...
Trying to submit a symlink as part of crash reports will cause a failedsubmission. Remove symlinks first. Also properly set user agent whilehere, consistent with others. Fix some style and whitespace too. Ticket
Tidy up "status_upnp.php" XHTML
Remove double line from table
Tidy up "services_unbound.php" XHTML
Add missing closing TD tag
More www code style oddments
Fix #4640 IPsec Auto-exclude LAN address toggles
every time save is pressed.Actually the GUI is displaying the opposite setting to what is in the config. When the user pressed save that opposite setting was saved, but then again it displays the opposite of the opposite...
Code style usr-local-www diag
Code style xmlrpc
Code style usr-local-www back-end
files that do stuff in mostly in the background.
Implement make bofre break feature avaliable on strongswan 5.3.0 useful for IKEv2. Fixes #4626
Make diag_smart back button look like other buttons
The back button here was just a piece of text with no nice formatting.This change codes it as a button in the same way that "Cancel" buttons are done elsewhere. It makes the SMART Diag results page look a bit more consistent with the rest of the pfSense GUI.
Widgets code style
Add Interfaces column to Floating Rules
Add support for EAP-RADIUS to IKEv2 Mobile Clients
Merge pull request #1601 from phil-davis/check-overlapping-subnets
Remove pre-check and post-check from Cache-Control
If both `post-check` and `pre-check` are specified and set to `0`, bothare entirely ignored:
http://blogs.msdn.com/b/ieinternals/archive/2009/07/20/using-post_2d00_check-and-pre_2d00_check-cache-directives.aspx
Combine Cache-Control header in one line
Sorted by RFC 2616:
Section 14.9.1 `no-cache`Section 14.9.2 `no-store`Section 14.9.4 `must-revalidate`
Combined into one line with IE's `pre-check` and `post-check`. However,when both set to `0`, both are entirely ignored:...
Merge pull request #1609 from phil-davis/www-bits
Code style for small things in usr-local-www
When deleting a VIP check it is not used by OpenVPN
I noticed this when cleaning up VIPs and OpenVPN server when testing for this forum post https://forum.pfsense.org/index.php?topic=92174.0The system let me delete my test VIP before I deleted the OpenVPN server using, probably not a good thing....
Domain override with multiple authoritative DNS servers
Tell users that this is possible in DNS Resolver and how to achieve it. The code in unbound.inc already supports it and works.I had asked for this in Redmine feature request #4350 and when I went to look at coding to implement it I found code that already did it....
Check for overlapping subnets when saving interface addresses
This checks if a static IP address entered for an interface has a subnetthat overlaps with any other configured subnet. e.g.:LAN is IPv4 10.10.12.1/24Then try to set OPT1 to 10.10.13.1/23 - it overlaps with LAN because...
Allow single interface bridges. Useful with span port option, and when shuffling configuration around.
Merge pull request #1597 from phil-davis/Common-typos
diag_sockets show sockets listening on localhostthis helps pick a free port for services using sockets bound to localhost, and helps determine if the service has at least started and bound the port without needing to go through all 'connected' sockets as well
Fix up Ticket #4504 implementation. Match config style with other areas. Use a config setting to disable, rather than enable, this functionality since it's enabled by default so the tag isn't necessary in the default config. Remove now unnecessary config upgrade code.
Few minor text typos
Note that advertise is spelt with an "s" in other places in the GUI, somaking it consistent in services_ntpd - but maybe Americans do spell it"advertize" these days?
shouldn't need this as its own inc anymore, but only changing in master since 2_2 nearing release
There is no longer any need to restrict protocols for IPv4+IPv6 rules, the appropriate ruleset is generated and problem scenarios that would otherwise break here are prevented by other input validation.
remove dead code, clean up excess white space a bit.
Fixes #4504 use correct key index
Fixes #4504 Allow the bypass policy for LAN to be enabled and prevent traffic sent to lan ip to go to the ipsec tunnel
Fixes #4259 Use proper variable to do calculations
Add SCTP to protocol list for filtering.