(no commit message)

diff --git a/inc/commons/class.common.droits.php b/inc/commons/class.common.droits.php
index d5ca99e31a0b66edc43dd517851e454eb7eb7741..bf0d60fa4aaf0706bb47cc0d268ca52e64c8b7da 100644 (file)
--- a/inc/commons/class.common.droits.php
+++ b/inc/commons/class.common.droits.php
@@ -1,14 +1,20 @@
 <?php\r
 class commonDroits {\r
-\r
        public static function min($grade, $error = true)\r
        {\r
                global $core;\r
-               if(MODE=='extranet'){\r
-                       $val=$core->user->grade;\r
-               }elseif(MODE=='ws'){\r
-                       $val=$core->user->ws_grade;\r
+               if (MODE == 'extranet') {\r
+                       $val = $core->user->grade;\r
+               } elseif (MODE == 'ws') {\r
+                       $val = $core->user->ws_grade;\r
+               }\r
+\r
+               if (is_array($grade)) {\r
+                       $grade = $grade[MODE];\r
                }\r
+\r
+               fb($val,$grade);\r
+\r
                if ($val < $grade) {\r
                        if (!$error) {\r
                                return false;\r
@@ -26,7 +32,13 @@ class commonDroits {
 \r
        public static function error()\r
        {\r
-               http::head(401);\r
+               try {\r
+                       throw new Exception('Authorisation');\r
+               }\r
+               catch(Exception $e) {\r
+                       fb($e);\r
+               }\r
+               http::head(403);\r
                ob_end_clean();\r
                exit;\r
        }\r

diff --git a/inc/commons/class.common.url.php b/inc/commons/class.common.url.php
index 4c2a25c893ca42287811d0b693e8cc746242d7d9..0a4c98dd570a72ee4eaadff88f8cfa27b59648ca 100644 (file)
--- a/inc/commons/class.common.url.php
+++ b/inc/commons/class.common.url.php
@@ -289,7 +289,8 @@ class commonUrl {
        public static function fichiers($args)\r
        {\r
                global $core;\r
-               commonDroits::min(0);\r
+\r
+               commonDroits::min(array('extranet'=>0,'ws'=>1));\r
 \r
                $settings = $core->user->getSettings('fichiers');\r
 \r
@@ -364,8 +365,9 @@ class commonUrl {
 \r
        public static function listeFichiers($settings = null)\r
        {\r
+               commonDroits::min(array('extranet'=>0,'ws'=>1));\r
+\r
                global $core;\r
-               wsDroits::min(0);\r
                if ($core->user->grade <= 0) {\r
                        $entreprise = $core->user->entreprise;\r
                } else {\r
@@ -421,6 +423,8 @@ class commonUrl {
 \r
        public static function telecharger($args)\r
        {\r
+               commonDroits::min(array('extranet'=>0,'ws'=>1));\r
+\r
                array_shift($args);\r
                $path = implode('/', $args);\r
                $utilisateur_id = array_shift($args);\r
@@ -436,6 +440,9 @@ class commonUrl {
        public static function upload($args)\r
        {\r
                global $core;\r
+\r
+               commonDroits::min(array('extranet'=>0,'ws'=>1));\r
+\r
                if (isset($args[1]) && $args[1] != '') {\r
                        $for = $args[1];\r
                } else {\r

diff --git a/inc/extranet/Controlleur/class.extranet.ajax.php b/inc/extranet/Controlleur/class.extranet.ajax.php
index 35c5c564de2f770164474e7d1fdb8de656399b17..d08ec5c06bfc93faf35915140c5117edbc4ed05f 100644 (file)
--- a/inc/extranet/Controlleur/class.extranet.ajax.php
+++ b/inc/extranet/Controlleur/class.extranet.ajax.php
@@ -702,7 +702,7 @@ class extranetAjax {
                        return;\r
                }\r
 \r
-               extranetDroits::min(1);\r
+               commonDroits::min(1);\r
                $dao = new extranetDAODevis($core->con);\r
                $devis = $dao->sauve($core->user->utilisateur_id, $_POST);\r
                $dao->saveAsPdf($devis->devis_id);\r
@@ -712,7 +712,7 @@ class extranetAjax {
        public static function previewFacture($args, &$x)\r
        {\r
                global $core;\r
-               extranetDroits::min(1);\r
+               commonDroits::min(1);\r
 \r
                $daoProjet = new extranetDAOProjet($core->con);\r
                $daoClient = new commonDAOClient($core->con);\r

diff --git a/inc/extranet/Controlleur/class.extranet.droits.php b/inc/extranet/Controlleur/class.extranet.droits.php
index aba4b087d77f04830bdba5ac1efdd0881495d7a4..bab49da7cf07119202567cfccab28cabbd88b0ac 100644 (file)
--- a/inc/extranet/Controlleur/class.extranet.droits.php
+++ b/inc/extranet/Controlleur/class.extranet.droits.php
@@ -1,16 +1,5 @@
 <?php\r
 class extranetDroits {\r
-       public static function min($grade, $error = true)\r
-       {\r
-               global $core;\r
-               if ($core->user->grade < $grade) {\r
-                       if (!$error) {\r
-                               return false;\r
-                       }\r
-                       commonDroits::error();\r
-               }\r
-       }\r
-\r
        protected static function verifDroits($proprietaire, $client, $action = 'r', $error = true, $collegues = false)\r
        {\r
                global $core;\r

diff --git a/inc/extranet/Controlleur/class.extranet.page.chiffres.php b/inc/extranet/Controlleur/class.extranet.page.chiffres.php
index 7e6015fb65f37293d34b98339ced1e7fa03dadc9..7fe2b48839c3a8fdcb5540ad3b44395ace97434b 100644 (file)
--- a/inc/extranet/Controlleur/class.extranet.page.chiffres.php
+++ b/inc/extranet/Controlleur/class.extranet.page.chiffres.php
@@ -59,7 +59,7 @@ class extranetPageChiffres {
        public static function listeChiffres()\r
        {\r
                global $core;\r
-               extranetDroits::min(2);\r
+               commonDroits::min(2);\r
                $res = self::chiffresAnnee($encours);\r
                $res .= self::caGlobal($chiffres, $total, $encours);\r
                $res .= self::caCategorie($chiffres, $total);\r

diff --git a/inc/extranet/Controlleur/class.extranet.url.php b/inc/extranet/Controlleur/class.extranet.url.php
index 879680a10a372e4c2cfbad2e32fd10b5e32a784c..ff485d60c04f91ab3461e538657bee9adea95334 100644 (file)
--- a/inc/extranet/Controlleur/class.extranet.url.php
+++ b/inc/extranet/Controlleur/class.extranet.url.php
@@ -6,7 +6,7 @@ class extranetUrl {
                cubePage::truePopup();\r
                cubePage::autoComplete();\r
                cubePage::emptyfield();\r
-               extranetDroits::min(1);\r
+               commonDroits::min(1);\r
                $settings = $core->user->getSettings('clients');\r
 \r
                $shortcuts = array();\r
@@ -28,7 +28,7 @@ class extranetUrl {
        public static function listeClients($dashboard = null, $settings = null)\r
        {\r
                global $core;\r
-               extranetDroits::min(1);\r
+               commonDroits::min(1);\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
@@ -147,7 +147,7 @@ class extranetUrl {
        public static function formClient($entreprise_id = 'new')\r
        {\r
                global $core;\r
-               extranetDroits::min(1);\r
+               commonDroits::min(1);\r
                $dao = new commonDAOEntreprise($core->con);\r
                $daoUtilisateur = new commonDAOUtilisateur($core->con);\r
                if ($entreprise_id == 'new') {\r
@@ -203,7 +203,7 @@ class extranetUrl {
        public static function listeContacts($entreprise_id)\r
        {\r
                global $core;\r
-               extranetDroits::min(1);\r
+               commonDroits::min(1);\r
                $dao = new commonDAOEntreprise($core->con);\r
                $contacts = $dao->getContacts($entreprise_id);\r
 \r
@@ -226,7 +226,7 @@ class extranetUrl {
        public static function formContact($client_id = 'new', $entreprise_id = null)\r
        {\r
                global $core;\r
-               extranetDroits::min(1);\r
+               commonDroits::min(1);\r
 \r
                $dao = new commonDAOClient($core->con);\r
                if ($client_id == 'new') {\r
@@ -262,7 +262,7 @@ class extranetUrl {
        public static function formNotes($utilisateur_id)\r
        {\r
                global $core;\r
-               extranetDroits::min(1);\r
+               commonDroits::min(1);\r
                $dao = new commonDAOUtilisateur($core->con);\r
                $utilisateur = $dao->selectById($utilisateur_id);\r
                $res = '<tr><td colspan="2">' . form::hidden('utilisateur_id', $utilisateur_id) . '</td></tr>';\r
@@ -274,7 +274,7 @@ class extranetUrl {
        public static function projets($args)\r
        {\r
                global $core;\r
-               extranetDroits::min(1);\r
+               commonDroits::min(1);\r
 \r
                $settings = $core->user->getSettings('projets');\r
 \r
@@ -300,7 +300,7 @@ class extranetUrl {
        public static function listeProjets($dashboard = null, $settings = null)\r
        {\r
                global $core;\r
-               extranetDroits::min(1);\r
+               commonDroits::min(1);\r
                $settings = is_null($settings)?$core->user->getSettings('projets'):$settings;\r
                $change = is_null($dashboard)?'Projet':'Dashboard/' . $dashboard;\r
 \r
@@ -404,7 +404,7 @@ class extranetUrl {
        public static function projet($args)\r
        {\r
                global $core;\r
-               extranetDroits::min(1);\r
+               commonDroits::min(1);\r
 \r
                $shortcuts = array();\r
                $shortcuts[] = '<a href="#" class="popup" rel="formTacheNormale/new/' . $args[1] . '">' . $core->typo->Ajouter('Créer une tâche') . '</a>';\r
@@ -424,7 +424,7 @@ class extranetUrl {
        public static function listeProjet($projet_id)\r
        {\r
                global $core;\r
-               extranetDroits::min(1);\r
+               commonDroits::min(1);\r
 \r
                $res = '<table class="liste">';\r
                $res .= '<tr><th>#</th>';\r
@@ -524,7 +524,7 @@ class extranetUrl {
        public static function formProjet($projet_id = 'new')\r
        {\r
                global $core;\r
-               extranetDroits::min(1);\r
+               commonDroits::min(1);\r
 \r
                $dao = new extranetDAOProjet($core->con);\r
                if ($projet_id == 'new') {\r
@@ -577,7 +577,7 @@ class extranetUrl {
        public static function formTache($tache)\r
        {\r
                global $core;\r
-               extranetDroits::min(1);\r
+               commonDroits::min(1);\r
 \r
                $res = '<tr><td>' . __('Numéro de tâche') . '</td><td>' . form::hidden('projet', $tache->projet) . form::hidden('tache_id', $tache->tache_id) . '' . $tache->tache_id . '</td></tr>';\r
                $res .= '<tr><td>' . __('Catégorie') . '</td><td>' . form::combo('categorie', array_flip($core->categories), $tache->categorie) . '</td></tr>';\r
@@ -589,7 +589,7 @@ class extranetUrl {
        public static function formTacheNormale($tache_id, $projet_id = null)\r
        {\r
                global $core;\r
-               extranetDroits::min(1);\r
+               commonDroits::min(1);\r
                $dao = new extranetDAOTache($core->con);\r
                if ($tache_id == 'new') {\r
                        $tache = $dao->creeNormale();\r
@@ -606,7 +606,7 @@ class extranetUrl {
        public static function formTacheSousTraitee($tache_id, $projet_id = null)\r
        {\r
                global $core;\r
-               extranetDroits::min(1);\r
+               commonDroits::min(1);\r
                $dao = new extranetDAOTache($core->con);\r
                if ($tache_id == 'new') {\r
                        $tache = $dao->creeSousTraitee();\r
@@ -622,7 +622,7 @@ class extranetUrl {
        public static function timereport($args)\r
        {\r
                global $core;\r
-               extranetDroits::min(1);\r
+               commonDroits::min(1);\r
                $settings = $core->user->getSettings('timereport');\r
                $filtres = array();\r
                $filtres[] = new commonFiltre(__('Participants'), 'equipier_participe', $settings['filtres']);\r
@@ -640,7 +640,7 @@ class extranetUrl {
        public static function listeTimereport($dashboard = null, $settings = null)\r
        {\r
                global $core;\r
-               extranetDroits::min(1);\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
@@ -757,7 +757,7 @@ class extranetUrl {
                        return self::devis_client($args);\r
                }\r
                $settings = $core->user->getSettings('devis');\r
-               extranetDroits::min(1);\r
+               commonDroits::min(1);\r
 \r
                $shortcuts = array();\r
                $shortcuts[] = '<a href="' . SITE_PATH . 'editedevis/new">' . $core->typo->Ajouter('Créer un devis') . '</a>';\r
@@ -826,7 +826,7 @@ class extranetUrl {
        public static function listeDevisEquipier($dashboard = null, $settings = null)\r
        {\r
                global $core;\r
-               extranetDroits::min(1);\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
@@ -947,7 +947,7 @@ class extranetUrl {
        public static function editedevis($args)\r
        {\r
                global $core;\r
-               extranetDroits::min(1);\r
+               commonDroits::min(1);\r
                $res = commonPage::barre();\r
                $res .= commonPage::tMain();\r
                $res .= commonPage::bh();\r
@@ -963,7 +963,7 @@ class extranetUrl {
                cubePage::autocomplete();\r
                cubePage::emptyField();\r
                cubePage::ui('Sortable');\r
-               extranetDroits::min(1);\r
+               commonDroits::min(1);\r
                $dao = new extranetDAODevis($core->con);\r
                if ($devis_id == 'new') {\r
                        $devis = $dao->cree();\r
@@ -1087,7 +1087,7 @@ class extranetUrl {
                }\r
                $settings = $core->user->getSettings('factures');\r
 \r
-               extranetDroits::min(1);\r
+               commonDroits::min(1);\r
                $shortcuts = array();\r
                if ($core->user->grade != 3) {\r
                        $shortcuts[] = '<a href="' . SITE_PATH . 'editefacture/new">' . $core->typo->Ajouter('Créer une facture') . '</a>';\r
@@ -1318,7 +1318,7 @@ class extranetUrl {
        public static function editefacture($args)\r
        {\r
                global $core;\r
-               extranetDroits::min(1);\r
+               commonDroits::min(1);\r
                $res = commonPage::barre();\r
                $res .= commonPage::tMain();\r
                $res .= commonPage::bh();\r
@@ -1335,7 +1335,7 @@ class extranetUrl {
        public static function formFacture($facture_id = 'new', $projet_id = null)\r
        {\r
                global $core;\r
-               extranetDroits::min(1);\r
+               commonDroits::min(1);\r
                cubePage::autoComplete();\r
                cubePage::emptyField();\r
                cubePage::ui('Sortable');\r
@@ -1466,7 +1466,7 @@ class extranetUrl {
        public static function previewFacture($args)\r
        {\r
                global $core;\r
-               extranetDroits::min(1);\r
+               commonDroits::min(1);\r
                $dao = new extranetDAOFacture($core->con);\r
                $facture = $dao->selectById($args[1]);\r
 \r
@@ -1503,7 +1503,7 @@ class extranetUrl {
        public static function chiffres($args)\r
        {\r
                global $core;\r
-               extranetDroits::min(2);\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
                $res = commonPage::barre(null, null, null, null);\r
                $res .= commonPage::tMain();\r
@@ -1515,7 +1515,7 @@ class extranetUrl {
        public static function traduction($args)\r
        {\r
                global $core;\r
-               extranetDroits::min(1);\r
+               commonDroits::min(1);\r
                $res = commonPage::barre();\r
                $res .= commonPage::tMain("traduction");\r
                $res .= commonPage::bh();\r
@@ -1565,7 +1565,7 @@ class extranetUrl {
        public static function rh($args)\r
        {\r
                global $core;\r
-               extranetDroits::min(2);\r
+               commonDroits::min(2);\r
                $res = commonPage::barre();\r
                $res .= commonPage::tMain("rh");\r
                $res .= commonPage::bh();\r
@@ -1580,7 +1580,7 @@ class extranetUrl {
        public static function listeRh($dashboard = null, $settings = null)\r
        {\r
                global $core;\r
-               extranetDroits::min(2);\r
+               commonDroits::min(2);\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

diff --git a/inc/ws/Controlleur/class.ws.droits.php b/inc/ws/Controlleur/class.ws.droits.php
index 9f260b027a971b66da292325a63da35d5dbee3e2..79246d1efda0b95eeef697c25b90f48068a8cfd7 100644 (file)
--- a/inc/ws/Controlleur/class.ws.droits.php
+++ b/inc/ws/Controlleur/class.ws.droits.php
@@ -36,17 +36,6 @@ class wsDroits {
                }\r
                return $res;\r
        }\r
-\r
-       public static function min($grade, $error = true)\r
-       {\r
-               global $core;\r
-               if ($core->user->grade < $grade) {\r
-                       if (!$error) {\r
-                               return false;\r
-                       }\r
-                       commonDroits::error();\r
-               }\r
-       }\r
 }\r
 \r
 ?>
\ No newline at end of file

diff --git a/inc/ws/Controlleur/class.ws.url.php b/inc/ws/Controlleur/class.ws.url.php
index a9dcc3d762095ccc20fbfcde53d11a086aa6ae09..ea149617c4f295a53858a1b585c6e9aab55fa7de 100644 (file)
--- a/inc/ws/Controlleur/class.ws.url.php
+++ b/inc/ws/Controlleur/class.ws.url.php
@@ -29,7 +29,7 @@ class wsUrl {
                cubePage::truePopup();\r
                cubePage::autocomplete();\r
 \r
-               wsDroits::min(1);\r
+               commonDroits::min(1);\r
                $settings = is_null($settings)?$core->user->getSettings('books'):$settings;\r
                $change = is_null($dashboard)?'Books':'Dashboard/' . $dashboard;\r
                $dao = new wsDAOBook($core->con);\r
@@ -374,7 +374,7 @@ html{height:100%}' . "\n";
                cubePage::truePopup();\r
                cubePage::autoComplete();\r
                cubePage::emptyfield();\r
-               wsDroits::min(1);\r
+               commonDroits::min(1);\r
                $settings = $core->user->getSettings('clients');\r
 \r
                $shortcuts = array();\r
@@ -396,7 +396,7 @@ html{height:100%}' . "\n";
        public static function listeClients($dashboard = null, $settings = null)\r
        {\r
                global $core;\r
-               wsDroits::min(1);\r
+               commonDroits::min(1);\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
@@ -448,7 +448,7 @@ html{height:100%}' . "\n";
        public static function formClient($entreprise_id = 'new')\r
        {\r
                global $core;\r
-               wsDroits::min(1);\r
+               commonDroits::min(1);\r
                $dao = new commonDAOEntreprise($core->con);\r
                $daoUtilisateur = new commonDAOUtilisateur($core->con);\r
                if ($entreprise_id == 'new') {\r
@@ -504,7 +504,7 @@ html{height:100%}' . "\n";
        public static function listeContacts($entreprise_id)\r
        {\r
                global $core;\r
-               wsDroits::min(1);\r
+               commonDroits::min(1);\r
                $dao = new commonDAOEntreprise($core->con);\r
                $contacts = $dao->getContacts($entreprise_id);\r
 \r
@@ -527,7 +527,7 @@ html{height:100%}' . "\n";
        public static function formContact($client_id = 'new', $entreprise_id = null)\r
        {\r
                global $core;\r
-               wsDroits::min(1);\r
+               commonDroits::min(1);\r
 \r
                $dao = new commonDAOClient($core->con);\r
                if ($client_id == 'new') {\r
@@ -562,7 +562,7 @@ html{height:100%}' . "\n";
        public static function formNotes($utilisateur_id)\r
        {\r
                global $core;\r
-               wsDroits::min(1);\r
+               commonDroits::min(1);\r
                $dao = new commonDAOUtilisateur($core->con);\r
                $utilisateur = $dao->selectById($utilisateur_id);\r
                $res = '<tr><td colspan="2">' . form::hidden('utilisateur_id', $utilisateur_id) . '</td></tr>';\r