clones/librenms
1
0
Fork 0
mirror of https://github.com/librenms/librenms.git synced 2024-09-22 02:48:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

remove eval() (#6648)

Browse Source
This commit is contained in:
Tony Murray 2017-05-17 16:38:00 -05:00 committed by Neil Lathwood
parent 8d1b7d5493
commit f43ad4629c
2 changed files with 7 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
html/index.php
View File

@ -84,14 +84,10 @@ if (strstr($_SERVER['REQUEST_URI'], 'widescreen=no')) {
# Load the settings for Multi-Tenancy.
if (isset($config['branding']) && is_array($config['branding'])) {
if ($config['branding'][$_SERVER['SERVER_NAME']]) {
foreach ($config['branding'][$_SERVER['SERVER_NAME']] as $confitem => $confval) {
eval("\$config['" . $confitem . "'] = \$confval;");
}
if (isset($config['branding'][$_SERVER['SERVER_NAME']])) {
$config = array_replace_recursive($config, $config['branding'][$_SERVER['SERVER_NAME']]);
} else {
foreach ($config['branding']['default'] as $confitem => $confval) {
eval("\$config['" . $confitem . "'] = \$confval;");
}
$config = array_replace_recursive($config, $config['branding']['default']);
}
}

12
html/network-map.php
View File

@ -25,15 +25,11 @@ if (strpos($_SERVER['REQUEST_URI'], 'anon')) {
$anon = 1;
}
if (is_array($config['branding'])) {
if ($config['branding'][$_SERVER['SERVER_NAME']]) {
foreach ($config['branding'][$_SERVER['SERVER_NAME']] as $confitem => $confval) {
eval("\$config['" . $confitem . "'] = \$confval;");
}
if (isset($config['branding']) && is_array($config['branding'])) {
if (isset($config['branding'][$_SERVER['SERVER_NAME']])) {
$config = array_replace_recursive($config, $config['branding'][$_SERVER['SERVER_NAME']]);
} else {
foreach ($config['branding']['default'] as $confitem => $confval) {
eval("\$config['" . $confitem . "'] = \$confval;");
}
$config = array_replace_recursive($config, $config['branding']['default']);
}
}