From f968d39a0822ff0292eaed7243271bda0054b363 Mon Sep 17 00:00:00 2001
From: Fil <fil@rezo.net>
Date: Sat, 4 Feb 2006 23:23:59 +0000
Subject: [PATCH] des redirections fantaisistes
---
ecrire/exec_auth.php | 6 ++++--
ecrire/inc_utils.php | 8 ++------
2 files changed, 6 insertions(+), 8 deletions(-)
diff --git a/ecrire/exec_auth.php b/ecrire/exec_auth.php
index c00f57096d..1d8f77d5a2 100644
--- a/ecrire/exec_auth.php
+++ b/ecrire/exec_auth.php
@@ -99,8 +99,10 @@ function auth_dist() {
// demander login / mdp et nettoyer en cas de login en echec
if (!$auth_login) {
if ($_GET['bonjour'] == 'oui') $clean_link->delVar('bonjour');
-
- redirige_url_public('spip_login', "url=".urlencode(str_replace('/./', '/', _DIR_LOGGED_IN. $clean_link->getUrl())));
+ redirige_par_entete(
+ generer_url_public('spip_login',
+ "url=" . urlencode(str_replace('/./', '/',
+ _DIR_LOGGED_IN. $clean_link->getUrl()))));
}
//
diff --git a/ecrire/inc_utils.php b/ecrire/inc_utils.php
index d6065bdd08..c6f91519f0 100644
--- a/ecrire/inc_utils.php
+++ b/ecrire/inc_utils.php
@@ -176,8 +176,8 @@ function spip_query($query) {
// moins bien les erreurs timeout sur SQL), on ne force donc pas l'upgrade
if ($GLOBALS['spip_connect_version'] < 0.1) {
if (!_DIR_RESTREINT) {$GLOBALS['db_ok'] = false; return;}
- redirige_url_ecrire("upgrade","reinstall=oui");
- exit;
+ redirige_par_entete(
+ generer_url_ecrire('upgrade', 'reinstall=oui', true));
}
// Faire la requete
@@ -544,10 +544,6 @@ function redirige_par_entete($url, $fin="") {
exit;
}
-function redirige_url_ecrire($script, $args="") {
- redirige_par_entete(generer_url_ecrire($script, $args, true));
-}
-
// transformation XML des "&" en "&"
function quote_amp($u) {
return preg_replace(
--
GitLab