From: vincent@cubedesigners.com <vincent@cubedesigners.com@f5622870-0f3c-0410-866d-9cb505b7a8ef>
Date: Mon, 4 Jul 2011 12:49:07 +0000 (+0000)
Subject: (no commit message)
X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=053636f440ff727ba032da21ccc376f3c8b02de7;p=cubeextranet.git

---

diff --git a/fluidbook/compile/_ico/fluidbook.icns b/fluidbook/compile/_ico/fluidbook.icns
new file mode 100644
index 000000000..5f5ddb814
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
index 000000000..fdaa6af8d
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
index 000000000..5efdaa729
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 af7ba03bf..b8df4e7ff 100644
--- a/inc/commons/Metier/class.common.utilisateur.php
+++ b/inc/commons/Metier/class.common.utilisateur.php
@@ -41,7 +41,7 @@ class commonUtilisateur extends cubeMetier {
 
 	public function getSettings($liste)
 	{
-		$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');
+		$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');
 		if (!isset($this->settings['search'][$liste]) || !is_array($this->settings['search'][$liste])) {
 			$this->settings['search'][$liste] = array();
 		}
@@ -94,6 +94,10 @@ class commonUtilisateur extends cubeMetier {
 		$this->settings['lastprint']['pages'] = $pages;
 		$this->settings['lastprint']['date'] = TIME;
 	}
+	
+	public function getWSSignatures(){
+		return $this->ws_signatures;
+	}
 
 	public function __toString()
 	{
diff --git a/inc/commons/class.common.droits.php b/inc/commons/class.common.droits.php
index 81840ac27..0a39fe6d0 100644
--- a/inc/commons/class.common.droits.php
+++ b/inc/commons/class.common.droits.php
@@ -1,14 +1,21 @@
 <?php
+
 class commonDroits {
-	public static function min($grade, $error = true)
-	{
+
+	public static function min($grade, $error = true) {
 		global $core;
-		if (MODE == 'extranet') {
-			$val = $core->user->grade;
-		} elseif (MODE == 'ws') {
-			$val = $core->user->ws_grade;
+
+		if (is_null($core->user)) {
+			$val = -1;
+		} else {
+			if (MODE == 'extranet') {
+				$val = $core->user->grade;
+			} elseif (MODE == 'ws') {
+				$val = $core->user->ws_grade;
+			}
 		}
 
+
 		if (is_array($grade)) {
 			$grade = $grade[MODE];
 		}
@@ -22,8 +29,7 @@ class commonDroits {
 		return true;
 	}
 
-	public static function dashboard($error = true)
-	{
+	public static function dashboard($error = true) {
 		if (MODE == 'extranet') {
 			$grade = 1;
 		} elseif (MODE == 'ws') {
@@ -32,13 +38,12 @@ class commonDroits {
 		return commonDroits::min($grade, $error);
 	}
 
-	public static function recherche($page)
-	{
+	public static function recherche($page) {
 		global $core;
 		if (MODE == 'extranet') {
 			$droits = array('projets' => 1, 'factures' => 1, 'devis' => 1, 'clients' => 1, 'timereport' => 1, 'fichiers' => 0);
 		} elseif (MODE == 'ws') {
-			$droits = array('clients' => 3, 'fichiers' => 0, 'publications' => 3,'devis'=>3);
+			$droits = array('clients' => 3, 'fichiers' => 0, 'publications' => 3, 'devis' => 3);
 		}
 		if (MODE == 'extranet') {
 			return (isset($droits[$page]) && $droits[$page] <= $core->user->grade);
@@ -47,8 +52,7 @@ class commonDroits {
 		}
 	}
 
-	public static function telecharger($utilisateur_id)
-	{
+	public static function telecharger($utilisateur_id) {
 		global $core;
 		if ($core->user->grade > 0) {
 			return true;
@@ -56,7 +60,7 @@ class commonDroits {
 			$dao = new commonDAOClient($core->con);
 			$contacts = $dao->getCollegues($utilisateur_id);
 			$collegues = array();
-			foreach($contacts as $c) {
+			foreach ($contacts as $c) {
 				$collegues[] = $c->utilisateur_id;
 			}
 
@@ -69,12 +73,12 @@ class commonDroits {
 		commonDroits::error();
 	}
 
-	public static function error()
-	{
+	public static function error() {
 		http::head(403);
 		ob_end_clean();
 		exit;
 	}
+
 }
 
 ?>
\ No newline at end of file
diff --git a/inc/commons/class.common.url.php b/inc/commons/class.common.url.php
index 0b26fae09..793aab1d2 100644
--- a/inc/commons/class.common.url.php
+++ b/inc/commons/class.common.url.php
@@ -6,7 +6,7 @@ class commonUrl {
 		$args = cubePage::getArgs($args);
 		// Si l'utilisateur n'est pas connecté, on affiche le formulaire
 		// de login
-		if (!is_null($core->user) && !$core->user) {
+		if (is_null($core->user) || !$core->user) {
 			$args = array('login');
 		} else {
 			if (isset($args[0]) && $args[0] == 'login') {
diff --git a/inc/ws/Controlleur/class.ws.droits.php b/inc/ws/Controlleur/class.ws.droits.php
index 5d48ba623..ef430b79d 100644
--- a/inc/ws/Controlleur/class.ws.droits.php
+++ b/inc/ws/Controlleur/class.ws.droits.php
@@ -9,6 +9,10 @@ class wsDroits {
 		global $core;
 
 		$nav = array();
+		
+		if(is_null($core->user)){
+			return $nav;
+		}
 
 		if ($core->user->ws_grade >= 5) {
 			$nav[__('Dashboard')] = 'dashboard';