@@ -169,57 +164,10 @@ if ( class_exists( 'WP_Importer' ) ) {
* @return void
*/
function greet() {
-
echo '
';
echo '
' . __( 'Hi there! Choose a .csv file to upload, then click "Upload file and import".', 'sportspress' ).'
';
-
echo '
' . sprintf( __( 'Players need to be defined with columns in a specific order (7 columns). Click here to download a sample.', 'sportspress' ), plugin_dir_url( SP_PLUGIN_FILE ) . 'dummy-data/players-sample.csv' ) . '
';
-
- $action = 'admin.php?import=sportspress_player_csv&step=1';
-
- $bytes = apply_filters( 'import_upload_size_limit', wp_max_upload_size() );
- $size = size_format( $bytes );
- $upload_dir = wp_upload_dir();
- if ( ! empty( $upload_dir['error'] ) ) :
- ?>
-
- ';
}
}
diff --git a/includes/admin/importers/class-sp-staff-importer.php b/includes/admin/importers/class-sp-staff-importer.php
index e90f8d18..433511b3 100644
--- a/includes/admin/importers/class-sp-staff-importer.php
+++ b/includes/admin/importers/class-sp-staff-importer.php
@@ -5,7 +5,7 @@
* @author ThemeBoy
* @category Admin
* @package SportsPress/Admin/Importers
- * @version 0.9
+ * @version 1.3
*/
if ( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly
@@ -21,112 +21,110 @@ if ( class_exists( 'WP_Importer' ) ) {
*/
public function __construct() {
$this->import_page = 'sportspress_staff_csv';
+ $this->import_label = __( 'Import Staff', 'sportspress' );
+ $this->columns = array(
+ 'post_title' => __( 'Name', 'sportspress' ),
+ 'sp_role' => __( 'Roles', 'sportspress' ),
+ 'sp_team' => __( 'Teams', 'sportspress' ),
+ 'sp_league' => __( 'Leagues', 'sportspress' ),
+ 'sp_season' => __( 'Seasons', 'sportspress' ),
+ 'sp_nationality' => __( 'Nationality', 'sportspress' ),
+ );
+ parent::__construct();
}
/**
* import function.
*
* @access public
- * @param mixed $file
+ * @param array $array
+ * @param array $columns
* @return void
*/
- function import( $file ) {
- global $wpdb;
-
+ function import( $array = array(), $columns = array( 'post_title' ) ) {
$this->imported = $this->skipped = 0;
- if ( ! is_file($file) ):
+ if ( ! is_array( $array ) || ! sizeof( $array ) ):
$this->footer();
die();
endif;
- ini_set( 'auto_detect_line_endings', '1' );
+ $rows = array_chunk( $array, sizeof( $columns ) );
- if ( ( $handle = fopen( $file, "r" ) ) !== FALSE ):
+ foreach ( $rows as $row ):
- $header = fgetcsv( $handle, 0, $this->delimiter );
+ if ( empty( array_filter( $row ) ) ) continue;
- if ( sizeof( $header ) == 5 ):
+ $meta = array();
- $loop = 0;
+ foreach ( $columns as $index => $key ):
+ $meta[ $key ] = sp_array_value( $row, $index );
+ endforeach;
- while ( ( $row = fgetcsv( $handle, 0, $this->delimiter ) ) !== FALSE ):
-
- list( $name, $teams, $leagues, $seasons, $nationality ) = $row;
-
- $nationality = trim( strtoupper( $nationality ) );
-
- if ( $nationality == '*' )
- $nationality = '';
-
- if ( ! $name ):
- $this->skipped++;
- continue;
- endif;
-
- $args = array( 'post_type' => 'sp_staff', 'post_status' => 'publish', 'post_title' => $name );
-
- $id = wp_insert_post( $args );
-
- // Flag as import
- update_post_meta( $id, '_sp_import', 1 );
-
- // Update leagues
- $leagues = explode( '|', $leagues );
- wp_set_object_terms( $id, $leagues, 'sp_league', false );
-
- // Update seasons
- $seasons = explode( '|', $seasons );
- wp_set_object_terms( $id, $seasons, 'sp_season', false );
-
- // Update teams
- $teams = (array)explode( '|', $teams );
- $i = 0;
- foreach ( $teams as $team ):
- // Get or insert team
- $team_object = get_page_by_title( $team, OBJECT, 'sp_team' );
- if ( $team_object ):
- if ( $team_object->post_status != 'publish' ):
- wp_update_post( array( 'ID' => $team_object->ID, 'post_status' => 'publish' ) );
- endif;
- $team_id = $team_object->ID;
- else:
- $team_id = wp_insert_post( array( 'post_type' => 'sp_team', 'post_status' => 'publish', 'post_title' => $team ) );
- // Flag as import
- update_post_meta( $team_id, '_sp_import', 1 );
- wp_set_object_terms( $team_id, $leagues, 'sp_league', false );
- wp_set_object_terms( $team_id, $seasons, 'sp_season', false );
- endif;
-
- // Add team to staff
- add_post_meta( $id, 'sp_team', $team_id );
-
- // Update current team if first in array
- if ( $i == 0 ):
- update_post_meta( $id, 'sp_current_team', $team_id );
- endif;
-
- $i++;
- endforeach;
-
- // Update nationality
- update_post_meta( $id, 'sp_nationality', $nationality );
-
- $loop ++;
- $this->imported++;
- endwhile;
-
- else:
-
- echo '
' . __( 'Sorry, there has been an error.', 'sportspress' ) . '
';
- _e( 'The CSV is invalid.', 'sportspress' ) . '
';
- $this->footer();
- die();
+ $name = sp_array_value( $meta, 'post_title' );
+ if ( ! $name ):
+ $this->skipped++;
+ continue;
endif;
- fclose( $handle );
- endif;
+ $args = array( 'post_type' => 'sp_staff', 'post_status' => 'publish', 'post_title' => $name );
+
+ $id = wp_insert_post( $args );
+
+ // Flag as import
+ update_post_meta( $id, '_sp_import', 1 );
+
+ // Update roles
+ $roles = explode( '|', sp_array_value( $meta, 'sp_role' ) );
+ wp_set_object_terms( $id, $roles, 'sp_role', false );
+
+ // Update leagues
+ $leagues = explode( '|', sp_array_value( $meta, 'sp_league' ) );
+ wp_set_object_terms( $id, $leagues, 'sp_league', false );
+
+ // Update seasons
+ $seasons = explode( '|', sp_array_value( $meta, 'sp_season' ) );
+ wp_set_object_terms( $id, $seasons, 'sp_season', false );
+
+ // Update teams
+ $teams = (array)explode( '|', sp_array_value( $meta, 'sp_team' ) );
+ $i = 0;
+ foreach ( $teams as $team ):
+ // Get or insert team
+ $team_object = get_page_by_title( $team, OBJECT, 'sp_team' );
+ if ( $team_object ):
+ if ( $team_object->post_status != 'publish' ):
+ wp_update_post( array( 'ID' => $team_object->ID, 'post_status' => 'publish' ) );
+ endif;
+ $team_id = $team_object->ID;
+ else:
+ $team_id = wp_insert_post( array( 'post_type' => 'sp_team', 'post_status' => 'publish', 'post_title' => $team ) );
+ // Flag as import
+ update_post_meta( $team_id, '_sp_import', 1 );
+ wp_set_object_terms( $team_id, $leagues, 'sp_league', false );
+ wp_set_object_terms( $team_id, $seasons, 'sp_season', false );
+ endif;
+
+ // Add team to staff
+ add_post_meta( $id, 'sp_team', $team_id );
+
+ // Update current team if first in array
+ if ( $i == 0 ):
+ update_post_meta( $id, 'sp_current_team', $team_id );
+ endif;
+
+ $i++;
+ endforeach;
+
+ // Update nationality
+ $nationality = trim( strtoupper( sp_array_value( $meta, 'sp_nationality' ) ) );
+ if ( $nationality == '*' ) $nationality = '';
+ update_post_meta( $id, 'sp_nationality', $nationality );
+
+ $this->imported++;
+
+ endforeach;
// Show Result
echo '
@@ -162,57 +160,10 @@ if ( class_exists( 'WP_Importer' ) ) {
* @return void
*/
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 (5 columns). Click here to download a sample.', 'sportspress' ), plugin_dir_url( SP_PLUGIN_FILE ) . 'dummy-data/staff-sample.csv' ) . '
';
-
- $action = 'admin.php?import=sportspress_staff_csv&step=1';
-
- $bytes = apply_filters( 'import_upload_size_limit', wp_max_upload_size() );
- $size = size_format( $bytes );
- $upload_dir = wp_upload_dir();
- if ( ! empty( $upload_dir['error'] ) ) :
- ?>
-
- ' . 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' ) . '';
+ wp_import_upload_form( 'admin.php?import=sportspress_staff_csv&step=1' );
echo '
';
}
}
diff --git a/includes/admin/importers/class-sp-team-importer.php b/includes/admin/importers/class-sp-team-importer.php
index e5511f74..08d3a4fa 100644
--- a/includes/admin/importers/class-sp-team-importer.php
+++ b/includes/admin/importers/class-sp-team-importer.php
@@ -5,7 +5,7 @@
* @author ThemeBoy
* @category Admin
* @package SportsPress/Admin/Importers
- * @version 0.9
+ * @version 1.3
*/
if ( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly
@@ -21,76 +21,71 @@ if ( class_exists( 'WP_Importer' ) ) {
*/
public function __construct() {
$this->import_page = 'sportspress_team_csv';
+ $this->import_label = __( 'Import Teams', 'sportspress' );
+ $this->columns = array(
+ 'post_title' => __( 'Name', 'sportspress' ),
+ 'sp_league' => __( 'Leagues', 'sportspress' ),
+ 'sp_season' => __( 'Seasons', 'sportspress' ),
+ 'sp_url' => __( 'Site URL', 'sportspress' ),
+ 'sp_abbreviation' => __( 'Abbreviation', 'sportspress' ),
+ 'sp_venue' => __( 'Home', 'sportspress' ),
+ );
+ parent::__construct();
}
/**
* import function.
*
* @access public
- * @param mixed $file
+ * @param array $array
+ * @param array $columns
* @return void
*/
- function import( $file ) {
- global $wpdb;
-
+ function import( $array = array(), $columns = array( 'post_title' ) ) {
$this->imported = $this->skipped = 0;
- if ( ! is_file($file) ):
+ if ( ! is_array( $array ) || ! sizeof( $array ) ):
$this->footer();
die();
endif;
- ini_set( 'auto_detect_line_endings', '1' );
+ $rows = array_chunk( $array, sizeof( $columns ) );
- if ( ( $handle = fopen( $file, "r" ) ) !== FALSE ):
+ foreach ( $rows as $row ):
- $header = fgetcsv( $handle, 0, $this->delimiter );
+ if ( empty( array_filter( $row ) ) ) continue;
- if ( sizeof( $header ) == 3 ):
+ $meta = array();
- $loop = 0;
+ foreach ( $columns as $index => $key ):
+ $meta[ $key ] = sp_array_value( $row, $index );
+ endforeach;
- while ( ( $row = fgetcsv( $handle, 0, $this->delimiter ) ) !== FALSE ):
-
- list( $name, $leagues, $seasons ) = $row;
-
- $team_object = get_page_by_title( $name, OBJECT, 'sp_team' );
-
- if ( ! $name || $team_object ):
- $this->skipped++;
- continue;
- endif;
-
- $args = array( 'post_type' => 'sp_team', 'post_status' => 'publish', 'post_title' => $name );
-
- $id = wp_insert_post( $args );
-
- // Flag as import
- update_post_meta( $id, '_sp_import', 1 );
-
- // Update leagues
- $leagues = explode( '|', $leagues );
- wp_set_object_terms( $id, $leagues, 'sp_league', false );
-
- // Update seasons
- $seasons = explode( '|', $seasons );
- wp_set_object_terms( $id, $seasons, 'sp_season', false );
-
- $loop ++;
- $this->imported++;
- endwhile;
-
- else:
-
- echo '
' . __( 'Sorry, there has been an error.', 'sportspress' ) . '
';
- _e( 'The CSV is invalid.', 'sportspress' ) . '
';
- $this->footer();
- die();
+ $name = sp_array_value( $meta, 'post_title' );
+ if ( ! $name ):
+ $this->skipped++;
+ continue;
endif;
- fclose( $handle );
- endif;
+ $args = array( 'post_type' => 'sp_team', 'post_status' => 'publish', 'post_title' => $name );
+
+ $id = wp_insert_post( $args );
+
+ // Flag as import
+ update_post_meta( $id, '_sp_import', 1 );
+
+ // Update leagues
+ $leagues = explode( '|', sp_array_value( $meta, 'sp_league' ) );
+ wp_set_object_terms( $id, $leagues, 'sp_league', false );
+
+ // Update seasons
+ $seasons = explode( '|', sp_array_value( $meta, 'sp_season' ) );
+ wp_set_object_terms( $id, $seasons, 'sp_season', false );
+
+ $this->imported++;
+
+ endforeach;
// Show Result
echo '
@@ -109,16 +104,6 @@ if ( class_exists( 'WP_Importer' ) ) {
do_action( 'import_end' );
}
- /**
- * header function.
- *
- * @access public
- * @return void
- */
- function header() {
- echo '
' . __( 'Import Teams', 'sportspress' ) . '
';
- }
-
/**
* greet function.
*
@@ -126,57 +111,10 @@ if ( class_exists( 'WP_Importer' ) ) {
* @return void
*/
function greet() {
-
echo '
';
echo '
' . __( 'Hi there! Choose a .csv file to upload, then click "Upload file and import".', 'sportspress' ).'
';
-
echo '
' . sprintf( __( 'Teams need to be defined with columns in a specific order (3 columns). Click here to download a sample.', 'sportspress' ), plugin_dir_url( SP_PLUGIN_FILE ) . 'dummy-data/teams-sample.csv' ) . '
';
-
- $action = 'admin.php?import=sportspress_team_csv&step=1';
-
- $bytes = apply_filters( 'import_upload_size_limit', wp_max_upload_size() );
- $size = size_format( $bytes );
- $upload_dir = wp_upload_dir();
- if ( ! empty( $upload_dir['error'] ) ) :
- ?>
-
- ';
}
}
diff --git a/includes/admin/sp-admin-functions.php b/includes/admin/sp-admin-functions.php
index b816f713..d6cc3b20 100755
--- a/includes/admin/sp-admin-functions.php
+++ b/includes/admin/sp-admin-functions.php
@@ -17,6 +17,7 @@ if ( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly
*/
function sp_get_screen_ids() {
return apply_filters( 'sportspress_screen_ids', array(
+ 'admin',
'widgets',
'dashboard',
'dashboard_page_sp-about',
diff --git a/includes/class-sp-wpml.php b/includes/class-sp-wpml.php
index f4279f32..2915651a 100644
--- a/includes/class-sp-wpml.php
+++ b/includes/class-sp-wpml.php
@@ -50,7 +50,7 @@ class SP_WPML {
// Get translated post ID
$translated_id = icl_object_id( $id, 'any', false, ICL_LANGUAGE_CODE );
- if ( $translated_id && $translated_id != $id ):
+ if ( $translated_id && $translated_id != $id && get_the_ID() != $translated_id ):
return get_permalink( $translated_id, $leavename );
endif;
endif;
@@ -59,7 +59,7 @@ class SP_WPML {
}
public static function can_localize( $post, $id = null ) {
- return function_exists( 'icl_object_id' ) && is_sp_post_type( get_post_type( $post ) ) && $id != get_the_ID();
+ return function_exists( 'icl_object_id' ) && is_sp_post_type( get_post_type( $post ) );
}
}