Fixup easyrule block for IPv6
Fixup processing of IPv6 IPs for EasyRule. Fixes #2649
Allow using subnets and special nets in the CLI version of easyrule
Fix merge conflict
Merge remote-tracking branch 'upstream/master'
Conflicts: etc/inc/easyrule.inc etc/inc/filter.inc etc/inc/interfaces.inc etc/inc/services.inc etc/inc/xmlrpc_client.inc usr/local/www/fbegin.inc usr/local/www/services_dhcp.php
Merge remote branch 'upstream/master'
Conflicts: etc/inc/filter.inc usr/local/www/themes/the_wall/rrdcolors.inc.php
Merge remote-tracking branch 'mainline/master' into inc
Conflicts: etc/inc/voucher.inc
In IPsec, s/mobileclients/client/, this was changed long ago in the config but not everywhere followed.
Conflicts: etc/inc/auth.inc etc/inc/config.lib.inc etc/inc/filter.inc etc/inc/pfsense-utils.inc etc/inc/pkg-utils.inc etc/inc/priv.defs.inc etc/inc/services.inc...
Add {} around foreach contents. Fixes occasional duplication of the easyrule block alias.
Add block rule to the top of the firewall rules.
add a ipprotocol variable to the easy add rules
Also fix easyrule and auto->manual nat switch code. Ticket #1243
Merge branch 'master' into inc
Conflicts: etc/inc/captiveportal.inc etc/inc/config.console.inc etc/inc/config.lib.inc etc/inc/easyrule.inc etc/inc/filter.inc etc/inc/ipsec.inc etc/inc/pkg-utils.inc etc/inc/shaper.inc...
Don't run mb_convert_encoding on descr field, it's cdata protected in the config now and this just causes some characters to be lost on input. Ticket #1168
Merge remote branch 'mainline/master' into inc
Conflicts: etc/inc/PEAR.inc etc/inc/filter.inc
Remove trailing carriage return
Bail out here if a variable isn't an array like it should be.
Implement gettext() calls on easyrule.inc
Refactor the Easy Rule code a bit. Add a CLI version.
Fix EasyRule port check so it is only tested when the protocol is TCP or UDP. Resolves #412While I'm here, make EasyRule put a description in when writing the config so it shows up properly in the config history.
Ticket #340. Remove bogus functions. Sort aliases the same way it is done on the aliases page.
Clean up some formatting while I'm here.
Fix Easy Rule for OpenVPN interfaces. Resolves #349
Move two include files to /etc/inc instead of leaving them in the www dir. Move filterparser.php to /usr/local/bin since it's not meant to be used from the web interface.