Changeset 3290731

Timestamp:

05/10/2025 03:06:44 AM (10 months ago)

Author:

MarkODonnell

Message:

Submitting a corrected version 1.5

Location:

coaching-staffs/trunk

Files:

• includes/mstw-admin-utils.php (modified) (8 diffs)
• includes/mstw-coaching-staffs-admin.php (modified) (40 diffs)
• includes/mstw-cs-utility-functions.php (modified) (4 diffs)
• includes/mstw-utility-functions.php (modified) (20 diffs)
• lang/mstw-coaching-staffs-en_US.pot (modified) (4 diffs)
• mstw-coaching-staffs.php (modified) (14 diffs)
• readme.txt (modified) (1 diff)
• theme-templates/single-coach.php (modified) (8 diffs)
• theme-templates/taxonomy-staffs.php (modified) (11 diffs)

coaching-staffs/trunk/includes/mstw-admin-utils.php

@@ -5 +5 @@
  *
  *  MSTW Wordpress Plugins
- *  Copyright (C) 2013-24 Mark O'Donnell
+ *  Copyright (C) 2013-25 Mark O'Donnell
  *  Contact me at http://shoalsummitsolutions.com
  *
@@ -64 +64 @@
         $label = $args['label'];
         
-        echo "<input type='text' id='$id' name='$name' value='$value' /> \n";
-        echo ($label != '') ? "<br /><span class='description'>$label</span>" : "";
+        //echo "<input type='text' id='$id' name='$name' value='$value' /> \n";
+        ?>
+        <input type='text' id='<?php echo esc_html( $id ) ?>' name='<?php echo esc_html( $name ) ?>' value='<?php echo esc_html( $value ) ?>' /></br>
+        <?php
+        //echo ($label != '') ? "<br /><span class='description'>$label</span>" : "";
+        if ( $label != '' ) {
+            ?>  
+            <span class='description'><?php echo esc_html( $label ) ?></span>
+      <?php
+        }
         //echo "<label for='$id'>$label</label> \n";
 
@@ -83 +91 @@
  *---------------------------------------------------------------*/
     function mstw_utl_text_ctrl( $args ) { 
+        //mstw_log_msg( "mstw_utl_text_ctrl: args:" );
+        //mstw_log_msg( $args );
+        
         $id = $args['id'];
         $name = $args['name'];
@@ -88 +99 @@
         $label = $args['label'];
         
-        echo "<input type='text' id='$id' name='$name' value='$value' /> \n";
+        //echo  "<input type='text' id='$id' name='$name' value='$value' /> \n" ;
+        ?>
+        <input type='text' id='<?php echo esc_html( $id ) ?>' name='<?php echo esc_html( $name ) ?>' value='<?php echo esc_html( $value ) ?>' /></br>
+        <?php
         //echo "<label for='$id'>$label</label> \n";
-        echo ($label != '') ? "<br /><span class='description'>$label</span>" : "";
+        //echo ($label != '') ? wp_kses_post( "<br /><span class='description'>$label</span>" ) : "";
+        if ( $label != '' ) {
+            ?>  
+            <span class='description'><?php echo esc_html( $label ) ?></span>
+      <?php
+        }
         
     } //End: mstw_utl_text_ctrl
@@ -109 +128 @@
  *---------------------------------------------------------------*/
     function mstw_utl_checkbox_ctrl( $args ) { 
+        //mstw_log_msg( "mstw_utl_checkbox_ctrl:" );
+        
         $id =       $args['id'];
         $name =     $args['name'];
@@ -114 +135 @@
         $label =    $args['label'];
         
-        echo "<input type='checkbox' id='$id' name='$name' value='1' " . 
-                checked( '1', $value, false ) . "/> \n";  
-        //echo "<label for='$id'>$label</label> \n";
-        echo ($label != '') ? "<br /><span class='description'>$label</span>" : "";
+        echo wp_kses_post( "<input type='checkbox' id='$id' name='$name' value='1' " . 
+                checked( '1', $value, false ) . "/> \n" );
+            
+        if ( $label != '' ) {
+            ?><br /><span class='<?php echo esc_html( description ) ?>' <?php echo esc_html( $label ) ?> </span>
+        <?php
+        }
+        else {
+            echo esc_html( "" ) ;
+        }
         
     }   //End: mstw_utl_checkbox_ctrl
@@ -135 +162 @@
  *---------------------------------------------------------------*/ 
     function mstw_utl_show_hide_ctrl( $args ) {
-    
-        $new_args = array(  'options' => array( __( 'Show', 'mstw-loc-domain' ) => 1, 
-                                            __( 'Hide', 'mstw-loc-domain' ) => 0, 
+        //mstw_log_msg( "mstw_utl_show_hide_ctrl:" );
+
+        $new_args = array(  'options' => array( __( 'Show', 'coaching-staffs' ) => 1, 
+                                            __( 'Hide', 'coaching-staffs' ) => 0, 
                                             ),
                         'id' => $args['id'],
@@ -157 +185 @@
  *   $args['name'] (string)     Name of input field
  *   $args['value'] (string)    Current value of setting
- *   $args['label'] (string)    Default to use of setting is blank
+ *   $args['label'] (string)    Default to use if setting is blank
  *
  *  Return - none. Output is echoed.
  *---------------------------------------------------------------*/
     function mstw_utl_select_option_ctrl( $args ) {
-        
+        //mstw_log_msg( "mstw_utl_select_option_ctrl: args: " );
+        //mstw_log_msg( $args );
+    
         $options = $args['options'];
         $name = $args['name'];
         $id = $args['id'];
+        
         $curr_value = $args['value'];
         $label = $args['label'];
         
-        echo "<select id='$id' name='$name' style='width: 160px' >";
+        //echo "<select id='$id' name='$name' style='width: 160px' >";
+        ?> 
+        <select id= <?php echo esc_html( $id ) ?> name= <?php echo esc_html( $name ) ?> style='width: 160px' >
+        <?php
         foreach( $options as $key=>$value ) {
-            //echo '<p> key: ' . $key . ' value: ' . $value .'</p>';
-            $selected = ( $curr_value == $value ) ? 'selected="selected"' : '';
-            echo "<option value='$value' $selected>$key</option>";
+            $selected = ( $curr_value == $value ) ? ' selected' : '';
+            ?> 
+            <option value='<?php echo esc_html( $value ) ?>'<?php echo esc_html( $selected ) ?> > <?php echo esc_html( $key ) ?> </option>
+        <?php
         }
         echo "</select> \n";
-        //echo "<label for='$id'>". $label . "</label> \n";
-        //echo "<label for='$id'>$label</label> \n";
-        echo ($label != '') ? "<br /><span class='description'>$label</span>" : "";
+        echo ($label != '') ? wp_kses_post( "<br /><span class='description'>$label</span>" ) : "";
         
     }  //End: mstw_utl_select_option_ctrl

coaching-staffs/trunk/includes/mstw-coaching-staffs-admin.php

@@ -6 +6 @@
 
 /*-----------------------------------------------------------------------------------
-Copyright 2012-24  Mark O'Donnell  (email : [email protected])
+Copyright 2012-25  Mark O'Donnell  (email : [email protected])
 
 This program is free software: you can redistribute it and/or modify
@@ -60 +60 @@
         wp_enqueue_style( 'wp-color-picker' );
         //wp_enqueue_script( 'wp-color-picker' );
-        wp_enqueue_script( 'wp-color-picker-settings', plugins_url( 'coaching-staffs/js/cs-color-settings.js' ), array( 'wp-color-picker' ), false, true ); 
+        wp_enqueue_script( 'wp-color-picker-settings', plugins_url( 'coaching-staffs/js/cs-color-settings.js' ), array( 'wp-color-picker' ), "1.5", true ); 
     }
 
@@ -75 +75 @@
     function mstw_cs_custom_css() {
     echo '<style type="text/css">
-           #icon-mstw-cs-main-menu.icon32 {background: url( ' . plugins_url( '/coaching-staffs/images/mstw-logo-32x32.png', 'coaching-staffs' ) . ') transparent no-repeat;}
-           #icon-coaching-staffs.icon32 {background: url( ' . plugins_url( '/coaching-staffs/images/mstw-logo-32x32.png', 'coaching-staffs' ) . ') transparent no-repeat;}
-           #icon-edit.icon32-posts-staff_position {background: url( ' . plugins_url( '/coaching-staffs/images/mstw-logo-32x32.png', 'coaching-staffs' ) . ') transparent no-repeat;}' .
+           #icon-mstw-cs-main-menu.icon32 {background: url( ' . esc_url( plugins_url( '/coaching-staffs/images/mstw-logo-32x32.png', 'coaching-staffs' ) ) . ') transparent no-repeat;}
+           #icon-coaching-staffs.icon32 {background: url( ' . esc_url( plugins_url( '/coaching-staffs/images/mstw-logo-32x32.png', 'coaching-staffs' ) ) . ') transparent no-repeat;}
+           #icon-edit.icon32-posts-staff_position {background: url( ' . esc_url( plugins_url( '/coaching-staffs/images/mstw-logo-32x32.png', 'coaching-staffs' ) ). ') transparent no-repeat;}' .
          '</style>';
     }
@@ -108 +108 @@
     
     function mstw_cs_restrict_positions_by_staff( ) {
-    global $typenow;
-
-    if( $typenow == 'staff_position' ) {
-        
-        $taxonomy_slugs = array( 'staffs' );
-        
-        foreach ( $taxonomy_slugs as $tax_slug ) {
-            //retrieve the taxonomy object for the tax_slug
-            $tax_obj = get_taxonomy( $tax_slug );
-            $tax_name = $tax_obj->labels->name;
-            
-            $terms = get_terms( $tax_slug );
-        
-            //output the html for the drop down menu
-            echo "<select name='$tax_slug' id='$tax_slug' class='postform'>";
-            echo "<option value=''>". __( 'Show All Staffs', 'coaching-staffs') . "</option>";
-            
-            //output each select option line
-            foreach ($terms as $term) {
-                //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"' : '';
-                }
-                else {
-                    $selected = '';
-                }
-                echo '<option value=' . $term->slug . $selected . '>' . $term->name . ' (' . $term->count . ')</option>';
-            }
-            echo "</select>"; 
-        }   
-    }
+        //mstw_log_msg( "mstw_cs_restrict_positions_by_staff:" );
+        
+        global $typenow;
+
+        if( $typenow == 'staff_position' ) {
+            
+            $taxonomy_slugs = array( 'staffs' );
+            
+            foreach ( $taxonomy_slugs as $tax_slug ) {
+                //retrieve the taxonomy object for the tax_slug
+                $tax_obj = get_taxonomy( $tax_slug );
+                $tax_name = $tax_obj->labels->name;
+                $terms = get_terms( $tax_slug );
+                
+                //output the html for the drop down menu
+                ?><select name='<?php echo esc_html( $tax_slug )?>' id='<?php echo esc_html( $tax_slug )?>' class='postform'>
+                    <option value=''><?php esc_html_e( 'Show All Staffs', 'coaching-staffs')?></option>
+                    <?php
+                    //output each select option line
+                    foreach ($terms as $term) {
+                        //check against the last $_GET to show the current selection
+                        if ( array_key_exists( $tax_slug, $_GET ) ) {
+                            $selected = ( $_GET[$tax_slug] == $term->slug ) ? ' selected' : '';
+                        }
+                        else {
+                            $selected = '';
+                        }
+                        
+                        ?>
+                        <option value='<?php echo esc_html( $term->slug )?>' <?php echo esc_html( $selected )?>> <?php echo esc_html( $term->name . '(' . $term->count . ')' ) ?> </option>
+                        <?php           
+                    }
+                ?></select><?php 
+            }   
+        }
+    
 } //End: mstw_cs_restrict_positions_by_staff
     
-
-    // ----------------------------------------------------------------
-    // Create the meta box for the Coaching Staff custom post type
-    add_action( 'add_meta_boxes', 'mstw_cs_add_meta_boxes' );
-
-    function mstw_cs_add_meta_boxes () {    
-        add_meta_box(   'mstw-cs-coach-meta', 
-                        __('Coach', 'coaching-staffs'), 
+ //-----------------------------------------------------------------
+ // Add the meta box for the mstw_cs_coach custom post type
+ //
+ add_action( 'add_meta_boxes_coach', 'mstw_cs_coach_metaboxes' );
+ 
+ if( !function_exists( 'mstw_cs_coach_metaboxes' ) ) {
+    function mstw_cs_coach_metaboxes( ) {
+            
+        add_meta_box(   'mstw-cs_coach-meta', 
+                        __('Coach Data', 'coaching-staffs'), 
                         'mstw_cs_coach_ui', 
                         'coach', 
-                        'normal', 
-                        'high' );
-                        
+                        'advanced', 
+                        'high' );   
+                        
+    } //End: mstw_cs_coach_metaboxes( )
+ }
+ 
+ //-----------------------------------------------------------------
+ // Add the meta box for the mstw_cs_coach custom post type
+ //
+ add_action( 'add_meta_boxes_staff_position', 'mstw_cs_staff_metaboxes' );
+ 
+ if( !function_exists( 'mstw_cs_staff_metaboxes' ) ) {
+    function mstw_cs_staff_metaboxes( ) {
+        //mstw_log_msg( 'mstw_cs_staff_metaboxes:' );   
+        
         add_meta_box(   'mstw-cs-staff-position-meta', 
                         __('Staff Position', 'coaching-staffs'), 
                         'mstw_cs_staff_position_ui', 
                         'staff_position', 
-                        'normal', 
+                        'advanced', 
                         'high' );
-    }
+                        
+    } //End: mstw_cs_staff_metaboxes( )
+ }
+ 
+ //-----------------------------------------------------------------
+ // Move the meta box ahead of the content (coach bio)
+ //
+ add_action('edit_form_after_title', 'mstw_cs_build_coach_screen' );
+
+ if( !function_exists( 'mstw_cs_build_coach_screen' ) ) {
+    function mstw_cs_build_coach_screen( ) {
+        //mstw_log_msg( 'mstw_cs_build_coach_screen' ); 
+        
+        global $post, $wp_meta_boxes;
+        
+        // first make sure we're on the right screen ...
+        if( get_post_type( $post ) == 'coach' ) {
+            do_meta_boxes(get_current_screen( ), 'advanced', $post);
+            unset( $wp_meta_boxes[get_post_type($post)]['advanced'] );
+            ?>
+            <p class='player-bio-admin-head'><?php esc_html_e( 'Coach Bio:', 'coaching-staffs' ) ?></p>
+            <?php
+        }
+    }  //End: mstw_cs_build_coach_screen()
+ }
 
     // ----------------------------------------------------------------------
@@ -167 +210 @@
     
     function mstw_cs_coach_ui( $post ) {
+        //mstw_log_msg( "mstw_cs_coach_ui:" );
+        
+        wp_nonce_field( 'edit-coaches', 'mstw-cs-nonce', false, true );
+            
         // Retrieve the metadata values if they exist
         $experience = get_post_meta( $post->ID, 'mstw_cs_experience', true );
@@ -176 +223 @@
         $family = get_post_meta( $post->ID, 'mstw_cs_family', true );   
         ?>  
-        
-       <table class="form-table">
-        
-        <tr valign="top">
-            <th scope="row"><label for="mstw_cs_experience" ><?php echo( __( 'Experience', 'coaching-staffs' ) . ':' ); ?> </label></th>
-            <td><input size="20" name="mstw_cs_experience"
-                value="<?php echo esc_attr( $experience ); ?>"/></td>
-        </tr>
-        <tr valign="top">
-            <th scope="row"><label for="mstw_cs_alma_mater" ><?php echo( __( 'Alma Mater', 'coaching-staffs' ) . ':' ); ?> </label></th>
-            <td><input size="20" name="mstw_cs_alma_mater"
-                value="<?php echo esc_attr( $alma_mater ); ?>"/></td>
-        </tr>
-        <tr valign="top">
-            <th scope="row"><label for="mstw_cs_degree" ><?php echo( __( 'Degree', 'coaching-staffs' ) . ':' ); ?> </label></th>
-            <td><input size="20" name="mstw_cs_degree"
-                value="<?php echo esc_attr( $degree ); ?>"/></td>
-        </tr>   
-        <tr valign="top">
-            <th scope="row"><label for="mstw_cs_birth_date" ><?php echo( __( 'Birth Date', 'coaching-staffs' ) . ':' ); ?> </label></th>
-            <td><input size="20" name="mstw_cs_birth_date"
-                value="<?php echo esc_attr( $birth_date ); ?>"/></td>
-        </tr>
-        <tr valign="top">
-            <th scope="row"><label for="mstw_cs_home_town" ><?php echo( __( 'Home Town', 'coaching-staffs' ) . ':' ); ?> </label></th>
-            <td><input size="20" name="mstw_cs_home_town"
-                value="<?php echo esc_attr( $home_town ); ?>"/></td>
-        </tr>
-        <tr valign="top">
-            <th scope="row"><label for="mstw_cs_high_school" ><?php echo( __( 'High School', 'coaching-staffs' ) . ':' ); ?> </label></th>
-            <td><input size="20" name="mstw_cs_high_school"
-                value="<?php echo esc_attr( $high_school ); ?>"/></td>
-        </tr>
-        <tr valign="top">
-            <th scope="row"><label for="mstw_cs_family" ><?php echo( __( 'Family', 'coaching-staffs' ) . ':' ); ?> </label></th>
-            <td><textarea rows="5" cols="40" name="mstw_cs_family">
-                <?php echo esc_attr( $family ); ?> </textarea></td>
-        </tr>
+         
+      <table class="form-table"
+            <tr valign="top">
+                <th scope="row"><label for="mstw_cs_experience" ><?php esc_html_e( 'Experience', 'coaching-staffs' ) ?>:  </label></th>
+                <td><input size="20" name="mstw_cs_experience"
+                    value="<?php echo esc_html( $experience ) ?>"/></td>
+            </tr>
+            <tr valign="top">
+                <th scope="row"><label for="mstw_cs_alma_mater" ><?php esc_html_e( 'Alma Mater', 'coaching-staffs' ) ?>:  </label></th>
+                <td><input size="20" name="mstw_cs_alma_mater"
+                    value="<?php echo esc_html( $alma_mater ) ?>"/></td>
+            </tr>
+            <tr valign="top">
+                <th scope="row"><label for="mstw_cs_degree" ><?php esc_html_e( 'Degree', 'coaching-staffs' ) ?>:  </label></th>
+                <td><input size="20" name="mstw_cs_degree"
+                    value="<?php echo esc_html( $degree ) ?>"/></td>
+            </tr>   
+            <tr valign="top">
+                <th scope="row"><label for="mstw_cs_birth_date" ><?php esc_html_e( 'Birth Date', 'coaching-staffs' ) ?>: </label></th>
+                <td><input size="20" name="mstw_cs_birth_date"
+                    vvalue="<?php echo esc_html( $birth_date ) ?>"/></td>
+            </tr>
+            <tr valign="top">
+                <th scope="row"><label for="mstw_cs_home_town" ><?php esc_html_e( 'Home Town', 'coaching-staffs' ) ?>: </label></th>
+                <td><input size="20" name="mstw_cs_home_town"
+                    value="<?php echo esc_html( $home_town ); ?>"/></td>
+            </tr>
+            <tr valign="top">
+                <th scope="row"><label for="mstw_cs_high_school" ><?php esc_html_e( 'High School', 'coaching-staffs' ) ?>: </label></th>
+                <td><input size="20" name="mstw_cs_high_school"
+                    value="<?php echo esc_html( $high_school ) ?>"/></td>
+            </tr>
+            <tr valign="top">
+                <th scope="row"><label for="mstw_cs_family" ><?php esc_html_e( 'Family', 'coaching-staffs' ) ?>: </label></th>
+                <td><textarea rows="5" cols="40" name="mstw_cs_family">
+                    <?php echo esc_html( $family ) ?> </textarea></td>
+            </tr>
         
     </table> 
@@ -225 +271 @@
     
     function mstw_cs_staff_position_ui( $post ) {
+        //mstw_log_msg( "mstw_cs_staff_position_ui:" );
+        
         // Retrieve the metadata values if they exist
         $position_coach = get_post_meta( $post->ID, 'mstw_cs_position_coach', true );
-        $display_order = get_post_meta( $post->ID, 'mstw_cs_display_order', true );   
+        $display_order = get_post_meta( $post->ID, 'mstw_cs_display_order', true ); 
+        
+        wp_nonce_field( 'edit-staffs', 'mstw-cs-nonce', false, true );
         ?>  
         
@@ -237 +287 @@
             <select name="mstw_cs_position_coach" > <!--onchange='document.location.href=this.options[this.selectedIndex].value;'> -->
                  <option value="">
-                <?php echo esc_attr( __( 'Select coach', 'coaching-staffs' ) ); ?></option> 
+                <?php esc_html_e( 'Select coach', 'coaching-staffs' ) ?></option> 
                  <?php 
                  $args = array(
@@ -253 +303 @@
                                 'post_parent'      => '',
                                 'post_status'      => 'publish',
-                                'suppress_filters' => true ); 
+                                'suppress_filters' => false /*true*/ ); 
                   $coaches = get_posts( $args ); 
                           
                   foreach ( $coaches as $coach ) {
-                    $selected = ( $coach->ID == $position_coach ) ? 'selected="selected"' : '';
-                    $option = '<option value="' . $coach->ID . '" ' . $selected . '>';
-                    $option .= $coach->post_title;
-                    $option .= '</option>';
-                    echo $option;
+                        $selected = ( $coach->ID == $position_coach ) ? 'selected="selected"' : '';
+                        ?>
+                        <option value="<?php echo esc_html( $coach -> ID )?>" <?php echo esc_html( $selected ) ?> > <?php echo esc_html( $coach->post_title ) ?> </option>
+                        <?php
                   }
                 ?>
@@ -269 +318 @@
                         
             <tr valign="top">
-                <th scope="row"><label for="mstw_cs_display_order" ><?php echo( __( 'Display Order:', 'coaching-staffs' ) ); ?> </label></th>
+                <th scope="row"><label for="mstw_cs_display_order" ><?php esc_html_e( 'Display Order:', 'coaching-staffs' ) ?> </label></th>
                 <td><input maxlength="5" size="5" name="mstw_cs_display_order"
-                    value="<?php echo esc_attr( $display_order ); ?>"/></td>
+                    value="<?php echo esc_html( $display_order ); ?>"/></td>
             </tr>
             
@@ -278 +327 @@
     <?php
     }
-
 
     // ----------------------------------------------------------------------
@@ -285 +333 @@
 
     function mstw_cs_save_meta_data( $post_id ) {
+        //mstw_log_msg( "mstw_cs_save_meta_data:" );
+        
         global $typenow;
         
+        //
+        //Just return on an autosave
+        //
+        if ( defined('DOING_AUTOSAVE') && DOING_AUTOSAVE ) 
+            return $post_id;
+        
+        if ( !isset( $_POST['mstw-cs-nonce'] ) ) {
+            die( esc_html__( "Irrecoverable error encountered saving data. Exiting.", 'coaching-staffs' ) );
+        } else { //nonce is set, verify it
+            $safeNonce = mstw_safe_get( 'mstw-cs-nonce', $_POST, null );    
+        }
+
         if ( $typenow == 'coach' ) {
+            if ( false == wp_verify_nonce( $safeNonce, 'edit-coaches' ) ) { 
+                die( esc_html__( "Irrecoverable error encountered saving data. Exiting.", 'coaching-staffs' ) );
+            }
             //Strip tags for safety before storing strings      
             update_post_meta( $post_id, 'mstw_cs_experience', 
-                    strip_tags( $_POST['mstw_cs_experience'] ) );
+                    wp_strip_all_tags( mstw_safe_get( 'mstw_cs_experience', $_POST ) ) );
                     
             update_post_meta( $post_id, 'mstw_cs_alma_mater', 
-                    strip_tags( $_POST['mstw_cs_alma_mater'] ) );
+                    wp_strip_all_tags( mstw_safe_get( 'mstw_cs_alma_mater', $_POST ) ) );
                     
             update_post_meta( $post_id, 'mstw_cs_degree', 
-                    strip_tags( $_POST['mstw_cs_degree'] ) );
+                    wp_strip_all_tags( mstw_safe_get( 'mstw_cs_degree', $_POST ) ) );
                     
             update_post_meta( $post_id, 'mstw_cs_birth_date', 
-                    strip_tags( $_POST['mstw_cs_birth_date'] ) );
+                    wp_strip_all_tags( mstw_safe_get( 'mstw_cs_birth_date', $_POST ) ) );
                     
             update_post_meta( $post_id, 'mstw_cs_home_town', 
-                    strip_tags( $_POST['mstw_cs_home_town'] ) );
+                    wp_strip_all_tags( mstw_safe_get( 'mstw_cs_home_town', $_POST ) ) );
                     
             update_post_meta( $post_id, 'mstw_cs_high_school', 
-                    strip_tags( $_POST['mstw_cs_high_school'] ) );
+                    wp_strip_all_tags( mstw_safe_get( 'mstw_cs_high_school', $_POST ) ) );
 
             update_post_meta( $post_id, 'mstw_cs_family', 
-                    strip_tags( $_POST['mstw_cs_family'] ) );       
+                    wp_strip_all_tags( mstw_safe_get( 'mstw_cs_family', $_POST ) ) );       
         }
         else if ( $typenow == 'staff_position' ) {
+            if ( false == wp_verify_nonce( $safeNonce, 'edit-staffs' ) ) {  
+                die( esc_html__( "Irrecoverable error encountered saving data. Exiting.", 'coaching-staffs' ) );
+            }
             update_post_meta( $post_id, 'mstw_cs_position_coach', 
-                    strip_tags( $_POST['mstw_cs_position_coach'] ) );
+                    wp_strip_all_tags( mstw_safe_get( 'mstw_cs_position_coach', $_POST ) ) );
                     
             update_post_meta( $post_id, 'mstw_cs_display_order', 
-                    strip_tags( $_POST['mstw_cs_display_order'] ) );
+                    wp_strip_all_tags( mstw_safe_get( 'mstw_cs_display_order', $_POST ) ) );
         }
-    }
+        
+    } //End: mstw_cs_save_meta_data( )
     
 
@@ -357 +426 @@
                 else {
                     $photo_file_url = plugins_url() . '/coaching-staffs/images/default-photo.jpg';
-                    echo '<img width="64" height="64" src="' . $photo_file_url . '" class="attachment-64x64 wp-post-image" alt="No photo available">';
+                    //echo '<img width="64" height="64" src="' . $photo_file_url . '" class="attachment-64x64 wp-post-image" alt="No photo available">';
+                    ?>
+                    <img width="64" height="64" src="<?php echo esc_url( $photo_file_url ) ?>" class="attachment-64x64 wp-post-image" alt="No photo available">
+                    <?php
                     
                 }
@@ -363 +435 @@
                 
             case 'experience' :
-                printf( '%s', get_post_meta( $post_id, 'mstw_cs_experience', true ) );
+                echo esc_html( get_post_meta( $post_id, 'mstw_cs_experience', true ) );
                 break;
                 
             case 'alma_mater' :
-                printf( '%s', get_post_meta( $post_id, 'mstw_cs_alma_mater', true ) );
+                echo esc_html( get_post_meta( $post_id, 'mstw_cs_alma_mater', true ) );
                 break;
         
                 
             case 'degree' :
-                printf( '%s', get_post_meta( $post_id, 'mstw_cs_degree', true ) );
+                echo esc_html( get_post_meta( $post_id, 'mstw_cs_degree', true ) );
                 break;
                 
             case 'birth_date' :
-                printf( '%s', get_post_meta( $post_id, 'mstw_cs_birth_date', true ) );
+                echo esc_html( get_post_meta( $post_id, 'mstw_cs_birth_date', true ) );
                 break;
 
             case 'home_town' :
-                printf( '%s', get_post_meta( $post_id, 'mstw_cs_home_town', true ) );
+                echo esc_html( get_post_meta( $post_id, 'mstw_cs_home_town', true ) );
                 break;
                 
             case 'high_school' :
-                printf( '%s', get_post_meta( $post_id, 'mstw_cs_high_school', true ) );
+                echo esc_html( get_post_meta( $post_id, 'mstw_cs_high_school', true ) );
                 break;
                 
             case 'family' :
-                printf( '%s', nl2br( get_post_meta( $post_id, 'mstw_cs_family', true ) ) );
+                echo wp_kses_post( nl2br( get_post_meta( $post_id, 'mstw_cs_family', true ) ) );
                 break;
                 
@@ -429 +501 @@
                         $staffs[$key] =  $staff->name;
                     }
-                    echo implode( ' | ', $staffs );
+                    echo esc_html( implode( ' | ', $staffs ) );
                 }
                 break;
@@ -435 +507 @@
             case 'coach' :
                 $coach_id = get_post_meta( $post_id, 'mstw_cs_position_coach', true );
-                printf( '%s', get_the_title( $coach_id ) );
+                echo esc_html( get_the_title( $coach_id ) );
                 break;
                 
             case 'experience' :
-                printf( '%s', get_post_meta( $post_id, 'mstw_cs_experience', true ) );
+                //printf( '%s', get_post_meta( $post_id, 'mstw_cs_experience', true ) );
+                echo esc_html( get_post_meta( $post_id, 'mstw_cs_experience', true ) );
                 break;
                 
@@ -486 +559 @@
             <?php //settings_errors(); ?>
             <form action="options.php" method="post">
+                <?php wp_nonce_field( 'display-settings', 'mstw-cs-nonce' ); ?>
                 <?php settings_fields( 'mstw_cs_settings_fields' ); ?>
                 <?php do_settings_sections( 'mstw-cs-display-settings' ); ?>
                 <p>
-                <input name="submit" type="submit" class="button-primary" value=<?php _e( "Save Changes", "coaching-staffs" ); ?> />
+                <input name="submit" type="submit" class="button-primary" value=<?php esc_html_e( "Save Changes", "coaching-staffs" ); ?> />
                 
-                <input type="submit" name="mstw_cs_options[reset]" value=<?php _e( "Reset Default Values", "coaching-staffs" ) ?> />
-                    <strong><?php _e( "WARNING! Reset Default Values will do so without further warning!", "coaching-staffs" ); ?></strong>
+                <input type="submit" name="mstw_cs_options[reset]" value=<?php esc_html_e( "Reset Default Values", "coaching-staffs" ) ?> />
+                    <strong><?php esc_html_e( "WARNING! Reset Default Values will do so without further warning!", "coaching-staffs" ); ?></strong>
                 </p>
             </form>
@@ -505 +579 @@
 
     function mstw_cs_admin_init( ){
+        //mstw_log_msg( "mstw_cs_admin_init:" );
+        
         $options = get_option( 'mstw_cs_options' );
         $options = wp_parse_args( $options, mstw_cs_get_defaults( ) );
-        //print_r ($options);
         
         // Settings for the fields and columns display and label controls.
@@ -532 +607 @@
     // Data field visibility and labels 
     function mstw_cs_data_fields_setup( ) {
+        //mstw_log_msg( "mstw_cs_data_fields_setup:" );
+        
         $display_page = 'mstw-cs-display-settings';     //menu page slug on which to display
         $page_section = 'mstw_cs_data_field_settings';  //page section slug on which to display
         
         $options = get_option( 'mstw_cs_options' );
-        
+
         add_settings_section(
             $page_section,      //id attribute of tags
-            __( 'Data Field Settings', 'coaching-staffs' ), //title of the section
+            esc_html__( 'Data Field Settings', 'coaching-staffs' ), //title of the section
             'mstw_cs_data_fields_settings_text',    //callback to fill section with desired output - should echo
             $display_page   //page slug on which to display
@@ -560 +637 @@
             );
         
-        
         //Show/Hide Position
         $args = array(  'id' => 'show_position',
                         'name' => 'mstw_cs_options[show_position]',
-                        'value' => $options['show_position'],
+                        'value' => mstw_safe_get( 'show_position', $options, 1 ),
                         'label' => ''
                         );
@@ -576 +652 @@
             $args                           //Callback arguments
             );
-            
-            
             
         //Position Label
@@ -598 +672 @@
         $args = array(  'id' => 'show_experience',
                         'name' => 'mstw_cs_options[show_experience]',
-                        'value' => $options['show_experience'],
+                        'value' => mstw_safe_get( 'show_experience', $options, 1 ),
                         'label' => ''
                         );
@@ -630 +704 @@
         $args = array(  'id' => 'show_alma_mater',
                         'name' => 'mstw_cs_options[show_alma_mater]',
-                        'value' => $options['show_alma_mater'],
+                        'value' => mstw_safe_get( 'show_alma_mater', $options, 1 ),
                         'label' => ''
                         );
@@ -662 +736 @@
         $args = array(  'id' => 'show_degree',
                         'name' => 'mstw_cs_options[show_degree]',
-                        'value' => $options['show_degree'],
+                        'value' => mstw_safe_get( 'show_degree', $options, 0 ),
                         'label' => ''
                         );
@@ -694 +768 @@
         $args = array(  'id' => 'show_birth_date',
                         'name' => 'mstw_cs_options[show_birth_date]',
-                        'value' => $options['show_birth_date'],
+                        'value' => mstw_safe_get( 'show_birth_date', $options, 0 ),
                         'label' => ''
                         );
@@ -726 +800 @@
         $args = array(  'id' => 'show_home_town',
                         'name' => 'mstw_cs_options[show_home_town]',
-                        'value' => $options['show_home_town'],
+                        'value' => mstw_safe_get( 'show_home_town', $options, 0 ),
                         'label' => ''
                         );
@@ -758 +832 @@
         $args = array(  'id' => 'show_high_school',
                         'name' => 'mstw_cs_options[show_high_school]',
-                        'value' => $options['show_high_school'],
+                        'value' => mstw_safe_get( 'show_high_school', $options, 0 ),
                         'label' => ''
                         );
@@ -771 +845 @@
             );  
             
-        //Hometown Label
+        //High School Label
         $args = array(  'id' => 'high_school_label',
                         'name' => 'mstw_cs_options[high_school_label]',
@@ -790 +864 @@
         $args = array(  'id' => 'show_family',
                         'name' => 'mstw_cs_options[show_family]',
-                        'value' => $options['show_family'],
+                        'value' => mstw_safe_get( 'show_family', $options, 0 ),
                         'label' => ''
                         );
@@ -803 +877 @@
             );  
             
-        //Hometown Label
+        //Family Label
         $args = array(  'id' => 'family_label',
                         'name' => 'mstw_cs_options[family_label]',
@@ -873 +947 @@
         add_settings_field(
             'table_title_color',
-            __( 'Table Title Color:', 'coaching-staffs' ),
+            esc_html__( 'Table Title Color:', 'coaching-staffs' ),
             'mstw_utl_color_ctrl',
             $display_page,                  //Page to display field
@@ -884 +958 @@
                         'name' => 'mstw_cs_options[show_photos]',
                         //'value' => $options['show_photos'], //mstw_cs_admin_safe_ref( $options, 'show_photos' ),
-                        'value' => mstw_cs_safe_ref( $options, 'show_photos' ),
+                        'value' => mstw_cs_safe_ref( $options, 'show_photos', 1 ),
                         'label' => __( 'Will show coaches photos in the staff tables', 'coaching-staffs')
                         );
@@ -1090 +1164 @@
         );      
         
-    }
+    } //End: mstw_cs_table_settings_setup( )
     
     // --------------------------------------------------------------------------------------
@@ -1283 +1357 @@
         );
         
+        $showGalleryTitle = mstw_safe_get( 'show_gallery_title', $options, 0 );
         // Show/Hide Gallery Title
         $args = array(  'id' => 'show_gallery_title',
                         'name' => 'mstw_cs_options[show_gallery_title]',
-                        'value' => $options['show_gallery_title'],
+                        'value' => $showGalleryTitle, /*$options['show_gallery_title'],*/
                         'label' => __( 'Will use "Staff Name" from Staff taxonomy as default. Hide to use another page element for the table title.', 'coaching-staffs')
                         );
-                        
+        
         add_settings_field(
             'show_gallery_title',
@@ -1316 +1391 @@
         
         //Tile Corner Style
+        $galleryTileRadius = mstw_safe_get( 'gagallery_tile_radius', $options, 0 );
         $args = array(  'id' => 'gallery_tile_radius',
                         'name' => 'mstw_cs_options[gallery_tile_radius]',
-                        'value' => $options['gallery_tile_radius'],
+                        'value' => $galleryTileRadius, /*$options['gallery_tile_radius'],*/
                         'label' => __( 'Default is rounded.', 'coaching-staffs' ),
                         'options' => array( __( 'Rounded', 'coaching-staffs' ) => 15,
@@ -1400 +1476 @@
 
     function mstw_cs_gallery_settings_text( ) {
-        echo '<p>' . __( 'Enter the default settings for Coaches Gallery pages.', 'coaching-staffs' ) .  '</p>';    
+        echo '<p>' . esc_html__( 'Enter the default settings for Coaches Gallery pages.', 'coaching-staffs' ) .  '</p>';    
     }
 
     function mstw_cs_profile_settings_text( ) {
-        echo '<p>' . __( 'Enter the default settings for Single Coach Profile pages.', 'coaching-staffs' ) .  '</p>';
+        echo '<p>' . esc_html__( 'Enter the default settings for Single Coach Profile pages.', 'coaching-staffs' ) .  '</p>';
     }
 
     function mstw_cs_table_settings_text( ) {
-        echo '<p>' . __( 'Enter the default settings for Staff Table/[shortcode]. These can be overridden by [shortcode] arguments.', 'coaching-staffs' ) .  '</p>';
+        echo '<p>' . esc_html__( 'Enter the default settings for Staff Table/[shortcode]. These can be overridden by [shortcode] arguments.', 'coaching-staffs' ) .  '</p>';
     }
     
     function mstw_cs_data_fields_settings_text( ) {
-        echo '<p>' . __( 'Enter the visibility and labels for the data fiels. The name field must always be displayed, but it can be re-labeled. Note that these settings can be overridden by [shortcode] arguments.', 'coaching-staffs' ) .  '</p>';
+        echo '<p>' . esc_html__( 'Enter the visibility and labels for the data fields. The name field must always be displayed, but it can be re-labeled. Note that these settings can be overridden by [shortcode] arguments.', 'coaching-staffs' ) .  '</p>';
     }
      
     function mstw_cs_validate_settings( $input ) {
-        // Create our array for storing the validated options
+        //mstw_log_msg( "mstw_cs_validate_settings:" );
+        
+        // array to store the validated options
         $output = array();
+        
         // Pull the previous (good) options
         $options = get_option( 'mstw_cs_options' );
@@ -1423 +1502 @@
         if ( array_key_exists( 'reset', $input ) ) {
             if ( $input['reset'] ) {
+                    delete_option( 'mstw_cs_options' );
                     $output = mstw_cs_get_defaults( );
                     return $output;
@@ -1490 +1570 @@
                     case 'show_photos':
                         $output[$key] = ( isset( $input[$key] ) and  $input[$key] == 1 ) ? 1 : 0;
-                        //mstw_log_msg( 'saving ' . $key . '... input= ' . $input[$key] . ' output= ' . $output[$key] );
                         break;
                         
@@ -1504 +1583 @@
         
         return $output;
-    }
-    
-    function mstw_cs_safe_ref( $array, $ref ) {
-        $foo = isset( $array[$ref] ) ? $array[$ref] : '';
+    } //End: mstw_cs_validate_settings( )
+    
+    function mstw_cs_safe_ref( $array, $ref, $default = '' ) {
+        $foo = isset( $array[$ref] ) ? $array[$ref] : $default;
         return $foo;
     }
@@ -1564 +1643 @@
         
         $messages['coach'] = array(
+            /* translators: %s number of items */
             'updated'   => _n( '%s coach updated.', '%s coaches updated.', $bulk_counts['updated'], 'coaching-staffs' ),
+            /* translators: %s number of items */
             'locked'    => _n( '%s coach not updated, somebody is editing it.', '%s coaches not updated, somebody is editing them.', $bulk_counts['locked'], 'coaching-staffs' ),
+            /* translators: %s number of items */
             'deleted'   => _n( '%s coach permanently deleted.', '%s coaches permanently deleted.', $bulk_counts['deleted'], 'coaching-staffs' ),
+            /* translators: %s number of items */
             'trashed'   => _n( '%s coach moved to the Trash.', '%s coaches moved to the Trash.', $bulk_counts['trashed'], 'coaching-staffs' ),
+            /* translators: %s number of items */
             'untrashed' => _n( '%s coach restored from the Trash.', '%s coaches restored from the Trash.', $bulk_counts['untrashed'], 'coaching-staffs' ),
         );
         
         $messages['staff_position'] = array(
+            /* translators: %s number of items */
             'updated'   => _n( '%s position updated.', '%s positions updated.', $bulk_counts['updated'], 'coaching-staffs' ),
+            /* translators: %s number of items */
             'locked'    => _n( '%s position not updated, somebody is editing it.', '%s positions not updated, somebody is editing them.', $bulk_counts['locked'], 'coaching-staffs' ),
+            /* translators: %s number of items */
             'deleted'   => _n( '%s position permanently deleted.', '%s positions permanently deleted.', $bulk_counts['deleted'], 'coaching-staffs' ),
+            /* translators: %s number of items */
             'trashed'   => _n( '%s position moved to the Trash.', '%s positions moved to the Trash.', $bulk_counts['trashed'], 'coaching-staffs' ),
+            /* translators: %s number of items */
             'untrashed' => _n( '%s position restored from the Trash.', '%s positions restored from the Trash.', $bulk_counts['untrashed'], 'coaching-staffs' ),
         );

coaching-staffs/trunk/includes/mstw-cs-utility-functions.php

@@ -34 +34 @@
 //          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 ) {
@@ -49 +49 @@
     } //End: mstw_log_msg( )
 }
-
+*/
 //---------------------------------------------------------------------------------
 //  2. mstw_cs_get_defaults: returns the array of option defaults
@@ -74 +74 @@
                 'birth_date_label'      => __( 'Born', 'coaching-staffs' ),
                 'show_birth_date'       => 0,
-                'home_town_label'       => __( 'Hometown', 'coaching-staffs' ),
+                'home_town_label'       => __( 'Home Town', 'coaching-staffs' ),
                 'show_home_town'        => 0,
                 'high_school_label'     => __( 'High School', 'coaching-staffs' ),
@@ -130 +130 @@
     } //End: mstw_cs_find_staff_position( )
 }
+
+/*---------------------------------------------------------------------------------*/
+//  4. mstw_cs_build_coach_link_html: 
+//      ARGUMENTS: 
+//      RETURNS  : 
+//  
+if ( !function_exists( 'mstw_cs_build_coach_link_html' ) ) {
+    function mstw_cs_build_coach_link_html( $coachURL, $coachDisplay ) {
+        //mstw_log_msg( "mstw_cs_build_coach_link_html:" );
+        $coachHTML = '<a href="' .  $coachURL . '">' . $coachDisplay . '</a>';
+        
+        return $coachHTML;
+        
+    } //End: mstw_cs_build_coach_link_html( )
+}
+
+/*---------------------------------------------------------------------------------*/
+//  4. mstw_cs_build_coach_url: 
+//      ARGUMENTS: 
+//      RETURNS  : 
+//  
+if ( !function_exists( 'mstw_cs_build_coach_url' ) ) {
+    function mstw_cs_build_coach_url( $postID, $coachID ) {
+        //mstw_log_msg( "mstw_cs_build_coach_url:" );
+        $nonceURL = wp_nonce_url( get_permalink( $coachID ), 'single-coach', 'mstw-cs-nonce' );
+        $nonceURL .= '&position='. $postID;
+        
+        return $nonceURL;
+    } //End: mstw_cs_build_coach_url()
+}
+
+/*---------------------------------------------------------------------------------
+//  4. mstw_cs_get_photo_url: returns url of post thumbnail or default photo
+//      ARGUMENTS: coach CPT object
+//      RETURNS  : coach photo url
+//  
+if ( !function_exists( 'mstw_cs_get_photo_url' ) ) {
+
+    function mstw_cs_get_photo_url( ) {
+        //mstw_log_msg( 'mstw_cs_get_photo_url:' );
+
+        // check if the post has a Post Thumbnail assigned to it.
+        if ( has_post_thumbnail( ) ) { //defaults to current post
+            //Get the photo file;
+            $photo_file_url = wp_get_attachment_thumb_url( get_post_thumbnail_id(               
+            // defaults to current post
+            $alt = 'Photo of ' . $name;
+        } else {
+            // Default image is tied to the staff taxonomy. 
+            // Try to load default-photo-staff-slug.jpg, If it does not exst,
+            // Then load default-photo.jpg from the plugin -->
+            $photo_file = WP_PLUGIN_DIR . '/coaching-staffs/images/default-photo' . '-' . $staff_slug . '.jpg';
+            if ( file_exists( $photo_file ) ) {
+                $photo_file_url = plugins_url() . '/coaching-staffs/images/default-photo' . '-' . $staff_slug . '.jpg';
+                $alt = __( 'Default image for', 'coaching-staffs') . ' ' . $staff_slug;
+            }
+            else {
+                $photo_file_url = plugins_url() . '/coaching-staffs/images/default-photo' . '.jpg';
+                $alt = __( 'Photo not found.', 'coaching-staffs' );
+            }
+        }
+    } // End: mstw_cs_get_photo_url( )
+}
+*/
 ?>

coaching-staffs/trunk/includes/mstw-utility-functions.php

@@ -5 +5 @@
  *
  *  MSTW Wordpress Plugins (http://shoalsummitsolutions.com)
- *  Copyright 2014-24 Mark O'Donnell ([email protected])
+ *  Copyright 2014-25 Mark O'Donnell ([email protected])
  *
  *  This program is free software: you can redistribute it and/or modify
@@ -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 coaching staffs
  * 3. mstw_safe_ref - prevents uninitialized string errors 
  * 3.   mstw_safe_get - Safely get value for a key from an array
@@ -60 +60 @@
 //          None. Outputs to WP error_log
 //
+/*
+ *  ABOUT THE PLUGIN CHECKER TOOL COMPLAINTS:
+ *  This 'debug' code is included in production code to provide hints to system
+ *  admistrators about possible(rare) problems. It's used for debugging in development.
+ */
 if ( !function_exists( 'mstw_log_msg' ) ) {
     function mstw_log_msg( $msg ) {
@@ -84 +89 @@
 //  THIS FUNCTION ONLY WORKS IN ADMIN (because it calls get_plugin_data()
 //
-if ( !function_exists( 'mstw_requires_wordpress_version' ) ) {
-    function mstw_requires_wordpress_version( $version = '3.9.2' ) {
-        global $wp_version;
-        
-        $plugin = MSTW_SS_PLUGIN_NAME;
-        //$plugin_data = get_plugin_data( __FILE__, false );
-        $plugin_data = get_plugin_data( MSTW_SS_PLUGIN_DIR . '/mstw-schedules-scoreboards.php', 
-                                        false );
-
-        if ( version_compare( $wp_version, $version, "<" ) ) {
-            if( is_plugin_active( $plugin ) ) {
-                deactivate_plugins( $plugin );
-                $die_msg = $plugin_data['Name'] . " requires WordPress $version or higher, and has been deactivated! <br/> Please upgrade WordPress and try again.<br /><br /><a href='".admin_url()."'>Back to admin dashboard</a>.";
-                die( $die_msg );
-            }
-        }
-    } //end mstw_requires_wordpress_version()
-}
-
+/*
+ *  Removed from coaching staffs plugins
+ */
+ 
 // ----------------------------------------------------------------
 // 3. mstw_safe_ref - prevents uninitialized string errors 
@@ -130 +120 @@
 if ( !function_exists ( 'mstw_safe_get' ) ) {
     function mstw_safe_get( $needle, $haystack, $default = '' ) {
-        //mstw_log_msg( "mstw_safe_get: needle= $needle" );
-        //mstw_log_msg( $haystack );
+        //mstw_log_msg( "mstw_safe_get: needle= $needle" haystack= $haystack" );
         
         if ( array_key_exists( $needle, $haystack ) ) {
@@ -180 +169 @@
     function mstw_date_loc($format, $timestamp = null) {
         $param_D = array( '', 
-                            __( 'Mon', 'mstw-loc-domain' ), 
-                            __( 'Tue', 'mstw-loc-domain' ), 
-                            __( 'Wed', 'mstw-loc-domain' ), 
-                            __( 'Thr', 'mstw-loc-domain' ), 
-                            __( 'Fri', 'mstw-loc-domain' ), 
-                            __( 'Sat', 'mstw-loc-domain' ), 
-                            __( 'Sun', 'mstw-loc-domain' ) );
+                            __( 'Mon', 'coaching-staffs' ), 
+                            __( 'Tue', 'coaching-staffs' ), 
+                            __( 'Wed', 'coaching-staffs' ), 
+                            __( 'Thr', 'coaching-staffs' ), 
+                            __( 'Fri', 'coaching-staffs' ), 
+                            __( 'Sat', 'coaching-staffs' ), 
+                            __( 'Sun', 'coaching-staffs' ) );
         
         $param_l = array( '', 
-                            __( 'Monday', 'mstw-loc-domain' ), 
-                            __( 'Tuesday', 'mstw-loc-domain' ), 
-                            __( 'Wednesday', 'mstw-loc-domain' ), 
-                            __( 'Thursday', 'mstw-loc-domain' ), 
-                            __( 'Friday', 'mstw-loc-domain' ), 
-                            __( 'Saturday', 'mstw-loc-domain' ), 
-                            __( 'Sunday', 'mstw-loc-domain' ) );
+                            __( 'Monday', 'coaching-staffs' ), 
+                            __( 'Tuesday', 'coaching-staffs' ), 
+                            __( 'Wednesday', 'coaching-staffs' ), 
+                            __( 'Thursday', 'coaching-staffs' ), 
+                            __( 'Friday', 'coaching-staffs' ), 
+                            __( 'Saturday', 'coaching-staffs' ), 
+                            __( 'Sunday', 'coaching-staffs' ) );
                             
         $param_F = array( '', 
-                            __( 'January', 'mstw-loc-domain' ), 
-                            __( 'February', 'mstw-loc-domain' ), 
-                            __( 'March', 'mstw-loc-domain' ), 
-                            __( 'April', 'mstw-loc-domain' ), 
-                            __( 'May', 'mstw-loc-domain' ), 
-                            __( 'June', 'mstw-loc-domain' ),
-                            __( 'July', 'mstw-loc-domain' ),
-                            __( 'August', 'mstw-loc-domain' ),
-                            __( 'September', 'mstw-loc-domain' ),
-                            __( 'October', 'mstw-loc-domain' ),
-                            __( 'November', 'mstw-loc-domain' ),
-                            __( 'December', 'mstw-loc-domain' ) );
+                            __( 'January', 'coaching-staffs' ), 
+                            __( 'February', 'coaching-staffs' ), 
+                            __( 'March', 'coaching-staffs' ), 
+                            __( 'April', 'coaching-staffs' ), 
+                            __( 'May', 'coaching-staffs' ), 
+                            __( 'June', 'coaching-staffs' ),
+                            __( 'July', 'coaching-staffs' ),
+                            __( 'August', 'coaching-staffs' ),
+                            __( 'September', 'coaching-staffs' ),
+                            __( 'October', 'coaching-staffs' ),
+                            __( 'November', 'coaching-staffs' ),
+                            __( 'December', 'coaching-staffs' ) );
                             
         $param_M = array( '', 
-                            __( 'Jan', 'mstw-loc-domain' ), 
-                            __( 'Feb', 'mstw-loc-domain' ), 
-                            __( 'Mar', 'mstw-loc-domain' ), 
-                            __( 'Apr', 'mstw-loc-domain' ), 
-                            __( 'May', 'mstw-loc-domain' ), 
-                            __( 'Jun', 'mstw-loc-domain' ),
-                            __( 'Jul', 'mstw-loc-domain' ),
-                            __( 'Aug', 'mstw-loc-domain' ),
-                            __( 'Sep', 'mstw-loc-domain' ),
-                            __( 'Oct', 'mstw-loc-domain' ),
-                            __( 'Nov', 'mstw-loc-domain' ),
-                            __( 'Dec', 'mstw-loc-domain' ) );
+                            __( 'Jan', 'coaching-staffs' ), 
+                            __( 'Feb', 'coaching-staffs' ), 
+                            __( 'Mar', 'coaching-staffs' ), 
+                            __( 'Apr', 'coaching-staffs' ), 
+                            __( 'May', 'coaching-staffs' ), 
+                            __( 'Jun', 'coaching-staffs' ),
+                            __( 'Jul', 'coaching-staffs' ),
+                            __( 'Aug', 'coaching-staffs' ),
+                            __( 'Sep', 'coaching-staffs' ),
+                            __( 'Oct', 'coaching-staffs' ),
+                            __( 'Nov', 'coaching-staffs' ),
+                            __( 'Dec', 'coaching-staffs' ) );
         
         $return = '';
@@ -238 +227 @@
                     break;
                 case 'D' :
-                    $return .= $param_D[date('N', $timestamp)];
+                    $return .= $param_D[gmdate('N', $timestamp)];
                     break;
                 case 'l' :
-                    $return .= $param_l[date('N', $timestamp)];
+                    $return .= $param_l[gmdate('N', $timestamp)];
                     break;
                 case 'F' :
-                    $return .= $param_F[date('n', $timestamp)];
+                    $return .= $param_F[gmdate('n', $timestamp)];
                     break;
                 case 'M' :
-                    $return .= $param_M[date('n', $timestamp)];
+                    $return .= $param_M[gmdate('n', $timestamp)];
                     break;
                 default :
-                    $return .= date($format[$i], $timestamp);
+                    $return .= gmdate($format[$i], $timestamp);
                     break;
             }
@@ -269 +258 @@
 //      'curr_value' => current field value,
 //      'options'    => array of options in key=>value pairs
-//          e.g., array( __( '08:00 (24hr)', 'mstw-loc-domain' ) => 'H:i', ... )
+//          e.g., array( __( '08:00 (24hr)', 'coaching-staffs' ) => 'H:i', ... )
 //      'label_for'  => $id,
 //      'class'      => $class,
@@ -275 +264 @@
 //  );
 //
-if( !function_exists( 'mstw_build_admin_edit_screen' ) ) {  
-    function mstw_build_admin_edit_screen( $fields ) {
-        
-        foreach( $fields as $field_id=>$field_data ) {
-            //HANDLE table dividers here ... NEW
-            if ( $field_data['type'] == 'divider' ) {
-                $divider_msg = ( isset( $field_data['curr_value'] ) ) ? $field_data['curr_value'] : '&nbsp;&nbsp;';
-                ?>
-                <tr class='mstw-divider-spacer'><td>&nbsp;&nbsp;</td></tr>
-                <tr class='mstw-divider'><th colspan=2 ><?php echo $divider_msg ?></th></tr>
-                <?php
-            }
-            else {
-                $field_data['id'] = ( !isset( $field_data['id'] ) || empty( $field_data['id'] ) ) ? $field_id : $field_data['id'];
-                $field_data['name'] = ( !isset( $field_data['name'] ) || empty( $field_data['name'] ) ) ? $field_id : $field_data['name'];
-                
-                // check the field label/title
-                if ( array_key_exists( 'label', $field_data ) && !empty( $field_data['label'] ) )
-                    $label = $field_data['label'];
-                else
-                    $label = '';
-                ?>
-                
-                <tr>
-                    <th><label for '<?php echo $field_data['id']?>' >
-                        <?php echo $label ?>
-                    </label></th>
-                    <?php 
-                    // media-uploader will add it's own cells (3 of theme)
-                    if ( $field_data['type'] != 'media-uploader' ) { 
-                        echo "<td>\n";
-                    }
-
-                        
-                        mstw_build_admin_edit_field( $field_data );
-
-                    if ( $field_data['type'] != 'media-uploader' ) { 
-                        echo "</td>\n";
-                    }
-                    ?>
-                    </tr>
-                <?php
-            }
-        }
-        
-    } //End: mstw_build_admin_edit_screen()
-}
+/*
+ * Removed from cuaching staffs plugin version
+ */
 
 //-------------------------------------------------------------------------------
@@ -333 +278 @@
 //      'curr_value' => current field value,
 //      'options'    => array of options in key=>value pairs
-//          e.g., array( __( '08:00 (24hr)', 'mstw-loc-domain' ) => 'H:i', ... )
+//          e.g., array( __( '08:00 (24hr)', 'coaching-staffs' ) => 'H:i', ... )
 //      'label_for'  => $id,
 //      'class'      => $class,
@@ -340 +285 @@
 //      
 //
-if( !function_exists( 'mstw_build_admin_edit_field' ) ) {
-    function mstw_build_admin_edit_field( $args ) {
-    
-        $defaults = array(
-                'type'       => 'text',
-                'id'         => 'default_field', // the ID of the setting in our options array, and the ID of the HTML form element
-                'title'      => __( 'Default Field', 'mstw-loc-domain' ), // the label for the HTML form element
-                'label'      => __( 'Default Label', 'mstw-loc-domain' ), // the label for the HTML form element
-                'desc'       => '', // the description displayed under the HTML form element
-                'default'    => '',  // the default value for this setting
-                'type'       => 'text', // the HTML form element to use
-                'options'    => array(), // (optional): the values in radio buttons or a drop-down menu
-                'name'       => '', //name of HTML form element. should be options_array[option]
-                'class'      => '',  // the HTML form element class. Also used for validation purposes!
-                'curr_value' => '',  // the current value of the setting
-                'maxlength'  => '',  // maxlength attrib of some input controls
-                'size'       => '',  // size attrib of some input controls
-                'img_width'  => 60,
-                'btn_label'  => 'Upload from Media Library',
-                );
-        
-        // "extract" to be able to use the array keys as variables in our function output below
-        $args = wp_parse_args( $args, $defaults );
-    
-        extract( $args );
-        
-        // default name to id
-        $name = ( !empty( $name ) ) ? $name : $id;
-        
-        // pass the standard value if the option is not yet set in the database
-        //if ( !isset( $options[$id] ) && $options[ != 'checkbox' && ) {
-        //  $options[$id] = ( isset( $default ) ? $default : 'default_field' );
-        //}
-        
-        // Additional field class. Output only if the class is defined in the $args()
-        $class_str = ( !empty( $class ) ) ? "class='$class'" : '' ;
-        $maxlength_str = ( !empty( $maxlength ) ) ? "maxlength='$maxlength'" : '' ;
-        $size_str = ( !empty( $size ) ) ? "size='$size'" : '' ;
-        $attrib_str = " $class_str $maxlength_str $size_str ";
-
-        // switch html display based on the setting type.
-        switch ( $args['type'] ) {
-            //TEXT & COLOR CONTROLS
-            case 'text':    // this is the default type
-            case 'color':   // color field is just a text field with associated JavaScript
-            ?>
-                <input type="text" id="<?php echo $id ?>" name="<?php echo $name ?>" value="<?php echo $curr_value ?>" <?php echo $attrib_str ?> />
-            <?php
-                echo ( !empty( $desc ) ) ? "<br /><span class='description'>$desc</span>\n" : "";
-                break;
-                
-            //SELECT OPTION CONTROL
-            case 'select-option':
-                //not sure why this is needed given the extract() above
-                //but without it you get an extra option with the 
-                //'option-name' displayed (huh??)
-                $options = $args['options'];
-                    
-                echo "<select id='$id' name='$name' $attrib_str >";
-                    foreach( $options as $key=>$value ) {
-                        $selected = ( $curr_value == $value ) ? 'selected="selected"' : '';
-                        echo "<option value='$value' $selected>$key</option>";
-                    }
-                echo "</select>";
-                echo ( !empty( $desc ) ) ? "<br /><span class='description'>$desc</span>" : "";
-                break;
-            
-            // CHECKBOX
-            case 'checkbox':
-                echo "<input class='checkbox $class_str' type='checkbox' id='$id' name='$name' value=1 " . checked( $curr_value, 1, false ) . " />";
-                echo ($desc != '') ? "<br /><span class='description'>$desc</span>" : "";   
-                break;
-                
-            // LABEL
-            case 'label':
-                echo "<span class='description'>" . $curr_value . "</span>";
-                echo ( '' != $desc ) ? "<br /><span class='description'>$desc</span>" : "";
-                break;
-                
-            // MEDIA UPLOADER
-            case 'media-uploader':
-                ?>
-                <td class="uploader">
-                    <input type="text" name="<?php echo $id  ?>" id="<?php echo $id ?>" class="mstw_logo_text" size="32" value="<?php echo $curr_value ?>"/>
-                    <?php echo ($desc != '') ? "<br /><span class='description'>$desc</span>" : ""; ?>
-                </td>
-                
-                <td class="uploader">
-                  <input type="button" class="button" name="<?php echo $id . '_btn'?>" id="<?php echo $id . '_btn'?>" value="<?php echo $btn_label ?>" />
-                <!-- </div> -->
-                </td>
-                <td>
-                <img id="<?php echo $id . '_img' ?>" width="<?php echo $img_width ?>" src="<?php echo $curr_value ?>" />
-                </td>
-        <?php
-                break;
-                
-
-            //---------------------------------------------------------------
-            // THE FOLLOWING CASES HAVE NOT BEEN TESTED/USED
-            
-            case "multi-text":
-                foreach($options as $item) {
-                    $item = explode("|",$item); // cat_name|cat_slug
-                    $item[0] = esc_html__($item[0], 'wptuts_textdomain');
-                    if (!empty($options[$id])) {
-                        foreach ($options[$id] as $option_key => $option_val){
-                            if ($item[1] == $option_key) {
-                                $value = $option_val;
-                            }
-                        }
-                    } else {
-                        $value = '';
-                    }
-                    echo "<span>$item[0]:</span> <input class='$field_class' type='text' id='$id|$item[1]' name='" . $wptuts_option_name . "[$id|$item[1]]' value='$value' /><br/>";
-                }
-                echo ($desc != '') ? "<span class='description'>$desc</span>" : "";
-            break;
-            
-            case 'textarea':
-                $options[$id] = stripslashes($options[$id]);
-                $options[$id] = esc_html( $options[$id]);
-                echo "<textarea class='textarea$field_class' type='text' id='$id' name='" . $wptuts_option_name . "[$id]' rows='5' cols='30'>$options[$id]</textarea>";
-                echo ($desc != '') ? "<br /><span class='description'>$desc</span>" : "";       
-            break;
-
-            case 'select2':
-                echo "<select id='$id' class='select$field_class' name='" . $wptuts_option_name . "[$id]'>";
-                foreach($options as $item) {
-                    
-                    $item = explode("|",$item);
-                    $item[0] = esc_html($item[0], 'wptuts_textdomain');
-                    
-                    $selected = ($options[$id]==$item[1]) ? 'selected="selected"' : '';
-                    echo "<option value='$item[1]' $selected>$item[0]</option>";
-                }
-                echo "</select>";
-                echo ($desc != '') ? "<br /><span class='description'>$desc</span>" : "";
-            break;
-
-            case "multi-checkbox":
-                foreach($options as $item) {
-                    
-                    $item = explode("|",$item);
-                    $item[0] = esc_html($item[0], 'wptuts_textdomain');
-                    
-                    $checked = '';
-                    
-                    if ( isset($options[$id][$item[1]]) ) {
-                        if ( $options[$id][$item[1]] == 'true') {
-                            $checked = 'checked="checked"';
-                        }
-                    }
-                    
-                    echo "<input class='checkbox$field_class' type='checkbox' id='$id|$item[1]' name='" . $wptuts_option_name . "[$id|$item[1]]' value='1' $checked /> $item[0] <br/>";
-                }
-                echo ($desc != '') ? "<br /><span class='description'>$desc</span>" : "";
-            break;
-            
-            default:
-                mstw_log_msg( "CONTROL TYPE $type NOT RECOGNIZED." );
-                echo "CONTROL TYPE $type NOT RECOGNIZED.";
-            break;
-            
-        }   
-    } //End: mstw_build_admin_edit_field()
-}
-
+/*
+ * Removed from cuaching staffs plugin version
+ */
 //-------------------------------------------------------------------------------
 // 8. mstw_build_settings_screen - builds admin settings form (using settings api)
@@ -515 +295 @@
 //          None. HTML is ouput/echoed to the screen by mstw_build_settings_field()
 //
-if( !function_exists( 'mstw_build_settings_screen' ) ) {    
-    function mstw_build_settings_screen( $arguments ) {
-        foreach ( $arguments as $args ) {
-            mstw_build_settings_field( $args );
-        }
-    }  //End: mstw_build_settings_screen()
-}
+/*
+ * Removed from coaching staffs version
+ */
 
 //-------------------------------------------------------------------------------
@@ -532 +308 @@
 //          None. HTML is output/echoed to screen
 //      
-if( !function_exists( 'mstw_build_settings_field' ) ) { 
-    function mstw_build_settings_field( $args ) {
-        // default array to overwrite when calling the function
-        
-        $defaults = array(
-            'id'      => 'default_field', // the ID of the setting in our options array, and the ID of the HTML form element
-            'title'   => 'Default Field',  // the label for the HTML form element
-            'desc'    => '', // the description displayed under the HTML form element
-            'default'     => '',  // the default value for this setting
-            'type'    => 'text', // the HTML form element to use
-            'section' => '', // settings section to which this setting belongs
-            'page' => '', //page on which the section belongs
-            'options' => array(), // (optional): the values in radio buttons or a drop-down menu
-            'name' => '', //name of HTML form element. should be options_array[option]
-            'class'   => '',  // the HTML form element class. Also used for validation purposes!
-            'value' => ''  // the current value of the setting
-        );
-        
-        //  ARGUMENTS: $field_args = array(
-        //      'type'       => $type,  *
-        //      'id'         => $id,    *
-        //      'desc'       => $desc,  *
-        //      'curr_value' => $value, *
-        //      'options'    => $options,   *
-        //      'label_for'  => $id,    * (use id)
-        //      'class'      => $class, *
-        //      'name'       => $name,
-        //  );
-        
-        // "extract" to be able to use the array keys as variables in our function output below
-        extract( wp_parse_args( $args, $defaults ) );
-        
-        //Handle some MSTW custom field types; convert for generic select-option
-        switch ( $type ) {
-            case 'show-hide':
-                $type = 'select-option';
-                $options = array(   __( 'Show', 'mstw-loc-domain' ) => 1, 
-                                    __( 'Hide', 'mstw-loc-domain' ) => 0, 
-                                  );
-                break;
-            case 'date-time':
-                $type = 'select-option';
-                
-                $options = array (  __( 'Custom', 'mstw-loc-domain' ) => 'custom',
-                                    __( 'Tuesday, 07 April 01:15 pm', 'mstw-loc-domain' ) => 'l, d M h:i a',
-                                    __( 'Tuesday, 7 April 01:15 pm', 'mstw-loc-domain' ) => 'l, j M h:i a',
-                                    __( 'Tuesday, 07 April 1:15 pm', 'mstw-loc-domain' ) => 'l, d M g:i a',
-                                    __( 'Tuesday, 7 April 1:15 pm', 'mstw-loc-domain' ) => 'l, j M g:i a',
-                                    __( 'Tuesday, 7 April 13:15', 'mstw-loc-domain' ) => 'l, d M H:i',
-                                    __( 'Tuesday, 7 April 13:15', 'mstw-loc-domain' ) => 'l, j M H:i',
-                                    __( '07 April 13:15', 'mstw-loc-domain' ) => 'd M H:i',
-                                    __( '7 April 13:15', 'mstw-loc-domain' ) => 'j M H:i',
-                                    __( '07 April 01:15 pm', 'mstw-loc-domain' ) => 'd M g:i a',
-                                    __( '7 April 01:15 pm', 'mstw-loc-domain' ) => 'j M g:i a',     
-                                    );
-                
-                if ( isset( $custom_format ) && $custom_format == 0 ) {
-                    //remove the custom option
-                    unset( $options[ __( 'Custom', 'mstw_loc_domain' ) ] );
-                }
-                
-                if ( $desc == '' ) {
-                    $desc = __( 'Formats for 7 April 2013 13:15.', 'mstw-loc-domain' );
-                }
-                
-                break;
-            case 'date-only':
-                $type = 'select-option';
-                $options = array (  __( 'Custom', 'mstw-loc-domain' ) => 'custom',
-                                    '2013-04-07' => 'Y-m-d',
-                                    '13-04-07' => 'y-m-d',
-                                    '04/07/13' => 'm/d/y',
-                                    '4/7/13' => 'n/j/y',
-                                    __( '07 Apr 2013', 'mstw-loc-domain' ) => 'd M Y',
-                                    __( '7 Apr 2013', 'mstw-loc-domain' ) => 'j M Y',
-                                    __( 'Tues, 07 Apr 2013', 'mstw-loc-domain' ) => 'D, d M Y',
-                                    __( 'Tues, 7 Apr 13', 'mstw-loc-domain' ) => 'D, j M y',
-                                    __( 'Tuesday, 7 Apr', 'mstw-loc-domain' ) => 'l, j M',
-                                    __( 'Tuesday, 07 April 2013', 'mstw-loc-domain' ) => 'l, d F Y',
-                                    __( 'Tuesday, 7 April 2013', 'mstw-loc-domain' ) => 'l, j F Y',
-                                    __( 'Tues, 07 Apr', 'mstw-loc-domain' ) => 'D, d M',
-                                    __( 'Tues, 7 Apr', 'mstw-loc-domain' ) => 'D, j M',
-                                    __( '07 Apr', 'mstw-loc-domain' ) => 'd M',
-                                    __( '7 Apr', 'mstw-loc-domain' ) => 'j M',
-                                    );
-                                    
-                if ( isset( $custom_format ) && $custom_format == 0 ) {
-                    //remove the custom option
-                    unset( $options[ __( 'Custom', 'mstw_loc_domain' ) ] );
-                }
-                if ( $desc == '' ) {
-                    $desc = __( 'Formats for 7 Apr 2013. Default: 2013-04-07', 'mstw-loc-domain' );
-                }
-                break;
-            case 'time-only':
-                $type = 'select-option';
-                $options = array (  __( 'Custom', 'mstw-loc-domain' )   => 'custom',
-                                    __( '08:00 (24hr)', 'mstw-loc-domain' ) => 'H:i',
-                                    __( '8:00 (24hr)', 'mstw-loc-domain' )  => 'G:i',
-                                    __( '08:00 am', 'mstw-loc-domain' )     => 'h:i a',
-                                    __( '08:00 AM', 'mstw-loc-domain' )     => 'h:i A',
-                                    __( '8:00 am', 'mstw-loc-domain' )      => 'g:i a',
-                                    __( '8:00 AM', 'mstw-loc-domain' )      => 'g:i A',
-                                    );
-                                    
-                if ( isset( $custom_format ) && $custom_format == 0 ) {
-                    //remove the custom option
-                    unset( $options[ __( 'Custom', 'mstw_loc_domain' ) ] );
-                }
-                if ( $desc == '' ) {
-                    $desc = __( 'Formats for eight in the morning. Default: 08:00', 'mstw-loc-domain' );
-                }
-                break;
-            default:
-                break;
-                                
-        }
-        
-        //
-        // map arguments used by mstw_display_form_field() to create HTML output 
-        //
-        $field_args = array(
-            'type'       => $type,
-            'id'         => $id,
-            'desc'       => $desc,
-            'curr_value' => $value,
-            'options'    => $options,
-            'label_for'  => $id,
-            'class'      => $class,
-            'name'       => $name,
-        );
-        
-        add_settings_field( $id, 
-            $title, 
-            'mstw_build_admin_edit_field', 
-            $page, 
-            $section, 
-            $field_args 
-            );
-        
-    } //End: mstw_build_settings_field()
-}
+/*
+ * Removed from coaching staffs version
+ */
 
 //-------------------------------------------------------------------------------
@@ -734 +371 @@
         }
         else { 
-            //mstw_log_msg( 'in mstw_validate_url ... got a bad URL: ' . $url );
             // url is not valid, display an error message (dont' update DB)
             $notice .= ' ' . $url;          
@@ -744 +380 @@
 }
 
-//-------------------------------------------------------------------------------
+/*//-------------------------------------------------------------------------------
 // 13. mstw_get_current_post_type - get the current post type in the WordPress Admin
 //      ARGUMENTS: 
@@ -765 +401 @@
         elseif( $current_screen and $current_screen->post_type )
             return $current_screen->post_type;
-     
+      /**
+            * IDK how to fix the warning from the plugin checker:
+            *   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'] );
@@ -774 +414 @@
     } //End: mstw_get_current_post_type( )
 }
+*/
 
 //-------------------------------------------------------------------------------
@@ -869 +510 @@
                 $msg_type = ( $msg_type == 'warning' ) ? $msg_type . ' updated' : $msg_type ;
             ?>
-                <div class="<?php echo $msg_type; ?>">
-                    <p><?php echo $msg_notice; ?></p>
+                <div class="<?php echo esc_html( $msg_type ); ?>">
+                    <p><?php echo esc_html( $msg_notice ); ?></p>
                 </div>
             
@@ -892 +533 @@
 //
 if ( !function_exists ( 'mstw_add_admin_notice' ) ) {
-    function mstw_add_admin_notice( $transient = 'mstw_admin_messages', $type = 'updated', $notice ) {
+    function mstw_add_admin_notice( $transient = 'mstw_admin_messages', $type = 'updated', $notice = "" ) {
+        /**
+            *  20250130: changed required arg $notice to optional to stop annoying
+            *       PHP warnings that started with PHP 8
+            */
+                                                                                                                                                                
         //default type to 'updated'
         if ( !( $type == 'updated' or $type == 'error' or $type =='update-nag' or $type == 'warning' ) ) $type = 'updated';
@@ -936 +582 @@
 //
 if( function_exists( 'mstw_add_role_caps' ) ) {
-    function mstw_add_role_caps( $role_obj = null, $role_name = null, $cpt, $cpt_s ) {
-        
+    function mstw_add_role_caps( $role_obj = null, $role_name = null, $cpt = null, $cpt_s = null ) {
+        
+         /**
+            *  20250130: changed required args $cpt & $cpt_s to optional to stop annoying
+            *       PHP warnings that started with PHP 8
+            */
         $cap = array( 'edit_', 'read_', 'delete_' );
         $caps = array( 'edit_', 'edit_others_', 'publish_', 'read_private_', 'delete_', 'delete_published_', 'delete_others_', 'edit_private_', 'edit_published_' );

coaching-staffs/trunk/lang/mstw-coaching-staffs-en_US.pot

@@ -3 +3 @@
 msgstr ""
 "Project-Id-Version: MSTW Coaching Staffs\n"
-"POT-Creation-Date: 2024-12-30 14:08-0600\n"
+"POT-Creation-Date: 2025-05-07 13:58-0500\n"
 "PO-Revision-Date: 2015-01-23 20:31-0800\n"
 "Last-Translator: \n"
@@ -12 +12 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Poedit 3.5\n"
+"X-Generator: Poedit 3.6\n"
 "X-Poedit-Basepath: .\n"
 "X-Poedit-KeywordsList: __;_e\n"
@@ -19 +19 @@
 "X-Poedit-SearchPath-2: ../theme-templates\n"
 
-#: ../includes/mstw-admin-utils.php:138
-#: ../includes/mstw-utility-functions.php:570
+#: ../includes/mstw-admin-utils.php:167
 msgid "Show"
 msgstr ""
 
-#: ../includes/mstw-admin-utils.php:139
-#: ../includes/mstw-utility-functions.php:571
+#: ../includes/mstw-admin-utils.php:168
 msgid "Hide"
 msgstr ""
 
-#: ../includes/mstw-coaching-staffs-admin.php:129
-msgid "Show All Staffs"
-msgstr ""
-
-#: ../includes/mstw-coaching-staffs-admin.php:163
-msgid "Show All "
-msgstr ""
-
-#: ../includes/mstw-coaching-staffs-admin.php:202
-#: ../includes/mstw-coaching-staffs-admin.php:462
+#: ../includes/mstw-coaching-staffs-admin.php:157
+msgid "Coach Data"
+msgstr ""
+
+#: ../includes/mstw-coaching-staffs-admin.php:176
+msgid "Staff Position"
+msgstr ""
+
+#: ../includes/mstw-coaching-staffs-admin.php:399
+#: ../includes/mstw-cs-utility-functions.php:65
+msgid "Name"
+msgstr ""
+
+#: ../includes/mstw-coaching-staffs-admin.php:400
+#: ../includes/mstw-cs-utility-functions.php:64
+msgid "Photo"
+msgstr ""
+
+#: ../includes/mstw-coaching-staffs-admin.php:401
+#: ../includes/mstw-cs-utility-functions.php:70
+#: ../theme-templates/taxonomy-staffs.php:179
+msgid "Alma Mater"
+msgstr ""
+
+#: ../includes/mstw-coaching-staffs-admin.php:402
+#: ../includes/mstw-cs-utility-functions.php:68
+#: ../theme-templates/taxonomy-staffs.php:169
+msgid "Experience"
+msgstr ""
+
+#: ../includes/mstw-coaching-staffs-admin.php:403
+#: ../includes/mstw-cs-utility-functions.php:72
+#: ../theme-templates/taxonomy-staffs.php:189
+msgid "Degree"
+msgstr ""
+
+#: ../includes/mstw-coaching-staffs-admin.php:404
+msgid "Birth Date"
+msgstr ""
+
+#: ../includes/mstw-coaching-staffs-admin.php:405
+#: ../includes/mstw-cs-utility-functions.php:76
+#: ../theme-templates/taxonomy-staffs.php:209
+msgid "Home Town"
+msgstr ""
+
+#: ../includes/mstw-coaching-staffs-admin.php:406
+#: ../includes/mstw-cs-utility-functions.php:78
+#: ../theme-templates/taxonomy-staffs.php:219
+msgid "High School"
+msgstr ""
+
+#: ../includes/mstw-coaching-staffs-admin.php:407
+#: ../includes/mstw-cs-utility-functions.php:80
+#: ../theme-templates/taxonomy-staffs.php:229
+msgid "Family"
+msgstr ""
+
+#: ../includes/mstw-coaching-staffs-admin.php:479
+#: ../includes/mstw-cs-utility-functions.php:66
+msgid "Position"
+msgstr ""
+
+#: ../includes/mstw-coaching-staffs-admin.php:480
+msgid "Staff"
+msgstr ""
+
+#: ../includes/mstw-coaching-staffs-admin.php:482
 msgid "Coach"
 msgstr ""
 
-#: ../includes/mstw-coaching-staffs-admin.php:209
-msgid "Staff Position"
-msgstr ""
-
-#: ../includes/mstw-coaching-staffs-admin.php:234
-#: ../includes/mstw-coaching-staffs-admin.php:385
-#: ../includes/mstw-cs-utility-functions.php:49
-msgid "Experience"
-msgstr ""
-
-#: ../includes/mstw-coaching-staffs-admin.php:239
-#: ../includes/mstw-coaching-staffs-admin.php:384
-#: ../includes/mstw-cs-utility-functions.php:51
-msgid "Alma Mater"
-msgstr ""
-
-#: ../includes/mstw-coaching-staffs-admin.php:244
-#: ../includes/mstw-coaching-staffs-admin.php:386
-#: ../includes/mstw-cs-utility-functions.php:53
-msgid "Degree"
-msgstr ""
-
-#: ../includes/mstw-coaching-staffs-admin.php:249
-#: ../includes/mstw-coaching-staffs-admin.php:387
-msgid "Birth Date"
-msgstr ""
-
-#: ../includes/mstw-coaching-staffs-admin.php:254
-#: ../includes/mstw-coaching-staffs-admin.php:388
-msgid "Home Town"
-msgstr ""
-
-#: ../includes/mstw-coaching-staffs-admin.php:259
-#: ../includes/mstw-coaching-staffs-admin.php:389
-#: ../includes/mstw-cs-utility-functions.php:59
-msgid "High School"
-msgstr ""
-
-#: ../includes/mstw-coaching-staffs-admin.php:264
-#: ../includes/mstw-coaching-staffs-admin.php:390
-#: ../includes/mstw-cs-utility-functions.php:61
-msgid "Family"
-msgstr ""
-
-#: ../includes/mstw-coaching-staffs-admin.php:291
-msgid "Select coach"
-msgstr ""
-
-#: ../includes/mstw-coaching-staffs-admin.php:323
-msgid "Display Order:"
-msgstr ""
-
-#: ../includes/mstw-coaching-staffs-admin.php:382
-#: ../includes/mstw-cs-utility-functions.php:46
-msgid "Name"
-msgstr ""
-
-#: ../includes/mstw-coaching-staffs-admin.php:383
-#: ../includes/mstw-cs-utility-functions.php:45
-msgid "Photo"
-msgstr ""
-
-#: ../includes/mstw-coaching-staffs-admin.php:459
-#: ../includes/mstw-cs-utility-functions.php:47
-msgid "Position"
-msgstr ""
-
-#: ../includes/mstw-coaching-staffs-admin.php:460
-msgid "Staff"
-msgstr ""
-
-#: ../includes/mstw-coaching-staffs-admin.php:507
+#: ../includes/mstw-coaching-staffs-admin.php:528
 msgid "MSTW Coaching Staffs"
 msgstr ""
 
-#: ../includes/mstw-coaching-staffs-admin.php:508
-#: ../includes/mstw-coaching-staffs-admin.php:517
+#: ../includes/mstw-coaching-staffs-admin.php:529
+#: ../includes/mstw-coaching-staffs-admin.php:538
 msgid "Coaching Staffs"
 msgstr ""
 
-#: ../includes/mstw-coaching-staffs-admin.php:518
+#: ../includes/mstw-coaching-staffs-admin.php:539
 msgid "Staffs"
 msgstr ""
 
-#: ../includes/mstw-coaching-staffs-admin.php:525
+#: ../includes/mstw-coaching-staffs-admin.php:546
 msgid "Coaching Staffs Display Settings"
 msgstr ""
 
-#: ../includes/mstw-coaching-staffs-admin.php:526
+#: ../includes/mstw-coaching-staffs-admin.php:547
 msgid "Display Settings"
 msgstr ""
 
-#: ../includes/mstw-coaching-staffs-admin.php:543
-msgid "Save Changes"
-msgstr ""
-
-#: ../includes/mstw-coaching-staffs-admin.php:545
-msgid "Reset Default Values"
-msgstr ""
-
-#: ../includes/mstw-coaching-staffs-admin.php:546
-msgid "WARNING! Reset Default Values will do so without further warning!"
-msgstr ""
-
-#: ../includes/mstw-coaching-staffs-admin.php:593
-msgid "Data Field Settings"
-msgstr ""
-
-#: ../includes/mstw-coaching-staffs-admin.php:607
+#: ../includes/mstw-coaching-staffs-admin.php:632
 msgid "Name Label:"
 msgstr ""
 
-#: ../includes/mstw-coaching-staffs-admin.php:624
+#: ../includes/mstw-coaching-staffs-admin.php:648
 msgid "Show Position:"
 msgstr ""
 
-#: ../includes/mstw-coaching-staffs-admin.php:642
+#: ../includes/mstw-coaching-staffs-admin.php:664
 msgid "Position Label:"
 msgstr ""
 
-#: ../includes/mstw-coaching-staffs-admin.php:658
+#: ../includes/mstw-coaching-staffs-admin.php:680
 msgid "Show Experience:"
 msgstr ""
 
-#: ../includes/mstw-coaching-staffs-admin.php:674
+#: ../includes/mstw-coaching-staffs-admin.php:696
 msgid "Experience Label:"
 msgstr ""
 
-#: ../includes/mstw-coaching-staffs-admin.php:690
+#: ../includes/mstw-coaching-staffs-admin.php:712
 msgid "Show Alma Mater:"
 msgstr ""
 
-#: ../includes/mstw-coaching-staffs-admin.php:706
+#: ../includes/mstw-coaching-staffs-admin.php:728
 msgid "Alma Mater Label:"
 msgstr ""
 
-#: ../includes/mstw-coaching-staffs-admin.php:722
+#: ../includes/mstw-coaching-staffs-admin.php:744
 msgid "Show Degree:"
 msgstr ""
 
-#: ../includes/mstw-coaching-staffs-admin.php:738
+#: ../includes/mstw-coaching-staffs-admin.php:760
 msgid "Degree Label:"
 msgstr ""
 
-#: ../includes/mstw-coaching-staffs-admin.php:754
+#: ../includes/mstw-coaching-staffs-admin.php:776
 msgid "Show Birth Date:"
 msgstr ""
 
-#: ../includes/mstw-coaching-staffs-admin.php:770
+#: ../includes/mstw-coaching-staffs-admin.php:792
 msgid "Birth Date Label:"
 msgstr ""
 
-#: ../includes/mstw-coaching-staffs-admin.php:786
+#: ../includes/mstw-coaching-staffs-admin.php:808
 msgid "Show Hometown:"
 msgstr ""
 
-#: ../includes/mstw-coaching-staffs-admin.php:802
+#: ../includes/mstw-coaching-staffs-admin.php:824
 msgid "Hometown Label:"
 msgstr ""
 
-#: ../includes/mstw-coaching-staffs-admin.php:818
+#: ../includes/mstw-coaching-staffs-admin.php:840
 msgid "Show High School:"
 msgstr ""
 
-#: ../includes/mstw-coaching-staffs-admin.php:834
+#: ../includes/mstw-coaching-staffs-admin.php:856
 msgid "High School Label:"
 msgstr ""
 
-#: ../includes/mstw-coaching-staffs-admin.php:850
+#: ../includes/mstw-coaching-staffs-admin.php:872
 msgid "Show Family:"
 msgstr ""
 
-#: ../includes/mstw-coaching-staffs-admin.php:866
+#: ../includes/mstw-coaching-staffs-admin.php:888
 msgid "Family Label:"
 msgstr ""
 
-#: ../includes/mstw-coaching-staffs-admin.php:887
+#: ../includes/mstw-coaching-staffs-admin.php:909
 msgid "Staff Table/[shortcode] Settings"
 msgstr ""
 
-#: ../includes/mstw-coaching-staffs-admin.php:903
-#: ../includes/mstw-coaching-staffs-admin.php:1341
+#: ../includes/mstw-coaching-staffs-admin.php:925
+#: ../includes/mstw-coaching-staffs-admin.php:1364
 msgid ""
 "Will use \"Staff Name\" from Staff taxonomy as default. Hide to use another "
@@ -229 +198 @@
 msgstr ""
 
-#: ../includes/mstw-coaching-staffs-admin.php:908
+#: ../includes/mstw-coaching-staffs-admin.php:930
 msgid "Show Staff Table Titles:"
 msgstr ""
 
-#: ../includes/mstw-coaching-staffs-admin.php:927
-msgid "Table Title Color:"
-msgstr ""
-
-#: ../includes/mstw-coaching-staffs-admin.php:939
+#: ../includes/mstw-coaching-staffs-admin.php:961
 msgid "Will show coaches photos in the staff tables"
 msgstr ""
 
-#: ../includes/mstw-coaching-staffs-admin.php:944
+#: ../includes/mstw-coaching-staffs-admin.php:966
 msgid "Show Photos:"
 msgstr ""
 
-#: ../includes/mstw-coaching-staffs-admin.php:956
+#: ../includes/mstw-coaching-staffs-admin.php:978
 msgid "Set width in pixels for table photos, if shown. (Default: 80px)"
 msgstr ""
 
-#: ../includes/mstw-coaching-staffs-admin.php:961
+#: ../includes/mstw-coaching-staffs-admin.php:983
 msgid "Table Photo Width:"
 msgstr ""
 
-#: ../includes/mstw-coaching-staffs-admin.php:972
+#: ../includes/mstw-coaching-staffs-admin.php:994
 msgid "Set height in pixels for table photos, if shown. (Default: 80px)"
 msgstr ""
 
-#: ../includes/mstw-coaching-staffs-admin.php:977
+#: ../includes/mstw-coaching-staffs-admin.php:999
 msgid "Table Photo Height:"
 msgstr ""
 
-#: ../includes/mstw-coaching-staffs-admin.php:993
+#: ../includes/mstw-coaching-staffs-admin.php:1015
 msgid "Table Border Color:"
 msgstr ""
 
-#: ../includes/mstw-coaching-staffs-admin.php:1004
+#: ../includes/mstw-coaching-staffs-admin.php:1026
 msgid "Set table border width in pixels (default:2px)"
 msgstr ""
 
-#: ../includes/mstw-coaching-staffs-admin.php:1009
+#: ../includes/mstw-coaching-staffs-admin.php:1031
 msgid "Table Border Width:"
 msgstr ""
 
-#: ../includes/mstw-coaching-staffs-admin.php:1025
+#: ../includes/mstw-coaching-staffs-admin.php:1047
 msgid "Table Header Background Color:"
 msgstr ""
 
-#: ../includes/mstw-coaching-staffs-admin.php:1041
+#: ../includes/mstw-coaching-staffs-admin.php:1063
 msgid "Table Header Text Color:"
 msgstr ""
 
-#: ../includes/mstw-coaching-staffs-admin.php:1057
+#: ../includes/mstw-coaching-staffs-admin.php:1079
 msgid "Table Even Row Text Color:"
 msgstr ""
 
-#: ../includes/mstw-coaching-staffs-admin.php:1073
+#: ../includes/mstw-coaching-staffs-admin.php:1095
 msgid "Table Even Row Background Color:"
 msgstr ""
 
-#: ../includes/mstw-coaching-staffs-admin.php:1089
+#: ../includes/mstw-coaching-staffs-admin.php:1111
 msgid "Table Even Row Link Color:"
 msgstr ""
 
-#: ../includes/mstw-coaching-staffs-admin.php:1105
+#: ../includes/mstw-coaching-staffs-admin.php:1127
 msgid "Table Odd Row Text Color:"
 msgstr ""
 
-#: ../includes/mstw-coaching-staffs-admin.php:1121
+#: ../includes/mstw-coaching-staffs-admin.php:1143
 msgid "Table Odd Row Background Color:"
 msgstr ""
 
-#: ../includes/mstw-coaching-staffs-admin.php:1137
+#: ../includes/mstw-coaching-staffs-admin.php:1159
 msgid "Table Odd Row Link Color:"
 msgstr ""
 
-#: ../includes/mstw-coaching-staffs-admin.php:1156
+#: ../includes/mstw-coaching-staffs-admin.php:1178
 msgid "Coach Profile Settings"
 msgstr ""
 
-#: ../includes/mstw-coaching-staffs-admin.php:1165
+#: ../includes/mstw-coaching-staffs-admin.php:1187
 msgid "The text for the coach's profile bio heading."
 msgstr ""
 
-#: ../includes/mstw-coaching-staffs-admin.php:1170
+#: ../includes/mstw-coaching-staffs-admin.php:1192
 msgid "Profile Heading:"
 msgstr ""
 
-#: ../includes/mstw-coaching-staffs-admin.php:1186
+#: ../includes/mstw-coaching-staffs-admin.php:1208
 msgid "Header Background Color:"
 msgstr ""
 
-#: ../includes/mstw-coaching-staffs-admin.php:1202
+#: ../includes/mstw-coaching-staffs-admin.php:1224
 msgid "Header Text Color:"
 msgstr ""
 
-#: ../includes/mstw-coaching-staffs-admin.php:1218
+#: ../includes/mstw-coaching-staffs-admin.php:1240
 msgid "Name Color:"
 msgstr ""
 
-#: ../includes/mstw-coaching-staffs-admin.php:1234
+#: ../includes/mstw-coaching-staffs-admin.php:1256
 msgid "Position Color:"
 msgstr ""
 
-#: ../includes/mstw-coaching-staffs-admin.php:1250
+#: ../includes/mstw-coaching-staffs-admin.php:1272
 msgid "Bio Section Heading Color:"
 msgstr ""
 
-#: ../includes/mstw-coaching-staffs-admin.php:1266
+#: ../includes/mstw-coaching-staffs-admin.php:1288
 msgid "Bio Section Text Color:"
 msgstr ""
 
-#: ../includes/mstw-coaching-staffs-admin.php:1282
+#: ../includes/mstw-coaching-staffs-admin.php:1304
 msgid "Bio Section Background Color:"
 msgstr ""
 
-#: ../includes/mstw-coaching-staffs-admin.php:1298
+#: ../includes/mstw-coaching-staffs-admin.php:1320
 msgid "Bio Section Border Color:"
 msgstr ""
 
-#: ../includes/mstw-coaching-staffs-admin.php:1309
+#: ../includes/mstw-coaching-staffs-admin.php:1331
 msgid "Set bio border width in pixels (default:2px)"
 msgstr ""
 
-#: ../includes/mstw-coaching-staffs-admin.php:1314
+#: ../includes/mstw-coaching-staffs-admin.php:1336
 msgid "Bio Section Border Width:"
 msgstr ""
 
-#: ../includes/mstw-coaching-staffs-admin.php:1332
+#: ../includes/mstw-coaching-staffs-admin.php:1354
 msgid "Coaches Gallery Settings"
 msgstr ""
 
-#: ../includes/mstw-coaching-staffs-admin.php:1346
+#: ../includes/mstw-coaching-staffs-admin.php:1369
 msgid "Show Gallery Title:"
 msgstr ""
 
-#: ../includes/mstw-coaching-staffs-admin.php:1362
+#: ../includes/mstw-coaching-staffs-admin.php:1385
 msgid "Gallery Title Color:"
 msgstr ""
 
-#: ../includes/mstw-coaching-staffs-admin.php:1373
+#: ../includes/mstw-coaching-staffs-admin.php:1397
 msgid "Default is rounded."
 msgstr ""
 
-#: ../includes/mstw-coaching-staffs-admin.php:1374
+#: ../includes/mstw-coaching-staffs-admin.php:1398
 msgid "Rounded"
 msgstr ""
 
-#: ../includes/mstw-coaching-staffs-admin.php:1375
+#: ../includes/mstw-coaching-staffs-admin.php:1399
 msgid "Square"
 msgstr ""
 
-#: ../includes/mstw-coaching-staffs-admin.php:1381
+#: ../includes/mstw-coaching-staffs-admin.php:1405
 msgid "Gallery Tile Corner Style:"
 msgstr ""
 
-#: ../includes/mstw-coaching-staffs-admin.php:1392
+#: ../includes/mstw-coaching-staffs-admin.php:1416
 msgid "Set width in pixels for gallery photos, if shown. (Default: 150px)"
 msgstr ""
 
-#: ../includes/mstw-coaching-staffs-admin.php:1397
+#: ../includes/mstw-coaching-staffs-admin.php:1421
 msgid "Gallery Photo Width:"
 msgstr ""
 
-#: ../includes/mstw-coaching-staffs-admin.php:1408
+#: ../includes/mstw-coaching-staffs-admin.php:1432
 msgid "Set height in pixels for gallery photos, if shown. (Default: 150px)"
 msgstr ""
 
-#: ../includes/mstw-coaching-staffs-admin.php:1413
+#: ../includes/mstw-coaching-staffs-admin.php:1437
 msgid "Gallery Photo Height:"
 msgstr ""
 
-#: ../includes/mstw-coaching-staffs-admin.php:1429
+#: ../includes/mstw-coaching-staffs-admin.php:1453
 msgid "Gallery Tile Border Color:"
 msgstr ""
 
-#: ../includes/mstw-coaching-staffs-admin.php:1440
+#: ../includes/mstw-coaching-staffs-admin.php:1464
 msgid "Set border width in pixels. (Default: 2px)"
 msgstr ""
 
-#: ../includes/mstw-coaching-staffs-admin.php:1445
+#: ../includes/mstw-coaching-staffs-admin.php:1469
 msgid "Gallery Tile Border Width:"
 msgstr ""
 
-#: ../includes/mstw-coaching-staffs-admin.php:1454
-msgid "Enter the default settings for Coaches Gallery pages."
-msgstr ""
-
-#: ../includes/mstw-coaching-staffs-admin.php:1458
-msgid "Enter the default settings for Single Coach Profile pages."
-msgstr ""
-
-#: ../includes/mstw-coaching-staffs-admin.php:1462
-msgid ""
-"Enter the default settings for Staff Table/[shortcode]. These can be "
-"overridden by [shortcode] arguments."
-msgstr ""
-
-#: ../includes/mstw-coaching-staffs-admin.php:1466
-msgid ""
-"Enter the visibility and labels for the data fiels. The name field must "
-"always be displayed, but it can be re-labeled. Note that these settings can "
-"be overridden by [shortcode] arguments."
-msgstr ""
-
-#: ../includes/mstw-coaching-staffs-admin.php:1578
-#: ../includes/mstw-coaching-staffs-admin.php:1581
+#: ../includes/mstw-coaching-staffs-admin.php:1605
+#: ../includes/mstw-coaching-staffs-admin.php:1608
 msgid "Coach updated."
 msgstr ""
 
-#: ../includes/mstw-coaching-staffs-admin.php:1579
-#: ../includes/mstw-coaching-staffs-admin.php:1593
+#: ../includes/mstw-coaching-staffs-admin.php:1606
+#: ../includes/mstw-coaching-staffs-admin.php:1620
 msgid "Custom field updated."
 msgstr ""
 
-#: ../includes/mstw-coaching-staffs-admin.php:1580
-#: ../includes/mstw-coaching-staffs-admin.php:1594
+#: ../includes/mstw-coaching-staffs-admin.php:1607
+#: ../includes/mstw-coaching-staffs-admin.php:1621
 msgid "Custom field deleted."
 msgstr ""
 
-#: ../includes/mstw-coaching-staffs-admin.php:1582
+#: ../includes/mstw-coaching-staffs-admin.php:1609
 msgid "Coach restored to revision"
 msgstr ""
 
-#: ../includes/mstw-coaching-staffs-admin.php:1583
+#: ../includes/mstw-coaching-staffs-admin.php:1610
 msgid "Coach published."
 msgstr ""
 
-#: ../includes/mstw-coaching-staffs-admin.php:1584
+#: ../includes/mstw-coaching-staffs-admin.php:1611
 msgid "Coach saved."
 msgstr ""
 
-#: ../includes/mstw-coaching-staffs-admin.php:1585
+#: ../includes/mstw-coaching-staffs-admin.php:1612
 msgid "Coach submitted."
 msgstr ""
 
-#: ../includes/mstw-coaching-staffs-admin.php:1586
+#: ../includes/mstw-coaching-staffs-admin.php:1613
 msgid "Coach scheduled for publication."
 msgstr ""
 
-#: ../includes/mstw-coaching-staffs-admin.php:1587
+#: ../includes/mstw-coaching-staffs-admin.php:1614
 msgid "Coach draft updated."
 msgstr ""
 
-#: ../includes/mstw-coaching-staffs-admin.php:1592
-#: ../includes/mstw-coaching-staffs-admin.php:1595
+#: ../includes/mstw-coaching-staffs-admin.php:1619
+#: ../includes/mstw-coaching-staffs-admin.php:1622
 msgid "Position updated."
 msgstr ""
 
-#: ../includes/mstw-coaching-staffs-admin.php:1596
+#: ../includes/mstw-coaching-staffs-admin.php:1623
 msgid "Position restored to revision"
 msgstr ""
 
-#: ../includes/mstw-coaching-staffs-admin.php:1597
+#: ../includes/mstw-coaching-staffs-admin.php:1624
 msgid "Position published."
 msgstr ""
 
-#: ../includes/mstw-coaching-staffs-admin.php:1598
+#: ../includes/mstw-coaching-staffs-admin.php:1625
 msgid "Position saved."
 msgstr ""
 
-#: ../includes/mstw-coaching-staffs-admin.php:1599
+#: ../includes/mstw-coaching-staffs-admin.php:1626
 msgid "Position submitted."
 msgstr ""
 
-#: ../includes/mstw-coaching-staffs-admin.php:1600
+#: ../includes/mstw-coaching-staffs-admin.php:1627
 msgid "Position scheduled for publication."
 msgstr ""
 
-#: ../includes/mstw-coaching-staffs-admin.php:1601
+#: ../includes/mstw-coaching-staffs-admin.php:1628
 msgid "Position draft updated."
 msgstr ""
 
-#: ../includes/mstw-cs-utility-functions.php:55
+#: ../includes/mstw-cs-utility-functions.php:74
 msgid "Born"
 msgstr ""
 
-#: ../includes/mstw-cs-utility-functions.php:57
-msgid "Hometown"
+#: ../includes/mstw-utility-functions.php:171
+msgid "Mon"
+msgstr ""
+
+#: ../includes/mstw-utility-functions.php:172
+msgid "Tue"
+msgstr ""
+
+#: ../includes/mstw-utility-functions.php:173
+msgid "Wed"
+msgstr ""
+
+#: ../includes/mstw-utility-functions.php:174
+msgid "Thr"
+msgstr ""
+
+#: ../includes/mstw-utility-functions.php:175
+msgid "Fri"
+msgstr ""
+
+#: ../includes/mstw-utility-functions.php:176
+msgid "Sat"
+msgstr ""
+
+#: ../includes/mstw-utility-functions.php:177
+msgid "Sun"
+msgstr ""
+
+#: ../includes/mstw-utility-functions.php:180
+msgid "Monday"
+msgstr ""
+
+#: ../includes/mstw-utility-functions.php:181
+msgid "Tuesday"
 msgstr ""
 
 #: ../includes/mstw-utility-functions.php:182
-msgid "Mon"
+msgid "Wednesday"
 msgstr ""
 
 #: ../includes/mstw-utility-functions.php:183
-msgid "Tue"
+msgid "Thursday"
 msgstr ""
 
 #: ../includes/mstw-utility-functions.php:184
-msgid "Wed"
+msgid "Friday"
 msgstr ""
 
 #: ../includes/mstw-utility-functions.php:185
-msgid "Thr"
+msgid "Saturday"
 msgstr ""
 
 #: ../includes/mstw-utility-functions.php:186
-msgid "Fri"
-msgstr ""
-
-#: ../includes/mstw-utility-functions.php:187
-msgid "Sat"
-msgstr ""
-
-#: ../includes/mstw-utility-functions.php:188
-msgid "Sun"
+msgid "Sunday"
+msgstr ""
+
+#: ../includes/mstw-utility-functions.php:189
+msgid "January"
+msgstr ""
+
+#: ../includes/mstw-utility-functions.php:190
+msgid "February"
 msgstr ""
 
 #: ../includes/mstw-utility-functions.php:191
-msgid "Monday"
+msgid "March"
 msgstr ""
 
 #: ../includes/mstw-utility-functions.php:192
-msgid "Tuesday"
+msgid "April"
 msgstr ""
 
 #: ../includes/mstw-utility-functions.php:193
-msgid "Wednesday"
+#: ../includes/mstw-utility-functions.php:207
+msgid "May"
 msgstr ""
 
 #: ../includes/mstw-utility-functions.php:194
-msgid "Thursday"
+msgid "June"
 msgstr ""
 
 #: ../includes/mstw-utility-functions.php:195
-msgid "Friday"
+msgid "July"
 msgstr ""
 
 #: ../includes/mstw-utility-functions.php:196
-msgid "Saturday"
+msgid "August"
 msgstr ""
 
 #: ../includes/mstw-utility-functions.php:197
-msgid "Sunday"
+msgid "September"
+msgstr ""
+
+#: ../includes/mstw-utility-functions.php:198
+msgid "October"
+msgstr ""
+
+#: ../includes/mstw-utility-functions.php:199
+msgid "November"
 msgstr ""
 
 #: ../includes/mstw-utility-functions.php:200
-msgid "January"
-msgstr ""
-
-#: ../includes/mstw-utility-functions.php:201
-msgid "February"
-msgstr ""
-
-#: ../includes/mstw-utility-functions.php:202
-msgid "March"
+msgid "December"
 msgstr ""
 
 #: ../includes/mstw-utility-functions.php:203
-msgid "April"
+msgid "Jan"
 msgstr ""
 
 #: ../includes/mstw-utility-functions.php:204
-#: ../includes/mstw-utility-functions.php:218
-msgid "May"
+msgid "Feb"
 msgstr ""
 
 #: ../includes/mstw-utility-functions.php:205
-msgid "June"
+msgid "Mar"
 msgstr ""
 
 #: ../includes/mstw-utility-functions.php:206
-msgid "July"
-msgstr ""
-
-#: ../includes/mstw-utility-functions.php:207
-msgid "August"
+msgid "Apr"
 msgstr ""
 
 #: ../includes/mstw-utility-functions.php:208
-msgid "September"
+msgid "Jun"
 msgstr ""
 
 #: ../includes/mstw-utility-functions.php:209
-msgid "October"
+msgid "Jul"
 msgstr ""
 
 #: ../includes/mstw-utility-functions.php:210
-msgid "November"
+msgid "Aug"
 msgstr ""
 
 #: ../includes/mstw-utility-functions.php:211
-msgid "December"
+msgid "Sep"
+msgstr ""
+
+#: ../includes/mstw-utility-functions.php:212
+msgid "Oct"
+msgstr ""
+
+#: ../includes/mstw-utility-functions.php:213
+msgid "Nov"
 msgstr ""
 
 #: ../includes/mstw-utility-functions.php:214
-msgid "Jan"
-msgstr ""
-
-#: ../includes/mstw-utility-functions.php:215
-msgid "Feb"
-msgstr ""
-
-#: ../includes/mstw-utility-functions.php:216
-msgid "Mar"
-msgstr ""
-
-#: ../includes/mstw-utility-functions.php:217
-msgid "Apr"
-msgstr ""
-
-#: ../includes/mstw-utility-functions.php:219
-msgid "Jun"
-msgstr ""
-
-#: ../includes/mstw-utility-functions.php:220
-msgid "Jul"
-msgstr ""
-
-#: ../includes/mstw-utility-functions.php:221
-msgid "Aug"
-msgstr ""
-
-#: ../includes/mstw-utility-functions.php:222
-msgid "Sep"
-msgstr ""
-
-#: ../includes/mstw-utility-functions.php:223
-msgid "Oct"
-msgstr ""
-
-#: ../includes/mstw-utility-functions.php:224
-msgid "Nov"
-msgstr ""
-
-#: ../includes/mstw-utility-functions.php:225
 msgid "Dec"
 msgstr ""
 
-#: ../includes/mstw-utility-functions.php:348
-msgid "Default Field"
-msgstr ""
-
-#: ../includes/mstw-utility-functions.php:349
-msgid "Default Label"
-msgstr ""
-
-#: ../includes/mstw-utility-functions.php:577
-#: ../includes/mstw-utility-functions.php:592
-#: ../includes/mstw-utility-functions.php:602
-#: ../includes/mstw-utility-functions.php:622
-#: ../includes/mstw-utility-functions.php:630
-#: ../includes/mstw-utility-functions.php:641
-msgid "Custom"
-msgstr ""
-
-#: ../includes/mstw-utility-functions.php:578
-msgid "Tuesday, 07 April 01:15 pm"
-msgstr ""
-
-#: ../includes/mstw-utility-functions.php:579
-msgid "Tuesday, 7 April 01:15 pm"
-msgstr ""
-
-#: ../includes/mstw-utility-functions.php:580
-msgid "Tuesday, 07 April 1:15 pm"
-msgstr ""
-
-#: ../includes/mstw-utility-functions.php:581
-msgid "Tuesday, 7 April 1:15 pm"
-msgstr ""
-
-#: ../includes/mstw-utility-functions.php:582
-#: ../includes/mstw-utility-functions.php:583
-msgid "Tuesday, 7 April 13:15"
-msgstr ""
-
-#: ../includes/mstw-utility-functions.php:584
-msgid "07 April 13:15"
-msgstr ""
-
-#: ../includes/mstw-utility-functions.php:585
-msgid "7 April 13:15"
-msgstr ""
-
-#: ../includes/mstw-utility-functions.php:586
-msgid "07 April 01:15 pm"
-msgstr ""
-
-#: ../includes/mstw-utility-functions.php:587
-msgid "7 April 01:15 pm"
-msgstr ""
-
-#: ../includes/mstw-utility-functions.php:596
-msgid "Formats for 7 April 2013 13:15."
-msgstr ""
-
-#: ../includes/mstw-utility-functions.php:607
-msgid "07 Apr 2013"
-msgstr ""
-
-#: ../includes/mstw-utility-functions.php:608
-msgid "7 Apr 2013"
-msgstr ""
-
-#: ../includes/mstw-utility-functions.php:609
-msgid "Tues, 07 Apr 2013"
-msgstr ""
-
-#: ../includes/mstw-utility-functions.php:610
-msgid "Tues, 7 Apr 13"
-msgstr ""
-
-#: ../includes/mstw-utility-functions.php:611
-msgid "Tuesday, 7 Apr"
-msgstr ""
-
-#: ../includes/mstw-utility-functions.php:612
-msgid "Tuesday, 07 April 2013"
-msgstr ""
-
-#: ../includes/mstw-utility-functions.php:613
-msgid "Tuesday, 7 April 2013"
-msgstr ""
-
-#: ../includes/mstw-utility-functions.php:614
-msgid "Tues, 07 Apr"
-msgstr ""
-
-#: ../includes/mstw-utility-functions.php:615
-msgid "Tues, 7 Apr"
-msgstr ""
-
-#: ../includes/mstw-utility-functions.php:616
-msgid "07 Apr"
-msgstr ""
-
-#: ../includes/mstw-utility-functions.php:617
-msgid "7 Apr"
-msgstr ""
-
-#: ../includes/mstw-utility-functions.php:625
-msgid "Formats for 7 Apr 2013. Default: 2013-04-07"
-msgstr ""
-
-#: ../includes/mstw-utility-functions.php:631
-msgid "08:00 (24hr)"
-msgstr ""
-
-#: ../includes/mstw-utility-functions.php:632
-msgid "8:00 (24hr)"
-msgstr ""
-
-#: ../includes/mstw-utility-functions.php:633
-msgid "08:00 am"
-msgstr ""
-
-#: ../includes/mstw-utility-functions.php:634
-msgid "08:00 AM"
-msgstr ""
-
-#: ../includes/mstw-utility-functions.php:635
-msgid "8:00 am"
-msgstr ""
-
-#: ../includes/mstw-utility-functions.php:636
-msgid "8:00 AM"
-msgstr ""
-
-#: ../includes/mstw-utility-functions.php:644
-msgid "Formats for eight in the morning. Default: 08:00"
-msgstr ""
-
-#: ../theme-templates/single-coach.php:38
-msgid "Post navigation"
-msgstr ""
-
-#: ../theme-templates/single-coach.php:44
-msgid "Return"
-msgstr ""
-
-#: ../theme-templates/single-coach.php:70
+#: ../theme-templates/single-coach.php:75
 msgid "No Staff Position"
 msgstr ""
 
-#: ../theme-templates/single-coach.php:128
-#: ../theme-templates/taxonomy-staffs.php:112
+#: ../theme-templates/single-coach.php:133
+#: ../theme-templates/taxonomy-staffs.php:98
 msgid "Default image for"
 msgstr ""
 
-#: ../theme-templates/single-coach.php:132
-#: ../theme-templates/taxonomy-staffs.php:116
+#: ../theme-templates/single-coach.php:137
+#: ../theme-templates/taxonomy-staffs.php:102
 msgid "Photo not found."
 msgstr ""
 
-#: ../theme-templates/single-coach.php:204
+#: ../theme-templates/single-coach.php:239
 msgid "Profile"
 msgstr ""
 
-#: ../theme-templates/taxonomy-staffs.php:104
+#: ../theme-templates/taxonomy-staffs.php:90
 msgid "Photo of"
 msgstr ""
+
+#: ../theme-templates/taxonomy-staffs.php:199
+msgid "Age"
+msgstr ""

coaching-staffs/trunk/mstw-coaching-staffs.php

@@ -41 +41 @@
         
         echo "h1.staff-head-title { \n";
-            echo mstw_cs_build_css_rule( $options, 'table_title_color', 'color', '' );
+            echo esc_html( mstw_cs_build_css_rule( $options, 'table_title_color', 'color', '' ) );
         echo "} \n";
         
         echo "th.mstw-cs-table-head { \n";
-            echo mstw_cs_build_css_rule( $options, 'table_header_text_color', 'color' );
-            echo mstw_cs_build_css_rule( $options, 'table_header_bkgd_color', 'background-color' );
-            echo mstw_cs_build_css_rule( $options, 'table_border_color', 'border-color' );
-            echo mstw_cs_build_css_rule( $options, 'table_border_width', 'border-width', 'px' );
+            echo esc_html(mstw_cs_build_css_rule( $options, 'table_header_text_color', 'color' ) );
+            echo esc_html( mstw_cs_build_css_rule( $options, 'table_header_bkgd_color', 'background-color' ) );
+            echo esc_html( mstw_cs_build_css_rule( $options, 'table_border_color', 'border-color' ) );
+            echo esc_html( mstw_cs_build_css_rule( $options, 'table_border_width', 'border-width', 'px' ) );
         echo "} \n";
         
         echo "td.mstw-cs-odd { \n";
-            echo mstw_cs_build_css_rule( $options, 'table_odd_text_color', 'color' );
-            echo mstw_cs_build_css_rule( $options, 'table_odd_bkgd_color', 'background-color' );
-            echo mstw_cs_build_css_rule( $options, 'table_border_color', 'border-color' );
-            echo mstw_cs_build_css_rule( $options, 'table_border_width', 'border-width', 'px' );
+            echo esc_html( mstw_cs_build_css_rule( $options, 'table_odd_text_color', 'color' ) );
+            echo esc_html( mstw_cs_build_css_rule( $options, 'table_odd_bkgd_color', 'background-color' ) );
+            echo esc_html( mstw_cs_build_css_rule( $options, 'table_border_color', 'border-color' ) );
+            echo esc_html( mstw_cs_build_css_rule( $options, 'table_border_width', 'border-width', 'px' ) );
         echo "} \n";
         
         echo "tr.mstw-cs-odd  td.mstw-cs-odd a { \n";
-            echo mstw_cs_build_css_rule( $options, 'table_odd_link_color', 'color' );
+            echo esc_html( mstw_cs_build_css_rule( $options, 'table_odd_link_color', 'color' ) );
         echo "} \n";
         
         echo "td.mstw-cs-even { \n";
-            echo mstw_cs_build_css_rule( $options, 'table_even_text_color', 'color' );
-            echo mstw_cs_build_css_rule( $options, 'table_even_bkgd_color', 'background-color' );
-            echo mstw_cs_build_css_rule( $options, 'table_border_color', 'border-color' );
-            echo mstw_cs_build_css_rule( $options, 'table_border_width', 'border-width', 'px' );
+            echo esc_html( mstw_cs_build_css_rule( $options, 'table_even_text_color', 'color' ) );
+            echo esc_html( mstw_cs_build_css_rule( $options, 'table_even_bkgd_color', 'background-color' ) );
+            echo esc_html( mstw_cs_build_css_rule( $options, 'table_border_color', 'border-color' ) );
+            echo esc_html( mstw_cs_build_css_rule( $options, 'table_border_width', 'border-width', 'px' ) );
         echo "} \n";
         
         echo "tr.mstw-cs-even td.mstw-cs-even a { \n";
-            echo mstw_cs_build_css_rule( $options, 'table_even_link_color', 'color' );
+            echo esc_html( mstw_cs_build_css_rule( $options, 'table_even_link_color', 'color' ) );
         echo "} \n";
         
@@ -76 +76 @@
         //Rules for Single Coach
         echo "div.coach-header { \n";
-            echo mstw_cs_build_css_rule( $options, 'profile_header_bkgd_color', 'background-color' );
+            echo esc_html( mstw_cs_build_css_rule( $options, 'profile_header_bkgd_color', 'background-color' ) );
         echo "} \n";
         
         echo "#coach-name h1 { \n";
-            echo mstw_cs_build_css_rule( $options, 'profile_header_name_color', 'color' );
+            echo esc_html( mstw_cs_build_css_rule( $options, 'profile_header_name_color', 'color' ) );
         echo "} \n";
         
         echo "#coach-name h2 { \n";
-            echo mstw_cs_build_css_rule( $options, 'profile_header_position_color', 'color' );
+            echo esc_html( mstw_cs_build_css_rule( $options, 'profile_header_position_color', 'color' ) );
         echo "} \n";
         
         echo "div.coach-header table { \n";
-            echo mstw_cs_build_css_rule( $options, 'profile_header_text_color', 'color' );
+            echo esc_html( mstw_cs_build_css_rule( $options, 'profile_header_text_color', 'color' ) );
         echo "} \n";
          
         //bio_heading_color
         echo ".coach-bio h1 { \n";
-            echo mstw_cs_build_css_rule( $options, 'profile_bio_heading_color', 'color' );
+            echo esc_html( mstw_cs_build_css_rule( $options, 'profile_bio_heading_color', 'color' ) );
         echo "} \n";
         //bio_text_color
         echo ".coach-bio p { \n";
-            echo mstw_cs_build_css_rule( $options, 'profile_bio_text_color', 'color' );
+            echo esc_html( mstw_cs_build_css_rule( $options, 'profile_bio_text_color', 'color' ) );
         echo "} \n";
         //bio_bkgd_color
         echo ".coach-bio { \n";
-            echo mstw_cs_build_css_rule( $options, 'profile_bio_bkgd_color', 'background-color' );
-        //echo "} \n";
-        //bio_border_color
-        //echo ".coach-bio { \n";
-            echo mstw_cs_build_css_rule( $options, 'profile_bio_border_color', 'border-color' );
-        //echo "} \n";
-        //bio_border_width
-        //echo ".coach-bio { \n";
-            echo mstw_cs_build_css_rule( $options, 'profile_bio_border_width', 'border-width', 'px' );
+            echo esc_html( mstw_cs_build_css_rule( $options, 'profile_bio_bkgd_color', 'background-color' ) );
+            echo esc_html( mstw_cs_build_css_rule( $options, 'profile_bio_border_color', 'border-color' ) );
+            echo esc_html( mstw_cs_build_css_rule( $options, 'profile_bio_border_width', 'border-width', 'px' ) );
         echo "} \n";
         
         // Rules for Coaches Galleries
         echo ".coach-tile { \n";
-            echo mstw_cs_build_css_rule( $options, 'profile_header_bkgd_color', 'background-color' );
-            echo mstw_cs_build_css_rule( $options, 'profile_header_text_color', 'color' );
-            //echo mstw_cs_build_css_rule( $options, 'gallery_tile_radius', 'border-radius', 'px' );
-            //echo mstw_cs_build_css_rule( $options, 'gallery_tile_radius', '-moz-border-radius', 'px' );
-            echo 'border-radius: ' . $options['gallery_tile_radius'] . "px; \n";
-            echo '-moz-border-radius: ' . $options['gallery_tile_radius'] . "px; \n";
-            echo mstw_cs_build_css_rule( $options, 'gallery_tile_border_color', 'border-color' );
-            echo mstw_cs_build_css_rule( $options, 'gallery_tile_border_width', 'border-width', 'px' );
+            echo esc_html( mstw_cs_build_css_rule( $options, 'profile_header_bkgd_color', 'background-color' ) );
+            echo esc_html( mstw_cs_build_css_rule( $options, 'profile_header_text_color', 'color' ) );
+            
+            echo esc_html( mstw_cs_build_css_rule( $options, 'gallery_tile_radius', 'border-radius', 'px' ) );
+            echo esc_html( mstw_cs_build_css_rule( $options, 'gallery_tile_radius', '-moz-border-radius', 'px' ) );
+            //echo esc_html( 'border-radius: ' . $options['gallery_tile_radius'] . "px; \n" );
+            //echo esc_html( '-moz-border-radius: ' . $options['gallery_tile_radius'] . "px; \n" );
+            echo esc_html( mstw_cs_build_css_rule( $options, 'gallery_tile_border_color', 'border-color' ) );
+            echo esc_html( mstw_cs_build_css_rule( $options, 'gallery_tile_border_width', 'border-width', 'px' ) );
             //echo 'border-width: ' . $options['gallery_tile_border_width'] . "px; \n";
-            echo mstw_cs_build_css_rule( $options, 'gallery_tile_border_width', 'border-width', 'px' );
-        echo "} \n";
-        
-        echo "h1.staff-head-title { \n";
-            echo mstw_cs_build_css_rule( $options, 'gallery_title_color', 'color' );
+            echo esc_html( mstw_cs_build_css_rule( $options, 'gallery_tile_border_width', 'border-width', 'px' ) );
+        echo "} \n";
+        
+        echo esc_html( "h1.staff-head-title { \n" );
+            echo esc_html( mstw_cs_build_css_rule( $options, 'gallery_title_color', 'color' ) );
         echo "} \n";
         
         echo ".coach-photo img, #coach-photo img { \n";
-            echo mstw_cs_build_css_rule( $options, 'gallery_photo_width', 'width', 'px' );
-            echo mstw_cs_build_css_rule( $options, 'gallery_photo_height', 'height', 'px' );
+            echo esc_html( mstw_cs_build_css_rule( $options, 'gallery_photo_width', 'width', 'px' ) );
+            echo esc_html( mstw_cs_build_css_rule( $options, 'gallery_photo_height', 'height', 'px' ) );
         echo "} \n";
         
         echo ".coach-name-position a { \n";
-            echo mstw_cs_build_css_rule( $options, 'profile_header_name_color', 'color' );
+            echo esc_html( mstw_cs_build_css_rule( $options, 'profile_header_name_color', 'color' ) );
         echo "} \n";
         
         echo ".coach-name-position h2 { \n";
-            echo mstw_cs_build_css_rule( $options, 'profile_header_position_color', 'color' );
-        echo "} \n";
-        
+            echo esc_html( mstw_cs_build_css_rule( $options, 'profile_header_position_color', 'color' ) );
+        echo "} \n"; 
+         
         echo '</style>';
         
@@ -181 +176 @@
         // Need to check the need for this first conditional ... someday
 
-        if ( !is_admin() && $query->is_tax( 'staffs' ) && $query->is_main_query() ) {
+        if ( !is_admin() && is_tax( 'staffs' ) && $query->is_main_query() ) {
             // We are on the coach gallery page ...
             // So set the sort order based on the admin settings
@@ -187 +182 @@
             
             // Need the team slug to set query
-            $uri_array = explode( '/', $_SERVER['REQUEST_URI'] );   
+            $uri_array = mstw_safe_get( 'REQUEST_URI', $_SERVER, '' );
+            if ( '' == $uri_array ) {
+                mstw_log_msg( 'mstw_cs_get_posts: error with $_SERVER[REQUEST_URI]' );
+                mstw_log_msg ( 'query received:' ); mstw_log_msg( $query );
+                return;
+            }
+            
+            $uri_array = explode( '/', $uri_array );    
             $staff_slug = $uri_array[sizeof( $uri_array )-2];
             
@@ -252 +254 @@
         $plugin_data = get_plugin_data( __FILE__, false );
 
-        if ( version_compare($wp_version, "3.5", "<" ) ) {
+        if ( version_compare($wp_version, "4.1", "<" ) ) {
             if( is_plugin_active($plugin) ) {
                 deactivate_plugins( $plugin );
-                wp_die( "'" . $plugin_data['Name'] . "' requires WordPress 3.5 or higher, and has been deactivated! 
-                    Please upgrade WordPress and try again.<br /><br />Back to <a href='".admin_url() . "'>WordPress admin</a>." );
+                wp_die( "'" . esc_html( $plugin_data['Name'] ) . "' requires WordPress 3.5 or higher, and has been deactivated! 
+                    Please upgrade WordPress and try again.<br /><br />Back to <a href='".  esc_url( admin_url() ) . "'>WordPress admin</a>." );
             }
         }
@@ -278 +280 @@
         // If stylesheet exists, enqueue the style 
         if ( file_exists( $mstw_cs_style_file ) ) { 
-            wp_register_style( 'mstw-cs-styles', plugins_url( '/css/mstw-cs-styles.css', __FILE__ ) );
-            //mstw_log_msg( "enqueing " . plugins_url( '/css/mstw-cs-styles.css', __FILE__ ) );
+            wp_register_style( 'mstw-cs-styles', plugins_url( '/css/mstw-cs-styles.css', __FILE__ ), array(), '1.4', 'all' );
             wp_enqueue_style( 'mstw-cs-styles' );               
         } 
 
         $mstw_cs_custom_stylesheet = get_stylesheet_directory( ) . '/mstw-cs-custom-styles.css';
-        //mstw_log_msg( 'custom stylesheet path: ' . $mstw_cs_custom_stylesheet );
         
         if ( file_exists( $mstw_cs_custom_stylesheet ) ) {
             $mstw_cs_custom_stylesheet_url = get_stylesheet_directory_uri( ) . '/mstw-cs-custom-styles.css';
-            //error_log( 'custom stylesheet uri: ' . $mstw_cs_custom_stylesheet_url );
-            wp_register_style( 'mstw_cs_custom_style', $mstw_cs_custom_stylesheet_url );
+            wp_register_style( 'mstw_cs_custom_style', $mstw_cs_custom_stylesheet_url, array(), '1.4', 'all' );
             wp_enqueue_style( 'mstw_cs_custom_style' );
         }
@@ -365 +364 @@
             //'exclude_from_search' => false,
             //'show_ui'             => true,
-            'show_in_menu'          => 'mstw-cs-main-menu', //=> true,
+            'show_in_menu'          => 'mstw-cs-main-menu', //=> true, 
             //'menu_position'       => null,
             //'menu_icon'           => null,
@@ -432 +431 @@
     //mstw_log_msg( "mstw_cs_single_coach_template: $single_template" );
     global $post;
-
-    if ($post->post_type == 'coach') {
-        //$single_template = dirname( __FILE__ ) . '/templates/single-coach.php';  
+    
+    $single_template = null;
+
+    if ( $post->post_type == 'coach') {  
         $custom_coach_template = get_stylesheet_directory( ) . '/single-coach.php';
         $plugin_coach_template = dirname( __FILE__ ) . '/theme-templates/single-coach.php';
-        //mstw_log_msg( "plugin template: $plugin_coach_template" );
         
         if ( file_exists( $custom_coach_template ) ) {
             $single_template = $custom_coach_template;
-            //mstw_log_msg( "mstw_cs_single_coach_template: using custom template: $custom_coach_template" );
         }
         else if ( file_exists( $plugin_coach_template ) ) {
             $single_template = $plugin_coach_template;
-            //mstw_log_msg( "mstw_cs_single_coach_template: using plugin template: $plugin_coach_template" );
-        }   
-    }
-    
-    //mstw_log_msg( "mstw_cs_single_coach_template: NEW TEMPLATE: $single_template" );
+        }
+    }
     
     return $single_template;
@@ -464 +459 @@
     //mstw_log_msg( "taxonomy: " . get_query_var( 'taxonomy' ) );
     
+    // Return value
+    $template = null;
+    
     if ( 'staffs' == get_query_var( 'taxonomy' ) ) {    
         $custom_taxonomy_template = get_stylesheet_directory( ) . '/taxonomy-staffs.php';
@@ -470 +468 @@
         if ( file_exists( $custom_taxonomy_template ) ) {
             $template = $custom_taxonomy_template;
-            //mstw_log_msg( "using custom template: $custom_taxonomy_template" );
         }
         else if ( file_exists( $plugin_taxonomy_template ) ) {
             $template = $plugin_taxonomy_template;
-            //mstw_log_msg( "using plugin template: $plugin_taxonomy_template" );
-        }
-        else {
-            //mstw_log_msg( "could not find a taxonomy template?? $custom_taxonomy_template or $plugin_taxonomy_template " );
         } //End: if ( file_exists( $custom_taxonomy_template ) ) {
             
     } //End: if ( file_exists( $custom_taxonomy_template ) ) {
         
-    //mstw_log_msg( "returning template: $template" );   
     return $template;
          
@@ -620 +612 @@
         }
         
-        $output = $output . '</tr></thead>';
+    $output = $output . '</tr></thead>';
+        
+        // Check to see if a single_coach.php template exists in 
+        // the active theme directory, or in the plugin directory 
+        // if so add the links to the table
+        $custom_taxonomy_template = get_stylesheet_directory( ) . '/taxonomy-staffs.php';
+        $plugin_taxonomy_template = dirname( __FILE__ ) . '/theme-templates/taxonomy-staffs.php';
+    
+        if ( file_exists( $custom_taxonomy_template ) or file_exists( $plugin_taxonomy_template ) ) {
+            $single_coach_template = true;
+        } else {
+            $single_coach_template = false;
+        }
         
         // Keeps track of even and odd rows. Start with row 1 = odd.
@@ -642 +646 @@
             $coach_id = get_post_meta( $post->ID, 'mstw_cs_position_coach', true );
 
-            // Check to see if a single_coach.php template exists in 
-            // the active theme directory, or in the plugin directory 
-            // if so add the links to the table
-            $custom_taxonomy_template = get_stylesheet_directory( ) . '/taxonomy-staffs.php';
-            $plugin_taxonomy_template = dirname( __FILE__ ) . '/theme-templates/taxonomy-staffs.php';
-        
-            if ( file_exists( $custom_taxonomy_template ) or file_exists( $plugin_taxonomy_template ) ) {
-                $single_coach_template = true;
-            } else {
-                $single_coach_template = false;
-            }
+            
 
             if ( $show_photos ) {
@@ -659 +653 @@
                 if ( has_post_thumbnail( $coach_id ) ) {
                     if ( $single_coach_template ) {
-                        $row_string .= '<a href="' .  get_permalink( $coach_id ) . '?position='. $post->ID . '">';
+                        
+                        $coachURL = mstw_cs_build_coach_url( $post->ID, $coach_id );
+                        
+                        
+                        $nonceURL = wp_nonce_url( get_permalink( $coach_id ), 'single-coach', 'mstw-cs-nonce' );
+                        $nonceURL .= '&position='. $post->ID;
+                        
+                        $coachLink = mstw_cs_build_coach_link_html( $coachURL, get_the_post_thumbnail( $coach_id, array( $table_photo_width, $table_photo_height ) ) );
+                        
+                        //mstw_log_msg( "coachLink= $coachLink" );
+                        //$row_string .= '<a href="' .  get_permalink( $coach_id ) . '&position='. $post->ID . '>"';
+                        
                         $row_string .= get_the_post_thumbnail( $coach_id, array($table_photo_width, $table_photo_height) ) .  '</a></td>'; 
                     }
@@ -682 +687 @@
             
             if ( $single_coach_template ) {
-                //$coach_html = '<a href="' .  get_permalink( $coach_id ) . '" ';
-                $coach_html = '<a href="' .  get_permalink( $coach_id ) . '?position='. $post->ID . '">';
-                $coach_html .= $coach_name . '</a>';
+                $coachURL = mstw_cs_build_coach_url( $post->ID, $coach_id );            
+                $coach_html = mstw_cs_build_coach_link_html( $coachURL, $coach_name );          
             }
             else {

coaching-staffs/trunk/readme.txt

@@ -3 +3 @@
 Donate link: http://shoalsummitsolutions.com
 Tags: sports,teams,coaches,staffs  
-Requires at least: 3.6
-Tested up to: 6.7.1
+Requires at least: 5.2
+Tested up to: 6.8
 Stable tag: 1.5
-Requires PHP: 7.0
+Requires PHP: 7.2
 License: GPLv2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html

coaching-staffs/trunk/theme-templates/single-coach.php

@@ -8 +8 @@
  *
  *  MSTW Wordpress Plugins (http://shoalsummitsolutions.com)
- *  Copyright 2015-24 Mark O'Donnell ([email protected])
+ *  Copyright 2015-25 Mark O'Donnell ([email protected])
  *
  *  This program is free software: you can redistribute it and/or modify
@@ -24 +24 @@
  *-------------------------------------------------------------------------*/
  ?>
-
+    <?php   //Validate the nonce
+    //$nonce = mstw_safe_get( 'mstw-cs-nonce', $_GET, '' );
+    if ( isset( $_GET['mstw-cs-nonce'] ) ) {
+        //$safeNonce = mstw_safe_get( 'mstw-cs-nonce', $_GET, '' );
+        if ( false == wp_verify_nonce(  sanitize_text_field( wp_unslash( $_GET[ 'mstw-cs-nonce' ] ) ), 'single-coach' ) ) {
+            mstw_log_msg( "single-coach: invalid nonce" );
+            die( __('fatal error encountered in single_coach', 'coaching-staffs' ) );
+        } 
+    } else {
+        mstw_log_msg( "single-coach: nonce not found" );
+        die( __('fatal error encountered in single_coach', 'coaching-staffs' ) );
+    }
+
+        
+    ?>
+        
     <?php get_header(); 
     //mstw_log_msg( "starting single-coach: current post ID = " . $post->ID ); ?>
@@ -31 +46 @@
         <div id="content" role="main">
 
-            <?php while ( have_posts() ) : the_post( ); ?>
-            
-                <?php if ( array_key_exists( 'HTTP_REFERER', $_SERVER ) ) { ?>
-                
-                <nav id="nav-single">
-                    <h3 class="assistive-text"><?php _e( 'Post navigation', 'coaching-staffs' ); ?></h3>
-                    
-                    <span class="nav-previous">
-                        <?php $back =$_SERVER['HTTP_REFERER'];
-                        if( isset( $back ) && $back != '' ) { 
-                            echo '<a href="' . $back . '">';?>
-                            <span class="meta-nav">&larr;</span><?php _e( 'Return', 'coaching-staffs' ); ?></a>
-                        <?php
-                        }?>
-                    </span> <!-- .nav-previous -->
-                </nav><!-- #nav-single -->
-            
-            <?php } //End: if( array_key_exists( 'HTTP_REFERER', $_SERVER ) ?>
-
-                <article id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
+        <?php while ( have_posts() ) : the_post( ); ?>
+
+            <article id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
 
                 <?php
@@ -57 +55 @@
                 
                 // Check to see if there is a postion in the URL
-                $position_post = mstw_safe_get( 'position', $_GET, '' );
+                $position_post = mstw_safe_get( 'position', $_GET, '' ); 
                 
                 if ( $position_post ) {
                     $position = get_the_title( $position_post );
-                    $term_list = wp_get_post_terms( $_GET['position'], 'staffs' );
+                    //$position = mstw_safe_get( 'position', $_GET, '' );
+                    
+                    if ('' != $position ) {
+                        $term_list = wp_get_post_terms( $position, 'staffs' );
+                    }
+                    else {
+                        $term_list = null;
+                    }
                     
                 } else {
@@ -101 +106 @@
                 ?>
         
-                <div class="coach-header <?php echo( $header_class ) ?>">
+                <div class="coach-header <?php echo esc_url( $header_class ) ?>">
                     <!-- First, figure out the coach's photo -->
                     <div id = "coach-photo">
@@ -115 +120 @@
     
                         // check if the post has a Post Thumbnail assigned to it.
-                         if ( has_post_thumbnail( ) ) { //defaults to current post
+                        if ( has_post_thumbnail( ) ) { //defaults to current post
                             //Get the photo file;
                             $photo_file_url = wp_get_attachment_thumb_url( get_post_thumbnail_id( ) ); //defaults to current post
@@ -133 +138 @@
                             }
                         }
-                        
-                        echo( '<img src="' . $photo_file_url . '" alt="' . $alt . '" width="' . $img_width . '" height="' . $img_height . '" />' );
                         ?>
+                        <img src="<?php echo esc_url( $photo_file_url ) ?>" alt="<?php echo esc_html( $alt ) ?>" width="<?php echo esc_html( $img_width ) ?>" height="<?php echo esc_html( $img_height ) ?>" />
+                            
                     </div> <!-- #coach-photo -->
                     
-                    <!-- Figure out the coach name and number -->
+                    <!-- Figure out the coach name and position, which are always displayed -->
                     <div id="coach-name-position"> 
                         <div id="coach-name">
-                        <h1><?php echo $name; ?></h1> 
+                        <h1><?php echo esc_html( $name ) ?></h1> 
                         <!-- get the position ID from the URL -->
-                        <h2><?php echo $position; ?> </h2>
+                        <h2><?php echo esc_html( $position ) ?> </h2>
                         </div> <!-- #coach-name -->
-                    
                     
                         <table class="coach-info">
                         <tbody>
                             <?php 
-                            $row_start = '<tr><td class="lf-col">';
-                            $new_cell = ':</td><td class="rt-col">'; //colon is for the end of the title
-                            $row_end = '</td></tr>';
-                            
                             //EXPERIENCE
-                            if( $options['show_experience'] ) {
-                                echo $row_start . $options['experience_label'] . $new_cell .  $experience . $row_end;
+                            if( 0 != mstw_safe_get( 'show_experience', $options, 1 ) ) {
+                                ?>
+                                <tr> 
+                                <td class="lf-col"><?php echo esc_html( $options['experience_label'] ) ?></td>
+                                <td class="rt-col"><?php echo esc_html( $experience ) ?></td>
+                                </tr>
+                                <?php 
                             }
                             
                             //ALMA MATER
-                            if( $options['show_alma_mater'] ) {
-                                echo $row_start . $options['alma_mater_label'] . $new_cell .  $alma_mater . $row_end;
+                            //if( $options['show_alma_mater'] ) {
+                            if( 0 != mstw_safe_get( 'show_alma_mater', $options, 1 ) ) {
+                                ?>
+                                <tr> 
+                                <td class="lf-col"><?php echo esc_html( $options['alma_mater_label'] ) ?></td>
+                                <td class="rt-col"><?php echo esc_html( $alma_mater ) ?></td>
+                                </tr>
+                                <?php 
                             }
                             
                             // DEGREE
-                            if( $options['show_degree'] ) {
-                                echo $row_start . $options['degree_label'] . $new_cell .  $degree . $row_end;
+                            if( 0 != mstw_safe_get( 'show_degree', $options, 0 ) ) {
+                                ?>
+                                <tr> 
+                                <td class="lf-col"><?php echo esc_html( $options['degree_label'] ) ?></td>
+                                <td class="rt-col"><?php echo esc_html( $degree ) ?></td>
+                                </tr>
+                                <?php
                             }
                             
                             // BIRTH DATE
-                            if( $options['show_birth_date'] ) {
-                                echo $row_start . $options['birth_date_label'] . $new_cell .  $birth_date . $row_end;
+                            if( 0 != mstw_safe_get( 'show_birth_date', $options, 0 ) ) {
+                                ?>
+                                <tr> 
+                                <td class="lf-col"><?php echo esc_html( $options['birth_date_label'] ) ?></td>
+                                <td class="rt-col"><?php echo esc_html( $birth_date ) ?></td>
+                                </tr>
+                                <?php
                             }
                             
                             // HOMETOWN
-                            if( $options['show_home_town'] ) {
-                                echo $row_start . $options['home_town_label'] . $new_cell .  $home_town . $row_end;
+                            if( 0 != mstw_safe_get( 'show_home_town', $options, 0 ) ) {
+                                ?>
+                                <tr> 
+                                <td class="lf-col"><?php echo esc_html( $options['home_town_label'] ) ?></td>
+                                <td class="rt-col"><?php echo esc_html( $home_town ) ?></td>
+                                </tr>
+                                <?php
                             }
                             
                             // HIGH SCHOOL
-                            if( $options['show_high_school'] ) {
-                                echo $row_start . $options['high_school_label'] . $new_cell .  $high_school . $row_end;
-                            }
-                            
+                            if( 0 != mstw_safe_get( 'show_high_school', $options, 0 ) ) {
+                                ?>
+                                <tr> 
+                                <td class="lf-col"><?php echo esc_html( $options['high_school_label'] ) ?></td>
+                                <td class="rt-col"><?php echo esc_html( $high_school ) ?></td>
+                                </tr>
+                                    <?php
+                            }
+                                
                             // FAMILY
-                            if( $options['show_family'] ) {
-                                echo $row_start . $options['family_label'] . $new_cell .  $family . $row_end;
-                            }
-                            
+                            if( 0 != mstw_safe_get( 'show_home_family', $options, 0 ) ) {
+                                ?>
+                                <tr> 
+                                <td class="lf-col"><?php echo esc_html( $options['family_label'] ) ?></td>
+                                <td class="rt-col"><?php echo wp_kses_post( $family ) ?></td>
+                                </tr>
+                                <?php
+                            }
                             ?>
                             
@@ -200 +235 @@
                 <?php if( get_the_content( ) != "" ) { ?>
                     
-                    <div class="coach-bio"> <!-- coach-bio-<?php echo $staff_slug; ?> "> -->
+                    <div class="coach-bio"> <!-- coach-bio-<?php echo esc_html( $staff_slug ) ?> "> -->
                     
                         <?php $profile_bio_heading_text = ($profile_bio_heading_text == '' ) ? __( 'Profile', 'coaching-staffs' ) : $profile_bio_heading_text; ?>
                         
-                        <h1><?php echo $profile_bio_heading_text ?></h1>
+                        <h1><?php echo esc_html( $profile_bio_heading_text ) ?></h1>
 
                         <!--add the bio content (format it as desired in the post)-->

coaching-staffs/trunk/theme-templates/taxonomy-staffs.php

@@ -8 +8 @@
  *
  *  MSTW Wordpress Plugins (http://shoalsummitsolutions.com)
- *  Copyright 2015-24 Mark O'Donnell ([email protected])
+ *  Copyright 2015-25 Mark O'Donnell ([email protected])
  *
  *  This program is free software: you can redistribute it and/or modify
@@ -24 +24 @@
  *-------------------------------------------------------------------------*/
  
-    //if ( !function_exists( 'mstw_cs_set_fields_by_format' ) ) {
-        //echo '<p> mstw_text_ctrl does not exist. </p>';
-        //echo '<p> path:' . WP_CONTENT_DIR . '/plugins/coaching-staff/includes/mstw-cs-utility-functions.php</p>';
-        //require_once  WP_CONTENT_DIR . '/plugins/coaching-staff/includes/mstw-cs-utility-functions.php';
-    //};
- 
     get_header(); 
     
@@ -35 +29 @@
     $options = get_option( 'mstw_cs_options' );
     
-    //$sp_main_text_color = $options['sp_main_text_color'];
-    //$sp_main_bkgd_color = $options['sp_main_bkgd_color'];
-    //$hide_weight = $options['tr_hide_weight'];
-    
-    
-    // Get the right settings for the format
-    //$settings = mstw_cs_set_fields_by_format( $format );
-    
-    //echo '<h2>REVISED OPTIONS</h2>';
-    //$options = wp_parse_args( $settings, $options );
-    //print_r( $options );
-    
-    //$show_title = 1; /* this will come from a setting */
-    
-    //$use_coach_links = $options['pg_use_coach_links'];
-    
     // figure out the staff name - for the title (if shown) and for staff-based styles
-    $uri_array = explode( '/', $_SERVER['REQUEST_URI'] );   
-    $staff_slug = $uri_array[sizeof( $uri_array )-2];
-    $term = get_term_by( 'slug', $staff_slug, 'staffs' ); 
-    $staff_name = '';
-    if( isset( $term->name ) )
-        $staff_name = $term->name;
+    if ( isset( $_SERVER['REQUEST_URI'] ) ) {
+        $requestURI = esc_url_raw( wp_unslash( $_SERVER['REQUEST_URI'] ) );
+        $requestURI = rtrim( $requestURI,'/' );
+        $staffSlug = substr($requestURI, strrpos ( $requestURI, '/' ) +1 );
+        
+        $term = get_term_by( 'slug', $staffSlug, 'staffs' ); 
+        $staff_name = '';
+        if( isset( $term->name ) )
+            $staff_name = $term->name;
+        
+    } else {
+                die( "fatal error encountered in taxonomy-staffs" );
+    }
     
     ?>
@@ -64 +49 @@
     <div id="content-coach-gallery" role="main" >
 
-    <header class="page-header page-header-<?php echo $staff_slug ?>">
-        <?php if( $options['show_gallery_title'] == 1 ) {
-            echo '<h1 class="staff-head-title staff-head-title-' . $staff_slug . '">' . $staff_name . '</h1>'; 
-        } ?>
+    <header class="page-header page-header-<?php echo esc_html( $staffSlug ) ?>">
+        <?php if( mstw_safe_get( 'show_gallery_title', $options, 1 ) == 1 ) { ?>
+            <h1 class="staff-head-title staff-head-title-<?php echo esc_html( $staffSlug ) ?>"><?php echo esc_html( $staff_name ) ?></h1>
+        <?php } ?>
     </header>
 
@@ -91 +76 @@
         $high_school = get_post_meta( $coach_id, 'mstw_cs_high_school', true );
         $family = nl2br( get_post_meta( $coach_id, 'mstw_cs_family', true ) );  
+        
         ?> 
         
-        <div class="coach-tile coach-tile-<?php echo( $staff_slug ) ?>">
+        <div class="coach-tile coach-tile-<?php echo esc_html( $staffSlug ) ?>">
         
             <div class = "coach-photo">
@@ -107 +93 @@
                     // Try to load default-photo-staff-slug.jpg, If it does not exst,
                     // Then load default-photo.jpg from the plugin -->
-                    $photo_file = WP_PLUGIN_DIR . '/coaching-staffs/images/default-photo' . '-' . $staff_slug . '.jpg';
+                    $photo_file = WP_PLUGIN_DIR . '/coaching-staffs/images/default-photo' . '-' . $staffSlug . '.jpg';
                     if ( file_exists( $photo_file ) ) {
-                        $photo_file_url = plugins_url() . '/coaching-staffs/images/default-photo' . '-' . $staff_slug . '.jpg';
-                        $alt = __( 'Default image for', 'coaching-staffs' ) . ' ' . $staff_slug;
+                        $photo_file_url = plugins_url() . '/coaching-staffs/images/default-photo' . '-' . $staffSlug . '.jpg';
+                        $alt = __( 'Default image for', 'coaching-staffs' ) . ' ' . $staffSlug;
                     }
                     else {
@@ -122 +108 @@
                 $custom_coach_template = get_stylesheet_directory( ) . '/single-coach.php';
                 $plugin_coach_template = dirname( __DIR__ ) . '/theme-templates/single-coach.php';
-                //mstw_log_msg( "plugin template: $plugin_coach_template" );
                 
                 if ( file_exists( $custom_coach_template ) ) {
@@ -139 +124 @@
                 
                 if ( $single_coach_template ) {
-                    echo( '<a href="' . get_permalink( $coach_id ) . '?position='. $post->ID . '">' . '<img src="' . $photo_file_url . '" alt="' . $alt . '" width="' . $img_width . '" height="' . $img_height . '" /></a>' );
+                    ?>
+                    <img src="<?php echo esc_url( $photo_file_url ) ?>" alt="<?php echo esc_html( $alt ) ?>" width="<?php echo esc_html( $img_width ) ?>" height="<?php echo esc_html( $img_height ) ?>" />
+                    <?php
                 }
                 else {
-                    echo( '<img src="' . $photo_file_url . '" alt="' . $alt . '" width="' . $img_width . '" height="' . $img_height . '" />' );
+                    ?>                  
+                    <img src="<?php echo esc_url( $photo_file_url ) ?>" alt="<?php echo esc_html( $alt ) ?>" width="<?php echo esc_html( $img_width ) ?>" height="<?php echo esc_html( $img_height ) ?>" />
+                    <?php
                 }
                 ?>
@@ -152 +141 @@
                 // See if the single-coach.php template is in the theme directory
                 // If so, add a link to the coach's name
-                if ( $single_coach_template ) {
-                    $coach_html = '<a href="' .  get_permalink( $coach_id ) . '?position='. $post->ID . '">';
-                    $coach_html .= get_the_title( $coach_id ) . '</a>';
+                if ( true /*$single_coach_template*/ ) {
+                    $coachURL = mstw_cs_build_coach_url( $post->ID, $coach_id );        
+                    $coach_html = mstw_cs_build_coach_link_html( $coachURL, get_the_title( $coach_id ) );
                 }
                 else {
@@ -163 +152 @@
                 
                 <div class="coach-name-position"> 
-                    <h1><?php echo $coach_html ?></h1>
-                    <?php if ( $options['show_position'] == 1 ) { ?>
-                        <h2><?php echo $position ?></h2>
+                    <h1><?php echo wp_kses_post( $coach_html ) ?></h1>
+                    <?php if ( mstw_safe_get( 'show_position', $options, 1 ) == 1 ) { ?>
+                        <h2><?php echo esc_html( $position ) ?></h2>
                     <?php } ?>
                 </div>
@@ -173 +162 @@
                 <tbody>
                     <?php 
-                    $row_start = '<tr><td class="lf-col">';
-                    $new_cell = ':</td><td class="rt-col">'; //colon is for the end of the title
-                    $row_end = '</td></tr>';
-                    
+                
                     //EXPERIENCE
-                    if( $options['show_experience'] ) {
-                        echo $row_start . $options['experience_label'] . $new_cell .  $experience . $row_end;
+                    if( mstw_safe_get( 'show_experience', $options, 1 ) ) {
+                    ?>
+                        <tr> 
+                        <td class="lf-col"><?php echo esc_html( mstw_safe_get( 'experience_label', $options, __( 'Experience', 'coaching-staffs' ) ) ) ?></td>
+                        <td class="rt-col"><?php echo esc_html( get_post_meta( $coach_id, 'mstw_cs_experience', true ) ) ?></td>
+                        </tr>
+                        <?php 
                     }
                     
                     //ALMA MATER
-                    if( $options['show_alma_mater'] ) {
-                        echo $row_start . $options['alma_mater_label'] . $new_cell .  $alma_mater . $row_end;
-                    }
-                    
+                    if( mstw_safe_get( 'show_alma_mater', $options, 1 ) ) {
+                    ?>
+                        <tr> 
+                        <td class="lf-col"><?php echo esc_html( mstw_safe_get( 'alma_mater_label', $options, __( 'Alma Mater', 'coaching-staffs' ) ) ) ?></td>
+                        <td class="rt-col"><?php echo esc_html( get_post_meta( $coach_id, 'mstw_cs_alma_mater', true ) ) ?></td>
+                        </tr>
+                        <?php 
+                    }
+
                     // DEGREE
-                    if( $options['show_degree'] ) {
-                        echo $row_start . $options['degree_label'] . $new_cell .  $degree . $row_end;
+                    if( mstw_safe_get( 'show_degree', $options, 1 ) ) {
+                    ?>
+                        <tr> 
+                        <td class="lf-col"><?php echo esc_html( mstw_safe_get( 'degree_label', $options, __( 'Degree', 'coaching-staffs' ) ) ) ?></td>
+                        <td class="rt-col"><?php echo esc_html( get_post_meta( $coach_id, 'mstw_cs_degree', true ) ) ?></td>
+                        </tr>
+                        <?php 
                     }
                     
                     // BIRTH DATE
-                    if( $options['show_birth_date'] ) {
-                        echo $row_start . $options['birth_date_label'] . $new_cell .  $birth_date . $row_end;
+                    if( mstw_safe_get( 'show_birth_date', $options, 1 ) ) {
+                    ?>
+                        <tr> 
+                        <td class="lf-col"><?php echo esc_html( mstw_safe_get( 'birth_date_label', $options, __( 'Age', 'coaching-staffs' ) ) ) ?></td>
+                        <td class="rt-col"><?php echo esc_html( get_post_meta( $coach_id, 'mstw_cs_birth_date', true ) ) ?></td>
+                        </tr>
+                        <?php 
                     }
                     
                     // HOMETOWN
-                    if( $options['show_home_town'] ) {
-                        echo $row_start . $options['home_town_label'] . $new_cell .  $home_town . $row_end;
+                    if( mstw_safe_get( 'show_home_town', $options, 0 ) ) {
+                    ?>
+                        <tr> 
+                        <td class="lf-col"><?php echo esc_html( mstw_safe_get( 'home_town_label', $options, __( 'Home Town', 'coaching-staffs' ) ) ) ?></td>
+                        <td class="rt-col"><?php echo esc_html( get_post_meta( $coach_id, 'mstw_cs_home_town', true ) ) ?></td>
+                        </tr>
+                        <?php 
                     }
                     
                     // HIGH SCHOOL
-                    if( $options['show_high_school'] ) {
-                        echo $row_start . $options['high_school_label'] . $new_cell .  $high_school . $row_end;
+                    if( mstw_safe_get( 'show_high_school', $options, 0 ) ) {
+                    ?>
+                        <tr> 
+                        <td class="lf-col"><?php echo esc_html( mstw_safe_get( 'high_school_label', $options, __( 'High School', 'coaching-staffs' ) ) ) ?></td>
+                        <td class="rt-col"><?php echo esc_html( get_post_meta( $coach_id, 'mstw_cs_high_school', true ) ) ?></td>
+                        </tr>
+                        <?php 
                     }
                     
                     // FAMILY
-                    if( $options['show_family'] ) {
-                        echo $row_start . $options['family_label'] . $new_cell .  $family . $row_end;
-                    }
-                    
+                    if( mstw_safe_get( 'show_family', $options, 0 ) ) {
+                    ?>
+                        <tr> 
+                        <td class="lf-col"><?php echo esc_html( mstw_safe_get( 'family_label', $options, __( 'Family', 'coaching-staffs' ) ) ) ?></td>
+                        <td class="rt-col"><?php echo esc_html( get_post_meta( $coach_id, 'mstw_cs_family', true ) ) ?></td>
+                        </tr>
+                        <?php 
+                    }
                     ?>