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

Fix #747 misleading explanation in file module config

Browse source
This commit is contained in:
Kijin Sung 2017-09-13 00:25:00 +09:00
parent 54cf5bb056
commit 401d2c0179
8 changed files with 51 additions and 53 deletions
Download patch file Download diff file Expand all files Collapse all files

1
modules/admin/admin.class.php
View file

@ -188,7 +188,6 @@ class admin extends ModuleObject
'admin.adminConfigurationGeneral',
'admin.adminConfigurationFtp',
'admin.adminMenuSetup',
'file.fileUpload',
'module.filebox',
),
'advanced' => array(

15
modules/file/conf/module.xml
View file

@ -14,7 +14,7 @@
<action name="procFileGetList" type="controller" permission="root" />
<action name="dispFileAdminList" type="view" admin_index="true" menu_name="file" menu_index="true" />
<action name="dispFileAdminConfig" type="view" menu_name="fileUpload" menu_index="true" />
<action name="dispFileAdminConfig" type="view" menu_name="file" />
<action name="procFileAdminAddCart" type="controller" />
<action name="procFileAdminDeleteChecked" type="controller" ruleset="deleteChecked" />
@ -35,18 +35,5 @@
<title xml:lang="mn">File</title>
<title xml:lang="tr">File</title>
</menu>
<menu name="fileUpload">
<title xml:lang="en">File Upload</title>
<title xml:lang="ko">파일 업로드</title>
<title xml:lang="zh-CN">File Upload</title>
<title xml:lang="jp">ファイル添付</title>
<title xml:lang="es">File Upload</title>
<title xml:lang="ru">File Upload</title>
<title xml:lang="fr">File Upload</title>
<title xml:lang="zh-TW">檔案上傳</title>
<title xml:lang="vi">File Upload</title>
<title xml:lang="mn">File Upload</title>
<title xml:lang="tr">File Upload</title>
</menu>
</menus>
</module>

12
modules/file/lang/en.php
View file

@ -1,23 +1,25 @@
<?php
$lang->file = 'File';
$lang->file_management = 'File Management';
$lang->file_upload = 'File Upload';
$lang->file_upload_config = 'File Upload Settings';
$lang->file_name = 'File Name';
$lang->file_size = 'File Size';
$lang->download_count = 'Number of Downloads';
$lang->status = 'Status';
$lang->is_valid = 'Valid';
$lang->is_stand_by = 'Stand by';
$lang->file_list = 'Attachments List';
$lang->allow_outlink = 'Allow External Link?';
$lang->file_list = 'Attachment List';
$lang->allow_outlink = 'Allow External Link to Download URL';
$lang->allow_outlink_site = 'Allowed Websites';
$lang->allow_outlink_format = 'Allowed Formats';
$lang->allowed_filesize = 'Maximum File Size';
$lang->allowed_attach_size = 'Maximum Attachments';
$lang->allowed_filetypes = 'Allowed extentsions';
$lang->enable_download_group = 'Downloadable Groups';
$lang->about_allow_outlink = 'You can block external links according to referers(except media files like *.wmv and *.mp3).';
$lang->about_allow_outlink_format = 'These formats will always be allowed. Please use comma(,) for multiple input. eg)hwp,doc,zip,pdf';
$lang->about_allow_outlink_site = 'These websites will alyways be allowed. Please use new line for multiple input. ex)https://www.rhymix.org/';
$lang->about_allow_outlink = 'You can block other websites from accessing your download URLs directly.<br />This does not apply to images and other files that can be embedded directly in a document.';
$lang->about_allow_outlink_format = 'These file formats will always be allowed.<br />Please use a comma (,) to separate items: e.g. doc, zip, pdf';
$lang->about_allow_outlink_site = 'These referers will alyways be allowed.<br />Please enter one full address per line: e.g. https://www.rhymix.org/';
$lang->about_allowed_filesize = 'You can limit the size of each attached file. Administrators are exempt.';
$lang->about_allowed_attach_size = 'You can limit the total size of all attached files in one document. Administrators are exempt.';
$lang->about_allowed_size_limits = 'The file size will be limited to the value set in php.ini (%sB) in IE9 and below and older Android browsers.';

8
modules/file/lang/ja.php
View file

@ -1,6 +1,8 @@
<?php
$lang->file = 'ファイル';
$lang->file_management = 'ファイル管理';
$lang->file_upload = 'ファイル添付';
$lang->file_upload_config = 'ファイル添付の設定';
$lang->file_name = 'ファイル名';
$lang->file_size = 'ファイルサイズ';
$lang->download_count = 'ダウンロード数';
@ -15,9 +17,9 @@ $lang->allowed_filesize = 'ファイルサイズ制限';
$lang->allowed_attach_size = '書き込みへの添付制限';
$lang->allowed_filetypes = '許可ファイル拡張子';
$lang->enable_download_group = 'ダウンロード可能グループ';
$lang->about_allow_outlink = 'リファラーによって外部からのファイルリンクを制御できます。(*.wmv, *.mp3などのメディアファイルは除く)';
$lang->about_allow_outlink_format = '外部からのファイルリンク設定に関係なく、常に外部からのリンクを許可する拡張子です。複数登録時には、「半角コンマ（,）」区切りで記入してください。 eg)txt,doc,zip,pdf';
$lang->about_allow_outlink_site = '外部からのファイルリンク設定に関係なく、常に外部からのリンクを許可するURLです。複数登録時には、改行で記入してください。 ex)https://www.rhymix.org/';
$lang->about_allow_outlink = '他のサイトからファイルをダウンロードするリンクに直接アクセスすることを禁止します。<br />ダウンロードリンクを使用せずに本体に直接挿入することができる画像ファイルなどは適用されません。';
$lang->about_allow_outlink_format = '外部からのファイルリンク設定に関係なく、常に外部からのリンクを許可する拡張子です。<br />複数登録時には、「半角コンマ（,）」区切りで記入してください。 ex) doc, zip, pdf';
$lang->about_allow_outlink_site = '外部からのファイルリンク設定に関係なく、常に外部からのリンクを許可するURLです。<br />複数登録時には、改行で記入してください。 ex) https://www.rhymix.org/';
$lang->about_allowed_filesize = '一つのファイルに対して、アップロード可能なファイルの最大サイズを指定します（管理者は除く）。';
$lang->about_allowed_attach_size = '一つの書き込みに対して、管理者以外のユーザーが添付可能な最大サイズを指定します。';
$lang->about_allowed_filetypes = '"*.拡張子"で指定し、 ";"で区切って任意の拡張子を追加して指定できます。ex) *.* or *.jpg;*.gif; ';

14
modules/file/lang/ko.php
View file

@ -1,6 +1,8 @@
<?php
$lang->file = '파일';
$lang->file_management = '파일 관리';
$lang->file_upload = '파일 업로드';
$lang->file_upload_config = '파일 업로드 설정';
$lang->file_name = '파일 이름';
$lang->file_size = '파일 크기';
$lang->download_count = '다운로드 받은 수';
@ -8,16 +10,16 @@ $lang->status = '상태';
$lang->is_valid = '유효';
$lang->is_stand_by = '대기';
$lang->file_list = '첨부 파일 목록';
$lang->allow_outlink = '파일 외부 링크';
$lang->allow_outlink_site = '파일 외부 링크 허용 사이트';
$lang->allow_outlink_format = '파일 외부 링크 허용 확장자';
$lang->allow_outlink = '다운로드 링크 외부 접근 허용';
$lang->allow_outlink_site = '다운로드 링크 허용 사이트';
$lang->allow_outlink_format = '다운로드 링크 허용 확장자';
$lang->allowed_filesize = '파일 크기 제한';
$lang->allowed_attach_size = '문서 첨부 제한';
$lang->allowed_filetypes = '허용 확장자';
$lang->enable_download_group = '다운로드 가능 그룹';
$lang->about_allow_outlink = '리퍼러에 따라 파일 외부 링크를 차단할 수 있습니다.(*.wmv, *.mp3등 미디어 파일 제외)';
$lang->about_allow_outlink_format = '파일 외부 링크 설정에 상관없이 허용하는 파일 확장자입니다. 여러 개 입력 시에 쉼표(,)을 이용해서 구분해주세요. 예)hwp,doc,zip,pdf';
$lang->about_allow_outlink_site = '파일 외부 링크 설정에 상관없이 허용하는 사이트 주소입니다. 여러 개 입력 시에 줄을 바꿔서 구분해주세요. 예)https://www.rhymix.org/';
$lang->about_allow_outlink = '다른 사이트에서 파일 다운로드 링크에 직접 접근하는 것을 차단합니다.<br />다운로드 링크를 사용하지 않고 본문에 바로 삽입할 수 있는 이미지 파일 등에는 적용되지 않습니다.';
$lang->about_allow_outlink_format = '파일 외부 링크 설정에 상관없이 허용하는 파일 확장자입니다.<br />여러 개 입력시 쉼표(,)을 이용해서 구분해 주세요. 예) doc, zip, pdf';
$lang->about_allow_outlink_site = '파일 외부 링크 설정에 상관없이 허용하는 사이트 주소입니다.<br />여러 개 입력시 줄을 바꿔서 구분해 주세요. 예) https://www.rhymix.org/';
$lang->about_allowed_filesize = '각 파일의 용량을 제한할 수 있습니다. 관리자에게는 적용되지 않습니다.';
$lang->about_allowed_attach_size = '하나의 문서에 첨부할 수 있는 최대 용량을 제한할 수 있습니다. 관리자에게는 적용되지 않습니다.';
$lang->about_allowed_size_limits = 'IE9 이하, 구버전 안드로이드 등에서는 php.ini에서 지정한 %sB로 제한됩니다.';

23
modules/file/tpl/adminConfig.html
View file

@ -1,6 +1,4 @@
<div class="x_page-header">
<h1>{$lang->file_upload} <a class="x_icon-question-sign" href="./common/manual/admin/index.html#UMAN_config_fileupload" target="_blank">{$lang->help}</a></h1>
</div>
<include target="header.html" />
<div cond="$XE_VALIDATOR_MESSAGE && $XE_VALIDATOR_ID == 'modules/file/tpl/adminConfig/1'" class="message {$XE_VALIDATOR_MESSAGE_TYPE}">
<p>{$XE_VALIDATOR_MESSAGE}</p>
@ -11,43 +9,46 @@
<input type="hidden" name="act" value="procFileAdminInsertConfig" />
<input type="hidden" name="xe_validator_id" value="modules/file/tpl/adminConfig/1" />
<div class="x_control-group">
<label class="x_control-label">{$lang->allow_outlink} <a class="x_icon-question-sign" href="./common/manual/admin/index.html#UMAN_config_file_outlink" target="_blank">{$lang->help}</a></label>
<label class="x_control-label">{$lang->allow_outlink}</label>
<div class="x_controls">
<label class="x_inline"><input type="radio" name="allow_outlink" id="allow_outlink_y" value="Y" checked="checked"|cond="$config->allow_outlink == 'Y'" /> {$lang->cmd_yes}</label>
<label class="x_inline"><input type="radio" name="allow_outlink" value="N" checked="checked"|cond="$config->allow_outlink == 'N'" /> {$lang->cmd_no}</label>
<p class="x_help-block">{$lang->about_allow_outlink}</p>
</div>
</div>
<div class="x_control-group">
<label class="x_control-label" for="allow_outlink_format">{$lang->allow_outlink_format}</label>
<div class="x_controls">
<input type="text" name="allow_outlink_format" id="allow_outlink_format" value="{$config->allow_outlink_format}" />
<p class="x_help-inline">{$lang->about_allow_outlink_format}</p>
<p class="x_help-block">{$lang->about_allow_outlink_format}</p>
</div>
</div>
<div class="x_control-group">
<label class="x_control-label" for="allow_outlink_site">{$lang->allow_outlink_site}</label>
<div class="x_controls">
<textarea name="allow_outlink_site" id="allow_outlink_site" rows="4" cols="42" style="float:left;margin-right:10px">{$config->allow_outlink_site}</textarea>
<textarea name="allow_outlink_site" id="allow_outlink_site" rows="4" cols="42">{$config->allow_outlink_site}</textarea>
<p class="x_help-block">{$lang->about_allow_outlink_site}</p>
</div>
</div>
<div class="x_control-group">
<label for="filesize" class="x_control-label">{$lang->allowed_filesize} <a class="x_icon-question-sign" href="./common/manual/admin/index.html#UMAN_config_file_size" target="_blank">{$lang->help}</a></label>
<label for="allowed_filesize" class="x_control-label">{$lang->allowed_filesize}</label>
<div class="x_controls">
<input type="number" step="any" id="filesize" name="allowed_filesize" value="{$config->allowed_filesize}" /> MB / {$upload_max_filesize}
<input type="number" min="0" name="allowed_filesize" id="allowed_filesize" value="{$config->allowed_filesize}" size="7" style="min-width:80px" /> MB
<p class="x_help-block">{$lang->about_allowed_filesize}<br />{sprintf($lang->about_allowed_size_limits, ini_get('upload_max_filesize'))}</p>
</div>
</div>
<div class="x_control-group">
<label for="attachSize" class="x_control-label">{$lang->allowed_attach_size} <a class="x_icon-question-sign" href="./common/manual/admin/index.html#UMAN_config_file_document_attach_limit" target="_blank">{$lang->help}</a></label>
<label for="allowed_attach_size" class="x_control-label">{$lang->allowed_attach_size}</label>
<div class="x_controls">
<input type="number" step="any" id="attachSize" name="allowed_attach_size" value="{$config->allowed_attach_size}" /> MB
<input type="number" min="0" name="allowed_attach_size" id="allowed_attach_size" value="{$config->allowed_attach_size}" size="7" style="min-width:80px" /> MB
<p class="x_help-block">{$lang->about_allowed_attach_size}<br />{sprintf($lang->about_allowed_size_limits, ini_get('upload_max_filesize'))}</p>
</div>
</div>
<div class="x_control-group">
<label for="allowedFiletypes" class="x_control-label">{$lang->allowed_filetypes}</label>
<div class="x_controls">
<input id="allowedFiletypes" type="text" name="allowed_filetypes" value="{$config->allowed_filetypes}" />
<p class="x_help-inline">{$lang->about_allowed_filetypes}</p>
<p class="x_help-block">{$lang->about_allowed_filetypes}</p>
</div>
</div>
<div class="x_clearfix btnArea">

13
modules/file/tpl/file_list.html
View file

@ -1,16 +1,15 @@
<include target="header.html" />
<div cond="$XE_VALIDATOR_MESSAGE && $XE_VALIDATOR_ID == 'modules/file/tpl/file_list/1'" class="message {$XE_VALIDATOR_MESSAGE_TYPE}">
<p>{$XE_VALIDATOR_MESSAGE}</p>
</div>
<script>
xe.lang.msg_empty_search_target = '{$lang->msg_empty_search_target}';
xe.lang.msg_empty_search_keyword = '{$lang->msg_empty_search_keyword}';
</script>
<load target="js/file_admin.js" />
<form id="fo_list" action="./" method="post">
<input type="hidden" name="module" value="file" />
<div class="x_page-header">
<h1>{$lang->file} <a class="x_icon-question-sign" href="./common/manual/admin/index.html#UMAN_content_file" target="_blank">{$lang->help}</a></h1>
</div>
<div cond="$XE_VALIDATOR_MESSAGE && $XE_VALIDATOR_ID == 'modules/file/tpl/file_list/1'" class="message {$XE_VALIDATOR_MESSAGE_TYPE}">
<p>{$XE_VALIDATOR_MESSAGE}</p>
</div>
<table id="fileListTable" class="x_table x_table-striped x_table-hover">
<caption>
<a href="{getUrl('', 'module', 'admin', 'act', 'dispFileAdminList')}" class="active"|cond="!$isvalid">{$lang->all}<block cond="!$isvalid">({number_format($total_count)})</block></a>

18
modules/file/tpl/header.html
View file

@ -1,7 +1,13 @@
<load target="js/file_admin.js" />
<h2 class="h2">{$lang->file} {$lang->cmd_management}</h2>
<p>
<a href="{getUrl('act','dispFileAdminList')}" class="active"|cond="$act=='dispFileAdminList'">{$lang->file_list}</a>
<i>|</i>
<a href="{getUrl('act','dispFileAdminConfig')}" class="active"|cond="$act=='dispFileAdminConfig'">{$lang->cmd_module_config}</a>
</p>
<div class="x_page-header">
<h1>{$lang->file_management}</h1>
</div>
<ul class="x_nav x_nav-tabs">
<li class="x_active"|cond="$act == 'dispFileAdminList'">
<a href="{getUrl('', 'module', 'admin', 'act', 'dispFileAdminList')}">{$lang->file_list}</a>
</li>
<li class="x_active"|cond="$act == 'dispFileAdminConfig'">
<a href="{getUrl('', 'module', 'admin', 'act', 'dispFileAdminConfig')}">{$lang->file_upload_config}</a>
</li>
</ul>