diff --git a/ecrire/exec/articles.php b/ecrire/exec/articles.php
index 9f622b15d50f03cb58927730c382ea5e36c8dd9b..9825b90d93a645e68b775f2ea46b5b362b84e70a 100644
--- a/ecrire/exec/articles.php
+++ b/ecrire/exec/articles.php
@@ -165,7 +165,7 @@ fin_cadre_enfonce(false);
//
if ($options == 'avancees' AND $GLOBALS['meta']["articles_mots"] != 'non') {
- formulaire_mots('articles', $id_article, $nouv_mot, $supp_mot, $cherche_mot, $flag_editable, generer_url_ecrire("articles","id_article=$id_article&id_rubrique=$id_rubrique"));
+ formulaire_mots('articles', $id_article, $nouv_mot, $supp_mot, $cherche_mot, $flag_editable, generer_url_ecrire("articles","id_article=$id_article"));
}
langues_articles($id_article, $langue_article, $flag_editable, $id_rubrique, $id_trad, $dir_lang, $nom_select, $lier_trad);
@@ -199,7 +199,7 @@ if ($flag_auteur AND $statut_article == 'prepa') {
echo "<center>",
"<B>"._T('texte_proposer_publication')."</B>",
aide ("artprop"),
- generer_url_post_ecrire("articles", "id_article=$id_article&id_rubrique=$id_rubrique"),
+ generer_url_post_ecrire("articles", "id_article=$id_article"),
"<input type='hidden' name='statut_nouv' value='prop' />\n",
"<input type='submit' class='fondo' value=\"",
_T('bouton_demande_publication'),
@@ -314,7 +314,7 @@ function boites_de_config_articles($id_article, $id_rubrique, $flag_editable,
if ($nb_forums) {
echo "<br />\n";
- icone_horizontale(_T('icone_suivi_forum', array('nb_forums' => $nb_forums)), generer_url_ecrire("articles_forum","id_article=$id_article&id_rubrique=$id_rubrique"), "suivi-forum-24.gif", "");
+ icone_horizontale(_T('icone_suivi_forum', array('nb_forums' => $nb_forums)), generer_url_ecrire("articles_forum","id_article=$id_article"), "suivi-forum-24.gif", "");
}
// Reglage existant
@@ -328,7 +328,7 @@ function boites_de_config_articles($id_article, $id_rubrique, $flag_editable,
}
// Afficher le formulaire de modification du reglage
- echo formulaire_modification_forums_publics($id_article, $forums_publics, generer_url_ecrire("articles","id_article=$id_article&id_rubrique=$id_rubrique"));
+ echo formulaire_modification_forums_publics($id_article, $forums_publics, generer_url_ecrire("articles","id_article=$id_article"));
// Petitions
@@ -361,7 +361,7 @@ function boites_de_config_articles($id_article, $id_rubrique, $flag_editable,
$message=$petition["message"];
$texte_petition=$petition["texte"];
- echo generer_url_post_ecrire("articles","id_article=$id_article&id_rubrique=$id_rubrique");
+ echo generer_url_post_ecrire("articles","id_article=$id_article");
echo "<select name='change_petition'
class='fondl' style='font-size:10px;'
@@ -455,7 +455,7 @@ function boites_de_config_articles($id_article, $id_rubrique, $flag_editable,
else
echo debut_block_invisible("redirection");
- echo generer_url_post_ecrire("articles", "id_article=$id_article&id_rubrique=$id_rubrique");
+ echo generer_url_post_ecrire("articles", "id_article=$id_article");
echo "\n<INPUT TYPE='hidden' NAME='changer_virtuel' VALUE='oui'>";
$virtuelhttp = ($virtuel ? "" : "http://");
@@ -546,7 +546,7 @@ function meme_rubrique_articles($id_rubrique, $id_article, $options, $order='art
if ($options == "avancees") {
$numero = "<div class='arial1' style='float: $spip_lang_right; color: black; padding-$spip_lang_left: 4px;'><b>"._T('info_numero_abbreviation')."$ze_article</b></div>";
}
- echo "<a class='$ze_statut' style='font-size: 10px;' href='" . generer_url_ecrire("articles","id_article=$ze_article&id_rubrique=$id_rubrique") . "'>$numero$ze_titre</a>";
+ echo "<a class='$ze_statut' style='font-size: 10px;' href='" . generer_url_ecrire("articles","id_article=$ze_article") . "'>$numero$ze_titre</a>";
}
echo "</div>";
echo "</div>";
@@ -556,12 +556,12 @@ function meme_rubrique_articles($id_rubrique, $id_article, $options, $order='art
function bouton_modifier_articles($id_article, $id_rubrique, $flag_modif, $mode, $ip, $im)
{
if ($flag_modif) {
- icone(_T('icone_modifier_article'), generer_url_ecrire("articles_edit","id_article=$id_article&id_rubrique=$id_rubrique"), $ip, $im);
+ icone(_T('icone_modifier_article'), generer_url_ecrire("articles_edit","id_article=$id_article"), $ip, $im);
echo "<font face='arial,helvetica,sans-serif' size='2'>$mode</font>";
echo aide("artmodif");
}
else {
- icone(_T('icone_modifier_article'), generer_url_ecrire("articles_edit","id_article=$id_article&id_rubrique=$id_rubrique"), "article-24.gif", "edit.gif");
+ icone(_T('icone_modifier_article'), generer_url_ecrire("articles_edit","id_article=$id_article"), "article-24.gif", "edit.gif");
}
}
@@ -653,7 +653,7 @@ function dates_articles($id_article, $id_rubrique, $flag_editable, $statut_artic
if ($flag_editable AND $options == 'avancees') {
debut_cadre_couleur();
- echo generer_url_post_ecrire("articles", "id_article=$id_article&id_rubrique=$id_rubrique");
+ echo generer_url_post_ecrire("articles", "id_article=$id_article");
if ($statut_article == 'publie') {
@@ -923,7 +923,7 @@ function langues_articles($id_article, $langue_article, $flag_editable, $id_rubr
// Formulaire pour lier a un article
echo "<td class='arial2' width='60%'>";
- echo "<form action='" . generer_url_ecrire("articles","id_article=$id_article&id_rubrique=$id_rubrique") . "' method='post' style='margin:0px; padding:0px;'>";
+ echo "<form action='" . generer_url_ecrire("articles","id_article=$id_article") . "' method='post' style='margin:0px; padding:0px;'>";
echo _T('trad_lier');
echo "<div align='$spip_lang_right'><input type='text' class='fondl' name='lier_trad' size='5'> <INPUT TYPE='submit' NAME='Valider' VALUE='"._T('bouton_valider')."' CLASS='fondl'></div>";
echo "</form>";
@@ -940,7 +940,7 @@ function langues_articles($id_article, $langue_article, $flag_editable, $id_rubr
echo "<td background='" . _DIR_IMG_PACK . "tirets-separation.gif' width='2'>". http_img_pack('rien.gif', " ", "width='2' height='2'") . "</td>";
echo "<td background='' width='10'> </td>";
echo "<td>";
- icone_horizontale(_T('trad_delier'), generer_url_ecrire("articles","id_article=$id_article&id_rubrique=$id_rubrique&supp_trad=oui"), "traductions-24.gif", "supprimer.gif");
+ icone_horizontale(_T('trad_delier'), generer_url_ecrire("articles","id_article=$id_article&supp_trad=oui"), "traductions-24.gif", "supprimer.gif");
echo "</td>\n";
}
@@ -1019,7 +1019,7 @@ function rechercher_auteurs_articles($cherche_auteur, $id_article, $id_rubrique,
echo "<li><b>".typo($nom_auteur)."</b>";
if ($email_auteur) echo " ($email_auteur)";
- echo " | <A href='", generer_url_ecrire('articles', "id_article=$id_article&id_rubrique=$id_rubrique&ajout_auteur=oui&nouv_auteur=$id_auteur#auteurs"),
+ echo " | <A href='", generer_url_ecrire('articles', "id_article=$id_article&ajout_auteur=oui&nouv_auteur=$id_auteur#auteurs"),
"'>",_T('lien_ajouter_auteur'),"</A>";
if (trim($bio_auteur)) {
@@ -1038,7 +1038,7 @@ function rechercher_auteurs_articles($cherche_auteur, $id_article, $id_rubrique,
AND $GLOBALS['connect_toutes_rubriques']) {
echo "<div style='width: 200px;'>";
- $retour = urlencode(generer_url_ecrire("articles","id_article=$id_article&id_rubrique=$id_rubrique"));
+ $retour = urlencode(generer_url_ecrire("articles","id_article=$id_article"));
$titre = urlencode($cherche_auteur);
icone_horizontale(_T('icone_creer_auteur'), generer_url_ecrire("auteur_infos","ajouter_id_article=$id_article&nom=$titre&redirect=$retour"), "redacteurs-24.gif", "creer.gif");
echo "</div> ";
@@ -1138,7 +1138,7 @@ function afficher_auteurs_articles($id_article, $flag_editable)
else $vals[] = " ";
if ($flag_editable AND ($connect_id_auteur != $id_auteur OR $connect_statut == '0minirezo') AND $options == 'avancees') {
- $vals[] = "<A href='" . generer_url_ecrire("articles","id_article=$id_article&id_rubrique=$id_rubrique&supp_auteur=$id_auteur#auteurs") . "'>"._T('lien_retirer_auteur')." ". http_img_pack('croix-rouge.gif', "X", "width='7' height='7' border='0' align='middle'") . "</A>";
+ $vals[] = "<A href='" . generer_url_ecrire("articles","id_article=$id_article&supp_auteur=$id_auteur#auteurs") . "'>"._T('lien_retirer_auteur')." ". http_img_pack('croix-rouge.gif', "X", "width='7' height='7' border='0' align='middle'") . "</A>";
} else {
$vals[] = "";
}
@@ -1182,7 +1182,7 @@ function ajouter_auteurs_articles($id_article, $id_rubrique, $les_auteurs, $flag
AND $options == "avancees"
AND !$supprimer_bouton_creer_auteur) {
echo "<td width='200'>";
- $retour = urlencode(generer_url_ecrire("articles","id_article=$id_article&id_rubrique=$id_rubrique"));
+ $retour = urlencode(generer_url_ecrire("articles","id_article=$id_article"));
icone_horizontale(_T('icone_creer_auteur'), generer_url_ecrire("auteur_infos","ajouter_id_article=$id_article&redirect=$retour"), "redacteurs-24.gif", "creer.gif");
echo "</td>";
echo "<td width='20'> </td>";
@@ -1192,7 +1192,7 @@ function ajouter_auteurs_articles($id_article, $id_rubrique, $les_auteurs, $flag
if (spip_num_rows($result) > 0) {
- echo generer_url_post_ecrire("articles", "id_article=$id_article&id_rubrique=$id_rubrique");;
+ echo generer_url_post_ecrire("articles", "id_article=$id_article");;
echo "<span class='verdana1'><B>"._T('titre_cadre_ajouter_auteur')." </B></span>\n";
echo "<DIV><INPUT TYPE='Hidden' NAME='id_article' VALUE=\"$id_article\">";
@@ -1308,7 +1308,7 @@ function affiche_forums_article($id_article, $id_rubrique, $titre, $debut, $mute
echo "<BR><BR>";
- $forum_retour = generer_url_ecrire("articles","id_article=$id_article&id_rubrique=$id_rubrique", true);
+ $forum_retour = generer_url_ecrire("articles","id_article=$id_article", true);
if (!$mute) {
$tm = urlencode($titre);
@@ -1333,7 +1333,7 @@ function affiche_forums_article($id_article, $id_rubrique, $titre, $debut, $mute
if ($i == $debut)
echo "<FONT SIZE=3><B>[$i-$y]</B></FONT> ";
else
- echo "[<A href='" . generer_url_ecrire("articles","id_article=$id_article&id_rubrique=$id_rubrique&debut=$i") . "'>$i-$y</A>] ";
+ echo "[<A href='" . generer_url_ecrire("articles","id_article=$id_article&debut=$i") . "'>$i-$y</A>] ";
}
echo "</div>";
}
@@ -1354,7 +1354,7 @@ function affiche_forums_article($id_article, $id_rubrique, $titre, $debut, $mute
if ($i == $debut)
echo "<FONT SIZE=3><B>[$i-$y]</B></FONT> ";
else
- echo "[<A href='" . generer_url_ecrire("articles","id_article=$id_article&id_rubrique=$id_rubrique&debut=$i") . "'>$i-$y</A>] ";
+ echo "[<A href='" . generer_url_ecrire("articles","id_article=$id_article&debut=$i") . "'>$i-$y</A>] ";
}
echo "</div>";
}
@@ -1368,7 +1368,7 @@ function afficher_statut_articles($id_article, $rubrique_article, $statut_articl
if ($connect_statut == '0minirezo' AND acces_rubrique($rubrique_article)) {
- echo generer_url_post_ecrire("articles", "id_article=$id_article&id_rubrique=$rubrique_article"),
+ echo generer_url_post_ecrire("articles", "id_article=$id_article"),
debut_cadre_relief("", true),
"\n<center>", "<B>",_T('texte_article_statut'),"</B>",
"\n<SELECT NAME='statut_nouv' SIZE='1' CLASS='fondl'\n",
diff --git a/ecrire/exec/articles_edit.php b/ecrire/exec/articles_edit.php
index b18bf6a5c3a52cbeecfac386de8c4ed530b78502..d4d8824d137ee4c90e39135047220b60dc1111b4 100644
--- a/ecrire/exec/articles_edit.php
+++ b/ecrire/exec/articles_edit.php
@@ -113,8 +113,8 @@ function formulaire_articles_edit($id_article, $id_rubrique, $titre, $soustitre,
echo "\n<table cellpadding=0 cellspacing=0 border=0 width='100%'>";
echo "<tr width='100%'>";
echo "<td>";
- if ($lier_trad) icone(_T('icone_retour'), generer_url_ecrire("articles","id_article=$lier_trad&id_rubrique=$id_rubrique"), "article-24.gif", "rien.gif");
- else icone(_T('icone_retour'), generer_url_ecrire("articles","id_article=$id_article&id_rubrique=$id_rubrique"), "article-24.gif", "rien.gif");
+ if ($lier_trad) icone(_T('icone_retour'), generer_url_ecrire("articles","id_article=$lier_trad"), "article-24.gif", "rien.gif");
+ else icone(_T('icone_retour'), generer_url_ecrire("articles","id_article=$id_article"), "article-24.gif", "rien.gif");
echo "</td>";
echo "<td>". http_img_pack('rien.gif', " ", "width='10'") . "</td>\n";
@@ -137,7 +137,7 @@ echo "<P><HR><P>";
$texte = entites_html($texte);
$ps = entites_html($ps);
- echo generer_url_post_ecrire("articles", ($id_article ? "id_article=$id_article&id_rubrique=$id_rubrique" : ""),'formulaire');
+ echo generer_url_post_ecrire("articles", ($id_article ? "id_article=$id_article" : ""),'formulaire');
if ($new == 'oui')
echo "<INPUT TYPE='Hidden' NAME='new' VALUE='oui'>";
diff --git a/ecrire/exec/articles_forum.php b/ecrire/exec/articles_forum.php
index 10c216a5093bdbc4e89de21675c114d151028cfc..0690d4cdd9e7ada72d4bc6055815d87cfc8bb5f7 100644
--- a/ecrire/exec/articles_forum.php
+++ b/ecrire/exec/articles_forum.php
@@ -35,7 +35,7 @@ function exec_articles_forum_dist()
debut_page($titre, "documents", "articles");
- articles_forum_cadres($id_rubrique, $titre, 'articles', "id_article=$id_article&id_rubrique=$id_rubrique");
+ articles_forum_cadres($id_rubrique, $titre, 'articles', "id_article=$id_article");
if (! ($connect_statut=='0minirezo' AND acces_rubrique($id_rubrique)))
return;
diff --git a/ecrire/exec/brouteur_frame.php b/ecrire/exec/brouteur_frame.php
index f4402784c8b6b9f4686a51cb45f9f0c3ff0ea7fc..faf324b1b1f4282e0353b78e551669e979bae29c 100644
--- a/ecrire/exec/brouteur_frame.php
+++ b/ecrire/exec/brouteur_frame.php
@@ -48,7 +48,7 @@ function exec_brouteur_frame_dist()
$id_rubrique=$row['id_rubrique'];
$titre = typo($row['titre']);
$statut = $row['statut'];
- echo "<a class='$statut' href='javascript:window.parent.location=\"" . generer_url_ecrire('articles',"id_article=$id_article&id_rubrique=$id_rubrique"),"\"'>",$titre,"</a>";
+ echo "<a class='$statut' href='javascript:window.parent.location=\"" . generer_url_ecrire('articles',"id_article=$id_article"),"\"'>",$titre,"</a>";
}
echo "</div>";
}
@@ -65,7 +65,7 @@ function exec_brouteur_frame_dist()
$id_rubrique=$row['id_rubrique'];
$titre = typo($row['titre']);
$statut = $row['statut'];
- echo "<a class='$statut' href='javascript:window.parent.location=\"", generer_url_ecrire('articles',"id_article=$id_article&id_rubrique=$id_rubrique"),"\"'>",$titre,"</a>";
+ echo "<a class='$statut' href='javascript:window.parent.location=\"", generer_url_ecrire('articles',"id_article=$id_article"),"\"'>",$titre,"</a>";
}
echo "</div>";
}
@@ -149,7 +149,7 @@ onMouseOut=\"changeclass(this, 'brouteur_rubrique');\">";
$id_rubrique=$row['id_rubrique'];
$titre = typo($row['titre']);
$statut = $row['statut'];
- echo "<a class='$statut' href='javascript:window.parent.location=\"" . generer_url_ecrire('articles',"id_article=$id_article&id_rubrique=$id_rubrique")."\"'>",$titre,"</a>";
+ echo "<a class='$statut' href='javascript:window.parent.location=\"" . generer_url_ecrire('articles',"id_article=$id_article")."\"'>",$titre,"</a>";
}
echo "</div>";
}
diff --git a/ecrire/inc/presentation.php b/ecrire/inc/presentation.php
index 0e1263cab4b6ea767eb94493dc81a56fae6db439..4e5540e709168c38dc7c4d8984abb31dd26670e5 100644
--- a/ecrire/inc/presentation.php
+++ b/ecrire/inc/presentation.php
@@ -850,7 +850,7 @@ function afficher_articles($titre_table, $requete, $afficher_visites = false, $a
if (acces_restreint_rubrique($id_rubrique))
$s .= http_img_pack("admin-12.gif", "", "width='12' height='12'", _T('titre_image_admin_article'));
- $s .= "<a href='" . generer_url_ecrire("articles","id_article=$id_article&id_rubrique=$id_rubrique") .
+ $s .= "<a href='" . generer_url_ecrire("articles","id_article=$id_article") .
"'$descriptif$dir_lang style=\"display:block;\">";
if ($voir_logo) $s .= baliser_logo("art", $id_article, 26, 20);
@@ -1047,20 +1047,20 @@ function afficher_articles_trad($titre_table, $requete, $afficher_visites = fals
while (list(,$k) = each($langues_site)) {
if ($langues_art[$k]) {
if ($langues_art[$k] == $id_trad) {
- $span_lang = "<a href='" . generer_url_ecrire("articles","id_article=".$langues_art[$k] . "&id_rubrique=$id_rubrique") . "'><span class='lang_base'>$k</a></a>";
+ $span_lang = "<a href='" . generer_url_ecrire("articles","id_article=".$langues_art[$k]) . "'><span class='lang_base'>$k</a></a>";
$l .= $span_lang;
} else {
$date = $dates_art[$k];
if ($date < $date_ref)
- $l .= "<a href='" . generer_url_ecrire("articles","id_article=".$langues_art[$k] . "&id_rubrique=$id_rubrique") . "' class='claire'>$k</a>";
- else $l .= "<a href='" . generer_url_ecrire("articles","id_article=".$langues_art[$k] . "&id_rubrique=$id_rubrique") . "' class='foncee'>$k</a>";
+ $l .= "<a href='" . generer_url_ecrire("articles","id_article=".$langues_art[$k]) . "' class='claire'>$k</a>";
+ else $l .= "<a href='" . generer_url_ecrire("articles","id_article=".$langues_art[$k]) . "' class='foncee'>$k</a>";
}
}
# else $l.= "<span class='creer'>$k</span>";
}
if (!$span_lang)
- $span_lang = "<a href='" . generer_url_ecrire("articles","id_article=$id_article&id_rubrique=$id_rubrique") . "'><span class='lang_base'>$lang</a></a>";
+ $span_lang = "<a href='" . generer_url_ecrire("articles","id_article=$id_article") . "'><span class='lang_base'>$lang</a></a>";
$vals[] = "<div style='text-align: center;'>$span_lang</div>";
@@ -1072,7 +1072,7 @@ function afficher_articles_trad($titre_table, $requete, $afficher_visites = fals
if (acces_restreint_rubrique($id_rubrique))
$s .= http_img_pack("admin-12.gif", "", "width='12' height='12'", _T('titre_image_admin_article'));
- $s .= "<a href='" . generer_url_ecrire("articles","id_article=$id_article&id_rubrique=$id_rubrique") . "'$descriptif$dir_lang style=\"display:block;\">";
+ $s .= "<a href='" . generer_url_ecrire("articles","id_article=$id_article") . "'$descriptif$dir_lang style=\"display:block;\">";
if ($id_article == $id_trad) $titre = "<b>$titre</b>";
@@ -2487,7 +2487,7 @@ if (true /*$gadgets*/) {
$id_article = $row['id_article'];
$titre = typo(sinon($row['titre'], _T('ecrire:info_sans_titre')));
$statut = $row['statut'];
- $gadget .= "<a class='$statut' style='font-size: 10px;' href='" . generer_url_ecrire("articles","id_article=$id_article&id_rubrique=$id_rubrique") . "'>$titre</a>\n";
+ $gadget .= "<a class='$statut' style='font-size: 10px;' href='" . generer_url_ecrire("articles","id_article=$id_article") . "'>$titre</a>\n";
}
$gadget .= "</div>";
$gadget .= "</div>";
@@ -2505,7 +2505,7 @@ if (true /*$gadgets*/) {
$titre = sinon($row['titre'], _T('ecrire:info_sans_titre'));
$statut = $row['statut'];
- $gadget .= "<a class='$statut' style='font-size: 10px;' href='" . generer_url_ecrire("articles","id_article=$id_article&id_rubrique=$id_rubrique") . "'>$titre</a>";
+ $gadget .= "<a class='$statut' style='font-size: 10px;' href='" . generer_url_ecrire("articles","id_article=$id_article") . "'>$titre</a>";
}
$gadget .= "</div>";
$gadget .= "</div>";
@@ -2940,7 +2940,7 @@ function debut_droite($rubrique="") {
}
echo "<div style='padding: 3px; background-color: $couleur;'>";
- echo "<div class='verdana1'><b><a href='" . generer_url_ecrire("articles","id_article=$ze_article&id_rubrique=$id_rubrique") . "'>$ze_titre</a></div></b>";
+ echo "<div class='verdana1'><b><a href='" . generer_url_ecrire("articles","id_article=$ze_article") . "'>$ze_titre</a></div></b>";
// ne pas proposer de debloquer si c'est l'article en cours d'edition
if ($ze_article != $GLOBALS['id_article_bloque']) {