mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-06 00:37:42 +02:00
Code Issues Releases Wiki Activity

unified the transfer routines from the updater and from acp_language.php. still needs work..

Browse Source 
git-svn-id: file:///svn/phpbb/trunk@9751 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Jim Wigginton
2009-07-12 15:44:43 +00:00
parent 2839f3a964
commit 7909b729bb
9 changed files with 599 additions and 690 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
phpBB/includes/functions_transfer.php
View File

@@ -16,7 +16,7 @@ if (!defined('IN_PHPBB'))
exit;
}
require_once PHPBB_ROOT_PATH . 'includes/sftp/sftp.' . PHP_EXT;
require_once PHPBB_ROOT_PATH . 'includes/libraries/sftp/sftp.' . PHP_EXT;
/**
* Transfer class, wrapper for ftp/sftp/ssh
@@ -192,7 +192,7 @@ class transfer
$directory = $this->root_path . str_replace(PHPBB_ROOT_PATH, '', $directory);
$this->_chdir($directory);
$result = $this->_ls();
$result = $this->_ls('');
if ($result !== false && is_array($result))
{
@@ -455,7 +455,7 @@ class ftp extends transfer
$item = str_replace('\\', '/', $item);
$dir = str_replace('\\', '/', $dir);
if (strpos($item, $dir) === 0)
if (!empty($dir) && strpos($item, $dir) === 0)
{
$item = substr($item, strlen($dir));
}