1 files changed, 29 insertions, 4 deletions

diff --git a/plugins/jetpack/modules/monitor.php b/plugins/jetpack/modules/monitor.php
index 79a9d15e..be57ceb6 100644
--- a/plugins/jetpack/modules/monitor.php
+++ b/plugins/jetpack/modules/monitor.php
@@ -1,14 +1,14 @@
 <?php
 /**
  * Module Name: Monitor
- * Module Description: Reports on site downtime.
+ * Module Description: Receive immediate notifications if your site goes down, 24/7.
  * Sort Order: 28
  * Recommendation Order: 10
  * First Introduced: 2.6
  * Requires Connection: Yes
  * Auto Activate: No
  * Module Tags: Recommended
- * Feature: Recommended, Performance-Security
+ * Feature: Security
  * Additional Search Queries: monitor, uptime, downtime, monitoring
  */
 
@@ -104,10 +104,24 @@ class Jetpack_Monitor {
 		if ( $xml->isError() ) {
 			wp_die( sprintf( '%s: %s', $xml->getErrorCode(), $xml->getErrorMessage() ) );
 		}
+
+		// To be used only in Jetpack_Core_Json_Api_Endpoints::get_remote_value.
+		update_option( 'monitor_receive_notifications', (bool) $value );
+
 		return true;
 	}
 
-	public function user_receives_notifications() {
+	/**
+	 * Checks the status of notifications for current Jetpack site user.
+	 *
+	 * @since 2.8
+	 * @since 4.1.0 New parameter $die_on_error.
+	 *
+	 * @param bool $die_on_error Whether to issue a wp_die when an error occurs or return a WP_Error object.
+	 *
+	 * @return boolean|WP_Error
+	 */
+	public function user_receives_notifications( $die_on_error = true ) {
 		Jetpack::load_xml_rpc_client();
 		$xml = new Jetpack_IXR_Client( array(
 			'user_id' => get_current_user_id()
@@ -115,7 +129,11 @@ class Jetpack_Monitor {
 		$xml->query( 'jetpack.monitor.isUserInNotifications' );
 
 		if ( $xml->isError() ) {
-			wp_die( sprintf( '%s: %s', $xml->getErrorCode(), $xml->getErrorMessage() ) );
+			if ( $die_on_error ) {
+				wp_die( sprintf( '%s: %s', $xml->getErrorCode(), $xml->getErrorMessage() ) );
+			} else {
+				return new WP_Error( $xml->getErrorCode(), $xml->getErrorMessage(), array( 'status' => 400 ) );
+			}
 		}
 		return $xml->getResponse();
 	}
@@ -155,6 +173,10 @@ class Jetpack_Monitor {
 	 * @return date in YYYY-MM-DD HH:mm:ss format
 	 */
 	public function monitor_get_last_downtime() {
+//		if ( $last_down = get_transient( 'monitor_last_downtime' ) ) {
+//			return $last_down;
+//		}
+
 		Jetpack::load_xml_rpc_client();
 		$xml = new Jetpack_IXR_Client( array(
 			'user_id' => get_current_user_id()
@@ -165,6 +187,9 @@ class Jetpack_Monitor {
 		if ( $xml->isError() ) {
 			return new WP_Error( 'monitor-downtime', $xml->getErrorMessage() );
 		}
+
+		set_transient( 'monitor_last_downtime', $xml->getResponse(), 10 * MINUTE_IN_SECONDS );
+
 		return $xml->getResponse();
 	}