From b97e0fe6e5a75559807170a0483e9b35360f9cd5 Mon Sep 17 00:00:00 2001
From: "vincent@cubedesigners.com"
 <vincent@cubedesigners.com@f5622870-0f3c-0410-866d-9cb505b7a8ef>
Date: Mon, 17 Jan 2011 09:05:40 +0000
Subject: [PATCH]

---
 inc/commons/_common.php                                   | 8 ++++++++
 .../class.common.core.php}                                | 2 +-
 .../class.common.filtre.php}                              | 2 +-
 .../class.common.page.php}                                | 2 +-
 .../class.common.shortcuts.php}                           | 2 +-
 inc/extranet/Controlleur/_common.php                      | 4 ----
 inc/prepend.php                                           | 4 +++-
 7 files changed, 15 insertions(+), 9 deletions(-)
 rename inc/{extranet/Controlleur/class.extranet.core.php => commons/class.common.core.php} (97%)
 rename inc/{extranet/Controlleur/class.extranet.filtre.php => commons/class.common.filtre.php} (96%)
 rename inc/{extranet/Controlleur/class.extranet.page.php => commons/class.common.page.php} (96%)
 rename inc/{extranet/Controlleur/class.extranet.shortcuts.php => commons/class.common.shortcuts.php} (93%)

diff --git a/inc/commons/_common.php b/inc/commons/_common.php
index e69de29bb..86877015f 100644
--- a/inc/commons/_common.php
+++ b/inc/commons/_common.php
@@ -0,0 +1,8 @@
+<?php
+// Common
+$__autoload['commonCore'] = dirname(__FILE__) . '/class.common.core.php';
+$__autoload['commonPage'] = dirname(__FILE__) . '/class.common.page.php';
+$__autoload['commonFiltre'] = dirname(__FILE__) . '/class.extranet.filtre.php';
+$__autoload['commonShortcuts'] = dirname(__FILE__) . '/class.extranet.shortcuts.php';
+
+?>
\ No newline at end of file
diff --git a/inc/extranet/Controlleur/class.extranet.core.php b/inc/commons/class.common.core.php
similarity index 97%
rename from inc/extranet/Controlleur/class.extranet.core.php
rename to inc/commons/class.common.core.php
index d728b1d0b..5ade1adbd 100644
--- a/inc/extranet/Controlleur/class.extranet.core.php
+++ b/inc/commons/class.common.core.php
@@ -1,5 +1,5 @@
 <?php
-class extranetCore extends cubeCore {
+class commonCore extends cubeCore {
 	public $grades;
 	public $user;
 	public $agences;
diff --git a/inc/extranet/Controlleur/class.extranet.filtre.php b/inc/commons/class.common.filtre.php
similarity index 96%
rename from inc/extranet/Controlleur/class.extranet.filtre.php
rename to inc/commons/class.common.filtre.php
index b8fed388c..f5d555b43 100644
--- a/inc/extranet/Controlleur/class.extranet.filtre.php
+++ b/inc/commons/class.common.filtre.php
@@ -1,5 +1,5 @@
 <?php
-class extranetFiltre {
+class commonFiltre {
 	public $titre;
 	public $varname;
 	public $settings;
diff --git a/inc/extranet/Controlleur/class.extranet.page.php b/inc/commons/class.common.page.php
similarity index 96%
rename from inc/extranet/Controlleur/class.extranet.page.php
rename to inc/commons/class.common.page.php
index 4d870264c..2b3f26434 100644
--- a/inc/extranet/Controlleur/class.extranet.page.php
+++ b/inc/commons/class.common.page.php
@@ -1,5 +1,5 @@
 <?php
-class extranetPage {
+class commonPage {
 	public static function header($args)
 	{
 		global $js;
diff --git a/inc/extranet/Controlleur/class.extranet.shortcuts.php b/inc/commons/class.common.shortcuts.php
similarity index 93%
rename from inc/extranet/Controlleur/class.extranet.shortcuts.php
rename to inc/commons/class.common.shortcuts.php
index 13b118381..2c9350eb3 100644
--- a/inc/extranet/Controlleur/class.extranet.shortcuts.php
+++ b/inc/commons/class.common.shortcuts.php
@@ -1,6 +1,6 @@
 <?php
 
-class extranetShortcuts {
+class commonShortcuts {
 	public $titre;
 	public $values;
 	public $selectedValue;
diff --git a/inc/extranet/Controlleur/_common.php b/inc/extranet/Controlleur/_common.php
index d1da641e7..33ca12152 100644
--- a/inc/extranet/Controlleur/_common.php
+++ b/inc/extranet/Controlleur/_common.php
@@ -1,12 +1,8 @@
 <?php
 // Extranet
-$__autoload['extranetCore'] = dirname(__FILE__) . '/class.extranet.core.php';
 $__autoload['extranetAjax'] = dirname(__FILE__) . '/class.extranet.ajax.php';
-$__autoload['extranetPage'] = dirname(__FILE__) . '/class.extranet.page.php';
 $__autoload['extranetUrl'] = dirname(__FILE__) . '/class.extranet.url.php';
 $__autoload['extranetDroits'] = dirname(__FILE__) . '/class.extranet.droits.php';
-$__autoload['extranetFiltre'] = dirname(__FILE__) . '/class.extranet.filtre.php';
-$__autoload['extranetShortcuts'] = dirname(__FILE__) . '/class.extranet.shortcuts.php';
 $__autoload['extranetPageChiffres'] = dirname(__FILE__) . '/class.extranet.page.chiffres.php';
 
 ?>
\ No newline at end of file
diff --git a/inc/prepend.php b/inc/prepend.php
index 5b90bad76..ab95b87af 100644
--- a/inc/prepend.php
+++ b/inc/prepend.php
@@ -3,6 +3,8 @@
 require_once(dirname(__FILE__) . '/config.inc.php');
 // Chargement de la classe cube
 require_once(dirname(__FILE__) . '/cube/_common.php');
+// Inclusion des classes communes
+require_once(dirname(__FILE__) . '/commons/_common.php');
 // Inclusion des classes propres à l'extranet et à la DAO
 require_once(dirname(__FILE__) . '/extranet/Metier/_common.php');
 require_once(dirname(__FILE__) . '/extranet/Controlleur/_common.php');
@@ -20,7 +22,7 @@ if (MODE == 'extranet') {
 	$GLOBALS['ajaxClasses'][] = 'extranetAjax';
 }
 // Instantiation de la classe de contrôle
-$core = new extranetCore();
+$core = new commonCore();
 // Définition des handlers des urls
 $core->url->registerDefault(array('extranetUrl', 'home'));
 $core->url->register('ajax', 'ajax', '^ajax(.*)$', array('cubeAjax', 'ajax'));
-- 
2.39.5