(no commit message)

diff --git a/inc/commons/DAO/_common.php b/inc/commons/DAO/_common.php
new file mode 100644 (file)
index 0000000..4427283
--- /dev/null
+++ b/inc/commons/DAO/_common.php
@@ -0,0 +1,4 @@
+<?php\r
+$__autoload['commonDAO'] = dirname(__FILE__) . '/class.common.dao.php';\r
+\r
+?>
\ No newline at end of file

diff --git a/inc/commons/DAO/class.common.dao.php b/inc/commons/DAO/class.common.dao.php
new file mode 100644 (file)
index 0000000..3315b4a
--- /dev/null
+++ b/inc/commons/DAO/class.common.dao.php
@@ -0,0 +1,19 @@
+<?php\r
+abstract class commonDAO extends cubeDAO {\r
+       protected $filtres = null;\r
+       protected $q = null;\r
+       protected $search_id = true;\r
+\r
+       public function setFiltres($filtres)\r
+       {\r
+               $this->filtres = $filtres;\r
+       }\r
+\r
+       public function setSearch($q, $search_id = true)\r
+       {\r
+               $this->q = mb_strtolower($q);\r
+               $this->search_id = $search_id;\r
+       }\r
+}\r
+\r
+?>
\ No newline at end of file

diff --git a/inc/extranet/DAO/class.extranet.dao.client.php b/inc/extranet/DAO/class.extranet.dao.client.php
index c407cea53699c69631165362e40eb1491af1a4de..b4e92266091c7845d750b832eab3dd53902a19bb 100644 (file)
--- a/inc/extranet/DAO/class.extranet.dao.client.php
+++ b/inc/extranet/DAO/class.extranet.dao.client.php
@@ -1,5 +1,5 @@
 <?php\r
-class extranetDAOClient extends extranetDAOUtilisateur {\r
+class extranetDAOClient extends commonDAOUtilisateur {\r
        protected function singleton($r, $utilisateur = null)\r
        {\r
                $utilisateur = new extranetClient();\r

diff --git a/inc/extranet/DAO/class.extranet.dao.devis.php b/inc/extranet/DAO/class.extranet.dao.devis.php
index 9b48364d2b95c692f1a3d5f8ac408070cddfe459..501ceccda616cde485c465fb8ea0cd5cb13079e6 100644 (file)
--- a/inc/extranet/DAO/class.extranet.dao.devis.php
+++ b/inc/extranet/DAO/class.extranet.dao.devis.php
@@ -1,6 +1,6 @@
 <?php\r
 \r
-class extranetDAODevis extends extranetDAO {\r
+class extranetDAODevis extends commonDAO {\r
        /**\r
         * extranetDAODevis::singleton()\r
         *\r

diff --git a/inc/extranet/DAO/class.extranet.dao.entreprise.php b/inc/extranet/DAO/class.extranet.dao.entreprise.php
index b778cf1a4ec55d766de82feb5fc7097245a32a72..4fd1b66c0b8a70d88ff6d686a778d8fb303b8ce4 100644 (file)
--- a/inc/extranet/DAO/class.extranet.dao.entreprise.php
+++ b/inc/extranet/DAO/class.extranet.dao.entreprise.php
@@ -1,5 +1,5 @@
 <?php\r
-class extranetDAOEntreprise extends extranetDAO {\r
+class extranetDAOEntreprise extends commonDAO {\r
        protected function singleton($r)\r
        {\r
                $entreprise = new extranetEntreprise();\r

diff --git a/inc/extranet/DAO/class.extranet.dao.equipier.php b/inc/extranet/DAO/class.extranet.dao.equipier.php
index c9276f119415edcff40573a46d4a72398adcf91f..4219fc2e7ed2d8754c0ba739e7a81f38d2d5310f 100644 (file)
--- a/inc/extranet/DAO/class.extranet.dao.equipier.php
+++ b/inc/extranet/DAO/class.extranet.dao.equipier.php
@@ -1,5 +1,5 @@
 <?php\r
-class extranetDAOEquipier extends extranetDAOUtilisateur {\r
+class extranetDAOEquipier extends commonDAOUtilisateur {\r
        protected function singleton($r)\r
        {\r
                $utilisateur = new extranetEquipier();\r

diff --git a/inc/extranet/DAO/class.extranet.dao.facture.php b/inc/extranet/DAO/class.extranet.dao.facture.php
index 2e62a34d65e3df07d1d4642fe560421cf0efd4ba..10ebf22ea4de4437405e83070691f3b3e380d515 100644 (file)
--- a/inc/extranet/DAO/class.extranet.dao.facture.php
+++ b/inc/extranet/DAO/class.extranet.dao.facture.php
@@ -8,7 +8,7 @@
  * @version $Id$\r
  * @access public\r
  */\r
-class extranetDAOFacture extends extranetDAO {\r
+class extranetDAOFacture extends commonDAO {\r
        protected function singleton($r)\r
        {\r
                $facture = new extranetFacture();\r

diff --git a/inc/extranet/DAO/class.extranet.dao.fichier.php b/inc/extranet/DAO/class.extranet.dao.fichier.php
index a02c6fa568d0f23a48b0ab21d7e0f2c13369f9fc..49c66da068158bdc82283b42d3074bd38d974edb 100644 (file)
--- a/inc/extranet/DAO/class.extranet.dao.fichier.php
+++ b/inc/extranet/DAO/class.extranet.dao.fichier.php
@@ -1,5 +1,5 @@
 <?php\r
-class extranetDAOFichier extends extranetDAO {\r
+class extranetDAOFichier extends commonDAO {\r
        public $entreprise_id;\r
        public function singleton($infos)\r
        {\r

diff --git a/inc/extranet/DAO/class.extranet.dao.php b/inc/extranet/DAO/class.extranet.dao.php
deleted file mode 100644 (file)
index 30bd39b..0000000
--- a/inc/extranet/DAO/class.extranet.dao.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php\r
-abstract class extranetDAO extends cubeDAO {\r
-       protected $filtres = null;\r
-       protected $q = null;\r
-       protected $search_id = true;\r
-\r
-       public function setFiltres($filtres)\r
-       {\r
-               $this->filtres = $filtres;\r
-       }\r
-\r
-       public function setSearch($q, $search_id = true)\r
-       {\r
-               $this->q = mb_strtolower($q);\r
-               $this->search_id = $search_id;\r
-       }\r
-}\r
-\r
-?>
\ No newline at end of file

diff --git a/inc/extranet/DAO/class.extranet.dao.projet.php b/inc/extranet/DAO/class.extranet.dao.projet.php
index 44c2236ede644c7a4de6f2d62f99645161faa9de..71a13895ebc1f9542a1c0bda445541c89fd9a884 100644 (file)
--- a/inc/extranet/DAO/class.extranet.dao.projet.php
+++ b/inc/extranet/DAO/class.extranet.dao.projet.php
@@ -1,5 +1,5 @@
 <?php\r
-class extranetDAOProjet extends extranetDAO {\r
+class extranetDAOProjet extends commonDAO {\r
        protected function singleton($r)\r
        {\r
                $projet = new extranetProjet();\r

diff --git a/inc/extranet/DAO/class.extranet.dao.tache.php b/inc/extranet/DAO/class.extranet.dao.tache.php
index b15310228c990b81e42685f95d08417bdd230e38..ddac578017a029e5ef5ca0e630f2c93417801d68 100644 (file)
--- a/inc/extranet/DAO/class.extranet.dao.tache.php
+++ b/inc/extranet/DAO/class.extranet.dao.tache.php
@@ -1,5 +1,5 @@
 <?php\r
-class extranetDAOTache extends extranetDAO {\r
+class extranetDAOTache extends commonDAO {\r
        protected function singleton($r)\r
        {\r
                if ($r->type == 0) {\r

diff --git a/inc/extranet/DAO/class.extranet.dao.timereport.php b/inc/extranet/DAO/class.extranet.dao.timereport.php
index d59b8332603f0d322141f020bdf7ed1f0fe65722..fa8bf448fdc72b882c0ad676f7c3349ab2eceee3 100644 (file)
--- a/inc/extranet/DAO/class.extranet.dao.timereport.php
+++ b/inc/extranet/DAO/class.extranet.dao.timereport.php
@@ -1,5 +1,5 @@
 <?php\r
-class extranetDAOTimereport extends extranetDAO {\r
+class extranetDAOTimereport extends commonDAO {\r
        protected function singleton($r)\r
        {\r
                $tr = new extranetTimereport();\r

diff --git a/inc/extranet/DAO/class.extranet.dao.utilisateur.php b/inc/extranet/DAO/class.extranet.dao.utilisateur.php
index 2fca4b8cd78910646f720fb9ffbb65e006c64a7c..a728463f54fa0c59de8d66cf944a820b4606ebe3 100644 (file)
--- a/inc/extranet/DAO/class.extranet.dao.utilisateur.php
+++ b/inc/extranet/DAO/class.extranet.dao.utilisateur.php
@@ -1,5 +1,5 @@
 <?php\r
-class extranetDAOUtilisateur extends extranetDAO {\r
+class extranetDAOUtilisateur extends commonDAO {\r
        protected function singleton($r, $utilisateur = null)\r
        {\r
                if (!$r) {\r

diff --git a/inc/ws/DAO/class.ws.dao.book.php b/inc/ws/DAO/class.ws.dao.book.php
index 1a26893eff0a7e2bf25366d98d556ac79df597fd..d8d60b73987ce4d4d2c29932f59e27d5a673be54 100644 (file)
--- a/inc/ws/DAO/class.ws.dao.book.php
+++ b/inc/ws/DAO/class.ws.dao.book.php
@@ -1,5 +1,5 @@
 <?php\r
-class wsDAOBook extends extranetDAO {\r
+class wsDAOBook extends commonDAO {\r
        protected function singleton($r)\r
        {\r
                $book = new wsBook();\r

diff --git a/inc/ws/DAO/class.ws.dao.document.php b/inc/ws/DAO/class.ws.dao.document.php
index 847e8c364d3a10adf16b8f9ba9c2a06162ab20f6..8d405e6abbdc529d7f6dc8823dbaea2066fff525 100644 (file)
--- a/inc/ws/DAO/class.ws.dao.document.php
+++ b/inc/ws/DAO/class.ws.dao.document.php
@@ -1,5 +1,5 @@
 <?php\r
-class wsDAODocument extends extranetDAO {\r
+class wsDAODocument extends commonDAO {\r
        public static $normal = array('document_id', 'file', 'proprietaire', 'pages', 'date', 'numberSections');\r
        public static $complex = array('localInfos', 'bookmarks', 'generalInfos', 'conversionInfos', 'trim');\r
 \r

diff --git a/inc/ws/DAO/class.ws.dao.icone.php b/inc/ws/DAO/class.ws.dao.icone.php
index e773126fb5da0c5be288717b5e1bca471fd0e299..37020daa0ec803851f3aef44f9627a05f6c4d211 100644 (file)
--- a/inc/ws/DAO/class.ws.dao.icone.php
+++ b/inc/ws/DAO/class.ws.dao.icone.php
@@ -1,5 +1,5 @@
 <?php\r
-class wsDAOIcone extends cubeDAO {\r
+class wsDAOIcone extends commonDAO {\r
        public function singleton($r)\r
        {\r
                $icone = new wsIcone();\r

diff --git a/inc/ws/DAO/class.ws.dao.lang.php b/inc/ws/DAO/class.ws.dao.lang.php
index 3f432c0f167c6b030386553087bedff6a88686a6..13a0ac2c86bf50e8e25f0cf999d683006af00cfe 100644 (file)
--- a/inc/ws/DAO/class.ws.dao.lang.php
+++ b/inc/ws/DAO/class.ws.dao.lang.php
@@ -1,5 +1,5 @@
 <?php\r
-class wsDAOLang extends extranetDAO {\r
+class wsDAOLang extends commonDAO {\r
        protected function singleton($r)\r
        {\r
                $lang = new wsLang();\r

diff --git a/inc/ws/DAO/class.ws.dao.signature.php b/inc/ws/DAO/class.ws.dao.signature.php
index 327395c8ea226872fd68630be510687c99e6895a..3ed7746ac7926569c912c7c23da3319522572924 100644 (file)
--- a/inc/ws/DAO/class.ws.dao.signature.php
+++ b/inc/ws/DAO/class.ws.dao.signature.php
@@ -1,5 +1,5 @@
 <?php\r
-class wsDAOSignature extends extranetDAO {\r
+class wsDAOSignature extends commonDAO {\r
        protected function singleton($r)\r
        {\r
                $signature = new wsSignature();\r

diff --git a/inc/ws/DAO/class.ws.dao.theme.php b/inc/ws/DAO/class.ws.dao.theme.php
index 937a45f46c3c1ff15e6455af5298b7721248349a..be19a1a61522b96fa59be0eafc48989a4a08cc2d 100644 (file)
--- a/inc/ws/DAO/class.ws.dao.theme.php
+++ b/inc/ws/DAO/class.ws.dao.theme.php
@@ -1,5 +1,5 @@
 <?php\r
-class wsDAOTheme extends extranetDAO {\r
+class wsDAOTheme extends commonDAO {\r
        protected function singleton($r)\r
        {\r
                $theme = new wsTheme();\r