From 69c7f1122285753e50babaed5eb005214e2fc818 Mon Sep 17 00:00:00 2001
From: "vincent@cubedesigners.com"
 <vincent@cubedesigners.com@f5622870-0f3c-0410-866d-9cb505b7a8ef>
Date: Mon, 17 Jan 2011 10:21:47 +0000
Subject: [PATCH]

---
 inc/commons/DAO/_common.php                              | 2 +-
 .../DAO/class.common.dao.utilisateur.php}                | 2 +-
 inc/extranet/_common.php                                 | 9 +++++----
 inc/ws/_common.php                                       | 8 ++++----
 4 files changed, 11 insertions(+), 10 deletions(-)
 rename inc/{extranet/DAO/class.extranet.dao.utilisateur.php => commons/DAO/class.common.dao.utilisateur.php} (96%)

diff --git a/inc/commons/DAO/_common.php b/inc/commons/DAO/_common.php
index 4427283b8..443da0785 100644
--- a/inc/commons/DAO/_common.php
+++ b/inc/commons/DAO/_common.php
@@ -1,4 +1,4 @@
 <?php
 $__autoload['commonDAO'] = dirname(__FILE__) . '/class.common.dao.php';
-
+$__autoload['commonDAOUtilisateur']=dirname(__FILE__).'/class.commmon.dao.utilisateur.php';
 ?>
\ No newline at end of file
diff --git a/inc/extranet/DAO/class.extranet.dao.utilisateur.php b/inc/commons/DAO/class.common.dao.utilisateur.php
similarity index 96%
rename from inc/extranet/DAO/class.extranet.dao.utilisateur.php
rename to inc/commons/DAO/class.common.dao.utilisateur.php
index a728463f5..e80103347 100644
--- a/inc/extranet/DAO/class.extranet.dao.utilisateur.php
+++ b/inc/commons/DAO/class.common.dao.utilisateur.php
@@ -1,5 +1,5 @@
 <?php
-class extranetDAOUtilisateur extends commonDAO {
+class commonDAOUtilisateur extends commonDAO {
 	protected function singleton($r, $utilisateur = null)
 	{
 		if (!$r) {
diff --git a/inc/extranet/_common.php b/inc/extranet/_common.php
index 8edc39f20..5eb1cbfeb 100644
--- a/inc/extranet/_common.php
+++ b/inc/extranet/_common.php
@@ -1,9 +1,10 @@
 <?php
-$GLOBALS['ajaxClasses'][] = 'extranetAjax';
 // 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');
-require_once(dirname(__FILE__) . '/extranet/DAO/_common.php');
+require_once(dirname(__FILE__) . '/Metier/_common.php');
+require_once(dirname(__FILE__) . '/Controlleur/_common.php');
+require_once(dirname(__FILE__) . '/DAO/_common.php');
+
+$GLOBALS['ajaxClasses'][] = 'extranetAjax';
 
 $core->url->register('cleanDownload', 'cleanDownload', '^cleanDownload$', array('extranetUrl', 'cleanDownload'));
 
diff --git a/inc/ws/_common.php b/inc/ws/_common.php
index 442d76bc5..f87e3052a 100644
--- a/inc/ws/_common.php
+++ b/inc/ws/_common.php
@@ -1,10 +1,10 @@
 <?php
+// Inclusion des classes propres au Fluidbook Workshop
+require_once(dirname(__FILE__) . '/Metier/_common.php');
+require_once(dirname(__FILE__) . '/Controlleur/_common.php');
+require_once(dirname(__FILE__) . '/DAO/_common.php');
 
 $GLOBALS['ajaxClasses'][] = 'wsAjax';
-// Inclusion des classes propres au Fluidbook Workshop
-require_once(dirname(__FILE__) . '/ws/Metier/_common.php');
-require_once(dirname(__FILE__) . '/ws/Controlleur/_common.php');
-require_once(dirname(__FILE__) . '/ws/DAO/_common.php');
 
 $core->url->register('flash', 'flash', '^flash(.*)$', array('wsFlash', 'in'));
 $core->url->register('services', 'services', '^services(.*)$', array('wsServices', 'in'));
-- 
2.39.5