From e9b1d84c413700461a9759be294c706d01696a34 Mon Sep 17 00:00:00 2001
From: savvasha <savvasha@hotmail.com>
Date: Sun, 10 Dec 2017 21:09:51 +0200
Subject: [PATCH 1/8] Add event_id as an option to the template

---
 templates/event-blocks.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/templates/event-blocks.php b/templates/event-blocks.php
index 2021d2a9..f727e190 100644
--- a/templates/event-blocks.php
+++ b/templates/event-blocks.php
@@ -11,6 +11,7 @@ if ( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly
 
 $defaults = array(
 	'id' => null,
+	'event_id' => null,
 	'title' => false,
 	'status' => 'default',
 	'date' => 'default',
@@ -58,6 +59,8 @@ if ( $date_future != 'default' )
 	$calendar->future = $date_future;
 if ( $date_relative != 'default' )
 	$calendar->relative = $date_relative;
+if ( $event_id ) 
+	$calendar->event_id = $event_id;
 if ( $league )
 	$calendar->league = $league;
 if ( $season )
@@ -175,4 +178,4 @@ if ( $title )
 	if ( $id && $show_all_events_link )
 		echo '<div class="sp-calendar-link sp-view-all-link"><a href="' . get_permalink( $id ) . '">' . __( 'View all events', 'sportspress' ) . '</a></div>';
 	?>
-</div>
\ No newline at end of file
+</div>

From 4c43023175df1550008e98b9f975b866c0336c4b Mon Sep 17 00:00:00 2001
From: savvasha <savvasha@hotmail.com>
Date: Sun, 10 Dec 2017 21:12:14 +0200
Subject: [PATCH 2/8] Add event_id as a variable to Calendar Class

---
 includes/class-sp-calendar.php | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/includes/class-sp-calendar.php b/includes/class-sp-calendar.php
index 26c3ae9f..cb49e953 100644
--- a/includes/class-sp-calendar.php
+++ b/includes/class-sp-calendar.php
@@ -45,6 +45,9 @@ class SP_Calendar extends SP_Secondary_Post {
 
 	/** @var int Number of events. */
 	public $number;
+	
+	/** @var int The event ID. */
+	public $event_id;
 
 	/**
 	 * __construct function.
@@ -277,6 +280,10 @@ class SP_Calendar extends SP_Secondary_Post {
 					),
 				);
 			}
+		
+			if ( $this->event_id) {
+				$args['p'] = $this->event_id;
+			}
 
 			if ( 'auto' === $this->date && 'any' === $this->status ) {
 				$args['post_status'] = 'publish';

From 7d26c871e218daffcedba2b849386ced879dd349 Mon Sep 17 00:00:00 2001
From: savvasha <savvasha@hotmail.com>
Date: Sun, 10 Dec 2017 21:30:39 +0200
Subject: [PATCH 3/8] Add event_id to event-blocks shortcode

---
 includes/class-sp-ajax.php | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/includes/class-sp-ajax.php b/includes/class-sp-ajax.php
index dbef2f57..fd34eafd 100644
--- a/includes/class-sp-ajax.php
+++ b/includes/class-sp-ajax.php
@@ -468,6 +468,12 @@ class SP_AJAX {
 					<input class="regular-text" type="text" name="title">
 				</label>
 			</p>
+			<p>
+				<label>
+					<?php _e( 'Event ID:', 'sportspress' ); ?>
+					<input class="regular-text" type="number" name="event_id">
+				</label>
+			</p>
 			<p>
 				<label>
 					<?php printf( __( 'Select %s:', 'sportspress' ), __( 'Calendar', 'sportspress' ) ); ?>
@@ -1031,6 +1037,7 @@ class SP_AJAX {
                     args.show_all_events_link = $div.find('[name=show_all_events_link]:checked').length;
                 } else if ( 'event_blocks' == type ) {
                     args.title = $div.find('[name=title]').val();
+		    args.event_id = $div.find('[name=event_id]').val();
                     args.team = $div.find('[name=team]').val();
                     args.league = $div.find('[name=league]').val();
                     args.season = $div.find('[name=season]').val();

From a02e1034c82ee4196b51736d1d5ad9603be6b17d Mon Sep 17 00:00:00 2001
From: savvasha <savvasha@hotmail.com>
Date: Sun, 10 Dec 2017 22:14:43 +0200
Subject: [PATCH 4/8] Add hook to add more information on player names

Before or after the player name in the selection list in an event
---
 includes/sp-api-functions.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/includes/sp-api-functions.php b/includes/sp-api-functions.php
index 37b90276..46861f1a 100644
--- a/includes/sp-api-functions.php
+++ b/includes/sp-api-functions.php
@@ -347,9 +347,9 @@ function sp_get_player_number( $post = 0 ) {
 function sp_get_player_name_with_number( $post = 0, $prepend = '', $append = '. ' ) {
 	$number = sp_get_player_number( $post );
 	if ( isset( $number ) && '' !== $number ) {
-		return $prepend . $number . $append . get_the_title( $post );
+		return apply_filters( 'sportspress_event_players', $prepend . $number . $append . get_the_title( $post ));
 	} else {
-		return get_the_title( $post );
+		return apply_filters( 'sportspress_event_players', get_the_title( $post ));
 	}
 }
 
@@ -413,4 +413,4 @@ function sp_get_position_caption( $term = 0 ) {
 		return $term->name;
 	}
 
-}
\ No newline at end of file
+}

From e5f98ff38039cee5653ac5a43a10ea2437ee28c3 Mon Sep 17 00:00:00 2001
From: savvasha <savvasha@hotmail.com>
Date: Sun, 10 Dec 2017 22:26:02 +0200
Subject: [PATCH 5/8] Add hook to add more information on player names

After the player name in the list of selected players in an event.
---
 .../meta-boxes/class-sp-meta-box-event-performance.php         | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/includes/admin/post-types/meta-boxes/class-sp-meta-box-event-performance.php b/includes/admin/post-types/meta-boxes/class-sp-meta-box-event-performance.php
index ff3dcb11..2e39c483 100644
--- a/includes/admin/post-types/meta-boxes/class-sp-meta-box-event-performance.php
+++ b/includes/admin/post-types/meta-boxes/class-sp-meta-box-event-performance.php
@@ -405,6 +405,7 @@ class SP_Meta_Box_Event_Performance {
 			<?php } ?>
 			<td>
 				<?php echo get_the_title( $player_id ); ?>
+				<?php do_action ( 'sportspress_event_selected_players' ); ?>
 				<?php if ( 1 == $section ) { ?>
 					<input type="hidden" name="sp_order[<?php echo $team_id; ?>][]" value="<?php echo $player_id; ?>">
 				<?php } ?>
@@ -569,4 +570,4 @@ class SP_Meta_Box_Event_Performance {
 		return $output;
 
 	}
-}
\ No newline at end of file
+}

From 9ca9aa213194f93b5833a2fec0d7ca97e6de3005 Mon Sep 17 00:00:00 2001
From: Brian Miyaji <brian@themeboy.com>
Date: Mon, 11 Dec 2017 12:09:48 +1100
Subject: [PATCH 6/8] Split player name filters to target specific use cases

---
 includes/sp-api-functions.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/includes/sp-api-functions.php b/includes/sp-api-functions.php
index 46861f1a..451ba1f5 100644
--- a/includes/sp-api-functions.php
+++ b/includes/sp-api-functions.php
@@ -345,11 +345,12 @@ function sp_get_player_number( $post = 0 ) {
 }
 
 function sp_get_player_name_with_number( $post = 0, $prepend = '', $append = '. ' ) {
+	$name = apply_filters( 'sportspress_player_name', get_the_title( $post ));
 	$number = sp_get_player_number( $post );
 	if ( isset( $number ) && '' !== $number ) {
-		return apply_filters( 'sportspress_event_players', $prepend . $number . $append . get_the_title( $post ));
+		return apply_filters( 'sportspress_player_name_with_number', $prepend . $number . $append . $name);
 	} else {
-		return apply_filters( 'sportspress_event_players', get_the_title( $post ));
+		return $name;
 	}
 }
 

From dacfa8eac0dac0d5240c557fb3b3237351f07a7a Mon Sep 17 00:00:00 2001
From: Brian Miyaji <brian@themeboy.com>
Date: Mon, 11 Dec 2017 12:10:03 +1100
Subject: [PATCH 7/8] Rename event performance player selection action for
 clarity

---
 .../meta-boxes/class-sp-meta-box-event-performance.php          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/includes/admin/post-types/meta-boxes/class-sp-meta-box-event-performance.php b/includes/admin/post-types/meta-boxes/class-sp-meta-box-event-performance.php
index 2e39c483..e6ca2643 100644
--- a/includes/admin/post-types/meta-boxes/class-sp-meta-box-event-performance.php
+++ b/includes/admin/post-types/meta-boxes/class-sp-meta-box-event-performance.php
@@ -405,7 +405,7 @@ class SP_Meta_Box_Event_Performance {
 			<?php } ?>
 			<td>
 				<?php echo get_the_title( $player_id ); ?>
-				<?php do_action ( 'sportspress_event_selected_players' ); ?>
+				<?php do_action ( 'sportspress_event_performance_player_selection' ); ?>
 				<?php if ( 1 == $section ) { ?>
 					<input type="hidden" name="sp_order[<?php echo $team_id; ?>][]" value="<?php echo $player_id; ?>">
 				<?php } ?>

From d1e16197808db49bfa2a12ddfd32be9bf583ad1f Mon Sep 17 00:00:00 2001
From: Brian Miyaji <brian@themeboy.com>
Date: Mon, 11 Dec 2017 12:10:42 +1100
Subject: [PATCH 8/8] Change 'event_id' parameter to 'event' for consistency

---
 includes/class-sp-ajax.php     | 6 +++---
 includes/class-sp-calendar.php | 6 +++---
 templates/event-blocks.php     | 6 +++---
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/includes/class-sp-ajax.php b/includes/class-sp-ajax.php
index fd34eafd..5b1a19a5 100644
--- a/includes/class-sp-ajax.php
+++ b/includes/class-sp-ajax.php
@@ -470,8 +470,8 @@ class SP_AJAX {
 			</p>
 			<p>
 				<label>
-					<?php _e( 'Event ID:', 'sportspress' ); ?>
-					<input class="regular-text" type="number" name="event_id">
+					<?php _e( 'Event:', 'sportspress' ); ?>
+					<input class="regular-text" type="number" name="event">
 				</label>
 			</p>
 			<p>
@@ -1037,7 +1037,7 @@ class SP_AJAX {
                     args.show_all_events_link = $div.find('[name=show_all_events_link]:checked').length;
                 } else if ( 'event_blocks' == type ) {
                     args.title = $div.find('[name=title]').val();
-		    args.event_id = $div.find('[name=event_id]').val();
+                    args.event = $div.find('[name=event]').val();
                     args.team = $div.find('[name=team]').val();
                     args.league = $div.find('[name=league]').val();
                     args.season = $div.find('[name=season]').val();
diff --git a/includes/class-sp-calendar.php b/includes/class-sp-calendar.php
index cb49e953..a4824e73 100644
--- a/includes/class-sp-calendar.php
+++ b/includes/class-sp-calendar.php
@@ -47,7 +47,7 @@ class SP_Calendar extends SP_Secondary_Post {
 	public $number;
 	
 	/** @var int The event ID. */
-	public $event_id;
+	public $event;
 
 	/**
 	 * __construct function.
@@ -281,8 +281,8 @@ class SP_Calendar extends SP_Secondary_Post {
 				);
 			}
 		
-			if ( $this->event_id) {
-				$args['p'] = $this->event_id;
+			if ( $this->event) {
+				$args['p'] = $this->event;
 			}
 
 			if ( 'auto' === $this->date && 'any' === $this->status ) {
diff --git a/templates/event-blocks.php b/templates/event-blocks.php
index f727e190..318e1624 100644
--- a/templates/event-blocks.php
+++ b/templates/event-blocks.php
@@ -11,7 +11,7 @@ if ( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly
 
 $defaults = array(
 	'id' => null,
-	'event_id' => null,
+	'event' => null,
 	'title' => false,
 	'status' => 'default',
 	'date' => 'default',
@@ -59,8 +59,8 @@ if ( $date_future != 'default' )
 	$calendar->future = $date_future;
 if ( $date_relative != 'default' )
 	$calendar->relative = $date_relative;
-if ( $event_id ) 
-	$calendar->event_id = $event_id;
+if ( $event ) 
+	$calendar->event = $event;
 if ( $league )
 	$calendar->league = $league;
 if ( $season )