lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #7192 from hregis/develop_mc

Browse Source 
Fix: remove unused $_COOKIE['DOLENTITY']
This commit is contained in:
Laurent Destailleur 2017-07-25 13:25:49 +02:00 committed by GitHub
commit 2f4602e201
2 changed files with 0 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
htdocs/master.inc.php
View File

@ -160,10 +160,6 @@ else if (defined('DOLENTITY') && is_numeric(DOLENTITY)) // For public page wit
{ {
$conf->entity = DOLENTITY; $conf->entity = DOLENTITY;
} }
else if (!empty($_COOKIE['DOLENTITY'])) // For other application with MultiCompany module (TODO: We should remove this. entity to use should never be stored into client side)
{
$conf->entity = $_COOKIE['DOLENTITY'];
}
// Sanitize entity // Sanitize entity
if (! is_numeric($conf->entity)) $conf->entity=1; if (! is_numeric($conf->entity)) $conf->entity=1;

7
htdocs/user/logout.php
View File

@ -50,13 +50,6 @@ if ($result < 0) { $error++; }
// Define url to go after disconnect // Define url to go after disconnect
$urlfrom=empty($_SESSION["urlfrom"])?'':$_SESSION["urlfrom"]; $urlfrom=empty($_SESSION["urlfrom"])?'':$_SESSION["urlfrom"];
// Destroy some cookies
// TODO external module
if (! empty($conf->phenix->enabled) && ! empty($conf->phenix->cookie))
{
setcookie($conf->phenix->cookie, '', 1, "/");
}
// Define url to go // Define url to go
$url=DOL_URL_ROOT."/index.php"; // By default go to login page $url=DOL_URL_ROOT."/index.php"; // By default go to login page
if ($urlfrom) $url=DOL_URL_ROOT.$urlfrom; if ($urlfrom) $url=DOL_URL_ROOT.$urlfrom;