From 82328a8a49897d68ade3bf79e55a4b0bdb1630ea 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:15:02 +0000
Subject: [PATCH]

---
 inc/commons/DAO/_common.php                                   | 4 ++++
 .../DAO/class.common.dao.php}                                 | 2 +-
 inc/extranet/DAO/class.extranet.dao.client.php                | 2 +-
 inc/extranet/DAO/class.extranet.dao.devis.php                 | 2 +-
 inc/extranet/DAO/class.extranet.dao.entreprise.php            | 2 +-
 inc/extranet/DAO/class.extranet.dao.equipier.php              | 2 +-
 inc/extranet/DAO/class.extranet.dao.facture.php               | 2 +-
 inc/extranet/DAO/class.extranet.dao.fichier.php               | 2 +-
 inc/extranet/DAO/class.extranet.dao.projet.php                | 2 +-
 inc/extranet/DAO/class.extranet.dao.tache.php                 | 2 +-
 inc/extranet/DAO/class.extranet.dao.timereport.php            | 2 +-
 inc/extranet/DAO/class.extranet.dao.utilisateur.php           | 2 +-
 inc/ws/DAO/class.ws.dao.book.php                              | 2 +-
 inc/ws/DAO/class.ws.dao.document.php                          | 2 +-
 inc/ws/DAO/class.ws.dao.icone.php                             | 2 +-
 inc/ws/DAO/class.ws.dao.lang.php                              | 2 +-
 inc/ws/DAO/class.ws.dao.signature.php                         | 2 +-
 inc/ws/DAO/class.ws.dao.theme.php                             | 2 +-
 18 files changed, 21 insertions(+), 17 deletions(-)
 create mode 100644 inc/commons/DAO/_common.php
 rename inc/{extranet/DAO/class.extranet.dao.php => commons/DAO/class.common.dao.php} (81%)

diff --git a/inc/commons/DAO/_common.php b/inc/commons/DAO/_common.php
new file mode 100644
index 000000000..4427283b8
--- /dev/null
+++ b/inc/commons/DAO/_common.php
@@ -0,0 +1,4 @@
+<?php
+$__autoload['commonDAO'] = dirname(__FILE__) . '/class.common.dao.php';
+
+?>
\ No newline at end of file
diff --git a/inc/extranet/DAO/class.extranet.dao.php b/inc/commons/DAO/class.common.dao.php
similarity index 81%
rename from inc/extranet/DAO/class.extranet.dao.php
rename to inc/commons/DAO/class.common.dao.php
index 30bd39b9e..3315b4ae5 100644
--- a/inc/extranet/DAO/class.extranet.dao.php
+++ b/inc/commons/DAO/class.common.dao.php
@@ -1,5 +1,5 @@
 <?php
-abstract class extranetDAO extends cubeDAO {
+abstract class commonDAO extends cubeDAO {
 	protected $filtres = null;
 	protected $q = null;
 	protected $search_id = true;
diff --git a/inc/extranet/DAO/class.extranet.dao.client.php b/inc/extranet/DAO/class.extranet.dao.client.php
index c407cea53..b4e922660 100644
--- a/inc/extranet/DAO/class.extranet.dao.client.php
+++ b/inc/extranet/DAO/class.extranet.dao.client.php
@@ -1,5 +1,5 @@
 <?php
-class extranetDAOClient extends extranetDAOUtilisateur {
+class extranetDAOClient extends commonDAOUtilisateur {
 	protected function singleton($r, $utilisateur = null)
 	{
 		$utilisateur = new extranetClient();
diff --git a/inc/extranet/DAO/class.extranet.dao.devis.php b/inc/extranet/DAO/class.extranet.dao.devis.php
index 9b48364d2..501ceccda 100644
--- a/inc/extranet/DAO/class.extranet.dao.devis.php
+++ b/inc/extranet/DAO/class.extranet.dao.devis.php
@@ -1,6 +1,6 @@
 <?php
 
-class extranetDAODevis extends extranetDAO {
+class extranetDAODevis extends commonDAO {
 	/**
 	 * extranetDAODevis::singleton()
 	 *
diff --git a/inc/extranet/DAO/class.extranet.dao.entreprise.php b/inc/extranet/DAO/class.extranet.dao.entreprise.php
index b778cf1a4..4fd1b66c0 100644
--- a/inc/extranet/DAO/class.extranet.dao.entreprise.php
+++ b/inc/extranet/DAO/class.extranet.dao.entreprise.php
@@ -1,5 +1,5 @@
 <?php
-class extranetDAOEntreprise extends extranetDAO {
+class extranetDAOEntreprise extends commonDAO {
 	protected function singleton($r)
 	{
 		$entreprise = new extranetEntreprise();
diff --git a/inc/extranet/DAO/class.extranet.dao.equipier.php b/inc/extranet/DAO/class.extranet.dao.equipier.php
index c9276f119..4219fc2e7 100644
--- a/inc/extranet/DAO/class.extranet.dao.equipier.php
+++ b/inc/extranet/DAO/class.extranet.dao.equipier.php
@@ -1,5 +1,5 @@
 <?php
-class extranetDAOEquipier extends extranetDAOUtilisateur {
+class extranetDAOEquipier extends commonDAOUtilisateur {
 	protected function singleton($r)
 	{
 		$utilisateur = new extranetEquipier();
diff --git a/inc/extranet/DAO/class.extranet.dao.facture.php b/inc/extranet/DAO/class.extranet.dao.facture.php
index 2e62a34d6..10ebf22ea 100644
--- a/inc/extranet/DAO/class.extranet.dao.facture.php
+++ b/inc/extranet/DAO/class.extranet.dao.facture.php
@@ -8,7 +8,7 @@
  * @version $Id$
  * @access public
  */
-class extranetDAOFacture extends extranetDAO {
+class extranetDAOFacture extends commonDAO {
 	protected function singleton($r)
 	{
 		$facture = new extranetFacture();
diff --git a/inc/extranet/DAO/class.extranet.dao.fichier.php b/inc/extranet/DAO/class.extranet.dao.fichier.php
index a02c6fa56..49c66da06 100644
--- a/inc/extranet/DAO/class.extranet.dao.fichier.php
+++ b/inc/extranet/DAO/class.extranet.dao.fichier.php
@@ -1,5 +1,5 @@
 <?php
-class extranetDAOFichier extends extranetDAO {
+class extranetDAOFichier extends commonDAO {
 	public $entreprise_id;
 	public function singleton($infos)
 	{
diff --git a/inc/extranet/DAO/class.extranet.dao.projet.php b/inc/extranet/DAO/class.extranet.dao.projet.php
index 44c2236ed..71a13895e 100644
--- a/inc/extranet/DAO/class.extranet.dao.projet.php
+++ b/inc/extranet/DAO/class.extranet.dao.projet.php
@@ -1,5 +1,5 @@
 <?php
-class extranetDAOProjet extends extranetDAO {
+class extranetDAOProjet extends commonDAO {
 	protected function singleton($r)
 	{
 		$projet = new extranetProjet();
diff --git a/inc/extranet/DAO/class.extranet.dao.tache.php b/inc/extranet/DAO/class.extranet.dao.tache.php
index b15310228..ddac57801 100644
--- a/inc/extranet/DAO/class.extranet.dao.tache.php
+++ b/inc/extranet/DAO/class.extranet.dao.tache.php
@@ -1,5 +1,5 @@
 <?php
-class extranetDAOTache extends extranetDAO {
+class extranetDAOTache extends commonDAO {
 	protected function singleton($r)
 	{
 		if ($r->type == 0) {
diff --git a/inc/extranet/DAO/class.extranet.dao.timereport.php b/inc/extranet/DAO/class.extranet.dao.timereport.php
index d59b83326..fa8bf448f 100644
--- a/inc/extranet/DAO/class.extranet.dao.timereport.php
+++ b/inc/extranet/DAO/class.extranet.dao.timereport.php
@@ -1,5 +1,5 @@
 <?php
-class extranetDAOTimereport extends extranetDAO {
+class extranetDAOTimereport extends commonDAO {
 	protected function singleton($r)
 	{
 		$tr = new extranetTimereport();
diff --git a/inc/extranet/DAO/class.extranet.dao.utilisateur.php b/inc/extranet/DAO/class.extranet.dao.utilisateur.php
index 2fca4b8cd..a728463f5 100644
--- a/inc/extranet/DAO/class.extranet.dao.utilisateur.php
+++ b/inc/extranet/DAO/class.extranet.dao.utilisateur.php
@@ -1,5 +1,5 @@
 <?php
-class extranetDAOUtilisateur extends extranetDAO {
+class extranetDAOUtilisateur extends commonDAO {
 	protected function singleton($r, $utilisateur = null)
 	{
 		if (!$r) {
diff --git a/inc/ws/DAO/class.ws.dao.book.php b/inc/ws/DAO/class.ws.dao.book.php
index 1a26893ef..d8d60b739 100644
--- a/inc/ws/DAO/class.ws.dao.book.php
+++ b/inc/ws/DAO/class.ws.dao.book.php
@@ -1,5 +1,5 @@
 <?php
-class wsDAOBook extends extranetDAO {
+class wsDAOBook extends commonDAO {
 	protected function singleton($r)
 	{
 		$book = new wsBook();
diff --git a/inc/ws/DAO/class.ws.dao.document.php b/inc/ws/DAO/class.ws.dao.document.php
index 847e8c364..8d405e6ab 100644
--- a/inc/ws/DAO/class.ws.dao.document.php
+++ b/inc/ws/DAO/class.ws.dao.document.php
@@ -1,5 +1,5 @@
 <?php
-class wsDAODocument extends extranetDAO {
+class wsDAODocument extends commonDAO {
 	public static $normal = array('document_id', 'file', 'proprietaire', 'pages', 'date', 'numberSections');
 	public static $complex = array('localInfos', 'bookmarks', 'generalInfos', 'conversionInfos', 'trim');
 
diff --git a/inc/ws/DAO/class.ws.dao.icone.php b/inc/ws/DAO/class.ws.dao.icone.php
index e773126fb..37020daa0 100644
--- a/inc/ws/DAO/class.ws.dao.icone.php
+++ b/inc/ws/DAO/class.ws.dao.icone.php
@@ -1,5 +1,5 @@
 <?php
-class wsDAOIcone extends cubeDAO {
+class wsDAOIcone extends commonDAO {
 	public function singleton($r)
 	{
 		$icone = new wsIcone();
diff --git a/inc/ws/DAO/class.ws.dao.lang.php b/inc/ws/DAO/class.ws.dao.lang.php
index 3f432c0f1..13a0ac2c8 100644
--- a/inc/ws/DAO/class.ws.dao.lang.php
+++ b/inc/ws/DAO/class.ws.dao.lang.php
@@ -1,5 +1,5 @@
 <?php
-class wsDAOLang extends extranetDAO {
+class wsDAOLang extends commonDAO {
 	protected function singleton($r)
 	{
 		$lang = new wsLang();
diff --git a/inc/ws/DAO/class.ws.dao.signature.php b/inc/ws/DAO/class.ws.dao.signature.php
index 327395c8e..3ed7746ac 100644
--- a/inc/ws/DAO/class.ws.dao.signature.php
+++ b/inc/ws/DAO/class.ws.dao.signature.php
@@ -1,5 +1,5 @@
 <?php
-class wsDAOSignature extends extranetDAO {
+class wsDAOSignature extends commonDAO {
 	protected function singleton($r)
 	{
 		$signature = new wsSignature();
diff --git a/inc/ws/DAO/class.ws.dao.theme.php b/inc/ws/DAO/class.ws.dao.theme.php
index 937a45f46..be19a1a61 100644
--- a/inc/ws/DAO/class.ws.dao.theme.php
+++ b/inc/ws/DAO/class.ws.dao.theme.php
@@ -1,5 +1,5 @@
 <?php
-class wsDAOTheme extends extranetDAO {
+class wsDAOTheme extends commonDAO {
 	protected function singleton($r)
 	{
 		$theme = new wsTheme();
-- 
2.39.5