From b67997988a4992043966acc4805eae8d53c0f647 Mon Sep 17 00:00:00 2001
From: Bill Van Pelt <linusx@gmail.com>
Date: Wed, 21 Feb 2024 10:50:57 -0500
Subject: [PATCH] fixing lint errors

---
 includes/core/classes/class-event.php       | 10 +++---
 includes/templates/admin/user/date-time.php | 40 ++++++++++-----------
 src/components/RsvpResponse.js              |  2 +-
 src/components/RsvpResponseCard.js          |  2 +-
 4 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/includes/core/classes/class-event.php b/includes/core/classes/class-event.php
index 958e1a0cb..6797efe31 100644
--- a/includes/core/classes/class-event.php
+++ b/includes/core/classes/class-event.php
@@ -247,7 +247,7 @@ public function get_display_datetime(): string {
 		$timezone    = $settings->get_value( 'general', 'formatting', 'show_timezone' ) ? ' T' : '';
 
 		// If there is a user and they have custom date/time formats, use those.
-		if ($user_id) {
+		if ( $user_id ) {
 			$date_format = get_user_meta( $user_id, 'gp_date_format', true ) ?? $date_format;
 			$time_format = get_user_meta( $user_id, 'gp_time_format', true ) ?? $time_format;
 		}
@@ -557,8 +557,8 @@ public function get_datetime(): array {
 		global $wpdb;
 
 		// Get the users timezone from the profile.
-		$user_id        = get_current_user_id();
-		$gp_timezone    = esc_attr( get_user_meta( $user_id, 'gp_timezone', true ) );
+		$user_id     = get_current_user_id();
+		$gp_timezone = esc_attr( get_user_meta( $user_id, 'gp_timezone', true ) );
 
 		$default = array(
 			'datetime_start'     => '',
@@ -584,8 +584,8 @@ public function get_datetime(): array {
 		}
 
 		// If not in an admin page, use the user's timezone if set.
-		if ( ! is_admin() && $user_id && !empty( $gp_timezone ) ) {
-			$data['timezone'] = !empty( $gp_timezone ) ? $gp_timezone : $data['timezone'];
+		if ( ! is_admin() && $user_id && ! empty( $gp_timezone ) ) {
+			$data['timezone'] = ! empty( $gp_timezone ) ? $gp_timezone : $data['timezone'];
 		}
 
 		return array_merge(
diff --git a/includes/templates/admin/user/date-time.php b/includes/templates/admin/user/date-time.php
index 5763f0b35..0a11dd9df 100644
--- a/includes/templates/admin/user/date-time.php
+++ b/includes/templates/admin/user/date-time.php
@@ -12,14 +12,14 @@
 	return;
 }
 
-$tz_choices = Utility::timezone_choices();
+$gatherpress_tz_choices = Utility::timezone_choices();
 
-$date_attrs = array(
+$gatherpress_date_attrs = array(
 	'name'  => 'gp_date_format',
 	'value' => ! empty( $date_format ) ? $date_format : '',
 );
 
-$time_attrs = array(
+$gatherpress_time_attrs = array(
 	'name'  => 'gp_time_format',
 	'value' => ! empty( $time_format ) ? $time_format : '',
 );
@@ -29,52 +29,52 @@
 		<?php esc_html_e( 'Date & Time Formatting', 'gatherpress' ); ?>
 	</h2>
 	<div>
-		<?php _e( 'For more information read the <a href="https://wordpress.org/documentation/article/customize-date-and-time-format/">Documentation on date and time formatting</a>.', 'gatherpress' ); ?>
+		<?php esc_html_e( 'For more information read the <a href="https://wordpress.org/documentation/article/customize-date-and-time-format/">Documentation on date and time formatting</a>.', 'gatherpress' ); ?>
 	</div>
 	<table class="form-table">
 		<tr>
-			<th scope="row"><label for="gp_date_format"><?php _e( 'Date Format', 'gatherpress' ); ?></label></th>
+			<th scope="row"><label for="gp_date_format"><?php esc_html_e( 'Date Format', 'gatherpress' ); ?></label></th>
 			<td>
 				<div class="form-wrap">
-					<label for="gp_date_format"><?php _e('Format of date for scheduled events.', 'gatherpress'); ?></label>
+					<label for="gp_date_format"><?php esc_html_e( 'Format of date for scheduled events.', 'gatherpress' ); ?></label>
 					<input type="text" name="gp_date_format" id="gp_date_format" value="<?php echo esc_attr( $date_format ); ?>" />
 					<p>
-						<strong><?php _e( 'Preview', 'gatherpress' ); ?>:</strong>
-						<span data-gp_component_name="datetime-preview" data-gp_component_attrs="<?php echo esc_attr( htmlspecialchars( wp_json_encode( $date_attrs ), ENT_QUOTES, 'UTF-8' ) ); ?>"></span>
+						<strong><?php esc_html_e( 'Preview', 'gatherpress' ); ?>:</strong>
+						<span data-gp_component_name="datetime-preview" data-gp_component_attrs="<?php echo esc_attr( htmlspecialchars( wp_json_encode( $gatherpress_date_attrs ), ENT_QUOTES, 'UTF-8' ) ); ?>"></span>
 					</p>
 				</div>
 			</td>
 		</tr>
 		<tr>
 			<th>
-				<label for="gp_time_format"><?php _e( 'Time Format', 'gatherpress' ); ?></label></th>
+				<label for="gp_time_format"><?php esc_html_e( 'Time Format', 'gatherpress' ); ?></label></th>
 			<td>
 				<div class="form-wrap">
-					<label for="gp_date_format"><?php _e('Format of time for scheduled events.', 'gatherpress'); ?></label>
+					<label for="gp_date_format"><?php esc_html_e( 'Format of time for scheduled events.', 'gatherpress' ); ?></label>
 					<input type="text" name="gp_time_format" id="gp_time_format" value="<?php echo esc_attr( $time_format ); ?>" />
 					<p>
-						<strong><?php _e( 'Preview', 'gatherpress' ); ?>:</strong>
-						<span data-gp_component_name="datetime-preview" data-gp_component_attrs="<?php echo esc_attr( htmlspecialchars( wp_json_encode( $time_attrs ), ENT_QUOTES, 'UTF-8' ) ); ?>"></span>
+						<strong><?php esc_html_e( 'Preview', 'gatherpress' ); ?>:</strong>
+						<span data-gp_component_name="datetime-preview" data-gp_component_attrs="<?php echo esc_attr( htmlspecialchars( wp_json_encode( $gatherpress_time_attrs ), ENT_QUOTES, 'UTF-8' ) ); ?>"></span>
 					</p>
 				</div>
 			</td>
 		</tr>
 		<tr>
-			<th><label for="gp_timezone"><?php _e( 'Timezone', 'gatherpress' ); ?></label></th>
+			<th><label for="gp_timezone"><?php esc_html_e( 'Timezone', 'gatherpress' ); ?></label></th>
 			<td>
 				<select name="gp_timezone">
 					<option value="">--</option>
 					<?php
-					foreach( $tz_choices as $location => $timezones ) {
-						echo '<optgroup label="' . $location . '">';
-						foreach( $timezones as $tz => $name ) {
-							echo '<option value="' . $tz . '"';
-							if ($timezone === $tz) {
+					foreach ( $gatherpress_tz_choices as $gatherpress_location => $gatherpress_timezones ) {
+						echo esc_html( '<optgroup label="' . $gatherpress_location . '">' );
+						foreach ( $gatherpress_timezones as $gatherpress_tz => $gatherpress_name ) {
+							echo esc_html( '<option value="' . $gatherpress_tz . '"' );
+							if ( $timezone === $gatherpress_tz ) {
 								echo ' selected';
 							}
-							echo '>' . $name . '</option>';
+							echo esc_html( '>' . $gatherpress_name . '</option>' );
 						}
-						echo '</optgroup>';
+						echo esc_html( '</optgroup>' );
 					}
 					?>
 				</select>
diff --git a/src/components/RsvpResponse.js b/src/components/RsvpResponse.js
index 436bd42f8..91ed1eba1 100644
--- a/src/components/RsvpResponse.js
+++ b/src/components/RsvpResponse.js
@@ -50,7 +50,7 @@ const RsvpResponse = () => {
 							'Not Attending',
 							'responded not attending',
 							'gatherpress'
-					  )
+						)
 					: __("Didn't Go", 'gatherpress'),
 			value: 'not_attending',
 		},
diff --git a/src/components/RsvpResponseCard.js b/src/components/RsvpResponseCard.js
index bd3ea2ba0..824151333 100644
--- a/src/components/RsvpResponseCard.js
+++ b/src/components/RsvpResponseCard.js
@@ -90,7 +90,7 @@ const RsvpResponseCard = ({ value, limit, responses = [] }) => {
 						? __(
 								'No one is attending this event yet.',
 								'gatherpress'
-						  )
+							)
 						: __('No one went to this event.', 'gatherpress')}
 				</div>
 			)}