From 8329ec125b148ea9121588b42b5930356a99619e Mon Sep 17 00:00:00 2001 From: cmp167 Date: Tue, 28 Mar 2023 04:21:20 +1200 Subject: [PATCH] Add appendConf --- cmpUtil.php | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/cmpUtil.php b/cmpUtil.php index 607c2fb..362a5ab 100644 --- a/cmpUtil.php +++ b/cmpUtil.php @@ -160,16 +160,25 @@ return $obj; } + function appendConf($arr) { + if(!$arr) + return false; + + foreach($arr as $k => $v) { + // $this->d("Set parm .$k to $v"); + $this->parm[$k] = $v; + } + + return true; + } + function readJSONConf($file) { $obj = $this->readJSON($file); if(!$obj) return false; - foreach($obj as $k => $v) { - // $this->d("Set parm .$k to $v"); - $this->parm[$k] = $v; - } + $this->appendConf($obj); if(@$this->parm["timezone"]) { $this->d("Set timezone '" . $this->parm["timezone"] . "'");