From 7d29077abeea46c1544f6895d9d143a5b6ee4832 Mon Sep 17 00:00:00 2001
From: "Committo,Ergo:sum" <esj@rezo.net>
Date: Tue, 27 Jun 2006 09:38:49 +0000
Subject: [PATCH] =?UTF-8?q?Ticket=20#413:=20toutes=20les=20URL=20pass?=
=?UTF-8?q?=C3=A9es=20en=20param=C3=A8tre=20dans=20une=20URL=20sont=20?=
=?UTF-8?q?=C3=A0=20pr=C3=A9sent=20relatives,=20afin=20de=20ne=20pas=20etr?=
=?UTF-8?q?e=20bloqu=C3=A9es=20par=20le=20mod=5Fsecurity=20d'Apache.=20Les?=
=?UTF-8?q?=20derniers=20cas=20suspects=20ne=20l'=C3=A9taient=20en=20fait?=
=?UTF-8?q?=20pas=20ou=20=C3=A9taient=20du=20code=20mort.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
ecrire/exec/articles.php | 2 +-
ecrire/exec/breves_voir.php | 2 +-
ecrire/exec/naviguer.php | 2 +-
ecrire/exec/sites.php | 11 +----------
ecrire/inc/mots.php | 4 +---
5 files changed, 5 insertions(+), 16 deletions(-)
diff --git a/ecrire/exec/articles.php b/ecrire/exec/articles.php
index 85090cb60d..99a1b05260 100644
--- a/ecrire/exec/articles.php
+++ b/ecrire/exec/articles.php
@@ -169,7 +169,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"));
+ formulaire_mots('articles', $id_article, $nouv_mot, $supp_mot, $cherche_mot, $flag_editable);
}
langues_articles($id_article, $langue_article, $flag_editable, $id_rubrique, $id_trad, $dir_lang, $nom_select, $lier_trad, $id_trad_new);
diff --git a/ecrire/exec/breves_voir.php b/ecrire/exec/breves_voir.php
index 3d8db42c55..8aa7d0bf50 100644
--- a/ecrire/exec/breves_voir.php
+++ b/ecrire/exec/breves_voir.php
@@ -124,7 +124,7 @@ if ($flag_editable AND ($options == 'avancees' OR $statut == 'publie')) {
if ($GLOBALS['meta']["articles_mots"]!='non' AND $flag_editable AND $options == 'avancees') {
- formulaire_mots('breves', $id_breve, $nouv_mot, $supp_mot, $cherche_mot, $flag_editable, generer_url_ecrire("breves_voir", "id_breve=$id_breve"));
+ formulaire_mots('breves', $id_breve, $nouv_mot, $supp_mot, $cherche_mot, $flag_editable);
}
diff --git a/ecrire/exec/naviguer.php b/ecrire/exec/naviguer.php
index 52158df1ac..a3fa366be8 100644
--- a/ecrire/exec/naviguer.php
+++ b/ecrire/exec/naviguer.php
@@ -127,7 +127,7 @@ function exec_naviguer_dist()
/// Mots-cles
if ($GLOBALS['meta']["articles_mots"] != 'non' AND $id_rubrique > 0) {
echo "\n<p>";
- formulaire_mots('rubriques', $id_rubrique, $nouv_mot, $supp_mot, $cherche_mot, $flag_editable, generer_url_ecrire("naviguer","id_rubrique=$id_rubrique&id_parent=$id_parent"));
+ formulaire_mots('rubriques', $id_rubrique, $nouv_mot, $supp_mot, $cherche_mot, $flag_editable);
}
diff --git a/ecrire/exec/sites.php b/ecrire/exec/sites.php
index e6d8bd40da..3cd5729a4f 100644
--- a/ecrire/exec/sites.php
+++ b/ecrire/exec/sites.php
@@ -44,7 +44,6 @@ function exec_sites_dist()
$nouveau_statut,
$old_syndic,
$oubli,
- $redirect,
$reload,
$resume,
$spip_display,
@@ -57,7 +56,6 @@ function exec_sites_dist()
$id_rubrique = intval($id_parent); // pas toujours present, mais tant pis.
$id_syndic = intval($id_syndic);
- $redirect_args = '';
//
// Creation d'un site
//
@@ -109,7 +107,6 @@ if ($analyser_site == 'oui' AND $flag_editable) {
$syndication = $v[syndic] ? 'oui' : 'non';
$result = spip_query("UPDATE spip_syndic SET nom_site=" . spip_abstract_quote($nom_site) . ", url_site=" . spip_abstract_quote($url) . ", url_syndic=" . spip_abstract_quote($url_syndic) . ", descriptif=" . spip_abstract_quote($descriptif) . ", syndication='$syndication', statut='$statut' WHERE id_syndic=$id_syndic");
if ($syndication == 'oui') syndic_a_jour($id_syndic);
- $redirect_args = "id_syndic=$id_syndic";
}
}
@@ -166,8 +163,6 @@ if (strval($nom_site)!='' AND $modifier_site == 'oui' AND $flag_editable) {
marquer_indexer('syndic', $id_syndic);
}
}
-
- $redirect_args = "id_syndic=$id_syndic" .($reload ? "&reload=$reload" : '');
}
@@ -178,10 +173,6 @@ if ($jour AND $flag_administrable) {
calculer_rubriques();
}
-if ($redirect AND $redirect_args) {
- redirige_par_entete(generer_url_ecrire('sites', $redirect_args . "&redirect=$redirect", true));
-}
-
// Appliquer le choix resume/fulltexte (necessite un reload)
if ($flag_editable AND ($resume == 'oui' OR $resume == 'non')) {
$old_resume = spip_fetch_array(spip_query("SELECT resume FROM spip_syndic WHERE id_syndic=$id_syndic"));
@@ -339,7 +330,7 @@ if ($flag_editable AND ($options == 'avancees' OR $statut == 'publie')) {
echo "\n";
if ($flag_editable AND $options == 'avancees') {
- formulaire_mots('syndic', $id_syndic, $nouv_mot, $supp_mot, $cherche_mot, $flag_editable,generer_url_ecrire('sites',"id_syndic=$id_syndic"));
+ formulaire_mots('syndic', $id_syndic, $nouv_mot, $supp_mot, $cherche_mot, $flag_editable);
}
echo pipeline('affiche_milieu',array('args'=>array('exec'=>'sites','id_syndic'=>$id_syndic),'data'=>''));
diff --git a/ecrire/inc/mots.php b/ecrire/inc/mots.php
index 8eba7e99a6..d6d27cf3a7 100644
--- a/ecrire/inc/mots.php
+++ b/ecrire/inc/mots.php
@@ -101,9 +101,7 @@ function mots_ressemblants($mot, $table_mots, $table_ids='') {
* specifie, plus le formulaire d'ajout de mot-cle
*/
-// $retour ne sert plus car deductible des autres
-
-function formulaire_mots($table, $id_objet, $nouv_mot, $supp_mot, $cherche_mot, $flag_editable, $retour='') {
+function formulaire_mots($table, $id_objet, $nouv_mot, $supp_mot, $cherche_mot, $flag_editable) {
global $connect_statut, $connect_toutes_rubriques, $options;
global $spip_lang_rtl, $spip_lang_right, $spip_lang;
--
GitLab