(no commit message)

diff --git a/inc/commons/_common.php b/inc/commons/_common.php
index c4b50d0aaccbad71fb9683704513344a79de174f..606c32c629fb3fb2880f1e6f30f3e6be6e19c1dc 100644 (file)
--- a/inc/commons/_common.php
+++ b/inc/commons/_common.php
@@ -8,6 +8,7 @@ $__autoload['commonFiltre'] = dirname(__FILE__) . '/class.common.filtre.php';
 $__autoload['commonShortcuts'] = dirname(__FILE__) . '/class.common.shortcuts.php';\r
 $__autoload['commonUrl'] = dirname(__FILE__) . '/class.common.url.php';\r
 $__autoload['commonAjax'] = dirname(__FILE__) . '/class.common.ajax.php';\r
+$__autoload['commonDroits'] = dirname(__FILE__) . '/class.common.droits.php';\r
 // Instantiation de la classe de contrôle\r
 $core = new commonCore();\r
 // Définition des handlers des urls\r

diff --git a/inc/commons/class.common.droits.php b/inc/commons/class.common.droits.php
new file mode 100644 (file)
index 0000000..88a84c9
--- /dev/null
+++ b/inc/commons/class.common.droits.php
@@ -0,0 +1,17 @@
+<?php\r
+class commonDroits {\r
+       public static function recherche($page)\r
+       {\r
+               global $core;\r
+               $droits = array('projets' => 1, 'factures' => 1, 'devis' => 1, 'clients' => 1, 'timereport' => 1, 'fichiers' => 0, 'books' => 0);\r
+               return (isset($droits[$page]) && $droits[$page] <= $core->user->grade);\r
+       }\r
+\r
+       public static function error()\r
+       {\r
+               http::head(401);\r
+               exit;\r
+       }\r
+}\r
+\r
+?>
\ No newline at end of file

diff --git a/inc/commons/class.common.page.php b/inc/commons/class.common.page.php
index a54ef7d9a19f14c501cf03cf14f70ba393d9602b..756998b7a0d8dd0a7616316d8b65215d9a3d5d2d 100644 (file)
--- a/inc/commons/class.common.page.php
+++ b/inc/commons/class.common.page.php
@@ -43,7 +43,7 @@ class commonPage {
        {\r
                global $core;\r
 \r
-               if (!extranetDroits::recherche($args[0])) {\r
+               if (!commonDroits::recherche($args[0])) {\r
                        return;\r
                }\r
                cubePage::emptyfield();\r

diff --git a/inc/commons/class.common.url.php b/inc/commons/class.common.url.php
index d29e5e5ca5774a471e9e4772b83df78471d2daae..fcef3298840d4679d02ce5787d0825af46a1d5a8 100644 (file)
--- a/inc/commons/class.common.url.php
+++ b/inc/commons/class.common.url.php
@@ -137,6 +137,25 @@ class commonUrl {
                $res .= '</a>';\r
                return $res;\r
        }\r
+\r
+       public static function formParPage($action, $value, $nom = 'éléments', $all = true)\r
+       {\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
+                       $datas[$v . ' ' . $nom] = $v;\r
+               }\r
+\r
+               $res = '<form action="' . $action . '" method="post" class="submitonchange">';\r
+               $res .= '<div class="formParPage">' . __('Afficher') . ' : ' . form::combo(array('par_page'), $datas, $value) . ' ' . __('par page') . '</div>';\r
+               $res .= '<div>' . cubeMedia::spacer(950, 1) . '</div>';\r
+               $res .= '</form>';\r
+               return $res;\r
+       }\r
 }\r
 \r
 ?>
\ No newline at end of file

diff --git a/inc/extranet/Controlleur/class.extranet.droits.php b/inc/extranet/Controlleur/class.extranet.droits.php
index f39d3b288125c76085b5a0ed22248513c92d0c01..aba4b087d77f04830bdba5ac1efdd0881495d7a4 100644 (file)
--- a/inc/extranet/Controlleur/class.extranet.droits.php
+++ b/inc/extranet/Controlleur/class.extranet.droits.php
@@ -7,7 +7,7 @@ class extranetDroits {
                        if (!$error) {\r
                                return false;\r
                        }\r
-                       self::error();\r
+                       commonDroits::error();\r
                }\r
        }\r
 \r
@@ -31,7 +31,7 @@ class extranetDroits {
                        return true;\r
                }\r
                if ($error) {\r
-                       self::error();\r
+                       commonDroits::error();\r
                }\r
                return false;\r
        }\r
@@ -51,13 +51,6 @@ class extranetDroits {
                return self::verifDroits($projet->chef_id, 0, 'w', $error);\r
        }\r
 \r
-       public static function recherche($page)\r
-       {\r
-               global $core;\r
-               $droits = array('projets' => 1, 'factures' => 1, 'devis' => 1, 'clients' => 1, 'timereport' => 1, 'fichiers' => 0, 'books' => 0);\r
-               return (isset($droits[$page]) && $droits[$page] <= $core->user->grade);\r
-       }\r
-\r
        public static function navigation()\r
        {\r
                global $core;\r
@@ -100,18 +93,12 @@ class extranetDroits {
                        }\r
 \r
                        if ($core->user->utilisateur_id != $utilisateur_id && !in_array($core->user->utilisateur_id, $collegues)) {\r
-                               self::error();\r
+                               commonDroits::error();\r
                        } else {\r
                                return true;\r
                        }\r
                }\r
-               self::error();\r
-       }\r
-\r
-       public static function error()\r
-       {\r
-               http::head(401);\r
-               exit;\r
+               commonDroits::error();\r
        }\r
 }\r
 \r

diff --git a/inc/extranet/Controlleur/class.extranet.url.php b/inc/extranet/Controlleur/class.extranet.url.php
index e78e6179dc2a5016313fd7c38f0ed0188a6098f6..8d89e6c154b670c97d11e0a33bc05c8a3da54d40 100644 (file)
--- a/inc/extranet/Controlleur/class.extranet.url.php
+++ b/inc/extranet/Controlleur/class.extranet.url.php
@@ -89,7 +89,7 @@ class extranetUrl {
                        $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 .= self::formParPage('parPage' . $change, $settings['par_page'], __('clients'));\r
+                       $res .= commonUrl::formParPage('parPage' . $change, $settings['par_page'], __('clients'));\r
                        $res .= '</td></tr>';\r
                }\r
                $res .= '</table>';\r
@@ -392,7 +392,7 @@ class extranetUrl {
                        $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 .= self::formParPage('parPage' . $change, $settings['par_page'], __('projets'));\r
+                       $res .= commonUrl::formParPage('parPage' . $change, $settings['par_page'], __('projets'));\r
                        $res .= '</td></tr>';\r
                }\r
                $res .= '</table>';\r
@@ -722,7 +722,7 @@ class extranetUrl {
                if (!isset($settings['search']) || is_null($settings['search'])) {\r
                        $res .= '<tr><td colspan="22"> ';\r
                        $res .= commonPage::pager($settings['page'], $dao->countActifs(), $settings['par_page'], 'page' . $change . '/%d');\r
-                       $res .= self::formParPage('parPage' . $change, $settings['par_page'], __('projets'));\r
+                       $res .= commonUrl::formParPage('parPage' . $change, $settings['par_page'], __('projets'));\r
                        $res .= ' </td></tr>';\r
                }\r
                $res .= '</table>';\r
@@ -888,7 +888,7 @@ class extranetUrl {
                        $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 .= self::formParPage('parPage' . $change, $settings['par_page'], __('devis'));\r
+                       $res .= commonUrl::formParPage('parPage' . $change, $settings['par_page'], __('devis'));\r
                        $res .= '</td></tr>';\r
                }\r
                $res .= '</table>';\r
@@ -1282,7 +1282,7 @@ class extranetUrl {
                        } else {\r
                                $res .= commonPage::pager($settings['page'], $dao->countCompta() , $settings['par_page'], 'page' . $change . '/%d');\r
                        }\r
-                       $res .= self::formParPage('parPage' . $change, $settings['par_page'], __('factures'));\r
+                       $res .= commonUrl::formParPage('parPage' . $change, $settings['par_page'], __('factures'));\r
                        $res .= '</td></tr>';\r
                }\r
                $res .= '</table>';\r
@@ -1547,25 +1547,6 @@ class extranetUrl {
                return $res;\r
        }\r
 \r
-       public static function formParPage($action, $value, $nom = 'éléments', $all = true)\r
-       {\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
-                       $datas[$v . ' ' . $nom] = $v;\r
-               }\r
-\r
-               $res = '<form action="' . $action . '" method="post" class="submitonchange">';\r
-               $res .= '<div class="formParPage">' . __('Afficher') . ' : ' . form::combo(array('par_page'), $datas, $value) . ' ' . __('par page') . '</div>';\r
-               $res .= '<div>' . cubeMedia::spacer(950, 1) . '</div>';\r
-               $res .= '</form>';\r
-               return $res;\r
-       }\r
-\r
        public static function dashboard($args)\r
        {\r
                extranetDroits::min(1);\r
@@ -1799,7 +1780,7 @@ class extranetUrl {
                        $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 .= self::formParPage('parPage' . $change, $settings['par_page'], __('clients'));\r
+                       $res .= commonUrl::formParPage('parPage' . $change, $settings['par_page'], __('clients'));\r
                        $res .= '</td></tr>';\r
                }*/\r
                $res .= '</table>';\r
@@ -1931,7 +1912,7 @@ class extranetUrl {
                        $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 .= self::formParPage('parPage' . $change, $settings['par_page'], __('fichiers'));\r
+                       $res .= commonUrl::formParPage('parPage' . $change, $settings['par_page'], __('fichiers'));\r
                        $res .= '</td></tr>';\r
                }\r
                $res .= '</table>';\r

diff --git a/inc/ws/Controlleur/class.ws.droits.php b/inc/ws/Controlleur/class.ws.droits.php
index d5f682978243fcce0ba08ac8add2063dd02dc27b..d076a054f212b78663b0d52b48b3f950ec90dcb5 100644 (file)
--- a/inc/ws/Controlleur/class.ws.droits.php
+++ b/inc/ws/Controlleur/class.ws.droits.php
@@ -4,8 +4,6 @@ class wsDroits {
        {\r
                global $core;\r
 \r
-               fb($core->user);\r
-\r
                $nav = array();\r
                $nav[__('Dashboard')] = 'dashboard';\r
                $nav[__('Publications')] = 'publications';\r
@@ -31,6 +29,17 @@ 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 33e4f96b892879fb7592720054afd34708ac28e9..d957549cb001450778463d7953ef8dd00c3e10f0 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
-               extranetDroits::min(1);\r
+               wsDroits::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
@@ -79,7 +79,7 @@ class wsUrl {
                        $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 .= extranetUrl::formParPage('parPage' . $change, $settings['par_page'], __('publications'), false);\r
+                       $res .= commonUrl::formParPage('parPage' . $change, $settings['par_page'], __('publications'), false);\r
                        $res .= '</td></tr>';\r
                }\r
                $res .= '</table>';\r
@@ -374,7 +374,7 @@ html{height:100%}' . "\n";
                cubePage::truePopup();\r
                cubePage::autoComplete();\r
                cubePage::emptyfield();\r
-               extranetDroits::min(1);\r
+               wsDroits::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
-               extranetDroits::min(1);\r
+               wsDroits::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
@@ -438,7 +438,7 @@ html{height:100%}' . "\n";
                        $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 .= extranetUrl::formParPage('parPage' . $change, $settings['par_page'], __('clients'));\r
+                       $res .= commonUrl::formParPage('parPage' . $change, $settings['par_page'], __('clients'));\r
                        $res .= '</td></tr>';\r
                }\r
                $res .= '</table>';\r
@@ -448,7 +448,7 @@ html{height:100%}' . "\n";
        public static function formClient($entreprise_id = 'new')\r
        {\r
                global $core;\r
-               extranetDroits::min(1);\r
+               wsDroits::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
-               extranetDroits::min(1);\r
+               wsDroits::min(1);\r
                $dao = new commonDAOEntreprise($core->con);\r
                $contacts = $dao->getContacts($entreprise_id);\r
 \r
@@ -526,7 +526,7 @@ html{height:100%}' . "\n";
        public static function formContact($client_id = 'new', $entreprise_id = null)\r
        {\r
                global $core;\r
-               extranetDroits::min(1);\r
+               wsDroits::min(1);\r
 \r
                $dao = new commonDAOClient($core->con);\r
                if ($client_id == 'new') {\r
@@ -560,7 +560,7 @@ html{height:100%}' . "\n";
        public static function formNotes($utilisateur_id)\r
        {\r
                global $core;\r
-               extranetDroits::min(1);\r
+               wsDroits::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