Version 4.5.0
This commit is contained in:
1 parent
1a0c7fd3c2
commit
f79dcf067a
3791 files changed
+248032
-76372
No files matched your search
@@ -11,7 +11,7 @@
|
||||
namespace IPS\Ftp;
|
||||
|
||||
/* To prevent PHP errors (extending class does not exist) revealing path */
|
||||
if ( !defined( '\IPS\SUITE_UNIQUE_KEY' ) )
|
||||
if ( !\defined( '\IPS\SUITE_UNIQUE_KEY' ) )
|
||||
{
|
||||
header( ( isset( $_SERVER['SERVER_PROTOCOL'] ) ? $_SERVER['SERVER_PROTOCOL'] : 'HTTP/1.0' ) . ' 403 Forbidden' );
|
||||
exit;
|
||||
|
||||
+4
-3
@@ -11,7 +11,7 @@
|
||||
namespace IPS;
|
||||
|
||||
/* To prevent PHP errors (extending class does not exist) revealing path */
|
||||
if ( !defined( '\IPS\SUITE_UNIQUE_KEY' ) )
|
||||
if ( !\defined( '\IPS\SUITE_UNIQUE_KEY' ) )
|
||||
{
|
||||
header( ( isset( $_SERVER['SERVER_PROTOCOL'] ) ? $_SERVER['SERVER_PROTOCOL'] : 'HTTP/1.0' ) . ' 403 Forbidden' );
|
||||
exit;
|
||||
@@ -43,7 +43,7 @@ class _Ftp
|
||||
{
|
||||
if ( $secure )
|
||||
{
|
||||
if( !function_exists('ftp_ssl_connect') )
|
||||
if( !\function_exists('ftp_ssl_connect') )
|
||||
{
|
||||
throw new \IPS\Ftp\Exception( 'SSL_NOT_AVAILABLE' );
|
||||
}
|
||||
@@ -139,7 +139,8 @@ class _Ftp
|
||||
/**
|
||||
* Raw list
|
||||
*
|
||||
* @param string $path Argument to pass to ftp_nlist
|
||||
* @param string $path Argument to pass to ftp_nlist
|
||||
* @param bool $recursive Whether or not to list recursively
|
||||
* @return array
|
||||
*/
|
||||
public function rawList( $path = '.', $recursive = FALSE )
|
||||
|
||||
@@ -11,7 +11,7 @@
|
||||
namespace IPS\Ftp;
|
||||
|
||||
/* To prevent PHP errors (extending class does not exist) revealing path */
|
||||
if ( !defined( '\IPS\SUITE_UNIQUE_KEY' ) )
|
||||
if ( !\defined( '\IPS\SUITE_UNIQUE_KEY' ) )
|
||||
{
|
||||
header( ( isset( $_SERVER['SERVER_PROTOCOL'] ) ? $_SERVER['SERVER_PROTOCOL'] : 'HTTP/1.0' ) . ' 403 Forbidden' );
|
||||
exit;
|
||||
@@ -23,18 +23,38 @@ if ( !defined( '\IPS\SUITE_UNIQUE_KEY' ) )
|
||||
class _FtpSplFileInfo extends \SplFileInfo
|
||||
{
|
||||
/**
|
||||
* @brief Define our possible types
|
||||
* @brief Type: Unknown
|
||||
*/
|
||||
const TYPE_UNKNOWN = 1;
|
||||
|
||||
/**
|
||||
* @brief Type: Directory
|
||||
*/
|
||||
const TYPE_DIRECTORY = 2;
|
||||
|
||||
/**
|
||||
* @brief Type: File
|
||||
*/
|
||||
const TYPE_FILE = 3;
|
||||
|
||||
/**
|
||||
* @brief Type: Symlink
|
||||
*/
|
||||
const TYPE_LINK = 4;
|
||||
|
||||
/**
|
||||
* @brief Some information about our current object
|
||||
* @brief Current item type
|
||||
*/
|
||||
protected $type = self::TYPE_DIRECTORY;
|
||||
|
||||
/**
|
||||
* @brief Current directory
|
||||
*/
|
||||
protected $directory = '/';
|
||||
|
||||
/**
|
||||
* @brief Current filename
|
||||
*/
|
||||
protected $filename = '.';
|
||||
|
||||
/**
|
||||
@@ -179,7 +199,7 @@ class _FtpSplFileInfo extends \SplFileInfo
|
||||
/**
|
||||
* Parse a raw list item to extract the needed information
|
||||
*
|
||||
* @param string $item The item we are parsing, which could be a file or directory (or unknown)
|
||||
* @param string $file The item we are parsing, which could be a file or directory (or unknown)
|
||||
* @return array ( 'filename' => ..., 'directory' => ... )
|
||||
* @throws \InvalidArgumentException
|
||||
*/
|
||||
|
||||
@@ -11,7 +11,7 @@
|
||||
namespace IPS\Ftp;
|
||||
|
||||
/* To prevent PHP errors (extending class does not exist) revealing path */
|
||||
if ( !defined( '\IPS\SUITE_UNIQUE_KEY' ) )
|
||||
if ( !\defined( '\IPS\SUITE_UNIQUE_KEY' ) )
|
||||
{
|
||||
header( ( isset( $_SERVER['SERVER_PROTOCOL'] ) ? $_SERVER['SERVER_PROTOCOL'] : 'HTTP/1.0' ) . ' 403 Forbidden' );
|
||||
exit;
|
||||
@@ -56,7 +56,7 @@ class _RecursiveDirectoryFtpIterator extends \IPS\Ftp\FtpSplFileInfo implements
|
||||
/**
|
||||
* Return children of the current object
|
||||
*
|
||||
* @return \RecursiveDirectoryFtpIterator
|
||||
* @return static
|
||||
*/
|
||||
public function getChildren()
|
||||
{
|
||||
|
||||
+6
-5
@@ -11,7 +11,7 @@
|
||||
namespace IPS\Ftp;
|
||||
|
||||
/* To prevent PHP errors (extending class does not exist) revealing path */
|
||||
if ( !defined( '\IPS\SUITE_UNIQUE_KEY' ) )
|
||||
if ( !\defined( '\IPS\SUITE_UNIQUE_KEY' ) )
|
||||
{
|
||||
header( ( isset( $_SERVER['SERVER_PROTOCOL'] ) ? $_SERVER['SERVER_PROTOCOL'] : 'HTTP/1.0' ) . ' 403 Forbidden' );
|
||||
exit;
|
||||
@@ -50,7 +50,7 @@ class _Sftp extends \IPS\Ftp
|
||||
*/
|
||||
public function __construct( $host, $username, $password, $port=22 )
|
||||
{
|
||||
if ( !extension_loaded( 'ssh2' ) )
|
||||
if ( !\extension_loaded( 'ssh2' ) )
|
||||
{
|
||||
throw new \BadMethodCallException;
|
||||
}
|
||||
@@ -130,7 +130,7 @@ class _Sftp extends \IPS\Ftp
|
||||
$handle = opendir("ssh2.sftp://{$this->sftp}/{$this->dir}");
|
||||
while( $entry = readdir( $handle ) )
|
||||
{
|
||||
if ( !in_array( $entry, array( '.', '..' ) ) )
|
||||
if ( !\in_array( $entry, array( '.', '..' ) ) )
|
||||
{
|
||||
$return[] = $entry;
|
||||
}
|
||||
@@ -141,7 +141,8 @@ class _Sftp extends \IPS\Ftp
|
||||
/**
|
||||
* Raw list
|
||||
*
|
||||
* @param string $path The path
|
||||
* @param string $path The path
|
||||
* @param bool $recursive Whether or not to recursively list
|
||||
* @return array
|
||||
*/
|
||||
public function rawList( $path = '.', $recursive = FALSE )
|
||||
@@ -150,7 +151,7 @@ class _Sftp extends \IPS\Ftp
|
||||
$handle = opendir("ssh2.sftp://{$this->sftp}/{$this->dir}");
|
||||
while( $entry = readdir( $handle ) )
|
||||
{
|
||||
if ( !in_array( $entry, array( '.', '..' ) ) )
|
||||
if ( !\in_array( $entry, array( '.', '..' ) ) )
|
||||
{
|
||||
$bits = array();
|
||||
$stats = @ssh2_sftp_stat( $this->sftp, $this->dir . $entry );
|
||||
|
||||
Reference in new issue
Block a user