diff --git a/ecrire/admin_effacer.php3 b/ecrire/admin_effacer.php3 index 6cdaabf21d5cd09ddcfacf3e242f3ae31a18b9c4..3720789575fb11e2ed5c72fea7b3f2aaf2ac0acf 100644 --- a/ecrire/admin_effacer.php3 +++ b/ecrire/admin_effacer.php3 @@ -47,7 +47,7 @@ echo "<TR><TD BACKGROUND=''>"; echo "<FONT FACE='Georgia,Garamond,Times,serif' SIZE=3>"; echo "\n<p align='justify'>"; -echo '<img src="img_pack/warning.gif" alt="warning.gif" width="48" height="48" align="right">'; +echo '<img src="img_pack/warning.gif" alt="Avertissement" width="48" height="48" align="right">'; echo "Cette commande efface <i>tout</i> le contenu de la base de données, y compris <i>tous</i> les accès rédacteurs et administrateurs. Après l'avoir exécutée, vous devrez lancer la réinstallation de SPIP pour recréer une nouvelle base ainsi qu'un premier accès administrateur."; diff --git a/ecrire/admin_tech.php3 b/ecrire/admin_tech.php3 index a4f54b02237af1e470ad6bd36f46559658dce8c5..49eeba8336392dad89456ffba76c9f40be741e41 100644 --- a/ecrire/admin_tech.php3 +++ b/ecrire/admin_tech.php3 @@ -49,7 +49,7 @@ echo "\n<FORM ACTION='export_all.php3' METHOD='get'>"; echo "\n<p align='justify'>"; -echo '<img src="img_pack/warning.gif" alt="warning.gif" width="48" height="48" align="right">'; +echo '<img src="img_pack/warning.gif" alt="Avertissement" width="48" height="48" align="right">'; echo "Cette option vous permet de sauvegarder le contenu de la base dans un fichier qui sera stocké dans le répertoire <i>ecrire/data/</i>. N'oubliez pas également de récupérer l'intégralité du répertoire <i>IMG/</i>, qui contient diff --git a/ecrire/aide_gauche.php3 b/ecrire/aide_gauche.php3 index 16815450c6877ca7c55659af33a58d2cb7e1a83b..d7eec9f4a33f912badcd9ee2d0ef1dc38da57167 100644 --- a/ecrire/aide_gauche.php3 +++ b/ecrire/aide_gauche.php3 @@ -183,12 +183,12 @@ for ($i=0; $i<=count($texte); $i++) { if ($aff == 1) { $supp_rub="$larubrique"; - $texte[$i]=ereg_replace("#IMG","<img src='img_pack/triangle-bleu-bas.gif' alt='>' width='14' height='14' border='0'>",$texte[$i]); + $texte[$i]=ereg_replace("#IMG","<img src='img_pack/triangle-bleu-bas.gif' alt='' width='14' height='14' border='0'>",$texte[$i]); $texte[$i]=ereg_replace("#LIEN","aide_gauche.php3?les_rub=$les_rub&supp_rub=$supp_rub&aide=$aide",$texte[$i]); } else { $ajouter_rub="$larubrique"; - $texte[$i]=ereg_replace("#IMG","<img src='img_pack/triangle-bleu.gif' alt='>' width='14' height='14' border='0'>",$texte[$i]); + $texte[$i]=ereg_replace("#IMG","<img src='img_pack/triangle-bleu.gif' alt='' width='14' height='14' border='0'>",$texte[$i]); $texte[$i]=ereg_replace("#LIEN","aide_gauche.php3?les_rub=$les_rub&addrub=$ajouter_rub&aide=$aide",$texte[$i]); } diff --git a/ecrire/articles.php3 b/ecrire/articles.php3 index 75619f6376a63783d6b928e5b9ae6f97ca04e55c..aeb4ad087b62753c6b398975260aed5e6317b784 100644 --- a/ecrire/articles.php3 +++ b/ecrire/articles.php3 @@ -1259,19 +1259,19 @@ if ($connect_statut == '0minirezo' AND acces_rubrique($rubrique_article)) { echo " \n"; if ($statut_article=='publie') { - echo "<img src='img_pack/puce-verte.gif' alt='X' width='13' height='14' border='0' NAME='statut'>"; + echo "<img src='img_pack/puce-verte.gif' alt='' width='13' height='14' border='0' NAME='statut'>"; } else if ($statut_article=='prepa') { - echo "<img src='img_pack/puce-blanche.gif' alt='X' width='13' height='14' border='0' NAME='statut'>"; + echo "<img src='img_pack/puce-blanche.gif' alt='' width='13' height='14' border='0' NAME='statut'>"; } else if ($statut_article=='prop') { - echo "<img src='img_pack/puce-orange.gif' alt='X' width='13' height='14' border='0' NAME='statut'>"; + echo "<img src='img_pack/puce-orange.gif' alt='' width='13' height='14' border='0' NAME='statut'>"; } else if ($statut_article == 'refuse') { - echo "<img src='img_pack/puce-rouge.gif' alt='X' width='13' height='14' border='0' NAME='statut'>"; + echo "<img src='img_pack/puce-rouge.gif' alt='' width='13' height='14' border='0' NAME='statut'>"; } else if ($statut_article == 'poubelle') { - echo "<img src='img_pack/puce-poubelle.gif' alt='X' width='13' height='14' border='0' NAME='statut'>"; + echo "<img src='img_pack/puce-poubelle.gif' alt='' width='13' height='14' border='0' NAME='statut'>"; } echo " \n"; diff --git a/ecrire/articles_tous.php3 b/ecrire/articles_tous.php3 index 220f7b80e2ed50e736f75a6c8a4248dd0657fe26..a4d0bc975f62d638ae6c311e2fdc34bc385ce984 100644 --- a/ecrire/articles_tous.php3 +++ b/ecrire/articles_tous.php3 @@ -26,7 +26,7 @@ if ($connect_statut == "0minirezo") { else { echo "<input type='checkbox' name='aff_art[]' value='prepa' id='prepa'>"; } - echo " <label for='prepa'><img src='img_pack/puce-blanche.gif' alt='X' width='9' height='9' border='0'>"; + echo " <label for='prepa'><img src='img_pack/puce-blanche.gif' alt='' width='9' height='9' border='0'>"; echo " en cours de rédaction</label><BR>"; } @@ -37,7 +37,7 @@ if (ereg('prop', $aff_art)) { else { echo "<input type='checkbox' name='aff_art[]' value='prop' id='prop'>"; } -echo " <label for='prop'><img src='img_pack/puce-orange.gif' alt='X' width='9' height='9' border='0'>"; +echo " <label for='prop'><img src='img_pack/puce-orange.gif' alt='' width='9' height='9' border='0'>"; echo " en attente de validation</label><BR>"; if (ereg('publie', $aff_art)) { @@ -46,7 +46,7 @@ if (ereg('publie', $aff_art)) { else { echo "<input type='checkbox' name='aff_art[]' value='publie' id='publie'>"; } -echo " <label for='publie'><img src='img_pack/puce-verte.gif' alt='X' width='9' height='9' border='0'>"; +echo " <label for='publie'><img src='img_pack/puce-verte.gif' alt='' width='9' height='9' border='0'>"; echo " publiés en ligne</label><BR>"; if ($connect_statut == "0minirezo") { @@ -56,7 +56,7 @@ if ($connect_statut == "0minirezo") { else { echo "<input type='checkbox' name='aff_art[]' value='refuse' id='refuse'>"; } - echo " <label for='refuse'><img src='img_pack/puce-rouge.gif' alt='X' width='9' height='9' border='0'>"; + echo " <label for='refuse'><img src='img_pack/puce-rouge.gif' alt='' width='9' height='9' border='0'>"; echo " refusés</label><BR>"; if (ereg('poubelle',$aff_art)) { @@ -65,7 +65,7 @@ if ($connect_statut == "0minirezo") { else { echo "<input type='checkbox' name='aff_art[]' value='poubelle' id='poubelle'>"; } - echo " <label for='poubelle'><img src='img_pack/puce-poubelle.gif' alt='X' width='9' height='9' border='0'>"; + echo " <label for='poubelle'><img src='img_pack/puce-poubelle.gif' alt='' width='9' height='9' border='0'>"; echo " à la poubelle</label>"; } @@ -120,7 +120,7 @@ function enfants($id_parent, $decalage = 0) { echo "<TD WIDTH=$decalage><IMG SRC='img_pack/rien.gif' BORDER=0 HEIGHT=1 WIDTH=$decalage></TD><TD WIDTH='100%'>"; } $bandeau = "<A HREF='$lien'>"; - $bandeau .= "<img src='img_pack/triangle-bleu-bas.gif' alt='>' width='14' height='14' border='0'></A>"; + $bandeau .= "<img src='img_pack/triangle-bleu-bas.gif' alt='' width='14' height='14' border='0'></A>"; $bandeau .= " <A HREF='naviguer.php3?coll=$id_rubrique'><FONT COLOR='white'>$titre</FONT></A> $sucrer"; $requete = "SELECT id_article, titre, id_rubrique, statut, date FROM spip_articles WHERE id_rubrique=$id_rubrique AND FIND_IN_SET(statut,'$aff_art') ORDER BY date DESC"; afficher_articles($bandeau, $requete, false, false, true, false); @@ -137,7 +137,7 @@ function enfants($id_parent, $decalage = 0) { echo "<TABLE CELLPADDING=3 CELLSPACING=1 BORDER=0 WIDTH=\"100%\">"; echo "<TR><TD BGCOLOR='$couleur_foncee' WIDTH=\"100%\"><FONT FACE='Verdana,Arial,Helvetica,sans-serif' SIZE=3 COLOR='#FFFFFF'>"; - echo "<B><A HREF='$lien'><img src='img_pack/triangle-bleu.gif' alt='>' width='14' height='14' border='0'></A> <A HREF='naviguer.php3?coll=$id_rubrique'><FONT COLOR='#FFFFFF'>$titre</FONT></A></B> $sucrer"; + echo "<B><A HREF='$lien'><img src='img_pack/triangle-bleu.gif' alt='' width='14' height='14' border='0'></A> <A HREF='naviguer.php3?coll=$id_rubrique'><FONT COLOR='#FFFFFF'>$titre</FONT></A></B> $sucrer"; echo "</FONT></TD></TR></TABLE>"; if ($decalage) { echo "</TD></TR></TABLE>"; diff --git a/ecrire/auteur_infos.php3 b/ecrire/auteur_infos.php3 index 0683935f785b8261243a7773be6ba6b56bae2b34..b214f553f87741a5c64519d2d8fff4adb87aa8d8 100644 --- a/ecrire/auteur_infos.php3 +++ b/ecrire/auteur_infos.php3 @@ -221,7 +221,7 @@ debut_droite(); if ($echec){ debut_cadre_relief(); - echo '<img src="img_pack/warning.gif" alt="warning.gif" width="48" height="48" align="left">'; + echo '<img src="img_pack/warning.gif" alt="Avertissement" width="48" height="48" align="left">'; echo "<font color='red'>$echec <p>Veuillez recommencer.</font>"; fin_cadre_relief(); echo "<p>"; @@ -284,7 +284,7 @@ if (($connect_statut == "0minirezo" AND $connect_toutes_rubriques) OR $connect_i if ($connect_id_auteur == $id_auteur) { debut_cadre_enfonce(); - echo '<img src="img_pack/warning.gif" alt="warning.gif" width="48" height="48" align="right">'; + echo '<img src="img_pack/warning.gif" alt="Avertissement" width="48" height="48" align="right">'; echo "<b>Attention ! Ceci est le login sous lequel vous êtes connecté actuellement. <font color=\"red\">Utilisez ce formulaire avec précaution : si vous oubliez votre mot de passe, il sera impossible de le retrouver (seul un administrateur pourra vous en attribuer un nouveau).</font></b>\n"; fin_cadre_enfonce(); diff --git a/ecrire/auteurs.php3 b/ecrire/auteurs.php3 index 4ab825249abe2abbca7bebb0a6b4da109b77979b..dca462be9746edad1bd0cf4a496155208665bc56 100644 --- a/ecrire/auteurs.php3 +++ b/ecrire/auteurs.php3 @@ -189,7 +189,7 @@ debut_cadre_relief('redacteurs-24.gif'); echo "<TABLE BORDER=0 CELLPADDING=3 CELLSPACING=0 WIDTH='100%' class='arial2'>\n"; echo "<tr bgcolor='#DBE1C5'>"; echo "<td width='50'>"; - $img = "<img src='img_pack/bonhomme-noir.gif' alt='Statut' border='0'>"; + $img = "<img src='img_pack/bonhomme-noir.gif' alt='' border='0'>"; if ($tri=='statut') echo $img; else diff --git a/ecrire/config-contenu.php3 b/ecrire/config-contenu.php3 index 1412a4f4439c975b3e29c092bd9276daa4651a10..da2b59b8445fe7a6a63adebd713aaebb21e58a41 100644 --- a/ecrire/config-contenu.php3 +++ b/ecrire/config-contenu.php3 @@ -100,7 +100,7 @@ debut_boite_info(); <P align="center"><FONT COLOR='red'><B>ATTENTION !</B></FONT> <P align="justify"> -<img src="img_pack/warning.gif" alt="warning.gif" width="48" height="48" align="right"> +<img src="img_pack/warning.gif" alt="Avertissement" width="48" height="48" align="right"> Les modifications effectuées ci-dessous influent notablement sur le fonctionnement de votre site. Nous vous recommandons de ne pas y intervenir tant que vous n'êtes pas parfaitement familier du fonctionnement du système SPIP. <P align="justify"><B>Plus généralement, il est <I>fortement conseillé</I> diff --git a/ecrire/config-fonctions.php3 b/ecrire/config-fonctions.php3 index f9eea08e130cd2293db3639e269da607b9a47210..48de37959d9b292faeabddb75aa24fad87cb11e3 100644 --- a/ecrire/config-fonctions.php3 +++ b/ecrire/config-fonctions.php3 @@ -120,7 +120,7 @@ debut_boite_info(); <P align="center"><FONT COLOR='red'><B>ATTENTION !</B></FONT> <P align="justify"> -<img src="img_pack/warning.gif" alt="warning.gif" width="48" height="48" align="right"> +<img src="img_pack/warning.gif" alt="Avertissement" width="48" height="48" align="right"> Les modifications effectuées ci-dessous influent notablement sur le fonctionnement de votre site. Nous vous recommandons de ne pas y intervenir tant que vous n'êtes pas parfaitement familier du fonctionnement du système SPIP. <P align="justify"><B>Plus généralement, il est <I>fortement conseillé</I> diff --git a/ecrire/configuration.php3 b/ecrire/configuration.php3 index 96dd2931059f22b26d44b5ef62e071d90e0c4fa4..9e9836c7481698fc1de23033e207844b5071c0fd 100644 --- a/ecrire/configuration.php3 +++ b/ecrire/configuration.php3 @@ -126,7 +126,7 @@ debut_boite_info(); <P align="center"><FONT COLOR='red'><B>ATTENTION !</B></FONT> <P align="justify"> -<img src="img_pack/warning.gif" alt="warning.gif" width="48" height="48" align="right"> +<img src="img_pack/warning.gif" alt="Avertissement" width="48" height="48" align="right"> Les modifications effectuées ci-dessous influent notablement sur le fonctionnement de votre site. Nous vous recommandons de ne pas y intervenir tant que vous n'êtes pas parfaitement familier du fonctionnement du système SPIP. <P align="justify"><B>Plus généralement, il est <I>fortement conseillé</I> diff --git a/ecrire/inc_layer.php3 b/ecrire/inc_layer.php3 index 38bf6e9223b6219f6bfc90e44023901c0126738d..14480f09f7bfa9c9e82b440b47aa898971819498 100644 --- a/ecrire/inc_layer.php3 +++ b/ecrire/inc_layer.php3 @@ -111,11 +111,11 @@ function bouton_block_invisible($nom_block) { $javasc .= "swap_couche(\\'".$numero_block[$nom_block]."\\');"; } $retour = "\n<script language='JavaScript'><!--\n"; - $retour .= "document.write('<a href=\"javascript:$javasc\"><img name=\"triangle$num_triangle\" src=\"img_pack/deplierhaut.gif\" alt=\"Déplier\" title=\"Déplier\" width=\"16\" height=\"14\" border=\"0\"></a> ');\n"; + $retour .= "document.write('<a href=\"javascript:$javasc\"><img name=\"triangle$num_triangle\" src=\"img_pack/deplierhaut.gif\" alt=\"\" title=\"Déplier\" width=\"16\" height=\"14\" border=\"0\"></a> ');\n"; $retour .= "//-->\n"; $retour .= "</script>\n"; - $retour .= "<noscript><img name='triangle$num_triangle' src='img_pack/deplierbas.gif' alt='*' width='16' height='14' border='0'></noscript>\n"; + $retour .= "<noscript><img name='triangle$num_triangle' src='img_pack/deplierbas.gif' alt='' width='16' height='14' border='0'></noscript>\n"; return $retour; // return "<a href=\"javascript:$javasc\"><img name='triangle$num_triangle' src='img_pack/deplierhaut.gif' alt='Déplier' title='Déplier' width='16' height='14' border='0'></a> "; } @@ -131,7 +131,7 @@ function bouton_block_visible($nom_block){ $numero_block["$nom_block"] = $compteur_block; } - return "<a href=\"javascript:swap_couche('".$numero_block["$nom_block"]."')\"><IMG name='triangle".$numero_block["$nom_block"]."' src='img_pack/deplierbas.gif' alt='Déplier' title='Déplier' width='16' height='14' border='0'></a> "; + return "<a href=\"javascript:swap_couche('".$numero_block["$nom_block"]."')\"><IMG name='triangle".$numero_block["$nom_block"]."' src='img_pack/deplierbas.gif' alt='' title='Déplier' width='16' height='14' border='0'></a> "; } } diff --git a/ecrire/inc_mots.php3 b/ecrire/inc_mots.php3 index e925122858cb1e798d0f0723b04ead13d4617508..a97d3e172c331e135594264af86d9d604c6bb84f 100644 --- a/ecrire/inc_mots.php3 +++ b/ecrire/inc_mots.php3 @@ -276,7 +276,7 @@ function formulaire_mots($table, $id_objet, $nouv_mot, $supp_mot, $cherche_mot, echo "<TR WIDTH=\"100%\">"; echo "<TD BGCOLOR='$couleur'>"; - echo "<A HREF='$url'><img src='img_pack/petite-cle.gif' alt='X' width='23' height='12' border='0'></A>"; + echo "<A HREF='$url'><img src='img_pack/petite-cle.gif' alt='' width='23' height='12' border='0'></A>"; echo "</TD>"; echo "<TD BGCOLOR='$couleur' width='100%'><FONT FACE='Verdana,Arial,Helvetica,sans-serif' SIZE=2>"; diff --git a/ecrire/inc_presentation.php3 b/ecrire/inc_presentation.php3 index c021f3989ef3f3f423f283da7d8190dc1709f249..8500f4db69e7c77c2b6c01d606a833aee2d74ac7 100644 --- a/ecrire/inc_presentation.php3 +++ b/ecrire/inc_presentation.php3 @@ -70,20 +70,20 @@ function debut_cadre_relief($icone='', $return = false, $fonction=''){ if (strlen($icone)<3) $icone = "rien.gif"; $retour_aff.= "<TABLE CELLPADDING=0 CELLSPACING=0 BORDER=0 WIDTH=\"100%\">"; $retour_aff.= "<tr>"; - $retour_aff.= "<td width='5'><img src='img_pack/rond-hg-24.gif' alt='/' width='5' height='24'></td>"; + $retour_aff.= "<td width='5'><img src='img_pack/rond-hg-24.gif' alt='' width='5' height='24'></td>"; $retour_aff.= "<td background='img_pack/rond-h-24.gif'>"; if (strlen($fonction)>3) { - $retour_aff.= "<table cellpadding=0 cellspacing=0 border=0><tr><td background='img_pack/$icone'><img src='img_pack/$fonction' alt='\' width='24' height='24'></td></tr></table>"; + $retour_aff.= "<table cellpadding=0 cellspacing=0 border=0><tr><td background='img_pack/$icone'><img src='img_pack/$fonction' alt='' width='24' height='24'></td></tr></table>"; } else { - $retour_aff.= "<img src='img_pack/$icone' alt='\' width='24' height='24'>"; + $retour_aff.= "<img src='img_pack/$icone' alt='' width='24' height='24'>"; } $retour_aff.= "</td>"; - $retour_aff.= "<td width='5'><img src='img_pack/rond-hd-24.gif' alt='/' width='5' height='24'></td>"; + $retour_aff.= "<td width='5'><img src='img_pack/rond-hd-24.gif' alt='' width='5' height='24'></td>"; $retour_aff.= "</tr>"; $retour_aff.= "<TR>"; - $retour_aff.= "<td background='img_pack/rond-g.gif' width='5'><img src='img_pack/rien.gif' alt='/' width='5' height='5'></td>"; + $retour_aff.= "<td background='img_pack/rond-g.gif' width='5'><img src='img_pack/rien.gif' alt='' width='5' height='5'></td>"; $retour_aff.= "<TD WIDTH=\"100%\">"; $retour_aff.= "<TABLE CELLPADDING=3 CELLSPACING=0 BORDER=0 WIDTH=\"100%\"><TR><TD BGCOLOR='#ffffff' WIDTH=\"100%\">"; } @@ -102,13 +102,13 @@ function fin_cadre_relief($return = false){ $retour_aff.= "</td></tr></table>"; $retour_aff.= "</td>"; - $retour_aff.= "<td background='img_pack/rond-d.gif' width='5'><img src='img_pack/rien.gif' alt='\' width='5' height='5'></td></tr>"; + $retour_aff.= "<td background='img_pack/rond-d.gif' width='5'><img src='img_pack/rien.gif' alt='' width='5' height='5'></td></tr>"; $retour_aff.= "<tr>"; - $retour_aff.= "<td width='5'><img src='img_pack/rond-bg.gif' alt='\' width='5' height='5'></td>"; - $retour_aff.= "<td background='img_pack/rond-b.gif'><img src='img_pack/rien.gif' alt='-' width='5' height='5'></td>"; - $retour_aff.= "<td width='5'><img src='img_pack/rond-bd.gif' alt='/' width='5' height='5'></td>"; + $retour_aff.= "<td width='5'><img src='img_pack/rond-bg.gif' alt='' width='5' height='5'></td>"; + $retour_aff.= "<td background='img_pack/rond-b.gif'><img src='img_pack/rien.gif' alt='' width='5' height='5'></td>"; + $retour_aff.= "<td width='5'><img src='img_pack/rond-bd.gif' alt='' width='5' height='5'></td>"; $retour_aff.= "</tr>"; - $retour_aff.= "<tr><td></td><td bgcolor='#bbbbbb'><img src='img_pack/rien.gif' alt='\' width='5' height='1'></td></tr>"; + $retour_aff.= "<tr><td></td><td bgcolor='#bbbbbb'><img src='img_pack/rien.gif' alt='' width='5' height='1'></td></tr>"; $retour_aff.= "<tr><td><img src='img_pack/rien.gif' alt='' width='5' height='4'></td></tr>"; $retour_aff.= "</table>"; @@ -130,7 +130,7 @@ function debut_cadre_enfonce($icone='', $return = false, $fonction=''){ if (strlen($icone)<3) $icone = "rien.gif"; $retour_aff.= "<TABLE CELLPADDING=0 CELLSPACING=0 BORDER=0 WIDTH=\"100%\">"; $retour_aff.= "<tr>"; - $retour_aff.= "<td width='5'><img src='$img_pack/cadre-hg.gif' alt='/' width='5' height='24'></td>"; + $retour_aff.= "<td width='5'><img src='$img_pack/cadre-hg.gif' alt='' width='5' height='24'></td>"; $retour_aff.= "<td background='$img_pack/cadre-h.gif'>"; if (strlen($fonction)>3) { $retour_aff.= "<table cellpadding=0 cellspacing=0 border=0><tr><td background='$img_pack/$icone'><img src='$img_pack/$fonction' alt='' width='24' height='24'></td></tr></table>"; @@ -139,7 +139,7 @@ function debut_cadre_enfonce($icone='', $return = false, $fonction=''){ $retour_aff.= "<img src='$img_pack/$icone' alt='' width='24' height='24'>"; } $retour_aff.= "</td>"; - $retour_aff.= "<td width='5'><img src='$img_pack/cadre-hd.gif' alt='\' width='5' height='24'></td>"; + $retour_aff.= "<td width='5'><img src='$img_pack/cadre-hd.gif' alt='' width='5' height='24'></td>"; $retour_aff.= "</tr>"; $retour_aff.= "<TR>"; @@ -164,9 +164,9 @@ function fin_cadre_enfonce($return = false){ $retour_aff.= "</TD>"; $retour_aff.= "<td background='$img_pack/cadre-d.gif' width='5'><img src='$img_pack/rien.gif' alt='' width='5' height='5'></td>"; $retour_aff.= "<tr>"; - $retour_aff.= "<td width='5'><img src='$img_pack/cadre-bg.gif' alt='\' width='5' height='5'></td>"; + $retour_aff.= "<td width='5'><img src='$img_pack/cadre-bg.gif' alt='' width='5' height='5'></td>"; $retour_aff.= "<td background='$img_pack/cadre-b.gif'><img src='$img_pack/rien.gif' alt='' width='5' height='5'></td>"; - $retour_aff.= "<td width='5'><img src='$img_pack/cadre-bd.gif' alt='/' width='5' height='5'></td>"; + $retour_aff.= "<td width='5'><img src='$img_pack/cadre-bd.gif' alt='' width='5' height='5'></td>"; $retour_aff.= "</tr>"; $retour_aff.= "<tr><td><img src='$img_pack/rien.gif' alt='' width='5' height='4'></td></tr>"; $retour_aff.= "</table>"; @@ -264,7 +264,7 @@ function afficher_icone_texte($url, $texte, $image, $largeur, $hauteur, $align = echo " cellspacing='0' cellpadding='10'>"; echo "<tr><td width='".floor($largeur * 2.0)."' align='center'>\n"; echo "\t<a class='icone' href=\"$url\"><font face='Verdana,Arial,Helvetica,sans-serif' size='1'>\n"; - echo "\t<img src='$image' border='0' alt='o' width='$largeur' height='$hauteur'><br>\n"; + echo "\t<img src='$image' border='0' alt='' width='$largeur' height='$hauteur'><br>\n"; echo "\t<b>$texte</b></font></a>\n"; echo "\t</td></tr></table>\n"; } @@ -291,7 +291,7 @@ function afficher_icone($url, $texte, $image, $largeur, $hauteur, $align = "") { function tableau($texte,$lien,$image){ echo "<td width=15> </td>\n"; - echo "<td width=80 valign='top' align='center'><a href='$lien'><img src='$image' border='0' alt='o'></a><br><font size=1 face='arial,helvetica' color='#e86519'><b>$texte</b></font></td>"; + echo "<td width=80 valign='top' align='center'><a href='$lien'><img src='$image' border='0' alt=''></a><br><font size=1 face='arial,helvetica' color='#e86519'><b>$texte</b></font></td>"; } function afficher_liste($largeurs, $table, $styles = '') { @@ -452,7 +452,7 @@ function afficher_articles($titre_table, $requete, $afficher_visites = false, $a else $puce = "puce-$puce.gif"; - $s .= "<img src=\"img_pack/$puce\" alt='-' width=\"13\" height=\"14\" border=\"0\"></a> "; + $s .= "<img src=\"img_pack/$puce\" alt='' width=\"13\" height=\"14\" border=\"0\"></a> "; $s .= "<a href=\"articles.php3?id_article=$id_article\"$descriptif>".typo($titre)."</a>"; if ($petition) $s .= " <Font size=1 color='red'>PÉTITION</font>"; @@ -530,7 +530,7 @@ function afficher_breves($titre_table, $requete) { else if ($statut == 'refuse') $puce = "puce-rouge"; $s = "<a href='breves_voir.php3?id_breve=$id_breve'>"; - $s .= "<img src='img_pack/$puce.gif' alt='o' width='8' height='9' border='0'></a> "; + $s .= "<img src='img_pack/$puce.gif' alt='' width='8' height='9' border='0'></a> "; $s .= "<a href='breves_voir.php3?id_breve=$id_breve'>"; $s .= typo($titre); $s .= "</a>"; @@ -595,7 +595,7 @@ function afficher_rubriques($titre_table, $requete) { $s = "<b><a href=\"naviguer.php3?coll=$id_rubrique\">"; $puce = "puce.gif"; - $s .= "<img src=\"$puce\" alt=\">\" border=\"0\"> "; + $s .= "<img src=\"$puce\" alt=\"- \" border=\"0\"> "; $s .= typo($titre); $s .= "</A></b>"; $vals[] = $s; @@ -756,7 +756,7 @@ function afficher_forum($request, $adresse_retour, $controle = "non", $recurrenc if ($count==$compteur_forum){ $fleche='img_pack/forum-droite.gif'; } - echo "<td width=10 valign='top' background=$fond[$count]><img src=$fleche alt='o' width=10 height=13 border=0></td>\n"; + echo "<td width=10 valign='top' background=$fond[$count]><img src='$fleche' alt='' width=10 height=13 border=0></td>\n"; } echo "\n<td width=100% valign='top'>"; @@ -922,7 +922,7 @@ function changeclass(objet, myClass) function onglet_relief_inter(){ global $spip_display; if ($spip_display != 1) { - echo "<td background='img_pack/barre-noir.gif'><img src='img_pack/rien.gif' alt='o' width='1' height='40'></td>"; + echo "<td background='img_pack/barre-noir.gif'><img src='img_pack/rien.gif' alt='' width='1' height='40'></td>"; } } @@ -937,7 +937,7 @@ function debut_onglet(){ echo "\n"; echo "<p><table cellpadding=0 cellspacing=0 border=0>"; echo "<tr><td>"; - echo "<img src='img_pack/barre-g.gif' alt='<' width='16' height='40'>"; + echo "<img src='img_pack/barre-g.gif' alt='' width='16' height='40'>"; echo "</td>"; } } @@ -950,7 +950,7 @@ function fin_onglet(){ echo "</table>"; } else { echo "<td>"; - echo "<img src='img_pack/barre-d.gif' alt='>' width='16' height='40'>"; + echo "<img src='img_pack/barre-d.gif' alt='' width='16' height='40'>"; echo "</td></tr>"; echo "</table>"; } @@ -1065,7 +1065,7 @@ function icone_bandeau_principal($texte, $lien, $fond, $rubrique_icone = "vide", else { $hauteur = 80; $largeur = 80; - $alt = " alt=\"o\" "; + $alt = " alt=\"\" "; } if (eregi("^javascript:",$lien)){ @@ -1140,7 +1140,7 @@ function icone_bandeau_secondaire($texte, $lien, $fond, $rubrique_icone = "vide" else { $hauteur = 70; $largeur = 80; - $alt = " alt=\"o\""; + $alt = " alt=\"\""; } if ($rubrique_icone == $rubrique){ @@ -1192,7 +1192,7 @@ function icone($texte, $lien, $fond, $fonction="", $align=""){ if ($spip_display == 1){ $hauteur = 20; $largeur = 80; - $alt = " alt=\"o\""; + $alt = " alt=\"\""; } else if ($spip_display == 3){ $hauteur = 30; @@ -1258,19 +1258,19 @@ function icone_horizontale($texte, $lien, $fond = "", $fonction = "", $important echo "<td background='' align='center'>"; if ($fonction != "rien.gif") { echo "\n<table cellpadding=0 cellspacing=0 border=0><tr><td background='img_pack/$fond'>"; - echo "<a href='$lien'><img src='img_pack/$fonction' alt='o' $title width='24' height='24' border='0'></a>"; + echo "<a href='$lien'><img src='img_pack/$fonction' alt='' $title width='24' height='24' border='0'></a>"; echo "</td></tr></table>\n"; } else { echo "\n<table cellpadding=0 cellspacing=0 border=0><tr><td background=''>"; - echo "<a href='$lien'><img src='img_pack/$fond' alt='o' $title width='24' height='24' border='0'></a>"; + echo "<a href='$lien'><img src='img_pack/$fond' alt='' $title width='24' height='24' border='0'></a>"; echo "</td></tr></table>\n"; } echo "</td>"; } echo "<td background=''>"; - echo "<img src='img_pack/rien.gif' alt='o' width=5 height=1>"; + echo "<img src='img_pack/rien.gif' alt='' width=5 height=1>"; echo "</td>"; echo "<td background='' align='left'>"; @@ -1286,7 +1286,7 @@ function icone_horizontale($texte, $lien, $fond = "", $fonction = "", $important function bandeau_barre_verticale(){ global $spip_ecran; echo "<td background='img_pack/tirets-separation.gif' width='2'>"; - echo "<img src='img_pack/rien.gif' alt='o' width=2 height=2>"; + echo "<img src='img_pack/rien.gif' alt='' width=2 height=2>"; echo "</td>"; if ($spip_ecran == "large") { echo "<td width=10><img src='img_pack/rien.gif' border=0 width=10 height=1></td>"; @@ -1378,7 +1378,7 @@ function debut_page($titre = "", $rubrique = "asuivre", $sous_rubrique = "asuivr } echo "<td background='' width='100%'> </td>"; echo "<td align='center'><font size=1>"; - echo "<img src='img_pack/choix-layout.gif' alt='o' vspace=3 border=0 usemap='#map_layout'>"; + echo "<img src='img_pack/choix-layout.gif' alt='' vspace=3 border=0 usemap='#map_layout'>"; echo "</font></td>"; icone_bandeau_principal ("Aide en ligne", "javascript:window.open('aide_index.php3', 'aide_spip', 'scrollbars=yes,resizable=yes,width=740,height=580'); void(0);", "aide-48.gif", "vide", "", "aide_index.php3"); icone_bandeau_principal ("Visiter le site", "$adresse_site", "visiter-48.gif"); @@ -1565,7 +1565,7 @@ function gros_titre($titre, $ze_logo=''){ global $couleur_foncee; echo "<div>"; - if (strlen($ze_logo) > 3) echo "<img src='img_pack/$ze_logo' alt='o' border=0 align='middle'> "; + if (strlen($ze_logo) > 3) echo "<img src='img_pack/$ze_logo' alt='' border=0 align='middle'> "; echo "<span style='border-bottom: 1px dashed $couleur_foncee;'><font size=5 face='Verdana,Arial,Helvetica,sans-serif' color='$couleur_foncee'><b>"; echo typo($titre); echo "</b></font></span></div>\n"; @@ -1695,12 +1695,12 @@ function debut_gauche($rubrique = "asuivre") { $flag_cadre = ($nb_connectes > 0 OR $rubrique == "messagerie"); if ($flag_cadre) debut_cadre_relief("messagerie-24.gif"); if ($rubrique == "messagerie") { - echo "<a href='message_edit.php3?new=oui&type=normal'><img src='img_pack/m_envoi.gif' alt='M>' width='14' height='7' border='0'>"; + echo "<a href='message_edit.php3?new=oui&type=normal'><img src='img_pack/m_envoi.gif' alt='' width='14' height='7' border='0'>"; echo "<font color='#169249' face='Verdana,Arial,Helvetica,sans-serif' size=1><b> NOUVEAU MESSAGE</b></font></a>"; - echo "\n<br><a href='message_edit.php3?new=oui&type=pb'><img src='img_pack/m_envoi_bleu.gif' alt='M>' width='14' height='7' border='0'>"; + echo "\n<br><a href='message_edit.php3?new=oui&type=pb'><img src='img_pack/m_envoi_bleu.gif' alt='' width='14' height='7' border='0'>"; echo "<font color='#044476' face='Verdana,Arial,Helvetica,sans-serif' size=1><b> NOUVEAU PENSE-BÊTE</b></font></a>"; if ($connect_statut == "0minirezo") { - echo "\n<br><a href='message_edit.php3?new=oui&type=affich'><img src='img_pack/m_envoi_jaune.gif' alt='M>' width='14' height='7' border='0'>"; + echo "\n<br><a href='message_edit.php3?new=oui&type=affich'><img src='img_pack/m_envoi_jaune.gif' alt='' width='14' height='7' border='0'>"; echo "<font color='#ff9900' face='Verdana,Arial,Helvetica,sans-serif' size=1><b> NOUVELLE ANNONCE</b></font></a>"; } } @@ -1776,12 +1776,12 @@ function creer_colonne_droite(){ $flag_cadre = ($nb_connectes > 0 OR $rubrique == "messagerie"); if ($flag_cadre) debut_cadre_relief("messagerie-24.gif"); if ($rubrique == "messagerie") { - echo "<a href='message_edit.php3?new=oui&type=normal'><img src='img_pack/m_envoi.gif' alt='M>' width='14' height='7' border='0'>"; + echo "<a href='message_edit.php3?new=oui&type=normal'><img src='img_pack/m_envoi.gif' alt='' width='14' height='7' border='0'>"; echo "<font color='#169249' face='Verdana,Arial,Helvetica,sans-serif' size=1><b> NOUVEAU MESSAGE</b></font></a>"; - echo "\n<br><a href='message_edit.php3?new=oui&type=pb'><img src='img_pack/m_envoi_bleu.gif' alt='M>' width='14' height='7' border='0'>"; + echo "\n<br><a href='message_edit.php3?new=oui&type=pb'><img src='img_pack/m_envoi_bleu.gif' alt='' width='14' height='7' border='0'>"; echo "<font color='#044476' face='Verdana,Arial,Helvetica,sans-serif' size=1><b> NOUVEAU PENSE-BÊTE</b></font></a>"; if ($connect_statut == "0minirezo") { - echo "\n<br><a href='message_edit.php3?new=oui&type=affich'><img src='img_pack/m_envoi_jaune.gif' alt='M>' width='14' height='7' border='0'>"; + echo "\n<br><a href='message_edit.php3?new=oui&type=affich'><img src='img_pack/m_envoi_jaune.gif' alt='' width='14' height='7' border='0'>"; echo "<font color='#ff9900' face='Verdana,Arial,Helvetica,sans-serif' size=1><b> NOUVELLE ANNONCE</b></font></a>"; } } @@ -2002,9 +2002,9 @@ function afficher_parents($collection){ } else { if ($id_parent == "0"){ - $parents="~ <IMG SRC='img_pack/secteur-24.gif' alt='o' WIDTH=24 HEIGHT=24 BORDER=0 align='middle'> <FONT SIZE=3 FACE='Verdana,Arial,Helvetica,sans-serif'><a href='naviguer.php3?coll=$id_rubrique'><font color='$couleur_foncee'>$titre</font></a></FONT><BR>\n$parents"; + $parents="~ <IMG SRC='img_pack/secteur-24.gif' alt='' WIDTH=24 HEIGHT=24 BORDER=0 align='middle'> <FONT SIZE=3 FACE='Verdana,Arial,Helvetica,sans-serif'><a href='naviguer.php3?coll=$id_rubrique'><font color='$couleur_foncee'>$titre</font></a></FONT><BR>\n$parents"; } else { - $parents="~ <IMG SRC='img_pack/rubrique-24.gif' alt='o' WIDTH=24 HEIGHT=24 BORDER=0 align='middle'> <FONT SIZE=3 FACE='Verdana,Arial,Helvetica,sans-serif'><a href='naviguer.php3?coll=$id_rubrique'><font color='$couleur_foncee'>$titre</font></a></FONT><BR>\n$parents"; + $parents="~ <IMG SRC='img_pack/rubrique-24.gif' alt='' WIDTH=24 HEIGHT=24 BORDER=0 align='middle'> <FONT SIZE=3 FACE='Verdana,Arial,Helvetica,sans-serif'><a href='naviguer.php3?coll=$id_rubrique'><font color='$couleur_foncee'>$titre</font></a></FONT><BR>\n$parents"; } } } diff --git a/ecrire/inc_statistiques.php3 b/ecrire/inc_statistiques.php3 index 427c9374f3dcf6d3027c972bafc2e56e83b2912f..81369ec963a4da58ae63cb44a0740a340f524ae0 100644 --- a/ecrire/inc_statistiques.php3 +++ b/ecrire/inc_statistiques.php3 @@ -225,82 +225,71 @@ function calculer_visites($date = "") { // function supprimer_referers($type = "") { - $popularite_update = ""; - $diff = 7; - $coeff_referer = 2; + $table = 'spip_referers'; + if ($type) { + $table .= '_'. $type . 's'; + $col_id = 'id_' . $type; + $query = "SELECT COUNT(DISTINCT $col_id) AS count FROM $table"; + $result = spip_query($query); + if ($row = @mysql_fetch_array($result)) { + $count = $row['count']; + } + } + if (!$count) $count = 1; + $query = "SELECT visites FROM $table ". + "ORDER BY visites LIMIT ".intval($count * 100).",1"; + $result = spip_query($query); + $visites_min = 1; + if ($row = @mysql_fetch_array($result)) { + $visites_min = $row['visites']; + } - // Visites ponderees par age des derniers jours - $query = "SELECT id_article, visites, (TO_DAYS(now())-TO_DAYS(date)) AS age FROM spip_visites_articles WHERE date > DATE_SUB(NOW(), INTERVAL 30 DAY)"; + $query = "DELETE FROM $table WHERE date < DATE_SUB(NOW(),INTERVAL 7 DAY) OR visites <= $visites_min"; $result = spip_query($query); +} + +function optimiser_referers() { + $popularite_update = ""; + + // Calcul des gains en popularite + $query = "SELECT id_article, COUNT(*) AS referers, SUM(visites) AS visites ". + "FROM spip_referers_articles GROUP BY id_article"; + $result = spip_query($query); while ($row = mysql_fetch_array($result)) { $id_article = $row['id_article']; + $referers = $row['referers']; $visites = $row['visites']; - $age = $row['age']; - - if ($age > $age_max) $age_max = $age; - - $valeurs[$id_article]['valeur'] = $valeurs[$id_article]['valeur'] + ($visites/($age+$diff))*$diff; - $valeurs[$id_article]['visites'] = $valeurs[$id_article]['visites'] + $visites ; - - $tous_articles[$id_article] = $id_article; - } - - // Visites ponderees par age dans l'absolu - $col_age = "(LEAST((TO_DAYS(now())-TO_DAYS(date)),(DAYOFMONTH(now())-DAYOFMONTH(date))+30.4368*(MONTH(now())-MONTH(date))+365.2422*(YEAR(now())-YEAR(date))))"; - $query = "SELECT id_article, visites, $col_age AS age FROM spip_articles WHERE statut = 'publie'"; - $result = spip_query($query); - while ($row = mysql_fetch_array($result)) { - $id_article = $row['id_article']; - $visites = $row['visites'] - $valeurs[$id_article]['visites']; - $age = intval(2 * ($row['age'] + $diff) / 3); - $periode = $age - $age_max; - - if ($periode < 1) $periode = 1; - if ($age < 1) $age = 1; - - $valeur = $visites / ($age * $periode) * $diff; - $valeurs[$id_article]['valeur'] = $valeurs[$id_article]['valeur'] + $valeur; - - $tous_articles[$id_article] = $id_article; + $popularite = intval(10 * sqrt(sqrt($referers + 1)) * $visites); + $popularite_update[$popularite][] = $id_article; + if ($max < $popularite) $max = $popularite; } - - if ($tous_articles) { - $tous_articles = join(",", $tous_articles); - - // Visites surponderees des referers - $query = "SELECT id_article, SUM(visites) AS externes, MAX((TO_DAYS(now())-TO_DAYS(date))) AS age ". - "FROM spip_referers_articles WHERE date > DATE_SUB(NOW(), INTERVAL 15 DAY) GROUP BY id_article"; - $result = spip_query($query); - - while ($row = mysql_fetch_array($result)) { - $id_article = $row['id_article']; - $age = $row['age']; - if ($age < 1) $age = 1; - $externes = ($row['externes']) * $coeff_referer; - $visites = $valeurs[$id_article]['valeur']; - $nouvelle_valeur = $externes + $visites; - if ($nouvelle_valeur > $max_valeur) $max_valeur = $nouvelle_valeur; - $valeurs[$id_article]['valeur'] = $nouvelle_valeur; - } - - while (list($id_article) = each ($valeurs) AND $max_valeur > 0) { - $valeur = $valeurs[$id_article]['valeur']; - $popularite = round(sqrt((($valeur) / $max_valeur)) * 100); - $popularite_update[$popularite][] = $id_article; + + // Mise a jour des valeurs de referers et popularite + if (is_array($popularite_update)) { + // Normalisation avant (limiter l'influence des visites recentes) + if ($max < 100) $max = 100; + + while (list($popularite, $articles) = each($popularite_update)) { + $query = "UPDATE spip_articles SET popularite = popularite + $popularite * 100 / $max ". + "WHERE id_article IN (".join(', ', $articles).")"; + $result = spip_query($query); } - - if (is_array($popularite_update)) { - while (list($popularite, $articles) = each($popularite_update)) { - $articles = join(",",$articles); - $query = "UPDATE spip_articles SET popularite = $popularite ". - "WHERE id_article IN ($articles)"; + + // Normalisation apres + $query = "SELECT MAX(popularite) AS max FROM spip_articles"; + $result = spip_query($query); + if ($row = mysql_fetch_array($result)) { + $max = $row['max']; + if ($max > 100) { + $query = "UPDATE spip_articles SET popularite = popularite * 100 / $max"; $result = spip_query($query); } - } + } } + supprimer_referers(); supprimer_referers("article"); } diff --git a/ecrire/mots_tous.php3 b/ecrire/mots_tous.php3 index f77601f91c7288aec28c50ff34e3a051488e6b33..7d4a5c9d21f90fd22527a2c9a16d87492107b2b8 100644 --- a/ecrire/mots_tous.php3 +++ b/ecrire/mots_tous.php3 @@ -259,9 +259,9 @@ while($row_groupes = mysql_fetch_array($result_groupes)) { echo "<TR BGCOLOR='$couleur'>"; echo "<TD>"; if ($connect_statut == "0minirezo" OR $nombre_mots>0) - echo "<A HREF='mots_edit.php3?id_mot=$id_mot&redirect=mots_tous.php3'><img src='img_pack/petite-cle.gif' alt='X' width='23' height='12' border='0'></A>"; + echo "<A HREF='mots_edit.php3?id_mot=$id_mot&redirect=mots_tous.php3'><img src='img_pack/petite-cle.gif' alt='' width='23' height='12' border='0'></A>"; else - echo "<img src='img_pack/petite-cle.gif' alt='X' width='23' height='12' border='0'>"; + echo "<img src='img_pack/petite-cle.gif' alt='' width='23' height='12' border='0'>"; echo "</TD>"; echo "<TD WIDTH=\"50%\">"; echo "<FONT FACE='Georgia,Garamond,Times,serif' SIZE=3>";