Add private sites module

_inc/client/security/index.jsx

@@ -21,6 +21,7 @@ import BackupsScan from './backups-scan';
 import Antispam from './antispam';
 import { ManagePlugins } from './manage-plugins';
 import { Monitor } from './monitor';
+import { Private } from './private';
 import { Protect } from './protect';
 import { SSO } from './sso';
 
@@ -72,13 +73,14 @@ export class Security extends Component {
 			foundAkismet = this.isAkismetFound(),
 			rewindActive = 'active' === get( this.props.rewindStatus, [ 'state' ], false ),
 			foundBackups = this.props.isModuleFound( 'vaultpress' ) || rewindActive,
-			foundMonitor = this.props.isModuleFound( 'monitor' );
+			foundMonitor = this.props.isModuleFound( 'monitor' ),
+			foundPrivateSites = this.props.isModuleFound( 'private' );
 
 		if ( ! this.props.searchTerm && ! this.props.active ) {
 			return null;
 		}
 
-		if ( ! foundSso && ! foundProtect && ! foundAkismet && ! foundBackups && ! foundMonitor ) {
+		if ( ! foundSso && ! foundProtect && ! foundAkismet && ! foundBackups && ! foundMonitor && ! foundPrivateSites ) {
 			return null;
 		}
 
@@ -106,6 +108,7 @@ export class Security extends Component {
 				<ManagePlugins { ...commonProps } />
 				{ foundProtect && <Protect { ...commonProps } /> }
 				{ foundSso && <SSO { ...commonProps } /> }
+				{ foundPrivateSites && <Private { ...commonProps } /> }
 			</div>
 		);
 	}

_inc/client/security/private.jsx

@@ -0,0 +1,52 @@
+/**
+ * External dependencies
+ */
+import React, { Component } from 'react';
+import { translate as __ } from 'i18n-calypso';
+
+/**
+ * Internal dependencies
+ */
+import { ModuleToggle } from 'components/module-toggle';
+import SettingsCard from 'components/settings-card';
+import SettingsGroup from 'components/settings-group';
+import { withModuleSettingsFormHelpers } from 'components/module-settings/with-module-settings-form-helpers';
+
+export const Private = withModuleSettingsFormHelpers(
+	class extends Component {
+		render() {
+			return (
+				<SettingsCard { ...this.props } module="private" hideButton>
+					<SettingsGroup
+						hasChild
+						module={ { module: 'private' } }
+						support={ {
+							text: __(
+								"This option is great if you're still working on your site " +
+									" and aren't quite ready to show it off to the rest of the internet yet."
+							),
+							link: 'https://jetpack.com/support/private',
+						} }
+					>
+						<p>
+							{ __(
+								'Private sites can only be seen by you ' +
+									'and other users who are members of this site.'
+							) }
+						</p>
+
+						<ModuleToggle
+							slug="private"
+							compact
+							activated={ this.props.getOptionValue( 'private' ) }
+							toggling={ this.props.isSavingAnyOption( 'private' ) }
+							toggleModule={ this.props.toggleModuleNow }
+						>
+							{ __( 'Make your site private' ) }
+						</ModuleToggle>
+					</SettingsGroup>
+				</SettingsCard>
+			);
+		}
+	}
+);

bin/phpcs-whitelist.js

@@ -22,4 +22,6 @@ module.exports = [
 	'modules/verification-tools.php',
 	'modules/wpcom-block-editor/class-jetpack-wpcom-block-editor.php',
 	'packages',
+	'modules/private.php',
+	'modules/private/',
 ];

class.jetpack.php

@@ -1809,9 +1809,66 @@ function user_role_change( $user_id ) {
 	}
 
 	/**
-	 * Loads the currently active modules.
+	 * Loads the private module if it has been activated.
+	 * Else, updates the admin dashboard with the site's private status.
 	 */
-	public static function load_modules() {
+	public static function load_private() {
+		if ( self::is_module_active( 'private' ) ) {
+			self::load_modules( array( 'private' ) );
+		} else {
+			add_action( 'update_right_now_text', array( __CLASS__, 'add_public_dashboard_glance_items' ) );
+			add_action( 'admin_enqueue_scripts', array( __CLASS__, 'wp_admin_glance_dashboard_style' ) );
+		}
+	}
+
+	/**
+	 * Basic styling for the wp-admin 'At a Glance' dashboard widget.
+	 * This is applied when the private module is inactive.
+	 * 
+	 * @param string $hook Page Hook Suffix for the current page.
+	 */
+	public static function wp_admin_glance_dashboard_style( $hook ) {
+		if ( 'index.php' !== $hook ) {
+			return;
+		}
+
+		$custom_css = '
+			.jp-at-a-glance__site-public {
+				color: #46B450;
+			}
+		';
+		wp_add_inline_style( 'dashboard', $custom_css );
+	}
+
+	/**
+	 * Adds a message to the 'At a Glance' dashboard widget.
+	 *
+	 * @param string $content Content of 'At A Glance' wp-admin dashboard widget.
+	 */
+	public static function add_public_dashboard_glance_items( $content ) {
+		return 
+			$content . 
+			'<br><br>' .
+			wp_kses(
+				sprintf(
+					/* translators: URL for Jetpack dashboard. */
+					__( '<span class="%1$1s">This site is set to public.</span> <a href="%2$2s">Make private</a>.', 'jetpack' ),
+					esc_attr( 'jp-at-a-glance__site-public' ),
+					esc_url( admin_url( 'admin.php?page=jetpack#/security?term=private' ) )
+				),
+				array(
+					'a' => array( 'href' => true ),
+					'span' => array( 'class' => true ),
+				)
+			);
+	}
+
+	/**
+	 * Loads modules from given array, otherwise all the currently active modules.
+	 *
+	 * @param array $modules Specific modules to be loaded.
+	 */
+	public static function load_modules( $modules = array() ) {
 		if (
 			! self::is_active()
 			&& ! self::is_development_mode()
@@ -1831,9 +1888,13 @@ public static function load_modules() {
 			do_action( 'updating_jetpack_version', $version, false );
 			Jetpack_Options::update_options( compact( 'version', 'old_version' ) );
 		}
-		list( $version ) = explode( ':', $version );
+		list( $version )            = explode( ':', $version );
+		$fetched_all_active_modules = false;
 
-		$modules = array_filter( Jetpack::get_active_modules(), array( 'Jetpack', 'is_module' ) );
+		if ( empty( $modules ) ) {
+			$modules                    = array_filter( Jetpack::get_active_modules(), array( 'Jetpack', 'is_module' ) );
+			$fetched_all_active_modules = true;
+		}
 
 		$modules_data = array();
 
@@ -1890,12 +1951,14 @@ public static function load_modules() {
 			do_action( 'jetpack_module_loaded_' . $module );
 		}
 
-		/**
-		 * Fires when all the modules are loaded.
-		 *
-		 * @since 1.1.0
-		 */
-		do_action( 'jetpack_modules_loaded' );
+		if ( $fetched_all_active_modules ) {
+			/**
+			* Fires when all the modules are loaded.
+			*
+			* @since 1.1.0
+			*/
+			do_action( 'jetpack_modules_loaded' );
+		}
 
 		// Load module-specific code that is needed even when a module isn't active. Loaded here because code contained therein may need actions such as setup_theme.
 		require_once( JETPACK__PLUGIN_DIR . 'modules/module-extras.php' );

jetpack.php

@@ -232,6 +232,7 @@ function jetpack_admin_missing_autoloader() { ?>
 add_action( 'updating_jetpack_version', array( 'Jetpack', 'do_version_bump' ), 10, 2 );
 add_action( 'init', array( 'Jetpack', 'init' ) );
 add_action( 'plugins_loaded', array( 'Jetpack', 'plugin_textdomain' ), 99 );
+add_action( 'plugins_loaded', array( 'Jetpack', 'load_private' ), 99 );
 add_action( 'plugins_loaded', array( 'Jetpack', 'load_modules' ), 100 );
 add_filter( 'jetpack_static_url', array( 'Jetpack', 'staticize_subdomain' ) );
 add_filter( 'is_jetpack_site', '__return_true' );

modules/module-extras.php

@@ -83,3 +83,28 @@ function jetpack_widgets_add_suffix( $widget_name ) {
 	);
 }
 add_filter( 'jetpack_widget_name', 'jetpack_widgets_add_suffix' );
+
+add_action( 'blog_privacy_selector', 'jetpack_priv_notice_privacy_selector' );
+
+/**
+ * Echos notice directing site owners to Jetpack's Private Site feature.
+ */
+function jetpack_priv_notice_privacy_selector() {
+	?>
+	<p>
+	<?php
+
+		wp_kses(
+			printf(
+				/* translators: URL to the Jetpack dashboard. */
+				__( 'You can also make your site completely private by allowing only registered users to see it. <a href="%s">Go to Private Site settings</a>.', 'jetpack' ),
+				esc_url( admin_url( 'admin.php?page=jetpack#/security?term=private' ) )
+			),
+			array( 'a' => array( 'href' => true ) )
+		);
+	?>
+	</p>
+
+	<?php
+}
+

modules/module-headings.php

@@ -131,6 +131,11 @@ function jetpack_get_module_i18n( $key ) {
 				'description' => _x( 'Publish posts by sending an email', 'Module Description', 'jetpack' ),
 			),
 
+			'private' => array(
+				'name' => _x( 'Private site', 'Module Name', 'jetpack' ),
+				'description' => _x( 'Make your site only visible to you and users you approve.', 'Module Description', 'jetpack' ),
+			),
+
 			'protect' => array(
 				'name' => _x( 'Protect', 'Module Name', 'jetpack' ),
 				'description' => _x( 'Protect yourself from brute force and distributed brute force attacks, which are the most common way for hackers to get into your site.', 'Module Description', 'jetpack' ),
@@ -328,6 +333,10 @@ function jetpack_get_module_i18n_tag( $key ) {
 			//  - modules/minileven.php
 			'Mobile' =>_x( 'Mobile', 'Module Tag', 'jetpack' ),
 
+			// Modules with `Private` tag:
+			//  - modules/private.php
+			'Private' =>_x( 'Private', 'Module Tag', 'jetpack' ),
+
 			// Modules with `Traffic` tag:
 			//  - modules/sitemaps.php
 			//  - modules/wordads.php

modules/module-info.php

@@ -912,3 +912,22 @@ function jetpack_more_info_copy_post() {
 	esc_html_e( 'Create a new post based on an existing post.', 'jetpack' );
 }
 add_action( 'jetpack_module_more_info_copy-post', 'jetpack_more_info_copy_post' );
+
+/**
+ * Private sites support link.
+ */
+function jetpack_private_more_link() {
+	echo 'https://jetpack.com/support/private';
+}
+add_action( 'jetpack_learn_more_button_private', 'jetpack_private_more_link' );
+
+/**
+ * Private sites description.
+ */
+function jetpack_private_more_info() {
+	esc_html_e(
+		'Make your site private. It will only be visible to registered users.',
+		'jetpack'
+	);
+}
+add_action( 'jetpack_module_more_info_private', 'jetpack_private_more_info' );

modules/private.php

@@ -0,0 +1,19 @@
+<?php
+/**
+ * Module Name: Private site
+ * Module Description: Make your site only visible to you and users you approve.
+ * Sort Order: 9
+ * First Introduced: 7.4.0
+ * Requires Connection: No
+ * Auto Activate: No
+ * Module Tags: Private
+ * Feature: Security
+ * Additional Search Queries: private, sandbox, launch, unlaunched, maintenance, coming soon
+ *
+ * @package Jetpack
+ */
+
+/* Private Site Class */
+require_once 'private/class-jetpack-private.php';
+
+Jetpack_Private::init();