From f43ad4629c4fc7c0b0e5d71869f2b0d0a1a475e9 Mon Sep 17 00:00:00 2001
From: Tony Murray <murraytony@gmail.com>
Date: Wed, 17 May 2017 16:38:00 -0500
Subject: [PATCH] remove eval() (#6648)

---
 html/index.php       | 10 +++-------
 html/network-map.php | 12 ++++--------
 2 files changed, 7 insertions(+), 15 deletions(-)

diff --git a/html/index.php b/html/index.php
index e1e635bcbc..1f1e59040a 100644
--- a/html/index.php
+++ b/html/index.php
@@ -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']);
     }
 }
 
diff --git a/html/network-map.php b/html/network-map.php
index be8889d336..d737b69a6d 100644
--- a/html/network-map.php
+++ b/html/network-map.php
@@ -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']);
     }
 }