Changeset 2968572

Timestamp:

09/19/2023 06:45:06 AM (2 years ago)

Author:

mtreherne

Message:

Release of Version 3.6

Location:

eh-gms-feed

Files:

• tags/3.6/eh-gms-feed.php (modified) (1 diff)
• tags/3.6/includes/main-class.php (modified) (4 diffs)
• tags/3.6/includes/settings.php (modified) (1 diff)
• tags/3.6/readme.txt (modified) (2 diffs)
• trunk/eh-gms-feed.php (modified) (1 diff)
• trunk/includes/main-class.php (modified) (4 diffs)
• trunk/includes/settings.php (modified) (1 diff)
• trunk/readme.txt (modified) (2 diffs)

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

@@ -4 +4 @@
  * Plugin URI: https://wordpress.org/plugins/eh-gms-feed/
  * Description: Show fixtures, results and tables from England Hockey GMS
- * Version: 3.5
+ * Version: 3.6
  * Author: Matthew Treherne
  * Author URI: https://profiles.wordpress.org/mtreherne

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

@@ -268 +268 @@
             }
             $html .= $this->process_matches($competition->fixtures);
-            if (!$this->filter_match) $html .= '<tr><td colspan="'.count($this->fixture_data).'">No '.$this->display_name.' found</td></tr>';
+            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'), $this->display_name, $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' ), $this->display_name).'</p>';
+            $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>';
     }
 
@@ -310 +310 @@
                 }
             }
-            if (!$this->filter_match) $html .= '<tr><td colspan="'.count($this->fixture_data).'">No '.$this->display_name.' found</td></tr>';
+            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' ), $this->display_name, '<a href="'.$this->club_link.'" target="_blank">England Hockey Link</a>', '<span class="gms-nomobile">', '</span>') : '').'</div>';
+            $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;
@@ -325 +325 @@
             if (!$this->club_link) $this->club_link = $this->get_link('club', $team->clubUrlSlug);
         }
-        if (!$this->filter_match) $html .= '<tr><td colspan=2>No '.$this->display_name.' 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' ), $this->display_name, '<a href="'.$this->club_link.'" target="_blank">England Hockey Link</a>', '<span class="gms-nomobile">', '</span>') : '').'</div>';
+        if (!$this->filter_match) $html .= '<tr><td colspan=2>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;
     }
@@ -341 +341 @@
         foreach ($tables as $table_name) {
             $this->table_name = $table_name;
-            $this->display_name = ($table_name == 'combined') ? 'fixtures' : $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']);

eh-gms-feed/tags/3.6/includes/settings.php

@@ -21 +21 @@
     public function __construct($basename) {
         $this->settings = get_option(self::OPTION_NAME) ?? null;
-        $this->default_ajax = $this->settings['default_ajax'] ?? null;
-        $this->default_css = $this->settings['default_css'] ?? null;
-        $this->default_transient_expiry = $this->settings['transient_expiry'] ?? null;
-        $this->default_club_id = $this->settings['club_id'] ?? null;
+        if (isset($this->settings['default_ajax'])) $this->default_ajax = $this->settings['default_ajax'];
+        if (isset($this->settings['default_css'])) $this->default_css = $this->settings['default_css'];
+        if (isset($this->settings['transient_expiry'])) $this->default_transient_expiry = $this->settings['transient_expiry'];
+        if (isset($this->settings['club_id'])) $this->default_club_id = $this->settings['club_id'];
         if (is_admin() && ( !defined( 'DOING_AJAX' ) || !DOING_AJAX ) ) {
             add_action( 'admin_init', array( $this, 'settings_init' ) );

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

@@ -5 +5 @@
 Tested up to: 6.2
 Requires PHP: 5.3
-Stable tag: 3.5
+Stable tag: 3.6
 License: GPLv2
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
@@ -63 +63 @@
 == Changelog ==
 
+= 3.6 =
+* Fix to default settings
+* Fix to class for combined fixtures and results
+
 = 3.5 =
 * Deal with previous season competition in dynamic filter

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

@@ -4 +4 @@
  * Plugin URI: https://wordpress.org/plugins/eh-gms-feed/
  * Description: Show fixtures, results and tables from England Hockey GMS
- * Version: 3.5
+ * Version: 3.6
  * Author: Matthew Treherne
  * Author URI: https://profiles.wordpress.org/mtreherne

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

@@ -268 +268 @@
             }
             $html .= $this->process_matches($competition->fixtures);
-            if (!$this->filter_match) $html .= '<tr><td colspan="'.count($this->fixture_data).'">No '.$this->display_name.' found</td></tr>';
+            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'), $this->display_name, $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' ), $this->display_name).'</p>';
+            $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>';
     }
 
@@ -310 +310 @@
                 }
             }
-            if (!$this->filter_match) $html .= '<tr><td colspan="'.count($this->fixture_data).'">No '.$this->display_name.' found</td></tr>';
+            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' ), $this->display_name, '<a href="'.$this->club_link.'" target="_blank">England Hockey Link</a>', '<span class="gms-nomobile">', '</span>') : '').'</div>';
+            $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;
@@ -325 +325 @@
             if (!$this->club_link) $this->club_link = $this->get_link('club', $team->clubUrlSlug);
         }
-        if (!$this->filter_match) $html .= '<tr><td colspan=2>No '.$this->display_name.' 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' ), $this->display_name, '<a href="'.$this->club_link.'" target="_blank">England Hockey Link</a>', '<span class="gms-nomobile">', '</span>') : '').'</div>';
+        if (!$this->filter_match) $html .= '<tr><td colspan=2>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;
     }
@@ -341 +341 @@
         foreach ($tables as $table_name) {
             $this->table_name = $table_name;
-            $this->display_name = ($table_name == 'combined') ? 'fixtures' : $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']);

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

@@ -21 +21 @@
     public function __construct($basename) {
         $this->settings = get_option(self::OPTION_NAME) ?? null;
-        $this->default_ajax = $this->settings['default_ajax'] ?? null;
-        $this->default_css = $this->settings['default_css'] ?? null;
-        $this->default_transient_expiry = $this->settings['transient_expiry'] ?? null;
-        $this->default_club_id = $this->settings['club_id'] ?? null;
+        if (isset($this->settings['default_ajax'])) $this->default_ajax = $this->settings['default_ajax'];
+        if (isset($this->settings['default_css'])) $this->default_css = $this->settings['default_css'];
+        if (isset($this->settings['transient_expiry'])) $this->default_transient_expiry = $this->settings['transient_expiry'];
+        if (isset($this->settings['club_id'])) $this->default_club_id = $this->settings['club_id'];
         if (is_admin() && ( !defined( 'DOING_AJAX' ) || !DOING_AJAX ) ) {
             add_action( 'admin_init', array( $this, 'settings_init' ) );

eh-gms-feed/trunk/readme.txt

@@ -5 +5 @@
 Tested up to: 6.2
 Requires PHP: 5.3
-Stable tag: 3.5
+Stable tag: 3.6
 License: GPLv2
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
@@ -63 +63 @@
 == Changelog ==
 
+= 3.6 =
+* Fix to default settings
+* Fix to class for combined fixtures and results
+
 = 3.5 =
 * Deal with previous season competition in dynamic filter