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

gateways: more potential fails of legacy code vs. new config system

Browse Source
This commit is contained in:
Franco Fichtner 2015-04-03 12:12:43 +02:00
parent a35f277d56
commit 15eb3c5652
6 changed files with 42 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/www/status_gateway_groups.php
View File

@ -1,4 +1,5 @@
<?php
/*
Copyright (C) 2014-2015 Deciso B.V.
Copyright (C) 2010 Seth Mos <seth.mos@dds.nl>.
@ -28,8 +29,13 @@
require_once("guiconfig.inc");
if (!is_array($config['gateways']['gateway_group']))
if (!is_array($config['gateways'])) {
$config['gateways'] = array();
}
if (!is_array($config['gateways']['gateway_group'])) {
$config['gateways']['gateway_group'] = array();
}
$a_gateway_groups = &$config['gateways']['gateway_group'];
$changedesc = gettext("Gateway Groups") . ": ";

11
src/www/system_gateway_groups.php
View File

@ -33,8 +33,17 @@ require_once("filter.inc");
require_once("shaper.inc");
require_once("openvpn.inc");
if (!is_array($config['gateways']['gateway_group']))
if (!is_array($config['gateways'])) {
$config['gateways'] = array();
}
if (!is_array($config['gateways']['gateway_item'])) {
$config['gateways']['gateway_item'] = array();
}
if (!is_array($config['gateways']['gateway_group'])) {
$config['gateways']['gateway_group'] = array();
}
$a_gateway_groups = &$config['gateways']['gateway_group'];
$a_gateways = &$config['gateways']['gateway_item'];

7
src/www/system_gateway_groups_edit.php
View File

@ -32,8 +32,13 @@ require_once("vpn.inc");
$referer = (isset($_SERVER['HTTP_REFERER']) ? $_SERVER['HTTP_REFERER'] : '/system_gateway_groups.php');
if (!is_array($config['gateways']['gateway_group']))
if (!is_array($config['gateways'])) {
$config['gateways'] = array();
}
if (!is_array($config['gateways']['gateway_group'])) {
$config['gateways']['gateway_group'] = array();
}
$a_gateway_groups = &$config['gateways']['gateway_group'];
$a_gateways = return_gateways_array();

10
src/www/system_gateways.php
View File

@ -33,12 +33,18 @@ require_once("shaper.inc");
$a_gateways = return_gateways_array(true, false, true);
$a_gateways_arr = array();
foreach ($a_gateways as $gw)
foreach ($a_gateways as $gw) {
$a_gateways_arr[] = $gw;
}
$a_gateways = $a_gateways_arr;
if (!is_array($config['gateways']['gateway_item']))
if (!is_array($config['gateways'])) {
$config['gateways'] = array();
}
if (!is_array($config['gateways']['gateway_item'])) {
$config['gateways']['gateway_item'] = array();
}
$a_gateway_item = &$config['gateways']['gateway_item'];

7
src/www/system_gateways_edit.php
View File

@ -37,8 +37,13 @@ foreach($a_gateways as $gw) {
}
$a_gateways = $a_gateways_arr;
if (!is_array($config['gateways']['gateway_item']))
if (!is_array($config['gateways'])) {
$config['gateways'] = array();
}
if (!is_array($config['gateways']['gateway_item'])) {
$config['gateways']['gateway_item'] = array();
}
$a_gateway_item = &$config['gateways']['gateway_item'];
$apinger_default = return_apinger_defaults();

6
src/www/wizards/setup_wizard.xml
View File

@ -579,8 +579,12 @@
$config['system']['hostname'] = $config['wizardtemp']['system']['hostname'];
$config['system']['domain'] = $config['wizardtemp']['system']['domain'];
if (!empty($config['wizardtemp']['wangateway'])) {
if (!is_array($config['gateways']['gateway_item']))
if (!is_array($config['gateways'])) {
$config['gateways'] = array();
}
if (!is_array($config['gateways']['gateway_item'])) {
$config['gateways']['gateway_item'] = array();
}
$found = false;
$defaultgw_found = false;
foreach ($config['gateways']['gateway_item'] as & $gw) {