var $link = false;
var $sftp_link = false;
var $keys = false;
- /*
- * This is the timeout value for ssh results.
- * Slower servers might need this incressed, but this number otherwise should not change.
- *
- * @parm $timeout int
- *
- */
- var $timeout = 15;
var $errors = array();
var $options = array();
- var $permission = 0644;
-
function WP_Filesystem_SSH2($opt='') {
$this->method = 'ssh2';
$this->errors = new WP_Error();
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.
$this->errors->add('command', sprintf(__('Unable to perform command: %s'), $command));
} else {
stream_set_blocking( $stream, true );
- stream_set_timeout( $stream, $this->timeout );
+ stream_set_timeout( $stream, FS_TIMEOUT );
$data = stream_get_contents( $stream );
fclose( $stream );
return false;
}
- function setDefaultPermissions($perm) {
- $this->debug("setDefaultPermissions();");
- if ( $perm )
- $this->permission = $perm;
- }
-
function get_contents($file, $type = '', $resumepos = 0 ) {
$file = ltrim($file, '/');
return file_get_contents('ssh2.sftp://' . $this->sftp_link . '/' . $file);
return file('ssh2.sftp://' . $this->sftp_link . '/' . $file);
}
- function put_contents($file, $contents, $type = '' ) {
+ function put_contents($file, $contents, $mode = false ) {
$file = ltrim($file, '/');
- return file_put_contents('ssh2.sftp://' . $this->sftp_link . '/' . $file, $contents);
+ $ret = file_put_contents('ssh2.sftp://' . $this->sftp_link . '/' . $file, $contents);
+
+ $this->chmod($file, $mode);
+
+ return false !== $ret;
}
function cwd() {
$cwd = $this->run_command('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 ( ! $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) )
return $this->run_command(sprintf('chmod %o %s', $mode, escapeshellarg($file)), true);
return $this->run_command(sprintf('chmod -R %o %s', $mode, escapeshellarg($file)), true);
}
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);
}
//Not implmented.
}
- function mkdir($path, $chmod = null, $chown = false, $chgrp = false) {
+ function mkdir($path, $chmod = false, $chown = false, $chgrp = false) {
$path = untrailingslashit($path);
- $chmod = !empty($chmod) ? $chmod : $this->permission;
+ if ( ! $chmod )
+ $chmod = FS_CHMOD_DIR;
if ( ! ssh2_sftp_mkdir($this->sftp_link, $path, $chmod, true) )
return false;
if ( $chown )
return $this->delete($path, $recursive);
}
- function dirlist($path, $incdot = false, $recursive = false) {
+ function dirlist($path, $include_hidden = true, $recursive = false) {
if ( $this->is_file($path) ) {
- $limitFile = basename($path);
+ $limit_file = basename($path);
$path = dirname($path);
} else {
- $limitFile = false;
+ $limit_file = false;
}
+
if ( ! $this->is_dir($path) )
return false;
$ret = array();
$dir = @dir('ssh2.sftp://' . $this->sftp_link .'/' . ltrim($path, '/') );
+
if ( ! $dir )
return false;
+
while (false !== ($entry = $dir->read()) ) {
$struc = array();
$struc['name'] = $entry;
if ( '.' == $struc['name'] || '..' == $struc['name'] )
continue; //Do not care about these folders.
- if ( '.' == $struc['name'][0] && !$incdot)
+
+ if ( ! $include_hidden && '.' == $struc['name'][0] )
continue;
- if ( $limitFile && $struc['name'] != $limitFile)
+
+ if ( $limit_file && $struc['name'] != $limit_file )
continue;
$struc['perms'] = $this->gethchmod($path.'/'.$entry);
if ( 'd' == $struc['type'] ) {
if ( $recursive )
- $struc['files'] = $this->dirlist($path . '/' . $struc['name'], $incdot, $recursive);
+ $struc['files'] = $this->dirlist($path . '/' . $struc['name'], $include_hidden, $recursive);
else
$struc['files'] = array();
}