From 6066b9312ec05a90a3f11263b230a06e18767d9a Mon Sep 17 00:00:00 2001
From: Dmitriy Simushev <simushevds@ossg.ru>
Date: Fri, 7 Nov 2014 12:39:19 +0000
Subject: [PATCH] Remove "is_secure_request" function

---
 src/mibew/libs/common/request.php |  7 -------
 src/mibew/libs/init.php           | 14 +++++++++-----
 2 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/src/mibew/libs/common/request.php b/src/mibew/libs/common/request.php
index b8fbc9a2..62a58c99 100644
--- a/src/mibew/libs/common/request.php
+++ b/src/mibew/libs/common/request.php
@@ -29,10 +29,3 @@ function get_get_param($name, $default = '')
 
     return $value;
 }
-
-function is_secure_request()
-{
-    return (isset($_SERVER['SERVER_PORT']) && $_SERVER['SERVER_PORT'] == '443')
-        || (isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] == "on")
-        || (isset($_SERVER["HTTP_HTTPS"]) && $_SERVER["HTTP_HTTPS"] == "on");
-}
diff --git a/src/mibew/libs/init.php b/src/mibew/libs/init.php
index 01ea5322..f2983943 100644
--- a/src/mibew/libs/init.php
+++ b/src/mibew/libs/init.php
@@ -44,17 +44,21 @@ require_once(MIBEW_FS_ROOT . '/libs/common/request.php');
 require_once(MIBEW_FS_ROOT . '/libs/common/response.php');
 require_once(MIBEW_FS_ROOT . '/libs/common/string.php');
 
+// We need to get some info from the request. Use symfony wrapper because it's
+// the simplest way.
+$tmp_request = \Symfony\Component\HttpFoundation\Request::createFromGlobals();
+
 // Make session cookie more secure
 @ini_set('session.cookie_httponly', true);
-if (is_secure_request()) {
+if ($tmp_request->isSecure()) {
     @ini_set('session.cookie_secure', true);
 }
-@ini_set(
-    'session.cookie_path',
-    \Symfony\Component\HttpFoundation\Request::createFromGlobals()->getBasePath() . "/"
-);
+@ini_set('session.cookie_path', $tmp_request->getBasePath() . "/");
 @ini_set('session.name', 'MibewSessionID');
 
+// Remove temporary request to keep global scope clean.
+unset($tmp_request);
+
 // Initialize user session
 session_start();