From 09ae44f6d310f5f10f93d923c28af4f6738f3a21 Mon Sep 17 00:00:00 2001
From: "Committo,Ergo:sum" <esj@rezo.net>
Date: Mon, 18 Dec 2006 16:07:21 +0000
Subject: [PATCH] =?UTF-8?q?Conformit=C3=A9=20XHTML=20=C3=A0=20la=20main=20?=
=?UTF-8?q?/=20haut=20la=20main=20/=20au=20malin.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
ecrire/exec/admin_tech.php | 6 +--
ecrire/exec/config_lang.php | 25 +++++------
ecrire/exec/config_multilang.php | 54 ++++++++++++------------
ecrire/exec/documents_liste.php | 6 +--
ecrire/exec/lang_raccourcis.php | 6 +--
ecrire/exec/statistiques_lang.php | 17 ++++----
ecrire/exec/statistiques_repartition.php | 10 ++---
ecrire/inc/presentation.php | 12 +++---
ecrire/inc/signatures.php | 8 ++--
9 files changed, 72 insertions(+), 72 deletions(-)
diff --git a/ecrire/exec/admin_tech.php b/ecrire/exec/admin_tech.php
index 0957cc0cdb..889cfc5d6b 100644
--- a/ecrire/exec/admin_tech.php
+++ b/ecrire/exec/admin_tech.php
@@ -105,7 +105,7 @@ echo "</table>";
if ($connect_toutes_rubriques) {
$liste_dump = preg_files(_DIR_DUMP,str_replace("@stamp@","(_[0-9]{6,8}_[0-9]{1,3})?",_SPIP_DUMP)."(.gz)?$",50,false);
$selected = end($liste_dump);
- $liste_choix = "<p><ul>";
+ $liste_choix = "<ul>";
foreach($liste_dump as $key=>$fichier){
$affiche_fichier = substr($fichier,strlen(_DIR_DUMP));
$liste_choix.="\n<li><input type='radio' name='archive' value='"
@@ -148,11 +148,11 @@ echo "</table>";
'</p>';
echo "<p>",
_L("Eventuellement, URL du site d'origine :"),
- "<input name='url_site' type='texte' />",
+ "<input name='url_site' type='text' />",
'</p>';
fin_cadre_relief();
- echo "\n</p><div align='right'><input class='fondo' type='submit' value='",
+ echo "\n<div align='right'><input class='fondo' type='submit' value='",
_T('bouton_restaurer_base'),
"' /></div></form>",
"\n</td></tr>",
diff --git a/ecrire/exec/config_lang.php b/ecrire/exec/config_lang.php
index c3ded10da0..7260bcab03 100644
--- a/ecrire/exec/config_lang.php
+++ b/ecrire/exec/config_lang.php
@@ -52,7 +52,7 @@ lire_metas();
echo generer_url_post_ecrire('config_lang');
- echo "<input type='hidden' name='changer_config' value='oui'>";
+ echo "<input type='hidden' name='changer_config' value='oui' />";
//
@@ -69,7 +69,7 @@ echo _T('texte_selection_langue_principale');
// langue du site
echo _T('info_langue_principale')." : ";
-echo "\n<select name='changer_langue_site' class='fondl' align='middle'>\n";
+echo "\n<select name='changer_langue_site' class='fondl'>\n";
echo "<option value='$langue_site' selected='selected'>".traduire_nom_langue($langue_site)."</option>\n";
reset ($langues_prop);
while (list(,$l) = each ($langues_prop)) {
@@ -77,14 +77,11 @@ while (list(,$l) = each ($langues_prop)) {
echo "<option value='$l'>".traduire_nom_langue($l)."</option>\n";
}
echo "</select>\n";
-echo "<input type='submit' name='Valider' value='"._T('bouton_valider')."' class='fondo'>";
+echo "<input type='submit' name='Valider' value='"._T('bouton_valider')."' class='fondo' />";
fin_cadre_couleur();
-echo "<p>";
-
-
//
// Configuration du charset
//
@@ -95,21 +92,25 @@ $charset = $GLOBALS['meta']["charset"];
debut_cadre_relief("breve-24.gif", false, "", _T('info_jeu_caractere'));
- echo _T('texte_jeu_caractere')."<p>";
- echo "<blockquote class='spip'><p>"._T('texte_jeu_caractere_3'),
- "</p><div align='center'><b><tt>".entites_html($charset)."</tt></b></div><p>",
+ echo _T('texte_jeu_caractere');
+ echo "<blockquote class='spip'>\n<p>"
+ . _T('texte_jeu_caractere_3'),
+ "</p>\n<div align='center'><b><tt>"
+ .entites_html($charset)
+ ."</tt></b></div><p>",
_T('texte_jeu_caractere_4'),
" <input type='text' name='charset'
value=\"".entites_html($charset)."\" />",
- "<br />("._T('texte_jeu_caractere_2').")",
- "</p></blockquote>";
+ "<br />\n(".
+ _T('texte_jeu_caractere_2').")",
+ "</p></blockquote>\n";
if ($charset != 'utf-8' AND load_charset($charset))
echo _T('texte_jeu_caractere_conversion',
array('url' => generer_url_ecrire('convert_utf8'))
);
- echo "<div style='text-align: $spip_lang_right;'><input type='submit' name='Valider' value='"._T('bouton_valider')."' class='fondo'></div>";
+ echo "\n<div style='text-align: $spip_lang_right;'><input type='submit' name='Valider' value='"._T('bouton_valider')."' class='fondo' /></div>";
fin_cadre_relief();
diff --git a/ecrire/exec/config_multilang.php b/ecrire/exec/config_multilang.php
index 76b9c9ae6a..8aa67c64bc 100644
--- a/ecrire/exec/config_multilang.php
+++ b/ecrire/exec/config_multilang.php
@@ -46,25 +46,23 @@ if ($changer_config == 'oui') {
echo barre_onglets("config_lang", "multi");
-
debut_gauche();
-
echo pipeline('affiche_gauche',array('args'=>array('exec'=>'config_multilang'),'data'=>''));
creer_colonne_droite();
echo pipeline('affiche_droite',array('args'=>array('exec'=>'config_multilang'),'data'=>''));
debut_droite();
echo generer_url_post_ecrire('config_multilang');
-echo "<input type='hidden' name='changer_config' value='oui'>";
+echo "<input type='hidden' name='changer_config' value='oui' />";
debut_cadre_couleur("traductions-24.gif", false, "", _T('info_multilinguisme'));
echo "<p>"._T('texte_multilinguisme')."</p>";
echo "<div>";
echo _T('info_multi_articles');
- echo "<div style='text-align: $spip_lang_right';>";
+ echo "<div style='text-align: $spip_lang_right;'>";
echo afficher_choix('multi_articles', $GLOBALS['meta']['multi_articles'],
array('oui' => _T('item_oui'), 'non' => _T('item_non')), " ");
echo "</div>";
@@ -72,37 +70,37 @@ debut_cadre_couleur("traductions-24.gif", false, "", _T('info_multilinguisme'));
echo "<div>";
echo _T('info_multi_rubriques');
- echo "<div style='text-align: $spip_lang_right';>";
+ echo "<div style='text-align: $spip_lang_right;'>";
echo afficher_choix('multi_rubriques', $GLOBALS['meta']['multi_rubriques'],
array('oui' => _T('item_oui'), 'non' => _T('item_non')), " ");
echo "</div>";
echo "</div>";
if ($GLOBALS['meta']['multi_rubriques'] == 'oui') {
- echo "<div>";
+ echo "\n<div>";
echo _T('info_multi_secteurs');
- echo "<div style='text-align: $spip_lang_right';>";
+ echo "<div style='text-align: $spip_lang_right;'>";
echo afficher_choix('multi_secteurs', $GLOBALS['meta']['multi_secteurs'],
array('oui' => _T('item_oui'), 'non' => _T('item_non')), " ");
echo "</div>";
echo "</div>";
} else
- echo "<input type='hidden' name='multi_secteurs' value='".$GLOBALS['meta']['multi_secteurs']."'>";
+ echo "<input type='hidden' name='multi_secteurs' value='".$GLOBALS['meta']['multi_secteurs']."' />";
if (($GLOBALS['meta']['multi_rubriques'] == 'oui') OR ($GLOBALS['meta']['multi_articles'] == 'oui')) {
- echo "<hr>";
+ echo "<hr />";
echo "<p>"._T('texte_multilinguisme_trad')."</p>";
echo _T('info_gerer_trad');
- echo "<div style='text-align: $spip_lang_right';>";
+ echo "<div style='text-align: $spip_lang_right;'>";
echo afficher_choix('gerer_trad', $GLOBALS['meta']['gerer_trad'],
array('oui' => _T('item_oui'), 'non' => _T('item_non')), " ");
echo "</div>";
} else
- echo "<input type='hidden' name='gerer_trad' value='".$GLOBALS['meta']['gerer_trad']."'>";
+ echo "<input type='hidden' name='gerer_trad' value='".$GLOBALS['meta']['gerer_trad']."' />";
- echo "<div style='text-align: $spip_lang_right;'><input type='submit' name='Valider' value='"._T('bouton_valider')."' class='fondo'></div>";
+ echo "\n<div style='text-align: $spip_lang_right;'><input type='submit' name='Valider' value='"._T('bouton_valider')."' class='fondo' /></div>";
fin_cadre_couleur();
@@ -112,7 +110,7 @@ fin_cadre_couleur();
if ($GLOBALS['meta']['multi_articles'] == "oui"
OR $GLOBALS['meta']['multi_rubriques'] == "oui"
OR count(explode(',',$GLOBALS['meta']['langues_utilisees'])) > 1) {
- echo "<p>";
+
debut_cadre_relief("langues-24.gif");
echo "<p class='verdana2'>";
echo _T('info_multi_langues_choisies');
@@ -138,47 +136,47 @@ fin_cadre_couleur();
$langues_bloquees[$l] = true;
}
- echo "<table width = '100%' cellspacing='10'><tr><td width='50%' align='top' class='verdana1'>";
+ echo "\n<table width='100%' cellspacing='10'><tr><td width='50%' class='verdana1'>";
while (list($code_langue) = each($langues_bloquees)) {
$i++;
- echo "<div>";
+ echo "\n<div>";
$nom_langue = $langues[$code_langue];
if ($langues_trad[$code_langue]) $nom_langue = "<u>$nom_langue</u>";
$nom_langue = "<b><font color='$couleur_foncee'>$nom_langue</font></b>";
- echo "<input type='hidden' name='langues_auth[]' value='$code_langue' id='langue_auth_$code_langue'>";
- echo "<input type='checkbox' checked='checked' disabled='disabled'>";
- echo " $nom_langue <font color='#777777'>[$code_langue]</font>";
- echo "</div>\n";
+ echo "<input type='hidden' name='langues_auth[]' value='$code_langue' id='langue_auth_$code_langue' />";
+ echo "<input type='checkbox' checked='checked' disabled='disabled' />";
+ echo "\n$nom_langue\n <font color='#777777'>[$code_langue]</font>";
+ echo "</div>";
- if ($i == $cesure) echo "</td><td width='50%' align='top' class='verdana1'>";
+ if ($i == $cesure) echo "\n</td><td width='50%' class='verdana1'>";
}
- echo "<div> </div>";
+ echo "\n<div> </div>";
while (list($code_langue, $nom_langue) = each($langues)) {
if ($langues_bloquees[$code_langue]) continue;
$i++;
- echo "<div>";
+ echo "\n<div>";
if ($langues_trad[$code_langue]) $nom_langue = "<u>$nom_langue</u>";
if ($langues_auth[$code_langue]) {
- echo "<input type='checkbox' name='langues_auth[]' value='$code_langue' id='langue_auth_$code_langue' checked='checked'>";
+ echo "<input type='checkbox' name='langues_auth[]' value='$code_langue' id='langue_auth_$code_langue' checked='checked' />";
$nom_langue = "<b>$nom_langue</b>";
}
else {
- echo "<input type='checkbox' name='langues_auth[]' value='$code_langue' id='langue_auth_$code_langue'>";
+ echo "<input type='checkbox' name='langues_auth[]' value='$code_langue' id='langue_auth_$code_langue' />";
}
- echo " <label for='langue_auth_$code_langue'>$nom_langue</label> <font color='#777777'>[$code_langue]</font>";
+ echo "\n<label for='langue_auth_$code_langue'>$nom_langue</label> <font color='#777777'>[$code_langue]</font>";
- echo "</div>\n";
+ echo "</div>";
- if ($i == $cesure) echo "</font></td><td width='50%' align='top' class='verdana1'>";
+ if ($i == $cesure) echo "</td><td width='50%' class='verdana1'>";
}
echo "</td></tr>";
echo "<tr><td style='text-align:$spip_lang_right;' colspan='2'>";
- echo "<input type='submit' name='Valider' value='"._T('bouton_valider')."' class='fondo'>";
+ echo "<input type='submit' name='Valider' value='"._T('bouton_valider')."' class='fondo' />";
echo "</td></tr></table>";
diff --git a/ecrire/exec/documents_liste.php b/ecrire/exec/documents_liste.php
index 2f9d379a9d..2aa867a5a6 100644
--- a/ecrire/exec/documents_liste.php
+++ b/ecrire/exec/documents_liste.php
@@ -62,11 +62,11 @@ debut_droite();
debut_cadre_relief("doc-24.gif");
echo "<b>$titre</b> (" . $types[$row['type']]['titre'] . ', ' . affdate($date) . ")";
if ($descriptif)
- echo "<p>".propre($descriptif);
+ echo "<p>".propre($descriptif) . '</p>';
else
- echo "<p><tt>$fichier</tt>";
+ echo "<p><tt>$fichier</tt>" . '</p>';
- echo "<p>"._T('info_dans_rubrique')." <a href='" . generer_url_ecrire("naviguer","id_rubrique=$id_rubrique") . "'>$titre_rub</a>";
+ echo "<p>"._T('info_dans_rubrique')." <a href='" . generer_url_ecrire("naviguer","id_rubrique=$id_rubrique") . "'>$titre_rub</a></p>";
fin_cadre_relief();
}
diff --git a/ecrire/exec/lang_raccourcis.php b/ecrire/exec/lang_raccourcis.php
index 8b408ae2ee..9745ab1047 100644
--- a/ecrire/exec/lang_raccourcis.php
+++ b/ecrire/exec/lang_raccourcis.php
@@ -94,12 +94,12 @@ function afficher_raccourcis($module = "public") {
echo "</div><div> </div>";
}
- echo "<table cellpadding='3' cellspacing='1' border='0'>";
- echo "<tr bgcolor='$couleur_foncee' style='color:white;'><td class='verdana1'><b>"._T('module_raccourci')."</b></td><td class='verdana2'><b>"._T('module_texte_affiche')."</b></td></tr>\n";
+ echo "\n<table cellpadding='3' cellspacing='1' border='0'>";
+ echo "\n<tr bgcolor='$couleur_foncee' style='color:white;'><td class='verdana1'><b>"._T('module_raccourci')."</b></td>\n<td class='verdana2'><b>"._T('module_texte_affiche')."</b></td></tr>\n";
foreach ($tableau as $raccourci => $val) {
$bgcolor = alterner($i++, '#eeeeee','white');
- echo "<tr bgcolor='$bgcolor'><td class='verdana2'><b><:$aff_nom_module$raccourci:></b></td><td class='arial2'>".$val."</td></tr>\n";
+ echo "\n<tr bgcolor='$bgcolor'><td class='verdana2'><b><:$aff_nom_module$raccourci:></b></td>\n<td class='arial2'>".$val."</td></tr>";
}
echo "</table>";
diff --git a/ecrire/exec/statistiques_lang.php b/ecrire/exec/statistiques_lang.php
index 96df138f80..bae236e966 100644
--- a/ecrire/exec/statistiques_lang.php
+++ b/ecrire/exec/statistiques_lang.php
@@ -69,11 +69,10 @@ $result = spip_query("SELECT SUM(".$critere.") AS total_visites FROM spip_articl
$total_visites = $row['total_visites'];
else
$total_visites = 1;
- echo "<p>";
$result = spip_query("SELECT lang, SUM(".$critere.") AS cnt FROM spip_articles WHERE statut='publie' GROUP BY lang");
- echo "<table cellpadding = 2 cellspacing = 0 border = 0 width='100%' style='border: 1px solid #aaaaaa;'>";
+ echo "\n<table cellpadding = 2 cellspacing = 0 border = 0 width='100%' style='border: 1px solid #aaaaaa;'>";
$ifond = 1;
while ($row = spip_fetch_array($result)) {
@@ -91,23 +90,23 @@ $result = spip_query("SELECT SUM(".$critere.") AS total_visites FROM spip_articl
$couleur="eeeeee";
}
- echo "<tr bgcolor='$couleur'>";
+ echo "\n<tr bgcolor='$couleur'>";
$dir=lang_dir($lang,'',' dir=rtl');
echo "<td width='100%' style='border-bottom: 1px solid #cccccc;'><span class='verdana2'$dir><div style='float: $spip_lang_right;'>$pourcent%</div>".traduire_nom_langue($lang)."</span></td>";
echo "<td style='border-bottom: 1px solid #cccccc;'>";
- echo "<table cellpadding='0' cellspacing='0' border='0' width='".($taille+5)."' height=8>";
- echo "<tr><td style='align:$spip_lang_right; background-color: #eeeeee; border: 1px solid #999999; white-space: nowrap;'>";
- if ($visites_abs > 0) echo "<img src='" . _DIR_IMG_PACK . "rien.gif' width='$visites_abs' height='8'>";
- if ($visites>0) echo "<IMG src='" . _DIR_IMG_PACK . "rien.gif' style='background-color: $couleur_foncee;' width='$visites' height=8 border=0>";
- echo "</td></tr></table>\n";
+ echo "\n<table cellpadding='0' cellspacing='0' border='0' width='".($taille+5)."' height=8>";
+ echo "\n<tr><td style='align:$spip_lang_right; background-color: #eeeeee; border: 1px solid #999999; white-space: nowrap;'>";
+ if ($visites_abs > 0) echo "<img src='" . _DIR_IMG_PACK . "rien.gif' width='$visites_abs' height='8' />";
+ if ($visites>0) echo "<img src='" . _DIR_IMG_PACK . "rien.gif' style='background-color: $couleur_foncee;' width='$visites' height='8' border='0' />";
+ echo "</td></tr></table>\n";
echo "</td>";
echo "</tr>";
$visites_abs += $visites;
}
}
- echo "</table>";
+ echo "</table>\n";
//echo "<p><font face='Verdana,Arial,Sans,sans-serif' size='3'>"._T('texte_signification')."</font>";
diff --git a/ecrire/exec/statistiques_repartition.php b/ecrire/exec/statistiques_repartition.php
index 9d8cb78324..c1c1a16810 100644
--- a/ecrire/exec/statistiques_repartition.php
+++ b/ecrire/exec/statistiques_repartition.php
@@ -98,13 +98,13 @@ function enfants_aff($id_parent,$decalage, $critere, $gauche=0) {
echo "</td>\n<td align='right' width='".($taille+5)."' style='border-bottom: 1px solid #aaaaaa;'>";
- echo "\n<table cellpadding='0' cellspacing='0' border='0' width=".($decalage+1+$gauche)." height=8>";
+ echo "\n<table cellpadding='0' cellspacing='0' border='0' width='".($decalage+1+$gauche)."' height='8'>";
echo "\n<tr>";
if ($gauche > 0) echo "<td width='".$gauche."'></td>";
echo "\n<td style='background-color: #eeeeee; border: 1px solid #999999; white-space: nowrap;'>";
- if ($visites_abs > 0) echo "<img src='" . _DIR_IMG_PACK . "rien.gif' width='".$visites_abs."' height='8' border='0'>";
- if ($largeur_rouge>0) echo "<IMG src='" . _DIR_IMG_PACK . "rien.gif' style='background-color: $couleur_foncee;' width=$largeur_rouge height=8 border=0>";
- if ($largeur_vert>0) echo "<IMG src='" . _DIR_IMG_PACK . "rien.gif' style='background-color: $couleur_claire;' width=$largeur_vert height=8 border=0>";
+ if ($visites_abs > 0) echo "<img src='" . _DIR_IMG_PACK . "rien.gif' width='".$visites_abs."' height='8' border='0' />";
+ if ($largeur_rouge>0) echo "<img src='" . _DIR_IMG_PACK . "rien.gif' style='background-color: $couleur_foncee;' width='$largeur_rouge' height='8' border='0' />";
+ if ($largeur_vert>0) echo "<IMG src='" . _DIR_IMG_PACK . "rien.gif' style='background-color: $couleur_claire;' width='$largeur_vert' height='8' border='0' />";
echo "</td></tr></table>\n";
echo "</td></tr></table>";
@@ -172,6 +172,6 @@ function exec_statistiques_repartition_dist()
echo "</td></tr></table></center>";
- // echo fin_page();
+ echo fin_page();
}
?>
diff --git a/ecrire/inc/presentation.php b/ecrire/inc/presentation.php
index d2840204c5..678dfc6c11 100644
--- a/ecrire/inc/presentation.php
+++ b/ecrire/inc/presentation.php
@@ -457,7 +457,6 @@ function affiche_tranche_bandeau($requete, $icone, $fg, $bg, $tmp_var, $titre,
if ($titre) $res .= "\n<div style='height: 12px;'></div>";
$res .= "\n<div class='liste'>";
$res .= bandeau_titre_boite2($titre, $icone, $fg, $bg, false);
- $res .= "<table width='100%' cellpadding='2' cellspacing='0' border='0'>";
if (isset($requete['LIMIT'])) $cpt = min($requete['LIMIT'], $cpt);
$deb_aff = intval(_request($tmp_var));
@@ -475,11 +474,12 @@ function affiche_tranche_bandeau($requete, $icone, $fg, $bg, $tmp_var, $titre,
$table[]= $skel($row, $tous_id, $voir_logo, $own);
}
spip_free_result($result);
-
- $res .= afficher_liste($largeurs, $table, $styles);
- $res .= "</table>";
- $res .= "</div>\n";
- return $res;
+
+ return $res
+ . "<table width='100%' cellpadding='2' cellspacing='0' border='0'>"
+ . afficher_liste($largeurs, $table, $styles)
+ . "</table>"
+ . "</div>\n";
}
diff --git a/ecrire/inc/signatures.php b/ecrire/inc/signatures.php
index 7504219fb4..602ff10b4c 100644
--- a/ecrire/inc/signatures.php
+++ b/ecrire/inc/signatures.php
@@ -58,8 +58,10 @@ function inc_signatures_dist($script, $id, $debut, $where, $order, $limit='') {
# ($limit . ($debut ? " OFFSET $debut" : "")); #PG
$request = spip_query("SELECT * FROM spip_signatures " . ($where ? " WHERE $where" : "") . ($order ? " ORDER BY $order" : "") . (!$limit ? '' : " LIMIT $limit"));
+ $res .= '<br />';
+
while($row=spip_fetch_array($request)){
- $res .= signatures_edit($script, $id, $debut, $row);
+ $res .= '<br />' . signatures_edit($script, $id, $debut, $row);
}
return $res;
}
@@ -118,7 +120,7 @@ function signatures_edit($script, $id, $debut, $row) {
$res .= "<font size='1'>"._T('info_adresse_email')."</font> <a href='mailto:$ad_email'>$ad_email</a><br />";
}
- $res .= "<p>" . message_de_signature($row) ."</p>";
+ $res .= '<br />' . message_de_signature($row);
$titre = spip_fetch_array(spip_query("SELECT titre FROM spip_articles WHERE id_article=$id_article"));
@@ -141,6 +143,6 @@ function signatures_edit($script, $id, $debut, $row) {
$res .= "</td></tr></table>";
}
- return "<p>$res</p>";
+ return $res;
}
?>
--
GitLab