Merge pull request Automattic#1505 from Automattic/add/sync-mock-option

Added Mock Jetpack Option to Sync options that don't have to live in the Database

Author: samhotchkiss

class.jetpack-sync.php

@@ -870,4 +870,31 @@ private function _get_post_count_cloud() {
 		return (int) $results['results']['total'];
 	}
 
+	/**
+	 * Sometimes we need to fake options to be able to sync data with .com
+	 * This is a helper function. That will make it easier to do just that.
+	 *
+	 * It will make sure that the options are synced when do_action( 'jetpack_sync_all_registered_options' );
+	 *
+	 * Which should happen everytime we update Jetpack to a new version or daily by Jetpack_Heartbeat.
+	 *
+	 * $callback is a function that is passed into a filter that returns the value of the option.
+	 * This value should never be false. Since we want to short circuit the get_option function
+	 * to return the value of the our callback.
+	 *
+	 * You can also trigger an update when a something else changes by calling the
+	 * do_action( 'add_option_jetpack_' . $option, 'jetpack_'.$option, $callback_function );
+	 * on the action that should that would trigger the update.
+	 *
+	 *
+	 * @param  string $option   Option will always be prefixed with Jetpack and be saved on .com side
+	 * @param  string or array  $callback
+	 */
+	function mock_option( $option , $callback ) {
+
+		add_filter( 'pre_option_jetpack_'. $option ,  $callback );
+		// Instead of passing a file we just pass in a string.
+		$this->options( 'mock-option' , 'jetpack_' . $option );
+
+	}
 }

class.jetpack.php

@@ -352,13 +352,7 @@ private function Jetpack() {
 		 * here, before we potentially fail out.
 		 */
 		add_filter( 'jetpack_require_lib_dir', 		array( $this, 'require_lib_dir' ) );
-		/**
-		 * Update the main_network_site on .com
-		 */
-		add_filter( 'pre_option_jetpack_main_network_site', array( $this, 'jetpack_main_network_site_option' ) );
-		add_action( 'update_option_siteurl', 			array( $this, 'update_jetpack_main_network_site_option' ) );
-		// Update jetpack_is_main_network on .com
-		add_filter( 'pre_option_jetpack_is_main_network', array( $this, 'is_main_network_option' ) );
+
 		/*
 		 * Load things that should only be in Network Admin.
 		 *
@@ -385,11 +379,22 @@ private function Jetpack() {
 			'siteurl',
 			'blogname',
 			'gmt_offset',
-			'timezone_string',
-			'jetpack_main_network_site',
-			'jetpack_is_main_network'
+			'timezone_string'
 		);
 
+		/**
+		 * Sometimes you want to sync data to .com without adding options to .org sites.
+		 * The mock option allows you to do just that.
+		 */
+		$this->sync->mock_option( 'is_main_network',   array( $this, 'is_main_network_option' ) );
+		$this->sync->mock_option( 'main_network_site', array( $this, 'jetpack_main_network_site_option' ) );
+
+		/**
+		 * Trigger an update to the main_network_site when we update the blogname of a site.
+		 *
+		 */
+		add_action( 'update_option_blogname', array( $this, 'update_jetpack_main_network_site_option' ) );
+
 		add_action( 'update_option', array( $this, 'log_settings_change' ), 10, 3 );
 
 		if ( defined( 'XMLRPC_REQUEST' ) && XMLRPC_REQUEST && isset( $_GET['for'] ) && 'jetpack' == $_GET['for'] ) {
@@ -645,7 +650,7 @@ function require_lib_dir( $lib_dir ) {
 	 * @param  bool $option
 	 * @return string
 	 */
-	function jetpack_main_network_site_option( $option ) {
+	public function jetpack_main_network_site_option( $option ) {
 		return network_site_url();
 	}
 
@@ -659,7 +664,7 @@ function jetpack_main_network_site_option( $option ) {
 	 *
 	 * @return boolean
 	 */
-	public static function is_main_network_option( $option ) {
+	public function is_main_network_option( $option ) {
 		// return '1' or ''
 		return (string) (bool) Jetpack::is_multi_network();
 	}
@@ -692,7 +697,7 @@ public static function is_multi_network() {
 	 * @return null
 	 */
 	function update_jetpack_main_network_site_option() {
-		do_action( 'add_option_jetpack_main_network_site', 'main_network_site', network_site_url() );
+		do_action( 'add_option_jetpack_main_network_site', 'jetpack_main_network_site', network_site_url() );
 		do_action( 'add_option_jetpack_is_main_network', 'jetpack_is_main_network', (string) (bool) Jetpack::is_multi_network() );
 	}