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

Merge branch 'next' into next-push

Browse source
This commit is contained in:
Kijin Sung 2020-06-22 16:46:38 +09:00 • committed by GitHub
commit b986f826ba
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
41 changed files with 1860 additions and 931 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -847,7 +847,8 @@ class adminAdminController extends admin
Rhymix\Framework\Config::set('locale.default_timezone', $vars->default_timezone);
// Other settings
Rhymix\Framework\Config::set('use_rewrite', $vars->use_rewrite === 'Y');
Rhymix\Framework\Config::set('url.rewrite', intval($vars->use_rewrite));
Rhymix\Framework\Config::set('use_rewrite', $vars->use_rewrite > 0);
Rhymix\Framework\Config::set('session.delay', $vars->delay_session === 'Y');
Rhymix\Framework\Config::set('session.use_db', $vars->use_db_session === 'Y');
Rhymix\Framework\Config::set('view.manager_layout', $vars->manager_layout ?: 'module');

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

@ -312,7 +312,26 @@ class adminAdminView extends admin
{
$needUpdate = FALSE;
$addTables = FALSE;
foreach($module_list AS $key => $value)
$priority = array(
'module' => 1000000,
'member' => 100000,
'document' => 10000,
'comment' => 1000,
'file' => 100,
);
usort($module_list, function($a, $b) use($priority) {
$a_priority = isset($priority[$a->module]) ? $priority[$a->module] : 0;
$b_priority = isset($priority[$b->module]) ? $priority[$b->module] : 0;
if ($a_priority == 0 && $b_priority == 0)
{
return strcmp($a->module, $b->module);
}
else
{
return $b_priority - $a_priority;
}
});
foreach($module_list as $value)
{
if($value->need_install)
{
@ -556,7 +575,7 @@ class adminAdminView extends admin
Context::set('selected_timezone', Rhymix\Framework\Config::get('locale.default_timezone'));
// Other settings
Context::set('use_rewrite', Rhymix\Framework\Config::get('use_rewrite'));
Context::set('use_rewrite', Rhymix\Framework\Router::getRewriteLevel());
Context::set('use_mobile_view', (config('mobile.enabled') !== null ? config('mobile.enabled') : config('use_mobile_view')) ? true : false);
Context::set('tablets_as_mobile', config('mobile.tablets') ? true : false);
Context::set('mobile_viewport', config('mobile.viewport') ?: 'width=device-width, initial-scale=1.0, user-scalable=yes');

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

@ -264,7 +264,11 @@ $lang->trash = 'Recycle Bin';
$lang->accusation = 'Report';
$lang->status = 'Status';
$lang->action = 'Execute';
$lang->use_rewrite = 'Use Rewrite Mode';
$lang->use_rewrite = 'Use Short URLs';
$lang->use_rewrite_0 = 'None';
$lang->use_rewrite_1 = 'XE-compatible URLs only';
$lang->use_rewrite_2 = 'All supported URLs';
$lang->about_use_rewrite = 'Your web server must support mod_rewrite in order for short URLs to work. Apache usually detects the .htaccess file automatically.<br />nginx users should configure rewrite rules according to <a href="https://github.com/rhymix/rhymix-docs/blob/master/ko/introduction/nginx.md> target="_blank">the manual</a>. Outdated versions of nginx rewrite rules only support XE-compatible short URLs.';
$lang->timezone = 'Time Zone';
$lang->use_mobile_view = 'Enable Mobile View';
$lang->about_use_mobile_view = 'Show mobile page when visitors access with mobile devices.';

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

@ -261,6 +261,10 @@ $lang->accusation = '신고';
$lang->status = '상태';
$lang->action = '실행';
$lang->use_rewrite = '짧은 주소 사용';
$lang->use_rewrite_0 = '사용하지 않음';
$lang->use_rewrite_1 = 'XE와 호환되는 주소 형태만 사용';
$lang->use_rewrite_2 = '모든 주소 형태를 사용';
$lang->about_use_rewrite = '짧은 주소를 사용하려면 웹서버에서 rewrite 기능을 지원해야 합니다. 아파치의 경우 .htaccess 파일이 있으면 대부분 자동으로 인식합니다.<br />nginx 사용시 <a href="https://github.com/rhymix/rhymix-docs/blob/master/ko/introduction/nginx.md> target="_blank">매뉴얼</a>을 참고하여 직접 설정하셔야 합니다. 구 버전의 nginx 설정은 XE와 호환되는 주소만 지원하니 주의하십시오.';
$lang->timezone = '표준 시간대';
$lang->use_mobile_view = '모바일 뷰 사용';
$lang->about_use_mobile_view = '모바일 기기로 접속시 모바일 페이지를 보여줍니다.';

6
modules/admin/tpl/config_advanced.html
View file

@ -13,8 +13,10 @@
<div class="x_control-group">
<label class="x_control-label">{$lang->use_rewrite}</label>
<div class="x_controls">
<label for="use_rewrite_y" class="x_inline"><input type="radio" name="use_rewrite" id="use_rewrite_y" value="Y" checked="checked"|cond="$use_rewrite" /> {$lang->cmd_yes}</label>
<label for="use_rewrite_n" class="x_inline"><input type="radio" name="use_rewrite" id="use_rewrite_n" value="N" checked="checked"|cond="!$use_rewrite" /> {$lang->cmd_no}</label>
<label for="use_rewrite_0" class="x_inline"><input type="radio" name="use_rewrite" id="use_rewrite_0" value="0" checked="checked"|cond="$use_rewrite == 0" /> {$lang->use_rewrite_0}</label>
<label for="use_rewrite_1" class="x_inline"><input type="radio" name="use_rewrite" id="use_rewrite_1" value="1" checked="checked"|cond="$use_rewrite == 1" /> {$lang->use_rewrite_1}</label>
<label for="use_rewrite_2" class="x_inline"><input type="radio" name="use_rewrite" id="use_rewrite_2" value="2" checked="checked"|cond="$use_rewrite == 2" /> {$lang->use_rewrite_2}</label>
<p class="x_help-block">{$lang->about_use_rewrite}</p>
</div>
</div>
<div class="x_control-group">