From e7ed4e37385225e8ba3238c19412289cc4f439d2 Mon Sep 17 00:00:00 2001 From: Brian Miyaji Date: Tue, 25 Mar 2014 17:38:05 +1100 Subject: [PATCH] Put countries in class --- admin/includes/globals.php | 220 -------------------------- admin/post-types/player.php | 10 +- includes/admin/class-sp-admin.php | 24 +-- includes/class-sp-countries.php | 249 ++++++++++++++++++++++++++++++ sportspress.php | 13 ++ templates/player-metrics.php | 6 +- 6 files changed, 278 insertions(+), 244 deletions(-) create mode 100644 includes/class-sp-countries.php diff --git a/admin/includes/globals.php b/admin/includes/globals.php index 5ec2c552..21d2e5c7 100644 --- a/admin/includes/globals.php +++ b/admin/includes/globals.php @@ -45,226 +45,6 @@ function sportspress_define_globals() { sort( $sportspress_text_options ); - // Continents - global $sportspress_continents; - - $sportspress_continents = array( - __( 'Africa', 'sportspress' ) => array('AO','BF','BI','BJ','BW','CD','CF','CG','CI','CM','CV','DJ','DZ','EG','EH','ER','ET','GA','GH','GM','GN','GQ','GW','KE','KM','LR','LS','LY','MA','MG','ML','MR','MU','MZ','NA','NE','NG','RW','SC','SD','SL','SN','SO','ST','SZ','TD','TG','TN','TZ','UG','ZA','ZM','ZW'), - __( 'Asia', 'sportspress' ) => array('AE','AF','AM','AZ','BD','BH','BN','BT','CN','CY','GE','HK','IL','IN','IQ','IR','JO','JP','KG','KH','KP','KR','KW','KZ','LA','LB','LK','MM','MN','MO','MV','MY','NP','OM','PH','PK','QA','SA','SG','TH','TJ','TM','TW','UZ','VN','YE'), - __( 'Europe', 'sportspress' ) => array('AD','AL','AT','BA','BE','BG','BY','CH','CZ','DE','DK','EE','EN','ES','FI','FR','GB','GR','HR','HU','IE','IS','IT','LI','LT','LU','LV','MC','MD','ME','MK','MT','MW','NB','NL','NO','PL','PT','RO','RS','RU','SE','SF','SI','SK','SM','TR','UA','VA','WA'), - __( 'North America', 'sportspress' ) => array('AG','BB','BS','BZ','CA','CR','CU','DM','DO','GD','GT','HN','HT','JM','KN','LC','MX','NI','PA','SV','US','VC'), - __( 'Oceania', 'sportspress' ) => array('AU','TL','FJ','FM','ID','KI','MH','NR','NZ','PG','PW','SB','TO','TV','VU','WS'), - __( 'South America', 'sportspress' ) => array('AR','BO','BR','CL','CO','EC','GY','PE','PY','SR','TT','UY','VE'), - ); - - // Countries - global $sportspress_countries; - - $sportspress_countries = array( - 'AD' => __( "Andorra", 'sportspress' ), - 'AE' => __( "United Arab Emirates", 'sportspress' ), - 'AF' => __( "Afghanistan", 'sportspress' ), - 'AG' => __( "Antigua and Barbuda", 'sportspress' ), - 'AL' => __( "Albania", 'sportspress' ), - 'AM' => __( "Armenia", 'sportspress' ), - 'AO' => __( "Angola", 'sportspress' ), - 'AR' => __( "Argentina", 'sportspress' ), - 'AT' => __( "Austria", 'sportspress' ), - 'AU' => __( "Australia", 'sportspress' ), - 'AZ' => __( "Azerbaijan", 'sportspress' ), - 'BA' => __( "Bosnia and Herzegovina", 'sportspress' ), - 'BB' => __( "Barbados", 'sportspress' ), - 'BD' => __( "Bangladesh", 'sportspress' ), - 'BE' => __( "Belgium", 'sportspress' ), - 'BF' => __( "Burkina Faso", 'sportspress' ), - 'BG' => __( "Bulgaria", 'sportspress' ), - 'BH' => __( "Bahrain", 'sportspress' ), - 'BI' => __( "Burundi", 'sportspress' ), - 'BJ' => __( "Benin", 'sportspress' ), - 'BN' => __( "Brunei", 'sportspress' ), - 'BO' => __( "Bolivia", 'sportspress' ), - 'BR' => __( "Brazil", 'sportspress' ), - 'BS' => __( "Bahamas", 'sportspress' ), - 'BT' => __( "Bhutan", 'sportspress' ), - 'BW' => __( "Botswana", 'sportspress' ), - 'BY' => __( "Belarus", 'sportspress' ), - 'BZ' => __( "Belize", 'sportspress' ), - 'CA' => __( "Canada", 'sportspress' ), - 'CD' => __( "Democratic Republic of the Congo", 'sportspress' ), - 'CF' => __( "Central African Republic", 'sportspress' ), - 'CG' => __( "Republic of the Congo", 'sportspress' ), - 'CH' => __( "Switzerland", 'sportspress' ), - 'CI' => __( "Ivory Coast", 'sportspress' ), - 'CL' => __( "Chile", 'sportspress' ), - 'CM' => __( "Cameroon", 'sportspress' ), - 'CN' => __( "China", 'sportspress' ), - 'CO' => __( "Colombia", 'sportspress' ), - 'CR' => __( "Costa Rica", 'sportspress' ), - 'CU' => __( "Cuba", 'sportspress' ), - 'CV' => __( "Cape Verde", 'sportspress' ), - 'CY' => __( "Cyprus", 'sportspress' ), - 'CZ' => __( "Czech Republic", 'sportspress' ), - 'DE' => __( "Germany", 'sportspress' ), - 'DJ' => __( "Djibouti", 'sportspress' ), - 'DK' => __( "Denmark", 'sportspress' ), - 'DM' => __( "Dominica", 'sportspress' ), - 'DO' => __( "Dominican Republic", 'sportspress' ), - 'DZ' => __( "Algeria", 'sportspress' ), - 'EC' => __( "Ecuador", 'sportspress' ), - 'EE' => __( "Estonia", 'sportspress' ), - 'EG' => __( "Egypt", 'sportspress' ), - 'EH' => __( "Western Sahara", 'sportspress' ), - 'EN' => __( "England", 'sportspress' ), - 'ER' => __( "Eritrea", 'sportspress' ), - 'ES' => __( "Spain", 'sportspress' ), - 'ET' => __( "Ethiopia", 'sportspress' ), - 'FI' => __( "Finland", 'sportspress' ), - 'FJ' => __( "Fiji", 'sportspress' ), - 'FM' => __( "Micronesia", 'sportspress' ), - 'FR' => __( "France", 'sportspress' ), - 'GA' => __( "Gabon", 'sportspress' ), - 'GB' => __( "United Kingdom", 'sportspress' ), - 'GD' => __( "Grenada", 'sportspress' ), - 'GE' => __( "Georgia", 'sportspress' ), - 'GH' => __( "Ghana", 'sportspress' ), - 'GM' => __( "Gambia", 'sportspress' ), - 'GN' => __( "Guinea", 'sportspress' ), - 'GQ' => __( "Equatorial Guinea", 'sportspress' ), - 'GR' => __( "Greece", 'sportspress' ), - 'GT' => __( "Guatemala", 'sportspress' ), - 'GW' => __( "Guinea-Bissau", 'sportspress' ), - 'GY' => __( "Guyana", 'sportspress' ), - 'HK' => __( "Hong Kong", 'sportspress' ), - 'HN' => __( "Honduras", 'sportspress' ), - 'HR' => __( "Croatia", 'sportspress' ), - 'HT' => __( "Haiti", 'sportspress' ), - 'HU' => __( "Hungary", 'sportspress' ), - 'ID' => __( "Indonesia", 'sportspress' ), - 'IE' => __( "Ireland", 'sportspress' ), - 'IL' => __( "Israel", 'sportspress' ), - 'IN' => __( "India", 'sportspress' ), - 'IQ' => __( "Iraq", 'sportspress' ), - 'IR' => __( "Iran", 'sportspress' ), - 'IS' => __( "Iceland", 'sportspress' ), - 'IT' => __( "Italy", 'sportspress' ), - 'JM' => __( "Jamaica", 'sportspress' ), - 'JO' => __( "Jordan", 'sportspress' ), - 'JP' => __( "Japan", 'sportspress' ), - 'KE' => __( "Kenya", 'sportspress' ), - 'KG' => __( "Kyrgyzstan", 'sportspress' ), - 'KH' => __( "Cambodia", 'sportspress' ), - 'KI' => __( "Kiribati", 'sportspress' ), - 'KM' => __( "Comoros", 'sportspress' ), - 'KN' => __( "Saint Kitts and Nevis", 'sportspress' ), - 'KP' => __( "North Korea", 'sportspress' ), - 'KR' => __( "South Korea", 'sportspress' ), - 'KW' => __( "Kuwait", 'sportspress' ), - 'KZ' => __( "Kazakhstan", 'sportspress' ), - 'LA' => __( "Laos", 'sportspress' ), - 'LB' => __( "Lebanon", 'sportspress' ), - 'LC' => __( "Saint Lucia", 'sportspress' ), - 'LI' => __( "Liechtenstein", 'sportspress' ), - 'LK' => __( "Sri Lanka", 'sportspress' ), - 'LR' => __( "Liberia", 'sportspress' ), - 'LS' => __( "Lesotho", 'sportspress' ), - 'LT' => __( "Lithuania", 'sportspress' ), - 'LU' => __( "Luxembourg", 'sportspress' ), - 'LV' => __( "Latvia", 'sportspress' ), - 'LY' => __( "Libya", 'sportspress' ), - 'MA' => __( "Morocco", 'sportspress' ), - 'MC' => __( "Monaco", 'sportspress' ), - 'MD' => __( "Moldova", 'sportspress' ), - 'ME' => __( "Montenegro", 'sportspress' ), - 'MG' => __( "Madagascar", 'sportspress' ), - 'MH' => __( "Marshall Islands", 'sportspress' ), - 'MK' => __( "Macedonia", 'sportspress' ), - 'ML' => __( "Mali", 'sportspress' ), - 'MM' => __( "Burma", 'sportspress' ), - 'MN' => __( "Mongolia", 'sportspress' ), - 'MO' => __( "Macau", 'sportspress' ), - 'MR' => __( "Mauritania", 'sportspress' ), - 'MT' => __( "Malta", 'sportspress' ), - 'MU' => __( "Mauritius", 'sportspress' ), - 'MV' => __( "Maldives", 'sportspress' ), - 'MW' => __( "Malawi", 'sportspress' ), - 'MX' => __( "Mexico", 'sportspress' ), - 'MY' => __( "Malaysia", 'sportspress' ), - 'MZ' => __( "Mozambique", 'sportspress' ), - 'NA' => __( "Namibia", 'sportspress' ), - 'NB' => __( "Northern Ireland", 'sportspress' ), - 'NE' => __( "Niger", 'sportspress' ), - 'NG' => __( "Nigeria", 'sportspress' ), - 'NI' => __( "Nicaragua", 'sportspress' ), - 'NL' => __( "Netherlands", 'sportspress' ), - 'NO' => __( "Norway", 'sportspress' ), - 'NP' => __( "Nepal", 'sportspress' ), - 'NR' => __( "Nauru", 'sportspress' ), - 'NZ' => __( "New Zealand", 'sportspress' ), - 'OM' => __( "Oman", 'sportspress' ), - 'PA' => __( "Panama", 'sportspress' ), - 'PE' => __( "Peru", 'sportspress' ), - 'PG' => __( "Papua New Guinea", 'sportspress' ), - 'PH' => __( "Philippines", 'sportspress' ), - 'PK' => __( "Pakistan", 'sportspress' ), - 'PL' => __( "Poland", 'sportspress' ), - 'PT' => __( "Portugal", 'sportspress' ), - 'PW' => __( "Palau", 'sportspress' ), - 'PY' => __( "Paraguay", 'sportspress' ), - 'QA' => __( "Qatar", 'sportspress' ), - 'RO' => __( "Romania", 'sportspress' ), - 'RS' => __( "Serbia", 'sportspress' ), - 'RU' => __( "Russia", 'sportspress' ), - 'RW' => __( "Rwanda", 'sportspress' ), - 'SA' => __( "Saudi Arabia", 'sportspress' ), - 'SB' => __( "Solomon Islands", 'sportspress' ), - 'SC' => __( "Seychelles", 'sportspress' ), - 'SD' => __( "Sudan", 'sportspress' ), - 'SE' => __( "Sweden", 'sportspress' ), - 'SF' => __( "Scotland", 'sportspress' ), - 'SG' => __( "Singapore", 'sportspress' ), - 'SI' => __( "Slovenia", 'sportspress' ), - 'SK' => __( "Slovakia", 'sportspress' ), - 'SL' => __( "Sierra Leone", 'sportspress' ), - 'SM' => __( "San Marino", 'sportspress' ), - 'SN' => __( "Senegal", 'sportspress' ), - 'SO' => __( "Somalia", 'sportspress' ), - 'SR' => __( "Suriname", 'sportspress' ), - 'ST' => __( "Sao Tome and Principe", 'sportspress' ), - 'SV' => __( "El Salvador", 'sportspress' ), - 'SZ' => __( "Swaziland", 'sportspress' ), - 'TD' => __( "Chad", 'sportspress' ), - 'TG' => __( "Togo", 'sportspress' ), - 'TH' => __( "Thailand", 'sportspress' ), - 'TJ' => __( "Tajikistan", 'sportspress' ), - 'TL' => __( "East Timor", 'sportspress' ), - 'TM' => __( "Turkmenistan", 'sportspress' ), - 'TN' => __( "Tunisia", 'sportspress' ), - 'TO' => __( "Tonga", 'sportspress' ), - 'TR' => __( "Turkey", 'sportspress' ), - 'TT' => __( "Trinidad and Tobago", 'sportspress' ), - 'TV' => __( "Tuvalu", 'sportspress' ), - 'TW' => __( "Taiwan", 'sportspress' ), - 'TZ' => __( "Tanzania", 'sportspress' ), - 'UA' => __( "Ukraine", 'sportspress' ), - 'UG' => __( "Uganda", 'sportspress' ), - 'US' => __( "United States", 'sportspress' ), - 'UY' => __( "Uruguay", 'sportspress' ), - 'UZ' => __( "Uzbekistan", 'sportspress' ), - 'VA' => __( "Vatican City", 'sportspress' ), - 'VC' => __( "Saint Vincent and the Grenadines", 'sportspress' ), - 'VE' => __( "Venezuela", 'sportspress' ), - 'VN' => __( "Vietnam", 'sportspress' ), - 'VU' => __( "Vanuatu", 'sportspress' ), - 'WL' => __( "Wales", 'sportspress' ), - 'WS' => __( "Samoa", 'sportspress' ), - 'YE' => __( "Yemen", 'sportspress' ), - 'ZA' => __( "South Africa", 'sportspress' ), - 'ZM' => __( "Zambia", 'sportspress' ), - 'ZW' => __( "Zimbabwe", 'sportspress' ), - ); - - asort( $sportspress_countries ); - // Formats global $sportspress_formats; diff --git a/admin/post-types/player.php b/admin/post-types/player.php index a73b3160..ad2e562e 100644 --- a/admin/post-types/player.php +++ b/admin/post-types/player.php @@ -61,15 +61,7 @@ function sportspress_player_meta_init( $post ) { } function sportspress_player_details_meta( $post ) { - global $sportspress_continents, $sportspress_countries; - - $continents = array(); - - foreach( $sportspress_continents as $continent => $codes ): - $countries = array_intersect_key( $sportspress_countries, array_flip( $codes ) ); - asort( $countries ); - $continents[ $continent ] = $countries; - endforeach; + $continents = SP()->countries->continents; $number = get_post_meta( $post->ID, 'sp_number', true ); $nationality = get_post_meta( $post->ID, 'sp_nationality', true ); diff --git a/includes/admin/class-sp-admin.php b/includes/admin/class-sp-admin.php index 462f9345..8edbc3aa 100644 --- a/includes/admin/class-sp-admin.php +++ b/includes/admin/class-sp-admin.php @@ -22,7 +22,7 @@ class SP_Admin { add_action( 'current_screen', array( $this, 'conditonal_includes' ) ); add_action( 'admin_init', array( $this, 'prevent_admin_access' ) ); // add_action( 'admin_init', array( $this, 'preview_emails' ) ); -// add_action( 'admin_footer', 'wc_print_js', 25 ); +// add_action( 'admin_footer', 'sp_print_js', 25 ); } /** @@ -30,25 +30,25 @@ class SP_Admin { */ public function includes() { // Functions -// include_once( 'wc-admin-functions.php' ); -// include_once( 'wc-meta-box-functions.php' ); +// include_once( 'sp-admin-functions.php' ); +// include_once( 'sp-meta-box-functions.php' ); // Classes -// include_once( 'class-wc-admin-post-types.php' ); -// include_once( 'class-wc-admin-taxonomies.php' ); +// include_once( 'class-sp-admin-post-types.php' ); +// include_once( 'class-sp-admin-taxonomies.php' ); // Classes we only need if the ajax is not-ajax if ( ! is_ajax() ) { -// include( 'class-wc-admin-menus.php' ); -// include( 'class-wc-admin-welcome.php' ); -// include( 'class-wc-admin-notices.php' ); -// include( 'class-wc-admin-assets.php' ); -// include( 'class-wc-admin-permalink-settings.php' ); -// include( 'class-wc-admin-editor.php' ); +// include( 'class-sp-admin-menus.php' ); +// include( 'class-sp-admin-welcome.php' ); +// include( 'class-sp-admin-notices.php' ); +// include( 'class-sp-admin-assets.php' ); +// include( 'class-sp-admin-permalink-settings.php' ); +// include( 'class-sp-admin-editor.php' ); // Help // if ( apply_filters( 'sportspress_enable_admin_help_tab', true ) ) -// include( 'class-wc-admin-help.php' ); +// include( 'class-sp-admin-help.php' ); } // Importers diff --git a/includes/class-sp-countries.php b/includes/class-sp-countries.php new file mode 100644 index 00000000..fabcd1ea --- /dev/null +++ b/includes/class-sp-countries.php @@ -0,0 +1,249 @@ + array('AO','BF','BI','BJ','BW','CD','CF','CG','CI','CM','CV','DJ','DZ','EG','EH','ER','ET','GA','GH','GM','GN','GQ','GW','KE','KM','LR','LS','LY','MA','MG','ML','MR','MU','MZ','NA','NE','NG','RW','SC','SD','SL','SN','SO','ST','SZ','TD','TG','TN','TZ','UG','ZA','ZM','ZW'), + __( 'Asia', 'sportspress' ) => array('AE','AF','AM','AZ','BD','BH','BN','BT','CN','CY','GE','HK','IL','IN','IQ','IR','JO','JP','KG','KH','KP','KR','KW','KZ','LA','LB','LK','MM','MN','MO','MV','MY','NP','OM','PH','PK','QA','SA','SG','TH','TJ','TM','TW','UZ','VN','YE'), + __( 'Europe', 'sportspress' ) => array('AD','AL','AT','BA','BE','BG','BY','CH','CZ','DE','DK','EE','EN','ES','FI','FR','GB','GR','HR','HU','IE','IS','IT','LI','LT','LU','LV','MC','MD','ME','MK','MT','MW','NB','NL','NO','PL','PT','RO','RS','RU','SE','SF','SI','SK','SM','TR','UA','VA','WA'), + __( 'North America', 'sportspress' ) => array('AG','BB','BS','BZ','CA','CR','CU','DM','DO','GD','GT','HN','HT','JM','KN','LC','MX','NI','PA','SV','US','VC'), + __( 'Oceania', 'sportspress' ) => array('AU','TL','FJ','FM','ID','KI','MH','NR','NZ','PG','PW','SB','TO','TV','VU','WS'), + __( 'South America', 'sportspress' ) => array('AR','BO','BR','CL','CO','EC','GY','PE','PY','SR','TT','UY','VE'), + ); + + $this->countries = apply_filters( 'sportspress_countries', array( + 'AD' => __( "Andorra", 'sportspress' ), + 'AE' => __( "United Arab Emirates", 'sportspress' ), + 'AF' => __( "Afghanistan", 'sportspress' ), + 'AG' => __( "Antigua and Barbuda", 'sportspress' ), + 'AL' => __( "Albania", 'sportspress' ), + 'AM' => __( "Armenia", 'sportspress' ), + 'AO' => __( "Angola", 'sportspress' ), + 'AR' => __( "Argentina", 'sportspress' ), + 'AT' => __( "Austria", 'sportspress' ), + 'AU' => __( "Australia", 'sportspress' ), + 'AZ' => __( "Azerbaijan", 'sportspress' ), + 'BA' => __( "Bosnia and Herzegovina", 'sportspress' ), + 'BB' => __( "Barbados", 'sportspress' ), + 'BD' => __( "Bangladesh", 'sportspress' ), + 'BE' => __( "Belgium", 'sportspress' ), + 'BF' => __( "Burkina Faso", 'sportspress' ), + 'BG' => __( "Bulgaria", 'sportspress' ), + 'BH' => __( "Bahrain", 'sportspress' ), + 'BI' => __( "Burundi", 'sportspress' ), + 'BJ' => __( "Benin", 'sportspress' ), + 'BN' => __( "Brunei", 'sportspress' ), + 'BO' => __( "Bolivia", 'sportspress' ), + 'BR' => __( "Brazil", 'sportspress' ), + 'BS' => __( "Bahamas", 'sportspress' ), + 'BT' => __( "Bhutan", 'sportspress' ), + 'BW' => __( "Botswana", 'sportspress' ), + 'BY' => __( "Belarus", 'sportspress' ), + 'BZ' => __( "Belize", 'sportspress' ), + 'CA' => __( "Canada", 'sportspress' ), + 'CD' => __( "Democratic Republic of the Congo", 'sportspress' ), + 'CF' => __( "Central African Republic", 'sportspress' ), + 'CG' => __( "Republic of the Congo", 'sportspress' ), + 'CH' => __( "Switzerland", 'sportspress' ), + 'CI' => __( "Ivory Coast", 'sportspress' ), + 'CL' => __( "Chile", 'sportspress' ), + 'CM' => __( "Cameroon", 'sportspress' ), + 'CN' => __( "China", 'sportspress' ), + 'CO' => __( "Colombia", 'sportspress' ), + 'CR' => __( "Costa Rica", 'sportspress' ), + 'CU' => __( "Cuba", 'sportspress' ), + 'CV' => __( "Cape Verde", 'sportspress' ), + 'CY' => __( "Cyprus", 'sportspress' ), + 'CZ' => __( "Czech Republic", 'sportspress' ), + 'DE' => __( "Germany", 'sportspress' ), + 'DJ' => __( "Djibouti", 'sportspress' ), + 'DK' => __( "Denmark", 'sportspress' ), + 'DM' => __( "Dominica", 'sportspress' ), + 'DO' => __( "Dominican Republic", 'sportspress' ), + 'DZ' => __( "Algeria", 'sportspress' ), + 'EC' => __( "Ecuador", 'sportspress' ), + 'EE' => __( "Estonia", 'sportspress' ), + 'EG' => __( "Egypt", 'sportspress' ), + 'EH' => __( "Western Sahara", 'sportspress' ), + 'EN' => __( "England", 'sportspress' ), + 'ER' => __( "Eritrea", 'sportspress' ), + 'ES' => __( "Spain", 'sportspress' ), + 'ET' => __( "Ethiopia", 'sportspress' ), + 'FI' => __( "Finland", 'sportspress' ), + 'FJ' => __( "Fiji", 'sportspress' ), + 'FM' => __( "Micronesia", 'sportspress' ), + 'FR' => __( "France", 'sportspress' ), + 'GA' => __( "Gabon", 'sportspress' ), + 'GB' => __( "United Kingdom", 'sportspress' ), + 'GD' => __( "Grenada", 'sportspress' ), + 'GE' => __( "Georgia", 'sportspress' ), + 'GH' => __( "Ghana", 'sportspress' ), + 'GM' => __( "Gambia", 'sportspress' ), + 'GN' => __( "Guinea", 'sportspress' ), + 'GQ' => __( "Equatorial Guinea", 'sportspress' ), + 'GR' => __( "Greece", 'sportspress' ), + 'GT' => __( "Guatemala", 'sportspress' ), + 'GW' => __( "Guinea-Bissau", 'sportspress' ), + 'GY' => __( "Guyana", 'sportspress' ), + 'HK' => __( "Hong Kong", 'sportspress' ), + 'HN' => __( "Honduras", 'sportspress' ), + 'HR' => __( "Croatia", 'sportspress' ), + 'HT' => __( "Haiti", 'sportspress' ), + 'HU' => __( "Hungary", 'sportspress' ), + 'ID' => __( "Indonesia", 'sportspress' ), + 'IE' => __( "Ireland", 'sportspress' ), + 'IL' => __( "Israel", 'sportspress' ), + 'IN' => __( "India", 'sportspress' ), + 'IQ' => __( "Iraq", 'sportspress' ), + 'IR' => __( "Iran", 'sportspress' ), + 'IS' => __( "Iceland", 'sportspress' ), + 'IT' => __( "Italy", 'sportspress' ), + 'JM' => __( "Jamaica", 'sportspress' ), + 'JO' => __( "Jordan", 'sportspress' ), + 'JP' => __( "Japan", 'sportspress' ), + 'KE' => __( "Kenya", 'sportspress' ), + 'KG' => __( "Kyrgyzstan", 'sportspress' ), + 'KH' => __( "Cambodia", 'sportspress' ), + 'KI' => __( "Kiribati", 'sportspress' ), + 'KM' => __( "Comoros", 'sportspress' ), + 'KN' => __( "Saint Kitts and Nevis", 'sportspress' ), + 'KP' => __( "North Korea", 'sportspress' ), + 'KR' => __( "South Korea", 'sportspress' ), + 'KW' => __( "Kuwait", 'sportspress' ), + 'KZ' => __( "Kazakhstan", 'sportspress' ), + 'LA' => __( "Laos", 'sportspress' ), + 'LB' => __( "Lebanon", 'sportspress' ), + 'LC' => __( "Saint Lucia", 'sportspress' ), + 'LI' => __( "Liechtenstein", 'sportspress' ), + 'LK' => __( "Sri Lanka", 'sportspress' ), + 'LR' => __( "Liberia", 'sportspress' ), + 'LS' => __( "Lesotho", 'sportspress' ), + 'LT' => __( "Lithuania", 'sportspress' ), + 'LU' => __( "Luxembourg", 'sportspress' ), + 'LV' => __( "Latvia", 'sportspress' ), + 'LY' => __( "Libya", 'sportspress' ), + 'MA' => __( "Morocco", 'sportspress' ), + 'MC' => __( "Monaco", 'sportspress' ), + 'MD' => __( "Moldova", 'sportspress' ), + 'ME' => __( "Montenegro", 'sportspress' ), + 'MG' => __( "Madagascar", 'sportspress' ), + 'MH' => __( "Marshall Islands", 'sportspress' ), + 'MK' => __( "Macedonia", 'sportspress' ), + 'ML' => __( "Mali", 'sportspress' ), + 'MM' => __( "Burma", 'sportspress' ), + 'MN' => __( "Mongolia", 'sportspress' ), + 'MO' => __( "Macau", 'sportspress' ), + 'MR' => __( "Mauritania", 'sportspress' ), + 'MT' => __( "Malta", 'sportspress' ), + 'MU' => __( "Mauritius", 'sportspress' ), + 'MV' => __( "Maldives", 'sportspress' ), + 'MW' => __( "Malawi", 'sportspress' ), + 'MX' => __( "Mexico", 'sportspress' ), + 'MY' => __( "Malaysia", 'sportspress' ), + 'MZ' => __( "Mozambique", 'sportspress' ), + 'NA' => __( "Namibia", 'sportspress' ), + 'NB' => __( "Northern Ireland", 'sportspress' ), + 'NE' => __( "Niger", 'sportspress' ), + 'NG' => __( "Nigeria", 'sportspress' ), + 'NI' => __( "Nicaragua", 'sportspress' ), + 'NL' => __( "Netherlands", 'sportspress' ), + 'NO' => __( "Norway", 'sportspress' ), + 'NP' => __( "Nepal", 'sportspress' ), + 'NR' => __( "Nauru", 'sportspress' ), + 'NZ' => __( "New Zealand", 'sportspress' ), + 'OM' => __( "Oman", 'sportspress' ), + 'PA' => __( "Panama", 'sportspress' ), + 'PE' => __( "Peru", 'sportspress' ), + 'PG' => __( "Papua New Guinea", 'sportspress' ), + 'PH' => __( "Philippines", 'sportspress' ), + 'PK' => __( "Pakistan", 'sportspress' ), + 'PL' => __( "Poland", 'sportspress' ), + 'PT' => __( "Portugal", 'sportspress' ), + 'PW' => __( "Palau", 'sportspress' ), + 'PY' => __( "Paraguay", 'sportspress' ), + 'QA' => __( "Qatar", 'sportspress' ), + 'RO' => __( "Romania", 'sportspress' ), + 'RS' => __( "Serbia", 'sportspress' ), + 'RU' => __( "Russia", 'sportspress' ), + 'RW' => __( "Rwanda", 'sportspress' ), + 'SA' => __( "Saudi Arabia", 'sportspress' ), + 'SB' => __( "Solomon Islands", 'sportspress' ), + 'SC' => __( "Seychelles", 'sportspress' ), + 'SD' => __( "Sudan", 'sportspress' ), + 'SE' => __( "Sweden", 'sportspress' ), + 'SF' => __( "Scotland", 'sportspress' ), + 'SG' => __( "Singapore", 'sportspress' ), + 'SI' => __( "Slovenia", 'sportspress' ), + 'SK' => __( "Slovakia", 'sportspress' ), + 'SL' => __( "Sierra Leone", 'sportspress' ), + 'SM' => __( "San Marino", 'sportspress' ), + 'SN' => __( "Senegal", 'sportspress' ), + 'SO' => __( "Somalia", 'sportspress' ), + 'SR' => __( "Suriname", 'sportspress' ), + 'ST' => __( "Sao Tome and Principe", 'sportspress' ), + 'SV' => __( "El Salvador", 'sportspress' ), + 'SZ' => __( "Swaziland", 'sportspress' ), + 'TD' => __( "Chad", 'sportspress' ), + 'TG' => __( "Togo", 'sportspress' ), + 'TH' => __( "Thailand", 'sportspress' ), + 'TJ' => __( "Tajikistan", 'sportspress' ), + 'TL' => __( "East Timor", 'sportspress' ), + 'TM' => __( "Turkmenistan", 'sportspress' ), + 'TN' => __( "Tunisia", 'sportspress' ), + 'TO' => __( "Tonga", 'sportspress' ), + 'TR' => __( "Turkey", 'sportspress' ), + 'TT' => __( "Trinidad and Tobago", 'sportspress' ), + 'TV' => __( "Tuvalu", 'sportspress' ), + 'TW' => __( "Taiwan", 'sportspress' ), + 'TZ' => __( "Tanzania", 'sportspress' ), + 'UA' => __( "Ukraine", 'sportspress' ), + 'UG' => __( "Uganda", 'sportspress' ), + 'US' => __( "United States", 'sportspress' ), + 'UY' => __( "Uruguay", 'sportspress' ), + 'UZ' => __( "Uzbekistan", 'sportspress' ), + 'VA' => __( "Vatican City", 'sportspress' ), + 'VC' => __( "Saint Vincent and the Grenadines", 'sportspress' ), + 'VE' => __( "Venezuela", 'sportspress' ), + 'VN' => __( "Vietnam", 'sportspress' ), + 'VU' => __( "Vanuatu", 'sportspress' ), + 'WL' => __( "Wales", 'sportspress' ), + 'WS' => __( "Samoa", 'sportspress' ), + 'YE' => __( "Yemen", 'sportspress' ), + 'ZA' => __( "South Africa", 'sportspress' ), + 'ZM' => __( "Zambia", 'sportspress' ), + 'ZW' => __( "Zimbabwe", 'sportspress' ), + )); + + foreach( $continents as $continent => $codes ): + $countries = array_intersect_key( $this->countries, array_flip( $codes ) ); + asort( $countries ); + $continents[ $continent ] = $countries; + endforeach; + + $this->continents = apply_filters( 'sportspress_continents', $continents ); + } +} diff --git a/sportspress.php b/sportspress.php index 08303001..dd88f049 100644 --- a/sportspress.php +++ b/sportspress.php @@ -215,6 +215,16 @@ final class SportsPress { // Post types include_once( 'includes/class-sp-post-types.php' ); // Registers post types + // Include abstract classes +// include_once( 'includes/abstracts/abstract-sp-product.php' ); // Products +// include_once( 'includes/abstracts/abstract-sp-settings-api.php' ); // Settings API (for gateways, shipping, and integrations) +// include_once( 'includes/abstracts/abstract-sp-shipping-method.php' ); // A Shipping method +// include_once( 'includes/abstracts/abstract-sp-payment-gateway.php' ); // A Payment gateway +// include_once( 'includes/abstracts/abstract-sp-integration.php' ); // An integration with a service + + // Classes (used on all pages) + include_once( 'includes/class-sp-countries.php' ); // Defines continents and countries + // Terms include_once( 'admin/terms/venue.php' ); @@ -298,6 +308,9 @@ final class SportsPress { // Set up localisation $this->load_plugin_textdomain(); + // Load class instances + $this->countries = new SP_Countries(); // Countries class + // Init action do_action( 'sportspress_init' ); } diff --git a/templates/player-metrics.php b/templates/player-metrics.php index 82973632..d67e3b28 100644 --- a/templates/player-metrics.php +++ b/templates/player-metrics.php @@ -2,8 +2,6 @@ if ( ! isset( $id ) ) $id = get_the_ID(); -global $sportspress_countries; - global $sportspress_options; $defaults = array( @@ -12,6 +10,8 @@ $defaults = array( extract( $defaults, EXTR_SKIP ); +$countries = SP()->countries->countries; + $nationality = get_post_meta( $id, 'sp_nationality', true ); $current_team = get_post_meta( $id, 'sp_current_team', true ); $past_teams = get_post_meta( $id, 'sp_past_team', false ); @@ -19,7 +19,7 @@ $metrics = sportspress_get_player_metrics_data( $id ); $common = array(); if ( $nationality ): - $country_name = sportspress_array_value( $sportspress_countries, $nationality, null ); + $country_name = sportspress_array_value( $countries, $nationality, null ); $common[ __( 'Nationality', 'sportspress' ) ] = $country_name ? ( $show_nationality_flag ? '' . $nationality . ' ' : '' ) . $country_name : '—'; endif;