From c6fe17404cbf086e9983cb404203a7eb4659e9de Mon Sep 17 00:00:00 2001
From: Andy Fragen <andy@thefragens.com>
Date: Sat, 2 Nov 2024 09:15:00 -0700
Subject: [PATCH 01/16] add multisite support

---
 aspire-update.php                 |  1 +
 includes/class-admin-settings.php | 22 ++++++++++++----------
 2 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/aspire-update.php b/aspire-update.php
index 09ac602..6daeb8c 100644
--- a/aspire-update.php
+++ b/aspire-update.php
@@ -20,6 +20,7 @@
  * License URI:       https://www.gnu.org/licenses/gpl-3.0.txt
  * Text Domain:       AspireUpdate
  * Domain Path:       /languages
+ * Network:           true
  */
 
 if ( ! defined( 'ABSPATH' ) ) {
diff --git a/includes/class-admin-settings.php b/includes/class-admin-settings.php
index b7d6fc0..61277a1 100644
--- a/includes/class-admin-settings.php
+++ b/includes/class-admin-settings.php
@@ -44,7 +44,7 @@ class Admin_Settings {
 	 * The Constructor.
 	 */
 	public function __construct() {
-		add_action( 'admin_menu', array( $this, 'register_admin_menu' ) );
+		add_action( is_multisite() ? 'network_admin_menu' : 'admin_menu', array( $this, 'register_admin_menu' ) );
 		add_action( 'admin_init', array( $this, 'reset_settings' ) );
 		add_action( 'admin_init', array( $this, 'register_settings' ) );
 		add_action( 'admin_notices', array( $this, 'reset_admin_notice' ) );
@@ -216,6 +216,8 @@ private function get_settings_from_config_file() {
 	 * @return void
 	 */
 	public function register_admin_menu() {
+		$capability = is_multisite() ? 'manage_network_options' : 'manage_options';
+
 		if ( ! defined( 'AP_REMOVE_UI' ) ) {
 			define( 'AP_REMOVE_UI', false );
 		}
@@ -224,7 +226,7 @@ public function register_admin_menu() {
 				'index.php',
 				'AspireUpdate',
 				'AspireUpdate',
-				'manage_options',
+				$capability,
 				'aspireupdate-settings',
 				array( $this, 'the_settings_page' )
 			);
@@ -502,10 +504,10 @@ public function add_settings_field_callback( $args = array() ) {
 					<?php
 					foreach ( $group_options as $group_option ) {
 						?>
-							<option 
-								data-api-key-url="<?php echo esc_html( $group_option['api-key-url'] ?? '' ); ?>" 
-								data-require-api-key="<?php echo esc_html( $group_option['require-api-key'] ?? 'false' ); ?>" 
-								value="<?php echo esc_attr( $group_option['value'] ?? '' ); ?>" 
+							<option
+								data-api-key-url="<?php echo esc_html( $group_option['api-key-url'] ?? '' ); ?>"
+								data-require-api-key="<?php echo esc_html( $group_option['require-api-key'] ?? 'false' ); ?>"
+								value="<?php echo esc_attr( $group_option['value'] ?? '' ); ?>"
 								<?php selected( esc_attr( $group_option['value'] ?? '' ), esc_attr( $options[ $id ] ?? '' ) ); ?>
 							>
 								<?php echo esc_html( $group_option['label'] ?? '' ); ?>
@@ -516,10 +518,10 @@ public function add_settings_field_callback( $args = array() ) {
 				</select>
 				<p>
 					<input
-						type="text" 
-						id="aspireupdate-settings-field-<?php echo esc_attr( $id ); ?>_other" 
-						name="<?php echo esc_attr( $this->option_name ); ?>[<?php echo esc_attr( $id ); ?>_other]" 
-						value="<?php echo esc_attr( $options[ $id . '_other' ] ?? '' ); ?>" 
+						type="text"
+						id="aspireupdate-settings-field-<?php echo esc_attr( $id ); ?>_other"
+						name="<?php echo esc_attr( $this->option_name ); ?>[<?php echo esc_attr( $id ); ?>_other]"
+						value="<?php echo esc_attr( $options[ $id . '_other' ] ?? '' ); ?>"
 						class="regular-text"
 					/>
 				</p>

From 13f43b619cb166c53e2032142c0d43f2398fc3c2 Mon Sep 17 00:00:00 2001
From: Andy Fragen <andy@thefragens.com>
Date: Sat, 2 Nov 2024 09:33:06 -0700
Subject: [PATCH 02/16] updated to use site options

---
 includes/class-admin-settings.php | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/includes/class-admin-settings.php b/includes/class-admin-settings.php
index 61277a1..909935d 100644
--- a/includes/class-admin-settings.php
+++ b/includes/class-admin-settings.php
@@ -87,8 +87,8 @@ public function reset_settings() {
 			wp_verify_nonce( sanitize_key( $_GET['reset-nonce'] ), 'aspireupdate-reset-nonce' )
 		) {
 			$options = $this->get_default_settings();
-			update_option( $this->option_name, $options );
-			update_option( 'aspireupdate-reset', 'true' );
+			update_site_option( $this->option_name, $options );
+			update_site_option( 'aspireupdate-reset', 'true' );
 
 			wp_safe_redirect(
 				add_query_arg(
@@ -110,14 +110,14 @@ public function reset_settings() {
 	 */
 	public function reset_admin_notice() {
 		if (
-			( 'true' === get_option( 'aspireupdate-reset' ) ) &&
+			( 'true' === get_site_option( 'aspireupdate-reset' ) ) &&
 			isset( $_GET['reset-success'] ) &&
 			( 'success' === $_GET['reset-success'] ) &&
 			isset( $_GET['reset-success-nonce'] ) &&
 			wp_verify_nonce( sanitize_key( $_GET['reset-success-nonce'] ), 'aspireupdate-reset-success-nonce' )
 		) {
 			echo '<div class="notice notice-success is-dismissible"><p>Settings have been reset to default.</p></div>';
-			delete_option( 'aspireupdate-reset' );
+			delete_site_option( 'aspireupdate-reset' );
 		}
 	}
 
@@ -131,13 +131,13 @@ public function reset_admin_notice() {
 	 */
 	public function get_setting( $setting_name, $default_value = false ) {
 		if ( null === $this->options ) {
-			$options = get_option( $this->option_name, false );
+			$options = get_site_option( $this->option_name, false );
 			/**
 			 * If the options are not set load defaults.
 			 */
 			if ( false === $options ) {
 				$options = $this->get_default_settings();
-				update_option( $this->option_name, $options );
+				update_site_option( $this->option_name, $options );
 			}
 			$config_file_options = $this->get_settings_from_config_file();
 			if ( is_array( $options ) ) {
@@ -293,13 +293,13 @@ public function the_settings_page() {
 	 */
 	public function register_settings() {
 		$nonce   = wp_create_nonce( 'aspireupdate-settings' );
-		$options = get_option( $this->option_name, false );
+		$options = get_site_option( $this->option_name, false );
 		/**
 		 * If the options are not set load defaults.
 		 */
 		if ( false === $options ) {
 			$options = $this->get_default_settings();
-			update_option( $this->option_name, $options );
+			update_site_option( $this->option_name, $options );
 		}
 
 		register_setting(

From a58469051d84c940edfb97d9f189c5a7179b437f Mon Sep 17 00:00:00 2001
From: Andy Fragen <andy@thefragens.com>
Date: Sat, 2 Nov 2024 13:00:03 -0700
Subject: [PATCH 03/16] use network_admin_url

---
 includes/class-admin-settings.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/includes/class-admin-settings.php b/includes/class-admin-settings.php
index 909935d..97840d9 100644
--- a/includes/class-admin-settings.php
+++ b/includes/class-admin-settings.php
@@ -96,7 +96,7 @@ public function reset_settings() {
 						'reset-success'       => 'success',
 						'reset-success-nonce' => wp_create_nonce( 'aspireupdate-reset-success-nonce' ),
 					),
-					admin_url( 'index.php?page=aspireupdate-settings' )
+					network_admin_url( 'index.php?page=aspireupdate-settings' )
 				)
 			);
 			exit;
@@ -249,7 +249,7 @@ public function admin_enqueue_scripts( $hook ) {
 			'aspire_update_settings_js',
 			'aspireupdate',
 			array(
-				'ajax_url' => admin_url( 'admin-ajax.php' ),
+				'ajax_url' => network_admin_url( 'admin-ajax.php' ),
 				'nonce'    => wp_create_nonce( 'aspireupdate-ajax' ),
 				'domain'   => Utilities::get_top_level_domain(),
 			)
@@ -267,7 +267,7 @@ public function the_settings_page() {
 				'reset'       => 'reset',
 				'reset-nonce' => wp_create_nonce( 'aspireupdate-reset-nonce' ),
 			),
-			admin_url( 'index.php?page=aspireupdate-settings' )
+			network_admin_url( 'index.php?page=aspireupdate-settings' )
 		);
 		?>
 		<div class="wrap">

From 13e6731a81759d44bf1c44a2506ca0a18d379f17 Mon Sep 17 00:00:00 2001
From: Andy Fragen <andy@thefragens.com>
Date: Sat, 2 Nov 2024 14:03:14 -0700
Subject: [PATCH 04/16] update for multisite saving settings

---
 includes/class-admin-settings.php | 37 +++++++++++++++++++++++++++++--
 1 file changed, 35 insertions(+), 2 deletions(-)

diff --git a/includes/class-admin-settings.php b/includes/class-admin-settings.php
index 97840d9..6474059 100644
--- a/includes/class-admin-settings.php
+++ b/includes/class-admin-settings.php
@@ -49,6 +49,9 @@ public function __construct() {
 		add_action( 'admin_init', array( $this, 'register_settings' ) );
 		add_action( 'admin_notices', array( $this, 'reset_admin_notice' ) );
 		add_action( 'admin_enqueue_scripts', array( $this, 'admin_enqueue_scripts' ) );
+
+		add_action( 'admin_init', array( $this, 'update_settings' ) );
+		add_action( 'network_admin_edit_aspireupdate-settings', array( $this, 'update_settings' ) );
 	}
 
 	/**
@@ -210,6 +213,33 @@ private function get_settings_from_config_file() {
 		return $options;
 	}
 
+	/**
+	 * Update settings for single site or network activated.
+	 *
+	 * @link http://wordpress.stackexchange.com/questions/64968/settings-api-in-multisite-missing-update-message
+	 * @link http://benohead.com/wordpress-network-wide-plugin-settings/
+	 */
+	public function update_settings() {
+		if ( isset( $_POST['_wpnonce'] ) && wp_verify_nonce( sanitize_key( wp_unslash( $_POST['_wpnonce'] ) ), 'aspireupdate-settings' ) ) {
+			if ( ( isset( $_POST['option_page'] )
+			&& 'aspireupdate_settings' === $_POST['option_page'] )
+			) {
+				update_site_option( $this->option_name, $this->sanitize_settings( wp_unslash( $_POST['aspireupdate_settings'] ) ) );
+			}
+		}
+
+		// phpcs:ignore WordPress.Security.NonceVerification.Missing
+		if ( isset( $_POST['option_page'] ) ){
+			wp_safe_redirect(
+				add_query_arg(
+					array( '_wpnonce' => wp_create_nonce( 'aspireupdate-settings' ) ),
+					network_admin_url( 'index.php?page=aspireupdate-settings' )
+				)
+			);
+		exit;
+		}
+	}
+
 	/**
 	 * Register the Admin Menu.
 	 *
@@ -262,6 +292,7 @@ public function admin_enqueue_scripts( $hook ) {
 	 * @return void
 	 */
 	public function the_settings_page() {
+		$action = is_multisite() ? 'index.php?page=aspireupdate-settings' : 'options.php';
 		$reset_url = add_query_arg(
 			array(
 				'reset'       => 'reset',
@@ -272,13 +303,15 @@ public function the_settings_page() {
 		?>
 		<div class="wrap">
 			<h1><?php esc_html_e( 'AspireUpdate Settings', 'AspireUpdate' ); ?></h1>
-			<form id="aspireupdate-settings-form" method="post" action="options.php">
+			<form id="aspireupdate-settings-form" method="post" action="<?php echo esc_attr( $action ); ?>">
 				<?php
 				settings_fields( $this->option_group );
 				do_settings_sections( 'aspireupdate-settings' );
 				?>
 				<p class="submit">
-					<input type="submit" name="submit" id="submit" class="button button-primary" value="Save Changes">
+					<?php wp_nonce_field( 'aspireupdate-settings' ); ?>
+					<?php submit_button( esc_html__( 'Save Changes', 'aspireupdate-settings' ), 'primary', 'submit', false ); ?>
+
 					<a href="<?php echo esc_url( $reset_url ); ?>" class="button button-secondary" >Reset</a>
 				</p>
 			</form>

From 904596ab86869fc8d9bdc556deb64d02684f70c7 Mon Sep 17 00:00:00 2001
From: Andy Fragen <andy@thefragens.com>
Date: Sat, 2 Nov 2024 14:03:54 -0700
Subject: [PATCH 05/16] need to check empty not isset for multisite

---
 includes/class-admin-settings.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/includes/class-admin-settings.php b/includes/class-admin-settings.php
index 6474059..5f9420a 100644
--- a/includes/class-admin-settings.php
+++ b/includes/class-admin-settings.php
@@ -574,18 +574,18 @@ class="regular-text"
 	public function sanitize_settings( $input ) {
 		$sanitized_input = array();
 
-		$sanitized_input['enable']         = ( isset( $input['enable'] ) && $input['enable'] ) ? 1 : 0;
+		$sanitized_input['enable']         = ( ! empty( $input['enable'] ) && $input['enable'] ) ? 1 : 0;
 		$sanitized_input['api_key']        = sanitize_text_field( $input['api_key'] ?? '' );
 		$sanitized_input['api_host']       = sanitize_text_field( $input['api_host'] ?? '' );
 		$sanitized_input['api_host_other'] = sanitize_text_field( $input['api_host_other'] ?? '' );
 
-		$sanitized_input['enable_debug'] = isset( $input['enable_debug'] ) ? 1 : 0;
+		$sanitized_input['enable_debug'] = ! empty( $input['enable_debug'] ) ? 1 : 0;
 		if ( isset( $input['enable_debug_type'] ) && is_array( $input['enable_debug_type'] ) ) {
 			$sanitized_input['enable_debug_type'] = array_map( 'sanitize_text_field', $input['enable_debug_type'] );
 		} else {
 			$sanitized_input['enable_debug_type'] = array();
 		}
-		$sanitized_input['disable_ssl_verification'] = ( isset( $input['disable_ssl_verification'] ) && $input['disable_ssl_verification'] ) ? 1 : 0;
+		$sanitized_input['disable_ssl_verification'] = ( ! empty( $input['disable_ssl_verification'] ) && $input['disable_ssl_verification'] ) ? 1 : 0;
 		return $sanitized_input;
 	}
 }

From f214c40660fe0a9e5f9e09aa2eb094fa64d5272b Mon Sep 17 00:00:00 2001
From: Andy Fragen <andy@thefragens.com>
Date: Sat, 2 Nov 2024 14:04:32 -0700
Subject: [PATCH 06/16] load scripts on multisite

---
 includes/class-admin-settings.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/includes/class-admin-settings.php b/includes/class-admin-settings.php
index 5f9420a..734bc2a 100644
--- a/includes/class-admin-settings.php
+++ b/includes/class-admin-settings.php
@@ -270,7 +270,7 @@ public function register_admin_menu() {
 	 * @return void
 	 */
 	public function admin_enqueue_scripts( $hook ) {
-		if ( 'dashboard_page_aspireupdate-settings' !== $hook ) {
+		if ( ! in_array( $hook, array( 'dashboard_page_aspireupdate-settings','index_page_aspireupdate-settings' ) ) ) {
 			return;
 		}
 		wp_enqueue_style( 'aspire_update_settings_css', plugin_dir_url( __DIR__ ) . 'assets/css/aspire-update.css', array(), AP_VERSION );

From e55f7b6baa6d2d664131f382c261dfc0d950bf99 Mon Sep 17 00:00:00 2001
From: Andy Fragen <andy@thefragens.com>
Date: Sun, 3 Nov 2024 10:05:27 -0800
Subject: [PATCH 07/16] add early return, simplify redirect

---
 includes/class-admin-settings.php | 22 +++++++++-------------
 1 file changed, 9 insertions(+), 13 deletions(-)

diff --git a/includes/class-admin-settings.php b/includes/class-admin-settings.php
index 734bc2a..75ab3b7 100644
--- a/includes/class-admin-settings.php
+++ b/includes/class-admin-settings.php
@@ -220,23 +220,19 @@ private function get_settings_from_config_file() {
 	 * @link http://benohead.com/wordpress-network-wide-plugin-settings/
 	 */
 	public function update_settings() {
-		if ( isset( $_POST['_wpnonce'] ) && wp_verify_nonce( sanitize_key( wp_unslash( $_POST['_wpnonce'] ) ), 'aspireupdate-settings' ) ) {
-			if ( ( isset( $_POST['option_page'] )
-			&& 'aspireupdate_settings' === $_POST['option_page'] )
-			) {
-				update_site_option( $this->option_name, $this->sanitize_settings( wp_unslash( $_POST['aspireupdate_settings'] ) ) );
-			}
+		// Exit if improper privileges.
+		if ( ! isset( $_POST['_wpnonce'] ) || ! wp_verify_nonce( sanitize_key( wp_unslash( $_POST['_wpnonce'] ) ), 'aspireupdate-settings' ) ) {
+			return;
 		}
 
-		// phpcs:ignore WordPress.Security.NonceVerification.Missing
-		if ( isset( $_POST['option_page'] ) ){
+		// Save settings and redirect.
+		if ( ( isset( $_POST['option_page'] ) && 'aspireupdate_settings' === $_POST['option_page'] ) ) {
+			update_site_option( $this->option_name, $this->sanitize_settings( wp_unslash( $_POST['aspireupdate_settings'] ) ) );
+
 			wp_safe_redirect(
-				add_query_arg(
-					array( '_wpnonce' => wp_create_nonce( 'aspireupdate-settings' ) ),
-					network_admin_url( 'index.php?page=aspireupdate-settings' )
-				)
+				add_query_arg( array( network_admin_url( 'index.php?page=aspireupdate-settings' ) ) )
 			);
-		exit;
+			exit;
 		}
 	}
 

From 47a8b215374148c51311cca9c42b5a5236e89a8c Mon Sep 17 00:00:00 2001
From: Andy Fragen <andy@thefragens.com>
Date: Sun, 3 Nov 2024 10:11:35 -0800
Subject: [PATCH 08/16] action should redirect to settings page

settings page is same for both multisite/single site
---
 includes/class-admin-settings.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/includes/class-admin-settings.php b/includes/class-admin-settings.php
index 75ab3b7..09e570d 100644
--- a/includes/class-admin-settings.php
+++ b/includes/class-admin-settings.php
@@ -288,7 +288,6 @@ public function admin_enqueue_scripts( $hook ) {
 	 * @return void
 	 */
 	public function the_settings_page() {
-		$action = is_multisite() ? 'index.php?page=aspireupdate-settings' : 'options.php';
 		$reset_url = add_query_arg(
 			array(
 				'reset'       => 'reset',
@@ -299,7 +298,7 @@ public function the_settings_page() {
 		?>
 		<div class="wrap">
 			<h1><?php esc_html_e( 'AspireUpdate Settings', 'AspireUpdate' ); ?></h1>
-			<form id="aspireupdate-settings-form" method="post" action="<?php echo esc_attr( $action ); ?>">
+			<form id="aspireupdate-settings-form" method="post" action="<?php echo esc_attr( 'index.php?page=aspireupdate-settings' ); ?>">
 				<?php
 				settings_fields( $this->option_group );
 				do_settings_sections( 'aspireupdate-settings' );

From 2342f724152360e8b16bdbfeb43a73b0bb3bfcad Mon Sep 17 00:00:00 2001
From: Andy Fragen <andy@thefragens.com>
Date: Sun, 3 Nov 2024 10:14:27 -0800
Subject: [PATCH 09/16] remove remaining code from using variable

---
 includes/class-admin-settings.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/includes/class-admin-settings.php b/includes/class-admin-settings.php
index 09e570d..f9037a7 100644
--- a/includes/class-admin-settings.php
+++ b/includes/class-admin-settings.php
@@ -298,7 +298,7 @@ public function the_settings_page() {
 		?>
 		<div class="wrap">
 			<h1><?php esc_html_e( 'AspireUpdate Settings', 'AspireUpdate' ); ?></h1>
-			<form id="aspireupdate-settings-form" method="post" action="<?php echo esc_attr( 'index.php?page=aspireupdate-settings' ); ?>">
+			<form id="aspireupdate-settings-form" method="post" action="index.php?page=aspireupdate-settings">
 				<?php
 				settings_fields( $this->option_group );
 				do_settings_sections( 'aspireupdate-settings' );

From 2f964da08a1c88fd78213525d69e2faada66daa5 Mon Sep 17 00:00:00 2001
From: Andy Fragen <andy@thefragens.com>
Date: Sun, 3 Nov 2024 10:19:41 -0800
Subject: [PATCH 10/16] no need to use variable for single instance

---
 includes/class-admin-settings.php | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/includes/class-admin-settings.php b/includes/class-admin-settings.php
index f9037a7..437a3f2 100644
--- a/includes/class-admin-settings.php
+++ b/includes/class-admin-settings.php
@@ -242,8 +242,6 @@ public function update_settings() {
 	 * @return void
 	 */
 	public function register_admin_menu() {
-		$capability = is_multisite() ? 'manage_network_options' : 'manage_options';
-
 		if ( ! defined( 'AP_REMOVE_UI' ) ) {
 			define( 'AP_REMOVE_UI', false );
 		}
@@ -252,7 +250,7 @@ public function register_admin_menu() {
 				'index.php',
 				'AspireUpdate',
 				'AspireUpdate',
-				$capability,
+				is_multisite() ? 'manage_network_options' : 'manage_options',
 				'aspireupdate-settings',
 				array( $this, 'the_settings_page' )
 			);

From ae88d99c7dc70774d58fbeac7ef4e3c6eafcad32 Mon Sep 17 00:00:00 2001
From: Andy Fragen <andy@thefragens.com>
Date: Sun, 3 Nov 2024 10:27:34 -0800
Subject: [PATCH 11/16] add @return

---
 includes/class-admin-settings.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/includes/class-admin-settings.php b/includes/class-admin-settings.php
index 437a3f2..6312f5c 100644
--- a/includes/class-admin-settings.php
+++ b/includes/class-admin-settings.php
@@ -218,6 +218,8 @@ private function get_settings_from_config_file() {
 	 *
 	 * @link http://wordpress.stackexchange.com/questions/64968/settings-api-in-multisite-missing-update-message
 	 * @link http://benohead.com/wordpress-network-wide-plugin-settings/
+	 *
+	 * @return void
 	 */
 	public function update_settings() {
 		// Exit if improper privileges.

From 6248b74e4bce98f56fc5c74319bd894697c4d49c Mon Sep 17 00:00:00 2001
From: Andy Fragen <andy@thefragens.com>
Date: Sun, 3 Nov 2024 10:39:12 -0800
Subject: [PATCH 12/16] simplified sanitization of some checkboxes, thanks
 @costdev

---
 includes/class-admin-settings.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/includes/class-admin-settings.php b/includes/class-admin-settings.php
index 6312f5c..85465a2 100644
--- a/includes/class-admin-settings.php
+++ b/includes/class-admin-settings.php
@@ -569,18 +569,18 @@ class="regular-text"
 	public function sanitize_settings( $input ) {
 		$sanitized_input = array();
 
-		$sanitized_input['enable']         = ( ! empty( $input['enable'] ) && $input['enable'] ) ? 1 : 0;
+		$sanitized_input['enable']         = (int) ! empty( $input['enable'] ) ? 1 : 0;
 		$sanitized_input['api_key']        = sanitize_text_field( $input['api_key'] ?? '' );
 		$sanitized_input['api_host']       = sanitize_text_field( $input['api_host'] ?? '' );
 		$sanitized_input['api_host_other'] = sanitize_text_field( $input['api_host_other'] ?? '' );
 
-		$sanitized_input['enable_debug'] = ! empty( $input['enable_debug'] ) ? 1 : 0;
+		$sanitized_input['enable_debug'] = (int) ! empty( $input['enable_debug'] ) ? 1 : 0;
 		if ( isset( $input['enable_debug_type'] ) && is_array( $input['enable_debug_type'] ) ) {
 			$sanitized_input['enable_debug_type'] = array_map( 'sanitize_text_field', $input['enable_debug_type'] );
 		} else {
 			$sanitized_input['enable_debug_type'] = array();
 		}
-		$sanitized_input['disable_ssl_verification'] = ( ! empty( $input['disable_ssl_verification'] ) && $input['disable_ssl_verification'] ) ? 1 : 0;
+		$sanitized_input['disable_ssl_verification'] = (int) ! empty( $input['disable_ssl_verification'] ) ? 1 : 0;
 		return $sanitized_input;
 	}
 }

From f6a70194c075459e568fefc41fe623cc0ef161d1 Mon Sep 17 00:00:00 2001
From: Andy Fragen <andy@thefragens.com>
Date: Sun, 3 Nov 2024 13:06:19 -0800
Subject: [PATCH 13/16] no need for ternary

---
 includes/class-admin-settings.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/includes/class-admin-settings.php b/includes/class-admin-settings.php
index 85465a2..a051f50 100644
--- a/includes/class-admin-settings.php
+++ b/includes/class-admin-settings.php
@@ -569,18 +569,18 @@ class="regular-text"
 	public function sanitize_settings( $input ) {
 		$sanitized_input = array();
 
-		$sanitized_input['enable']         = (int) ! empty( $input['enable'] ) ? 1 : 0;
+		$sanitized_input['enable']         = (int) ! empty( $input['enable'] );
 		$sanitized_input['api_key']        = sanitize_text_field( $input['api_key'] ?? '' );
 		$sanitized_input['api_host']       = sanitize_text_field( $input['api_host'] ?? '' );
 		$sanitized_input['api_host_other'] = sanitize_text_field( $input['api_host_other'] ?? '' );
 
-		$sanitized_input['enable_debug'] = (int) ! empty( $input['enable_debug'] ) ? 1 : 0;
+		$sanitized_input['enable_debug'] = (int) ! empty( $input['enable_debug'] );
 		if ( isset( $input['enable_debug_type'] ) && is_array( $input['enable_debug_type'] ) ) {
 			$sanitized_input['enable_debug_type'] = array_map( 'sanitize_text_field', $input['enable_debug_type'] );
 		} else {
 			$sanitized_input['enable_debug_type'] = array();
 		}
-		$sanitized_input['disable_ssl_verification'] = (int) ! empty( $input['disable_ssl_verification'] ) ? 1 : 0;
+		$sanitized_input['disable_ssl_verification'] = (int) ! empty( $input['disable_ssl_verification'] );
 		return $sanitized_input;
 	}
 }

From 2851b3e3239e1a9394509671071d4bda06a82026 Mon Sep 17 00:00:00 2001
From: Andy Fragen <andy@thefragens.com>
Date: Sun, 3 Nov 2024 16:43:17 -0800
Subject: [PATCH 14/16] new line before return

---
 includes/class-admin-settings.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/includes/class-admin-settings.php b/includes/class-admin-settings.php
index d07b47e..4a1a327 100644
--- a/includes/class-admin-settings.php
+++ b/includes/class-admin-settings.php
@@ -581,6 +581,7 @@ public function sanitize_settings( $input ) {
 			$sanitized_input['enable_debug_type'] = array();
 		}
 		$sanitized_input['disable_ssl_verification'] = (int) ! empty( $input['disable_ssl_verification'] );
+
 		return $sanitized_input;
 	}
 }

From 429ede302da721ea8a2b0892c10c01ee9c9113fb Mon Sep 17 00:00:00 2001
From: Andy Fragen <andy@thefragens.com>
Date: Mon, 4 Nov 2024 09:15:29 -0800
Subject: [PATCH 15/16] not necessary to add text here as default text is `Save
 Changes`

---
 includes/class-admin-settings.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/includes/class-admin-settings.php b/includes/class-admin-settings.php
index b27f233..c1dd6b7 100644
--- a/includes/class-admin-settings.php
+++ b/includes/class-admin-settings.php
@@ -305,7 +305,7 @@ public function the_settings_page() {
 				?>
 				<p class="submit">
 					<?php wp_nonce_field( 'aspireupdate-settings' ); ?>
-					<?php submit_button( esc_html__( 'Save Changes', 'aspireupdate-settings' ), 'primary', 'submit', false ); ?>
+					<?php submit_button( '', 'primary', 'submit', false ); ?>
 
 					<a href="<?php echo esc_url( $reset_url ); ?>" class="button button-secondary" >Reset</a>
 				</p>

From 69786dc071d68ed57bee24a8169355baaa397ea8 Mon Sep 17 00:00:00 2001
From: Andy Fragen <andy@thefragens.com>
Date: Mon, 4 Nov 2024 09:16:05 -0800
Subject: [PATCH 16/16] add back i18n

---
 includes/class-admin-settings.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/includes/class-admin-settings.php b/includes/class-admin-settings.php
index c1dd6b7..f1c3876 100644
--- a/includes/class-admin-settings.php
+++ b/includes/class-admin-settings.php
@@ -307,7 +307,7 @@ public function the_settings_page() {
 					<?php wp_nonce_field( 'aspireupdate-settings' ); ?>
 					<?php submit_button( '', 'primary', 'submit', false ); ?>
 
-					<a href="<?php echo esc_url( $reset_url ); ?>" class="button button-secondary" >Reset</a>
+					<a href="<?php echo esc_url( $reset_url ); ?>" class="button button-secondary" ><?php esc_html_e( 'Reset', 'AspireUpdate' ); ?></a>
 				</p>
 			</form>
 		</div>