Changeset 35325

Timestamp:

10/21/2015 02:02:59 PM (9 years ago)

Author:

DrewAPicture

Message:

Filesystem: Following the introduction of the KB|MB|GB|TB_IN_BYTES constants in [35286], use them in various places in core.

Props sudar.
Fixes #22405.

Location:

trunk/src

Files:

• wp-admin/includes/ms.php (modified) (2 diffs)
• wp-includes/cache.php (modified) (1 diff)
• wp-includes/deprecated.php (modified) (1 diff)
• wp-includes/functions.php (modified) (1 diff)
• wp-includes/media.php (modified) (1 diff)
• wp-includes/ms-functions.php (modified) (4 diffs)

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

@@ -29 +29 @@
 
     $file_size = filesize( $file['tmp_name'] );
-    if ( $space_left < $file_size )
-        $file['error'] = sprintf( __( 'Not enough space to upload. %1$s KB needed.' ), number_format( ($file_size - $space_left) /1024 ) );
-    if ( $file_size > ( 1024 * get_site_option( 'fileupload_maxk', 1500 ) ) )
-        $file['error'] = sprintf(__('This file is too big. Files must be less than %1$s KB in size.'), get_site_option( 'fileupload_maxk', 1500 ) );
+    if ( $space_left < $file_size ) {
+        $file['error'] = sprintf( __( 'Not enough space to upload. %1$s KB needed.' ), number_format( ( $file_size - $space_left ) / KB_IN_BYTES ) );
+    }
+
+    if ( $file_size > ( KB_IN_BYTES * get_site_option( 'fileupload_maxk', 1500 ) ) ) {
+        $file['error'] = sprintf( __( 'This file is too big. Files must be less than %1$s KB in size.' ), get_site_option( 'fileupload_maxk', 1500 ) );
+    }
+
     if ( upload_is_user_over_quota( false ) ) {
         $file['error'] = __( 'You have used your space quota. Please delete files before uploading.' );
     }
+
     if ( $file['error'] != '0' && ! isset( $_POST['html-upload'] ) && ( ! defined( 'DOING_AJAX' ) || ! DOING_AJAX ) ) {
         wp_die( $file['error'] . ' <a href="javascript:history.go(-1)">' . __( 'Back' ) . '</a>' );
@@ -444 +449 @@
 
     if ( $space_allowed > 1000 ) {
-        $space = number_format( $space_allowed / 1024 );
+        $space = number_format( $space_allowed / KB_IN_BYTES );
         /* translators: Gigabytes */
         $space .= __( 'GB' );

trunk/src/wp-includes/cache.php

@@ -692 +692 @@
         echo '<ul>';
         foreach ($this->cache as $group => $cache) {
-            echo "<li><strong>Group:</strong> $group - ( " . number_format( strlen( serialize( $cache ) ) / 1024, 2 ) . 'k )</li>';
+            echo "<li><strong>Group:</strong> $group - ( " . number_format( strlen( serialize( $cache ) ) / KB_IN_BYTES, 2 ) . 'k )</li>';
         }
         echo '</ul>';

trunk/src/wp-includes/deprecated.php

@@ -3285 +3285 @@
 
     $units = array( 0 => 'B', 1 => 'kB', 2 => 'MB', 3 => 'GB', 4 => 'TB' );
-    $log   = log( $bytes, 1024 );
+    $log   = log( $bytes, KB_IN_BYTES );
     $power = (int) $log;
-    $size  = pow( 1024, $log - $power );
+    $size  = pow( KB_IN_BYTES, $log - $power );
 
     if ( ! is_nan( $size ) && array_key_exists( $power, $units ) ) {

trunk/src/wp-includes/functions.php

@@ -211 +211 @@
 function size_format( $bytes, $decimals = 0 ) {
     $quant = array(
-        // ========================= Origin ====
-        'TB' => 1099511627776,  // pow( 1024, 4)
-        'GB' => 1073741824,     // pow( 1024, 3)
-        'MB' => 1048576,        // pow( 1024, 2)
-        'kB' => 1024,           // pow( 1024, 1)
-        'B'  => 1,              // pow( 1024, 0)
+        'TB' => TB_IN_BYTES,
+        'GB' => GB_IN_BYTES,
+        'MB' => MB_IN_BYTES,
+        'kB' => KB_IN_BYTES,
+        'B'  => 1,
     );
 

trunk/src/wp-includes/media.php

@@ -2639 +2639 @@
     $bytes = (int) $size;
     if ( strpos( $size, 'k' ) !== false )
-        $bytes = intval( $size ) * 1024;
+        $bytes = intval( $size ) * KB_IN_BYTES;
     elseif ( strpos( $size, 'm' ) !== false )
-        $bytes = intval($size) * 1024 * 1024;
+        $bytes = intval($size) * MB_IN_BYTES;
     elseif ( strpos( $size, 'g' ) !== false )
-        $bytes = intval( $size ) * 1024 * 1024 * 1024;
+        $bytes = intval( $size ) * GB_IN_BYTES;
     return $bytes;
 }

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

@@ -1875 +1875 @@
         return $upload;
 
-    if ( strlen( $upload['bits'] )  > ( 1024 * get_site_option( 'fileupload_maxk', 1500 ) ) )
-        return sprintf( __( 'This file is too big. Files must be less than %d KB in size.' ) . '<br />', get_site_option( 'fileupload_maxk', 1500 ));
+    if ( strlen( $upload['bits'] )  > ( KB_IN_BYTES * get_site_option( 'fileupload_maxk', 1500 ) ) ) {
+        return sprintf( __( 'This file is too big. Files must be less than %d KB in size.' ) . '<br />', get_site_option( 'fileupload_maxk', 1500 ) );
+    }
 
     return $upload;
@@ -2279 +2280 @@
     if ( false === $space_used ) {
         $upload_dir = wp_upload_dir();
-        $space_used = get_dirsize( $upload_dir['basedir'] ) / 1024 / 1024;
+        $space_used = get_dirsize( $upload_dir['basedir'] ) / MB_IN_BYTES;
     }
 
@@ -2323 +2324 @@
         $allowed = 0;
     }
-    $space_allowed = $allowed * 1024 * 1024;
+    $space_allowed = $allowed * MB_IN_BYTES;
     if ( get_site_option( 'upload_space_check_disabled' ) )
         return $space_allowed;
 
-    $space_used = get_space_used() * 1024 * 1024;
+    $space_used = get_space_used() * MB_IN_BYTES;
 
     if ( ( $space_allowed - $space_used ) <= 0 )
@@ -2354 +2355 @@
  */
 function upload_size_limit_filter( $size ) {
-    $fileupload_maxk = 1024 * get_site_option( 'fileupload_maxk', 1500 );
+    $fileupload_maxk = KB_IN_BYTES * get_site_option( 'fileupload_maxk', 1500 );
     if ( get_site_option( 'upload_space_check_disabled' ) )
         return min( $size, $fileupload_maxk );