(no commit message)

diff --git a/fluidbook/compile/_ico/fluidbook.icns b/fluidbook/compile/_ico/fluidbook.icns
new file mode 100644 (file)
index 0000000..5f5ddb8
Binary files /dev/null and b/fluidbook/compile/_ico/fluidbook.icns differ

diff --git a/fluidbook/compile/_ico/fluidbook.ico b/fluidbook/compile/_ico/fluidbook.ico
new file mode 100644 (file)
index 0000000..fdaa6af
Binary files /dev/null and b/fluidbook/compile/_ico/fluidbook.ico differ

diff --git a/fluidbook/compile/_ico/fluidbook.png b/fluidbook/compile/_ico/fluidbook.png
new file mode 100644 (file)
index 0000000..5efdaa7
Binary files /dev/null and b/fluidbook/compile/_ico/fluidbook.png differ

diff --git a/inc/commons/Metier/class.common.utilisateur.php b/inc/commons/Metier/class.common.utilisateur.php
index af7ba03bfc6c25c7820612cd4a628d29fe2f4366..b8df4e7ff320342d9c27b1159538e5dfbe97c4a6 100644 (file)
--- a/inc/commons/Metier/class.common.utilisateur.php
+++ b/inc/commons/Metier/class.common.utilisateur.php
@@ -41,7 +41,7 @@ class commonUtilisateur extends cubeMetier {
 \r
        public function getSettings($liste)\r
        {\r
-               $cles = array('clients' => 'entreprise_id', 'clients_ws' => 'entreprise_id', 'equipiers' => 'utilisateur_id', 'devis' => 'devis_id', 'projets' => 'projet_id', 'factures' => 'facture_id', 'timereport' => 'projet_id', 'fichiers' => 'nom', 'books' => 'book_id', 'demandes' => 'demande_id');\r
+               $cles = array('clients' => 'entreprise_id', 'clients_ws' => 'entreprise_id', 'equipiers' => 'utilisateur_id', 'devis' => 'devis_id', 'projets' => 'projet_id', 'factures' => 'facture_id', 'timereport' => 'projet_id', 'fichiers' => 'nom', 'books' => 'book_id', 'demandes' => 'demande_id','publications'=>'book_id');\r
                if (!isset($this->settings['search'][$liste]) || !is_array($this->settings['search'][$liste])) {\r
                        $this->settings['search'][$liste] = array();\r
                }\r
@@ -94,6 +94,10 @@ class commonUtilisateur extends cubeMetier {
                $this->settings['lastprint']['pages'] = $pages;\r
                $this->settings['lastprint']['date'] = TIME;\r
        }\r
+       \r
+       public function getWSSignatures(){\r
+               return $this->ws_signatures;\r
+       }\r
 \r
        public function __toString()\r
        {\r

diff --git a/inc/commons/class.common.droits.php b/inc/commons/class.common.droits.php
index 81840ac27325b09d3f885e6e218c2cab5735f33e..0a39fe6d08ee306e58add5921e6bc02dc13a57f4 100644 (file)
--- a/inc/commons/class.common.droits.php
+++ b/inc/commons/class.common.droits.php
@@ -1,14 +1,21 @@
 <?php\r
+\r
 class commonDroits {\r
-       public static function min($grade, $error = true)\r
-       {\r
+\r
+       public static function min($grade, $error = true) {\r
                global $core;\r
-               if (MODE == 'extranet') {\r
-                       $val = $core->user->grade;\r
-               } elseif (MODE == 'ws') {\r
-                       $val = $core->user->ws_grade;\r
+\r
+               if (is_null($core->user)) {\r
+                       $val = -1;\r
+               } else {\r
+                       if (MODE == 'extranet') {\r
+                               $val = $core->user->grade;\r
+                       } elseif (MODE == 'ws') {\r
+                               $val = $core->user->ws_grade;\r
+                       }\r
                }\r
 \r
+\r
                if (is_array($grade)) {\r
                        $grade = $grade[MODE];\r
                }\r
@@ -22,8 +29,7 @@ class commonDroits {
                return true;\r
        }\r
 \r
-       public static function dashboard($error = true)\r
-       {\r
+       public static function dashboard($error = true) {\r
                if (MODE == 'extranet') {\r
                        $grade = 1;\r
                } elseif (MODE == 'ws') {\r
@@ -32,13 +38,12 @@ class commonDroits {
                return commonDroits::min($grade, $error);\r
        }\r
 \r
-       public static function recherche($page)\r
-       {\r
+       public static function recherche($page) {\r
                global $core;\r
                if (MODE == 'extranet') {\r
                        $droits = array('projets' => 1, 'factures' => 1, 'devis' => 1, 'clients' => 1, 'timereport' => 1, 'fichiers' => 0);\r
                } elseif (MODE == 'ws') {\r
-                       $droits = array('clients' => 3, 'fichiers' => 0, 'publications' => 3,'devis'=>3);\r
+                       $droits = array('clients' => 3, 'fichiers' => 0, 'publications' => 3, 'devis' => 3);\r
                }\r
                if (MODE == 'extranet') {\r
                        return (isset($droits[$page]) && $droits[$page] <= $core->user->grade);\r
@@ -47,8 +52,7 @@ class commonDroits {
                }\r
        }\r
 \r
-       public static function telecharger($utilisateur_id)\r
-       {\r
+       public static function telecharger($utilisateur_id) {\r
                global $core;\r
                if ($core->user->grade > 0) {\r
                        return true;\r
@@ -56,7 +60,7 @@ class commonDroits {
                        $dao = new commonDAOClient($core->con);\r
                        $contacts = $dao->getCollegues($utilisateur_id);\r
                        $collegues = array();\r
-                       foreach($contacts as $c) {\r
+                       foreach ($contacts as $c) {\r
                                $collegues[] = $c->utilisateur_id;\r
                        }\r
 \r
@@ -69,12 +73,12 @@ class commonDroits {
                commonDroits::error();\r
        }\r
 \r
-       public static function error()\r
-       {\r
+       public static function error() {\r
                http::head(403);\r
                ob_end_clean();\r
                exit;\r
        }\r
+\r
 }\r
 \r
 ?>
\ No newline at end of file

diff --git a/inc/commons/class.common.url.php b/inc/commons/class.common.url.php
index 0b26fae090ec5541c48fbe6ed52480475df035e8..793aab1d23e6641df4ec98f2d4aa2ced3169775c 100644 (file)
--- a/inc/commons/class.common.url.php
+++ b/inc/commons/class.common.url.php
@@ -6,7 +6,7 @@ class commonUrl {
                $args = cubePage::getArgs($args);\r
                // Si l'utilisateur n'est pas connecté, on affiche le formulaire\r
                // de login\r
-               if (!is_null($core->user) && !$core->user) {\r
+               if (is_null($core->user) || !$core->user) {\r
                        $args = array('login');\r
                } else {\r
                        if (isset($args[0]) && $args[0] == 'login') {\r

diff --git a/inc/ws/Controlleur/class.ws.droits.php b/inc/ws/Controlleur/class.ws.droits.php
index 5d48ba6231607f63d37077eaabefee0b025a93ce..ef430b79da2546300d364a6b30e13f7fd3b96c2d 100644 (file)
--- a/inc/ws/Controlleur/class.ws.droits.php
+++ b/inc/ws/Controlleur/class.ws.droits.php
@@ -9,6 +9,10 @@ class wsDroits {
                global $core;\r
 \r
                $nav = array();\r
+               \r
+               if(is_null($core->user)){\r
+                       return $nav;\r
+               }\r
 \r
                if ($core->user->ws_grade >= 5) {\r
                        $nav[__('Dashboard')] = 'dashboard';\r