Jetpack: Tidy up some logging calls, and add them to the WP-CLI code.

Author: georgestephanis

class.jetpack-cli.php

@@ -85,11 +85,13 @@ public function disconnect( $args, $assoc_args ) {
 
 		switch ( $action ) {
 			case 'blog':
+				Jetpack::log( 'disconnect' );
 				Jetpack::disconnect();
 				WP_CLI::success( __( 'Jetpack has been successfully disconnected.', 'jetpack' ) );
 				break;
 			case 'user':
 				if ( Jetpack::unlink_user( $user->ID ) ) {
+					Jetpack::log( 'unlink', $user->ID );
 					WP_CLI::success( sprintf( __( '%s has been successfully disconnected.', 'jetpack' ), $action ) );
 				} else {
 					WP_CLI::error( sprintf( __( '%s could not be disconnected.  Are you sure they\'re connected currently?', 'jetpack' ), "{$user->login} <{$user->email}>" ) );
@@ -156,11 +158,13 @@ public function module( $args, $assoc_args ) {
 				break;
 			case 'activate':
 				$module = Jetpack::get_module( $module_slug );
+				Jetpack::log( 'activate', $module_slug );
 				Jetpack::activate_module( $module_slug, false );
 				WP_CLI::success( sprintf( __( '%s has been activated.', 'jetpack' ), $module['name'] ) );
 				break;
 			case 'deactivate':
 				$module = Jetpack::get_module( $module_slug );
+				Jetpack::log( 'deactivate', $module_slug );
 				Jetpack::deactivate_module( $module_slug );
 				WP_CLI::success( sprintf( __( '%s has been deactivated.', 'jetpack' ), $module['name'] ) );
 				break;

class.jetpack.php

@@ -2036,7 +2036,7 @@ function admin_page_load() {
 
 				$module = stripslashes( $_GET['module'] );
 				check_admin_referer( "jetpack_activate-$module" );
-				Jetpack::log( 'activate' );
+				Jetpack::log( 'activate', $module );
 				Jetpack::activate_module( $module );
 				// The following two lines will rarely happen, as Jetpack::activate_module normally exits at the end.
 				wp_safe_redirect( Jetpack::admin_url( 'page=jetpack' ) );
@@ -2081,8 +2081,8 @@ function admin_page_load() {
 
 				$modules = stripslashes( $_GET['module'] );
 				check_admin_referer( "jetpack_deactivate-$modules" );
-				Jetpack::log( 'deactivate' );
 				foreach ( explode( ',', $modules ) as $module ) {
+					Jetpack::log( 'deactivate', $module );
 					Jetpack::deactivate_module( $module );
 					Jetpack::state( 'message', 'module_deactivated' );
 				}