(no commit message)

diff --git a/inc/commons/class.common.url.php b/inc/commons/class.common.url.php
index d6fc05d08611e34f0a8d2f7d4f839989e2d6002b..d673ca0507e3cbc385990b6a8588d6cff7ffcc55 100644 (file)
--- a/inc/commons/class.common.url.php
+++ b/inc/commons/class.common.url.php
@@ -1,7 +1,8 @@
 <?php\r
+\r
 class commonUrl {\r
-       public static function hub($args)\r
-       {\r
+\r
+       public static function hub($args) {\r
                global $core;\r
                $args = cubePage::getArgs($args);\r
                // Si l'utilisateur n'est pas connecté, on affiche le formulaire\r
@@ -19,7 +20,7 @@ class commonUrl {
                                } elseif (MODE == 'ws') {\r
                                        $nav = wsDroits::navigation();\r
                                }\r
-                               foreach($nav as $titre => $url) {\r
+                               foreach ($nav as $titre => $url) {\r
                                        $args = array($url);\r
                                        break;\r
                                }\r
@@ -32,7 +33,7 @@ class commonUrl {
 \r
                echo commonPage::header($args);\r
 \r
-               foreach($classes as $class) {\r
+               foreach ($classes as $class) {\r
                        $cb = array($class, $f);\r
                        if (is_callable($cb)) {\r
                                echo call_user_func($cb, $args);\r
@@ -42,8 +43,7 @@ class commonUrl {
                echo commonPage::footer();\r
        }\r
 \r
-       public static function login($args)\r
-       {\r
+       public static function login($args) {\r
                global $core;\r
 \r
                $tentative = isset($_SESSION['errorLogin']) && $_SESSION['errorLogin'];\r
@@ -51,7 +51,7 @@ class commonUrl {
                        $_SESSION['errorLogin'] = false;\r
                }\r
 \r
-               $message = $tentative?'<p class="message"><br />' . __('Identifiants incorrects') . '</p>':'';\r
+               $message = $tentative ? '<p class="message"><br />' . __('Identifiants incorrects') . '</p>' : '';\r
 \r
                $res = commonPage::barre();\r
                $res .= commonPage::tMain();\r
@@ -73,8 +73,7 @@ class commonUrl {
                return $res;\r
        }\r
 \r
-       public static function logout($args)\r
-       {\r
+       public static function logout($args) {\r
                if (isset($_SESSION['user_email'])) {\r
                        unset($_SESSION['user_email']);\r
                }\r
@@ -84,13 +83,11 @@ class commonUrl {
                http::redirect(SITE_PATH);\r
        }\r
 \r
-       public static function motdepasseOublie($args)\r
-       {\r
+       public static function motdepasseOublie($args) {\r
                return '<tr><td>' . __('Entrez votre e-mail') . ' : </td><td>' . form::field('email', 30, 128) . '</td></tr>';\r
        }\r
 \r
-       public static function mesParametres($args)\r
-       {\r
+       public static function mesParametres($args) {\r
                global $core;\r
                $utilisateur = $core->user;\r
 \r
@@ -117,8 +114,7 @@ class commonUrl {
                return $res;\r
        }\r
 \r
-       public static function changeMotdepasse()\r
-       {\r
+       public static function changeMotdepasse() {\r
                $res = '<tr><td colspan="2"><em>' . __('Votre mot de passe doit comprendre en 6 et 10 caractères') . '</em></td></tr>';\r
                $res .= '<tr><td>' . __('Tapez votre mot de passe actuel') . ' : </td><td>' . form::password('actuel', 20, 10) . '</td></tr>';\r
                $res .= '<tr><td>' . __('Tapez votre nouveau mot de passe') . ' : </td><td>' . form::password('nouveau', 20, 10) . '</td></tr>';\r
@@ -126,27 +122,25 @@ class commonUrl {
                return $res;\r
        }\r
 \r
-       public static function orderby($label, $field, $settings, $function)\r
-       {\r
+       public static function orderby($label, $field, $settings, $function) {\r
                $res = '<a href="#" class="ajax" rel="' . $function . '/' . $field . '">';\r
                $res .= $label;\r
                if ($settings['orderby'] == $field) {\r
-                       $puce = ($settings['sens'] == 'DESC')?'down':'up';\r
+                       $puce = ($settings['sens'] == 'DESC') ? 'down' : 'up';\r
                        $res .= ' ' . cubeMedia::image(IMG . '/' . $puce . '.png');\r
                }\r
                $res .= '</a>';\r
                return $res;\r
        }\r
 \r
-       public static function formParPage($action, $value, $nom = 'éléments', $all = true)\r
-       {\r
+       public static function formParPage($action, $value, $nom = 'éléments', $all = true) {\r
                $values = array(2, 5, 10, 15, 25, 50, 100);\r
                if ($all) {\r
                        $datas = array(__('Tous les ') . $nom => 0);\r
                } else {\r
                        $datas = array();\r
                }\r
-               foreach($values as $v) {\r
+               foreach ($values as $v) {\r
                        $datas[$v . ' ' . $nom] = $v;\r
                }\r
 \r
@@ -157,8 +151,7 @@ class commonUrl {
                return $res;\r
        }\r
 \r
-       public static function autocomplete($args)\r
-       {\r
+       public static function autocomplete($args) {\r
                global $core;\r
 \r
                if (isset($_GET['q'])) {\r
@@ -170,35 +163,35 @@ class commonUrl {
                        $dao = new commonDAOClient($core->con);\r
                        $dao->setSearch($q, true);\r
                        $clients = $dao->getListe();\r
-                       foreach($clients as $client) {\r
+                       foreach ($clients as $client) {\r
                                $suggestions[] = $client->utilisateur_id . ' - ' . $client->rs . ' (' . $client->prenom . ' ' . $client->nom . ')';\r
                        }\r
                } elseif ($args[1] == 'projet') {\r
                        $dao = new extranetDAOProjet($core->con);\r
                        $dao->setSearch($q, true);\r
                        $projets = $dao->getListe();\r
-                       foreach($projets as $projet) {\r
+                       foreach ($projets as $projet) {\r
                                $suggestions[] = $projet->projet_id . ' - ' . $projet->nom . ' (' . $projet->client . ')';\r
                        }\r
                } elseif ($args[1] == 'book') {\r
                        $dao = new wsDAOBook($core->con);\r
                        $dao->setSearch($q, true);\r
                        $books = $dao->getListe('date', 'DESC', 15, $core->user);\r
-                       foreach($books as $book) {\r
+                       foreach ($books as $book) {\r
                                $suggestions[] = $book->book_id . ' - ' . $book->nom;\r
                        }\r
                } elseif ($args[1] == 'wsuser') {\r
                        $dao = new commonDAOUtilisateur($core->con);\r
                        $dao->setSearch($q, true);\r
                        $clients = $dao->getListe('utilisateur_id', 'ASC', null, ' AND ws_grade>0', $core->user);\r
-                       foreach($clients as $client) {\r
+                       foreach ($clients as $client) {\r
                                $suggestions[] = $client->utilisateur_id . ' - ' . $client->rs . ' (' . $client->prenom . ' ' . $client->nom . ')';\r
                        }\r
                } elseif ($args[1] == 'wsadmin') {\r
                        $dao = new commonDAOUtilisateur($core->con);\r
                        $dao->setSearch($q, true);\r
                        $clients = $dao->getListe('utilisateur_id', 'ASC', null, 'AND ws_grade>2', $core->user);\r
-                       foreach($clients as $client) {\r
+                       foreach ($clients as $client) {\r
                                $suggestions[] = $client->utilisateur_id . ' - ' . $client->rs . ' (' . $client->prenom . ' ' . $client->nom . ')';\r
                        }\r
                }\r
@@ -206,8 +199,7 @@ class commonUrl {
                exit;\r
        }\r
 \r
-       public static function dashboard($args)\r
-       {\r
+       public static function dashboard($args) {\r
                commonDroits::dashboard();\r
 \r
                cubePage::ui('Sortable');\r
@@ -218,8 +210,7 @@ class commonUrl {
                return $res;\r
        }\r
 \r
-       public static function listeDashboard($args)\r
-       {\r
+       public static function listeDashboard($args) {\r
                commonDroits::dashboard();\r
                global $core;\r
                $r = $core->con->select('SELECT * FROM dashboard WHERE equipier=\'' . $core->user->utilisateur_id . '\' AND site=\'' . MODE . '\' ORDER BY sort');\r
@@ -232,14 +223,13 @@ class commonUrl {
                return $res;\r
        }\r
 \r
-       public static function displayDashboard($r)\r
-       {\r
+       public static function displayDashboard($r) {\r
                commonDroits::dashboard();\r
                global $core;\r
                $res = '<div class="caption">' . $core->typo->OngletBlanc($r->nom);\r
 \r
-               $close = ($r->state == '0')?' close':'';\r
-               $hide = ($r->state == '0')?' class="close"':'';\r
+               $close = ($r->state == '0') ? ' close' : '';\r
+               $hide = ($r->state == '0') ? ' class="close"' : '';\r
 \r
                $res .= '<a href="#" rel="' . $r->dashboard_id . '" class="toggle' . $close . '">' . cubeMedia::spacer(18, 10) . '</a>';\r
                $res .= '<a href="#" rel="formDashboard/d/' . $r->dashboard_id . '" class="edit popup">' . cubeMedia::image(IMG . '/edit.png') . '</a>';\r
@@ -260,6 +250,8 @@ class commonUrl {
                        $res .= extranetUrl::listeTimereport($r->dashboard_id, self::getDashboardSettings($r->settings));\r
                } elseif ($r->rubrique == 'demandes') {\r
                        $res .= wsUrl::listeDemandes($r->dashboard_id, self::getDashboardSettings($r->settings));\r
+               } elseif ($r->rubrique == 'books') {\r
+                       $res .= wsUrl::listeBooks($r->dashboard_id, self::getDashboardSettings($r->settings));\r
                }\r
                $res .= '</div>';\r
                $res .= commonPage::bf();\r
@@ -267,8 +259,7 @@ class commonUrl {
                return $res;\r
        }\r
 \r
-       public static function getDashboardSettings($s)\r
-       {\r
+       public static function getDashboardSettings($s) {\r
                commonDroits::dashboard();\r
                $s = unserialize($s);\r
                if (isset($s['filtres']['annee'])) {\r
@@ -277,12 +268,11 @@ class commonUrl {
                return $s;\r
        }\r
 \r
-       public static function formDashboard($args)\r
-       {\r
+       public static function formDashboard($args) {\r
                commonDroits::dashboard();\r
                global $core;\r
                $rub = $args[1];\r
-               $dashboard_id = isset($args[2])?$args[2]:'new';\r
+               $dashboard_id = isset($args[2]) ? $args[2] : 'new';\r
 \r
                if ($dashboard_id == 'new') {\r
                        $res = '<tr><td class="right">Titre de la liste</td><td>' . form::field('nom', 20, 128, false) . form::hidden('rubrique', $rub) . form::hidden('dashboard_id', $dashboard_id) . '</td></tr>';\r
@@ -294,8 +284,7 @@ class commonUrl {
                return $res;\r
        }\r
 \r
-       public static function fichiers($args)\r
-       {\r
+       public static function fichiers($args) {\r
                global $core;\r
 \r
                commonDroits::min(array('extranet' => 0, 'ws' => 1));\r
@@ -332,8 +321,7 @@ class commonUrl {
                return $res;\r
        }\r
 \r
-       public static function formFichier($for = 'client')\r
-       {\r
+       public static function formFichier($for = 'client') {\r
                global $core;\r
 \r
                if ($for == 'client') {\r
@@ -372,8 +360,7 @@ class commonUrl {
                return $res;\r
        }\r
 \r
-       public static function listeFichiers($settings = null)\r
-       {\r
+       public static function listeFichiers($settings = null) {\r
                commonDroits::min(array('extranet' => 0, 'ws' => 1));\r
 \r
                global $core;\r
@@ -383,7 +370,7 @@ class commonUrl {
                        $entreprise = $_SESSION['entreprise_fichiers'];\r
                }\r
 \r
-               $settings = is_null($settings)?$core->user->getSettings('fichiers'):$settings;\r
+               $settings = is_null($settings) ? $core->user->getSettings('fichiers') : $settings;\r
                $dao = new commonDAOFichier($core->con);\r
                $change = 'Fichiers';\r
                $dao->entreprise_id = $entreprise;\r
@@ -401,8 +388,8 @@ class commonUrl {
                $res .= '<th>' . commonUrl::orderby(__('Destiné à'), 'destinataire', $settings, 'sort' . $change) . '</th>';\r
                $res .= '<th class="min"></th><th class="min"></th></tr>';\r
                $i = 0;\r
-               foreach($liste as $fichier) {\r
-                       $odd = cubeMath::isOdd($i)?' class="odd"':'';\r
+               foreach ($liste as $fichier) {\r
+                       $odd = cubeMath::isOdd($i) ? ' class="odd"' : '';\r
                        $res .= '<tr' . $odd . '>';\r
                        $res .= '<td>' . $fichier->nom . '</td>';\r
                        $res .= '<td>' . $fichier->type . '</td>';\r
@@ -420,9 +407,9 @@ class commonUrl {
                        $i++;\r
                }\r
                if (!isset($settings['search']) || is_null($settings['search'])) {\r
-                       $odd = cubeMath::isOdd($i)?' class="odd"':'';\r
-                       $res .= '<tr' . $odd . '><td colspan="12">' ;\r
-                       $res .= commonPage::pager($settings['page'], $dao->count() , $settings['par_page'], 'page' . $change . '/%d');\r
+                       $odd = cubeMath::isOdd($i) ? ' class="odd"' : '';\r
+                       $res .= '<tr' . $odd . '><td colspan="12">';\r
+                       $res .= commonPage::pager($settings['page'], $dao->count(), $settings['par_page'], 'page' . $change . '/%d');\r
                        $res .= commonUrl::formParPage('parPage' . $change, $settings['par_page'], __('fichiers'));\r
                        $res .= '</td></tr>';\r
                }\r
@@ -430,8 +417,7 @@ class commonUrl {
                return $res;\r
        }\r
 \r
-       public static function telecharger($args)\r
-       {\r
+       public static function telecharger($args) {\r
                commonDroits::min(array('extranet' => 0, 'ws' => 1));\r
 \r
                array_shift($args);\r
@@ -446,8 +432,7 @@ class commonUrl {
                http::redirect(WEBROOT . '/cache/download/' . $dir . '/' . $nom);\r
        }\r
 \r
-       public static function upload($args)\r
-       {\r
+       public static function upload($args) {\r
                global $core;\r
 \r
                commonDroits::min(array('extranet' => 0, 'ws' => 1));\r
@@ -471,7 +456,7 @@ class commonUrl {
                if (!isset($_SESSION['files_uploaded'])) {\r
                        $_SESSION['files_uploaded'] = array();\r
                }\r
-               foreach($_FILES as $f) {\r
+               foreach ($_FILES as $f) {\r
                        if ($f['error']) {\r
                                continue;\r
                        }\r
@@ -496,7 +481,7 @@ class commonUrl {
                                        $mail->subject = '[' . EMAIL_SUBJECT . '] Nouveaux fichiers uploadés par ' . $core->user->prenom . ' ' . $core->user->nom;\r
                                        $body = 'Tous les fichiers de ' . $core->user->prenom . ' ' . $core->user->nom . ' : http://' . $_SERVER['HTTP_HOST'] . '/fichiers/' . $core->user->utilisateur_id . "\n\n";\r
                                        $body .= 'Fichiers chargés : ' . "\n";\r
-                                       foreach($_SESSION['files_uploaded'] as $f) {\r
+                                       foreach ($_SESSION['files_uploaded'] as $f) {\r
                                                $body .= ' - http://' . $_SERVER['HTTP_HOST'] . '/telecharger/' . $f . "\n";\r
                                        }\r
                                } else {\r
@@ -508,7 +493,7 @@ class commonUrl {
 \r
                                        $body = 'Tous les fichiers de ' . $client->prenom . ' ' . $client->nom . ' : http://' . $_SERVER['HTTP_HOST'] . '/fichiers/' . $client->utilisateur_id . "\n\n";\r
                                        $body .= 'Fichiers chargés : ' . "\n";\r
-                                       foreach($_SESSION['files_uploaded'] as $f) {\r
+                                       foreach ($_SESSION['files_uploaded'] as $f) {\r
                                                $body .= ' - http://' . $_SERVER['HTTP_HOST'] . '/telecharger/' . $f . "\n";\r
                                        }\r
                                        $body .= "\n" . RAPPEL . " : \n";\r
@@ -526,38 +511,35 @@ class commonUrl {
                exit;\r
        }\r
 \r
-       public static function cleanDownload($args)\r
-       {\r
+       public static function cleanDownload($args) {\r
                $root = ROOT . '/cache/download/';\r
                cubeFiles::scanRecursiveDir($root, $files);\r
-               $limit = TIME-7200;\r
-               foreach($files as $f) {\r
+               $limit = TIME - 7200;\r
+               foreach ($files as $f) {\r
                        if (filemtime($f) < $limit) {\r
                                unlink($f);\r
                        }\r
                }\r
                $files = cubeFiles::scandir($root, true);\r
-               foreach($files as $f) {\r
+               foreach ($files as $f) {\r
                        if (cubeFiles::isEmpty($f)) {\r
                                @rmdir($f);\r
                        }\r
                }\r
        }\r
 \r
-       public static function deleteOldFilesFromFTP($args)\r
-       {\r
+       public static function deleteOldFilesFromFTP($args) {\r
                global $core;\r
                cubePHP::neverStop();\r
-               \r
+\r
                $dao = new commonDAOFichier($core->con);\r
                $dao->deleteOldFiles();\r
-               \r
+\r
                cubeFiles::deleteFilesOlderThan('/home/ws/ftp', 60);\r
                cubeFiles::deleteFilesOlderThan('/home/ws/www/getpdf', 60);\r
        }\r
 \r
-       public static function adresse($utilisateur_id = null, $projet_id = null, $display = 'devis', $adresse = '')\r
-       {\r
+       public static function adresse($utilisateur_id = null, $projet_id = null, $display = 'devis', $adresse = '') {\r
                global $core;\r
                $dao = new commonDAOClient($core->con);\r
                if (!is_null($utilisateur_id)) {\r
@@ -593,6 +575,7 @@ class commonUrl {
                $a .= '<a href="#" class="popup edit" rel="formContact/' . $client->utilisateur_id . '" title="' . __('Editer les informations de ce client') . '">' . cubeMedia::image(IMG . '/edit.png') . '</a>';\r
                return $a;\r
        }\r
+\r
 }\r
 \r
 ?>
\ No newline at end of file