diff --git a/ecrire/inc_getdocument.php3 b/ecrire/inc_getdocument.php3 index ed3b374552d20f3b7726fa9d634517d05250db87..5a6c5286ad346836342b77337196fcfe44390cca 100644 --- a/ecrire/inc_getdocument.php3 +++ b/ecrire/inc_getdocument.php3 @@ -122,17 +122,14 @@ function check_upload_error($error, $msg='') { spip_log ("erreur upload $error"); - install_debut_html($msg); echo '<form action="' , - _DIR_RESTREINT_ABS, - urldecode($GLOBALS['redirect']), - '"><div align="', - $spip_lang_right, - '"><input type="submit" class="fondl" value="', - _T('ecrire:bouton_suivant'), - ' >>"></div>', - '</form></body></html>'; - install_fin_html(); - exit; + minipres($msg, '<form action="' . + _DIR_RESTREINT_ABS. + urldecode($GLOBALS['redirect']). + '"><div align="'. + $spip_lang_right. + '"><input type="submit" class="fondl" value="'. + _T('ecrire:bouton_suivant'). + ' >>"></div></form>'); } @@ -383,13 +380,13 @@ function ajouter_un_document ($source, $nom_envoye, $type_lien, $id_lien, $mode, } function afficher_compactes($action) { - install_debut_html(_T('upload_fichier_zip')); echo "<p>", - _T('upload_fichier_zip_texte'), - "</p>", - "<p>", - _T('upload_fichier_zip_texte2'), - "</p>",$action; - install_fin_html(); + minipres(_T('upload_fichier_zip'), + "<p>" . + _T('upload_fichier_zip_texte') . + "</p><p>" . + _T('upload_fichier_zip_texte2') . + "</p>" . + $action); } // diff --git a/ecrire/inc_messagerie.php b/ecrire/inc_messagerie.php index eefb4e61c0bd98f39a672ded8d6231a501fd4864..56c1e79e63aa48ba0c3a31c9efa1cc1ee60fab76 100644 --- a/ecrire/inc_messagerie.php +++ b/ecrire/inc_messagerie.php @@ -28,7 +28,6 @@ function messagerie_dist() spip_query("DELETE FROM spip_auteurs_messages WHERE id_message=$id_message AND id_auteur=$supp_dest"); } - spip_log("messa det $detruire_message"); if ($detruire_message) { spip_query("DELETE FROM spip_messages WHERE id_message=$detruire_message"); spip_query("DELETE FROM spip_auteurs_messages WHERE id_message=$detruire_message"); diff --git a/ecrire/inc_meta.php3 b/ecrire/inc_meta.php3 index 9bdfb5214283bf9fcc1fe2f651e8e3c5e7dd2803..8778fd5e3cf0671c4cbf41a27657f95fc02b314d 100644 --- a/ecrire/inc_meta.php3 +++ b/ecrire/inc_meta.php3 @@ -10,19 +10,15 @@ * Pour plus de details voir le fichier COPYING.txt ou l'aide en ligne. * \***************************************************************************/ - -// if (!defined("_ECRIRE_INC_VERSION")) return; function lire_metas() { global $meta; - $meta = ''; - $query = 'SELECT nom,valeur FROM spip_meta'; - $result = spip_query($query); - while ($row = spip_fetch_array($result)) { - $nom = $row['nom']; - $meta[$nom] = $row['valeur']; + $meta = array(); + $result = spip_query('SELECT nom,valeur FROM spip_meta'); + while (list($nom,$valeur) = spip_fetch_array($result)) { + $meta[$nom] = $valeur; } } @@ -46,16 +42,17 @@ function ecrire_metas() { lire_metas(); if (is_array($meta)) { - $ok = ecrire_fichier (_FILE_META, serialize($meta)); - if (!$ok && $GLOBALS['connect_statut'] == '0minirezo') - echo "<h4 font color=red>", - _T('texte_inc_meta_1', array('fichier' => _FILE_META)), - " <a href='", generer_url_action('test_dirs'), "'>", - _T('texte_inc_meta_2'), - "</a> ", - _T('texte_inc_meta_3', array('repertoire' => _DIR_SESSIONS)), - " </h4>\n"; + if (!$ok && $GLOBALS['connect_statut'] == '0minirezo') { + include_ecrire('minipres'); + minipres(_T('texte_inc_meta_2'), "<h4 font color=red>". + _T('texte_inc_meta_1', array('fichier' => _FILE_META)). + " <a href='". generer_url_action('test_dirs'). "'>". + _T('texte_inc_meta_2'). + "</a> ". + _T('texte_inc_meta_3', array('repertoire' => _DIR_SESSIONS)). + "</h4>\n"); + } } } diff --git a/ecrire/inc_spip_action_test_dirs.php b/ecrire/inc_spip_action_test_dirs.php index 78e6a6b9e0f02d7d22c564210ae391469db134f4..455ae1b8a26e692bec485a4bf76459eb4bbdadaf 100644 --- a/ecrire/inc_spip_action_test_dirs.php +++ b/ecrire/inc_spip_action_test_dirs.php @@ -101,11 +101,11 @@ if ($bad_dirs OR $absent_dirs) { "<DIV align='right'><input type='submit' class='fondl' value='". _T('login_recharger')."'></DIV>" . "</form>"; - install_debut_html($titre);echo $res; install_fin_html(); + minipres($titre, $res); } else { if (!_FILE_CONNECT) - header("Location: " . generer_url_ecrire("install", "etape=1", true)); + header("Location: " . generer_url_ecrire("install", "etape=1", true)); else header("Location: " . _DIR_RESTREINT_ABS); }