diff --git a/modules/admin/admin.admin.controller.php b/modules/admin/admin.admin.controller.php index cbaa546db..6506ae67f 100644 --- a/modules/admin/admin.admin.controller.php +++ b/modules/admin/admin.admin.controller.php @@ -1007,6 +1007,10 @@ class adminAdminController extends admin { return new Object(-1, 'msg_invalid_index_document_srl'); } + if (intval($oDocument->get('module_srl')) !== intval($vars->index_module_srl)) + { + return new Object(-1, 'msg_invalid_index_document_srl_module_srl'); + } } else { diff --git a/modules/admin/lang/en.php b/modules/admin/lang/en.php index c6a8a6ef3..ae343c9fd 100644 --- a/modules/admin/lang/en.php +++ b/modules/admin/lang/en.php @@ -129,6 +129,7 @@ $lang->msg_invalid_http_port = 'Invalid HTTP port.'; $lang->msg_invalid_https_port = 'Invalid HTTPS port.'; $lang->msg_invalid_index_module_srl = 'The main module does not exist.'; $lang->msg_invalid_index_document_srl = 'The main document number does not exist.'; +$lang->msg_invalid_index_document_srl_module_srl = 'The main module does not match the main document number.'; $lang->msg_lang_is_not_enabled = 'The language you selected is not enabled in this site.'; $lang->msg_invalid_timezone = 'The selected time zone is not usable on this server.'; $lang->use_db_session = 'Store Session in DB'; diff --git a/modules/admin/lang/ko.php b/modules/admin/lang/ko.php index a02342c28..2b98c228c 100644 --- a/modules/admin/lang/ko.php +++ b/modules/admin/lang/ko.php @@ -128,6 +128,7 @@ $lang->msg_invalid_http_port = '올바르지 않은 HTTP 포트입니다.'; $lang->msg_invalid_https_port = '올바르지 않은 HTTPS 포트입니다.'; $lang->msg_invalid_index_module_srl = '선택하신 메인 모듈이 존재하지 않습니다.'; $lang->msg_invalid_index_document_srl = '선택하신 메인 문서 번호가 존재하지 않습니다.'; +$lang->msg_invalid_index_document_srl_module_srl = '선택하신 메인 모듈과 메인 문서 번호가 일치하지 않습니다.'; $lang->msg_lang_is_not_enabled = '선택하신 언어가 활성화되어 있지 않습니다.'; $lang->msg_invalid_timezone = '사용할 수 없는 표준 시간대입니다.'; $lang->use_db_session = '인증 세션 DB 사용'; diff --git a/modules/admin/tpl/config_domains.html b/modules/admin/tpl/config_domains.html index ea85b6dba..f4a792a0d 100644 --- a/modules/admin/tpl/config_domains.html +++ b/modules/admin/tpl/config_domains.html @@ -7,32 +7,31 @@ + - - - + - - - + -
{$lang->site_title} {$lang->domain}{$lang->cmd_http_port}{$lang->cmd_https_port} {$lang->use_ssl} {$lang->cmd_index_module_srl} {$lang->cmd_index_document_srl}{$lang->cmd_default_language} {$lang->cmd_modify} / {$lang->cmd_delete}
+ {$domain->settings->title} + {$lang->cmd_is_default_domain} + {$domain->domain}{$domain->http_port ?: ''}{$domain->https_port ?: ''}{$lang->ssl_options[$domain->security ?: 'none']}{preg_replace('/\\(.+$/', '', $lang->ssl_options[$domain->security ?: 'none'])} {($domain->index_module_srl && $module_list[$domain->index_module_srl]) ? $module_list[$domain->index_module_srl]->browser_title : ''} - + {$domain->index_document_srl ?: ''} {$domain->settings->language ? $supported_lang[$domain->settings->language]['name'] : $supported_lang[config('locale.default_lang')]['name']} {$lang->cmd_modify} / diff --git a/modules/module/queries/updateDefaultDomain.xml b/modules/module/queries/updateDefaultDomain.xml new file mode 100644 index 000000000..0b814dee1 --- /dev/null +++ b/modules/module/queries/updateDefaultDomain.xml @@ -0,0 +1,12 @@ + + + + + + + + + + + + \ No newline at end of file