Plugin Directory

Changeset 3166632


Ignore:
Timestamp:
10/10/2024 02:21:18 PM (17 months ago)
Author:
mtreherne
Message:

Release of Version 3.18

Location:
eh-gms-feed
Files:
6 edited

Legend:

Unmodified
Added
Removed
  • eh-gms-feed/tags/3.18/eh-gms-feed.php

    r3158574 r3166632  
    44 * Plugin URI: https://wordpress.org/plugins/eh-gms-feed/
    55 * Description: Show fixtures, results and tables from England Hockey GMS
    6  * Version: 3.17
     6 * Version: 3.18
    77 * Author: Matthew Treherne
    88 * Author URI: https://profiles.wordpress.org/mtreherne
  • eh-gms-feed/tags/3.18/includes/coreAPI.php

    r3158574 r3166632  
    131131        if (str_contains($this->atts_show['show'], 'teams')) $tables[] = 'teams';
    132132        foreach ($tables as $table_name) {
    133             if ($this->api_error) break;
     133            $result = '';
    134134            $this->table_name = $table_name;
    135135            $this->display_name = ($table_name == 'combined') ? 'results' : $table_name;
     
    138138            if ($table_name == 'league') {
    139139                if ($this->atts_show['link']) $this->comp_link = $this->atts_show['link'];
    140                 if ($this->is_competition()) $html .= $this->get_json('competition', $this->atts_show['comp_id']);
    141                 else $html .= $this->multiple_teams();
     140                if ($this->is_competition()) $result = $this->get_json('competition', $this->atts_show['comp_id']);
     141                else $result = $this->multiple_teams();
    142142            }
    143143            elseif (($table_name == 'fixtures' || $table_name == 'results' || $table_name == 'combined') && $this->is_team()) {
    144144                if ($this->atts_show['link']) $this->team_link = $this->atts_show['link'];
    145                 $html .= $this->get_json('fixturesandresults', $this->atts_show['team']);
     145                $result = $this->get_json('fixturesandresults', $this->atts_show['team']);
    146146            }
    147147            elseif (($table_name == 'fixtures' || $table_name == 'results' || $table_name == 'combined') && $this->is_clubwide()) {
    148148                if ($this->atts_show['link']) $this->club_link = $this->atts_show['link'];
    149                 $html .= $this->get_json('matchdays', $this->atts_show['club_id']);
     149                $result = $this->get_json('matchdays', $this->atts_show['club_id']);
    150150            }
    151151            elseif ($table_name == 'teams' && $this->is_clubwide()) {
    152152                if ($this->atts_show['link']) $this->club_link = $this->atts_show['link'];
    153                 $html .= $this->get_json('teamslist', $this->atts_show['club_id']);
     153                $result = $this->get_json('teamslist', $this->atts_show['club_id']);
    154154            }
    155155            elseif ($table_name == 'fixture' && $this->id) {
    156156                $this->show_list = true;
    157                 $html .= $this->get_json('fixture', $this->id);
    158             }
     157                $result = $this->get_json('fixture', $this->id);
     158            }
     159            if ($this->api_error) { $html = $result; break; }
     160            else $html .= $result;
    159161        }
    160162        return $html;
     
    269271            }
    270272            switch ($player->otherRoleDescription) {
    271                 case 'Goalkeeper' : $role = ' (GK)'; break;
    272                 case 'Captain' : $role = ' (C)'; break;
     273                case 'Goalkeeper' : case 'GK' : $role = ' (GK)'; break;
     274                case 'Captain' : case 'CAPT' : $role = ' (C)'; break;
    273275                default : $role = '';
    274276            }
  • eh-gms-feed/tags/3.18/readme.txt

    r3158574 r3166632  
    55Tested up to: 6.6
    66Requires PHP: 5.3
    7 Stable tag: 3.17
     7Stable tag: 3.18
    88License: GPLv2
    99License URI: http://www.gnu.org/licenses/gpl-2.0.html
     
    6262
    6363== Changelog ==
     64
     65= 3.18 =
     66* Fix to display player role on fixture detail
     67* Technical upgrade to error handling
    6468
    6569= 3.17 =
  • eh-gms-feed/trunk/eh-gms-feed.php

    r3158574 r3166632  
    44 * Plugin URI: https://wordpress.org/plugins/eh-gms-feed/
    55 * Description: Show fixtures, results and tables from England Hockey GMS
    6  * Version: 3.17
     6 * Version: 3.18
    77 * Author: Matthew Treherne
    88 * Author URI: https://profiles.wordpress.org/mtreherne
  • eh-gms-feed/trunk/includes/coreAPI.php

    r3158574 r3166632  
    131131        if (str_contains($this->atts_show['show'], 'teams')) $tables[] = 'teams';
    132132        foreach ($tables as $table_name) {
    133             if ($this->api_error) break;
     133            $result = '';
    134134            $this->table_name = $table_name;
    135135            $this->display_name = ($table_name == 'combined') ? 'results' : $table_name;
     
    138138            if ($table_name == 'league') {
    139139                if ($this->atts_show['link']) $this->comp_link = $this->atts_show['link'];
    140                 if ($this->is_competition()) $html .= $this->get_json('competition', $this->atts_show['comp_id']);
    141                 else $html .= $this->multiple_teams();
     140                if ($this->is_competition()) $result = $this->get_json('competition', $this->atts_show['comp_id']);
     141                else $result = $this->multiple_teams();
    142142            }
    143143            elseif (($table_name == 'fixtures' || $table_name == 'results' || $table_name == 'combined') && $this->is_team()) {
    144144                if ($this->atts_show['link']) $this->team_link = $this->atts_show['link'];
    145                 $html .= $this->get_json('fixturesandresults', $this->atts_show['team']);
     145                $result = $this->get_json('fixturesandresults', $this->atts_show['team']);
    146146            }
    147147            elseif (($table_name == 'fixtures' || $table_name == 'results' || $table_name == 'combined') && $this->is_clubwide()) {
    148148                if ($this->atts_show['link']) $this->club_link = $this->atts_show['link'];
    149                 $html .= $this->get_json('matchdays', $this->atts_show['club_id']);
     149                $result = $this->get_json('matchdays', $this->atts_show['club_id']);
    150150            }
    151151            elseif ($table_name == 'teams' && $this->is_clubwide()) {
    152152                if ($this->atts_show['link']) $this->club_link = $this->atts_show['link'];
    153                 $html .= $this->get_json('teamslist', $this->atts_show['club_id']);
     153                $result = $this->get_json('teamslist', $this->atts_show['club_id']);
    154154            }
    155155            elseif ($table_name == 'fixture' && $this->id) {
    156156                $this->show_list = true;
    157                 $html .= $this->get_json('fixture', $this->id);
    158             }
     157                $result = $this->get_json('fixture', $this->id);
     158            }
     159            if ($this->api_error) { $html = $result; break; }
     160            else $html .= $result;
    159161        }
    160162        return $html;
     
    269271            }
    270272            switch ($player->otherRoleDescription) {
    271                 case 'Goalkeeper' : $role = ' (GK)'; break;
    272                 case 'Captain' : $role = ' (C)'; break;
     273                case 'Goalkeeper' : case 'GK' : $role = ' (GK)'; break;
     274                case 'Captain' : case 'CAPT' : $role = ' (C)'; break;
    273275                default : $role = '';
    274276            }
  • eh-gms-feed/trunk/readme.txt

    r3158574 r3166632  
    55Tested up to: 6.6
    66Requires PHP: 5.3
    7 Stable tag: 3.17
     7Stable tag: 3.18
    88License: GPLv2
    99License URI: http://www.gnu.org/licenses/gpl-2.0.html
     
    6262
    6363== Changelog ==
     64
     65= 3.18 =
     66* Fix to display player role on fixture detail
     67* Technical upgrade to error handling
    6468
    6569= 3.17 =
Note: See TracChangeset for help on using the changeset viewer.