Changeset 48089 for trunk/src/wp-admin/includes/class-wp-filesystem-base.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-base.php (modified) (14 diffs)

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

@@ -56 +56 @@
     public function abspath() {
         $folder = $this->find_folder( ABSPATH );
+
         // Perhaps the FTP folder is rooted at the WordPress install.
         // Check for wp-includes folder in root. Could have some false positives, but rare.
@@ -61 +62 @@
             $folder = '/';
         }
+
         return $folder;
     }
@@ -189 +191 @@
                     continue;
                 }
+
                 if ( $folder === $dir ) {
                     return trailingslashit( constant( $constant ) );
@@ -199 +202 @@
                     continue;
                 }
+
                 if ( 0 === stripos( $folder, $dir ) ) { // $folder starts with $dir.
                     $potential_folder = preg_replace( '#^' . preg_quote( $dir, '#' ) . '/#i', trailingslashit( constant( $constant ) ), $folder );
@@ -205 +209 @@
                     if ( $this->is_dir( $potential_folder ) ) {
                         $this->cache[ $folder ] = $potential_folder;
+
                         return $potential_folder;
                     }
@@ -211 +216 @@
         } elseif ( 'direct' === $this->method ) {
             $folder = str_replace( '\\', '/', $folder ); // Windows path sanitisation.
+
             return trailingslashit( $folder );
         }
@@ -224 +230 @@
             $folder                 = trailingslashit( $folder );
             $this->cache[ $folder ] = $folder;
+
             return $folder;
         }
+
         $return = $this->search_for_folder( $folder );
+
         if ( $return ) {
             $this->cache[ $folder ] = $return;
         }
+
         return $return;
     }
@@ -280 +290 @@
                 // Let's try that folder:
                 $newdir = trailingslashit( path_join( $base, $key ) );
+
                 if ( $this->verbose ) {
                     /* translators: %s: Directory name. */
@@ -288 +299 @@
                 $newfolder = implode( '/', array_slice( $folder_parts, $index + 1 ) );
                 $ret       = $this->search_for_folder( $newfolder, $newdir, $loop );
+
                 if ( $ret ) {
                     return $ret;
@@ -301 +313 @@
                 printf( "\n" . __( 'Found %s' ) . "<br/>\n", $base . $last_path );
             }
+
             return trailingslashit( $base . $last_path );
         }
@@ -330 +343 @@
     public function gethchmod( $file ) {
         $perms = intval( $this->getchmod( $file ), 8 );
+
         if ( ( $perms & 0xC000 ) == 0xC000 ) { // Socket.
             $info = 's';
@@ -368 +382 @@
                     ( ( $perms & 0x0200 ) ? 't' : 'x' ) :
                     ( ( $perms & 0x0200 ) ? 'T' : '-' ) );
+
         return $info;
     }
@@ -403 +418 @@
         for ( $i = 0, $c = count( $attarray ); $i < $c; $i++ ) {
             $key = array_search( $attarray[ $i ], $legal, true );
+
             if ( $key ) {
                 $realmode .= $legal[ $key ];
@@ -421 +437 @@
         $newmode .= $mode[4] + $mode[5] + $mode[6];
         $newmode .= $mode[7] + $mode[8] + $mode[9];
+
         return $newmode;
     }