From cbcc27be9efaa435596abba43b00698f9cd5591f Mon Sep 17 00:00:00 2001
From: Joe Dolson <design@joedolson.com>
Date: Thu, 2 Dec 2021 16:23:17 -0600
Subject: [PATCH] More piddling changes

---
 src/wp-accessibility-settings.php | 18 +++++++++---------
 src/wp-accessibility-toolbar.php  | 12 ++++++------
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/src/wp-accessibility-settings.php b/src/wp-accessibility-settings.php
index 656b0d9..474aa62 100644
--- a/src/wp-accessibility-settings.php
+++ b/src/wp-accessibility-settings.php
@@ -253,7 +253,7 @@ function wpa_admin_settings() {
 									<input type="hidden" name="_wpnonce" value="<?php echo wp_create_nonce( 'wpa-nonce' ); ?>"/>
 									<input type="hidden" name="action" value="asl"/>
 								</p>
-								<p><input type="submit" name="wpa-settings" class="button-primary" value="<?php _e( 'Update Skiplink Settings', 'wp-accessibility' ); ?>"/></p>
+								<p><input type="submit" name="wpa-settings" class="button-primary" value="<?php esc_html_e( 'Update Skiplink Settings', 'wp-accessibility' ); ?>"/></p>
 							</form>
 								<?php
 							}
@@ -261,9 +261,9 @@ function wpa_admin_settings() {
 						</div>
 					</div>
 					<div class="postbox">
-						<h2 id="toolbar" class='hndle'><?php _e( 'Accessibility Toolbar Settings', 'wp-accessibility' ); ?></h2>
+						<h2 id="toolbar" class='hndle'><?php esc_html_e( 'Accessibility Toolbar Settings', 'wp-accessibility' ); ?></h2>
 						<div class="inside">
-							<form method="post" action="<?php echo admin_url( 'options-general.php?page=wp-accessibility/wp-accessibility.php' ); ?>">
+							<form method="post" action="<?php echo esc_url( admin_url( 'options-general.php?page=wp-accessibility/wp-accessibility.php' ) ); ?>">
 								<ul>
 									<li>
 										<input type="checkbox" id="wpa_toolbar" name="wpa_toolbar" <?php checked( get_option( 'wpa_toolbar' ), 'on' ); ?>/>
@@ -408,8 +408,8 @@ function wpa_admin_settings() {
 										<input type="text" id="wpa_focus_color" name="wpa_focus_color" value="#<?php echo esc_attr( get_option( 'wpa_focus_color' ) ); ?>"/></li>
 								</ul>
 								<p>
-									<input type="hidden" name="_wpnonce" value="<?php echo wp_create_nonce( 'wpa-nonce' ); ?>"/>
-									<input type="hidden" name="action" value="misc"/>
+									<input type="hidden" name="_wpnonce" value="<?php echo wp_create_nonce( 'wpa-nonce' ); ?>" />
+									<input type="hidden" name="action" value="misc" />
 								</p>
 
 								<p><input type="submit" name="wpa-settings" class="button-primary" value="<?php _e( 'Update Miscellaneous Settings', 'wp-accessibility' ); ?>"/></p>
@@ -431,8 +431,8 @@ function wpa_admin_settings() {
 									</ul>
 								</fieldset>
 								<p>
-									<input type="hidden" name="_wpnonce" value="<?php echo wp_create_nonce( 'wpa-nonce' ); ?>"/>
-									<input type="hidden" name="action" value="rta"/>
+									<input type="hidden" name="_wpnonce" value="<?php echo wp_create_nonce( 'wpa-nonce' ); ?>" />
+									<input type="hidden" name="action" value="rta" />
 								</p>
 
 								<p><input type="submit" name="wpa-settings" class="button-primary" value="<?php _e( 'Update Title Attribute Settings', 'wp-accessibility' ); ?>"/></p>
@@ -501,8 +501,8 @@ function wpa_admin_settings() {
 									</ul>
 								</fieldset>
 								<p>
-									<input type="hidden" name="_wpnonce" value="<?php echo wp_create_nonce( 'wpa-nonce' ); ?>"/>
-									<input type="hidden" name="action" value="contrast"/>
+									<input type="hidden" name="_wpnonce" value="<?php echo wp_create_nonce( 'wpa-nonce' ); ?>" />
+									<input type="hidden" name="action" value="contrast" />
 								</p>
 
 								<p><input type="submit" name="wpa-settings" class="button-primary" value="<?php _e( 'Check Color Contrast', 'wp-accessibility' ); ?>"/></p>
diff --git a/src/wp-accessibility-toolbar.php b/src/wp-accessibility-toolbar.php
index d29e409..0aee162 100644
--- a/src/wp-accessibility-toolbar.php
+++ b/src/wp-accessibility-toolbar.php
@@ -110,9 +110,9 @@ function wpa_toolbar_shortcode( $atts, $content ) {
  * @return string HTML.
  */
 function wpa_toolbar_html( $type = 'widget', $control = 'button' ) {
-	$contrast         = __( 'Toggle High Contrast', 'wp-accessibility' );
-	$grayscale        = __( 'Toggle Grayscale', 'wp-accessibility' );
-	$fontsize         = __( 'Toggle Font size', 'wp-accessibility' );
+	$contrast         = esc_html__( 'Toggle High Contrast', 'wp-accessibility' );
+	$grayscale        = esc_html__( 'Toggle Grayscale', 'wp-accessibility' );
+	$fontsize         = esc_html__( 'Toggle Font size', 'wp-accessibility' );
 	$enable_grayscale = ( 'on' === get_option( 'wpa_toolbar_gs' ) && current_user_can( 'manage_options' ) ) ? true : false;
 	$enable_contrast  = ( 'off' === get_option( 'wpa_toolbar_ct' ) ) ? false : true;
 	$enable_fontsize  = ( 'off' === get_option( 'wpa_toolbar_fs' ) ) ? false : true;
@@ -153,9 +153,9 @@ function wpa_toolbar_js() {
 	$is_right   = ( 'on' === get_option( 'wpa_toolbar_right' ) ) ? 'right' : 'left';
 	$responsive = ( 'on' === get_option( 'wpa_toolbar_mobile' ) ) ? 'a11y-responsive' : 'a11y-non-responsive';
 
-	$contrast         = __( 'Toggle High Contrast', 'wp-accessibility' );
-	$grayscale        = __( 'Toggle Grayscale', 'wp-accessibility' );
-	$fontsize         = __( 'Toggle Font size', 'wp-accessibility' );
+	$contrast         = esc_html__( 'Toggle High Contrast', 'wp-accessibility' );
+	$grayscale        = esc_html__( 'Toggle Grayscale', 'wp-accessibility' );
+	$fontsize         = esc_html__( 'Toggle Font size', 'wp-accessibility' );
 	$enable_grayscale = ( 'on' === get_option( 'wpa_toolbar_gs' ) && current_user_can( 'manage_options' ) ) ? 'true' : 'false';
 	$enable_fontsize  = ( 'off' === get_option( 'wpa_toolbar_fs' ) ) ? 'false' : 'true';
 	$enable_contrast  = ( 'off' === get_option( 'wpa_toolbar_ct' ) ) ? 'false' : 'true';