aliases: fix missing array() init in config structure

opnsense · Apr 5, 2015 · f21708c · f21708c
1 parent 4ee0a0a
commit f21708c
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 10 deletions.
diff --git 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
@@ -36,9 +36,9 @@
 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
@@ -50,12 +50,12 @@
 $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
@@ -50,9 +50,9 @@
 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
@@ -42,8 +42,12 @@
 
 $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']))