From ee336a900c5e5defe899a3f77554e5e8072f636d Mon Sep 17 00:00:00 2001
From: "Committo,Ergo:sum" <esj@rezo.net>
Date: Fri, 29 Oct 2004 07:01:26 +0000
Subject: [PATCH] =?UTF-8?q?abstraction=20du=20r=C3=A9pertoire=20ecrire/?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
ecrire/admin_vider.php3 | 10 ++++------
ecrire/inc_abstract_sql.php3 | 2 +-
ecrire/inc_auth.php3 | 4 ++--
ecrire/inc_config.php3 | 2 +-
ecrire/upgrade.php3 | 8 ++++----
inc-public-global.php3 | 2 +-
spip_cache.php3 | 2 +-
7 files changed, 14 insertions(+), 16 deletions(-)
diff --git a/ecrire/admin_vider.php3 b/ecrire/admin_vider.php3
index 4fa9bdc5f4..3c27361bc1 100644
--- a/ecrire/admin_vider.php3
+++ b/ecrire/admin_vider.php3
@@ -52,16 +52,14 @@ echo _T('texte_vider_cache')."</FONT></B></TD></TR>";
echo "<TR><TD class='serif'>";
-echo "\n<p align='justify'>"._T('texte_suppression_fichiers')."<p align='justify'>"._T('texte_recalcul_page');
+echo "\n<p align='justify'>"._T('texte_suppression_fichiers'),
+ "<p align='justify'>"._T('texte_recalcul_page');
echo "\n<FORM ACTION='../spip_cache.php3' METHOD='post'>";
-
-$hash = calculer_action_auteur("purger_cache");
-
echo "\n<INPUT TYPE='hidden' NAME='id_auteur' VALUE='$connect_id_auteur'>";
-echo "\n<INPUT TYPE='hidden' NAME='hash' VALUE='$hash'>";
+echo "\n<INPUT TYPE='hidden' NAME='hash' VALUE='" . calculer_action_auteur("purger_cache") . "'>";
echo "\n<INPUT TYPE='hidden' NAME='purger_cache' VALUE='oui'>";
-echo "\n<INPUT TYPE='hidden' NAME='redirect' VALUE='admin_vider.php3'>";
+echo "\n<INPUT TYPE='hidden' NAME='redirect' VALUE='" . _DIR_RESTREINT_ABS . "admin_vider.php3'>";
echo "\n<p><DIV align='right'><INPUT CLASS='fondo' TYPE='submit' NAME='valider' VALUE='"._T('bouton_vider_cache')."'></FORM></DIV>";
echo "</TD></TR>";
echo "</TABLE>";
diff --git a/ecrire/inc_abstract_sql.php3 b/ecrire/inc_abstract_sql.php3
index cf25a48223..729b3b41db 100644
--- a/ecrire/inc_abstract_sql.php3
+++ b/ecrire/inc_abstract_sql.php3
@@ -40,7 +40,7 @@ function spip_abstract_select (
if (!function_exists($f)) {
// non, il est decrit dans le fichier ad hoc
$d = 'inc_connect-' . $serveur .'.php3';
- if (@file_exists('ecrire/' . $d))
+ if (@file_exists(_DIR_RESTREINT . $d))
include_ecrire($d);
$f = spip_abstract_serveur($f, $serveur);
}
diff --git a/ecrire/inc_auth.php3 b/ecrire/inc_auth.php3
index 276fe1620f..e485d38967 100644
--- a/ecrire/inc_auth.php3
+++ b/ecrire/inc_auth.php3
@@ -104,14 +104,14 @@ function auth() {
else if ($GLOBALS['bonjour'] == 'oui') {
$link = new Link("../spip_cookie.php3?test_echec_cookie=oui");
$clean_link->delVar('bonjour');
- $url = str_replace('/./', '/', 'ecrire/'.$clean_link->getUrl());
+ $url = str_replace('/./', '/', _DIR_RESTREINT_ABS .$clean_link->getUrl());
$link->addVar('var_url', $url);
redirige_par_entete($link->getUrl());
}
// Si pas authentifie, demander login / mdp
if (!$auth_login) {
- $url = str_replace('/./', '/', 'ecrire/'.$clean_link->getUrl());
+ $url = str_replace('/./', '/', _DIR_RESTREINT_ABS .$clean_link->getUrl());
redirige_par_entete("../spip_login.php3?var_url=".urlencode($url));
}
diff --git a/ecrire/inc_config.php3 b/ecrire/inc_config.php3
index aeb6fc4f85..0090dcebca 100644
--- a/ecrire/inc_config.php3
+++ b/ecrire/inc_config.php3
@@ -288,7 +288,7 @@ function appliquer_modifs_config() {
if ($purger_skel) {
redirige_par_entete("../spip_cache.php3?purger_squelettes=oui&id_auteur=$connect_id_auteur&hash=" .
calculer_action_auteur("purger_squelettes") .
- "&redirect=".
+ "&redirect=". _DIR_RESTREINT_ABS .
urlencode($clean_link->getUrl()));
}
}
diff --git a/ecrire/upgrade.php3 b/ecrire/upgrade.php3
index aaace8856d..d1fb85776f 100644
--- a/ecrire/upgrade.php3
+++ b/ecrire/upgrade.php3
@@ -65,14 +65,14 @@ if ($ok) {
ecrire_acces();
init_config();
- $hash = calculer_action_auteur("purger_cache");
- $redirect = rawurlencode("index.php3");
}
fin_admin($upgrade_titre);
-if ($ok)
- @header ("Location: ../spip_cache.php3?purger_cache=oui&id_auteur=$connect_id_auteur&hash=$hash&redirect=$redirect");
+if ($ok) {
+ $hash = calculer_action_auteur("purger_cache");
+ @header ("Location: ../spip_cache.php3?purger_cache=oui&id_auteur=$connect_id_auteur&hash=$hash&redirect=" . _DIR_RESTREINT_ABS . "index.php3");
+ }
else {
include_ecrire ('inc_lang.php3');
echo _T('alerte_maj_impossible', array('version' => $spip_version));
diff --git a/inc-public-global.php3 b/inc-public-global.php3
index c99ec2ef88..a951d06002 100644
--- a/inc-public-global.php3
+++ b/inc-public-global.php3
@@ -205,7 +205,7 @@ function afficher_page_globale ($fond, $delais, &$use_cache) {
top: 0px;
left: 0px;
position: absolute;
- "><a href="'.$url.'"><img src="ecrire/img_pack/naviguer-site.png" align="left" border="0" /></a>
+ "><a href="'.$url.'"><img src="' . _DIR_IMG_PACK . 'naviguer-site.png" align="left" border="0" /></a>
'.majuscules(_T('previsualisation')).'</div>';
}
diff --git a/spip_cache.php3 b/spip_cache.php3
index 4658ec486c..a6f9c4729c 100644
--- a/spip_cache.php3
+++ b/spip_cache.php3
@@ -15,6 +15,6 @@ if ($purger_squelettes == "oui") {
if (verifier_action_auteur("purger_squelettes", $hash, $id_auteur))
purger_squelettes();
}
-redirige_par_entete("./ecrire/" . $redirect);
+redirige_par_entete($redirect);
?>
--
GitLab