From 267aa9c397c0cdd874804b3374d9458ca9645c0c Mon Sep 17 00:00:00 2001
From: Kijin Sung <kijin@kijinsung.com>
Date: Fri, 12 Apr 2024 00:07:57 +0900
Subject: [PATCH] Remove unnecessary conversion of ftp.config.php

https://xetown.com/questions/1819188
---
 common/defaults/plugins.php               | 11 ++++++-----
 common/framework/parsers/ConfigParser.php | 19 -------------------
 2 files changed, 6 insertions(+), 24 deletions(-)

diff --git a/common/defaults/plugins.php b/common/defaults/plugins.php
index 53ea36d9f..afd87f266 100644
--- a/common/defaults/plugins.php
+++ b/common/defaults/plugins.php
@@ -2,11 +2,11 @@
 
 /**
  * Rhymix Default Plugins
- * 
+ *
  * Copyright (c) Rhymix Developers and Contributors
  */
 return array(
-	
+
 	// Addons
 	'addon' => array(
 		'adminlogging' => true,
@@ -16,7 +16,7 @@ return array(
 		'photoswipe' => true,
 		'point_level_icon' => true,
 	),
-	
+
 	// Layouts
 	'layout' => array(
 		'colorCode' => true,
@@ -25,7 +25,7 @@ return array(
 		'user_layout' => true,
 		'xedition' => true,
 	),
-	
+
 	// Modules
 	'module' => array(
 		'addon' => true,
@@ -39,6 +39,7 @@ return array(
 		'counter' => true,
 		'document' => true,
 		'editor' => true,
+		'extravar' => true,
 		'file' => true,
 		'importer' => true,
 		'install' => true,
@@ -60,7 +61,7 @@ return array(
 		'trash' => true,
 		'widget' => true,
 	),
-	
+
 	// Widgets
 	'widget' => array(
 		'content' => true,
diff --git a/common/framework/parsers/ConfigParser.php b/common/framework/parsers/ConfigParser.php
index ecbe7ac93..448cd10dc 100644
--- a/common/framework/parsers/ConfigParser.php
+++ b/common/framework/parsers/ConfigParser.php
@@ -31,14 +31,6 @@ class ConfigParser
 			return array();
 		}
 
-		// Load FTP info file.
-		if (file_exists(\RX_BASEDIR . Config::OLD_FTP_CONFIG_PATH))
-		{
-			ob_start();
-			include \RX_BASEDIR . Config::OLD_FTP_CONFIG_PATH;
-			ob_end_clean();
-		}
-
 		// Load selected language file.
 		if (file_exists(\RX_BASEDIR . Config::OLD_LANG_CONFIG_PATH))
 		{
@@ -151,17 +143,6 @@ class ConfigParser
 			$config['cache']['servers'] = in_array($config['cache']['type'], array('memcached', 'redis')) ? $db_info->use_object_cache : array();
 		}
 
-		// Convert FTP configuration.
-		if (isset($ftp_info))
-		{
-			$config['ftp']['host'] = $ftp_info->ftp_host;
-			$config['ftp']['port'] = $ftp_info->ftp_port;
-			$config['ftp']['path'] = $ftp_info->ftp_root_path;
-			$config['ftp']['user'] = $ftp_info->ftp_user;
-			$config['ftp']['pasv'] = $ftp_info->ftp_pasv;
-			$config['ftp']['sftp'] = $ftp_info->sftp === 'Y' ? true : false;
-		}
-
 		// Create new crypto keys.
 		$config['crypto']['encryption_key'] = Security::getRandom(64, 'alnum');
 		$config['crypto']['authentication_key'] = $db_info->secret_key ?: Security::getRandom(64, 'alnum');