From 5bae4ffe4d5cd6cbd323c92ecee6ef6e43f42460 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 20 Mar 2024 21:27:28 +0100
Subject: [PATCH] FIX #28978 FIX #28976

---
 htdocs/takepos/index.php | 3 +--
 htdocs/user/logout.php   | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/htdocs/takepos/index.php b/htdocs/takepos/index.php
index 97dae7e1a14..99374eebc9f 100644
--- a/htdocs/takepos/index.php
+++ b/htdocs/takepos/index.php
@@ -73,7 +73,6 @@ if ($setcurrency != "") {
 	// We will recalculate amount for foreign currency at next call of invoice.php when $_SESSION["takeposcustomercurrency"] differs from invoice->multicurrency_code.
 }
 
-$_SESSION["urlfrom"] = '/takepos/index.php';
 
 $langs->loadLangs(array("bills", "orders", "commercial", "cashdesk", "receiptprinter", "banks"));
 
@@ -1107,7 +1106,7 @@ if (empty($conf->global->TAKEPOS_HIDE_HEAD_BAR)) {
 				}?>
 				<div class="login_block_user">
 				<?php
-				print top_menu_user(1);
+				print top_menu_user(1, DOL_URL_ROOT.'/user/logout.php?token='.newtoken().'&urlfrom='.urlencode('/takepos/?setterminal='.((int) $term)));
 				?>
 				</div>
 			</div>
diff --git a/htdocs/user/logout.php b/htdocs/user/logout.php
index d71ee34d93f..129ae24df06 100644
--- a/htdocs/user/logout.php
+++ b/htdocs/user/logout.php
@@ -72,7 +72,7 @@ if ($reshook < 0) {
 }
 
 // Define url to go after disconnect
-$urlfrom = empty($_SESSION["urlfrom"]) ? '' : $_SESSION["urlfrom"];
+$urlfrom = empty($_SESSION["urlfrom"]) ? GETPOST('urlfrom') : $_SESSION["urlfrom"];
 
 // Define url to go
 $url = DOL_URL_ROOT."/index.php"; // By default go to login page