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

mvc:JsonKeyValueStoreField - restore support for json input data without configd callout, closes https://github.com/opnsense/core/issues/8180

Browse Source 
partially reverts 525481c15b
This commit is contained in:
Ad Schellevis 2025-01-05 18:26:13 +01:00
parent b962ccd3ed
commit e150a571de
1 changed files with 21 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
src/opnsense/mvc/app/models/OPNsense/Base/FieldTypes/JsonKeyValueStoreField.php
View File

@ -123,17 +123,18 @@ class JsonKeyValueStoreField extends BaseListField
protected function actionPostLoadingEvent()
{
$data = null;
if ($this->internalSourceFile != null && $this->internalSourceField != null) {
$sourcefile = sprintf($this->internalSourceFile, $this->internalSourceField);
} else {
$sourcefile = $this->internalSourceFile;
}
$cachename = $sourcefile != null ? $sourcefile : $this->internalConfigdPopulateAct;
if (!empty($this->internalConfigdPopulateAct)) {
if (isset(static::$internalStaticContent[$this->internalConfigdPopulateAct])) {
if (isset(static::$internalStaticContent[$cachename])) {
/* cached for the lifetime of this session */
$data = static::$internalStaticContent[$this->internalConfigdPopulateAct];
} elseif ($this->internalSourceFile != null) {
$data = static::$internalStaticContent[$cachename];
} elseif ($sourcefile != null) {
/* use a file cache for the configd call*/
if ($this->internalSourceField != null) {
$sourcefile = sprintf($this->internalSourceFile, $this->internalSourceField);
} else {
$sourcefile = $this->internalSourceFile;
}
if (is_file($sourcefile)) {
$sourcehandle = fopen($sourcefile, "r+");
} else {
@ -166,12 +167,18 @@ class JsonKeyValueStoreField extends BaseListField
true
);
}
if ($data != null) {
static::$internalStaticContent[$this->internalConfigdPopulateAct] = $data;
$this->internalOptionList = $data;
if ($this->internalSelectAll && $this->internalValue == "") {
$this->internalValue = implode(',', array_keys($this->internalOptionList));
}
} elseif ($sourcefile != null && is_file($sourcefile)) {
if (isset(static::$internalStaticContent[$cachename])) {
$data = static::$internalStaticContent[$cachename];
} else {
$data = json_decode(file_get_contents($sourcefile), true) ?? [];
}
}
if ($data != null) {
static::$internalStaticContent[$cachename] = $data;
$this->internalOptionList = $data;
if ($this->internalSelectAll && $this->internalValue == "") {
$this->internalValue = implode(',', array_keys($this->internalOptionList));
}
}
}