diff --git a/ecrire/inc_auth.php3 b/ecrire/inc_auth.php3
index 8eb3fcb057097dad4c270665bf480ae1ba9eb2f5..7bebcc5399309d2da6260d40d1182f7cc1b45e4e 100644
--- a/ecrire/inc_auth.php3
+++ b/ecrire/inc_auth.php3
@@ -15,7 +15,7 @@
if (!defined("_ECRIRE_INC_VERSION")) return;
define("_DIR_LOGIN", _DIR_RESTREINT ? "" : "../");
-define("_DIR_LOGED_IN", _DIR_RESTREINT ? "" : _DIR_RESTREINT_ABS);
+define("_DIR_LOGGED_IN", _DIR_RESTREINT ? "" : _DIR_RESTREINT_ABS);
//
// Fonctions de gestion de l'acces restreint aux rubriques
@@ -100,9 +100,9 @@ function auth_dist() {
// Tentative de login echec
if ($_GET['bonjour'] == 'oui' AND !$auth_login) {
- $link = new Link(_DIR_LOGIN . "spip_cookie.php3?test_echec_cookie=oui");
+ $link = new Link(http_php_scriptnq(_DIR_LOGIN . "spip_cookie","test_echec_cookie=oui"));
$clean_link->delVar('bonjour');
- $url = str_replace('/./', '/', _DIR_LOGED_IN .$clean_link->getUrl());
+ $url = str_replace('/./', '/', _DIR_LOGGED_IN .$clean_link->getUrl());
$link->addVar('url', $url);
redirige_par_entete($link->getUrl());
exit;
@@ -110,9 +110,9 @@ function auth_dist() {
// Si pas authentifie, demander login / mdp
if (!$auth_login) {
- $url = str_replace('/./', '/', _DIR_LOGED_IN
+ $url = str_replace('/./', '/', _DIR_LOGGED_IN
. $clean_link->getUrl());
- redirige_par_entete(_DIR_LOGIN . "spip_login.php3?url=".urlencode($url));
+ redirige_par_entete(http_php_scriptnq(_DIR_LOGIN . "spip_login"),"?url=".urlencode($url));
exit;
}
@@ -202,13 +202,13 @@ function auth_dist() {
install_debut_html(_T('info_travaux_titre')); echo _T('titre_probleme_technique'), "<p><tt>".spip_sql_errno()." ".spip_sql_error()."</tt></p>";install_fin_html();
} else {
- install_debut_html(_T('avis_erreur_connexion')); echo "<br><br><p>", _T('texte_inc_auth_1', array('auth_login' => $auth_login)), " <a href='", _DIR_LOGIN . http_php_scriptnq("spip_cookie","logout=$auth_login'>"), _T('texte_inc_auth_2')."</A>"._T('texte_inc_auth_3');install_fin_html();
+ install_debut_html(_T('avis_erreur_connexion')); echo "<br><br><p>", _T('texte_inc_auth_1', array('auth_login' => $auth_login)), " <a href=", http_php_script(_DIR_LOGIN . "spip_cookie","logout=$auth_login"), '>', _T('texte_inc_auth_2'), "</A>",_T('texte_inc_auth_3');install_fin_html();
}
exit;
}
if (!$auth_pass_ok) {
- redirige_par_entete(_DIR_LOGIN . "spip_login.php3?var_erreur=pass");
+ redirige_par_entete(http_php_scriptnq(_DIR_LOGIN . "spip_login"),"var_erreur=pass");
}
// Si c'est un nouvel inscrit, le passer de 'nouveau' a '1comite'
diff --git a/ecrire/inc_breves.php b/ecrire/inc_breves.php
index 9af8b0da64af02c80da6db455720913f28518ad8..c564920fc1ac2db1ce3d5cbf1ba8c6a0b08e523e 100644
--- a/ecrire/inc_breves.php
+++ b/ecrire/inc_breves.php
@@ -79,7 +79,7 @@ function breves_dist()
include_ecrire("inc_rubriques");
calculer_rubriques();
}
- redirige_par_entete(http_php_scriptnq("naviguer","id_rubrique=$id_rubrique"));
+ redirige_par_entete(http_php_scriptnq("naviguer"),"id_rubrique=$id_rubrique");
} else {
debut_page(_T('titre_page_breves'), "documents", "breves");
diff --git a/ecrire/inc_config.php3 b/ecrire/inc_config.php3
index 5fc71fc579a514ff922b700ee95ecc6651f82b66..b0d795f1f2e4f039f8a7fed94bd5827950fe6213 100644
--- a/ecrire/inc_config.php3
+++ b/ecrire/inc_config.php3
@@ -298,10 +298,10 @@ function appliquer_modifs_config() {
}
if ($purger_skel) {
- redirige_par_entete("../spip_cache.php3?purger_squelettes=oui&id_auteur=$connect_id_auteur&hash=" .
+ redirige_par_entete(http_php_scriptnq("../spip_cache"), "?purger_squelettes=oui&id_auteur=$connect_id_auteur&hash=" .
calculer_action_auteur("purger_squelettes") .
"&redirect=". _DIR_RESTREINT_ABS .
- urlencode($clean_link->getUrl()));
+ urlencode($clean_link->getUrl()));
}
}
diff --git a/ecrire/inc_getdocument.php3 b/ecrire/inc_getdocument.php3
index 0f7054d35d50f60231f95f81acbbd14fdb92bf2f..14124a4f7e07e8c09b6bca524fa08c78d99dc234 100644
--- a/ecrire/inc_getdocument.php3
+++ b/ecrire/inc_getdocument.php3
@@ -91,8 +91,8 @@ function deplacer_fichier_upload($source, $dest) {
if ($f) {
fclose ($f);
} else {
- redirige_par_entete(http_php_scriptnq("spip_test_dirs",
- "test_dir=". dirname($dest)));
+ redirige_par_entete(http_php_scriptnq("spip_test_dirs"),
+ "test_dir=". dirname($dest));
}
@unlink($dest);
}
diff --git a/ecrire/inc_mots_tous.php b/ecrire/inc_mots_tous.php
index c2598ef1b0d792d378239bd47a8257021a873870..3961161eb0d46763768c15e05062a88c7087599e 100644
--- a/ecrire/inc_mots_tous.php
+++ b/ecrire/inc_mots_tous.php
@@ -56,7 +56,7 @@ function mots_tous_dist()
// si le mot n'est pas lie, on demande sa suppression
if ($nb_articles + $nb_breves + $nb_sites + $nb_forum == 0) {
- redirige_par_entete(http_php_scriptnq("mots_edit","supp_mot=$id_mot&redirect_ok=oui&redirect=" . http_php_scriptnq('mots_tous')));
+ redirige_par_entete(http_php_scriptnq("mots_edit"),"?supp_mot=$id_mot&redirect_ok=oui&redirect=" . http_php_scriptnq('mots_tous'));
} // else traite plus loin (confirmation de suppression)
}
}
diff --git a/ecrire/inc_upgrade.php b/ecrire/inc_upgrade.php
index e990b5adb8e8d50381e9c781c78aa735c3bf5da2..caacbc6780f326950f921e14b39e9e2dabc5cffa 100644
--- a/ecrire/inc_upgrade.php
+++ b/ecrire/inc_upgrade.php
@@ -82,7 +82,7 @@ function upgrade_dist()
if ($ok) {
$hash = calculer_action_auteur("purger_cache");
- redirige_par_entete(http_php_script("../spip_cache", "purger_cache=oui&id_auteur=$connect_id_auteur&hash=$hash&redirect=" . _DIR_RESTREINT_ABS));
+ redirige_par_entete(http_php_script("../spip_cache"), "purger_cache=oui&id_auteur=$connect_id_auteur&hash=$hash&redirect=" . _DIR_RESTREINT_ABS);
}
else {
echo _T('alerte_maj_impossible', array('version' => $spip_version));
diff --git a/ecrire/inc_utils.php b/ecrire/inc_utils.php
index 634ab6eea6703caee216a26ad0e5ad7d228ac768..262edd7174a4cc3f7a4600cde07b60abeaa6c346 100644
--- a/ecrire/inc_utils.php
+++ b/ecrire/inc_utils.php
@@ -479,10 +479,10 @@ function http_last_modified($lastmodified, $expire = 0) {
// envoyer le navigateur sur une nouvelle adresse
-function redirige_par_entete($url) {
- spip_log("redirige $url");
+function redirige_par_entete($url, $fin="") {
+ spip_log("redirige $url$fin");
include_ecrire('inc_headers');
- spip_header("Location: $url");
+ spip_header("Location: $url$fin");
exit;
}