Version 0.9.8

acp/all_bets_module.php

@@ -47,10 +47,8 @@ class all_bets_module
 	{
 		global $db, $auth, $phpbb_container, $phpbb_admin_path, $league_info;
 		global $template, $user, $config, $phpbb_extension_manager, $request, $phpbb_root_path, $phpEx;
-		$provider			= new \phpbb\controller\ provider();
-		$symphony_request	= new \phpbb\ symfony_request($request);
-		$filesystem			= new \phpbb\ filesystem();
-		$helper				= new \phpbb\controller\ helper($template, $user, $config, $provider, $phpbb_extension_manager, $symphony_request, $request, $filesystem, $phpbb_root_path, $phpEx);
+		
+		$helper = $phpbb_container->get('controller.helper');
 		
 		$this->tpl_name = 'acp_football_all_bets';
 		$this->page_title = 'ACP_FOOTBALL_ALL_BETS_VIEW';

acp/bank_module.php

@@ -47,10 +47,8 @@ class bank_module
 	{
 		global $db, $auth, $phpbb_container, $phpbb_admin_path, $league_info, $functions_points;
 		global $template, $user, $config, $phpbb_extension_manager, $request, $phpbb_root_path, $phpEx;
-		$provider			= new \phpbb\controller\ provider();
-		$symphony_request	= new \phpbb\ symfony_request($request);
-		$filesystem			= new \phpbb\ filesystem();
-		$helper				= new \phpbb\controller\ helper($template, $user, $config, $provider, $phpbb_extension_manager, $symphony_request, $request, $filesystem, $phpbb_root_path, $phpEx);
+		
+		$helper = $phpbb_container->get('controller.helper');
 		
 		if (!$this->config['football_bank'])
 		{

acp/bets_module.php

@@ -39,10 +39,8 @@ class bets_module
 	{
 		global $db, $auth, $phpbb_container, $phpbb_admin_path, $league_info, $functions_points;
 		global $template, $user, $config, $phpbb_extension_manager, $request, $phpbb_root_path, $phpEx;
-		$provider			= new \phpbb\controller\ provider();
-		$symphony_request	= new \phpbb\ symfony_request($request);
-		$filesystem			= new \phpbb\ filesystem();
-		$helper				= new \phpbb\controller\ helper($template, $user, $config, $provider, $phpbb_extension_manager, $symphony_request, $request, $filesystem, $phpbb_root_path, $phpEx);
+				
+		$helper = $phpbb_container->get('controller.helper');
 
 		$this->ext_football_path = $phpbb_root_path . 'ext/football/football/';
 		if(!function_exists('season_info'))

acp/extra_module.php

@@ -47,10 +47,8 @@ class extra_module
 	{
 		global $db, $auth, $phpbb_container, $phpbb_admin_path, $league_info;
 		global $template, $user, $config, $phpbb_extension_manager, $request, $phpbb_root_path, $phpEx;
-		$provider			= new \phpbb\controller\ provider();
-		$symphony_request	= new \phpbb\ symfony_request($request);
-		$filesystem			= new \phpbb\ filesystem();
-		$helper				= new \phpbb\controller\ helper($template, $user, $config, $provider, $phpbb_extension_manager, $symphony_request, $request, $filesystem, $phpbb_root_path, $phpEx);
+		
+		$helper = $phpbb_container->get('controller.helper');
 		
 		$this->tpl_name = 'acp_football_extra';
 		$this->page_title = 'ACP_FOOTBALL_EXTRA_MANAGE';

acp/football_module.php

@@ -51,10 +51,8 @@ class football_module
 	{
 		global $db, $auth, $phpbb_container, $phpbb_admin_path, $league_info, $phpbb_log;
 		global $template, $user, $config, $phpbb_extension_manager, $request, $phpbb_root_path, $phpEx;
-		$provider			= new \phpbb\controller\ provider();
-		$symphony_request	= new \phpbb\ symfony_request($request);
-		$filesystem			= new \phpbb\ filesystem();
-		$helper				= new \phpbb\controller\ helper($template, $user, $config, $provider, $phpbb_extension_manager, $symphony_request, $request, $filesystem, $phpbb_root_path, $phpEx);
+		
+		$helper = $phpbb_container->get('controller.helper');
 		
 		$user->add_lang('acp/board');
 

acp/ko_module.php

@@ -47,10 +47,8 @@ class ko_module
 	{
 		global $db, $auth, $phpbb_container, $phpbb_admin_path, $league_info;
 		global $template, $user, $config, $phpbb_extension_manager, $request, $phpbb_root_path, $phpEx;
-		$provider			= new \phpbb\controller\ provider();
-		$symphony_request	= new \phpbb\ symfony_request($request);
-		$filesystem			= new \phpbb\ filesystem();
-		$helper				= new \phpbb\controller\ helper($template, $user, $config, $provider, $phpbb_extension_manager, $symphony_request, $request, $filesystem, $phpbb_root_path, $phpEx);
+		
+		$helper = $phpbb_container->get('controller.helper');
 		
 		$this->tpl_name = 'acp_football_ko';
 		$this->page_title = 'ACP_FOOTBALL_KO_MANAGE';

acp/leagues_module.php

@@ -47,10 +47,8 @@ class leagues_module
 	{
 		global $db, $auth, $phpbb_container, $phpbb_admin_path, $league_info;
 		global $template, $user, $config, $phpbb_extension_manager, $request, $phpbb_root_path, $phpEx;
-		$provider			= new \phpbb\controller\ provider();
-		$symphony_request	= new \phpbb\ symfony_request($request);
-		$filesystem			= new \phpbb\ filesystem();
-		$helper				= new \phpbb\controller\ helper($template, $user, $config, $provider, $phpbb_extension_manager, $symphony_request, $request, $filesystem, $phpbb_root_path, $phpEx);
+		
+		$helper = $phpbb_container->get('controller.helper');
 		
 		$this->tpl_name = 'acp_football_leagues';
 		$this->page_title = 'ACP_FOOTBALL_LEAGUES_MANAGE';

acp/matchdays_module.php

@@ -47,10 +47,8 @@ class matchdays_module
 	{
 		global $db, $auth, $phpbb_container, $phpbb_admin_path, $league_info;
 		global $template, $user, $config, $phpbb_extension_manager, $request, $phpbb_root_path, $phpEx;
-		$provider			= new \phpbb\controller\ provider();
-		$symphony_request	= new \phpbb\ symfony_request($request);
-		$filesystem			= new \phpbb\ filesystem();
-		$helper				= new \phpbb\controller\ helper($template, $user, $config, $provider, $phpbb_extension_manager, $symphony_request, $request, $filesystem, $phpbb_root_path, $phpEx);
+		
+		$helper = $phpbb_container->get('controller.helper');
 		
 		$this->tpl_name = 'acp_football_matchdays';
 		$this->page_title = 'ACP_FOOTBALL_MATCHDAYS_MANAGE';

acp/matches_module.php

@@ -47,10 +47,8 @@ class matches_module
 	{
 		global $db, $auth, $phpbb_container, $phpbb_admin_path, $league_info;
 		global $template, $user, $config, $phpbb_extension_manager, $request, $phpbb_root_path, $phpEx;
-		$provider			= new \phpbb\controller\ provider();
-		$symphony_request	= new \phpbb\ symfony_request($request);
-		$filesystem			= new \phpbb\ filesystem();
-		$helper				= new \phpbb\controller\ helper($template, $user, $config, $provider, $phpbb_extension_manager, $symphony_request, $request, $filesystem, $phpbb_root_path, $phpEx);
+		
+		$helper = $phpbb_container->get('controller.helper');
 		
 		$this->tpl_name = 'acp_football_matches';
 		$this->page_title = 'ACP_FOOTBALL_MATCHES_MANAGE';

acp/results_module.php

@@ -46,10 +46,8 @@ class results_module
 	{
 		global $db, $auth, $phpbb_container, $phpbb_admin_path, $league_info, $functions_points;
 		global $template, $user, $config, $phpbb_extension_manager, $request, $phpbb_root_path, $phpEx;
-		$provider			= new \phpbb\controller\ provider();
-		$symphony_request	= new \phpbb\ symfony_request($request);
-		$filesystem			= new \phpbb\ filesystem();
-		$helper				= new \phpbb\controller\ helper($template, $user, $config, $provider, $phpbb_extension_manager, $symphony_request, $request, $filesystem, $phpbb_root_path, $phpEx);
+		
+		$helper = $phpbb_container->get('controller.helper');
 		
 		if ($phpbb_extension_manager->is_enabled('dmzx/ultimatepoints')) {
 			// Get an instance of the ultimatepoints functions_points

acp/seasons_module.php

@@ -47,10 +47,8 @@ class seasons_module
 	{
 		global $db, $auth, $phpbb_container, $phpbb_admin_path, $league_info;
 		global $template, $user, $config, $phpbb_extension_manager, $request, $phpbb_root_path, $phpEx;
-		$provider			= new \phpbb\controller\ provider();
-		$symphony_request	= new \phpbb\ symfony_request($request);
-		$filesystem			= new \phpbb\ filesystem();
-		$helper				= new \phpbb\controller\ helper($template, $user, $config, $provider, $phpbb_extension_manager, $symphony_request, $request, $filesystem, $phpbb_root_path, $phpEx);
+		
+		$helper = $phpbb_container->get('controller.helper');
 		
 		$this->tpl_name = 'acp_football_seasons';
 		$this->page_title = 'ACP_FOOTBALL_SEASONS_MANAGE';

acp/teams_module.php

@@ -37,10 +37,8 @@ class teams_module
 	{
 		global $db, $auth, $phpbb_container, $phpbb_admin_path, $league_info;
 		global $template, $user, $config, $phpbb_extension_manager, $request, $phpbb_root_path, $phpEx;
-		$provider			= new \phpbb\controller\ provider();
-		$symphony_request	= new \phpbb\ symfony_request($request);
-		$filesystem			= new \phpbb\ filesystem();
-		$helper				= new \phpbb\controller\ helper($template, $user, $config, $provider, $phpbb_extension_manager, $symphony_request, $request, $filesystem, $phpbb_root_path, $phpEx);
+		
+		$helper = $phpbb_container->get('controller.helper');
 		
 		$this->ext_football_path = $phpbb_root_path . 'ext/football/football/';
 		if(!function_exists('season_info'))

acp/update_module.php

@@ -36,10 +36,8 @@ class update_module
 	{
 		global $db, $auth, $phpbb_container, $phpbb_admin_path, $league_info, $functions_points;
 		global $template, $user, $config, $phpbb_extension_manager, $request, $phpbb_root_path, $phpEx;
-		$provider			= new \phpbb\controller\ provider();
-		$symphony_request	= new \phpbb\ symfony_request($request);
-		$filesystem			= new \phpbb\ filesystem();
-		$helper				= new \phpbb\controller\ helper($template, $user, $config, $provider, $phpbb_extension_manager, $symphony_request, $request, $filesystem, $phpbb_root_path, $phpEx);
+		
+		$helper = $phpbb_container->get('controller.helper');
 		
 		$user->add_lang_ext('football/football', 'info_acp_update');
 
@@ -90,10 +88,8 @@ class update_module
 	{
 		global $db, $auth, $phpbb_container, $phpbb_admin_path, $league_info, $functions_points, $phpbb_log;
 		global $template, $user, $config, $phpbb_extension_manager, $request, $phpbb_root_path, $phpEx, $cache;
-		$provider			= new \phpbb\controller\ provider();
-		$symphony_request	= new \phpbb\ symfony_request($request);
-		$filesystem			= new \phpbb\ filesystem();
-		$helper				= new \phpbb\controller\ helper($template, $user, $config, $provider, $phpbb_extension_manager, $symphony_request, $request, $filesystem, $phpbb_root_path, $phpEx);
+		
+		$helper = $phpbb_container->get('controller.helper');
 		
 		$this->ext_football_path = $phpbb_root_path . 'ext/football/football/';
 		if(!function_exists('season_info'))

block/delivery.php

@@ -11,13 +11,12 @@ if (!defined('IN_PHPBB') OR !defined('IN_FOOTBALL'))
 {
 	exit;
 }
-
 $data_delivery = false;
 $user_id = $user->data['user_id'];
 $lang_dates = $user->lang['datetime'];
 $index = 0;
 $local_board_time = time() + (($config['board_timezone'] - $config['football_host_timezone']) * 3600); 
-$sql = "(SELECT 
+$sql = "SELECT 
 			m.season, 
 			m.league, 
 			m.matchday,
@@ -27,19 +26,12 @@ $sql = "(SELECT
 					THEN CONCAT(m.matchday, '." . sprintf($user->lang['MATCHDAY']) . "') 
 					ELSE m.matchday_name 
 			END AS matchday_name, 
-			CONCAT(
-				CASE DATE_FORMAT(m.delivery_date,'%w')
-					WHEN 0 THEN '" . $lang_dates['Sun'] . "'
-					WHEN 1 THEN '" . $lang_dates['Mon'] . "'
-					WHEN 2 THEN '" . $lang_dates['Tue'] . "'
-					WHEN 3 THEN '" . $lang_dates['Wed'] . "'
-					WHEN 4 THEN '" . $lang_dates['Thu'] . "'
-					WHEN 5 THEN '" . $lang_dates['Fri'] . "'
-					WHEN 6 THEN '" . $lang_dates['Sat'] . "'
-					ELSE 'Error' END,
-				DATE_FORMAT(m.delivery_date,' %d.%m.%y %H:%i')
-			) as delivery_time,
-			m.delivery_date AS delivery,
+			IF(l.bet_in_time = 0, IF(ma.status = 0, m.delivery_date
+												  , IF(ma.status = -1, m.delivery_date_2
+																	 , m.delivery_date_3
+													  )
+									)
+								, ma.match_datetime) AS delivery,
 			SUM(IF(((b.goals_home = '') OR (b.goals_guest = '')), 0, 1)) AS bets_count,
 			COUNT(*) AS matches_count,
 			SUM(IF(eb.extra_no > 0, IF(eb.bet = '', 0, 1), 0)) AS extra_bets_count,
@@ -50,83 +42,9 @@ $sql = "(SELECT
 		JOIN " . FOOTB_BETS . " AS b ON (b.season = m.season AND b.league = m.league AND b.match_no = ma.match_no AND b.user_id = $user_id)
 		LEFT JOIN " . FOOTB_EXTRA . " AS e ON (e.season = m.season AND e.league = m.league AND e.matchday = m.matchday  AND e.extra_status = 0)
 		LEFT JOIN " . FOOTB_EXTRA_BETS . " AS eb ON (eb.season = m.season AND eb.league = m.league AND eb.extra_no = e.extra_no AND eb.user_id = $user_id)
-		WHERE m.delivery_date > FROM_UNIXTIME('$local_board_time') 
-			AND m.status <= 0 
-		GROUP BY m.delivery_date, m.league, b.user_id
-	) 
-	UNION
-	(SELECT 
-			m.season, 
-			m.league, 
-			m.matchday,
-			l.league_name_short, 
-			CASE m.matchday_name 
-				WHEN '' 
-					THEN CONCAT(m.matchday, '." . sprintf($user->lang['MATCHDAY']) . "') 
-					ELSE m.matchday_name 
-			END AS matchday_name, 
-			CONCAT(
-				CASE DATE_FORMAT(m.delivery_date_2,'%w')
-					WHEN 0 THEN '" . $lang_dates['Sun'] . "'
-					WHEN 1 THEN '" . $lang_dates['Mon'] . "'
-					WHEN 2 THEN '" . $lang_dates['Tue'] . "'
-					WHEN 3 THEN '" . $lang_dates['Wed'] . "'
-					WHEN 4 THEN '" . $lang_dates['Thu'] . "'
-					WHEN 5 THEN '" . $lang_dates['Fri'] . "'
-					WHEN 6 THEN '" . $lang_dates['Sat'] . "'
-					ELSE 'Error' END,
-				DATE_FORMAT(m.delivery_date_2,' %d.%m.%y %H:%i')
-			) as delivery_time,
-			m.delivery_date_2 AS delivery ,
-			SUM(IF(((b.goals_home = '') OR (b.goals_guest = '')), 0, 1)) AS bets_count,
-			COUNT(*) AS matches_count,
-			0 AS extra_bets_count,
-			0 AS extra_count
-		FROM " . FOOTB_MATCHDAYS . " AS m
-		JOIN " . FOOTB_LEAGUES . " AS l ON(l.season = m.season AND l.league = m.league)
-		JOIN " . FOOTB_MATCHES . " AS ma ON (ma.season = m.season AND ma.league = m.league AND ma.matchday = m.matchday AND ma.status = -1)
-		JOIN " . FOOTB_BETS . " AS b ON (b.season = ma.season AND b.league = ma.league AND b.match_no = ma.match_no AND b.user_id = $user_id)
-		WHERE m.delivery_date_2 > FROM_UNIXTIME('$local_board_time') 
-			AND m.status <= 0
-		GROUP BY m.delivery_date, m.league, b.user_id
-	) 
-	UNION
-	(SELECT 
-			m.season, 
-			m.league, 
-			m.matchday,
-			l.league_name_short, 
-			CASE m.matchday_name 
-				WHEN '' 
-					THEN CONCAT(m.matchday, '." . sprintf($user->lang['MATCHDAY']) . "') 
-					ELSE m.matchday_name 
-			END AS matchday_name, 
-			CONCAT(
-				CASE DATE_FORMAT(m.delivery_date_3,'%w')
-					WHEN 0 THEN '" . $lang_dates['Sun'] . "'
-					WHEN 1 THEN '" . $lang_dates['Mon'] . "'
-					WHEN 2 THEN '" . $lang_dates['Tue'] . "'
-					WHEN 3 THEN '" . $lang_dates['Wed'] . "'
-					WHEN 4 THEN '" . $lang_dates['Thu'] . "'
-					WHEN 5 THEN '" . $lang_dates['Fri'] . "'
-					WHEN 6 THEN '" . $lang_dates['Sat'] . "'
-					ELSE 'Error' END,
-				DATE_FORMAT(m.delivery_date_3,' %d.%m.%y %H:%i')
-			) as delivery_time,
-			m.delivery_date_3 AS delivery, 
-			SUM(IF(((b.goals_home = '') OR (b.goals_guest = '')), 0, 1)) AS bets_count,
-			COUNT(*) AS matches_count,
-			0 AS extra_bets_count,
-			0 AS extra_count
-		FROM " . FOOTB_MATCHDAYS . " AS m
-		JOIN " . FOOTB_LEAGUES . " AS l ON(l.season = m.season AND l.league = m.league)
-		JOIN " . FOOTB_MATCHES . " AS ma ON (ma.season = m.season AND ma.league = m.league AND ma.matchday = m.matchday AND ma.status = -2)
-		JOIN " . FOOTB_BETS . " AS b ON (b.season = ma.season AND b.league = ma.league AND b.match_no = ma.match_no AND b.user_id = $user_id)
-		WHERE m.delivery_date_3 > FROM_UNIXTIME('$local_board_time')
-			AND m.status <= 0
-		GROUP BY m.delivery_date, m.league, b.user_id
-	) 
-	ORDER BY delivery, league";
+		WHERE m.status <= 0 
+		GROUP BY delivery, m.league
+		ORDER BY delivery, m.league";
 	
 $result = $db->sql_query($sql);
 while($row = $db->sql_fetchrow($result) AND $index < 11)
@@ -142,7 +60,7 @@ while($row = $db->sql_fetchrow($result) AND $index < 11)
 		'MATCHDAY_NAME' => $row['matchday_name'],
 		'COLOR'			=> ($row['bets_count'] == $row['matches_count'] && $row['extra_bets_count'] == $row['extra_count']) ? 'green' : 'red',
 		'TITLE'			=> ($row['bets_count'] == $row['matches_count']) ? sprintf($user->lang['DELIVERY_READY']) : sprintf($user->lang['DELIVERY_NOT_READY']),
-		'DELIVERY' 		=> $row['delivery_time'],
+		'DELIVERY' 		=> $lang_dates[date("D", strtotime($row['delivery']))] . date(" d.m.y G:i", strtotime($row['delivery'])),
 		)
 	);
 }

block/last_users.php

@@ -24,6 +24,7 @@ $sql = 'SELECT s.session_user_id
 	FROM ' . USERS_TABLE . ' AS u
 	LEFT JOIN ' . SESSIONS_TABLE . ' AS s ON (u.user_id = s.session_user_id)
 	WHERE u.user_lastvisit > 0
+	AND u.user_type IN (0,3)
 	GROUP BY u.user_id 
 	ORDER BY lastvisit DESC';
 

block/my_table.php

@@ -137,7 +137,6 @@ $sql = 'SELECT
 		AND b.goals_home <> '' 
 		AND b.goals_guest <> '' 
 		AND m.matchday <= $matchday 
-		AND m.status IN (2, 3,5,6)
 	GROUP BY t.team_id
 	ORDER BY t.group_id ASC, points DESC, goals_diff DESC, goals DESC";
 	
@@ -234,7 +233,6 @@ $sql = 'SELECT
 		AND b.goals_home <> '' 
 		AND b.goals_guest <> '' 
 		AND m.matchday >= $form_from 
-		AND m.status IN (2, 3,5,6)
 	GROUP BY t.team_id
 	ORDER BY t.group_id ASC, points DESC, goals_diff DESC, goals DESC";
 	
@@ -302,7 +300,6 @@ $sql = 'SELECT
 		AND b.goals_home <> '' 
 		AND b.goals_guest <> '' 
 		AND m.matchday <= $matchday 
-		AND m.status IN (2, 3,5,6)
 	GROUP BY t.team_id
 	ORDER BY t.group_id ASC, points DESC, goals_diff DESC, goals DESC";
 	
@@ -368,7 +365,6 @@ $sql = 'SELECT
 		AND b.goals_home <> '' 
 		AND b.goals_guest <> '' 
 		AND m.matchday <= $matchday 
-		AND m.status IN (2, 3,5,6)
 	GROUP BY t.team_id
 	ORDER BY t.group_id ASC, points DESC, goals_diff DESC, goals DESC";
 	

composer.json

@@ -1,10 +1,10 @@
 {
 	"name": "football/football",
 	"type": "phpbb-extension",
-	"description": "Football Prediction League for phpBB 3.1",
+	"description": "Football Prediction League",
 	"homepage": "http://football.bplaced.net",
-	"version": "0.9.6",
-	"time": "2016-05-29",
+	"version": "0.9.8",
+	"time": "2017-02-19",
 	"license": "GPL-2.0",
 	"authors": [{
 			"name": "J. Helmke",

cron/task/football_remember.php

@@ -73,6 +73,7 @@ class football_remember extends \phpbb\cron\task\base
 		include($ext_path . 'includes/constants.' . $this->php_ext);
 
 		// Load extension language file
+		$this->user->setup();
 		$this->user->add_lang_ext('football/football', 'info_acp_football');
 
 		// mode=test ?
@@ -87,9 +88,8 @@ class football_remember extends \phpbb\cron\task\base
 
 		$season = curr_season();
 		//Matchdays to close in 24 hours and 24 hours later
-		$local_board_time = time() + (($this->config['board_timezone'] - $this->config['football_host_timezone']) * 3600); 
 		// shift days to test
-		$local_board_time = $local_board_time + ($days * 86400);
+		$local_board_time = time() + ($days * 86400);
 
 		if ($mode <> 'test')
 		{
@@ -105,13 +105,14 @@ class football_remember extends \phpbb\cron\task\base
 		}
 
 		$sql = 'SELECT
-				 m.*,
-				 l.*
-				 FROM ' . FOOTB_MATCHDAYS . ' AS m
-				 LEFT JOIN ' . FOOTB_LEAGUES . " AS l ON (l.season = m.season AND l.league = m.league)
-				 WHERE m.season >= $season AND m.status = 0 
+				m.*,
+				l.*
+				FROM ' . FOOTB_MATCHDAYS . ' AS m
+				LEFT JOIN ' . FOOTB_LEAGUES . " AS l ON (l.season = m.season AND l.league = m.league)
+				WHERE m.season >= $season AND m.status = 0 
 					AND (DATE_SUB(m.delivery_date, INTERVAL '1 23:59' DAY_MINUTE) < FROM_UNIXTIME('$local_board_time'))
-					AND (DATE_SUB(m.delivery_date, INTERVAL '1 00:00' DAY_MINUTE) > FROM_UNIXTIME('$local_board_time'))";
+					AND (DATE_SUB(m.delivery_date, INTERVAL '1 00:00' DAY_MINUTE) > FROM_UNIXTIME('$local_board_time'))
+				GROUP BY m.season, m.league, m.matchday";
 		$result = $this->db->sql_query($sql);
 		$toclose = $this->db->sql_fetchrowset($result);
 		$this->db->sql_freeresult($result);
@@ -137,12 +138,17 @@ class football_remember extends \phpbb\cron\task\base
 					u.user_id AS userid,
 					u.user_lang 
 					FROM ' . FOOTB_MATCHES . ' AS m
+					LEFT JOIN ' . FOOTB_LEAGUES . ' AS l ON (l.season = m.season AND l.league = m.league)
 					LEFT JOIN ' . FOOTB_BETS . ' AS b ON (b.season = m.season AND b.league = m.league AND b.match_no = m.match_no)
 					LEFT JOIN ' . PROFILE_FIELDS_DATA_TABLE. ' AS p ON p.user_id = b.user_id
 					LEFT JOIN ' . USERS_TABLE. " AS u ON u.user_id = b.user_id
 					WHERE m.season = $season AND m.league = $league AND m.matchday = $matchday 
 						AND ((b.goals_home = '') OR (b.goals_guest = '')) 
 						AND m.status = 0 AND p.pf_footb_rem_f = 1
+						AND (l.bet_in_time = 0 OR 
+								(l.bet_in_time = 1 
+									AND (DATE_SUB(m.match_datetime, INTERVAL '1 23:59' DAY_MINUTE) < FROM_UNIXTIME('$local_board_time'))
+									AND (DATE_SUB(m.match_datetime, INTERVAL '1 00:00' DAY_MINUTE) > FROM_UNIXTIME('$local_board_time'))))
 					GROUP BY b.user_id
 					UNION
 					SELECT
@@ -151,12 +157,17 @@ class football_remember extends \phpbb\cron\task\base
 					u.user_id AS userid,
 					u.user_lang
 					FROM " . FOOTB_MATCHES . ' AS m
+					LEFT JOIN ' . FOOTB_LEAGUES . ' AS l ON (l.season = m.season AND l.league = m.league)
 					LEFT JOIN ' . FOOTB_BETS . ' AS b ON (b.season = m.season AND b.league = m.league AND b.match_no = m.match_no)
 					LEFT JOIN ' . PROFILE_FIELDS_DATA_TABLE. ' AS p ON p.user_id = b.user_id
 					LEFT JOIN ' . USERS_TABLE. " AS u ON u.user_id = b.user_id
 					WHERE m.season = $season AND m.league = $league AND m.matchday = $matchday 
 						AND ((b.goals_home = '') OR (b.goals_guest = '')) 
 						AND m.status = 0 AND p.pf_footb_rem_s = 1
+						AND (l.bet_in_time = 0 OR 
+								(l.bet_in_time = 1 
+									AND (DATE_SUB(m.match_datetime, INTERVAL '1 23:59' DAY_MINUTE) < FROM_UNIXTIME('$local_board_time'))
+									AND (DATE_SUB(m.match_datetime, INTERVAL '1 00:00' DAY_MINUTE) > FROM_UNIXTIME('$local_board_time'))))
 					GROUP BY b.user_id
 					";
 			$result = $this->db->sql_query($sql);

includes/functions.php

@@ -934,14 +934,20 @@ function set_bet_in_time_delivery($season, $league)
 function curr_season()
 {
 	global $db, $lang, $user;
-	$curr_user = $user->data['user_id'];
+	$user_spec = '';
+	if ($user->data['user_type']==0 OR $user->data['user_type']==3)
+	{
+		$curr_user = $user->data['user_id'];
+		$user_spec = 'AND b.user_id = ' . $curr_user;
+	}
+	
 	$sql = 'SELECT DISTINCT s.season 
 			FROM  ' . FOOTB_SEASONS . '  AS s
 			INNER JOIN ' . FOOTB_LEAGUES . ' AS l ON (l.season = s.season)
 			INNER JOIN ' . FOOTB_MATCHDAYS . ' AS m ON (m.season = s.season AND m.league = l.league)
-			INNER JOIN ' . FOOTB_BETS . " AS b ON (b.season = m.season AND b.league = m.league AND b.user_id = $curr_user) 
+			INNER JOIN ' . FOOTB_BETS . ' AS b ON (b.season = m.season AND b.league = m.league ' . $user_spec . ') 
 			WHERE m.status IN (0,1,2)
-			ORDER BY s.season ASC";
+			ORDER BY s.season ASC';
 	$result = $db->sql_query($sql);
 
 	if ($row = $db->sql_fetchrow($result))
@@ -1017,13 +1023,19 @@ function first_league($season, $complete = true)
 function current_league($season)
 {
 	global $db, $lang, $user;
-	$curr_user = $user->data['user_id'];
-	$sql = 'SELECT m.league 
+	$user_spec = '';
+	if ($user->data['user_type']==0 OR $user->data['user_type']==3)
+	{
+		$curr_user = $user->data['user_id'];
+		$user_spec = 'AND b.user_id = ' . $curr_user;
+	}
+	$sql = 'SELECT DISTINCT m.league 
 			FROM ' . FOOTB_MATCHES . ' AS m  
-			INNER JOIN ' . FOOTB_BETS . " AS b ON (b.season = m.season AND b.league = m.league AND b.user_id = $curr_user)
+			INNER JOIN ' . FOOTB_BETS . ' AS b ON (b.season = m.season AND b.league = m.league ' . $user_spec . ")
 			WHERE m.season = $season 
 			AND m.status in (0,1,2)
-			ORDER BY m.match_datetime ASC";
+			ORDER BY m.match_datetime ASC
+			LIMIT 1";
 	$result = $db->sql_query($sql);
 
 	if ($row = $db->sql_fetchrow($result))
@@ -1710,7 +1722,7 @@ function get_order_team_compare($team_ary, $season, $league, $group, $ranks, $ma
 			$tmp[] = $team;
 		}
 	}
-    return $tmp;
+    return (sizeof($tmp) == 0) ? $team_ary: $tmp;
 }  
 
 /**

language/de/help_football.php

@@ -93,7 +93,8 @@ footb_rem_s = Schalter für Versand der Erinnerungsmail an die 2. E-Mail-Adresse
 		0 => 'Wie aktiviere ich die Erinnerungs-Mail Funktion?',
 		1 => 'Im Adminbereich muss unter den Tipprunden-Funktionalitäten der Cronjob für die Tipp-Erinnerungsmail aktiviert und der Termin der nächsten Ausführung gesetzt werden.<br />
 Der Cron-Job wird beim ersten Zugriff nach diesem Termin ausgeführt und sendet eine Erinnerungs-Mail für die fehlenden Tippabgaben, die im Zeitraum 24-48 Stunden nach dem Cron-Termin liegen. 
-Falls nicht ausreichend Zugriffe auf die Seite erfolgen, sollte der Cronjob automatisch z.B. von www.cronjob.de durch das Script "cron.php?cron_type=football_remember" gestartet werden.<br />
+Falls nicht ausreichend Zugriffe auf die Seite erfolgen, sollte der Cronjob automatisch z.B. von www.cronjob.de durch das Script 
+"DEINE_URL/cron.php?cron_type=football.football.cron.task.football_remember" gestartet werden.<br />
 Das versenden der Email erfolgt nur einmalig. Nach Aufruf des Cronjobs wird der nächste automatisch für den Folgetag eingeplant.
 Mit den angehängten parametern "&mode=test&days=n" kann der Versand für die um n Tage versetzte Tippabgabe getestet werden. Dabei werden nur Mails an Board-Email-Adresse versendet.'
 	),

language/de/info_acp_football.php

@@ -120,7 +120,7 @@ $lang = array_merge($lang, array(
 	'FOOTBALL_REMEMBER_ENABLE_EXPLAIN'	=> 'Hier kannst Du angeben, ob 1 Tag vor Tippabgabe eine Erinnerungsmail versendet werden soll.',
 
 	'FOOTBALL_REMEMBER_NEXT_RUN'		=> 'Nächster Cronjoblauf für die Tipp-Erinnerungsmail',
-	'FOOTBALL_REMEMBER_NEXT_RUN_EXPLAIN'=> 'Hier kannst Du einstellen, wann der Cronjob für die Tipp-Erinnerungsmail frühestens wieder aufgerufen wird. Nach Ausführung wird der Cronjob für den Folgetag zur geichen Uhrzeit neu eingeplant.',
+	'FOOTBALL_REMEMBER_NEXT_RUN_EXPLAIN'=> 'Hier kannst Du einstellen, wann der Cronjob für die Tipp-Erinnerungsmail frühestens wieder aufgerufen wird. Nach Ausführung wird der Cronjob für den Folgetag zur gleichen Uhrzeit neu eingeplant.',
 
 	'FOUNDER_DELETE'					=> 'Nur Gründungsmitglieder dürfen löschen',
 	'FOUNDER_DELETE_EXPLAIN'			=> 'Löschung von Spielplandaten wie Saisons, Ligen, Teams, Spieltage und Spielpläne nur auf Gründungsmitglieder beschränken. ',
@@ -185,6 +185,7 @@ $lang = array_merge($lang, array(
 	'LOG_FOOTBALL_FEATURES'				=> '<strong>Tipprunden-Funktionalitäten geändert</strong>',
 	'LOG_FOOTBALL_MENU'					=> '<strong>Tipprunden-Menu geändert</strong>',
 	'LOG_FOOTBALL_SETTINGS'				=> '<strong>Tipprunde-Einstellungen geändert</strong>',
+	'LOG_PL_BACKUP'						=> '<strong>Tipprunden Backup</strong>',
 
 	'LOG_FOOTBALL_MSG_TEST'				=> 'Aufruf am %s.',
 	'LOG_FOOTBALL_MSG_TEST_TRAVEL'		=> 'Aufruf mit Zeitreise zum %s.',

language/en/help_football.php

@@ -96,7 +96,7 @@ footb_rem_s = switch for sending the reminder email to the second E-mail address
 		0 => 'How do I activate the reminder e-mail function? ',
 		1 => 'In the admin area in the Prediction League functionality the mail reminder cron job and the next run must be activated. <br />
 The cron job is run on the first access after this date and sends an e-mail reminder for the missing tip duties that lie in the period 24-48 hours after cron date .
-If not sufficient accesses the page, the cron job should automatically run on script "cron.php?cron_type=football_remember". <br />
+If not sufficient accesses the page, the cron job should automatically run on script "YOUR_URL/cron.php?cron_type=football.football.cron.task.football_remember". <br />
 The ship of the email takes place only once . After calling up the cron job, the next scheduled is automatically planned for the following day .
 With the appended parameters " & mode = test & days = n " can be tested the shipment for the offset to n days predictions . Only mails to board email address will be shipped .
 		In ACP a user defined prediction leagues code is to define.<br />

language/en/info_acp_football.php

@@ -146,6 +146,7 @@ $lang = array_merge($lang, array(
 	'LOG_FOOTBALL_MSG_TEST_TRAVEL'			=> 'Call with time travel to %s.',
 	'LOG_FOOTBALL_REMEMBER_CRON'			=> 'Cronjob Football remember running %s',
 	'LOG_FOOTBALL_REMEMBER_CRON_TEST'		=> 'Cronjob Football remember test call %s',
+	'LOG_PL_BACKUP'							=> '<strong>Prediction League backup</strong>',
 	'FOOTBALL_REMEMBER_SUBJECT'				=> 'Please bet %1$s %2$d. matchday',
 	'FOOTBALL_REMEMBER_SUBJECT_BOARD'		=> 'Sent reminder mails %1$s %2$d',
 	'FOOTBALL_REMEMBER_ERROR_EMAIL'			=> '%1$s reminder email to: %2$d failed',

migrations/v094_beta_update.php

@@ -58,23 +58,13 @@ class v094_beta_update extends \phpbb\db\migration\migration
 	{
 		return array(
 			'drop_columns'        => array(
-				$this->table_prefix . 'groups'        => array(
-					'group_teampage',
-				),
 				$this->table_prefix . 'sessions' 			=> array(
+					'football_season',
+					'football_league',
+					'football_matchday',
 					'football_mobile',
 					'football_mobile_device',
 				),
-				$this->table_prefix . 'footb_bets'		=> array(
-					'bet_time',
-				),
-				$this->table_prefix . 'footb_matches'	=> array(
-					'trend',
-					'odd_1',
-					'odd_x',
-					'odd_2',
-					'rating',
-				),
 			)
 		);
 	}

migrations/v097_beta.php

@@ -0,0 +1,30 @@
+<?php
+/**
+*
+* @package Football Football v0.97
+* @copyright (c) 2016 football (http://football.bplaced.net)
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+namespace football\football\migrations;
+
+class v097_beta extends \phpbb\db\migration\migration
+{
+	public function effectively_installed()
+	{
+		return isset($this->config['football_version']) && version_compare($this->config['football_version'], '0.9.7', '>=');
+	}
+	
+	static public function depends_on()
+	{
+		return array('\football\football\migrations\v096_beta');
+	}
+
+	public function update_data()
+	{
+		return array(
+			array('config.update', array('football_version', '0.9.7', '0')),
+		);
+	}
+}

migrations/v098_beta.php

@@ -0,0 +1,30 @@
+<?php
+/**
+*
+* @package Football Football v0.98
+* @copyright (c) 2017 football (http://football.bplaced.net)
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+namespace football\football\migrations;
+
+class v098_beta extends \phpbb\db\migration\migration
+{
+	public function effectively_installed()
+	{
+		return isset($this->config['football_version']) && version_compare($this->config['football_version'], '0.9.8', '>=');
+	}
+	
+	static public function depends_on()
+	{
+		return array('\football\football\migrations\v097_beta');
+	}
+
+	public function update_data()
+	{
+		return array(
+			array('config.update', array('football_version', '0.9.8', '0')),
+		);
+	}
+}

styles/prosilver/template/event/overall_header_head_append.html

@@ -10,7 +10,7 @@
 <!-- IF S_FOOTBALL_HEADER_ENABLED -->
 <style>
 @media screen and (min-width: 700px){
-	.imageset.site_logo {
+	.site_logo {
 		background-image: url({S_FOOTBALL_EXT_PATH}images/site_logo.gif);
 		padding-left: 0px;
 		padding-top: 0px;

styles/prosilver/template/event/overall_header_page_body_before.html

@@ -15,7 +15,7 @@
 			<p id="dirty"><strong>{S_FOOTBALLSIDE}</strong></p>
 			<ul class="topiclist">
 				<li class="header">
-					<dl class="icon">
+					<dl>
 						<dt><a href="{U_FOOTBALL}"><span>{S_FOOTBALL_NAME}</span></a></dt><dd></dd>
 					</dl>
 				</li>
@@ -24,9 +24,9 @@
 				<li class="small-icon icon-bet"><a href="{U_BET}" role="menuitem">{L_BET}</a></li>
 				<li class="small-icon icon-allbets"><a href="{U_ALL_BETS}" role="menuitem">{L_ALL_BETS}</a></li>
 				<li class="small-icon icon-results"><a href="{U_RESULTS}" role="menuitem">{L_RESULTS}</a></li>
-				<li class="small-icon icon-list"><a href="{U_TABLE}" role="menuitem">{L_TABLE}</a></li>
-				<li class="small-icon icon-rank"><a href="{U_RANKS_TOTAL}" role="menuitem">{L_RANK_TOTAL}</a></li>
 				<li class="small-icon icon-rank"><a href="{U_RANKS_MATCHDAY}" role="menuitem">{L_RANK_MATCHDAY}</a></li>
+				<li class="small-icon icon-rank"><a href="{U_RANKS_TOTAL}" role="menuitem">{L_RANK_TOTAL}</a></li>
+				<li class="small-icon icon-list"><a href="{U_TABLE}" role="menuitem">{L_TABLE}</a></li>
 				<li class="small-icon icon-points"><a href="{U_FOOTBALL_BANK}" role="menuitem">{L_FOOTBALL_BANK}</a></li>
 				<li class="small-icon icon-rules"><a href="{U_RULES}" role="menuitem" target="popup" onclick="popup('{U_RULES}', 625,625);return false;">{L_RULES}</a></li>
 				<li class="small-icon icon-download"><a href="{U_EXPORT}" role="menuitem">{L_EXPORT}</a></li>
@@ -44,7 +44,7 @@
 			</ul>
 			<ul class="topiclist cat">
 				<li class="header">
-					<dl class="icon">
+					<dl>
 						<dt>{L_STATISTICS}</dt><dd></dd>
 					</dl>
 				</li>

styles/prosilver/template/football_body.html

@@ -14,7 +14,7 @@
 <!-- [+] center block area -->
 	<div id="football-center-wrapper">
 		<div id="football-center" style="margin: 0 {FOOTBALL_RIGHT_COLUMN}px 0 {FOOTBALL_LEFT_COLUMN}px; padding: 0 4px;">
-		<div id="tabs" style="margin-top: 0px;  margin-left: 5px;">
+		<div id="tabs" class="tabs" style="margin-top: 0px;  margin-left: 5px;">
 			<ul>
 				<li class="tab <!-- IF S_DISPLAY_BET -->activetab<!-- ENDIF --> small-icon icon-bet"><a href="{U_BET}"><span>{L_BET}</span></a></li>
 				<li class="tab <!-- IF S_DISPLAY_ALL_BETS -->activetab<!-- ENDIF --> small-icon icon-allbets"><a href="{U_ALL_BETS}"><span>{L_ALL_BETS}</span></a></li>

styles/prosilver/template/mobile_football_body.html

@@ -6,7 +6,7 @@
 		<strong>{L_INFORMATION}:</strong> {S_FOOTBALL_INFO}
 	</div>
 <!-- ENDIF -->
-	<div id="tabs" style="margin-top: 0px;  margin-left: 5px;">
+	<div id="tabs" class="tabs" style="margin-top: 0px;  margin-left: 5px;">
 		<ul>
 			<li class="tab <!-- IF S_DISPLAY_BET -->activetab<!-- ENDIF --> small-icon icon-bet"><a href="{U_BET}"><span>{L_BET}</span></a></li>
 			<li class="tab <!-- IF S_DISPLAY_ALL_BETS -->activetab<!-- ENDIF --> small-icon icon-allbets"><a href="{U_ALL_BETS}"><span>{L_BETS}</span></a></li>

styles/prosilver/template/mobile_viewplan_popup.html

@@ -1,57 +0,0 @@
-<!-- INCLUDE simple_header.html -->
-<!--//<link href="{T_THEME_PATH}/football.css" rel="stylesheet" type="text/css" media="screen, projection" /> -->
-
-<div class="panel">
-	<br />
-	<div class="navbar football_bg">
-		<div class="maintitle">{MODE_DESC} {LOGO} {TEAM} <br /> {LEAGUE} {SEASON}</div>
-	</div>
-		<br />
-<!-- IF S_DATA_PLAN -->
-	<span class="match_win">{L_WON}</span> - <span class="match_draw">{L_DRAW}</span> - <span class="match_lost">{L_LOST}</span>
-	<div class="forabg">
-		<table class="football">
-			<thead>
-				<tr>
-					<th>{L_DATE}</th>
-				<!-- IF S_DATA_GROUP -->
-					<th>{L_GR}</th>
-				<!-- ENDIF -->
-					<th colspan="5">{L_VS}</th>
-				<!-- IF S_DATA_RESULTS -->
-					<th colspan="3">{L_RESULT}</th>
-				<!-- ENDIF -->
-				</tr>
-			</thead>
-			<tbody>
-			<!-- BEGIN match -->
-				<tr class="{match.ROW_CLASS}">
-					<td>{match.MATCH_TIME}</td>
-				<!-- IF S_DATA_GROUP -->
-					<td class="td_group">{match.GROUP}</td>
-				<!-- ENDIF -->
-					<td class="td_logo">{match.LOGO_HOME}</td>
-					<td class="td_team {match.COLOR_HOME}">{match.HOME_NAME}</td>
-					<td class="td_vs">:</td>
-					<td class="td_logo">{match.LOGO_GUEST}</td>
-					<td class="td_team {match.COLOR_GUEST}">{match.GUEST_NAME}</td>
-				<!-- IF S_DATA_RESULTS -->
-					<td class="td_goals_home {match.COLOR_GOALS}">{match.GOALS_HOME}</td>
-					<td class="td_vs {match.COLOR_GOALS}">:</td>
-					<td class="td_goals_guest {match.COLOR_GOALS}">{match.GOALS_GUEST}</td>
-				<!-- ENDIF -->
-				</tr>
-			<!-- END match -->
-			</tbody>
-		</table>
-	</div>
-<!-- ELSE -->
-	<br />
-	<div class="message">{S_ERROR_MESSAGE}</div>
-	<br />
-<!-- ENDIF -->
-	<div style="text-align:center">
-		<a href="#" onclick="window.close(); return false;">{L_CLOSE_WINDOW}</a>
-	</div>
-</div>
-<!-- INCLUDE simple_footer.html -->