Changeset 42343 for trunk/src/wp-includes/ms-files.php

Timestamp:

11/30/2017 11:09:33 PM (9 years ago)

Author:

pento

Message:

Code is Poetry.
WordPress' code just... wasn't.
This is now dealt with.

Props jrf, pento, netweb, GaryJ, jdgrimes, westonruter, Greg Sherwood from PHPCS, and everyone who's ever contributed to WPCS and PHPCS.
Fixes #41057.

File:

• trunk/src/wp-includes/ms-files.php (modified) (6 diffs)

trunk/src/wp-includes/ms-files.php

@@ -12 +12 @@
 require_once( dirname( dirname( __FILE__ ) ) . '/wp-load.php' );
 
-if ( !is_multisite() )
+if ( ! is_multisite() ) {
         die( 'Multisite support not enabled' );
+}
 
 ms_file_constants();
@@ -24 +25 @@
 }
 
-$file = rtrim( BLOGUPLOADDIR, '/' ) . '/' . str_replace( '..', '', $_GET[ 'file' ] );
-if ( !is_file( $file ) ) {
+$file = rtrim( BLOGUPLOADDIR, '/' ) . '/' . str_replace( '..', '', $_GET['file'] );
+if ( ! is_file( $file ) ) {
         status_header( 404 );
         die( '404 — File not found.' );
@@ -31 +32 @@
 
 $mime = wp_check_filetype( $file );
-if ( false === $mime[ 'type' ] && function_exists( 'mime_content_type' ) )
-        $mime[ 'type' ] = mime_content_type( $file );
+if ( false === $mime['type'] && function_exists( 'mime_content_type' ) ) {
+        $mime['type'] = mime_content_type( $file );
+}
 
-if ( $mime[ 'type' ] )
-        $mimetype = $mime[ 'type' ];
-else
+if ( $mime['type'] ) {
+        $mimetype = $mime['type'];
+} else {
         $mimetype = 'image/' . substr( $file, strrpos( $file, '.' ) + 1 );
+}
 
 header( 'Content-Type: ' . $mimetype ); // always send this
-if ( false === strpos( $_SERVER['SERVER_SOFTWARE'], 'Microsoft-IIS' ) )
+if ( false === strpos( $_SERVER['SERVER_SOFTWARE'], 'Microsoft-IIS' ) ) {
         header( 'Content-Length: ' . filesize( $file ) );
+}
 
 // Optional support for X-Sendfile and X-Accel-Redirect
@@ -53 +57 @@
 
 $last_modified = gmdate( 'D, d M Y H:i:s', filemtime( $file ) );
-$etag = '"' . md5( $last_modified ) . '"';
+$etag          = '"' . md5( $last_modified ) . '"';
 header( "Last-Modified: $last_modified GMT" );
 header( 'ETag: ' . $etag );
@@ -61 +65 @@
 $client_etag = isset( $_SERVER['HTTP_IF_NONE_MATCH'] ) ? stripslashes( $_SERVER['HTTP_IF_NONE_MATCH'] ) : false;
 
-if ( ! isset( $_SERVER['HTTP_IF_MODIFIED_SINCE'] ) )
+if ( ! isset( $_SERVER['HTTP_IF_MODIFIED_SINCE'] ) ) {
         $_SERVER['HTTP_IF_MODIFIED_SINCE'] = false;
+}
 
 $client_last_modified = trim( $_SERVER['HTTP_IF_MODIFIED_SINCE'] );
@@ -69 +74 @@
 
 // Make a timestamp for our most recent modification...
-$modified_timestamp = strtotime($last_modified);
+$modified_timestamp = strtotime( $last_modified );
 
 if ( ( $client_last_modified && $client_etag )
-        ? ( ( $client_modified_timestamp >= $modified_timestamp) && ( $client_etag == $etag ) )
-        : ( ( $client_modified_timestamp >= $modified_timestamp) || ( $client_etag == $etag ) )
+        ? ( ( $client_modified_timestamp >= $modified_timestamp ) && ( $client_etag == $etag ) )
+        : ( ( $client_modified_timestamp >= $modified_timestamp ) || ( $client_etag == $etag ) )
         ) {
         status_header( 304 );