loviuz/openstamanager
loviuz/openstamanager
1
0
Fork 0
mirror of https://github.com/devcode-it/openstamanager.git synced 2025-01-27 22:19:26 +01:00
Code Issues Releases Activity

Aggiunto try catch per funzione exec sconosciuta

Browse Source
This commit is contained in:
Luca 2024-01-06 19:34:00 +01:00
parent f40d3ee4f3
commit 34a0edd2d0
2 changed files with 34 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
include/init/requirements.php
View File

@ -125,6 +125,11 @@ $settings = [
'type' => 'value', 'type' => 'value',
'description' => '>5000', 'description' => '>5000',
], ],
'exec' => [
'type' => 'function',
'description' => tr('Permette di importare file con estensione .p7m'),
],
]; ];
$php = []; $php = [];
@ -140,6 +145,8 @@ foreach ($settings as $name => $values) {
$status = ((version_compare(phpversion(), $values['minimum'], '>=') && version_compare(phpversion(), $values['maximum'], '<=')) ? 1 : 0); $status = ((version_compare(phpversion(), $values['minimum'], '>=') && version_compare(phpversion(), $values['maximum'], '<=')) ? 1 : 0);
} elseif ($values['type'] == 'ext') { } elseif ($values['type'] == 'ext') {
$status = extension_loaded($name); $status = extension_loaded($name);
} elseif ($values['type'] == 'function') {
$status = is_callable($name);
} else { } else {
$ini = str_replace(['k', 'M'], ['000', '000000'], ini_get($name)); $ini = str_replace(['k', 'M'], ['000', '000000'], ini_get($name));
$real = str_replace(['k', 'M'], ['000', '000000'], $description); $real = str_replace(['k', 'M'], ['000', '000000'], $description);
@ -164,13 +171,13 @@ foreach ($settings as $name => $values) {
]); ]);
} }
$type = ($values['type'] == 'ext') ? tr('Estensione') : tr('Impostazione');
if ($values['type'] == 'ext') { if ($values['type'] == 'ext') {
$type = tr('Estensione'); $type = tr('Estensione');
} elseif ($values['type'] == 'version') { } elseif ($values['type'] == 'version') {
$type = tr('Versione'); $type = tr('Versione');
} else { } elseif ($values['type'] == 'function') {
$type = tr('Funzione');
}else {
$type = tr('Impostazione'); $type = tr('Impostazione');
} }

33
src/Util/XML.php
View File

@ -92,18 +92,33 @@ class XML
$output_file = $directory.'/'.basename($file, '.p7m'); $output_file = $directory.'/'.basename($file, '.p7m');
exec('openssl smime -verify -noverify -in "'.$file.'" -inform DER -out "'.$output_file.'"', $output, $cmd); try {
if (!file_exists($output_file)) { if (function_exists('exec')) {
$signer = $directory.'/signer';
exec('openssl smime -verify -noverify -in "'.$file.'" -inform DER -out "'.$output_file.'"', $output, $cmd);
self::decode($file, $output_file, $signer);
self::der2smime($file);
self::decode($file, $output_file, $signer);
if (!file_exists($output_file)) { if (!file_exists($output_file)) {
return false; $signer = $directory.'/signer';
self::decode($file, $output_file, $signer);
self::der2smime($file);
self::decode($file, $output_file, $signer);
if (!file_exists($output_file)) {
return false;
}
} }
}
if ($cmd === 0) {
return empty($output[0]) ? tr('Nessuna informazione sulla versione del client PHP') : $output[0];
}
}
catch (Exception $e) {
return false;
} }
return $output_file; return $output_file;