*/
class WP_Filesystem_ftpsockets extends WP_Filesystem_Base {
var $ftp = false;
- var $timeout = 5;
var $errors = null;
var $options = array();
- var $permission = null;
-
function WP_Filesystem_ftpsockets($opt = '') {
$this->method = 'ftpsockets';
$this->errors = new WP_Error();
//Check if possible to use ftp functions.
- if( ! @include_once ABSPATH . 'wp-admin/includes/class-ftp.php' )
+ if ( ! @include_once ABSPATH . 'wp-admin/includes/class-ftp.php' )
return false;
$this->ftp = new ftp();
else
$this->options['hostname'] = $opt['hostname'];
- if ( isset($opt['base']) && ! empty($opt['base']) )
+ if ( ! empty($opt['base']) )
$this->wp_base = $opt['base'];
// Check if the options provided are OK.
if ( ! $this->ftp )
return false;
- //$this->ftp->Verbose = true;
+ $this->ftp->setTimeout(FS_CONNECT_TIMEOUT);
if ( ! $this->ftp->SetServer($this->options['hostname'], $this->options['port']) ) {
$this->errors->add('connect', sprintf(__('Failed to connect to FTP Server %1$s:%2$s'), $this->options['hostname'], $this->options['port']));
return false;
}
+
if ( ! $this->ftp->connect() ) {
$this->errors->add('connect', sprintf(__('Failed to connect to FTP Server %1$s:%2$s'), $this->options['hostname'], $this->options['port']));
return false;
$this->ftp->SetType(FTP_AUTOASCII);
$this->ftp->Passive(true);
+ $this->ftp->setTimeout(FS_TIMEOUT);
return true;
}
- function setDefaultPermissions($perm) {
- $this->permission = $perm;
- }
-
function get_contents($file, $type = '', $resumepos = 0) {
- if( ! $this->exists($file) )
+ if ( ! $this->exists($file) )
return false;
- if( empty($type) )
+ if ( empty($type) )
$type = FTP_AUTOASCII;
$this->ftp->SetType($type);
return explode("\n", $this->get_contents($file) );
}
- function put_contents($file, $contents, $type = '' ) {
- if( empty($type) )
- $type = $this->is_binary($contents) ? FTP_BINARY : FTP_ASCII;
-
- $this->ftp->SetType($type);
-
+ function put_contents($file, $contents, $mode = false ) {
$temp = wp_tempnam( $file );
- if ( ! $temphandle = fopen($temp, 'w+') ){
+ if ( ! $temphandle = @fopen($temp, 'w+') ) {
unlink($temp);
return false;
}
fwrite($temphandle, $contents);
fseek($temphandle, 0); //Skip back to the start of the file being written to
+ $type = $this->is_binary($contents) ? FTP_BINARY : FTP_ASCII;
+ $this->ftp->SetType($type);
+
$ret = $this->ftp->fput($file, $temphandle);
fclose($temphandle);
unlink($temp);
+
+ $this->chmod($file, $mode);
+
return $ret;
}
function cwd() {
$cwd = $this->ftp->pwd();
- if( $cwd )
+ if ( $cwd )
$cwd = trailingslashit($cwd);
return $cwd;
}
}
function chmod($file, $mode = false, $recursive = false ) {
- if( ! $mode )
- $mode = $this->permission;
- if( ! $mode )
- return false;
- //if( ! $this->exists($file) )
- // return false;
- if( ! $recursive || ! $this->is_dir($file) ) {
- return $this->ftp->chmod($file,$mode);
+ if ( ! $mode ) {
+ if ( $this->is_file($file) )
+ $mode = FS_CHMOD_FILE;
+ elseif ( $this->is_dir($file) )
+ $mode = FS_CHMOD_DIR;
+ else
+ return false;
}
- //Is a directory, and we want recursive
- $filelist = $this->dirlist($file);
- foreach($filelist as $filename){
- $this->chmod($file . '/' . $filename, $mode, $recursive);
+
+ // chmod any sub-objects if recursive.
+ if ( $recursive && $this->is_dir($file) ) {
+ $filelist = $this->dirlist($file);
+ foreach ( (array)$filelist as $filename => $filemeta )
+ $this->chmod($file . '/' . $filename, $mode, $recursive);
}
- return true;
+
+ // chmod the file or directory
+ return $this->ftp->chmod($file, $mode);
}
function chown($file, $owner, $recursive = false ) {
}
function copy($source, $destination, $overwrite = false ) {
- if( ! $overwrite && $this->exists($destination) )
+ if ( ! $overwrite && $this->exists($destination) )
return false;
$content = $this->get_contents($source);
}
function is_file($file) {
- return $this->is_dir($file) ? false : true;
+ if ( $this->is_dir($file) )
+ return false;
+ if ( $this->exists($file) )
+ return true;
+ return false;
}
function is_dir($path) {
}
function mkdir($path, $chmod = false, $chown = false, $chgrp = false ) {
- if( ! $this->ftp->mkdir($path) )
+ if ( ! $this->ftp->mkdir($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;
}
function rmdir($path, $recursive = false ) {
- if( ! $recursive )
- return $this->ftp->rmdir($path);
-
- return $this->ftp->mdel($path);
+ $this->delete($path, $recursive);
}
- 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 = $this->ftp->dirlist($path);
- if( ! $list )
+ if ( empty($list) && !$this->exists($path) )
return false;
- if( empty($list) )
- return array();
$ret = array();
foreach ( $list as $struc ) {
+ if ( '.' == $struc['name'] || '..' == $struc['name'] )
+ continue;
+
+ if ( ! $include_hidden && '.' == $struc['name'][0] )
+ continue;
+
+ if ( $limit_file && $struc['name'] != $limit_file )
+ continue;
+
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;
}