From 29b707d380e26cb8062fdcf636ab67b12195fd90 Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis@dolibarr.fr>
Date: Sat, 23 May 2009 17:56:01 +0000
Subject: [PATCH] Add: just used cookie for remind last user and last entity
 Look: use cookie for view logo of last used entity

---
 htdocs/master.inc.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/htdocs/master.inc.php b/htdocs/master.inc.php
index e87cd764ccc..61e8128187c 100644
--- a/htdocs/master.inc.php
+++ b/htdocs/master.inc.php
@@ -137,7 +137,7 @@ $conf->file->main_force_https = empty($dolibarr_main_force_https)?'':$dolibarr_m
 if (empty($force_charset_do_notuse)) $force_charset_do_notuse='UTF-8';
 $conf->file->character_set_client=strtoupper($force_charset_do_notuse);
 // Cookie cryptkey
-if (! empty($dolibarr_main_cookie_cryptkey))
+if (isset($dolibarr_main_cookie_cryptkey))
 {
 	$conf->cookie->cryptkey = $dolibarr_main_cookie_cryptkey;
 }
@@ -224,12 +224,13 @@ if (! defined('NOREQUIREDB'))
 	{
 		$conf->entity = $_POST["entity"];
 	}
-	elseif (isset($_COOKIE[$entityCookieName]) && isset($conf->cookie->cryptkey)) // Just for view specific login page
+	elseif (isset($_COOKIE[$entityCookieName])) // Just for view specific login page
 	{
 		include_once(DOL_DOCUMENT_ROOT."/core/cookie.class.php");
 		
 		$lastuser = '';
 		$lastentity = '';
+		$cryptkey = ( isset($conf->cookie->cryptkey) ? $conf->cookie->cryptkey : '' );
 
 		$entityCookie = new DolCookie($conf->cookie->cryptkey);
 		$cookieValue = $entityCookie->_getCookie($entityCookieName);