Skip to content

Commit 6d45a68

Browse files
committed
fix: etichette per moduli premium in controllo Moduli personalizzati in Aggiornamenti
1 parent 53745ba commit 6d45a68

1 file changed

Lines changed: 20 additions & 0 deletions

File tree

modules/aggiornamenti/edit.php

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -402,6 +402,7 @@ function highlightDifferences($current, $expected)
402402
'Vista mancante' => $view_info_count++,
403403
'Query modificata' => $view_warning_count++,
404404
'Modulo non previsto' => $view_info_count++,
405+
'Modulo premium' => $view_info_count++,
405406
default => null,
406407
};
407408
}
@@ -452,6 +453,7 @@ function highlightDifferences($current, $expected)
452453
'Vista mancante' => 'badge-info',
453454
'Query modificata' => 'badge-warning',
454455
'Modulo non previsto' => 'badge-info',
456+
'Modulo premium' => 'badge-primary',
455457
default => 'badge-secondary',
456458
};
457459

@@ -532,6 +534,7 @@ function highlightDifferences($current, $expected)
532534
match ($modulo['reason']) {
533535
'Options modificato' => $module_warning_count++,
534536
'Modulo non previsto' => $module_warning_count++,
537+
'Modulo premium' => $module_info_count++,
535538
'Options2 valorizzato' => $module_info_count++,
536539
default => null,
537540
};
@@ -581,6 +584,7 @@ function highlightDifferences($current, $expected)
581584
'Options2 valorizzato' => 'badge-info',
582585
'Options modificato' => 'badge-warning',
583586
'Modulo non previsto' => 'badge-warning',
587+
'Modulo premium' => 'badge-primary',
584588
default => 'badge-secondary',
585589
};
586590

@@ -667,6 +671,22 @@ function highlightDifferences($current, $expected)
667671
$contents_settings = file_get_contents(base_dir().'/settings.json');
668672
$data_settings = json_decode($contents_settings, true);
669673

674+
// Carica e accoda le impostazioni dai file settings.json presenti nelle sottocartelle di modules/
675+
$modules_dir = base_dir().'/modules/';
676+
$settings_json_files = glob($modules_dir.'*/settings.json');
677+
678+
if (!empty($settings_json_files)) {
679+
foreach ($settings_json_files as $settings_json_file) {
680+
$settings_contents = file_get_contents($settings_json_file);
681+
$settings_data = json_decode($settings_contents, true);
682+
683+
if (!empty($settings_data) && is_array($settings_data)) {
684+
// Accoda le impostazioni del modulo a quelle principali
685+
$data_settings = array_merge($data_settings, $settings_data);
686+
}
687+
}
688+
}
689+
670690
$settings = Update::getSettings();
671691
$results_settings = settings_diff($data_settings, $settings);
672692
$results_settings_added = settings_diff($settings, $data_settings);

0 commit comments

Comments
 (0)