lucaspalomodevelop/core
1
0
Fork 0
mirror of https://github.com/lucaspalomodevelop/core.git synced 2026-03-15 09:04:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

aliases: fix missing array() init in config structure

Browse Source
This commit is contained in:
Franco Fichtner 2015-04-05 09:28:48 +02:00
parent 4ee0a0a428
commit f21708cbbd
5 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/etc/inc/easyrule.inc
View File

@ -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 */

4
src/www/firewall_aliases.php
View File

@ -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']));

6
src/www/firewall_aliases_edit.php
View File

@ -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'];

4
src/www/firewall_aliases_import.php
View File

@ -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'] <> "") {

6
src/www/firewall_nat_out_edit.php
View File

@ -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']))