From: vincent@cubedesigners.com <vincent@cubedesigners.com@f5622870-0f3c-0410-866d-9cb505b7a8ef>
Date: Mon, 17 Jan 2011 10:24:50 +0000 (+0000)
Subject: (no commit message)
X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=1ec2eb0360a333c17dd04637e62f23d58cc1d978;p=cubeextranet.git

---

diff --git a/inc/commons/Metier/_common.php b/inc/commons/Metier/_common.php
new file mode 100644
index 000000000..35d6c22b0
--- /dev/null
+++ b/inc/commons/Metier/_common.php
@@ -0,0 +1,5 @@
+<?php
+$__autoload['commonUtilisateur']=dirname(__FILE__).'/class.common.utilisateur.php';
+
+
+?>
\ 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
index 000000000..c29fd620a
--- /dev/null
+++ b/inc/commons/Metier/class.common.utilisateur.php
@@ -0,0 +1,102 @@
+<?php
+class commonUtilisateur extends cubeMetier {
+	protected $utilisateur_id;
+	protected $connected;
+	protected $email;
+	protected $login;
+	protected $password;
+	protected $nom;
+	protected $prenom;
+	protected $adresse;
+	protected $code_postal;
+	protected $ville;
+	protected $pays;
+	protected $telephone;
+	protected $mobile;
+	protected $fax;
+	protected $date_creation;
+	protected $grade;
+	protected $settings;
+	protected $notes;
+	protected $lang;
+	protected $entreprise;
+	protected $tva_intra;
+	protected $rs;
+	protected $collegues;
+	protected $ws_admin;
+	protected $ws_grade;
+	protected $ws_settings;
+
+	public function getEmail()
+	{
+		return trim($this->prenom . ' ' . $this->nom . '<' . $this->email . '>');
+	}
+
+	public function changeSettings($rubrique, $element, $valeur)
+	{
+		$this->settings['search'][$rubrique][$element] = $valeur;
+	}
+
+	public function getSettings($liste)
+	{
+		$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');
+		if (!isset($this->settings['search'][$liste]) || !is_array($this->settings['search'][$liste])) {
+			$this->settings['search'][$liste] = array();
+		}
+		if (!isset($this->settings['search'][$liste]['sens'])) {
+			$this->settings['search'][$liste]['sens'] = 'DESC';
+		}
+		if (!isset($this->settings['search'][$liste]['orderby'])) {
+			$this->settings['search'][$liste]['orderby'] = $cles[$liste];
+		}
+		if (!isset($this->settings['search'][$liste]['page'])) {
+			$this->settings['search'][$liste]['page'] = 1;
+		}
+
+		$this->settings['search'][$liste]['search'] = isset($_SESSION['q'])?$_SESSION['q']:null;
+
+		if (!isset($this->settings['search'][$liste]['par_page'])) {
+			if ($liste == 'projets' || $liste == 'projets_timereport') {
+				$this->settings['search'][$liste]['par_page'] = 15;
+			} else {
+				$this->settings['search'][$liste]['par_page'] = 25;
+			}
+		}
+		if (!isset($this->settings['search'][$liste]['filtres'])) {
+			$this->settings['search'][$liste]['filtres'] = null;
+		}
+
+		$page = $this->settings['search'][$liste]['page'];
+		$this->settings['search'][$liste]['page'] = $page?$page:1;
+		$par_page = $this->settings['search'][$liste]['par_page'];
+		if ($par_page > 0) {
+			$this->settings['search'][$liste]['limit'] = array(($page-1) * $par_page, $par_page);
+		} else {
+			$this->settings['search'][$liste]['limit'] = null;
+		}
+		$this->settings['search'][$liste]['table'] = $liste;
+
+		return $this->settings['search'][$liste];
+	}
+
+	public function getLastPrint()
+	{
+		if (!isset($this->settings['lastprint'])) {
+			$this->settings['lastprint'] = array('pages' => '', 'date' => 0);
+		}
+		return $this->settings['lastprint'];
+	}
+
+	public function saveLastPrint($pages)
+	{
+		$this->settings['lastprint']['pages'] = $pages;
+		$this->settings['lastprint']['date'] = TIME;
+	}
+
+	public function __toString()
+	{
+		return trim($this->prenom . ' ' . $this->nom);
+	}
+}
+
+?>
\ No newline at end of file
diff --git a/inc/commons/_common.php b/inc/commons/_common.php
index 3c4f37341..c4b50d0aa 100644
--- a/inc/commons/_common.php
+++ b/inc/commons/_common.php
@@ -1,5 +1,6 @@
 <?php
 require_once(dirname(__FILE__) . '/DAO/_common.php');
+require_once(dirname(__FILE__) . '/Metier/_common.php');
 // Common
 $__autoload['commonCore'] = dirname(__FILE__) . '/class.common.core.php';
 $__autoload['commonPage'] = dirname(__FILE__) . '/class.common.page.php';
diff --git a/inc/commons/class.common.core.php b/inc/commons/class.common.core.php
index 59b6d241e..88f85d6f3 100644
--- 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
 		// Dans la base de données
 		// Utilisateur connecté à l'interface
-		$dao = new extranetDAOUtilisateur($this->con);
+		$dao = new commonExtranetUtilisateur($this->con);
 		$this->user = $dao->selectByLoginPassword($_SESSION['user_email'], $_SESSION['user_password']);
 		if ($this->user == false) {
 			$_SESSION['errorLogin'] = true;
@@ -487,7 +487,7 @@ class commonCore extends cubeCore {
 
 	public function sauvePreferencesUtilisateur()
 	{
-		$dao = new extranetDAOUtilisateur($this->con);
+		$dao = new commonExtranetUtilisateur($this->con);
 		$dao->sauvePreferences($this->user);
 	}
 
diff --git a/inc/extranet/DAO/_common.php b/inc/extranet/DAO/_common.php
index 96f1a5e62..08f75d0b8 100644
--- a/inc/extranet/DAO/_common.php
+++ b/inc/extranet/DAO/_common.php
@@ -1,6 +1,6 @@
 <?php
 $__autoload['extranetDAO'] = dirname(__FILE__) . '/class.extranet.dao.php';
-$__autoload['extranetDAOUtilisateur'] = dirname(__FILE__) . '/class.extranet.dao.utilisateur.php';
+$__autoload['commonExtranetUtilisateur'] = dirname(__FILE__) . '/class.extranet.dao.utilisateur.php';
 $__autoload['extranetDAOClient'] = dirname(__FILE__) . '/class.extranet.dao.client.php';
 $__autoload['extranetDAOEquipier'] = dirname(__FILE__) . '/class.extranet.dao.equipier.php';
 $__autoload['extranetDAODevis'] = dirname(__FILE__) . '/class.extranet.dao.devis.php';
diff --git a/inc/extranet/DAO/class.extranet.dao.devis.php b/inc/extranet/DAO/class.extranet.dao.devis.php
index 501ceccda..6436359d7 100644
--- 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 {
 	{
 		/*
 		$facture = $this->selectById($facture_id);
-		$daoUtilisateur = new extranetDAOUtilisateur($this->con);
+		$daoUtilisateur = new commonExtranetUtilisateur($this->con);
 		$facture->client = $daoUtilisateur->selectById($facture->client_id);
 		$facture->createur = $daoUtilisateur->selectById($facture->createur_id);
 		if ($facture->status == 4) {
@@ -238,7 +238,7 @@ class extranetDAODevis extends commonDAO {
 
 		$devis = $this->selectById($devis_id);
 
-		$daoUtilisateur = new extranetDAOUtilisateur($this->con);
+		$daoUtilisateur = new commonExtranetUtilisateur($this->con);
 		$devis->createur = $daoUtilisateur->selectById($devis->createur_id);
 		$devis->client = $daoUtilisateur->selectById($devis->client_id);
 		// Chargement des paramètres de la langue du client
diff --git a/inc/extranet/DAO/class.extranet.dao.entreprise.php b/inc/extranet/DAO/class.extranet.dao.entreprise.php
index 4fd1b66c0..3734f66b3 100644
--- 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()) {
 			return null;
 		}
-		$daoUtilisateur = new extranetDAOUtilisateur($this->con);
+		$daoUtilisateur = new commonExtranetUtilisateur($this->con);
 
 		$res = new stdClass();
 		$res->administrateur = $daoUtilisateur->selectById($r->administrateur_id, 'utilisateurs_entreprise');
diff --git a/inc/extranet/DAO/class.extranet.dao.facture.php b/inc/extranet/DAO/class.extranet.dao.facture.php
index 10ebf22ea..b0fcae909 100644
--- 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)
 	{
 		$facture = $this->selectById($facture_id);
-		$daoUtilisateur = new extranetDAOUtilisateur($this->con);
+		$daoUtilisateur = new commonExtranetUtilisateur($this->con);
 		$facture->client = $daoUtilisateur->selectById($facture->client_id);
 		$facture->createur = $daoUtilisateur->selectById($facture->createur_id);
 		if ($facture->status == 4) {
diff --git a/inc/extranet/Metier/class.extranet.utilisateur.php b/inc/extranet/Metier/class.extranet.utilisateur.php
deleted file mode 100644
index ae0df915d..000000000
--- a/inc/extranet/Metier/class.extranet.utilisateur.php
+++ /dev/null
@@ -1,102 +0,0 @@
-<?php
-class extranetUtilisateur extends cubeMetier {
-	protected $utilisateur_id;
-	protected $connected;
-	protected $email;
-	protected $login;
-	protected $password;
-	protected $nom;
-	protected $prenom;
-	protected $adresse;
-	protected $code_postal;
-	protected $ville;
-	protected $pays;
-	protected $telephone;
-	protected $mobile;
-	protected $fax;
-	protected $date_creation;
-	protected $grade;
-	protected $settings;
-	protected $notes;
-	protected $lang;
-	protected $entreprise;
-	protected $tva_intra;
-	protected $rs;
-	protected $collegues;
-	protected $ws_admin;
-	protected $ws_grade;
-	protected $ws_settings;
-
-	public function getEmail()
-	{
-		return trim($this->prenom . ' ' . $this->nom . '<' . $this->email . '>');
-	}
-
-	public function changeSettings($rubrique, $element, $valeur)
-	{
-		$this->settings['search'][$rubrique][$element] = $valeur;
-	}
-
-	public function getSettings($liste)
-	{
-		$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');
-		if (!isset($this->settings['search'][$liste]) || !is_array($this->settings['search'][$liste])) {
-			$this->settings['search'][$liste] = array();
-		}
-		if (!isset($this->settings['search'][$liste]['sens'])) {
-			$this->settings['search'][$liste]['sens'] = 'DESC';
-		}
-		if (!isset($this->settings['search'][$liste]['orderby'])) {
-			$this->settings['search'][$liste]['orderby'] = $cles[$liste];
-		}
-		if (!isset($this->settings['search'][$liste]['page'])) {
-			$this->settings['search'][$liste]['page'] = 1;
-		}
-
-		$this->settings['search'][$liste]['search'] = isset($_SESSION['q'])?$_SESSION['q']:null;
-
-		if (!isset($this->settings['search'][$liste]['par_page'])) {
-			if ($liste == 'projets' || $liste == 'projets_timereport') {
-				$this->settings['search'][$liste]['par_page'] = 15;
-			} else {
-				$this->settings['search'][$liste]['par_page'] = 25;
-			}
-		}
-		if (!isset($this->settings['search'][$liste]['filtres'])) {
-			$this->settings['search'][$liste]['filtres'] = null;
-		}
-
-		$page = $this->settings['search'][$liste]['page'];
-		$this->settings['search'][$liste]['page'] = $page?$page:1;
-		$par_page = $this->settings['search'][$liste]['par_page'];
-		if ($par_page > 0) {
-			$this->settings['search'][$liste]['limit'] = array(($page-1) * $par_page, $par_page);
-		} else {
-			$this->settings['search'][$liste]['limit'] = null;
-		}
-		$this->settings['search'][$liste]['table'] = $liste;
-
-		return $this->settings['search'][$liste];
-	}
-
-	public function getLastPrint()
-	{
-		if (!isset($this->settings['lastprint'])) {
-			$this->settings['lastprint'] = array('pages' => '', 'date' => 0);
-		}
-		return $this->settings['lastprint'];
-	}
-
-	public function saveLastPrint($pages)
-	{
-		$this->settings['lastprint']['pages'] = $pages;
-		$this->settings['lastprint']['date'] = TIME;
-	}
-
-	public function __toString()
-	{
-		return trim($this->prenom . ' ' . $this->nom);
-	}
-}
-
-?>
\ 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 0984c9ded..f0065b29b 100644
--- 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()
 	{
 		global $core;
-		$dao = new extranetDAOUtilisateur($core->con);
+		$dao = new commonExtranetUtilisateur($core->con);
 		$datas = array('resolution' => $this->args['resolution'],
 			'objects' => $this->args['objects'],
 			'method' => $this->args['method'],
diff --git a/inc/ws/Controlleur/class.ws.url.php b/inc/ws/Controlleur/class.ws.url.php
index 81e31cc9f..5e9adcf90 100644
--- 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;
 		extranetDroits::min(1);
 		$dao = new extranetDAOEntreprise($core->con);
-		$daoUtilisateur = new extranetDAOUtilisateur($core->con);
+		$daoUtilisateur = new commonExtranetUtilisateur($core->con);
 		if ($entreprise_id == 'new') {
 			$client = $dao->cree();
 		} else {
@@ -561,7 +561,7 @@ html{height:100%}' . "\n";
 	{
 		global $core;
 		extranetDroits::min(1);
-		$dao = new extranetDAOUtilisateur($core->con);
+		$dao = new commonExtranetUtilisateur($core->con);
 		$utilisateur = $dao->selectById($utilisateur_id);
 		$res = '<tr><td colspan="2">' . form::hidden('utilisateur_id', $utilisateur_id) . '</td></tr>';
 		$res .= '<tr><td colspan="2">' . form::textarea('notes', 100, 30, $utilisateur->notes) . '</td></tr>';