diff options
Diffstat (limited to 'phpBB/modules/acp')
| -rw-r--r-- | phpBB/modules/acp/acp_language.php | 7 | ||||
| -rw-r--r-- | phpBB/modules/acp/acp_update.php | 2 |
2 files changed, 7 insertions, 2 deletions
diff --git a/phpBB/modules/acp/acp_language.php b/phpBB/modules/acp/acp_language.php index 9d76e3fd0b..3b1269c837 100644 --- a/phpBB/modules/acp/acp_language.php +++ b/phpBB/modules/acp/acp_language.php @@ -98,6 +98,10 @@ class acp_language $transfer = new ftp_fsock(request_var('host', ''), request_var('username', ''), request_var('password', ''), request_var('root_path', ''), request_var('port', ''), request_var('timeout', '')); break; + case 'sftp': + $transfer = new sftp(request_var('host', ''), request_var('username', ''), request_var('password', ''), request_var('root_path', ''), request_var('port', ''), request_var('timeout', '')); + break; + default: trigger_error(phpbb::$user->lang['INVALID_UPLOAD_METHOD'], E_USER_ERROR); break; @@ -153,6 +157,7 @@ class acp_language 'S_CONNECTION_SUCCESS' => (request_var('test_connection', '') && $test_connection === true) ? true : false, 'S_CONNECTION_FAILED' => (request_var('test_connection', '') && $test_connection !== true) ? true : false, + 'ERROR_MSG' => (request_var('test_connection', '') && $test_connection !== true) ? phpbb::$user->lang[$test_connection] : '', )); break; @@ -397,7 +402,7 @@ class acp_language include_once(PHPBB_ROOT_PATH . 'includes/functions_transfer.' . PHP_EXT); $method = request_var('method', ''); - if ($method != 'ftp' && $method != 'ftp_fsock') + if ($method != 'ftp' && $method != 'ftp_fsock' && $method != 'sftp') { trigger_error(phpbb::$user->lang['INVALID_UPLOAD_METHOD'], E_USER_ERROR); } diff --git a/phpBB/modules/acp/acp_update.php b/phpBB/modules/acp/acp_update.php index 73abac7584..6440e86616 100644 --- a/phpBB/modules/acp/acp_update.php +++ b/phpBB/modules/acp/acp_update.php @@ -25,7 +25,7 @@ class acp_update function main($id, $mode) { - phpbb::$user-3>add_lang('install'); + phpbb::$user->add_lang('install'); $this->tpl_name = 'acp_update'; $this->page_title = 'ACP_VERSION_CHECK'; |