<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[48535] trunk/src: Site Health: Include new tests to check for the ability to upload files.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { white-space: pre-line; overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="https://core.trac.wordpress.org/changeset/48535">48535</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"https://core.trac.wordpress.org/changeset/48535","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>whyisjake</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2020-07-21 15:19:58 +0000 (Tue, 21 Jul 2020)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>Site Health: Include new tests to check for the ability to upload files.
Several new checks:
* `max_file_uploads`
* `file_uploads`
* `post_max_size`
* `upload_max_filesize`
* `upload_max`
* `max_file_uploads`
In addition, new function `parse_ini_size()` that converts shorthand byte strings to bytes. Useful for size comparisons.
Fixes <a href="https://core.trac.wordpress.org/ticket/50038">#50038</a>.
Props dd32, donmhico, JavierCasares, SergeyBiryukov, ayeshrajans, Clorith, ipstenu, sabernhardt, whyisjake.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpadminincludesclasswpdebugdataphp">trunk/src/wp-admin/includes/class-wp-debug-data.php</a></li>
<li><a href="#trunksrcwpadminincludesclasswpsitehealthphp">trunk/src/wp-admin/includes/class-wp-site-health.php</a></li>
<li><a href="#trunksrcwpincludesfunctionsphp">trunk/src/wp-includes/functions.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpadminincludesclasswpdebugdataphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/includes/class-wp-debug-data.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/class-wp-debug-data.php 2020-07-21 14:40:43 UTC (rev 48534)
+++ trunk/src/wp-admin/includes/class-wp-debug-data.php 2020-07-21 15:19:58 UTC (rev 48535)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -519,6 +519,47 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'value' => ( is_array( $imagick_version ) ? $imagick_version['versionString'] : $imagick_version ),
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! function_exists( 'ini_get' ) ) {
+ $info['wp-media']['fields']['ini_get'] = array(
+ 'label' => __( 'File upload settings' ),
+ 'value' => sprintf(
+ /* translators: %s: ini_get() */
+ __( 'Unable to determine some settings, as the %s function has been disabled.' ),
+ 'ini_get()'
+ ),
+ 'debug' => 'ini_get() is disabled',
+ );
+ } else {
+ // Get the PHP ini directive values.
+ $post_max_size = ini_get( 'post_max_size' );
+ $upload_max_size = ini_get( 'upload_max_filesize' );
+ $max_file_uploads = ini_get( 'max_file_uploads' );
+ $effective = min( parse_ini_size( $post_max_size ), parse_ini_size( $upload_max_size ) );
+
+ // Add info in Media section.
+ $info['wp-media']['fields']['file_uploads'] = array(
+ 'label' => __( 'File uploads' ),
+ 'value' => empty( ini_get( 'file_uploads' ) ) ? __( 'Disabled' ) : __( 'Enabled' ),
+ 'debug' => 'File uploads is turned off',
+ );
+ $info['wp-media']['fields']['post_max_size'] = array(
+ 'label' => __( 'Max size of post data allowed' ),
+ 'value' => $post_max_size,
+ );
+ $info['wp-media']['fields']['upload_max_filesize'] = array(
+ 'label' => __( 'Max size of an uploaded file' ),
+ 'value' => $upload_max_size,
+ );
+ $info['wp-media']['fields']['upload_max'] = array(
+ 'label' => __( 'Max effective file size' ),
+ 'value' => size_format( $effective ),
+ );
+ $info['wp-media']['fields']['max_file_uploads'] = array(
+ 'label' => __( 'Max number of files allowed' ),
+ 'value' => number_format( $max_file_uploads ),
+ );
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> // If Imagick is used as our editor, provide some more information about its limitations.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( 'WP_Image_Editor_Imagick' === _wp_image_editor_choose() && isset( $imagick ) && $imagick instanceof Imagick ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $limits = array(
</span></span></pre></div>
<a id="trunksrcwpadminincludesclasswpsitehealthphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/includes/class-wp-site-health.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/class-wp-site-health.php 2020-07-21 14:40:43 UTC (rev 48534)
+++ trunk/src/wp-admin/includes/class-wp-site-health.php 2020-07-21 15:19:58 UTC (rev 48535)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1956,6 +1956,76 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Test if 'file_uploads' directive in PHP.ini is turned off
+ *
+ * @since 5.5.0
+ *
+ * @return array The test results.
+ */
+ public function get_test_file_uploads() {
+ $result = array(
+ 'label' => __( 'Files can be uploaded.' ),
+ 'status' => 'good',
+ 'badge' => array(
+ 'label' => __( 'Performance' ),
+ 'color' => 'blue',
+ ),
+ 'description' => sprintf(
+ '<p>%s</p>',
+ sprintf(
+ /* translators: %1$s: file_uploads %2$s: php.ini */
+ __( 'The %1$s directive in %2$s determines if uploading to is allowed in your WordPress.' ),
+ '<code>file_uploads</code>',
+ '<code>php.ini</code>'
+ )
+ ),
+ 'actions' => '',
+ 'test' => 'file_uploads',
+ );
+
+ if ( ! function_exists( 'ini_get' ) ) {
+ $result['status'] = 'critical';
+ $result['description'] .= sprintf(
+ /* translators: %s: ini_get() */
+ __( 'The %s function has been disabled, some media settings are unavailable because of this.' ),
+ '<code>ini_get()</code>'
+ );
+ return $result;
+ }
+
+ if ( empty( ini_get( 'file_uploads' ) ) ) {
+ $result['status'] = 'critical';
+ $result['description'] .= sprintf(
+ '<p>%s</p>',
+ sprintf(
+ /* translators: %1$s: file_uploads %2$s: 0 */
+ __( '%1$s is set to %2$s. You won\'t be able to upload files in your WordPress.' ),
+ '<code>file_uploads</code>',
+ '<code>0</code>'
+ )
+ );
+ return $result;
+ }
+
+ if ( parse_ini_size( ini_get( 'post_max_size' ) ) !== parse_ini_size( ini_get( 'upload_max_filesize' ) ) ) {
+ $result['label'] = __( 'Mismatched "post_max_size" and "upload_max_filesize" values.' );
+ $result['status'] = 'recommended';
+ $result['description'] = sprintf(
+ '<p>%s</p>',
+ sprintf(
+ /* translators: %1$s: post_max_size %2$s: upload_max_filesize */
+ __( 'The settings for %1$s and %2$s are not the same, this could cause some problems when trying to upload files.' ),
+ '<code>post_max_size</code>',
+ '<code>upload_max_filesize</code>'
+ )
+ );
+ return $result;
+ }
+
+ return $result;
+ }
+
+ /**
</ins><span class="cx" style="display: block; padding: 0 10px"> * Return a set of tests that belong to the site status page.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * Each site status test is defined here, they may be `direct` tests, that run on page load, or `async` tests
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2025,6 +2095,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'label' => __( 'Debugging enabled' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'test' => 'is_in_debug_mode',
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'file_uploads' => array(
+ 'label' => __( 'File uploads' ),
+ 'test' => 'file_uploads',
+ ),
</ins><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'async' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'dotorg_communication' => array(
</span></span></pre></div>
<a id="trunksrcwpincludesfunctionsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/functions.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/functions.php 2020-07-21 14:40:43 UTC (rev 48534)
+++ trunk/src/wp-includes/functions.php 2020-07-21 15:19:58 UTC (rev 48535)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -477,6 +477,38 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Converts a shorthand byte string to bytes.
+ *
+ * Useful when needing to compare two byte strings for size differences.
+ *
+ * E.g.
+ * "1G" (1 Gigabyte) = 1073741824
+ * "10M" (10 Megabytes) = 10485760
+ * "1K" (1 Kilobyte) = 1024
+ *
+ * @since 5.5.0
+ *
+ * @param string $size_string Shorthand byte string
+ * @return int $size_string converted to numberic bytes.
+ */
+function parse_ini_size( $size_string ) {
+ $size_string = trim( $size_string );
+ $last = strtolower( substr( $size_string, - 1 ) );
+ $value = intval( $size_string );
+
+ switch ( $last ) {
+ case 'g':
+ return (int) $value * GB_IN_BYTES;
+ case 'm':
+ return (int) $value * MB_IN_BYTES;
+ case 'k':
+ return (int) $value * KB_IN_BYTES;
+ default:
+ return (int) $value;
+ }
+}
+
+/**
</ins><span class="cx" style="display: block; padding: 0 10px"> * Convert a duration to human readable format.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 5.1.0
</span></span></pre>
</div>
</div>
</body>
</html>