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

Improve default domain handling

Browse source
This commit is contained in:
Kijin Sung 2017-03-13 00:00:17 +09:00
parent d5959a91bb
commit 393a90c022
2 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

3
modules/admin/admin.admin.controller.php
View file

@ -1087,6 +1087,7 @@ class adminAdminController extends admin
$args = new stdClass(); $args = new stdClass();
$args->domain_srl = $domain_info->domain_srl; $args->domain_srl = $domain_info->domain_srl;
$args->domain = $vars->domain; $args->domain = $vars->domain;
$args->is_default_domain = 'N';
$args->index_module_srl = $vars->index_module_srl; $args->index_module_srl = $vars->index_module_srl;
$args->index_document_srl = $vars->index_document_srl; $args->index_document_srl = $vars->index_document_srl;
$args->http_port = $vars->http_port; $args->http_port = $vars->http_port;
@ -1115,7 +1116,7 @@ class adminAdminController extends admin
} }
// Update system configuration to match the default domain. // Update system configuration to match the default domain.
if ($domain_info && $domain_srl === '0') if ($domain_info && $domain_info->is_default_domain === 'Y')
{ {
$domain_info->domain = $vars->domain; $domain_info->domain = $vars->domain;
$domain_info->http_port = $vars->http_port; $domain_info->http_port = $vars->http_port;

3
modules/admin/admin.admin.view.php
View file

@ -557,6 +557,7 @@ class adminAdminView extends admin
// Other settings // Other settings
Context::set('use_rewrite', Rhymix\Framework\Config::get('use_rewrite')); Context::set('use_rewrite', Rhymix\Framework\Config::get('use_rewrite'));
Context::set('use_sso', Rhymix\Framework\Config::get('use_sso')); Context::set('use_sso', Rhymix\Framework\Config::get('use_sso'));
Context::set('use_ssl', Rhymix\Framework\Config::get('url.ssl'));
Context::set('delay_session', Rhymix\Framework\Config::get('session.delay')); Context::set('delay_session', Rhymix\Framework\Config::get('session.delay'));
Context::set('use_session_keys', Rhymix\Framework\Config::get('session.use_keys')); Context::set('use_session_keys', Rhymix\Framework\Config::get('session.use_keys'));
Context::set('use_session_ssl', Rhymix\Framework\Config::get('session.use_ssl')); Context::set('use_session_ssl', Rhymix\Framework\Config::get('session.use_ssl'));
@ -705,7 +706,7 @@ class adminAdminView extends admin
} }
else else
{ {
$index_module_srl = 0; $index_module_srl = '';
} }
Context::set('module_list', $module_list); Context::set('module_list', $module_list);
Context::set('index_module_srl', $index_module_srl); Context::set('index_module_srl', $index_module_srl);