Changeset 45104 for trunk/src/wp-includes/ms-functions.php

Timestamp:

04/02/2019 11:32:31 PM (6 years ago)

Author:

azaozz

Message:

Site health:

• Prevent fatal errors from timeouts on the Tools => Site Health => Info tab.
• Use the get_dirsize() and recurse_dirsize() functions to calculate directory sizes. The results are cached.
• Introduce "timeout protection" in recurse_dirsize().

Props pento, Clorith, xkon, afercia, jeremyfelt, azaozz.
Fixes #46645.

File:

• trunk/src/wp-includes/ms-functions.php (modified) (1 diff)

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

@@ -1779 +1779 @@
 
 /**
- * Get the size of a directory.
- *
- * A helper function that is used primarily to check whether
- * a blog has exceeded its allowed upload space.
- *
- * @since MU (3.0.0)
- *
- * @param string $directory Full path of a directory.
- * @return int Size of the directory in MB.
- */
-function get_dirsize( $directory ) {
-    $dirsize = get_transient( 'dirsize_cache' );
-    if ( is_array( $dirsize ) && isset( $dirsize[ $directory ]['size'] ) ) {
-        return $dirsize[ $directory ]['size'];
-    }
-
-    if ( ! is_array( $dirsize ) ) {
-        $dirsize = array();
-    }
-
-    // Exclude individual site directories from the total when checking the main site,
-    // as they are subdirectories and should not be counted.
-    if ( is_main_site() ) {
-        $dirsize[ $directory ]['size'] = recurse_dirsize( $directory, $directory . '/sites' );
-    } else {
-        $dirsize[ $directory ]['size'] = recurse_dirsize( $directory );
-    }
-
-    set_transient( 'dirsize_cache', $dirsize, HOUR_IN_SECONDS );
-    return $dirsize[ $directory ]['size'];
-}
-
-/**
- * Get the size of a directory recursively.
- *
- * Used by get_dirsize() to get a directory's size when it contains
- * other directories.
- *
- * @since MU (3.0.0)
- * @since 4.3.0 $exclude parameter added.
- *
- * @param string $directory Full path of a directory.
- * @param string $exclude   Optional. Full path of a subdirectory to exclude from the total.
- * @return int|false Size in MB if a valid directory. False if not.
- */
-function recurse_dirsize( $directory, $exclude = null ) {
-    $size = 0;
-
-    $directory = untrailingslashit( $directory );
-
-    if ( ! file_exists( $directory ) || ! is_dir( $directory ) || ! is_readable( $directory ) || $directory === $exclude ) {
-        return false;
-    }
-
-    if ( $handle = opendir( $directory ) ) {
-        while ( ( $file = readdir( $handle ) ) !== false ) {
-            $path = $directory . '/' . $file;
-            if ( $file != '.' && $file != '..' ) {
-                if ( is_file( $path ) ) {
-                    $size += filesize( $path );
-                } elseif ( is_dir( $path ) ) {
-                    $handlesize = recurse_dirsize( $path, $exclude );
-                    if ( $handlesize > 0 ) {
-                        $size += $handlesize;
-                    }
-                }
-            }
-        }
-        closedir( $handle );
-    }
-    return $size;
-}
-
-/**
  * Check an array of MIME types against a whitelist.
  *