var $errors = null;
var $options = array();
- function WP_Filesystem_ftpsockets($opt = '') {
+ function __construct($opt = '') {
$this->method = 'ftpsockets';
$this->errors = new WP_Error();
- //Check if possible to use ftp functions.
+ // Check if possible to use ftp functions.
if ( ! @include_once ABSPATH . 'wp-admin/includes/class-ftp.php' )
return false;
$this->ftp = new ftp();
- //Set defaults:
if ( empty($opt['port']) )
$this->options['port'] = 21;
else
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.
return false;
}
- $this->ftp->SetType(FTP_AUTOASCII);
- $this->ftp->Passive(true);
- $this->ftp->setTimeout(FS_TIMEOUT);
+ $this->ftp->SetType( FTP_BINARY );
+ $this->ftp->Passive( true );
+ $this->ftp->setTimeout( FS_TIMEOUT );
return true;
}
- function get_contents($file, $type = '', $resumepos = 0) {
+ function get_contents( $file ) {
if ( ! $this->exists($file) )
return false;
- if ( empty($type) )
- $type = FTP_AUTOASCII;
- $this->ftp->SetType($type);
-
$temp = wp_tempnam( $file );
if ( ! $temphandle = fopen($temp, 'w+') )
return false;
+ mbstring_binary_safe_encoding();
+
if ( ! $this->ftp->fget($temphandle, $file) ) {
fclose($temphandle);
unlink($temp);
- return ''; //Blank document, File does exist, Its just blank.
+
+ reset_mbstring_encoding();
+
+ return ''; // Blank document, File does exist, It's just blank.
}
- fseek($temphandle, 0); //Skip back to the start of the file being written to
+ reset_mbstring_encoding();
+
+ fseek( $temphandle, 0 ); // Skip back to the start of the file being written to
$contents = '';
while ( ! feof($temphandle) )
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
+ // The FTP class uses string functions internally during file download/upload
+ mbstring_binary_safe_encoding();
+
+ $bytes_written = fwrite( $temphandle, $contents );
+ if ( false === $bytes_written || $bytes_written != strlen( $contents ) ) {
+ fclose( $temphandle );
+ unlink( $temp );
+
+ reset_mbstring_encoding();
+
+ return false;
+ }
+
+ fseek( $temphandle, 0 ); // Skip back to the start of the file being written to
$ret = $this->ftp->fput($file, $temphandle);
+ reset_mbstring_encoding();
+
fclose($temphandle);
unlink($temp);
+
+ $this->chmod($file, $mode);
+
return $ret;
}
}
function chmod($file, $mode = false, $recursive = false ) {
-
if ( ! $mode ) {
if ( $this->is_file($file) )
$mode = FS_CHMOD_FILE;
return false;
}
- if ( ! $recursive || ! $this->is_dir($file) ) {
- return $this->ftp->chmod($file, $mode);
+ // 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);
}
- //Is a directory, and we want recursive
- $filelist = $this->dirlist($file);
- foreach ( $filelist as $filename )
- $this->chmod($file . '/' . $filename, $mode, $recursive);
-
- return true;
- }
-
- function chown($file, $owner, $recursive = false ) {
- return false;
+ // chmod the file or directory
+ return $this->ftp->chmod($file, $mode);
}
function owner($file) {
return $dir[$file]['group'];
}
- function copy($source, $destination, $overwrite = false ) {
+ function copy($source, $destination, $overwrite = false, $mode = false) {
if ( ! $overwrite && $this->exists($destination) )
return false;
if ( false === $content )
return false;
- return $this->put_contents($destination, $content);
+ return $this->put_contents($destination, $content, $mode);
}
function move($source, $destination, $overwrite = false ) {
return $this->ftp->rename($source, $destination);
}
- function delete($file, $recursive = false ) {
+ function delete($file, $recursive = false, $type = false) {
if ( empty($file) )
return false;
- if ( $this->is_file($file) )
+ if ( 'f' == $type || $this->is_file($file) )
return $this->ftp->delete($file);
if ( !$recursive )
return $this->ftp->rmdir($file);
return $this->ftp->mdel($file);
}
- function exists($file) {
- return $this->ftp->is_exists($file);
+ function exists( $file ) {
+ $list = $this->ftp->nlist( $file );
+ return !empty( $list ); //empty list = no file, so invert.
+ // return $this->ftp->is_exists($file); has issues with ABOR+426 responses on the ncFTPd server
}
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 is_readable($file) {
- //Get dir list, Check if the file is writable by the current user??
return true;
}
function is_writable($file) {
- //Get dir list, Check if the file is writable by the current user??
return true;
}
}
function mkdir($path, $chmod = false, $chown = false, $chgrp = false ) {
+ $path = untrailingslashit($path);
+ if ( empty($path) )
+ return false;
+
if ( ! $this->ftp->mkdir($path) )
return false;
if ( ! $chmod )
}
function rmdir($path, $recursive = false ) {
- if ( ! $recursive )
- return $this->ftp->rmdir($path);
-
- return $this->ftp->mdel($path);
+ $this->delete($path, $recursive);
}
function dirlist($path = '.', $include_hidden = true, $recursive = false ) {
$limit_file = false;
}
+ mbstring_binary_safe_encoding();
+
$list = $this->ftp->dirlist($path);
- if ( ! $list )
+ if ( empty( $list ) && ! $this->exists( $path ) ) {
+
+ reset_mbstring_encoding();
+
return false;
+ }
$ret = array();
foreach ( $list as $struc ) {
$struc['files'] = array();
}
+ // Replace symlinks formatted as "source -> target" with just the source name
+ if ( $struc['islink'] )
+ $struc['name'] = preg_replace( '/(\s*->\s*.*)$/', '', $struc['name'] );
+
$ret[ $struc['name'] ] = $struc;
}
+
+ reset_mbstring_encoding();
+
return $ret;
}
$this->ftp->quit();
}
}
-
-?>
scripts.mit.edu / autoinstalls / wordpress.git / blobdiff