From bec7a43b42e9e51f9a9e3f48f853d010228c5e3a Mon Sep 17 00:00:00 2001 From: Savvas Hadjigeorgiou Date: Fri, 12 Nov 2021 08:01:30 +0200 Subject: [PATCH] Escape import variables ( issue with greet() function ) --- .../importers/class-sp-event-importer.php | 4 ++-- .../class-sp-event-performance-importer.php | 20 ++++++++-------- .../importers/class-sp-fixture-importer.php | 24 +++++++++---------- .../importers/class-sp-official-importer.php | 2 +- .../importers/class-sp-player-importer.php | 2 +- .../importers/class-sp-staff-importer.php | 12 +++++----- .../importers/class-sp-team-importer.php | 2 +- 7 files changed, 33 insertions(+), 33 deletions(-) diff --git a/includes/admin/importers/class-sp-event-importer.php b/includes/admin/importers/class-sp-event-importer.php index 75cdd974..55e81206 100644 --- a/includes/admin/importers/class-sp-event-importer.php +++ b/includes/admin/importers/class-sp-event-importer.php @@ -494,8 +494,8 @@ if ( class_exists( 'WP_Importer' ) ) { function greet() { echo '
'; echo '

' . esc_html__( 'Hi there! Choose a .csv file to upload, then click "Upload file and import".', 'sportspress' ) . '

'; - echo '

' . sprintf( esc_html__( 'Events need to be defined with columns in a specific order (3+ columns). Click here to download a sample.', 'sportspress' ), esc_url( plugin_dir_url( SP_PLUGIN_FILE ) ) . 'dummy-data/events-sample.csv' ) . '

'; - echo '

' . sprintf( esc_html__( 'Supports CSV files generated by LeagueLobster.', 'sportspress' ), 'http://tboy.co/leaguelobster' ) . '

'; + echo '

' . sprintf( __( 'Events need to be defined with columns in a specific order (3+ columns). Click here to download a sample.', 'sportspress' ), esc_url( plugin_dir_url( SP_PLUGIN_FILE ) ) . 'dummy-data/events-sample.csv' ) . '

'; + echo '

' . sprintf( __( 'Supports CSV files generated by LeagueLobster.', 'sportspress' ), 'http://tboy.co/leaguelobster' ) . '

'; wp_import_upload_form( 'admin.php?import=sp_event_csv&step=1' ); echo '
'; } diff --git a/includes/admin/importers/class-sp-event-performance-importer.php b/includes/admin/importers/class-sp-event-performance-importer.php index d2f307fa..c0ce5c47 100644 --- a/includes/admin/importers/class-sp-event-performance-importer.php +++ b/includes/admin/importers/class-sp-event-performance-importer.php @@ -135,7 +135,7 @@ if ( class_exists( 'WP_Importer' ) ) { // Show Result echo '

- ' . sprintf( __( 'Import complete - imported %1$s rows and skipped %2$s.', 'sportspress' ), $this->imported, $this->skipped ) . ' + ' . sprintf( esc_html__( 'Import complete - imported %1$s rows and skipped %2$s.', 'sportspress' ), esc_html( $this->imported ), esc_html( $this->skipped ) ) . '

'; $this->import_end( $event ); @@ -145,7 +145,7 @@ if ( class_exists( 'WP_Importer' ) ) { * Performs post-import cleanup of files and the cache */ function import_end( $event = 0 ) { - echo '

' . __( 'All done!', 'sportspress' ) . ' $event, @@ -153,7 +153,7 @@ if ( class_exists( 'WP_Importer' ) ) { ), 'post.php' ) - ) . '">' . __( 'View Event', 'sportspress' ) . '' . '

'; + ) ) . '">' . esc_html__( 'View Event', 'sportspress' ) . '' . '

'; do_action( 'import_end' ); } @@ -177,11 +177,11 @@ if ( class_exists( 'WP_Importer' ) ) { 'step' => '1', ) ); - echo '

' . __( 'Hi there! Choose a .csv file to upload, then click "Upload file and import".', 'sportspress' ) . '

'; - echo '

' . sprintf( __( 'Box scores need to be defined with columns in a specific order. Click here to download a sample.', 'sportspress' ), plugin_dir_url( SP_PLUGIN_FILE ) . 'dummy-data/event-performance-sample.csv' ) . '

'; + echo '

' . esc_html__( 'Hi there! Choose a .csv file to upload, then click "Upload file and import".', 'sportspress' ) . '

'; + echo '

' . sprintf( __( 'Box scores need to be defined with columns in a specific order. Click here to download a sample.', 'sportspress' ), esc_url( plugin_dir_url( SP_PLUGIN_FILE ) ) . 'dummy-data/event-performance-sample.csv' ) . '

'; wp_import_upload_form( add_query_arg( $args, 'admin.php' ) ); } else { - echo '

' . sprintf( __( 'Select %s', 'sportspress' ), __( 'Event', 'sportspress' ) ) . '

'; + echo '

' . sprintf( esc_html__( 'Select %s', 'sportspress' ), esc_html__( 'Event', 'sportspress' ) ) . '

'; } echo ''; @@ -203,10 +203,10 @@ if ( class_exists( 'WP_Importer' ) ) { - + - +


- - + + @@ -214,7 +214,7 @@ if ( class_exists( 'WP_Importer' ) ) {


- ' . sprintf( __( 'Import complete - imported %1$s events and skipped %2$s.', 'sportspress' ), $this->imported, $this->skipped ) . ' + ' . sprintf( esc_html__( 'Import complete - imported %1$s events and skipped %2$s.', 'sportspress' ), esc_html( $this->imported ), esc_html( $this->skipped ) ) . '

'; $this->import_end(); @@ -270,7 +270,7 @@ if ( class_exists( 'WP_Importer' ) ) { * Performs post-import cleanup of files and the cache */ function import_end() { - echo '

' . __( 'All done!', 'sportspress' ) . ' ' . __( 'View Fixtures', 'sportspress' ) . '' . '

'; + echo '

' . esc_html__( 'All done!', 'sportspress' ) . ' ' . esc_html__( 'View Fixtures', 'sportspress' ) . '' . '

'; do_action( 'import_end' ); } @@ -283,8 +283,8 @@ if ( class_exists( 'WP_Importer' ) ) { */ function greet() { echo '
'; - echo '

' . __( 'Hi there! Choose a .csv file to upload, then click "Upload file and import".', 'sportspress' ) . '

'; - echo '

' . sprintf( __( 'Fixtures need to be defined with columns in a specific order (4+ columns). Click here to download a sample.', 'sportspress' ), plugin_dir_url( SP_PLUGIN_FILE ) . 'dummy-data/fixtures-sample.csv' ) . '

'; + echo '

' . esc_html__( 'Hi there! Choose a .csv file to upload, then click "Upload file and import".', 'sportspress' ) . '

'; + echo '

' . sprintf( __( 'Fixtures need to be defined with columns in a specific order (4+ columns). Click here to download a sample.', 'sportspress' ), esc_url( plugin_dir_url( SP_PLUGIN_FILE ) ) . 'dummy-data/fixtures-sample.csv' ) . '

'; echo '

' . sprintf( __( 'Supports CSV files generated by LeagueLobster.', 'sportspress' ), 'http://tboy.co/leaguelobster' ) . '

'; wp_import_upload_form( 'admin.php?import=sp_fixture_csv&step=1' ); echo '
'; @@ -301,18 +301,18 @@ if ( class_exists( 'WP_Importer' ) ) { - + - + - + diff --git a/includes/admin/importers/class-sp-team-importer.php b/includes/admin/importers/class-sp-team-importer.php index 1afcbeb6..ae35e16d 100644 --- a/includes/admin/importers/class-sp-team-importer.php +++ b/includes/admin/importers/class-sp-team-importer.php @@ -144,7 +144,7 @@ if ( class_exists( 'WP_Importer' ) ) { function greet() { echo '
'; echo '

' . esc_html__( 'Hi there! Choose a .csv file to upload, then click "Upload file and import".', 'sportspress' ) . '

'; - echo '

' . sprintf( esc_html__( 'Teams need to be defined with columns in a specific order (3 columns). Click here to download a sample.', 'sportspress' ), esc_url( plugin_dir_url( SP_PLUGIN_FILE ) ) . 'dummy-data/teams-sample.csv' ) . '

'; + echo '

' . sprintf( __( 'Teams need to be defined with columns in a specific order (3 columns). Click here to download a sample.', 'sportspress' ), esc_url( plugin_dir_url( SP_PLUGIN_FILE ) ) . 'dummy-data/teams-sample.csv' ) . '

'; wp_import_upload_form( 'admin.php?import=sp_team_csv&step=1' ); echo '
'; }


    -
    • -
    • +
    • +



__( '— Not set —', 'sportspress' ), ); if ( ! sp_dropdown_taxonomies( $args ) ) : - echo '

' . __( 'None', 'sportspress' ) . '

'; + echo '

' . esc_html__( 'None', 'sportspress' ) . '

'; sp_taxonomy_adder( 'sp_league', 'sp_team', __( 'Add New', 'sportspress' ) ); endif; ?>


__( '— Not set —', 'sportspress' ), ); if ( ! sp_dropdown_taxonomies( $args ) ) : - echo '

' . __( 'None', 'sportspress' ) . '

'; + echo '

' . esc_html__( 'None', 'sportspress' ) . '

'; sp_taxonomy_adder( 'sp_season', 'sp_team', __( 'Add New', 'sportspress' ) ); endif; ?> @@ -347,7 +347,7 @@ if ( class_exists( 'WP_Importer' ) ) {
- +
diff --git a/includes/admin/importers/class-sp-official-importer.php b/includes/admin/importers/class-sp-official-importer.php index c8002b93..5e3ec2d1 100644 --- a/includes/admin/importers/class-sp-official-importer.php +++ b/includes/admin/importers/class-sp-official-importer.php @@ -117,7 +117,7 @@ if ( class_exists( 'WP_Importer' ) ) { function greet() { echo '
'; echo '

' . esc_html__( 'Hi there! Choose a .csv file to upload, then click "Upload file and import".', 'sportspress' ) . '

'; - echo '

' . sprintf( esc_html__( 'Officials need to be defined with columns in a specific order. Click here to download a sample.', 'sportspress' ), esc_url( plugin_dir_url( SP_PLUGIN_FILE ) ) . 'dummy-data/officials-sample.csv' ) . '

'; + echo '

' . sprintf( __( 'Officials need to be defined with columns in a specific order. Click here to download a sample.', 'sportspress' ), esc_url( plugin_dir_url( SP_PLUGIN_FILE ) ) . 'dummy-data/officials-sample.csv' ) . '

'; wp_import_upload_form( 'admin.php?import=sp_official_csv&step=1' ); echo '
'; } diff --git a/includes/admin/importers/class-sp-player-importer.php b/includes/admin/importers/class-sp-player-importer.php index 4e38691e..32a071b7 100644 --- a/includes/admin/importers/class-sp-player-importer.php +++ b/includes/admin/importers/class-sp-player-importer.php @@ -250,7 +250,7 @@ if ( class_exists( 'WP_Importer' ) ) { function greet() { echo '
'; echo '

' . esc_html__( 'Hi there! Choose a .csv file to upload, then click "Upload file and import".', 'sportspress' ) . '

'; - echo '

' . sprintf( esc_html__( 'Players need to be defined with columns in a specific order (8 columns). Click here to download a sample.', 'sportspress' ), esc_url( plugin_dir_url( SP_PLUGIN_FILE ) ) . 'dummy-data/players-sample.csv' ) . '

'; + echo '

' . sprintf( __( 'Players need to be defined with columns in a specific order (8 columns). Click here to download a sample.', 'sportspress' ), esc_url( plugin_dir_url( SP_PLUGIN_FILE ) ) . 'dummy-data/players-sample.csv' ) . '

'; wp_import_upload_form( 'admin.php?import=sp_player_csv&step=1' ); echo '
'; } diff --git a/includes/admin/importers/class-sp-staff-importer.php b/includes/admin/importers/class-sp-staff-importer.php index 81200f15..109dfe08 100644 --- a/includes/admin/importers/class-sp-staff-importer.php +++ b/includes/admin/importers/class-sp-staff-importer.php @@ -164,7 +164,7 @@ if ( class_exists( 'WP_Importer' ) ) { // Show Result echo '

- ' . sprintf( __( 'Import complete - imported %1$s staff and skipped %2$s.', 'sportspress' ), $this->imported, $this->skipped ) . ' + ' . sprintf( esc_html__( 'Import complete - imported %1$s staff and skipped %2$s.', 'sportspress' ), esc_html( $this->imported ), esc_html( $this->skipped ) ) . '

'; $this->import_end(); @@ -174,7 +174,7 @@ if ( class_exists( 'WP_Importer' ) ) { * Performs post-import cleanup of files and the cache */ function import_end() { - echo '

' . __( 'All done!', 'sportspress' ) . ' ' . __( 'View Staff', 'sportspress' ) . '' . '

'; + echo '

' . esc_html__( 'All done!', 'sportspress' ) . ' ' . esc_html__( 'View Staff', 'sportspress' ) . '' . '

'; do_action( 'import_end' ); } @@ -186,7 +186,7 @@ if ( class_exists( 'WP_Importer' ) ) { * @return void */ function header() { - echo '

' . __( 'Import Staff', 'sportspress' ) . '

'; + echo '

' . esc_html__( 'Import Staff', 'sportspress' ) . '

'; } /** @@ -197,8 +197,8 @@ if ( class_exists( 'WP_Importer' ) ) { */ function greet() { echo '
'; - echo '

' . __( 'Hi there! Choose a .csv file to upload, then click "Upload file and import".', 'sportspress' ) . '

'; - echo '

' . sprintf( __( 'Staff need to be defined with columns in a specific order (6 columns). Click here to download a sample.', 'sportspress' ), plugin_dir_url( SP_PLUGIN_FILE ) . 'dummy-data/staff-sample.csv' ) . '

'; + echo '

' . esc_html__( 'Hi there! Choose a .csv file to upload, then click "Upload file and import".', 'sportspress' ) . '

'; + echo '

' . sprintf( __( 'Staff need to be defined with columns in a specific order (6 columns). Click here to download a sample.', 'sportspress' ), esc_url( plugin_dir_url( SP_PLUGIN_FILE ) ) . 'dummy-data/staff-sample.csv' ) . '

'; wp_import_upload_form( 'admin.php?import=sp_staff_csv&step=1' ); echo '
'; } @@ -218,7 +218,7 @@ if ( class_exists( 'WP_Importer' ) ) {