From 97f079c653f285c8c5fc1da619e217178e70da7d 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:34:02 +0200
Subject: [PATCH] =?UTF-8?q?D=C3=A9placement=20de=20=5F=5Fcmd=5F=5F/cms.php?=
 =?UTF-8?q?=20dans=20=5F=5Fcms=5F=5F/cms/.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 __cms__/TODO                 |  5 -----
 __cms__/cms.php              | 24 +-----------------------
 __cms__/cms/cms.php          | 28 ++++++++++++++++++++++++++++
 __cms__/cms/include_tous.php | 11 +++++++++++
 __cms__/include.php          | 11 -----------
 5 files changed, 40 insertions(+), 39 deletions(-)
 create mode 100644 __cms__/cms/cms.php
 create mode 100644 __cms__/cms/include_tous.php
 delete mode 100644 __cms__/include.php

diff --git a/__cms__/TODO b/__cms__/TODO
index 36d9b55..737589c 100644
--- a/__cms__/TODO
+++ b/__cms__/TODO
@@ -1,7 +1,2 @@
 Sécurité : les noms de propriétés passés à stockage ne doivent pas
    contenir de '/' (doivent valider "nettoyer_segment()".
-Actions pouvant être effectuées par get (pas d'effets de bord) et ne
-   pouvant pas être effectuées par get (seulement POST, effets de
-   bord).
-
-déplacer cms.php dans __cms__/cms/
\ No newline at end of file
diff --git a/__cms__/cms.php b/__cms__/cms.php
index 0ac287e..4fb3ff6 100644
--- a/__cms__/cms.php
+++ b/__cms__/cms.php
@@ -1,27 +1,5 @@
 <?php
 
-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__) . "/include.php");
-
-class CMS {
-    public static function page($chemin_str) {
-		// TODO : appeller Modules::action($chemin, $action, $paramètres);
-		
-		$chemin = new Chemin($chemin_str);
-		$noms_params = Modules::get_module($chemin);
-		$noms_params["get_post"][] = "action";
-		$paramètres = array("action" => "vue");
-		// récupérer $noms_params dans $_GET, $_POST et $_FILE ==> $paramètres
-		$action = $paramètres["action"];
-		Modules::action($chemin, $action, $paramètres);
-    }
-}
+require_once(dirname(__FILE__) . "/cms/cms.php");
 
 ?>
\ No newline at end of file
diff --git a/__cms__/cms/cms.php b/__cms__/cms/cms.php
new file mode 100644
index 0000000..5f886c6
--- /dev/null
+++ b/__cms__/cms/cms.php
@@ -0,0 +1,28 @@
+<?php
+
+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__) . "/include_tous.php");
+
+class CMS {
+    public static function page($chemin_str) {
+		// TODO : appeller Modules::action($chemin, $action, $paramètres);
+		
+		$chemin = new Chemin($chemin_str);
+		$noms_params = Modules::get_module($chemin);
+		$noms_params["get_post"][] = "action";
+		$paramètres = array("action" => "vue");
+		// récupérer $noms_params dans $_GET, $_POST et $_FILE ==> $paramètres
+		$action = $paramètres["action"];
+		Modules::action($chemin, $action, $paramètres);
+                echo "OK.";
+    }
+}
+
+?>
\ No newline at end of file
diff --git a/__cms__/cms/include_tous.php b/__cms__/cms/include_tous.php
new file mode 100644
index 0000000..64945ab
--- /dev/null
+++ b/__cms__/cms/include_tous.php
@@ -0,0 +1,11 @@
+<?php
+
+require_once(dirname(__FILE__) . "/../cms/include.php");
+require_once(dirname(__FILE__) . "/../chemin/include.php");
+require_once(dirname(__FILE__) . "/../modules/include.php");
+require_once(dirname(__FILE__) . "/../securite/include.php");
+require_once(dirname(__FILE__) . "/../site/include.php");
+require_once(dirname(__FILE__) . "/../stockage/include.php");
+require_once(dirname(__FILE__) . "/../texte-enrichi/include.php");
+
+?>
\ No newline at end of file
diff --git a/__cms__/include.php b/__cms__/include.php
deleted file mode 100644
index 739d2fc..0000000
--- a/__cms__/include.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-require_once(dirname(__FILE__) . "/cms/include.php");
-require_once(dirname(__FILE__) . "/chemin/include.php");
-require_once(dirname(__FILE__) . "/modules/include.php");
-require_once(dirname(__FILE__) . "/securite/include.php");
-require_once(dirname(__FILE__) . "/site/include.php");
-require_once(dirname(__FILE__) . "/stockage/include.php");
-require_once(dirname(__FILE__) . "/texte-enrichi/include.php");
-
-?>
\ No newline at end of file