| @@ -7,8 +7,9 @@ | ||
| 7 | 7 | |
| 8 | 8 | use Automattic\Jetpack\Connection\Tokens; |
| 9 | 9 | use Automattic\Jetpack\Connection\Urls; |
| 10 | 10 | use Automattic\Jetpack\Constants; |
| 11 | +use Automattic\Jetpack\Current_Plan as Jetpack_Plan; | |
| 11 | 12 | use Automattic\Jetpack\Identity_Crisis; |
| 12 | 13 | use Automattic\Jetpack\Redirect; |
| 13 | 14 | use Automattic\Jetpack\Status; |
| 14 | 15 | use Automattic\Jetpack\Sync\Modules; |
| @@ -224,14 +225,14 @@ | ||
| 224 | 225 | 'private' => false, |
| 225 | 226 | ); |
| 226 | 227 | $debug_info['blog_token'] = array( |
| 227 | 228 | 'label' => 'Blog Public Key', |
| 228 | - 'value' => ( $blog_token ) ? $blog_key : 'Not set.', | |
| 229 | + 'value' => $blog_key ?? 'Not set.', | |
| 229 | 230 | 'private' => false, |
| 230 | 231 | ); |
| 231 | 232 | $debug_info['user_token'] = array( |
| 232 | 233 | 'label' => 'User Public Key', |
| 233 | - 'value' => ( $user_token ) ? $user_key : 'Not set.', | |
| 234 | + 'value' => $user_key ?? 'Not set.', | |
| 234 | 235 | 'private' => false, |
| 235 | 236 | ); |
| 236 | 237 | |
| 237 | 238 | /** Jetpack Environmental Information */ |
| @@ -283,14 +284,15 @@ | ||
| 283 | 284 | } |
| 284 | 285 | |
| 285 | 286 | $debug_info['protect_header'] = array( |
| 286 | 287 | 'label' => 'Trusted IP', |
| 287 | - 'value' => wp_json_encode( get_site_option( 'trusted_ip_header' ) ), | |
| 288 | + 'value' => wp_json_encode( get_site_option( 'trusted_ip_header' ), JSON_UNESCAPED_SLASHES ), | |
| 288 | 289 | 'private' => false, |
| 289 | 290 | ); |
| 290 | 291 | |
| 291 | 292 | /** Sync Debug Information */ |
| 292 | 293 | $sync_module = Modules::get_module( 'full-sync' ); |
| 294 | + '@phan-var \Automattic\Jetpack\Sync\Modules\Full_Sync_Immediately|\Automattic\Jetpack\Sync\Modules\Full_Sync $sync_module'; | |
| 293 | 295 | if ( $sync_module ) { |
| 294 | 296 | $sync_statuses = $sync_module->get_status(); |
| 295 | 297 | $human_readable_sync_status = array(); |
| 296 | 298 | foreach ( $sync_statuses as $sync_status => $sync_status_value ) { |
| @@ -299,9 +301,9 @@ | ||
| 299 | 301 | ? gmdate( 'r', $sync_status_value ) : $sync_status_value; |
| 300 | 302 | } |
| 301 | 303 | $debug_info['full_sync'] = array( |
| 302 | 304 | 'label' => 'Full Sync Status', |
| 303 | - 'value' => wp_json_encode( $human_readable_sync_status ), | |
| 305 | + 'value' => wp_json_encode( $human_readable_sync_status, JSON_UNESCAPED_SLASHES ), | |
| 304 | 306 | 'private' => false, |
| 305 | 307 | ); |
| 306 | 308 | } |
| 307 | 309 | |
| @@ -344,14 +346,14 @@ | ||
| 344 | 346 | ); |
| 345 | 347 | |
| 346 | 348 | $debug_info['idc_urls'] = array( |
| 347 | 349 | 'label' => 'IDC URLs', |
| 348 | - 'value' => wp_json_encode( $idc_urls ), | |
| 350 | + 'value' => wp_json_encode( $idc_urls, JSON_UNESCAPED_SLASHES ), | |
| 349 | 351 | 'private' => false, |
| 350 | 352 | ); |
| 351 | 353 | $debug_info['idc_error_option'] = array( |
| 352 | 354 | 'label' => 'IDC Error Option', |
| 353 | - 'value' => wp_json_encode( Jetpack_Options::get_option( 'sync_error_idc' ) ), | |
| 355 | + 'value' => wp_json_encode( Jetpack_Options::get_option( 'sync_error_idc' ), JSON_UNESCAPED_SLASHES ), | |
| 354 | 356 | 'private' => false, |
| 355 | 357 | ); |
| 356 | 358 | $debug_info['idc_optin'] = array( |
| 357 | 359 | 'label' => 'IDC Opt-in', |
| @@ -359,9 +361,9 @@ | ||
| 359 | 361 | 'private' => false, |
| 360 | 362 | ); |
| 361 | 363 | |
| 362 | 364 | // @todo -- Add testing results? |
| 363 | - $cxn_tests = new Jetpack_Cxn_Tests(); | |
| 365 | + $cxn_tests = new Automattic\Jetpack\Connection\Connection_Health_Tests(); | |
| 364 | 366 | $debug_info['cxn_tests'] = array( |
| 365 | 367 | 'label' => 'Connection Tests', |
| 366 | 368 | 'value' => '', |
| 367 | 369 | 'private' => false, |
| @@ -368,9 +370,9 @@ | ||
| 368 | 370 | ); |
| 369 | 371 | if ( $cxn_tests->pass() ) { |
| 370 | 372 | $debug_info['cxn_tests']['value'] = 'All Pass.'; |
| 371 | 373 | } else { |
| 372 | - $debug_info['cxn_tests']['value'] = wp_json_encode( $cxn_tests->list_fails() ); | |
| 374 | + $debug_info['cxn_tests']['value'] = wp_json_encode( $cxn_tests->list_fails(), JSON_UNESCAPED_SLASHES ); | |
| 373 | 375 | } |
| 374 | 376 | |
| 375 | 377 | return $debug_info; |
| 376 | 378 | } |
| @@ -388,9 +390,9 @@ | ||
| 388 | 390 | } |
| 389 | 391 | |
| 390 | 392 | $user = new WP_User( $master_user ); |
| 391 | 393 | |
| 392 | - if ( ! $user ) { | |
| 394 | + if ( ! $user->exists() ) { | |
| 393 | 395 | return __( 'Master user no longer exists. Please disconnect and reconnect Jetpack.', 'jetpack' ); |
| 394 | 396 | } |
| 395 | 397 | |
| 396 | 398 | return self::human_readable_user( $user ); |
