fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-01-08 03:01:43 +09:00
Code Issues Projects Releases Packages Wiki Activity

Revert "Merge branch 'develop' into develop"

Browse source 
This reverts commit ec54bbd415, reversing
changes made to 9b12e0a71c.
This commit is contained in:
Min-Soo Kim 2018-07-29 11:54:14 +09:00
parent ec54bbd415
commit b62a1322c9
8 changed files with 13 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

2
common/framework/session.php
View file

@ -295,7 +295,7 @@ class Session
if(!$is_default_domain && !\Context::get('sso_response') && $_COOKIE['sso'] !== md5($current_domain))
{
// Set sso cookie to prevent multiple simultaneous SSO validation requests.
setcookie('sso', md5($current_domain), 0, '/', null, \Context::isAlwaysSSL());
setcookie('sso', md5($current_domain), 0, '/');
// Redirect to the default site.
$sso_request = Security::encrypt($current_url);

3
common/js/common.js
View file

@ -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;
}

8
common/tpl/common_layout.html
View file

@ -48,14 +48,14 @@
<!-- COMMON JS VARIABLES -->
<script>
var default_url = "{Context::encodeIdna(Context::getDefaultUrl())}";
var current_url = "{Context::encodeIdna($current_url)}";
var request_uri = "{Context::encodeIdna($request_uri)}";
var default_url = "{\Rhymix\Framework\URL::encodeIdna(Context::getDefaultUrl())}";
var current_url = "{\Rhymix\Framework\URL::encodeIdna($current_url)}";
var request_uri = "{\Rhymix\Framework\URL::encodeIdna($request_uri)}";
var current_lang = xe.current_lang = "{$lang_type}";
var current_mid = {json_encode($mid ?: null)};
var http_port = {Context::get("_http_port") ?: 'null'};
var https_port = {Context::get("_https_port") ?: 'null'};
var enforce_ssl = {Context::isAlwaysSSL() ? 'true' : 'false'};
var enforce_ssl = {Context::get('_use_ssl') === 'always' ? 'true' : 'false'};
var ssl_actions = {json_encode(array_keys(Context::getSSLActions()))};
var xeVid = null;
</script>