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

ssl option modified

Browse source 
git-svn-id: http://xe-core.googlecode.com/svn/sandbox@5127 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
haneul 2008-12-18 10:10:43 +00:00
parent 602837f8c2
commit 93ffe36639
3 changed files with 12 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

16
classes/context/Context.class.php
View file

@ -209,14 +209,14 @@
$GLOBALS['_time_zone'] = $db_info->time_zone; $GLOBALS['_time_zone'] = $db_info->time_zone;
$GLOBALS['_qmail_compatibility'] = $db_info->qmail_compatibility; $GLOBALS['_qmail_compatibility'] = $db_info->qmail_compatibility;
$GLOBALS['_use_ssl'] = $db_info->use_ssl; $this->set('_use_ssl', $db_info->use_ssl);
if($db_info->http_port) if($db_info->http_port)
{ {
$GLOBALS['_http_port'] = $db_info->http_port; $this->set('_http_port', $db_info->http_port);
} }
if($db_info->https_port) if($db_info->https_port)
{ {
$GLOBALS['_https_port'] = $db_info->https_port; $this->set('_https_port', $db_info->https_port);
} }
} }
@ -783,7 +783,7 @@
**/ **/
function getRequestUri($ssl_mode = FOLLOW_REQUEST_SSL, $domain = null) { function getRequestUri($ssl_mode = FOLLOW_REQUEST_SSL, $domain = null) {
static $url = array(); static $url = array();
if($GLOBALS['_use_ssl'] == "always") $ssl_mode = ENFORCE_SSL; if(Context::get('_use_ssl') == "always") $ssl_mode = ENFORCE_SSL;
if($domain) $domain_key = md5($domain); if($domain) $domain_key = md5($domain);
else $domain_key = 'default'; else $domain_key = 'default';
@ -813,14 +813,14 @@
$url_info = parse_url('http://'.$target_url); $url_info = parse_url('http://'.$target_url);
if($use_ssl) if($use_ssl)
{ {
if($GLOBALS["_https_port"] && $GLOBALS["_https_port"] != 443) { if(Context::get("_https_port") && Context::get("_https_port") != 443) {
$url_info['port'] = $GLOBALS["_https_port"]; $url_info['port'] = Context::get("_https_port");
} }
} }
else else
{ {
if($GLOBALS["_http_port"] && $GLOBALS["_http_port"] != 80) { if(Context::get("_http_port") && Context::get("_http_port") != 80) {
$url_info['port'] = $GLOBALS["_http_port"]; $url_info['port'] = Context::get("_http_port");
} }
} }

6
common/tpl/common_layout.html
View file

@ -51,9 +51,9 @@
var current_mid = "{$mid}"; var current_mid = "{$mid}";
var waiting_message = "{$lang->msg_call_server}"; var waiting_message = "{$lang->msg_call_server}";
var ssl_actions = new Array(<!--@if(count($ssl_actions))-->"{implode('","',$ssl_actions)}"<!--@end-->); var ssl_actions = new Array(<!--@if(count($ssl_actions))-->"{implode('","',$ssl_actions)}"<!--@end-->);
<!--@if($GLOBALS["_http_port"])-->var http_port = {$GLOBALS["_http_port"]};<!--@end--> <!--@if(Context::get("_http_port"))-->var http_port = {Context::get("_http_port")};<!--@end-->
<!--@if($GLOBALS["_https_port"])-->var https_port = {$GLOBALS["_https_port"]};<!--@end--> <!--@if(Context::get("_https_port"))-->var https_port = {Context::get("_https_port")};<!--@end-->
<!--@if($GLOBALS["_use_ssl"] == "always")-->var enforce_ssl = true;<!--@end--> <!--@if(Context::get("_use_ssl") && Context::get("_use_ssl") == "always")-->var enforce_ssl = true;<!--@end-->
//]]></script> //]]></script>
{Context::getHtmlHeader()} {Context::getHtmlHeader()}

2
modules/member/member.class.php
View file

@ -17,7 +17,7 @@
$member_config = $oModuleModel->getModuleConfig('member'); $member_config = $oModuleModel->getModuleConfig('member');
// SSL 사용시 회원가입/정보/비밀번호등과 관련된 action에 대해 SSL 전송하도록 지정 // SSL 사용시 회원가입/정보/비밀번호등과 관련된 action에 대해 SSL 전송하도록 지정
if($GLOBALS['_use_ssl'] == 'optional') { if(Context::get('_use_ssl') == 'optional') {
Context::addSSLAction('dispMemberLoginForm'); Context::addSSLAction('dispMemberLoginForm');
Context::addSSLAction('dispMemberModifyPassword'); Context::addSSLAction('dispMemberModifyPassword');
Context::addSSLAction('dispMemberSignUpForm'); Context::addSSLAction('dispMemberSignUpForm');