Improve SportsPress event admin filter controls and team/result ordering

- Added `asc_generate_sp_event_title()` to format event titles using team names.
- Added `asc_generate_short_date()` for consistent date/time representation.
- Refined title/description to reflect event status (postponed, cancelled, etc.) and venue.
- Handled special outcomes like Technical Forfeit or Forfeit in title.

.github/workflows/release.yml

@@ -0,0 +1,37 @@
+name: Release Plugin Zip
+
+on:
+  push:
+    tags:
+      - "v*"
+
+permissions:
+  contents: write
+
+jobs:
+  release:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Build plugin zip
+        id: build
+        run: |
+          set -euo pipefail
+          PLUGIN_SLUG="${GITHUB_REPOSITORY##*/}"
+          TAG="${GITHUB_REF_NAME}"
+          ZIP_NAME="${PLUGIN_SLUG}-${TAG}.zip"
+
+          mkdir -p dist
+          git archive --format=zip --prefix="${PLUGIN_SLUG}/" -o "dist/${ZIP_NAME}" HEAD
+
+          echo "zip_path=dist/${ZIP_NAME}" >> "$GITHUB_OUTPUT"
+          echo "zip_name=${ZIP_NAME}" >> "$GITHUB_OUTPUT"
+
+      - name: Create or update release and upload zip
+        uses: softprops/action-gh-release@v2
+        with:
+          files: ${{ steps.build.outputs.zip_path }}
+          fail_on_unmatched_files: true

.gitignore

@@ -7,3 +7,4 @@ node_modules/
 *.sql
 *.tar.gz
 *.zip
+data

includes/open-graph-tags.php

@@ -8,6 +8,55 @@ Author: Your Name
 
 add_action('wp_head', 'custom_open_graph_tags_with_sportspress_integration');
 
+function asc_generate_sp_event_title( $post ) {
+  // See https://github.com/ThemeBoy/SportsPress/blob/770fa8c6654d7d6648791e877709c2428677635b/includes/admin/post-types/class-sp-admin-cpt-event.php#L99C40-L99C55
+	if ( is_numeric( $post ) ) {
+		$post = get_post( $post );
+	}
+	if ( ! $post || $post->post_type !== 'sp_event' ) {
+		return get_the_title();
+	}
+
+	$teams = get_post_meta( $post->ID, 'sp_team', false );
+	$teams = array_filter( $teams );
+
+	$team_names = array();
+	foreach ( $teams as $team ) {
+		while ( is_array( $team ) ) {
+			$team = array_shift( array_filter( $team ) );
+		}
+		if ( $team > 0 ) {
+			$team_names[] = sp_team_short_name( $team );
+		}
+	}
+
+	$team_names = array_unique( $team_names );
+
+	if ( get_option( 'sportspress_event_reverse_teams', 'no' ) === 'yes' ) {
+		$team_names = array_reverse( $team_names );
+	}
+
+	$delimiter = ' ' . get_option( 'sportspress_event_teams_delimiter', 'vs' ) . ' ';
+
+	return implode( $delimiter, $team_names );
+}
+
+function asc_generate_short_date( $post, $withTime = true ) {
+  $formatted_date =  get_the_date('D n/j/y', $post);
+
+  if (!$withTime){
+    return $formatted_date;
+  } 
+
+  if (  get_the_date('i', $post) == "00") {
+    $formatted_time = get_the_date('gA', $post);
+  } else {
+    $formatted_time = get_the_date('g:iA', $post);
+  }
+  return $formatted_date . " " . $formatted_time ;
+
+}
+
 function custom_open_graph_tags_with_sportspress_integration() {
     if (is_single()) {
         global $post;
@@ -18,16 +67,22 @@ function custom_open_graph_tags_with_sportspress_integration() {
             // Fetch details using SP_Event methods
             $publish_date = get_the_date('F j, Y', $post);
             $venue_terms = get_the_terms($post->ID, 'sp_venue');
-            $venue_name = $venue_terms ? $venue_terms[0]->name : 'No Venue Specified';
+            $venue_name = $venue_terms ? $venue_terms[0]->name : 'Venue TBD';
             $results = $event->results();  // Using SP_Event method
-            $title = get_the_title() . " " . "(" . $publish_date . ")";
+            $title = asc_generate_sp_event_title($post);
             $sp_status = get_post_meta( $post->ID, 'sp_status', true );
             $status = $event->status();  // Using SP_Event method
             $publish_date_and_time = get_the_date('F j, Y g:i A', $post);
             $description = "{$publish_date_and_time} at {$venue_name}.";
-            if ( 'postponed' == $sp_status ) {
-              $description = "POSTPONED" . " - " . $description;
-              $title = "POSTPONED" . " - " . $title;
+            
+            if ( 'postponed' == $sp_status || 'cancelled' == $sp_status || 'tbd' == $sp_status) {
+              $description = strtoupper($sp_status) . " — " . $description;
+              $title = strtoupper($sp_status) . " — " . $title . " — " . asc_generate_short_date($post) . " — " . $venue_name;
+            }
+
+            if ( 'future' == $status ) {
+              $description = $description;
+              $title = $title . " — " . asc_generate_short_date($post) . " — " . $venue_name;
             }
 
             if ( 'results' == $status ) { // checks if there is a final score
@@ -76,6 +131,7 @@ function custom_open_graph_tags_with_sportspress_integration() {
                 unset( $result['outcome'] );
               
                 $team_name = sp_team_short_name( $team_id );
+                $team_abbreviation = sp_team_abbreviation( $team_id );
 
                 $outcome_abbreviation = get_post_meta( $the_outcome->ID, 'sp_abbreviation', true );
                 if ( ! $outcome_abbreviation ) {
@@ -87,15 +143,37 @@ function custom_open_graph_tags_with_sportspress_integration() {
                   "outcome" => $the_outcome->post_title,
                   "outcome_abbreviation" => $outcome_abbreviation,
                   "team_name" => $team_name,
+                  "team_abbreviation" => $team_abbreviation
                 ]
               );              
                 $i++;
               endforeach;
-              $publish_date = get_the_date('F j, Y', $post);
-              $title = "{$teams_result_array[0]['team_name']} {$teams_result_array[0]['result']['r']}-{$teams_result_array[1]['result']['r']} {$teams_result_array[1]['team_name']} ({$publish_date})";
-              $description .= " " . "{$teams_result_array[0]['team_name']} ({$teams_result_array[0]['outcome']}), {$teams_result_array[1]['team_name']} ({$teams_result_array[1]['outcome']}).";;
-            }
+              $publish_date = asc_generate_short_date($post, false);
 
+              $special_result_suffix_abbreviation = '';
+              $special_result_suffix= '';
+
+              foreach ( $teams_result_array as $team ) {
+                  $outcome_abbreviation = strtoupper( $team['outcome_abbreviation'] ); // Normalize case
+
+                  if ( $outcome_abbreviation === 'TF-W' ) {
+                    $special_result_suffix_abbreviation = 'TF-W';
+                    $special_result_suffix = 'Technical Forfeit Win';
+                    break;
+                  } elseif ( $outcome_abbreviation === 'TF-L' ) {
+                    $special_result_suffix_abbreviation = 'TF';
+                    $special_result_suffix = 'Technical Forfeit';
+                    break;
+                  } elseif ( $outcome_abbreviation === 'F-W' || $outcome_abbreviation === 'F-L' ) {
+                    $special_result_suffix_abbreviation = 'Forfeit';
+                    $special_result_suffix = 'Forfeit';
+                    break;
+                  }
+              }
+
+              $title = "{$teams_result_array[0]['team_name']} {$teams_result_array[0]['result']['r']}-{$teams_result_array[1]['result']['r']} {$teams_result_array[1]['team_name']} — {$publish_date}" . ($special_result_suffix ? "({$special_result_suffix_abbreviation})" : "");
+              $description .= " " . "{$teams_result_array[0]['team_name']} ({$teams_result_array[0]['outcome']}), {$teams_result_array[1]['team_name']} ({$teams_result_array[1]['outcome']})." ;
+            }
             $description .= " " . $post->post_content;
             $image = get_site_url() . "/head-to-head?post={$post->ID}";
             echo '<meta property="og:type" content="article" />' . "\n";

includes/sp-event-admin-week-filter.php

@@ -0,0 +1,418 @@
+<?php
+/**
+ * Admin week filter for SportsPress events.
+ *
+ * Adds a week selector in wp-admin for `sp_event` and filters events by
+ * Monday-start week (Monday 00:00:00 through Sunday 23:59:59).
+ */
+
+if ( ! defined( 'ABSPATH' ) ) {
+	exit;
+}
+
+/**
+ * Screen-option defaults for event list filters.
+ *
+ * @return array<string, bool>
+ */
+function tony_sportspress_event_filter_defaults() {
+	return array(
+		'month'     => true,
+		'week'      => true,
+		'team'      => true,
+		'venue'     => true,
+		'league'    => true,
+		'season'    => true,
+		'match_day' => true,
+	);
+}
+
+/**
+ * Build user meta key for an event filter screen option.
+ *
+ * @param string $key Filter key.
+ * @return string
+ */
+function tony_sportspress_event_filter_meta_key( $key ) {
+	return 'tony_sp_event_filter_' . $key;
+}
+
+/**
+ * Check whether a filter is enabled for the current user.
+ *
+ * @param string $key Filter key.
+ * @return bool
+ */
+function tony_sportspress_event_filter_enabled( $key ) {
+	$defaults = tony_sportspress_event_filter_defaults();
+	if ( ! array_key_exists( $key, $defaults ) ) {
+		return true;
+	}
+
+	$user_id = get_current_user_id();
+	if ( ! $user_id ) {
+		return (bool) $defaults[ $key ];
+	}
+
+	$stored = get_user_meta( $user_id, tony_sportspress_event_filter_meta_key( $key ), true );
+	if ( '' === $stored ) {
+		return (bool) $defaults[ $key ];
+	}
+
+	return '1' === (string) $stored;
+}
+
+/**
+ * Persist event filter Screen Options via AJAX.
+ */
+function tony_sportspress_save_event_filter_screen_options_ajax() {
+	if ( ! current_user_can( 'edit_posts' ) ) {
+		wp_send_json_error();
+	}
+
+	check_ajax_referer( 'tony_sp_event_filters', 'nonce' );
+
+	$defaults = tony_sportspress_event_filter_defaults();
+	$filters  = isset( $_POST['filters'] ) && is_array( $_POST['filters'] ) ? $_POST['filters'] : array();
+	$user_id  = get_current_user_id();
+
+	foreach ( $defaults as $key => $_enabled ) {
+		$value = isset( $filters[ $key ] ) ? sanitize_text_field( wp_unslash( $filters[ $key ] ) ) : '0';
+		update_user_meta( $user_id, tony_sportspress_event_filter_meta_key( $key ), '1' === $value ? '1' : '0' );
+	}
+
+	wp_send_json_success();
+}
+add_action( 'wp_ajax_tony_sp_event_filter_prefs_save', 'tony_sportspress_save_event_filter_screen_options_ajax' );
+
+/**
+ * Add filter visibility toggles to Screen Options on event list admin page.
+ *
+ * @param string    $settings Existing settings HTML.
+ * @param WP_Screen $screen   Current screen.
+ * @return string
+ */
+function tony_sportspress_event_filter_screen_options_markup( $settings, $screen ) {
+	if ( ! $screen || 'edit-sp_event' !== $screen->id ) {
+		return $settings;
+	}
+
+	$labels = array(
+		'month'     => __( 'Month/Year', 'tonys-sportspress-enhancements' ),
+		'week'      => __( 'Week', 'tonys-sportspress-enhancements' ),
+		'team'      => __( 'Team', 'tonys-sportspress-enhancements' ),
+		'venue'     => __( 'Venue', 'tonys-sportspress-enhancements' ),
+		'league'    => __( 'League', 'tonys-sportspress-enhancements' ),
+		'season'    => __( 'Season', 'tonys-sportspress-enhancements' ),
+		'match_day' => __( 'Match Day', 'tonys-sportspress-enhancements' ),
+	);
+
+	$settings .= '<fieldset class="metabox-prefs">';
+	$settings .= '<legend>' . esc_html__( 'Event Filters', 'tonys-sportspress-enhancements' ) . '</legend>';
+
+	foreach ( $labels as $key => $label ) {
+		$meta_key = tony_sportspress_event_filter_meta_key( $key );
+		$checked  = tony_sportspress_event_filter_enabled( $key ) ? ' checked="checked"' : '';
+		$settings .= '<label for="' . esc_attr( $meta_key ) . '">';
+		$settings .= '<input type="checkbox" id="' . esc_attr( $meta_key ) . '" name="' . esc_attr( $meta_key ) . '" value="1"' . $checked . ' />';
+		$settings .= esc_html( $label );
+		$settings .= '</label>';
+	}
+
+	$settings .= '</fieldset>';
+
+	return $settings;
+}
+add_filter( 'screen_settings', 'tony_sportspress_event_filter_screen_options_markup', 10, 2 );
+
+/**
+ * Parse an ISO week input (e.g. 2026-W07) from the request.
+ *
+ * @return array{year:int,week:int}|null
+ */
+function tony_sportspress_parse_admin_week_filter() {
+	if ( empty( $_GET['sp_week_filter'] ) ) {
+		return null;
+	}
+
+	$raw = sanitize_text_field( wp_unslash( $_GET['sp_week_filter'] ) );
+	if ( ! preg_match( '/^(\d{4})-W(0[1-9]|[1-4][0-9]|5[0-3])$/', $raw, $matches ) ) {
+		return null;
+	}
+
+	$year = (int) $matches[1];
+	$week = (int) $matches[2];
+
+	return array(
+		'year' => $year,
+		'week' => $week,
+	);
+}
+
+/**
+ * Render week filter control in event admin list.
+ *
+ * @param string $post_type Current post type.
+ */
+function tony_sportspress_render_admin_week_filter( $post_type ) {
+	if ( 'sp_event' !== $post_type ) {
+		return;
+	}
+	if ( ! tony_sportspress_event_filter_enabled( 'week' ) ) {
+		return;
+	}
+
+	$value = '';
+	if ( ! empty( $_GET['sp_week_filter'] ) ) {
+		$value = sanitize_text_field( wp_unslash( $_GET['sp_week_filter'] ) );
+	}
+
+	$summary_text = __( 'Select a week', 'tonys-sportspress-enhancements' );
+	$parsed       = tony_sportspress_parse_admin_week_filter();
+	if ( is_array( $parsed ) ) {
+		$timezone = wp_timezone();
+		$monday   = ( new DateTimeImmutable( 'now', $timezone ) )->setISODate( $parsed['year'], $parsed['week'], 1 )->setTime( 0, 0, 0 );
+		$sunday   = $monday->modify( '+6 days' )->setTime( 23, 59, 59 );
+		/* translators: 1: Monday label/date, 2: Sunday label/date. */
+		$summary_text = sprintf(
+			__( '%1$s to %2$s', 'tonys-sportspress-enhancements' ),
+			wp_date( 'D M j, Y', $monday->getTimestamp(), $timezone ),
+			wp_date( 'D M j, Y', $sunday->getTimestamp(), $timezone )
+		);
+	}
+	?>
+	<label for="sp_week_filter" class="screen-reader-text"><?php esc_html_e( 'Filter by week', 'tonys-sportspress-enhancements' ); ?></label>
+	<input
+		type="week"
+		id="sp_week_filter"
+		name="sp_week_filter"
+		class="sp-week-filter-field"
+		value="<?php echo esc_attr( $value ); ?>"
+		title="<?php esc_attr_e( 'Week (Monday start)', 'tonys-sportspress-enhancements' ); ?>"
+	/>
+	<span id="sp-week-filter-summary" class="sp-week-filter-summary"><?php echo esc_html( $summary_text ); ?></span>
+	<?php
+}
+add_action( 'restrict_manage_posts', 'tony_sportspress_render_admin_week_filter' );
+
+/**
+ * Add responsive admin styles so filters stay visible on narrow widths.
+ */
+function tony_sportspress_admin_week_filter_styles() {
+	$screen = get_current_screen();
+	if ( ! $screen || 'edit-sp_event' !== $screen->id ) {
+		return;
+	}
+	$hide = array(
+		'month'     => ! tony_sportspress_event_filter_enabled( 'month' ),
+		'team'      => ! tony_sportspress_event_filter_enabled( 'team' ),
+		'venue'     => ! tony_sportspress_event_filter_enabled( 'venue' ),
+		'league'    => ! tony_sportspress_event_filter_enabled( 'league' ),
+		'season'    => ! tony_sportspress_event_filter_enabled( 'season' ),
+		'match_day' => ! tony_sportspress_event_filter_enabled( 'match_day' ),
+		'week'      => ! tony_sportspress_event_filter_enabled( 'week' ),
+	);
+	?>
+	<style>
+		<?php if ( $hide['month'] ) : ?>
+		.post-type-sp_event .tablenav.top .alignleft.actions:not(.bulkactions) select[name="m"] { display: none !important; }
+		<?php endif; ?>
+		<?php if ( $hide['team'] ) : ?>
+		.post-type-sp_event .tablenav.top .alignleft.actions:not(.bulkactions) select[name="team"],
+		.post-type-sp_event .tablenav.top .alignleft.actions:not(.bulkactions) select[name="team"] + .chosen-container,
+		.post-type-sp_event .tablenav.top .alignleft.actions:not(.bulkactions) select[name="team"] + .select2 { display: none !important; }
+		<?php endif; ?>
+		<?php if ( $hide['venue'] ) : ?>
+		.post-type-sp_event .tablenav.top .alignleft.actions:not(.bulkactions) select[name="sp_venue"],
+		.post-type-sp_event .tablenav.top .alignleft.actions:not(.bulkactions) select[name="sp_venue"] + .chosen-container,
+		.post-type-sp_event .tablenav.top .alignleft.actions:not(.bulkactions) select[name="sp_venue"] + .select2 { display: none !important; }
+		<?php endif; ?>
+		<?php if ( $hide['league'] ) : ?>
+		.post-type-sp_event .tablenav.top .alignleft.actions:not(.bulkactions) select[name="sp_league"],
+		.post-type-sp_event .tablenav.top .alignleft.actions:not(.bulkactions) select[name="sp_league"] + .chosen-container,
+		.post-type-sp_event .tablenav.top .alignleft.actions:not(.bulkactions) select[name="sp_league"] + .select2 { display: none !important; }
+		<?php endif; ?>
+		<?php if ( $hide['season'] ) : ?>
+		.post-type-sp_event .tablenav.top .alignleft.actions:not(.bulkactions) select[name="sp_season"],
+		.post-type-sp_event .tablenav.top .alignleft.actions:not(.bulkactions) select[name="sp_season"] + .chosen-container,
+		.post-type-sp_event .tablenav.top .alignleft.actions:not(.bulkactions) select[name="sp_season"] + .select2 { display: none !important; }
+		<?php endif; ?>
+		<?php if ( $hide['match_day'] ) : ?>
+		.post-type-sp_event .tablenav.top .alignleft.actions:not(.bulkactions) input[name="match_day"] { display: none !important; }
+		<?php endif; ?>
+		<?php if ( $hide['week'] ) : ?>
+		.post-type-sp_event .tablenav.top .alignleft.actions:not(.bulkactions) #sp_week_filter,
+		.post-type-sp_event .tablenav.top .alignleft.actions:not(.bulkactions) #sp-week-filter-summary { display: none !important; }
+		<?php endif; ?>
+		@media (max-width: 1200px) {
+			.post-type-sp_event .tablenav.top .alignleft.actions:not(.bulkactions) {
+				display: flex;
+				flex-wrap: wrap;
+				gap: 6px;
+				align-items: center;
+			}
+			.post-type-sp_event .tablenav.top .alignleft.actions:not(.bulkactions) > * {
+				float: none;
+				margin-right: 0;
+			}
+			.post-type-sp_event .tablenav.top .alignleft.actions:not(.bulkactions) .sp-week-filter-field {
+				min-width: 145px;
+			}
+			.post-type-sp_event .tablenav.top .alignleft.actions:not(.bulkactions) .sp-week-filter-summary {
+				display: block;
+				width: 100%;
+				margin-top: 2px;
+				color: #50575e;
+				font-size: 12px;
+				line-height: 1.4;
+			}
+		}
+	</style>
+	<?php
+}
+add_action( 'admin_head-edit.php', 'tony_sportspress_admin_week_filter_styles' );
+
+/**
+ * Update week summary text when week input changes.
+ */
+function tony_sportspress_admin_week_filter_script() {
+	$screen = get_current_screen();
+	if ( ! $screen || 'edit-sp_event' !== $screen->id ) {
+		return;
+	}
+	?>
+	<script>
+	(function() {
+		const filterCheckboxes = Array.from(
+			document.querySelectorAll('#screen-options-wrap input[type="checkbox"][id^="tony_sp_event_filter_"]')
+		);
+
+		function saveFilterPrefs() {
+			if (!filterCheckboxes.length || typeof ajaxurl === 'undefined') {
+				return;
+			}
+
+			const body = new URLSearchParams();
+			body.append('action', 'tony_sp_event_filter_prefs_save');
+			body.append('nonce', <?php echo wp_json_encode( wp_create_nonce( 'tony_sp_event_filters' ) ); ?>);
+
+			filterCheckboxes.forEach(function(checkbox) {
+				const key = checkbox.id.replace('tony_sp_event_filter_', '');
+				body.append('filters[' + key + ']', checkbox.checked ? '1' : '0');
+			});
+
+			fetch(ajaxurl, {
+				method: 'POST',
+				credentials: 'same-origin',
+				headers: {
+					'Content-Type': 'application/x-www-form-urlencoded; charset=UTF-8'
+				},
+				body: body.toString(),
+				keepalive: true
+			}).catch(function() {});
+		}
+
+		filterCheckboxes.forEach(function(checkbox) {
+			checkbox.addEventListener('change', saveFilterPrefs);
+		});
+
+		const monthSelect = document.querySelector('select[name="m"]');
+		if (monthSelect) {
+			const allDates = monthSelect.querySelector('option[value="0"]');
+			if (allDates) {
+				allDates.textContent = <?php echo wp_json_encode( __( 'Month/Year', 'tonys-sportspress-enhancements' ) ); ?>;
+			}
+		}
+
+		const input = document.getElementById('sp_week_filter');
+		const summary = document.getElementById('sp-week-filter-summary');
+		if (!input || !summary) {
+			return;
+		}
+
+		function updateSummary() {
+			const raw = (input.value || '').trim();
+			const match = raw.match(/^(\d{4})-W(\d{2})$/);
+			if (!match) {
+				summary.textContent = 'Select a week';
+				return;
+			}
+
+			const year = parseInt(match[1], 10);
+			const week = parseInt(match[2], 10);
+
+			const jan4 = new Date(Date.UTC(year, 0, 4));
+			const jan4Day = jan4.getUTCDay() || 7;
+			const mondayWeek1 = new Date(jan4);
+			mondayWeek1.setUTCDate(jan4.getUTCDate() - jan4Day + 1);
+
+			const monday = new Date(mondayWeek1);
+			monday.setUTCDate(mondayWeek1.getUTCDate() + (week - 1) * 7);
+			const sunday = new Date(monday);
+			sunday.setUTCDate(monday.getUTCDate() + 6);
+
+			const fmt = new Intl.DateTimeFormat(undefined, {
+				weekday: 'short',
+				month: 'short',
+				day: 'numeric',
+				year: 'numeric',
+				timeZone: 'UTC'
+			});
+
+			summary.textContent = fmt.format(monday) + ' to ' + fmt.format(sunday);
+		}
+
+		input.addEventListener('change', updateSummary);
+		updateSummary();
+	})();
+	</script>
+	<?php
+}
+add_action( 'admin_footer-edit.php', 'tony_sportspress_admin_week_filter_script' );
+
+/**
+ * Apply Monday-start week date query to event admin list.
+ *
+ * @param WP_Query $query Main query.
+ */
+function tony_sportspress_apply_admin_week_filter( $query ) {
+	if ( ! is_admin() || ! $query->is_main_query() ) {
+		return;
+	}
+
+	$post_type = $query->get( 'post_type' );
+	if ( 'sp_event' !== $post_type ) {
+		return;
+	}
+
+	$parsed = tony_sportspress_parse_admin_week_filter();
+	if ( null === $parsed ) {
+		return;
+	}
+
+	$timezone = wp_timezone();
+	$monday   = ( new DateTimeImmutable( 'now', $timezone ) )->setISODate( $parsed['year'], $parsed['week'], 1 )->setTime( 0, 0, 0 );
+	$sunday   = $monday->modify( '+6 days' )->setTime( 23, 59, 59 );
+
+	$date_query = $query->get( 'date_query' );
+	if ( ! is_array( $date_query ) ) {
+		$date_query = array();
+	}
+
+	$date_query[] = array(
+		'after'     => array(
+			'year'  => (int) $monday->format( 'Y' ),
+			'month' => (int) $monday->format( 'n' ),
+			'day'   => (int) $monday->format( 'j' ),
+		),
+		'before'    => array(
+			'year'  => (int) $sunday->format( 'Y' ),
+			'month' => (int) $sunday->format( 'n' ),
+			'day'   => (int) $sunday->format( 'j' ),
+		),
+		'inclusive' => true,
+	);
+
+	$query->set( 'date_query', $date_query );
+}
+add_action( 'pre_get_posts', 'tony_sportspress_apply_admin_week_filter' );

includes/sp-event-quick-edit-officials.php

@@ -0,0 +1,234 @@
+<?php
+/**
+ * Quick Edit officials support for SportsPress events.
+ */
+
+if ( ! defined( 'ABSPATH' ) ) {
+	exit;
+}
+
+/**
+ * Print hidden officials data on each event row for quick edit prefill.
+ *
+ * @param string $column  Column key.
+ * @param int    $post_id Post ID.
+ */
+function tony_sportspress_event_quick_edit_officials_row_data( $column, $post_id ) {
+	if ( 'sp_team' !== $column ) {
+		return;
+	}
+
+	$officials = get_post_meta( $post_id, 'sp_officials', true );
+	if ( ! is_array( $officials ) ) {
+		$officials = array();
+	}
+
+	$serialized = wp_json_encode( $officials );
+	if ( ! is_string( $serialized ) ) {
+		$serialized = '{}';
+	}
+
+	echo '<span class="hidden tony-event-officials-data" data-officials="' . esc_attr( $serialized ) . '"></span>';
+}
+add_action( 'manage_sp_event_posts_custom_column', 'tony_sportspress_event_quick_edit_officials_row_data', 20, 2 );
+
+/**
+ * Render quick edit UI for officials.
+ *
+ * @param string $column_name Column key.
+ * @param string $post_type   Post type key.
+ */
+function tony_sportspress_event_quick_edit_officials_field( $column_name, $post_type ) {
+	if ( 'sp_event' !== $post_type || 'sp_team' !== $column_name ) {
+		return;
+	}
+
+	static $printed = false;
+	if ( $printed ) {
+		return;
+	}
+	$printed = true;
+
+	wp_nonce_field( 'tony_sp_event_officials_quick_edit', 'tony_sp_event_officials_quick_edit_nonce' );
+
+	$duties = get_terms(
+		array(
+			'taxonomy'   => 'sp_duty',
+			'hide_empty' => false,
+			'orderby'    => 'meta_value_num',
+			'meta_query' => array(
+				'relation' => 'OR',
+				array(
+					'key'     => 'sp_order',
+					'compare' => 'NOT EXISTS',
+				),
+				array(
+					'key'     => 'sp_order',
+					'compare' => 'EXISTS',
+				),
+			),
+		)
+	);
+
+	if ( ! is_array( $duties ) || empty( $duties ) ) {
+		return;
+	}
+
+	$officials = get_posts(
+		array(
+			'post_type'      => 'sp_official',
+			'post_status'    => 'publish',
+			'posts_per_page' => -1,
+			'orderby'        => 'title',
+			'order'          => 'ASC',
+		)
+	);
+
+	if ( ! is_array( $officials ) || empty( $officials ) ) {
+		return;
+	}
+	?>
+	<fieldset class="inline-edit-col-right tony-sp-event-officials-wrap">
+		<div class="inline-edit-col">
+			<span class="title inline-edit-categories-label"><?php esc_html_e( 'Officials', 'tonys-sportspress-enhancements' ); ?></span>
+			<?php foreach ( $duties as $duty ) : ?>
+				<div class="tony-sp-duty-group">
+					<span class="title inline-edit-categories-label"><?php echo esc_html( $duty->name ); ?></span>
+					<input type="hidden" name="tony_sp_officials[<?php echo esc_attr( $duty->term_id ); ?>][]" value="0">
+					<ul class="cat-checklist">
+						<?php foreach ( $officials as $official ) : ?>
+							<li>
+								<label class="selectit">
+									<input
+										value="<?php echo esc_attr( $official->ID ); ?>"
+										type="checkbox"
+										name="tony_sp_officials[<?php echo esc_attr( $duty->term_id ); ?>][]"
+										class="tony-sp-official-checkbox"
+										data-duty-id="<?php echo esc_attr( $duty->term_id ); ?>"
+									>
+									<?php echo esc_html( $official->post_title ); ?>
+								</label>
+							</li>
+						<?php endforeach; ?>
+					</ul>
+				</div>
+			<?php endforeach; ?>
+		</div>
+	</fieldset>
+	<?php
+}
+add_action( 'quick_edit_custom_box', 'tony_sportspress_event_quick_edit_officials_field', 10, 2 );
+
+/**
+ * Save quick edit officials data.
+ *
+ * @param int $post_id Post ID.
+ */
+function tony_sportspress_event_quick_edit_officials_save( $post_id ) {
+	if ( empty( $_POST ) ) {
+		return;
+	}
+
+	if ( wp_is_post_revision( $post_id ) || ( defined( 'DOING_AUTOSAVE' ) && DOING_AUTOSAVE ) ) {
+		return;
+	}
+
+	if ( 'sp_event' !== get_post_type( $post_id ) ) {
+		return;
+	}
+
+	if ( ! current_user_can( 'edit_post', $post_id ) ) {
+		return;
+	}
+
+	$nonce = isset( $_POST['tony_sp_event_officials_quick_edit_nonce'] )
+		? sanitize_text_field( wp_unslash( $_POST['tony_sp_event_officials_quick_edit_nonce'] ) )
+		: '';
+
+	if ( '' === $nonce || ! wp_verify_nonce( $nonce, 'tony_sp_event_officials_quick_edit' ) ) {
+		return;
+	}
+
+	$raw_officials = isset( $_POST['tony_sp_officials'] ) ? wp_unslash( $_POST['tony_sp_officials'] ) : array();
+	if ( ! is_array( $raw_officials ) ) {
+		$raw_officials = array();
+	}
+
+	$clean_officials = array();
+	foreach ( $raw_officials as $duty_id => $official_ids ) {
+		$duty_id = absint( $duty_id );
+		if ( $duty_id <= 0 || ! is_array( $official_ids ) ) {
+			continue;
+		}
+
+		$official_ids = array_map( 'absint', $official_ids );
+		$official_ids = array_filter( $official_ids );
+		$official_ids = array_values( array_unique( $official_ids ) );
+
+		if ( ! empty( $official_ids ) ) {
+			$clean_officials[ $duty_id ] = $official_ids;
+		}
+	}
+
+	update_post_meta( $post_id, 'sp_officials', $clean_officials );
+}
+add_action( 'save_post', 'tony_sportspress_event_quick_edit_officials_save' );
+
+/**
+ * Prefill quick edit checkboxes with existing officials.
+ */
+function tony_sportspress_event_quick_edit_officials_script() {
+	$screen = get_current_screen();
+	if ( ! $screen || 'edit-sp_event' !== $screen->id ) {
+		return;
+	}
+	?>
+	<script>
+	(function($) {
+		if (typeof inlineEditPost === 'undefined' || !inlineEditPost.edit) {
+			return;
+		}
+
+		var wpInlineEdit = inlineEditPost.edit;
+
+		inlineEditPost.edit = function(id) {
+			wpInlineEdit.apply(this, arguments);
+
+			var postId = 0;
+			if (typeof id === 'object') {
+				postId = parseInt(this.getId(id), 10);
+			}
+			if (!postId) {
+				return;
+			}
+
+			var editRow = $('#edit-' + postId);
+			var postRow = $('#post-' + postId);
+			var payload = postRow.find('.tony-event-officials-data').attr('data-officials');
+			var selected = {};
+
+			try {
+				selected = payload ? JSON.parse(payload) : {};
+			} catch (e) {
+				selected = {};
+			}
+
+			editRow.find('.tony-sp-official-checkbox').prop('checked', false);
+
+			Object.keys(selected).forEach(function(dutyId) {
+				var ids = selected[dutyId];
+				if (!Array.isArray(ids)) {
+					return;
+				}
+				ids.forEach(function(officialId) {
+					editRow
+						.find('.tony-sp-official-checkbox[data-duty-id="' + dutyId + '"][value="' + String(officialId) + '"]')
+						.prop('checked', true);
+				});
+			});
+		};
+	})(jQuery);
+	</script>
+	<?php
+}
+add_action( 'admin_footer-edit.php', 'tony_sportspress_event_quick_edit_officials_script' );

includes/sp-event-team-ordering.php

@@ -0,0 +1,275 @@
+<?php
+/**
+ * Unified team-ordering behavior for SportsPress event admin and frontend lists.
+ */
+
+if ( ! defined( 'ABSPATH' ) ) {
+	exit;
+}
+
+/**
+ * Check whether SportsPress reverse teams option is enabled.
+ *
+ * @return bool
+ */
+function tony_sportspress_reverse_teams_enabled() {
+	return get_option( 'sportspress_event_reverse_teams', 'no' ) === 'yes';
+}
+
+/**
+ * Add Away | Home option to Event List title format setting.
+ *
+ * @param array $options Event list settings options.
+ * @return array
+ */
+function tony_sportspress_event_list_add_away_home_option( $options ) {
+	if ( ! is_array( $options ) ) {
+		return $options;
+	}
+
+	foreach ( $options as &$option ) {
+		if ( ! is_array( $option ) || ! isset( $option['id'] ) || 'sportspress_event_list_title_format' !== $option['id'] ) {
+			continue;
+		}
+
+		if ( ! isset( $option['options'] ) || ! is_array( $option['options'] ) ) {
+			continue;
+		}
+
+		if ( ! array_key_exists( 'awayhome', $option['options'] ) ) {
+			$option['options']['awayhome'] = sprintf( '%s | %s', esc_attr__( 'Away', 'sportspress' ), esc_attr__( 'Home', 'sportspress' ) );
+		}
+	}
+	unset( $option );
+
+	return $options;
+}
+add_filter( 'sportspress_event_list_options', 'tony_sportspress_event_list_add_away_home_option' );
+
+/**
+ * Clarify wording of SportsPress Teams reverse-order option.
+ *
+ * @param array $options Team options.
+ * @return array
+ */
+function tony_sportspress_relabel_reverse_teams_option( $options ) {
+	if ( ! is_array( $options ) ) {
+		return $options;
+	}
+
+	foreach ( $options as &$option ) {
+		if ( ! is_array( $option ) || ! isset( $option['id'] ) || 'sportspress_event_reverse_teams' !== $option['id'] ) {
+			continue;
+		}
+
+		$option['desc'] = esc_attr__( 'Show away team first', 'tonys-sportspress-enhancements' );
+	}
+	unset( $option );
+
+	return $options;
+}
+add_filter( 'sportspress_event_logo_options', 'tony_sportspress_relabel_reverse_teams_option' );
+
+/**
+ * Add Event Results team order option.
+ *
+ * @param array $options Event Results options.
+ * @return array
+ */
+function tony_sportspress_add_event_results_order_option( $options ) {
+	if ( ! is_array( $options ) ) {
+		return $options;
+	}
+
+	$options[] = array(
+		'title'   => esc_attr__( 'Row order', 'tonys-sportspress-enhancements' ),
+		'id'      => 'tony_sportspress_event_results_row_order',
+		'default' => 'home_away',
+		'type'    => 'radio',
+		'options' => array(
+			'home_away' => sprintf( '%s | %s', esc_attr__( 'Home', 'sportspress' ), esc_attr__( 'Away', 'sportspress' ) ),
+			'away_home' => sprintf( '%s | %s', esc_attr__( 'Away', 'sportspress' ), esc_attr__( 'Home', 'sportspress' ) ),
+		),
+	);
+
+	return $options;
+}
+add_filter( 'sportspress_result_options', 'tony_sportspress_add_event_results_order_option' );
+
+/**
+ * Override SportsPress event templates with plugin versions.
+ *
+ * @param string $template      Located template path.
+ * @param string $template_name Template filename.
+ * @param string $template_path Template base path.
+ * @return string
+ */
+function tony_sportspress_locate_event_list_template( $template, $template_name, $template_path ) {
+	$supported = array(
+		'event-list.php',
+		'event-results.php',
+	);
+
+	if ( ! in_array( $template_name, $supported, true ) ) {
+		return $template;
+	}
+
+	$override = dirname( __DIR__ ) . '/templates/' . $template_name;
+	if ( file_exists( $override ) ) {
+		return $override;
+	}
+
+	return $template;
+}
+add_filter( 'sportspress_locate_template', 'tony_sportspress_locate_event_list_template', 10, 3 );
+
+/**
+ * Add admin styles for explicit Home/Away labels on event edit screens.
+ */
+function tony_sportspress_event_team_order_admin_styles() {
+	$screen = get_current_screen();
+	if ( ! $screen || 'sp_event' !== $screen->post_type ) {
+		return;
+	}
+	?>
+	<style>
+		#sp_teamdiv .sp-instance {
+			padding-top: 8px;
+			border-top: 1px solid #dcdcde;
+		}
+		#sp_teamdiv .sp-instance:first-child {
+			padding-top: 0;
+			border-top: 0;
+		}
+		#sp_teamdiv .tony-sp-home-away-label {
+			margin: 0 0 8px;
+			font-size: 12px;
+			letter-spacing: 0.02em;
+			text-transform: uppercase;
+			color: #50575e;
+		}
+	</style>
+	<?php
+}
+add_action( 'admin_head-post.php', 'tony_sportspress_event_team_order_admin_styles' );
+add_action( 'admin_head-post-new.php', 'tony_sportspress_event_team_order_admin_styles' );
+
+/**
+ * Add explicit Home/Away labels and reverse visual order in event edit teams metabox.
+ */
+function tony_sportspress_event_team_order_admin_script() {
+	$screen = get_current_screen();
+	if ( ! $screen || 'sp_event' !== $screen->post_type ) {
+		return;
+	}
+
+	$slot_labels     = array(
+		__( 'Home Team', 'tonys-sportspress-enhancements' ),
+		__( 'Away Team', 'tonys-sportspress-enhancements' ),
+	);
+	$show_away_first = tony_sportspress_reverse_teams_enabled();
+	?>
+	<script>
+	(function($) {
+		function applyHomeAwayLabels() {
+			var labels = <?php echo wp_json_encode( $slot_labels ); ?>;
+			var showAwayFirst = <?php echo $show_away_first ? 'true' : 'false'; ?>;
+			var $instances = $('#sp_teamdiv .sp-instance');
+
+			if (!$instances.length) {
+				return;
+			}
+
+			var $container = $instances.first().parent();
+			$instances.css('order', '');
+
+			if (showAwayFirst && $instances.length > 1) {
+				$container.css({
+					display: 'flex',
+					flexDirection: 'column'
+				});
+				$instances.each(function(index) {
+					$(this).css('order', index + 1);
+				});
+				$instances.eq(0).css('order', 2);
+				$instances.eq(1).css('order', 1);
+			}
+
+			$instances.each(function(index) {
+				var label = labels[index] || ('Team ' + (index + 1));
+				var $instance = $(this);
+
+				if (!$instance.children('.tony-sp-home-away-label').length) {
+					$instance.prepend('<p class="tony-sp-home-away-label"><strong>' + label + '</strong></p>');
+				} else {
+					$instance.children('.tony-sp-home-away-label').find('strong').text(label);
+				}
+
+				$instance.find('select[name="sp_team[]"]').first().attr('aria-label', label);
+			});
+		}
+
+		$(applyHomeAwayLabels);
+		$(document).on('sp-init-chosen sp-init', applyHomeAwayLabels);
+	})(jQuery);
+	</script>
+	<?php
+}
+add_action( 'admin_footer-post.php', 'tony_sportspress_event_team_order_admin_script' );
+add_action( 'admin_footer-post-new.php', 'tony_sportspress_event_team_order_admin_script' );
+
+/**
+ * Normalize event-list results array to match event team order.
+ *
+ * @param array $main_results Team results array.
+ * @param int   $event_id     Event ID.
+ * @return array
+ */
+function tony_sportspress_event_list_score_order( $main_results, $event_id ) {
+	if ( ! is_array( $main_results ) || empty( $main_results ) ) {
+		return $main_results;
+	}
+
+	$teams = (array) get_post_meta( $event_id, 'sp_team', false );
+	$teams = array_values( array_filter( array_map( 'absint', $teams ) ) );
+	if ( empty( $teams ) ) {
+		return $main_results;
+	}
+
+	$ordered = array();
+
+	foreach ( $teams as $index => $team_id ) {
+		if ( array_key_exists( $team_id, $main_results ) ) {
+			$ordered[ $team_id ] = $main_results[ $team_id ];
+			continue;
+		}
+
+		// SportsPress main_results() can be positional (0,1,...) in team order.
+		if ( array_key_exists( $index, $main_results ) ) {
+			$ordered[ $team_id ] = $main_results[ $index ];
+		}
+	}
+
+	if ( empty( $ordered ) ) {
+		return $main_results;
+	}
+
+	foreach ( $main_results as $team_id => $result ) {
+		if ( array_key_exists( $team_id, $ordered ) ) {
+			continue;
+		}
+
+		// Skip positional keys that have already been remapped to team IDs.
+		if ( is_int( $team_id ) || ctype_digit( (string) $team_id ) ) {
+			$position = (int) $team_id;
+			if ( array_key_exists( $position, $teams ) ) {
+				continue;
+			}
+		}
+
+		$ordered[ $team_id ] = $result;
+	}
+
+	return $ordered;
+}
+add_filter( 'sportspress_event_list_main_results', 'tony_sportspress_event_list_score_order', 999, 2 );

readme.md

@@ -0,0 +1,37 @@
+# Tony's SportsPress Enhancements
+
+Suite of enhancements for the SportsPress plugin, including custom event permalinks, Open Graph tags, and automatic featured image generation for events.
+
+## Description
+
+Tony's SportsPress Enhancements is a collection of add-ons for the [SportsPress](https://wordpress.org/plugins/sportspress/) plugin. It provides:
+
+- **Custom event permalinks** for `sp_event` post types, including season and team slugs.
+- **Open Graph meta tags** for events, with dynamic titles, descriptions, and images.
+- **Automatic featured image generation** for events, combining team colors and logos into a shareable image.
+
+## Features
+
+- Custom rewrite rules and permalinks for SportsPress events.
+- Open Graph integration for better social sharing.
+- Dynamic, cached event images based on team data.
+- Compatible with WordPress 4.5+ and PHP 5.6+.
+
+## Installation
+
+1. Upload the plugin files to the `/wp-content/plugins/tonys-sportspress-enhancements/` directory, or install via the WordPress plugin repository.
+2. Activate the plugin through the 'Plugins' menu in WordPress.
+3. Make sure the [SportsPress](https://wordpress.org/plugins/sportspress/) plugin is installed and activated.
+
+## Frequently Asked Questions
+
+**Q: Does this plugin require SportsPress?**  
+A: Yes, it extends the functionality of the SportsPress plugin.
+
+**Q: How are event images generated?**  
+A: When an event is viewed or shared, a featured image is generated using the primary colors and logos of the participating teams.
+
+
+---
+
+*This plugin is not affiliated with or endorsed by ThemeBoy or the official SportsPress plugin.*

readme.txt

@@ -1,115 +0,0 @@
-=== Tonys Sportspress Enhancements ===
-Contributors: (this should be a list of wordpress.org userid's)
-Donate link: https://example.com/
-Tags: comments, spam
-Requires at least: 4.5
-Tested up to: 6.5.3
-Requires PHP: 5.6
-Stable tag: 0.1.0
-License: GPLv2 or later
-License URI: https://www.gnu.org/licenses/gpl-2.0.html
-
-Here is a short description of the plugin.  This should be no more than 150 characters.  No markup here.
-
-== Description ==
-
-This is the long description.  No limit, and you can use Markdown (as well as in the following sections).
-
-For backwards compatibility, if this section is missing, the full length of the short description will be used, and
-Markdown parsed.
-
-A few notes about the sections above:
-
-*   "Contributors" is a comma separated list of wp.org/wp-plugins.org usernames
-*   "Tags" is a comma separated list of tags that apply to the plugin
-*   "Requires at least" is the lowest version that the plugin will work on
-*   "Tested up to" is the highest version that you've *successfully used to test the plugin*. Note that it might work on
-higher versions... this is just the highest one you've verified.
-*   Stable tag should indicate the Subversion "tag" of the latest stable version, or "trunk," if you use `/trunk/` for
-stable.
-
-    Note that the `readme.txt` of the stable tag is the one that is considered the defining one for the plugin, so
-if the `/trunk/readme.txt` file says that the stable tag is `4.3`, then it is `/tags/4.3/readme.txt` that'll be used
-for displaying information about the plugin.  In this situation, the only thing considered from the trunk `readme.txt`
-is the stable tag pointer.  Thus, if you develop in trunk, you can update the trunk `readme.txt` to reflect changes in
-your in-development version, without having that information incorrectly disclosed about the current stable version
-that lacks those changes -- as long as the trunk's `readme.txt` points to the correct stable tag.
-
-    If no stable tag is provided, it is assumed that trunk is stable, but you should specify "trunk" if that's where
-you put the stable version, in order to eliminate any doubt.
-
-== Installation ==
-
-This section describes how to install the plugin and get it working.
-
-e.g.
-
-1. Upload `plugin-name.php` to the `/wp-content/plugins/` directory
-1. Activate the plugin through the 'Plugins' menu in WordPress
-1. Place `<?php do_action('plugin_name_hook'); ?>` in your templates
-
-== Frequently Asked Questions ==
-
-= A question that someone might have =
-
-An answer to that question.
-
-= What about foo bar? =
-
-Answer to foo bar dilemma.
-
-== Screenshots ==
-
-1. This screen shot description corresponds to screenshot-1.(png|jpg|jpeg|gif). Note that the screenshot is taken from
-the /assets directory or the directory that contains the stable readme.txt (tags or trunk). Screenshots in the /assets
-directory take precedence. For example, `/assets/screenshot-1.png` would win over `/tags/4.3/screenshot-1.png`
-(or jpg, jpeg, gif).
-2. This is the second screen shot
-
-== Changelog ==
-
-= 1.0 =
-* A change since the previous version.
-* Another change.
-
-= 0.5 =
-* List versions from most recent at top to oldest at bottom.
-
-== Upgrade Notice ==
-
-= 1.0 =
-Upgrade notices describe the reason a user should upgrade.  No more than 300 characters.
-
-= 0.5 =
-This version fixes a security related bug.  Upgrade immediately.
-
-== Arbitrary section ==
-
-You may provide arbitrary sections, in the same format as the ones above.  This may be of use for extremely complicated
-plugins where more information needs to be conveyed that doesn't fit into the categories of "description" or
-"installation."  Arbitrary sections will be shown below the built-in sections outlined above.
-
-== A brief Markdown Example ==
-
-Ordered list:
-
-1. Some feature
-1. Another feature
-1. Something else about the plugin
-
-Unordered list:
-
-* something
-* something else
-* third thing
-
-Here's a link to [WordPress](https://wordpress.org/ "Your favorite software") and one to [Markdown's Syntax Documentation][markdown syntax].
-Titles are optional, naturally.
-
-[markdown syntax]: https://daringfireball.net/projects/markdown/syntax
-            "Markdown is what the parser uses to process much of the readme file"
-
-Markdown uses email style notation for blockquotes and I've been told:
-> Asterisks for *emphasis*. Double it up  for **strong**.
-
-`<?php code(); // goes in backticks ?>`

templates/event-list.php

@@ -0,0 +1,576 @@
+<?php
+/**
+ * Event List
+ *
+ * @author      ThemeBoy
+ * @package     SportsPress/Templates
+ * @version     2.7.23
+ */
+
+if ( ! defined( 'ABSPATH' ) ) {
+	exit; // Exit if accessed directly
+}
+
+$defaults = array(
+	'id'                   => null,
+	'title'                => false,
+	'status'               => 'default',
+	'format'               => 'default',
+	'date'                 => 'default',
+	'date_from'            => 'default',
+	'date_to'              => 'default',
+	'date_past'            => 'default',
+	'date_future'          => 'default',
+	'date_relative'        => 'default',
+	'day'                  => 'default',
+	'league'               => null,
+	'season'               => null,
+	'venue'                => null,
+	'team'                 => null,
+	'teams_past'           => null,
+	'date_before'          => null,
+	'player'               => null,
+	'number'               => -1,
+	'show_team_logo'       => get_option( 'sportspress_event_list_show_logos', 'no' ) == 'yes' ? true : false,
+	'link_events'          => get_option( 'sportspress_link_events', 'yes' ) == 'yes' ? true : false,
+	'link_teams'           => get_option( 'sportspress_link_teams', 'no' ) == 'yes' ? true : false,
+	'link_venues'          => get_option( 'sportspress_link_venues', 'yes' ) == 'yes' ? true : false,
+	'responsive'           => get_option( 'sportspress_enable_responsive_tables', 'no' ) == 'yes' ? true : false,
+	'sortable'             => get_option( 'sportspress_enable_sortable_tables', 'yes' ) == 'yes' ? true : false,
+	'scrollable'           => get_option( 'sportspress_enable_scrollable_tables', 'yes' ) == 'yes' ? true : false,
+	'paginated'            => get_option( 'sportspress_event_list_paginated', 'yes' ) == 'yes' ? true : false,
+	'rows'                 => get_option( 'sportspress_event_list_rows', 10 ),
+	'order'                => 'default',
+	'columns'              => null,
+	'show_all_events_link' => false,
+	'show_title'           => get_option( 'sportspress_event_list_show_title', 'yes' ) == 'yes' ? true : false,
+	'title_format'         => get_option( 'sportspress_event_list_title_format', 'title' ),
+	'time_format'          => get_option( 'sportspress_event_list_time_format', 'combined' ),
+);
+
+extract( $defaults, EXTR_SKIP );
+
+$calendar = new SP_Calendar( $id );
+if ( $status != 'default' ) {
+	$calendar->status = $status;
+}
+if ( $format != 'default' ) {
+	$calendar->event_format = $format;
+}
+if ( $date != 'default' ) {
+	$calendar->date = $date;
+}
+if ( $date_from != 'default' ) {
+	$calendar->from = $date_from;
+}
+if ( $date_to != 'default' ) {
+	$calendar->to = $date_to;
+}
+if ( $date_past != 'default' ) {
+	$calendar->past = $date_past;
+}
+if ( $date_future != 'default' ) {
+	$calendar->future = $date_future;
+}
+if ( $date_relative != 'default' ) {
+	$calendar->relative = $date_relative;
+}
+if ( $league ) {
+	$calendar->league = $league;
+}
+if ( $season ) {
+	$calendar->season = $season;
+}
+if ( $venue ) {
+	$calendar->venue = $venue;
+}
+if ( $team ) {
+	$calendar->team = $team;
+}
+if ( $teams_past ) {
+	$calendar->teams_past = $teams_past;
+}
+if ( $date_before ) {
+	$calendar->date_before = $date_before;
+}
+if ( $player ) {
+	$calendar->player = $player;
+}
+if ( $order != 'default' ) {
+	$calendar->order = $order;
+}
+if ( $day != 'default' ) {
+	$calendar->day = $day;
+}
+$data       = $calendar->data();
+$usecolumns = $calendar->columns;
+
+if ( isset( $columns ) ) :
+	if ( is_array( $columns ) ) {
+		$usecolumns = $columns;
+	} else {
+		$usecolumns = explode( ',', $columns );
+	}
+endif;
+
+$title_format_raw    = $title_format;
+$is_awayhome_format  = 'awayhome' === $title_format_raw;
+if ( $is_awayhome_format ) {
+	$title_format = 'homeaway';
+}
+$home_label = $is_awayhome_format ? esc_attr__( 'Away', 'sportspress' ) : esc_attr__( 'Home', 'sportspress' );
+$away_label = $is_awayhome_format ? esc_attr__( 'Home', 'sportspress' ) : esc_attr__( 'Away', 'sportspress' );
+
+if ( $show_title && false === $title && $id ) :
+	$caption = $calendar->caption;
+	if ( $caption ) {
+		$title = $caption;
+	} else {
+		$title = get_the_title( $id );
+	}
+endif;
+$labels = array();
+// Create a unique identifier based on the current time in microseconds
+$identifier = uniqid( 'eventlist_' );
+?>
+<div class="sp-template sp-template-event-list">
+	<?php if ( $title ) { ?>
+		<h4 class="sp-table-caption"><?php echo wp_kses_post( $title ); ?></h4>
+	<?php } ?>
+	<div class="sp-table-wrapper">
+		<table class="sp-event-list sp-event-list-format-<?php echo esc_attr( $title_format ); ?> sp-data-table
+																	<?php
+																	if ( $paginated ) {
+																		?>
+			 sp-paginated-table
+																		 <?php
+																	} if ( $sortable ) {
+																		?>
+			 sp-sortable-table
+																		 <?php
+																	} if ( $responsive ) {
+																												echo ' sp-responsive-table ' . esc_attr( $identifier ); } if ( $scrollable ) {
+																		?>
+													 sp-scrollable-table <?php } ?>" data-sp-rows="<?php echo esc_attr( $rows ); ?>">
+			<thead>
+				<tr>
+					<?php
+					echo '<th class="data-date">' . esc_attr__( 'Date', 'sportspress' ) . '</th>';
+
+					switch ( $title_format ) {
+						case 'homeaway':
+							if ( sp_column_active( $usecolumns, 'event' ) ) {
+								echo '<th class="data-home">' . esc_html( $home_label ) . '</th>';
+							}
+
+							if ( 'combined' == $time_format && sp_column_active( $usecolumns, 'time' ) ) {
+								echo '<th class="data-time">' . esc_attr__( 'Time/Results', 'sportspress' ) . '</th>';
+								$labels[] = esc_attr__( 'Time/Results', 'sportspress' );
+							} elseif ( in_array( $time_format, array( 'separate', 'results' ) ) && sp_column_active( $usecolumns, 'results' ) ) {
+								echo '<th class="data-results">' . esc_attr__( 'Results', 'sportspress' ) . '</th>';
+							}
+
+							if ( sp_column_active( $usecolumns, 'event' ) ) {
+								echo '<th class="data-away">' . esc_html( $away_label ) . '</th>';
+							}
+
+							if ( in_array( $time_format, array( 'separate', 'time' ) ) && sp_column_active( $usecolumns, 'time' ) ) {
+								echo '<th class="data-time">' . esc_attr__( 'Time', 'sportspress' ) . '</th>';
+							}
+							break;
+						default:
+							if ( sp_column_active( $usecolumns, 'event' ) ) {
+								if ( $title_format == 'teams' ) {
+									echo '<th class="data-teams">' . esc_attr__( 'Teams', 'sportspress' ) . '</th>';
+								} else {
+									echo '<th class="data-event">' . esc_attr__( 'Event', 'sportspress' ) . '</th>';
+								}
+							}
+
+							switch ( $time_format ) {
+								case 'separate':
+									if ( sp_column_active( $usecolumns, 'time' ) ) {
+										echo '<th class="data-time">' . esc_attr__( 'Time', 'sportspress' ) . '</th>';
+									}
+									if ( sp_column_active( $usecolumns, 'results' ) ) {
+										echo '<th class="data-results">' . esc_attr__( 'Results', 'sportspress' ) . '</th>';
+									}
+									break;
+								case 'time':
+									if ( sp_column_active( $usecolumns, 'time' ) ) {
+										echo '<th class="data-time">' . esc_attr__( 'Time', 'sportspress' ) . '</th>';
+									}
+									break;
+								case 'results':
+									if ( sp_column_active( $usecolumns, 'results' ) ) {
+										echo '<th class="data-results">' . esc_attr__( 'Results', 'sportspress' ) . '</th>';
+									}
+									break;
+								default:
+									if ( sp_column_active( $usecolumns, 'time' ) ) {
+										echo '<th class="data-time">' . esc_attr__( 'Time/Results', 'sportspress' ) . '</th>';
+									}
+							}
+					}
+
+					if ( sp_column_active( $usecolumns, 'league' ) ) {
+						echo '<th class="data-league">' . esc_attr__( 'League', 'sportspress' ) . '</th>';
+					}
+
+					if ( sp_column_active( $usecolumns, 'season' ) ) {
+						echo '<th class="data-season">' . esc_attr__( 'Season', 'sportspress' ) . '</th>';
+					}
+
+					if ( sp_column_active( $usecolumns, 'venue' ) ) {
+						echo '<th class="data-venue">' . esc_attr__( 'Venue', 'sportspress' ) . '</th>';
+					} else {
+						echo '<th style="display:none;" class="data-venue">' . esc_attr__( 'Venue', 'sportspress' ) . '</th>';
+					}
+
+					if ( sp_column_active( $usecolumns, 'article' ) ) {
+						echo '<th class="data-article">' . esc_attr__( 'Article', 'sportspress' ) . '</th>';
+					}
+
+					if ( sp_column_active( $usecolumns, 'day' ) ) {
+						echo '<th class="data-day">' . esc_attr__( 'Match Day', 'sportspress' ) . '</th>';
+					}
+
+					do_action( 'sportspress_event_list_head_row', $usecolumns );
+					?>
+				</tr>
+			</thead>
+			<tbody>
+				<?php
+				$i = 0;
+
+				if ( is_numeric( $number ) && $number > 0 ) {
+					$limit = $number;
+				}
+
+				foreach ( $data as $event ) :
+					if ( isset( $limit ) && $i >= $limit ) {
+						continue;
+					}
+
+					$teams  = get_post_meta( $event->ID, 'sp_team' );
+					$video  = get_post_meta( $event->ID, 'sp_video', true );
+					$status = get_post_meta( $event->ID, 'sp_status', true );
+
+					$main_results = apply_filters( 'sportspress_event_list_main_results', sp_get_main_results( $event ), $event->ID );
+
+					$reverse_results = $is_awayhome_format;
+					$reverse_teams   = false;
+					if ( 'homeaway' === $title_format ) {
+						$reverse_teams = $is_awayhome_format;
+					} elseif ( 'teams' === $title_format ) {
+						$reverse_teams = get_option( 'sportspress_event_reverse_teams', 'no' ) === 'yes' ? true : false;
+					}
+
+					if ( $reverse_results ) {
+						$main_results = array_reverse( $main_results, true );
+					}
+
+					$teams_output = '';
+					$team_class   = '';
+					$teams_array  = array();
+					$team_logos   = array();
+
+					if ( $teams ) :
+						foreach ( $teams as $t => $team ) :
+							$name = sp_team_short_name( $team );
+							if ( $name ) :
+
+								$name = '<meta itemprop="name" content="' . $name . '">' . $name;
+
+								if ( $show_team_logo ) :
+									if ( has_post_thumbnail( $team ) ) :
+										$logo         = '<span class="team-logo">' . sp_get_logo( $team, 'mini', array( 'itemprop' => 'url' ) ) . '</span>';
+										$team_logos[] = $logo;
+										$team_class  .= ' has-logo';
+
+										if ( $t ) :
+											$name = $logo . ' ' . $name;
+										else :
+											$name .= ' ' . $logo;
+										endif;
+									endif;
+								endif;
+
+								if ( $link_teams ) :
+									$team_output = '<a href="' . get_post_permalink( $team ) . '" itemprop="url">' . $name . '</a>';
+								else :
+									$team_output = $name;
+								endif;
+
+								$team_result = sp_array_value( $main_results, $team, null );
+
+								if ( $team_result != null ) :
+									if ( $usecolumns != null && ! in_array( 'time', $usecolumns ) ) :
+										$team_output .= ' (' . $team_result . ')';
+									endif;
+								endif;
+
+								$teams_array[] = $team_output;
+
+								$teams_output .= $team_output . '<br>';
+							endif;
+						endforeach;
+					else :
+						$teams_output .= '&mdash;';
+					endif;
+
+					echo '<tr class="sp-row sp-post' . ( $i % 2 == 0 ? ' alternate' : '' ) . ' sp-row-no-' . esc_attr( $i ) . '" itemscope itemtype="http://schema.org/SportsEvent">';
+
+						$date_html = '<date>' . get_post_time( 'Y-m-d H:i:s', false, $event ) . '</date>' . apply_filters( 'sportspress_event_date', get_post_time( get_option( 'date_format' ), false, $event, true ), $event->ID );
+
+					if ( $link_events ) {
+						$date_html = '<a href="' . get_post_permalink( $event->ID, false, true ) . '" itemprop="url">' . $date_html . '</a>';
+					}
+
+						echo '<td class="data-date" itemprop="startDate" content="' . esc_attr( mysql2date( 'Y-m-d\TH:i:sP', $event->post_date ) ) . '" data-label="' . esc_attr__( 'Date', 'sportspress' ) . '">' . wp_kses( $date_html, array( 'a' => array( 'href' => array(), 'itemprop' => array() ), 'date' => array() ) ) . '</td>';
+
+						// Check if the reverse_teams option is selected and alter the teams order
+					if ( $reverse_teams ) {
+						$teams_array = array_reverse( $teams_array, true );
+					}
+
+					switch ( $title_format ) {
+						case 'homeaway':
+							if ( sp_column_active( $usecolumns, 'event' ) ) {
+								$team = array_shift( $teams_array );
+								echo '<td class="data-home' . esc_attr( $team_class ) . '" itemprop="competitor" itemscope itemtype="http://schema.org/SportsTeam" data-label="' . esc_attr( $home_label ) . '">' . wp_kses_post( $team ) . '</td>';
+							}
+
+							if ( 'combined' == $time_format && sp_column_active( $usecolumns, 'time' ) ) {
+								echo '<td class="data-time ' . esc_attr( $status ) . '" data-label="' . esc_attr__( 'Time/Results', 'sportspress' ) . '">';
+								if ( $link_events ) {
+									echo '<a href="' . esc_url( get_post_permalink( $event->ID, false, true ) ) . '" itemprop="url">';
+								}
+								if ( ! empty( $main_results ) ) :
+									echo wp_kses_post( implode( ' - ', $main_results ) );
+									else :
+										echo '<date>&nbsp;' . wp_kses_post( get_post_time( 'H:i:s', false, $event ) ) . '</date>' . wp_kses_post( apply_filters( 'sportspress_event_time', sp_get_time( $event ), $event->ID ) );
+									endif;
+									if ( $link_events ) {
+										echo '</a>';
+									}
+									echo '</td>';
+							} elseif ( in_array( $time_format, array( 'separate', 'results' ) ) && sp_column_active( $usecolumns, 'results' ) ) {
+								echo '<td class="data-results" data-label="' . esc_attr__( 'Results', 'sportspress' ) . '">';
+								if ( $link_events ) {
+									echo '<a href="' . esc_url( get_post_permalink( $event->ID, false, true ) ) . '" itemprop="url">';
+								}
+								if ( ! empty( $main_results ) ) :
+									echo wp_kses_post( implode( ' - ', $main_results ) );
+									else :
+										echo '-';
+									endif;
+									if ( $link_events ) {
+										echo '</a>';
+									}
+									echo '</td>';
+							}
+
+							if ( sp_column_active( $usecolumns, 'event' ) ) {
+								$team = array_shift( $teams_array );
+								echo '<td class="data-away' . esc_attr( $team_class ) . '" itemprop="competitor" itemscope itemtype="http://schema.org/SportsTeam" data-label="' . esc_attr( $away_label ) . '">' . wp_kses_post( $team ) . '</td>';
+							}
+
+							if ( in_array( $time_format, array( 'separate', 'time' ) ) && sp_column_active( $usecolumns, 'time' ) ) {
+								echo '<td class="data-time ' . esc_attr( $status ) . '" data-label="' . esc_attr__( 'Time', 'sportspress' ) . '">';
+								if ( $link_events ) {
+									echo '<a href="' . esc_url( get_post_permalink( $event->ID, false, true ) ) . '" itemprop="url">';
+								}
+								echo '<date>&nbsp;' . wp_kses_post( get_post_time( 'H:i:s', false, $event ) ) . '</date>' . wp_kses_post( apply_filters( 'sportspress_event_time', sp_get_time( $event ), $event->ID ) );
+								if ( $link_events ) {
+									echo '</a>';
+								}
+								echo '</td>';
+							}
+							break;
+						default:
+							if ( sp_column_active( $usecolumns, 'event' ) ) {
+								if ( $title_format == 'teams' ) {
+									echo '<td class="data-event data-teams" data-label="' . esc_attr__( 'Teams', 'sportspress' ) . '">' . wp_kses_post( $teams_output ) . '</td>';
+								} else {
+									$title_html = implode( ' ', $team_logos ) . ' ' . $event->post_title;
+									if ( $link_events ) {
+										$title_html = '<a href="' . get_post_permalink( $event->ID, false, true ) . '" itemprop="url name">' . $title_html . '</a>';
+									}
+									echo '<td class="data-event" data-label="' . esc_attr__( 'Event', 'sportspress' ) . '">' . wp_kses_post( $title_html ) . '</td>';
+								}
+							}
+
+							switch ( $time_format ) {
+								case 'separate':
+									if ( sp_column_active( $usecolumns, 'time' ) ) {
+										echo '<td class="data-time ' . esc_attr( $status ) . '" data-label="' . esc_attr__( 'Time', 'sportspress' ) . '">';
+										if ( $link_events ) {
+											echo '<a href="' . esc_url( get_post_permalink( $event->ID, false, true ) ) . '" itemprop="url">';
+										}
+										echo '<date>&nbsp;' . wp_kses_post( get_post_time( 'H:i:s', false, $event ) ) . '</date>' . wp_kses_post( apply_filters( 'sportspress_event_time', sp_get_time( $event ), $event->ID ) );
+										if ( $link_events ) {
+											echo '</a>';
+										}
+										echo '</td>';
+									}
+									if ( sp_column_active( $usecolumns, 'results' ) ) {
+										echo '<td class="data-results" data-label="' . esc_attr__( 'Results', 'sportspress' ) . '">';
+										if ( $link_events ) {
+											echo '<a href="' . esc_url( get_post_permalink( $event->ID, false, true ) ) . '" itemprop="url">';
+										}
+										if ( ! empty( $main_results ) ) :
+											echo wp_kses_post( implode( ' - ', $main_results ) );
+											else :
+												echo '-';
+											endif;
+											if ( $link_events ) {
+												echo '</a>';
+											}
+											echo '</td>';
+									}
+									break;
+								case 'time':
+									if ( sp_column_active( $usecolumns, 'time' ) ) {
+										echo '<td class="data-time ' . esc_attr( $status ) . '" data-label="' . esc_attr__( 'Time', 'sportspress' ) . '">';
+										if ( $link_events ) {
+											echo '<a href="' . esc_url( get_post_permalink( $event->ID, false, true ) ) . '" itemprop="url">';
+										}
+										echo '<date>&nbsp;' . wp_kses_post( get_post_time( 'H:i:s', false, $event ) ) . '</date>' . wp_kses_post( apply_filters( 'sportspress_event_time', sp_get_time( $event ), $event->ID ) );
+										if ( $link_events ) {
+											echo '</a>';
+										}
+										echo '</td>';
+									}
+									break;
+								case 'results':
+									if ( sp_column_active( $usecolumns, 'results' ) ) {
+										echo '<td class="data-results" data-label="' . esc_attr__( 'Results', 'sportspress' ) . '">';
+										if ( $link_events ) {
+											echo '<a href="' . esc_url( get_post_permalink( $event->ID, false, true ) ) . '" itemprop="url">';
+										}
+										if ( ! empty( $main_results ) ) :
+											echo wp_kses_post( implode( ' - ', $main_results ) );
+											else :
+												echo '-';
+											endif;
+											if ( $link_events ) {
+												echo '</a>';
+											}
+											echo '</td>';
+									}
+									break;
+								default:
+									if ( sp_column_active( $usecolumns, 'time' ) ) {
+										echo '<td class="data-time ' . esc_attr( $status ) . '" data-label="' . esc_attr__( 'Time/Results', 'sportspress' ) . '">';
+										if ( $link_events ) {
+											echo '<a href="' . esc_url( get_post_permalink( $event->ID, false, true ) ) . '" itemprop="url">';
+										}
+										if ( ! empty( $main_results ) ) :
+											echo wp_kses_post( implode( ' - ', $main_results ) );
+											else :
+												echo '<date>&nbsp;' . wp_kses_post( get_post_time( 'H:i:s', false, $event ) ) . '</date>' . wp_kses_post( apply_filters( 'sportspress_event_time', sp_get_time( $event ), $event->ID ) );
+											endif;
+											if ( $link_events ) {
+												echo '</a>';
+											}
+											echo '</td>';
+									}
+							}
+					}
+
+					if ( sp_column_active( $usecolumns, 'league' ) ) :
+						echo '<td class="data-league" data-label="' . esc_attr__( 'League', 'sportspress' ) . '">';
+						$leagues = get_the_terms( $event->ID, 'sp_league' );
+						if ( $leagues ) :
+							echo wp_kses_post( implode( ', ', wp_list_pluck( $leagues, 'name' ) ) );
+							endif;
+						echo '</td>';
+						endif;
+
+					if ( sp_column_active( $usecolumns, 'season' ) ) :
+						echo '<td class="data-season" data-label="' . esc_attr__( 'Season', 'sportspress' ) . '">';
+						$seasons = get_the_terms( $event->ID, 'sp_season' );
+						if ( $seasons ) :
+							echo wp_kses_post( implode( ', ', wp_list_pluck( $seasons, 'name' ) ) );
+							endif;
+						echo '</td>';
+						endif;
+
+					if ( sp_column_active( $usecolumns, 'venue' ) ) :
+						echo '<td class="data-venue" data-label="' . esc_attr__( 'Venue', 'sportspress' ) . '" itemprop="location" itemscope itemtype="http://schema.org/Place">';
+						echo '<div itemprop="address" itemscope itemtype="http://schema.org/PostalAddress">';
+						if ( $link_venues ) :
+							the_terms( $event->ID, 'sp_venue' );
+							else :
+								$venues = get_the_terms( $event->ID, 'sp_venue' );
+								if ( $venues ) :
+									echo wp_kses_post( implode( ', ', wp_list_pluck( $venues, 'name' ) ) );
+								endif;
+							endif;
+							echo '</div>';
+							echo '</td>';
+						else :
+							echo '<td style="display:none;" class="data-venue" data-label="' . esc_attr__( 'Venue', 'sportspress' ) . '" itemprop="location" itemscope itemtype="http://schema.org/Place">';
+							echo '<div itemprop="address" itemscope itemtype="http://schema.org/PostalAddress">';
+							esc_attr_e( 'N/A', 'sportspress' );
+							echo '</div>';
+							echo '</td>';
+						endif;
+
+						if ( sp_column_active( $usecolumns, 'article' ) ) :
+							echo '<td class="data-article" data-label="' . esc_attr__( 'Article', 'sportspress' ) . '">';
+							if ( $link_events ) {
+								echo '<a href="' . esc_url( get_post_permalink( $event->ID, false, true ) ) . '" itemprop="url">';
+							}
+
+							if ( $video ) :
+								echo '<div class="dashicons dashicons-video-alt"></div>';
+								elseif ( has_post_thumbnail( $event->ID ) ) :
+									echo '<div class="dashicons dashicons-camera"></div>';
+								endif;
+								if ( $event->post_content !== null ) :
+									if ( $event->post_status == 'publish' ) :
+										esc_attr_e( 'Recap', 'sportspress' );
+									else :
+										esc_attr_e( 'Preview', 'sportspress' );
+									endif;
+								endif;
+
+								if ( $link_events ) {
+									echo '</a>';
+								}
+								echo '</td>';
+						endif;
+
+						if ( sp_column_active( $usecolumns, 'day' ) ) :
+							echo '<td class="data-day" data-label="' . esc_attr__( 'Match Day', 'sportspress' ) . '">';
+							$day = get_post_meta( $event->ID, 'sp_day', true );
+							if ( '' == $day ) {
+								echo '-';
+							} else {
+								echo wp_kses_post( $day );
+							}
+							echo '</td>';
+						endif;
+
+						do_action( 'sportspress_event_list_row', $event, $usecolumns );
+
+						echo '</tr>';
+
+						$i++;
+				endforeach;
+				?>
+			</tbody>
+		</table>
+	</div>
+	<?php
+	// If responsive tables are enabled then load the inline css code
+	if ( $responsive ) {
+		// sportspress_responsive_tables_css( $identifier );
+	}
+	if ( $id && $show_all_events_link ) {
+		echo '<div class="sp-calendar-link sp-view-all-link"><a href="' . esc_url( get_permalink( $id ) ) . '">' . esc_attr__( 'View all events', 'sportspress' ) . '</a></div>';
+	}
+	?>
+</div>

templates/event-results.php

@@ -0,0 +1,166 @@
+<?php
+/**
+ * Event Results
+ *
+ * @author      ThemeBoy
+ * @package     SportsPress/Templates
+ * @version   2.7.1
+ */
+
+if ( ! defined( 'ABSPATH' ) ) {
+	exit; // Exit if accessed directly
+}
+if ( get_option( 'sportspress_event_show_results', 'yes' ) === 'no' ) {
+	return;
+}
+
+if ( ! isset( $id ) ) {
+	$id = get_the_ID();
+}
+
+$event  = new SP_Event( $id );
+$status = $event->status();
+
+if ( 'results' != $status ) {
+	return;
+}
+
+if ( ! isset( $caption ) ) {
+	$caption = esc_attr__( 'Results', 'sportspress' );
+}
+
+// Get event result data
+$data = $event->results();
+
+// The first row should be column labels
+$labels = $data[0];
+
+// Remove the first row to leave us with the actual data
+unset( $data[0] );
+
+$data = array_filter( $data );
+
+if ( empty( $data ) ) {
+	return false;
+}
+
+$scrollable    = get_option( 'sportspress_enable_scrollable_tables', 'yes' ) == 'yes' ? true : false;
+$link_teams    = get_option( 'sportspress_link_teams', 'no' ) == 'yes' ? true : false;
+$show_outcomes = array_key_exists( 'outcome', $labels );
+
+// Initialize
+$output     = '';
+$table_rows = '';
+$i          = 0;
+
+// Event Results row order is controlled in SportsPress > Settings > Events > Event Results.
+$row_order = get_option( 'tony_sportspress_event_results_row_order', '' );
+if ( '' === $row_order ) {
+	// Backward compatibility with the legacy checkbox option.
+	$legacy_away_first = get_option( 'tony_sportspress_event_results_away_first', 'no' ) === 'yes';
+	$row_order         = $legacy_away_first ? 'away_home' : 'home_away';
+}
+
+$teams = array_values( array_filter( array_map( 'absint', (array) get_post_meta( $id, 'sp_team', false ) ) ) );
+if ( 'away_home' === $row_order ) {
+	$teams = array_reverse( $teams );
+}
+
+if ( ! empty( $teams ) ) {
+	$ordered = array();
+
+	foreach ( $teams as $index => $team_id ) {
+		if ( array_key_exists( $team_id, $data ) ) {
+			$ordered[ $team_id ] = $data[ $team_id ];
+			continue;
+		}
+
+		// SportsPress can store positional rows in team order (0,1,...) depending on context.
+		if ( array_key_exists( $index, $data ) ) {
+			$ordered[ $team_id ] = $data[ $index ];
+		}
+	}
+
+	foreach ( $data as $team_id => $result ) {
+		if ( ! array_key_exists( $team_id, $ordered ) ) {
+			$ordered[ $team_id ] = $result;
+		}
+	}
+
+	if ( ! empty( $ordered ) ) {
+		$data = $ordered;
+	}
+}
+
+foreach ( $data as $team_id => $result ) :
+	if ( $show_outcomes ) :
+		$outcomes       = array();
+		$result_outcome = sp_array_value( $result, 'outcome' );
+		if ( ! is_array( $result_outcome ) ) :
+			$outcomes = array( '&mdash;' );
+		else :
+			foreach ( $result_outcome as $outcome ) :
+				$the_outcome = get_page_by_path( $outcome, OBJECT, 'sp_outcome' );
+				if ( is_object( $the_outcome ) ) :
+					$outcomes[] = $the_outcome->post_title;
+				endif;
+			endforeach;
+		endif;
+	endif;
+
+	unset( $result['outcome'] );
+
+	$table_rows .= '<tr class="' . ( $i % 2 == 0 ? 'odd' : 'even' ) . '">';
+
+	$team_name = sp_team_short_name( $team_id );
+
+	if ( $link_teams && sp_post_exists( $team_id ) ) :
+		$team_name = '<a href="' . get_post_permalink( $team_id ) . '">' . $team_name . '</a>';
+	endif;
+
+	$table_rows .= '<td class="data-name">' . $team_name . '</td>';
+
+	foreach ( $labels as $key => $label ) :
+		if ( in_array( $key, array( 'name', 'outcome' ) ) ) {
+			continue;
+		}
+		if ( array_key_exists( $key, $result ) && $result[ $key ] != '' ) :
+			$value = $result[ $key ];
+		else :
+			$value = apply_filters( 'sportspress_event_empty_result_string', '&mdash;' );
+		endif;
+		$table_rows .= '<td class="data-' . $key . '">' . $value . '</td>';
+	endforeach;
+
+	if ( $show_outcomes ) :
+		$table_rows .= '<td class="data-outcome">' . implode( ', ', $outcomes ) . '</td>';
+	endif;
+
+	$table_rows .= '</tr>';
+
+	$i++;
+endforeach;
+
+if ( empty( $table_rows ) ) :
+
+	return false;
+
+else :
+
+	$output .= '<h4 class="sp-table-caption">' . $caption . '</h4>';
+
+	$output .= '<div class="sp-table-wrapper">' .
+		'<table class="sp-event-results sp-data-table' . ( $scrollable ? ' sp-scrollable-table' : '' ) . '"><thead>' .
+		'<th class="data-name">' . esc_attr__( 'Team', 'sportspress' ) . '</th>';
+	foreach ( $labels as $key => $label ) :
+		$output .= '<th class="data-' . $key . '">' . $label . '</th>';
+	endforeach;
+	$output .= '</tr>' . '</thead>' . '<tbody>';
+	$output .= $table_rows;
+	$output .= '</tbody>' . '</table>' . '</div>';
+
+endif;
+?>
+<div class="sp-template sp-template-event-results">
+	<?php echo wp_kses_post( $output ); ?>
+</div>

tonys-sportspress-enhancements.php

@@ -1,13 +1,13 @@
 <?php
 /**
  * Plugin Name:     Tonys SportsPress Enhancements
- * Plugin URI:      PLUGIN SITE HERE
+ * Plugin URI:      https://github.com/anthonyscorrea/tonys-sportspress-enhancements
  * Description:     Suite of SportsPress Enhancements
- * Author:          YOUR NAME HERE
- * Author URI:      YOUR SITE HERE
+ * Author:          Tony Correa
+ * Author URI:      https://github.com/anthonyscorrea/
  * Text Domain:     tonys-sportspress-enhancements
  * Domain Path:     /languages
- * Version:         0.1.0
+ * Version:         0.1.4
  *
  * @package         Tonys_Sportspress_Enhancements
  */
@@ -17,3 +17,7 @@
 require_once plugin_dir_path(__FILE__) . 'includes/open-graph-tags.php';
 require_once plugin_dir_path(__FILE__) . 'includes/featured-image-generator.php';
 require_once plugin_dir_path(__FILE__) . 'includes/sp-event-permalink.php';
+require_once plugin_dir_path(__FILE__) . 'includes/sp-event-csv.php';
+require_once plugin_dir_path(__FILE__) . 'includes/sp-event-admin-week-filter.php';
+require_once plugin_dir_path(__FILE__) . 'includes/sp-event-quick-edit-officials.php';
+require_once plugin_dir_path(__FILE__) . 'includes/sp-event-team-ordering.php';