X-Git-Url: https://scripts.mit.edu/gitweb/autoinstalls/wordpress.git/blobdiff_plain/98a4d31e52bd56c908617df281730bd4ba58d110..refs/tags/wordpress-4.0:/wp-admin/includes/class-wp-filesystem-ssh2.php diff --git a/wp-admin/includes/class-wp-filesystem-ssh2.php b/wp-admin/includes/class-wp-filesystem-ssh2.php index 89763df8..4618f288 100644 --- a/wp-admin/includes/class-wp-filesystem-ssh2.php +++ b/wp-admin/includes/class-wp-filesystem-ssh2.php @@ -1,13 +1,6 @@ method = 'ssh2'; $this->errors = new WP_Error(); @@ -83,7 +66,7 @@ class WP_Filesystem_SSH2 extends WP_Filesystem_Base { 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. @@ -102,7 +85,8 @@ class WP_Filesystem_SSH2 extends WP_Filesystem_Base { $this->options['username'] = $opt['username']; if ( empty ($opt['password']) ) { - if ( !$this->keys ) //password can be blank if we are using keys + // Password can be blank if we are using keys. + if ( !$this->keys ) $this->errors->add('empty_password', __('SSH2 password is required')); } else { $this->options['password'] = $opt['password']; @@ -110,7 +94,7 @@ class WP_Filesystem_SSH2 extends WP_Filesystem_Base { } - function connect() { + public function connect() { if ( ! $this->keys ) { $this->link = @ssh2_connect($this->options['hostname'], $this->options['port']); } else { @@ -139,7 +123,7 @@ class WP_Filesystem_SSH2 extends WP_Filesystem_Base { return true; } - function run_command( $command, $returnbool = false) { + public function run_command( $command, $returnbool = false) { if ( ! $this->link ) return false; @@ -148,7 +132,7 @@ class WP_Filesystem_SSH2 extends WP_Filesystem_Base { $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 ); @@ -160,67 +144,83 @@ class WP_Filesystem_SSH2 extends WP_Filesystem_Base { return false; } - function setDefaultPermissions($perm) { - $this->debug("setDefaultPermissions();"); - if ( $perm ) - $this->permission = $perm; - } - - function get_contents($file, $type = '', $resumepos = 0 ) { + public function get_contents( $file ) { $file = ltrim($file, '/'); return file_get_contents('ssh2.sftp://' . $this->sftp_link . '/' . $file); } - function get_contents_array($file) { + public function get_contents_array($file) { $file = ltrim($file, '/'); return file('ssh2.sftp://' . $this->sftp_link . '/' . $file); } - function put_contents($file, $contents, $type = '' ) { - $file = ltrim($file, '/'); - return file_put_contents('ssh2.sftp://' . $this->sftp_link . '/' . $file, $contents); + public function put_contents($file, $contents, $mode = false ) { + $ret = file_put_contents( 'ssh2.sftp://' . $this->sftp_link . '/' . ltrim( $file, '/' ), $contents ); + + if ( $ret !== strlen( $contents ) ) + return false; + + $this->chmod($file, $mode); + + return true; } - function cwd() { + public function cwd() { $cwd = $this->run_command('pwd'); - if( $cwd ) + if ( $cwd ) $cwd = trailingslashit($cwd); return $cwd; } - function chdir($dir) { + public function chdir($dir) { return $this->run_command('cd ' . $dir, true); } - function chgrp($file, $group, $recursive = false ) { + public function chgrp($file, $group, $recursive = false ) { if ( ! $this->exists($file) ) return false; if ( ! $recursive || ! $this->is_dir($file) ) - return $this->run_command(sprintf('chgrp %o %s', $mode, escapeshellarg($file)), true); - return $this->run_command(sprintf('chgrp -R %o %s', $mode, escapeshellarg($file)), true); + return $this->run_command(sprintf('chgrp %s %s', escapeshellarg($group), escapeshellarg($file)), true); + return $this->run_command(sprintf('chgrp -R %s %s', escapeshellarg($group), escapeshellarg($file)), true); } - function chmod($file, $mode = false, $recursive = false) { - if( ! $mode ) - $mode = $this->permission; - if( ! $mode ) - return false; + public function chmod($file, $mode = false, $recursive = 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 chown($file, $owner, $recursive = false ) { + /** + * Change the ownership of a file / folder. + * + * @since Unknown + * + * @param string $file Path to the file. + * @param mixed $owner A user name or number. + * @param bool $recursive Optional. If set True changes file owner recursivly. Defaults to False. + * @return bool Returns true on success or false on failure. + */ + public function chown( $file, $owner, $recursive = false ) { if ( ! $this->exists($file) ) return false; if ( ! $recursive || ! $this->is_dir($file) ) - return $this->run_command(sprintf('chown %o %s', $mode, escapeshellarg($file)), true); - return $this->run_command(sprintf('chown -R %o %s', $mode, escapeshellarg($file)), true); + return $this->run_command(sprintf('chown %s %s', escapeshellarg($owner), escapeshellarg($file)), true); + return $this->run_command(sprintf('chown -R %s %s', escapeshellarg($owner), escapeshellarg($file)), true); } - function owner($file) { + public function owner($file) { $owneruid = @fileowner('ssh2.sftp://' . $this->sftp_link . '/' . ltrim($file, '/')); if ( ! $owneruid ) return false; @@ -230,11 +230,11 @@ class WP_Filesystem_SSH2 extends WP_Filesystem_Base { return $ownerarray['name']; } - function getchmod($file) { - return substr(decoct(@fileperms( 'ssh2.sftp://' . $this->sftp_link . '/' . ltrim($file, '/') )),3); + public function getchmod($file) { + return substr( decoct( @fileperms( 'ssh2.sftp://' . $this->sftp_link . '/' . ltrim( $file, '/' ) ) ), -3 ); } - function group($file) { + public function group($file) { $gid = @filegroup('ssh2.sftp://' . $this->sftp_link . '/' . ltrim($file, '/')); if ( ! $gid ) return false; @@ -244,80 +244,84 @@ class WP_Filesystem_SSH2 extends WP_Filesystem_Base { return $grouparray['name']; } - function copy($source, $destination, $overwrite = false ) { - if( ! $overwrite && $this->exists($destination) ) + public function copy($source, $destination, $overwrite = false, $mode = false) { + 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); + return $this->put_contents($destination, $content, $mode); } - function move($source, $destination, $overwrite = false) { + public function move($source, $destination, $overwrite = false) { return @ssh2_sftp_rename($this->link, $source, $destination); } - function delete($file, $recursive = false) { - if ( $this->is_file($file) ) + public function delete($file, $recursive = false, $type = false) { + if ( 'f' == $type || $this->is_file($file) ) return ssh2_sftp_unlink($this->sftp_link, $file); if ( ! $recursive ) return ssh2_sftp_rmdir($this->sftp_link, $file); $filelist = $this->dirlist($file); if ( is_array($filelist) ) { foreach ( $filelist as $filename => $fileinfo) { - $this->delete($file . '/' . $filename, $recursive); + $this->delete($file . '/' . $filename, $recursive, $fileinfo['type']); } } return ssh2_sftp_rmdir($this->sftp_link, $file); } - function exists($file) { + public function exists($file) { $file = ltrim($file, '/'); return file_exists('ssh2.sftp://' . $this->sftp_link . '/' . $file); } - function is_file($file) { + public function is_file($file) { $file = ltrim($file, '/'); return is_file('ssh2.sftp://' . $this->sftp_link . '/' . $file); } - function is_dir($path) { + public function is_dir($path) { $path = ltrim($path, '/'); return is_dir('ssh2.sftp://' . $this->sftp_link . '/' . $path); } - function is_readable($file) { + public function is_readable($file) { $file = ltrim($file, '/'); return is_readable('ssh2.sftp://' . $this->sftp_link . '/' . $file); } - function is_writable($file) { + public function is_writable($file) { $file = ltrim($file, '/'); return is_writable('ssh2.sftp://' . $this->sftp_link . '/' . $file); } - function atime($file) { + public function atime($file) { $file = ltrim($file, '/'); return fileatime('ssh2.sftp://' . $this->sftp_link . '/' . $file); } - function mtime($file) { + public function mtime($file) { $file = ltrim($file, '/'); return filemtime('ssh2.sftp://' . $this->sftp_link . '/' . $file); } - function size($file) { + public function size($file) { $file = ltrim($file, '/'); return filesize('ssh2.sftp://' . $this->sftp_link . '/' . $file); } - function touch($file, $time = 0, $atime = 0) { - //Not implmented. + public function touch($file, $time = 0, $atime = 0) { + //Not implemented. } - function mkdir($path, $chmod = null, $chown = false, $chgrp = false) { + public function mkdir($path, $chmod = false, $chown = false, $chgrp = false) { $path = untrailingslashit($path); - $chmod = !empty($chmod) ? $chmod : $this->permission; + if ( empty($path) ) + return false; + + if ( ! $chmod ) + $chmod = FS_CHMOD_DIR; if ( ! ssh2_sftp_mkdir($this->sftp_link, $path, $chmod, true) ) return false; if ( $chown ) @@ -327,33 +331,38 @@ class WP_Filesystem_SSH2 extends WP_Filesystem_Base { return true; } - function rmdir($path, $recursive = false) { + public function rmdir($path, $recursive = false) { return $this->delete($path, $recursive); } - function dirlist($path, $incdot = false, $recursive = false) { + public 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); @@ -369,7 +378,7 @@ class WP_Filesystem_SSH2 extends WP_Filesystem_Base { 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(); }