diff --git a/admin/globals/continents.php b/admin/globals/continents.php
deleted file mode 100644
index 3d1c84d4..00000000
--- a/admin/globals/continents.php
+++ /dev/null
@@ -1,14 +0,0 @@
- 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'),
- );
-}
-add_action( 'init', 'sportspress_define_continents_global' );
diff --git a/admin/globals/formats.php b/admin/globals/formats.php
deleted file mode 100644
index 6e3e97e7..00000000
--- a/admin/globals/formats.php
+++ /dev/null
@@ -1,16 +0,0 @@
- array(), 'list' => array() );
-
- $sportspress_formats['event']['league'] = __( 'League', 'sportspress' );
- $sportspress_formats['event']['friendly'] = __( 'Friendly', 'sportspress' );
-
- $sportspress_formats['calendar']['calendar'] = __( 'Calendar', 'sportspress' );
- $sportspress_formats['calendar']['list'] = __( 'List', 'sportspress' );
-
- $sportspress_formats['list']['list'] = __( 'List', 'sportspress' );
- $sportspress_formats['list']['gallery'] = __( 'Gallery', 'sportspress' );
-}
-add_action( 'init', 'sportspress_define_formats_global', 10 );
diff --git a/admin/globals/sports.php b/admin/globals/sports.php
deleted file mode 100644
index 783e455b..00000000
--- a/admin/globals/sports.php
+++ /dev/null
@@ -1,23 +0,0 @@
- 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(
@@ -206,5 +225,40 @@ function sportspress_define_countries_global() {
);
asort( $sportspress_countries );
+
+ // Formats
+ global $sportspress_formats;
+
+ $sportspress_formats = array( 'event' => array(), 'list' => array() );
+
+ $sportspress_formats['event']['league'] = __( 'League', 'sportspress' );
+ $sportspress_formats['event']['friendly'] = __( 'Friendly', 'sportspress' );
+
+ $sportspress_formats['calendar']['calendar'] = __( 'Calendar', 'sportspress' );
+ $sportspress_formats['calendar']['list'] = __( 'List', 'sportspress' );
+
+ $sportspress_formats['list']['list'] = __( 'List', 'sportspress' );
+ $sportspress_formats['list']['gallery'] = __( 'Gallery', 'sportspress' );
+
+ // Sports
+ global $sportspress_sports;
+
+ include_once dirname( SPORTSPRESS_PLUGIN_FILE ) . '/presets/sports/soccer.php';
+ include_once dirname( SPORTSPRESS_PLUGIN_FILE ) . '/presets/sports/football.php';
+ include_once dirname( SPORTSPRESS_PLUGIN_FILE ) . '/presets/sports/footy.php';
+ include_once dirname( SPORTSPRESS_PLUGIN_FILE ) . '/presets/sports/baseball.php';
+ include_once dirname( SPORTSPRESS_PLUGIN_FILE ) . '/presets/sports/basketball.php';
+ include_once dirname( SPORTSPRESS_PLUGIN_FILE ) . '/presets/sports/gaming.php';
+ include_once dirname( SPORTSPRESS_PLUGIN_FILE ) . '/presets/sports/cricket.php';
+ include_once dirname( SPORTSPRESS_PLUGIN_FILE ) . '/presets/sports/golf.php';
+ include_once dirname( SPORTSPRESS_PLUGIN_FILE ) . '/presets/sports/handball.php';
+ include_once dirname( SPORTSPRESS_PLUGIN_FILE ) . '/presets/sports/hockey.php';
+ include_once dirname( SPORTSPRESS_PLUGIN_FILE ) . '/presets/sports/racing.php';
+ include_once dirname( SPORTSPRESS_PLUGIN_FILE ) . '/presets/sports/rugby.php';
+ include_once dirname( SPORTSPRESS_PLUGIN_FILE ) . '/presets/sports/swimming.php';
+ include_once dirname( SPORTSPRESS_PLUGIN_FILE ) . '/presets/sports/tennis.php';
+ include_once dirname( SPORTSPRESS_PLUGIN_FILE ) . '/presets/sports/volleyball.php';
+
+ uasort( $sportspress_sports, 'sportspress_sort_sports' );
}
-add_action( 'init', 'sportspress_define_countries_global' );
+add_action( 'init', 'sportspress_define_globals' );
diff --git a/admin/settings/options-event.php b/admin/settings/options-event.php
index c724b28d..597a6064 100644
--- a/admin/settings/options-event.php
+++ b/admin/settings/options-event.php
@@ -1,134 +1,136 @@
options =& $sportspress_options;
+ add_action( 'admin_init', array( $this, 'page_init' ), 1 );
+ }
- $args = array(
- 'post_type' => 'sp_result',
- 'numberposts' => -1,
- 'posts_per_page' => -1,
- 'orderby' => 'menu_order',
- 'order' => 'ASC'
- );
- $data = get_posts( $args );
- ?>
-