Changeset 3319253

Timestamp:

06/28/2025 08:59:56 PM (8 months ago)

Author:

MarkODonnell

Message:

Releasing version 4.8.1

Location:

team-rosters/trunk

Files:

• includes/mstw-tr-admin.php (modified) (18 diffs)
• includes/mstw-tr-csv-import-class.php (modified) (27 diffs)
• includes/mstw-tr-player-cpt-admin.php (modified) (5 diffs)
• includes/mstw-tr-roster-table.php (modified) (3 diffs)
• includes/mstw-tr-roster-tables-class.php (modified) (12 diffs)
• includes/mstw-tr-settings.php (modified) (5 diffs)
• includes/mstw-tr-team-roster-admin-class.php (modified) (12 diffs)
• includes/mstw-tr-team-tax-admin-class.php (modified) (3 diffs)
• includes/mstw-tr-utility-functions.php (modified) (8 diffs)
• includes/mstw-utility-functions.php (modified) (10 diffs)
• js/tr-manage-rosters.js (modified) (5 diffs)
• js/tr-sort-roster-table.js (modified) (1 diff)
• js/tr-team-roster-2-ajax.js (modified) (1 diff)
• lang/team-rosters.pot (modified) (65 diffs)
• mstw-team-rosters.php (modified) (17 diffs)
• readme.txt (modified) (2 diffs)
• theme-templates/single-player.php (modified) (5 diffs)
• theme-templates/taxonomy-team.php (modified) (2 diffs)

team-rosters/trunk/includes/mstw-tr-admin.php

@@ -158 +158 @@
         
         wp_register_style( 'players-screen-styles', plugins_url( 'css/mstw-tr-admin-styles.css', dirname( __FILE__ ) ), array(), '4.8' );
-        //mstw_log_msg( plugins_url( 'mstw-tr-admin-styles.css', __FILE__ ) );
-        //mstw_tr_load_admin_styles( );
-        
-        //ob_start();
-    
-        
+    
     } //End: mstw_tr_admin_init()
 }
@@ -244 +239 @@
                                         plugins_url( 'css/mstw-tr-admin-styles.css', dirname( __FILE__ ) ), 
                                         array( ), 
-                                        '4.9', 
-                                        array( )
+                                        '4.9'
                                         );
     
@@ -258 +252 @@
                                             plugins_url( 'team-rosters/js/tr-another-media.js' ), 
                                             array( ), 
-                                            '4.9', 
-                                            array( )
+                                            '4.9',
+                                            array( 'in_footer' => true )
                                             );
     
@@ -277 +271 @@
                              array( )
                              );
+                         
+        wp_localize_script( 'tr-manage-rosters', 'mstw_tr_manage_rosters_ajax', array( 'ajaxurl' => admin_url( 'admin-ajax.php' ), 'nonce' => wp_create_nonce( 'ajax-nonce' ) ) );
     }
-    
+         
     //
     // If it's the Manage Teams screen, enqueue the script to load team
@@ -286 +282 @@
                            plugins_url( 'js/tr-manage-teams.js', dirname( __FILE__ ) ), 
                            array( ), 
-                           '4.9', 
-                             array( )
+                           '4.9',
+                             array( 'in_footer' => true )
                              );
 
@@ -297 +293 @@
                            array( ), 
                            '4.9', 
-                             array( )
+                             array( 'in_footer' => true )
                              );
     }
@@ -309 +305 @@
         
         wp_enqueue_script(  'mstw-tr-color-picker', 
-                            plugins_url( 'team-rosters/js/tr-color-settings.js' ), array( 'wp-color-picker' ), '4.8', true ); 
+                            plugins_url( 'team-rosters/js/tr-color-settings.js' ), 
+                            array( 'wp-color-picker' ), 
+                            '4.8', 
+                            array( 'in_footer' => true ) 
+                            ); 
                             
         wp_enqueue_script(  'mstw-tr-confirm-reset', 
-                            plugins_url( 'team-rosters/js/tr-confirm-reset.js' ), array( 'wp-color-picker' ), '4.8', true ); 
+                            plugins_url( 'team-rosters/js/tr-confirm-reset.js' ), 
+                            array( 'wp-color-picker' ), 
+                            '4.8', 
+                            array( 'in_footer' => true ) 
+                            ); 
     }
 
@@ -339 +343 @@
         return $actions;
     } //End: mstw_tr_bulk_actions()
-}
-    
-// ----------------------------------------------------------------
-// Add a filter the All Teams screen based on the Leagues Taxonomy
-//add_action('restrict_manage_posts','mstw_tr_restrict_manage_posts');
-
-function mstw_tr_restrict_manage_posts( ) {
-    global $typenow;
-
-    if ( $typenow=='mstw_tr_player' ){
-        // Trying to find current selection
-        $selected = isset( $_REQUEST[$mstw_tr_team] ) ? $_REQUEST[$mstw_tr_team] : '';
-            
-        $args = array(
-                    'show_option_all' => 'All Teams',
-                    'taxonomy' => 'mstw_tr_team',
-                    'name' => 'mstw_tr_team',
-                    'orderby' => 'name',
-                    'selected' => $_GET['mstw_tr_team'],
-                    'show_count' => true,
-                    'hide_empty' => true,
-                    );
-        wp_dropdown_categories( $args );
-    }
-}
-
-//add_action( 'request', 'mstw_tr_request' );
-function mstw_tr_request( $request ) {
-    //mstw_log_msg( 'mstw_tr_request:' );
-    
-    if ( is_admin( ) && $GLOBALS['PHP_SELF'] == '/wp-admin/edit.php' && isset( $request['post_type'] ) && $request['post_type']=='mstw_tr_player' ) {
-        $request['term'] = get_term( $request['mstw_tr_player'], 'mstw_tr_team', OBJECT )->name;
-    }
-    return $request;
 }
 
@@ -610 +580 @@
     function mstw_tr_set_option_page_capabilities( $capability ) {
         //mstw_log_msg( 'mstw_tr_set_option_page_capabilities:' );
+        
         $capability = 'edit_mstw_tr_settings';
-        return $capability; //'edit_mstw_tr_settings'; //
+        return $capability;
+        
     } //End mstw_tr_set_option_page_capabilities()
  }
@@ -626 +598 @@
  function mstw_tr_ajax_callback ( ) {
     //mstw_log_msg( 'mstw_tr_ajax_callback:' );
+    //mstw_log_msg( $_POST );
     
     global $wpdb;  //this provides access to the WP DB
     
-    if ( array_key_exists( 'real_action', $_POST ) ) {
-        
-        $action = $_POST['real_action'];
-    
+    $action = mstw_safe_get( 'real_action', $_POST, '' );
+    
+    if ( '' != $action ) {
         switch( $action ) {
             case 'change_current_team':
@@ -644 +616 @@
                 
             default:
-                mstw_log_msg( "Error: Invalid action, $action, on page: " . $_POST['page'] );
+                $postPage = mstw_safe_get( 'page', $_POST, 'unknown' );
+                mstw_log_msg( "Error: Invalid action, $action, on page: $postPage" );
                 $response['error'] = __( 'AJAX Error: invalid action.', 'team-rosters' );
                 break;
@@ -673 +646 @@
     //mstw_log_msg( 'mstw_tr_ajax_change_team:' );
     //$_POST should be global
+    //mstw_log_msg( '$_POST' );
+    //mstw_log_msg( $_POST );
     
     $response = array( 'response'      => 'team',
@@ -678 +653 @@
                        'error'         => ''
                      );
-        
-    if ( array_key_exists( 'current_team', $_POST ) ) {
-        
-        $current_team = $_POST['current_team'];
+                 
+    $current_team = mstw_safe_get( 'current_team', $_POST, '' );
+        
+    if ( '' != $current_team ) {
+        
+        $current_team = mstw_safe_get( 'current_team', $_POST, '' );
         
         mstw_tr_set_current_team( $current_team );
@@ -713 +690 @@
     //mstw_log_msg( 'mstw_tr_ajax_add_team:' );
     //$_POST should be global
+    //mstw_log_msg( '$_POST' );
+    //mstw_log_msg( $_POST );
     
     $response = array( 'response'      => 'team',
@@ -719 +698 @@
                      );
         
-    if ( array_key_exists( 'current_team', $_POST ) ) {
-        
-        $current_team = $_POST['current_team'];
-        
+    
+    $current_team = mstw_safe_get( 'current_team', $_POST, '' );
+    
+    if ( '' != $current_team ) {
         mstw_tr_set_current_team( $current_team );
-        
         $response['current_team'] = $current_team;
         
@@ -730 +708 @@
         // we've got a problem
         mstw_log_msg( "AJAX Error: No league provided to handler." ); 
-        
         $response['error'] = __( 'AJAX Error: No league provided to handler.', 'team-rosters' );    
-        
     } //End: if ( array_key_exists( 'current_team', $_POST ) )
     
@@ -776 +752 @@
 //
 function mstw_tr_get_current_post_type( ) {
-    
+    //mstw_log_msg( 'mstw_tr_get_current_post_type:' );
+
     global $post, $typenow, $current_screen;
  
@@ -788 +765 @@
         return $current_screen->post_type;
  
-    elseif( isset( $_REQUEST['post_type'] ) )
-        return sanitize_key( $_REQUEST['post_type'] );
-        
-    else
-        return null;
-        
+    //elseif( isset( $_REQUEST['post_type'] ) )
+    else {
+        if ( isset( $_REQUEST['mstw-tr-nonce'] ) ) {
+            if ( false == wp_verify_nonce(  sanitize_text_field( wp_unslash( $_REQUEST[ 'mstw-tr-nonce' ] ) ), 'edit-players' ) ) {
+                mstw_log_msg( "mstw_tr_get_current_post_type: invalid nonce" );
+                die( esc_html__('fatal error encountered in team rosters', 'team-rosters' ) );
+            } 
+        } else {
+            mstw_log_msg( "mstw_tr_get_current_post_type: nonce not found" );
+            die( esc_html__('fatal error encountered in team Rosters', 'team-rosters' ) );
+        }
+        
+        $postType = mstw_safe_get( 'post_type', $_REQUEST, null );
+        //return sanitize_key( $postType );
+        return $postType;
+    }
+
 } //End: mstw_tr_get_current_post_type( )
 

team-rosters/trunk/includes/mstw-tr-csv-import-class.php

@@ -65 +65 @@
         //
         function form( ) {          
-            //mstw_tr_log_msg( "MSTW_TR_ImporterPlugin.form:" );
+            //mstw_log_msg( "MSTW_TR_ImporterPlugin.form:" );
+            //mstw_log_msg( $_POST );
             
             // check & cleanup the returned $_POST values
             $submit_value = $this->process_option( 'submit', 0, $_POST, false );
             $import_team = $this->process_option( 'csv_import_team', 0, $_POST, false );
-            //mstw_tr_log_msg( "import team: $import_team" );
+            //mstw_log_msg( "import team: $import_team" );
             
             //$csv_teams_import = $this->process_option( 'csv_teams_import', 0, $_POST, false );
             $move_photos = $this->process_option( 'csv_move_photos', 0, $_POST, true );
             
-            if ( 'POST' == $_SERVER['REQUEST_METHOD'] ) {
+            if ( 'POST' == mstw_safe_get( 'REQUEST_METHOD', $_SERVER, '' ) ) {
                 $this->post( compact( 'submit_value', 'import_team', 'move_photos' ) );
             }
@@ -183 +184 @@
 
         function print_messages() {
-            //mstw_tr_log_msg( "MSTW_TR_ImporterPlugin.print_messages:" );
+            //mstw_log_msg( "MSTW_TR_ImporterPlugin.print_messages:" );
             
             if ( !empty( $this->log ) ) { ?>
@@ -219 +220 @@
         //
         function post( $options ) {
-            //mstw_tr_log_msg( "MSTW_TR_ImporterPlugin.post:" );
+            //mstw_log_msg( "MSTW_TR_ImporterPlugin.post:" );
+            //mstw_log_msg( $_POST );
             
             if ( !$options ) {
-                mstw_tr_log_msg( 'Houston, we have a problem ... no $options' );
+                mstw_log_msg( 'Houston, we have a problem ... no $options' );
                 return;
             }
@@ -231 +233 @@
                     if ( isset( $_POST['mstw-tr-nonce'] ) ) {
                         //wp_verify_nonce( sanitize_key( wp_unslash( $_POST['mstw-tr-nonce'] ) );
-                        $safeNonce = wp_esc_key( wp_unslash( $_POST['mstw-tr-nonce'] ) );
+                        $safeNonce = sanitize_text_field( wp_unslash( $_POST['mstw-tr-nonce'] ) );
                         if ( !wp_verify_nonce( $safeNonce, 'import-teams' ) ) {
                             mstw_tr_add_admin_notice( 'error', __( 'Problem encountered with CSV file. Exiting.', 'team-rosters' ) );
@@ -253 +255 @@
                     if ( isset( $_POST['mstw-tr-nonce'] ) ) {
                         //wp_verify_nonce( sanitize_key( wp_unslash( $_POST['mstw-tr-nonce'] ) );
-                        $safeNonce = wp_esc_key( wp_unslash( $_POST['mstw-tr-nonce'] ) );
-                        
-                        if ( !wp_verify_nonce( $safeNonce, 'import-teams' ) ) {
+                        //$safeNonce = wp_esc_key( wp_unslash( $_POST['mstw-tr-nonce'] ) );
+                        $safeNonce = mstw_really_safe_get( 'mstw-tr-nonce', $_POST, '' );
+                        
+                        if ( !wp_verify_nonce( $safeNonce, 'import-players' ) ) {
                             mstw_tr_add_admin_notice( 'error', __( 'Problem encountered with CSV file. Exiting.', 'team-rosters' ) );
                             mstw_log_msg( 'MSTW_TR_CSV_IMPORT_CLASS.post: Problem encountered loading CSV file; bad nonce. Exiting.' );
@@ -274 +277 @@
                     
                 default:
-                    mstw_tr_log_msg( 'Error encountered in post() method. $submit_value = ' . $submit_value . '. Exiting' );
+                    mstw_log_msg( 'Error encountered in post() method. $submit_value = ' . $submit_value . '. Exiting' );
                     return;
                     break;
@@ -286 +289 @@
             $csv = new MSTW_CSV_DataSource;
             
-            $file = $_FILES[$file_id]['tmp_name'];
+            //$file = $_FILES[$file_id]['tmp_name'];
+            $filesFileID = mstw_safe_get( $file_id, $_FILES, null );
+            
+            $file = mstw_safe_get( 'tmp_name', $filesFileID, '' );
+            
             if ( !$this->stripBOM( $file ) ) {
                 $this -> print_messages( );
@@ -293 +300 @@
 
             if ( !$csv -> load( $file ) ) {
-                //mstw_tr_log_msg( "logging failure to load file" );
+                //mstw_log_msg( "logging failure to load file" );
                 $this->log['error'][] = sprintf( 
                         /* translators: %s: filename */
@@ -309 +316 @@
             foreach ( $csv -> connect( ) as $csv_data ) {
                 if ( empty( $csv_data ) or !$csv_data ) {
-                    mstw_tr_log_msg( 'No CSV data. $csv_data is empty.' );
+                    mstw_log_msg( 'No CSV data. $csv_data is empty.' );
                 }
                 
@@ -336 +343 @@
                         
                     default:
-                        mstw_tr_log_msg( 'Oops, something went wrong with file ID: ' . $file_id );
+                        mstw_log_msg( 'Oops, something went wrong with file ID: ' . $file_id );
                         break;
                 }
@@ -355 +362 @@
                 /* translators: %1$s 'record' or 'records' skipped %*/
                 _n( 'Skipped %1$s record.', 'Skipped %1$s records.', $skipped, 'team-rosters' ), $skipped );
-                $this->log['error'][] = "<b>{$admin_notice}</b>";
+                //$this->log['error'][] = "<b>{$admin_notice}</b>";
+                $this->log['error'][] = $admin_notice;
             }
             
@@ -362 +370 @@
                 /* translators: %1$s/%2$s 'record' or 'records' processed */
                 _n( 'Imported %1$s record in %2$.2f seconds.', 'Imported %1$s records in %2$.2f seconds.', $imported, 'team-rosters' ), $imported, $exec_time );
-            $this->log['notice'][] = "<b>{$admin_notice}</b>";
+            //$this->log['notice'][] = "<b>{$admin_notice}</b>";
+            $this->log['notice'][] = $admin_notice;
             
             $this->print_messages();
@@ -372 +381 @@
         //
         function create_post( $data, $options ) {   
-            //mstw_tr_log_msg( 'MSTW_TR_ImporterPlugin.create_post:' );
-            //mstw_tr_log_msg( $data );
-            //mstw_tr_log_msg( $options );
+            //mstw_log_msg( 'MSTW_TR_ImporterPlugin.create_post:' );
+            //mstw_log_msg( $data );
+            //mstw_log_msg( $options );
             
             $data = array_merge( $this->defaults, $data );
@@ -415 +424 @@
                     
                 default:
-                    mstw_tr_log_msg( 'Whoa horsie ... submit_value = ' . $options[ 'submit_value'] );
+                    mstw_log_msg( 'Whoa horsie ... submit_value = ' . $options[ 'submit_value'] );
                     $this->log['error']["type-{$type}"] = sprintf(
                         /* translators: %s: import type */
@@ -441 +450 @@
             // Add the specified team taxonomy, if provided
             if ( $post_id ) {
-                //mstw_tr_log_msg( "Trying to add import_team tax" );
-                //mstw_tr_log_msg( "for player " . convert_chars( $temp_title ) );
+                //mstw_log_msg( "Trying to add import_team tax" );
+                //mstw_log_msg( "for player " . convert_chars( $temp_title ) );
                 if ( array_key_exists( 'import_team', $options ) && !empty( $options['import_team' ] ) && $options['import_team' ] > 0 ) {
                     $term = get_term_by( 'id', $options['import_team'], 'mstw_tr_team' );
@@ -557 +566 @@
                                 //Check for errors downloading
                                 if( is_wp_error( $temp_photo ) ) {
-                                    mstw_tr_log_msg( "Error downloading: $v" );
-                                    mstw_tr_log_msg( $temp_photo );
+                                    mstw_log_msg( "Error downloading: $v" );
+                                    mstw_log_msg( $temp_photo );
                                 }
                                 else {
@@ -570 +579 @@
                                     //Check for sideload errors
                                     if( is_wp_error( $id ) ) {
-                                        mstw_tr_log_msg( "Error loading file to media library: $temp_photo" );
-                                        mstw_tr_log_msg( $id ); 
+                                        mstw_log_msg( "Error loading file to media library: $temp_photo" );
+                                        mstw_log_msg( $id );    
                                     } 
                                     else {
@@ -578 +587 @@
                                         
                                         if( $post_meta_id === false ) {
-                                            mstw_tr_log_msg( "Failed to set thumbnail for post $post_id" ); 
+                                            mstw_log_msg( "Failed to set thumbnail for post $post_id" );    
                                         }
                                     }
@@ -589 +598 @@
                                 if( $thumbnail_id and $thumbnail_id != -1 ) {
                                     if( set_post_thumbnail( $post_id, $thumbnail_id ) === false ) {
-                                        mstw_tr_log_msg( 'Failed to set_post_thumbnail. Post= ' . $post_id . ' thumbnail= ' . $thumbnail_id );
+                                        mstw_log_msg( 'Failed to set_post_thumbnail. Post= ' . $post_id . ' thumbnail= ' . $thumbnail_id );
                                     }
                                 }
                                 else {
-                                    mstw_tr_log_msg( 'No file found in the media library: ' . $thumbnail_id );
+                                    mstw_log_msg( 'No file found in the media library: ' . $thumbnail_id );
                                 }   
                             }
@@ -601 +610 @@
                     default:
                         // bad column header
-                        mstw_tr_log_msg( 'Unrecognized game data field: ' . $k );
+                        mstw_log_msg( 'Unrecognized game data field: ' . $k );
                         break;
                         
@@ -653 +662 @@
         //
         function create_team_taxonomy_term( $data, $options, $imported ) {
-            //mstw_tr_log_msg( "MSTW_TR_ImporterPlugin:create_team_taxonomy_term:" );
-            //mstw_tr_log_msg( "data:" );
-            //mstw_tr_log_msg( $data );
-            //mstw_tr_log_msg( "options:" );
-            //mstw_tr_log_msg( $options );
+            //mstw_log_msg( "MSTW_TR_ImporterPlugin:create_team_taxonomy_term:" );
+            //mstw_log_msg( "data:" );
+            //mstw_log_msg( $data );
+            //mstw_log_msg( "options:" );
+            //mstw_log_msg( $options );
             
             $retval = 0;
@@ -709 +718 @@
             
             if ( is_wp_error( $result ) ) {
-                mstw_tr_log_msg( 'Error inserting term ... ' );
-                mstw_tr_log_msg( $result );
+                mstw_log_msg( 'Error inserting term ... ' );
+                mstw_log_msg( $result );
                 $retval = 0;
             }
             else {
-                //mstw_tr_log_msg( 'Term inserted ... ID= ' . $result['term_id'] );
+                //mstw_log_msg( 'Term inserted ... ID= ' . $result['term_id'] );
                 //
                 // If it exists, the SS team link will be added as term meta data 
@@ -747 +756 @@
         //
         function stripBOM( $fname ) {
-            //mstw_tr_log_msg( "MSTW_TR_ImporterPlugin.stripBOM:" );
+            //mstw_log_msg( "MSTW_TR_ImporterPlugin.stripBOM:" );
             
             $res = @fopen( $fname, 'rb' );
@@ -759 +768 @@
                     $contents = file_get_contents( $fname );
                     if ( false === $contents ) {
-                        trigger_error( 'Failed to get file contents.', E_USER_WARNING );
+                        //trigger_error( 'Failed to get file contents.', E_USER_WARNING );
+                        mstw_log_msg( esc_html__( 'Failed to get file contents.' , 'team-rosters' ) );
                     }
                     $contents = substr($contents, 3);
@@ -765 +775 @@
                     
                     if (false === $success) {
-                        trigger_error( 'Failed to put file contents.', E_USER_WARNING );
+                        //trigger_error( 'Failed to put file contents.', E_USER_WARNING );
+                        mstw_log_msg( esc_html__( 'Failed to get file contents.' , 'team-rosters' ) );
                     }
                     
@@ -794 +805 @@
         //  
         function add_help( ) {
-            //mstw_tr_log_msg( "MSTW_TR_ImporterPlugin.add_help:" );
+            //mstw_log_msg( "MSTW_TR_ImporterPlugin.add_help:" );
             
             $screen = get_current_screen( );
-            //mstw_tr_log_msg( $screen );
+            //mstw_log_msg( $screen );
             
             // All TR help screen have the same sidebar
@@ -817 +828 @@
         
         function csv_import_help_content ( ) {
-            //mstw_tr_log_msg( "MSTW_TR_ImporterPlugin.add_help:" );
+            //mstw_log_msg( "MSTW_TR_ImporterPlugin.add_help:" );
             ?>
             <p><?php esc_html_e( 'This screen allows the import of teams and players from files in CSV format. Sample file formats are available in the Users Manual (link below).', 'team-rosters' ) ?></p>

team-rosters/trunk/includes/mstw-tr-player-cpt-admin.php

@@ -39 +39 @@
             <p class='player-bio-admin-head'><?php esc_html_e( 'Player Bio:', 'team-rosters' ) ?></p>
             <?php
+            //wp_nonce_field( 'single-player', 'mstw-tr-nonce' );
         }
     }  //End: mstw_tr_build_player_screen
@@ -336 +337 @@
             if ( $_POST['post_type'] == 'mstw_tr_player' ) {
                 update_post_meta( $post_id, 'player_first_name', 
-                        wp_strip_all_tags( $_POST['player_first_name'] ) );
+                        wp_strip_all_tags( mstw_safe_get( 'player_first_name', $_POST, '' ) ) );
                         
                 update_post_meta( $post_id, 'player_last_name', 
-                        wp_strip_all_tags( $_POST['player_last_name'] ) );
+                        wp_strip_all_tags( mstw_safe_get( 'player_last_name', $_POST, '' ) ) );
                         
                 update_post_meta( $post_id, 'player_number', 
-                        wp_strip_all_tags( $_POST['player_number'] ) );
+                        wp_strip_all_tags( mstw_safe_get( 'player_number', $_POST, '' ) ) );
                         
                 update_post_meta( $post_id, 'player_position', 
-                        wp_strip_all_tags( $_POST['player_position'] ) );
+                        wp_strip_all_tags( mstw_safe_get( 'player_position', $_POST, '' ) ) );
                         
                 update_post_meta( $post_id, 'player_position_long', 
-                        wp_strip_all_tags( $_POST['player_position_long'] ) );  
+                        wp_strip_all_tags( mstw_safe_get( 'player_position_long', $_POST, '' ) ) ); 
                         
                 update_post_meta( $post_id, 'player_height', 
                         //$_POST['player_height'] );
-                        wp_strip_all_tags( $_POST['player_height'] ) );
+                        wp_strip_all_tags( mstw_safe_get( 'player_height', $_POST, '' ) ) );
                         
                 update_post_meta( $post_id, 'player_weight',  
-                        wp_strip_all_tags( $_POST['player_weight'] ) );
+                        wp_strip_all_tags( mstw_safe_get( 'player_weight', $_POST, '' ) ) );
                         
                 update_post_meta( $post_id, 'player_year',  
-                        wp_strip_all_tags( $_POST['player_year'] ) );
+                        wp_strip_all_tags( mstw_safe_get( 'player_year', $_POST, '' ) ) );
                         
                 update_post_meta( $post_id, 'player_year_long',  
-                        wp_strip_all_tags( $_POST['player_year_long'] ) );
+                        wp_strip_all_tags( mstw_safe_get( 'player_year_long', $_POST, '' ) ) );
                         
                 update_post_meta( $post_id, 'player_experience',
-                        wp_strip_all_tags( $_POST['player_experience'] ) );
+                        wp_strip_all_tags( mstw_safe_get( 'player_experience', $_POST, '' ) ) );
                 
                 update_post_meta( $post_id, 'player_age', 
-                        wp_strip_all_tags( $_POST['player_age'] ) );
+                        wp_strip_all_tags( mstw_safe_get( 'player_age', $_POST, '' ) ) );
                         
                 update_post_meta( $post_id, 'player_home_town',
-                        wp_strip_all_tags( $_POST['player_home_town'] ) );
+                        wp_strip_all_tags( mstw_safe_get( 'player_home_town', $_POST, '' ) ) );
                         
                 update_post_meta( $post_id, 'player_last_school',
-                        wp_strip_all_tags( $_POST['player_last_school'] ) );
+                        wp_strip_all_tags( mstw_safe_get( 'player_last_school', $_POST, '' ) ) );
                         
                 update_post_meta( $post_id, 'player_country',
-                        wp_strip_all_tags( $_POST['player_country'] ) );
+                        wp_strip_all_tags( mstw_safe_get( 'player_country', $_POST, '' ) ) );
                         
                 update_post_meta( $post_id, 'player_bats',
-                        wp_strip_all_tags( $_POST['player_bats'] ) );
+                        wp_strip_all_tags( mstw_safe_get( 'player_bats', $_POST, 'R' ) ) );
                         
                 update_post_meta( $post_id, 'player_throws',
-                        wp_strip_all_tags( $_POST['player_throws'] ) );
+                        wp_strip_all_tags( mstw_safe_get( 'player_throws', $_POST, 'R' ) ) );
                         
                 update_post_meta( $post_id, 'player_other',
-                        wp_strip_all_tags( $_POST['player_other'] ) );
+                        wp_strip_all_tags( mstw_safe_get( 'player_other', $_POST, '' ) ) );
                         
             } //End: if ( $_POST['post_type'] == 'mstw_tr_player' )
@@ -519 +520 @@
 
  if( !function_exists( 'mstw_tr_restrict_players_by_team' ) ) {
-    function mstw_tr_restrict_players_by_team( ) {
+    function mstw_tr_restrict_players_by_team ( ) {
+        //mstw_log_msg( 'mstw_tr_restrict_players_by_team:' );
+        
         global $typenow;
         //global $wp_query;
         
         if( $typenow == 'mstw_tr_player' ) {
+            
+            wp_nonce_field( 'single-player', 'mstw-tr-nonce' );
+            //wp_nonce_field( plugins_url(__FILE__), 'mstw_tr_player_nonce' );
             
             $taxonomy_slugs = array( 'mstw_tr_team' );
@@ -544 +550 @@
                     //check against the last $_GET to show the current selection
                     if ( array_key_exists( $tax_slug, $_GET ) ) {
-                        $selected = ( $_GET[$tax_slug] == $term->slug ) ? ' selected="selected"' : '';
+                        $selected = ( $_GET[$tax_slug] == $term->slug ) ? ' selected' : '';
                     }
                     else {
@@ -550 +556 @@
                     }
                     ?>
-                    <option value='<?php echo esc_html( $term->slug . $selected ) ?>' > <?php echo esc_html( $term->name . '(' . $term->count . ')' ) ?> </option>
+                    <option value='<?php echo esc_html( $term->slug )?>' <?php echo esc_html( $selected) ?>> <?php echo esc_html( $term->name . '(' . $term->count . ')' ) ?> </option>
+                    
         <?php 
                 }

team-rosters/trunk/includes/mstw-tr-roster-table.php

@@ -127 +127 @@
             
             $test_output = mstw_tr_build_roster_table_header( $roster_type, $attribs, $fieldOrder );
-            //mstw_log_msg( $test_output );
-            
             $output .= $test_output;
 
@@ -489 +487 @@
  if( !function_exists( 'mstw_tr_add_player_name' ) ) {
     function mstw_tr_add_player_name( $post, $args ) {
+        mstw_log_msg( 'mstw_tr_add_player_name:' );
         
         switch( $args['name_format'] ) {
@@ -508 +507 @@
         
         if ( $args['links_to_profiles'] ) {
+            
+            /*$playerURL = mstw_tr_build_player_url( $post->ID, $player_id );
+                        
+            $nonceURL = wp_nonce_url( get_permalink( $player_id ), 'single-player', 'mstw-tr-nonce' );
+            $nonceURL .= '&position='. $post->ID;
+            
+            mstw_log_msg( '$nonceURL=' );
+            mstw_log_msg( $nonceURL );
+            */
+                        
+            $playerLink = mstw_tr_build_player_link_html( $playerURL, get_the_post_thumbnail( $player_id, array( $table_photo_width, $table_photo_height ) ) );
+            
+            
             $player_html = '<a href="' .  get_permalink($post->ID) . '?roster_type=' . $args['roster_type'] . '" ';
+            mstw_log_msg( '$player_html=' );
+            mstw_log_msg( $player_html );
             $player_html .= '>' . $player_name . '</a>';
         }

team-rosters/trunk/includes/mstw-tr-roster-tables-class.php

@@ -64 +64 @@
                 // merge the shortcode arguments and the settings/options
                 $attribs = $this -> processAtts( $args, $shortcode );
-                            
+            
                 ob_start( );
                     
                     ?>
-                    <div class='mstw-tr-roster-table-container mstw-tr-roster-table-container-<?php echo esc_html( $teamSlug )?>' id='mstw-tr-roster-table-container-<?php echo esc_html( $tableID ) ?>'>   
+                    <div class='mstw-tr-roster-table-container mstw-tr-roster-table-container-<?php echo esc_attr( $teamSlug )?>' id='mstw-tr-roster-table-container-<?php echo esc_attr( $tableID ) ?>'>   
                             <?php $noControls = $this -> safeGet( 'no_controls', $args, null );
-                            //mstw_log_msg( "noControls= $noControls" );
-                            
+                        
                             if ( null === $noControls ) { ?>
-                                <!--<div class='mstw-tr-roster-title-controls mstw-tr-roster-title-controls-<?php //echo $teamSlug ?>'>-->
-                                    <?php //echo $this -> build_roster_title( $teamSlug, $attribs ); ?>
-                                    <div class='roster-sort-controls roster-sort-controls-<?php echo esc_html( $teamSlug ) ?> MSTW-flex-row'>
+                                    <div class='roster-sort-controls roster-sort-controls-<?php echo esc_attr( $teamSlug ) ?> MSTW-flex-row'>
                                         <?php 
-                                        // build_roster_sort_controls buffers the output so I am escaping earlier then here
+                                        // build_roster_sort_controls buffers the output so I am escaping earlier than here
                                         $controls_escaped = $this -> build_roster_sort_controls( $teamSlug, $attribs, $args, $argsStr, $tableID );
                                         echo $controls_escaped;
-                                        //echo $this -> build_roster_sort_controls( $teamSlug, $attribs, $args, $argsStr, $tableID ); 
                                         ?>
                                     </div>
@@ -87 +83 @@
                             } ?>
 
-                        <div class= 'mstw-tr-roster-players mstw-tr-roster-players-<?php echo esc_html( $teamSlug )?>' id='mstw-tr-roster-players-<?php echo esc_html( $tableID ) ?>'>
+                        <div class= 'mstw-tr-roster-players mstw-tr-roster-players-<?php echo esc_attr( $teamSlug )?>' id='mstw-tr-roster-players-<?php echo esc_attr( $tableID ) ?>'>
                         <?php
                             // get the players
@@ -126 +122 @@
         
         ?>
-        <ul class='mstw-tr-roster-player-list mstw-tr-roster-player-list-<?php echo esc_html( $teamSlug ) ?> mstw-tr-roster-player-list-<?php echo esc_html( $tableID ) ?>'>
+        <ul class='mstw-tr-roster-player-list mstw-tr-roster-player-list-<?php echo esc_attr( $teamSlug ) ?> mstw-tr-roster-player-list-<?php echo esc_attr( $tableID ) ?>'>
             
             <!-- Why is this needed ?? -->
@@ -144 +140 @@
                 ?>
                 <li class='mstw-tr-roster-player'>
-                    <div class='mstw-tr-roster-player-container mstw-tr-roster-player-container-<?php echo esc_html( $teamSlug ) ?> MSTW-flex-row'>
+                    <div class='mstw-tr-roster-player-container mstw-tr-roster-player-container-<?php echo esc_attr( $teamSlug ) ?> MSTW-flex-row'>
                 
                     <?php //PRIMARY INFO COLUMN ?>
@@ -166 +162 @@
                             <div class='mstw-tr-roster-player-number-name MSTW-uppercase'>
                                 <?php
-                                $playerNameLink_escaped = $this -> buildPlayerName( $player, $teamSlug, $attribs, 1 );
+                                $playerNameLink_escaped = $this -> buildPlayerName( $player, $teamSlug, $attribs, 1 ); 
                                 $playerNumber = get_post_meta( $player->ID, 'player_number', true );
                                 ?>
@@ -184 +180 @@
                         <div class='mstw-tr-roster-player-bio'>
                             <?php $playerLink = get_permalink( $player->ID ) . '?roster_type=' . $this -> safeGet( 'roster_type', $attribs, 'custom' ) . '&' . 'team=' . $teamSlug . '"'; ?>
-                            <a href="<?php echo esc_html( $playerLink ) ?>"> FULL BIO</a>
+                            <a href="<?php echo esc_url( $playerLink ) ?>"> FULL BIO</a>
                             
                         </div>
@@ -311 +307 @@
         
         if ( $addProfileLink ) {
-            $paramStr = '?roster_type=' . $options['roster_type'];
+            $paramStr = '&roster_type=' . $options['roster_type'];
             if ( $teamSlug ) {
                 $paramStr .= "&team=$teamSlug";
             }
-            $ret_html = '<a href="' .  esc_url( get_permalink( $player->ID ) ) . esc_html( $paramStr ) . '" ';
-            $ret_html .= '>' . esc_html( $player_name ) . '</a>';
-            
-            //$ret_html = get_permalink( $player->ID ) . $paramStr . '" ';
-            //$ret_html .= '>' . $player_html;
+            
+            $nonceURL = wp_nonce_url( get_permalink( $player->ID ), 'single-player', 'mstw-tr-nonce' );
+            $nonceURL .= $paramStr;
+            
+            $ret_html = '<a href="' .  esc_url( $nonceURL ) . '" > ' . esc_html( $player_name ) . '</a>';
+            
         }
         else {
-            $ret_html = $player_name;
+            $ret_html = esc_html( $player_name );
             
         }
@@ -453 +450 @@
     //
     function get_field_key( $rosterType, $fldNbr ) {
-        //mstw_log_msg( "get_field_key:" );
+        //mstw_log_msg( "MSTW_ROSTER_TABLE.get_field_key:" );
         
         $conversionTable = array(  'high-school'    => 
@@ -487 +484 @@
     function processAtts( $atts, $shortcode ) {
         //mstw_log_msg( "MSTW_ROSTER_TABLE.processAtts: shortcode= $shortcode" );
-        //mstw_log_msg( "Passed atts: " );
-        //mstw_log_msg( $atts );
         
         switch( $shortcode ) {
@@ -546 +541 @@
     function build_roster_sort_controls( $team, $attribs, $args, $argsStr = '', $tableID = '' ) {
         //mstw_log_msg( "MSTW_ROSTER_TABLE.build_roster_sort_control: team: $team , argsStr: $argsStr, tableID: $tableID" );
-        
-        // jersey # | name | position | hometown | class-year 
+         
         $choices = array( 'numeric' => __( 'Jersey Number', 'team-rosters' ),
                                             'alpha-first' => __( 'First Name', 'team-rosters' ),
@@ -562 +556 @@
             ?>
             <form id='tr-sort-controls' class='MSTW-flex-row' >
-                <input type='hidden' id='roster-team' value='<?php echo esc_html( $team ) ?>'/>
-                <input type="hidden" id='tableID' value="<?php echo esc_html( $tableID ) ?>" />
-                <input type="hidden" id='args_<?php echo esc_html( $tableID ) ?>' value="<?php echo esc_html( $argsStr )?>" />
+                <input type='hidden' id='roster-team' value='<?php echo esc_attr( $team ) ?>'/>
+                <input type="hidden" id='tableID' value="<?php echo esc_attr( $tableID ) ?>" />
+                <input type="hidden" id='args_<?php echo esc_attr( $tableID ) ?>' value="<?php echo esc_attr( $argsStr )?>" />
                 
                 <div class='tr-sort-menu'> 
-                    <select name='tr-sort-menu' id='tr-sort-menu_<?php echo esc_html( $tableID ) ?>'>
+                    <select name='tr-sort-menu' id='tr-sort-menu_<?php echo esc_attr( $tableID ) ?>'>
                         <?php 
                         foreach( $choices as $slug => $label ) {
                             $selected = ( $currentSortOrder == $slug ) ? 'selected="selected"' : '';
                             ?>
-                            <option value=<?php echo esc_html( "$slug $selected" ) ?>> <?php echo esc_html( $label ) ?></option>
+                            <option value=<?php echo esc_attr( "$slug $selected" ) ?>> <?php echo esc_html( $label ) ?></option>
                             <?php
                         }
@@ -580 +574 @@
                 
                 <div class='tr-sort-button'>
-                    <input type='button' class='secondary tr-sort-submit' id='<?php echo esc_html( $tableID ) ?>' name='<?php echo esc_html( $team )?>' value=<?php esc_html_e( 'Sort Roster', 'team-rosters' ) ?>/>
+                    <input type='button' class='secondary tr-sort-submit' id='<?php echo esc_attr( $tableID ) ?>' name='<?php echo esc_attr( $team )?>' value=<?php esc_attr_e( 'Sort Roster', 'team-rosters' ) ?>/>
                 </div> 
                 

team-rosters/trunk/includes/mstw-tr-settings.php

@@ -27 +27 @@
     function mstw_tr_settings_page( ) {
         //mstw_log_msg( "mstw_tr_settings_page:" );
+        //mstw_log_msg( $_GET );
         
         global $pagenow;
@@ -35 +36 @@
         include_once 'mstw-tr-player-profiles-galleries-settings.php';
         
-        //mstw_tr_data_fields_columns_setup( );
         mstw_tr_data_fields_setup( );
-        //mstw_tr_data_fields_center_setup( );
         
         mstw_tr_roster_table_setup( );
@@ -52 +51 @@
             <?php 
             //Get or set the current tab - default to first/main settings tab
-            $current_tab = ( isset( $_GET['tab'] ) ? $_GET['tab'] : 'data-fields-columns-tab' );
+            $current_tab = mstw_really_safe_get( 'tab', $_GET, 'data-fields-columns-tab' );
+            //$current_tab = ( isset( $_GET['tab'] ) ? $_GET['tab'] : 'data-fields-columns-tab' );
             
             $tabsArray = array( 'data-fields-columns-tab', 
@@ -133 +133 @@
             <table class="form-table">
                 <!-- Add a spacer row -->
-                <tr><td><input type='hidden' name='current_tab' id='current_tab' value='<?php echo esc_html( $current_tab ) ?>' /></td></tr>
+                <tr><td><input type='hidden' name='current_tab' id='current_tab' value='<?php echo esc_attr( $current_tab ) ?>' /></td></tr>
                 <tr>
                     <td>
-                        <input name="Submit" type="submit" class="button-primary" value="<?php esc_html_e( 'Save Changes', 'team-rosters' ) ?>" />
-                    
-                        <input type="submit" class="button-secondary" id="reset_btn" name="<?php echo esc_html( $options_name ) ?>" onclick="tr_confirm_reset_defaults()" value="<?php esc_html_e( 'Reset Defaults', 'team-rosters' ) ?>" />
+                        <input name="Submit" type="submit" class="button-primary" value="<?php esc_attr_e( 'Save Changes', 'team-rosters' ) ?>" />
+                    
+                        <input type="submit" class="button-secondary" id="reset_btn" name="<?php echo esc_attr( $options_name ) ?>" onclick="tr_confirm_reset_defaults()" value="<?php esc_attr_e( 'Reset Defaults', 'team-rosters' ) ?>" />
                     </td>
                 </tr>
@@ -277 +277 @@
         }
         
-        // Get current tab so we know what fields to validate and save
-        // Default to first/main settings tab
-        $current_tab = ( isset( $_POST['current_tab'] ) ) ? $_POST['current_tab'] : 'data-fields-columns-tab';
-
+        $current_tab = mstw_really_safe_get( 'current_tab', $_POST, 'data-fields-columns-tab' );
+        
         //check if the reset button was pressed and confirmed
         //array_key_exists() returns true for null, isset does not

team-rosters/trunk/includes/mstw-tr-team-roster-admin-class.php

@@ -110 +110 @@
         // We do the heavy lifting in the post( ) method
         //
-        if ( 'POST' == $_SERVER['REQUEST_METHOD'] ) {
-            
-            $submit_value = array_key_exists( 'submit', $_POST ) ? wp_unslash( $_POST[ 'submit' ] ) : null;
+        $requestMethod = mstw_safe_get( 'REQUEST_METHOD', $_SERVER, '' );
+        
+        if ( 'POST' == $requestMethod ) {
+            
+            $submit_value = mstw_safe_get( 'submit', $_POST, null );
+            
+            //$submit_value = array_key_exists( 'submit', $_POST ) ? wp_unslash( $_POST[ 'submit' ] ) : null;
             
             $this->post( compact( 'submit_value' ) );
@@ -135 +139 @@
         //
         $current_team = mstw_tr_get_current_team( );
-        //mstw_log_msg( 'Current Team: ' . $current_team );
         
         $paged = ( array_key_exists( 'paged', $_GET ) ) ? absint( $_GET['paged'] ) : 1;
@@ -157 +160 @@
         
         <form id="manage-roster" class="add:the-list: validate" method="post" enctype="multipart/form-data" action="">
-        
+            <?php wp_nonce_field( 'add-edit-players', 'mstw-tr-nonce' ); ?>
+            
             <div class="alignleft actions mstw-tr-controls">
                 <?php
@@ -172 +176 @@
                     </h1>
                     </div> <!-- .alignleft actions mstw-lm-controls -->
-                    </form> <!-- #bracket-builder -->
+                    </form> <!-- #manage-roster-->
                     <?php return; ?>
                     
-                <?php
+        <?php
                 } else {
                     //echo admin_url( 'admin.php?page=manage-team-rosters' );
@@ -216 +220 @@
               $this -> build_roster_table_header( );
               if ( $edit ) {
-                $this -> build_roster_table_body( $players_list );
-                $submit_button_label = __( 'Update Roster', 'team-rosters' );
-                
+                    $this -> build_roster_table_body( $players_list );
+                    $submit_button_label = __( 'Update Roster', 'team-rosters' );       
               } else {
-                $this -> build_add_players_table_body( );
-                $submit_button_label = __( 'Add Players', 'team-rosters' );
-                
+                    $this -> build_add_players_table_body( );
+                    $submit_button_label = __( 'Add Players', 'team-rosters' );
               }
               
@@ -228 +230 @@
               
               <!-- Submit button -->
-                <?php wp_nonce_field( 'add-edit-players', 'mstw-tr-nonce' ); ?>
+                <?php //wp_nonce_field( 'add-edit-players', 'mstw-tr-nonce' ); ?>
               <tbody>
               <tr> 
@@ -245 +247 @@
               </tbody>
               
-            </table> 
-            
-        </form>
+            </table> <!-- #edit-teams -->
+            
+        </form> <!-- #manage-roster -->
         
         <?php
@@ -502 +504 @@
         ?>
         <span class="tr-paginate-links">
-          <?php echo wp_kses_post( paginate_links( $args ) ); ?>
+            <?php if ( !is_null( paginate_links( $args ) ) ) {
+                echo wp_kses_post( paginate_links( $args ) );
+            }?>
+            
+          <?php //echo wp_kses_post( paginate_links( $args ) ); ?>
         </span>
         
@@ -655 +661 @@
     function post( $options ) {
         //mstw_log_msg( 'MSTW_TR_TEAM_ROSTERS_ADMIN.post:' );
+        //mstw_log_msg( $_POST );
         //
         //first, do a few checks on form
         //
         
-        if ( isset( $_POST['mstw-tr-nonce'] ) ) {
-            //wp_verify_nonce( sanitize_key( wp_unslash( $_POST['mstw-tr-nonce'] ) );
-            $safeNonce = wp_esc_key( wp_unslash( $_POST['mstw-tr-nonce'] ) );
-            
+        $safeNonce = mstw_really_safe_get( 'mstw-tr-nonce', $_POST, '' );
+        
+        if ( "" != $safeNonce  ) {
             if ( !wp_verify_nonce( $safeNonce, 'add-edit-players' ) ) {
-                mstw_tr_add_admin_notice( 'error', __( 'Problem encountered updating roster. Exiting.', 'team-rosters' ) );
                 mstw_log_msg( 'MSTW_TR_TEAM_ROSTERS_ADMIN.post: Problem encountered updating roster; bad nonce. Exiting.' );
+                //die( esc_html__( 'Fatal error encountered updating roster -verification.', 'team-rosters' ) );
                 return;
             }
             
         } else {
-            mstw_tr_add_admin_notice( 'error', __( 'Problem encountered updating roster. Exiting.', 'team-rosters' ) );
             mstw_log_msg( 'MSTW_TR_TEAM_ROSTERS_ADMIN.post: Problem encountered updating roster; nonce missing. Exiting.' );
+            //die( esc_html__( 'Fatal error encountered updating roster -missin.', 'team-rosters' ) );
             return;
             
@@ -691 +697 @@
                     
                 } else {
-                    $team_slug = array_shift( $_POST ); //return 1st value and remove 1st element
                     $playerArray = $_POST;
-            
+                    $trashNonce = array_shift( $playerArray ); //nonce is 1st value - trash
+                    $trashRef = array_shift( $playerArray ); //referrer is 2nd value - trash
+                    //return 1st value and remove 1st element
+                    $team_slug = array_shift( $playerArray ); 
+                    
                     // Count for admin message
                     $nbr_updated = 0;
@@ -707 +716 @@
                             
                             $playerArray = array_slice( $playerArray, $nbrFields + 1 );
-                            
+
                             $result = $this -> process_player( $player_slug, $team_slug, $playerData );
                             
@@ -881 +890 @@
     function update_player( $player_id, $player_slug, $team_slug, $first_name, $last_name, $playerData ) {
         //mstw_log_msg( "MSTW_TR_TEAM_ROSTERS_ADMIN.update_player:" );
-        //mstw_log_msg( "player id: $player_id , slug: $player_slug , team: $team_slug" );
-
+        
         if ( '' != $player_slug ) {
             $player_obj = get_page_by_path( $player_slug, OBJECT, 'mstw_tr_player' );

team-rosters/trunk/includes/mstw-tr-team-tax-admin-class.php

@@ -296 +296 @@
     function create_team_meta( $term_id, $tt_id ){
         //mstw_log_msg( 'MSTW_TR_TEAM_TAX_ADMIN.create_team_meta:' );
-        //mstw_log_msg( "term_id= $term_id || tt_id= $tt_id" ); 
-    
+        
         $key = 'ss_team_link';
-        if ( array_key_exists( $key, $_POST ) && ( -1 != $_POST[ $key ] ) ) {
-            
-            $res = update_term_meta( $term_id, 'tr_team_link', $_POST[ $key ] );
-            
+        $postKey = mstw_safe_get( $key, $_POST, -1 );
+        
+        if ( -1 != $postKey ) {
+            $res = update_term_meta( $term_id, 'tr_team_link', $postKey );
             $res = update_term_meta( $term_id, 'tr_link_source', 'mstw_ss_team' );
-            
-            return;
-                    
+            return;     
         }  
             
         $key = 'lm_team_link';
-        if ( array_key_exists( $key, $_POST ) && ( -1 != $_POST[ $key ] ) ) {
-            
-            $res = update_term_meta( $term_id, 'tr_team_link', $_POST[ $key ] );
-            
-            $res = update_term_meta( $term_id, 'tr_link_source', 'mstw_lm_team' );
-            
-            return;
-                    
+        $postKey = mstw_safe_get( $key, $_POST, -1 );
+        
+        if ( -1 != $postKey ) {
+            $res = update_term_meta( $term_id, 'tr_team_link', $postKey );
+            $res = update_term_meta( $term_id, 'tr_link_source', 'mstw_lm_team' );  
         } 
          
@@ -333 +327 @@
     //
     function edit_team_meta( $term_id, $tt_id ) {
-        //mstw_log_msg( 'MSTW_TR_TEAM_TAX_ADMIN.edit_team_meta:' );
-        //mstw_log_msg( '$term_id= ' . $term_id );
-        //mstw_log_msg( '$tt_id= ' . $tt_id );
-    
+        mstw_log_msg( 'MSTW_TR_TEAM_TAX_ADMIN.edit_team_meta:' );
+        mstw_log_msg( $_POST );
+        
         $key = 'ss_team_link';
-        if ( array_key_exists( $key, $_POST ) && ( -1 != $_POST[ $key ] ) ) {
-            
-                update_term_meta( $term_id, 'tr_team_link', $_POST[ $key ] );
+        $postKey = mstw_safe_get( $key, $_POST, -1 );
+        
+        if ( -1 != $postKey ) {
+            
+                update_term_meta( $term_id, 'tr_team_link', $postKey );
                 update_term_meta( $term_id, 'tr_link_source', 'mstw_ss_team' );
                     
@@ -346 +341 @@
         
             $key = 'lm_team_link';
-            if ( array_key_exists( $key, $_POST ) && ( -1 != $_POST[ $key ] ) ) {
-                
-                update_term_meta( $term_id, 'tr_team_link', $_POST[ $key ] );
-                update_term_meta( $term_id, 'tr_link_source', 'mstw_lm_team' );
-                        
+            $postKey = mstw_safe_get( $key, $_POST, -1 );
+            
+            if ( -1 != $postKey ) {
+                update_term_meta( $term_id, 'tr_team_link', $postKey );
+                update_term_meta( $term_id, 'tr_link_source', 'mstw_lm_team' ); 
             } else {
-                
                 update_term_meta( $term_id, 'tr_team_link', -1 );
                 update_term_meta( $term_id, 'tr_link_source', '' );

team-rosters/trunk/includes/mstw-tr-utility-functions.php

@@ -126 +126 @@
 //          None. Outputs to WP error_log
 //
-if ( !function_exists( 'mstw_log_msg' ) ) {
+/*if ( !function_exists( 'mstw_log_msg' ) ) {
     function mstw_log_msg( $msg ) {
         if ( WP_DEBUG === true ) {
@@ -141 +141 @@
     } //End: mstw_log_msg( )
 }
+*/
 
 // ----------------------------------------------------------------
@@ -591 +592 @@
  if ( !function_exists( 'mstw_tr_build_gallery' ) ) {
     function mstw_tr_build_gallery( $team_slug, $roster_type, $options ) {
-        //mstw_tr_log_msg( 'mstw_tr_build_gallery:' );
+        //mstw_log_msg( 'mstw_tr_build_gallery:' );
         
         // Set the sort field   
@@ -824 +825 @@
         //mstw_log_msg( "mstw_tr_build_player_name: name_format= " . $options[ 'name_format' ] );
         
-        $first_name = get_post_meta($player->ID, 'player_first_name', true );
-        $last_name = get_post_meta($player->ID, 'player_last_name', true );
+        $first_name = get_post_meta( $player->ID, 'player_first_name', true );
+        $last_name = get_post_meta( $player->ID, 'player_last_name', true );
         
         switch ( $options['name_format'] ) { 
@@ -847 +848 @@
         if( $display != 'profile' ) {
             if ( $options['links_to_profiles'] ) {
-                $paramStr = '?roster_type=' . $options['roster_type'];
+                // this has a ? need an & since nonce is already there
+                //$paramStr = '?roster_type=' . $options['roster_type'];
+                $paramStr = '&roster_type=' . $options['roster_type'];
                 if ( $teamSlug ) {
                     $paramStr .= "&team=$teamSlug";
                 }
-                if ( 'custom' == $options['roster_type'] /*&& $last_name == "Havlicek"*/ ) {
+                if ( 'custom' == $options['roster_type'] ) {
                     $serialArgs = base64_encode( serialize( $options ) );
                     $paramStr .= "&args=$serialArgs";
                 }
                 
-                $player_html = '<a href="' .  get_permalink( $player->ID ) . $paramStr . '" ';
-                $player_html .= '>' . $player_name . '</a>';
+                if ( $last_name == "Roth" ) {
+                    $nonceURL = wp_nonce_url( get_permalink( $player->ID ), 'single-player', 'mstw-tr-nonce' );
+                    $nonceURL .= $paramStr;
+                }
+                
+                $nonceURL = wp_nonce_url( get_permalink( $player->ID ), 'single-player', 'mstw-tr-nonce' );
+                $player_html = '<a href="' . $nonceURL . $paramStr . '">' . $player_name . '</a>';;
+                
             }
         }
@@ -1265 +1274 @@
         
         //for testing only
-        //$this -> set_current_team( '' );
+        //mstw_tr_set_current_team( '' );
         
         $current_team = get_option( 'tr-current-team', '' );
+        
+        //mstw_log_msg( "mstw_tr_get_current_team: current_team = $current_team" );
         
         // We should get a current team, but in case we don't we'll take the
@@ -1847 +1858 @@
             
             default:
-                mstw_tr_log_msg( "CONTROL TYPE $type NOT RECOGNIZED." );
+                mstw_log_msg( "CONTROL TYPE $type NOT RECOGNIZED." );
                 echo "CONTROL TYPE ", esc_html( $type ), " NOT RECOGNIZED.";
             break;
@@ -2023 +2034 @@
         
     } //End: mstw_tr_build_settings_field()
+}
+
+/*---------------------------------------------------------------------------------*/
+//  44. mstw_tr_build_player_link_html: 
+//      ARGUMENTS: 
+//      RETURNS  : 
+//  
+if ( !function_exists( 'mstw_tr_build_player_link_html' ) ) {
+    function mstw_tr_build_player_link_html( $playerURL, $playerDisplay ) {
+        //mstw_log_msg( "mstw_tr_build_player_link_html:" );
+        
+        $playerHTML = '<a href="' .  $playerURL . '">' . $playerDisplay . '</a>';
+        
+        return $playerHTML;
+        
+    } //End: mstw_tr_build_player_link_html( )
+}
+
+/*---------------------------------------------------------------------------------*/
+//  45. mstw_tr_build_player_url: 
+//      ARGUMENTS: 
+//      RETURNS  : 
+//  
+if ( !function_exists( 'mstw_tr_build_player_url' ) ) {
+    function mstw_tr_build_player_url( $postID, $playerID ) {
+        //mstw_log_msg( "mstw_tr_build_player_url:" );
+        
+        $nonceURL = wp_nonce_url( get_permalink( $playerID ), 'single-player', 'mstw-tr-nonce' );
+        $nonceURL .= '&position='. $postID;
+        
+        return $nonceURL;
+    } //End: mstw_tr_build_player_url()
 }
 

team-rosters/trunk/includes/mstw-utility-functions.php

@@ -26 +26 @@
  * 1. mstw_log_msg - writes debug messages to /wp-content/debug.log
  *                   if the WP_DEBUG settings in wp-config are correct
- * 2. mstw_requires_wordpress_version - checks for the right WordPress version 
+ * 2. mstw_requires_wordpress_version - removed from team rosters 
  * 3. mstw_safe_ref - prevents uninitialized string errors 
- * 3.1  mstw_safe_get - Safely get value for a key from an array
+ * 3.1 mstw_safe_get - Safely get value for a key from an array
+ * 3.2 mstw_really_safe_get - safely get data from array that makes PCP happy :)
  * 4. mstw_build_css_rule - builds css rules from an array of options
  *                          generally from get_option() without errors
@@ -88 +89 @@
 //
 /*
- * Removed from team rosters version
+ *  Removed from team rosters plugin
  */
 
@@ -119 +120 @@
     function mstw_safe_get( $needle, $haystack, $default = '' ) {
         //mstw_log_msg( "mstw_safe_get: needle= $needle" haystack= $haystack" );
-        
+                                                            
         if ( array_key_exists( $needle, $haystack ) ) {
             return $haystack[ $needle ];
@@ -130 +131 @@
     } //End: mstw_safe_get( )
 }
+
+//--------------------------------------------------------------------------------
+// 3.2 mstw_really_safe_get - safely get data from array that makes PCP happy :)
+//          unslashes and sanitizes the array field - used primarily with $_POST and 
+//          $_GET to satisify PCP recommended practices 
+//  ARGUMENTS:
+//      $needle - a (candidate) array key
+//      $haystack - an array
+//      $default - returned if $needle is not (a key) in $haystack
+//
+//  RETURNS
+//      $haystack[ $needle ] if $needle exists as a key. $default otherwise.
+//
+if ( !function_exists ( 'mstw_really_safe_get' ) ) {
+    function mstw_really_safe_get( $needle, $haystack, $default = '' ) {
+        //mstw_log_msg( "mstw_really_safe_get:" );
+        
+        if ( isset( $haystack[ $needle ] ) ) {
+            return sanitize_text_field( wp_unslash( $haystack[ $needle ] ) );       
+        }
+        else {
+            return $default;
+            
+        }
+
+    } //End: mstw_really_safe_get( )
+}
+
 
 //------------------------------------------------------------------------------
@@ -263 +292 @@
 //
 /*
- * Removed from team rosters version
+ * Removed from team rosters plugin version
  */
 
@@ -358 +387 @@
             update_post_meta( $post_id, $key, esc_url( $url ) );
             
-        } else { 
+        }
+        else { 
             // url is not valid, display an error message (dont' update DB)
             $notice .= ' ' . $url;          
@@ -365 +395 @@
             }
         }
-    } //End: mstw_validate_url( )
+    } //End: mstw_validate_url()
 }
 
@@ -377 +407 @@
 // http://themergency.com/wordpress-tip-get-post-type-in-admin/
 //
+/*
 if ( !function_exists( 'mstw_get_current_post_type' ) ) {
     function mstw_get_current_post_type( ) {
@@ -393 +424 @@
             *   Processing form data without nonce verification.
             * This utility function is just trying to find a post type??
-            */
+            
         elseif( isset( $_REQUEST['post_type'] ) )
             return sanitize_key( $_REQUEST['post_type'] );
@@ -402 +433 @@
     } //End: mstw_get_current_post_type( )
 }
+*/
 
 //-------------------------------------------------------------------------------

team-rosters/trunk/js/tr-manage-rosters.js

@@ -5 +5 @@
  *
  *  MSTW Wordpress Plugins (http://shoalsummitsolutions.com)
- *  Copyright 2017-22 Mark O'Donnell ([email protected])
+ *  Copyright 2017-25 Mark O'Donnell ([email protected])
  *
  *  This program is distributed in the hope that it will be useful,
@@ -13 +13 @@
 
 jQuery(document).ready( function( $ ) {
-    //alert( "Doc is ready" );
     //console.log( "Doc is ready" );
     
@@ -20 +19 @@
     //
     $( '#current-team' ).change( function( event ) {
-        //alert( 'tr-manage-rosters.js tourney changed ... id= ' + event.target.id );
-        //console.log( 'tr-manage-rosters.js tourney changed ... id= ' + event.target.id );
-        //alert( 'tourney: ' + this.value );
+        //console.log( 'tr-manage-rosters.js team changed ... id= ' + event.target.id );
         
         var data = {
@@ -31 +28 @@
               };
               
-        jQuery.post( ajaxurl, data, function( response ) {
-            //alert( 'Got this from the server: ' + response );
+        jQuery.post( mstw_tr_manage_rosters_ajax.ajaxurl, data, function( response ) {
+            //console_log( 'Got this from the server: ' + response );
             var object = jQuery.parseJSON( response );
             
@@ -39 +36 @@
             }
             else {
-                //alert( "Current team updated" );
+                //console_log( "Current team updated" );
             }
             

team-rosters/trunk/js/tr-sort-roster-table.js

@@ -3 +3 @@
  *
  *  MSTW Wordpress Plugins (http://shoalsummitsolutions.com)
- *  Copyright 2020-22 Mark O'Donnell ([email protected])
+ *  Copyright 2020-25 Mark O'Donnell ([email protected])
  *
  *  This program is free software: you can redistribute it and/or modify

team-rosters/trunk/js/tr-team-roster-2-ajax.js

@@ -1 +1 @@
 // tr-team-roster-2-ajax.js
 // JavaScript to sort team roster - mstw-tr-roster-2 shortcode (mstw-tr-roster-tables-class.php)
-//
+/*
+ *  MSTW Wordpress Plugins (http://shoalsummitsolutions.com)
+ *  Copyright 2017-25 Mark O'Donnell ([email protected])
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ */
 
 jQuery(document).ready( function( $ ) {

team-rosters/trunk/lang/team-rosters.pot

@@ -3 +3 @@
 msgstr ""
 "Project-Id-Version: MSTW Team Rosters\n"
-"POT-Creation-Date: 2025-02-14 15:58-0600\n"
+"POT-Creation-Date: 2025-06-24 22:11-0500\n"
 "PO-Revision-Date: 2025-02-14 15:57-0600\n"
 "Last-Translator: \n"
@@ -11 +11 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
-"X-Generator: Poedit 3.5\n"
+"X-Generator: Poedit 3.6\n"
 "X-Poedit-Basepath: ..\n"
 "X-Poedit-Flags-xgettext: --add-comments=translators:\n"
 "X-Poedit-WPHeader: mstw-team-rosters.php\n"
 "X-Poedit-SourceCharset: UTF-8\n"
-"X-Poedit-KeywordsList: __;_e;_n:1,2;_x:1,2c;_ex:1,2c;_nx:4c,1,2;esc_attr__;"
-"esc_attr_e;esc_attr_x:1,2c;esc_html__;esc_html_e;esc_html_x:1,2c;_n_noop:1,2;"
-"_nx_noop:3c,1,2;__ngettext_noop:1,2\n"
+"X-Poedit-KeywordsList: "
+"__;_e;_n:1,2;_x:1,2c;_ex:1,2c;_nx:4c,1,2;esc_attr__;esc_attr_e;esc_attr_x:1,2c;esc_html__;esc_html_e;esc_html_x:1,2c;_n_noop:1,2;_nx_noop:3c,1,2;__ngettext_noop:1,2\n"
 "X-Poedit-SearchPath-0: .\n"
 "X-Poedit-SearchPathExcluded-0: *.min.js\n"
@@ -26 +25 @@
 msgstr ""
 
-#: includes/mstw-tr-admin.php:390 includes/mstw-tr-admin.php:391
+#. Plugin Name of the plugin/theme
+#: includes/mstw-tr-admin.php:359 includes/mstw-tr-admin.php:360
 msgid "Team Rosters"
 msgstr ""
 
-#: includes/mstw-tr-admin.php:408 includes/mstw-tr-admin.php:409
-#: includes/mstw-tr-cpts.php:120 includes/mstw-tr-csv-import-class.php:96
-#: includes/mstw-tr-team-tax-admin-class.php:394
+#: includes/mstw-tr-admin.php:377 includes/mstw-tr-admin.php:378
+#: includes/mstw-tr-cpts.php:120 includes/mstw-tr-csv-import-class.php:98
+#: includes/mstw-tr-team-tax-admin-class.php:385
 msgid "Teams"
 msgstr ""
 
-#: includes/mstw-tr-admin.php:429
+#: includes/mstw-tr-admin.php:398
 msgid "All Players"
 msgstr ""
 
-#: includes/mstw-tr-admin.php:430 includes/mstw-tr-player-cpt-admin.php:631
+#: includes/mstw-tr-admin.php:399 includes/mstw-tr-player-cpt-admin.php:639
 msgid "Manage Players"
 msgstr ""
 
-#: includes/mstw-tr-admin.php:452
-#: includes/mstw-tr-team-roster-admin-class.php:233
-#: includes/mstw-tr-team-roster-admin-class.php:709
+#: includes/mstw-tr-admin.php:421
+#: includes/mstw-tr-team-roster-admin-class.php:226
+#: includes/mstw-tr-team-roster-admin-class.php:693
 msgid "Add Players"
 msgstr ""
 
-#: includes/mstw-tr-admin.php:453
+#: includes/mstw-tr-admin.php:422
 msgid "Add Players to Rosters"
 msgstr ""
 
-#: includes/mstw-tr-admin.php:467 includes/mstw-tr-admin.php:468
+#: includes/mstw-tr-admin.php:436 includes/mstw-tr-admin.php:437
 msgid "Edit Rosters"
 msgstr ""
 
-#: includes/mstw-tr-admin.php:487 includes/mstw-tr-admin.php:488
+#: includes/mstw-tr-admin.php:456 includes/mstw-tr-admin.php:457
 msgid "Settings"
 msgstr ""
 
-#: includes/mstw-tr-admin.php:566 includes/mstw-tr-admin.php:569
+#: includes/mstw-tr-admin.php:512 includes/mstw-tr-admin.php:515
 msgid "Player updated."
 msgstr ""
 
-#: includes/mstw-tr-admin.php:567
+#: includes/mstw-tr-admin.php:513
 msgid "Custom field updated."
 msgstr ""
 
-#: includes/mstw-tr-admin.php:568
+#: includes/mstw-tr-admin.php:514
 msgid "Custom field deleted."
 msgstr ""
 
-#: includes/mstw-tr-admin.php:570
+#: includes/mstw-tr-admin.php:516
 msgid "Player restored to revision"
 msgstr ""
 
-#: includes/mstw-tr-admin.php:571
+#: includes/mstw-tr-admin.php:517
 msgid "Player published."
 msgstr ""
 
-#: includes/mstw-tr-admin.php:572
+#: includes/mstw-tr-admin.php:518
 msgid "Player saved."
 msgstr ""
 
-#: includes/mstw-tr-admin.php:573
+#: includes/mstw-tr-admin.php:519
 msgid "Player submitted."
 msgstr ""
 
-#: includes/mstw-tr-admin.php:574
+#: includes/mstw-tr-admin.php:520
 msgid "Player scheduled for publication."
 msgstr ""
 
-#: includes/mstw-tr-admin.php:575
+#: includes/mstw-tr-admin.php:521
 msgid "Player draft updated."
 msgstr ""
 
 #. translators: %s: count of players updated
-#: includes/mstw-tr-admin.php:591
+#: includes/mstw-tr-admin.php:537
 #, php-format
 msgid "%s player updated."
@@ -107 +107 @@
 
 #. translators: %s: count of players deleted
-#: includes/mstw-tr-admin.php:593
+#: includes/mstw-tr-admin.php:539
 #, php-format
 msgid "%s player not updated, somebody is editing it."
@@ -115 +115 @@
 
 #. translators: %s: count of players deleted
-#: includes/mstw-tr-admin.php:595
+#: includes/mstw-tr-admin.php:541
 #, php-format
 msgid "%s player permanently deleted."
@@ -123 +123 @@
 
 #. translators: %s: count of players moved to trash
-#: includes/mstw-tr-admin.php:597
+#: includes/mstw-tr-admin.php:543
 #, php-format
 msgid "%s player moved to the Trash."
@@ -131 +131 @@
 
 #. translators: %s: count of players restored from trash
-#: includes/mstw-tr-admin.php:599
+#: includes/mstw-tr-admin.php:545
 #, php-format
 msgid "%s player restored from the Trash."
@@ -138 +138 @@
 msgstr[1] ""
 
-#: includes/mstw-tr-admin.php:617
+#: includes/mstw-tr-admin.php:563
 msgid "Team added."
 msgstr ""
 
-#: includes/mstw-tr-admin.php:618
+#: includes/mstw-tr-admin.php:564
 msgid "Team deleted."
 msgstr ""
 
-#: includes/mstw-tr-admin.php:619
+#: includes/mstw-tr-admin.php:565
 msgid "Team updated."
 msgstr ""
 
-#: includes/mstw-tr-admin.php:620
+#: includes/mstw-tr-admin.php:566
 msgid "Team not added."
 msgstr ""
 
-#: includes/mstw-tr-admin.php:621
+#: includes/mstw-tr-admin.php:567
 msgid "Team not updated."
 msgstr ""
 
-#: includes/mstw-tr-admin.php:622
+#: includes/mstw-tr-admin.php:568
 msgid "Teams deleted."
 msgstr ""
 
-#: includes/mstw-tr-admin.php:679 mstw-team-rosters.php:764
+#: includes/mstw-tr-admin.php:620 mstw-team-rosters.php:750
 msgid "AJAX Error: invalid action."
 msgstr ""
 
-#: includes/mstw-tr-admin.php:685 mstw-team-rosters.php:769
+#: includes/mstw-tr-admin.php:626 mstw-team-rosters.php:756
 msgid "AJAX Error: no action found."
 msgstr ""
 
-#: includes/mstw-tr-admin.php:726 includes/mstw-tr-admin.php:766
+#: includes/mstw-tr-admin.php:670 includes/mstw-tr-admin.php:710
 msgid "AJAX Error: No league provided to handler."
 msgstr ""
 
-#: includes/mstw-tr-admin.php:874
+#: includes/mstw-tr-admin.php:772
+msgid "fatal error encountered in team rosters"
+msgstr ""
+
+#: includes/mstw-tr-admin.php:776
+msgid "fatal error encountered in team Rosters"
+msgstr ""
+
+#: includes/mstw-tr-admin.php:818
 msgid "Team Rosters - Quick Start"
 msgstr ""
 
-#: includes/mstw-tr-admin.php:877
+#: includes/mstw-tr-admin.php:821
 msgid ""
 "At least one team must exist before anything can be displayed via the "
@@ -185 +193 @@
 msgstr ""
 
-#: includes/mstw-tr-admin.php:878
+#: includes/mstw-tr-admin.php:822
 msgid ""
 "After creating one or more teams, players must be added to them. Players may "
@@ -192 +200 @@
 msgstr ""
 
-#: includes/mstw-tr-admin.php:879
+#: includes/mstw-tr-admin.php:823
 msgid ""
 "Multiple players may be added to a roster via this screen. While the same "
@@ -199 +207 @@
 msgstr ""
 
-#: includes/mstw-tr-admin.php:880
+#: includes/mstw-tr-admin.php:824
 msgid ""
 "Entire rosters may be edited or updated via this screen. While the same data "
@@ -206 +214 @@
 msgstr ""
 
-#: includes/mstw-tr-admin.php:881
+#: includes/mstw-tr-admin.php:825
 msgid ""
 "Provides a rich set of controls for ROSTER TABLES, ROSTER GALLERIES, and "
@@ -212 +220 @@
 msgstr ""
 
-#: includes/mstw-tr-admin.php:882
+#: includes/mstw-tr-admin.php:826
 msgid ""
 "Provides the ability to upload Teams and Players (including player photos) "
@@ -220 +228 @@
 msgstr ""
 
-#: includes/mstw-tr-admin.php:890
+#: includes/mstw-tr-admin.php:834
 #, php-format
 msgid ""
@@ -232 +240 @@
 
 #: includes/mstw-tr-cpts.php:39 includes/mstw-tr-cpts.php:84
-#: includes/mstw-tr-cpts.php:86 includes/mstw-tr-csv-import-class.php:145
-#: includes/mstw-tr-team-tax-admin-class.php:225
+#: includes/mstw-tr-cpts.php:86 includes/mstw-tr-csv-import-class.php:141
+#: includes/mstw-tr-team-tax-admin-class.php:226
 msgid "Players"
 msgstr ""
@@ -293 +301 @@
 msgstr ""
 
-#: includes/mstw-tr-cpts.php:112 includes/mstw-tr-team-tax-admin-class.php:399
+#: includes/mstw-tr-cpts.php:112 includes/mstw-tr-team-tax-admin-class.php:390
 msgid "Edit Team"
 msgstr ""
@@ -325 +333 @@
 msgstr ""
 
-#: includes/mstw-tr-csv-import-class.php:86
+#: includes/mstw-tr-csv-import-class.php:87
 msgid "Import CSV Files"
 msgstr ""
 
-#: includes/mstw-tr-csv-import-class.php:89
-#: includes/mstw-tr-team-roster-admin-class.php:127
+#: includes/mstw-tr-csv-import-class.php:90
+#: includes/mstw-tr-team-roster-admin-class.php:131
 msgid "Read the contextual help tab on the top right of this screen."
 msgstr ""
 
-#: includes/mstw-tr-csv-import-class.php:99
+#: includes/mstw-tr-csv-import-class.php:101
 msgid "Teams CSV file:"
 msgstr ""
 
-#: includes/mstw-tr-csv-import-class.php:106
-#: includes/mstw-tr-csv-import-class.php:236
+#: includes/mstw-tr-csv-import-class.php:108
+#: includes/mstw-tr-csv-import-class.php:231
 msgid "Import Teams"
 msgstr ""
 
 #. translators: %1s: HTML newline that should not be translated
-#: includes/mstw-tr-csv-import-class.php:149
+#: includes/mstw-tr-csv-import-class.php:145
 #, php-format
 msgid ""
@@ -354 +362 @@
 msgstr ""
 
-#: includes/mstw-tr-csv-import-class.php:155
+#: includes/mstw-tr-csv-import-class.php:151
 msgid "Select Team to Import:"
 msgstr ""
 
-#: includes/mstw-tr-csv-import-class.php:158
+#: includes/mstw-tr-csv-import-class.php:154
 msgid ""
 "This team will be used as the default if there is no entry for a player in "
@@ -364 +372 @@
 msgstr ""
 
-#: includes/mstw-tr-csv-import-class.php:162
+#: includes/mstw-tr-csv-import-class.php:158
 msgid "Move Player Photos:"
 msgstr ""
 
-#: includes/mstw-tr-csv-import-class.php:165
+#: includes/mstw-tr-csv-import-class.php:161
 msgid ""
 "If checked, photo files will be imported from their current locations to the "
@@ -375 +383 @@
 msgstr ""
 
-#: includes/mstw-tr-csv-import-class.php:169
+#: includes/mstw-tr-csv-import-class.php:165
 msgid "Players CSV file:"
 msgstr ""
 
-#: includes/mstw-tr-csv-import-class.php:172
+#: includes/mstw-tr-csv-import-class.php:168
 msgid "Select the CSV players file to import."
 msgstr ""
 
-#: includes/mstw-tr-csv-import-class.php:239
+#: includes/mstw-tr-csv-import-class.php:237
+#: includes/mstw-tr-csv-import-class.php:242
+#: includes/mstw-tr-csv-import-class.php:261
+#: includes/mstw-tr-csv-import-class.php:267
+msgid "Problem encountered with CSV file. Exiting."
+msgstr ""
+
+#: includes/mstw-tr-csv-import-class.php:250
 msgid "team"
 msgstr ""
 
-#: includes/mstw-tr-csv-import-class.php:239
+#: includes/mstw-tr-csv-import-class.php:250
 msgid "teams"
 msgstr ""
 
-#: includes/mstw-tr-csv-import-class.php:242
-#: includes/mstw-tr-csv-import-class.php:354
+#: includes/mstw-tr-csv-import-class.php:253
+#: includes/mstw-tr-csv-import-class.php:391
 msgid "Import Players"
 msgstr ""
 
-#: includes/mstw-tr-csv-import-class.php:245
+#: includes/mstw-tr-csv-import-class.php:275
 msgid "player"
 msgstr ""
 
-#: includes/mstw-tr-csv-import-class.php:245
+#: includes/mstw-tr-csv-import-class.php:275
 msgid "players"
 msgstr ""
 
 #. translators: %s: filename
-#: includes/mstw-tr-csv-import-class.php:271
+#: includes/mstw-tr-csv-import-class.php:305
 #, php-format
 msgid "Failed to load file %s, aborting."
@@ -411 +426 @@
 
 #. translators: %1$s 'record' or 'records' skipped %
-#: includes/mstw-tr-csv-import-class.php:326
+#: includes/mstw-tr-csv-import-class.php:363
 #, php-format
 msgid "Skipped %1$s record."
@@ -419 +434 @@
 
 #. translators: %1$s/%2$s 'record' or 'records' processed
-#: includes/mstw-tr-csv-import-class.php:335
+#: includes/mstw-tr-csv-import-class.php:371
 #, php-format
 msgid "Imported %1$s record in %2$.2f seconds."
@@ -426 +441 @@
 msgstr[1] ""
 
-#: includes/mstw-tr-csv-import-class.php:378
+#: includes/mstw-tr-csv-import-class.php:415
 msgid "No first or last name."
 msgstr ""
 
-#: includes/mstw-tr-csv-import-class.php:384
+#: includes/mstw-tr-csv-import-class.php:421
 msgid "No title imported"
 msgstr ""
 
 #. translators: %s: import type
-#: includes/mstw-tr-csv-import-class.php:392
+#: includes/mstw-tr-csv-import-class.php:429
 #, php-format
 msgid "Unknown import type \"%s\"."
 msgstr ""
 
-#: includes/mstw-tr-csv-import-class.php:433
-#: includes/mstw-tr-csv-import-class.php:446
-#: includes/mstw-tr-player-cpt-admin.php:119
-#: includes/mstw-tr-player-cpt-admin.php:125
-msgid "----"
-msgstr ""
-
-#: includes/mstw-tr-csv-import-class.php:435
-#: includes/mstw-tr-csv-import-class.php:448
+#: includes/mstw-tr-csv-import-class.php:470
+#: includes/mstw-tr-csv-import-class.php:483
 #: includes/mstw-tr-player-cpt-admin.php:120
 #: includes/mstw-tr-player-cpt-admin.php:126
-#: includes/mstw-tr-roster-tables-class.php:412
-#: includes/mstw-tr-utility-functions.php:919
-#: includes/mstw-tr-utility-functions.php:920
-msgid "R"
-msgstr ""
-
-#: includes/mstw-tr-csv-import-class.php:436
-#: includes/mstw-tr-csv-import-class.php:449
-msgid "r"
-msgstr ""
-
-#: includes/mstw-tr-csv-import-class.php:438
-#: includes/mstw-tr-csv-import-class.php:451
+msgid "----"
+msgstr ""
+
+#: includes/mstw-tr-csv-import-class.php:472
+#: includes/mstw-tr-csv-import-class.php:485
 #: includes/mstw-tr-player-cpt-admin.php:121
 #: includes/mstw-tr-player-cpt-admin.php:127
+#: includes/mstw-tr-roster-tables-class.php:411
+#: includes/mstw-tr-utility-functions.php:920
+#: includes/mstw-tr-utility-functions.php:921
+msgid "R"
+msgstr ""
+
+#: includes/mstw-tr-csv-import-class.php:473
+#: includes/mstw-tr-csv-import-class.php:486
+msgid "r"
+msgstr ""
+
+#: includes/mstw-tr-csv-import-class.php:475
+#: includes/mstw-tr-csv-import-class.php:488
+#: includes/mstw-tr-player-cpt-admin.php:122
+#: includes/mstw-tr-player-cpt-admin.php:128
+#: includes/mstw-tr-roster-tables-class.php:412
+#: includes/mstw-tr-utility-functions.php:924
+#: includes/mstw-tr-utility-functions.php:925
+msgid "L"
+msgstr ""
+
+#: includes/mstw-tr-csv-import-class.php:476
+#: includes/mstw-tr-csv-import-class.php:489
+msgid "l"
+msgstr ""
+
+#: includes/mstw-tr-csv-import-class.php:478
+#: includes/mstw-tr-player-cpt-admin.php:123
 #: includes/mstw-tr-roster-tables-class.php:413
-#: includes/mstw-tr-utility-functions.php:923
-#: includes/mstw-tr-utility-functions.php:924
-msgid "L"
-msgstr ""
-
-#: includes/mstw-tr-csv-import-class.php:439
-#: includes/mstw-tr-csv-import-class.php:452
-msgid "l"
-msgstr ""
-
-#: includes/mstw-tr-csv-import-class.php:441
-#: includes/mstw-tr-player-cpt-admin.php:122
-#: includes/mstw-tr-roster-tables-class.php:414
-#: includes/mstw-tr-utility-functions.php:927
 #: includes/mstw-tr-utility-functions.php:928
+#: includes/mstw-tr-utility-functions.php:929
 msgid "B"
 msgstr ""
 
-#: includes/mstw-tr-csv-import-class.php:442
+#: includes/mstw-tr-csv-import-class.php:479
 msgid "b"
 msgstr ""
 
-#: includes/mstw-tr-csv-import-class.php:675
+#: includes/mstw-tr-csv-import-class.php:715
 msgid "No team name or slug found."
 msgstr ""
 
+#: includes/mstw-tr-csv-import-class.php:771
+#: includes/mstw-tr-csv-import-class.php:778
+msgid "Failed to get file contents."
+msgstr ""
+
 #. translators: %s: filename
-#: includes/mstw-tr-csv-import-class.php:750
+#: includes/mstw-tr-csv-import-class.php:792
 #, php-format
 msgid "Failed to open file: %s."
 msgstr ""
 
-#: includes/mstw-tr-csv-import-class.php:775
+#: includes/mstw-tr-csv-import-class.php:817
 msgid "CSV Import"
 msgstr ""
 
-#: includes/mstw-tr-csv-import-class.php:790
+#: includes/mstw-tr-csv-import-class.php:832
 msgid ""
 "This screen allows the import of teams and players from files in CSV format. "
@@ -509 +529 @@
 msgstr ""
 
-#: includes/mstw-tr-csv-import-class.php:792
+#: includes/mstw-tr-csv-import-class.php:834
 msgid "To import teams, simply choose the CSV file and click \"Import Teams\"."
 msgstr ""
 
-#: includes/mstw-tr-csv-import-class.php:794
+#: includes/mstw-tr-csv-import-class.php:836
 msgid ""
 "To import players, first select the CSV file containing the players, then "
@@ -519 +539 @@
 msgstr ""
 
-#: includes/mstw-tr-csv-import-class.php:797
+#: includes/mstw-tr-csv-import-class.php:839
 msgid "Select an existing team. Players will be addeded to that team."
 msgstr ""
 
-#: includes/mstw-tr-csv-import-class.php:798
+#: includes/mstw-tr-csv-import-class.php:840
 msgid ""
 "Don't elect an existing team, and provide the team(s) in the player_teams "
@@ -530 +550 @@
 msgstr ""
 
-#: includes/mstw-tr-csv-import-class.php:799
+#: includes/mstw-tr-csv-import-class.php:841
 msgid ""
 "Choose whether you want the player photos (provided in the CSV file) to be "
@@ -539 +559 @@
 msgstr ""
 
-#: includes/mstw-tr-csv-import-class.php:802
+#: includes/mstw-tr-csv-import-class.php:844
 msgid ""
 "NOTE THAT IT CAN TAKE A SIGNFICANT AMOUNT OF TIME TO IMPORT PLAYERS. In "
@@ -546 +566 @@
 msgstr ""
 
-#: includes/mstw-tr-csv-import-class.php:804
+#: includes/mstw-tr-csv-import-class.php:846
 msgid "See the plugin Users Manual on shoalsummitsolutions.com"
 msgstr ""
 
-#: includes/mstw-tr-data-fields-columns-settings.php:46
+#: includes/mstw-tr-data-fields-columns-settings.php:44
 msgid "Data Fields Labels"
 msgstr ""
 
-#: includes/mstw-tr-data-fields-columns-settings.php:60
+#: includes/mstw-tr-data-fields-columns-settings.php:58
 msgid "Photo Label:"
 msgstr ""
 
-#: includes/mstw-tr-data-fields-columns-settings.php:61
+#: includes/mstw-tr-data-fields-columns-settings.php:59
 msgid "(Default: Photo)"
 msgstr ""
 
-#: includes/mstw-tr-data-fields-columns-settings.php:71
+#: includes/mstw-tr-data-fields-columns-settings.php:69
 msgid "Name Label:"
 msgstr ""
 
-#: includes/mstw-tr-data-fields-columns-settings.php:72
+#: includes/mstw-tr-data-fields-columns-settings.php:70
 msgid "(Default: Name)"
 msgstr ""
 
-#: includes/mstw-tr-data-fields-columns-settings.php:82
+#: includes/mstw-tr-data-fields-columns-settings.php:80
 msgid "Number Label:"
 msgstr ""
 
-#: includes/mstw-tr-data-fields-columns-settings.php:83
+#: includes/mstw-tr-data-fields-columns-settings.php:81
 msgid "(Default: Nbr)"
 msgstr ""
 
-#: includes/mstw-tr-data-fields-columns-settings.php:93
+#: includes/mstw-tr-data-fields-columns-settings.php:91
 msgid "Position Label:"
 msgstr ""
 
-#: includes/mstw-tr-data-fields-columns-settings.php:94
+#: includes/mstw-tr-data-fields-columns-settings.php:92
 msgid "(Default: Pos)"
 msgstr ""
 
-#: includes/mstw-tr-data-fields-columns-settings.php:104
+#: includes/mstw-tr-data-fields-columns-settings.php:102
 msgid "Height Label:"
 msgstr ""
 
-#: includes/mstw-tr-data-fields-columns-settings.php:105
+#: includes/mstw-tr-data-fields-columns-settings.php:103
 msgid "(Default: Ht)"
 msgstr ""
 
-#: includes/mstw-tr-data-fields-columns-settings.php:115
+#: includes/mstw-tr-data-fields-columns-settings.php:113
 msgid "Weight Label:"
 msgstr ""
 
-#: includes/mstw-tr-data-fields-columns-settings.php:116
+#: includes/mstw-tr-data-fields-columns-settings.php:114
 msgid "(Default: Wt)"
 msgstr ""
 
-#: includes/mstw-tr-data-fields-columns-settings.php:126
+#: includes/mstw-tr-data-fields-columns-settings.php:124
 msgid "Year Label:"
 msgstr ""
 
-#: includes/mstw-tr-data-fields-columns-settings.php:127
+#: includes/mstw-tr-data-fields-columns-settings.php:125
 msgid "(Default: Year)"
 msgstr ""
 
-#: includes/mstw-tr-data-fields-columns-settings.php:137
+#: includes/mstw-tr-data-fields-columns-settings.php:135
 msgid "Experience Label:"
 msgstr ""
 
-#: includes/mstw-tr-data-fields-columns-settings.php:138
+#: includes/mstw-tr-data-fields-columns-settings.php:136
 msgid "(Default: Exp)"
 msgstr ""
 
-#: includes/mstw-tr-data-fields-columns-settings.php:148
+#: includes/mstw-tr-data-fields-columns-settings.php:146
 msgid "Age Label:"
 msgstr ""
 
-#: includes/mstw-tr-data-fields-columns-settings.php:149
+#: includes/mstw-tr-data-fields-columns-settings.php:147
 msgid "(Default: Age)"
 msgstr ""
 
-#: includes/mstw-tr-data-fields-columns-settings.php:159
+#: includes/mstw-tr-data-fields-columns-settings.php:157
 msgid "Home Town Label:"
 msgstr ""
 
-#: includes/mstw-tr-data-fields-columns-settings.php:160
+#: includes/mstw-tr-data-fields-columns-settings.php:158
 msgid "(Default: Home Town)"
 msgstr ""
 
-#: includes/mstw-tr-data-fields-columns-settings.php:170
+#: includes/mstw-tr-data-fields-columns-settings.php:168
 msgid "Last School Label:"
 msgstr ""
 
-#: includes/mstw-tr-data-fields-columns-settings.php:171
+#: includes/mstw-tr-data-fields-columns-settings.php:169
 msgid "(Default: Last School)"
 msgstr ""
 
-#: includes/mstw-tr-data-fields-columns-settings.php:181
+#: includes/mstw-tr-data-fields-columns-settings.php:179
 msgid "Country Label:"
 msgstr ""
 
-#: includes/mstw-tr-data-fields-columns-settings.php:182
+#: includes/mstw-tr-data-fields-columns-settings.php:180
 msgid "(Default: Country)"
 msgstr ""
 
-#: includes/mstw-tr-data-fields-columns-settings.php:192
+#: includes/mstw-tr-data-fields-columns-settings.php:190
 msgid "Bats/Throws Label:"
 msgstr ""
 
-#: includes/mstw-tr-data-fields-columns-settings.php:193
+#: includes/mstw-tr-data-fields-columns-settings.php:191
 msgid "(Default: Bat/Thw)"
 msgstr ""
 
-#: includes/mstw-tr-data-fields-columns-settings.php:203
+#: includes/mstw-tr-data-fields-columns-settings.php:201
 msgid "Other Info Label:"
 msgstr ""
 
-#: includes/mstw-tr-data-fields-columns-settings.php:204
+#: includes/mstw-tr-data-fields-columns-settings.php:202
 msgid "(Default: Other)"
 msgstr ""
 
-#: includes/mstw-tr-data-fields-columns-settings.php:225
+#: includes/mstw-tr-data-fields-columns-settings.php:223
 msgid "Visibility"
 msgstr ""
 
-#: includes/mstw-tr-data-fields-columns-settings.php:239
-#: includes/mstw-tr-data-fields-columns-settings.php:305
-#: includes/mstw-tr-data-fields-columns-settings.php:316
-#: includes/mstw-tr-data-fields-columns-settings.php:327
-#: includes/mstw-tr-data-fields-columns-settings.php:338
-#: includes/mstw-tr-data-fields-columns-settings.php:349
-#: includes/mstw-tr-data-fields-columns-settings.php:360
-#: includes/mstw-tr-data-fields-columns-settings.php:371
-#: includes/mstw-tr-data-fields-columns-settings.php:382
+#: includes/mstw-tr-data-fields-columns-settings.php:237
+#: includes/mstw-tr-data-fields-columns-settings.php:303
+#: includes/mstw-tr-data-fields-columns-settings.php:314
+#: includes/mstw-tr-data-fields-columns-settings.php:325
+#: includes/mstw-tr-data-fields-columns-settings.php:336
+#: includes/mstw-tr-data-fields-columns-settings.php:347
+#: includes/mstw-tr-data-fields-columns-settings.php:358
+#: includes/mstw-tr-data-fields-columns-settings.php:369
+#: includes/mstw-tr-data-fields-columns-settings.php:380
 msgid "(Default: Hide)"
 msgstr ""
 
-#: includes/mstw-tr-data-fields-columns-settings.php:250
+#: includes/mstw-tr-data-fields-columns-settings.php:248
 msgid "(Always shown.)"
 msgstr ""
 
-#: includes/mstw-tr-data-fields-columns-settings.php:261
-#: includes/mstw-tr-data-fields-columns-settings.php:272
-#: includes/mstw-tr-data-fields-columns-settings.php:283
-#: includes/mstw-tr-data-fields-columns-settings.php:294
+#: includes/mstw-tr-data-fields-columns-settings.php:259
+#: includes/mstw-tr-data-fields-columns-settings.php:270
+#: includes/mstw-tr-data-fields-columns-settings.php:281
+#: includes/mstw-tr-data-fields-columns-settings.php:292
 msgid "(Default: Show)"
 msgstr ""
 
-#: includes/mstw-tr-data-fields-columns-settings.php:403
+#: includes/mstw-tr-data-fields-columns-settings.php:401
 msgid "Order"
 msgstr ""
 
-#: includes/mstw-tr-data-fields-columns-settings.php:417
+#: includes/mstw-tr-data-fields-columns-settings.php:415
 msgid "(Default: 1)"
 msgstr ""
 
-#: includes/mstw-tr-data-fields-columns-settings.php:428
+#: includes/mstw-tr-data-fields-columns-settings.php:426
 msgid "(Default: 2)"
 msgstr ""
 
-#: includes/mstw-tr-data-fields-columns-settings.php:439
+#: includes/mstw-tr-data-fields-columns-settings.php:437
 msgid "(Default: 3)"
 msgstr ""
 
-#: includes/mstw-tr-data-fields-columns-settings.php:450
+#: includes/mstw-tr-data-fields-columns-settings.php:448
 msgid "(Default: 4)"
 msgstr ""
 
-#: includes/mstw-tr-data-fields-columns-settings.php:461
+#: includes/mstw-tr-data-fields-columns-settings.php:459
 msgid "(Default: 5)"
 msgstr ""
 
-#: includes/mstw-tr-data-fields-columns-settings.php:472
+#: includes/mstw-tr-data-fields-columns-settings.php:470
 msgid "(Default: 6)"
 msgstr ""
 
-#: includes/mstw-tr-data-fields-columns-settings.php:483
+#: includes/mstw-tr-data-fields-columns-settings.php:481
 msgid "(Default: 7)"
 msgstr ""
 
-#: includes/mstw-tr-data-fields-columns-settings.php:494
+#: includes/mstw-tr-data-fields-columns-settings.php:492
 msgid "(Default: 8)"
 msgstr ""
 
-#: includes/mstw-tr-data-fields-columns-settings.php:505
+#: includes/mstw-tr-data-fields-columns-settings.php:503
 msgid "(Default: 9)"
 msgstr ""
 
-#: includes/mstw-tr-data-fields-columns-settings.php:516
+#: includes/mstw-tr-data-fields-columns-settings.php:514
 msgid "(Default: 10)"
 msgstr ""
 
-#: includes/mstw-tr-data-fields-columns-settings.php:527
+#: includes/mstw-tr-data-fields-columns-settings.php:525
 msgid "(Default: 11)"
 msgstr ""
 
-#: includes/mstw-tr-data-fields-columns-settings.php:538
+#: includes/mstw-tr-data-fields-columns-settings.php:536
 msgid "(Default: 12)"
 msgstr ""
 
-#: includes/mstw-tr-data-fields-columns-settings.php:549
+#: includes/mstw-tr-data-fields-columns-settings.php:547
 msgid "(Default: 13)"
 msgstr ""
 
-#: includes/mstw-tr-data-fields-columns-settings.php:560
+#: includes/mstw-tr-data-fields-columns-settings.php:558
 msgid "(Default: 14)"
 msgstr ""
 
-#: includes/mstw-tr-data-fields-columns-settings.php:578
-msgid "Field Labels. "
-msgstr ""
-
-#: includes/mstw-tr-player-cpt-admin.php:38
+#: includes/mstw-tr-player-cpt-admin.php:39
 msgid "Player Bio:"
 msgstr ""
 
-#: includes/mstw-tr-player-cpt-admin.php:52
+#: includes/mstw-tr-player-cpt-admin.php:55
 msgid "Player Photo"
 msgstr ""
 
-#: includes/mstw-tr-player-cpt-admin.php:76
+#: includes/mstw-tr-player-cpt-admin.php:79
 msgid "Set featured image"
 msgstr ""
 
-#: includes/mstw-tr-player-cpt-admin.php:76
+#: includes/mstw-tr-player-cpt-admin.php:79
 msgid "Set Player Photo"
 msgstr ""
 
-#: includes/mstw-tr-player-cpt-admin.php:78
+#: includes/mstw-tr-player-cpt-admin.php:81
 msgid "Remove featured image"
 msgstr ""
 
-#: includes/mstw-tr-player-cpt-admin.php:78
+#: includes/mstw-tr-player-cpt-admin.php:81
 msgid "Remove Player Photo"
 msgstr ""
 
-#: includes/mstw-tr-player-cpt-admin.php:93
+#: includes/mstw-tr-player-cpt-admin.php:96
 msgid "Player Data"
 msgstr ""
 
-#: includes/mstw-tr-player-cpt-admin.php:177
+#: includes/mstw-tr-player-cpt-admin.php:178
 msgid "First Name:"
 msgstr ""
 
-#: includes/mstw-tr-player-cpt-admin.php:185
+#: includes/mstw-tr-player-cpt-admin.php:186
 msgid "Last Name:"
 msgstr ""
 
-#: includes/mstw-tr-player-cpt-admin.php:236
+#: includes/mstw-tr-player-cpt-admin.php:237
 msgid ""
 "This field is intended for the player's year in school, for example, \"So\", "
@@ -800 +816 @@
 msgstr ""
 
-#: includes/mstw-tr-player-cpt-admin.php:244
+#: includes/mstw-tr-player-cpt-admin.php:245
 msgid ""
 "This field is intended for the player's year or class in school, for "
@@ -807 +823 @@
 msgstr ""
 
-#: includes/mstw-tr-player-cpt-admin.php:252
+#: includes/mstw-tr-player-cpt-admin.php:253
 msgid ""
 "This field is intended to be the player's experience, for example, \"3 "
@@ -814 +830 @@
 msgstr ""
 
-#: includes/mstw-tr-player-cpt-admin.php:268
+#: includes/mstw-tr-player-cpt-admin.php:269
 msgid ""
 "This field is typically combined with the last school in US college and high "
@@ -820 +836 @@
 msgstr ""
 
-#: includes/mstw-tr-player-cpt-admin.php:276
+#: includes/mstw-tr-player-cpt-admin.php:277
 msgid ""
 "This field is typically combined with the home town in US college and high "
@@ -827 +843 @@
 msgstr ""
 
-#: includes/mstw-tr-player-cpt-admin.php:284
+#: includes/mstw-tr-player-cpt-admin.php:285
 msgid ""
 "This field is intended for international teams, but it could changed to "
@@ -833 +849 @@
 msgstr ""
 
-#: includes/mstw-tr-player-cpt-admin.php:290
+#: includes/mstw-tr-player-cpt-admin.php:291
 msgid "Bats:"
 msgstr ""
 
-#: includes/mstw-tr-player-cpt-admin.php:291
+#: includes/mstw-tr-player-cpt-admin.php:292
 msgid ""
 "This is a baseball specific field, but it could be used for cricket, say. It "
@@ -843 +859 @@
 msgstr ""
 
-#: includes/mstw-tr-player-cpt-admin.php:297
+#: includes/mstw-tr-player-cpt-admin.php:298
 msgid "Throws:"
 msgstr ""
 
-#: includes/mstw-tr-player-cpt-admin.php:298
+#: includes/mstw-tr-player-cpt-admin.php:299
 msgid ""
 "This is a baseball specific field. It is combined with the \"Bats\" field in "
@@ -853 +869 @@
 msgstr ""
 
-#: includes/mstw-tr-player-cpt-admin.php:306
+#: includes/mstw-tr-player-cpt-admin.php:307
 msgid "This field is a spare. It is intended to be re-purposed by site admins."
 msgstr ""
@@ -860 +876 @@
 #: includes/mstw-tr-roster-table-settings.php:94
 #: includes/mstw-tr-roster-table-settings.php:221
-#: includes/mstw-tr-roster-tables-class.php:565
+#: includes/mstw-tr-roster-tables-class.php:547
 #: includes/mstw-tr-team-roster-admin-class.php:46
-#: includes/mstw-tr-utility-functions.php:379
+#: includes/mstw-tr-utility-functions.php:380
 msgid "First Name"
 msgstr ""
@@ -869 +885 @@
 #: includes/mstw-tr-roster-table-settings.php:93
 #: includes/mstw-tr-roster-table-settings.php:220
-#: includes/mstw-tr-roster-tables-class.php:566
+#: includes/mstw-tr-roster-tables-class.php:548
 #: includes/mstw-tr-team-roster-admin-class.php:47
-#: includes/mstw-tr-utility-functions.php:380
+#: includes/mstw-tr-utility-functions.php:381
 msgid "Last Name"
 msgstr ""
@@ -879 +895 @@
 msgstr ""
 
-#: includes/mstw-tr-player-cpt-admin.php:540
+#: includes/mstw-tr-player-cpt-admin.php:545
 msgid "Show All Teams"
 msgstr ""
 
-#: includes/mstw-tr-player-cpt-admin.php:636
+#: includes/mstw-tr-player-cpt-admin.php:644
 msgid "Add/Edit Player"
 msgstr ""
 
-#: includes/mstw-tr-player-cpt-admin.php:659
+#: includes/mstw-tr-player-cpt-admin.php:667
 msgid ""
 "This screen provides a list of selected data fields for all players. The "
@@ -893 +909 @@
 msgstr ""
 
-#: includes/mstw-tr-player-cpt-admin.php:661
+#: includes/mstw-tr-player-cpt-admin.php:669
 msgid ""
 "To add a player, click the \"Add New Player\" button at the top of the "
@@ -900 +916 @@
 msgstr ""
 
-#: includes/mstw-tr-player-cpt-admin.php:663
+#: includes/mstw-tr-player-cpt-admin.php:671
 msgid "To edit a player, roll over the \"Name\" field and selecte \"Edit\"."
 msgstr ""
 
-#: includes/mstw-tr-player-cpt-admin.php:665
+#: includes/mstw-tr-player-cpt-admin.php:673
 msgid ""
 "To delete a player, roll over the \"Name\" field and selecte \"Trash\". Note "
@@ -912 +928 @@
 msgstr ""
 
-#: includes/mstw-tr-player-cpt-admin.php:667
-#: includes/mstw-tr-player-cpt-admin.php:687
+#: includes/mstw-tr-player-cpt-admin.php:675
+#: includes/mstw-tr-player-cpt-admin.php:695
 msgid "See the Data Entry - Players man page for more details."
 msgstr ""
 
-#: includes/mstw-tr-player-cpt-admin.php:673
+#: includes/mstw-tr-player-cpt-admin.php:681
 msgid ""
 "Title. The player title should always be entered. However, it does not "
@@ -923 +939 @@
 msgstr ""
 
-#: includes/mstw-tr-player-cpt-admin.php:675
+#: includes/mstw-tr-player-cpt-admin.php:683
 msgid ""
 "First Name and Last Name. At least one of these fields should be entered; "
@@ -929 +945 @@
 msgstr ""
 
-#: includes/mstw-tr-player-cpt-admin.php:677
-#: includes/mstw-tr-player-cpt-admin.php:679
+#: includes/mstw-tr-player-cpt-admin.php:685
+#: includes/mstw-tr-player-cpt-admin.php:687
 msgid ""
 "Use the Manage Teams metabox to add a player to one or more teams; "
@@ -936 +952 @@
 msgstr ""
 
-#: includes/mstw-tr-player-cpt-admin.php:681
+#: includes/mstw-tr-player-cpt-admin.php:689
 msgid ""
 "Use the Player Photo metabox to add a player photo from the Media Gallery."
 msgstr ""
 
-#: includes/mstw-tr-player-cpt-admin.php:683
+#: includes/mstw-tr-player-cpt-admin.php:691
 msgid ""
 "Use the Player Bio metabox to add a player profile/bio. Note that you can "
@@ -947 +963 @@
 msgstr ""
 
-#: includes/mstw-tr-player-cpt-admin.php:685
+#: includes/mstw-tr-player-cpt-admin.php:693
 msgid ""
 "Delete a player by clicking the \"Move to Trash\" link in the Publish "
@@ -953 +969 @@
 msgstr ""
 
-#: includes/mstw-tr-player-cpt-admin.php:707
+#: includes/mstw-tr-player-cpt-admin.php:715
 msgid ""
 "This screen allows updating the status of all games in a league and season."
 msgstr ""
 
-#: includes/mstw-tr-player-cpt-admin.php:708
+#: includes/mstw-tr-player-cpt-admin.php:716
 msgid "Select a LEAGUE and SEASON then press the Update Games Table button."
 msgstr ""
 
-#: includes/mstw-tr-player-cpt-admin.php:709
+#: includes/mstw-tr-player-cpt-admin.php:717
 msgid "Enter the status in information for each game."
 msgstr ""
 
-#: includes/mstw-tr-player-cpt-admin.php:710
+#: includes/mstw-tr-player-cpt-admin.php:718
 msgid "See the Update Games man page for more details."
 msgstr ""
@@ -1158 +1174 @@
 #: includes/mstw-tr-roster-table-settings.php:65
 #: includes/mstw-tr-roster-table-settings.php:202
-#: includes/mstw-tr-utility-functions.php:1954
-#: includes/mstw-tr-utility-functions.php:1969
-#: includes/mstw-tr-utility-functions.php:1979
-#: includes/mstw-tr-utility-functions.php:1999
-#: includes/mstw-tr-utility-functions.php:2007
-#: includes/mstw-tr-utility-functions.php:2018
-#: includes/mstw-utility-functions.php:522
-#: includes/mstw-utility-functions.php:537
-#: includes/mstw-utility-functions.php:547
-#: includes/mstw-utility-functions.php:567
-#: includes/mstw-utility-functions.php:575
-#: includes/mstw-utility-functions.php:586
+#: includes/mstw-tr-utility-functions.php:1938
+#: includes/mstw-tr-utility-functions.php:1953
+#: includes/mstw-tr-utility-functions.php:1963
+#: includes/mstw-tr-utility-functions.php:1983
+#: includes/mstw-tr-utility-functions.php:1991
+#: includes/mstw-tr-utility-functions.php:2002
 msgid "Custom"
 msgstr ""
@@ -1316 +1326 @@
 
 #: includes/mstw-tr-roster-table-settings.php:164
-#: includes/mstw-tr-roster-tables-class.php:568
+#: includes/mstw-tr-roster-tables-class.php:550
 msgid "Class/Year"
 msgstr ""
 
 #: includes/mstw-tr-roster-table-settings.php:165
-#: includes/mstw-tr-utility-functions.php:387
+#: includes/mstw-tr-utility-functions.php:388
 msgid "Class/Year (long format)"
 msgstr ""
 
 #: includes/mstw-tr-roster-table-settings.php:166
-#: includes/mstw-tr-utility-functions.php:388
+#: includes/mstw-tr-utility-functions.php:389
 msgid "Experience"
 msgstr ""
 
 #: includes/mstw-tr-roster-table-settings.php:167
-#: includes/mstw-tr-utility-functions.php:217
-#: includes/mstw-tr-utility-functions.php:389
-#: includes/mstw-tr-utility-functions.php:458
-#: includes/mstw-tr-utility-functions.php:502
-#: includes/mstw-tr-utility-functions.php:548
+#: includes/mstw-tr-utility-functions.php:218
+#: includes/mstw-tr-utility-functions.php:390
+#: includes/mstw-tr-utility-functions.php:459
+#: includes/mstw-tr-utility-functions.php:503
+#: includes/mstw-tr-utility-functions.php:549
 msgid "Age"
 msgstr ""
 
 #: includes/mstw-tr-roster-table-settings.php:168
-#: includes/mstw-tr-utility-functions.php:221
-#: includes/mstw-tr-utility-functions.php:390
-#: includes/mstw-tr-utility-functions.php:460
-#: includes/mstw-tr-utility-functions.php:506
-#: includes/mstw-tr-utility-functions.php:550
+#: includes/mstw-tr-utility-functions.php:222
+#: includes/mstw-tr-utility-functions.php:391
+#: includes/mstw-tr-utility-functions.php:461
+#: includes/mstw-tr-utility-functions.php:507
+#: includes/mstw-tr-utility-functions.php:551
 msgid "Home Town"
 msgstr ""
 
 #: includes/mstw-tr-roster-table-settings.php:169
-#: includes/mstw-tr-utility-functions.php:225
-#: includes/mstw-tr-utility-functions.php:391
-#: includes/mstw-tr-utility-functions.php:462
-#: includes/mstw-tr-utility-functions.php:508
-#: includes/mstw-tr-utility-functions.php:552
+#: includes/mstw-tr-utility-functions.php:226
+#: includes/mstw-tr-utility-functions.php:392
+#: includes/mstw-tr-utility-functions.php:463
+#: includes/mstw-tr-utility-functions.php:509
+#: includes/mstw-tr-utility-functions.php:553
 msgid "Last School"
 msgstr ""
 
 #: includes/mstw-tr-roster-table-settings.php:170
-#: includes/mstw-tr-utility-functions.php:229
-#: includes/mstw-tr-utility-functions.php:392
-#: includes/mstw-tr-utility-functions.php:464
-#: includes/mstw-tr-utility-functions.php:510
-#: includes/mstw-tr-utility-functions.php:556
+#: includes/mstw-tr-utility-functions.php:230
+#: includes/mstw-tr-utility-functions.php:393
+#: includes/mstw-tr-utility-functions.php:465
+#: includes/mstw-tr-utility-functions.php:511
+#: includes/mstw-tr-utility-functions.php:557
 msgid "Country"
 msgstr ""
 
 #: includes/mstw-tr-roster-table-settings.php:172
-#: includes/mstw-tr-utility-functions.php:395
-#: includes/mstw-tr-utility-functions.php:468
-#: includes/mstw-tr-utility-functions.php:514
-#: includes/mstw-tr-utility-functions.php:560
+#: includes/mstw-tr-utility-functions.php:396
+#: includes/mstw-tr-utility-functions.php:469
+#: includes/mstw-tr-utility-functions.php:515
+#: includes/mstw-tr-utility-functions.php:561
 msgid "Other Info"
 msgstr ""
@@ -1437 +1447 @@
 
 #. translators: %s: team slug
-#: includes/mstw-tr-roster-table.php:146
+#: includes/mstw-tr-roster-table.php:143
 #, php-format
 msgid "No players found on team: %s"
 msgstr ""
 
-#: includes/mstw-tr-roster-tables-class.php:256
-#: includes/mstw-tr-utility-functions.php:788
+#: includes/mstw-tr-roster-tables-class.php:255
+#: includes/mstw-tr-utility-functions.php:787
 msgid "No player photo found."
 msgstr ""
 
-#: includes/mstw-tr-roster-tables-class.php:411
+#: includes/mstw-tr-roster-tables-class.php:410
 msgid "--"
 msgstr ""
 
-#: includes/mstw-tr-roster-tables-class.php:564
-#: includes/mstw-tr-utility-functions.php:381
+#: includes/mstw-tr-roster-tables-class.php:546
+#: includes/mstw-tr-utility-functions.php:382
 msgid "Jersey Number"
 msgstr ""
 
-#: includes/mstw-tr-roster-tables-class.php:567
+#: includes/mstw-tr-roster-tables-class.php:549
 msgid "Hometown"
 msgstr ""
 
-#: includes/mstw-tr-roster-tables-class.php:596
+#: includes/mstw-tr-roster-tables-class.php:578
 msgid "Sort Roster"
 msgstr ""
 
-#: includes/mstw-tr-roster-tables-class.php:634
+#: includes/mstw-tr-roster-tables-class.php:614
 msgid "Roster"
 msgstr ""
@@ -1472 +1482 @@
 msgstr ""
 
-#: includes/mstw-tr-settings.php:138
+#: includes/mstw-tr-settings.php:139
 msgid "Save Changes"
 msgstr ""
 
-#: includes/mstw-tr-settings.php:140
+#: includes/mstw-tr-settings.php:141
 msgid "Reset Defaults"
 msgstr ""
 
-#: includes/mstw-tr-settings.php:156
+#: includes/mstw-tr-settings.php:157
 msgid "Roster Table Fields & Columns"
 msgstr ""
 
-#: includes/mstw-tr-settings.php:157 includes/mstw-tr-settings.php:194
+#: includes/mstw-tr-settings.php:158 includes/mstw-tr-settings.php:194
 msgid "Roster Tables"
 msgstr ""
 
-#: includes/mstw-tr-settings.php:158 includes/mstw-tr-settings.php:199
+#: includes/mstw-tr-settings.php:159 includes/mstw-tr-settings.php:199
 msgid "Roster Table Colors"
 msgstr ""
 
-#: includes/mstw-tr-settings.php:159 includes/mstw-tr-settings.php:204
+#: includes/mstw-tr-settings.php:160 includes/mstw-tr-settings.php:204
 msgid "Player Profiles & Galleries"
 msgstr ""
@@ -1592 +1602 @@
 msgstr ""
 
+#: includes/mstw-tr-settings.php:290
+msgid "Rpster Table data fields & columns settings reset to defaults."
+msgstr ""
+
 #: includes/mstw-tr-settings.php:297
-msgid "Rpster Table data fields & columns settings reset to defaults."
-msgstr ""
-
-#: includes/mstw-tr-settings.php:304
 msgid "Roster table settings reset to defaults."
 msgstr ""
 
-#: includes/mstw-tr-settings.php:308
+#: includes/mstw-tr-settings.php:301
 msgid "Roster table color settings reset to defaults."
 msgstr ""
 
-#: includes/mstw-tr-settings.php:312
+#: includes/mstw-tr-settings.php:305
 msgid "Player profile & gallery settings reset to defaults."
 msgstr ""
 
-#: includes/mstw-tr-settings.php:330
+#: includes/mstw-tr-settings.php:323
 msgid "Data fields & columns settings updated."
 msgstr ""
 
 #. translators: %1$s/%2$s: key/value that had error
-#: includes/mstw-tr-settings.php:353 includes/mstw-tr-settings.php:439
+#: includes/mstw-tr-settings.php:346 includes/mstw-tr-settings.php:429
 #, php-format
 msgid "Error with %1$s = '%2$s'. Reset to previous value."
 msgstr ""
 
-#: includes/mstw-tr-settings.php:365
+#: includes/mstw-tr-settings.php:358
 msgid "Roster tables settings updated."
 msgstr ""
 
 #. translators: $s: key that had error
-#: includes/mstw-tr-settings.php:394 includes/mstw-tr-settings.php:460
+#: includes/mstw-tr-settings.php:385 includes/mstw-tr-settings.php:450
 #, php-format
 msgid "Error: %s reset to the default."
 msgstr ""
 
-#: includes/mstw-tr-settings.php:402
+#: includes/mstw-tr-settings.php:393
 msgid "Roster table colors settings updated."
 msgstr ""
 
-#: includes/mstw-tr-settings.php:468
+#: includes/mstw-tr-settings.php:458
 msgid "Player profiles & galleries settings updated."
 msgstr ""
 
 #: includes/mstw-tr-team-roster-admin-class.php:58
-#: includes/mstw-tr-utility-functions.php:393
+#: includes/mstw-tr-utility-functions.php:394
 msgid "Bats"
 msgstr ""
 
 #: includes/mstw-tr-team-roster-admin-class.php:59
-#: includes/mstw-tr-utility-functions.php:394
+#: includes/mstw-tr-utility-functions.php:395
 msgid "Throws"
 msgstr ""
 
-#: includes/mstw-tr-team-roster-admin-class.php:179
+#: includes/mstw-tr-team-roster-admin-class.php:174
 msgid "Create a team before editting it's roster."
 msgstr ""
 
-#: includes/mstw-tr-team-roster-admin-class.php:194
+#: includes/mstw-tr-team-roster-admin-class.php:189
 msgid "Change Team"
 msgstr ""
 
-#: includes/mstw-tr-team-roster-admin-class.php:204
+#: includes/mstw-tr-team-roster-admin-class.php:198
 msgid ""
 "Caution! This button will update the table with the selected team roster "
@@ -1661 +1671 @@
 msgstr ""
 
-#: includes/mstw-tr-team-roster-admin-class.php:212
+#: includes/mstw-tr-team-roster-admin-class.php:206
 msgid ""
 "Enter players for the selected team. No data will be processed on or after "
@@ -1667 +1677 @@
 msgstr ""
 
-#: includes/mstw-tr-team-roster-admin-class.php:229
-#: includes/mstw-tr-team-roster-admin-class.php:708
+#: includes/mstw-tr-team-roster-admin-class.php:223
+#: includes/mstw-tr-team-roster-admin-class.php:692
 msgid "Update Roster"
 msgstr ""
 
-#: includes/mstw-tr-team-roster-admin-class.php:691
-msgid "Problem encountered updating games. Exiting."
-msgstr ""
-
-#: includes/mstw-tr-team-roster-admin-class.php:715
+#: includes/mstw-tr-team-roster-admin-class.php:685
+msgid "Problem encountered updating roster; $options array missing. Exiting."
+msgstr ""
+
+#: includes/mstw-tr-team-roster-admin-class.php:696
 msgid "Error: No team specified for roster update."
 msgstr ""
 
-#: includes/mstw-tr-team-roster-admin-class.php:1057
+#: includes/mstw-tr-team-roster-admin-class.php:981
 msgid ""
 "Use this screen to edit the players on a roster in bulk - up to 20 at time. "
@@ -1686 +1696 @@
 msgstr ""
 
-#: includes/mstw-tr-team-roster-admin-class.php:1059
+#: includes/mstw-tr-team-roster-admin-class.php:983
 msgid ""
 "While players can be edited on this screen much faster than the Manage "
@@ -1694 +1704 @@
 msgstr ""
 
-#: includes/mstw-tr-team-roster-admin-class.php:1081
+#: includes/mstw-tr-team-roster-admin-class.php:1003
 msgid ""
 "Use this screen to add players to rosters in bulk - up to 20 at time. First "
@@ -1700 +1710 @@
 msgstr ""
 
-#: includes/mstw-tr-team-roster-admin-class.php:1083
+#: includes/mstw-tr-team-roster-admin-class.php:1005
 msgid ""
 "While players can be added on this screen much faster than the Manage "
@@ -1706 +1716 @@
 msgstr ""
 
-#: includes/mstw-tr-team-roster-admin-class.php:1086
+#: includes/mstw-tr-team-roster-admin-class.php:1008
 msgid "The Player Title will be set to \"First_Name Last_Name."
 msgstr ""
 
-#: includes/mstw-tr-team-roster-admin-class.php:1087
+#: includes/mstw-tr-team-roster-admin-class.php:1009
 msgid "The Player Slug will be set to \"first_name-last_name."
 msgstr ""
 
-#: includes/mstw-tr-team-roster-admin-class.php:1088
+#: includes/mstw-tr-team-roster-admin-class.php:1010
 msgid ""
 "Each Player will be added to only the selected team. Use the Manage Players "
@@ -1720 +1730 @@
 msgstr ""
 
-#: includes/mstw-tr-team-roster-admin-class.php:1089
+#: includes/mstw-tr-team-roster-admin-class.php:1011
 msgid "Use the Manage Players screen to add Player Photos and Player Profiles."
 msgstr ""
 
-#: includes/mstw-tr-team-roster-admin-class.php:1092
+#: includes/mstw-tr-team-roster-admin-class.php:1014
 msgid "See the MSTW Team Rosters users manual for more details."
 msgstr ""
 
-#: includes/mstw-tr-team-tax-admin-class.php:224
+#: includes/mstw-tr-team-tax-admin-class.php:225
 msgid "Team Name"
 msgstr ""
 
-#: includes/mstw-tr-team-tax-admin-class.php:226
+#: includes/mstw-tr-team-tax-admin-class.php:227
 msgid "Slug"
 msgstr ""
 
-#: includes/mstw-tr-team-tax-admin-class.php:227
+#: includes/mstw-tr-team-tax-admin-class.php:228
 msgid "Team Source"
 msgstr ""
 
-#: includes/mstw-tr-team-tax-admin-class.php:260
+#: includes/mstw-tr-team-tax-admin-class.php:261
 msgid "None"
 msgstr ""
 
-#: includes/mstw-tr-team-tax-admin-class.php:433
+#: includes/mstw-tr-team-tax-admin-class.php:424
 msgid "This screen provides management (add, edit, delete) of teams."
 msgstr ""
 
-#: includes/mstw-tr-team-tax-admin-class.php:434
+#: includes/mstw-tr-team-tax-admin-class.php:425
 msgid ""
 "Each team may be linked to a team in the MSTW Schedules & Scoreboards or the "
@@ -1755 +1765 @@
 msgstr ""
 
-#: includes/mstw-tr-team-tax-admin-class.php:435
+#: includes/mstw-tr-team-tax-admin-class.php:426
 msgid ""
 "Teams may be added on this page. They may also be added in bulk via the CSV "
@@ -1761 +1771 @@
 msgstr ""
 
-#: includes/mstw-tr-team-tax-admin-class.php:436
+#: includes/mstw-tr-team-tax-admin-class.php:427
 msgid ""
 "Roll over a team name, and select \"Edit\" to modify the data for an "
@@ -1767 +1777 @@
 msgstr ""
 
-#: includes/mstw-tr-team-tax-admin-class.php:437
+#: includes/mstw-tr-team-tax-admin-class.php:428
 msgid ""
 "Roll over a team name, and select \"Delete\" to remove a team. Any players "
@@ -1774 +1784 @@
 msgstr ""
 
+#: includes/mstw-tr-team-tax-admin-class.php:430
 #: includes/mstw-tr-team-tax-admin-class.php:439
-#: includes/mstw-tr-team-tax-admin-class.php:448
 msgid "See the Data Entry - Teams man page for more details."
 msgstr ""
 
-#: includes/mstw-tr-team-tax-admin-class.php:446
+#: includes/mstw-tr-team-tax-admin-class.php:437
 msgid "Use this screen to modify the information for an existing team."
 msgstr ""
 
-#: includes/mstw-tr-utility-functions.php:184
-#: includes/mstw-tr-utility-functions.php:446
-#: includes/mstw-tr-utility-functions.php:490
-#: includes/mstw-tr-utility-functions.php:536
+#: includes/mstw-tr-utility-functions.php:185
+#: includes/mstw-tr-utility-functions.php:447
+#: includes/mstw-tr-utility-functions.php:491
+#: includes/mstw-tr-utility-functions.php:537
 msgid "Nbr"
 msgstr ""
 
-#: includes/mstw-tr-utility-functions.php:189
+#: includes/mstw-tr-utility-functions.php:190
 msgid "Name"
 msgstr ""
 
-#: includes/mstw-tr-utility-functions.php:193
+#: includes/mstw-tr-utility-functions.php:194
 msgid "Photo"
 msgstr ""
 
-#: includes/mstw-tr-utility-functions.php:197
-#: includes/mstw-tr-utility-functions.php:448
-#: includes/mstw-tr-utility-functions.php:492
-#: includes/mstw-tr-utility-functions.php:538
+#: includes/mstw-tr-utility-functions.php:198
+#: includes/mstw-tr-utility-functions.php:449
+#: includes/mstw-tr-utility-functions.php:493
+#: includes/mstw-tr-utility-functions.php:539
 msgid "Pos"
 msgstr ""
 
-#: includes/mstw-tr-utility-functions.php:201
-#: includes/mstw-tr-utility-functions.php:450
-#: includes/mstw-tr-utility-functions.php:494
-#: includes/mstw-tr-utility-functions.php:540
+#: includes/mstw-tr-utility-functions.php:202
+#: includes/mstw-tr-utility-functions.php:451
+#: includes/mstw-tr-utility-functions.php:495
+#: includes/mstw-tr-utility-functions.php:541
 msgid "Ht"
 msgstr ""
 
-#: includes/mstw-tr-utility-functions.php:205
-#: includes/mstw-tr-utility-functions.php:452
-#: includes/mstw-tr-utility-functions.php:496
-#: includes/mstw-tr-utility-functions.php:542
+#: includes/mstw-tr-utility-functions.php:206
+#: includes/mstw-tr-utility-functions.php:453
+#: includes/mstw-tr-utility-functions.php:497
+#: includes/mstw-tr-utility-functions.php:543
 msgid "Wt"
 msgstr ""
 
-#: includes/mstw-tr-utility-functions.php:209
+#: includes/mstw-tr-utility-functions.php:210
 msgid "Year"
 msgstr ""
 
-#: includes/mstw-tr-utility-functions.php:213
-#: includes/mstw-tr-utility-functions.php:456
-#: includes/mstw-tr-utility-functions.php:500
-#: includes/mstw-tr-utility-functions.php:546
+#: includes/mstw-tr-utility-functions.php:214
+#: includes/mstw-tr-utility-functions.php:457
+#: includes/mstw-tr-utility-functions.php:501
+#: includes/mstw-tr-utility-functions.php:547
 msgid "Exp"
 msgstr ""
 
-#: includes/mstw-tr-utility-functions.php:233
-#: includes/mstw-tr-utility-functions.php:466
-#: includes/mstw-tr-utility-functions.php:512
-#: includes/mstw-tr-utility-functions.php:558
+#: includes/mstw-tr-utility-functions.php:234
+#: includes/mstw-tr-utility-functions.php:467
+#: includes/mstw-tr-utility-functions.php:513
+#: includes/mstw-tr-utility-functions.php:559
 msgid "Bat/Thw"
 msgstr ""
 
-#: includes/mstw-tr-utility-functions.php:237
+#: includes/mstw-tr-utility-functions.php:238
 msgid "Other"
 msgstr ""
 
-#: includes/mstw-tr-utility-functions.php:346
-#: theme-templates/single-player.php:244
+#: includes/mstw-tr-utility-functions.php:347
+#: theme-templates/single-player.php:267
 msgid "Player Bio"
 msgstr ""
 
-#: includes/mstw-tr-utility-functions.php:382
+#: includes/mstw-tr-utility-functions.php:383
 msgid "Position (abbrev)"
 msgstr ""
 
-#: includes/mstw-tr-utility-functions.php:383
+#: includes/mstw-tr-utility-functions.php:384
 msgid "Position (long format)"
 msgstr ""
 
-#: includes/mstw-tr-utility-functions.php:384
+#: includes/mstw-tr-utility-functions.php:385
 msgid "Height"
 msgstr ""
 
-#: includes/mstw-tr-utility-functions.php:385
+#: includes/mstw-tr-utility-functions.php:386
 msgid "Weight"
 msgstr ""
 
-#: includes/mstw-tr-utility-functions.php:386
+#: includes/mstw-tr-utility-functions.php:387
 msgid "Class/Year (abbrev)"
 msgstr ""
 
-#: includes/mstw-tr-utility-functions.php:454
-#: includes/mstw-tr-utility-functions.php:498
-#: includes/mstw-tr-utility-functions.php:544
+#: includes/mstw-tr-utility-functions.php:455
+#: includes/mstw-tr-utility-functions.php:499
+#: includes/mstw-tr-utility-functions.php:545
 msgid "Yr"
 msgstr ""
@@ -1878 +1888 @@
 msgstr ""
 
-#: includes/mstw-tr-utility-functions.php:1352
+#: includes/mstw-tr-utility-functions.php:1338
 msgid "For more information:"
 msgstr ""
 
-#: includes/mstw-tr-utility-functions.php:1354
+#: includes/mstw-tr-utility-functions.php:1340
 msgid "MSTW Team Rosters Users Manual"
 msgstr ""
 
-#: includes/mstw-tr-utility-functions.php:1356
+#: includes/mstw-tr-utility-functions.php:1342
 msgid "See MSTW Team Rosters in Action"
 msgstr ""
 
-#: includes/mstw-tr-utility-functions.php:1358
+#: includes/mstw-tr-utility-functions.php:1344
 msgid "MSTW Team Rosters on WordPress.org"
 msgstr ""
 
-#: includes/mstw-tr-utility-functions.php:1360
+#: includes/mstw-tr-utility-functions.php:1346
 msgid "Need more help? Want to contribute? Register for MSTW Gold Support"
 msgstr ""
 
-#: includes/mstw-tr-utility-functions.php:1722
-#: includes/mstw-utility-functions.php:348
+#: includes/mstw-tr-utility-functions.php:1708
 msgid "Default Field"
 msgstr ""
 
-#: includes/mstw-tr-utility-functions.php:1723
-#: includes/mstw-utility-functions.php:349
+#: includes/mstw-tr-utility-functions.php:1709
 msgid "Default Label"
 msgstr ""
 
+#: includes/mstw-tr-utility-functions.php:1931
+msgid "Show"
+msgstr ""
+
+#: includes/mstw-tr-utility-functions.php:1932
+msgid "Hide"
+msgstr ""
+
+#: includes/mstw-tr-utility-functions.php:1939
+msgid "Tuesday, 07 April 01:15 pm"
+msgstr ""
+
+#: includes/mstw-tr-utility-functions.php:1940
+msgid "Tuesday, 7 April 01:15 pm"
+msgstr ""
+
+#: includes/mstw-tr-utility-functions.php:1941
+msgid "Tuesday, 07 April 1:15 pm"
+msgstr ""
+
+#: includes/mstw-tr-utility-functions.php:1942
+msgid "Tuesday, 7 April 1:15 pm"
+msgstr ""
+
+#: includes/mstw-tr-utility-functions.php:1943
+#: includes/mstw-tr-utility-functions.php:1944
+msgid "Tuesday, 7 April 13:15"
+msgstr ""
+
+#: includes/mstw-tr-utility-functions.php:1945
+msgid "07 April 13:15"
+msgstr ""
+
+#: includes/mstw-tr-utility-functions.php:1946
+msgid "7 April 13:15"
+msgstr ""
+
 #: includes/mstw-tr-utility-functions.php:1947
-#: includes/mstw-utility-functions.php:515
-msgid "Show"
+msgid "07 April 01:15 pm"
 msgstr ""
 
 #: includes/mstw-tr-utility-functions.php:1948
-#: includes/mstw-utility-functions.php:516
-msgid "Hide"
-msgstr ""
-
-#: includes/mstw-tr-utility-functions.php:1955
-#: includes/mstw-utility-functions.php:523
-msgid "Tuesday, 07 April 01:15 pm"
-msgstr ""
-
-#: includes/mstw-tr-utility-functions.php:1956
-#: includes/mstw-utility-functions.php:524
-msgid "Tuesday, 7 April 01:15 pm"
+msgid "7 April 01:15 pm"
 msgstr ""
 
 #: includes/mstw-tr-utility-functions.php:1957
-#: includes/mstw-utility-functions.php:525
-msgid "Tuesday, 07 April 1:15 pm"
-msgstr ""
-
-#: includes/mstw-tr-utility-functions.php:1958
-#: includes/mstw-utility-functions.php:526
-msgid "Tuesday, 7 April 1:15 pm"
-msgstr ""
-
-#: includes/mstw-tr-utility-functions.php:1959
-#: includes/mstw-tr-utility-functions.php:1960
-#: includes/mstw-utility-functions.php:527
-#: includes/mstw-utility-functions.php:528
-msgid "Tuesday, 7 April 13:15"
-msgstr ""
-
-#: includes/mstw-tr-utility-functions.php:1961
-#: includes/mstw-utility-functions.php:529
-msgid "07 April 13:15"
-msgstr ""
-
-#: includes/mstw-tr-utility-functions.php:1962
-#: includes/mstw-utility-functions.php:530
-msgid "7 April 13:15"
-msgstr ""
-
-#: includes/mstw-tr-utility-functions.php:1963
-#: includes/mstw-utility-functions.php:531
-msgid "07 April 01:15 pm"
-msgstr ""
-
-#: includes/mstw-tr-utility-functions.php:1964
-#: includes/mstw-utility-functions.php:532
-msgid "7 April 01:15 pm"
+msgid "Formats for 7 April 2013 13:15."
+msgstr ""
+
+#: includes/mstw-tr-utility-functions.php:1968
+msgid "07 Apr 2013"
+msgstr ""
+
+#: includes/mstw-tr-utility-functions.php:1969
+msgid "7 Apr 2013"
+msgstr ""
+
+#: includes/mstw-tr-utility-functions.php:1970
+msgid "Tues, 07 Apr 2013"
+msgstr ""
+
+#: includes/mstw-tr-utility-functions.php:1971
+msgid "Tues, 7 Apr 13"
+msgstr ""
+
+#: includes/mstw-tr-utility-functions.php:1972
+msgid "Tuesday, 7 Apr"
 msgstr ""
 
 #: includes/mstw-tr-utility-functions.php:1973
-#: includes/mstw-utility-functions.php:541
-msgid "Formats for 7 April 2013 13:15."
-msgstr ""
-
-#: includes/mstw-tr-utility-functions.php:1984
-#: includes/mstw-utility-functions.php:552
-msgid "07 Apr 2013"
-msgstr ""
-
-#: includes/mstw-tr-utility-functions.php:1985
-#: includes/mstw-utility-functions.php:553
-msgid "7 Apr 2013"
+msgid "Tuesday, 07 April 2013"
+msgstr ""
+
+#: includes/mstw-tr-utility-functions.php:1974
+msgid "Tuesday, 7 April 2013"
+msgstr ""
+
+#: includes/mstw-tr-utility-functions.php:1975
+msgid "Tues, 07 Apr"
+msgstr ""
+
+#: includes/mstw-tr-utility-functions.php:1976
+msgid "Tues, 7 Apr"
+msgstr ""
+
+#: includes/mstw-tr-utility-functions.php:1977
+msgid "07 Apr"
+msgstr ""
+
+#: includes/mstw-tr-utility-functions.php:1978
+msgid "7 Apr"
 msgstr ""
 
 #: includes/mstw-tr-utility-functions.php:1986
-#: includes/mstw-utility-functions.php:554
-msgid "Tues, 07 Apr 2013"
-msgstr ""
-
-#: includes/mstw-tr-utility-functions.php:1987
-#: includes/mstw-utility-functions.php:555
-msgid "Tues, 7 Apr 13"
-msgstr ""
-
-#: includes/mstw-tr-utility-functions.php:1988
-#: includes/mstw-utility-functions.php:556
-msgid "Tuesday, 7 Apr"
-msgstr ""
-
-#: includes/mstw-tr-utility-functions.php:1989
-#: includes/mstw-utility-functions.php:557
-msgid "Tuesday, 07 April 2013"
-msgstr ""
-
-#: includes/mstw-tr-utility-functions.php:1990
-#: includes/mstw-utility-functions.php:558
-msgid "Tuesday, 7 April 2013"
-msgstr ""
-
-#: includes/mstw-tr-utility-functions.php:1991
-#: includes/mstw-utility-functions.php:559
-msgid "Tues, 07 Apr"
+msgid "Formats for 7 Apr 2013. Default: 2013-04-07"
 msgstr ""
 
 #: includes/mstw-tr-utility-functions.php:1992
-#: includes/mstw-utility-functions.php:560
-msgid "Tues, 7 Apr"
+msgid "08:00 (24hr)"
 msgstr ""
 
 #: includes/mstw-tr-utility-functions.php:1993
-#: includes/mstw-utility-functions.php:561
-msgid "07 Apr"
+msgid "8:00 (24hr)"
 msgstr ""
 
 #: includes/mstw-tr-utility-functions.php:1994
-#: includes/mstw-utility-functions.php:562
-msgid "7 Apr"
-msgstr ""
-
-#: includes/mstw-tr-utility-functions.php:2002
-#: includes/mstw-utility-functions.php:570
-msgid "Formats for 7 Apr 2013. Default: 2013-04-07"
-msgstr ""
-
-#: includes/mstw-tr-utility-functions.php:2008
-#: includes/mstw-utility-functions.php:576
-msgid "08:00 (24hr)"
-msgstr ""
-
-#: includes/mstw-tr-utility-functions.php:2009
-#: includes/mstw-utility-functions.php:577
-msgid "8:00 (24hr)"
-msgstr ""
-
-#: includes/mstw-tr-utility-functions.php:2010
-#: includes/mstw-utility-functions.php:578
 msgid "08:00 am"
 msgstr ""
 
-#: includes/mstw-tr-utility-functions.php:2011
-#: includes/mstw-utility-functions.php:579
+#: includes/mstw-tr-utility-functions.php:1995
 msgid "08:00 AM"
 msgstr ""
 
-#: includes/mstw-tr-utility-functions.php:2012
-#: includes/mstw-utility-functions.php:580
+#: includes/mstw-tr-utility-functions.php:1996
 msgid "8:00 am"
 msgstr ""
 
-#: includes/mstw-tr-utility-functions.php:2013
-#: includes/mstw-utility-functions.php:581
+#: includes/mstw-tr-utility-functions.php:1997
 msgid "8:00 AM"
 msgstr ""
 
-#: includes/mstw-tr-utility-functions.php:2021
-#: includes/mstw-utility-functions.php:589
+#: includes/mstw-tr-utility-functions.php:2005
 msgid "Formats for eight in the morning. Default: 08:00"
 msgstr ""
 
-#: includes/mstw-tr-utility-functions.php:2120
-msgid "Default"
-msgstr ""
-
-#: includes/mstw-tr-utility-functions.php:2160
-msgid "Baseball"
-msgstr ""
-
-#: includes/mstw-tr-utility-functions.php:2161
-msgid "Baseball-MLB"
-msgstr ""
-
-#: includes/mstw-tr-utility-functions.php:2162
-msgid "Basketball"
-msgstr ""
-
-#: includes/mstw-tr-utility-functions.php:2163
-msgid "Mens Basketball"
-msgstr ""
-
-#: includes/mstw-tr-utility-functions.php:2164
-#: includes/mstw-tr-utility-functions.php:2165
-msgid "Womens Basketball"
-msgstr ""
-
-#: includes/mstw-tr-utility-functions.php:2167
-msgid "Competitive Cheer"
-msgstr ""
-
-#: includes/mstw-tr-utility-functions.php:2169
-msgid "Cross Country"
-msgstr ""
-
-#: includes/mstw-tr-utility-functions.php:2170
-msgid "Mens Cross Country"
-msgstr ""
-
-#: includes/mstw-tr-utility-functions.php:2171
-msgid "Womens Cross Country"
-msgstr ""
-
-#: includes/mstw-tr-utility-functions.php:2173
-msgid "Field Hockey"
-msgstr ""
-
-#: includes/mstw-tr-utility-functions.php:2174
-msgid "Football"
-msgstr ""
-
-#: includes/mstw-tr-utility-functions.php:2175
-msgid "Football-NCAA"
-msgstr ""
-
-#: includes/mstw-tr-utility-functions.php:2176
-msgid "Football-NFL"
-msgstr ""
-
-#: includes/mstw-tr-utility-functions.php:2178
-msgid "Golf"
-msgstr ""
-
-#: includes/mstw-tr-utility-functions.php:2179
-msgid "Mens Golf"
-msgstr ""
-
-#: includes/mstw-tr-utility-functions.php:2180
-msgid "Womens Golf"
-msgstr ""
-
-#: includes/mstw-tr-utility-functions.php:2182
-msgid "Gymnastics"
-msgstr ""
-
-#: includes/mstw-tr-utility-functions.php:2184
-msgid "Ice Hockey"
-msgstr ""
-
-#: includes/mstw-tr-utility-functions.php:2185
-msgid "Ice Hockey-NHL"
-msgstr ""
-
-#: includes/mstw-tr-utility-functions.php:2187
-msgid "Lacrosse"
-msgstr ""
-
-#: includes/mstw-tr-utility-functions.php:2188
-msgid "Mens Lacrosse"
-msgstr ""
-
-#: includes/mstw-tr-utility-functions.php:2189
-msgid "Womens Lacrosse"
-msgstr ""
-
-#: includes/mstw-tr-utility-functions.php:2191
-msgid "Rugby"
-msgstr ""
-
-#: includes/mstw-tr-utility-functions.php:2193
-msgid "Soccer"
-msgstr ""
-
-#: includes/mstw-tr-utility-functions.php:2194
-msgid "Mens Soccer"
-msgstr ""
-
-#: includes/mstw-tr-utility-functions.php:2195
-msgid "Womens Soccer"
-msgstr ""
-
-#: includes/mstw-tr-utility-functions.php:2196
-msgid "Soccer-Premier League"
-msgstr ""
-
-#: includes/mstw-tr-utility-functions.php:2198
-msgid "Softball"
-msgstr ""
-
-#: includes/mstw-tr-utility-functions.php:2200
-msgid "Swimming & Diving"
-msgstr ""
-
-#: includes/mstw-tr-utility-functions.php:2201
-msgid "Mens Swimming"
-msgstr ""
-
-#: includes/mstw-tr-utility-functions.php:2202
-msgid "Womens Swimming"
-msgstr ""
-
-#: includes/mstw-tr-utility-functions.php:2204
-msgid "Tennis"
-msgstr ""
-
-#: includes/mstw-tr-utility-functions.php:2205
-msgid "Mens Tennis"
-msgstr ""
-
-#: includes/mstw-tr-utility-functions.php:2206
-msgid "Womens Tennis"
-msgstr ""
-
-#: includes/mstw-tr-utility-functions.php:2208
-msgid "Track & Field"
-msgstr ""
-
-#: includes/mstw-tr-utility-functions.php:2209
-msgid "Mens Track"
-msgstr ""
-
-#: includes/mstw-tr-utility-functions.php:2210
-msgid "Womens Track"
-msgstr ""
-
-#: includes/mstw-tr-utility-functions.php:2211
-msgid "Volleyball"
-msgstr ""
-
-#: includes/mstw-tr-utility-functions.php:2213
-msgid "Mens Volleyball"
-msgstr ""
-
-#: includes/mstw-tr-utility-functions.php:2214
-msgid "Womens Volleyball"
-msgstr ""
-
-#: includes/mstw-tr-utility-functions.php:2216
-msgid "Water Polo"
-msgstr ""
-
-#: includes/mstw-utility-functions.php:182
+#: includes/mstw-utility-functions.php:198
 msgid "Mon"
 msgstr ""
 
-#: includes/mstw-utility-functions.php:183
+#: includes/mstw-utility-functions.php:199
 msgid "Tue"
 msgstr ""
 
-#: includes/mstw-utility-functions.php:184
+#: includes/mstw-utility-functions.php:200
 msgid "Wed"
 msgstr ""
 
-#: includes/mstw-utility-functions.php:185
+#: includes/mstw-utility-functions.php:201
 msgid "Thr"
 msgstr ""
 
-#: includes/mstw-utility-functions.php:186
+#: includes/mstw-utility-functions.php:202
 msgid "Fri"
 msgstr ""
 
-#: includes/mstw-utility-functions.php:187
+#: includes/mstw-utility-functions.php:203
 msgid "Sat"
 msgstr ""
 
-#: includes/mstw-utility-functions.php:188
+#: includes/mstw-utility-functions.php:204
 msgid "Sun"
 msgstr ""
 
-#: includes/mstw-utility-functions.php:191
+#: includes/mstw-utility-functions.php:207
 msgid "Monday"
 msgstr ""
 
-#: includes/mstw-utility-functions.php:192
+#: includes/mstw-utility-functions.php:208
 msgid "Tuesday"
 msgstr ""
 
-#: includes/mstw-utility-functions.php:193
+#: includes/mstw-utility-functions.php:209
 msgid "Wednesday"
 msgstr ""
 
-#: includes/mstw-utility-functions.php:194
+#: includes/mstw-utility-functions.php:210
 msgid "Thursday"
 msgstr ""
 
-#: includes/mstw-utility-functions.php:195
+#: includes/mstw-utility-functions.php:211
 msgid "Friday"
 msgstr ""
 
-#: includes/mstw-utility-functions.php:196
+#: includes/mstw-utility-functions.php:212
 msgid "Saturday"
 msgstr ""
 
-#: includes/mstw-utility-functions.php:197
+#: includes/mstw-utility-functions.php:213
 msgid "Sunday"
 msgstr ""
 
-#: includes/mstw-utility-functions.php:200
+#: includes/mstw-utility-functions.php:216
 msgid "January"
 msgstr ""
 
-#: includes/mstw-utility-functions.php:201
+#: includes/mstw-utility-functions.php:217
 msgid "February"
 msgstr ""
 
-#: includes/mstw-utility-functions.php:202
+#: includes/mstw-utility-functions.php:218
 msgid "March"
 msgstr ""
 
-#: includes/mstw-utility-functions.php:203
+#: includes/mstw-utility-functions.php:219
 msgid "April"
 msgstr ""
 
-#: includes/mstw-utility-functions.php:204
-#: includes/mstw-utility-functions.php:218
+#: includes/mstw-utility-functions.php:220
+#: includes/mstw-utility-functions.php:234
 msgid "May"
 msgstr ""
 
-#: includes/mstw-utility-functions.php:205
+#: includes/mstw-utility-functions.php:221
 msgid "June"
 msgstr ""
 
-#: includes/mstw-utility-functions.php:206
+#: includes/mstw-utility-functions.php:222
 msgid "July"
 msgstr ""
 
-#: includes/mstw-utility-functions.php:207
+#: includes/mstw-utility-functions.php:223
 msgid "August"
 msgstr ""
 
-#: includes/mstw-utility-functions.php:208
+#: includes/mstw-utility-functions.php:224
 msgid "September"
 msgstr ""
 
-#: includes/mstw-utility-functions.php:209
+#: includes/mstw-utility-functions.php:225
 msgid "October"
 msgstr ""
 
-#: includes/mstw-utility-functions.php:210
+#: includes/mstw-utility-functions.php:226
 msgid "November"
 msgstr ""
 
-#: includes/mstw-utility-functions.php:211
+#: includes/mstw-utility-functions.php:227
 msgid "December"
 msgstr ""
 
-#: includes/mstw-utility-functions.php:214
+#: includes/mstw-utility-functions.php:230
 msgid "Jan"
 msgstr ""
 
-#: includes/mstw-utility-functions.php:215
+#: includes/mstw-utility-functions.php:231
 msgid "Feb"
 msgstr ""
 
-#: includes/mstw-utility-functions.php:216
+#: includes/mstw-utility-functions.php:232
 msgid "Mar"
 msgstr ""
 
-#: includes/mstw-utility-functions.php:217
+#: includes/mstw-utility-functions.php:233
 msgid "Apr"
 msgstr ""
 
-#: includes/mstw-utility-functions.php:219
+#: includes/mstw-utility-functions.php:235
 msgid "Jun"
 msgstr ""
 
-#: includes/mstw-utility-functions.php:220
+#: includes/mstw-utility-functions.php:236
 msgid "Jul"
 msgstr ""
 
-#: includes/mstw-utility-functions.php:221
+#: includes/mstw-utility-functions.php:237
 msgid "Aug"
 msgstr ""
 
-#: includes/mstw-utility-functions.php:222
+#: includes/mstw-utility-functions.php:238
 msgid "Sep"
 msgstr ""
 
-#: includes/mstw-utility-functions.php:223
+#: includes/mstw-utility-functions.php:239
 msgid "Oct"
 msgstr ""
 
-#: includes/mstw-utility-functions.php:224
+#: includes/mstw-utility-functions.php:240
 msgid "Nov"
 msgstr ""
 
-#: includes/mstw-utility-functions.php:225
+#: includes/mstw-utility-functions.php:241
 msgid "Dec"
 msgstr ""
 
 #. translators: %s: plugin name & version
-#: mstw-team-rosters.php:149
+#: mstw-team-rosters.php:150
 #, php-format
 msgid ""
@@ -2391 +2198 @@
 msgstr ""
 
-#: mstw-team-rosters.php:172
+#: mstw-team-rosters.php:173
 msgid "MSTW Admin"
 msgstr ""
 
-#: mstw-team-rosters.php:201
+#: mstw-team-rosters.php:202
 msgid "MSTW Team Rosters Admin"
 msgstr ""
 
-#: theme-templates/single-player.php:61
+#: theme-templates/single-player.php:37 theme-templates/single-player.php:41
+msgid "fatal error encountered in single-player"
+msgstr ""
+
+#: theme-templates/single-player.php:78
 msgid "Unspecified"
 msgstr ""
 
-#: theme-templates/single-player.php:62
+#: theme-templates/single-player.php:79
 msgid "unknown"
 msgstr ""
 
-#: theme-templates/single-player.php:128
+#: theme-templates/single-player.php:154
 msgid "Update Player"
 msgstr ""
 
-#. Plugin Name of the plugin/theme
-msgid "MSTW Team Rosters"
+#: theme-templates/taxonomy-team.php:81
+msgid "Not Found"
 msgstr ""
 

team-rosters/trunk/mstw-team-rosters.php

@@ -4 +4 @@
  * Plugin URI:   http://shoalsummitsolutions.com
  * Description:  Manage & display team rosters. Front end displays include roster tables, player galleries, and single player profiles.
- * Version:      4.8
+ * Version:      4.8.1
  * Requires at least: 3.4.2
  * Requires PHP: 5.6
@@ -79 +79 @@
  // ----------------------------------------------------------------
  // add ajax action for the manage rosters screen
- // mstw_bb_ajax_callback( ) is in mstw-bb-admin.php
+ // mstw_tr_ajax_callback( ) is in mstw-tr-admin.php
  //
  add_action( 'wp_ajax_team_rosters', 'mstw_tr_ajax_callback' );
@@ -112 +112 @@
 
  function mstw_tr_register_activation_hook( ) {
-    // Need mstw-tr-utility-functions.php for mstw_tr_log_msg() 
+    // mstw_log_msg( 'mstw_tr_register_activation_hook:' );
+     
     require_once( plugin_dir_path( __FILE__ ) . 'includes/mstw-tr-utility-functions.php' );
     
@@ -149 +150 @@
                 __( '%1$s requires WordPress %2$s or higher, and has been deactivated! Please upgrade WordPress and try again.', 'team-rosters' ), $plugin_data['Name'], $version );
             
-            die( $die_msg );
+            die( esc_html( $die_msg ) );
 
         }
@@ -189 +190 @@
         }
         else 
-            mstw_tr_log_msg( "Oops, failed to add MSTW Admin role. Already exists?" );
+            mstw_log_msg( "Oops, failed to add MSTW Admin role. Already exists?" );
         
         //
@@ -213 +214 @@
         }
         else {
-            mstw_tr_log_msg( "Oops, failed to add MSTW Schedules & Scoreboards Admin role. Already exists?" );
+            mstw_log_msg( "Oops, failed to add MSTW Schedules & Scoreboards Admin role. Already exists?" );
         }
     
@@ -280 +281 @@
         else {
             $role_name = ( $role_name == null ) ? 'null' : $role_name;
-            mstw_tr_log_msg( 'Bad args passed to mstw_tr_add_caps( ). $role_name = ' . $role_name . ' and $role_obj = null' );
+            mstw_log_msg( 'Bad args passed to mstw_tr_add_caps( ). $role_name = ' . $role_name . ' and $role_obj = null' );
         }
         
@@ -380 +381 @@
     // Roster Table settings
     //
-    echo ".mstw-tr-table thead tr th { \n";
-        echo mstw_tr_build_css_rule( $options, 'table_head_text', 'color' );
-        echo mstw_tr_build_css_rule( $options, 'table_head_bkgd', 'background-color' );
-    echo "} \n";
-    
-    echo "h1.mstw-tr-roster-title { \n";
-        echo mstw_tr_build_css_rule( $options, 'table_title_color', 'color' );      
-    echo "} \n";
-    
-    echo '.mstw-tr-table tbody tr:nth-child(odd) td {';//'tr.mstw-tr-odd {';
-        echo mstw_tr_build_css_rule( $options, 'table_odd_row_text', 'color' );
-        echo mstw_tr_build_css_rule( $options, 'table_odd_row_bkgd', 'background-color' );
-    echo '}';
-    
-    echo '.mstw-tr-table tbody tr:nth-child(even) td {' ; //'tr.mstw-tr-even {';
-        echo mstw_tr_build_css_rule( $options, 'table_even_row_text', 'color' );
-        echo mstw_tr_build_css_rule( $options, 'table_even_row_bkgd', 'background-color' );
-    echo '}';
-    
-    echo ".mstw-tr-table tbody tr:nth-child(even) td a, 
-          .mstw-tr-table tbody tr:nth-child(odd) td a   { \n";
-        echo mstw_tr_build_css_rule( $options, 'table_links_color', 'color' );
-    echo "} \n";
-    
-    echo '.mstw-tr-table tbody tr td,
-         .mstw-tr-table tbody tr td {';
-        echo mstw_tr_build_css_rule( $options, 'table_border_color', 'border-top-color' );
-        echo mstw_tr_build_css_rule( $options, 'table_border_color', 'border-bottom-color' );
-        echo mstw_tr_build_css_rule( $options, 'table_border_color', 'border-left-color' );
-        echo mstw_tr_build_css_rule( $options, 'table_border_color', 'border-right-color' );
-    echo '}';
-    
-    echo '.mstw-tr-table tbody tr td img {';
-        echo mstw_tr_build_css_rule( $options, 'table_photo_width', 'width', 'px' );
-        echo mstw_tr_build_css_rule( $options, 'table_photo_height', 'height', 'px' );
-    echo '}';
+    echo wp_kses_post( ".mstw-tr-table thead tr th { \n" );
+        echo wp_kses_post( mstw_tr_build_css_rule( $options, 'table_head_text', 'color' ) );
+        echo wp_kses_post( mstw_tr_build_css_rule( $options, 'table_head_bkgd', 'background-color' ) );
+    echo wp_kses_post( "} \n" );
+    
+    echo wp_kses_post( "h1.mstw-tr-roster-title { \n" );
+        echo wp_kses_post( mstw_tr_build_css_rule( $options, 'table_title_color', 'color' ) );      
+    echo wp_kses_post( "} \n");
+    
+    echo wp_kses_post( ".mstw-tr-table tbody tr:nth-child(odd) td { \n" );
+        echo wp_kses_post( mstw_tr_build_css_rule( $options, 'table_odd_row_text', 'color' ) );
+        echo wp_kses_post( mstw_tr_build_css_rule( $options, 'table_odd_row_bkgd', 'background-color' ) );
+    echo wp_kses_post( '}' );
+    
+    echo wp_kses_post( '.mstw-tr-table tbody tr:nth-child(even) td {' );
+        echo wp_kses_post( mstw_tr_build_css_rule( $options, 'table_even_row_text', 'color' ) );
+        echo wp_kses_post( mstw_tr_build_css_rule( $options, 'table_even_row_bkgd', 'background-color' ) );
+    echo wp_kses_post( '}' );
+    
+    echo wp_kses_post( ".mstw-tr-table tbody tr:nth-child(even) td a, 
+          .mstw-tr-table tbody tr:nth-child(odd) td a   { \n" );
+        echo wp_kses_post( mstw_tr_build_css_rule( $options, 'table_links_color', 'color' ) );
+    echo wp_kses_post( "} \n" );
+    
+    echo wp_kses_post( '.mstw-tr-table tbody tr td,
+         .mstw-tr-table tbody tr td {' );
+        echo wp_kses_post( mstw_tr_build_css_rule( $options, 'table_border_color', 'border-top-color' ) );
+        echo wp_kses_post( mstw_tr_build_css_rule( $options, 'table_border_color', 'border-bottom-color' ) );
+        echo wp_kses_post( mstw_tr_build_css_rule( $options, 'table_border_color', 'border-left-color' ) );
+        echo wp_kses_post( mstw_tr_build_css_rule( $options, 'table_border_color', 'border-right-color' ) );
+    echo wp_kses_post( '}' );
+    
+    echo wp_kses_post( '.mstw-tr-table tbody tr td img {' );
+        echo wp_kses_post( mstw_tr_build_css_rule( $options, 'table_photo_width', 'width', 'px' ) );
+        echo wp_kses_post( mstw_tr_build_css_rule( $options, 'table_photo_height', 'height', 'px' ) );
+    echo wp_kses_post( '}' );
     
     //
     // Roster Table 2 Settings
     //
-    echo "div.roster-sort-controls h1.mstw-tr-roster-title { \n";
-        echo mstw_tr_build_css_rule( $options, 'table2_title_color', 'color' );     
-    echo "} \n";
-    
-    echo "div.mstw-tr-roster-player-bio a, div.mstw-tr-roster-player-number-name h3.player-name a { \n";
-        echo mstw_tr_build_css_rule( $options, 'table2_links_color', 'color' );
-    echo "} \n";
-    
-    echo '.mstw-tr-roster-player-pertinents .mstw-tr-roster-player-number-name span.jersey {';
-        echo mstw_tr_build_css_rule( $options, 'table2_jersey_text', 'color' );
-        echo mstw_tr_build_css_rule( $options, 'table2_jersey_bkgd', 'background-color' );
-    echo '}';
-    
-    echo 'li.mstw-tr-roster-player:nth-child(even) div.mstw-tr-roster-player-container {' ; 
-        echo mstw_tr_build_css_rule( $options, 'table2_even_row_text', 'color' );
-        echo mstw_tr_build_css_rule( $options, 'table2_even_row_bkgd', 'background-color' );
-    echo '}';
-    
-    echo 'li.mstw-tr-roster-player:nth-child(odd) div.mstw-tr-roster-player-container {' ;
-        echo mstw_tr_build_css_rule( $options, 'table2_odd_row_text', 'color' );
-        echo mstw_tr_build_css_rule( $options, 'table2_odd_row_bkgd', 'background-color' );
-    echo '}';
+    echo wp_kses_post( "div.roster-sort-controls h1.mstw-tr-roster-title { \n" );
+        echo wp_kses_post( mstw_tr_build_css_rule( $options, 'table2_title_color', 'color' ) );     
+    echo wp_kses_post( "} \n" );
+    
+    echo wp_kses_post( "div.mstw-tr-roster-player-bio a, div.mstw-tr-roster-player-number-name h3.player-name a { \n" );
+        echo wp_kses_post( mstw_tr_build_css_rule( $options, 'table2_links_color', 'color' ) );
+    echo wp_kses_post( "} \n" );
+    
+    echo wp_kses_post( '.mstw-tr-roster-player-pertinents .mstw-tr-roster-player-number-name span.jersey {' );
+        echo wp_kses_post( mstw_tr_build_css_rule( $options, 'table2_jersey_text', 'color' ) );
+        echo wp_kses_post( mstw_tr_build_css_rule( $options, 'table2_jersey_bkgd', 'background-color' ) );
+    echo wp_kses_post( '}' );
+    
+    echo wp_kses_post( 'li.mstw-tr-roster-player:nth-child(even) div.mstw-tr-roster-player-container {'  ); 
+        echo wp_kses_post( mstw_tr_build_css_rule( $options, 'table2_even_row_text', 'color' ) );
+        echo wp_kses_post( mstw_tr_build_css_rule( $options, 'table2_even_row_bkgd', 'background-color' ) );
+    echo wp_kses_post( '}' );
+    
+    echo wp_kses_post( 'li.mstw-tr-roster-player:nth-child(odd) div.mstw-tr-roster-player-container {'  );
+        echo wp_kses_post( mstw_tr_build_css_rule( $options, 'table2_odd_row_text', 'color' ) );
+        echo wp_kses_post( mstw_tr_build_css_rule( $options, 'table2_odd_row_bkgd', 'background-color' ) );
+    echo wp_kses_post( '}' );
 
     //
     // Player Profile Settings
     //
-    echo ".player-header { \n";
-        echo mstw_tr_build_css_rule( $options, 'sp_main_bkgd_color', 'background-color' );
-    echo "} \n";
-    
-    echo "#player-name-nbr { \n";
-        echo mstw_tr_build_css_rule( $options, 'sp_main_text_color', 'color' );
-    echo "} \n";
-    
-    echo "table#player-info-table { \n";
-        echo mstw_tr_build_css_rule( $options, 'sp_main_text_color', 'color' );
-    echo "} \n";
-    
-    echo ".player-bio { \n";
-        echo mstw_tr_build_css_rule( $options, 'sp_bio_border_color', 'border-color' );
-    echo '}';
-    
-    echo ".player-bio h1, .player-bio h2, .player-bio h3 { \n";
-        echo mstw_tr_build_css_rule( $options, 'sp_bio_header_color', 'color' );
-    echo "}\n";
-    
-    echo ".player-bio { \n";
-        echo mstw_tr_build_css_rule( $options, 'sp_bio_text_color', 'color' );
-    echo "}\n";
-    
-    echo ".player-bio { \n";
-        echo mstw_tr_build_css_rule( $options, 'sp_bio_bkgd_color', 'background-color' );
-    echo "}\n";
-    
-    echo "h1.player-head-title, .player-team-title { \n";
-        echo mstw_tr_build_css_rule( $options, 'table_title_color', 'color' );
-    echo "}\n";
-    
-    echo "h1.mstw_tr_roster_title { \n";
-        echo mstw_tr_build_css_rule( $options, 'table_title_color', 'color' );
-    echo "}\n";
-    
-    echo "div#player-photo img, div#team-logo img { \n";
-        echo mstw_tr_build_css_rule( $options, 'sp_image_width', 'width', 'px' );
-        echo mstw_tr_build_css_rule( $options, 'sp_image_height', 'height', 'px' );
-    echo "}\n";
-    
-    echo "table#player-info { \n";
-        echo mstw_tr_build_css_rule( $options, 'sp_main_text_color', 'color' );
-    echo "}\n";
+    echo wp_kses_post( ".player-header { \n" );
+        echo wp_kses_post( mstw_tr_build_css_rule( $options, 'sp_main_bkgd_color', 'background-color' ) );
+    echo wp_kses_post( "} \n" );
+    
+    echo wp_kses_post( "#player-name-nbr { \n" );
+        echo wp_kses_post( mstw_tr_build_css_rule( $options, 'sp_main_text_color', 'color' ) );
+    echo wp_kses_post( "} \n" );
+    
+    echo wp_kses_post( "table#player-info-table { \n" );
+        echo wp_kses_post( mstw_tr_build_css_rule( $options, 'sp_main_text_color', 'color' ) );
+    echo wp_kses_post( "} \n" );
+    
+    echo wp_kses_post( ".player-bio { \n" );
+        echo wp_kses_post( mstw_tr_build_css_rule( $options, 'sp_bio_border_color', 'border-color' ) );
+    echo wp_kses_post( '}' );
+    
+    echo wp_kses_post( ".player-bio h1, .player-bio h2, .player-bio h3 { \n" );
+        echo wp_kses_post( mstw_tr_build_css_rule( $options, 'sp_bio_header_color', 'color' ) );
+    echo wp_kses_post( "}\n" );
+    
+    echo wp_kses_post( ".player-bio { \n" );
+        echo wp_kses_post( mstw_tr_build_css_rule( $options, 'sp_bio_text_color', 'color' ) );
+    echo wp_kses_post( "}\n" );
+    
+    echo wp_kses_post( ".player-bio { \n" );
+        echo wp_kses_post( mstw_tr_build_css_rule( $options, 'sp_bio_bkgd_color', 'background-color' ) );
+    echo wp_kses_post( "}\n" );
+    
+    echo wp_kses_post( "h1.player-head-title, .player-team-title { \n" );
+        echo wp_kses_post( mstw_tr_build_css_rule( $options, 'table_title_color', 'color' ) );
+    echo wp_kses_post( "}\n" );
+    
+    echo wp_kses_post( "h1.mstw_tr_roster_title { \n" );
+        echo wp_kses_post( mstw_tr_build_css_rule( $options, 'table_title_color', 'color' ) );
+    echo wp_kses_post( "}\n" );
+    
+    echo wp_kses_post( "div#player-photo img, div#team-logo img { \n" );
+        echo wp_kses_post( mstw_tr_build_css_rule( $options, 'sp_image_width', 'width', 'px' ) );
+        echo wp_kses_post( mstw_tr_build_css_rule( $options, 'sp_image_height', 'height', 'px' ) );
+    echo wp_kses_post( "}\n" );
+    
+    echo wp_kses_post( "table#player-info { \n" );
+        echo wp_kses_post( mstw_tr_build_css_rule( $options, 'sp_main_text_color', 'color' ) );
+    echo wp_kses_post( "}\n" );
     
     //
     // Player Gallery Settings
     //
-    echo ".player-tile { \n";
-        echo mstw_tr_build_css_rule( $options, 'sp_main_bkgd_color', 'background-color' );
-    echo "} \n";
-    
-    //echo ".player-tile { \n";
-    //  echo mstw_tr_build_css_rule( $options, 'sp_main_text_color', 'color' );
-    //echo "} \n";
-    
-    echo ".player-tile img { \n";
-        echo mstw_tr_build_css_rule( $options, 'sp_image_width', 'width', 'px' );
-        echo mstw_tr_build_css_rule( $options, 'sp_image_height', 'height', 'px' );
-    echo "} \n";
-    
-    echo ".player-name-number { \n";
-        echo mstw_tr_build_css_rule( $options, 'sp_main_text_color', 'color' );
-        
-    echo "} \n";
-    
-    echo ".player-name-number .player-name a:link, .player-name-number .player-name a:visited { \n";
-        echo mstw_tr_build_css_rule( $options, 'gallery_links_color', 'color' );
-    echo "}\n";
-    
-    echo ".player-info-container table.player-info { \n";
-        echo mstw_tr_build_css_rule( $options, 'sp_main_text_color', 'color' );
-    echo "}\n";
-    
-    
-    
-    echo '</style>';
+    echo wp_kses_post( ".player-tile { \n" );
+        echo wp_kses_post( mstw_tr_build_css_rule( $options, 'sp_main_bkgd_color', 'background-color' ) );
+    echo wp_kses_post( "} \n" );
+    
+    echo wp_kses_post( ".player-tile img { \n" );
+        echo wp_kses_post( mstw_tr_build_css_rule( $options, 'sp_image_width', 'width', 'px' ) );
+        echo wp_kses_post( mstw_tr_build_css_rule( $options, 'sp_image_height', 'height', 'px' ) );
+    echo wp_kses_post( "} \n" );
+    
+    echo wp_kses_post( ".player-name-number { \n" );
+        echo wp_kses_post( mstw_tr_build_css_rule( $options, 'sp_main_text_color', 'color' ) );
+    echo wp_kses_post( "} \n" );
+    
+    echo wp_kses_post( ".player-name-number .player-name a:link, .player-name-number .player-name a:visited { \n" );
+        echo wp_kses_post( mstw_tr_build_css_rule( $options, 'gallery_links_color', 'color' ) );
+    echo wp_kses_post( "}\n" );
+    
+    echo wp_kses_post( ".player-info-container table.player-info { \n" );
+        echo wp_kses_post( mstw_tr_build_css_rule( $options, 'sp_main_text_color', 'color' ) );
+    echo wp_kses_post( "}\n" );
+    
+    
+    
+    echo wp_kses_post( '</style>' );
     
 }
@@ -558 +554 @@
             
                 // Need the team slug to set query
-                $uri_array = explode( '/', $_SERVER['REQUEST_URI'] );   
+                $requestURI = mstw_safe_get( 'REQUEST_URI',  $_SERVER, '' );
+                $uri_array = explode( '/', $requestURI );   
                 $team_slug = $uri_array[sizeof( $uri_array )-2];
                 
@@ -582 +579 @@
     }  //End: mstw_tr_get_posts()
 
-// ----------------------------------------------------------------
-// Deactivate, request upgrade, and exit if WP version is not right
-
-    //add_action( 'admin_init', 'mstw_tr_requires_wp_ver' );
-
-    function mstw_tr_requires_wp_ver() {
-        //mstw_log_msg( "mstw_tr_requires_wp_ver:" );
-        global $wp_version;
-        
-        $plugin = plugin_basename( __FILE__ );
-        $plugin_data = get_plugin_data( __FILE__, false );
-
-        if ( version_compare($wp_version, "4.0", "<" ) ) {
-            if( is_plugin_active($plugin) ) {
-                deactivate_plugins( $plugin );
-                wp_die( "'".$plugin_data['Name']."' requires WordPress 3.4.2 or higher, and has been deactivated! 
-                    Please upgrade WordPress and try again.<br /><br />Back to <a href='".admin_url()."'>WordPress admin</a>." );
-            }
-        }
-    }
-
  // ----------------------------------------------------------------
  // Load the CSS styles and Java scripts
@@ -608 +584 @@
  add_action( 'wp_enqueue_scripts', 'mstw_tr_enqueue_styles' );
 
- function mstw_tr_enqueue_styles( ) {   
+function mstw_tr_enqueue_styles( ) {    
     //mstw_log_msg( "mstw_tr_enqueue_styles:" );
     
@@ -631 +607 @@
     if ( file_exists( $custom_stylesheet ) ) {
         $custom_stylesheet_url = get_stylesheet_directory_uri( ) . '/mstw-tr-custom-styles.css';
-        wp_register_style( 'mstw_tr_custom_style', $custom_stylesheet_url );
-        wp_enqueue_style( 'mstw_tr_custom_style' );
+        //wp_register_style( 'mstw_tr_custom_style', $custom_stylesheet_url );
+        //wp_enqueue_style( 'mstw_tr_custom_style' );
         wp_enqueue_style( 'mstw_tr_custom_style', 
                                             $custom_stylesheet_url,
@@ -681 +657 @@
         
         //wp_localize_script( 'multi-team-schedule-ajax', 'mstw_multi_team_schedule_ajax', array( 'ajaxurl' => admin_url( 'admin-ajax.php' ) ) );       
-        wp_localize_script( 'tr-sort-roster-2', 'mstw_tr_sort_roster_2_ajax', array( 'ajaxurl' => admin_url( 'admin-ajax.php' ) ) );    
+        wp_localize_script( 'tr-sort-roster-2', 'mstw_tr_sort_roster_2_ajax', array( 'ajaxurl' => admin_url( 'admin-ajax.php' ), 'nonce' => wp_create_nonce( 'ajax-nonce' ) ) );    
                          
                          
@@ -695 +671 @@
 function mstw_tr_add_feat_img( ) {
     //mstw_log_msg( "mstw_tr_add_feat_img:" );
+    
     if ( !current_theme_supports( 'post-thumbnails' ) ) {
         add_theme_support( 'post-thumbnails' );
@@ -739 +716 @@
 function mstw_tr_sort_roster_ajax_callback ( ) {
     //mstw_log_msg( 'mstw_tr_sort_roster_ajax_callback:' );
-
+    //mstw_log_msg( $_POST );
+    
     $response = array( 
                                 'response' => 'sorted',
@@ -749 +727 @@
     if ( array_key_exists( 'real_action', $_POST ) ) {
         
-        $action = $_POST['real_action'];
+        $action = mstw_safe_get( 'real_action', $_POST, 'sort_roster' );
 
         switch( $action ) {
             case 'sort_roster':
-                $team = $_POST[ 'team' ];
+                $team = mstw_safe_get( 'team',  $_POST, '' );
                 
-                $table_id = $_POST[ 'table_id' ];
+                $table_id = mstw_safe_get( 'table_id', $_POST, '' );
                 $response[ 'table_id' ] = $table_id;
                 
-                $args_str = stripslashes( $_POST[ 'args_str' ] );
+                $args_str = stripslashes( mstw_safe_get( 'args_str', $_POST, '' ) );
                 
-                $sort_value = $_POST[ 'sort_value' ];
+                $sort_value = mstw_safe_get( 'sort_value', $_POST, 'numeric' );
 
                 $html = do_shortcode( "[mstw_tr_roster_2 $args_str table_id=$table_id no_controls=1 sort_order=$sort_value ]" );
@@ -768 +746 @@
                 
             default:
-                mstw_log_msg( "Error: Invalid action, $action, on page: " . $_POST['page'] );
-                $response['error'] = __( 'AJAX Error: invalid action.', 'team-rosters' );
+                if (isset( $_POST['page'] ) ) {
+                    mstw_log_msg( "Error: Invalid action, $action, on page: " . sanitize_text_field( wp_unslash( $_POST['page'] ) ) );
+                    $response['error'] = __( 'AJAX Error: invalid action.', 'team-rosters' );
+                }
                 break;
         }

team-rosters/trunk/readme.txt

@@ -4 +4 @@
 Tags: sports,teams,rosters,players,team rosters  
 Requires at least: 3.4.2
-Tested up to: 6.7
-Stable tag: 4.8
+Tested up to: 6.8
+Stable tag: 4.8.1
 License: GPLv2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
@@ -42 +42 @@
 
 == Changelog ==
+
+== 4.8.1 ==
+* Re-corrected security issues identified by the Wordpress team.
 
 = 4.8 =

team-rosters/trunk/theme-templates/single-player.php

@@ -25 +25 @@
     
     //mstw_log_msg( 'single-player.php' );
-        
+    //mstw_log_msg( $_GET );
+        
+    //Validate the nonce
+    //$nonce = mstw_safe_get( 'mstw-tr-nonce', $_GET, '' );
+    
+    if ( isset( $_GET['mstw-tr-nonce'] ) ) {
+        //$safeNonce = mstw_really_safe_get( 'mstw-tr-nonce', $_GET, '' );
+        //$safeNonce = $_GET[ 'mstw-tr-nonce' ];
+        if ( false == wp_verify_nonce(  sanitize_text_field( wp_unslash( $_GET[ 'mstw-tr-nonce' ] ) ), 'single-player' ) ) {
+            mstw_log_msg( "single-player: invalid nonce" );
+            die( esc_html__('fatal error encountered in single-player', 'team-rosters' ) );
+        } 
+    } else {
+        mstw_log_msg( "single-player: nonce not found" );
+        die( esc_html__('fatal error encountered in single-player', 'team-rosters' ) );
+    }
+    
+    
     // Get the settings from the admin page
     $options = get_option( 'mstw_tr_options' );
@@ -34 +51 @@
     // Set the roster format based on the page args & plugin settings 
     $roster_type = ( isset( $_GET['roster_type'] ) && $_GET['roster_type'] != '' ) ? 
-                        $_GET['roster_type'] : 
+                        sanitize_text_field( wp_unslash( $_GET['roster_type'] ) ) : 
                         $options['roster_type'];
                         
-    $team_slug =  ( isset( $_GET['team'] ) && $_GET['team'] != '' ) ?
-                                    $_GET['team'] : 
+    $team_slug =  ( isset( $_GET['team'] ) && sanitize_text_field( wp_unslash( $_GET['team'] ) ) != '' ) ?
+                                    sanitize_text_field( wp_unslash( $_GET['team'] ) )  : 
                                     '';
     
@@ -65 +82 @@
     
     if ( 'custom' == $roster_type ) {
-        $argsStr =  ( isset( $_GET['args'] ) && $_GET['args'] != '' ) ?
-                                    $_GET['args'] : 
+        $argsStr =  ( isset( $_GET['args'] ) && sanitize_text_field( wp_unslash( $_GET['args'] ) ) != '' ) ?
+                                    sanitize_text_field( wp_unslash( $_GET['args'] ) ) : 
                                     '';
+        $newArgsStr = mstw_safe_get( 'args', $_GET, '' );
+        
+        //mstw_log_msg( 'argsStr:' );
+        //mstw_log_msg( $argsStr );
+        //mstw_log_msg( 'newArgsStr:' );
+        //mstw_log_msg( $newArgsStr );
+
                                     
         if ( '' != $argsStr ) {
@@ -107 +131 @@
                         <div class="player-select-controls MSTW-flex-row alignwide">
                             <?php 
-                            $formAction = get_site_url( null, "player/{$post->post_name}/?roster_type=$roster_type&team=$team_slug" );
+                            $nonce = wp_create_nonce( 'single-player' );
+                            $formAction = get_site_url( null, "player/{$post->post_name}/?roster_type=$roster_type&team=$team_slug&mstw-tr-nonce=$nonce" );
                             if ( 'custom' == $roster_type ) {
                                 $serialArgs = base64_encode( serialize( $options ) );
@@ -115 +140 @@
                             
                             <form id="single-player-profile" method="POST" action= "<?php echo esc_url( $formAction ); ?>">
+                                <?php wp_nonce_field( 'single-player', 'mstw-tr-nonce' ); ?>
                                 <input type='hidden' name='current-player' id='current-player' value= <?php echo esc_html( $post->post_name ) ?> />
                                 <div class="player-select-list ms-control">

team-rosters/trunk/theme-templates/taxonomy-team.php

@@ -23 +23 @@
     get_header( ); 
     
-    $siteURL = "//".$_SERVER['HTTP_HOST'].$_SERVER['REQUEST_URI'];
+    if ( !isset( $_SERVER['REQUEST_URI'] ) or !isset( $_SERVER['HTTP_HOST'] ) ) {
+        mstw_log_msg( '$_SERVER[REQUEST_URI] or $_SERVER[HTTP_HOST] is not set. Returning nada' );
+        return;
+    }
     
+    $requestURI = esc_url_raw( wp_unslash( $_SERVER['REQUEST_URI'] ) );
+    $httpHost = esc_url_raw( wp_unslash( $_SERVER['HTTP_HOST'] ) );
+    $siteURL = "//" . $httpHost . $requestURI;
     $parsedURL = wp_parse_url( $siteURL, PHP_URL_QUERY );
     
@@ -73 +79 @@
 
     // figure out the team name - for the title (if shown) and for team-based styles
-    $uri_array = explode( '/', $_SERVER['REQUEST_URI'] );   
-    $team_slug = $uri_array[sizeof( $uri_array )-2];
-    $term = get_term_by( 'slug', $team_slug, 'mstw_tr_team' );
-    $team_name = $term->name;
+    $team_name = __('Not Found', 'team-rosters' );
+    
+    if ( isset( $_SERVER['REQUEST_URI'] ) ) {   
+        $requestURI = esc_url_raw( wp_unslash( $_SERVER['REQUEST_URI'] ) );
+        $uri_array = explode( '/', $requestURI );   
+        /*mstw_log_msg( 'uri array' );
+        mstw_log_msg( $uri_array ); 
+        $us_uri_array = explode( '/', wp_unslash( $_SERVER['REQUEST_URI'] ) );
+        mstw_log_msg( 'unslashed uri array' );
+        mstw_log_msg( $us_uri_array ); 
+        */
+        $team_slug = $uri_array[sizeof( $uri_array )-2];
+        $term = get_term_by( 'slug', $team_slug, 'mstw_tr_team' );
+        $team_name = $term->name;
+    }   
     ?>