Julian/phpbb_football_tlw
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'football/master'

Browse Source 
# Conflicts:
#	acp/matches_module.php
#	adm/style/acp_football_leagues.html
#	adm/style/acp_football_matches.html
#	block/all_bets.php
#	block/rank_matchday.php
#	block/ranks_total.php
#	config/services.yml
#	controller/main.php
#	event/main_listener.php
#	includes/constants.php
#	includes/functions.php
#	language/de/football.php
#	language/de/info_acp_leagues.php
#	language/de/info_acp_matches.php
#	styles/prosilver/template/all_bets.html
#	styles/prosilver/template/results.html
#	styles/prosilver/template/table.html
#	styles/prosilver/theme/football.css
This commit is contained in:
Julian Arndt
2023-06-07 20:40:33 +02:00
parent 76cedb15a2 cba1e024cd
commit c9b4372b34
167 changed files with 12199 additions and 12181 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
controller/download.php
View File

@@ -122,7 +122,6 @@ class download
{
$message = (!empty($config['football_disable_msg'])) ? $config['football_disable_msg'] : 'FOOTBALL_DISABLED';
trigger_error($message);
exit;
}
// Can this user view Prediction Leagues pages?

31
controller/main.php
View File

@@ -45,7 +45,7 @@ class main
/* @var \phpbb\user */
protected $user;
/** @var \phpbb\pagination */
/* @var \phpbb\pagination */
protected $pagination;
/* @var phpBB root path */
@@ -137,7 +137,6 @@ class main
{
$message = (!empty($config['football_disable_msg'])) ? $config['football_disable_msg'] : 'FOOTBALL_DISABLED';
trigger_error($message);
exit;
}
// Can this user view Prediction Leagues pages?
@@ -753,18 +752,18 @@ class main
INNER JOIN ' . FOOTB_LEAGUES . ' AS l ON (l.season = s.season)
INNER JOIN ' . FOOTB_MATCHDAYS . ' AS sp ON (sp.season = s.season AND sp.league = l.league)
WHERE 1
ORDER BY season DESC';
ORDER BY s.season DESC';
$result = $db->sql_query($sql);
while( $row = $db->sql_fetchrow($result))
{
$selected = ($season && $row['season'] == $season) ? ' selected="selected"' : '';
if ($selected)
{
$season_name = htmlspecialchars($row['season_name_short']);
$season_name = utf8_htmlspecialchars($row['season_name_short']);
}
$template->assign_block_vars('form_season', array(
'S_SEASON' => htmlspecialchars($row['season']),
'S_SEASONNAME' => htmlspecialchars($row['season_name_short']),
'S_SEASON' => utf8_htmlspecialchars($row['season']),
'S_SEASONNAME' => utf8_htmlspecialchars($row['season_name_short']),
'S_SELECTED' => $selected));
}
$db->sql_freeresult($result);
@@ -825,8 +824,8 @@ class main
}
$template->assign_block_vars('form_league', array(
'S_LEAGUE' => $row['league'],
'S_LEAGUENAME' => $row['league_name'],
'S_SELECTED' => $selected
'S_LEAGUENAME' => $row['league_name'],
'S_SELECTED' => $selected
)
);
}
@@ -937,7 +936,7 @@ class main
// Start matchday list
if ($side == 'bet')
{
}
else
{
@@ -953,12 +952,12 @@ class main
//*****************************************************************************
}
if ($side == 'bet')
{
include($this->football_root_path . 'block/table.' . $this->php_ext);
}
// Start assign vars
$sql_ary = array(
'football_season' => (int) $season,
@@ -977,9 +976,9 @@ class main
$print_start = ($start) ? "start=$start&" : '';
$template->assign_vars(array(
'U_PRINT_FOOTBALL' => $this->helper->route('football_main_controller', array('side' => $side, 's' => $season, 'l' => $league, 'm' => $matchday, 'view' => 'print')),
'U_MOBILE_SWITCH' => $this->helper->route('football_main_controller', array('side' => $side, 's' => $season, 'l' => $league, 'm' => $matchday, 'action' => 'switch')),
'U_SIDE_LINK' => $this->helper->route('football_main_controller', array('side' => $side, 's' => $season, 'l' => $league, 'm' => $matchday)),
'U_PRINT_FOOTBALL' => $this->helper->route('football_football_controller', array('side' => $side, 's' => $season, 'l' => $league, 'm' => $matchday, 'view' => 'print')),
'U_MOBILE_SWITCH' => $this->helper->route('football_football_controller', array('side' => $side, 's' => $season, 'l' => $league, 'm' => $matchday, 'action' => 'switch')),
'U_SIDE_LINK' => $this->helper->route('football_football_controller', array('side' => $side, 's' => $season, 'l' => $league, 'm' => $matchday)),
'L_TOP_RANKSP' => sprintf($user->lang['RANKING']) . ' ' . $matchday . '. ' . sprintf($user->lang['MATCHDAY']),
'L_TOP_RANKGESAMT' => sprintf($user->lang['TOTAL_RANKING']) . ' ' . $matchday . '. ' . sprintf($user->lang['MATCHDAY']),
'PHPBB_ROOT_PATH' => $this->phpbb_root_path,
@@ -998,13 +997,13 @@ class main
'S_SEASON_NAME' => $season_name,
'S_LEAGUE_NAME' => $league_name,
'S_MATCHDAY_NAME' => $matchday_name,
'S_FORMSELF' => $this->helper->route('football_main_controller', array('side' => $side)),
'S_FORMSELF' => $this->helper->route('football_football_controller', array('side' => $side)),
'S_DELIVERY' => delivery($season, $league, $matchday),
// For nav_delivery
'S_PREV_LINK' => $prev_link,
'S_PREV_CLASS' => $prev_class,
'S_PREV_DEADLINE' => $prev_deadline,
'S_CURR_LINK' => $this->helper->route('football_main_controller', array('side' => $side, 's' => $season, 'l' => $league)),
'S_CURR_LINK' => $this->helper->route('football_football_controller', array('side' => $side, 's' => $season, 'l' => $league)),
'S_CURR_MATCHDAY' => $curr_matchday,
'S_NEXT_LINK' => $next_link,
'S_NEXT_CLASS' => $next_class,

3
controller/popup.php
View File

@@ -39,7 +39,7 @@ class popup
/* @var \phpbb\user */
protected $user;
/** @var \phpbb\pagination */
/* @var \phpbb\pagination */
protected $pagination;
/* @var phpBB root path */
@@ -128,7 +128,6 @@ class popup
{
$message = (!empty($config['football_disable_msg'])) ? $config['football_disable_msg'] : 'FOOTBALL_DISABLED';
trigger_error($message);
exit;
}
// Can this user view Prediction Leagues pages?

1
controller/xmlplan.php
View File

@@ -105,7 +105,6 @@ class xmlplan
{
$message = (!empty($config['football_disable_msg'])) ? $config['football_disable_msg'] : 'FOOTBALL_DISABLED';
trigger_error($message);
exit;
}