From fa1078a0d6e12d788347bad512f787feb7d060d3 Mon Sep 17 00:00:00 2001 From: bnu Date: Mon, 29 May 2017 11:30:58 +0900 Subject: [PATCH] =?UTF-8?q?fix=20#2086=20FTP=20host=20=EC=9D=B4=EB=A6=84?= =?UTF-8?q?=EC=9D=84=20=EB=85=B8=EC=B6=9C=ED=95=98=EC=A7=80=20=EC=95=8A?= =?UTF-8?q?=EB=8F=84=EB=A1=9D=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/admin/admin.admin.model.php | 4 ++-- modules/autoinstall/autoinstall.lib.php | 4 ++-- modules/install/install.model.php | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/modules/admin/admin.admin.model.php b/modules/admin/admin.admin.model.php index 10db01b46..952773514 100644 --- a/modules/admin/admin.admin.model.php +++ b/modules/admin/admin.admin.model.php @@ -112,7 +112,7 @@ class adminAdminModel extends admin $connection = ftp_connect($ftp_info->ftp_host, $ftp_info->ftp_port); if(!$connection) { - return new Object(-1, sprintf(lang('msg_ftp_not_connected'), $ftp_host)); + return new Object(-1, sprintf(lang('msg_ftp_not_connected'), 'host')); } $login_result = @ftp_login($connection, $ftp_info->ftp_user, $ftp_info->ftp_password); @@ -216,7 +216,7 @@ class adminAdminModel extends admin $oFTP = new ftp(); if(!$oFTP->ftp_connect($ftp_info->ftp_host, $ftp_info->ftp_port)) { - return new Object(1, sprintf(lang('msg_ftp_not_connected'), $ftp_info->ftp_host)); + return new Object(1, sprintf(lang('msg_ftp_not_connected'), 'host')); } if(!$oFTP->ftp_login($ftp_info->ftp_user, $ftp_info->ftp_password)) diff --git a/modules/autoinstall/autoinstall.lib.php b/modules/autoinstall/autoinstall.lib.php index 52f0819cc..d2c992192 100644 --- a/modules/autoinstall/autoinstall.lib.php +++ b/modules/autoinstall/autoinstall.lib.php @@ -532,7 +532,7 @@ class PHPFTPModuleInstaller extends ModuleInstaller $this->connection = ftp_connect($ftp_host, $this->ftp_info->ftp_port); if(!$this->connection) { - return new Object(-1, sprintf(lang('msg_ftp_not_connected'), $ftp_host)); + return new Object(-1, sprintf(lang('msg_ftp_not_connected'), 'host')); } $login_result = @ftp_login($this->connection, $this->ftp_info->ftp_user, $this->ftp_password); @@ -745,7 +745,7 @@ class FTPModuleInstaller extends ModuleInstaller $this->oFtp = new ftp(); if(!$this->oFtp->ftp_connect($ftp_host, $this->ftp_info->ftp_port)) { - return new Object(-1, sprintf(lang('msg_ftp_not_connected'), $ftp_host)); + return new Object(-1, sprintf(lang('msg_ftp_not_connected'), 'host')); } if(!$this->oFtp->ftp_login($this->ftp_info->ftp_user, $this->ftp_password)) { diff --git a/modules/install/install.model.php b/modules/install/install.model.php index b9d749b67..9c1fac416 100644 --- a/modules/install/install.model.php +++ b/modules/install/install.model.php @@ -54,7 +54,7 @@ class installModel extends install if(function_exists('ftp_connect')) { $connection = ftp_connect($ftp_info->ftp_host, $ftp_info->ftp_port); - if(!$connection) return new Object(-1, sprintf(lang('msg_ftp_not_connected'), $ftp_info->ftp_host)); + if(!$connection) return new Object(-1, sprintf(lang('msg_ftp_not_connected'), 'host')); if(! @ftp_login($connection, $ftp_info->ftp_user, $ftp_info->ftp_password)) { ftp_close($connection);