Changes from tags/3.7/src/wp-admin/includes/class-wp-filesystem-ssh2.php at r31381 to tags/4.0/src/wp-admin/includes/class-wp-filesystem-ssh2.php at r31381

File:

• tags/4.0/src/wp-admin/includes/class-wp-filesystem-ssh2.php (modified) (15 diffs)

tags/4.0/src/wp-admin/includes/class-wp-filesystem-ssh2.php

@@ -36 +36 @@
 class WP_Filesystem_SSH2 extends WP_Filesystem_Base {
 
-    var $link = false;
-    var $sftp_link = false;
-    var $keys = false;
-    var $errors = array();
-    var $options = array();
-
-    function __construct($opt='') {
+    public $link = false;
+    public $sftp_link = false;
+    public $keys = false;
+    public $errors = array();
+    public $options = array();
+
+    public function __construct($opt='') {
         $this->method = 'ssh2';
         $this->errors = new WP_Error();
@@ -86 +86 @@
 
         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 {
@@ -94 +95 @@
     }
 
-    function connect() {
+    public function connect() {
         if ( ! $this->keys ) {
             $this->link = @ssh2_connect($this->options['hostname'], $this->options['port']);
@@ -123 +124 @@
     }
 
-    function run_command( $command, $returnbool = false) {
+    public function run_command( $command, $returnbool = false) {
 
         if ( ! $this->link )
@@ -144 +145 @@
     }
 
-    function get_contents( $file ) {
+    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, $mode = false ) {
+    public function put_contents($file, $contents, $mode = false ) {
         $ret = file_put_contents( 'ssh2.sftp://' . $this->sftp_link . '/' . ltrim( $file, '/' ), $contents );
 
@@ -165 +166 @@
     }
 
-    function cwd() {
+    public function cwd() {
         $cwd = $this->run_command('pwd');
         if ( $cwd )
@@ -172 +173 @@
     }
 
-    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;
@@ -184 +185 @@
     }
 
-    function chmod($file, $mode = false, $recursive = false) {
+    public function chmod($file, $mode = false, $recursive = false) {
         if ( ! $this->exists($file) )
             return false;
@@ -212 +213 @@
      * @return bool Returns true on success or false on failure.
      */
-    function chown( $file, $owner, $recursive = false ) {
+    public function chown( $file, $owner, $recursive = false ) {
         if ( ! $this->exists($file) )
             return false;
@@ -220 +221 @@
     }
 
-    function owner($file) {
+    public function owner($file) {
         $owneruid = @fileowner('ssh2.sftp://' . $this->sftp_link . '/' . ltrim($file, '/'));
         if ( ! $owneruid )
@@ -230 +231 @@
     }
 
-    function getchmod($file) {
-        return substr(decoct(@fileperms( 'ssh2.sftp://' . $this->sftp_link . '/' . ltrim($file, '/') )),3);
-    }
-
-    function group($file) {
+    public function getchmod($file) {
+        return substr( decoct( @fileperms( 'ssh2.sftp://' . $this->sftp_link . '/' . ltrim( $file, '/' ) ) ), -3 );
+    }
+
+    public function group($file) {
         $gid = @filegroup('ssh2.sftp://' . $this->sftp_link . '/' . ltrim($file, '/'));
         if ( ! $gid )
@@ -244 +245 @@
     }
 
-    function copy($source, $destination, $overwrite = false, $mode = false) {
+    public function copy($source, $destination, $overwrite = false, $mode = false) {
         if ( ! $overwrite && $this->exists($destination) )
             return false;
@@ -253 +254 @@
     }
 
-    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, $type = false) {
+    public function delete($file, $recursive = false, $type = false) {
         if ( 'f' == $type || $this->is_file($file) )
             return ssh2_sftp_unlink($this->sftp_link, $file);
@@ -271 +272 @@
     }
 
-    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) {
+    public function touch($file, $time = 0, $atime = 0) {
         //Not implemented.
     }
 
-    function mkdir($path, $chmod = false, $chown = false, $chgrp = false) {
+    public function mkdir($path, $chmod = false, $chown = false, $chgrp = false) {
         $path = untrailingslashit($path);
         if ( empty($path) )
@@ -331 +332 @@
     }
 
-    function rmdir($path, $recursive = false) {
+    public function rmdir($path, $recursive = false) {
         return $this->delete($path, $recursive);
     }
 
-    function dirlist($path, $include_hidden = true, $recursive = false) {
+    public function dirlist($path, $include_hidden = true, $recursive = false) {
         if ( $this->is_file($path) ) {
             $limit_file = basename($path);