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

Move remaining non-composer classes to common/libraries

Browse source
This commit is contained in:
Kijin Sung 2016-01-13 16:22:07 +09:00
parent 97d385648b
commit 971a3bd115
9 changed files with 2 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

1
classes/file/FileHandler.class.php
View file

@ -315,7 +315,6 @@ class FileHandler
return; return;
} }
require_once(_XE_PATH_ . 'libs/ftp.class.php');
$oFtp = new ftp(); $oFtp = new ftp();
if(!$ftp_info->ftp_host) if(!$ftp_info->ftp_host)
{ {

0
libs/ftp.class.php → common/libraries/ftp.php
View file

0
libs/tar.class.php → common/libraries/tar.php
View file

2
config/config.inc.php
View file

@ -398,6 +398,8 @@ $GLOBALS['__xe_autoload_file_map'] = array_change_key_case(array(
'HintTableTag' => 'classes/xml/xmlquery/tags/table/HintTableTag.class.php', 'HintTableTag' => 'classes/xml/xmlquery/tags/table/HintTableTag.class.php',
'TableTag' => 'classes/xml/xmlquery/tags/table/TableTag.class.php', 'TableTag' => 'classes/xml/xmlquery/tags/table/TableTag.class.php',
'TablesTag' => 'classes/xml/xmlquery/tags/table/TablesTag.class.php', 'TablesTag' => 'classes/xml/xmlquery/tags/table/TablesTag.class.php',
'Ftp' => 'common/libraries/ftp.php',
'Tar' => 'common/libraries/tar.php',
), CASE_LOWER); ), CASE_LOWER);
function __xe_autoload($class_name) function __xe_autoload($class_name)

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

@ -177,7 +177,6 @@ class adminAdminModel extends admin
{ {
Context::loadLang(_XE_PATH_ . 'modules/autoinstall/lang'); Context::loadLang(_XE_PATH_ . 'modules/autoinstall/lang');
@set_time_limit(5); @set_time_limit(5);
require_once(_XE_PATH_ . 'libs/ftp.class.php');
$ftp_info = Context::getRequestVars(); $ftp_info = Context::getRequestVars();
@ -323,8 +322,6 @@ class adminAdminModel extends admin
Context::loadLang(_XE_PATH_ . 'modules/autoinstall/lang'); Context::loadLang(_XE_PATH_ . 'modules/autoinstall/lang');
@set_time_limit(5); @set_time_limit(5);
require_once(_XE_PATH_ . 'libs/ftp.class.php');
$ftp_info = Context::getRequestVars(); $ftp_info = Context::getRequestVars();
if(!$ftp_info->ftp_user || !$ftp_info->ftp_password) if(!$ftp_info->ftp_user || !$ftp_info->ftp_password)
{ {

4
modules/autoinstall/autoinstall.lib.php
View file

@ -1,8 +1,6 @@
<?php <?php
/* Copyright (C) NAVER <http://www.navercorp.com> */ /* Copyright (C) NAVER <http://www.navercorp.com> */
require_once(_XE_PATH_ . 'libs/ftp.class.php');
/** /**
* Module installer * Module installer
* @author NAVER (developers@xpressengine.com) * @author NAVER (developers@xpressengine.com)
@ -253,8 +251,6 @@ class ModuleInstaller
*/ */
function _unPack() function _unPack()
{ {
require_once(_XE_PATH_ . 'libs/tar.class.php');
$oTar = new tar(); $oTar = new tar();
$oTar->openTAR($this->download_file); $oTar->openTAR($this->download_file);

2
modules/install/install.controller.php
View file

@ -233,7 +233,6 @@ class installController extends install
{ {
if(!$ftp_info->ftp_user || !$ftp_info->ftp_password) return new Object(-1,'msg_safe_mode_ftp_needed'); if(!$ftp_info->ftp_user || !$ftp_info->ftp_password) return new Object(-1,'msg_safe_mode_ftp_needed');
require_once(_XE_PATH_.'libs/ftp.class.php');
$oFtp = new ftp(); $oFtp = new ftp();
if(!$oFtp->ftp_connect($ftp_info->ftp_host, $ftp_info->ftp_port)) return new Object(-1, sprintf(Context::getLang('msg_ftp_not_connected'), $ftp_info->ftp_host)); if(!$oFtp->ftp_connect($ftp_info->ftp_host, $ftp_info->ftp_port)) return new Object(-1, sprintf(Context::getLang('msg_ftp_not_connected'), $ftp_info->ftp_host));
@ -292,7 +291,6 @@ class installController extends install
} }
else else
{ {
require_once(_XE_PATH_.'libs/ftp.class.php');
$oFtp = new ftp(); $oFtp = new ftp();
if(!$oFtp->ftp_connect('127.0.0.1', $ftp_info->ftp_port)) return new Object(-1, sprintf(Context::getLang('msg_ftp_not_connected'), 'localhost')); if(!$oFtp->ftp_connect('127.0.0.1', $ftp_info->ftp_port)) return new Object(-1, sprintf(Context::getLang('msg_ftp_not_connected'), 'localhost'));

1
modules/install/install.model.php
View file

@ -71,7 +71,6 @@ class installModel extends install
} }
else else
{ {
require_once(_XE_PATH_.'libs/ftp.class.php');
$oFtp = new ftp(); $oFtp = new ftp();
if($oFtp->ftp_connect($ftp_info->ftp_host, $ftp_info->ftp_port)) if($oFtp->ftp_connect($ftp_info->ftp_host, $ftp_info->ftp_port))
{ {

2
modules/layout/layout.admin.controller.php
View file

@ -593,7 +593,6 @@ class layoutAdminController extends layout
$layout_srl = Context::get('layout_srl'); $layout_srl = Context::get('layout_srl');
if(!$layout_srl) return new Object('-1','msg_invalid_request'); if(!$layout_srl) return new Object('-1','msg_invalid_request');
require_once(_XE_PATH_.'libs/tar.class.php');
$oLayoutModel = getModel('layout'); $oLayoutModel = getModel('layout');
// Copy files to temp path // Copy files to temp path
@ -898,7 +897,6 @@ class layoutAdminController extends layout
FileHandler::removeFile($user_layout_path . $file); FileHandler::removeFile($user_layout_path . $file);
} }
require_once(_XE_PATH_.'libs/tar.class.php');
$image_path = $oLayoutModel->getUserLayoutImagePath($layout_srl); $image_path = $oLayoutModel->getUserLayoutImagePath($layout_srl);
FileHandler::makeDir($image_path); FileHandler::makeDir($image_path);
$tar = new tar(); $tar = new tar();