diff options
| author | Jim Wigginton <terrafrost@phpbb.com> | 2009-06-07 00:51:45 +0000 |
|---|---|---|
| committer | Jim Wigginton <terrafrost@phpbb.com> | 2009-06-07 00:51:45 +0000 |
| commit | cd40f978f769c6029fdb5839ca0e2f71485e5eae (patch) | |
| tree | 32298dfa74b3000d1e0c7e6809c72c485f04aa59 /phpBB/modules/acp/acp_language.php | |
| parent | 1042152a55ab2d0764c446949a77f085ab7a77f3 (diff) | |
| download | forums-cd40f978f769c6029fdb5839ca0e2f71485e5eae.tar forums-cd40f978f769c6029fdb5839ca0e2f71485e5eae.tar.gz forums-cd40f978f769c6029fdb5839ca0e2f71485e5eae.tar.bz2 forums-cd40f978f769c6029fdb5839ca0e2f71485e5eae.tar.xz forums-cd40f978f769c6029fdb5839ca0e2f71485e5eae.zip | |
- added sftp support
git-svn-id: file:///svn/phpbb/trunk@9553 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/modules/acp/acp_language.php')
| -rw-r--r-- | phpBB/modules/acp/acp_language.php | 7 |
1 files changed, 6 insertions, 1 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); } |