Context Navigation

← Previous Changeset
Next Changeset →

Changeset 3065987

Timestamp:

04/06/2024 12:15:48 PM (23 months ago)

Author:

mtreherne

Message:

Release of Version 3.13

Location:

eh-gms-feed

Files:

: 2 added
: 8 edited

tags/3.13/eh-gms-feed.php (modified) (1 diff)
tags/3.13/includes/coreAPI.php (added)
tags/3.13/includes/main-class.php (modified) (4 diffs)
tags/3.13/js/eh-gms-feed.js (modified) (1 diff)
tags/3.13/readme.txt (modified) (2 diffs)
trunk/eh-gms-feed.php (modified) (1 diff)
trunk/includes/coreAPI.php (added)
trunk/includes/main-class.php (modified) (4 diffs)
trunk/js/eh-gms-feed.js (modified) (1 diff)
trunk/readme.txt (modified) (2 diffs)

Legend:

: Unmodified
: Added
: Removed

eh-gms-feed/tags/3.13/eh-gms-feed.php

r3064521	r3065987
4	4	* Plugin URI: https://wordpress.org/plugins/eh-gms-feed/
5	5	* Description: Show fixtures, results and tables from England Hockey GMS
6		* Version: 3.12
	6	* Version: 3.13
7	7	* Author: Matthew Treherne
8	8	* Author URI: https://profiles.wordpress.org/mtreherne

eh-gms-feed/tags/3.13/includes/main-class.php

-                      r3064521
+                      r3065987
 include_once 'settings.php';
+include_once 'coreAPI.php';
 class EH_GMS_Feed {
+class EH_GMS_Feed extends coreAPI {
+    private $basename, $settings, $atts_show, $not_valid, $filter_match, $table_name, $fixture_data, $display_name, $show_gender, $show_list, $show_cal, $cal_summary, $id, $show_detail, $directions, $multiple_teams = [], $isLaravel = false, $teamlimit = 12;
+    private $club_link, $team_link, $comp_link, $team_comps, $comp_name;
+    private $args = ['method','show','team','comp_id','club_id','whatson','link','sort_by','options'];
+    private $api = [
+        'table' => ['transient' => 'COMPETITION LEAGUE', 'keys' => ['competitions'], 'error_bag' => null, 'expiry' => 'default'],
+        'fixturesandresults' => ['transient' => 'TEAM', 'keys' => ['teams'], 'error_bag' => null, 'expiry' => 'default'],
+        'matchdays' => ['transient' => 'CLUB MATCHDAYS', 'keys' => ['clubs'], 'error_bag' => null, 'expiry' => 'default'],
+        'matchday' => ['suffix' => '', 'transient' => 'CLUB MATCHDAY', 'keys' => ['clubs', 'matchdays'], 'error_bag' => null, 'expiry' => 'static'],
+        'teamsinclub' => ['suffix' => 'teams', 'transient' => 'CLUB TEAMS', 'keys' => ['clubs'], 'error_bag' => 'teamselected', 'expiry' => 'static'],
+        'teamslist' => ['suffix' => 'teams', 'transient' => 'CLUB TEAMS', 'keys' => ['clubs'], 'error_bag' => null, 'expiry' => 'static'],
+        'compsinfixtures' => ['suffix' => 'fixturesandresults', 'transient' => 'TEAM', 'keys' => ['teams'], 'error_bag' => 'competition', 'expiry' => 'default'],
+        'competition' => ['suffix' => '', 'transient' => 'COMPETITION SUMMARY', 'keys' => ['competitions'], 'error_bag' => null, 'expiry' => 'default'],
+        'fixture' => ['suffix' => '', 'transient' => 'FIXTURE', 'keys' => ['fixtures'], 'error_bag' => null, 'expiry' => 'default'],
+    ];
+    private $basename, $not_valid;
     public function __construct () {
         $this->basename = $GLOBALS['EH_GMS_Feed_basename'];
         $this->settings = new Settings($this->basename);
-        $this->settings->static_transient_expiry = '86400';
         add_shortcode( 'gms', array( $this, 'gms_shortcode' ) );
         add_action( 'wp_enqueue_scripts', array( $this, 'enqueue_scripts' ) );
         add_action( 'wp_ajax_get_gms_table', array( $this, 'ajax_handler' ) );
         add_action( 'wp_ajax_nopriv_get_gms_table', array( $this, 'ajax_handler' ) );
+    }
+    private function get_comp_list () {
+        if (is_null($this->team_comps)) $this->team_comps = $this->is_team() ? $this->get_json('compsinfixtures', $this->atts_show['team']) : [];
+        $comp_count = count($this->team_comps);
+        $html = '<div'.(($comp_count == 0) ? ' style="display: none" ': '').'><label><span class="gms-nomobile">Competition </span><select name="comp_id"><option value="">- All Competitions -</option>';
+        foreach ($this->team_comps as $key => $competition) $html .= '<option value="'.$key.'"'.(($this->is_competition() && $this->atts_show['comp_id'] == $key) || ($comp_count == 1) ? ' selected' : '').'>'.esc_html($competition['name']).'</option>';
+        if ($this->is_competition() && !array_key_exists($this->atts_show['comp_id'], $this->team_comps)) {
+            $html .= '<option value="'.$this->atts_show['comp_id'].'" selected>Previous Season</option>';
+        }
+        $html .= '</select></label></div>';
+        return $html;
+    }
+    private function get_filter () {
+        $html = '<div class="gms-filter"><div'.($this->is_team() ? ' style="display: none" ': '').'><label><span class="gms-nomobile">Team </span><select name="team"><option value="">- All Club Teams -</option>';
+        $teams = $this->get_json('teamsinclub', $this->atts_show['club_id']);
+        foreach ($teams as $key => $team) $html .= '<option value="'.$key.'"'.(($this->is_team() && $this->atts_show['team'] == $key) ? ' selected' : '').'>'.esc_html($team['teamName']).' ('.esc_html($team['gender']).')</option>';
+        $html .= '</select></label></div>'.$this->get_comp_list().'<div><label><span class="gms-nomobile">What`s On </span><select name="whatson">';
+        $whatson = $this->atts_show['whatson'];
+        $options = ($whatson && !in_array($whatson,[7, 14, 31])) ? ['Days ('.$whatson.')' => $whatson] : [];
+        $options = array_merge($options, [$this->is_team () ? '- All Match Days -' : '- Next Match Day -' => '', 'Week' => 7, 'Fortnight' => 14, 'Month' => 31]);
+        foreach ($options as $key => $value) $html .= '<option value="'.$value.'"'.($whatson == $value ? ' selected' : '').'>'.$key.'</option>';
+        $html .= '</select></label></div><div><fieldset><legend class="gms-nomobile">Show</legend>';
+        foreach (['league' => 'League', 'results' => 'Results', 'fixtures' => 'Fixtures'] as $key => $value) {
+            $html .= '<div><label><input type="checkbox" name="show" value="'.$key.'" '.(str_contains($this->atts_show['show'], $key) ? ' checked' : '').'> '.$value.'</label></div>';
+        }
+        $html .= '</fieldset></div><button type="button" class="gms-button">Refresh</button></div>';
+        return $html;
+    }
+    private function get_json($key, $keys=[], $raw=false) {
+    $keys = (array) $keys; $valid_json = true;
+        $headers = ['headers' => ['Content-Type' => 'application/json;charset=UTF-8', 'x-functions-key' => $this->settings->gms_api_key]];
+        $transient_name = 'eh_gms_feed '.$this->api[$key]['transient'];
+        $gms_api_url = $this->settings->gms_api_url;
+        foreach ($keys as $index => $value) {
+            $transient_name .= ' '.$value;
+            $gms_api_url .= ($this->api[$key]['keys'][$index] ?? '').'/'.$value.'/';
+        }
+        $gms_api_url .= $this->api[$key]['suffix'] ?? $key;
+        $body = get_transient($transient_name);
+        if ($body === false) {
+            $response = wp_remote_get($gms_api_url, $headers);
+            $http_code = wp_remote_retrieve_response_code($response);
+            if ($http_code == 200) {
+                $body = wp_remote_retrieve_body($response);
+                if (strlen($transient_name) <= 172) {
+                    switch ($this->api[$key]['expiry']) {
+                        case 'static' : $expiry = $this->settings->static_transient_expiry; break;
+                        case 'weekly' : $expiry = '604800'; break;
+                        default : $expiry = $this->settings->default_transient_expiry;
+                    }
+                    set_transient($transient_name, $body, $expiry);
+                }
+            }
+            else {
+                $valid_json = false;
+                if ($http_code) $message = sprintf(esc_html__( 'Failed to get data with HTTP error code = %s', 'eh-gms-feed' ), $http_code);
+                else {
+                    $error_message = is_wp_error($response) ? $response->get_error_message() : 'unknown';
+                    $message = sprintf(esc_html__( 'Failed to get data with error: %s', 'eh-gms-feed' ), $error_message);
+                }
+            }
+        }
+        if ($raw) return $valid_json ? $body : null;
+        if ($valid_json) {
+            $data = json_decode($body);
+            if (json_last_error() === JSON_ERROR_NONE) {
+                if (!empty($data)) {
+                    return($this->{'process_'.$key}($data));
+                }
+                else {
+                    $valid_json = false;
+                    $data_type = $this->api[$key]['suffix'] ?? $key;
+                    switch ($data_type) {
+                        case 'table' : $data_type = 'league'; break;
+                        case 'fixturesandresults' : $data_type = 'results/fixtures'; break;
+                    }
+                    $message = sprintf(esc_html__( 'No %s data could be found.', 'eh-gms-feed' ), $data_type);
+                }
+            }
+            else {
+                $valid_json = false;
+                $message = esc_html__( 'Failed to decode JSON.', 'eh-gms-feed' );
+            }
+        }
+        if ($this->api[$key]['error_bag']) {
+            if (isset($this->error_bag)) $this->error_bag->add($this->api[$key]['error_bag'], $message);
+            return [];
+        }
+        else return $this->show_api_error($message);
+    }
+    private function get_link($type, $slug) {
+        return 'https://englandhockey.co.uk/'.$type.'s/'.$slug;
+    }
+    private function is_competition () {
+        return !empty($this->atts_show['comp_id']);
+    }
+    private function is_team () {
+        return !empty($this->atts_show['team']);
+    }
+    private function is_clubwide () {
+        return !$this->is_team() && !empty($this->atts_show['club_id']);
+    }
+    private function is_sortby_time () {
+        return $this->atts_show['sort_by'] == 'fixtureTime' || $this->is_reverse_date();
+    }
+    private function is_reverse_date () {
+        return $this->atts_show['sort_by'] == 'reverseDate';
+    }
+    private function show_api_error ($message) {
+        return '<p>'.$message.'</p>';
+    }
+    private function filter_whatson ($fixture_date) {
+        $filter = false;
+        if (is_numeric($this->atts_show['whatson'])) {
+            $compare = (clone $fixture_date)->setTime(0,0);
+            $diff = (new \DateTime())->setTime(0,0)->diff($compare)->format('%a');
+            if ($diff > $this->atts_show['whatson']) $filter = true;
+        }
+        return $filter;
+    }
+    private function is_beforetoday($valid_date) {
+        return $valid_date < (new \DateTime())->setTime(0,0);
+    }
+    private function is_clubteam ($team) {
+        if ($team->id == $this->atts_show['team'] || ($this->is_clubwide() && $team->clubId == $this->atts_show['club_id'])) {
+            if (!$this->club_link) $this->club_link = $this->get_link('club', $team->clubUrlSlug);
+            if (!$this->team_link) $this->team_link = $this->get_link('team', $team->entityUrlSlug);
+            return true;
+        }
+        return false;
+    }
+    private function show_goals ($events) {
+        $goals = [];
+        foreach ($events as $event) if (in_array($event->eventType,['FG','PC','PS'])) $goals[$event->memberId][] = $event;
+        $showGoals = [];
+        foreach ($goals as $goalsById) {
+            $playerName = '';
+            $playerGoals = [];
+            foreach ($goalsById as $goal) {
+                if (!$playerName) $playerName = $goal->displayName;
+                $playerGoals[] = ($goal->minute ? $goal->minute . '&prime; ' : '') . $goal->eventType;
+            }
+            $showGoals[] = $playerName . ' (' . implode(', ',$playerGoals) . ')';
+        }
+        return implode(', ', $showGoals);
+    }
+    private function show_players($players) {
+        $showPlayers = '';
+        $withheld = 0;
+        foreach ($players as $player) {
+            if (!($player->consent || isset($player->shirtNumber))) { $withheld += 1; continue; }
+            $playerEvents = [];
+            foreach ($player->playerEvents as $event) {
+                switch ($event->eventType) {
+                    case 'GC': $showType = '<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path d="M1.892 20.5 12 3.959 22.109 20.5z" fill="#0FBD00" stroke="#0DA300"/></svg>'; break;
+                    case 'YC': $showType = '<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><rect x="3.5" y=".5" width="17" height="23" rx="1.5" fill="#FFE500" stroke="#DBCA39"/></svg>'; break;
+                    case 'RC': $showType = '<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><circle cx="12" cy="12" r="10.5" fill="#E0251B" stroke="#E0251B"/></svg>'; break;
+                    default : $showType = '<b>'.$event->eventType.'</b>';
+                }
+                $playerEvents[] = ($event->minute ? '<b>'.$event->minute . '&prime;&nbsp;</b>' : '') . $showType;
+            }
+            switch ($player->otherRoleDescription) {
+                case 'Goalkeeper' : $role = ' (GK)'; break;
+                case 'Captain' : $role = ' (C)'; break;
+                default : $role = '';
+            }
+            $showPlayers .= '<li>'.($player->shirtNumber ?? '') . ' ' . $player->displayName . $role . (!empty($playerEvents) ? ('&nbsp;' . implode(',&nbsp;',$playerEvents)) : '') . '</li>';
+        }
+        if ($withheld) $showPlayers .= ($withheld > 1) ? '<li>Names Withheld (&times;'.$withheld.')</li>' : '<li>Name Withheld</li>';
+        return $showPlayers;
+    }
+    private function show_officials($officials) {
+        $showOfficials = '';
+        foreach ($officials as $official) {
+            if ($official->displayName != 'Name Withheld') $showOfficials .= '<li>' . $official->role . ': ' . $official->displayName . '</li>';
+        }
+        return $showOfficials;
+    }
+    private function fixture_summary ($fixture, $valid_date, $show_detail=false) {
+        $html = '';
+        $fixture_card = [
+            'Date' => $valid_date->format('d M Y'),
+            'Time' => $fixture->fixtureTime == '00:00' ? '' : $fixture->fixtureTime,
+            'Home Team' => $fixture->homeTeam->teamName,
+            'Score' => '',
+            'Away Team' => $fixture->awayTeam->teamName,
+            'Venue' => !empty($fixture->venue) ? ($this->show_detail || $show_detail ? esc_html($fixture->venue) : '<a href="https://www.google.com/maps/search/?api=1&query='.urlencode($fixture->venue).'" target="_blank">'.esc_html($fixture->venue).'</a>') : '',
+        ];
+        if ($show_detail) {
+            $home_goals = $this->show_goals($fixture->homeTeamEvents);
+            $away_goals = $this->show_goals($fixture->awayTeamEvents);
+            $address = !empty($fixture->venueDetails->address) ? preg_replace ('#(\w+,)(\w+)#', '$1 $2' , $fixture->venueDetails->address) : null;
+            if (!($fixture->isResult || $this->is_beforetoday($valid_date))) $this->directions = ['venue' => $fixture->venue ?? '', 'll' => null, 'address' => $address, 'postcode' => $fixture->venueDetails->postCode ?? null];
+            $address .= !empty($address) ? (!empty($fixture->venueDetails->postCode) ? ', '.$fixture->venueDetails->postCode : '') : '';
+        }
+        $score_class = '';
+        $home_attr = $away_attr = $home_class = $away_class = [];
+        if ($fixture->isResult && !$fixture->isBye) {
+            $fixture_card['Score'] = $fixture->homeTeamScore . ' : ' . $fixture->awayTeamScore;
+            if ($fixture->status == 'Postponed' || ($fixture->homeTeamScore == 'P' && $fixture->awayTeamScore == 'P'));
+            elseif ($fixture->status == 'Cancelled' || ($fixture->homeTeamScore == 'C' && $fixture->awayTeamScore == 'C'));
+            elseif ($fixture->homeTeamScore == $fixture->awayTeamScore) $score_class = 'gms-draw';
+            elseif (($fixture->homeTeam->id == $this->atts_show['team'] || ($this->is_clubwide() && $fixture->homeTeam->clubId == $this->atts_show['club_id'])) && $fixture->homeTeamScore > $fixture->awayTeamScore) $score_class = 'gms-win';
+            elseif (($fixture->awayTeam->id == $this->atts_show['team'] || ($this->is_clubwide() && $fixture->awayTeam->clubId == $this->atts_show['club_id'])) && $fixture->homeTeamScore < $fixture->awayTeamScore) $score_class = 'gms-win';
+            else $score_class = 'gms-loss';
+        }
+        if ($this->is_clubteam($fixture->homeTeam) && $this->is_clubwide()) {
+            $home_class[] = 'gms-clubteam';
+            $home_attr[] = 'data-team="'.($fixture->homeTeam->id).'"';
+            if ($this->show_gender) $fixture_card['Home Team'] .= ' ('.$fixture->homeTeam->gender.')';
+        }
+        if ($this->is_clubteam($fixture->awayTeam) && $this->is_clubwide()) {
+            $away_class[] = 'gms-clubteam';
+            $away_attr[] = 'data-team="'.($fixture->awayTeam->id).'"';
+            if ($this->show_gender) $fixture_card['Away Team'] .= ' ('.$fixture->awayTeam->gender.')';
+        }
+        if ($this->show_list) {
+            $statusDisplay = !in_array($fixture->status, ['Active','Result','Bye']) ? $fixture->status : '';
+            if ($fixture->isResult && ($fixture->homeTeamShootoutScore > 0 || $fixture->awayTeamShootoutScore > 0)) $statusDisplay = 'Shootout '.$fixture->homeTeamShootoutScore.' - '. $fixture->awayTeamShootoutScore;
+            $home_attr[] = 'class="'.implode(' ',$home_class).'"';
+            $away_attr[] = 'class="'.implode(' ',$away_class).'"';
+            if ($fixture->isBye) {
+                $divide = '- : -';
+                $divide_attr = ' class="gms-carddivide gms-cardnoscore"';
+            }
+            elseif ($fixture->isResult) {
+                $divide = $fixture_card['Score'];
+                $divide_attr = ' class="gms-carddivide '.($score_class ?: 'gms-cardnoscore').'"';
+            }
+            else {
+                $divide = $fixture_card['Time'] ?: 'TBC';
+                $divide_attr = ' class="gms-carddivide gms-cardtime"';
+            }
+            $html .= '<div class="gms-card'.($this->show_detail ? ' gms-detaillink' : '').'"'.($this->show_detail ? ' data-fixture="'.$fixture->id.'"': '').'>'
+                .($show_detail ? '<div class="gms-cardtitle">Fixture Details</div><div class="gms-cardcomp">'.$fixture->competitionName.'</div>': '')
+                .'<div class="gms-carddate">'.$fixture_card['Date'].'</div>'
+                .'<div class="gms-cardfixture"><div class="gms-cardhome"><div '.implode(' ',$home_attr).'>'.$fixture_card['Home Team'].'</div></div><div'.$divide_attr.'>'.$divide.'</div><div class="gms-cardaway"><div '.implode(' ',$away_attr).'>'.$fixture_card['Away Team'].'</div></div></div>'
+                .(($show_detail && ($home_goals || $away_goals)) ? '<div class="gms-cardscorers"><div class="gms-cardhome"><div>'.$home_goals.'</div></div><div class="gms-carddivide"></div><div class="gms-cardaway"><div>'.$away_goals.'</div></div></div>' : '')
+                .($statusDisplay ? '<div class="gms-cardstatus">'.$statusDisplay.'</div>' : '')
+                .'<div class="gms-cardvenue">'.($fixture_card['Venue'] ?: 'Venue TBC').'</div>'
+                .($show_detail && $address ? '<div class="gms-cardaddress">'.$address.'</div>' : '')
+                .'</div>';
+            if ($show_detail) {
+                $participant_details = false;
+                $html .= '<div class="gms-fixturedetails">';
+                foreach (['home','away'] as $team) {
+                    $showPlayers = $this->show_players($fixture->{$team . 'Players'});
+                    $showOfficials = $this->show_officials($fixture->{$team. 'TeamOfficials'});
+                    if ($showPlayers || $showOfficials) {
+                        $club_logo = $fixture->{$team . 'Team'}->clubLogoUrl ?? null;
+                        $participant_details = true;
+                        $html .= '<div>';
+                        if ($showPlayers) $html .= '<div class="gms-players">'.($club_logo ? '<img src="'.$club_logo.'" onerror="this.style.display=\'none\'"></img>' : '').'<b>'.$fixture->{$team.'Team'}->teamName.'</b><ul>'.$showPlayers.'</ul></div>';
+                        if ($showOfficials) $html .= '<div class="gms-officials">'.($showPlayers ? '<br/>' : '').'<b>Coaching Roles</b><ul>'.$showOfficials.'</ul></div>';
+                        $html .= '</div>';
+                    }
+                }
+                $showOfficials = $this->show_officials($fixture->officials);
+                if ($showOfficials) {
+                    $participant_details = true;
+                    $html .= '<div class="gms-officials"><b>Match Officials</b><ul>'.$showOfficials.'</ul></div>';
+                }
+                if (!$participant_details) $html .= '<div><b>No more details available</b></div>';
+                $html .= '</div>';
+            }
+        }
+        else {
+            $home_attr[] = 'class="'.implode(' ',$home_class).'"';
+            $away_attr[] = 'class="'.implode(' ',$away_class).'"';
+            $html .= $this->show_detail ? '<tr class="gms-detaillink" data-fixture="'.$fixture->id.'">': '<tr>';
+            foreach ($this->fixture_data as $column_title => $field_name) {
+                $value = $fixture_card[$column_title];
+                switch ($column_title) {
+                    case 'Home Team' : $attr = implode(' ',$home_attr); break;
+                    case 'Away Team' : $attr = implode(' ',$away_attr); break;
+                    case 'Score' : $attr = 'class="'.$score_class.'"';  break;
+                    default : $attr = '';
+                }
+                $html .= '<td '.$attr.'>'.($column_title != 'Venue' ? esc_html($value) : $value).'</td>';
+            }
+            $html .= '</tr>';
+        }
+        return $html;
+    }
+    private function process_matches ($fixtures) {
+        $html = '';
+        foreach ($fixtures as $fixture) {
+            $valid_date = new \DateTime($fixture->fixtureDate);
+            if ($fixture->isBye) continue;
+            if ($this->table_name == 'fixtures') {
+                if ($fixture->isResult || $this->is_beforetoday($valid_date)) continue;
+            }
+            elseif ($this->table_name == 'results') {
+                if (!$fixture->isResult && !$this->is_beforetoday($valid_date)) continue;
+            }
+            if ($this->filter_whatson($valid_date)) continue;
+            $this->filter_match = true;
+            $html .= $this->fixture_summary($fixture, $valid_date);
+        }
+        return $html;
+    }
+    private function process_competition ($data) {
+        if (!$this->comp_link) $this->comp_link = $this->get_link('competition', $data->entityUrlSlug);
+        $this->comp_name = $data->name . ' ('.$data->seasonName.')';
+        if (empty($data->table)) return $this->get_json('table', $this->atts_show['comp_id']);
+        return $this->process_table($data->table);
+    }
+    private function process_table ($data, $custom=false) {
+        $html = ''; $link = $this->comp_link;
+        $league_data = ['Team' => 'teamName', 'Played' => 'gamesPlayed', 'Won' => 'gamesWon', 'Drawn' => 'gamesDrawn', 'Lost' => 'gamesLost', 'For' => 'goalsFor', 'Against' => 'goalsAgainst', 'GD' => 'goalsDifference', 'Points' => 'totalPoints'];
+        if ($custom) { $league_data['PPG'] = 'PPG'; $league_data['Form'] = 'form'; }
+        $html .= '<table class="gms-table gms-table-'.$this->display_name.($custom ? ' gms-table-custom' : '').'"><thead><tr><th></th>';
+        foreach ($league_data as $column_title => $field_name) $html .= '<th>'.$column_title.'</th>';
+        $html .= '</tr></thead><tbody>';
+        foreach ($data as $position => $team) {
+            $class = '';
+            if (!$custom && $team->teamId == $this->atts_show['team']) {
+                $class = ' class="gms-clubteam"';
+                if (!$link) $link = $this->get_link('team', $team->teamEntityUrlSlug);
+            }
+            $html .= '<tr'.$class.'><td>'.($position+1).'</td>';
+            foreach ($league_data as $field_name) {
+                if ($field_name == 'form') {
+                    if (count($team->form) > 5) $team->form = array_slice($team->form, -5, 5);
+                    $team->form = implode(' ', $team->form);
+                    $html .= '<td>'.$team->form.'</td>';
+                }
+                else $html .= '<td>'.(isset($field_name, $team->{$field_name}) ? esc_html($team->{$field_name}) : '').'</td>';
+            }
+            $html .= '</tr>';
+        }
+        if (empty($data)) $html .= '<tr><td colspan="'.(count($league_data)+1).'">No data for teams found</td></tr>';
+        $html .= '</tbody></table>';
+        $html .= '<div class="gms-footnote">'.($link ? sprintf(esc_html__( '[%5$s%3$s %1$s also found at%4$s %2$s]', 'eh-gms-feed' ), $this->comp_name ? 'for '.$this->comp_name : '', '<a href="'.$link.'" target="_blank">England Hockey Link</a>', '<span class="gms-nomobile">', '</span>', ($custom ? esc_html__('Data') : esc_html__('Table'))) : ($custom ? esc_html__('[League table for selected teams]') : '')).'</div>';
+        return $html;
+    }
+    private function process_fixturesandresults($data) {
+        $html = '';
+        foreach ($data as $competition) {
+            $this->team_comps[$competition->competitionId] = ['name' => $competition->competitionName];
+            if ($this->is_competition() && $competition->competitionId != $this->atts_show['comp_id']) continue;
+            $this->filter_match = false;
+            if ($this->show_list) $html .= '<div class="gms-list">';
+            else {
+                $html .= '<table class="gms-table gms-table-'.$this->display_name.'"><thead><tr>';
+                foreach ($this->fixture_data as $column_title => $field_name) $html .= '<th>'.$column_title.'</th>';
+                $html .= '</tr></thead><tbody>';
+            }
+            if ($this->is_reverse_date()) {
+                usort($competition->fixtures, function ($a,$b) {
+                    return strcmp($b->fixtureDate, $a->fixtureDate);
+                });
+            }
+            $html .= $this->process_matches($competition->fixtures);
+            if ($this->show_list) {
+                if (!$this->filter_match) $html .= '<div>No fixtures found</div>';
+                $html .= '</div>';
+            }
+            else {
+                if (!$this->filter_match) $html .= '<tr><td colspan="'.count($this->fixture_data).'">No fixtures found</td></tr>';
+                $html .= '</tbody></table>';
+            }
+            $html .= '<div class="gms-footnote">'.($this->team_link ? sprintf(esc_html__( '[Team %1$s%4$s for %2$s also found at%5$s %3$s]', 'eh-gms-feed'), 'fixtures', $competition->competitionName, '<a href="'.$this->team_link.'" target="_blank">England Hockey Link</a>', '<span class="gms-nomobile">', '</span>') : '').'</div>';
+        }
+        return $html ?: '<p>'.sprintf(esc_html__( 'No %s were found that matched the criteria.', 'eh-gms-feed' ), 'fixtures').'</p>';
+    }
+    private function process_matchday($data) {
+        $html = '';
+        if ($this->is_sortby_time()) { $sort = true; $sorted_fixtures = []; }
+        else $sort = false;
+        foreach ($data as $competition) {
+            if ($sort) $sorted_fixtures = array_merge($sorted_fixtures, $competition->fixtures);
+            else $html .= $this->process_matches($competition->fixtures);
+        }
+        if ($sort) {
+            usort($sorted_fixtures, function ($a,$b) {
+                return strcmp($a->fixtureTime, $b->fixtureTime);
+            });
+            $html .= $this->process_matches($sorted_fixtures);
+        }
+        return $html;
+    }
+    private function process_matchdays($data) {
+        $html = '';
+        if (!empty($data->matchDays)) {
+            $this->filter_match = false;
+            if ($this->show_list) $html .= '<div class="gms-list">';
+            else {
+                $html .= '<table class="gms-table gms-table-'.$this->display_name.'"><thead><tr>';
+                foreach ($this->fixture_data as $column_title => $field_name) $html .= '<th>'.$column_title.'</th>';
+                $html .= '</tr></thead><tbody>';
+            }
+            foreach (($this->is_reverse_date() ? array_reverse($data->matchDays) : $data->matchDays) as $matches) {
+                $valid_date = new \DateTime($matches->matchDay);
+                if ($this->table_name == 'fixtures' && $this->is_beforetoday($valid_date)) continue;
+                if ($this->filter_whatson($valid_date)) continue;
+                if (is_numeric($this->atts_show['whatson']) && $matches->matchDay != $data->nextMatchDay && !isset($matches->competitions)) {
+                    $html .= $this->get_json('matchday', [$this->atts_show['club_id'], $matches->id]);
+                }
+                else {
+                    if (!empty($matches->competitions)) $html .= $this->process_matchday($matches->competitions);
+                }
+            }
+            if ($this->show_list) {
+                if (!$this->filter_match) $html .= '<div>No fixtures found</div>';
+                $html .= '</div>';
+            }
+            else {
+                if (!$this->filter_match) $html .= '<tr><td colspan="'.count($this->fixture_data).'">No fixtures found</td></tr>';
+                $html .= '</tbody></table>';
+            }
+            $html .= '<div class="gms-footnote">'.($this->club_link ? sprintf(esc_html__( '[Club%3$s match day %1$s also found at%4$s %2$s]', 'eh-gms-feed' ), 'fixtures', '<a href="'.$this->club_link.'" target="_blank">England Hockey Link</a>', '<span class="gms-nomobile">', '</span>') : '').'</div>';
+        }
+        return $html;
+    }
+    private function process_teamslist($data) {
+        $this->filter_match = false;
+        $colspan = $this->show_cal ? 3 : 2;
+        $cal_options = $this->cal_summary ? '&options=summary:'.$this->cal_summary : '';
+        $html =  $this->show_cal ? '<p>If your calendar app supports subscribing to internet calendars (the WebCal protocol), then click on Copy WebCal for link to paste into your calendar app. For more help and advanced options please goto <a href="https://gmsfeed.co.uk/webcal?club_id='.$this->atts_show['club_id'].'" target="_blank">GMS Feed WebCal</a>.</p><p><span style="word-break: break-all" id="gms-webcal-link"><i>Click on Copy WebCal to select and copy link</i></span></p>' : '';
+        $html .= '<table class="gms-table gms-table-'.$this->display_name.'"><thead><tr><th>England Hockey Link</th><th>Gender</th>'.($this->show_cal ? '<th>Fixtures Calendar</th>' : '').'</tr></thead><tbody>';
+        foreach ($data as $team) {
+            $this->filter_match = true;
+            $calid = 'gms_webcal_'.$team->id;
+            $webcal = $this->show_cal ? '<td><button type="button" class="gms-button gms-copy" data-copy_id="gms-webcal-link" data-copy_text="'.esc_html('webcal://gmsfeed.co.uk/api/calendar?team='.$team->id.$cal_options).'" title="'.esc_html($team->teamName).'">Copy WebCal</button></td>' : '';
+            $html .= '<tr><td><a href="'.esc_attr($this->get_link('team', $team->entityUrlSlug)).'" target="_blank">'.esc_html($team->teamName).'</a></td><td>'.esc_html($team->gender).'</td>'.$webcal.'</tr>';
+            if (!$this->club_link) $this->club_link = $this->get_link('club', $team->clubUrlSlug);
+        }
+        if (!$this->filter_match) $html .= '<tr><td colspan='.$colspan.'>No teams found</td></tr>';
+        $html .= '</tbody></table><div class="gms-footnote">'.($this->club_link ? sprintf(esc_html__( '[Club %1$s%3$s also found at%4$s %2$s]', 'eh-gms-feed' ), 'teams', '<a href="'.$this->club_link.'" target="_blank">England Hockey Link</a>', '<span class="gms-nomobile">', '</span>') : '').'</div>';
+        return $html;
+    }
+    private function process_fixture($data) {
+        $html = '<div class="gms-list">';
+        $html .= $this->fixture_summary($data, new \DateTime($data->fixtureDate), true);
+        $html .= '</div>';
+        $html .= '<div class="gms-footnote">'.sprintf(esc_html__( '[Fixture %2$s also found at%3$s %1$s]', 'eh-gms-feed'), '<a href="'.$this->get_link('fixture', $this->id).'" target="_blank">England Hockey Link</a>', '<span class="gms-nomobile">', '</span>').'</div>';
+        return $html;
+    }
+    private function get_table() {
+        $html = '';
+        $tables = [];
+        if ($this->atts_show['show'] == 'fixture') $tables[] = 'fixture';
+        if (str_contains($this->atts_show['show'], 'league')) $tables[] = 'league';
+        if (str_contains($this->atts_show['show'], 'results')) {
+            $tables[] = (str_contains($this->atts_show['show'], 'fixtures')) ? 'combined' : 'results';
+        }
+        elseif (str_contains($this->atts_show['show'], 'fixtures')) $tables[] = 'fixtures';
+        if (str_contains($this->atts_show['show'], 'teams')) $tables[] = 'teams';
+        foreach ($tables as $table_name) {
+            $this->table_name = $table_name;
+            $this->display_name = ($table_name == 'combined') ? 'results' : $table_name;
+            $this->fixture_data = ['Date' => 'fixtureDate', 'Time' => 'fixtureTime', 'Home Team' => ['homeTeam','teamName'], 'Score' => ['homeTeamScore', 'awayTeamScore'], 'Away Team' => ['awayTeam','teamName'], 'Venue' => 'venue'];
+            if ($table_name == 'fixtures') unset($this->fixture_data['Score']);
+            if ($table_name == 'league') {
+                if ($this->atts_show['link']) $this->comp_link = $this->atts_show['link'];
+                if ($this->is_competition()) $html .= $this->get_json('competition', $this->atts_show['comp_id']);
+                else $html .= $this->multiple_teams();
+            }
+            elseif (($table_name == 'fixtures' || $table_name == 'results' || $table_name == 'combined') && $this->is_team()) {
+                if ($this->atts_show['link']) $this->team_link = $this->atts_show['link'];
+                $html .= $this->get_json('fixturesandresults', $this->atts_show['team']);
+            }
+            elseif (($table_name == 'fixtures' || $table_name == 'results' || $table_name == 'combined') && $this->is_clubwide()) {
+                if ($this->atts_show['link']) $this->club_link = $this->atts_show['link'];
+                $html .= $this->get_json('matchdays', $this->atts_show['club_id']);
+            }
+            elseif ($table_name == 'teams' && $this->is_clubwide()) {
+                if ($this->atts_show['link']) $this->club_link = $this->atts_show['link'];
+                $html .= $this->get_json('teamslist', $this->atts_show['club_id']);
+            }
+            elseif ($table_name == 'fixture' && $this->id) {
+                $this->show_list = true;
+                $html .= $this->get_json('fixture', $this->id);
+            }
+        }
+        return $html;
+    }
+    private function process_teams ($data) {
+        $teams = [];
+        foreach ($data as $team) $teams[$team->id] = ['teamName' => $team->teamName, 'clubId' => $team->clubId, 'clubName' => $team->clubName, 'slug' => $team->entityUrlSlug, 'clubSlug' => $team->clubUrlSlug, 'gender' => $team->gender, 'clubLogoUrl' => $team->clubLogoUrl ?? null];
+        return $teams;
+    }
+    private function process_teamsinclub ($data) {
+        return $this->process_teams($data);
+    }
+    private function process_compsinfixtures($data) {
+        $competitions = [];
+        // seasonId is available but season (name) is ONLY within fixtures object
+        foreach ($data as $competition) $competitions[$competition->competitionId] = ['name' => $competition->competitionName, 'slug' => $competition->competitionEntityUrlSlug];
+        return $competitions;
+    }
+    private function multiple_teams() {
+        $html = '';
+        $api = 'fixturesandresults';
+        $json_data = [];
+        $required_data = [];
+        $no_data = 0;
+        // Try the default data cache first
+        foreach ($this->multiple_teams as $teamID) {
+            $body = get_transient('eh_gms_feed '.$this->api[$api]['transient'].' '.$teamID);
+            if ($body === false) $required_data[] = $teamID;
+            else $json_data[$teamID] = $body;
+        }
+        // If Laravel then use Guzzle and do requests in parallel
+        if ($this->isLaravel) {
+            $refreshlist = collect();
+            foreach ($required_data as $teamID) {
+                $object = new \stdClass;
+                $object->api = $api;
+                $object->api_key = $teamID;
+                $refreshlist->push($object);
+            }
+            if ($refreshlist->isNotEmpty()) $this->refresh_cache($refreshlist);
+        }
+        foreach ($required_data as $teamID) {
+            $json_data[$teamID] = $this->get_json($api, $teamID, true);
+        }
+        if (!empty($json_data)) {
+            $league = [];
+            foreach ($json_data as $key => $snapshot) {
+                if ($snapshot && ($data = json_decode($snapshot)) && json_last_error() === JSON_ERROR_NONE && !empty($data)) {
+                    $teamname = $next_fixture_date = null;
+                    $gp = $gw = $gd = $gl = $gf = $ga = 0;
+                    $form = [];
+                    foreach ($data as $competition) {
+                        foreach ($competition->fixtures as $fixture) {
+                            $isHome = $fixture->homeTeamId == $key;
+                            if (!$teamname) $teamname = $isHome ? $fixture->homeTeam->teamName : $fixture->awayTeam->teamName;
+                            if ($fixture->isBye) continue;
+                            $valid_date = new \DateTime($fixture->fixtureDate);
+                            if ($fixture->isResult) {
+                                if ($fixture->status == 'Postponed' || ($fixture->homeTeamScore == 'P' && $fixture->awayTeamScore == 'P')) continue;
+                                elseif ($fixture->status == 'Cancelled' || ($fixture->homeTeamScore == 'C' && $fixture->awayTeamScore == 'C')) continue;
+                                else {
+                                    $gp++;
+                                    $gf += $isHome ? $fixture->homeTeamScoreAsInt : $fixture->awayTeamScoreAsInt;
+                                    $ga += $isHome ? $fixture->awayTeamScoreAsInt : $fixture->homeTeamScoreAsInt;
+                                    if ($fixture->homeTeamScoreAsInt == $fixture->awayTeamScoreAsInt) { $gd++; $form[] = '<span class="gms-form gms-draw">D</span>'; }
+                                    else if (($isHome && $fixture->homeTeamScoreAsInt > $fixture->awayTeamScoreAsInt) || (!$isHome && $fixture->homeTeamScoreAsInt < $fixture->awayTeamScoreAsInt)) { $gw++; $form[] = '<span class="gms-form gms-win">W</span>'; }
+                                    else { $gl++; $form[] = '<span class="gms-form gms-loss">L</span>'; }
+                                }
+                            }
+                            elseif ($this->is_beforetoday($valid_date)) continue;
+                            elseif (!$next_fixture_date || $valid_date < $next_fixture_date) $next_fixture_date = $valid_date;
+                        }
+                    }
+                    if ($teamname) {
+                        $points = $gw * 3 + $gd;
+                        $object = new \stdClass;
+                        $object->teamId = $key;
+                        $object->teamName = $teamname;
+                        $object->gamesPlayed = $gp;
+                        $object->gamesWon = $gw;
+                        $object->gamesDrawn = $gd;
+                        $object->gamesLost = $gl;
+                        $object->goalsFor = $gf;
+                        $object->goalsAgainst = $ga;
+                        $object->goalsDifference = $gf - $ga;
+                        $object->totalPoints = $points;
+                        $object->PPG = number_format($gp ? $points/$gp : 0, 2, '.', '');
+                        $object->form = $form;
+                        $league[] = $object;
+                    }
+                }
+                else $no_data++;
+            }
+            usort($league, function ($a,$b) {
+                if ($a->PPG != $b->PPG) return $a->PPG < $b->PPG ? 1 : -1;
+                if ($a->goalsDifference != $b->goalsDifference) return $a->goalsDifference < $b->goalsDifference ? 1 : -1;
+                if ($a->goalsFor != $b->goalsFor) return $a->goalsFor < $b->goalsFor ? 1 : -1;
+                if ($a->gamesWon != $b->gamesWon) return $a->gamesWon < $b->gamesWon ? 1 : -1;
+                return 0;
+            });
+            $html .= $this->process_table($league, true);
+            if ($no_data) $html .= $this->show_api_error(sprintf(esc_html__( 'Failed to retrieve data for %s of selected team(s)', 'eh-gms-feed' ), $no_data));
+        }
+        else $html .= $this->show_api_error(esc_html__( 'You have selected a custom league table without any teams', 'eh-gms-feed' ));
+        return $html;
+    }
+    private function ajax_method () {
+        wp_enqueue_script('EH_GMS_Feed');
+        $atts = '';
+        foreach ($this->args as $value) {
+            if (!empty($this->atts_show[$value])) $atts .= ' data-'.$value.'="'.esc_attr($this->atts_show[$value]).'"';
+        }
+        return '<div class="gms-wrapper gms-ajax"'.$atts.'></div>';
+        parent::__construct();
+    }
 …
+        }
         foreach (explode('+',$this->atts_show['show']) as $show) {
             if (!in_array($show,['fixtures','results','league','teams','fixture'])) {
+            if (!in_array($show, $this->valid_show)) {
                 $message = sprintf(esc_html__( 'Please enter a "show" parameter (%s) equal to "fixtures", "results", "league" or "teams".', 'eh-gms-feed' ), $show ?: 'empty');
                 $this->not_valid .= '<p>'.$message.'</p>';
 …
     public function gms_shortcode ( $atts = [] ) {
         if ($this->validate_atts($atts)) {
+            if ($this->settings->default_ajax == 'yes' || $this->atts_show['method'] == 'api-dynamic')
+                $html = $this->ajax_method ();
+            if ($this->settings->default_ajax == 'yes' || $this->atts_show['method'] == 'api-dynamic') {
+                wp_enqueue_script('EH_GMS_Feed');
+                $html_atts = '';
+                foreach ($this->args as $value) {
+                    if (!empty($this->atts_show[$value])) $html_atts .= ' data-'.$value.'="'.esc_attr($this->atts_show[$value]).'"';
+                }
+                $html = '<div class="gms-wrapper gms-ajax"'.$html_atts.'></div>';
+            }
             elseif ($this->atts_show['method'] == 'api') $html = '<div class="gms-wrapper">'.$this->get_table().'</div>';
             return $html;
 …
     public function enqueue_scripts () {
         wp_register_script('EH_GMS_Feed', plugin_dir_url(__DIR__).'js/eh-gms-feed.js', ['jquery'], '3.12', true);
+        wp_register_script('EH_GMS_Feed', plugin_dir_url(__DIR__).'js/eh-gms-feed.js', ['jquery'], '3.13', true);
         wp_localize_script('EH_GMS_Feed', 'eh_gms_feed_ajax_obj', ['ajax_url' => admin_url( 'admin-ajax.php' ), 'nonce' => wp_create_nonce('get_gms_table')]);
         wp_register_style('EH_GMS_Feed', plugin_dir_url(__DIR__).'css/gms-default.css',[],'3.12');
         if ($this->settings->default_css == 'yes') wp_enqueue_style('EH_GMS_Feed');
+    }
+}

eh-gms-feed/tags/3.13/js/eh-gms-feed.js

r3064521	r3065987
112	112	.always(function() {
113	113	var goback = jQuery('<button type="button" class="gms-button">Go Back</button>').appendTo(detail);
114		back_btns.push ~~= goback[0]~~;
	114	back_btns.push(goback[0]);
115	115	back_btns.forEach(function (ele) {
116	116	ele.addEventListener('click', function() {

eh-gms-feed/tags/3.13/readme.txt

-                      r3064521
+                      r3065987
 Tested up to: 6.5
 Requires PHP: 5.3
 Stable tag: 3.12
+Stable tag: 3.13
 License: GPLv2
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
 …
 == Changelog ==
+= 3.13 =
+* Fix fault with back button on fixture detail
+* Added showGender option to custom league table
 = 3.12 =

eh-gms-feed/trunk/eh-gms-feed.php

r3064521	r3065987
4	4	* Plugin URI: https://wordpress.org/plugins/eh-gms-feed/
5	5	* Description: Show fixtures, results and tables from England Hockey GMS
6		* Version: 3.12
	6	* Version: 3.13
7	7	* Author: Matthew Treherne
8	8	* Author URI: https://profiles.wordpress.org/mtreherne

eh-gms-feed/trunk/includes/main-class.php

-                      r3064521
+                      r3065987
 include_once 'settings.php';
+include_once 'coreAPI.php';
 class EH_GMS_Feed {
+class EH_GMS_Feed extends coreAPI {
+    private $basename, $settings, $atts_show, $not_valid, $filter_match, $table_name, $fixture_data, $display_name, $show_gender, $show_list, $show_cal, $cal_summary, $id, $show_detail, $directions, $multiple_teams = [], $isLaravel = false, $teamlimit = 12;
+    private $club_link, $team_link, $comp_link, $team_comps, $comp_name;
+    private $args = ['method','show','team','comp_id','club_id','whatson','link','sort_by','options'];
+    private $api = [
+        'table' => ['transient' => 'COMPETITION LEAGUE', 'keys' => ['competitions'], 'error_bag' => null, 'expiry' => 'default'],
+        'fixturesandresults' => ['transient' => 'TEAM', 'keys' => ['teams'], 'error_bag' => null, 'expiry' => 'default'],
+        'matchdays' => ['transient' => 'CLUB MATCHDAYS', 'keys' => ['clubs'], 'error_bag' => null, 'expiry' => 'default'],
+        'matchday' => ['suffix' => '', 'transient' => 'CLUB MATCHDAY', 'keys' => ['clubs', 'matchdays'], 'error_bag' => null, 'expiry' => 'static'],
+        'teamsinclub' => ['suffix' => 'teams', 'transient' => 'CLUB TEAMS', 'keys' => ['clubs'], 'error_bag' => 'teamselected', 'expiry' => 'static'],
+        'teamslist' => ['suffix' => 'teams', 'transient' => 'CLUB TEAMS', 'keys' => ['clubs'], 'error_bag' => null, 'expiry' => 'static'],
+        'compsinfixtures' => ['suffix' => 'fixturesandresults', 'transient' => 'TEAM', 'keys' => ['teams'], 'error_bag' => 'competition', 'expiry' => 'default'],
+        'competition' => ['suffix' => '', 'transient' => 'COMPETITION SUMMARY', 'keys' => ['competitions'], 'error_bag' => null, 'expiry' => 'default'],
+        'fixture' => ['suffix' => '', 'transient' => 'FIXTURE', 'keys' => ['fixtures'], 'error_bag' => null, 'expiry' => 'default'],
+    ];
+    private $basename, $not_valid;
     public function __construct () {
         $this->basename = $GLOBALS['EH_GMS_Feed_basename'];
         $this->settings = new Settings($this->basename);
-        $this->settings->static_transient_expiry = '86400';
         add_shortcode( 'gms', array( $this, 'gms_shortcode' ) );
         add_action( 'wp_enqueue_scripts', array( $this, 'enqueue_scripts' ) );
         add_action( 'wp_ajax_get_gms_table', array( $this, 'ajax_handler' ) );
         add_action( 'wp_ajax_nopriv_get_gms_table', array( $this, 'ajax_handler' ) );
+    }
+    private function get_comp_list () {
+        if (is_null($this->team_comps)) $this->team_comps = $this->is_team() ? $this->get_json('compsinfixtures', $this->atts_show['team']) : [];
+        $comp_count = count($this->team_comps);
+        $html = '<div'.(($comp_count == 0) ? ' style="display: none" ': '').'><label><span class="gms-nomobile">Competition </span><select name="comp_id"><option value="">- All Competitions -</option>';
+        foreach ($this->team_comps as $key => $competition) $html .= '<option value="'.$key.'"'.(($this->is_competition() && $this->atts_show['comp_id'] == $key) || ($comp_count == 1) ? ' selected' : '').'>'.esc_html($competition['name']).'</option>';
+        if ($this->is_competition() && !array_key_exists($this->atts_show['comp_id'], $this->team_comps)) {
+            $html .= '<option value="'.$this->atts_show['comp_id'].'" selected>Previous Season</option>';
+        }
+        $html .= '</select></label></div>';
+        return $html;
+    }
+    private function get_filter () {
+        $html = '<div class="gms-filter"><div'.($this->is_team() ? ' style="display: none" ': '').'><label><span class="gms-nomobile">Team </span><select name="team"><option value="">- All Club Teams -</option>';
+        $teams = $this->get_json('teamsinclub', $this->atts_show['club_id']);
+        foreach ($teams as $key => $team) $html .= '<option value="'.$key.'"'.(($this->is_team() && $this->atts_show['team'] == $key) ? ' selected' : '').'>'.esc_html($team['teamName']).' ('.esc_html($team['gender']).')</option>';
+        $html .= '</select></label></div>'.$this->get_comp_list().'<div><label><span class="gms-nomobile">What`s On </span><select name="whatson">';
+        $whatson = $this->atts_show['whatson'];
+        $options = ($whatson && !in_array($whatson,[7, 14, 31])) ? ['Days ('.$whatson.')' => $whatson] : [];
+        $options = array_merge($options, [$this->is_team () ? '- All Match Days -' : '- Next Match Day -' => '', 'Week' => 7, 'Fortnight' => 14, 'Month' => 31]);
+        foreach ($options as $key => $value) $html .= '<option value="'.$value.'"'.($whatson == $value ? ' selected' : '').'>'.$key.'</option>';
+        $html .= '</select></label></div><div><fieldset><legend class="gms-nomobile">Show</legend>';
+        foreach (['league' => 'League', 'results' => 'Results', 'fixtures' => 'Fixtures'] as $key => $value) {
+            $html .= '<div><label><input type="checkbox" name="show" value="'.$key.'" '.(str_contains($this->atts_show['show'], $key) ? ' checked' : '').'> '.$value.'</label></div>';
+        }
+        $html .= '</fieldset></div><button type="button" class="gms-button">Refresh</button></div>';
+        return $html;
+    }
+    private function get_json($key, $keys=[], $raw=false) {
+    $keys = (array) $keys; $valid_json = true;
+        $headers = ['headers' => ['Content-Type' => 'application/json;charset=UTF-8', 'x-functions-key' => $this->settings->gms_api_key]];
+        $transient_name = 'eh_gms_feed '.$this->api[$key]['transient'];
+        $gms_api_url = $this->settings->gms_api_url;
+        foreach ($keys as $index => $value) {
+            $transient_name .= ' '.$value;
+            $gms_api_url .= ($this->api[$key]['keys'][$index] ?? '').'/'.$value.'/';
+        }
+        $gms_api_url .= $this->api[$key]['suffix'] ?? $key;
+        $body = get_transient($transient_name);
+        if ($body === false) {
+            $response = wp_remote_get($gms_api_url, $headers);
+            $http_code = wp_remote_retrieve_response_code($response);
+            if ($http_code == 200) {
+                $body = wp_remote_retrieve_body($response);
+                if (strlen($transient_name) <= 172) {
+                    switch ($this->api[$key]['expiry']) {
+                        case 'static' : $expiry = $this->settings->static_transient_expiry; break;
+                        case 'weekly' : $expiry = '604800'; break;
+                        default : $expiry = $this->settings->default_transient_expiry;
+                    }
+                    set_transient($transient_name, $body, $expiry);
+                }
+            }
+            else {
+                $valid_json = false;
+                if ($http_code) $message = sprintf(esc_html__( 'Failed to get data with HTTP error code = %s', 'eh-gms-feed' ), $http_code);
+                else {
+                    $error_message = is_wp_error($response) ? $response->get_error_message() : 'unknown';
+                    $message = sprintf(esc_html__( 'Failed to get data with error: %s', 'eh-gms-feed' ), $error_message);
+                }
+            }
+        }
+        if ($raw) return $valid_json ? $body : null;
+        if ($valid_json) {
+            $data = json_decode($body);
+            if (json_last_error() === JSON_ERROR_NONE) {
+                if (!empty($data)) {
+                    return($this->{'process_'.$key}($data));
+                }
+                else {
+                    $valid_json = false;
+                    $data_type = $this->api[$key]['suffix'] ?? $key;
+                    switch ($data_type) {
+                        case 'table' : $data_type = 'league'; break;
+                        case 'fixturesandresults' : $data_type = 'results/fixtures'; break;
+                    }
+                    $message = sprintf(esc_html__( 'No %s data could be found.', 'eh-gms-feed' ), $data_type);
+                }
+            }
+            else {
+                $valid_json = false;
+                $message = esc_html__( 'Failed to decode JSON.', 'eh-gms-feed' );
+            }
+        }
+        if ($this->api[$key]['error_bag']) {
+            if (isset($this->error_bag)) $this->error_bag->add($this->api[$key]['error_bag'], $message);
+            return [];
+        }
+        else return $this->show_api_error($message);
+    }
+    private function get_link($type, $slug) {
+        return 'https://englandhockey.co.uk/'.$type.'s/'.$slug;
+    }
+    private function is_competition () {
+        return !empty($this->atts_show['comp_id']);
+    }
+    private function is_team () {
+        return !empty($this->atts_show['team']);
+    }
+    private function is_clubwide () {
+        return !$this->is_team() && !empty($this->atts_show['club_id']);
+    }
+    private function is_sortby_time () {
+        return $this->atts_show['sort_by'] == 'fixtureTime' || $this->is_reverse_date();
+    }
+    private function is_reverse_date () {
+        return $this->atts_show['sort_by'] == 'reverseDate';
+    }
+    private function show_api_error ($message) {
+        return '<p>'.$message.'</p>';
+    }
+    private function filter_whatson ($fixture_date) {
+        $filter = false;
+        if (is_numeric($this->atts_show['whatson'])) {
+            $compare = (clone $fixture_date)->setTime(0,0);
+            $diff = (new \DateTime())->setTime(0,0)->diff($compare)->format('%a');
+            if ($diff > $this->atts_show['whatson']) $filter = true;
+        }
+        return $filter;
+    }
+    private function is_beforetoday($valid_date) {
+        return $valid_date < (new \DateTime())->setTime(0,0);
+    }
+    private function is_clubteam ($team) {
+        if ($team->id == $this->atts_show['team'] || ($this->is_clubwide() && $team->clubId == $this->atts_show['club_id'])) {
+            if (!$this->club_link) $this->club_link = $this->get_link('club', $team->clubUrlSlug);
+            if (!$this->team_link) $this->team_link = $this->get_link('team', $team->entityUrlSlug);
+            return true;
+        }
+        return false;
+    }
+    private function show_goals ($events) {
+        $goals = [];
+        foreach ($events as $event) if (in_array($event->eventType,['FG','PC','PS'])) $goals[$event->memberId][] = $event;
+        $showGoals = [];
+        foreach ($goals as $goalsById) {
+            $playerName = '';
+            $playerGoals = [];
+            foreach ($goalsById as $goal) {
+                if (!$playerName) $playerName = $goal->displayName;
+                $playerGoals[] = ($goal->minute ? $goal->minute . '&prime; ' : '') . $goal->eventType;
+            }
+            $showGoals[] = $playerName . ' (' . implode(', ',$playerGoals) . ')';
+        }
+        return implode(', ', $showGoals);
+    }
+    private function show_players($players) {
+        $showPlayers = '';
+        $withheld = 0;
+        foreach ($players as $player) {
+            if (!($player->consent || isset($player->shirtNumber))) { $withheld += 1; continue; }
+            $playerEvents = [];
+            foreach ($player->playerEvents as $event) {
+                switch ($event->eventType) {
+                    case 'GC': $showType = '<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path d="M1.892 20.5 12 3.959 22.109 20.5z" fill="#0FBD00" stroke="#0DA300"/></svg>'; break;
+                    case 'YC': $showType = '<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><rect x="3.5" y=".5" width="17" height="23" rx="1.5" fill="#FFE500" stroke="#DBCA39"/></svg>'; break;
+                    case 'RC': $showType = '<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><circle cx="12" cy="12" r="10.5" fill="#E0251B" stroke="#E0251B"/></svg>'; break;
+                    default : $showType = '<b>'.$event->eventType.'</b>';
+                }
+                $playerEvents[] = ($event->minute ? '<b>'.$event->minute . '&prime;&nbsp;</b>' : '') . $showType;
+            }
+            switch ($player->otherRoleDescription) {
+                case 'Goalkeeper' : $role = ' (GK)'; break;
+                case 'Captain' : $role = ' (C)'; break;
+                default : $role = '';
+            }
+            $showPlayers .= '<li>'.($player->shirtNumber ?? '') . ' ' . $player->displayName . $role . (!empty($playerEvents) ? ('&nbsp;' . implode(',&nbsp;',$playerEvents)) : '') . '</li>';
+        }
+        if ($withheld) $showPlayers .= ($withheld > 1) ? '<li>Names Withheld (&times;'.$withheld.')</li>' : '<li>Name Withheld</li>';
+        return $showPlayers;
+    }
+    private function show_officials($officials) {
+        $showOfficials = '';
+        foreach ($officials as $official) {
+            if ($official->displayName != 'Name Withheld') $showOfficials .= '<li>' . $official->role . ': ' . $official->displayName . '</li>';
+        }
+        return $showOfficials;
+    }
+    private function fixture_summary ($fixture, $valid_date, $show_detail=false) {
+        $html = '';
+        $fixture_card = [
+            'Date' => $valid_date->format('d M Y'),
+            'Time' => $fixture->fixtureTime == '00:00' ? '' : $fixture->fixtureTime,
+            'Home Team' => $fixture->homeTeam->teamName,
+            'Score' => '',
+            'Away Team' => $fixture->awayTeam->teamName,
+            'Venue' => !empty($fixture->venue) ? ($this->show_detail || $show_detail ? esc_html($fixture->venue) : '<a href="https://www.google.com/maps/search/?api=1&query='.urlencode($fixture->venue).'" target="_blank">'.esc_html($fixture->venue).'</a>') : '',
+        ];
+        if ($show_detail) {
+            $home_goals = $this->show_goals($fixture->homeTeamEvents);
+            $away_goals = $this->show_goals($fixture->awayTeamEvents);
+            $address = !empty($fixture->venueDetails->address) ? preg_replace ('#(\w+,)(\w+)#', '$1 $2' , $fixture->venueDetails->address) : null;
+            if (!($fixture->isResult || $this->is_beforetoday($valid_date))) $this->directions = ['venue' => $fixture->venue ?? '', 'll' => null, 'address' => $address, 'postcode' => $fixture->venueDetails->postCode ?? null];
+            $address .= !empty($address) ? (!empty($fixture->venueDetails->postCode) ? ', '.$fixture->venueDetails->postCode : '') : '';
+        }
+        $score_class = '';
+        $home_attr = $away_attr = $home_class = $away_class = [];
+        if ($fixture->isResult && !$fixture->isBye) {
+            $fixture_card['Score'] = $fixture->homeTeamScore . ' : ' . $fixture->awayTeamScore;
+            if ($fixture->status == 'Postponed' || ($fixture->homeTeamScore == 'P' && $fixture->awayTeamScore == 'P'));
+            elseif ($fixture->status == 'Cancelled' || ($fixture->homeTeamScore == 'C' && $fixture->awayTeamScore == 'C'));
+            elseif ($fixture->homeTeamScore == $fixture->awayTeamScore) $score_class = 'gms-draw';
+            elseif (($fixture->homeTeam->id == $this->atts_show['team'] || ($this->is_clubwide() && $fixture->homeTeam->clubId == $this->atts_show['club_id'])) && $fixture->homeTeamScore > $fixture->awayTeamScore) $score_class = 'gms-win';
+            elseif (($fixture->awayTeam->id == $this->atts_show['team'] || ($this->is_clubwide() && $fixture->awayTeam->clubId == $this->atts_show['club_id'])) && $fixture->homeTeamScore < $fixture->awayTeamScore) $score_class = 'gms-win';
+            else $score_class = 'gms-loss';
+        }
+        if ($this->is_clubteam($fixture->homeTeam) && $this->is_clubwide()) {
+            $home_class[] = 'gms-clubteam';
+            $home_attr[] = 'data-team="'.($fixture->homeTeam->id).'"';
+            if ($this->show_gender) $fixture_card['Home Team'] .= ' ('.$fixture->homeTeam->gender.')';
+        }
+        if ($this->is_clubteam($fixture->awayTeam) && $this->is_clubwide()) {
+            $away_class[] = 'gms-clubteam';
+            $away_attr[] = 'data-team="'.($fixture->awayTeam->id).'"';
+            if ($this->show_gender) $fixture_card['Away Team'] .= ' ('.$fixture->awayTeam->gender.')';
+        }
+        if ($this->show_list) {
+            $statusDisplay = !in_array($fixture->status, ['Active','Result','Bye']) ? $fixture->status : '';
+            if ($fixture->isResult && ($fixture->homeTeamShootoutScore > 0 || $fixture->awayTeamShootoutScore > 0)) $statusDisplay = 'Shootout '.$fixture->homeTeamShootoutScore.' - '. $fixture->awayTeamShootoutScore;
+            $home_attr[] = 'class="'.implode(' ',$home_class).'"';
+            $away_attr[] = 'class="'.implode(' ',$away_class).'"';
+            if ($fixture->isBye) {
+                $divide = '- : -';
+                $divide_attr = ' class="gms-carddivide gms-cardnoscore"';
+            }
+            elseif ($fixture->isResult) {
+                $divide = $fixture_card['Score'];
+                $divide_attr = ' class="gms-carddivide '.($score_class ?: 'gms-cardnoscore').'"';
+            }
+            else {
+                $divide = $fixture_card['Time'] ?: 'TBC';
+                $divide_attr = ' class="gms-carddivide gms-cardtime"';
+            }
+            $html .= '<div class="gms-card'.($this->show_detail ? ' gms-detaillink' : '').'"'.($this->show_detail ? ' data-fixture="'.$fixture->id.'"': '').'>'
+                .($show_detail ? '<div class="gms-cardtitle">Fixture Details</div><div class="gms-cardcomp">'.$fixture->competitionName.'</div>': '')
+                .'<div class="gms-carddate">'.$fixture_card['Date'].'</div>'
+                .'<div class="gms-cardfixture"><div class="gms-cardhome"><div '.implode(' ',$home_attr).'>'.$fixture_card['Home Team'].'</div></div><div'.$divide_attr.'>'.$divide.'</div><div class="gms-cardaway"><div '.implode(' ',$away_attr).'>'.$fixture_card['Away Team'].'</div></div></div>'
+                .(($show_detail && ($home_goals || $away_goals)) ? '<div class="gms-cardscorers"><div class="gms-cardhome"><div>'.$home_goals.'</div></div><div class="gms-carddivide"></div><div class="gms-cardaway"><div>'.$away_goals.'</div></div></div>' : '')
+                .($statusDisplay ? '<div class="gms-cardstatus">'.$statusDisplay.'</div>' : '')
+                .'<div class="gms-cardvenue">'.($fixture_card['Venue'] ?: 'Venue TBC').'</div>'
+                .($show_detail && $address ? '<div class="gms-cardaddress">'.$address.'</div>' : '')
+                .'</div>';
+            if ($show_detail) {
+                $participant_details = false;
+                $html .= '<div class="gms-fixturedetails">';
+                foreach (['home','away'] as $team) {
+                    $showPlayers = $this->show_players($fixture->{$team . 'Players'});
+                    $showOfficials = $this->show_officials($fixture->{$team. 'TeamOfficials'});
+                    if ($showPlayers || $showOfficials) {
+                        $club_logo = $fixture->{$team . 'Team'}->clubLogoUrl ?? null;
+                        $participant_details = true;
+                        $html .= '<div>';
+                        if ($showPlayers) $html .= '<div class="gms-players">'.($club_logo ? '<img src="'.$club_logo.'" onerror="this.style.display=\'none\'"></img>' : '').'<b>'.$fixture->{$team.'Team'}->teamName.'</b><ul>'.$showPlayers.'</ul></div>';
+                        if ($showOfficials) $html .= '<div class="gms-officials">'.($showPlayers ? '<br/>' : '').'<b>Coaching Roles</b><ul>'.$showOfficials.'</ul></div>';
+                        $html .= '</div>';
+                    }
+                }
+                $showOfficials = $this->show_officials($fixture->officials);
+                if ($showOfficials) {
+                    $participant_details = true;
+                    $html .= '<div class="gms-officials"><b>Match Officials</b><ul>'.$showOfficials.'</ul></div>';
+                }
+                if (!$participant_details) $html .= '<div><b>No more details available</b></div>';
+                $html .= '</div>';
+            }
+        }
+        else {
+            $home_attr[] = 'class="'.implode(' ',$home_class).'"';
+            $away_attr[] = 'class="'.implode(' ',$away_class).'"';
+            $html .= $this->show_detail ? '<tr class="gms-detaillink" data-fixture="'.$fixture->id.'">': '<tr>';
+            foreach ($this->fixture_data as $column_title => $field_name) {
+                $value = $fixture_card[$column_title];
+                switch ($column_title) {
+                    case 'Home Team' : $attr = implode(' ',$home_attr); break;
+                    case 'Away Team' : $attr = implode(' ',$away_attr); break;
+                    case 'Score' : $attr = 'class="'.$score_class.'"';  break;
+                    default : $attr = '';
+                }
+                $html .= '<td '.$attr.'>'.($column_title != 'Venue' ? esc_html($value) : $value).'</td>';
+            }
+            $html .= '</tr>';
+        }
+        return $html;
+    }
+    private function process_matches ($fixtures) {
+        $html = '';
+        foreach ($fixtures as $fixture) {
+            $valid_date = new \DateTime($fixture->fixtureDate);
+            if ($fixture->isBye) continue;
+            if ($this->table_name == 'fixtures') {
+                if ($fixture->isResult || $this->is_beforetoday($valid_date)) continue;
+            }
+            elseif ($this->table_name == 'results') {
+                if (!$fixture->isResult && !$this->is_beforetoday($valid_date)) continue;
+            }
+            if ($this->filter_whatson($valid_date)) continue;
+            $this->filter_match = true;
+            $html .= $this->fixture_summary($fixture, $valid_date);
+        }
+        return $html;
+    }
+    private function process_competition ($data) {
+        if (!$this->comp_link) $this->comp_link = $this->get_link('competition', $data->entityUrlSlug);
+        $this->comp_name = $data->name . ' ('.$data->seasonName.')';
+        if (empty($data->table)) return $this->get_json('table', $this->atts_show['comp_id']);
+        return $this->process_table($data->table);
+    }
+    private function process_table ($data, $custom=false) {
+        $html = ''; $link = $this->comp_link;
+        $league_data = ['Team' => 'teamName', 'Played' => 'gamesPlayed', 'Won' => 'gamesWon', 'Drawn' => 'gamesDrawn', 'Lost' => 'gamesLost', 'For' => 'goalsFor', 'Against' => 'goalsAgainst', 'GD' => 'goalsDifference', 'Points' => 'totalPoints'];
+        if ($custom) { $league_data['PPG'] = 'PPG'; $league_data['Form'] = 'form'; }
+        $html .= '<table class="gms-table gms-table-'.$this->display_name.($custom ? ' gms-table-custom' : '').'"><thead><tr><th></th>';
+        foreach ($league_data as $column_title => $field_name) $html .= '<th>'.$column_title.'</th>';
+        $html .= '</tr></thead><tbody>';
+        foreach ($data as $position => $team) {
+            $class = '';
+            if (!$custom && $team->teamId == $this->atts_show['team']) {
+                $class = ' class="gms-clubteam"';
+                if (!$link) $link = $this->get_link('team', $team->teamEntityUrlSlug);
+            }
+            $html .= '<tr'.$class.'><td>'.($position+1).'</td>';
+            foreach ($league_data as $field_name) {
+                if ($field_name == 'form') {
+                    if (count($team->form) > 5) $team->form = array_slice($team->form, -5, 5);
+                    $team->form = implode(' ', $team->form);
+                    $html .= '<td>'.$team->form.'</td>';
+                }
+                else $html .= '<td>'.(isset($field_name, $team->{$field_name}) ? esc_html($team->{$field_name}) : '').'</td>';
+            }
+            $html .= '</tr>';
+        }
+        if (empty($data)) $html .= '<tr><td colspan="'.(count($league_data)+1).'">No data for teams found</td></tr>';
+        $html .= '</tbody></table>';
+        $html .= '<div class="gms-footnote">'.($link ? sprintf(esc_html__( '[%5$s%3$s %1$s also found at%4$s %2$s]', 'eh-gms-feed' ), $this->comp_name ? 'for '.$this->comp_name : '', '<a href="'.$link.'" target="_blank">England Hockey Link</a>', '<span class="gms-nomobile">', '</span>', ($custom ? esc_html__('Data') : esc_html__('Table'))) : ($custom ? esc_html__('[League table for selected teams]') : '')).'</div>';
+        return $html;
+    }
+    private function process_fixturesandresults($data) {
+        $html = '';
+        foreach ($data as $competition) {
+            $this->team_comps[$competition->competitionId] = ['name' => $competition->competitionName];
+            if ($this->is_competition() && $competition->competitionId != $this->atts_show['comp_id']) continue;
+            $this->filter_match = false;
+            if ($this->show_list) $html .= '<div class="gms-list">';
+            else {
+                $html .= '<table class="gms-table gms-table-'.$this->display_name.'"><thead><tr>';
+                foreach ($this->fixture_data as $column_title => $field_name) $html .= '<th>'.$column_title.'</th>';
+                $html .= '</tr></thead><tbody>';
+            }
+            if ($this->is_reverse_date()) {
+                usort($competition->fixtures, function ($a,$b) {
+                    return strcmp($b->fixtureDate, $a->fixtureDate);
+                });
+            }
+            $html .= $this->process_matches($competition->fixtures);
+            if ($this->show_list) {
+                if (!$this->filter_match) $html .= '<div>No fixtures found</div>';
+                $html .= '</div>';
+            }
+            else {
+                if (!$this->filter_match) $html .= '<tr><td colspan="'.count($this->fixture_data).'">No fixtures found</td></tr>';
+                $html .= '</tbody></table>';
+            }
+            $html .= '<div class="gms-footnote">'.($this->team_link ? sprintf(esc_html__( '[Team %1$s%4$s for %2$s also found at%5$s %3$s]', 'eh-gms-feed'), 'fixtures', $competition->competitionName, '<a href="'.$this->team_link.'" target="_blank">England Hockey Link</a>', '<span class="gms-nomobile">', '</span>') : '').'</div>';
+        }
+        return $html ?: '<p>'.sprintf(esc_html__( 'No %s were found that matched the criteria.', 'eh-gms-feed' ), 'fixtures').'</p>';
+    }
+    private function process_matchday($data) {
+        $html = '';
+        if ($this->is_sortby_time()) { $sort = true; $sorted_fixtures = []; }
+        else $sort = false;
+        foreach ($data as $competition) {
+            if ($sort) $sorted_fixtures = array_merge($sorted_fixtures, $competition->fixtures);
+            else $html .= $this->process_matches($competition->fixtures);
+        }
+        if ($sort) {
+            usort($sorted_fixtures, function ($a,$b) {
+                return strcmp($a->fixtureTime, $b->fixtureTime);
+            });
+            $html .= $this->process_matches($sorted_fixtures);
+        }
+        return $html;
+    }
+    private function process_matchdays($data) {
+        $html = '';
+        if (!empty($data->matchDays)) {
+            $this->filter_match = false;
+            if ($this->show_list) $html .= '<div class="gms-list">';
+            else {
+                $html .= '<table class="gms-table gms-table-'.$this->display_name.'"><thead><tr>';
+                foreach ($this->fixture_data as $column_title => $field_name) $html .= '<th>'.$column_title.'</th>';
+                $html .= '</tr></thead><tbody>';
+            }
+            foreach (($this->is_reverse_date() ? array_reverse($data->matchDays) : $data->matchDays) as $matches) {
+                $valid_date = new \DateTime($matches->matchDay);
+                if ($this->table_name == 'fixtures' && $this->is_beforetoday($valid_date)) continue;
+                if ($this->filter_whatson($valid_date)) continue;
+                if (is_numeric($this->atts_show['whatson']) && $matches->matchDay != $data->nextMatchDay && !isset($matches->competitions)) {
+                    $html .= $this->get_json('matchday', [$this->atts_show['club_id'], $matches->id]);
+                }
+                else {
+                    if (!empty($matches->competitions)) $html .= $this->process_matchday($matches->competitions);
+                }
+            }
+            if ($this->show_list) {
+                if (!$this->filter_match) $html .= '<div>No fixtures found</div>';
+                $html .= '</div>';
+            }
+            else {
+                if (!$this->filter_match) $html .= '<tr><td colspan="'.count($this->fixture_data).'">No fixtures found</td></tr>';
+                $html .= '</tbody></table>';
+            }
+            $html .= '<div class="gms-footnote">'.($this->club_link ? sprintf(esc_html__( '[Club%3$s match day %1$s also found at%4$s %2$s]', 'eh-gms-feed' ), 'fixtures', '<a href="'.$this->club_link.'" target="_blank">England Hockey Link</a>', '<span class="gms-nomobile">', '</span>') : '').'</div>';
+        }
+        return $html;
+    }
+    private function process_teamslist($data) {
+        $this->filter_match = false;
+        $colspan = $this->show_cal ? 3 : 2;
+        $cal_options = $this->cal_summary ? '&options=summary:'.$this->cal_summary : '';
+        $html =  $this->show_cal ? '<p>If your calendar app supports subscribing to internet calendars (the WebCal protocol), then click on Copy WebCal for link to paste into your calendar app. For more help and advanced options please goto <a href="https://gmsfeed.co.uk/webcal?club_id='.$this->atts_show['club_id'].'" target="_blank">GMS Feed WebCal</a>.</p><p><span style="word-break: break-all" id="gms-webcal-link"><i>Click on Copy WebCal to select and copy link</i></span></p>' : '';
+        $html .= '<table class="gms-table gms-table-'.$this->display_name.'"><thead><tr><th>England Hockey Link</th><th>Gender</th>'.($this->show_cal ? '<th>Fixtures Calendar</th>' : '').'</tr></thead><tbody>';
+        foreach ($data as $team) {
+            $this->filter_match = true;
+            $calid = 'gms_webcal_'.$team->id;
+            $webcal = $this->show_cal ? '<td><button type="button" class="gms-button gms-copy" data-copy_id="gms-webcal-link" data-copy_text="'.esc_html('webcal://gmsfeed.co.uk/api/calendar?team='.$team->id.$cal_options).'" title="'.esc_html($team->teamName).'">Copy WebCal</button></td>' : '';
+            $html .= '<tr><td><a href="'.esc_attr($this->get_link('team', $team->entityUrlSlug)).'" target="_blank">'.esc_html($team->teamName).'</a></td><td>'.esc_html($team->gender).'</td>'.$webcal.'</tr>';
+            if (!$this->club_link) $this->club_link = $this->get_link('club', $team->clubUrlSlug);
+        }
+        if (!$this->filter_match) $html .= '<tr><td colspan='.$colspan.'>No teams found</td></tr>';
+        $html .= '</tbody></table><div class="gms-footnote">'.($this->club_link ? sprintf(esc_html__( '[Club %1$s%3$s also found at%4$s %2$s]', 'eh-gms-feed' ), 'teams', '<a href="'.$this->club_link.'" target="_blank">England Hockey Link</a>', '<span class="gms-nomobile">', '</span>') : '').'</div>';
+        return $html;
+    }
+    private function process_fixture($data) {
+        $html = '<div class="gms-list">';
+        $html .= $this->fixture_summary($data, new \DateTime($data->fixtureDate), true);
+        $html .= '</div>';
+        $html .= '<div class="gms-footnote">'.sprintf(esc_html__( '[Fixture %2$s also found at%3$s %1$s]', 'eh-gms-feed'), '<a href="'.$this->get_link('fixture', $this->id).'" target="_blank">England Hockey Link</a>', '<span class="gms-nomobile">', '</span>').'</div>';
+        return $html;
+    }
+    private function get_table() {
+        $html = '';
+        $tables = [];
+        if ($this->atts_show['show'] == 'fixture') $tables[] = 'fixture';
+        if (str_contains($this->atts_show['show'], 'league')) $tables[] = 'league';
+        if (str_contains($this->atts_show['show'], 'results')) {
+            $tables[] = (str_contains($this->atts_show['show'], 'fixtures')) ? 'combined' : 'results';
+        }
+        elseif (str_contains($this->atts_show['show'], 'fixtures')) $tables[] = 'fixtures';
+        if (str_contains($this->atts_show['show'], 'teams')) $tables[] = 'teams';
+        foreach ($tables as $table_name) {
+            $this->table_name = $table_name;
+            $this->display_name = ($table_name == 'combined') ? 'results' : $table_name;
+            $this->fixture_data = ['Date' => 'fixtureDate', 'Time' => 'fixtureTime', 'Home Team' => ['homeTeam','teamName'], 'Score' => ['homeTeamScore', 'awayTeamScore'], 'Away Team' => ['awayTeam','teamName'], 'Venue' => 'venue'];
+            if ($table_name == 'fixtures') unset($this->fixture_data['Score']);
+            if ($table_name == 'league') {
+                if ($this->atts_show['link']) $this->comp_link = $this->atts_show['link'];
+                if ($this->is_competition()) $html .= $this->get_json('competition', $this->atts_show['comp_id']);
+                else $html .= $this->multiple_teams();
+            }
+            elseif (($table_name == 'fixtures' || $table_name == 'results' || $table_name == 'combined') && $this->is_team()) {
+                if ($this->atts_show['link']) $this->team_link = $this->atts_show['link'];
+                $html .= $this->get_json('fixturesandresults', $this->atts_show['team']);
+            }
+            elseif (($table_name == 'fixtures' || $table_name == 'results' || $table_name == 'combined') && $this->is_clubwide()) {
+                if ($this->atts_show['link']) $this->club_link = $this->atts_show['link'];
+                $html .= $this->get_json('matchdays', $this->atts_show['club_id']);
+            }
+            elseif ($table_name == 'teams' && $this->is_clubwide()) {
+                if ($this->atts_show['link']) $this->club_link = $this->atts_show['link'];
+                $html .= $this->get_json('teamslist', $this->atts_show['club_id']);
+            }
+            elseif ($table_name == 'fixture' && $this->id) {
+                $this->show_list = true;
+                $html .= $this->get_json('fixture', $this->id);
+            }
+        }
+        return $html;
+    }
+    private function process_teams ($data) {
+        $teams = [];
+        foreach ($data as $team) $teams[$team->id] = ['teamName' => $team->teamName, 'clubId' => $team->clubId, 'clubName' => $team->clubName, 'slug' => $team->entityUrlSlug, 'clubSlug' => $team->clubUrlSlug, 'gender' => $team->gender, 'clubLogoUrl' => $team->clubLogoUrl ?? null];
+        return $teams;
+    }
+    private function process_teamsinclub ($data) {
+        return $this->process_teams($data);
+    }
+    private function process_compsinfixtures($data) {
+        $competitions = [];
+        // seasonId is available but season (name) is ONLY within fixtures object
+        foreach ($data as $competition) $competitions[$competition->competitionId] = ['name' => $competition->competitionName, 'slug' => $competition->competitionEntityUrlSlug];
+        return $competitions;
+    }
+    private function multiple_teams() {
+        $html = '';
+        $api = 'fixturesandresults';
+        $json_data = [];
+        $required_data = [];
+        $no_data = 0;
+        // Try the default data cache first
+        foreach ($this->multiple_teams as $teamID) {
+            $body = get_transient('eh_gms_feed '.$this->api[$api]['transient'].' '.$teamID);
+            if ($body === false) $required_data[] = $teamID;
+            else $json_data[$teamID] = $body;
+        }
+        // If Laravel then use Guzzle and do requests in parallel
+        if ($this->isLaravel) {
+            $refreshlist = collect();
+            foreach ($required_data as $teamID) {
+                $object = new \stdClass;
+                $object->api = $api;
+                $object->api_key = $teamID;
+                $refreshlist->push($object);
+            }
+            if ($refreshlist->isNotEmpty()) $this->refresh_cache($refreshlist);
+        }
+        foreach ($required_data as $teamID) {
+            $json_data[$teamID] = $this->get_json($api, $teamID, true);
+        }
+        if (!empty($json_data)) {
+            $league = [];
+            foreach ($json_data as $key => $snapshot) {
+                if ($snapshot && ($data = json_decode($snapshot)) && json_last_error() === JSON_ERROR_NONE && !empty($data)) {
+                    $teamname = $next_fixture_date = null;
+                    $gp = $gw = $gd = $gl = $gf = $ga = 0;
+                    $form = [];
+                    foreach ($data as $competition) {
+                        foreach ($competition->fixtures as $fixture) {
+                            $isHome = $fixture->homeTeamId == $key;
+                            if (!$teamname) $teamname = $isHome ? $fixture->homeTeam->teamName : $fixture->awayTeam->teamName;
+                            if ($fixture->isBye) continue;
+                            $valid_date = new \DateTime($fixture->fixtureDate);
+                            if ($fixture->isResult) {
+                                if ($fixture->status == 'Postponed' || ($fixture->homeTeamScore == 'P' && $fixture->awayTeamScore == 'P')) continue;
+                                elseif ($fixture->status == 'Cancelled' || ($fixture->homeTeamScore == 'C' && $fixture->awayTeamScore == 'C')) continue;
+                                else {
+                                    $gp++;
+                                    $gf += $isHome ? $fixture->homeTeamScoreAsInt : $fixture->awayTeamScoreAsInt;
+                                    $ga += $isHome ? $fixture->awayTeamScoreAsInt : $fixture->homeTeamScoreAsInt;
+                                    if ($fixture->homeTeamScoreAsInt == $fixture->awayTeamScoreAsInt) { $gd++; $form[] = '<span class="gms-form gms-draw">D</span>'; }
+                                    else if (($isHome && $fixture->homeTeamScoreAsInt > $fixture->awayTeamScoreAsInt) || (!$isHome && $fixture->homeTeamScoreAsInt < $fixture->awayTeamScoreAsInt)) { $gw++; $form[] = '<span class="gms-form gms-win">W</span>'; }
+                                    else { $gl++; $form[] = '<span class="gms-form gms-loss">L</span>'; }
+                                }
+                            }
+                            elseif ($this->is_beforetoday($valid_date)) continue;
+                            elseif (!$next_fixture_date || $valid_date < $next_fixture_date) $next_fixture_date = $valid_date;
+                        }
+                    }
+                    if ($teamname) {
+                        $points = $gw * 3 + $gd;
+                        $object = new \stdClass;
+                        $object->teamId = $key;
+                        $object->teamName = $teamname;
+                        $object->gamesPlayed = $gp;
+                        $object->gamesWon = $gw;
+                        $object->gamesDrawn = $gd;
+                        $object->gamesLost = $gl;
+                        $object->goalsFor = $gf;
+                        $object->goalsAgainst = $ga;
+                        $object->goalsDifference = $gf - $ga;
+                        $object->totalPoints = $points;
+                        $object->PPG = number_format($gp ? $points/$gp : 0, 2, '.', '');
+                        $object->form = $form;
+                        $league[] = $object;
+                    }
+                }
+                else $no_data++;
+            }
+            usort($league, function ($a,$b) {
+                if ($a->PPG != $b->PPG) return $a->PPG < $b->PPG ? 1 : -1;
+                if ($a->goalsDifference != $b->goalsDifference) return $a->goalsDifference < $b->goalsDifference ? 1 : -1;
+                if ($a->goalsFor != $b->goalsFor) return $a->goalsFor < $b->goalsFor ? 1 : -1;
+                if ($a->gamesWon != $b->gamesWon) return $a->gamesWon < $b->gamesWon ? 1 : -1;
+                return 0;
+            });
+            $html .= $this->process_table($league, true);
+            if ($no_data) $html .= $this->show_api_error(sprintf(esc_html__( 'Failed to retrieve data for %s of selected team(s)', 'eh-gms-feed' ), $no_data));
+        }
+        else $html .= $this->show_api_error(esc_html__( 'You have selected a custom league table without any teams', 'eh-gms-feed' ));
+        return $html;
+    }
+    private function ajax_method () {
+        wp_enqueue_script('EH_GMS_Feed');
+        $atts = '';
+        foreach ($this->args as $value) {
+            if (!empty($this->atts_show[$value])) $atts .= ' data-'.$value.'="'.esc_attr($this->atts_show[$value]).'"';
+        }
+        return '<div class="gms-wrapper gms-ajax"'.$atts.'></div>';
+        parent::__construct();
+    }
 …
+        }
         foreach (explode('+',$this->atts_show['show']) as $show) {
             if (!in_array($show,['fixtures','results','league','teams','fixture'])) {
+            if (!in_array($show, $this->valid_show)) {
                 $message = sprintf(esc_html__( 'Please enter a "show" parameter (%s) equal to "fixtures", "results", "league" or "teams".', 'eh-gms-feed' ), $show ?: 'empty');
                 $this->not_valid .= '<p>'.$message.'</p>';
 …
     public function gms_shortcode ( $atts = [] ) {
         if ($this->validate_atts($atts)) {
+            if ($this->settings->default_ajax == 'yes' || $this->atts_show['method'] == 'api-dynamic')
+                $html = $this->ajax_method ();
+            if ($this->settings->default_ajax == 'yes' || $this->atts_show['method'] == 'api-dynamic') {
+                wp_enqueue_script('EH_GMS_Feed');
+                $html_atts = '';
+                foreach ($this->args as $value) {
+                    if (!empty($this->atts_show[$value])) $html_atts .= ' data-'.$value.'="'.esc_attr($this->atts_show[$value]).'"';
+                }
+                $html = '<div class="gms-wrapper gms-ajax"'.$html_atts.'></div>';
+            }
             elseif ($this->atts_show['method'] == 'api') $html = '<div class="gms-wrapper">'.$this->get_table().'</div>';
             return $html;
 …
     public function enqueue_scripts () {
         wp_register_script('EH_GMS_Feed', plugin_dir_url(__DIR__).'js/eh-gms-feed.js', ['jquery'], '3.12', true);
+        wp_register_script('EH_GMS_Feed', plugin_dir_url(__DIR__).'js/eh-gms-feed.js', ['jquery'], '3.13', true);
         wp_localize_script('EH_GMS_Feed', 'eh_gms_feed_ajax_obj', ['ajax_url' => admin_url( 'admin-ajax.php' ), 'nonce' => wp_create_nonce('get_gms_table')]);
         wp_register_style('EH_GMS_Feed', plugin_dir_url(__DIR__).'css/gms-default.css',[],'3.12');
         if ($this->settings->default_css == 'yes') wp_enqueue_style('EH_GMS_Feed');
+    }
+}

eh-gms-feed/trunk/js/eh-gms-feed.js

r3064521	r3065987
112	112	.always(function() {
113	113	var goback = jQuery('<button type="button" class="gms-button">Go Back</button>').appendTo(detail);
114		back_btns.push ~~= goback[0]~~;
	114	back_btns.push(goback[0]);
115	115	back_btns.forEach(function (ele) {
116	116	ele.addEventListener('click', function() {

eh-gms-feed/trunk/readme.txt

-                      r3064521
+                      r3065987
 Tested up to: 6.5
 Requires PHP: 5.3
 Stable tag: 3.12
+Stable tag: 3.13
 License: GPLv2
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
 …
 == Changelog ==
+= 3.13 =
+* Fix fault with back button on fixture detail
+* Added showGender option to custom league table
 = 3.12 =

Note: See TracChangeset for help on using the changeset viewer.

Trac UI Preferences

Plugin Directory

Context Navigation

Changeset 3065987

Legend:

eh-gms-feed/tags/3.13/eh-gms-feed.php

eh-gms-feed/tags/3.13/includes/main-class.php

eh-gms-feed/tags/3.13/js/eh-gms-feed.js

eh-gms-feed/tags/3.13/readme.txt

eh-gms-feed/trunk/eh-gms-feed.php

eh-gms-feed/trunk/includes/main-class.php

eh-gms-feed/trunk/js/eh-gms-feed.js

eh-gms-feed/trunk/readme.txt

Download in other formats: