Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 25 additions & 5 deletions src/js/_enqueues/admin/site-health.js
Original file line number Diff line number Diff line change
Expand Up @@ -161,6 +161,19 @@ jQuery( function( $ ) {
issue.test = issue.status + count;
}

if ( 'critical' === issue.status || 'recommended' === issue.status ) {
if ( 'undefined' === typeof SiteHealth.site_status.actionable_issues ) {
SiteHealth.site_status.actionable_issues = [];
}

SiteHealth.site_status.actionable_issues.push( {
test: issue.test,
label: issue.label,
status: issue.status,
description: issue.description
} );
}

if ( 'critical' === issue.status ) {
heading = sprintf(
_n( '%s critical issue', '%s critical issues', count ),
Expand Down Expand Up @@ -250,13 +263,19 @@ jQuery( function( $ ) {
}

if ( isStatusTab ) {
var postData = {
'action': 'health-check-site-status-result',
'_wpnonce': SiteHealth.nonce.site_status_result,
'counts': SiteHealth.site_status.issues
};

if ( 'undefined' !== typeof SiteHealth.site_status.actionable_issues ) {
postData.issues = JSON.stringify( SiteHealth.site_status.actionable_issues );
}

$.post(
ajaxurl,
{
'action': 'health-check-site-status-result',
'_wpnonce': SiteHealth.nonce.site_status_result,
'counts': SiteHealth.site_status.issues
}
postData
);

if ( 100 === val ) {
Expand Down Expand Up @@ -375,6 +394,7 @@ jQuery( function( $ ) {
'recommended': 0,
'critical': 0
};
SiteHealth.site_status.actionable_issues = [];
}

if ( 0 < SiteHealth.site_status.direct.length ) {
Expand Down
54 changes: 53 additions & 1 deletion src/wp-admin/includes/ajax-actions.php
Original file line number Diff line number Diff line change
Expand Up @@ -5466,7 +5466,59 @@ function wp_ajax_health_check_site_status_result() {
wp_send_json_error();
}

set_transient( 'health-check-site-status-result', wp_json_encode( $_POST['counts'] ) );
$counts = isset( $_POST['counts'] ) ? wp_unslash( $_POST['counts'] ) : null;
if ( ! is_array( $counts ) ) {
wp_send_json_error();
}

$good = isset( $counts['good'] ) ? (int) $counts['good'] : 0;
$recommended = isset( $counts['recommended'] ) ? (int) $counts['recommended'] : 0;
$critical = isset( $counts['critical'] ) ? (int) $counts['critical'] : 0;

$payload = array(
'good' => $good,
'recommended' => $recommended,
'critical' => $critical,
);

$previous_raw = get_transient( 'health-check-site-status-result' );
$previous = is_string( $previous_raw ) ? json_decode( $previous_raw, true ) : array();
$previous = is_array( $previous ) ? $previous : array();
$previous_issues = ( isset( $previous['issues'] ) && is_array( $previous['issues'] ) ) ? $previous['issues'] : array();

if ( array_key_exists( 'issues', $_POST ) ) {
$issues_raw = wp_unslash( $_POST['issues'] );
$decoded = is_string( $issues_raw ) ? json_decode( $issues_raw, true ) : null;

if ( is_array( $decoded ) ) {
$sanitized_issues = array();
foreach ( $decoded as $issue ) {
if ( ! is_array( $issue ) ) {
continue;
}

$status = isset( $issue['status'] ) ? sanitize_key( $issue['status'] ) : '';
if ( ! in_array( $status, array( 'recommended', 'critical' ), true ) ) {
continue;
}

$sanitized_issues[] = array(
'test' => isset( $issue['test'] ) ? sanitize_text_field( $issue['test'] ) : '',
'label' => isset( $issue['label'] ) ? sanitize_text_field( $issue['label'] ) : '',
'status' => $status,
'description' => isset( $issue['description'] ) ? wp_strip_all_tags( $issue['description'] ) : '',
);
}

$payload['issues'] = $sanitized_issues;
} elseif ( $previous_issues ) {
$payload['issues'] = $previous_issues;
}
} elseif ( $previous_issues ) {
$payload['issues'] = $previous_issues;
}

set_transient( 'health-check-site-status-result', wp_json_encode( $payload ) );

wp_send_json_success();
}
Expand Down
14 changes: 14 additions & 0 deletions src/wp-admin/includes/class-wp-site-health.php
Original file line number Diff line number Diff line change
Expand Up @@ -3453,14 +3453,28 @@ public function wp_cron_scheduled_check() {
}
}

$site_status['issues'] = array();
foreach ( $results as $result ) {
if ( ! is_array( $result ) || ! isset( $result['status'] ) ) {
continue;
}

if ( 'critical' === $result['status'] ) {
++$site_status['critical'];
} elseif ( 'recommended' === $result['status'] ) {
++$site_status['recommended'];
} else {
++$site_status['good'];
}

if ( in_array( $result['status'], array( 'recommended', 'critical' ), true ) ) {
$site_status['issues'][] = array(
'test' => isset( $result['test'] ) ? (string) $result['test'] : '',
'label' => isset( $result['label'] ) ? wp_strip_all_tags( (string) $result['label'] ) : '',
'status' => $result['status'],
'description' => isset( $result['description'] ) ? wp_strip_all_tags( (string) $result['description'] ) : '',
);
}
}

set_transient( 'health-check-site-status-result', wp_json_encode( $site_status ) );
Expand Down
Loading
Loading