From acb2e846788040343322190e585a24fafef157d7 Mon Sep 17 00:00:00 2001
From: James <james@rezo.net>
Date: Tue, 17 Oct 2006 19:22:20 +0000
Subject: [PATCH] =?UTF-8?q?-=20d=C3=A9placement=20du=20r=C3=A9pertoire=20u?=
=?UTF-8?q?pload/=20-=20on=20isole=20les=20sessions=20dans=20un=20r=C3=A9p?=
=?UTF-8?q?ertoire=20d=C3=A9di=C3=A9=20-=20et=20on=20en=20profite=20pour?=
=?UTF-8?q?=20corriger=20quelques=20oublis=20pour=20l'application=20de=20?=
=?UTF-8?q?=5FDIR=5FCHMOD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.gitattributes | 1 +
ecrire/inc/flock.php | 2 +-
ecrire/inc/math.php | 2 +-
ecrire/inc_version.php | 11 +++++------
tmp/sessions/remove.txt | 3 +++
{ecrire => tmp}/upload/remove.txt | 0
6 files changed, 11 insertions(+), 8 deletions(-)
create mode 100644 tmp/sessions/remove.txt
rename {ecrire => tmp}/upload/remove.txt (100%)
diff --git a/.gitattributes b/.gitattributes
index f181c425b2..08f62b2b9c 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -528,4 +528,5 @@ ecrire/xml/rss.php -text
/rien.gif -text
/spip.php -text
tmp/remove.txt -text
+tmp/sessions/remove.txt -text
/win_png.htc -text
diff --git a/ecrire/inc/flock.php b/ecrire/inc/flock.php
index 1db8afd996..d6b9ef604a 100644
--- a/ecrire/inc/flock.php
+++ b/ecrire/inc/flock.php
@@ -162,7 +162,7 @@ function sous_repertoire($base, $subdir, $nobase = false) {
if (@file_exists("$path/.ok"))
return "$baseaff$subdir/";
- @mkdir($path, 0777);
+ @mkdir($path, _DIR_CHMOD);
@chmod($path, _DIR_CHMOD);
$ok = false;
diff --git a/ecrire/inc/math.php b/ecrire/inc/math.php
index d3b04ebb12..bb12fcc4fa 100644
--- a/ecrire/inc/math.php
+++ b/ecrire/inc/math.php
@@ -38,7 +38,7 @@ function image_math($tex) {
// Regarder dans le repertoire local des images TeX et blocs MathML
if (!@is_dir(_DIR_TeX))
- @mkdir (_DIR_TeX, 0777);
+ @mkdir (_DIR_TeX, _DIR_CHMOD);
$fichier = _DIR_TeX .md5(trim($tex)).$ext;
diff --git a/ecrire/inc_version.php b/ecrire/inc_version.php
index fb717a6041..25b0feb55a 100644
--- a/ecrire/inc_version.php
+++ b/ecrire/inc_version.php
@@ -262,7 +262,7 @@ $auteur_session = $connect_statut = $connect_toutes_rubriques = $connect_id_rubr
// mais ne touche pas a cette variable si elle est deja definie
// afin que mes_options.php puisse en specifier d'autres.
-function spip_initialisation_parametree($dir1, $dir2) {
+function spip_initialisation_parametree($dir1) {
static $too_late = false;
if ($too_late) return;
@@ -279,9 +279,8 @@ function spip_initialisation_parametree($dir1, $dir2) {
define('_DIR_TMP', $dir1 . "tmp/");
define('_DIR_DUMP', $dir1 . "tmp/data/");
- define('_DIR_SESSIONS', $dir1 . "tmp/data/");
-
- define('_DIR_TRANSFERT', $dir2 . "upload/");
+ define('_DIR_SESSIONS', $dir1 . "tmp/sessions/");
+ define('_DIR_TRANSFERT', $dir1 . "tmp/upload/");
// les fichiers qu'on y met, entre autres
define('_FILE_CRON_LOCK', _DIR_TMP . 'cron.lock');
@@ -294,7 +293,7 @@ function spip_initialisation_parametree($dir1, $dir2) {
define('_DIR_IMG_ICONES', _DIR_IMG . "icones/");
// Le fichier de connexion a la base de donnees
- define('_FILE_CONNECT_INS_191', ($dir2 . "inc_connect"));
+ define('_FILE_CONNECT_INS_191', (_DIR_RESTREINT . "inc_connect"));
define('_FILE_CONNECT_INS', (_DIR_CONFIG . "connect"));
define('_FILE_CONNECT',
(@is_readable($f = _FILE_CONNECT_INS . '.php') ? $f
@@ -336,7 +335,7 @@ if (defined('_FILE_OPTIONS')) {
//
// mais cette fonction a peut-etre deja ete appelee par mes_options
-spip_initialisation_parametree(_DIR_RACINE, _DIR_RESTREINT) ;
+spip_initialisation_parametree(_DIR_RACINE) ;
//
// Definitions standards (charge aussi inc/flock)
diff --git a/tmp/sessions/remove.txt b/tmp/sessions/remove.txt
new file mode 100644
index 0000000000..28138d7bdd
--- /dev/null
+++ b/tmp/sessions/remove.txt
@@ -0,0 +1,3 @@
+Vous pouvez effacer ce fichier sans dommages.
+
+You can safely remove this file.
diff --git a/ecrire/upload/remove.txt b/tmp/upload/remove.txt
similarity index 100%
rename from ecrire/upload/remove.txt
rename to tmp/upload/remove.txt
--
GitLab