(no commit message)

diff --git a/inc/commons/DAO/_common.php b/inc/commons/DAO/_common.php
index 443da0785a31f8f52dfd846014bbef238a6cea32..d554fefdaccf05a5d86ccfe6e9c903c415ae791e 100644 (file)
--- a/inc/commons/DAO/_common.php
+++ b/inc/commons/DAO/_common.php
@@ -1,4 +1,5 @@
 <?php\r
 $__autoload['commonDAO'] = dirname(__FILE__) . '/class.common.dao.php';\r
-$__autoload['commonDAOUtilisateur']=dirname(__FILE__).'/class.commmon.dao.utilisateur.php';\r
+$__autoload['commonDAOUtilisateur']=dirname(__FILE__).'/class.common.dao.utilisateur.php';\r
+$__autoload['commonDAOEquipier']=dirname(__FILE__).'/class.common.dao.equipier.php';\r
 ?>
\ No newline at end of file

diff --git a/inc/commons/DAO/class.common.dao.equipier.php b/inc/commons/DAO/class.common.dao.equipier.php
new file mode 100644 (file)
index 0000000..c04acda
--- /dev/null
+++ b/inc/commons/DAO/class.common.dao.equipier.php
@@ -0,0 +1,47 @@
+<?php\r
+class commonDAOEquipier extends commonDAOUtilisateur {\r
+       protected function singleton($r)\r
+       {\r
+               $utilisateur = new extranetEquipier();\r
+               $utilisateur->utilisateur_id = $r->utilisateur_id;\r
+               $utilisateur->agence = $r->agence;\r
+               return parent::singleton($r);\r
+       }\r
+\r
+       public function cree($utilisateur = null)\r
+       {\r
+               $utilisateur = new extranetEquipier();\r
+               $utilisateur->agence = 'Paris';\r
+               $utilisateur->grade = 1;\r
+               return parent::cree($utilisateur);\r
+       }\r
+\r
+       public function selectById($equipier_id)\r
+       {\r
+               $r = $this->con->select('SELECT * FROM equipiers WHERE utilisateur_id=' . $this->core->con->escape($equipier_id) . ' LIMIT 1');\r
+               return $this->singleton($r);\r
+       }\r
+\r
+       public function selectAll(){\r
+               $r=$this->con->select('SELECT * FROM equipiers');\r
+               return $this->factory($r);\r
+       }\r
+\r
+       public function getListe($q = null, $orderby = null, $sens = null, $limit = null, $search_id = true)\r
+       {\r
+               global $core;\r
+\r
+               $sql = $this->getQueryList('equipiers', $q, $orderby, $sens, $limit, $search_id);\r
+\r
+               $r = $this->con->select($sql);\r
+               return $this->factory($r);\r
+       }\r
+\r
+       public function count()\r
+       {\r
+               $r = $this->con->select('SELECT COUNT(*) AS nb FROM equipiers');\r
+               return $r->nb;\r
+       }\r
+}\r
+\r
+?>
\ No newline at end of file

diff --git a/inc/extranet/DAO/class.extranet.dao.equipier.php b/inc/extranet/DAO/class.extranet.dao.equipier.php
deleted file mode 100644 (file)
index 4219fc2..0000000
--- a/inc/extranet/DAO/class.extranet.dao.equipier.php
+++ /dev/null
@@ -1,47 +0,0 @@
-<?php\r
-class extranetDAOEquipier extends commonDAOUtilisateur {\r
-       protected function singleton($r)\r
-       {\r
-               $utilisateur = new extranetEquipier();\r
-               $utilisateur->utilisateur_id = $r->utilisateur_id;\r
-               $utilisateur->agence = $r->agence;\r
-               return parent::singleton($r);\r
-       }\r
-\r
-       public function cree($utilisateur = null)\r
-       {\r
-               $utilisateur = new extranetEquipier();\r
-               $utilisateur->agence = 'Paris';\r
-               $utilisateur->grade = 1;\r
-               return parent::cree($utilisateur);\r
-       }\r
-\r
-       public function selectById($equipier_id)\r
-       {\r
-               $r = $this->con->select('SELECT * FROM equipiers WHERE utilisateur_id=' . $this->core->con->escape($equipier_id) . ' LIMIT 1');\r
-               return $this->singleton($r);\r
-       }\r
-\r
-       public function selectAll(){\r
-               $r=$this->con->select('SELECT * FROM equipiers');\r
-               return $this->factory($r);\r
-       }\r
-\r
-       public function getListe($q = null, $orderby = null, $sens = null, $limit = null, $search_id = true)\r
-       {\r
-               global $core;\r
-\r
-               $sql = $this->getQueryList('equipiers', $q, $orderby, $sens, $limit, $search_id);\r
-\r
-               $r = $this->con->select($sql);\r
-               return $this->factory($r);\r
-       }\r
-\r
-       public function count()\r
-       {\r
-               $r = $this->con->select('SELECT COUNT(*) AS nb FROM equipiers');\r
-               return $r->nb;\r
-       }\r
-}\r
-\r
-?>
\ No newline at end of file