From f21708cbbd37f3a82313614ae74468e2be7b7f92 Mon Sep 17 00:00:00 2001
From: Franco Fichtner <franco@opnsense.org>
Date: Sun, 5 Apr 2015 09:28:48 +0200
Subject: [PATCH] aliases: fix missing array() init in config structure

---
 src/etc/inc/easyrule.inc            | 7 +++++--
 src/www/firewall_aliases.php        | 4 ++--
 src/www/firewall_aliases_edit.php   | 6 +++---
 src/www/firewall_aliases_import.php | 4 ++--
 src/www/firewall_nat_out_edit.php   | 6 +++++-
 5 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/src/etc/inc/easyrule.inc b/src/etc/inc/easyrule.inc
index 3a022e350..f0338d9ff 100644
--- a/src/etc/inc/easyrule.inc
+++ b/src/etc/inc/easyrule.inc
@@ -140,9 +140,12 @@ function easyrule_block_alias_add($host, $int = 'wan') {
 		return false;
 
 	/* If there are no aliases, start an array */
-	if (!is_array($config['aliases']['alias']))
+	if (!is_array($config['aliases'])) {
+		$config['aliases'] = array();
+	}
+	if (!is_array($config['aliases']['alias'])) {
 		$config['aliases']['alias'] = array();
-
+	}
 	$a_aliases = &$config['aliases']['alias'];
 
 	/* Try to get the ID if the alias already exists */
diff --git a/src/www/firewall_aliases.php b/src/www/firewall_aliases.php
index bdf3477db..ec8e4807a 100644
--- a/src/www/firewall_aliases.php
+++ b/src/www/firewall_aliases.php
@@ -36,9 +36,9 @@ require_once("shaper.inc");
 if (!is_array($config['aliases'])) {
         $config['aliases'] = array();
 }
-
-if (!is_array($config['aliases']['alias']))
+if (!is_array($config['aliases']['alias'])) {
 	$config['aliases']['alias'] = array();
+}
 $a_aliases = &$config['aliases']['alias'];
 
 $tab = ($_REQUEST['tab'] == "" ? "ip" : preg_replace("/\W/","",$_REQUEST['tab']));
diff --git a/src/www/firewall_aliases_edit.php b/src/www/firewall_aliases_edit.php
index fa9217cad..adb04fe80 100755
--- a/src/www/firewall_aliases_edit.php
+++ b/src/www/firewall_aliases_edit.php
@@ -50,12 +50,12 @@ if (is_array($config['load_balancer']['lbpool']))
 $reserved_ifs = get_configured_interface_list(false, true);
 $reserved_keywords = array_merge($reserved_keywords, $reserved_ifs, $reserved_table_names);
 
-if (!is_array($config['aliases'])){
+if (!is_array($config['aliases'])) {
         $config['aliases'] = array();
 }
-
-if (!is_array($config['aliases']['alias']))
+if (!is_array($config['aliases']['alias'])) {
 	$config['aliases']['alias'] = array();
+}
 $a_aliases = &$config['aliases']['alias'];
 
 $tab = $_REQUEST['tab'];
diff --git a/src/www/firewall_aliases_import.php b/src/www/firewall_aliases_import.php
index ef49c6824..162d16aee 100755
--- a/src/www/firewall_aliases_import.php
+++ b/src/www/firewall_aliases_import.php
@@ -50,9 +50,9 @@ $reserved_keywords = array_merge($reserved_keywords, $reserved_ifs, $reserved_ta
 if (!is_array($config['aliases'])) {
         $config['aliases'] = array();
 }
-
-if (!is_array($config['aliases']['alias']))
+if (!is_array($config['aliases']['alias'])) {
 	$config['aliases']['alias'] = array();
+}
 $a_aliases = &$config['aliases']['alias'];
 
 if($_POST['aliasimport'] <> "") {
diff --git a/src/www/firewall_nat_out_edit.php b/src/www/firewall_nat_out_edit.php
index 6cfcca1b6..e01e44272 100644
--- a/src/www/firewall_nat_out_edit.php
+++ b/src/www/firewall_nat_out_edit.php
@@ -42,8 +42,12 @@ if (!is_array($config['nat']['outbound']['rule'])) {
 
 $a_out = &$config['nat']['outbound']['rule'];
 
-if (!is_array($config['aliases']['alias']))
+if (!is_array($config['aliases'])) {
+	$config['aliases'] = array();
+}
+if (!is_array($config['aliases']['alias'])) {
 	$config['aliases']['alias'] = array();
+}
 $a_aliases = &$config['aliases']['alias'];
 
 if (is_numericint($_GET['id']))