lucaspalomodevelop/core
1
0
Fork 0
mirror of https://github.com/lucaspalomodevelop/core.git synced 2026-03-15 00:54:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

mvc:model:JsonKeyValueStoreField - support congfigd input without filestream, needed for https://github.com/opnsense/core/issues/7515

Browse Source 
basically this just offers the option to remove the SourceFile reference and keep the configd action, the call overhead of using configd is quite low anyway and #7515 implements generic caching (which was the intend of the file handle)
This commit is contained in:
Ad Schellevis 2024-06-06 18:56:16 +02:00
parent 06d507704e
commit a39add8b7f
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -117,6 +117,7 @@ class JsonKeyValueStoreField extends BaseListField
*/
protected function actionPostLoadingEvent()
{
$data = null;
if ($this->internalSourceFile != null) {
if ($this->internalSourceField != null) {
$sourcefile = sprintf($this->internalSourceFile, $this->internalSourceField);
@ -135,8 +136,7 @@ class JsonKeyValueStoreField extends BaseListField
$muttime = $stat['size'] == 0 ? 0 : $stat['mtime'];
if (time() - $muttime > $this->internalConfigdPopulateTTL) {
$act = $this->internalConfigdPopulateAct;
$backend = new Backend();
$response = $backend->configdRun($act, false, 20);
$response = (new Backend())->configdRun($act, false, 20);
if (!empty($response) && json_decode($response) !== null) {
// only store parsable results
fseek($sourcehandle, 0);
@ -151,12 +151,14 @@ class JsonKeyValueStoreField extends BaseListField
}
if (is_file($sourcefile)) {
$data = json_decode(file_get_contents($sourcefile), true);
if ($data != null) {
$this->internalOptionList = $data;
if ($this->internalSelectAll && $this->internalValue == "") {
$this->internalValue = implode(',', array_keys($this->internalOptionList));
}
}
}
} elseif (!empty($this->internalConfigdPopulateAct)) {
$data = json_decode((new Backend())->configdRun($this->internalConfigdPopulateAct, false, 20) ?? '', true);
}
if ($data != null) {
$this->internalOptionList = $data;
if ($this->internalSelectAll && $this->internalValue == "") {
$this->internalValue = implode(',', array_keys($this->internalOptionList));
}
}
}