Version 0.9.8
This commit is contained in:
@@ -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';
|
||||
|
||||
@@ -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'])
|
||||
{
|
||||
|
||||
@@ -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'))
|
||||
|
||||
@@ -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';
|
||||
|
||||
@@ -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');
|
||||
|
||||
|
||||
@@ -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';
|
||||
|
||||
@@ -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';
|
||||
|
||||
@@ -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';
|
||||
|
||||
@@ -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';
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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';
|
||||
|
||||
@@ -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'))
|
||||
|
||||
@@ -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'))
|
||||
|
||||
@@ -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,142 +26,25 @@ $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,
|
||||
SUM(IF(e.extra_no > 0, 1, 0)) AS extra_count
|
||||
FROM " . FOOTB_MATCHDAYS . " AS m
|
||||
JOIN " . FOOTB_LEAGUES . " AS l ON(l.season = m.season AND l.league = m.league AND l.bet_in_time = 0)
|
||||
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 = 0)
|
||||
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 AND l.bet_in_time = 0)
|
||||
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 AND l.bet_in_time = 0)
|
||||
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
|
||||
)
|
||||
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(ma.match_datetime,'%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(ma.match_datetime,' %d.%m.%y %H:%i')
|
||||
) as delivery_time,
|
||||
ma.match_datetime 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 AND l.bet_in_time = 1)
|
||||
JOIN " . FOOTB_MATCHES . " AS ma ON (ma.season = m.season AND ma.league = m.league AND ma.matchday = m.matchday AND ma.status = 0)
|
||||
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 ma.match_datetime > FROM_UNIXTIME('$local_board_time')
|
||||
AND m.status <= 0
|
||||
GROUP BY ma.match_datetime, 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)
|
||||
@@ -178,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'])),
|
||||
)
|
||||
);
|
||||
}
|
||||
|
||||
@@ -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.7",
|
||||
"time": "2016-06-12",
|
||||
"version": "0.9.8",
|
||||
"time": "2017-02-19",
|
||||
"license": "GPL-2.0",
|
||||
"authors": [{
|
||||
"name": "J. Helmke",
|
||||
|
||||
@@ -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 ?
|
||||
@@ -110,7 +111,8 @@ class football_remember extends \phpbb\cron\task\base
|
||||
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);
|
||||
|
||||
@@ -261,8 +261,7 @@ class main_listener implements EventSubscriberInterface
|
||||
|
||||
$mobile = false;
|
||||
$user_agent = $request->server('HTTP_USER_AGENT');
|
||||
if ($this->user->data['football_mobile_device'] == '')
|
||||
{
|
||||
|
||||
switch(true)
|
||||
{
|
||||
/** Remove Bots from the list */
|
||||
@@ -508,7 +507,6 @@ class main_listener implements EventSubscriberInterface
|
||||
$this->user->data['football_mobile'] = $mobile;
|
||||
$this->user->data['football_mobile_device'] = $mobile_device;
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Check if user should be able to access football prediction league
|
||||
|
||||
@@ -1029,12 +1029,13 @@ function current_league($season)
|
||||
$curr_user = $user->data['user_id'];
|
||||
$user_spec = 'AND b.user_id = ' . $curr_user;
|
||||
}
|
||||
$sql = 'SELECT m.league
|
||||
$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 ' . $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))
|
||||
|
||||
@@ -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.',
|
||||
|
||||
@@ -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',
|
||||
|
||||
@@ -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',
|
||||
),
|
||||
)
|
||||
);
|
||||
}
|
||||
|
||||
30
migrations/v098_beta.php
Normal file
30
migrations/v098_beta.php
Normal file
@@ -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')),
|
||||
);
|
||||
}
|
||||
}
|
||||
@@ -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;
|
||||
|
||||
@@ -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>
|
||||
|
||||
@@ -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>
|
||||
|
||||
@@ -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>
|
||||
|
||||
Reference in New Issue
Block a user