diff --git a/classes/context/Context.class.php b/classes/context/Context.class.php index 6abac9e71..ffa28514d 100644 --- a/classes/context/Context.class.php +++ b/classes/context/Context.class.php @@ -300,7 +300,7 @@ class Context { if($_COOKIE['lang_type'] !== $lang_type) { - setcookie('lang_type', $lang_type, time() + 86400, '/', null, RX_SSL, true); + setcookie('lang_type', $lang_type, $_SERVER['REQUEST_TIME'] + 3600 * 24 * 1000, '/'); } } elseif($_COOKIE['lang_type']) @@ -316,7 +316,7 @@ class Context if(!strncasecmp($lang_code, $_SERVER['HTTP_ACCEPT_LANGUAGE'], strlen($lang_code))) { $lang_type = $lang_code; - setcookie('lang_type', $lang_type, time() + 86400, '/', null, RX_SSL, true); + setcookie('lang_type', $lang_type, $_SERVER['REQUEST_TIME'] + 3600 * 24 * 1000, '/'); } } } diff --git a/classes/mobile/Mobile.class.php b/classes/mobile/Mobile.class.php index d9c1a325b..4bb976cd4 100644 --- a/classes/mobile/Mobile.class.php +++ b/classes/mobile/Mobile.class.php @@ -73,7 +73,7 @@ class Mobile $uatype = $uahash . ':' . (self::$_ismobile ? '1' : '0'); if ($cookie !== $uatype) { - setcookie('rx_uatype', $uatype, 0, null, null, RX_SSL, true); + setcookie('rx_uatype', $uatype, 0); $_COOKIE['rx_uatype'] = $uatype; } diff --git a/common/framework/session.php b/common/framework/session.php index 89eb58431..d7c659b4e 100644 --- a/common/framework/session.php +++ b/common/framework/session.php @@ -294,10 +294,8 @@ class Session // Step 1: if the current site is not the default site, send SSO validation request to the default site. if(!$is_default_domain && !\Context::get('sso_response') && $_COOKIE['sso'] !== md5($current_domain)) { - $ssl_only = (\RX_SSL && config('session.use_ssl')) ? true : false; - // Set sso cookie to prevent multiple simultaneous SSO validation requests. - setcookie('sso', md5($current_domain), 0, '/', null, null, $ssl_only, true); + setcookie('sso', md5($current_domain), 0, '/'); // Redirect to the default site. $sso_request = Security::encrypt($current_url); diff --git a/common/js/common.js b/common/js/common.js index b2dd8a569..7ef8b6e5c 100644 --- a/common/js/common.js +++ b/common/js/common.js @@ -1055,8 +1055,7 @@ function getOuterHTML(obj) { function setCookie(name, value, expire, path) { var s_cookie = name + "=" + escape(value) + ((!expire) ? "" : ("; expires=" + expire.toGMTString())) + - "; path=" + ((!path) ? "/" : path) + - ((enforce_ssl) ? ";secure" : ""); + "; path=" + ((!path) ? "/" : path); document.cookie = s_cookie; } diff --git a/modules/member/member.view.php b/modules/member/member.view.php index aad6675b4..d6057bd33 100644 --- a/modules/member/member.view.php +++ b/modules/member/member.view.php @@ -191,10 +191,8 @@ class memberView extends member */ function dispMemberSignUpForm() { - $ssl_only = (\RX_SSL && config('session.use_ssl')) ? true : false; - //setcookie for redirect url in case of going to member sign up - setcookie("XE_REDIRECT_URL", $_SERVER['HTTP_REFERER'], 0, null, null, $ssl_only, true); + setcookie("XE_REDIRECT_URL", $_SERVER['HTTP_REFERER']); $member_config = $this->member_config; diff --git a/widgets/login_info/skins/ncenter_login/js/ncenter.js b/widgets/login_info/skins/ncenter_login/js/ncenter.js index 92b073686..b7f3fddf0 100644 --- a/widgets/login_info/skins/ncenter_login/js/ncenter.js +++ b/widgets/login_info/skins/ncenter_login/js/ncenter.js @@ -8,7 +8,7 @@ dt.setTime(dt.getTime() + (d * 24 * 60 * 60000)); e = "; expires=" + dt.toGMTString(); } - document.cookie = n + "=" + v + e + "; path=/" + ((enforce_ssl) ? ";secure" : ""); + document.cookie = n + "=" + v + e + "; path=/"; } var n = $('#nc_container');