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

Remove unnecessary conversion of ftp.config.php

Browse source 
https://xetown.com/questions/1819188
This commit is contained in:
Kijin Sung 2024-04-12 00:07:57 +09:00
parent ab5a2c4f5f
commit 267aa9c397
2 changed files with 6 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

11
common/defaults/plugins.php
View file

@ -2,11 +2,11 @@
/** /**
* Rhymix Default Plugins * Rhymix Default Plugins
* *
* Copyright (c) Rhymix Developers and Contributors * Copyright (c) Rhymix Developers and Contributors
*/ */
return array( return array(
// Addons // Addons
'addon' => array( 'addon' => array(
'adminlogging' => true, 'adminlogging' => true,
@ -16,7 +16,7 @@ return array(
'photoswipe' => true, 'photoswipe' => true,
'point_level_icon' => true, 'point_level_icon' => true,
), ),
// Layouts // Layouts
'layout' => array( 'layout' => array(
'colorCode' => true, 'colorCode' => true,
@ -25,7 +25,7 @@ return array(
'user_layout' => true, 'user_layout' => true,
'xedition' => true, 'xedition' => true,
), ),
// Modules // Modules
'module' => array( 'module' => array(
'addon' => true, 'addon' => true,
@ -39,6 +39,7 @@ return array(
'counter' => true, 'counter' => true,
'document' => true, 'document' => true,
'editor' => true, 'editor' => true,
'extravar' => true,
'file' => true, 'file' => true,
'importer' => true, 'importer' => true,
'install' => true, 'install' => true,
@ -60,7 +61,7 @@ return array(
'trash' => true, 'trash' => true,
'widget' => true, 'widget' => true,
), ),
// Widgets // Widgets
'widget' => array( 'widget' => array(
'content' => true, 'content' => true,

19
common/framework/parsers/ConfigParser.php
View file

@ -31,14 +31,6 @@ class ConfigParser
return array(); 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. // Load selected language file.
if (file_exists(\RX_BASEDIR . Config::OLD_LANG_CONFIG_PATH)) 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(); $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. // Create new crypto keys.
$config['crypto']['encryption_key'] = Security::getRandom(64, 'alnum'); $config['crypto']['encryption_key'] = Security::getRandom(64, 'alnum');
$config['crypto']['authentication_key'] = $db_info->secret_key ?: Security::getRandom(64, 'alnum'); $config['crypto']['authentication_key'] = $db_info->secret_key ?: Security::getRandom(64, 'alnum');