mirror/webgui
1
0
Fork 0
mirror of https://github.com/unraid/webgui.git synced 2025-12-30 14:09:53 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2281 from unraid/fix-parse-plugin-cfg

Browse Source 
fix: parse_plugin_cfg(): better handling of corrupt ini files
This commit is contained in:
tom mortensen
2025-06-28 10:45:52 -07:00
committed by GitHub
parent dad4ccf6e8 f1c5cbe703
commit ec2742fa27
2 changed files with 22 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
emhttp/plugins/dynamix/include/Report.php
View File

@@ -18,11 +18,12 @@ require_once "$docroot/webGui/include/Wrappers.php";
switch ($_POST['cmd']??'') {
case 'config':
$config = "/boot/config";
$files = ['disk:0','docker:1','domain:1','flash:0','ident:1','share:0']; // config files to check
$files = ['disk:0:0','docker:1:0','domain:1:0','flash:0:0','ident:1:0','share:0:0','dynamix:0:1']; // config files to check
foreach ($files as $file) {
[$name,$need] = explode(':',$file);
[$name,$need,$plugin] = explode(':',$file);
$filename = $plugin ? "$config/plugins/$name/$name.cfg" : "$config/$name.cfg";
for ( $i=0;$i<2;$i++) {
if (($need && !file_exists("$config/$name.cfg")) || (file_exists("$config/$name.cfg") && !@parse_ini_file("$config/$name.cfg"))) {
if (($need && !file_exists($filename)) || (file_exists($filename) && !@parse_ini_file($filename))) {
$flag = 1;
sleep(1);
} else {

20
emhttp/plugins/dynamix/include/Wrappers.php
View File

@@ -52,8 +52,24 @@ function parse_plugin_cfg($plugin, $sections=false, $scanner=INI_SCANNER_NORMAL)
global $docroot;
$ram = "$docroot/plugins/$plugin/default.cfg";
$rom = "/boot/config/plugins/$plugin/$plugin.cfg";
$cfg = file_exists($ram) ? my_parse_ini_file($ram, $sections, $scanner) : [];
return file_exists($rom) ? array_replace_recursive($cfg, my_parse_ini_file($rom, $sections, $scanner)) : $cfg;
$cfg_ram = [];
if (file_exists($ram)) {
$cfg_ram = my_parse_ini_file($ram, $sections, $scanner);
if ($cfg_ram === false) {
my_logger("Failed to parse config file: $ram", 'webgui');
$cfg_ram = [];
}
}
$cfg_rom = [];
if (file_exists($rom)) {
$cfg_rom = my_parse_ini_file($rom, $sections, $scanner);
if ($cfg_rom === false) {
my_logger("Failed to parse config file: $rom", 'webgui');
$cfg_rom = [];
}
}
return !empty($cfg_rom) ? array_replace_recursive($cfg_ram, $cfg_rom) : $cfg_ram;
}
function parse_cron_cfg($plugin, $job, $text = "") {