diff --git a/ecrire/base/db_mysql.php b/ecrire/base/db_mysql.php index c2fafdcb118effd3fcd7df80aded53b4a34d8262..c0740cb3786c403aa5364e41f3d94ef6f7d82632 100644 --- a/ecrire/base/db_mysql.php +++ b/ecrire/base/db_mysql.php @@ -82,7 +82,7 @@ function spip_mysql_trace($query, $start, $result) echo _T('info_erreur_requete'), " ", htmlentities($query), - "<br>« ", + "<br />« ", htmlentities($result = $s), " »<p>"; } diff --git a/ecrire/exec/admin_repair.php b/ecrire/exec/admin_repair.php index 29f84f328880a4ae47bd663ddb861f20327a6336..5b37df245368d2000d05ba21ccb026c0ce0d31e7 100644 --- a/ecrire/exec/admin_repair.php +++ b/ecrire/exec/admin_repair.php @@ -56,7 +56,7 @@ function verifier_base() { if (!$ok) $res .= "<pre><font color='red'><b>".htmlentities(join("\n", $row))."</b></font></pre>\n"; else - $res .= " "._T('texte_table_ok')."<br>\n"; + $res .= " "._T('texte_table_ok')."<br />\n"; } diff --git a/ecrire/exec/config_contenu.php b/ecrire/exec/config_contenu.php index ed3c7183e9c1e6f914c5a1293e6b5144ef181e9c..b05e4aaa27c8abc42947c20f61896ceece55376e 100644 --- a/ecrire/exec/config_contenu.php +++ b/ecrire/exec/config_contenu.php @@ -39,7 +39,7 @@ pipeline('exec_init',array('args'=>array('exec'=>'config_contenu'),'data'=>'')); $commencer_page = charger_fonction('commencer_page', 'inc'); echo $commencer_page(_T('titre_page_config_contenu'), "configuration", "configuration"); -echo "<br><br><br>"; +echo "<br /><br /><br />"; gros_titre(_T('titre_page_config_contenu')); echo barre_onglets("configuration", "interactivite"); @@ -106,14 +106,14 @@ if ($options == 'avancees') { echo "<table width='100%' cellpadding='2' border='0' class='hauteur'>\n"; echo "<tr><td class='verdana2'>"; - echo _T('info_appliquer_choix_moderation')."<br>"; + echo _T('info_appliquer_choix_moderation')."<br />"; echo "<input type='radio' CHECKED name='forums_publics_appliquer' value='futur' id='forums_appliquer_futur'>"; - echo " <b><label for='forums_appliquer_futur'>"._T('bouton_radio_articles_futurs')."</label></b><br>"; + echo " <b><label for='forums_appliquer_futur'>"._T('bouton_radio_articles_futurs')."</label></b><br />"; echo "<input type='radio' name='forums_publics_appliquer' value='saufnon' id='forums_appliquer_saufnon'>"; - echo " <label for='forums_appliquer_saufnon'>"._T('bouton_radio_articles_tous_sauf_forum_desactive')."</label><br>"; + echo " <label for='forums_appliquer_saufnon'>"._T('bouton_radio_articles_tous_sauf_forum_desactive')."</label><br />"; echo "<input type='radio' name='forums_publics_appliquer' value='tous' id='forums_appliquer_tous'>"; - echo " <label for='forums_appliquer_tous'>"._T('bouton_radio_articles_tous')."</label><br>"; + echo " <label for='forums_appliquer_tous'>"._T('bouton_radio_articles_tous')."</label><br />"; echo "</td></tr></table>"; fin_cadre_relief(); echo "</ul>\n"; @@ -253,7 +253,7 @@ if ($options == "avancees") { echo "<blockquote class='spip'>"; if (!$adresse_suivi) $adresse_suivi = "mailing@monsite.net"; echo _T('info_config_suivi', array('adresse_suivi' => $adresse_suivi)); - echo "<br><input type='text' name='adresse_suivi_inscription' value='$adresse_suivi_inscription' size='50' class='fondl'>"; + echo "<br /><input type='text' name='adresse_suivi_inscription' value='$adresse_suivi_inscription' size='50' class='fondl'>"; echo "</blockquote>"; echo "</div>"; @@ -300,7 +300,7 @@ if ($options == "avancees") { echo "<br />"; echo bouton_radio("quoi_de_neuf", "non", _T('info_non_envoi_liste_nouveautes'), $quoi_de_neuf == "non", "changeVisible(this.checked, 'config-neuf', 'none', 'block');"); - //echo "<br><input type='radio' name='quoi_de_neuf' value='non' id='quoi_de_neuf_off'>"; + //echo "<br /><input type='radio' name='quoi_de_neuf' value='non' id='quoi_de_neuf_off'>"; //echo " <label for='quoi_de_neuf_off'>"._T('info_non_envoi_liste_nouveautes')."</label> "; diff --git a/ecrire/exec/config_lang.php b/ecrire/exec/config_lang.php index 37e1e8e6a19a841e7b828464b4bba69931a36cd0..dd3ffe7bb42963cc35a1a0ab106b128556a6ba18 100644 --- a/ecrire/exec/config_lang.php +++ b/ecrire/exec/config_lang.php @@ -25,7 +25,7 @@ pipeline('exec_init',array('args'=>array('exec'=>'config_lang'),'data'=>'')); $commencer_page = charger_fonction('commencer_page', 'inc'); echo $commencer_page(_T('titre_page_config_contenu'), "configuration", "langues"); -echo "<br><br><br>"; +echo "<br /><br /><br />"; gros_titre(_T('info_langues')); if ($connect_statut != '0minirezo' OR !$connect_toutes_rubriques) { diff --git a/ecrire/exec/config_multilang.php b/ecrire/exec/config_multilang.php index 752ffbc9d77904ec4203afa52fbd0c6c8b9bde38..a828f8c2138701c1b7e118b41e4415d078bfa20f 100644 --- a/ecrire/exec/config_multilang.php +++ b/ecrire/exec/config_multilang.php @@ -27,7 +27,7 @@ pipeline('exec_init',array('args'=>array('exec'=>'config_multilang'),'data'=>'') $commencer_page = charger_fonction('commencer_page', 'inc'); echo $commencer_page(_T('titre_page_config_contenu'), "configuration", "langues"); -echo "<br><br><br>"; +echo "<br /><br /><br />"; gros_titre(_T('info_langues')); diff --git a/ecrire/exec/controle_forum.php b/ecrire/exec/controle_forum.php index dc8ce228d645c625187cf41c892360cb9654a428..d43dd7b82f7d3fae434833af2014e2146dc030c2 100644 --- a/ecrire/exec/controle_forum.php +++ b/ecrire/exec/controle_forum.php @@ -46,7 +46,7 @@ function forum_parent($id_forum) { 'type' => 'id_article', 'valeur' => $id_article, 'titre' => $titre, - 'avant' => "<a href='" . generer_url_ecrire("articles_forum","id_article=$id_article") . "'><font color='red'>"._T('lien_forum_public'). "</font></a><br>"); + 'avant' => "<a href='" . generer_url_ecrire("articles_forum","id_article=$id_article") . "'><font color='red'>"._T('lien_forum_public'). "</font></a><br />"); } } else if ($forum_id_rubrique > 0) { diff --git a/ecrire/exec/demande_mise_a_jour.php b/ecrire/exec/demande_mise_a_jour.php index 6d5f1ac9b783189c357bc65b8488b1967f3e3f6a..396fe2e12cfdc3e2d6b145197010343210e1b586 100644 --- a/ecrire/exec/demande_mise_a_jour.php +++ b/ecrire/exec/demande_mise_a_jour.php @@ -20,7 +20,7 @@ function exec_demande_mise_a_jour_dist() { echo $commencer_page(); echo "<blockquote><blockquote><h4><font color='red'>", _T('info_message_technique'), - "</font><br> ", + "</font><br /> ", _T('info_procedure_maj_version'), "</h4>", _T('info_administrateur_site_01'), diff --git a/ecrire/exec/lang_raccourcis.php b/ecrire/exec/lang_raccourcis.php index f93bfdeae46c8c49ad6a8849e052c3828ced6a92..8b408ae2ee4165781d1b31cecf98a742bdb95676 100644 --- a/ecrire/exec/lang_raccourcis.php +++ b/ecrire/exec/lang_raccourcis.php @@ -37,7 +37,7 @@ function exec_lang_raccourcis_dist() { echo $commencer_page(_T('module_fichier_langue').": $module", "configuration", "langues"); - echo "<br><br><br>"; + echo "<br /><br /><br />"; gros_titre(_T('module_fichier_langue').": $module"); echo barre_onglets("config_lang", "fichiers"); @@ -47,7 +47,7 @@ function exec_lang_raccourcis_dist() { if (count($modules) > 1) { echo debut_cadre_relief(); - echo "<div class='verdana3' style='background-color: $couleur_foncee; color: white; padding: 3px;'><b>"._T('module_fichiers_langues').":</b></div><br>\n"; + echo "<div class='verdana3' style='background-color: $couleur_foncee; color: white; padding: 3px;'><b>"._T('module_fichiers_langues').":</b></div><br />\n"; foreach ($modules as $nom_module) { if ($nom_module == $module) echo "<div style='padding-$spip_lang_left: 10px;' class='verdana3'><b>$nom_module</b></div>"; diff --git a/ecrire/exec/statistiques_lang.php b/ecrire/exec/statistiques_lang.php index dde90b52156c60d462fe2d97873eb7fa17970fa8..96df138f8028e4da7d12f916063b7f317eb3ae22 100644 --- a/ecrire/exec/statistiques_lang.php +++ b/ecrire/exec/statistiques_lang.php @@ -31,7 +31,7 @@ function exec_statistiques_lang_dist() echo "<center><table width='$largeur_table'><tr width='$largeur_table'><td width='$largeur_table' class='verdana2'>"; -echo "<br><br>"; +echo "<br /><br />"; echo "<center>"; gros_titre(_T('onglet_repartition_lang')); echo "</center>"; diff --git a/ecrire/exec/statistiques_repartition.php b/ecrire/exec/statistiques_repartition.php index 4f98b55b550133d676fb1a9b83652e7707690d95..9d8cb78324be657d0fc8eea2115741658f95487e 100644 --- a/ecrire/exec/statistiques_repartition.php +++ b/ecrire/exec/statistiques_repartition.php @@ -145,7 +145,7 @@ function exec_statistiques_repartition_dist() $taille = 400; } - echo "\n<br><br><center><table width='$largeur_table'><tr width='$largeur_table'><td width='$largeur_table' class='verdana2' style='text-align: center'>"; + echo "\n<br /><br /><center><table width='$largeur_table'><tr width='$largeur_table'><td width='$largeur_table' class='verdana2' style='text-align: center'>"; gros_titre(_T('titre_page_statistiques')); if ($critere == "debut") { diff --git a/ecrire/exec/statistiques_visites.php b/ecrire/exec/statistiques_visites.php index f56170ef857925e1f31e12699daf0c0388b012c6..b5ec3ee353e13a780a7e9555fefdd730d2e0539b 100644 --- a/ecrire/exec/statistiques_visites.php +++ b/ecrire/exec/statistiques_visites.php @@ -209,7 +209,7 @@ else { echo "</ol>"; - echo "<b>"._T('info_comment_lire_tableau')."</b><br>"._T('texte_comment_lire_tableau'); + echo "<b>"._T('info_comment_lire_tableau')."</b><br />"._T('texte_comment_lire_tableau'); echo "</div>"; echo "</div>"; @@ -618,12 +618,12 @@ if ($GLOBALS['accepte_svg']) { echo "<br /><table cellpadding='0' cellspacing='0' border='0' width='100%'><tr style='width:100%;'>"; echo "<td valign='top' width='33%'><font face='Verdana,Arial,Sans,sans-serif'>"; echo _T('info_maximum')." ".$max; - echo "<br>"._T('info_moyenne')." ".round($moyenne); + echo "<br />"._T('info_moyenne')." ".round($moyenne); echo "</font></td>"; echo "<td valign='top' width='33%'><font face='Verdana,Arial,Sans,sans-serif'>"; echo '<a href="' . generer_url_ecrire("statistiques_referers","").'" title="'._T('titre_liens_entrants').'">'._T('info_aujourdhui').'</a> '.$visites_today; - if ($val_prec > 0) echo '<br><a href="' . generer_url_ecrire("statistiques_referers","jour=veille").'" title="'._T('titre_liens_entrants').'">'._T('info_hier').'</a> '.$val_prec; - if ($id_article) echo "<br>"._T('info_popularite_5').' '.$val_popularite; + if ($val_prec > 0) echo '<br /><a href="' . generer_url_ecrire("statistiques_referers","jour=veille").'" title="'._T('titre_liens_entrants').'">'._T('info_hier').'</a> '.$val_prec; + if ($id_article) echo "<br />"._T('info_popularite_5').' '.$val_popularite; echo "</font></td>"; echo "<td valign='top' width='33%'><font face='Verdana,Arial,Sans,sans-serif'>"; @@ -635,11 +635,11 @@ if ($GLOBALS['accepte_svg']) { $ch = _T('info_classement_1', array('liste' => $liste)); else $ch = _T('info_classement_2', array('liste' => $liste)); - echo "<br>".$classement[$id_article].$ch; + echo "<br />".$classement[$id_article].$ch; } } else { echo "<font size='1'>"; - echo "<br>"._T('info_popularite_2')." "; + echo "<br />"._T('info_popularite_2')." "; echo ceil($GLOBALS['meta']['popularite_total']); echo "</font>"; } diff --git a/ecrire/exec/synchro.php b/ecrire/exec/synchro.php index a32c93b8d5fc91efc47c72e1f6fc670f7eb2b856..0a6fc5b36827093102b4c4cabb54ef4cb6fa261c 100644 --- a/ecrire/exec/synchro.php +++ b/ecrire/exec/synchro.php @@ -39,7 +39,7 @@ global $connect_id_auteur; $commencer_page = charger_fonction('commencer_page', 'inc'); echo $commencer_page(_T("icone_suivi_activite"), "accueil", "synchro"); -echo "<br><br><br>"; +echo "<br /><br /><br />"; gros_titre(_T("icone_suivi_activite")); diff --git a/ecrire/inc/auth.php b/ecrire/inc/auth.php index 54b3c04957d700e2af337c3a8761547bc59c9f60..836302e5ec451ea4912b4e8d3fe62b590a7163bb 100644 --- a/ecrire/inc/auth.php +++ b/ecrire/inc/auth.php @@ -227,7 +227,7 @@ function auth_areconnecter($auth_login) echo minipres(_T('info_travaux_titre'), _T('titre_probleme_technique'). "<p><tt>".spip_sql_errno()." ".spip_sql_error()."</tt></p>"); } else { - echo minipres(_T('avis_erreur_connexion'), "<br><br><p>" . _T('texte_inc_auth_1', array('auth_login' => $auth_login)). " <a href='". generer_url_action('logout', "logout=prive"). "'>". _T('texte_inc_auth_2'). "</a>"._T('texte_inc_auth_3')); + echo minipres(_T('avis_erreur_connexion'), "<br /><br /><p>" . _T('texte_inc_auth_1', array('auth_login' => $auth_login)). " <a href='". generer_url_action('logout', "logout=prive"). "'>". _T('texte_inc_auth_2'). "</a>"._T('texte_inc_auth_3')); } exit; } diff --git a/ecrire/inc/feedfinder.php b/ecrire/inc/feedfinder.php index 08cae29183136fd0df859114dc2f5bb7727cf411..05d78b30bd7762cebfad6921d116470255c23354 100644 --- a/ecrire/inc/feedfinder.php +++ b/ecrire/inc/feedfinder.php @@ -82,11 +82,11 @@ function is_feed($url){ } /*****************test is_feed****************************** -echo is_feed("http://spip-contrib.net/backend" _EXTENSIO_PHP") . "<br>"; //retourne rss -echo is_feed("http://liberation.fr/rss.php") . "<br>"; //retourne rss -echo is_feed("http://liberation.fr/rss.php") . "<br>"; //retourne rss +echo is_feed("http://spip-contrib.net/backend" _EXTENSIO_PHP") . "<br />"; //retourne rss +echo is_feed("http://liberation.fr/rss.php") . "<br />"; //retourne rss +echo is_feed("http://liberation.fr/rss.php") . "<br />"; //retourne rss echo is_feed("http://willy.boerland.com/myblog/atom/feed") //retourne atom -echo is_feed("http://spip.net/") . "<br>"; //retoune 0 +echo is_feed("http://spip.net/") . "<br />"; //retoune 0 //pas trouver d'exmples avec rdf j'ai encore du mal à saisir ce que rdf apporte de plus que rss //mais bon j'ai pas aprofondi ************************************************************/ @@ -200,10 +200,10 @@ function concat_url($url1, $path){ } /****************************test concat********************** -echo concat_url("http://spip.net" , "ecrire")."<br>"; -echo concat_url("http://spip.net/" , "ecrire")."<br>"; -echo concat_url("http://spip.net" , "/ecrire")."<br>"; -echo concat_url("http://spip.net/" , "/ecrire")."<br>"; +echo concat_url("http://spip.net" , "ecrire")."<br />"; +echo concat_url("http://spip.net/" , "ecrire")."<br />"; +echo concat_url("http://spip.net" , "/ecrire")."<br />"; +echo concat_url("http://spip.net/" , "/ecrire")."<br />"; *************************************************************/ diff --git a/ecrire/inc/import_1_2.php b/ecrire/inc/import_1_2.php index 669a21831334afa8e250fc47158a7b9176e603ce..a101523729081ecbbdf984a535d3ad96cd605400 100644 --- a/ecrire/inc/import_1_2.php +++ b/ecrire/inc/import_1_2.php @@ -104,7 +104,7 @@ function inc_import_1_2_dist($f, $request, $gz='fread') { if (($type == 'article') && ($col == 'images')) { if ($value) { // ne pas afficher de message si on a un champ suppl mais vide - echo "--><br><font color='red'><b>"._T('avis_erreur_sauvegarde', array('type' => $type, 'id_objet' => $id_objet))."</b></font>\n<font color='black'>"._T('avis_colonne_inexistante', array('col' => $col)); + echo "--><br /><font color='red'><b>"._T('avis_erreur_sauvegarde', array('type' => $type, 'id_objet' => $id_objet))."</b></font>\n<font color='black'>"._T('avis_colonne_inexistante', array('col' => $col)); if ($col == 'images') echo _T('info_verifier_image'); echo "</font>\n<!--"; $GLOBALS['erreur_restauration'] = true; @@ -120,7 +120,7 @@ function inc_import_1_2_dist($f, $request, $gz='fread') { } if ($values) { if (!spip_query("REPLACE $table (" . join(',', array_keys($values)) . ') VALUES (' . join(',', array_map('_q', $values)) . ')')) { - echo "--><br><font color='red'><b>"._T('avis_erreur_mysql')."</b></font>\n<font color='black'><tt>".spip_sql_error()."</tt></font>\n<!--"; + echo "--><br /><font color='red'><b>"._T('avis_erreur_mysql')."</b></font>\n<font color='black'><tt>".spip_sql_error()."</tt></font>\n<!--"; $GLOBALS['erreur_restauration'] = true; }