From 6e23cb1acf0cf39ca9c07fe8ead8a5f8e660c333 Mon Sep 17 00:00:00 2001
From: Justin Foell <630830+jrfoell@users.noreply.github.com>
Date: Fri, 1 Nov 2019 13:34:47 -0500
Subject: [PATCH] Escape output to fix PHPCS errors

---
 includes/WPStrava/LatestMap.php       |  8 ++++----
 includes/WPStrava/LatestMapWidget.php | 22 ++++++++++++----------
 2 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/includes/WPStrava/LatestMap.php b/includes/WPStrava/LatestMap.php
index 9925b3c..58b68f1 100644
--- a/includes/WPStrava/LatestMap.php
+++ b/includes/WPStrava/LatestMap.php
@@ -34,7 +34,7 @@ class WPStrava_LatestMap {
 					// Translators: Message shown when using deprecated athlete_token parameter.
 					echo wp_kses_post( __( 'The <code>athlete_token</code> parameter is deprecated as of WP-Strava version 2 and should be replaced with <code>client_id</code>.', 'wp-strava' ) );
 				} else {
-					echo $e->to_html();
+					echo $e->to_html(); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- Debug only.
 				}
 			}
 
@@ -63,9 +63,9 @@ class WPStrava_LatestMap {
 		if ( $activity ) {
 			echo empty( $activity->map ) ?
 				// Translators: Text with activity name shown in place of image if not available.
-				sprintf( __( 'Map not available for activity "%s"', 'wp-strava' ), $activity->name ) :
-				"<a title='{$activity->name}' href='" . WPStrava_Activity::ACTIVITIES_URL . "{$activity->id}'>" .
-				self::get_static_image( $id, $activity, $build_new ) .
+				esc_html( sprintf( __( 'Map not available for activity "%s"', 'wp-strava' ), $activity->name ) ) :
+				"<a title='" . esc_attr( $activity->name ) . "' href='" . esc_attr( WPStrava_Activity::ACTIVITIES_URL . $activity->id ) . "'>" .
+				self::get_static_image( $id, $activity, $build_new ) . // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- Image OK.
 				'</a>';
 		}
 
diff --git a/includes/WPStrava/LatestMapWidget.php b/includes/WPStrava/LatestMapWidget.php
index 7975faa..630ce19 100644
--- a/includes/WPStrava/LatestMapWidget.php
+++ b/includes/WPStrava/LatestMapWidget.php
@@ -24,30 +24,30 @@ class WPStrava_LatestMapWidget extends WP_Widget {
 
 		?>
 		<p>
-			<label for="<?php echo $this->get_field_id( 'title' ); ?>">
+			<label for="<?php echo esc_attr( $this->get_field_id( 'title' ) ); ?>">
 				<?php // Translator: Widget Title. ?>
 				<?php esc_html_e( 'Title:', 'wp-strava' ); ?>
 			</label>
-			<input class="widefat" id="<?php echo $this->get_field_id( 'title' ); ?>" name="<?php echo $this->get_field_name( 'title' ); ?>" type="text" value="<?php echo $title; ?>" />
+			<input class="widefat" id="<?php echo esc_attr( $this->get_field_id( 'title' ) ); ?>" name="<?php echo esc_attr( $this->get_field_name( 'title' ) ); ?>" type="text" value="<?php echo esc_attr( $title ); ?>" />
 		</p>
 		<p>
-				<label for="<?php echo $this->get_field_id( 'client_id' ); ?>"><?php _e( 'Athlete:', 'wp-strava' ); ?></label>
-				<select name="<?php echo $this->get_field_name( 'client_id' ); ?>">
+				<label for="<?php echo esc_attr( $this->get_field_id( 'client_id' ) ); ?>"><?php esc_html_e( 'Athlete:', 'wp-strava' ); ?></label>
+				<select name="<?php echo esc_attr( $this->get_field_name( 'client_id' ) ); ?>">
 				<?php foreach ( $all_ids as $id => $nickname ) : ?>
-					<option value="<?php echo $id; ?>"<?php selected( $id, $client_id ); ?>><?php echo $nickname; ?></option>
+					<option value="<?php echo esc_attr( $id ); ?>"<?php selected( $id, $client_id ); ?>><?php echo esc_html( $nickname ); ?></option>
 				<?php endforeach; ?>
 				</select>
 			</p>
 		<p>
-			<label for="<?php echo $this->get_field_id( 'distance_min' ); ?>">
+			<label for="<?php echo esc_attr( $this->get_field_id( 'distance_min' ) ); ?>">
 				<?php // Translators: Label for minimum distance input. ?>
-				<?php echo sprintf( __( 'Min. Distance (%s):', 'wp-strava' ), $this->som->get_distance_label() ); ?>
+				<?php echo esc_html( sprintf( __( 'Min. Distance (%s):', 'wp-strava' ), $this->som->get_distance_label() ) ); ?>
 			</label>
-			<input class="widefat" id="<?php echo $this->get_field_id( 'distance_min' ); ?>" name="<?php echo $this->get_field_name( 'distance_min' ); ?>" type="text" value="<?php echo $distance_min; ?>" />
+			<input class="widefat" id="<?php echo esc_attr( $this->get_field_id( 'distance_min' ) ); ?>" name="<?php echo esc_attr( $this->get_field_name( 'distance_min' ) ); ?>" type="text" value="<?php echo esc_attr( $distance_min ); ?>" />
 		</p>
 			<p>
-				<label for="<?php echo $this->get_field_id( 'strava_club_id' ); ?>"><?php esc_html_e( 'Club ID (leave blank to show Athlete):', 'wp-strava' ); ?></label>
-				<input class="widefat" id="<?php echo $this->get_field_id( 'strava_club_id' ); ?>" name="<?php echo $this->get_field_name( 'strava_club_id' ); ?>" type="text" value="<?php echo $strava_club_id; ?>" />
+				<label for="<?php echo esc_attr( $this->get_field_id( 'strava_club_id' ) ); ?>"><?php esc_html_e( 'Club ID (leave blank to show Athlete):', 'wp-strava' ); ?></label>
+				<input class="widefat" id="<?php echo esc_attr( $this->get_field_id( 'strava_club_id' ) ); ?>" name="<?php echo esc_attr( $this->get_field_name( 'strava_club_id' ) ); ?>" type="text" value="<?php echo esc_attr( $strava_club_id ); ?>" />
 			</p>
 		<?php
 	}
@@ -78,11 +78,13 @@ class WPStrava_LatestMapWidget extends WP_Widget {
 			'distance_min'   => isset( $instance['distance_min'] ) ? absint( $instance['distance_min'] ) : 0,
 		);
 
+		// phpcs:disable WordPress.Security.EscapeOutput.OutputNotEscaped -- Widget OK.
 		echo $args['before_widget'];
 		if ( $title ) {
 			echo $args['before_title'] . $title . $args['after_title'];
 		}
 		echo WPStrava_LatestMap::get_map_html( $activities_args );
 		echo $args['after_widget'];
+		// phpcs:enable WordPress.Security.EscapeOutput.OutputNotEscaped
 	}
 }