(no commit message)

diff --git a/.htaccess b/.htaccess
index 06c506ed78b3f06283de9bb24526538161b9a5bd..b74df29d9bb27806244288a24c9d9ab5156d36a1 100644 (file)
--- a/.htaccess
+++ b/.htaccess
@@ -14,6 +14,10 @@ AddCharset UTF-8 log
        RewriteEngine on\r
        RewriteBase /\r
 \r
+       # Dev\r
+       RewriteCond %{HTTP_HOST} dev.ws.fluidbook.com\r
+       RewriteRule ^(.*)$ http://workshop.fluidbook.com/$1 [R=301]\r
+\r
        # Favicon\r
        RewriteCond %{HTTP_HOST} cubedesigners\r
        RewriteRule ^favicon.ico$ images/extranet/favicon.ico [L]\r

diff --git a/inc/commons/class.common.core.php b/inc/commons/class.common.core.php
index bec051d618a9777b6a75eab837095779ad0c6138..74a9986dde0366a24bbfad93dd597fb0fce6ab37 100644 (file)
--- 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 '\r
                                . '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) '\r
                                . 'GROUP BY u.utilisateur_id', 'TEMPTABLE');\r
-               $this->views->createView('taches_vue', 'SELECT taches.tache_id,taches.nom,taches.categorie,taches.type,taches.budget,taches.projet,taches.taux_journalier, '\r
+               $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');\r
+               $this->views->createView('taches_vue', 'SELECT taches.tache_id,taches.nom,taches.categorie,taches.type,taches.budget,taches.projet,taches.taux_journalier,tb.books, '\r
                                . '(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 '\r
                                . 'FROM taches LEFT JOIN timereport ON taches.tache_id=timereport.tache_id '\r
+                               . 'LEFT JOIN taches_books tb ON tb.tache=taches.tache_id '\r
                                . 'GROUP BY taches.tache_id');\r
                $this->views->createView('taches_projet', 'SELECT projet, '\r
                                . 'SUM(jours_prevus) AS jours_prevus,SUM(budget) AS budget,'\r

diff --git a/inc/extranet/Controlleur/class.extranet.url.php b/inc/extranet/Controlleur/class.extranet.url.php
index e4c506b1bc1333f88cd70cbb6d6f59a2244511eb..fe5435db19582cac5aa4a668a14650a3171192c0 100644 (file)
--- a/inc/extranet/Controlleur/class.extranet.url.php
+++ b/inc/extranet/Controlleur/class.extranet.url.php
@@ -1,7 +1,8 @@
 <?php\r
+\r
 class extranetUrl {\r
-       public static function clients($args)\r
-       {\r
+\r
+       public static function clients($args) {\r
                global $core;\r
                cubePage::truePopup();\r
                cubePage::autoComplete();\r
@@ -25,12 +26,11 @@ class extranetUrl {
                return $res;\r
        }\r
 \r
-       public static function listeClients($dashboard = null, $settings = null)\r
-       {\r
+       public static function listeClients($dashboard = null, $settings = null) {\r
                global $core;\r
                commonDroits::min(1);\r
-               $settings = is_null($settings)?$core->user->getSettings('clients'):$settings;\r
-               $change = is_null($dashboard)?'Client':'Dashboard/' . $dashboard;\r
+               $settings = is_null($settings) ? $core->user->getSettings('clients') : $settings;\r
+               $change = is_null($dashboard) ? 'Client' : 'Dashboard/' . $dashboard;\r
                $dao = new commonDAOEntreprise($core->con);\r
                if (isset($settings['search']) && !is_null($settings['search'])) {\r
                        $dao->setSearch($settings['search']);\r
@@ -47,18 +47,18 @@ class extranetUrl {
                $res .= '<th>' . commonUrl::orderby('Impayés', 'impaye', $settings, 'sort' . $change) . '</th>';\r
                $res .= '<th class="min"></th><th class="min"></th></tr>';\r
                $i = 0;\r
-               foreach($liste as $id => $client) {\r
+               foreach ($liste as $id => $client) {\r
                        if (!is_array($client->contacts)) {\r
                                fb($client);\r
                                continue;\r
                        }\r
-                       $odd = cubeMath::isOdd($i)?' class="odd"':'';\r
+                       $odd = cubeMath::isOdd($i) ? ' class="odd"' : '';\r
                        $res .= '<tr' . $odd . '>';\r
                        $res .= '<td>' . $client->entreprise_id . '</td>';\r
                        $res .= '<td>' . $client->nom . '</td>';\r
                        $contacts = array();\r
 \r
-                       foreach($client->contacts as $c) {\r
+                       foreach ($client->contacts as $c) {\r
                                $contacts[] = '<a href="#" class="popup" rel="formContact/' . $c->utilisateur_id . '">' . $c->prenom . ' ' . $c->nom . '</a>';\r
                        }\r
 \r
@@ -86,9 +86,9 @@ class extranetUrl {
                        $i++;\r
                }\r
                if (!isset($settings['search']) || is_null($settings['search'])) {\r
-                       $odd = cubeMath::isOdd($i)?' class="odd"':'';\r
+                       $odd = cubeMath::isOdd($i) ? ' class="odd"' : '';\r
                        $res .= '<tr' . $odd . '><td colspan="10">';\r
-                       $res .= commonPage::pager($settings['page'], $dao->count() , $settings['par_page'], 'page' . $change . '/%d');\r
+                       $res .= commonPage::pager($settings['page'], $dao->count(), $settings['par_page'], 'page' . $change . '/%d');\r
                        $res .= commonUrl::formParPage('parPage' . $change, $settings['par_page'], __('clients'));\r
                        $res .= '</td></tr>';\r
                }\r
@@ -96,23 +96,21 @@ class extranetUrl {
                return $res;\r
        }\r
 \r
-       public static function clientDetailCa($entreprise_id)\r
-       {\r
+       public static function clientDetailCa($entreprise_id) {\r
                global $core;\r
                $dao = new commonDAOEntreprise($core->con);\r
                $annees = $dao->getCaDetails($entreprise_id);\r
                $res = '';\r
                $i = 0;\r
-               foreach($annees as $annee => $ca) {\r
-                       $class = cubeMath::isOdd($i)?' class="odd"':'';\r
+               foreach ($annees as $annee => $ca) {\r
+                       $class = cubeMath::isOdd($i) ? ' class="odd"' : '';\r
                        $res .= '<tr' . $class . '><td><strong>' . $annee . '</strong></td><td>' . number_format($ca, 0, ',', ' ') . ' €</td></tr>';\r
                        $i++;\r
                }\r
                return $res;\r
        }\r
 \r
-       public static function clientDetailImpaye($entreprise_id)\r
-       {\r
+       public static function clientDetailImpaye($entreprise_id) {\r
                global $core;\r
                $dao = new extranetDAOFacture($core->con);\r
                $daoClient = new commonDAOEntreprise($core->con);\r
@@ -120,15 +118,15 @@ class extranetUrl {
                $client = $daoClient->selectById($entreprise_id);\r
                $res = '';\r
                $i = 0;\r
-               foreach($factures as $facture) {\r
-                       $class = cubeMath::isOdd($i)?' class="odd"':'';\r
+               foreach ($factures as $facture) {\r
+                       $class = cubeMath::isOdd($i) ? ' class="odd"' : '';\r
                        $res .= '<tr' . $class . '>';\r
                        $res .= '<td>' . $facture->facture_id . '</td>';\r
                        $res .= '<td>';\r
                        if ($facture->facture_id > 0) {\r
                                $res .= '<a href="' . SITE_PATH . 'voirfacture/' . $facture->facture_id . '" class="popupA4">' . $facture->nom . '</a>';\r
                        } else {\r
-                               $res .= $facture->nom ;\r
+                               $res .= $facture->nom;\r
                        }\r
                        $res .= '</td>';\r
                        $tva = cubeTaxes::tva($client->pays);\r
@@ -144,8 +142,7 @@ class extranetUrl {
                return $res;\r
        }\r
 \r
-       public static function formClient($entreprise_id = 'new')\r
-       {\r
+       public static function formClient($entreprise_id = 'new') {\r
                global $core;\r
                commonDroits::min(1);\r
                $dao = new commonDAOEntreprise($core->con);\r
@@ -200,8 +197,7 @@ class extranetUrl {
                return $res;\r
        }\r
 \r
-       public static function listeContacts($entreprise_id)\r
-       {\r
+       public static function listeContacts($entreprise_id) {\r
                global $core;\r
                commonDroits::min(1);\r
                $dao = new commonDAOEntreprise($core->con);\r
@@ -210,8 +206,8 @@ class extranetUrl {
                $res = '<table class="liste light">';\r
                $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>';\r
                $i = 0;\r
-               foreach($contacts as $contact) {\r
-                       $odd = cubeMath::isOdd($i)?' class="odd"':'';\r
+               foreach ($contacts as $contact) {\r
+                       $odd = cubeMath::isOdd($i) ? ' class="odd"' : '';\r
                        $res .= '<tr' . $odd . '><td>' . trim($contact->prenom . ' ' . $contact->nom) . '</td>';\r
                        $res .= '<td><a href="mailto:' . trim($contact->prenom . ' ' . $contact->nom) . '<' . $contact->email . '>">' . $contact->email . '</a></td>';\r
                        $res .= '<td class="min"><a href="' . SITE_PATH . 'fichiers/' . $contact->utilisateur_id . '">FTP</a></td>';\r
@@ -223,8 +219,7 @@ class extranetUrl {
                return $res;\r
        }\r
 \r
-       public static function formContact($client_id = 'new', $entreprise_id = null)\r
-       {\r
+       public static function formContact($client_id = 'new', $entreprise_id = null) {\r
                global $core;\r
                commonDroits::min(1);\r
 \r
@@ -259,8 +254,7 @@ class extranetUrl {
                return $res;\r
        }\r
 \r
-       public static function formNotes($utilisateur_id)\r
-       {\r
+       public static function formNotes($utilisateur_id) {\r
                global $core;\r
                commonDroits::min(1);\r
                $dao = new commonDAOUtilisateur($core->con);\r
@@ -271,8 +265,7 @@ class extranetUrl {
                return $res;\r
        }\r
 \r
-       public static function projets($args)\r
-       {\r
+       public static function projets($args) {\r
                global $core;\r
                commonDroits::min(1);\r
 \r
@@ -297,12 +290,11 @@ class extranetUrl {
                return $res;\r
        }\r
 \r
-       public static function listeProjets($dashboard = null, $settings = null)\r
-       {\r
+       public static function listeProjets($dashboard = null, $settings = null) {\r
                global $core;\r
                commonDroits::min(1);\r
-               $settings = is_null($settings)?$core->user->getSettings('projets'):$settings;\r
-               $change = is_null($dashboard)?'Projet':'Dashboard/' . $dashboard;\r
+               $settings = is_null($settings) ? $core->user->getSettings('projets') : $settings;\r
+               $change = is_null($dashboard) ? 'Projet' : 'Dashboard/' . $dashboard;\r
 \r
                $res = '<table class="liste">';\r
                $res .= '<tr><th>' . commonUrl::orderby('#', 'projet_id', $settings, 'sort' . $change) . '</th>';\r
@@ -325,15 +317,15 @@ class extranetUrl {
                $liste = $dao->getListe($settings['orderby'], $settings['sens'], $settings['limit']);\r
 \r
                $i = 0;\r
-               foreach($liste as $projet) {\r
+               foreach ($liste as $projet) {\r
                        $droits = extranetDroits::projet($projet, false);\r
 \r
-                       $projet->progression = !$projet->progression?'-':$projet->progression . '%';\r
-                       $projet->jours_prevus = !$projet->jours_prevus?'-':$projet->jours_prevus;\r
-                       $projet->jours_consommes = !$projet->jours_consommes?'-':$projet->jours_consommes;\r
+                       $projet->progression = !$projet->progression ? '-' : $projet->progression . '%';\r
+                       $projet->jours_prevus = !$projet->jours_prevus ? '-' : $projet->jours_prevus;\r
+                       $projet->jours_consommes = !$projet->jours_consommes ? '-' : $projet->jours_consommes;\r
 \r
-                       $projet->budget = !$projet->budget || !$droits?'-':$projet->budget;\r
-                       $odd = cubeMath::isOdd($i)?' class="odd"':'';\r
+                       $projet->budget = !$projet->budget || !$droits ? '-' : $projet->budget;\r
+                       $odd = cubeMath::isOdd($i) ? ' class="odd"' : '';\r
                        $res .= '<tr' . $odd . '>';\r
                        $res .= '<td>' . $projet->projet_id . '</td>';\r
                        $res .= '<td>' . $projet->nom . '</td>';\r
@@ -363,7 +355,7 @@ class extranetUrl {
                        if ($projet->budget == '-') {\r
                                $rapport_paiement = '-';\r
                        } elseif (!$rp) {\r
-                               $rapport_paiement = __('Non') ;\r
+                               $rapport_paiement = __('Non');\r
                        } elseif ($rp == 1) {\r
                                $rapport_paiement = __('Oui');\r
                        } elseif ($rp < 1) {\r
@@ -391,9 +383,9 @@ class extranetUrl {
                        $i++;\r
                }\r
                if (!isset($settings['search']) || is_null($settings['search'])) {\r
-                       $odd = cubeMath::isOdd($i)?' class="odd"':'';\r
+                       $odd = cubeMath::isOdd($i) ? ' class="odd"' : '';\r
                        $res .= '<tr' . $odd . '><td colspan="11">';\r
-                       $res .= commonPage::pager($settings['page'], $dao->count() , $settings['par_page'], 'page' . $change . '/%d');\r
+                       $res .= commonPage::pager($settings['page'], $dao->count(), $settings['par_page'], 'page' . $change . '/%d');\r
                        $res .= commonUrl::formParPage('parPage' . $change, $settings['par_page'], __('projets'));\r
                        $res .= '</td></tr>';\r
                }\r
@@ -401,8 +393,7 @@ class extranetUrl {
                return $res;\r
        }\r
 \r
-       public static function projet($args)\r
-       {\r
+       public static function projet($args) {\r
                global $core;\r
                commonDroits::min(1);\r
 \r
@@ -421,8 +412,7 @@ class extranetUrl {
                return $res;\r
        }\r
 \r
-       public static function listeProjet($projet_id)\r
-       {\r
+       public static function listeProjet($projet_id) {\r
                global $core;\r
                commonDroits::min(1);\r
 \r
@@ -446,11 +436,11 @@ class extranetUrl {
 \r
                $droits = extranetDroits::projet($projet, false);\r
 \r
-               $projet->progression = !$projet->progression?'-':$projet->progression . '%';\r
-               $projet->jours_prevus = !$projet->jours_prevus?'-':$projet->jours_prevus;\r
-               $projet->jours_consommes = !$projet->jours_consommes?'-':$projet->jours_consommes;\r
+               $projet->progression = !$projet->progression ? '-' : $projet->progression . '%';\r
+               $projet->jours_prevus = !$projet->jours_prevus ? '-' : $projet->jours_prevus;\r
+               $projet->jours_consommes = !$projet->jours_consommes ? '-' : $projet->jours_consommes;\r
 \r
-               $projet->budget = !$projet->budget || !$droits?'-':$projet->budget;\r
+               $projet->budget = !$projet->budget || !$droits ? '-' : $projet->budget;\r
 \r
                $res .= '<tr class="bold">';\r
                $res .= '<td>' . $projet->projet_id . '</td>';\r
@@ -479,22 +469,28 @@ class extranetUrl {
                }\r
                $res .= '</tr>';\r
                $i = 1;\r
-               foreach($projet->taches as $tache) {\r
-                       $tache->budget = !$tache->budget || !$droits?'-':$tache->budget;\r
-                       $odd = cubeMath::isOdd($i)?' class="odd"':'';\r
+               foreach ($projet->taches as $tache) {\r
+                       $tache->budget = !$tache->budget || !$droits ? '-' : $tache->budget;\r
+                       $odd = cubeMath::isOdd($i) ? ' class="odd"' : '';\r
                        $res .= '<tr' . $odd . '>';\r
                        $res .= '<td>T' . $i . '</td>';\r
                        $res .= '<td>' . $tache->nom . '</td>';\r
                        $res .= '<td>' . $core->categories[$tache->categorie] . '</td>';\r
-                       $res .= '<td></td>';\r
-                       $res .= '<td></td>';\r
-                       $res .= '<td></td>';\r
+                       if (count($tache->books)) {\r
+                               $n = array();\r
+                               foreach ($tache->books as $b) {\r
+                                       $n[] = '<a class="blank" href="' . WS_URL . '/publications/' . $b . '">' . $b . '</a>';\r
+                               }\r
+                               $res .= '<td colspan="3">Fluidbooks # ' . implode(', ', $n) . '</td>';\r
+                       } else {\r
+                               $res.='<td colspan="3"></td>';\r
+                       }\r
                        $res .= '<td>' . $tache->budget . '</td>';\r
 \r
                        if ($tache instanceof extranetTacheNormale) {\r
-                               $progression = !$tache->progression?'-':$tache->progression . '%';\r
-                               $jours_prevus = !$tache->jours_prevus?'-':$tache->jours_prevus;\r
-                               $jours_consommes = !$tache->jours_consommes?'-':$tache->jours_consommes;\r
+                               $progression = !$tache->progression ? '-' : $tache->progression . '%';\r
+                               $jours_prevus = !$tache->jours_prevus ? '-' : $tache->jours_prevus;\r
+                               $jours_consommes = !$tache->jours_consommes ? '-' : $tache->jours_consommes;\r
                                $res .= '<td>' . $jours_prevus . '</td>';\r
                                $res .= '<td>' . $jours_consommes . '</td>';\r
                                $res .= '<td>' . $progression . '</td>';\r
@@ -521,8 +517,7 @@ class extranetUrl {
                return $res;\r
        }\r
 \r
-       public static function formProjet($projet_id = 'new')\r
-       {\r
+       public static function formProjet($projet_id = 'new') {\r
                global $core;\r
                commonDroits::min(1);\r
 \r
@@ -537,7 +532,7 @@ class extranetUrl {
                $clients = $daoClient->getListe();\r
 \r
                $listeClients = array();\r
-               foreach($clients as $client) {\r
+               foreach ($clients as $client) {\r
                        $listeClients[$client->rs . ' (' . $client->prenom . ' ' . $client->nom . ')'] = $client->utilisateur_id;\r
                }\r
                ksort($listeClients);\r
@@ -546,14 +541,14 @@ class extranetUrl {
                $equipiers = $daoEquipier->getListe();\r
 \r
                $listeEquipiers = array();\r
-               foreach($equipiers as $equipier) {\r
+               foreach ($equipiers as $equipier) {\r
                        $listeEquipiers[$equipier->prenom . ' ' . $equipier->nom . ' (' . $equipier->agence . ')'] = $equipier->utilisateur_id;\r
                }\r
 \r
                $daoDevis = new extranetDAODevis($core->con);\r
                $devis = $daoDevis->getListeValidesLibres($projet_id);\r
                $listeDevis = array('--' => 0);\r
-               foreach($devis as $id => $dev) {\r
+               foreach ($devis as $id => $dev) {\r
                        $listeDevis[$dev->nom] = $dev->devis_id;\r
                }\r
 \r
@@ -574,8 +569,7 @@ class extranetUrl {
                return $res;\r
        }\r
 \r
-       public static function formTache($tache)\r
-       {\r
+       public static function formTache($tache) {\r
                global $core;\r
                commonDroits::min(1);\r
 \r
@@ -586,8 +580,7 @@ class extranetUrl {
                return $res;\r
        }\r
 \r
-       public static function formTacheNormale($tache_id, $projet_id = null)\r
-       {\r
+       public static function formTacheNormale($tache_id, $projet_id = null) {\r
                global $core;\r
                commonDroits::min(1);\r
                $dao = new extranetDAOTache($core->con);\r
@@ -603,8 +596,7 @@ class extranetUrl {
                return $res;\r
        }\r
 \r
-       public static function formTacheSousTraitee($tache_id, $projet_id = null)\r
-       {\r
+       public static function formTacheSousTraitee($tache_id, $projet_id = null) {\r
                global $core;\r
                commonDroits::min(1);\r
                $dao = new extranetDAOTache($core->con);\r
@@ -619,8 +611,7 @@ class extranetUrl {
                return $res;\r
        }\r
 \r
-       public static function timereport($args)\r
-       {\r
+       public static function timereport($args) {\r
                global $core;\r
                commonDroits::min(1);\r
                $settings = $core->user->getSettings('timereport');\r
@@ -637,13 +628,12 @@ class extranetUrl {
                return $res;\r
        }\r
 \r
-       public static function listeTimereport($dashboard = null, $settings = null)\r
-       {\r
+       public static function listeTimereport($dashboard = null, $settings = null) {\r
                global $core;\r
                commonDroits::min(1);\r
                // Récupère la liste des projets\r
-               $settings = is_null($settings)?$core->user->getSettings('timereport'):$settings;\r
-               $change = is_null($dashboard)?'Timereport':'Dashboard/' . $dashboard;\r
+               $settings = is_null($settings) ? $core->user->getSettings('timereport') : $settings;\r
+               $change = is_null($dashboard) ? 'Timereport' : 'Dashboard/' . $dashboard;\r
 \r
                $dao = new extranetDAOProjet($core->con);\r
                if (isset($settings['search']) && !is_null($settings['search'])) {\r
@@ -653,8 +643,8 @@ class extranetUrl {
                $liste = $dao->getProjetsForTimereport($settings['orderby'], $settings['sens'], $settings['limit'], $core->user->utilisateur_id);\r
                // Extrait la liste des tâches\r
                $taches = array();\r
-               foreach($liste as $id => $projet) {\r
-                       foreach($projet->taches as $tache) {\r
+               foreach ($liste as $id => $projet) {\r
+                       foreach ($projet->taches as $tache) {\r
                                if ($tache instanceof extranetTacheNormale) {\r
                                        $taches[] = $tache->tache_id;\r
                                }\r
@@ -672,7 +662,7 @@ class extranetUrl {
                $res .= '<tr><th class="normal">' . commonUrl::orderby('#', 'projet_id', $settings, 'sort' . $change) . '</th>';\r
                $res .= '<th class="normal">' . commonUrl::orderby(__('Projet'), 'nom', $settings, 'sort' . $change) . '</th>';\r
                $res .= '<th class="normal">' . commonUrl::orderby(__('Client'), 'client', $settings, 'sort' . $change) . '</th>';\r
-               for($date = $avant;$date <= $apres;$date += 3600 * 24) {\r
+               for ($date = $avant; $date <= $apres; $date += 3600 * 24) {\r
                        $res .= '<th>' . date('d', $date) . '' . cubeMedia::spacer(16, 1, '', 'spacer') . '</th>';\r
                }\r
                $res .= '<th class="normal info">' . commonUrl::orderby('<abbr title="' . __('Progression') . '">Pr</abbr>', 'progression', $settings, 'sort' . $change) . '</th>';\r
@@ -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>';\r
                $res .= '</tr>';\r
 \r
-               foreach($liste as $projet) {\r
+               foreach ($liste as $projet) {\r
                        $res .= '<tr class="bold">';\r
                        $res .= '<td class="normal">' . $projet->projet_id . '</td>';\r
                        $res .= '<td class="normal">' . $projet->nom . '</td>';\r
                        $res .= '<td class="normal">' . $projet->client . '</td>';\r
-                       for($date = $avant;$date <= $apres;$date += 3600 * 24) {\r
+                       for ($date = $avant; $date <= $apres; $date += 3600 * 24) {\r
                                $cc = self::getClassOfDay($date);\r
-                               $class = ($cc == '')?'':' class="' . $cc . '"';\r
+                               $class = ($cc == '') ? '' : ' class="' . $cc . '"';\r
                                $res .= '<td' . $class . '></td>';\r
                        }\r
-                       $projet->progression = !$projet->progression?'-':$projet->progression . '%';\r
-                       $projet->jours_prevus = !$projet->jours_prevus?'-':$projet->jours_prevus;\r
-                       $projet->jours_consommes = !$projet->jours_consommes?'-':$projet->jours_consommes;\r
+                       $projet->progression = !$projet->progression ? '-' : $projet->progression . '%';\r
+                       $projet->jours_prevus = !$projet->jours_prevus ? '-' : $projet->jours_prevus;\r
+                       $projet->jours_consommes = !$projet->jours_consommes ? '-' : $projet->jours_consommes;\r
                        $res .= '<td class="normal info"><span id="progress_projet_' . $projet->projet_id . '">' . $projet->progression . '</span></td>';\r
                        $res .= '<td class="normal info"><span id="consommees_projet_' . $projet->projet_id . '">' . $projet->jours_consommes . '</span></td>';\r
                        $res .= '<td class="normal info">' . $projet->jours_prevus . '</td>';\r
                        $res .= '</tr>';\r
                        $i = 1;\r
-                       foreach($projet->taches as $tache) {\r
+                       foreach ($projet->taches as $tache) {\r
                                if ($tache instanceof extranetTacheNormale) {\r
                                        $res .= '<tr class="odd">';\r
                                        $res .= '<td class="normal">T' . $i . '</td>';\r
                                        $res .= '<td class="normal">' . $tache->nom . '</td>';\r
                                        $res .= '<td class="normal">' . $core->categories[$tache->categorie] . '</td>';\r
-                                       for($date = $avant;$date <= $apres;$date += (3600 * 24)) {\r
-                                               $hh = isset($timereports[$tache->tache_id][$date])?$timereports[$tache->tache_id][$date]->heures:'';\r
-                                               $c = ($hh == '')?'':'filled';\r
+                                       for ($date = $avant; $date <= $apres; $date += (3600 * 24)) {\r
+                                               $hh = isset($timereports[$tache->tache_id][$date]) ? $timereports[$tache->tache_id][$date]->heures : '';\r
+                                               $c = ($hh == '') ? '' : 'filled';\r
                                                $cc = trim(self::getClassOfDay($date) . ' ' . $c);\r
-                                               $class = ($cc == '')?'':' class="' . $cc . '"';\r
+                                               $class = ($cc == '') ? '' : ' class="' . $cc . '"';\r
                                                $res .= '<td' . $class . '>' . form::field(array('timereport', 't_' . $date . '_' . $tache->tache_id), 1, 2, $hh, 'timereport_field') . '</td>';\r
                                        }\r
-                                       $tache->progression = !$tache->progression?'-':$tache->progression . '%';\r
-                                       $tache->jours_prevus = !$tache->jours_prevus?'-':$tache->jours_prevus;\r
-                                       $tache->jours_consommes = !$tache->jours_consommes?'-':$tache->jours_consommes;\r
+                                       $tache->progression = !$tache->progression ? '-' : $tache->progression . '%';\r
+                                       $tache->jours_prevus = !$tache->jours_prevus ? '-' : $tache->jours_prevus;\r
+                                       $tache->jours_consommes = !$tache->jours_consommes ? '-' : $tache->jours_consommes;\r
                                        $res .= '<td class="normal info"><span id="progress_' . $tache->tache_id . '">' . $tache->progression . '</span></td>';\r
                                        $res .= '<td class="normal info"><span id="consommees_' . $tache->tache_id . '">' . $tache->jours_consommes . '</span></td>';\r
                                        $res .= '<td class="normal info">' . $tache->jours_prevus . '</td>';\r
@@ -733,8 +723,7 @@ class extranetUrl {
                return $res;\r
        }\r
 \r
-       public static function getClassOfDay($date)\r
-       {\r
+       public static function getClassOfDay($date) {\r
                $aujourdhui = cubeDate::round(null, 'd');\r
                $highlight = ($date == $aujourdhui);\r
                $we = (date('N', $date) >= 6);\r
@@ -747,8 +736,7 @@ class extranetUrl {
                return '';\r
        }\r
 \r
-       public static function devis($args)\r
-       {\r
+       public static function devis($args) {\r
                global $core;\r
                cubePage::truePopup();\r
                cubePage::contextMenu();\r
@@ -767,7 +755,7 @@ class extranetUrl {
                $filtres[] = new commonFiltre(__('Status'), 'status_devis', $settings['filtres']);\r
                $filtres[] = new commonFiltre(__('Année'), 'annee_facture', $settings['filtres']);\r
 \r
-               $res = commonPage::barre($filtres, 'filtreDevis', 'devis' , $shortcuts);\r
+               $res = commonPage::barre($filtres, 'filtreDevis', 'devis', $shortcuts);\r
                $res .= commonPage::tMain();\r
                $res .= commonPage::bh();\r
                $res .= '<div id="listeDevis">';\r
@@ -778,8 +766,7 @@ class extranetUrl {
                return $res;\r
        }\r
 \r
-       public static function devis_client($args)\r
-       {\r
+       public static function devis_client($args) {\r
                global $core;\r
 \r
                $res = commonPage::barre();\r
@@ -793,8 +780,7 @@ class extranetUrl {
                return $res;\r
        }\r
 \r
-       public static function listeDevis($dashboard = null, $settings = null)\r
-       {\r
+       public static function listeDevis($dashboard = null, $settings = null) {\r
                global $core;\r
 \r
                if ($core->user->grade == 0) {\r
@@ -804,13 +790,12 @@ class extranetUrl {
                }\r
        }\r
 \r
-       public static function contextDevis($id)\r
-       {\r
+       public static function contextDevis($id) {\r
                global $core;\r
                $res = '<div class="contextMenu" id="' . $id . '">';\r
                $res .= '<ul>';\r
                $res .= '<li class="head">' . __("Changer le status du devis") . '</li>';\r
-               foreach($core->devis_status as $k => $v) {\r
+               foreach ($core->devis_status as $k => $v) {\r
                        if ($k == 0) {\r
                                continue;\r
                        }\r
@@ -823,13 +808,12 @@ class extranetUrl {
                return $res;\r
        }\r
 \r
-       public static function listeDevisEquipier($dashboard = null, $settings = null)\r
-       {\r
+       public static function listeDevisEquipier($dashboard = null, $settings = null) {\r
                global $core;\r
                commonDroits::min(1);\r
-               $settings = is_null($settings)?$core->user->getSettings('devis'):$settings;\r
-               $change = is_null($dashboard)?'Devis':'Dashboard/' . $dashboard;\r
-               $context_id = is_null($dashboard)?'contextDevis':'contextDashboard_' . $dashboard;\r
+               $settings = is_null($settings) ? $core->user->getSettings('devis') : $settings;\r
+               $change = is_null($dashboard) ? 'Devis' : 'Dashboard/' . $dashboard;\r
+               $context_id = is_null($dashboard) ? 'contextDevis' : 'contextDashboard_' . $dashboard;\r
 \r
                $dao = new extranetDAODevis($core->con);\r
                if (isset($settings['search']) && !is_null($settings['search'])) {\r
@@ -848,9 +832,9 @@ class extranetUrl {
                $res .= '<th>' . commonUrl::orderby(__('Status'), 'status', $settings, 'sort' . $change) . '</th>';\r
                $res .= '<th class="min"></th><th class="min"></th><th class="min"></th></tr>';\r
                $i = 0;\r
-               foreach($liste as $devis) {\r
+               foreach ($liste as $devis) {\r
                        $droits = extranetDroits::devis($devis, 'w', false);\r
-                       $odd = cubeMath::isOdd($i)?' class="odd"':'';\r
+                       $odd = cubeMath::isOdd($i) ? ' class="odd"' : '';\r
                        $res .= '<tr' . $odd . '>';\r
                        $res .= '<td>' . $devis->devis_id . '</td>';\r
                        $res .= '<td>' . $devis->nom . '</td>';\r
@@ -889,7 +873,7 @@ class extranetUrl {
                        $i++;\r
                }\r
                if (!isset($settings['search']) || is_null($settings['search'])) {\r
-                       $odd = cubeMath::isOdd($i)?' class="odd"':'';\r
+                       $odd = cubeMath::isOdd($i) ? ' class="odd"' : '';\r
                        $res .= '<tr' . $odd . '><td colspan="10">';\r
                        $res .= commonPage::pager($settings['page'], $dao->count(), $settings['par_page'], 'page' . $change . '/%d');\r
                        $res .= commonUrl::formParPage('parPage' . $change, $settings['par_page'], __('devis'));\r
@@ -899,8 +883,7 @@ class extranetUrl {
                return $res;\r
        }\r
 \r
-       public static function listeDevisClient($dashboard = null, $settings = null)\r
-       {\r
+       public static function listeDevisClient($dashboard = null, $settings = null) {\r
                global $core;\r
                cubePage::truePopup();\r
 \r
@@ -914,8 +897,8 @@ class extranetUrl {
                $res .= '<th>' . commonUrl::orderby(__('Status'), 'status', $settings, 'sortDevis') . '</th>';\r
                $res .= '<th class="min"></th></tr>';\r
                $i = 0;\r
-               foreach($liste as $devis) {\r
-                       $odd = cubeMath::isOdd($i)?' class="odd"':'';\r
+               foreach ($liste as $devis) {\r
+                       $odd = cubeMath::isOdd($i) ? ' class="odd"' : '';\r
                        $res .= '<tr' . $odd . '>';\r
                        $res .= '<td>' . $devis->nom . '</td>';\r
                        $res .= '<td>' . date(__('d/m/Y'), $devis->date_creation) . '</td>';\r
@@ -932,8 +915,7 @@ class extranetUrl {
                return $res;\r
        }\r
 \r
-       public static function voirdevis($args)\r
-       {\r
+       public static function voirdevis($args) {\r
                global $core;\r
                // Charge le devis\r
                $dao = new extranetDAODevis($core->con);\r
@@ -944,8 +926,7 @@ class extranetUrl {
                cubeHTTP::relayNoCache(ROOT . '/devis/' . $args[1] . '.pdf');\r
        }\r
 \r
-       public static function editedevis($args)\r
-       {\r
+       public static function editedevis($args) {\r
                global $core;\r
                commonDroits::min(1);\r
                $res = commonPage::barre();\r
@@ -957,8 +938,7 @@ class extranetUrl {
                return $res;\r
        }\r
 \r
-       public static function formDevis($devis_id = 'new')\r
-       {\r
+       public static function formDevis($devis_id = 'new') {\r
                global $core;\r
                cubePage::autocomplete();\r
                cubePage::emptyField();\r
@@ -1007,7 +987,7 @@ class extranetUrl {
                // Lignes du devis\r
                $nb_lignes = max(4, count($devis->lignes) + 2);\r
 \r
-               for($i = 0;$i < $nb_lignes;$i++) {\r
+               for ($i = 0; $i < $nb_lignes; $i++) {\r
                        if (isset($devis->lignes[$i])) {\r
                                $titre = $devis->lignes[$i]['titre'];\r
                                $description = $devis->lignes[$i]['description'];\r
@@ -1044,8 +1024,7 @@ class extranetUrl {
                return $res;\r
        }\r
 \r
-       public static function previewDevis($args)\r
-       {\r
+       public static function previewDevis($args) {\r
                global $core;\r
 \r
                $dao = new extranetDAODevis($core->con);\r
@@ -1078,8 +1057,7 @@ class extranetUrl {
                return $res;\r
        }\r
 \r
-       public static function factures($args)\r
-       {\r
+       public static function factures($args) {\r
                global $core;\r
 \r
                if ($core->user->grade == 0) {\r
@@ -1097,7 +1075,7 @@ class extranetUrl {
                $filtres[] = new commonFiltre(__('Créées par'), 'equipier', $settings['filtres']);\r
                $filtres[] = new commonFiltre(__('Status'), 'status_facture', $settings['filtres']);\r
                $filtres[] = new commonFiltre(__('Année'), 'annee_facture', $settings['filtres']);\r
-               $res = commonPage::barre($filtres , 'filtreFactures', 'factures', $shortcuts);\r
+               $res = commonPage::barre($filtres, 'filtreFactures', 'factures', $shortcuts);\r
                $res .= commonPage::tMain();\r
                $res .= commonPage::bh();\r
                $res .= '<div id="listeFactures">';\r
@@ -1108,8 +1086,7 @@ class extranetUrl {
                return $res;\r
        }\r
 \r
-       public static function factures_client($args)\r
-       {\r
+       public static function factures_client($args) {\r
                global $core;\r
                $res = commonPage::barre();\r
                $res .= commonPage::tMain();\r
@@ -1122,13 +1099,12 @@ class extranetUrl {
                return $res;\r
        }\r
 \r
-       public static function contextFacture($id)\r
-       {\r
+       public static function contextFacture($id) {\r
                global $core;\r
                $res = '<div class="contextMenu" id="' . $id . '">';\r
                $res .= '<ul>';\r
                $res .= '<li class="head">' . __("Changer le status de la facture") . '</li>';\r
-               foreach($core->factures_status as $k => $v) {\r
+               foreach ($core->factures_status as $k => $v) {\r
                        if (in_array($k, array(0, 4))) {\r
                                continue;\r
                        }\r
@@ -1147,8 +1123,7 @@ class extranetUrl {
                return $res;\r
        }\r
 \r
-       public static function listeFactures($dashboard = null, $settings = null)\r
-       {\r
+       public static function listeFactures($dashboard = null, $settings = null) {\r
                global $core;\r
                if ($core->user->grade == 0) {\r
                        return self::listeFacturesClient($dashboard, $settings);\r
@@ -1157,15 +1132,14 @@ class extranetUrl {
                }\r
        }\r
 \r
-       public static function listeFacturesEquipier($dashboard = null, $settings = null)\r
-       {\r
+       public static function listeFacturesEquipier($dashboard = null, $settings = null) {\r
                global $core;\r
                cubePage::truePopup();\r
                cubePage::contextMenu();\r
 \r
-               $settings = is_null($settings)?$core->user->getSettings('factures'):$settings;\r
-               $change = is_null($dashboard)?'Facture':'Dashboard/' . $dashboard;\r
-               $context_id = is_null($dashboard)?'contextFacture':'contextDashboard_' . $dashboard;\r
+               $settings = is_null($settings) ? $core->user->getSettings('factures') : $settings;\r
+               $change = is_null($dashboard) ? 'Facture' : 'Dashboard/' . $dashboard;\r
+               $context_id = is_null($dashboard) ? 'contextFacture' : 'contextDashboard_' . $dashboard;\r
                $dao = new extranetDAOFacture($core->con);\r
                if (isset($settings['search']) && !is_null($settings['search'])) {\r
                        $dao->setSearch($settings['search']);\r
@@ -1189,9 +1163,9 @@ class extranetUrl {
                $res .= '<th>' . commonUrl::orderby(__('Montant HT'), 'total_ht', $settings, 'sort' . $change) . '</th>';\r
                $res .= '<th>' . commonUrl::orderby(__('Status'), 'status', $settings, 'sort' . $change) . '</th><th class="min"></th><th class="min"></th><th class="min"></th></tr>';\r
                $i = 0;\r
-               foreach($liste as $facture) {\r
+               foreach ($liste as $facture) {\r
                        $droits = extranetDroits::facture($facture, 'w', false);\r
-                       $odd = cubeMath::isOdd($i)?' class="odd"':'';\r
+                       $odd = cubeMath::isOdd($i) ? ' class="odd"' : '';\r
                        $res .= '<tr' . $odd . '>';\r
                        $res .= '<td>' . $facture->facture_id . '</td>';\r
                        $res .= '<td>' . $facture->nom . '</td>';\r
@@ -1216,7 +1190,7 @@ class extranetUrl {
                                                $res .= '<td>' . $core->factures_status[$facture->status] . '</td>';\r
                                        }\r
                                } else {\r
-                                       $title = $facture->status == 3?__("Voir l'avoir correspondant"):__("Voir la facture annulée correspondante");\r
+                                       $title = $facture->status == 3 ? __("Voir l'avoir correspondant") : __("Voir la facture annulée correspondante");\r
                                        $res .= '<td><a href="' . SITE_PATH . 'voirfacture/' . $facture->avoir . '" class="popupA4" title="' . $title . '">' . $core->factures_status[$facture->status] . '</a></td>';\r
                                }\r
                                if ($facture->facture_id > 0) {\r
@@ -1240,12 +1214,12 @@ class extranetUrl {
                        $i++;\r
                }\r
                if (!isset($settings['search']) || is_null($settings['search'])) {\r
-                       $odd = cubeMath::isOdd($i)?' class="odd"':'';\r
-                       $res .= '<tr' . $odd . '><td colspan="10">' ;\r
+                       $odd = cubeMath::isOdd($i) ? ' class="odd"' : '';\r
+                       $res .= '<tr' . $odd . '><td colspan="10">';\r
                        if ($core->user->grade != 3) {\r
-                               $res .= commonPage::pager($settings['page'], $dao->count() , $settings['par_page'], 'page' . $change . '/%d');\r
+                               $res .= commonPage::pager($settings['page'], $dao->count(), $settings['par_page'], 'page' . $change . '/%d');\r
                        } else {\r
-                               $res .= commonPage::pager($settings['page'], $dao->countCompta() , $settings['par_page'], 'page' . $change . '/%d');\r
+                               $res .= commonPage::pager($settings['page'], $dao->countCompta(), $settings['par_page'], 'page' . $change . '/%d');\r
                        }\r
                        $res .= commonUrl::formParPage('parPage' . $change, $settings['par_page'], __('factures'));\r
                        $res .= '</td></tr>';\r
@@ -1254,8 +1228,7 @@ class extranetUrl {
                return $res;\r
        }\r
 \r
-       public static function listeFacturesClient($dashboard = null, $settings = null)\r
-       {\r
+       public static function listeFacturesClient($dashboard = null, $settings = null) {\r
                global $core;\r
                cubePage::truePopup();\r
                $settings = $core->user->getSettings('factures');\r
@@ -1270,8 +1243,8 @@ class extranetUrl {
                $res .= '<th>' . commonUrl::orderby(__('Status'), 'status', $settings, 'sortFacture') . '</th>';\r
                $res .= '<th class="min"></th></tr>';\r
                $i = 0;\r
-               foreach($liste as $facture) {\r
-                       $odd = cubeMath::isOdd($i)?' class="odd"':'';\r
+               foreach ($liste as $facture) {\r
+                       $odd = cubeMath::isOdd($i) ? ' class="odd"' : '';\r
                        $res .= '<tr' . $odd . '>';\r
                        $res .= '<td>' . $facture->numeroFacture() . '</td>';\r
                        $res .= '<td>' . $facture->nom . '</td>';\r
@@ -1290,12 +1263,11 @@ class extranetUrl {
                return $res;\r
        }\r
 \r
-       public static function formFacturePaiement($facture_id)\r
-       {\r
+       public static function formFacturePaiement($facture_id) {\r
                global $core;\r
                $dao = new extranetDAOFacture($core->con);\r
                $facture = $dao->selectById($facture_id);\r
-               $date = !$facture->date_paiement?null:$facture->date_paiement;\r
+               $date = !$facture->date_paiement ? null : $facture->date_paiement;\r
 \r
                $res = '<tr><td>' . form::hidden('facture_id', $facture_id) . __('Date de paiement') . '</td><td>' . cubeForm::date('date_paiement', $date) . '</td></tr>';\r
                $res .= '<tr><td>' . __('Informations de paiement') . '</td><td>' . form::textarea('informations_paiement', 40, 3, $facture->informations_paiement) . '</td></tr>';\r
@@ -1303,8 +1275,7 @@ class extranetUrl {
                return $res;\r
        }\r
 \r
-       public static function voirfacture($args)\r
-       {\r
+       public static function voirfacture($args) {\r
                global $core;\r
                // Charge la facture\r
                $dao = new extranetDAOFacture($core->con);\r
@@ -1315,8 +1286,7 @@ class extranetUrl {
                cubeHTTP::relayNoCache(ROOT . '/factures/' . $args[1] . '.pdf');\r
        }\r
 \r
-       public static function editefacture($args)\r
-       {\r
+       public static function editefacture($args) {\r
                global $core;\r
                commonDroits::min(1);\r
                $res = commonPage::barre();\r
@@ -1332,8 +1302,7 @@ class extranetUrl {
                return $res;\r
        }\r
 \r
-       public static function formFacture($facture_id = 'new', $projet_id = null)\r
-       {\r
+       public static function formFacture($facture_id = 'new', $projet_id = null) {\r
                global $core;\r
                commonDroits::min(1);\r
                cubePage::autoComplete();\r
@@ -1343,7 +1312,7 @@ class extranetUrl {
                $daoProjet = new extranetDAOProjet($core->con);\r
                $dao = new extranetDAOFacture($core->con);\r
 \r
-               $projet_id = isset($_POST['projet_id']) && $_POST['projet_id'] > 0?$_POST['projet_id']:$projet_id;\r
+               $projet_id = isset($_POST['projet_id']) && $_POST['projet_id'] > 0 ? $_POST['projet_id'] : $projet_id;\r
 \r
                if ($facture_id == 'new') {\r
                        $facture = $dao->cree();\r
@@ -1360,7 +1329,7 @@ class extranetUrl {
                        $facture->client = $projet->client;\r
                        $facture->projet = $facture->nom = $projet->nom;\r
                        $lignes = array();\r
-                       foreach($projet->taches as $tache) {\r
+                       foreach ($projet->taches as $tache) {\r
                                $lignes[] = array('montant' => $tache->budget, 'titre' => $tache->nom, 'description' => '');\r
                        }\r
                        $facture->lignes = $lignes;\r
@@ -1428,12 +1397,12 @@ class extranetUrl {
                // Lignes du devis\r
                $nb_lignes = max(4, count($facture->lignes) + 2);\r
 \r
-               for($i = 0;$i < $nb_lignes;$i++) {\r
+               for ($i = 0; $i < $nb_lignes; $i++) {\r
                        if (isset($facture->lignes[$i])) {\r
                                $titre = $facture->lignes[$i]['titre'];\r
                                $description = $facture->lignes[$i]['description'];\r
                                $montant = $facture->lignes[$i]['montant'];\r
-                               $book = isset($facture->lignes[$i]['book'])?$facture->lignes[$i]['book']:null;\r
+                               $book = isset($facture->lignes[$i]['book']) ? $facture->lignes[$i]['book'] : null;\r
                        } else {\r
                                $titre = $description = $montant = '';\r
                        }\r
@@ -1443,7 +1412,7 @@ class extranetUrl {
                        $res .= '<div class="devisLigneRight">';\r
                        $res .= form::field(array('montant[]'), 6, 15, $montant) . " €";\r
                        if (isset($book) && !is_null($book)) {\r
-                               $res .= form::hidden(array('book[]'), $book) ;\r
+                               $res .= form::hidden(array('book[]'), $book);\r
                        }\r
                        $res .= '</div>';\r
                        $res .= '<div class="devisLigneLeft">';\r
@@ -1463,8 +1432,7 @@ class extranetUrl {
                return $res;\r
        }\r
 \r
-       public static function previewFacture($args)\r
-       {\r
+       public static function previewFacture($args) {\r
                global $core;\r
                commonDroits::min(1);\r
                $dao = new extranetDAOFacture($core->con);\r
@@ -1487,8 +1455,7 @@ class extranetUrl {
                return $res;\r
        }\r
 \r
-       public static function formPrintFactures()\r
-       {\r
+       public static function formPrintFactures() {\r
                global $core;\r
                $last = $core->user->getLastPrint();\r
                $res = '';\r
@@ -1500,8 +1467,7 @@ class extranetUrl {
                return $res;\r
        }\r
 \r
-       public static function chiffres($args)\r
-       {\r
+       public static function chiffres($args) {\r
                global $core;\r
                commonDroits::min(2);\r
                // $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>'));\r
@@ -1512,8 +1478,7 @@ class extranetUrl {
                return $res;\r
        }\r
 \r
-       public static function traduction($args)\r
-       {\r
+       public static function traduction($args) {\r
                global $core;\r
                commonDroits::min(1);\r
                $res = commonPage::barre();\r
@@ -1523,15 +1488,14 @@ class extranetUrl {
                $res .= '<table class="liste">';\r
                $res .= '<tr><th>' . __("Traduction de l'application en anglais") . '</th><th></th></tr>';\r
                $res .= '</table>';\r
-               $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>');\r
+               $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>');\r
                $res .= '</form>';\r
                $res .= commonPage::bf();\r
                $res .= commonPage::bMain();\r
                return $res;\r
        }\r
 \r
-       public static function cleanTimereport($args)\r
-       {\r
+       public static function cleanTimereport($args) {\r
                global $core;\r
 \r
                $r = $core->con->select('SELECT * FROM timereport');\r
@@ -1543,7 +1507,7 @@ class extranetUrl {
                        $t[date('Y', $r->date)][$r->utilisateur_id][$r->tache_id] += $r->heures;\r
                }\r
 \r
-               foreach($t as $annee => $t1) {\r
+               foreach ($t as $annee => $t1) {\r
                        if ($annee == date('Y')) {\r
                                continue;\r
                        }\r
@@ -1551,9 +1515,9 @@ class extranetUrl {
                        $core->con->execute('DELETE FROM timereport WHERE date BETWEEN ' . $limit['start'] . ' AND ' . $limit['end']);\r
                        $c = $core->con->openCursor('timereport');\r
                        $c->date = mktime(1, 1, 1, 1, 1, $annee);\r
-                       foreach($t1 as $uid => $t2) {\r
+                       foreach ($t1 as $uid => $t2) {\r
                                $c->utilisateur_id = $uid;\r
-                               foreach($t2 as $tache_id => $heures) {\r
+                               foreach ($t2 as $tache_id => $heures) {\r
                                        $c->tache_id = $tache_id;\r
                                        $c->heures = $heures;\r
                                        $c->insert();\r
@@ -1562,8 +1526,7 @@ class extranetUrl {
                }\r
        }\r
 \r
-       public static function rh($args)\r
-       {\r
+       public static function rh($args) {\r
                global $core;\r
                commonDroits::min(2);\r
                $res = commonPage::barre();\r
@@ -1577,12 +1540,11 @@ class extranetUrl {
                return $res;\r
        }\r
 \r
-       public static function listeRh($dashboard = null, $settings = null)\r
-       {\r
+       public static function listeRh($dashboard = null, $settings = null) {\r
                global $core;\r
                commonDroits::min(2);\r
-               $settings = is_null($settings)?$core->user->getSettings('equipiers'):$settings;\r
-               $change = is_null($dashboard)?'Equipier':'Dashboard/' . $dashboard;\r
+               $settings = is_null($settings) ? $core->user->getSettings('equipiers') : $settings;\r
+               $change = is_null($dashboard) ? 'Equipier' : 'Dashboard/' . $dashboard;\r
                $dao = new commonDAOEquipier($core->con);\r
                $liste = $dao->getListe($settings['orderby'], $settings['sens'], $settings['limit']);\r
 \r
@@ -1595,14 +1557,14 @@ class extranetUrl {
                $res .= '<th>Notes</th>';\r
                // $res .= '<th class="min"></th><th class="min"></th></tr>';\r
                $i = 0;\r
-               foreach($liste as $id => $equipier) {\r
-                       $odd = cubeMath::isOdd($i)?' class="odd"':'';\r
+               foreach ($liste as $id => $equipier) {\r
+                       $odd = cubeMath::isOdd($i) ? ' class="odd"' : '';\r
                        $res .= '<tr' . $odd . '>';\r
                        $res .= '<td>' . $equipier->utilisateur_id . '</td>';\r
                        $res .= '<td>' . $equipier->agence . '</td>';\r
                        $res .= '<td>' . $equipier->prenom . ' ' . $equipier->nom . '</td>';\r
 \r
-                       $email = strlen($equipier->email) > 20?substr($equipier->email, 0, 17) . '...':$equipier->email;\r
+                       $email = strlen($equipier->email) > 20 ? substr($equipier->email, 0, 17) . '...' : $equipier->email;\r
 \r
                        $res .= '<td><a href="mailto:' . cubeMail::encodeForURL($equipier->email) . '">' . $email . '</a></td>';\r
                        $res .= '<td>' . $core->grades[$equipier->grade] . '</td>';\r
@@ -1612,16 +1574,17 @@ class extranetUrl {
                        $res .= '</tr>';\r
                        $i++;\r
                }\r
-               /*if (!isset($settings['search']) || is_null($settings['search'])) {\r
-                       $odd = cubeMath::isOdd($i)?' class="odd"':'';\r
-                       $res .= '<tr' . $odd . '><td colspan="10">';\r
-                       $res .= commonPage::pager($settings['page'], $dao->count() , $settings['par_page'], 'page' . $change . '/%d');\r
-                       $res .= commonUrl::formParPage('parPage' . $change, $settings['par_page'], __('clients'));\r
-                       $res .= '</td></tr>';\r
-               }*/\r
+               /* if (!isset($settings['search']) || is_null($settings['search'])) {\r
+                 $odd = cubeMath::isOdd($i)?' class="odd"':'';\r
+                 $res .= '<tr' . $odd . '><td colspan="10">';\r
+                 $res .= commonPage::pager($settings['page'], $dao->count() , $settings['par_page'], 'page' . $change . '/%d');\r
+                 $res .= commonUrl::formParPage('parPage' . $change, $settings['par_page'], __('clients'));\r
+                 $res .= '</td></tr>';\r
+                 } */\r
                $res .= '</table>';\r
                return $res;\r
        }\r
+\r
 }\r
 \r
 ?>
\ 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 20a60d7fe9f622415bd09f73195141323a9b7dcb..6b1658e2148ca7785d8c733b9d0481c2932e4570 100644 (file)
--- 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);\r
                        $tache->taux_journalier = $r->taux_journalier;\r
                        $tache->progression = round($r->progression);\r
+                       $tache->books=array();\r
+                       if(!is_null($r->books)){\r
+                               $tache->books=explode(',',$r->books);\r
+                       }\r
                } else {\r
                        $tache = new extranetTacheSousTraitee();\r
                }\r

diff --git a/inc/extranet/Metier/class.extranet.tache.normale.php b/inc/extranet/Metier/class.extranet.tache.normale.php
index 90b698ed7df48507b02efe281d70b3c370b1ca83..69a5c4ff512f39bc0b20012d6c3e8490727de17d 100644 (file)
--- 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;\r
        protected $progression;\r
        protected $jours_consommes;\r
+       protected $books;\r
 }\r
 \r
 ?>
\ No newline at end of file

diff --git a/inc/postconfig.inc.php b/inc/postconfig.inc.php
index 5458fe008e8ba153b02814cfb7c77434edd29b4e..151c751b8cc50fcafcd3bcea3932c56e7e5b2ac4 100644 (file)
--- a/inc/postconfig.inc.php
+++ b/inc/postconfig.inc.php
@@ -6,25 +6,15 @@ $ws = stristr($_SERVER['HTTP_HOST'], 'fluidbook.com');
 \r
 define('DEV', $dev);\r
 \r
-if ($dev) {\r
-       // Définition de la configuration sur l'environnement de développement\r
-       define('DB_HOST', ':/var/run/mysqld/mysqld.sock');\r
-       define('DB_NAME', 'extranet_dev');\r
-       define('DB_USER', 'ws');\r
-       define('DB_PASSWORD', '*arica*2');\r
-\r
-       define('EXTRANET_URL', 'http://dev.extranet.cubedesigners.com');\r
-       define('WS_URL', 'http://dev.ws.fluidbook.com');\r
-} else {\r
-       // Définition des variables dans l'environnement de production\r
-       define('DB_HOST', ':/var/run/mysqld/mysqld.sock');\r
-       define('DB_NAME', 'extranet_workshop');\r
-       define('DB_USER', 'ws');\r
-       define('DB_PASSWORD', '*arica*2');\r
-\r
-       define('EXTRANET_URL', 'http://extranet.cubedesigners.com');\r
-       define('WS_URL', 'http://workshop.fluidbook.com');\r
-}\r
+// Définition des variables dans l'environnement de production\r
+define('DB_HOST', ':/var/run/mysqld/mysqld.sock');\r
+define('DB_NAME', 'extranet_workshop');\r
+define('DB_USER', 'ws');\r
+define('DB_PASSWORD', '*arica*2');\r
+\r
+define('EXTRANET_URL', 'http://extranet.cubedesigners.com');\r
+define('WS_URL', 'http://workshop.fluidbook.com');\r
+\r
 \r
 if ($ws) {\r
        define('MODE', 'ws');\r
@@ -43,5 +33,4 @@ define('IMG', WEBROOT . '/images/' . MODE);
 \r
 define('TYPOGRAPHP_PATH', ROOT . '/typo/' . MODE);\r
 define('TYPOGRAPHP_WEBROOT', IMG . '/typographp');\r
-\r
 ?>
\ 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 51aa71767ecdc34ded51007d066260e27a9d936e..8cb1cc22c2769bfb28f4f4f04c459b2c88459e41 100644 (file)
--- a/inc/ws/Controlleur/class.ws.ajax.php
+++ b/inc/ws/Controlleur/class.ws.ajax.php
@@ -125,9 +125,7 @@ class wsAjax extends cubeAjax {
        }\r
 \r
        public static function searchPublications($args, &$x) {\r
-               fb(microtime(true));\r
                $x->addContent('listeBooks', wsUrl::listeBooks());\r
-               fb(microtime(true));\r
        }\r
 \r
        public static function pageBooks($args, &$x) {\r
@@ -168,7 +166,7 @@ class wsAjax extends cubeAjax {
                global $core;\r
                $dao = new wsDAOBook($core->con);\r
                if ($_POST['book'] != '') {\r
-                       $book = $dao->duplicate($_POST['book'], $core->user->utilisateur_id, $_POST['title'],isset($_POST['pages']));\r
+                       $book = $dao->duplicate($_POST['book'], $core->user->utilisateur_id, $_POST['title'], isset($_POST['pages']));\r
                } else {\r
                        $book = $dao->creeEmpty($core->user->utilisateur_id, $core->user->lang, $_POST['title']);\r
                }\r

diff --git a/inc/ws/Controlleur/class.ws.url.php b/inc/ws/Controlleur/class.ws.url.php
index ca88a4bd537324f03424a4cc44f03a40c7d04bb3..4caf06ffd99c9248dfd6a6585b874bec062dd422 100644 (file)
--- a/inc/ws/Controlleur/class.ws.url.php
+++ b/inc/ws/Controlleur/class.ws.url.php
@@ -4,6 +4,10 @@ class wsUrl {
 \r
        public static function publications($args) {\r
                global $core;\r
+               \r
+               if(isset($args[1])){\r
+                       $_SESSION['q']=$args[1];\r
+               }\r
 \r
                $settings = $core->user->getSettings('books');\r
 \r

diff --git a/inc/ws/DAO/class.ws.dao.book.php b/inc/ws/DAO/class.ws.dao.book.php
index 2671d0ce13c7063b4580737c8333e150b18443d3..bb1cad291f9c4a94e6ffd4a9f99816f11aad9dfa 100644 (file)
--- 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) {\r
                                $where .= ' book_id=\'' . $this->con->escape($this->q) . '\' OR ';\r
                        }\r
-                       $where .= 'nom LIKE \'%' . $this->con->escape($this->q) . '%\'';\r
-                       $daoClient = new commonDAOClient($this->con);\r
-                       $where .= ' OR proprietaire_id IN(' . $daoClient->querySearchByName($this->q) . ')';\r
+\r
+                       if (!cubeMath::is_int($this->q)) {\r
+                               $where .= 'nom LIKE \'%' . $this->con->escape($this->q) . '%\'';\r
+                               $daoClient = new commonDAOClient($this->con);\r
+                               $where .= ' OR proprietaire_id IN(' . $daoClient->querySearchByName($this->q) . ') OR ';\r
+                       }\r
                        $limit = null;\r
-                       $where .= ')';\r
+                       $where .= '1=2)';\r
                } else {\r
                        $where = '(' . $this->makeWhereFromFiltres() . ')';\r
                }\r
@@ -322,6 +325,9 @@ class wsDAOBook extends commonDAO {
 \r
        protected function limitToUserRights($utilisateur) {\r
                if ($utilisateur) {\r
+                       if (wsDroits::admin()) {\r
+                               return '';\r
+                       }\r
                        return ' AND proprietaire IN (' . $utilisateur->ws_rights . ')';\r
                }\r
                return '';\r
@@ -638,8 +644,8 @@ class wsDAOBook extends commonDAO {
                $this->makeTextsIndexes($book_id, $index, $textes);\r
                $daoDoc->getLinksAndRulers($book_id, $links, $rulers);\r
 \r
-               $flex = new cubeFlexCompiler('FluidbookDatas', $compilerDir, 'flash.display.Sprite', explode(';', AS3_SOURCES), MXMLC_PATH,10);\r
-               $flexLight = new cubeFlexCompiler('FluidbookDatasLight', $compilerDir, 'flash.display.Sprite', explode(';', AS3_SOURCES), MXMLC_PATH,10);\r
+               $flex = new cubeFlexCompiler('FluidbookDatas', $compilerDir, 'flash.display.Sprite', explode(';', AS3_SOURCES), MXMLC_PATH, 10);\r
+               $flexLight = new cubeFlexCompiler('FluidbookDatasLight', $compilerDir, 'flash.display.Sprite', explode(';', AS3_SOURCES), MXMLC_PATH, 10);\r
                $flex->addVariable('links', $links, false, true, 'JSONObject');\r
 \r
                $imagesassets = array();\r
@@ -828,11 +834,11 @@ class wsDAOBook extends commonDAO {
 \r
        public function indexPDF($book, $pages) {\r
                $indexPath = WS_BOOKS . '/search/' . $book->book_id;\r
-               \r
-               if(file_exists($indexPath) && filemtime($indexPath)>$book->composition_update){\r
+\r
+               if (file_exists($indexPath) && filemtime($indexPath) > $book->composition_update) {\r
                        return;\r
                }\r
-               \r
+\r
                Zend_Search_Lucene_Analysis_Analyzer::setDefault(new Zend_Search_Lucene_Analysis_Analyzer_Common_Utf8Num_CaseInsensitive());\r
 \r
                if (file_exists($indexPath)) {\r

diff --git a/inc/ws/Util/packager/class.ws.packager.html.php b/inc/ws/Util/packager/class.ws.packager.html.php
index b937dd3fe998a90d358d667d09e0219c4e069ccf..75df04b9d79c8dff8da1593d916fd18d6cbbcc1c 100644 (file)
--- 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 != '') {\r
                                $facebook .= '<meta property="og:description" content="' . self::escape($this->book->parametres->facebook_description) . '" />';\r
                        }\r
-                       $facebook .= '<meta property="og:image" content="http://dev.ws.fluidbook.com/services/facebook_thumbnail?id=' . $this->book->book_id . '" />';\r
+                       $facebook .= '<meta property="og:image" content="http://workshop.fluidbook.com/services/facebook_thumbnail?id=' . $this->book->book_id . '" />';\r
                }\r
                // Stuffs to replace in html\r
                $toReplace = array('lang' => strtolower($this->book->lang), 'title' => self::escape($this->book->parametres->title), 'ga' => $ga, 'facebook' => $facebook, 'bgcolor' => $this->theme->parametres->loadingBackColor);\r