diff --git a/classes/file/FileHandler.class.php b/classes/file/FileHandler.class.php index 9bafafd0c..50faa695c 100644 --- a/classes/file/FileHandler.class.php +++ b/classes/file/FileHandler.class.php @@ -315,7 +315,6 @@ class FileHandler return; } - require_once(_XE_PATH_ . 'libs/ftp.class.php'); $oFtp = new ftp(); if(!$ftp_info->ftp_host) { diff --git a/libs/ftp.class.php b/common/libraries/ftp.php similarity index 100% rename from libs/ftp.class.php rename to common/libraries/ftp.php diff --git a/libs/tar.class.php b/common/libraries/tar.php similarity index 100% rename from libs/tar.class.php rename to common/libraries/tar.php diff --git a/config/config.inc.php b/config/config.inc.php index 92f4fa8af..db7106ba9 100644 --- a/config/config.inc.php +++ b/config/config.inc.php @@ -398,6 +398,8 @@ $GLOBALS['__xe_autoload_file_map'] = array_change_key_case(array( 'HintTableTag' => 'classes/xml/xmlquery/tags/table/HintTableTag.class.php', 'TableTag' => 'classes/xml/xmlquery/tags/table/TableTag.class.php', 'TablesTag' => 'classes/xml/xmlquery/tags/table/TablesTag.class.php', + 'Ftp' => 'common/libraries/ftp.php', + 'Tar' => 'common/libraries/tar.php', ), CASE_LOWER); function __xe_autoload($class_name) diff --git a/modules/admin/admin.admin.model.php b/modules/admin/admin.admin.model.php index e1e613ed5..10cffb366 100644 --- a/modules/admin/admin.admin.model.php +++ b/modules/admin/admin.admin.model.php @@ -177,7 +177,6 @@ class adminAdminModel extends admin { Context::loadLang(_XE_PATH_ . 'modules/autoinstall/lang'); @set_time_limit(5); - require_once(_XE_PATH_ . 'libs/ftp.class.php'); $ftp_info = Context::getRequestVars(); @@ -323,8 +322,6 @@ class adminAdminModel extends admin Context::loadLang(_XE_PATH_ . 'modules/autoinstall/lang'); @set_time_limit(5); - require_once(_XE_PATH_ . 'libs/ftp.class.php'); - $ftp_info = Context::getRequestVars(); if(!$ftp_info->ftp_user || !$ftp_info->ftp_password) { diff --git a/modules/autoinstall/autoinstall.lib.php b/modules/autoinstall/autoinstall.lib.php index b94fc796e..d168f35ce 100644 --- a/modules/autoinstall/autoinstall.lib.php +++ b/modules/autoinstall/autoinstall.lib.php @@ -1,8 +1,6 @@ */ -require_once(_XE_PATH_ . 'libs/ftp.class.php'); - /** * Module installer * @author NAVER (developers@xpressengine.com) @@ -253,8 +251,6 @@ class ModuleInstaller */ function _unPack() { - require_once(_XE_PATH_ . 'libs/tar.class.php'); - $oTar = new tar(); $oTar->openTAR($this->download_file); diff --git a/modules/install/install.controller.php b/modules/install/install.controller.php index 74e54205b..a24fcfaa5 100644 --- a/modules/install/install.controller.php +++ b/modules/install/install.controller.php @@ -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'); - require_once(_XE_PATH_.'libs/ftp.class.php'); $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)); @@ -292,7 +291,6 @@ class installController extends install } else { - require_once(_XE_PATH_.'libs/ftp.class.php'); $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')); diff --git a/modules/install/install.model.php b/modules/install/install.model.php index 0e2da7183..f4b854a50 100644 --- a/modules/install/install.model.php +++ b/modules/install/install.model.php @@ -71,7 +71,6 @@ class installModel extends install } else { - require_once(_XE_PATH_.'libs/ftp.class.php'); $oFtp = new ftp(); if($oFtp->ftp_connect($ftp_info->ftp_host, $ftp_info->ftp_port)) { diff --git a/modules/layout/layout.admin.controller.php b/modules/layout/layout.admin.controller.php index 291233212..1e571a24f 100644 --- a/modules/layout/layout.admin.controller.php +++ b/modules/layout/layout.admin.controller.php @@ -593,7 +593,6 @@ class layoutAdminController extends layout $layout_srl = Context::get('layout_srl'); if(!$layout_srl) return new Object('-1','msg_invalid_request'); - require_once(_XE_PATH_.'libs/tar.class.php'); $oLayoutModel = getModel('layout'); // Copy files to temp path @@ -898,7 +897,6 @@ class layoutAdminController extends layout FileHandler::removeFile($user_layout_path . $file); } - require_once(_XE_PATH_.'libs/tar.class.php'); $image_path = $oLayoutModel->getUserLayoutImagePath($layout_srl); FileHandler::makeDir($image_path); $tar = new tar();