Merge remote-tracking branch 'mainline/master' into inc

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
	etc/inc/shaper.inc
	etc/inc/voucher.inc
	etc/inc/vpn.inc
	usr/local/www/fbegin.inc

1 files changed, 4 insertions, 3 deletions

diff --git a/etc/inc/easyrule.inc b/etc/inc/easyrule.inc
index 96864b1..0a6c703 100644
--- a/etc/inc/easyrule.inc
+++ b/etc/inc/easyrule.inc
@@ -46,7 +46,7 @@ function easyrule_find_rule_interface($int) {
 	if ($config['pptpd']['mode'] == "server")
 		$iflist['pptp'] = "PPTP VPN";
 
-	if ($config['pppoe']['mode'] == "server")
+	if (is_pppoe_server_enabled() && have_ruleint_access("pppoe"))
 		$iflist['pppoe'] = "PPPoE VPN";
 
 	if ($config['l2tp']['mode'] == "server")
@@ -79,11 +79,12 @@ function easyrule_block_rule_exists($int = 'wan') {
 	}
 
 	/* Search through the rules for one referencing our alias */
-	foreach ($config['filter']['rule'] as $rule)
+	foreach ($config['filter']['rule'] as $rule) {
 		if (!is_array($rule) || !is_array($rule['source']))
 			continue;
 		if ($rule['source']['address'] == $blockaliasname . strtoupper($int) && ($rule['interface'] == $int))
 			return true;
+	}
 	return false;
 }
 
@@ -114,7 +115,7 @@ function easyrule_block_rule_create($int = 'wan') {
 	$filterent['destination']['any'] = '';
 	$filterent['descr'] = gettext("Easy Rule: Blocked from Firewall Log View");
 
-	$a_filter[] = $filterent;
+	array_splice($a_filter, 0, 0, array($filterent));
 
 	return true;
 }