<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[28491] trunk/src/wp-admin/includes/class-wp-filesystem-ssh2.php: Add access modifier (`public`) to members and methods in `WP_Filesystem_SSH2`.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://core.trac.wordpress.org/changeset/28491">28491</a></dd>
<dt>Author</dt> <dd>wonderboymusic</dd>
<dt>Date</dt> <dd>2014-05-19 00:17:18 +0000 (Mon, 19 May 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Add access modifier (`public`) to members and methods in `WP_Filesystem_SSH2`.
See <a href="http://core.trac.wordpress.org/ticket/27881">#27881</a>, <a href="http://core.trac.wordpress.org/ticket/22234">#22234</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpadminincludesclasswpfilesystemssh2php">trunk/src/wp-admin/includes/class-wp-filesystem-ssh2.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpadminincludesclasswpfilesystemssh2php"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-admin/includes/class-wp-filesystem-ssh2.php (28490 => 28491)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-admin/includes/class-wp-filesystem-ssh2.php 2014-05-19 00:13:29 UTC (rev 28490)
+++ trunk/src/wp-admin/includes/class-wp-filesystem-ssh2.php 2014-05-19 00:17:18 UTC (rev 28491)
</span><span class="lines">@@ -35,13 +35,13 @@
</span><span class="cx"> */
</span><span class="cx"> class WP_Filesystem_SSH2 extends WP_Filesystem_Base {
</span><span class="cx">
</span><del>- var $link = false;
- var $sftp_link = false;
- var $keys = false;
- var $errors = array();
- var $options = array();
</del><ins>+ public $link = false;
+ public $sftp_link = false;
+ public $keys = false;
+ public $errors = array();
+ public $options = array();
</ins><span class="cx">
</span><del>- function __construct($opt='') {
</del><ins>+ public function __construct($opt='') {
</ins><span class="cx"> $this->method = 'ssh2';
</span><span class="cx"> $this->errors = new WP_Error();
</span><span class="cx">
</span><span class="lines">@@ -93,7 +93,7 @@
</span><span class="cx">
</span><span class="cx"> }
</span><span class="cx">
</span><del>- function connect() {
</del><ins>+ public function connect() {
</ins><span class="cx"> if ( ! $this->keys ) {
</span><span class="cx"> $this->link = @ssh2_connect($this->options['hostname'], $this->options['port']);
</span><span class="cx"> } else {
</span><span class="lines">@@ -122,7 +122,7 @@
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- function run_command( $command, $returnbool = false) {
</del><ins>+ public function run_command( $command, $returnbool = false) {
</ins><span class="cx">
</span><span class="cx"> if ( ! $this->link )
</span><span class="cx"> return false;
</span><span class="lines">@@ -143,17 +143,17 @@
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- function get_contents( $file ) {
</del><ins>+ public function get_contents( $file ) {
</ins><span class="cx"> $file = ltrim($file, '/');
</span><span class="cx"> return file_get_contents('ssh2.sftp://' . $this->sftp_link . '/' . $file);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- function get_contents_array($file) {
</del><ins>+ public function get_contents_array($file) {
</ins><span class="cx"> $file = ltrim($file, '/');
</span><span class="cx"> return file('ssh2.sftp://' . $this->sftp_link . '/' . $file);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- function put_contents($file, $contents, $mode = false ) {
</del><ins>+ public function put_contents($file, $contents, $mode = false ) {
</ins><span class="cx"> $ret = file_put_contents( 'ssh2.sftp://' . $this->sftp_link . '/' . ltrim( $file, '/' ), $contents );
</span><span class="cx">
</span><span class="cx"> if ( $ret !== strlen( $contents ) )
</span><span class="lines">@@ -164,18 +164,18 @@
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- function cwd() {
</del><ins>+ public function cwd() {
</ins><span class="cx"> $cwd = $this->run_command('pwd');
</span><span class="cx"> if ( $cwd )
</span><span class="cx"> $cwd = trailingslashit($cwd);
</span><span class="cx"> return $cwd;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- function chdir($dir) {
</del><ins>+ public function chdir($dir) {
</ins><span class="cx"> return $this->run_command('cd ' . $dir, true);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- function chgrp($file, $group, $recursive = false ) {
</del><ins>+ public function chgrp($file, $group, $recursive = false ) {
</ins><span class="cx"> if ( ! $this->exists($file) )
</span><span class="cx"> return false;
</span><span class="cx"> if ( ! $recursive || ! $this->is_dir($file) )
</span><span class="lines">@@ -183,7 +183,7 @@
</span><span class="cx"> return $this->run_command(sprintf('chgrp -R %s %s', escapeshellarg($group), escapeshellarg($file)), true);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- function chmod($file, $mode = false, $recursive = false) {
</del><ins>+ public function chmod($file, $mode = false, $recursive = false) {
</ins><span class="cx"> if ( ! $this->exists($file) )
</span><span class="cx"> return false;
</span><span class="cx">
</span><span class="lines">@@ -211,7 +211,7 @@
</span><span class="cx"> * @param bool $recursive Optional. If set True changes file owner recursivly. Defaults to False.
</span><span class="cx"> * @return bool Returns true on success or false on failure.
</span><span class="cx"> */
</span><del>- function chown( $file, $owner, $recursive = false ) {
</del><ins>+ public function chown( $file, $owner, $recursive = false ) {
</ins><span class="cx"> if ( ! $this->exists($file) )
</span><span class="cx"> return false;
</span><span class="cx"> if ( ! $recursive || ! $this->is_dir($file) )
</span><span class="lines">@@ -219,7 +219,7 @@
</span><span class="cx"> return $this->run_command(sprintf('chown -R %s %s', escapeshellarg($owner), escapeshellarg($file)), true);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- function owner($file) {
</del><ins>+ public function owner($file) {
</ins><span class="cx"> $owneruid = @fileowner('ssh2.sftp://' . $this->sftp_link . '/' . ltrim($file, '/'));
</span><span class="cx"> if ( ! $owneruid )
</span><span class="cx"> return false;
</span><span class="lines">@@ -229,11 +229,11 @@
</span><span class="cx"> return $ownerarray['name'];
</span><span class="cx"> }
</span><span class="cx">
</span><del>- function getchmod($file) {
</del><ins>+ public function getchmod($file) {
</ins><span class="cx"> return substr( decoct( @fileperms( 'ssh2.sftp://' . $this->sftp_link . '/' . ltrim( $file, '/' ) ) ), -3 );
</span><span class="cx"> }
</span><span class="cx">
</span><del>- function group($file) {
</del><ins>+ public function group($file) {
</ins><span class="cx"> $gid = @filegroup('ssh2.sftp://' . $this->sftp_link . '/' . ltrim($file, '/'));
</span><span class="cx"> if ( ! $gid )
</span><span class="cx"> return false;
</span><span class="lines">@@ -243,7 +243,7 @@
</span><span class="cx"> return $grouparray['name'];
</span><span class="cx"> }
</span><span class="cx">
</span><del>- function copy($source, $destination, $overwrite = false, $mode = false) {
</del><ins>+ public function copy($source, $destination, $overwrite = false, $mode = false) {
</ins><span class="cx"> if ( ! $overwrite && $this->exists($destination) )
</span><span class="cx"> return false;
</span><span class="cx"> $content = $this->get_contents($source);
</span><span class="lines">@@ -252,11 +252,11 @@
</span><span class="cx"> return $this->put_contents($destination, $content, $mode);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- function move($source, $destination, $overwrite = false) {
</del><ins>+ public function move($source, $destination, $overwrite = false) {
</ins><span class="cx"> return @ssh2_sftp_rename($this->link, $source, $destination);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- function delete($file, $recursive = false, $type = false) {
</del><ins>+ public function delete($file, $recursive = false, $type = false) {
</ins><span class="cx"> if ( 'f' == $type || $this->is_file($file) )
</span><span class="cx"> return ssh2_sftp_unlink($this->sftp_link, $file);
</span><span class="cx"> if ( ! $recursive )
</span><span class="lines">@@ -270,51 +270,51 @@
</span><span class="cx"> return ssh2_sftp_rmdir($this->sftp_link, $file);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- function exists($file) {
</del><ins>+ public function exists($file) {
</ins><span class="cx"> $file = ltrim($file, '/');
</span><span class="cx"> return file_exists('ssh2.sftp://' . $this->sftp_link . '/' . $file);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- function is_file($file) {
</del><ins>+ public function is_file($file) {
</ins><span class="cx"> $file = ltrim($file, '/');
</span><span class="cx"> return is_file('ssh2.sftp://' . $this->sftp_link . '/' . $file);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- function is_dir($path) {
</del><ins>+ public function is_dir($path) {
</ins><span class="cx"> $path = ltrim($path, '/');
</span><span class="cx"> return is_dir('ssh2.sftp://' . $this->sftp_link . '/' . $path);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- function is_readable($file) {
</del><ins>+ public function is_readable($file) {
</ins><span class="cx"> $file = ltrim($file, '/');
</span><span class="cx"> return is_readable('ssh2.sftp://' . $this->sftp_link . '/' . $file);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- function is_writable($file) {
</del><ins>+ public function is_writable($file) {
</ins><span class="cx"> $file = ltrim($file, '/');
</span><span class="cx"> return is_writable('ssh2.sftp://' . $this->sftp_link . '/' . $file);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- function atime($file) {
</del><ins>+ public function atime($file) {
</ins><span class="cx"> $file = ltrim($file, '/');
</span><span class="cx"> return fileatime('ssh2.sftp://' . $this->sftp_link . '/' . $file);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- function mtime($file) {
</del><ins>+ public function mtime($file) {
</ins><span class="cx"> $file = ltrim($file, '/');
</span><span class="cx"> return filemtime('ssh2.sftp://' . $this->sftp_link . '/' . $file);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- function size($file) {
</del><ins>+ public function size($file) {
</ins><span class="cx"> $file = ltrim($file, '/');
</span><span class="cx"> return filesize('ssh2.sftp://' . $this->sftp_link . '/' . $file);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- function touch($file, $time = 0, $atime = 0) {
</del><ins>+ public function touch($file, $time = 0, $atime = 0) {
</ins><span class="cx"> //Not implemented.
</span><span class="cx"> }
</span><span class="cx">
</span><del>- function mkdir($path, $chmod = false, $chown = false, $chgrp = false) {
</del><ins>+ public function mkdir($path, $chmod = false, $chown = false, $chgrp = false) {
</ins><span class="cx"> $path = untrailingslashit($path);
</span><span class="cx"> if ( empty($path) )
</span><span class="cx"> return false;
</span><span class="lines">@@ -330,11 +330,11 @@
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- function rmdir($path, $recursive = false) {
</del><ins>+ public function rmdir($path, $recursive = false) {
</ins><span class="cx"> return $this->delete($path, $recursive);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- function dirlist($path, $include_hidden = true, $recursive = false) {
</del><ins>+ public function dirlist($path, $include_hidden = true, $recursive = false) {
</ins><span class="cx"> if ( $this->is_file($path) ) {
</span><span class="cx"> $limit_file = basename($path);
</span><span class="cx"> $path = dirname($path);
</span></span></pre>
</div>
</div>
</body>
</html>