Merge branch 'master' into fork

Author: octalmage

src/css/style.css

@@ -97,3 +97,29 @@
 {
 	display: inline;
 }
+
+/* Tooltip container */
+.wpe-tooltip {
+	position: relative;
+	display: inline-block;
+}
+
+/* Tooltip text */
+.wpe-tooltip .wpe-tooltiptext {
+	visibility: hidden;
+	width: 340px;
+	background-color: black;
+	color: #fff;
+	text-align: center;
+	padding: 5px 0;
+	border-radius: 6px;
+	position: absolute;
+	z-index: 1;
+	top: -25px;
+	left: 105%;
+}
+
+/* Show the tooltip text when you mouse over the tooltip container */
+.wpe-tooltip:hover .wpe-tooltiptext {
+	visibility: visible;
+}

src/js/run.js

@@ -35,7 +35,6 @@ jQuery( document ).ready(function($) {
 		$( '.spinner' ).show();
 		// Empty the results textarea.
 		resetDisplay();
-		$( '#footer' ).hide();
 		test_version = $( 'input[name=phptest_version]:checked' ).val();
 		only_active = $( 'input[name=active_plugins]:checked' ).val();
 		var data = {
@@ -53,6 +52,15 @@ jQuery( document ).ready(function($) {
 			checkStatus();
 		});
 	});
+
+	$( '#cleanupButton' ).on( 'click', function() {
+		clearTimeout( timer );
+		jQuery.get( ajaxurl,  { 'action': 'wpephpcompat_clean_up' }, function() {
+			resetDisplay();
+			checkStatus();
+		});
+	});
+
 });
 /**
  * Check the scan status and display results if scan is done.
@@ -111,7 +119,7 @@ function checkStatus() {
 		// Server responded correctly, but the response wasn't valid.
 		if ( 200 === xhr.status ) {
 			alert( "Error: " + error + "\nResponse: " + xhr.responseText );
-		} 
+		}
 		else { // Server didn't respond correctly.
 			alert( "Error: " + error + "\nStatus: " + xhr.status );
 		}
@@ -128,6 +136,7 @@ function resetDisplay() {
 	jQuery( '#standardMode' ).html('');
 	jQuery( '#wpe-progress-count' ).text('');
 	jQuery( '#wpe-progress-active' ).text('');
+	jQuery( '#footer' ).hide();
 }
 /**
  * Loop through a string and count the total matches.

src/wpcli.php

@@ -44,6 +44,7 @@ function __invoke( $args, $assoc_args ) {
 		WP_CLI::log( $results );
 
 		$wpephpc->clean_after_scan();
+		delete_option( 'wpephpcompat.scan_results' );
 
 		if ( preg_match( '/(\d*) ERRORS?/i', $results ) ) {
 			WP_CLI::error( 'Your WordPress install is not compatible.' );

uninstall.php

@@ -0,0 +1,12 @@
+<?php
+
+// If uninstall.php is not called by WordPress, die.
+if ( ! defined( 'WP_UNINSTALL_PLUGIN' ) ) {
+	die;
+}
+
+require_once( __DIR__ . '/src/wpephpcompat.php' );
+
+$wpephpc = new \WPEPHPCompat( __DIR__ );
+$wpephpc->clean_after_scan();
+delete_option( 'wpephpcompat.scan_results' );

wpengine-phpcompat.php

@@ -60,6 +60,7 @@ public static function init() {
 		add_action( 'wp_ajax_wpephpcompat_start_test', array( self::instance(), 'start_test' ) );
 		add_action( 'wp_ajax_wpephpcompat_check_status', array( self::instance(), 'check_status' ) );
 		add_action( 'wpephpcompat_start_test_cron', array( self::instance(), 'start_test' ) );
+		add_action( 'wp_ajax_wpephpcompat_clean_up', array( self::instance(), 'clean_up' ) );
 
 		// Create custom post type.
 		add_action( 'init', array( self::instance(), 'create_job_queue' ) );
@@ -191,6 +192,21 @@ function fork_scan( $test_version, $only_active ) {
 		wp_remote_post( esc_url_raw( $url ), $args );
 	}
 
+	/**
+	 * Remove all database options from the database.
+	 *
+	 * @since 1.3.2
+	 * @action wp_ajax_wpephpcompat_clean_up
+	 */
+	function clean_up() {
+		if ( current_user_can( 'manage_options' ) || ( defined( 'DOING_CRON' ) && DOING_CRON ) ) {
+			$wpephpc = new \WPEPHPCompat( __DIR__ );
+			$wpephpc->clean_after_scan();
+			delete_option( 'wpephpcompat.scan_results' );
+			wp_send_json( 'success' );
+		}
+	}
+
 	/**
 	 * Create custom post type to store the directories we need to process.
 	 *
@@ -345,7 +361,9 @@ function settings_page() {
 			</p>
 			<p>
 				<input style="float: left;" name="run" id="runButton" type="button" value="<?php esc_attr_e( 'Run', 'php-compatibility-checker' ); ?>" class="button-primary" />
-				<div style="display:none; visibility: visible; float: none;" class="spinner"></div>
+				<div class="wpe-tooltip"><input style="float: left; margin-left: 5px;" name="run" id="cleanupButton" type="button" value="<?php esc_attr_e( 'Clean up', 'php-compatibility-checker' ); ?>" class="button" />
+				<span class="wpe-tooltiptext">This will remove all database options related to this plugin, but it will not stop a scan in progress. If you'd like to completly remove all data wait for the scan to finish before hitting this button.</span></div>
+				<div style="display:none; visibility: visible; float: left;" class="spinner"></div>
 			</p>
 		</div>