From c0291f04b7ee895b8edabc434d7a93e5ce44c30c Mon Sep 17 00:00:00 2001
From: Boro Sitnikovski <buritomath@gmail.com>
Date: Fri, 8 Jun 2018 12:31:40 +0200
Subject: [PATCH 1/5] Add handler for version switch button

---
 .../class-wc-beta-tester-version-picker.php   | 28 ++++++++++++++++++-
 1 file changed, 27 insertions(+), 1 deletion(-)

diff --git a/plugins/woocommerce-beta-tester/includes/class-wc-beta-tester-version-picker.php b/plugins/woocommerce-beta-tester/includes/class-wc-beta-tester-version-picker.php
index f5729fa9856..49cc7056dc7 100644
--- a/plugins/woocommerce-beta-tester/includes/class-wc-beta-tester-version-picker.php
+++ b/plugins/woocommerce-beta-tester/includes/class-wc-beta-tester-version-picker.php
@@ -24,6 +24,26 @@ class WC_Beta_Tester_Version_Picker {
 	 */
 	public function __construct() {
 		add_action( 'admin_menu', array( $this, 'add_to_menus' ) );
+		add_action( 'admin_init', array( $this, 'handle_version_switch' ) );
+	}
+
+	/**
+	 * Handler for the version switch button.
+	 */
+	public function handle_version_switch() {
+		if ( empty( $_GET['wcbt_switch_to_version'] ) ) {
+			return;
+		}
+
+		if ( ! wp_verify_nonce( $_GET['_wpnonce'], 'wcbt_switch_version_nonce' ) ) {
+			wp_die( __( 'Action failed. Please refresh the page and retry.', 'woocommerce-beta-tester' ) );
+		}
+
+		$switch_to = $_GET['wcbt_switch_to_version'];
+
+		// TODO: Actual switch.
+
+		wp_redirect( admin_url( 'tools.php?page=wc-beta-tester-version-picker&switched=1' ) );
 	}
 
 	/**
@@ -56,7 +76,13 @@ class WC_Beta_Tester_Version_Picker {
 		usort( $tags, 'version_compare' );
 		$tags = array_reverse( $tags );
 
-		$versions_html         = '<ul class="wcbt-version-list">';
+		$versions_html         = '';
+
+		if ( ! empty( $_GET['switched'] ) ) {
+			$versions_html    .= __( '<h2>Successfully switched version.</h2>', 'woocommerce-beta-tester' );
+		}
+
+		$versions_html        .= '<ul class="wcbt-version-list">';
 		$plugin_data           = WC_Beta_Tester::instance()->get_plugin_data();
 		$this->current_version = $plugin_data['Version'];
 

From a3d0e5b9067221e80d4c020073a4a9cd69d5bb8d Mon Sep 17 00:00:00 2001
From: Peter Fabian <peter.fabian.github@gmail.com>
Date: Fri, 8 Jun 2018 17:35:16 +0200
Subject: [PATCH 2/5] Added basic version switching.

---
 .../class-wc-beta-tester-plugin-upgrader.php  | 73 +++++++++++++++++++
 .../class-wc-beta-tester-version-picker.php   | 40 ++++++++--
 2 files changed, 107 insertions(+), 6 deletions(-)
 create mode 100644 plugins/woocommerce-beta-tester/includes/class-wc-beta-tester-plugin-upgrader.php

diff --git a/plugins/woocommerce-beta-tester/includes/class-wc-beta-tester-plugin-upgrader.php b/plugins/woocommerce-beta-tester/includes/class-wc-beta-tester-plugin-upgrader.php
new file mode 100644
index 00000000000..deeef678c94
--- /dev/null
+++ b/plugins/woocommerce-beta-tester/includes/class-wc-beta-tester-plugin-upgrader.php
@@ -0,0 +1,73 @@
+<?php
+/**
+ * WooCommerce Beta Tester Plugin Upgrader
+ *
+ * Class that extends the WP Core Plugin_Upgrader found in core to do version switch.
+ *
+ * @package WC_Beta_Tester
+ */
+
+defined( 'ABSPATH' ) || exit;
+
+if ( ! class_exists( 'Plugin_Upgrader' ) ) {
+	require_once ABSPATH . 'wp-admin/includes/class-wp-upgrader.php';
+}
+
+
+/**
+ * Class WC_Beta_Tester_Plugin_Upgrader
+ */
+class WC_Beta_Tester_Plugin_Upgrader extends Plugin_Upgrader {
+
+	/**
+	 * Switch plugin version.
+	 *
+	 * @param string $plugin
+	 * @param array  $args
+	 *
+	 * @return array|bool|\WP_Error
+	 */
+	public function switch_version( $plugin, $args = array() ) {
+
+		$defaults    = array(
+			'clear_update_cache' => true,
+		);
+		$parsed_args = wp_parse_args( $args, $defaults );
+
+		$this->init();
+		$this->upgrade_strings();
+
+		$plugin_version = $this->skin->options['version'];
+
+		$download_url = WC_Beta_Tester::instance()->get_download_url( $plugin_version );
+
+		add_filter( 'upgrader_pre_install', array( $this, 'deactivate_plugin_before_upgrade' ), 10, 2 );
+		add_filter( 'upgrader_clear_destination', array( $this, 'delete_old_plugin' ), 10, 4 );
+
+		$this->run( array(
+			'package'           => $download_url,
+			'destination'       => WP_PLUGIN_DIR,
+			'clear_destination' => true,
+			'clear_working'     => true,
+			'hook_extra'        => array(
+				'plugin' => $plugin,
+				'type'   => 'plugin',
+				'action' => 'update',
+			),
+		) );
+
+		// Cleanup our hooks, in case something else does a upgrade on this connection.
+		remove_filter( 'upgrader_pre_install', array( $this, 'deactivate_plugin_before_upgrade' ) );
+		remove_filter( 'upgrader_clear_destination', array( $this, 'delete_old_plugin' ) );
+
+		if ( ! $this->result || is_wp_error( $this->result ) ) {
+			return $this->result;
+		}
+
+		// Force refresh of plugin update information.
+		wp_clean_plugins_cache( $parsed_args['clear_update_cache'] );
+
+		return true;
+	}
+
+}
diff --git a/plugins/woocommerce-beta-tester/includes/class-wc-beta-tester-version-picker.php b/plugins/woocommerce-beta-tester/includes/class-wc-beta-tester-version-picker.php
index 49cc7056dc7..dd814b7eb9a 100644
--- a/plugins/woocommerce-beta-tester/includes/class-wc-beta-tester-version-picker.php
+++ b/plugins/woocommerce-beta-tester/includes/class-wc-beta-tester-version-picker.php
@@ -39,11 +39,37 @@ class WC_Beta_Tester_Version_Picker {
 			wp_die( __( 'Action failed. Please refresh the page and retry.', 'woocommerce-beta-tester' ) );
 		}
 
-		$switch_to = $_GET['wcbt_switch_to_version'];
+		include dirname( __FILE__ ) . '/class-wc-beta-tester-plugin-upgrader.php';
 
-		// TODO: Actual switch.
+		$plugin_name = 'woocommerce';
+		$plugin      = 'woocommerce/woocommerce.php';
+		$skin_args   = array(
+			'type'    => 'web',
+			'url'     => 'tools.php?page=wc-beta-tester-version-picker',
+			'title'   => 'Version switch result',
+			'plugin'  => $plugin_name,
+			'version' => $_GET['wcbt_switch_to_version'],
+			'nonce'   => $_GET['_wpnonce'],
+		);
 
-		wp_redirect( admin_url( 'tools.php?page=wc-beta-tester-version-picker&switched=1' ) );
+		$skin = new Automatic_Upgrader_Skin( $skin_args );
+		$upgrader = new WC_Beta_Tester_Plugin_Upgrader( $skin );
+
+		$result = $upgrader->switch_version( $plugin );
+
+		if ( $result ) {
+			// Activate plugin.
+			// TODO: this causes some issues...
+			//$result = activate_plugin( $plugin, self_admin_url('plugins.php?error=true&plugin=' . urlencode( $plugin ) ), is_network_admin(), true );
+
+			// ... so just do a redirect instead
+			$activate_url_encoded = wp_nonce_url( self_admin_url( 'plugins.php?action=activate&plugin=woocommerce/woocommerce.php&plugin_status=active' ), 'activate-plugin_woocommerce/woocommerce.php' );
+			$activate_url         = str_replace( '&amp;', '&', $activate_url_encoded );
+			wp_redirect( $activate_url );
+		} else {
+			// TODO: fail more gracefully.
+			print_r( $skin->get_upgrade_messages() );
+		}
 	}
 
 	/**
@@ -115,13 +141,13 @@ class WC_Beta_Tester_Version_Picker {
 		}
 
 		$settings = WC_Beta_Tester::get_settings();
-		$channel = $settings->channel;
+		$channel  = $settings->channel;
 
 		?>
 		<div class="wrap">
 			<div class="wcbt-content-wrap">
 				<h1><?php esc_html_e( 'Available WooCommerce versions', 'woocommerce-beta-tester' ); ?></h1>
-				<form name="wcbt-select-version" class="wcbt-select-version-form" action="<?php echo esc_attr( admin_url( '/index.php' ) ); ?>">
+				<form name="wcbt-select-version" class="wcbt-select-version-form" action="<?php echo esc_attr( admin_url( '/tools.php' ) ); ?>">
 					<div class="wcbt-versions-wrap">
 						<?php echo $this->get_versions_html( $channel ); // WPCS: XSS ok. ?>
 					</div>
@@ -129,6 +155,8 @@ class WC_Beta_Tester_Version_Picker {
 						<a href="#wcbt-modal-version-switch-confirm" class="button-primary" id="wcbt-modal-version-switch-confirm"><?php esc_html_e( 'Switch version', 'woocommerce-beta-tester' ); ?></a>
 					</div>
 					<?php wp_nonce_field( 'wcbt_switch_version_nonce' ); ?>
+					<input type="hidden" name="noheader" value="1">
+					<input type="hidden" name="page" value="wc-beta-tester-version-picker">
 
 					<script type="text/template" id="tmpl-wcbt-version-switch-confirm">
 						<div class="wc-backbone-modal wc-backbone-modal-beta-tester-version-info">
@@ -168,7 +196,7 @@ class WC_Beta_Tester_Version_Picker {
 										</div>
 									</article>
 									<footer>
-										<input type="submit" value="<?php esc_attr_e( 'Switch version', 'woocommerce-beta-tester' ); ?>" class="button-primary wcbt-go" id="wcbt-submit-version-switch" />
+										<input type="submit" value="<?php esc_attr_e( 'Switch version', 'woocommerce-beta-tester' ); ?>" class="button-primary wcbt-go" id="wcbt-submit-version-switch"/>
 										<a href="#" class="modal-close modal-close-link"><?php esc_attr_e( 'Cancel', 'woocommerce-beta-tester' ); ?></a>
 									</footer>
 								</section>

From 70ac4f95360c8223cab267c1215e5fc11d753e60 Mon Sep 17 00:00:00 2001
From: Peter Fabian <peter.fabian.github@gmail.com>
Date: Fri, 8 Jun 2018 17:36:01 +0200
Subject: [PATCH 3/5] Fixed wording on Activate button.

---
 .../includes/views/html-admin-missing-woocommerce.php           | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/woocommerce-beta-tester/includes/views/html-admin-missing-woocommerce.php b/plugins/woocommerce-beta-tester/includes/views/html-admin-missing-woocommerce.php
index 2cb08246f5c..34bade78c36 100644
--- a/plugins/woocommerce-beta-tester/includes/views/html-admin-missing-woocommerce.php
+++ b/plugins/woocommerce-beta-tester/includes/views/html-admin-missing-woocommerce.php
@@ -19,7 +19,7 @@ defined( 'ABSPATH' ) || exit;
 
 	<?php if ( ! is_plugin_active( 'woocommerce/woocommerce.php' ) && current_user_can( 'activate_plugin', 'woocommerce/woocommerce.php' ) ) : ?>
 		<p>
-			<a href="<?php echo esc_url( wp_nonce_url( self_admin_url( 'plugins.php?action=activate&plugin=woocommerce/woocommerce.php&plugin_status=active' ), 'activate-plugin_woocommerce/woocommerce.php' ) ); ?>" class="button button-primary"><?php esc_html_e( 'Active WooCommerce', 'woocommerce-beta-tester' ); ?></a>
+			<a href="<?php echo esc_url( wp_nonce_url( self_admin_url( 'plugins.php?action=activate&plugin=woocommerce/woocommerce.php&plugin_status=active' ), 'activate-plugin_woocommerce/woocommerce.php' ) ); ?>" class="button button-primary"><?php esc_html_e( 'Activate WooCommerce', 'woocommerce-beta-tester' ); ?></a>
 			<?php if ( current_user_can( 'deactivate_plugin', 'woocommerce-beta-tester/woocommerce-beta-tester.php' ) ) : ?>
 				<a href="<?php echo esc_url( wp_nonce_url( 'plugins.php?action=deactivate&plugin=woocommerce-beta-tester/woocommerce-beta-tester.php&plugin_status=inactive', 'deactivate-plugin_woocommerce-beta-tester/woocommerce-beta-tester.php' ) ); ?>" class="button button-secondary"><?php esc_html_e( 'Turn off Beta Tester plugin', 'woocommerce-beta-tester' ); ?></a>
 			<?php endif; ?>

From 1d500c10063e490fb013a6bd370c617d8d58dd40 Mon Sep 17 00:00:00 2001
From: Peter Fabian <peter.fabian.github@gmail.com>
Date: Fri, 8 Jun 2018 18:26:56 +0200
Subject: [PATCH 4/5] Plugin activation switched from redirect to WP function,
 then redirect to plugin page.

---
 .../class-wc-beta-tester-version-picker.php        | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/plugins/woocommerce-beta-tester/includes/class-wc-beta-tester-version-picker.php b/plugins/woocommerce-beta-tester/includes/class-wc-beta-tester-version-picker.php
index dd814b7eb9a..38458dbead2 100644
--- a/plugins/woocommerce-beta-tester/includes/class-wc-beta-tester-version-picker.php
+++ b/plugins/woocommerce-beta-tester/includes/class-wc-beta-tester-version-picker.php
@@ -43,12 +43,13 @@ class WC_Beta_Tester_Version_Picker {
 
 		$plugin_name = 'woocommerce';
 		$plugin      = 'woocommerce/woocommerce.php';
+		$version     = $_GET['wcbt_switch_to_version'];
 		$skin_args   = array(
 			'type'    => 'web',
 			'url'     => 'tools.php?page=wc-beta-tester-version-picker',
 			'title'   => 'Version switch result',
 			'plugin'  => $plugin_name,
-			'version' => $_GET['wcbt_switch_to_version'],
+			'version' => $version,
 			'nonce'   => $_GET['_wpnonce'],
 		);
 
@@ -59,13 +60,8 @@ class WC_Beta_Tester_Version_Picker {
 
 		if ( $result ) {
 			// Activate plugin.
-			// TODO: this causes some issues...
-			//$result = activate_plugin( $plugin, self_admin_url('plugins.php?error=true&plugin=' . urlencode( $plugin ) ), is_network_admin(), true );
-
-			// ... so just do a redirect instead
-			$activate_url_encoded = wp_nonce_url( self_admin_url( 'plugins.php?action=activate&plugin=woocommerce/woocommerce.php&plugin_status=active' ), 'activate-plugin_woocommerce/woocommerce.php' );
-			$activate_url         = str_replace( '&amp;', '&', $activate_url_encoded );
-			wp_redirect( $activate_url );
+			activate_plugin( $plugin, '', is_network_admin(), true );
+			wp_redirect( admin_url('tools.php?page=wc-beta-tester-version-picker&switched=' . $version ) );
 		} else {
 			// TODO: fail more gracefully.
 			print_r( $skin->get_upgrade_messages() );
@@ -105,7 +101,7 @@ class WC_Beta_Tester_Version_Picker {
 		$versions_html         = '';
 
 		if ( ! empty( $_GET['switched'] ) ) {
-			$versions_html    .= __( '<h2>Successfully switched version.</h2>', 'woocommerce-beta-tester' );
+			$versions_html    .= sprintf( __( '<h2>Successfully switched version to %s.</h2>' , 'woocommerce-beta-tester' ), $_GET['switched'] );
 		}
 
 		$versions_html        .= '<ul class="wcbt-version-list">';

From aa4554cf42a2c2548e4394a0c92135232cf8bada Mon Sep 17 00:00:00 2001
From: Peter Fabian <peter.fabian.github@gmail.com>
Date: Mon, 11 Jun 2018 12:14:39 +0200
Subject: [PATCH 5/5] Sanitization, escaping and PHPCS updates.

---
 .../class-wc-beta-tester-version-picker.php    | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/plugins/woocommerce-beta-tester/includes/class-wc-beta-tester-version-picker.php b/plugins/woocommerce-beta-tester/includes/class-wc-beta-tester-version-picker.php
index 38458dbead2..48542dcc293 100644
--- a/plugins/woocommerce-beta-tester/includes/class-wc-beta-tester-version-picker.php
+++ b/plugins/woocommerce-beta-tester/includes/class-wc-beta-tester-version-picker.php
@@ -43,7 +43,7 @@ class WC_Beta_Tester_Version_Picker {
 
 		$plugin_name = 'woocommerce';
 		$plugin      = 'woocommerce/woocommerce.php';
-		$version     = $_GET['wcbt_switch_to_version'];
+		$version     = sanitize_text_field( $_GET['wcbt_switch_to_version'] );
 		$skin_args   = array(
 			'type'    => 'web',
 			'url'     => 'tools.php?page=wc-beta-tester-version-picker',
@@ -53,15 +53,13 @@ class WC_Beta_Tester_Version_Picker {
 			'nonce'   => $_GET['_wpnonce'],
 		);
 
-		$skin = new Automatic_Upgrader_Skin( $skin_args );
+		$skin     = new Automatic_Upgrader_Skin( $skin_args );
 		$upgrader = new WC_Beta_Tester_Plugin_Upgrader( $skin );
-
-		$result = $upgrader->switch_version( $plugin );
+		$result   = $upgrader->switch_version( $plugin );
 
 		if ( $result ) {
-			// Activate plugin.
 			activate_plugin( $plugin, '', is_network_admin(), true );
-			wp_redirect( admin_url('tools.php?page=wc-beta-tester-version-picker&switched=' . $version ) );
+			wp_redirect( admin_url( 'tools.php?page=wc-beta-tester-version-picker&switched=' . urlencode( $version ) ) );
 		} else {
 			// TODO: fail more gracefully.
 			print_r( $skin->get_upgrade_messages() );
@@ -96,12 +94,12 @@ class WC_Beta_Tester_Version_Picker {
 		}
 
 		usort( $tags, 'version_compare' );
-		$tags = array_reverse( $tags );
-
-		$versions_html         = '';
+		$tags          = array_reverse( $tags );
+		$versions_html = '';
 
 		if ( ! empty( $_GET['switched'] ) ) {
-			$versions_html    .= sprintf( __( '<h2>Successfully switched version to %s.</h2>' , 'woocommerce-beta-tester' ), $_GET['switched'] );
+			/* translators: %s: WooCoomerce version  */
+			$versions_html .= '<h2>' . sprintf( esc_html__( 'Successfully switched version to %s.', 'woocommerce-beta-tester' ), esc_html( $_GET['switched'] ) ) . '</h2>';
 		}
 
 		$versions_html        .= '<ul class="wcbt-version-list">';