From 732117b03167e91739cd2454b68c25f39a831523 Mon Sep 17 00:00:00 2001
From: savvasha <savvasha@hotmail.com>
Date: Thu, 11 Nov 2021 16:17:02 +0200
Subject: [PATCH] Escapes based on phpcs #5

---
 .../settings/class-sp-settings-general.php    |  16 +-
 includes/class-sp-ajax.php                    | 386 +++++++++---------
 includes/class-sp-template-loader.php         |   4 +-
 includes/sp-deprecated-functions.php          |   2 +-
 sportspress.php                               |   4 +-
 5 files changed, 206 insertions(+), 206 deletions(-)

diff --git a/includes/admin/settings/class-sp-settings-general.php b/includes/admin/settings/class-sp-settings-general.php
index b35eec1b..4b8258e8 100644
--- a/includes/admin/settings/class-sp-settings-general.php
+++ b/includes/admin/settings/class-sp-settings-general.php
@@ -354,12 +354,12 @@ if ( ! class_exists( 'SP_Settings_General' ) ) :
 			?>
 		<tr valign="top">
 			<th scope="row" class="titledesc">
-				<label for="timezone_string"><?php _e( 'Timezone', 'sportspress' ); ?> <i class="dashicons dashicons-editor-help sp-desc-tip" title="<?php _e( 'Choose a city in the same timezone as you.', 'sportspress' ); ?>"></i></label>
+				<label for="timezone_string"><?php esc_html_e( 'Timezone', 'sportspress' ); ?> <i class="dashicons dashicons-editor-help sp-desc-tip" title="<?php esc_attr_e( 'Choose a city in the same timezone as you.', 'sportspress' ); ?>"></i></label>
 			</th>
 			<td class="forminp">
-				<legend class="screen-reader-text"><span><?php _e( 'Timezone', 'sportspress' ); ?></span></legend>
-				<select id="timezone_string" name="timezone_string" class="<?php echo $class; ?>">
-					<?php echo wp_timezone_choice( $tzstring ); ?>
+				<legend class="screen-reader-text"><span><?php esc_html_e( 'Timezone', 'sportspress' ); ?></span></legend>
+				<select id="timezone_string" name="timezone_string" class="<?php echo esc_attr( $class ); ?>">
+					<?php echo esc_html( wp_timezone_choice( $tzstring ) ); ?>
 				</select>
 			   </td>
 		   </tr>
@@ -390,13 +390,13 @@ if ( ! class_exists( 'SP_Settings_General' ) ) :
 			?>
 		<tr valign="top" class="themeboy">
 			<th scope="row" class="titledesc">
-				<?php _e( 'Color Scheme', 'sportspress' ); ?>
+				<?php esc_html_e( 'Color Scheme', 'sportspress' ); ?>
 			</th>
 			<td class="forminp">
 				<fieldset>
 					<?php foreach ( $color_schemes as $name => $colors ) { ?>
 						<div class="color-option sp-color-option">
-							<label data-sp-colors="<?php echo implode( ',', $colors ); ?>"><?php echo esc_html( $name ); ?></label>
+							<label data-sp-colors="<?php echo implode( ',', array_map( 'esc_attr', $colors ) ); ?>"><?php echo esc_html( $name ); ?></label>
 							<table class="color-palette">
 								<tbody>
 									<tr>
@@ -411,7 +411,7 @@ if ( ! class_exists( 'SP_Settings_General' ) ) :
 				</fieldset>
 				<fieldset>
 					<div class="sp-custom-colors">
-						<label data-sp-colors="<?php echo implode( ',', $colors ); ?>"><?php _e( 'Customize', 'sportspress' ); ?></label><br>
+						<label data-sp-colors="<?php echo implode( ',', array_map( 'esc_attr', $colors ) ); ?>"><?php esc_html_e( 'Customize', 'sportspress' ); ?></label><br>
 						<?php
 						// Get settings
 						$colors = array_map( 'esc_attr', (array) get_option( 'themeboy', array() ) );
@@ -453,7 +453,7 @@ if ( ! class_exists( 'SP_Settings_General' ) ) :
 							<br>
 							<label for="sportspress_frontend_css_customize">
 								<input name="sportspress_frontend_css_customize" id="sportspress_frontend_css_customize" type="checkbox" value="1" <?php checked( $colors['customize'] ); ?>>
-								<?php _e( 'Enable', 'sportspress' ); ?>
+								<?php esc_html_e( 'Enable', 'sportspress' ); ?>
 							</label>
 						<?php endif; ?>
 					</div>
diff --git a/includes/class-sp-ajax.php b/includes/class-sp-ajax.php
index 7ac1ba24..ee233e48 100644
--- a/includes/class-sp-ajax.php
+++ b/includes/class-sp-ajax.php
@@ -61,13 +61,13 @@ class SP_AJAX {
 		<div class="wrap sp-thickbox-content" id="sp-thickbox-event_calendar">
 			<p>
 				<label>
-					<?php printf( __( 'Select %s:', 'sportspress' ), __( 'Event', 'sportspress' ) ); ?>
+					<?php printf( esc_html__( 'Select %s:', 'sportspress' ), esc_html__( 'Event', 'sportspress' ) ); ?>
 					<?php
 					$args = array(
 						'post_type'       => 'sp_event',
 						'name'            => 'id',
 						'values'          => 'ID',
-						'show_option_all' => __( '(Auto)', 'sportspress' ),
+						'show_option_all' => esc_html__( '(Auto)', 'sportspress' ),
 						'show_dates'      => true,
 						'post_status'     => 'future',
 					);
@@ -78,19 +78,19 @@ class SP_AJAX {
 			<p>
 				<label>
 					<input class="checkbox" type="checkbox" name="show_venue">
-					<?php _e( 'Display venue', 'sportspress' ); ?>
+					<?php esc_html_e( 'Display venue', 'sportspress' ); ?>
 				</label>
 			</p>
 			<p>
 				<label>
 					<input class="checkbox" type="checkbox" name="show_league">
-					<?php _e( 'Display league', 'sportspress' ); ?>
+					<?php esc_html_e( 'Display league', 'sportspress' ); ?>
 				</label>
 			</p>
 			<?php do_action( 'sportspress_ajax_shortcode_form', 'countdown' ); ?>
 			<p class="submit">
-				<input type="button" class="button-primary" value="<?php _e( 'Insert Shortcode', 'sportspress' ); ?>" onclick="insertSportsPress('countdown');" />
-				<a class="button-secondary" onclick="tb_remove();" title="<?php _e( 'Cancel', 'sportspress' ); ?>"><?php _e( 'Cancel', 'sportspress' ); ?></a>
+				<input type="button" class="button-primary" value="<?php esc_attr_e( 'Insert Shortcode', 'sportspress' ); ?>" onclick="insertSportsPress('countdown');" />
+				<a class="button-secondary" onclick="tb_remove();" title="<?php esc_attr_e( 'Cancel', 'sportspress' ); ?>"><?php esc_html_e( 'Cancel', 'sportspress' ); ?></a>
 			</p>
 		</div>
 		<?php
@@ -106,7 +106,7 @@ class SP_AJAX {
 		<div class="wrap sp-thickbox-content" id="sp-thickbox-event_details">
 			<p>
 				<label>
-					<?php printf( __( 'Select %s:', 'sportspress' ), __( 'Event', 'sportspress' ) ); ?>
+					<?php printf( esc_html__( 'Select %s:', 'sportspress' ), esc_html__( 'Event', 'sportspress' ) ); ?>
 					<?php
 					$args = array(
 						'post_type' => 'sp_event',
@@ -119,8 +119,8 @@ class SP_AJAX {
 			</p>
 			<?php do_action( 'sportspress_ajax_shortcode_form', 'event-details' ); ?>
 			<p class="submit">
-				<input type="button" class="button-primary" value="<?php _e( 'Insert Shortcode', 'sportspress' ); ?>" onclick="insertSportsPress('event_details');" />
-				<a class="button-secondary" onclick="tb_remove();" title="<?php _e( 'Cancel', 'sportspress' ); ?>"><?php _e( 'Cancel', 'sportspress' ); ?></a>
+				<input type="button" class="button-primary" value="<?php esc_attr_e( 'Insert Shortcode', 'sportspress' ); ?>" onclick="insertSportsPress('event_details');" />
+				<a class="button-secondary" onclick="tb_remove();" title="<?php esc_attr_e( 'Cancel', 'sportspress' ); ?>"><?php esc_html_e( 'Cancel', 'sportspress' ); ?></a>
 			</p>
 		</div>
 		<?php
@@ -136,7 +136,7 @@ class SP_AJAX {
 		<div class="wrap sp-thickbox-content" id="sp-thickbox-event_results">
 			<p>
 				<label>
-					<?php printf( __( 'Select %s:', 'sportspress' ), __( 'Event', 'sportspress' ) ); ?>
+					<?php printf( esc_html__( 'Select %s:', 'sportspress' ), esc_html__( 'Event', 'sportspress' ) ); ?>
 					<?php
 					$args = array(
 						'post_type' => 'sp_event',
@@ -149,8 +149,8 @@ class SP_AJAX {
 			</p>
 			<?php do_action( 'sportspress_ajax_shortcode_form', 'event-results' ); ?>
 			<p class="submit">
-				<input type="button" class="button-primary" value="<?php _e( 'Insert Shortcode', 'sportspress' ); ?>" onclick="insertSportsPress('event_results');" />
-				<a class="button-secondary" onclick="tb_remove();" title="<?php _e( 'Cancel', 'sportspress' ); ?>"><?php _e( 'Cancel', 'sportspress' ); ?></a>
+				<input type="button" class="button-primary" value="<?php esc_attr_e( 'Insert Shortcode', 'sportspress' ); ?>" onclick="insertSportsPress('event_results');" />
+				<a class="button-secondary" onclick="tb_remove();" title="<?php esc_attr_e( 'Cancel', 'sportspress' ); ?>"><?php esc_attr_e( 'Cancel', 'sportspress' ); ?></a>
 			</p>
 		</div>
 		<?php
@@ -166,7 +166,7 @@ class SP_AJAX {
 		<div class="wrap sp-thickbox-content" id="sp-thickbox-event_performance">
 			<p>
 				<label>
-					<?php printf( __( 'Select %s:', 'sportspress' ), __( 'Event', 'sportspress' ) ); ?>
+					<?php printf( esc_html__( 'Select %s:', 'sportspress' ), esc_html__( 'Event', 'sportspress' ) ); ?>
 					<?php
 					$args = array(
 						'post_type' => 'sp_event',
@@ -179,8 +179,8 @@ class SP_AJAX {
 			</p>
 			<?php do_action( 'sportspress_ajax_shortcode_form', 'event-performance' ); ?>
 			<p class="submit">
-				<input type="button" class="button-primary" value="<?php _e( 'Insert Shortcode', 'sportspress' ); ?>" onclick="insertSportsPress('event_performance');" />
-				<a class="button-secondary" onclick="tb_remove();" title="<?php _e( 'Cancel', 'sportspress' ); ?>"><?php _e( 'Cancel', 'sportspress' ); ?></a>
+				<input type="button" class="button-primary" value="<?php esc_attr_e( 'Insert Shortcode', 'sportspress' ); ?>" onclick="insertSportsPress('event_performance');" />
+				<a class="button-secondary" onclick="tb_remove();" title="<?php esc_attr_e( 'Cancel', 'sportspress' ); ?>"><?php esc_html_e( 'Cancel', 'sportspress' ); ?></a>
 			</p>
 		</div>
 		<?php
@@ -196,7 +196,7 @@ class SP_AJAX {
 		<div class="wrap sp-thickbox-content" id="sp-thickbox-event_venue">
 			<p>
 				<label>
-					<?php printf( __( 'Select %s:', 'sportspress' ), __( 'Event', 'sportspress' ) ); ?>
+					<?php printf( esc_html__( 'Select %s:', 'sportspress' ), esc_html__( 'Event', 'sportspress' ) ); ?>
 					<?php
 					$args = array(
 						'post_type' => 'sp_event',
@@ -209,8 +209,8 @@ class SP_AJAX {
 			</p>
 			<?php do_action( 'sportspress_ajax_shortcode_form', 'event-venue' ); ?>
 			<p class="submit">
-				<input type="button" class="button-primary" value="<?php _e( 'Insert Shortcode', 'sportspress' ); ?>" onclick="insertSportsPress('event_venue');" />
-				<a class="button-secondary" onclick="tb_remove();" title="<?php _e( 'Cancel', 'sportspress' ); ?>"><?php _e( 'Cancel', 'sportspress' ); ?></a>
+				<input type="button" class="button-primary" value="<?php esc_attr_e( 'Insert Shortcode', 'sportspress' ); ?>" onclick="insertSportsPress('event_venue');" />
+				<a class="button-secondary" onclick="tb_remove();" title="<?php esc_attr_e( 'Cancel', 'sportspress' ); ?>"><?php esc_html_e( 'Cancel', 'sportspress' ); ?></a>
 			</p>
 		</div>
 		<?php
@@ -226,7 +226,7 @@ class SP_AJAX {
 		<div class="wrap sp-thickbox-content" id="sp-thickbox-event_officials">
 			<p>
 				<label>
-					<?php printf( __( 'Select %s:', 'sportspress' ), __( 'Event', 'sportspress' ) ); ?>
+					<?php printf( esc_html__( 'Select %s:', 'sportspress' ), esc_html__( 'Event', 'sportspress' ) ); ?>
 					<?php
 					$args = array(
 						'post_type' => 'sp_event',
@@ -239,8 +239,8 @@ class SP_AJAX {
 			</p>
 			<?php do_action( 'sportspress_ajax_shortcode_form', 'event-officials' ); ?>
 			<p class="submit">
-				<input type="button" class="button-primary" value="<?php _e( 'Insert Shortcode', 'sportspress' ); ?>" onclick="insertSportsPress('event_officials');" />
-				<a class="button-secondary" onclick="tb_remove();" title="<?php _e( 'Cancel', 'sportspress' ); ?>"><?php _e( 'Cancel', 'sportspress' ); ?></a>
+				<input type="button" class="button-primary" value="<?php esc_attr_e( 'Insert Shortcode', 'sportspress' ); ?>" onclick="insertSportsPress('event_officials');" />
+				<a class="button-secondary" onclick="tb_remove();" title="<?php esc_attr_e( 'Cancel', 'sportspress' ); ?>"><?php esc_html_e( 'Cancel', 'sportspress' ); ?></a>
 			</p>
 		</div>
 		<?php
@@ -256,7 +256,7 @@ class SP_AJAX {
 		<div class="wrap sp-thickbox-content" id="sp-thickbox-event_teams">
 			<p>
 				<label>
-					<?php printf( __( 'Select %s:', 'sportspress' ), __( 'Event', 'sportspress' ) ); ?>
+					<?php printf( esc_html__( 'Select %s:', 'sportspress' ), esc_html__( 'Event', 'sportspress' ) ); ?>
 					<?php
 					$args = array(
 						'post_type' => 'sp_event',
@@ -269,8 +269,8 @@ class SP_AJAX {
 			</p>
 			<?php do_action( 'sportspress_ajax_shortcode_form', 'event-teams' ); ?>
 			<p class="submit">
-				<input type="button" class="button-primary" value="<?php _e( 'Insert Shortcode', 'sportspress' ); ?>" onclick="insertSportsPress('event_teams');" />
-				<a class="button-secondary" onclick="tb_remove();" title="<?php _e( 'Cancel', 'sportspress' ); ?>"><?php _e( 'Cancel', 'sportspress' ); ?></a>
+				<input type="button" class="button-primary" value="<?php esc_attr_e( 'Insert Shortcode', 'sportspress' ); ?>" onclick="insertSportsPress('event_teams');" />
+				<a class="button-secondary" onclick="tb_remove();" title="<?php esc_attr_e( 'Cancel', 'sportspress' ); ?>"><?php esc_html_e( 'Cancel', 'sportspress' ); ?></a>
 			</p>
 		</div>
 		<?php
@@ -286,7 +286,7 @@ class SP_AJAX {
 		<div class="wrap sp-thickbox-content" id="sp-thickbox-event_full">
 			<p>
 				<label>
-					<?php printf( __( 'Select %s:', 'sportspress' ), __( 'Event', 'sportspress' ) ); ?>
+					<?php printf( esc_html__( 'Select %s:', 'sportspress' ), esc_html__( 'Event', 'sportspress' ) ); ?>
 					<?php
 					$args = array(
 						'post_type' => 'sp_event',
@@ -299,8 +299,8 @@ class SP_AJAX {
 			</p>
 			<?php do_action( 'sportspress_ajax_shortcode_form', 'event-full' ); ?>
 			<p class="submit">
-				<input type="button" class="button-primary" value="<?php _e( 'Insert Shortcode', 'sportspress' ); ?>" onclick="insertSportsPress('event_full');" />
-				<a class="button-secondary" onclick="tb_remove();" title="<?php _e( 'Cancel', 'sportspress' ); ?>"><?php _e( 'Cancel', 'sportspress' ); ?></a>
+				<input type="button" class="button-primary" value="<?php esc_attr_e( 'Insert Shortcode', 'sportspress' ); ?>" onclick="insertSportsPress('event_full');" />
+				<a class="button-secondary" onclick="tb_remove();" title="<?php esc_attr_e( 'Cancel', 'sportspress' ); ?>"><?php esc_html_e( 'Cancel', 'sportspress' ); ?></a>
 			</p>
 		</div>
 		<?php
@@ -316,13 +316,13 @@ class SP_AJAX {
 		<div class="wrap sp-thickbox-content" id="sp-thickbox-event_calendar">
 			<p>
 				<label>
-					<?php printf( __( 'Select %s:', 'sportspress' ), __( 'Calendar', 'sportspress' ) ); ?>
+					<?php printf( esc_html__( 'Select %s:', 'sportspress' ), esc_html__( 'Calendar', 'sportspress' ) ); ?>
 					<?php
 					$args = array(
 						'post_type'       => 'sp_calendar',
 						'name'            => 'id',
 						'values'          => 'ID',
-						'show_option_all' => __( 'All', 'sportspress' ),
+						'show_option_all' => esc_html__( 'All', 'sportspress' ),
 					);
 					sp_dropdown_pages( $args );
 					?>
@@ -330,11 +330,11 @@ class SP_AJAX {
 			</p>
 			<p>
 				<label>
-					<?php _e( 'Team:', 'sportspress' ); ?>
+					<?php esc_html_e( 'Team:', 'sportspress' ); ?>
 					<?php
 					$args = array(
 						'post_type'       => 'sp_team',
-						'show_option_all' => __( 'Default', 'sportspress' ),
+						'show_option_all' => esc_html__( 'Default', 'sportspress' ),
 						'name'            => 'team',
 						'values'          => 'ID',
 					);
@@ -344,11 +344,11 @@ class SP_AJAX {
 			</p>
 			<p>
 				<label>
-					<?php _e( 'League:', 'sportspress' ); ?>
+					<?php esc_html_e( 'League:', 'sportspress' ); ?>
 					<?php
 					$args = array(
 						'taxonomy'        => 'sp_league',
-						'show_option_all' => __( 'Default', 'sportspress' ),
+						'show_option_all' => esc_html__( 'Default', 'sportspress' ),
 						'name'            => 'league',
 						'values'          => 'term_id',
 					);
@@ -358,11 +358,11 @@ class SP_AJAX {
 			</p>
 			<p>
 				<label>
-					<?php _e( 'Season:', 'sportspress' ); ?>
+					<?php esc_html_e( 'Season:', 'sportspress' ); ?>
 					<?php
 					$args = array(
 						'taxonomy'        => 'sp_season',
-						'show_option_all' => __( 'Default', 'sportspress' ),
+						'show_option_all' => esc_html__( 'Default', 'sportspress' ),
 						'name'            => 'season',
 						'values'          => 'term_id',
 					);
@@ -372,11 +372,11 @@ class SP_AJAX {
 			</p>
 			<p>
 				<label>
-					<?php _e( 'Venue:', 'sportspress' ); ?>
+					<?php esc_html_e( 'Venue:', 'sportspress' ); ?>
 					<?php
 					$args = array(
 						'taxonomy'        => 'sp_venue',
-						'show_option_all' => __( 'Default', 'sportspress' ),
+						'show_option_all' => esc_html__( 'Default', 'sportspress' ),
 						'name'            => 'venue',
 						'values'          => 'term_id',
 					);
@@ -386,18 +386,18 @@ class SP_AJAX {
 			</p>
 			<p>
 				<label>
-					<?php _e( 'Status:', 'sportspress' ); ?>
+					<?php esc_html_e( 'Status:', 'sportspress' ); ?>
 					<?php
 					$args = array(
 						'name'                => 'status',
-						'show_option_default' => __( 'Default', 'sportspress' ),
+						'show_option_default' => esc_html__( 'Default', 'sportspress' ),
 					);
 					sp_dropdown_statuses( $args );
 					?>
 				</label>
 			</p>
 			<div class="sp-date-selector">
-				<p><?php _e( 'Date:', 'sportspress' ); ?> 
+				<p><?php esc_html_e( 'Date:', 'sportspress' ); ?> 
 					<?php
 					$args = array(
 						'name' => 'date',
@@ -415,39 +415,39 @@ class SP_AJAX {
 					</p>
 
 					<p class="sp-date-range-relative">
-						<?php _e( 'Past', 'sportspress' ); ?>
+						<?php esc_html_e( 'Past', 'sportspress' ); ?>
 						<input type="number" min="0" step="1" class="tiny-text" name="date_past" value="default">
-						<?php _e( 'days', 'sportspress' ); ?>
+						<?php esc_html_e( 'days', 'sportspress' ); ?>
 						&rarr;
-						<?php _e( 'Next', 'sportspress' ); ?>
+						<?php esc_html_e( 'Next', 'sportspress' ); ?>
 						<input type="number" min="0" step="1" class="tiny-text" name="date_future" value="default">
-						<?php _e( 'days', 'sportspress' ); ?>
+						<?php esc_html_e( 'days', 'sportspress' ); ?>
 					</p>
 
 					<p class="sp-date-relative">
 						<label>
 							<input type="checkbox" name="date_relative" value="0" id="date_relative">
-							<?php _e( 'Relative', 'sportspress' ); ?>
+							<?php esc_html_e( 'Relative', 'sportspress' ); ?>
 						</label>
 					</p>
 				</div>
 			</div>
 			<p>
 				<label>
-					<?php _e( 'Match Day:', 'sportspress' ); ?>
-					<input type="text" size="3" name="day" id="day" placeholder="<?php _e( 'All', 'sportspress' ); ?>">
+					<?php esc_html_e( 'Match Day:', 'sportspress' ); ?>
+					<input type="text" size="3" name="day" id="day" placeholder="<?php esc_html_e( 'All', 'sportspress' ); ?>">
 				</label>
 			</p>
 			<p>
 				<label>
-					<?php _e( 'Display link to view all events', 'sportspress' ); ?>
+					<?php esc_html_e( 'Display link to view all events', 'sportspress' ); ?>
 					<input type="checkbox" name="show_all_events_link" id="show_all_events_link">
 				</label>
 			</p>
 			<?php do_action( 'sportspress_ajax_shortcode_form', 'event-calendar' ); ?>
 			<p class="submit">
-				<input type="button" class="button-primary" value="<?php _e( 'Insert Shortcode', 'sportspress' ); ?>" onclick="insertSportsPress('event_calendar');" />
-				<a class="button-secondary" onclick="tb_remove();" title="<?php _e( 'Cancel', 'sportspress' ); ?>"><?php _e( 'Cancel', 'sportspress' ); ?></a>
+				<input type="button" class="button-primary" value="<?php esc_html_e( 'Insert Shortcode', 'sportspress' ); ?>" onclick="insertSportsPress('event_calendar');" />
+				<a class="button-secondary" onclick="tb_remove();" title="<?php esc_html_e( 'Cancel', 'sportspress' ); ?>"><?php esc_html_e( 'Cancel', 'sportspress' ); ?></a>
 			</p>
 		</div>
 		<?php
@@ -463,17 +463,17 @@ class SP_AJAX {
 		<div class="wrap sp-thickbox-content" id="sp-thickbox-event_list">
 			<p>
 				<label>
-					<?php _e( 'Title:', 'sportspress' ); ?>
+					<?php esc_html_e( 'Title:', 'sportspress' ); ?>
 					<input class="regular-text" type="text" name="title">
 				</label>
 			</p>
 			<p>
 				<label>
-					<?php printf( __( 'Select %s:', 'sportspress' ), __( 'Calendar', 'sportspress' ) ); ?>
+					<?php printf( esc_html__( 'Select %s:', 'sportspress' ), __( 'Calendar', 'sportspress' ) ); ?>
 					<?php
 					$args = array(
 						'post_type'       => 'sp_calendar',
-						'show_option_all' => __( 'All', 'sportspress' ),
+						'show_option_all' => esc_html__( 'All', 'sportspress' ),
 						'name'            => 'id',
 						'values'          => 'ID',
 					);
@@ -483,11 +483,11 @@ class SP_AJAX {
 			</p>
 			<p>
 				<label>
-					<?php _e( 'Team:', 'sportspress' ); ?>
+					<?php esc_html_e( 'Team:', 'sportspress' ); ?>
 					<?php
 					$args = array(
 						'post_type'       => 'sp_team',
-						'show_option_all' => __( 'Default', 'sportspress' ),
+						'show_option_all' => esc_html__( 'Default', 'sportspress' ),
 						'name'            => 'team',
 						'values'          => 'ID',
 					);
@@ -497,11 +497,11 @@ class SP_AJAX {
 			</p>
 			<p>
 				<label>
-					<?php _e( 'League:', 'sportspress' ); ?>
+					<?php esc_html_e( 'League:', 'sportspress' ); ?>
 					<?php
 					$args = array(
 						'taxonomy'        => 'sp_league',
-						'show_option_all' => __( 'Default', 'sportspress' ),
+						'show_option_all' => esc_html__( 'Default', 'sportspress' ),
 						'name'            => 'league',
 						'values'          => 'term_id',
 					);
@@ -511,11 +511,11 @@ class SP_AJAX {
 			</p>
 			<p>
 				<label>
-					<?php _e( 'Season:', 'sportspress' ); ?>
+					<?php esc_html_e( 'Season:', 'sportspress' ); ?>
 					<?php
 					$args = array(
 						'taxonomy'        => 'sp_season',
-						'show_option_all' => __( 'Default', 'sportspress' ),
+						'show_option_all' => esc_html__( 'Default', 'sportspress' ),
 						'name'            => 'season',
 						'values'          => 'term_id',
 					);
@@ -525,11 +525,11 @@ class SP_AJAX {
 			</p>
 			<p>
 				<label>
-					<?php _e( 'Venue:', 'sportspress' ); ?>
+					<?php esc_html_e( 'Venue:', 'sportspress' ); ?>
 					<?php
 					$args = array(
 						'taxonomy'        => 'sp_venue',
-						'show_option_all' => __( 'Default', 'sportspress' ),
+						'show_option_all' => esc_html__( 'Default', 'sportspress' ),
 						'name'            => 'venue',
 						'values'          => 'term_id',
 					);
@@ -539,11 +539,11 @@ class SP_AJAX {
 			</p>
 			<p>
 				<label>
-					<?php _e( 'Status:', 'sportspress' ); ?>
+					<?php esc_html_e( 'Status:', 'sportspress' ); ?>
 					<?php
 					$args = array(
 						'name'                => 'status',
-						'show_option_default' => __( 'Default', 'sportspress' ),
+						'show_option_default' => esc_html__( 'Default', 'sportspress' ),
 					);
 					sp_dropdown_statuses( $args );
 					?>
@@ -551,7 +551,7 @@ class SP_AJAX {
 			</p>
 			<p>
 				<label>
-					<?php _e( 'Format:', 'sportspress' ); ?>
+					<?php esc_html_e( 'Format:', 'sportspress' ); ?>
 					<select name="format" class="postform">
 						<option value="default">Default</option>
 						<option value="all">All</option>
@@ -562,7 +562,7 @@ class SP_AJAX {
 				</label>
 			</p>
 			<div class="sp-date-selector">
-				<p><?php _e( 'Date:', 'sportspress' ); ?> 
+				<p><?php esc_html_e( 'Date:', 'sportspress' ); ?> 
 					<?php
 					$args = array(
 						'name' => 'date',
@@ -580,57 +580,57 @@ class SP_AJAX {
 					</p>
 
 					<p class="sp-date-range-relative">
-						<?php _e( 'Past', 'sportspress' ); ?>
+						<?php esc_html_e( 'Past', 'sportspress' ); ?>
 						<input type="number" min="0" step="1" class="tiny-text" name="date_past" value="default">
-						<?php _e( 'days', 'sportspress' ); ?>
+						<?php esc_html_e( 'days', 'sportspress' ); ?>
 						&rarr;
-						<?php _e( 'Next', 'sportspress' ); ?>
+						<?php esc_html_e( 'Next', 'sportspress' ); ?>
 						<input type="number" min="0" step="1" class="tiny-text" name="date_future" value="default">
-						<?php _e( 'days', 'sportspress' ); ?>
+						<?php esc_html_e( 'days', 'sportspress' ); ?>
 					</p>
 
 					<p class="sp-date-relative">
 						<label>
 							<input type="checkbox" name="date_relative" value="0" id="date_relative">
-							<?php _e( 'Relative', 'sportspress' ); ?>
+							<?php esc_html_e( 'Relative', 'sportspress' ); ?>
 						</label>
 					</p>
 				</div>
 			</div>
 			<p>
 				<label>
-					<?php _e( 'Match Day:', 'sportspress' ); ?>
-					<input type="text" size="3" name="day" id="day" placeholder="<?php _e( 'All', 'sportspress' ); ?>">
+					<?php esc_html_e( 'Match Day:', 'sportspress' ); ?>
+					<input type="text" size="3" name="day" id="day" placeholder="<?php esc_attr_e( 'All', 'sportspress' ); ?>">
 				</label>
 			</p>
 			<p>
 				<label>
-					<?php _e( 'Number of events to show:', 'sportspress' ); ?>
+					<?php esc_html_e( 'Number of events to show:', 'sportspress' ); ?>
 					<input type="text" size="3" name="number" id="number" value="5">
 				</label>
 			</p>
 			<p>
 				<label>
-					<?php _e( 'Sort Order:', 'sportspress' ); ?>
+					<?php esc_html_e( 'Sort Order:', 'sportspress' ); ?>
 					<select id="order" name="order">
-						<option value="default"><?php _e( 'Default', 'sportspress' ); ?></option>
-						<option value="ASC"><?php _e( 'Ascending', 'sportspress' ); ?></option>
-						<option value="DESC"><?php _e( 'Descending', 'sportspress' ); ?></option>
+						<option value="default"><?php esc_html_e( 'Default', 'sportspress' ); ?></option>
+						<option value="ASC"><?php esc_html_e( 'Ascending', 'sportspress' ); ?></option>
+						<option value="DESC"><?php esc_html_e( 'Descending', 'sportspress' ); ?></option>
 					</select>
 				</label>
 			</p>
 			<p class="sp-prefs">
-				<?php _e( 'Columns:', 'sportspress' ); ?><br>
+				<?php esc_html_e( 'Columns:', 'sportspress' ); ?><br>
 				<?php
 				$the_columns = array(
-					'event'       => __( 'Event', 'sportspress' ),
-					'teams'       => __( 'Teams', 'sportspress' ),
-					'time'        => __( 'Time', 'sportspress' ),
-					'league'      => __( 'League', 'sportspress' ),
-					'season'      => __( 'Season', 'sportspress' ),
-					'venue'       => __( 'Venue', 'sportspress' ),
-					'article'     => __( 'Article', 'sportspress' ),
-					'event_specs' => __( 'Specs', 'sportspress' ),
+					'event'       => esc_attr__( 'Event', 'sportspress' ),
+					'teams'       => esc_attr__( 'Teams', 'sportspress' ),
+					'time'        => esc_attr__( 'Time', 'sportspress' ),
+					'league'      => esc_attr__( 'League', 'sportspress' ),
+					'season'      => esc_attr__( 'Season', 'sportspress' ),
+					'venue'       => esc_attr__( 'Venue', 'sportspress' ),
+					'article'     => esc_attr__( 'Article', 'sportspress' ),
+					'event_specs' => esc_attr__( 'Specs', 'sportspress' ),
 				);
 				$field_name  = 'columns[]';
 				$field_id    = 'columns';
@@ -642,13 +642,13 @@ class SP_AJAX {
 			<p>
 				<label>
 					<input type="checkbox" name="show_all_events_link" id="show_all_events_link">
-					<?php _e( 'Display link to view all events', 'sportspress' ); ?>
+					<?php esc_html_e( 'Display link to view all events', 'sportspress' ); ?>
 				</label>
 			</p>
 			<?php do_action( 'sportspress_ajax_shortcode_form', 'event-list' ); ?>
 			<p class="submit">
-				<input type="button" class="button-primary" value="<?php _e( 'Insert Shortcode', 'sportspress' ); ?>" onclick="insertSportsPress('event_list');" />
-				<a class="button-secondary" onclick="tb_remove();" title="<?php _e( 'Cancel', 'sportspress' ); ?>"><?php _e( 'Cancel', 'sportspress' ); ?></a>
+				<input type="button" class="button-primary" value="<?php esc_attr_e( 'Insert Shortcode', 'sportspress' ); ?>" onclick="insertSportsPress('event_list');" />
+				<a class="button-secondary" onclick="tb_remove();" title="<?php esc_attr_e( 'Cancel', 'sportspress' ); ?>"><?php esc_html_e( 'Cancel', 'sportspress' ); ?></a>
 			</p>
 		</div>
 		<?php
@@ -664,23 +664,23 @@ class SP_AJAX {
 		<div class="wrap sp-thickbox-content" id="sp-thickbox-event_blocks">
 			<p>
 				<label>
-					<?php _e( 'Title:', 'sportspress' ); ?>
+					<?php esc_html_e( 'Title:', 'sportspress' ); ?>
 					<input class="regular-text" type="text" name="title">
 				</label>
 			</p>
 			<p>
 				<label>
-					<?php _e( 'Event:', 'sportspress' ); ?>
+					<?php esc_html_e( 'Event:', 'sportspress' ); ?>
 					<input class="regular-text" type="number" name="event">
 				</label>
 			</p>
 			<p>
 				<label>
-					<?php printf( __( 'Select %s:', 'sportspress' ), __( 'Calendar', 'sportspress' ) ); ?>
+					<?php printf( esc_html__( 'Select %s:', 'sportspress' ), esc_html__( 'Calendar', 'sportspress' ) ); ?>
 					<?php
 					$args = array(
 						'post_type'       => 'sp_calendar',
-						'show_option_all' => __( 'All', 'sportspress' ),
+						'show_option_all' => esc_attr__( 'All', 'sportspress' ),
 						'name'            => 'id',
 						'values'          => 'ID',
 					);
@@ -690,11 +690,11 @@ class SP_AJAX {
 			</p>
 			<p>
 				<label>
-					<?php _e( 'Team:', 'sportspress' ); ?>
+					<?php esc_html_e( 'Team:', 'sportspress' ); ?>
 					<?php
 					$args = array(
 						'post_type'       => 'sp_team',
-						'show_option_all' => __( 'Default', 'sportspress' ),
+						'show_option_all' => esc_attr__( 'Default', 'sportspress' ),
 						'name'            => 'team',
 						'values'          => 'ID',
 					);
@@ -704,11 +704,11 @@ class SP_AJAX {
 			</p>
 			<p>
 				<label>
-					<?php _e( 'League:', 'sportspress' ); ?>
+					<?php esc_html_e( 'League:', 'sportspress' ); ?>
 					<?php
 					$args = array(
 						'taxonomy'        => 'sp_league',
-						'show_option_all' => __( 'Default', 'sportspress' ),
+						'show_option_all' => esc_attr__( 'Default', 'sportspress' ),
 						'name'            => 'league',
 						'values'          => 'term_id',
 					);
@@ -718,11 +718,11 @@ class SP_AJAX {
 			</p>
 			<p>
 				<label>
-					<?php _e( 'Season:', 'sportspress' ); ?>
+					<?php esc_html_e( 'Season:', 'sportspress' ); ?>
 					<?php
 					$args = array(
 						'taxonomy'        => 'sp_season',
-						'show_option_all' => __( 'Default', 'sportspress' ),
+						'show_option_all' => esc_attr__( 'Default', 'sportspress' ),
 						'name'            => 'season',
 						'values'          => 'term_id',
 					);
@@ -732,11 +732,11 @@ class SP_AJAX {
 			</p>
 			<p>
 				<label>
-					<?php _e( 'Venue:', 'sportspress' ); ?>
+					<?php esc_html_e( 'Venue:', 'sportspress' ); ?>
 					<?php
 					$args = array(
 						'taxonomy'        => 'sp_venue',
-						'show_option_all' => __( 'Default', 'sportspress' ),
+						'show_option_all' => esc_attr__( 'Default', 'sportspress' ),
 						'name'            => 'venue',
 						'values'          => 'term_id',
 					);
@@ -746,11 +746,11 @@ class SP_AJAX {
 			</p>
 			<p>
 				<label>
-					<?php _e( 'Status:', 'sportspress' ); ?>
+					<?php esc_html_e( 'Status:', 'sportspress' ); ?>
 					<?php
 					$args = array(
 						'name'                => 'status',
-						'show_option_default' => __( 'Default', 'sportspress' ),
+						'show_option_default' => esc_attr__( 'Default', 'sportspress' ),
 					);
 					sp_dropdown_statuses( $args );
 					?>
@@ -758,7 +758,7 @@ class SP_AJAX {
 			</p>
 			<p>
 				<label>
-					<?php _e( 'Format:', 'sportspress' ); ?>
+					<?php esc_html_e( 'Format:', 'sportspress' ); ?>
 					<select name="format" class="postform">
 					<option value="default">Default</option>
 					<option value="all">All</option>
@@ -769,7 +769,7 @@ class SP_AJAX {
 				</label>
 			</p>
 			<div class="sp-date-selector">
-				<p><?php _e( 'Date:', 'sportspress' ); ?> 
+				<p><?php esc_html_e( 'Date:', 'sportspress' ); ?> 
 					<?php
 					$args = array(
 						'name' => 'date',
@@ -787,65 +787,65 @@ class SP_AJAX {
 					</p>
 
 					<p class="sp-date-range-relative">
-						<?php _e( 'Past', 'sportspress' ); ?>
+						<?php esc_html_e( 'Past', 'sportspress' ); ?>
 						<input type="number" min="0" step="1" class="tiny-text" name="date_past" value="default">
-						<?php _e( 'days', 'sportspress' ); ?>
+						<?php esc_html_e( 'days', 'sportspress' ); ?>
 						&rarr;
-						<?php _e( 'Next', 'sportspress' ); ?>
+						<?php esc_html_e( 'Next', 'sportspress' ); ?>
 						<input type="number" min="0" step="1" class="tiny-text" name="date_future" value="default">
 						<?php _e( 'days', 'sportspress' ); ?>
-					</p>
+					</p>esc_html
 
 					<p class="sp-date-relative">
 						<label>
 							<input type="checkbox" name="date_relative" value="0" id="date_relative">
-							<?php _e( 'Relative', 'sportspress' ); ?>
+							<?php esc_html_e( 'Relative', 'sportspress' ); ?>
 						</label>
 					</p>
 				</div>
 			</div>
 			<p>
 				<label>
-					<?php _e( 'Match Day:', 'sportspress' ); ?>
-					<input type="text" size="3" name="day" id="day" placeholder="<?php _e( 'All', 'sportspress' ); ?>">
+					<?php esc_html_e( 'Match Day:', 'sportspress' ); ?>
+					<input type="text" size="3" name="day" id="day" placeholder="<?php esc_attr_e( 'All', 'sportspress' ); ?>">
 				</label>
 			</p>
 			<p>
 				<label>
-					<?php _e( 'Number of events to show:', 'sportspress' ); ?>
+					<?php esc_html_e( 'Number of events to show:', 'sportspress' ); ?>
 					<input type="text" size="3" name="number" id="number" value="5">
 				</label>
 			</p>
 			<p>
 				<label>
-					<?php _e( 'Sort by:', 'sportspress' ); ?>
+					<?php esc_html_e( 'Sort by:', 'sportspress' ); ?>
 					<select id="orderby" name="orderby">
-						<option value="default"><?php _e( 'Default', 'sportspress' ); ?></option>
-						<option value="date"><?php _e( 'Date', 'sportspress' ); ?></option>
-						<option value="day"><?php _e( 'Match Day', 'sportspress' ); ?></option>
+						<option value="default"><?php esc_html_e( 'Default', 'sportspress' ); ?></option>
+						<option value="date"><?php esc_html_e( 'Date', 'sportspress' ); ?></option>
+						<option value="day"><?php esc_html_e( 'Match Day', 'sportspress' ); ?></option>
 					</select>
 				</label>
 			</p>
 			<p>
 				<label>
-					<?php _e( 'Sort Order:', 'sportspress' ); ?>
+					<?php esc_html_e( 'Sort Order:', 'sportspress' ); ?>
 					<select id="order" name="order">
-						<option value="default"><?php _e( 'Default', 'sportspress' ); ?></option>
-						<option value="ASC"><?php _e( 'Ascending', 'sportspress' ); ?></option>
-						<option value="DESC"><?php _e( 'Descending', 'sportspress' ); ?></option>
+						<option value="default"><?php esc_html_e( 'Default', 'sportspress' ); ?></option>
+						<option value="ASC"><?php esc_html_e( 'Ascending', 'sportspress' ); ?></option>
+						<option value="DESC"><?php esc_html_e( 'Descending', 'sportspress' ); ?></option>
 					</select>
 				</label>
 			</p>
 			<p>
 				<label>
 					<input type="checkbox" name="show_all_events_link" id="show_all_events_link">
-					<?php _e( 'Display link to view all events', 'sportspress' ); ?>
+					<?php esc_html_e( 'Display link to view all events', 'sportspress' ); ?>
 				</label>
 			</p>
 			<?php do_action( 'sportspress_ajax_shortcode_form', 'event-blocks' ); ?>
 			<p class="submit">
-				<input type="button" class="button-primary" value="<?php _e( 'Insert Shortcode', 'sportspress' ); ?>" onclick="insertSportsPress('event_blocks');" />
-				<a class="button-secondary" onclick="tb_remove();" title="<?php _e( 'Cancel', 'sportspress' ); ?>"><?php _e( 'Cancel', 'sportspress' ); ?></a>
+				<input type="button" class="button-primary" value="<?php esc_attr_e( 'Insert Shortcode', 'sportspress' ); ?>" onclick="insertSportsPress('event_blocks');" />
+				<a class="button-secondary" onclick="tb_remove();" title="<?php esc_attr_e( 'Cancel', 'sportspress' ); ?>"><?php esc_html_e( 'Cancel', 'sportspress' ); ?></a>
 			</p>
 		</div>
 		<?php
@@ -861,13 +861,13 @@ class SP_AJAX {
 		<div class="wrap sp-thickbox-content" id="sp-thickbox-team_standings">
 			<p>
 				<label>
-					<?php _e( 'Title:', 'sportspress' ); ?>
+					<?php esc_html_e( 'Title:', 'sportspress' ); ?>
 					<input class="regular-text" type="text" name="title">
 				</label>
 			</p>
 			<p>
 				<label>
-					<?php printf( __( 'Select %s:', 'sportspress' ), __( 'League Table', 'sportspress' ) ); ?>
+					<?php printf( esc_html__( 'Select %s:', 'sportspress' ), esc_html__( 'League Table', 'sportspress' ) ); ?>
 					<?php
 					$args = array(
 						'post_type' => 'sp_table',
@@ -880,12 +880,12 @@ class SP_AJAX {
 			</p>
 			<p>
 				<label>
-					<?php _e( 'Number of teams to show:', 'sportspress' ); ?>
+					<?php esc_html_e( 'Number of teams to show:', 'sportspress' ); ?>
 					<input type="text" size="3" name="number" id="number" value="5">
 				</label>
 			</p>
 			<p class="sp-prefs">
-				<?php _e( 'Columns:', 'sportspress' ); ?><br>
+				<?php esc_html_e( 'Columns:', 'sportspress' ); ?><br>
 				<?php
 				$args        = array(
 					'post_type'      => 'sp_column',
@@ -906,31 +906,31 @@ class SP_AJAX {
 			<p>
 				<label>
 					<input type="checkbox" name="show_team_logo" id="show_team_logo">
-					<?php _e( 'Display logos', 'sportspress' ); ?>
+					<?php esc_html_e( 'Display logos', 'sportspress' ); ?>
 				</label>
 			</p>
 			<p>
 				<label>
 					<input type="checkbox" name="show_full_table_link" id="show_full_table_link">
-					<?php _e( 'Display link to view full table', 'sportspress' ); ?>
+					<?php esc_html_e( 'Display link to view full table', 'sportspress' ); ?>
 				</label>
 			</p>
 			<p>
-				<?php _e( 'Event Status:', 'sportspress' ); ?><br/>
+				<?php esc_html_e( 'Event Status:', 'sportspress' ); ?><br/>
 				<label>
 					<input type="checkbox" name="show_published_events" id="show_published_events" checked>
-					<?php _e( 'Include Published/Played Events with results', 'sportspress' ); ?>
+					<?php esc_html_e( 'Include Published/Played Events with results', 'sportspress' ); ?>
 				</label>
 				<br/>
 				<label>
 					<input type="checkbox" name="show_future_events" id="show_future_events" checked>
-					<?php _e( 'Include Scheduled/Future Events with results', 'sportspress' ); ?>
+					<?php esc_html_e( 'Include Scheduled/Future Events with results', 'sportspress' ); ?>
 				</label>
 			</p>
 			<?php do_action( 'sportspress_ajax_shortcode_form', 'league-table' ); ?>
 			<p class="submit">
-				<input type="button" class="button-primary" value="<?php _e( 'Insert Shortcode', 'sportspress' ); ?>" onclick="insertSportsPress('team_standings');" />
-				<a class="button-secondary" onclick="tb_remove();" title="<?php _e( 'Cancel', 'sportspress' ); ?>"><?php _e( 'Cancel', 'sportspress' ); ?></a>
+				<input type="button" class="button-primary" value="<?php esc_attr_e( 'Insert Shortcode', 'sportspress' ); ?>" onclick="insertSportsPress('team_standings');" />
+				<a class="button-secondary" onclick="tb_remove();" title="<?php esc_attr_e( 'Cancel', 'sportspress' ); ?>"><?php esc_html_e( 'Cancel', 'sportspress' ); ?></a>
 			</p>
 		</div>
 		<?php
@@ -946,13 +946,13 @@ class SP_AJAX {
 		<div class="wrap sp-thickbox-content" id="sp-thickbox-team_gallery">
 			<p>
 				<label>
-					<?php _e( 'Title:', 'sportspress' ); ?>
+					<?php esc_html_e( 'Title:', 'sportspress' ); ?>
 					<input class="regular-text" type="text" name="title">
 				</label>
 			</p>
 			<p>
 				<label>
-					<?php printf( __( 'Select %s:', 'sportspress' ), __( 'League Table', 'sportspress' ) ); ?>
+					<?php printf( esc_html__( 'Select %s:', 'sportspress' ), esc_html__( 'League Table', 'sportspress' ) ); ?>
 					<?php
 					$args = array(
 						'post_type' => 'sp_table',
@@ -965,36 +965,36 @@ class SP_AJAX {
 			</p>
 			<p>
 				<label>
-					<?php _e( 'Number of teams to show:', 'sportspress' ); ?>
+					<?php esc_html_e( 'Number of teams to show:', 'sportspress' ); ?>
 					<input type="text" size="3" name="number" id="number" value="5">
 				</label>
 			</p>
 			<p>
 				<label>
-					<?php _e( 'Columns:', 'sportspress' ); ?>
+					<?php esc_html_e( 'Columns:', 'sportspress' ); ?>
 					<input type="text" size="3" name="columns" id="columns" value="3">
 				</label>
 			</p>
 			<p>
 				<label>
-					<?php _e( 'Order by', 'sportspress' ); ?>:
+					<?php esc_html_e( 'Order by', 'sportspress' ); ?>:
 					<select name="orderby">
-						<option value="default"><?php _e( 'Rank', 'sportspress' ); ?></option>
-						<option value="name"><?php _e( 'Alphabetical', 'sportspress' ); ?></option>
-						<option value="rand"><?php _e( 'Random', 'sportspress' ); ?></option>
+						<option value="default"><?php esc_html_e( 'Rank', 'sportspress' ); ?></option>
+						<option value="name"><?php esc_html_e( 'Alphabetical', 'sportspress' ); ?></option>
+						<option value="rand"><?php esc_html_e( 'Random', 'sportspress' ); ?></option>
 					</select>
 				</label>
 			</p>
 			<p>
 				<label>
 					<input type="checkbox" name="show_full_table_link" id="show_full_table_link">
-					<?php _e( 'Display link to view full table', 'sportspress' ); ?>
+					<?php esc_html_e( 'Display link to view full table', 'sportspress' ); ?>
 				</label>
 			</p>
 			<?php do_action( 'sportspress_ajax_shortcode_form', 'league-table' ); ?>
 			<p class="submit">
-				<input type="button" class="button-primary" value="<?php _e( 'Insert Shortcode', 'sportspress' ); ?>" onclick="insertSportsPress('team_gallery');" />
-				<a class="button-secondary" onclick="tb_remove();" title="<?php _e( 'Cancel', 'sportspress' ); ?>"><?php _e( 'Cancel', 'sportspress' ); ?></a>
+				<input type="button" class="button-primary" value="<?php esc_attr_e( 'Insert Shortcode', 'sportspress' ); ?>" onclick="insertSportsPress('team_gallery');" />
+				<a class="button-secondary" onclick="tb_remove();" title="<?php esc_attr_e( 'Cancel', 'sportspress' ); ?>"><?php esc_html_e( 'Cancel', 'sportspress' ); ?></a>
 			</p>
 		</div>
 		<?php
@@ -1010,7 +1010,7 @@ class SP_AJAX {
 		<div class="wrap sp-thickbox-content" id="sp-thickbox-player_details">
 			<p>
 				<label>
-					<?php printf( __( 'Select %s:', 'sportspress' ), __( 'Player', 'sportspress' ) ); ?>
+					<?php printf( esc_html__( 'Select %s:', 'sportspress' ), esc_html__( 'Player', 'sportspress' ) ); ?>
 					<?php
 					$args = array(
 						'post_type' => 'sp_player',
@@ -1023,8 +1023,8 @@ class SP_AJAX {
 			</p>
 			<?php do_action( 'sportspress_ajax_shortcode_form', 'player-details' ); ?>
 			<p class="submit">
-				<input type="button" class="button-primary" value="<?php _e( 'Insert Shortcode', 'sportspress' ); ?>" onclick="insertSportsPress('player_details');" />
-				<a class="button-secondary" onclick="tb_remove();" title="<?php _e( 'Cancel', 'sportspress' ); ?>"><?php _e( 'Cancel', 'sportspress' ); ?></a>
+				<input type="button" class="button-primary" value="<?php esc_attr_e( 'Insert Shortcode', 'sportspress' ); ?>" onclick="insertSportsPress('player_details');" />
+				<a class="button-secondary" onclick="tb_remove();" title="<?php esc_attr_e( 'Cancel', 'sportspress' ); ?>"><?php esc_html_e( 'Cancel', 'sportspress' ); ?></a>
 			</p>
 		</div>
 		<?php
@@ -1040,7 +1040,7 @@ class SP_AJAX {
 		<div class="wrap sp-thickbox-content" id="sp-thickbox-player_statistics">
 			<p>
 				<label>
-					<?php printf( __( 'Select %s:', 'sportspress' ), __( 'Player', 'sportspress' ) ); ?>
+					<?php printf( esc_html__( 'Select %s:', 'sportspress' ), esc_html__( 'Player', 'sportspress' ) ); ?>
 					<?php
 					$args = array(
 						'post_type' => 'sp_player',
@@ -1053,8 +1053,8 @@ class SP_AJAX {
 			</p>
 			<?php do_action( 'sportspress_ajax_shortcode_form', 'player-statistics' ); ?>
 			<p class="submit">
-				<input type="button" class="button-primary" value="<?php _e( 'Insert Shortcode', 'sportspress' ); ?>" onclick="insertSportsPress('player_statistics');" />
-				<a class="button-secondary" onclick="tb_remove();" title="<?php _e( 'Cancel', 'sportspress' ); ?>"><?php _e( 'Cancel', 'sportspress' ); ?></a>
+				<input type="button" class="button-primary" value="<?php esc_attr_e( 'Insert Shortcode', 'sportspress' ); ?>" onclick="insertSportsPress('player_statistics');" />
+				<a class="button-secondary" onclick="tb_remove();" title="<?php esc_attr_e( 'Cancel', 'sportspress' ); ?>"><?php esc_html_e( 'Cancel', 'sportspress' ); ?></a>
 			</p>
 		</div>
 		<?php
@@ -1070,13 +1070,13 @@ class SP_AJAX {
 		<div class="wrap sp-thickbox-content" id="sp-thickbox-player_list">
 			<p>
 				<label>
-					<?php _e( 'Title:', 'sportspress' ); ?>
+					<?php esc_html_e( 'Title:', 'sportspress' ); ?>
 					<input class="regular-text" type="text" name="title">
 				</label>
 			</p>
 			<p>
 				<label>
-					<?php printf( __( 'Select %s:', 'sportspress' ), __( 'Player List', 'sportspress' ) ); ?>
+					<?php printf( esc_html__( 'Select %s:', 'sportspress' ), esc_html__( 'Player List', 'sportspress' ) ); ?>
 					<?php
 					$args = array(
 						'post_type' => 'sp_list',
@@ -1089,11 +1089,11 @@ class SP_AJAX {
 			</p>
 			<p>
 				<label>
-					<?php _e( 'Team:', 'sportspress' ); ?>
+					<?php esc_html_e( 'Team:', 'sportspress' ); ?>
 					<?php
 					$args = array(
 						'post_type'       => 'sp_team',
-						'show_option_all' => __( 'Default', 'sportspress' ),
+						'show_option_all' => esc_attr__( 'Default', 'sportspress' ),
 						'name'            => 'team',
 						'values'          => 'ID',
 					);
@@ -1103,11 +1103,11 @@ class SP_AJAX {
 			</p>
 			<p>
 				<label>
-					<?php _e( 'League:', 'sportspress' ); ?>
+					<?php esc_html_e( 'League:', 'sportspress' ); ?>
 					<?php
 					$args = array(
 						'taxonomy'        => 'sp_league',
-						'show_option_all' => __( 'Default', 'sportspress' ),
+						'show_option_all' => esc_attr__( 'Default', 'sportspress' ),
 						'name'            => 'league',
 						'values'          => 'term_id',
 					);
@@ -1117,11 +1117,11 @@ class SP_AJAX {
 			</p>
 			<p>
 				<label>
-					<?php _e( 'Season:', 'sportspress' ); ?>
+					<?php esc_html_e( 'Season:', 'sportspress' ); ?>
 					<?php
 					$args = array(
 						'taxonomy'        => 'sp_season',
-						'show_option_all' => __( 'Default', 'sportspress' ),
+						'show_option_all' => esc_attr__( 'Default', 'sportspress' ),
 						'name'            => 'season',
 						'values'          => 'term_id',
 					);
@@ -1131,12 +1131,12 @@ class SP_AJAX {
 			</p>
 			<p>
 				<label>
-					<?php _e( 'Number of players to show:', 'sportspress' ); ?>
+					<?php esc_html_e( 'Number of players to show:', 'sportspress' ); ?>
 					<input type="text" size="3" name="number" id="number" value="5">
 				</label>
 			</p>
 			<p class="sp-prefs">
-				<?php _e( 'Columns:', 'sportspress' ); ?><br>
+				<?php esc_html_e( 'Columns:', 'sportspress' ); ?><br>
 				<?php
 				$args        = array(
 					'post_type'      => array( 'sp_metric', 'sp_performance', 'sp_statistic' ),
@@ -1150,23 +1150,23 @@ class SP_AJAX {
 				$field_name = 'columns[]';
 				$field_id   = 'columns';
 				?>
-				<label class="button"><input name="columns[]" type="checkbox" id="columns-number" value="number" checked="checked"><?php _e( '#', 'sportspress' ); ?></label>
-				<label class="button"><input name="columns[]" type="checkbox" id="columns-team" value="team" checked="checked"><?php _e( 'Team', 'sportspress' ); ?></label>
-				<label class="button"><input name="columns[]" type="checkbox" id="columns-position" value="position" checked="checked"><?php _e( 'Position', 'sportspress' ); ?></label>
+				<label class="button"><input name="columns[]" type="checkbox" id="columns-number" value="number" checked="checked"><?php esc_html_e( '#', 'sportspress' ); ?></label>
+				<label class="button"><input name="columns[]" type="checkbox" id="columns-team" value="team" checked="checked"><?php esc_html_e( 'Team', 'sportspress' ); ?></label>
+				<label class="button"><input name="columns[]" type="checkbox" id="columns-position" value="position" checked="checked"><?php esc_html_e( 'Position', 'sportspress' ); ?></label>
 				<?php foreach ( $the_columns as $column ) : ?>
 					<label class="button"><input name="<?php echo esc_attr( $field_name ); ?>" type="checkbox" id="<?php echo esc_attr( $field_id ) . '-' . esc_attr( $column->post_name ); ?>" value="<?php echo esc_attr( $column->post_name ); ?>" checked="checked"><?php echo esc_html( $column->post_title ); ?></label>
 				<?php endforeach; ?>
 			</p>
 			<p>
 				<label>
-					<?php _e( 'Sort by:', 'sportspress' ); ?>
+					<?php esc_html_e( 'Sort by:', 'sportspress' ); ?>
 					<?php
 					$args = array(
 						'prepend_options' => array(
-							'default'      => __( 'Default', 'sportspress' ),
-							'number'       => __( 'Squad Number', 'sportspress' ),
-							'name'         => __( 'Name', 'sportspress' ),
-							'eventsplayed' => __( 'Played', 'sportspress' ),
+							'default'      => esc_attr__( 'Default', 'sportspress' ),
+							'number'       => esc_attr__( 'Squad Number', 'sportspress' ),
+							'name'         => esc_attr__( 'Name', 'sportspress' ),
+							'eventsplayed' => esc_attr__( 'Played', 'sportspress' ),
 						),
 						'post_type'       => array( 'sp_metric', 'sp_performance', 'sp_statistic' ),
 						'name'            => 'orderby',
@@ -1179,24 +1179,24 @@ class SP_AJAX {
 			</p>
 			<p>
 				<label>
-					<?php _e( 'Sort Order:', 'sportspress' ); ?>
+					<?php esc_html_e( 'Sort Order:', 'sportspress' ); ?>
 					<select id="order" name="order">
-						<option value=""><?php _e( 'Default', 'sportspress' ); ?></option>
-						<option value="ASC"><?php _e( 'Ascending', 'sportspress' ); ?></option>
-						<option value="DESC"><?php _e( 'Descending', 'sportspress' ); ?></option>
+						<option value=""><?php esc_html_e( 'Default', 'sportspress' ); ?></option>
+						<option value="ASC"><?php esc_html_e( 'Ascending', 'sportspress' ); ?></option>
+						<option value="DESC"><?php esc_html_e( 'Descending', 'sportspress' ); ?></option>
 					</select>
 				</label>
 			</p>
 			<p>
 				<label>
 					<input type="checkbox" name="show_all_players_link" id="show_all_players_link">
-					<?php _e( 'Display link to view all players', 'sportspress' ); ?>
+					<?php esc_html_e( 'Display link to view all players', 'sportspress' ); ?>
 				</label>
 			</p>
 			<?php do_action( 'sportspress_ajax_shortcode_form', 'player-list' ); ?>
 			<p class="submit">
-				<input type="button" class="button-primary" value="<?php _e( 'Insert Shortcode', 'sportspress' ); ?>" onclick="insertSportsPress('player_list');" />
-				<a class="button-secondary" onclick="tb_remove();" title="<?php _e( 'Cancel', 'sportspress' ); ?>"><?php _e( 'Cancel', 'sportspress' ); ?></a>
+				<input type="button" class="button-primary" value="<?php esc_attr_e( 'Insert Shortcode', 'sportspress' ); ?>" onclick="insertSportsPress('player_list');" />
+				<a class="button-secondary" onclick="tb_remove();" title="<?php esc_attr_e( 'Cancel', 'sportspress' ); ?>"><?php esc_html_e( 'Cancel', 'sportspress' ); ?></a>
 			</p>
 		</div>
 		<?php
@@ -1212,13 +1212,13 @@ class SP_AJAX {
 		<div class="wrap sp-thickbox-content" id="sp-thickbox-player_gallery">
 			<p>
 				<label>
-					<?php _e( 'Title:', 'sportspress' ); ?>
+					<?php esc_html_e( 'Title:', 'sportspress' ); ?>
 					<input class="regular-text" type="text" name="title">
 				</label>
 			</p>
 			<p>
 				<label>
-					<?php printf( __( 'Select %s:', 'sportspress' ), __( 'Player List', 'sportspress' ) ); ?>
+					<?php printf( esc_html__( 'Select %s:', 'sportspress' ), esc_html__( 'Player List', 'sportspress' ) ); ?>
 					<?php
 					$args = array(
 						'post_type' => 'sp_list',
@@ -1231,26 +1231,26 @@ class SP_AJAX {
 			</p>
 			<p>
 				<label>
-					<?php _e( 'Number of players to show:', 'sportspress' ); ?>
+					<?php esc_html_e( 'Number of players to show:', 'sportspress' ); ?>
 					<input type="text" size="3" name="number" id="number" value="5">
 				</label>
 			</p>
 			<p>
 				<label>
-					<?php _e( 'Columns:', 'sportspress' ); ?>
+					<?php esc_html_e( 'Columns:', 'sportspress' ); ?>
 					<input type="text" size="3" name="columns" id="columns" value="3">
 				</label>
 			</p>
 			<p>
 				<label>
-					<?php _e( 'Sort by:', 'sportspress' ); ?>
+					<?php esc_html_e( 'Sort by:', 'sportspress' ); ?>
 					<?php
 					$args = array(
 						'prepend_options' => array(
-							'default'      => __( 'Default', 'sportspress' ),
-							'number'       => __( 'Squad Number', 'sportspress' ),
-							'name'         => __( 'Name', 'sportspress' ),
-							'eventsplayed' => __( 'Played', 'sportspress' ),
+							'default'      => esc_attr__( 'Default', 'sportspress' ),
+							'number'       => esc_attr__( 'Squad Number', 'sportspress' ),
+							'name'         => esc_attr__( 'Name', 'sportspress' ),
+							'eventsplayed' => esc_attr__( 'Played', 'sportspress' ),
 						),
 						'post_type'       => array( 'sp_metric', 'sp_performance', 'sp_statistic' ),
 						'name'            => 'orderby',
@@ -1263,24 +1263,24 @@ class SP_AJAX {
 			</p>
 			<p>
 				<label>
-					<?php _e( 'Sort Order:', 'sportspress' ); ?>
+					<?php esc_html_e( 'Sort Order:', 'sportspress' ); ?>
 					<select id="order" name="order">
-						<option value=""><?php _e( 'Default', 'sportspress' ); ?></option>
-						<option value="ASC"><?php _e( 'Ascending', 'sportspress' ); ?></option>
-						<option value="DESC"><?php _e( 'Descending', 'sportspress' ); ?></option>
+						<option value=""><?php esc_html_e( 'Default', 'sportspress' ); ?></option>
+						<option value="ASC"><?php esc_html_e( 'Ascending', 'sportspress' ); ?></option>
+						<option value="DESC"><?php esc_html_e( 'Descending', 'sportspress' ); ?></option>
 					</select>
 				</label>
 			</p>
 			<p>
 				<label>
 					<input type="checkbox" name="show_all_players_link" id="show_all_players_link">
-					<?php _e( 'Display link to view all players', 'sportspress' ); ?>
+					<?php esc_html_e( 'Display link to view all players', 'sportspress' ); ?>
 				</label>
 			</p>
 			<?php do_action( 'sportspress_ajax_shortcode_form', 'player-gallery' ); ?>
 			<p class="submit">
-				<input type="button" class="button-primary" value="<?php _e( 'Insert Shortcode', 'sportspress' ); ?>" onclick="insertSportsPress('player_gallery');" />
-				<a class="button-secondary" onclick="tb_remove();" title="<?php _e( 'Cancel', 'sportspress' ); ?>"><?php _e( 'Cancel', 'sportspress' ); ?></a>
+				<input type="button" class="button-primary" value="<?php esc_attr_e( 'Insert Shortcode', 'sportspress' ); ?>" onclick="insertSportsPress('player_gallery');" />
+				<a class="button-secondary" onclick="tb_remove();" title="<?php esc_attr_e( 'Cancel', 'sportspress' ); ?>"><?php esc_html_e( 'Cancel', 'sportspress' ); ?></a>
 			</p>
 		</div>
 		<?php
diff --git a/includes/class-sp-template-loader.php b/includes/class-sp-template-loader.php
index 836bd775..b29e9361 100644
--- a/includes/class-sp-template-loader.php
+++ b/includes/class-sp-template-loader.php
@@ -34,7 +34,7 @@ class SP_Template_Loader {
 
 		// Return password form if required
 		if ( post_password_required() ) {
-			echo get_the_password_form();
+			echo wp_kses_post( get_the_password_form() );
 			return;
 		}
 
@@ -126,7 +126,7 @@ class SP_Template_Loader {
 				// Put tab content into buffer
 				ob_start();
 				if ( 'content' === $key ) {
-					echo $content;
+					echo wp_kses_post( $content );
 				} else {
 					call_user_func( $template['action'] );
 				}
diff --git a/includes/sp-deprecated-functions.php b/includes/sp-deprecated-functions.php
index 7662baf8..773cd9d2 100644
--- a/includes/sp-deprecated-functions.php
+++ b/includes/sp-deprecated-functions.php
@@ -219,7 +219,7 @@ if ( ! function_exists( 'sp_get_short_name' ) ) {
 
 if ( ! function_exists( 'sp_short_name' ) ) {
 	function sp_short_name( $post = 0 ) {
-		echo sp_get_short_name( $post );
+		echo wp_kses_post( sp_get_short_name( $post ) );
 	}
 }
 
diff --git a/sportspress.php b/sportspress.php
index c2446ac4..dcbbddd5 100644
--- a/sportspress.php
+++ b/sportspress.php
@@ -89,7 +89,7 @@ if ( ! class_exists( 'SportsPress' ) ) :
 		 * @since 0.7
 		 */
 		public function __clone() {
-			_doing_it_wrong( __FUNCTION__, __( 'Cheatin&#8217; huh?', 'sportspress' ), '0.7' );
+			_doing_it_wrong( __FUNCTION__, esc_html__( 'Cheatin&#8217; huh?', 'sportspress' ), '0.7' );
 		}
 
 		/**
@@ -98,7 +98,7 @@ if ( ! class_exists( 'SportsPress' ) ) :
 		 * @since 0.7
 		 */
 		public function __wakeup() {
-			_doing_it_wrong( __FUNCTION__, __( 'Cheatin&#8217; huh?', 'sportspress' ), '0.7' );
+			_doing_it_wrong( __FUNCTION__, esc_html__( 'Cheatin&#8217; huh?', 'sportspress' ), '0.7' );
 		}
 
 		/**