*/
class WP_Filesystem_FTPext extends WP_Filesystem_Base {
var $link;
- var $timeout = 5;
var $errors = null;
var $options = array();
- var $permission = null;
-
function WP_Filesystem_FTPext($opt='') {
$this->method = 'ftpext';
$this->errors = new WP_Error();
}
// Set defaults:
+ //This Class uses the timeout on a per-connection basis, Others use it on a per-action basis.
+
+ if ( ! defined('FS_TIMEOUT') )
+ define('FS_TIMEOUT', 240);
+
if ( empty($opt['port']) )
$this->options['port'] = 21;
else
function connect() {
if ( isset($this->options['ssl']) && $this->options['ssl'] && function_exists('ftp_ssl_connect') )
- $this->link = @ftp_ssl_connect($this->options['hostname'], $this->options['port'], $this->timeout);
+ $this->link = @ftp_ssl_connect($this->options['hostname'], $this->options['port'], FS_CONNECT_TIMEOUT);
else
- $this->link = @ftp_connect($this->options['hostname'], $this->options['port'], $this->timeout);
+ $this->link = @ftp_connect($this->options['hostname'], $this->options['port'], FS_CONNECT_TIMEOUT);
if ( ! $this->link ) {
$this->errors->add('connect', sprintf(__('Failed to connect to FTP Server %1$s:%2$s'), $this->options['hostname'], $this->options['port']));
//Set the Connection to use Passive FTP
@ftp_pasv( $this->link, true );
+ if ( @ftp_get_option($this->link, FTP_TIMEOUT_SEC) < FS_TIMEOUT )
+ @ftp_set_option($this->link, FTP_TIMEOUT_SEC, FS_TIMEOUT);
return true;
}
- function setDefaultPermissions($perm) {
- $this->permission = $perm;
- }
-
- function get_contents($file, $type = '', $resumepos = 0 ){
- if( empty($type) )
+ function get_contents($file, $type = '', $resumepos = 0 ) {
+ if ( empty($type) )
$type = FTP_BINARY;
$temp = tmpfile();
if ( ! $temp )
return false;
- if( ! @ftp_fget($this->link, $temp, $file, $type, $resumepos) )
+ if ( ! @ftp_fget($this->link, $temp, $file, $type, $resumepos) )
return false;
fseek($temp, 0); //Skip back to the start of the file being written to
return explode("\n", $this->get_contents($file));
}
function put_contents($file, $contents, $type = '' ) {
- if( empty($type) )
+ if ( empty($type) )
$type = $this->is_binary($contents) ? FTP_BINARY : FTP_ASCII;
$temp = tmpfile();
}
function cwd() {
$cwd = @ftp_pwd($this->link);
- if( $cwd )
+ if ( $cwd )
$cwd = trailingslashit($cwd);
return $cwd;
}
function chdir($dir) {
- return @ftp_chdir($dir);
+ return @ftp_chdir($this->link, $dir);
}
function chgrp($file, $group, $recursive = false ) {
return false;
}
function chmod($file, $mode = false, $recursive = false) {
- if( ! $mode )
- $mode = $this->permission;
- if( ! $mode )
- return false;
if ( ! $this->exists($file) && ! $this->is_dir($file) )
return false;
+
+ if ( ! $mode ) {
+ if ( $this->is_file($file) )
+ $mode = FS_CHMOD_FILE;
+ elseif ( $this->is_dir($file) )
+ $mode = FS_CHMOD_DIR;
+ else
+ return false;
+ }
+
if ( ! $recursive || ! $this->is_dir($file) ) {
if ( ! function_exists('ftp_chmod') )
return @ftp_site($this->link, sprintf('CHMOD %o %s', $mode, $file));
}
//Is a directory, and we want recursive
$filelist = $this->dirlist($file);
- foreach($filelist as $filename){
+ foreach ( $filelist as $filename ) {
$this->chmod($file . '/' . $filename, $mode, $recursive);
}
return true;
return $dir[$file]['group'];
}
function copy($source, $destination, $overwrite = false ) {
- if( ! $overwrite && $this->exists($destination) )
+ if ( ! $overwrite && $this->exists($destination) )
return false;
$content = $this->get_contents($source);
- if( false === $content)
+ if ( false === $content)
return false;
return $this->put_contents($destination, $content);
}
}
function exists($file) {
- $list = @ftp_rawlist($this->link, $file, false);
+ $list = @ftp_nlist($this->link, $file);
return !empty($list); //empty list = no file, so invert.
}
function is_file($file) {
function is_dir($path) {
$cwd = $this->cwd();
$result = @ftp_chdir($this->link, trailingslashit($path) );
- if( $result && $path == $this->cwd() || $this->cwd() != $cwd ) {
+ if ( $result && $path == $this->cwd() || $this->cwd() != $cwd ) {
@ftp_chdir($this->link, $cwd);
return true;
}
return false;
}
function mkdir($path, $chmod = false, $chown = false, $chgrp = false) {
- if( !ftp_mkdir($this->link, $path) )
+ if ( !ftp_mkdir($this->link, $path) )
return false;
- if( $chmod )
- $this->chmod($path, $chmod);
- if( $chown )
+ if ( ! $chmod )
+ $chmod = FS_CHMOD_DIR;
+ $this->chmod($path, $chmod);
+ if ( $chown )
$this->chown($path, $chown);
- if( $chgrp )
+ if ( $chgrp )
$this->chgrp($path, $chgrp);
return true;
}
if ( is_null($is_windows) )
$is_windows = strpos( strtolower(ftp_systype($this->link)), 'win') !== false;
- if ($is_windows && preg_match("/([0-9]{2})-([0-9]{2})-([0-9]{2}) +([0-9]{2}):([0-9]{2})(AM|PM) +([0-9]+|<DIR>) +(.+)/", $line, $lucifer)) {
+ if ( $is_windows && preg_match("/([0-9]{2})-([0-9]{2})-([0-9]{2}) +([0-9]{2}):([0-9]{2})(AM|PM) +([0-9]+|<DIR>) +(.+)/", $line, $lucifer) ) {
$b = array();
- if ($lucifer[3]<70) { $lucifer[3] +=2000; } else { $lucifer[3]+=1900; } // 4digit year fix
+ if ( $lucifer[3] < 70 ) { $lucifer[3] +=2000; } else { $lucifer[3] += 1900; } // 4digit year fix
$b['isdir'] = ($lucifer[7]=="<DIR>");
if ( $b['isdir'] )
$b['type'] = 'd';
return $b;
}
- function dirlist($path = '.', $incdot = false, $recursive = false) {
- if( $this->is_file($path) ) {
- $limitFile = basename($path);
+ function dirlist($path = '.', $include_hidden = true, $recursive = false) {
+ if ( $this->is_file($path) ) {
+ $limit_file = basename($path);
$path = dirname($path) . '/';
} else {
- $limitFile = false;
+ $limit_file = false;
}
$list = @ftp_rawlist($this->link, '-a ' . $path, false);
if ( empty($entry) )
continue;
- if ( '.' == $entry["name"] || '..' == $entry["name"] )
+ if ( '.' == $entry['name'] || '..' == $entry['name'] )
+ continue;
+
+ if ( ! $include_hidden && '.' == $entry['name'][0] )
+ continue;
+
+ if ( $limit_file && $entry['name'] != $limit_file)
continue;
$dirlist[ $entry['name'] ] = $entry;
if ( ! $dirlist )
return false;
- if ( empty($dirlist) )
- return array();
$ret = array();
- foreach ( $dirlist as $struc ) {
-
+ foreach ( (array)$dirlist as $struc ) {
if ( 'd' == $struc['type'] ) {
- $struc['files'] = array();
-
- if ( $incdot ){
- //We're including the doted starts
- if( '.' != $struc['name'] && '..' != $struc['name'] ){ //Ok, It isnt a special folder
- if ($recursive)
- $struc['files'] = $this->dirlist($path . '/' . $struc['name'], $incdot, $recursive);
- }
- } else { //No dots
- if ($recursive)
- $struc['files'] = $this->dirlist($path . '/' . $struc['name'], $incdot, $recursive);
- }
+ if ( $recursive )
+ $struc['files'] = $this->dirlist($path . '/' . $struc['name'], $include_hidden, $recursive);
+ else
+ $struc['files'] = array();
}
- //File
- $ret[$struc['name']] = $struc;
+
+ $ret[ $struc['name'] ] = $struc;
}
return $ret;
}
- function __destruct(){
- if( $this->link )
+ function __destruct() {
+ if ( $this->link )
ftp_close($this->link);
}
}