diff --git a/__cms__/cms.php b/__cms__/cms.php index 2409965..6c56137 100644 --- a/__cms__/cms.php +++ b/__cms__/cms.php @@ -3,6 +3,8 @@ // Tous les chemins pour les include sont relatifs à __cms__ . chdir(dirname(__FILE__)); +require_once("util.php"); +require_once("path.php"); require_once("controleur/page.php"); require_once("types/galerie.php"); @@ -11,22 +13,8 @@ require_once("types/galerie-evenement.php"); require_once("types/galerie-photo.php"); class CMS { - public static function uri_vers_chemin($uri) { - global $config_url_base; - // TODO : Pas propre ! - $base = "/" . preg_replace("/^https?:\/\/[^\/]*\//", "", $config_url_base, 1); - $uri = urldecode($uri); - if (strpos($uri, $base) == 0) { - $uri = '/' . substr($uri, strlen($base)); - } - - $uri = preg_replace("/\/?index.php$/", "/", $uri, 1); - - return $uri; - } - - public static function affiche($uri) { - $p = Page::_new(CMS::uri_vers_chemin($uri)); + public static function affiche($chemin) { + $p = Page::_new($chemin); echo CMS::en_tete($p->chemin->get()) // TODO . $p->vue() diff --git a/galerie/index.php b/galerie/index.php index a653bd9..75e7734 100644 --- a/galerie/index.php +++ b/galerie/index.php @@ -2,6 +2,6 @@ require_once("../__cms__/cms.php"); -CMS::affiche($_SERVER[REQUEST_URI]); +CMS::affiche("/galerie"); ?> diff --git a/galerie/periode 1/evenement a/index.php b/galerie/periode 1/evenement a/index.php index 44f0cb3..90add63 100644 --- a/galerie/periode 1/evenement a/index.php +++ b/galerie/periode 1/evenement a/index.php @@ -2,6 +2,6 @@ require_once("../../../__cms__/cms.php"); -CMS::affiche($_SERVER[REQUEST_URI]); +CMS::affiche("/galerie/periode 1/evenement a"); ?> diff --git a/galerie/periode 1/evenement a/photo a/index.php b/galerie/periode 1/evenement a/photo a/index.php index 01292b5..33cbb1e 100644 --- a/galerie/periode 1/evenement a/photo a/index.php +++ b/galerie/periode 1/evenement a/photo a/index.php @@ -2,6 +2,6 @@ require_once("../../../../__cms__/cms.php"); -CMS::affiche($_SERVER[REQUEST_URI]); +CMS::affiche("/galerie/periode 1/evenement a/photo a"); ?> diff --git a/galerie/periode 1/evenement a/photo b/index.php b/galerie/periode 1/evenement a/photo b/index.php index 01292b5..255fef8 100644 --- a/galerie/periode 1/evenement a/photo b/index.php +++ b/galerie/periode 1/evenement a/photo b/index.php @@ -2,6 +2,6 @@ require_once("../../../../__cms__/cms.php"); -CMS::affiche($_SERVER[REQUEST_URI]); +CMS::affiche("/galerie/periode 1/evenement a/photo b"); ?> diff --git a/galerie/periode 1/evenement a/photo c/index.php b/galerie/periode 1/evenement a/photo c/index.php index 01292b5..4ed6a31 100644 --- a/galerie/periode 1/evenement a/photo c/index.php +++ b/galerie/periode 1/evenement a/photo c/index.php @@ -2,6 +2,6 @@ require_once("../../../../__cms__/cms.php"); -CMS::affiche($_SERVER[REQUEST_URI]); +CMS::affiche("/galerie/periode 1/evenement a/photo c"); ?> diff --git a/galerie/periode 1/index.php b/galerie/periode 1/index.php index e5a04cf..8f51018 100644 --- a/galerie/periode 1/index.php +++ b/galerie/periode 1/index.php @@ -2,6 +2,6 @@ require_once("../../__cms__/cms.php"); -CMS::affiche($_SERVER[REQUEST_URI]); +CMS::affiche("/galerie/periode 1"); ?> diff --git a/galerie/periode 2/evenement machin/index.php b/galerie/periode 2/evenement machin/index.php index 44f0cb3..d44f07b 100644 --- a/galerie/periode 2/evenement machin/index.php +++ b/galerie/periode 2/evenement machin/index.php @@ -2,6 +2,6 @@ require_once("../../../__cms__/cms.php"); -CMS::affiche($_SERVER[REQUEST_URI]); +CMS::affiche("/galerie/periode 2/evenement machin"); ?> diff --git a/galerie/periode 2/evenement machin/photo a/index.php b/galerie/periode 2/evenement machin/photo a/index.php index 01292b5..46d1eb7 100644 --- a/galerie/periode 2/evenement machin/photo a/index.php +++ b/galerie/periode 2/evenement machin/photo a/index.php @@ -2,6 +2,6 @@ require_once("../../../../__cms__/cms.php"); -CMS::affiche($_SERVER[REQUEST_URI]); +CMS::affiche("/galerie/periode 2/evenement machin/photo a"); ?> diff --git a/galerie/periode 2/evenement machin/photo b/index.php b/galerie/periode 2/evenement machin/photo b/index.php index 01292b5..829afc3 100644 --- a/galerie/periode 2/evenement machin/photo b/index.php +++ b/galerie/periode 2/evenement machin/photo b/index.php @@ -2,6 +2,6 @@ require_once("../../../../__cms__/cms.php"); -CMS::affiche($_SERVER[REQUEST_URI]); +CMS::affiche("/galerie/periode 2/evenement machin/photo b"); ?> diff --git a/galerie/periode 2/evenement machin/photo c/index.php b/galerie/periode 2/evenement machin/photo c/index.php index 01292b5..80e11b6 100644 --- a/galerie/periode 2/evenement machin/photo c/index.php +++ b/galerie/periode 2/evenement machin/photo c/index.php @@ -2,6 +2,6 @@ require_once("../../../../__cms__/cms.php"); -CMS::affiche($_SERVER[REQUEST_URI]); +CMS::affiche("/galerie/periode 2/evenement machin/photo c"); ?> diff --git a/galerie/periode 2/evenement truc/index.php b/galerie/periode 2/evenement truc/index.php index 44f0cb3..bf088ca 100644 --- a/galerie/periode 2/evenement truc/index.php +++ b/galerie/periode 2/evenement truc/index.php @@ -2,6 +2,6 @@ require_once("../../../__cms__/cms.php"); -CMS::affiche($_SERVER[REQUEST_URI]); +CMS::affiche("/galerie/periode 2/evenement truc"); ?> diff --git a/galerie/periode 2/evenement truc/photo a/index.php b/galerie/periode 2/evenement truc/photo a/index.php index 01292b5..c682129 100644 --- a/galerie/periode 2/evenement truc/photo a/index.php +++ b/galerie/periode 2/evenement truc/photo a/index.php @@ -2,6 +2,6 @@ require_once("../../../../__cms__/cms.php"); -CMS::affiche($_SERVER[REQUEST_URI]); +CMS::affiche("/galerie/periode 2/evenement truc/photo a"); ?> diff --git a/galerie/periode 2/evenement truc/photo b/index.php b/galerie/periode 2/evenement truc/photo b/index.php index 01292b5..73f3cd4 100644 --- a/galerie/periode 2/evenement truc/photo b/index.php +++ b/galerie/periode 2/evenement truc/photo b/index.php @@ -2,6 +2,6 @@ require_once("../../../../__cms__/cms.php"); -CMS::affiche($_SERVER[REQUEST_URI]); +CMS::affiche("/galerie/periode 2/evenement truc/photo b"); ?> diff --git a/galerie/periode 2/evenement truc/photo c/index.php b/galerie/periode 2/evenement truc/photo c/index.php index 01292b5..a4b128f 100644 --- a/galerie/periode 2/evenement truc/photo c/index.php +++ b/galerie/periode 2/evenement truc/photo c/index.php @@ -2,6 +2,6 @@ require_once("../../../../__cms__/cms.php"); -CMS::affiche($_SERVER[REQUEST_URI]); +CMS::affiche("/galerie/periode 2/evenement truc/photo c"); ?> diff --git a/galerie/periode 2/index.php b/galerie/periode 2/index.php index e5a04cf..16b21fc 100644 --- a/galerie/periode 2/index.php +++ b/galerie/periode 2/index.php @@ -2,6 +2,6 @@ require_once("../../__cms__/cms.php"); -CMS::affiche($_SERVER[REQUEST_URI]); +CMS::affiche("/galerie/periode 2"); ?> diff --git a/index.php b/index.php index e28d05c..c3eeb28 100644 --- a/index.php +++ b/index.php @@ -2,6 +2,6 @@ require_once("__cms__/cms.php"); -CMS::affiche($_SERVER[REQUEST_URI]); +CMS::affiche('/'); ?> \ No newline at end of file