diff --git a/include/init/requirements.php b/include/init/requirements.php index 93542bb3d..d7cc382bf 100755 --- a/include/init/requirements.php +++ b/include/init/requirements.php @@ -146,7 +146,7 @@ foreach ($settings as $name => $values) { } elseif ($values['type'] == 'ext') { $status = extension_loaded($name); } elseif ($values['type'] == 'function') { - $status = ((function_exists($name) && is_callable($name)) ? 1: 0); + $status = ((function_exists($name) && is_callable($name)) ? 1 : 0); } else { $ini = str_replace(['k', 'M'], ['000', '000000'], ini_get($name)); $real = str_replace(['k', 'M'], ['000', '000000'], $description); @@ -177,7 +177,7 @@ foreach ($settings as $name => $values) { $type = tr('Versione'); } elseif ($values['type'] == 'function') { $type = tr('Funzione'); - }else { + } else { $type = tr('Impostazione'); } diff --git a/modules/interventi/add.php b/modules/interventi/add.php index 375928f7d..53ffe237a 100755 --- a/modules/interventi/add.php +++ b/modules/interventi/add.php @@ -50,7 +50,6 @@ if ($user['gruppo'] == 'Tecnici' && !empty($user['idanagrafica'])) { $id_cliente = $user['idanagrafica']; } - // Se รจ indicata un'anagrafica relativa, si carica il tipo di intervento di default impostato if (!empty($id_anagrafica)) { $anagrafica = $dbo->fetchOne('SELECT idtipointervento_default, idzona FROM an_anagrafiche WHERE idanagrafica='.prepare($id_anagrafica)); diff --git a/src/Util/XML.php b/src/Util/XML.php index f8325a51a..70621f4c5 100755 --- a/src/Util/XML.php +++ b/src/Util/XML.php @@ -93,31 +93,27 @@ class XML $output_file = $directory.'/'.basename($file, '.p7m'); try { - if (function_exists('exec')) { - - exec('openssl smime -verify -noverify -in "'.$file.'" -inform DER -out "'.$output_file.'"', $output, $cmd); - - if (!file_exists($output_file)) { - $signer = $directory.'/signer'; - - self::decode($file, $output_file, $signer); - - self::der2smime($file); - self::decode($file, $output_file, $signer); + if (function_exists('exec')) { + exec('openssl smime -verify -noverify -in "'.$file.'" -inform DER -out "'.$output_file.'"', $output, $cmd); 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) { + if ($cmd === 0) { + return empty($output[0]) ? tr('Nessuna informazione sulla versione del client PHP') : $output[0]; + } + } catch (Exception $e) { return false; }