diff --git a/ecrire/base/upgrade.php b/ecrire/base/upgrade.php index 02c4c40394ec9e4fd7160ffeb73eaf13e5045a2d..d5908bc17cd5f3ab179ce502faf0d70b024708c4 100644 --- a/ecrire/base/upgrade.php +++ b/ecrire/base/upgrade.php @@ -390,7 +390,7 @@ function maj_while($installee, $cible, $maj, $meta = '', $table = 'meta', $redir if ($meta) { ecrire_meta($meta, $installee = $v, 'oui', $table); } - echo '<br />'; + echo (_IS_CLI ? "\n" : '<br />'); } if (time() >= _TIME_OUT) { relance_maj($meta, $table, $redirect); @@ -449,7 +449,7 @@ function serie_alter($serie, $q = array(), $meta = '', $table = 'meta', $redirec if (strncmp($f, 'sql_', 4) == 0) { ecrire_meta($meta2, $i + 1, 'non', $table); } - echo " <span title='$i'>.</span>"; + echo (_IS_CLI ? "." : " <span title='$i'>.</span>"); call_user_func_array($f, $r); // si temps imparti depasse, on relance sans ecrire en meta // car on est peut etre sorti sur timeout si c'est une fonction longue diff --git a/ecrire/inc/plugin.php b/ecrire/inc/plugin.php index df43983d1b58f87fe8b11a6d11236218d47687a9..7469925f790e8eb35e0fbbc2bde368254b70f9be 100644 --- a/ecrire/inc/plugin.php +++ b/ecrire/inc/plugin.php @@ -1395,16 +1395,25 @@ function plugin_installes_meta() { } if (is_array($infos)) { list($ok, $trace) = $infos['install_test']; - include_spip('inc/filtres_boites'); - echo "<div class='install-plugins svp_retour'>" - . boite_ouvrir(_T('plugin_titre_installation', array('plugin' => typo($infos['nom']))), - ($ok ? 'success' : 'error')) - . $trace - . "<div class='result'>" - . ($ok ? ((isset($infos['upgrade']) && $infos['upgrade']) ? _T("plugin_info_upgrade_ok") : _T("plugin_info_install_ok")) : _T("avis_operation_echec")) - . "</div>" - . boite_fermer() - . "</div>"; + $titre = _T('plugin_titre_installation', array('plugin' => typo($infos['nom']))); + $result = ($ok ? ((isset($infos['upgrade']) && $infos['upgrade']) ? _T("plugin_info_upgrade_ok") : _T("plugin_info_install_ok")) : _T("avis_operation_echec")); + if (_IS_CLI) { + include_spip('inc/filtres'); + $trace = ltrim(textebrut($trace) . "\n" . $result); + $trace = " " . str_replace("\n", "\n ", $trace); + echo "\n" . ($ok ? 'OK ' : '/!\ ') . textebrut($titre) . "\n", + $trace, + "\n"; + } + else { + include_spip('inc/filtres_boites'); + echo "<div class='install-plugins svp_retour'>" + . boite_ouvrir($titre, ($ok ? 'success' : 'error')) + . $trace + . "<div class='result'>$result</div>" + . boite_fermer() + . "</div>"; + } } } }