From: vincent@cubedesigners.com <vincent@cubedesigners.com@f5622870-0f3c-0410-866d-9cb505b7a8ef>
Date: Wed, 10 Aug 2011 10:19:56 +0000 (+0000)
Subject: (no commit message)
X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=cdfd7f8fc7216b041c526ff80714a20e965faea3;p=cubeextranet.git

---

diff --git a/.htaccess b/.htaccess
index 06c506ed7..b74df29d9 100644
--- a/.htaccess
+++ b/.htaccess
@@ -14,6 +14,10 @@ AddCharset UTF-8 log
 	RewriteEngine on
 	RewriteBase /
 
+	# Dev
+	RewriteCond %{HTTP_HOST} dev.ws.fluidbook.com
+	RewriteRule ^(.*)$ http://workshop.fluidbook.com/$1 [R=301]
+
 	# Favicon
 	RewriteCond %{HTTP_HOST} cubedesigners
 	RewriteRule ^favicon.ico$ images/extranet/favicon.ico [L]
diff --git a/inc/commons/class.common.core.php b/inc/commons/class.common.core.php
index bec051d61..74a9986dd 100644
--- a/inc/commons/class.common.core.php
+++ b/inc/commons/class.common.core.php
@@ -472,9 +472,11 @@ class commonCore extends cubeCore {
 				. 'SUM(f.total_ht) AS ca '
 				. 'FROM entreprises e LEFT JOIN impayes_entreprises i ON e.entreprise_id=i.entreprise LEFT JOIN utilisateurs u ON u.entreprise=e.entreprise_id AND u.grade=0 LEFT JOIN projets p ON p.client=u.utilisateur_id LEFT JOIN factures f ON f.projet=p.projet_id AND f.status IN(1,2) '
 				. 'GROUP BY u.utilisateur_id', 'TEMPTABLE');
-		$this->views->createView('taches_vue', 'SELECT taches.tache_id,taches.nom,taches.categorie,taches.type,taches.budget,taches.projet,taches.taux_journalier, '
+		$this->views->createView('taches_books','SELECT tache,GROUP_CONCAT(book_id ORDER BY book_id ASC SEPARATOR ",") AS books FROM books WHERE tache>0 GROUP BY tache');
+		$this->views->createView('taches_vue', 'SELECT taches.tache_id,taches.nom,taches.categorie,taches.type,taches.budget,taches.projet,taches.taux_journalier,tb.books, '
 				. '(SUM(timereport.heures)/' . JOURNEE . ') AS jours_consommes, ((SUM(timereport.heures)/' . JOURNEE . ')/(taches.budget/taches.taux_journalier))*100 AS progression,(taches.budget/taches.taux_journalier) AS jours_prevus '
 				. 'FROM taches LEFT JOIN timereport ON taches.tache_id=timereport.tache_id '
+				. 'LEFT JOIN taches_books tb ON tb.tache=taches.tache_id '
 				. 'GROUP BY taches.tache_id');
 		$this->views->createView('taches_projet', 'SELECT projet, '
 				. 'SUM(jours_prevus) AS jours_prevus,SUM(budget) AS budget,'
diff --git a/inc/extranet/Controlleur/class.extranet.url.php b/inc/extranet/Controlleur/class.extranet.url.php
index e4c506b1b..fe5435db1 100644
--- a/inc/extranet/Controlleur/class.extranet.url.php
+++ b/inc/extranet/Controlleur/class.extranet.url.php
@@ -1,7 +1,8 @@
 <?php
+
 class extranetUrl {
-	public static function clients($args)
-	{
+
+	public static function clients($args) {
 		global $core;
 		cubePage::truePopup();
 		cubePage::autoComplete();
@@ -25,12 +26,11 @@ class extranetUrl {
 		return $res;
 	}
 
-	public static function listeClients($dashboard = null, $settings = null)
-	{
+	public static function listeClients($dashboard = null, $settings = null) {
 		global $core;
 		commonDroits::min(1);
-		$settings = is_null($settings)?$core->user->getSettings('clients'):$settings;
-		$change = is_null($dashboard)?'Client':'Dashboard/' . $dashboard;
+		$settings = is_null($settings) ? $core->user->getSettings('clients') : $settings;
+		$change = is_null($dashboard) ? 'Client' : 'Dashboard/' . $dashboard;
 		$dao = new commonDAOEntreprise($core->con);
 		if (isset($settings['search']) && !is_null($settings['search'])) {
 			$dao->setSearch($settings['search']);
@@ -47,18 +47,18 @@ class extranetUrl {
 		$res .= '<th>' . commonUrl::orderby('Impayés', 'impaye', $settings, 'sort' . $change) . '</th>';
 		$res .= '<th class="min"></th><th class="min"></th></tr>';
 		$i = 0;
-		foreach($liste as $id => $client) {
+		foreach ($liste as $id => $client) {
 			if (!is_array($client->contacts)) {
 				fb($client);
 				continue;
 			}
-			$odd = cubeMath::isOdd($i)?' class="odd"':'';
+			$odd = cubeMath::isOdd($i) ? ' class="odd"' : '';
 			$res .= '<tr' . $odd . '>';
 			$res .= '<td>' . $client->entreprise_id . '</td>';
 			$res .= '<td>' . $client->nom . '</td>';
 			$contacts = array();
 
-			foreach($client->contacts as $c) {
+			foreach ($client->contacts as $c) {
 				$contacts[] = '<a href="#" class="popup" rel="formContact/' . $c->utilisateur_id . '">' . $c->prenom . ' ' . $c->nom . '</a>';
 			}
 
@@ -86,9 +86,9 @@ class extranetUrl {
 			$i++;
 		}
 		if (!isset($settings['search']) || is_null($settings['search'])) {
-			$odd = cubeMath::isOdd($i)?' class="odd"':'';
+			$odd = cubeMath::isOdd($i) ? ' class="odd"' : '';
 			$res .= '<tr' . $odd . '><td colspan="10">';
-			$res .= commonPage::pager($settings['page'], $dao->count() , $settings['par_page'], 'page' . $change . '/%d');
+			$res .= commonPage::pager($settings['page'], $dao->count(), $settings['par_page'], 'page' . $change . '/%d');
 			$res .= commonUrl::formParPage('parPage' . $change, $settings['par_page'], __('clients'));
 			$res .= '</td></tr>';
 		}
@@ -96,23 +96,21 @@ class extranetUrl {
 		return $res;
 	}
 
-	public static function clientDetailCa($entreprise_id)
-	{
+	public static function clientDetailCa($entreprise_id) {
 		global $core;
 		$dao = new commonDAOEntreprise($core->con);
 		$annees = $dao->getCaDetails($entreprise_id);
 		$res = '';
 		$i = 0;
-		foreach($annees as $annee => $ca) {
-			$class = cubeMath::isOdd($i)?' class="odd"':'';
+		foreach ($annees as $annee => $ca) {
+			$class = cubeMath::isOdd($i) ? ' class="odd"' : '';
 			$res .= '<tr' . $class . '><td><strong>' . $annee . '</strong></td><td>' . number_format($ca, 0, ',', ' ') . ' €</td></tr>';
 			$i++;
 		}
 		return $res;
 	}
 
-	public static function clientDetailImpaye($entreprise_id)
-	{
+	public static function clientDetailImpaye($entreprise_id) {
 		global $core;
 		$dao = new extranetDAOFacture($core->con);
 		$daoClient = new commonDAOEntreprise($core->con);
@@ -120,15 +118,15 @@ class extranetUrl {
 		$client = $daoClient->selectById($entreprise_id);
 		$res = '';
 		$i = 0;
-		foreach($factures as $facture) {
-			$class = cubeMath::isOdd($i)?' class="odd"':'';
+		foreach ($factures as $facture) {
+			$class = cubeMath::isOdd($i) ? ' class="odd"' : '';
 			$res .= '<tr' . $class . '>';
 			$res .= '<td>' . $facture->facture_id . '</td>';
 			$res .= '<td>';
 			if ($facture->facture_id > 0) {
 				$res .= '<a href="' . SITE_PATH . 'voirfacture/' . $facture->facture_id . '" class="popupA4">' . $facture->nom . '</a>';
 			} else {
-				$res .= $facture->nom ;
+				$res .= $facture->nom;
 			}
 			$res .= '</td>';
 			$tva = cubeTaxes::tva($client->pays);
@@ -144,8 +142,7 @@ class extranetUrl {
 		return $res;
 	}
 
-	public static function formClient($entreprise_id = 'new')
-	{
+	public static function formClient($entreprise_id = 'new') {
 		global $core;
 		commonDroits::min(1);
 		$dao = new commonDAOEntreprise($core->con);
@@ -200,8 +197,7 @@ class extranetUrl {
 		return $res;
 	}
 
-	public static function listeContacts($entreprise_id)
-	{
+	public static function listeContacts($entreprise_id) {
 		global $core;
 		commonDroits::min(1);
 		$dao = new commonDAOEntreprise($core->con);
@@ -210,8 +206,8 @@ class extranetUrl {
 		$res = '<table class="liste light">';
 		$res .= '<tr class="light"><th colspan="5"><a href="" class="popup" rel="formContact/new/' . $entreprise_id . '">' . $core->typo->Contact('Ajouter un contact') . '</a></th></tr>';
 		$i = 0;
-		foreach($contacts as $contact) {
-			$odd = cubeMath::isOdd($i)?' class="odd"':'';
+		foreach ($contacts as $contact) {
+			$odd = cubeMath::isOdd($i) ? ' class="odd"' : '';
 			$res .= '<tr' . $odd . '><td>' . trim($contact->prenom . ' ' . $contact->nom) . '</td>';
 			$res .= '<td><a href="mailto:' . trim($contact->prenom . ' ' . $contact->nom) . '<' . $contact->email . '>">' . $contact->email . '</a></td>';
 			$res .= '<td class="min"><a href="' . SITE_PATH . 'fichiers/' . $contact->utilisateur_id . '">FTP</a></td>';
@@ -223,8 +219,7 @@ class extranetUrl {
 		return $res;
 	}
 
-	public static function formContact($client_id = 'new', $entreprise_id = null)
-	{
+	public static function formContact($client_id = 'new', $entreprise_id = null) {
 		global $core;
 		commonDroits::min(1);
 
@@ -259,8 +254,7 @@ class extranetUrl {
 		return $res;
 	}
 
-	public static function formNotes($utilisateur_id)
-	{
+	public static function formNotes($utilisateur_id) {
 		global $core;
 		commonDroits::min(1);
 		$dao = new commonDAOUtilisateur($core->con);
@@ -271,8 +265,7 @@ class extranetUrl {
 		return $res;
 	}
 
-	public static function projets($args)
-	{
+	public static function projets($args) {
 		global $core;
 		commonDroits::min(1);
 
@@ -297,12 +290,11 @@ class extranetUrl {
 		return $res;
 	}
 
-	public static function listeProjets($dashboard = null, $settings = null)
-	{
+	public static function listeProjets($dashboard = null, $settings = null) {
 		global $core;
 		commonDroits::min(1);
-		$settings = is_null($settings)?$core->user->getSettings('projets'):$settings;
-		$change = is_null($dashboard)?'Projet':'Dashboard/' . $dashboard;
+		$settings = is_null($settings) ? $core->user->getSettings('projets') : $settings;
+		$change = is_null($dashboard) ? 'Projet' : 'Dashboard/' . $dashboard;
 
 		$res = '<table class="liste">';
 		$res .= '<tr><th>' . commonUrl::orderby('#', 'projet_id', $settings, 'sort' . $change) . '</th>';
@@ -325,15 +317,15 @@ class extranetUrl {
 		$liste = $dao->getListe($settings['orderby'], $settings['sens'], $settings['limit']);
 
 		$i = 0;
-		foreach($liste as $projet) {
+		foreach ($liste as $projet) {
 			$droits = extranetDroits::projet($projet, false);
 
-			$projet->progression = !$projet->progression?'-':$projet->progression . '%';
-			$projet->jours_prevus = !$projet->jours_prevus?'-':$projet->jours_prevus;
-			$projet->jours_consommes = !$projet->jours_consommes?'-':$projet->jours_consommes;
+			$projet->progression = !$projet->progression ? '-' : $projet->progression . '%';
+			$projet->jours_prevus = !$projet->jours_prevus ? '-' : $projet->jours_prevus;
+			$projet->jours_consommes = !$projet->jours_consommes ? '-' : $projet->jours_consommes;
 
-			$projet->budget = !$projet->budget || !$droits?'-':$projet->budget;
-			$odd = cubeMath::isOdd($i)?' class="odd"':'';
+			$projet->budget = !$projet->budget || !$droits ? '-' : $projet->budget;
+			$odd = cubeMath::isOdd($i) ? ' class="odd"' : '';
 			$res .= '<tr' . $odd . '>';
 			$res .= '<td>' . $projet->projet_id . '</td>';
 			$res .= '<td>' . $projet->nom . '</td>';
@@ -363,7 +355,7 @@ class extranetUrl {
 			if ($projet->budget == '-') {
 				$rapport_paiement = '-';
 			} elseif (!$rp) {
-				$rapport_paiement = __('Non') ;
+				$rapport_paiement = __('Non');
 			} elseif ($rp == 1) {
 				$rapport_paiement = __('Oui');
 			} elseif ($rp < 1) {
@@ -391,9 +383,9 @@ class extranetUrl {
 			$i++;
 		}
 		if (!isset($settings['search']) || is_null($settings['search'])) {
-			$odd = cubeMath::isOdd($i)?' class="odd"':'';
+			$odd = cubeMath::isOdd($i) ? ' class="odd"' : '';
 			$res .= '<tr' . $odd . '><td colspan="11">';
-			$res .= commonPage::pager($settings['page'], $dao->count() , $settings['par_page'], 'page' . $change . '/%d');
+			$res .= commonPage::pager($settings['page'], $dao->count(), $settings['par_page'], 'page' . $change . '/%d');
 			$res .= commonUrl::formParPage('parPage' . $change, $settings['par_page'], __('projets'));
 			$res .= '</td></tr>';
 		}
@@ -401,8 +393,7 @@ class extranetUrl {
 		return $res;
 	}
 
-	public static function projet($args)
-	{
+	public static function projet($args) {
 		global $core;
 		commonDroits::min(1);
 
@@ -421,8 +412,7 @@ class extranetUrl {
 		return $res;
 	}
 
-	public static function listeProjet($projet_id)
-	{
+	public static function listeProjet($projet_id) {
 		global $core;
 		commonDroits::min(1);
 
@@ -446,11 +436,11 @@ class extranetUrl {
 
 		$droits = extranetDroits::projet($projet, false);
 
-		$projet->progression = !$projet->progression?'-':$projet->progression . '%';
-		$projet->jours_prevus = !$projet->jours_prevus?'-':$projet->jours_prevus;
-		$projet->jours_consommes = !$projet->jours_consommes?'-':$projet->jours_consommes;
+		$projet->progression = !$projet->progression ? '-' : $projet->progression . '%';
+		$projet->jours_prevus = !$projet->jours_prevus ? '-' : $projet->jours_prevus;
+		$projet->jours_consommes = !$projet->jours_consommes ? '-' : $projet->jours_consommes;
 
-		$projet->budget = !$projet->budget || !$droits?'-':$projet->budget;
+		$projet->budget = !$projet->budget || !$droits ? '-' : $projet->budget;
 
 		$res .= '<tr class="bold">';
 		$res .= '<td>' . $projet->projet_id . '</td>';
@@ -479,22 +469,28 @@ class extranetUrl {
 		}
 		$res .= '</tr>';
 		$i = 1;
-		foreach($projet->taches as $tache) {
-			$tache->budget = !$tache->budget || !$droits?'-':$tache->budget;
-			$odd = cubeMath::isOdd($i)?' class="odd"':'';
+		foreach ($projet->taches as $tache) {
+			$tache->budget = !$tache->budget || !$droits ? '-' : $tache->budget;
+			$odd = cubeMath::isOdd($i) ? ' class="odd"' : '';
 			$res .= '<tr' . $odd . '>';
 			$res .= '<td>T' . $i . '</td>';
 			$res .= '<td>' . $tache->nom . '</td>';
 			$res .= '<td>' . $core->categories[$tache->categorie] . '</td>';
-			$res .= '<td></td>';
-			$res .= '<td></td>';
-			$res .= '<td></td>';
+			if (count($tache->books)) {
+				$n = array();
+				foreach ($tache->books as $b) {
+					$n[] = '<a class="blank" href="' . WS_URL . '/publications/' . $b . '">' . $b . '</a>';
+				}
+				$res .= '<td colspan="3">Fluidbooks # ' . implode(', ', $n) . '</td>';
+			} else {
+				$res.='<td colspan="3"></td>';
+			}
 			$res .= '<td>' . $tache->budget . '</td>';
 
 			if ($tache instanceof extranetTacheNormale) {
-				$progression = !$tache->progression?'-':$tache->progression . '%';
-				$jours_prevus = !$tache->jours_prevus?'-':$tache->jours_prevus;
-				$jours_consommes = !$tache->jours_consommes?'-':$tache->jours_consommes;
+				$progression = !$tache->progression ? '-' : $tache->progression . '%';
+				$jours_prevus = !$tache->jours_prevus ? '-' : $tache->jours_prevus;
+				$jours_consommes = !$tache->jours_consommes ? '-' : $tache->jours_consommes;
 				$res .= '<td>' . $jours_prevus . '</td>';
 				$res .= '<td>' . $jours_consommes . '</td>';
 				$res .= '<td>' . $progression . '</td>';
@@ -521,8 +517,7 @@ class extranetUrl {
 		return $res;
 	}
 
-	public static function formProjet($projet_id = 'new')
-	{
+	public static function formProjet($projet_id = 'new') {
 		global $core;
 		commonDroits::min(1);
 
@@ -537,7 +532,7 @@ class extranetUrl {
 		$clients = $daoClient->getListe();
 
 		$listeClients = array();
-		foreach($clients as $client) {
+		foreach ($clients as $client) {
 			$listeClients[$client->rs . ' (' . $client->prenom . ' ' . $client->nom . ')'] = $client->utilisateur_id;
 		}
 		ksort($listeClients);
@@ -546,14 +541,14 @@ class extranetUrl {
 		$equipiers = $daoEquipier->getListe();
 
 		$listeEquipiers = array();
-		foreach($equipiers as $equipier) {
+		foreach ($equipiers as $equipier) {
 			$listeEquipiers[$equipier->prenom . ' ' . $equipier->nom . ' (' . $equipier->agence . ')'] = $equipier->utilisateur_id;
 		}
 
 		$daoDevis = new extranetDAODevis($core->con);
 		$devis = $daoDevis->getListeValidesLibres($projet_id);
 		$listeDevis = array('--' => 0);
-		foreach($devis as $id => $dev) {
+		foreach ($devis as $id => $dev) {
 			$listeDevis[$dev->nom] = $dev->devis_id;
 		}
 
@@ -574,8 +569,7 @@ class extranetUrl {
 		return $res;
 	}
 
-	public static function formTache($tache)
-	{
+	public static function formTache($tache) {
 		global $core;
 		commonDroits::min(1);
 
@@ -586,8 +580,7 @@ class extranetUrl {
 		return $res;
 	}
 
-	public static function formTacheNormale($tache_id, $projet_id = null)
-	{
+	public static function formTacheNormale($tache_id, $projet_id = null) {
 		global $core;
 		commonDroits::min(1);
 		$dao = new extranetDAOTache($core->con);
@@ -603,8 +596,7 @@ class extranetUrl {
 		return $res;
 	}
 
-	public static function formTacheSousTraitee($tache_id, $projet_id = null)
-	{
+	public static function formTacheSousTraitee($tache_id, $projet_id = null) {
 		global $core;
 		commonDroits::min(1);
 		$dao = new extranetDAOTache($core->con);
@@ -619,8 +611,7 @@ class extranetUrl {
 		return $res;
 	}
 
-	public static function timereport($args)
-	{
+	public static function timereport($args) {
 		global $core;
 		commonDroits::min(1);
 		$settings = $core->user->getSettings('timereport');
@@ -637,13 +628,12 @@ class extranetUrl {
 		return $res;
 	}
 
-	public static function listeTimereport($dashboard = null, $settings = null)
-	{
+	public static function listeTimereport($dashboard = null, $settings = null) {
 		global $core;
 		commonDroits::min(1);
 		// Récupère la liste des projets
-		$settings = is_null($settings)?$core->user->getSettings('timereport'):$settings;
-		$change = is_null($dashboard)?'Timereport':'Dashboard/' . $dashboard;
+		$settings = is_null($settings) ? $core->user->getSettings('timereport') : $settings;
+		$change = is_null($dashboard) ? 'Timereport' : 'Dashboard/' . $dashboard;
 
 		$dao = new extranetDAOProjet($core->con);
 		if (isset($settings['search']) && !is_null($settings['search'])) {
@@ -653,8 +643,8 @@ class extranetUrl {
 		$liste = $dao->getProjetsForTimereport($settings['orderby'], $settings['sens'], $settings['limit'], $core->user->utilisateur_id);
 		// Extrait la liste des tâches
 		$taches = array();
-		foreach($liste as $id => $projet) {
-			foreach($projet->taches as $tache) {
+		foreach ($liste as $id => $projet) {
+			foreach ($projet->taches as $tache) {
 				if ($tache instanceof extranetTacheNormale) {
 					$taches[] = $tache->tache_id;
 				}
@@ -672,7 +662,7 @@ class extranetUrl {
 		$res .= '<tr><th class="normal">' . commonUrl::orderby('#', 'projet_id', $settings, 'sort' . $change) . '</th>';
 		$res .= '<th class="normal">' . commonUrl::orderby(__('Projet'), 'nom', $settings, 'sort' . $change) . '</th>';
 		$res .= '<th class="normal">' . commonUrl::orderby(__('Client'), 'client', $settings, 'sort' . $change) . '</th>';
-		for($date = $avant;$date <= $apres;$date += 3600 * 24) {
+		for ($date = $avant; $date <= $apres; $date += 3600 * 24) {
 			$res .= '<th>' . date('d', $date) . '' . cubeMedia::spacer(16, 1, '', 'spacer') . '</th>';
 		}
 		$res .= '<th class="normal info">' . commonUrl::orderby('<abbr title="' . __('Progression') . '">Pr</abbr>', 'progression', $settings, 'sort' . $change) . '</th>';
@@ -680,40 +670,40 @@ class extranetUrl {
 		$res .= '<th class="normal info">' . commonUrl::orderby('<abbr title="' . __('Jours prévus') . '">Pl</abbr>', 'jours_prevus', $settings, 'sort' . $change) . '</th>';
 		$res .= '</tr>';
 
-		foreach($liste as $projet) {
+		foreach ($liste as $projet) {
 			$res .= '<tr class="bold">';
 			$res .= '<td class="normal">' . $projet->projet_id . '</td>';
 			$res .= '<td class="normal">' . $projet->nom . '</td>';
 			$res .= '<td class="normal">' . $projet->client . '</td>';
-			for($date = $avant;$date <= $apres;$date += 3600 * 24) {
+			for ($date = $avant; $date <= $apres; $date += 3600 * 24) {
 				$cc = self::getClassOfDay($date);
-				$class = ($cc == '')?'':' class="' . $cc . '"';
+				$class = ($cc == '') ? '' : ' class="' . $cc . '"';
 				$res .= '<td' . $class . '></td>';
 			}
-			$projet->progression = !$projet->progression?'-':$projet->progression . '%';
-			$projet->jours_prevus = !$projet->jours_prevus?'-':$projet->jours_prevus;
-			$projet->jours_consommes = !$projet->jours_consommes?'-':$projet->jours_consommes;
+			$projet->progression = !$projet->progression ? '-' : $projet->progression . '%';
+			$projet->jours_prevus = !$projet->jours_prevus ? '-' : $projet->jours_prevus;
+			$projet->jours_consommes = !$projet->jours_consommes ? '-' : $projet->jours_consommes;
 			$res .= '<td class="normal info"><span id="progress_projet_' . $projet->projet_id . '">' . $projet->progression . '</span></td>';
 			$res .= '<td class="normal info"><span id="consommees_projet_' . $projet->projet_id . '">' . $projet->jours_consommes . '</span></td>';
 			$res .= '<td class="normal info">' . $projet->jours_prevus . '</td>';
 			$res .= '</tr>';
 			$i = 1;
-			foreach($projet->taches as $tache) {
+			foreach ($projet->taches as $tache) {
 				if ($tache instanceof extranetTacheNormale) {
 					$res .= '<tr class="odd">';
 					$res .= '<td class="normal">T' . $i . '</td>';
 					$res .= '<td class="normal">' . $tache->nom . '</td>';
 					$res .= '<td class="normal">' . $core->categories[$tache->categorie] . '</td>';
-					for($date = $avant;$date <= $apres;$date += (3600 * 24)) {
-						$hh = isset($timereports[$tache->tache_id][$date])?$timereports[$tache->tache_id][$date]->heures:'';
-						$c = ($hh == '')?'':'filled';
+					for ($date = $avant; $date <= $apres; $date += (3600 * 24)) {
+						$hh = isset($timereports[$tache->tache_id][$date]) ? $timereports[$tache->tache_id][$date]->heures : '';
+						$c = ($hh == '') ? '' : 'filled';
 						$cc = trim(self::getClassOfDay($date) . ' ' . $c);
-						$class = ($cc == '')?'':' class="' . $cc . '"';
+						$class = ($cc == '') ? '' : ' class="' . $cc . '"';
 						$res .= '<td' . $class . '>' . form::field(array('timereport', 't_' . $date . '_' . $tache->tache_id), 1, 2, $hh, 'timereport_field') . '</td>';
 					}
-					$tache->progression = !$tache->progression?'-':$tache->progression . '%';
-					$tache->jours_prevus = !$tache->jours_prevus?'-':$tache->jours_prevus;
-					$tache->jours_consommes = !$tache->jours_consommes?'-':$tache->jours_consommes;
+					$tache->progression = !$tache->progression ? '-' : $tache->progression . '%';
+					$tache->jours_prevus = !$tache->jours_prevus ? '-' : $tache->jours_prevus;
+					$tache->jours_consommes = !$tache->jours_consommes ? '-' : $tache->jours_consommes;
 					$res .= '<td class="normal info"><span id="progress_' . $tache->tache_id . '">' . $tache->progression . '</span></td>';
 					$res .= '<td class="normal info"><span id="consommees_' . $tache->tache_id . '">' . $tache->jours_consommes . '</span></td>';
 					$res .= '<td class="normal info">' . $tache->jours_prevus . '</td>';
@@ -733,8 +723,7 @@ class extranetUrl {
 		return $res;
 	}
 
-	public static function getClassOfDay($date)
-	{
+	public static function getClassOfDay($date) {
 		$aujourdhui = cubeDate::round(null, 'd');
 		$highlight = ($date == $aujourdhui);
 		$we = (date('N', $date) >= 6);
@@ -747,8 +736,7 @@ class extranetUrl {
 		return '';
 	}
 
-	public static function devis($args)
-	{
+	public static function devis($args) {
 		global $core;
 		cubePage::truePopup();
 		cubePage::contextMenu();
@@ -767,7 +755,7 @@ class extranetUrl {
 		$filtres[] = new commonFiltre(__('Status'), 'status_devis', $settings['filtres']);
 		$filtres[] = new commonFiltre(__('Année'), 'annee_facture', $settings['filtres']);
 
-		$res = commonPage::barre($filtres, 'filtreDevis', 'devis' , $shortcuts);
+		$res = commonPage::barre($filtres, 'filtreDevis', 'devis', $shortcuts);
 		$res .= commonPage::tMain();
 		$res .= commonPage::bh();
 		$res .= '<div id="listeDevis">';
@@ -778,8 +766,7 @@ class extranetUrl {
 		return $res;
 	}
 
-	public static function devis_client($args)
-	{
+	public static function devis_client($args) {
 		global $core;
 
 		$res = commonPage::barre();
@@ -793,8 +780,7 @@ class extranetUrl {
 		return $res;
 	}
 
-	public static function listeDevis($dashboard = null, $settings = null)
-	{
+	public static function listeDevis($dashboard = null, $settings = null) {
 		global $core;
 
 		if ($core->user->grade == 0) {
@@ -804,13 +790,12 @@ class extranetUrl {
 		}
 	}
 
-	public static function contextDevis($id)
-	{
+	public static function contextDevis($id) {
 		global $core;
 		$res = '<div class="contextMenu" id="' . $id . '">';
 		$res .= '<ul>';
 		$res .= '<li class="head">' . __("Changer le status du devis") . '</li>';
-		foreach($core->devis_status as $k => $v) {
+		foreach ($core->devis_status as $k => $v) {
 			if ($k == 0) {
 				continue;
 			}
@@ -823,13 +808,12 @@ class extranetUrl {
 		return $res;
 	}
 
-	public static function listeDevisEquipier($dashboard = null, $settings = null)
-	{
+	public static function listeDevisEquipier($dashboard = null, $settings = null) {
 		global $core;
 		commonDroits::min(1);
-		$settings = is_null($settings)?$core->user->getSettings('devis'):$settings;
-		$change = is_null($dashboard)?'Devis':'Dashboard/' . $dashboard;
-		$context_id = is_null($dashboard)?'contextDevis':'contextDashboard_' . $dashboard;
+		$settings = is_null($settings) ? $core->user->getSettings('devis') : $settings;
+		$change = is_null($dashboard) ? 'Devis' : 'Dashboard/' . $dashboard;
+		$context_id = is_null($dashboard) ? 'contextDevis' : 'contextDashboard_' . $dashboard;
 
 		$dao = new extranetDAODevis($core->con);
 		if (isset($settings['search']) && !is_null($settings['search'])) {
@@ -848,9 +832,9 @@ class extranetUrl {
 		$res .= '<th>' . commonUrl::orderby(__('Status'), 'status', $settings, 'sort' . $change) . '</th>';
 		$res .= '<th class="min"></th><th class="min"></th><th class="min"></th></tr>';
 		$i = 0;
-		foreach($liste as $devis) {
+		foreach ($liste as $devis) {
 			$droits = extranetDroits::devis($devis, 'w', false);
-			$odd = cubeMath::isOdd($i)?' class="odd"':'';
+			$odd = cubeMath::isOdd($i) ? ' class="odd"' : '';
 			$res .= '<tr' . $odd . '>';
 			$res .= '<td>' . $devis->devis_id . '</td>';
 			$res .= '<td>' . $devis->nom . '</td>';
@@ -889,7 +873,7 @@ class extranetUrl {
 			$i++;
 		}
 		if (!isset($settings['search']) || is_null($settings['search'])) {
-			$odd = cubeMath::isOdd($i)?' class="odd"':'';
+			$odd = cubeMath::isOdd($i) ? ' class="odd"' : '';
 			$res .= '<tr' . $odd . '><td colspan="10">';
 			$res .= commonPage::pager($settings['page'], $dao->count(), $settings['par_page'], 'page' . $change . '/%d');
 			$res .= commonUrl::formParPage('parPage' . $change, $settings['par_page'], __('devis'));
@@ -899,8 +883,7 @@ class extranetUrl {
 		return $res;
 	}
 
-	public static function listeDevisClient($dashboard = null, $settings = null)
-	{
+	public static function listeDevisClient($dashboard = null, $settings = null) {
 		global $core;
 		cubePage::truePopup();
 
@@ -914,8 +897,8 @@ class extranetUrl {
 		$res .= '<th>' . commonUrl::orderby(__('Status'), 'status', $settings, 'sortDevis') . '</th>';
 		$res .= '<th class="min"></th></tr>';
 		$i = 0;
-		foreach($liste as $devis) {
-			$odd = cubeMath::isOdd($i)?' class="odd"':'';
+		foreach ($liste as $devis) {
+			$odd = cubeMath::isOdd($i) ? ' class="odd"' : '';
 			$res .= '<tr' . $odd . '>';
 			$res .= '<td>' . $devis->nom . '</td>';
 			$res .= '<td>' . date(__('d/m/Y'), $devis->date_creation) . '</td>';
@@ -932,8 +915,7 @@ class extranetUrl {
 		return $res;
 	}
 
-	public static function voirdevis($args)
-	{
+	public static function voirdevis($args) {
 		global $core;
 		// Charge le devis
 		$dao = new extranetDAODevis($core->con);
@@ -944,8 +926,7 @@ class extranetUrl {
 		cubeHTTP::relayNoCache(ROOT . '/devis/' . $args[1] . '.pdf');
 	}
 
-	public static function editedevis($args)
-	{
+	public static function editedevis($args) {
 		global $core;
 		commonDroits::min(1);
 		$res = commonPage::barre();
@@ -957,8 +938,7 @@ class extranetUrl {
 		return $res;
 	}
 
-	public static function formDevis($devis_id = 'new')
-	{
+	public static function formDevis($devis_id = 'new') {
 		global $core;
 		cubePage::autocomplete();
 		cubePage::emptyField();
@@ -1007,7 +987,7 @@ class extranetUrl {
 		// Lignes du devis
 		$nb_lignes = max(4, count($devis->lignes) + 2);
 
-		for($i = 0;$i < $nb_lignes;$i++) {
+		for ($i = 0; $i < $nb_lignes; $i++) {
 			if (isset($devis->lignes[$i])) {
 				$titre = $devis->lignes[$i]['titre'];
 				$description = $devis->lignes[$i]['description'];
@@ -1044,8 +1024,7 @@ class extranetUrl {
 		return $res;
 	}
 
-	public static function previewDevis($args)
-	{
+	public static function previewDevis($args) {
 		global $core;
 
 		$dao = new extranetDAODevis($core->con);
@@ -1078,8 +1057,7 @@ class extranetUrl {
 		return $res;
 	}
 
-	public static function factures($args)
-	{
+	public static function factures($args) {
 		global $core;
 
 		if ($core->user->grade == 0) {
@@ -1097,7 +1075,7 @@ class extranetUrl {
 		$filtres[] = new commonFiltre(__('Créées par'), 'equipier', $settings['filtres']);
 		$filtres[] = new commonFiltre(__('Status'), 'status_facture', $settings['filtres']);
 		$filtres[] = new commonFiltre(__('Année'), 'annee_facture', $settings['filtres']);
-		$res = commonPage::barre($filtres , 'filtreFactures', 'factures', $shortcuts);
+		$res = commonPage::barre($filtres, 'filtreFactures', 'factures', $shortcuts);
 		$res .= commonPage::tMain();
 		$res .= commonPage::bh();
 		$res .= '<div id="listeFactures">';
@@ -1108,8 +1086,7 @@ class extranetUrl {
 		return $res;
 	}
 
-	public static function factures_client($args)
-	{
+	public static function factures_client($args) {
 		global $core;
 		$res = commonPage::barre();
 		$res .= commonPage::tMain();
@@ -1122,13 +1099,12 @@ class extranetUrl {
 		return $res;
 	}
 
-	public static function contextFacture($id)
-	{
+	public static function contextFacture($id) {
 		global $core;
 		$res = '<div class="contextMenu" id="' . $id . '">';
 		$res .= '<ul>';
 		$res .= '<li class="head">' . __("Changer le status de la facture") . '</li>';
-		foreach($core->factures_status as $k => $v) {
+		foreach ($core->factures_status as $k => $v) {
 			if (in_array($k, array(0, 4))) {
 				continue;
 			}
@@ -1147,8 +1123,7 @@ class extranetUrl {
 		return $res;
 	}
 
-	public static function listeFactures($dashboard = null, $settings = null)
-	{
+	public static function listeFactures($dashboard = null, $settings = null) {
 		global $core;
 		if ($core->user->grade == 0) {
 			return self::listeFacturesClient($dashboard, $settings);
@@ -1157,15 +1132,14 @@ class extranetUrl {
 		}
 	}
 
-	public static function listeFacturesEquipier($dashboard = null, $settings = null)
-	{
+	public static function listeFacturesEquipier($dashboard = null, $settings = null) {
 		global $core;
 		cubePage::truePopup();
 		cubePage::contextMenu();
 
-		$settings = is_null($settings)?$core->user->getSettings('factures'):$settings;
-		$change = is_null($dashboard)?'Facture':'Dashboard/' . $dashboard;
-		$context_id = is_null($dashboard)?'contextFacture':'contextDashboard_' . $dashboard;
+		$settings = is_null($settings) ? $core->user->getSettings('factures') : $settings;
+		$change = is_null($dashboard) ? 'Facture' : 'Dashboard/' . $dashboard;
+		$context_id = is_null($dashboard) ? 'contextFacture' : 'contextDashboard_' . $dashboard;
 		$dao = new extranetDAOFacture($core->con);
 		if (isset($settings['search']) && !is_null($settings['search'])) {
 			$dao->setSearch($settings['search']);
@@ -1189,9 +1163,9 @@ class extranetUrl {
 		$res .= '<th>' . commonUrl::orderby(__('Montant HT'), 'total_ht', $settings, 'sort' . $change) . '</th>';
 		$res .= '<th>' . commonUrl::orderby(__('Status'), 'status', $settings, 'sort' . $change) . '</th><th class="min"></th><th class="min"></th><th class="min"></th></tr>';
 		$i = 0;
-		foreach($liste as $facture) {
+		foreach ($liste as $facture) {
 			$droits = extranetDroits::facture($facture, 'w', false);
-			$odd = cubeMath::isOdd($i)?' class="odd"':'';
+			$odd = cubeMath::isOdd($i) ? ' class="odd"' : '';
 			$res .= '<tr' . $odd . '>';
 			$res .= '<td>' . $facture->facture_id . '</td>';
 			$res .= '<td>' . $facture->nom . '</td>';
@@ -1216,7 +1190,7 @@ class extranetUrl {
 						$res .= '<td>' . $core->factures_status[$facture->status] . '</td>';
 					}
 				} else {
-					$title = $facture->status == 3?__("Voir l'avoir correspondant"):__("Voir la facture annulée correspondante");
+					$title = $facture->status == 3 ? __("Voir l'avoir correspondant") : __("Voir la facture annulée correspondante");
 					$res .= '<td><a href="' . SITE_PATH . 'voirfacture/' . $facture->avoir . '" class="popupA4" title="' . $title . '">' . $core->factures_status[$facture->status] . '</a></td>';
 				}
 				if ($facture->facture_id > 0) {
@@ -1240,12 +1214,12 @@ class extranetUrl {
 			$i++;
 		}
 		if (!isset($settings['search']) || is_null($settings['search'])) {
-			$odd = cubeMath::isOdd($i)?' class="odd"':'';
-			$res .= '<tr' . $odd . '><td colspan="10">' ;
+			$odd = cubeMath::isOdd($i) ? ' class="odd"' : '';
+			$res .= '<tr' . $odd . '><td colspan="10">';
 			if ($core->user->grade != 3) {
-				$res .= commonPage::pager($settings['page'], $dao->count() , $settings['par_page'], 'page' . $change . '/%d');
+				$res .= commonPage::pager($settings['page'], $dao->count(), $settings['par_page'], 'page' . $change . '/%d');
 			} else {
-				$res .= commonPage::pager($settings['page'], $dao->countCompta() , $settings['par_page'], 'page' . $change . '/%d');
+				$res .= commonPage::pager($settings['page'], $dao->countCompta(), $settings['par_page'], 'page' . $change . '/%d');
 			}
 			$res .= commonUrl::formParPage('parPage' . $change, $settings['par_page'], __('factures'));
 			$res .= '</td></tr>';
@@ -1254,8 +1228,7 @@ class extranetUrl {
 		return $res;
 	}
 
-	public static function listeFacturesClient($dashboard = null, $settings = null)
-	{
+	public static function listeFacturesClient($dashboard = null, $settings = null) {
 		global $core;
 		cubePage::truePopup();
 		$settings = $core->user->getSettings('factures');
@@ -1270,8 +1243,8 @@ class extranetUrl {
 		$res .= '<th>' . commonUrl::orderby(__('Status'), 'status', $settings, 'sortFacture') . '</th>';
 		$res .= '<th class="min"></th></tr>';
 		$i = 0;
-		foreach($liste as $facture) {
-			$odd = cubeMath::isOdd($i)?' class="odd"':'';
+		foreach ($liste as $facture) {
+			$odd = cubeMath::isOdd($i) ? ' class="odd"' : '';
 			$res .= '<tr' . $odd . '>';
 			$res .= '<td>' . $facture->numeroFacture() . '</td>';
 			$res .= '<td>' . $facture->nom . '</td>';
@@ -1290,12 +1263,11 @@ class extranetUrl {
 		return $res;
 	}
 
-	public static function formFacturePaiement($facture_id)
-	{
+	public static function formFacturePaiement($facture_id) {
 		global $core;
 		$dao = new extranetDAOFacture($core->con);
 		$facture = $dao->selectById($facture_id);
-		$date = !$facture->date_paiement?null:$facture->date_paiement;
+		$date = !$facture->date_paiement ? null : $facture->date_paiement;
 
 		$res = '<tr><td>' . form::hidden('facture_id', $facture_id) . __('Date de paiement') . '</td><td>' . cubeForm::date('date_paiement', $date) . '</td></tr>';
 		$res .= '<tr><td>' . __('Informations de paiement') . '</td><td>' . form::textarea('informations_paiement', 40, 3, $facture->informations_paiement) . '</td></tr>';
@@ -1303,8 +1275,7 @@ class extranetUrl {
 		return $res;
 	}
 
-	public static function voirfacture($args)
-	{
+	public static function voirfacture($args) {
 		global $core;
 		// Charge la facture
 		$dao = new extranetDAOFacture($core->con);
@@ -1315,8 +1286,7 @@ class extranetUrl {
 		cubeHTTP::relayNoCache(ROOT . '/factures/' . $args[1] . '.pdf');
 	}
 
-	public static function editefacture($args)
-	{
+	public static function editefacture($args) {
 		global $core;
 		commonDroits::min(1);
 		$res = commonPage::barre();
@@ -1332,8 +1302,7 @@ class extranetUrl {
 		return $res;
 	}
 
-	public static function formFacture($facture_id = 'new', $projet_id = null)
-	{
+	public static function formFacture($facture_id = 'new', $projet_id = null) {
 		global $core;
 		commonDroits::min(1);
 		cubePage::autoComplete();
@@ -1343,7 +1312,7 @@ class extranetUrl {
 		$daoProjet = new extranetDAOProjet($core->con);
 		$dao = new extranetDAOFacture($core->con);
 
-		$projet_id = isset($_POST['projet_id']) && $_POST['projet_id'] > 0?$_POST['projet_id']:$projet_id;
+		$projet_id = isset($_POST['projet_id']) && $_POST['projet_id'] > 0 ? $_POST['projet_id'] : $projet_id;
 
 		if ($facture_id == 'new') {
 			$facture = $dao->cree();
@@ -1360,7 +1329,7 @@ class extranetUrl {
 			$facture->client = $projet->client;
 			$facture->projet = $facture->nom = $projet->nom;
 			$lignes = array();
-			foreach($projet->taches as $tache) {
+			foreach ($projet->taches as $tache) {
 				$lignes[] = array('montant' => $tache->budget, 'titre' => $tache->nom, 'description' => '');
 			}
 			$facture->lignes = $lignes;
@@ -1428,12 +1397,12 @@ class extranetUrl {
 		// Lignes du devis
 		$nb_lignes = max(4, count($facture->lignes) + 2);
 
-		for($i = 0;$i < $nb_lignes;$i++) {
+		for ($i = 0; $i < $nb_lignes; $i++) {
 			if (isset($facture->lignes[$i])) {
 				$titre = $facture->lignes[$i]['titre'];
 				$description = $facture->lignes[$i]['description'];
 				$montant = $facture->lignes[$i]['montant'];
-				$book = isset($facture->lignes[$i]['book'])?$facture->lignes[$i]['book']:null;
+				$book = isset($facture->lignes[$i]['book']) ? $facture->lignes[$i]['book'] : null;
 			} else {
 				$titre = $description = $montant = '';
 			}
@@ -1443,7 +1412,7 @@ class extranetUrl {
 			$res .= '<div class="devisLigneRight">';
 			$res .= form::field(array('montant[]'), 6, 15, $montant) . " €";
 			if (isset($book) && !is_null($book)) {
-				$res .= form::hidden(array('book[]'), $book) ;
+				$res .= form::hidden(array('book[]'), $book);
 			}
 			$res .= '</div>';
 			$res .= '<div class="devisLigneLeft">';
@@ -1463,8 +1432,7 @@ class extranetUrl {
 		return $res;
 	}
 
-	public static function previewFacture($args)
-	{
+	public static function previewFacture($args) {
 		global $core;
 		commonDroits::min(1);
 		$dao = new extranetDAOFacture($core->con);
@@ -1487,8 +1455,7 @@ class extranetUrl {
 		return $res;
 	}
 
-	public static function formPrintFactures()
-	{
+	public static function formPrintFactures() {
 		global $core;
 		$last = $core->user->getLastPrint();
 		$res = '';
@@ -1500,8 +1467,7 @@ class extranetUrl {
 		return $res;
 	}
 
-	public static function chiffres($args)
-	{
+	public static function chiffres($args) {
 		global $core;
 		commonDroits::min(2);
 		// $res = commonPage::barre(null, null, null, array('<a href="http://www.google.com/calendar/" class="blank">' . $core->typo->Favoris(__('Gérer les charges sur Google Agenda')) . '</a>'));
@@ -1512,8 +1478,7 @@ class extranetUrl {
 		return $res;
 	}
 
-	public static function traduction($args)
-	{
+	public static function traduction($args) {
 		global $core;
 		commonDroits::min(1);
 		$res = commonPage::barre();
@@ -1523,15 +1488,14 @@ class extranetUrl {
 		$res .= '<table class="liste">';
 		$res .= '<tr><th>' . __("Traduction de l'application en anglais") . '</th><th></th></tr>';
 		$res .= '</table>';
-		$res .= cubeLang::translationForm(array(ROOT . '/inc/commons',ROOT . '/inc/extranet',ROOT . '/inc/ws', COMPOSER_SOURCES), 'en' , ROOT . '/l10n', '', array(), '<a href="#" class="submit">' . $core->typo->BoutonOK('Enregistrer') . '</a>');
+		$res .= cubeLang::translationForm(array(ROOT . '/inc/commons', ROOT . '/inc/extranet', ROOT . '/inc/ws', COMPOSER_SOURCES), 'en', ROOT . '/l10n', '', array(), '<a href="#" class="submit">' . $core->typo->BoutonOK('Enregistrer') . '</a>');
 		$res .= '</form>';
 		$res .= commonPage::bf();
 		$res .= commonPage::bMain();
 		return $res;
 	}
 
-	public static function cleanTimereport($args)
-	{
+	public static function cleanTimereport($args) {
 		global $core;
 
 		$r = $core->con->select('SELECT * FROM timereport');
@@ -1543,7 +1507,7 @@ class extranetUrl {
 			$t[date('Y', $r->date)][$r->utilisateur_id][$r->tache_id] += $r->heures;
 		}
 
-		foreach($t as $annee => $t1) {
+		foreach ($t as $annee => $t1) {
 			if ($annee == date('Y')) {
 				continue;
 			}
@@ -1551,9 +1515,9 @@ class extranetUrl {
 			$core->con->execute('DELETE FROM timereport WHERE date BETWEEN ' . $limit['start'] . ' AND ' . $limit['end']);
 			$c = $core->con->openCursor('timereport');
 			$c->date = mktime(1, 1, 1, 1, 1, $annee);
-			foreach($t1 as $uid => $t2) {
+			foreach ($t1 as $uid => $t2) {
 				$c->utilisateur_id = $uid;
-				foreach($t2 as $tache_id => $heures) {
+				foreach ($t2 as $tache_id => $heures) {
 					$c->tache_id = $tache_id;
 					$c->heures = $heures;
 					$c->insert();
@@ -1562,8 +1526,7 @@ class extranetUrl {
 		}
 	}
 
-	public static function rh($args)
-	{
+	public static function rh($args) {
 		global $core;
 		commonDroits::min(2);
 		$res = commonPage::barre();
@@ -1577,12 +1540,11 @@ class extranetUrl {
 		return $res;
 	}
 
-	public static function listeRh($dashboard = null, $settings = null)
-	{
+	public static function listeRh($dashboard = null, $settings = null) {
 		global $core;
 		commonDroits::min(2);
-		$settings = is_null($settings)?$core->user->getSettings('equipiers'):$settings;
-		$change = is_null($dashboard)?'Equipier':'Dashboard/' . $dashboard;
+		$settings = is_null($settings) ? $core->user->getSettings('equipiers') : $settings;
+		$change = is_null($dashboard) ? 'Equipier' : 'Dashboard/' . $dashboard;
 		$dao = new commonDAOEquipier($core->con);
 		$liste = $dao->getListe($settings['orderby'], $settings['sens'], $settings['limit']);
 
@@ -1595,14 +1557,14 @@ class extranetUrl {
 		$res .= '<th>Notes</th>';
 		// $res .= '<th class="min"></th><th class="min"></th></tr>';
 		$i = 0;
-		foreach($liste as $id => $equipier) {
-			$odd = cubeMath::isOdd($i)?' class="odd"':'';
+		foreach ($liste as $id => $equipier) {
+			$odd = cubeMath::isOdd($i) ? ' class="odd"' : '';
 			$res .= '<tr' . $odd . '>';
 			$res .= '<td>' . $equipier->utilisateur_id . '</td>';
 			$res .= '<td>' . $equipier->agence . '</td>';
 			$res .= '<td>' . $equipier->prenom . ' ' . $equipier->nom . '</td>';
 
-			$email = strlen($equipier->email) > 20?substr($equipier->email, 0, 17) . '...':$equipier->email;
+			$email = strlen($equipier->email) > 20 ? substr($equipier->email, 0, 17) . '...' : $equipier->email;
 
 			$res .= '<td><a href="mailto:' . cubeMail::encodeForURL($equipier->email) . '">' . $email . '</a></td>';
 			$res .= '<td>' . $core->grades[$equipier->grade] . '</td>';
@@ -1612,16 +1574,17 @@ class extranetUrl {
 			$res .= '</tr>';
 			$i++;
 		}
-		/*if (!isset($settings['search']) || is_null($settings['search'])) {
-			$odd = cubeMath::isOdd($i)?' class="odd"':'';
-			$res .= '<tr' . $odd . '><td colspan="10">';
-			$res .= commonPage::pager($settings['page'], $dao->count() , $settings['par_page'], 'page' . $change . '/%d');
-			$res .= commonUrl::formParPage('parPage' . $change, $settings['par_page'], __('clients'));
-			$res .= '</td></tr>';
-		}*/
+		/* if (!isset($settings['search']) || is_null($settings['search'])) {
+		  $odd = cubeMath::isOdd($i)?' class="odd"':'';
+		  $res .= '<tr' . $odd . '><td colspan="10">';
+		  $res .= commonPage::pager($settings['page'], $dao->count() , $settings['par_page'], 'page' . $change . '/%d');
+		  $res .= commonUrl::formParPage('parPage' . $change, $settings['par_page'], __('clients'));
+		  $res .= '</td></tr>';
+		  } */
 		$res .= '</table>';
 		return $res;
 	}
+
 }
 
 ?>
\ No newline at end of file
diff --git a/inc/extranet/DAO/class.extranet.dao.tache.php b/inc/extranet/DAO/class.extranet.dao.tache.php
index 20a60d7fe..6b1658e21 100644
--- a/inc/extranet/DAO/class.extranet.dao.tache.php
+++ b/inc/extranet/DAO/class.extranet.dao.tache.php
@@ -8,6 +8,10 @@ class extranetDAOTache extends commonDAO {
 			$tache->jours_consommes = round($r->jours_consommes, 1);
 			$tache->taux_journalier = $r->taux_journalier;
 			$tache->progression = round($r->progression);
+			$tache->books=array();
+			if(!is_null($r->books)){
+				$tache->books=explode(',',$r->books);
+			}
 		} else {
 			$tache = new extranetTacheSousTraitee();
 		}
diff --git a/inc/extranet/Metier/class.extranet.tache.normale.php b/inc/extranet/Metier/class.extranet.tache.normale.php
index 90b698ed7..69a5c4ff5 100644
--- a/inc/extranet/Metier/class.extranet.tache.normale.php
+++ b/inc/extranet/Metier/class.extranet.tache.normale.php
@@ -5,6 +5,7 @@ class extranetTacheNormale extends extranetTache {
 	protected $jours_prevus;
 	protected $progression;
 	protected $jours_consommes;
+	protected $books;
 }
 
 ?>
\ No newline at end of file
diff --git a/inc/postconfig.inc.php b/inc/postconfig.inc.php
index 5458fe008..151c751b8 100644
--- a/inc/postconfig.inc.php
+++ b/inc/postconfig.inc.php
@@ -6,25 +6,15 @@ $ws = stristr($_SERVER['HTTP_HOST'], 'fluidbook.com');
 
 define('DEV', $dev);
 
-if ($dev) {
-	// Définition de la configuration sur l'environnement de développement
-	define('DB_HOST', ':/var/run/mysqld/mysqld.sock');
-	define('DB_NAME', 'extranet_dev');
-	define('DB_USER', 'ws');
-	define('DB_PASSWORD', '*arica*2');
-
-	define('EXTRANET_URL', 'http://dev.extranet.cubedesigners.com');
-	define('WS_URL', 'http://dev.ws.fluidbook.com');
-} else {
-	// Définition des variables dans l'environnement de production
-	define('DB_HOST', ':/var/run/mysqld/mysqld.sock');
-	define('DB_NAME', 'extranet_workshop');
-	define('DB_USER', 'ws');
-	define('DB_PASSWORD', '*arica*2');
-
-	define('EXTRANET_URL', 'http://extranet.cubedesigners.com');
-	define('WS_URL', 'http://workshop.fluidbook.com');
-}
+// Définition des variables dans l'environnement de production
+define('DB_HOST', ':/var/run/mysqld/mysqld.sock');
+define('DB_NAME', 'extranet_workshop');
+define('DB_USER', 'ws');
+define('DB_PASSWORD', '*arica*2');
+
+define('EXTRANET_URL', 'http://extranet.cubedesigners.com');
+define('WS_URL', 'http://workshop.fluidbook.com');
+
 
 if ($ws) {
 	define('MODE', 'ws');
@@ -43,5 +33,4 @@ define('IMG', WEBROOT . '/images/' . MODE);
 
 define('TYPOGRAPHP_PATH', ROOT . '/typo/' . MODE);
 define('TYPOGRAPHP_WEBROOT', IMG . '/typographp');
-
 ?>
\ No newline at end of file
diff --git a/inc/ws/Controlleur/class.ws.ajax.php b/inc/ws/Controlleur/class.ws.ajax.php
index 51aa71767..8cb1cc22c 100644
--- a/inc/ws/Controlleur/class.ws.ajax.php
+++ b/inc/ws/Controlleur/class.ws.ajax.php
@@ -125,9 +125,7 @@ class wsAjax extends cubeAjax {
 	}
 
 	public static function searchPublications($args, &$x) {
-		fb(microtime(true));
 		$x->addContent('listeBooks', wsUrl::listeBooks());
-		fb(microtime(true));
 	}
 
 	public static function pageBooks($args, &$x) {
@@ -168,7 +166,7 @@ class wsAjax extends cubeAjax {
 		global $core;
 		$dao = new wsDAOBook($core->con);
 		if ($_POST['book'] != '') {
-			$book = $dao->duplicate($_POST['book'], $core->user->utilisateur_id, $_POST['title'],isset($_POST['pages']));
+			$book = $dao->duplicate($_POST['book'], $core->user->utilisateur_id, $_POST['title'], isset($_POST['pages']));
 		} else {
 			$book = $dao->creeEmpty($core->user->utilisateur_id, $core->user->lang, $_POST['title']);
 		}
diff --git a/inc/ws/Controlleur/class.ws.url.php b/inc/ws/Controlleur/class.ws.url.php
index ca88a4bd5..4caf06ffd 100644
--- a/inc/ws/Controlleur/class.ws.url.php
+++ b/inc/ws/Controlleur/class.ws.url.php
@@ -4,6 +4,10 @@ class wsUrl {
 
 	public static function publications($args) {
 		global $core;
+		
+		if(isset($args[1])){
+			$_SESSION['q']=$args[1];
+		}
 
 		$settings = $core->user->getSettings('books');
 
diff --git a/inc/ws/DAO/class.ws.dao.book.php b/inc/ws/DAO/class.ws.dao.book.php
index 2671d0ce1..bb1cad291 100644
--- a/inc/ws/DAO/class.ws.dao.book.php
+++ b/inc/ws/DAO/class.ws.dao.book.php
@@ -301,11 +301,14 @@ class wsDAOBook extends commonDAO {
 			if ($this->search_id) {
 				$where .= ' book_id=\'' . $this->con->escape($this->q) . '\' OR ';
 			}
-			$where .= 'nom LIKE \'%' . $this->con->escape($this->q) . '%\'';
-			$daoClient = new commonDAOClient($this->con);
-			$where .= ' OR proprietaire_id IN(' . $daoClient->querySearchByName($this->q) . ')';
+
+			if (!cubeMath::is_int($this->q)) {
+				$where .= 'nom LIKE \'%' . $this->con->escape($this->q) . '%\'';
+				$daoClient = new commonDAOClient($this->con);
+				$where .= ' OR proprietaire_id IN(' . $daoClient->querySearchByName($this->q) . ') OR ';
+			}
 			$limit = null;
-			$where .= ')';
+			$where .= '1=2)';
 		} else {
 			$where = '(' . $this->makeWhereFromFiltres() . ')';
 		}
@@ -322,6 +325,9 @@ class wsDAOBook extends commonDAO {
 
 	protected function limitToUserRights($utilisateur) {
 		if ($utilisateur) {
+			if (wsDroits::admin()) {
+				return '';
+			}
 			return ' AND proprietaire IN (' . $utilisateur->ws_rights . ')';
 		}
 		return '';
@@ -638,8 +644,8 @@ class wsDAOBook extends commonDAO {
 		$this->makeTextsIndexes($book_id, $index, $textes);
 		$daoDoc->getLinksAndRulers($book_id, $links, $rulers);
 
-		$flex = new cubeFlexCompiler('FluidbookDatas', $compilerDir, 'flash.display.Sprite', explode(';', AS3_SOURCES), MXMLC_PATH,10);
-		$flexLight = new cubeFlexCompiler('FluidbookDatasLight', $compilerDir, 'flash.display.Sprite', explode(';', AS3_SOURCES), MXMLC_PATH,10);
+		$flex = new cubeFlexCompiler('FluidbookDatas', $compilerDir, 'flash.display.Sprite', explode(';', AS3_SOURCES), MXMLC_PATH, 10);
+		$flexLight = new cubeFlexCompiler('FluidbookDatasLight', $compilerDir, 'flash.display.Sprite', explode(';', AS3_SOURCES), MXMLC_PATH, 10);
 		$flex->addVariable('links', $links, false, true, 'JSONObject');
 
 		$imagesassets = array();
@@ -828,11 +834,11 @@ class wsDAOBook extends commonDAO {
 
 	public function indexPDF($book, $pages) {
 		$indexPath = WS_BOOKS . '/search/' . $book->book_id;
-		
-		if(file_exists($indexPath) && filemtime($indexPath)>$book->composition_update){
+
+		if (file_exists($indexPath) && filemtime($indexPath) > $book->composition_update) {
 			return;
 		}
-		
+
 		Zend_Search_Lucene_Analysis_Analyzer::setDefault(new Zend_Search_Lucene_Analysis_Analyzer_Common_Utf8Num_CaseInsensitive());
 
 		if (file_exists($indexPath)) {
diff --git a/inc/ws/Util/packager/class.ws.packager.html.php b/inc/ws/Util/packager/class.ws.packager.html.php
index b937dd3fe..75df04b9d 100644
--- a/inc/ws/Util/packager/class.ws.packager.html.php
+++ b/inc/ws/Util/packager/class.ws.packager.html.php
@@ -43,7 +43,7 @@ class wsPackagerHTML extends wsPackager {
 			if ($this->book->parametres->facebook_description != '') {
 				$facebook .= '<meta property="og:description" content="' . self::escape($this->book->parametres->facebook_description) . '" />';
 			}
-			$facebook .= '<meta property="og:image" content="http://dev.ws.fluidbook.com/services/facebook_thumbnail?id=' . $this->book->book_id . '" />';
+			$facebook .= '<meta property="og:image" content="http://workshop.fluidbook.com/services/facebook_thumbnail?id=' . $this->book->book_id . '" />';
 		}
 		// Stuffs to replace in html
 		$toReplace = array('lang' => strtolower($this->book->lang), 'title' => self::escape($this->book->parametres->title), 'ga' => $ga, 'facebook' => $facebook, 'bgcolor' => $this->theme->parametres->loadingBackColor);