From d2d351c08131d48cbd00f5bfa3243f6ee955dc77 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Georges=20Dup=C3=A9ron?= <jahvascriptmaniac+github@free.fr>
Date: Tue, 3 Aug 2010 02:44:43 +0200
Subject: [PATCH] =?UTF-8?q?D=C3=A9placement=20de=20tout=20le=20code=20dans?=
 =?UTF-8?q?=20un=20dossier=20"code"=20(partie=202,=20modification=20des=20?=
 =?UTF-8?q?chemins=20dans=20les=20fichiers).?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 __cms__/cms.php                    | 2 +-
 __cms__/code/cms/cms.php           | 7 +------
 __cms__/code/cms/configuration.php | 9 +++++++++
 __cms__/config.php                 | 5 +----
 4 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/__cms__/cms.php b/__cms__/cms.php
index 4fb3ff6..81ac283 100644
--- a/__cms__/cms.php
+++ b/__cms__/cms.php
@@ -1,5 +1,5 @@
 <?php
 
-require_once(dirname(__FILE__) . "/cms/cms.php");
+require_once(dirname(__FILE__) . "/code/cms/cms.php");
 
 ?>
\ No newline at end of file
diff --git a/__cms__/code/cms/cms.php b/__cms__/code/cms/cms.php
index 5f886c6..aaed92d 100644
--- a/__cms__/code/cms/cms.php
+++ b/__cms__/code/cms/cms.php
@@ -2,12 +2,7 @@
 
 error_reporting(E_ALL | E_STRICT);
 
-require_once(dirname(__FILE__) . "/../config.php");
-if (Config::get('courriel_admin') === null) {
-	echo "Vous devez indiquer le courriel de l'administrateur dans le fichier config.php.";
-	exit;
-}
-
+require_once(dirname(__FILE__) . "/configuration.php");
 require_once(dirname(__FILE__) . "/include_tous.php");
 
 class CMS {
diff --git a/__cms__/code/cms/configuration.php b/__cms__/code/cms/configuration.php
index 36fcfe7..8ec3f48 100644
--- a/__cms__/code/cms/configuration.php
+++ b/__cms__/code/cms/configuration.php
@@ -18,4 +18,13 @@ class Config {
 	}
 }
 
+require_once(dirname(__FILE__) . "/../chemin/path.php");
+require_once(dirname(__FILE__) . "/../../config.php");
+
+if (Config::get('courriel_admin') === null) {
+	echo "Vous devez indiquer le courriel de l'administrateur dans le fichier config.php.";
+	exit;
+}
+
+
 ?>
\ No newline at end of file
diff --git a/__cms__/config.php b/__cms__/config.php
index d060b37..a486026 100644
--- a/__cms__/config.php
+++ b/__cms__/config.php
@@ -1,8 +1,5 @@
 <?php
 
-require_once(dirname(__FILE__) . "/chemin/path.php");
-require_once(dirname(__FILE__) . "/cms/configuration.php");
-
 // ========== CONFIGURATION =========
 
 // Addresse de courriel de l'administrateur.
@@ -19,7 +16,7 @@ Config::set('chemin_base', realpath(dirname(__FILE__)));
 
 // Chemin vers le stockage interne des données.
 // En général, c'est le chemin ..../__cms__/modele
-Config::set('chemin_base_stockage', Path::combine(Config::get("chemin_base"), "modele"));
+Config::set('chemin_base_stockage', Path::combine(Config::get("chemin_base"), "donnees"));
 
 // Chemin vers la partie visible du site.
 // En général, c'est le chemin vers le dossier contenant __cms__