GSP/Panel
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

edit xml config again

Browse source
This commit is contained in:
Frank Harris 2025-11-22 09:25:06 -05:00
parent d2d0f5d9d7
commit b097c31f4a
2 changed files with 17 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

17
modules/config_games/config_servers.php
View file

@ -30,6 +30,11 @@ function config_games_normalize_path($path)
return ltrim($clean, '/'); return ltrim($clean, '/');
} }
function config_games_normalize_newlines($text)
{
return preg_replace("/\\r\\n?/", "\\n", (string)$text);
}
function config_games_next_form_key(): string function config_games_next_form_key(): string
{ {
static $counter = 0; static $counter = 0;
@ -199,11 +204,12 @@ function config_games_save_xml($db, $home_cfg_id, array $nodesPayload)
} }
$hasChildren = !empty($nodeData['has_children']); $hasChildren = !empty($nodeData['has_children']);
if (array_key_exists('value', $nodeData)) { if (array_key_exists('value', $nodeData)) {
$normalizedValue = config_games_normalize_newlines($nodeData['value']);
while ($domNode->firstChild) { while ($domNode->firstChild) {
$domNode->removeChild($domNode->firstChild); $domNode->removeChild($domNode->firstChild);
} }
if ($nodeData['value'] !== '') { if ($normalizedValue !== '') {
$domNode->appendChild($dom->createTextNode($nodeData['value'])); $domNode->appendChild($dom->createTextNode($normalizedValue));
} }
} elseif (!$hasChildren) { } elseif (!$hasChildren) {
while ($domNode->firstChild) { while ($domNode->firstChild) {
@ -235,6 +241,13 @@ function config_games_save_xml($db, $home_cfg_id, array $nodesPayload)
if ($dom->save($config_file) === false) { if ($dom->save($config_file) === false) {
return false; return false;
} }
$savedContents = @file_get_contents($config_file);
if ($savedContents !== false) {
$normalizedContents = config_games_normalize_newlines($savedContents);
if ($normalizedContents !== $savedContents) {
file_put_contents($config_file, $normalizedContents);
}
}
$config = read_server_config($config_file); $config = read_server_config($config_file);
if ($config !== FALSE) { if ($config !== FALSE) {
$db->addGameCfg($config); $db->addGameCfg($config);

1
modules/config_games/create.php
View file

@ -160,6 +160,7 @@ function exec_ogp_module() {
echo "<b>".$myXML."</b>"; echo "<b>".$myXML."</b>";
echo "<xmp>".$template."</xmp>"; echo "<xmp>".$template."</xmp>";
$myXML = "modules/config_games/server_configs/".$key_name."_".$os.$arch.".xml"; $myXML = "modules/config_games/server_configs/".$key_name."_".$os.$arch.".xml";
$template = preg_replace("/\r\n?|\n/", "\n", $template);
$fh = fopen($myXML, 'w') or die("No Write Permission."); $fh = fopen($myXML, 'w') or die("No Write Permission.");
fwrite($fh, $template); fwrite($fh, $template);
fclose($fh); fclose($fh);