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

Timestamp:

06/19/2020 10:34:26 AM (5 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-direct.php (modified) (16 diffs)

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

@@ -65 +65 @@
     public function put_contents( $file, $contents, $mode = false ) {
         $fp = @fopen( $file, 'wb' );
+
         if ( ! $fp ) {
             return false;
@@ -126 +127 @@
             return false;
         }
+
         if ( ! $recursive ) {
             return chgrp( $file, $group );
         }
+
         if ( ! $this->is_dir( $file ) ) {
             return chgrp( $file, $group );
         }
+
         // Is a directory, and we want recursive.
         $file     = trailingslashit( $file );
         $filelist = $this->dirlist( $file );
+
         foreach ( $filelist as $filename ) {
             $this->chgrp( $file . $filename, $group, $recursive );
@@ -168 +173 @@
             return chmod( $file, $mode );
         }
+
         // Is a directory, and we want recursive.
         $file     = trailingslashit( $file );
         $filelist = $this->dirlist( $file );
+
         foreach ( (array) $filelist as $filename => $filemeta ) {
             $this->chmod( $file . $filename, $mode, $recursive );
@@ -193 +200 @@
             return false;
         }
+
         if ( ! $recursive ) {
             return chown( $file, $owner );
         }
+
         if ( ! $this->is_dir( $file ) ) {
             return chown( $file, $owner );
         }
+
         // Is a directory, and we want recursive.
         $filelist = $this->dirlist( $file );
+
         foreach ( $filelist as $filename ) {
             $this->chown( $file . '/' . $filename, $owner, $recursive );
         }
+
         return true;
     }
@@ -217 +229 @@
     public function owner( $file ) {
         $owneruid = @fileowner( $file );
+
         if ( ! $owneruid ) {
             return false;
         }
+
         if ( ! function_exists( 'posix_getpwuid' ) ) {
             return $owneruid;
         }
+
         $ownerarray = posix_getpwuid( $owneruid );
+
         if ( ! $ownerarray ) {
             return false;
         }
+
         return $ownerarray['name'];
     }
@@ -254 +271 @@
     public function group( $file ) {
         $gid = @filegroup( $file );
+
         if ( ! $gid ) {
             return false;
         }
+
         if ( ! function_exists( 'posix_getgrgid' ) ) {
             return $gid;
         }
+
         $grouparray = posix_getgrgid( $gid );
+
         if ( ! $grouparray ) {
             return false;
         }
+
         return $grouparray['name'];
     }
@@ -286 +308 @@
 
         $rtval = copy( $source, $destination );
+
         if ( $mode ) {
             $this->chmod( $destination, $mode );
         }
+
         return $rtval;
     }
@@ -315 +339 @@
         if ( $this->copy( $source, $destination, $overwrite ) && $this->exists( $destination ) ) {
             $this->delete( $source );
+
             return true;
         } else {
@@ -338 +363 @@
             return false;
         }
+
         $file = str_replace( '\\', '/', $file ); // For Win32, occasional problems deleting files otherwise.
 
@@ -343 +369 @@
             return @unlink( $file );
         }
+
         if ( ! $recursive && $this->is_dir( $file ) ) {
             return @rmdir( $file );
@@ -352 +379 @@
 
         $retval = true;
+
         if ( is_array( $filelist ) ) {
             foreach ( $filelist as $filename => $fileinfo ) {
@@ -481 +509 @@
             $time = time();
         }
+
         if ( 0 == $atime ) {
             $atime = time();
         }
+
         return touch( $file, $time, $atime );
     }
@@ -504 +534 @@
         // Safe mode fails with a trailing slash under certain PHP versions.
         $path = untrailingslashit( $path );
+
         if ( empty( $path ) ) {
             return false;
@@ -515 +546 @@
             return false;
         }
+
         $this->chmod( $path, $chmod );
+
         if ( $chown ) {
             $this->chown( $path, $chown );
         }
+
         if ( $chgrp ) {
             $this->chgrp( $path, $chgrp );
         }
+
         return true;
     }
@@ -577 +612 @@
 
         $dir = dir( $path );
+
         if ( ! $dir ) {
             return false;
@@ -620 +656 @@
             $ret[ $struc['name'] ] = $struc;
         }
+
         $dir->close();
         unset( $dir );
+
         return $ret;
     }