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

Miscellaneous fixes

Browse source
This commit is contained in:
Kijin Sung 2017-03-13 13:18:55 +09:00
parent 9cea950922
commit eec75ba372
5 changed files with 25 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -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
{

1
modules/admin/lang/en.php
View file

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

1
modules/admin/lang/ko.php
View file

@ -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 사용';

15
modules/admin/tpl/config_domains.html
View file

@ -7,32 +7,31 @@
<table id="domain_list" class="x_table x_table-striped x_table-hover">
<thead>
<tr>
<th scope="col" class="nowr">{$lang->site_title}</th>
<th scope="col" class="nowr">{$lang->domain}</th>
<th scope="col" class="nowr">{$lang->cmd_http_port}</th>
<th scope="col" class="nowr">{$lang->cmd_https_port}</th>
<th scope="col" class="nowr">{$lang->use_ssl}</th>
<th scope="col" class="nowr">{$lang->cmd_index_module_srl}</th>
<th scope="col" class="nowr">{$lang->cmd_index_document_srl}</th>
<th scope="col" class="nowr">{$lang->cmd_default_language}</th>
<th scope="col" class="nowr">{$lang->cmd_modify} / {$lang->cmd_delete}</th>
</tr>
</thead>
<tbody>
<tr loop="$domain_list->data => $domain">
<td class="nowr">
{$domain->settings->title}
<i cond="$domain->is_default_domain === 'Y'" class="x_icon-home" title="{$lang->cmd_is_default_domain}">{$lang->cmd_is_default_domain}</i>
</td>
<td class="nowr">{$domain->domain}</td>
<td class="nowr">{$domain->http_port ?: ''}</td>
<td class="nowr">{$domain->https_port ?: ''}</td>
<td class="nowr">{$lang->ssl_options[$domain->security ?: 'none']}</td>
<td class="nowr">{preg_replace('/\\(.+$/', '', $lang->ssl_options[$domain->security ?: 'none'])}</td>
<td class="nowr">
<a href="{getSiteUrl($domain->domain, '', 'mid', $module_list[$domain->index_module_srl]->mid)}" cond="$domain->index_module_srl && $module_list[$domain->index_module_srl]" target="_blank">
{($domain->index_module_srl && $module_list[$domain->index_module_srl]) ? $module_list[$domain->index_module_srl]->browser_title : ''}</td>
</a>
<td class="nowr">
<a href="{getSiteUrl($domain->domain, '', 'document_srl', $domain->index_document_srl)}" cond="$domain->index_document_srl" target="_blank">
<a href="{getSiteUrl($domain->domain, '', 'mid', $module_list[$domain->index_module_srl]->mid, 'document_srl', $domain->index_document_srl)}" cond="$domain->index_document_srl" target="_blank">
{$domain->index_document_srl ?: ''}
</a>
</td>
<td class="nowr">{$domain->settings->language ? $supported_lang[$domain->settings->language]['name'] : $supported_lang[config('locale.default_lang')]['name']}</td>
<td class="nowr">
<a href="{getUrl('', 'module', 'admin', 'act', 'dispAdminInsertDomain', 'domain_srl', $domain->domain_srl)}">{$lang->cmd_modify}</a>
/

12
modules/module/queries/updateDefaultDomain.xml Normal file
View file

@ -0,0 +1,12 @@
<query id="updateDefaultDomain" action="update">
<tables>
<table name="domains" />
</tables>
<columns>
<column name="is_default_domain" var="is_default_domain" notnull="notnull" default="N" />
</columns>
<conditions>
<condition operation="equal" column="domain_srl" var="domain_srl" filter="number" />
<condition operation="notequal" column="domain_srl" var="not_domain_srl" filter="number" pipe="and" />
</conditions>
</query>