Changeset 48089 for trunk/src/wp-admin/includes/class-wp-filesystem-ssh2.php

Timestamp:

06/19/2020 10:34:26 AM (6 years ago)

Author:

SergeyBiryukov

Message:

Coding Standards: Add some space around control structures in WP_Filesystem_* classes for consistency and better readability.

Additionally, synchronize $tempfile and $temphandle variable names in WP_Filesystem_FTPext and WP_Filesystem_ftpsockets.

See #49542.

File:

• trunk/src/wp-admin/includes/class-wp-filesystem-ssh2.php (modified) (20 diffs)

trunk/src/wp-admin/includes/class-wp-filesystem-ssh2.php

@@ -133 +133 @@
                 )
             );
+
             return false;
         }
@@ -146 +147 @@
                     )
                 );
+
                 return false;
             }
@@ -158 +160 @@
                     )
                 );
+
                 return false;
             }
@@ -163 +166 @@
 
         $this->sftp_link = ssh2_sftp( $this->link );
+
         if ( ! $this->sftp_link ) {
             $this->errors->add(
@@ -172 +176 @@
                 )
             );
+
             return false;
         }
@@ -195 +200 @@
             $path = '/./';
         }
+
         return 'ssh2.sftp://' . $this->sftp_link . '/' . ltrim( $path, '/' );
     }
@@ -212 +218 @@
 
         $stream = ssh2_exec( $this->link, $command );
+
         if ( ! $stream ) {
             $this->errors->add(
@@ -233 +240 @@
             }
         }
+
         return false;
     }
@@ -293 +301 @@
     public function cwd() {
         $cwd = ssh2_sftp_realpath( $this->sftp_link, '.' );
+
         if ( $cwd ) {
             $cwd = trailingslashit( trim( $cwd ) );
         }
+
         return $cwd;
     }
@@ -326 +336 @@
             return false;
         }
+
         if ( ! $recursive || ! $this->is_dir( $file ) ) {
             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 );
     }
@@ -362 +374 @@
             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 );
     }
@@ -380 +393 @@
             return false;
         }
+
         if ( ! $recursive || ! $this->is_dir( $file ) ) {
             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 );
     }
@@ -396 +411 @@
     public function owner( $file ) {
         $owneruid = @fileowner( $this->sftp_path( $file ) );
+
         if ( ! $owneruid ) {
             return false;
         }
+
         if ( ! function_exists( 'posix_getpwuid' ) ) {
             return $owneruid;
         }
+
         $ownerarray = posix_getpwuid( $owneruid );
+
         if ( ! $ownerarray ) {
             return false;
         }
+
         return $ownerarray['name'];
     }
@@ -431 +451 @@
     public function group( $file ) {
         $gid = @filegroup( $this->sftp_path( $file ) );
+
         if ( ! $gid ) {
             return false;
         }
+
         if ( ! function_exists( 'posix_getgrgid' ) ) {
             return $gid;
         }
+
         $grouparray = posix_getgrgid( $gid );
+
         if ( ! $grouparray ) {
             return false;
         }
+
         return $grouparray['name'];
     }
@@ -461 +486 @@
             return false;
         }
+
         $content = $this->get_contents( $source );
+
         if ( false === $content ) {
             return false;
         }
+
         return $this->put_contents( $destination, $content, $mode );
     }
@@ -509 +537 @@
             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 ) {
@@ -518 +549 @@
             }
         }
+
         return ssh2_sftp_rmdir( $this->sftp_link, $file );
     }
@@ -651 +683 @@
     public function mkdir( $path, $chmod = false, $chown = false, $chgrp = false ) {
         $path = untrailingslashit( $path );
+
         if ( empty( $path ) ) {
             return false;
@@ -658 +691 @@
             $chmod = FS_CHMOD_DIR;
         }
+
         if ( ! ssh2_sftp_mkdir( $this->sftp_link, $path, $chmod, true ) ) {
             return false;
         }
+
         if ( $chown ) {
             $this->chown( $path, $chown );
         }
+
         if ( $chgrp ) {
             $this->chgrp( $path, $chgrp );
         }
+
         return true;
     }
@@ -765 +802 @@
             $ret[ $struc['name'] ] = $struc;
         }
+
         $dir->close();
         unset( $dir );
+
         return $ret;
     }