lbd.git

@@ -1,16 +1,15 @@

 <?php

-

-/* tracked */

-

 /**

  * Event Blocks

  *

  * @author      ThemeBoy

  * @package     SportsPress/Templates

- * @version     2.2

+ * @version     2.7.14

  */

-if ( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly

+if ( ! defined( 'ABSPATH' ) ) {

+	exit; // Exit if accessed directly

+}

 $defaults = array(

 	'id'          => null,

@@ -34,24 +33,31 @@ $defaults = array(

 extract( $defaults, EXTR_SKIP );

 $calendar = new SP_Calendar( $id );

-if ( $date != 'default' )

+if ( $date != 'default' ) {

 	$calendar->date = $date;

-if ( $date_from != 'default' )

+}

+if ( $date_from != 'default' ) {

 	$calendar->from = $date_from;

-if ( $date_to != 'default' )

+}

+if ( $date_to != 'default' ) {

 	$calendar->to = $date_to;

-if ( $league )

+}

+if ( $league ) {

 	$calendar->league = $league;

-if ( $season )

+}

+if ( $season ) {

 	$calendar->season = $season;

-if ( $team )

+}

+if ( $team ) {

 	$calendar->team = $team;

-if ( $player )

+}

+if ( $player ) {

 	$calendar->player = $player;

+}

 $args = array(

 	'id'                   => $id,

-	'title' => __( 'Fixtures', 'sportspress' ),

+	'title'                => esc_attr__( 'Fixtures', 'sportspress' ),

 	'status'               => 'future',

 	'date'                 => $date,

 	'date_from'            => $date_from,

@@ -65,8 +71,7 @@ $args = array(

 	'link_events'          => $link_events,

 	'paginated'            => $paginated,

 	'rows'                 => $rows,

-// ICICICICICICICICICICICICICICICICICICICICICICICICICICICICICICICICI

-	'order' => 'ASC',

+	'order'                => 'ASC', // MODIF

 	'show_all_events_link' => false,

 	'show_title'           => true,

 	'show_league'          => $show_league,

@@ -81,7 +86,7 @@ ob_start();

 sp_get_template( 'event-blocks.php', $args );

 $fixtures = ob_get_clean();

-$args['title'] = __( 'Results', 'sportspress' );

+$args['title']  = esc_attr__( 'Results', 'sportspress' );

 $args['status'] = 'publish';

 $args['order']  = 'DESC';

@@ -91,17 +96,17 @@ $results = ob_get_clean();

 if ( false == $fixtures || false == $results ) {

-	echo $fixtures;

-	echo $results;

+	echo $fixtures; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped

+	echo $results; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped

 } else {

 	echo '<div class="sp-widget-align-left">';

-	echo $fixtures;

+	echo $fixtures; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped

 	echo '</div>';

 	echo '<div class="sp-widget-align-right">';

-	echo $results;

+	echo $results; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped

 	echo '</div>';

 }

@@ -1,16 +1,15 @@

 <?php

-

-/* tracked */

-

 /**

  * Player List

  *

  * @author      ThemeBoy

  * @package     SportsPress/Templates

- * @version   2.6.15

+ * @version   2.7.9

  */

-if ( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly

+if ( ! defined( 'ABSPATH' ) ) {

+	exit; // Exit if accessed directly

+}

 $defaults = array(

 	'id'                    => get_the_ID(),

@@ -41,24 +40,29 @@ $defaults = array(

 extract( $defaults, EXTR_SKIP );

 // Backward compatibility

-if ( isset( $performance ) )

+if ( isset( $performance ) ) {

 	$columns = $performance;

+}

 // Determine number of players to display

 if ( -1 === $number ) :

 	$number = (int) get_post_meta( $id, 'sp_number', true );

-	if ( $number <= 0 ) $number = -1;

+	if ( $number <= 0 ) {

+		$number = -1;

+	}

 endif;

 // Explode into array

-if ( null !== $columns && ! is_array( $columns ) )

+if ( null !== $columns && ! is_array( $columns ) ) {

 	$columns = explode( ',', $columns );

+}

 $list = new SP_Player_List( $id );

 if ( isset( $columns ) && null !== $columns ) :

 	$list->columns = $columns;

 endif;

-$data = $list->data( false, $leagues, $seasons, $team );

+

+$data = apply_filters( 'sportspress_player_list_data', $list->data( false, $leagues, $seasons, $team ), $id );

 // The first row should be labels

 $labels = $data[0];

@@ -92,30 +96,35 @@ endif;

 $output = '';

 if ( $grouping === 'position' ) :

-	$groups = get_terms( 'sp_position', array(

+	$groups = get_terms(

+		'sp_position',

+		array(

 			'orderby'    => 'meta_value_num',

 			'meta_query' => array(

 				'relation' => 'OR',

 				array(

 					'key'     => 'sp_order',

-				'compare' => 'NOT EXISTS'

+					'compare' => 'NOT EXISTS',

 				),

 				array(

 					'key'     => 'sp_order',

-				'compare' => 'EXISTS'

+					'compare' => 'EXISTS',

 				),

 			),

-	) );

+		)

+	);

 else :

 	if ( $show_title && false === $title && $id ) :

 		$caption = $list->caption;

-		if ( $caption )

+		if ( $caption ) {

 			$title = $caption;

-		else

+		} else {

 			$title = get_the_title( $id );

+		}

 	endif;

-	if ( $title )

+	if ( $title ) {

 		$output .= '<' . $grouptag . ' class="sp-table-caption">' . $title . '</' . $grouptag . '>';

+	}

 	$group          = new stdClass();

 	$group->term_id = null;

 	$group->name    = null;

@@ -126,8 +135,9 @@ endif;

 foreach ( $groups as $group ) :

 	$i = 0;

-	if ( intval( $number ) > 0 )

+	if ( intval( $number ) > 0 ) {

 		$limit = $number;

+	}

 	$thead = '<thead>' . '<tr>';

@@ -135,47 +145,40 @@ foreach ( $groups as $group ):

 		if ( in_array( $orderby, array( 'number', 'name' ) ) ) :

 			$thead .= '<th class="data-number">#</th>';

 		else :

-// ICICICICICICICICICICICICICICICICI**********************************************************************

-

-// Afficher le libellé "#" même s'il n'est pas sélectionné

-

-//			$thead .= '<th class="data-rank">' . __( 'Rank', 'sportspress' ) . '</th>';

-

-			$thead .= '<th class="data-number">#</th>';

+//			$thead .= '<th class="data-rank">' . esc_attr__( 'Rank', 'sportspress' ) . '</th>';

+        $thead .= '<th class="data-number">#</th>'; // MODIF

 		endif;

 	endif;

 	foreach ( $labels as $key => $label ) :

-		if ( $key !== 'number' && ( ! is_array( $columns ) || $key == 'name' || in_array( $key, $columns ) ) )

+		if ( $key !== 'number' && ( ! is_array( $columns ) || $key == 'name' || in_array( $key, $columns ) ) ) {

 			$thead .= '<th class="data-' . $key . '">' . $label . '</th>';

+		}

 	endforeach;

 	$thead .= '</tr>' . '</thead>';

 	$tbody = '';

-	foreach( $data as $player_id => $row ): if ( empty( $group->term_id ) || has_term( $group->term_id, 'sp_position', $player_id ) ):

+	foreach ( $data as $player_id => $row ) :

+		if ( empty( $group->term_id ) || has_term( $group->term_id, 'sp_position', $player_id ) ) :

-		if ( isset( $limit ) && $i >= $limit ) continue;

+			if ( isset( $limit ) && $i >= $limit ) {

+				continue;

+			}

 			$name = sp_array_value( $row, 'name', null );

-		if ( ! $name ) continue;

+			if ( ! $name ) {

+				continue;

+			}

 			$tbody .= '<tr class="' . ( $i % 2 == 0 ? 'odd' : 'even' ) . '">';

 			// Rank or number

 			if ( ! is_array( $labels ) || array_key_exists( 'number', $labels ) ) :

 				if ( isset( $orderby ) && $orderby != 'number' ) :

-// ICICICICICICICICICICICICICICICICI*******************************************************************

-

-// Afficher le numéro du joueur au lieu du rang

-

-//				$tbody .= '<td class="data-rank" data-label="'.$labels['number'].'">' . ( $i + 1 ) . '</td>';

-

-				$tbody .= '<td class="data-number" data-label="'.$labels['number'].'">' . sp_array_value( $row, 'number', '&nbsp;' ) . '</td>';

-

+					$tbody .= '<td class="data-number" data-label="' . $labels['number'] . '">' . sp_array_value( $row, 'number', '&nbsp;' ) . '</td>'; // MODIF copier le else dans le if.

 				else :

-

 					$tbody .= '<td class="data-number" data-label="' . $labels['number'] . '">' . sp_array_value( $row, 'number', '&nbsp;' ) . '</td>';

 				endif;

 				endif;

@@ -195,7 +198,7 @@ foreach ( $groups as $group ):

 				$nationalities = $player->nationalities();

 				if ( ! empty( $nationalities ) ) :

 					foreach ( $nationalities as $nationality ) :

-					$name = '<span class="player-flag"><img src="' . plugin_dir_url( SP_PLUGIN_FILE ) . 'assets/images/flags/' . strtolower( $nationality ) . '.png" alt="' . $nationality . '"></span>' . $name;

+						$name = '<span class="player-flag">' . sp_flags( $nationality ) . '</span>' . $name;

 					endforeach;

 					$name_class .= ' has-photo';

 				endif;

@@ -233,11 +236,12 @@ foreach ( $groups as $group ):

 				endif;

 			foreach ( $labels as $key => $value ) :

-			if ( in_array( $key, array( 'number', 'name', 'team', 'position' ) ) )

+				if ( in_array( $key, array( 'number', 'name', 'team', 'position' ) ) ) {

 					continue;

+				}

 				if ( ! is_array( $columns ) || in_array( $key, $columns ) ) {

 					$label = $labels[ $key ];

-				if ( preg_match ( "/title=\"(.*?)\"/", $value, $new_label ) ) {

+					if ( preg_match( '/title="(.*?)"/', $value, $new_label ) ) {

 						$label = $new_label[1];

 					}

 					$tbody .= '<td class="data-' . $key . '" data-label="' . $label . '">' . sp_array_value( $row, $key, '&mdash;' ) . '</td>';

@@ -248,9 +252,12 @@ foreach ( $groups as $group ):

 			$i++;

-	endif; endforeach;

+	endif;

+endforeach;

-	if ( $i === 0 ) continue;

+	if ( $i === 0 ) {

+		continue;

+	}

 	$output .= '<div class="sp-template sp-template-player-list">';

@@ -269,10 +276,11 @@ foreach ( $groups as $group ):

 	$output .= '</tbody>' . '</table>' . '</div>';

 	if ( $show_all_players_link ) :

-		$output .= '<div class="sp-player-list-link sp-view-all-link"><a href="' . get_permalink( $id ) . '">' . __( 'View all players', 'sportspress' ) . '</a></div>';

+		$output .= '<div class="sp-player-list-link sp-view-all-link"><a href="' . get_permalink( $id ) . '">' . esc_attr__( 'View all players', 'sportspress' ) . '</a></div>';

 	endif;

 	$output .= '</div>';

 endforeach;

 ?>

-<?php echo $output; ?>

+<?php

+echo wp_kses_post( $output );