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

MVC - serialize model to xml: replace model in stead of delete/add, which should keep the diff between versions more stable.

Browse Source 
closes https://github.com/opnsense/core/issues/4603
This commit is contained in:
Ad Schellevis 2021-06-23 18:22:07 +02:00
parent f0eefecdd6
commit d406ff2a83
1 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/opnsense/mvc/app/models/OPNsense/Base/BaseModel.php
View File

@ -521,7 +521,7 @@ abstract class BaseModel
// find parent of mountpoint (create if it doesn't exists)
$target_node = $config_xml;
$str_parts = explode("/", str_replace("//", "/", $this->internal_mountpoint));
for ($i = 0; $i < count($str_parts) - 1; $i++) {
for ($i = 0; $i < count($str_parts); $i++) {
if ($str_parts[$i] != "") {
if (count($target_node->xpath($str_parts[$i])) == 0) {
$target_node = $target_node->addChild($str_parts[$i]);
@ -534,14 +534,8 @@ abstract class BaseModel
// copy model data into config
$toDom = dom_import_simplexml($target_node);
$fromDom = dom_import_simplexml($source_node[0]);
// remove old model data and write new
foreach ($toDom->childNodes as $childNode) {
if ($childNode->nodeName == $fromDom->nodeName) {
$toDom->removeChild($childNode);
}
}
$toDom->appendChild($toDom->ownerDocument->importNode($fromDom, true));
$nodeImport = $toDom->ownerDocument->importNode($fromDom, TRUE);
$toDom->parentNode->replaceChild($nodeImport, $toDom);
}
/**