From cbaae172cdceeb3e0167c3fb60880c737bf63715 Mon Sep 17 00:00:00 2001 From: gRoussac Date: Tue, 28 May 2013 10:29:51 +0200 Subject: [PATCH] [-] BO : Report of #PSCFI-6790 REQUEST_URI badly recorded --- classes/ConnectionsSource.php | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/classes/ConnectionsSource.php b/classes/ConnectionsSource.php index 52409ab69..c818c9796 100644 --- a/classes/ConnectionsSource.php +++ b/classes/ConnectionsSource.php @@ -86,10 +86,12 @@ class ConnectionsSourceCore extends ObjectModel $source->id_connections = (int)$cookie->id_connections; $source->request_uri = Tools::getHttpHost(false, false); - if (isset($_SERVER['REDIRECT_URL'])) - $source->request_uri .= $_SERVER['REDIRECT_URL']; - elseif (isset($_SERVER['REQUEST_URI'])) + + if (isset($_SERVER['REQUEST_URI'])) $source->request_uri .= $_SERVER['REQUEST_URI']; + elseif (isset($_SERVER['REDIRECT_URL'])) + $source->request_uri .= $_SERVER['REDIRECT_URL']; + if (!Validate::isUrl($source->request_uri)) $source->request_uri = ''; $source->request_uri = substr($source->request_uri, 0, ConnectionsSource::$uri_max_size);