routes: fix missing array() init (#108)

Small whitespace cleanups and style on top.
This commit is contained in:
Franco Fichtner 2015-03-26 17:00:03 +01:00
parent b3aa303cdc
commit 32aeeab6b1
3 changed files with 13 additions and 5 deletions

View File

@ -58,15 +58,13 @@ function parse_config()
}
}
// return config data as array, use old "listags" construction to mark certain elements as array (even if they're not recurring)
$config=$cnf->toArray(listtags());
/* make alias table (for faster lookups) */
alias_make_table($config);
return $config;
}
/****f* config/convert_config

View File

@ -32,8 +32,13 @@ require_once("functions.inc");
require_once("filter.inc");
require_once("shaper.inc");
if (!is_array($config['staticroutes']['route']))
if (!is_array($config['staticroutes'])) {
$config['staticroutes'] = array();
}
if (!is_array($config['staticroutes']['route'])) {
$config['staticroutes']['route'] = array();
}
$a_routes = &$config['staticroutes']['route'];
$a_gateways = return_gateways_array(true, true, true);

View File

@ -35,8 +35,13 @@ require_once("gwlb.inc");
$referer = (isset($_SERVER['HTTP_REFERER']) ? $_SERVER['HTTP_REFERER'] : '/system_routes.php');
if (!is_array($config['staticroutes']['route']))
if (!is_array($config['staticroutes'])) {
$config['staticroutes'] = array();
}
if (!is_array($config['staticroutes']['route'])) {
$config['staticroutes']['route'] = array();
}
$a_routes = &$config['staticroutes']['route'];
$a_gateways = return_gateways_array(true, true);