(no commit message)

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

diff --git a/inc/commons/Metier/class.common.utilisateur.php b/inc/commons/Metier/class.common.utilisateur.php
new file mode 100644 (file)
index 0000000..c29fd62
--- /dev/null
+++ b/inc/commons/Metier/class.common.utilisateur.php
@@ -0,0 +1,102 @@
+<?php\r
+class commonUtilisateur extends cubeMetier {\r
+       protected $utilisateur_id;\r
+       protected $connected;\r
+       protected $email;\r
+       protected $login;\r
+       protected $password;\r
+       protected $nom;\r
+       protected $prenom;\r
+       protected $adresse;\r
+       protected $code_postal;\r
+       protected $ville;\r
+       protected $pays;\r
+       protected $telephone;\r
+       protected $mobile;\r
+       protected $fax;\r
+       protected $date_creation;\r
+       protected $grade;\r
+       protected $settings;\r
+       protected $notes;\r
+       protected $lang;\r
+       protected $entreprise;\r
+       protected $tva_intra;\r
+       protected $rs;\r
+       protected $collegues;\r
+       protected $ws_admin;\r
+       protected $ws_grade;\r
+       protected $ws_settings;\r
+\r
+       public function getEmail()\r
+       {\r
+               return trim($this->prenom . ' ' . $this->nom . '<' . $this->email . '>');\r
+       }\r
+\r
+       public function changeSettings($rubrique, $element, $valeur)\r
+       {\r
+               $this->settings['search'][$rubrique][$element] = $valeur;\r
+       }\r
+\r
+       public function getSettings($liste)\r
+       {\r
+               $cles = array('clients' => 'entreprise_id', 'equipiers' => 'utilisateur_id', 'devis' => 'devis_id', 'projets' => 'projet_id', 'factures' => 'facture_id', 'timereport' => 'projet_id', 'fichiers' => 'nom', 'books' => 'book_id');\r
+               if (!isset($this->settings['search'][$liste]) || !is_array($this->settings['search'][$liste])) {\r
+                       $this->settings['search'][$liste] = array();\r
+               }\r
+               if (!isset($this->settings['search'][$liste]['sens'])) {\r
+                       $this->settings['search'][$liste]['sens'] = 'DESC';\r
+               }\r
+               if (!isset($this->settings['search'][$liste]['orderby'])) {\r
+                       $this->settings['search'][$liste]['orderby'] = $cles[$liste];\r
+               }\r
+               if (!isset($this->settings['search'][$liste]['page'])) {\r
+                       $this->settings['search'][$liste]['page'] = 1;\r
+               }\r
+\r
+               $this->settings['search'][$liste]['search'] = isset($_SESSION['q'])?$_SESSION['q']:null;\r
+\r
+               if (!isset($this->settings['search'][$liste]['par_page'])) {\r
+                       if ($liste == 'projets' || $liste == 'projets_timereport') {\r
+                               $this->settings['search'][$liste]['par_page'] = 15;\r
+                       } else {\r
+                               $this->settings['search'][$liste]['par_page'] = 25;\r
+                       }\r
+               }\r
+               if (!isset($this->settings['search'][$liste]['filtres'])) {\r
+                       $this->settings['search'][$liste]['filtres'] = null;\r
+               }\r
+\r
+               $page = $this->settings['search'][$liste]['page'];\r
+               $this->settings['search'][$liste]['page'] = $page?$page:1;\r
+               $par_page = $this->settings['search'][$liste]['par_page'];\r
+               if ($par_page > 0) {\r
+                       $this->settings['search'][$liste]['limit'] = array(($page-1) * $par_page, $par_page);\r
+               } else {\r
+                       $this->settings['search'][$liste]['limit'] = null;\r
+               }\r
+               $this->settings['search'][$liste]['table'] = $liste;\r
+\r
+               return $this->settings['search'][$liste];\r
+       }\r
+\r
+       public function getLastPrint()\r
+       {\r
+               if (!isset($this->settings['lastprint'])) {\r
+                       $this->settings['lastprint'] = array('pages' => '', 'date' => 0);\r
+               }\r
+               return $this->settings['lastprint'];\r
+       }\r
+\r
+       public function saveLastPrint($pages)\r
+       {\r
+               $this->settings['lastprint']['pages'] = $pages;\r
+               $this->settings['lastprint']['date'] = TIME;\r
+       }\r
+\r
+       public function __toString()\r
+       {\r
+               return trim($this->prenom . ' ' . $this->nom);\r
+       }\r
+}\r
+\r
+?>
\ No newline at end of file

diff --git a/inc/commons/_common.php b/inc/commons/_common.php
index 3c4f373418dc78183c5b278d9e1206cbde7d114d..c4b50d0aaccbad71fb9683704513344a79de174f 100644 (file)
--- a/inc/commons/_common.php
+++ b/inc/commons/_common.php
@@ -1,5 +1,6 @@
 <?php\r
 require_once(dirname(__FILE__) . '/DAO/_common.php');\r
+require_once(dirname(__FILE__) . '/Metier/_common.php');\r
 // Common\r
 $__autoload['commonCore'] = dirname(__FILE__) . '/class.common.core.php';\r
 $__autoload['commonPage'] = dirname(__FILE__) . '/class.common.page.php';\r

diff --git a/inc/commons/class.common.core.php b/inc/commons/class.common.core.php
index 59b6d241e9013f2384c3546e0374d4adfe3fb2f3..88f85d6f3f46de59f33dd7a5e6172e36698eaf41 100644 (file)
--- a/inc/commons/class.common.core.php
+++ b/inc/commons/class.common.core.php
@@ -70,7 +70,7 @@ class commonCore extends cubeCore {
                // Les variables sont présentes on vérifie la validité des informations\r
                // Dans la base de données\r
                // Utilisateur connecté à l'interface\r
-               $dao = new extranetDAOUtilisateur($this->con);\r
+               $dao = new commonExtranetUtilisateur($this->con);\r
                $this->user = $dao->selectByLoginPassword($_SESSION['user_email'], $_SESSION['user_password']);\r
                if ($this->user == false) {\r
                        $_SESSION['errorLogin'] = true;\r
@@ -487,7 +487,7 @@ class commonCore extends cubeCore {
 \r
        public function sauvePreferencesUtilisateur()\r
        {\r
-               $dao = new extranetDAOUtilisateur($this->con);\r
+               $dao = new commonExtranetUtilisateur($this->con);\r
                $dao->sauvePreferences($this->user);\r
        }\r
 \r

diff --git a/inc/extranet/DAO/_common.php b/inc/extranet/DAO/_common.php
index 96f1a5e62eafd651829fd4587e4bdd43b6e25116..08f75d0b8442c9210ba0cd39ec69060c8f0b14f8 100644 (file)
--- a/inc/extranet/DAO/_common.php
+++ b/inc/extranet/DAO/_common.php
@@ -1,6 +1,6 @@
 <?php\r
 $__autoload['extranetDAO'] = dirname(__FILE__) . '/class.extranet.dao.php';\r
-$__autoload['extranetDAOUtilisateur'] = dirname(__FILE__) . '/class.extranet.dao.utilisateur.php';\r
+$__autoload['commonExtranetUtilisateur'] = dirname(__FILE__) . '/class.extranet.dao.utilisateur.php';\r
 $__autoload['extranetDAOClient'] = dirname(__FILE__) . '/class.extranet.dao.client.php';\r
 $__autoload['extranetDAOEquipier'] = dirname(__FILE__) . '/class.extranet.dao.equipier.php';\r
 $__autoload['extranetDAODevis'] = dirname(__FILE__) . '/class.extranet.dao.devis.php';\r

diff --git a/inc/extranet/DAO/class.extranet.dao.devis.php b/inc/extranet/DAO/class.extranet.dao.devis.php
index 501ceccda616cde485c465fb8ea0cd5cb13079e6..6436359d7cad3ebc3bd28cba7897cda9512518df 100644 (file)
--- a/inc/extranet/DAO/class.extranet.dao.devis.php
+++ b/inc/extranet/DAO/class.extranet.dao.devis.php
@@ -221,7 +221,7 @@ class extranetDAODevis extends commonDAO {
        {\r
                /*\r
                $facture = $this->selectById($facture_id);\r
-               $daoUtilisateur = new extranetDAOUtilisateur($this->con);\r
+               $daoUtilisateur = new commonExtranetUtilisateur($this->con);\r
                $facture->client = $daoUtilisateur->selectById($facture->client_id);\r
                $facture->createur = $daoUtilisateur->selectById($facture->createur_id);\r
                if ($facture->status == 4) {\r
@@ -238,7 +238,7 @@ class extranetDAODevis extends commonDAO {
 \r
                $devis = $this->selectById($devis_id);\r
 \r
-               $daoUtilisateur = new extranetDAOUtilisateur($this->con);\r
+               $daoUtilisateur = new commonExtranetUtilisateur($this->con);\r
                $devis->createur = $daoUtilisateur->selectById($devis->createur_id);\r
                $devis->client = $daoUtilisateur->selectById($devis->client_id);\r
                // Chargement des paramètres de la langue du client\r

diff --git a/inc/extranet/DAO/class.extranet.dao.entreprise.php b/inc/extranet/DAO/class.extranet.dao.entreprise.php
index 4fd1b66c0b8a70d88ff6d686a778d8fb303b8ce4..3734f66b3721bebf9a1c2a453d4a0606fd25c7be 100644 (file)
--- a/inc/extranet/DAO/class.extranet.dao.entreprise.php
+++ b/inc/extranet/DAO/class.extranet.dao.entreprise.php
@@ -51,7 +51,7 @@ class extranetDAOEntreprise extends commonDAO {
                if (!$r->count()) {\r
                        return null;\r
                }\r
-               $daoUtilisateur = new extranetDAOUtilisateur($this->con);\r
+               $daoUtilisateur = new commonExtranetUtilisateur($this->con);\r
 \r
                $res = new stdClass();\r
                $res->administrateur = $daoUtilisateur->selectById($r->administrateur_id, 'utilisateurs_entreprise');\r

diff --git a/inc/extranet/DAO/class.extranet.dao.facture.php b/inc/extranet/DAO/class.extranet.dao.facture.php
index 10ebf22ea4de4437405e83070691f3b3e380d515..b0fcae9096e2a97178ee7b2005c68eb4483ed125 100644 (file)
--- a/inc/extranet/DAO/class.extranet.dao.facture.php
+++ b/inc/extranet/DAO/class.extranet.dao.facture.php
@@ -269,7 +269,7 @@ class extranetDAOFacture extends commonDAO {
        public function saveAsPDF($facture_id)\r
        {\r
                $facture = $this->selectById($facture_id);\r
-               $daoUtilisateur = new extranetDAOUtilisateur($this->con);\r
+               $daoUtilisateur = new commonExtranetUtilisateur($this->con);\r
                $facture->client = $daoUtilisateur->selectById($facture->client_id);\r
                $facture->createur = $daoUtilisateur->selectById($facture->createur_id);\r
                if ($facture->status == 4) {\r

diff --git a/inc/extranet/Metier/class.extranet.utilisateur.php b/inc/extranet/Metier/class.extranet.utilisateur.php
deleted file mode 100644 (file)
index ae0df91..0000000
--- a/inc/extranet/Metier/class.extranet.utilisateur.php
+++ /dev/null
@@ -1,102 +0,0 @@
-<?php\r
-class extranetUtilisateur extends cubeMetier {\r
-       protected $utilisateur_id;\r
-       protected $connected;\r
-       protected $email;\r
-       protected $login;\r
-       protected $password;\r
-       protected $nom;\r
-       protected $prenom;\r
-       protected $adresse;\r
-       protected $code_postal;\r
-       protected $ville;\r
-       protected $pays;\r
-       protected $telephone;\r
-       protected $mobile;\r
-       protected $fax;\r
-       protected $date_creation;\r
-       protected $grade;\r
-       protected $settings;\r
-       protected $notes;\r
-       protected $lang;\r
-       protected $entreprise;\r
-       protected $tva_intra;\r
-       protected $rs;\r
-       protected $collegues;\r
-       protected $ws_admin;\r
-       protected $ws_grade;\r
-       protected $ws_settings;\r
-\r
-       public function getEmail()\r
-       {\r
-               return trim($this->prenom . ' ' . $this->nom . '<' . $this->email . '>');\r
-       }\r
-\r
-       public function changeSettings($rubrique, $element, $valeur)\r
-       {\r
-               $this->settings['search'][$rubrique][$element] = $valeur;\r
-       }\r
-\r
-       public function getSettings($liste)\r
-       {\r
-               $cles = array('clients' => 'entreprise_id', 'equipiers' => 'utilisateur_id', 'devis' => 'devis_id', 'projets' => 'projet_id', 'factures' => 'facture_id', 'timereport' => 'projet_id', 'fichiers' => 'nom', 'books' => 'book_id');\r
-               if (!isset($this->settings['search'][$liste]) || !is_array($this->settings['search'][$liste])) {\r
-                       $this->settings['search'][$liste] = array();\r
-               }\r
-               if (!isset($this->settings['search'][$liste]['sens'])) {\r
-                       $this->settings['search'][$liste]['sens'] = 'DESC';\r
-               }\r
-               if (!isset($this->settings['search'][$liste]['orderby'])) {\r
-                       $this->settings['search'][$liste]['orderby'] = $cles[$liste];\r
-               }\r
-               if (!isset($this->settings['search'][$liste]['page'])) {\r
-                       $this->settings['search'][$liste]['page'] = 1;\r
-               }\r
-\r
-               $this->settings['search'][$liste]['search'] = isset($_SESSION['q'])?$_SESSION['q']:null;\r
-\r
-               if (!isset($this->settings['search'][$liste]['par_page'])) {\r
-                       if ($liste == 'projets' || $liste == 'projets_timereport') {\r
-                               $this->settings['search'][$liste]['par_page'] = 15;\r
-                       } else {\r
-                               $this->settings['search'][$liste]['par_page'] = 25;\r
-                       }\r
-               }\r
-               if (!isset($this->settings['search'][$liste]['filtres'])) {\r
-                       $this->settings['search'][$liste]['filtres'] = null;\r
-               }\r
-\r
-               $page = $this->settings['search'][$liste]['page'];\r
-               $this->settings['search'][$liste]['page'] = $page?$page:1;\r
-               $par_page = $this->settings['search'][$liste]['par_page'];\r
-               if ($par_page > 0) {\r
-                       $this->settings['search'][$liste]['limit'] = array(($page-1) * $par_page, $par_page);\r
-               } else {\r
-                       $this->settings['search'][$liste]['limit'] = null;\r
-               }\r
-               $this->settings['search'][$liste]['table'] = $liste;\r
-\r
-               return $this->settings['search'][$liste];\r
-       }\r
-\r
-       public function getLastPrint()\r
-       {\r
-               if (!isset($this->settings['lastprint'])) {\r
-                       $this->settings['lastprint'] = array('pages' => '', 'date' => 0);\r
-               }\r
-               return $this->settings['lastprint'];\r
-       }\r
-\r
-       public function saveLastPrint($pages)\r
-       {\r
-               $this->settings['lastprint']['pages'] = $pages;\r
-               $this->settings['lastprint']['date'] = TIME;\r
-       }\r
-\r
-       public function __toString()\r
-       {\r
-               return trim($this->prenom . ' ' . $this->nom);\r
-       }\r
-}\r
-\r
-?>
\ No newline at end of file

diff --git a/inc/ws/Controlleur/class.ws.flash.php b/inc/ws/Controlleur/class.ws.flash.php
index 0984c9dedcc80e4865e7c58c0debeae760ddc569..f0065b29ba9509342f6f550f454ab5cffcd86116 100644 (file)
--- a/inc/ws/Controlleur/class.ws.flash.php
+++ b/inc/ws/Controlleur/class.ws.flash.php
@@ -12,7 +12,7 @@ class wsFlash extends cubeFlashGateway {
        public function saveConversionSettings()\r
        {\r
                global $core;\r
-               $dao = new extranetDAOUtilisateur($core->con);\r
+               $dao = new commonExtranetUtilisateur($core->con);\r
                $datas = array('resolution' => $this->args['resolution'],\r
                        'objects' => $this->args['objects'],\r
                        'method' => $this->args['method'],\r

diff --git a/inc/ws/Controlleur/class.ws.url.php b/inc/ws/Controlleur/class.ws.url.php
index 81e31cc9f4c79574e1fbb1ae6f41a82b4271803d..5e9adcf90f5ba7d45527bf14176dbac4430a4bd6 100644 (file)
--- a/inc/ws/Controlleur/class.ws.url.php
+++ b/inc/ws/Controlleur/class.ws.url.php
@@ -450,7 +450,7 @@ html{height:100%}' . "\n";
                global $core;\r
                extranetDroits::min(1);\r
                $dao = new extranetDAOEntreprise($core->con);\r
-               $daoUtilisateur = new extranetDAOUtilisateur($core->con);\r
+               $daoUtilisateur = new commonExtranetUtilisateur($core->con);\r
                if ($entreprise_id == 'new') {\r
                        $client = $dao->cree();\r
                } else {\r
@@ -561,7 +561,7 @@ html{height:100%}' . "\n";
        {\r
                global $core;\r
                extranetDroits::min(1);\r
-               $dao = new extranetDAOUtilisateur($core->con);\r
+               $dao = new commonExtranetUtilisateur($core->con);\r
                $utilisateur = $dao->selectById($utilisateur_id);\r
                $res = '<tr><td colspan="2">' . form::hidden('utilisateur_id', $utilisateur_id) . '</td></tr>';\r
                $res .= '<tr><td colspan="2">' . form::textarea('notes', 100, 30, $utilisateur->notes) . '</td></tr>';\r