Fix integrations

inc/admin-pages/class-hosting-integration-wizard-admin-page.php

@@ -367,4 +367,32 @@ public function section_test(): void {
 			]
 		);
 	}
+
+	/**
+	 * Register the script for the test page.
+	 *
+	 * @return void
+	 */
+	public function register_scripts() {
+		parent::register_scripts();
+
+		wp_enqueue_script(
+			'wu-integration-test',
+			wu_get_asset('integration-test.js', 'js'),
+			[
+				'jquery',
+				'wu-vue',
+			],
+			wu_get_version(),
+			true
+		);
+		wp_add_inline_script(
+			'wu-integration-test',
+			'var wu_integration_test_data = {
+				integration_id: "' . esc_js($this->integration->get_id()) . '",
+				waiting_message: "' . esc_js(__('Waiting for results...', 'ultimate-multisite')) . '"
+			};',
+			'before'
+		);
+	}
 }

inc/checkout/class-checkout-pages.php

@@ -475,7 +475,12 @@ public function maybe_obfuscate_login_url(): void {
 
 			$wp_query->set_404();
 
-			include get_404_template();
+			$four_oh_four = get_404_template();
+
+			// Apparently not all themes have a 404 template.
+			if ($four_oh_four) {
+				include $four_oh_four;
+			}
 
 			die;
 		} else {

inc/installers/class-base-installer.php

@@ -93,7 +93,7 @@ public function handle($status, $installer, $wizard) { // phpcs:ignore Generic.C
 		} catch (\Throwable $e) {
 			$wpdb->query('ROLLBACK'); // phpcs:ignore WordPress.DB.DirectDatabaseQuery.DirectQuery, WordPress.DB.DirectDatabaseQuery.NoCaching
 
-			return new \WP_Error(esc_html($installer), esc_html($e->getMessage()));
+			return new \WP_Error(esc_html($installer), wp_kses_post($e->getMessage()));
 		}
 
 		$wpdb->query('COMMIT'); // phpcs:ignore WordPress.DB.DirectDatabaseQuery.DirectQuery, WordPress.DB.DirectDatabaseQuery.NoCaching

inc/integrations/host-providers/class-base-host-provider.php

@@ -81,7 +81,6 @@ public function init(): void {
 			 * Adds an admin notice telling the admin that they should probably enable this integration.
 			 */
 			$this->alert_provider_detected();
-			return;
 		}
 
 		/*
@@ -96,7 +95,6 @@ public function init(): void {
 				 * Adds an admin notice telling the admin that the provider is not correctly setup.
 				 */
 				$this->alert_provider_not_setup();
-				return;
 			}
 
 			/*

inc/models/class-domain.php

@@ -428,7 +428,7 @@
 		 * @param array $domains_and_ips The list of domains and IPs found on the DNS lookup.
 		 * @return bool If the DNS is correctly setup or not.
 		 */
 		$result = apply_filters('wu_domain_has_correct_dns', $result, $this, $domains_and_ips);
 
 		return $result;
 	}
@@ -452,7 +452,7 @@
 	 *
 	 * @since 2.0.0
 	 *
-	 * @return bool
+	 * @return bool|\WP_Error
 	 */
 	public function save() {
 
@@ -473,8 +473,7 @@
 					 * Deprecated: Mercator created domain.
 					 *
 					 * @since 2.0.0
-					 * @param self The domain object after saving.
-					 * @param self The domain object before the changes.
+					 * @param self $domain The domain object after saving.
 					 * @return void.
 					 */
 					do_action_deprecated('mercator.mapping.created', $deprecated_args, '2.0.0', 'wu_domain_post_save');
@@ -489,8 +488,8 @@
 					 * Deprecated: Mercator updated domain.
 					 *
 					 * @since 2.0.0
-					 * @param self The domain object after saving.
-					 * @param self The domain object before the changes.
+					 * @param self $domain The domain object after saving.
+					 * @param self $before_changes The domain object before the changes.
 					 * @return void.
 					 */
 					do_action_deprecated('mercator.mapping.updated', $deprecated_args, '2.0.0', 'wu_domain_post_save');
@@ -621,7 +620,7 @@
 			$data = wp_cache_get('domain:' . $domain, 'domain_mappings');
 
 			if ( ! empty($data) && 'notexists' !== $data) {
 				return new static($data);
 			} elseif ('notexists' === $data) {
 				++$not_exists;
 			}
@@ -662,6 +661,6 @@
 
 		wp_cache_set('domain:' . $mapping->domain, $mapping, 'domain_mappings');
 
 		return new static($mapping);
 	}
 }

views/wizards/host-integrations/test.php

@@ -77,15 +77,3 @@
 	</div>
 
 </div>
-
-<?php
-wp_enqueue_script('wu-integration-test', wu_get_asset('integration-test.js', 'js'), ['jquery', 'vue'], wu_get_version(), true);
-wp_add_inline_script(
-	'wu-integration-test',
-	'var wu_integration_test_data = {
-	integration_id: "' . esc_js($integration->get_id()) . '",
-	waiting_message: "' . esc_js(__('Waiting for results...', 'ultimate-multisite')) . '"
-};',
-	'before'
-);
-?>