Merge branch 'develop' into next

modules/admin/admin.class.php

@@ -185,7 +185,6 @@ class admin extends ModuleObject
 			),
 			'configuration' => array(
 				'admin.adminConfigurationGeneral',
-				'admin.adminConfigurationFtp',
 				'admin.adminMenuSetup',
 				'module.filebox',
 			),

modules/admin/lang/en.php

@@ -337,6 +337,7 @@ $lang->cmd_admin_menu_reset = 'Initialize admin menu';
 $lang->confirm_reset_admin_menu = 'Are you sure initialize the admin menu?';
 $lang->cmd_view_server_env = 'View Server Env.';
 $lang->server_env = 'Server Environment';
+$lang->ftp_deprecated = 'FTP functionality is deprecated in Rhymix.<br>If you are having difficulty installing and updating third-party software, please check your server permissions.';
 $lang->ftp_form_title = 'FTP Account Information';
 $lang->ftp = 'FTP';
 $lang->ftp_host = 'FTP hostname';

modules/admin/lang/ko.php

@@ -333,6 +333,7 @@ $lang->cmd_admin_menu_reset = '관리자 메뉴 초기화';
 $lang->confirm_reset_admin_menu = '관리자 메뉴를 초기화하시겠습니까?';
 $lang->cmd_view_server_env = '서버 환경 표시';
 $lang->server_env = '서버 환경';
+$lang->ftp_deprecated = 'FTP 기능은 Rhymix에서 삭제되었습니다.<br>자료 설치 및 업데이트가 되지 않는 경우 퍼미션 조정으로 해결하십시오.';
 $lang->ftp_form_title = 'FTP 계정 정보 입력';
 $lang->ftp = 'FTP';
 $lang->ftp_host = 'FTP 서버 주소';

modules/admin/tpl/config_ftp.html

@@ -6,6 +6,12 @@
 <div class="x_page-header">
 	<h1>{$lang->menu_gnb_sub['adminConfigurationFtp']}</h1>
 </div>
+
+<div class="message">
+	<p>{$lang->ftp_deprecated}</p>
+</div>
+
+<!--@if(FALSE)-->
 <div cond="$XE_VALIDATOR_MESSAGE && $XE_VALIDATOR_ID == 'modules/admin/tpl/config_ftp/1'" class="message {$XE_VALIDATOR_MESSAGE_TYPE}">
 	<p>{$XE_VALIDATOR_MESSAGE}</p>
 </div>
@@ -73,3 +79,4 @@
 		<input type="submit" value="{$lang->cmd_save}" class="x_btn x_btn-primary x_pull-right" />
 	</div>
 </form>
+<!--@end-->