From 63e5adda0a3435c405a0f5143162a5f405dc336b Mon Sep 17 00:00:00 2001
From: "Committo,Ergo:sum" <esj@rezo.net>
Date: Thu, 12 Jan 2006 11:15:54 +0000
Subject: [PATCH] encore qq generer_url_public pas vus
---
ecrire/inc_spip_action_test_dirs.php | 2 +-
ecrire/inc_upgrade.php | 4 ++--
inc-public-global.php3 | 3 +--
spip_cookie.php3 | 9 ++++-----
4 files changed, 8 insertions(+), 10 deletions(-)
diff --git a/ecrire/inc_spip_action_test_dirs.php b/ecrire/inc_spip_action_test_dirs.php
index 6dfb3fbc46..53b33e6118 100644
--- a/ecrire/inc_spip_action_test_dirs.php
+++ b/ecrire/inc_spip_action_test_dirs.php
@@ -105,7 +105,7 @@ if ($bad_dirs OR $absent_dirs) {
} else {
if (!_FILE_CONNECT)
- header("Location: " . _DIR_RESTREINT_ABS . "install" . _EXTENSION_PHP . "?etape=1");
+ header("Location: " . generer_url_ecrire(_DIR_RESTREINT_ABS . "install", "etape=1"));
else
header("Location: " . _DIR_RESTREINT_ABS);
}
diff --git a/ecrire/inc_upgrade.php b/ecrire/inc_upgrade.php
index cfb343bb1f..01e1adbab7 100644
--- a/ecrire/inc_upgrade.php
+++ b/ecrire/inc_upgrade.php
@@ -18,7 +18,7 @@ function upgrade_dist()
global $connect_id_auteur, $spip_version, $reinstall;
if (!_FILE_CONNECT) {
- header("Location: " . 'install' . _EXTENSION_PHP);
+ header("Location: " . generer_url_ecrire("install"));
exit;
}
@@ -114,7 +114,7 @@ function info_install()
{
// Soit on est dans ecrire/ et on envoie sur l'installation
if (@file_exists("inc_version" . _EXTENSION_PHP)) {
- header("Location: " . 'install' . _EXTENSION_PHP);
+ header("Location: " . generer_url_ecrire("install"));
exit;
}
// Soit on est dans le site public
diff --git a/inc-public-global.php3 b/inc-public-global.php3
index d42eb28981..10b865c457 100644
--- a/inc-public-global.php3
+++ b/inc-public-global.php3
@@ -59,8 +59,7 @@ function calcule_header_et_page ($fond) {
else {
$link = new Link();
$link->addvar('var_mode', 'debug');
- redirige_par_entete('spip_login' . _EXTENSION_PHP . '?url='
- .urlencode($link->getUrl()));
+ redirige_par_entete(generer_url_public('spip_login'), '?url='.urlencode($link->getUrl()));
exit;
}
}
diff --git a/spip_cookie.php3 b/spip_cookie.php3
index 702e8b39dc..96c1883589 100644
--- a/spip_cookie.php3
+++ b/spip_cookie.php3
@@ -99,9 +99,8 @@ if ($essai_auth_http AND !$ignore_auth_http) {
// cas particulier, logout dans l'espace public
if ($logout_public) {
$logout = $logout_public;
- if (!$url)
- $url = 'index' . _EXTENSION_PHP;
-}
+ if (!$url) $url = $GLOBALS['meta']['adresse_site'];
+ }
// tentative de logout
if ($logout) {
verifier_visiteur();
@@ -189,7 +188,7 @@ if ($essai_login == "oui") {
if (!$ok) {
if (ereg(_DIR_RESTREINT_ABS, $redirect))
- $redirect = "spip_login" . _EXTENSION_PHP;
+ $redirect = generer_url_public('spip_login');
$redirect .= (strpos($redirect, "?") ? "&" : "?") . "var_login=$login";
if ($session_password || $session_password_md5)
$redirect .= '&var_erreur=pass';
@@ -200,7 +199,7 @@ if ($essai_login == "oui") {
// cookie d'admin ?
if ($cookie_admin == "non") {
if (!$retour)
- $retour = 'spip_login' . _EXTENSION_PHP .'?url='.urlencode($url);
+ $retour = generer_url_public('spip_login', 'url='.urlencode($url));
spip_setcookie('spip_admin', $spip_admin, time() - 3600 * 24);
$redirect = ereg_replace("([?&])var_login=[^&]*&?", '\1', $retour);
--
GitLab