Update of /home/spip-cvs/spip/ecrire
In directory alan:/tmp/cvs-serv6509/ecrire
Modified Files:
admin_vider.php3 inc_abstract_sql.php3 inc_auth.php3
inc_config.php3 upgrade.php3
Log Message:
abstraction du répertoire ecrire/
Index: inc_config.php3
RCS file: /home/spip-cvs/spip/ecrire/inc_config.php3,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -d -r1.56 -r1.57
--- inc_config.php3 22 Oct 2004 21:48:05 -0000 1.56
+++ inc_config.php3 29 Oct 2004 07:01:26 -0000 1.57
@@ -288,7 +288,7 @@
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()));
}
}
Index: inc_auth.php3
RCS file: /home/spip-cvs/spip/ecrire/inc_auth.php3,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -d -r1.61 -r1.62
--- inc_auth.php3 23 Oct 2004 10:12:42 -0000 1.61
+++ inc_auth.php3 29 Oct 2004 07:01:26 -0000 1.62
@@ -104,14 +104,14 @@
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));
}
Index: inc_abstract_sql.php3
RCS file: /home/spip-cvs/spip/ecrire/inc_abstract_sql.php3,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- inc_abstract_sql.php3 24 Oct 2004 06:24:33 -0000 1.3
+++ inc_abstract_sql.php3 29 Oct 2004 07:01:26 -0000 1.4
@@ -40,7 +40,7 @@
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);
}
Index: upgrade.php3
RCS file: /home/spip-cvs/spip/ecrire/upgrade.php3,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- upgrade.php3 20 Oct 2004 15:30:29 -0000 1.22
+++ upgrade.php3 29 Oct 2004 07:01:26 -0000 1.23
@@ -65,14 +65,14 @@
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));
Index: admin_vider.php3
RCS file: /home/spip-cvs/spip/ecrire/admin_vider.php3,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- admin_vider.php3 11 Sep 2004 21:57:00 -0000 1.18
+++ admin_vider.php3 29 Oct 2004 07:01:26 -0000 1.19
@@ -52,16 +52,14 @@
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>";