Settings saved!
Error saving settings: ' + err.message + '
API credentials not configured. Please configure Username and Password.
API Base URL not configured.
Settings saved and connection test successful!
' + errorMsg + details + '
API URL not reachable: ' + apiUrl + '
Settings saved! The plugin will automatically refresh API tokens as needed.
' . __('How long to cache match data in seconds (10-300)', 'swi_foot_matchdata') . '
'; } + public function language_render() + { + $language = get_option('swi_foot_api_language', '1'); + echo ''; + echo '' . __('Select the language for API responses (German, French, or Italian)', 'swi_foot_matchdata') . '
'; + } + public function admin_scripts($hook) { if ($hook === 'settings_page_swiss-football-matchdata') { @@ -248,23 +261,21 @@ class Swi_Foot_Admin-
' . - sprintf(__('Error loading teams: %s', 'swi_foot_matchdata'), $teams->get_error_message()) . + sprintf( + /* translators: %s is the error message from the API */ + __('Error loading teams: %s', 'swi_foot_matchdata'), + $teams->get_error_message() + ) . '
'; return; } @@ -357,7 +372,12 @@ class Swi_Foot_Admin $cache_count = is_array($keys) ? count($keys) : 0; $cache_duration = get_option('swi_foot_match_cache_duration', 30); - echo '' . sprintf(__('Currently caching %d match records with %d second cache duration.', 'swi_foot_matchdata'), $cache_count, $cache_duration) . '
'; + echo '' . sprintf( + /* translators: %1$d is the number of cached match records, %2$d is the cache duration in seconds */ + __('Currently caching %1$d match records with %2$d second cache duration.', 'swi_foot_matchdata'), + $cache_count, + $cache_duration + ) . '
'; if ($cache_count > 0) { $timestamps = array(); @@ -460,7 +480,5 @@ class Swi_Foot_Admin \ No newline at end of file diff --git a/includes/class-swi-foot-api.php b/includes/class-swi-foot-api.php index 3c93248..5a28aa7 100644 --- a/includes/class-swi-foot-api.php +++ b/includes/class-swi-foot-api.php @@ -9,6 +9,7 @@ class Swi_Foot_API private $verein_id; private $season_id; private $cache_duration; + private $language; public function __construct() { @@ -18,6 +19,7 @@ class Swi_Foot_API $this->verein_id = get_option('swi_foot_verein_id'); $this->season_id = get_option('swi_foot_season_id', date('Y')); $this->cache_duration = get_option('swi_foot_match_cache_duration', 30); + $this->language = get_option('swi_foot_api_language', '1'); // AJAX actions were migrated to REST endpoints (see includes/class-swi-foot-rest.php) @@ -176,6 +178,7 @@ class Swi_Foot_API $response = wp_remote_get($url, array( 'headers' => array( 'X-User-Token' => $token, + 'X-User-Language' => $this->language, 'Content-Type' => 'application/json' ), 'timeout' => 30 @@ -204,7 +207,13 @@ class Swi_Foot_API if ($response_code !== 200) { $body_debug = wp_remote_retrieve_body($response); error_log('Swiss Football API: Request to ' . $url . ' returned ' . $response_code . ' - body: ' . substr($body_debug, 0, 1000)); - return new WP_Error('api_error', 'API request failed with code ' . $response_code); + + // Handle 406 Not Acceptable - data not yet available + if ($response_code === 406) { + return new WP_Error('data_not_available', 'Data not yet available', array('status_code' => 406)); + } + + return new WP_Error('api_error', 'API request failed with code ' . $response_code, array('status_code' => $response_code)); } $body = wp_remote_retrieve_body($response); @@ -348,6 +357,11 @@ class Swi_Foot_API return $this->api_request('/api/match/' . $match_id . '/events'); } + public function get_match_referees($match_id) + { + return $this->api_request('/api/match/' . $match_id . '/referees'); + } + public function get_team_picture($team_id) { // Special handling for team picture endpoint which returns 200 with data or 204 No Content @@ -364,6 +378,7 @@ class Swi_Foot_API $response = wp_remote_get($url, array( 'headers' => array( 'X-User-Token' => $token, + 'X-User-Language' => $this->language, 'Content-Type' => 'application/json' ), 'timeout' => 30 @@ -410,9 +425,9 @@ class Swi_Foot_API return $body; } - public function get_commons_ids() + public function get_common_ids($params = array()) { - return $this->api_request('/api/commons/ids'); + return $this->api_request('/api/common/ids', $params); } /** @@ -441,17 +456,54 @@ class Swi_Foot_API */ public function test_connection() { - // Actually test the connection by making an API request - $result = $this->api_request('/api/teams', array('vereinId' => $this->verein_id)); - - // Check if the request was successful (not an error) - if (is_wp_error($result)) { - error_log('Swiss Football API: Connection test failed - ' . $result->get_error_message()); - return false; + // First, check if credentials are configured + if (empty($this->username) || empty($this->password)) { + return array( + 'success' => false, + 'error' => 'API credentials not configured', + 'details' => 'Please configure API Username and Password in Settings → Swiss Football' + ); + } + + // Check if Verein ID is configured + if (empty($this->verein_id)) { + return array( + 'success' => false, + 'error' => 'Verein ID (Club ID) not configured', + 'details' => 'Please configure Verein ID in Settings → Swiss Football' + ); } - // Verify we got a response (array means success) - return is_array($result); + // Test connection using the /api/common/ids endpoint with required parameters + $result = $this->get_common_ids(array( + 'ClubId' => $this->verein_id, + 'Language' => 1 // 1 = German + )); + + if (is_wp_error($result)) { + $error_msg = $result->get_error_message(); + error_log('Swiss Football API: Connection test failed - ' . $error_msg); + + return array( + 'success' => false, + 'error' => 'API connection failed', + 'details' => $error_msg + ); + } + + if (!is_array($result)) { + return array( + 'success' => false, + 'error' => 'Invalid API response', + 'details' => 'The API returned unexpected data format' + ); + } + + return array( + 'success' => true, + 'error' => null, + 'details' => 'Connection successful!' + ); } public function get_current_match($team_id) diff --git a/includes/class-swi-foot-blocks.php b/includes/class-swi-foot-blocks.php index 6771cc1..8759e85 100644 --- a/includes/class-swi-foot-blocks.php +++ b/includes/class-swi-foot-blocks.php @@ -17,6 +17,23 @@ class Swi_Foot_Blocks public function register_blocks() { + // Register custom block category for Swiss Football blocks + add_filter('block_categories_all', function($categories) { + // Check if category already exists + foreach ($categories as $cat) { + if ($cat['slug'] === 'swi-football') { + return $categories; // Already registered + } + } + // Add custom category with translated label + $categories[] = array( + 'slug' => 'swi-football', + 'title' => __('Swiss Football', 'swi_foot_matchdata'), + 'icon' => 'soccer' + ); + return $categories; + }); + // Register blocks from metadata (block.json) and provide server-side render callbacks $base = dirname(__DIR__) . '/blocks'; @@ -90,14 +107,6 @@ class Swi_Foot_Blocks ) ); } - // Register additional blocks (editor-only save shortcodes) - if ( file_exists( $base . '/team-data/block.json' ) ) { - register_block_type_from_metadata( $base . '/team-data', array( - 'editor_script' => 'swi-foot-editor-blocks', - 'editor_style' => 'swi-foot-editor-styles' - ) ); - } - if ( file_exists( $base . '/match-roster/block.json' ) ) { register_block_type_from_metadata( $base . '/match-roster', array( 'render_callback' => array( $this, 'render_match_roster_block' ), @@ -113,6 +122,22 @@ class Swi_Foot_Blocks 'editor_style' => 'swi-foot-editor-styles' ) ); } + + if ( file_exists( $base . '/match-bench/block.json' ) ) { + register_block_type_from_metadata( $base . '/match-bench', array( + 'render_callback' => array( $this, 'render_match_bench_block' ), + 'editor_script' => 'swi-foot-editor-blocks', + 'editor_style' => 'swi-foot-editor-styles' + ) ); + } + + if ( file_exists( $base . '/match-referees/block.json' ) ) { + register_block_type_from_metadata( $base . '/match-referees', array( + 'render_callback' => array( $this, 'render_match_referees_block' ), + 'editor_script' => 'swi-foot-editor-blocks', + 'editor_style' => 'swi-foot-editor-styles' + ) ); + } } public function enqueue_scripts() @@ -223,7 +248,11 @@ class Swi_Foot_Blocks if (is_wp_error($standings)) { return '{__('Team is inherited from the container context.', 'swi_foot_matchdata')}
-{__('Standings', 'swi_foot_matchdata')}
+{__('League standings inherited from team context. ✓ Data will render on the front-end.', 'swi_foot_matchdata')}
+{__('Team is inherited from the container context.', 'swi_foot_matchdata')}
{__('Schedule', 'swi_foot_matchdata')}
+{__('Team and match schedule inherited from context. ✓ Data will render on the front-end.', 'swi_foot_matchdata')}
+{__('Match Roster', 'swi_foot_matchdata')}
+{__('Team and match are inherited from the container context. ✓ Data will render on the front-end.', 'swi_foot_matchdata')}
+{__('Match Events', 'swi_foot_matchdata')}
+{__('Live match events inherited from context. ✓ Will update during match.', 'swi_foot_matchdata')}
+{__('Match is inherited from the container context.', 'swi_foot_matchdata')}
+{__('Match Bench', 'swi_foot_matchdata')}
+{__('Team bench and substitutes inherited from context. ✓ Data will render on the front-end.', 'swi_foot_matchdata')}
+{__('Match is inherited from the container context.', 'swi_foot_matchdata')}
+{__('Match Referees', 'swi_foot_matchdata')}
+{__('Match officials and referees inherited from context. ✓ Data will render on the front-end.', 'swi_foot_matchdata')}
+