From: vincent@cubedesigners.com <vincent@cubedesigners.com@f5622870-0f3c-0410-866d-9cb505b7a8ef>
Date: Tue, 5 Jan 2016 14:00:32 +0000 (+0000)
Subject: #fluidbook-workshop Fix display of files for resseler
X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=c0b5ffd1fa31ce7bf38b2a6962ad9c36392ce8b5;p=cubeextranet.git

#fluidbook-workshop Fix display of files for resseler
---

diff --git a/images/extranet/devis.png b/images/extranet/devis.png
index 9b27fe010..94718902b 100644
Binary files a/images/extranet/devis.png and b/images/extranet/devis.png differ
diff --git a/inc/commons/class.common.url.php b/inc/commons/class.common.url.php
index 37f7773d2..4373eb580 100644
--- a/inc/commons/class.common.url.php
+++ b/inc/commons/class.common.url.php
@@ -301,6 +301,7 @@ class commonUrl {
 		if ($core->user->ws_grade > 0 && isset($args[1])) {
 			$dao = new commonDAOClient($core->con);
 			$client = $dao->selectById($args[1]);
+			fb($client);
 			$_SESSION['entreprise_fichiers'] = $client->entreprise;
 		} else {
 			unset($_SESSION['entreprise_fichiers']);
@@ -371,14 +372,12 @@ class commonUrl {
 		commonDroits::min(array('extranet' => 0, 'ws' => 1));
 
 		global $core;
-		if ($core->user->ws_grade <= 0) {
+		if ($core->user->ws_grade <= 0  && isset($_SESSION['entreprise_fichiers'])) {
 			$entreprise = $core->user->entreprise;
 		} else {
 			$entreprise = $_SESSION['entreprise_fichiers'];
 		}
 
-		fb($entreprise);
-
 		$settings = is_null($settings) ? $core->user->getSettings('fichiers') : $settings;
 		$dao = new commonDAOFichier($core->con);
 		$change = 'Fichiers';
diff --git a/inc/extranet/_common.php b/inc/extranet/_common.php
index 2bbaa6729..446263135 100644
--- a/inc/extranet/_common.php
+++ b/inc/extranet/_common.php
@@ -5,7 +5,3 @@ require_once(dirname(__FILE__) . '/Controlleur/_common.php');
 require_once(dirname(__FILE__) . '/DAO/_common.php');
 
 $GLOBALS['ajaxClasses'][] = 'extranetAjax';
-
-
-
-?>
\ No newline at end of file