update jetpack 8.2.1

Signed-off-by: Anthony G. Basile <blueness@gentoo.org>

1 files changed, 128 insertions, 16 deletions

diff --git a/plugins/jetpack/modules/subscriptions.php b/plugins/jetpack/modules/subscriptions.php
index 3b6bd9f5..e7547981 100644
--- a/plugins/jetpack/modules/subscriptions.php
+++ b/plugins/jetpack/modules/subscriptions.php
@@ -92,6 +92,9 @@ class Jetpack_Subscriptions {
 		add_filter( 'jetpack_published_post_flags', array( $this, 'set_post_flags' ), 10, 2 );
 
 		add_filter( 'post_updated_messages', array( $this, 'update_published_message' ), 18, 1 );
+
+		// Set "social_notifications_subscribe" option during the first-time activation.
+		add_action( 'jetpack_activate_module_subscriptions',   array( $this, 'set_social_notifications_subscribe' ) );
 	}
 
 	/**
@@ -297,6 +300,30 @@ class Jetpack_Subscriptions {
 			'stc_enabled'
 		);
 
+		/** Email me whenever: Someone follows my blog ***************************************************/
+		/* @since 8.1 */
+
+		add_settings_section(
+			'notifications_section',
+			__( 'Someone follows my blog', 'jetpack' ),
+			array( $this, 'social_notifications_subscribe_section' ),
+			'discussion'
+		);
+
+		add_settings_field(
+			'jetpack_subscriptions_social_notifications_subscribe',
+			__( 'Email me whenever', 'jetpack' ),
+			array( $this, 'social_notifications_subscribe_field' ),
+			'discussion',
+			'notifications_section'
+		);
+
+		register_setting(
+			'discussion',
+			'social_notifications_subscribe',
+			array( $this, 'social_notifications_subscribe_validate' )
+		);
+
 		/** Subscription Messaging Options ******************************************************/
 
 		register_setting(
@@ -371,6 +398,69 @@ class Jetpack_Subscriptions {
 	<?php
 	}
 
+	/**
+	 * Someone follows my blog section
+	 *
+	 * @since 8.1
+	 */
+	public function social_notifications_subscribe_section() {
+		// Atypical usage here. We emit jquery to move subscribe notification checkbox to be with the rest of the email notification settings
+		?>
+		<script type="text/javascript">
+			jQuery( function( $ )  {
+				var table = $( '#social_notifications_subscribe' ).parents( 'table:first' ),
+					header = table.prevAll( 'h2:first' ),
+					newParent = $( '#moderation_notify' ).parent( 'label' ).parent();
+
+				if ( ! table.length || ! header.length || ! newParent.length ) {
+					return;
+				}
+
+				newParent.append( '<br/>' ).append( table.end().parent( 'label' ).siblings().andSelf() );
+				header.remove();
+				table.remove();
+			} );
+		</script>
+		<?php
+	}
+
+	/**
+	 * Someone follows my blog Toggle
+	 *
+	 * @since 8.1
+	 */
+	public function social_notifications_subscribe_field() {
+		$checked = intval( 'on' === get_option( 'social_notifications_subscribe', 'on' ) );
+		?>
+
+		<label>
+			<input type="checkbox" name="social_notifications_subscribe" id="social_notifications_subscribe" value="1" <?php checked( $checked ); ?> />
+			<?php
+				/* translators: this is a label for a setting that starts with "Email me whenever" */
+				esc_html_e( 'Someone follows my blog', 'jetpack' );
+			?>
+		</label>
+		<?php
+	}
+
+	/**
+	 * Validate "Someone follows my blog" option
+	 *
+	 * @since 8.1
+	 *
+	 * @param String $input the input string to be validated.
+	 * @return string on|off
+	 */
+	public function social_notifications_subscribe_validate( $input ) {
+		// If it's not set (was unchecked during form submission) or was set to off (during option update), return 'off'.
+		if ( ! $input || 'off' === $input ) {
+			return 'off';
+		}
+
+		// Otherwise we return 'on'.
+		return 'on';
+	}
+
 	function validate_settings( $settings ) {
 		global $allowedposttags;
 
@@ -434,6 +524,7 @@ class Jetpack_Subscriptions {
 	 *	not_subscribed  : strange error.  Jetpack servers at WordPress.com could subscribe the email.
 	 *	disabled        : Site owner has disabled subscriptions.
 	 *	active          : Already subscribed.
+	 *	pending         : Tried to subscribe before but the confirmation link is never clicked. No confirmation email is sent.
 	 *	unknown         : strange error.  Jetpack servers at WordPress.com returned something malformed.
 	 *	unknown_status  : strange error.  Jetpack servers at WordPress.com returned something I didn't understand.
 	 */
@@ -487,21 +578,24 @@ class Jetpack_Subscriptions {
 			}
 
 			switch ( $response[0]['status'] ) {
-			case 'error' :
-				$r[] = new Jetpack_Error( 'not_subscribed' );
-				continue 2;
-			case 'disabled' :
-				$r[] = new Jetpack_Error( 'disabled' );
-				continue 2;
-			case 'active' :
-				$r[] = new Jetpack_Error( 'active' );
-				continue 2;
-			case 'pending' :
-				$r[] = true;
-				continue 2;
-			default :
-				$r[] = new Jetpack_Error( 'unknown_status', (string) $response[0]['status'] );
-				continue 2;
+				case 'error':
+					$r[] = new Jetpack_Error( 'not_subscribed' );
+					continue 2;
+				case 'disabled':
+					$r[] = new Jetpack_Error( 'disabled' );
+					continue 2;
+				case 'active':
+					$r[] = new Jetpack_Error( 'active' );
+					continue 2;
+				case 'confirming':
+					$r[] = true;
+					continue 2;
+				case 'pending':
+					$r[] = new Jetpack_Error( 'pending' );
+					continue 2;
+				default:
+					$r[] = new Jetpack_Error( 'unknown_status', (string) $response[0]['status'] );
+					continue 2;
 			}
 		}
 
@@ -565,9 +659,14 @@ class Jetpack_Subscriptions {
 				$result = 'opted_out';
 				break;
 			case 'active':
-			case 'pending':
 				$result = 'already';
 				break;
+			case 'flooded_email':
+				$result = 'many_pending_subs';
+				break;
+			case 'pending':
+				$result = 'pending';
+				break;
 			default:
 				$result = 'error';
 				break;
@@ -773,6 +872,19 @@ class Jetpack_Subscriptions {
 		}
 	}
 
+	/**
+	 * Set the social_notifications_subscribe option to `off` when the Subscriptions module is activated in the first time.
+	 *
+	 * @since 8.1
+	 *
+	 * @return null
+	 */
+	function set_social_notifications_subscribe() {
+		if ( false === get_option( 'social_notifications_subscribe' ) ) {
+			add_option( 'social_notifications_subscribe', 'off' );
+		}
+	}
+
 }
 
 Jetpack_Subscriptions::init();