mirror of
https://github.com/phpbb/phpbb.git
synced 2025-08-01 14:30:32 +02:00
some updates. Also adjusted the utf tools and normalizer more to our coding guidelines.
git-svn-id: file:///svn/phpbb/trunk@6312 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
@@ -188,6 +188,24 @@ class transfer
|
||||
return $this->_rename($old_handle, $new_handle);
|
||||
}
|
||||
|
||||
/**
|
||||
* Check if a specified file exist...
|
||||
*/
|
||||
function file_exists($directory, $filename)
|
||||
{
|
||||
global $phpbb_root_path;
|
||||
|
||||
$directory = $this->root_path . str_replace($phpbb_root_path, '', $directory);
|
||||
$result = $this->_ls($directory);
|
||||
|
||||
if ($result !== false && is_array($result))
|
||||
{
|
||||
return (in_array($filename, $result)) ? true : false;
|
||||
}
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
/**
|
||||
* Open session
|
||||
*/
|
||||
@@ -272,7 +290,7 @@ class ftp extends transfer
|
||||
|
||||
/**
|
||||
* Init FTP Session
|
||||
* @access: private
|
||||
* @access private
|
||||
*/
|
||||
function _init()
|
||||
{
|
||||
@@ -304,7 +322,7 @@ class ftp extends transfer
|
||||
|
||||
/**
|
||||
* Create Directory (MKDIR)
|
||||
* @access: private
|
||||
* @access private
|
||||
*/
|
||||
function _mkdir($dir)
|
||||
{
|
||||
@@ -313,7 +331,7 @@ class ftp extends transfer
|
||||
|
||||
/**
|
||||
* Remove directory (RMDIR)
|
||||
* @access: private
|
||||
* @access private
|
||||
*/
|
||||
function _rmdir($dir)
|
||||
{
|
||||
@@ -322,7 +340,7 @@ class ftp extends transfer
|
||||
|
||||
/**
|
||||
* Rename file
|
||||
* @access: private
|
||||
* @access private
|
||||
*/
|
||||
function _rename($old_handle, $new_handle)
|
||||
{
|
||||
@@ -331,7 +349,7 @@ class ftp extends transfer
|
||||
|
||||
/**
|
||||
* Change current working directory (CHDIR)
|
||||
* @access: private
|
||||
* @access private
|
||||
*/
|
||||
function _chdir($dir = '')
|
||||
{
|
||||
@@ -345,7 +363,7 @@ class ftp extends transfer
|
||||
|
||||
/**
|
||||
* change file permissions (CHMOD)
|
||||
* @access: private
|
||||
* @access private
|
||||
*/
|
||||
function _chmod($file, $perms)
|
||||
{
|
||||
@@ -364,7 +382,7 @@ class ftp extends transfer
|
||||
|
||||
/**
|
||||
* Upload file to location (PUT)
|
||||
* @access: private
|
||||
* @access private
|
||||
*/
|
||||
function _put($from_file, $to_file)
|
||||
{
|
||||
@@ -386,7 +404,7 @@ class ftp extends transfer
|
||||
|
||||
/**
|
||||
* Delete file (DELETE)
|
||||
* @access: private
|
||||
* @access private
|
||||
*/
|
||||
function _delete($file)
|
||||
{
|
||||
@@ -395,7 +413,7 @@ class ftp extends transfer
|
||||
|
||||
/**
|
||||
* Close ftp session (CLOSE)
|
||||
* @access: private
|
||||
* @access private
|
||||
*/
|
||||
function _close()
|
||||
{
|
||||
@@ -410,7 +428,7 @@ class ftp extends transfer
|
||||
/**
|
||||
* Return current working directory (CWD)
|
||||
* At the moment not used by parent class
|
||||
* @access: private
|
||||
* @access private
|
||||
*/
|
||||
function _cwd()
|
||||
{
|
||||
@@ -419,8 +437,7 @@ class ftp extends transfer
|
||||
|
||||
/**
|
||||
* Return list of files in a given directory (LS)
|
||||
* At the moment not used by parent class
|
||||
* @access: private
|
||||
* @access private
|
||||
*/
|
||||
function _ls($dir = './')
|
||||
{
|
||||
@@ -429,7 +446,7 @@ class ftp extends transfer
|
||||
|
||||
/**
|
||||
* FTP SITE command (ftp-only function)
|
||||
* @access: private
|
||||
* @access private
|
||||
*/
|
||||
function _site($command)
|
||||
{
|
||||
@@ -487,7 +504,7 @@ class ftp_fsock extends transfer
|
||||
|
||||
/**
|
||||
* Init FTP Session
|
||||
* @access: private
|
||||
* @access private
|
||||
*/
|
||||
function _init()
|
||||
{
|
||||
@@ -526,7 +543,7 @@ class ftp_fsock extends transfer
|
||||
|
||||
/**
|
||||
* Create Directory (MKDIR)
|
||||
* @access: private
|
||||
* @access private
|
||||
*/
|
||||
function _mkdir($dir)
|
||||
{
|
||||
@@ -535,7 +552,7 @@ class ftp_fsock extends transfer
|
||||
|
||||
/**
|
||||
* Remove directory (RMDIR)
|
||||
* @access: private
|
||||
* @access private
|
||||
*/
|
||||
function _rmdir($dir)
|
||||
{
|
||||
@@ -544,7 +561,7 @@ class ftp_fsock extends transfer
|
||||
|
||||
/**
|
||||
* Rename File
|
||||
* @access: private
|
||||
* @access private
|
||||
*/
|
||||
function _rename($old_handle, $new_handle)
|
||||
{
|
||||
@@ -554,7 +571,7 @@ class ftp_fsock extends transfer
|
||||
|
||||
/**
|
||||
* Change current working directory (CHDIR)
|
||||
* @access: private
|
||||
* @access private
|
||||
*/
|
||||
function _chdir($dir = '')
|
||||
{
|
||||
@@ -568,7 +585,7 @@ class ftp_fsock extends transfer
|
||||
|
||||
/**
|
||||
* change file permissions (CHMOD)
|
||||
* @access: private
|
||||
* @access private
|
||||
*/
|
||||
function _chmod($file, $perms)
|
||||
{
|
||||
@@ -577,7 +594,7 @@ class ftp_fsock extends transfer
|
||||
|
||||
/**
|
||||
* Upload file to location (PUT)
|
||||
* @access: private
|
||||
* @access private
|
||||
*/
|
||||
function _put($from_file, $to_file)
|
||||
{
|
||||
@@ -613,7 +630,7 @@ class ftp_fsock extends transfer
|
||||
|
||||
/**
|
||||
* Delete file (DELETE)
|
||||
* @access: private
|
||||
* @access private
|
||||
*/
|
||||
function _delete($file)
|
||||
{
|
||||
@@ -622,7 +639,7 @@ class ftp_fsock extends transfer
|
||||
|
||||
/**
|
||||
* Close ftp session (CLOSE)
|
||||
* @access: private
|
||||
* @access private
|
||||
*/
|
||||
function _close()
|
||||
{
|
||||
@@ -637,7 +654,7 @@ class ftp_fsock extends transfer
|
||||
/**
|
||||
* Return current working directory (CWD)
|
||||
* At the moment not used by parent class
|
||||
* @access: private
|
||||
* @access private
|
||||
*/
|
||||
function _cwd()
|
||||
{
|
||||
@@ -647,8 +664,7 @@ class ftp_fsock extends transfer
|
||||
|
||||
/**
|
||||
* Return list of files in a given directory (LS)
|
||||
* At the moment not used by parent class
|
||||
* @access: private
|
||||
* @access private
|
||||
*/
|
||||
function _ls($dir = './')
|
||||
{
|
||||
@@ -671,7 +687,7 @@ class ftp_fsock extends transfer
|
||||
|
||||
/**
|
||||
* Send a command to server (FTP fsock only function)
|
||||
* @access: private
|
||||
* @access private
|
||||
*/
|
||||
function _send_command($command, $args = '', $check = true)
|
||||
{
|
||||
@@ -692,7 +708,7 @@ class ftp_fsock extends transfer
|
||||
|
||||
/**
|
||||
* Opens a connection to send data (FTP fosck only function)
|
||||
* @access: private
|
||||
* @access private
|
||||
*/
|
||||
function _open_data_connection()
|
||||
{
|
||||
@@ -727,7 +743,7 @@ class ftp_fsock extends transfer
|
||||
|
||||
/**
|
||||
* Closes a connection used to send data
|
||||
* @access: private
|
||||
* @access private
|
||||
*/
|
||||
function _close_data_connection()
|
||||
{
|
||||
@@ -736,7 +752,7 @@ class ftp_fsock extends transfer
|
||||
|
||||
/**
|
||||
* Check to make sure command was successful (FTP fsock only function)
|
||||
* @access: private
|
||||
* @access private
|
||||
*/
|
||||
function _check_command($return = false)
|
||||
{
|
||||
|
Reference in New Issue
Block a user