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

63
acp/matches_module.php
View File

@@ -56,7 +56,7 @@ class matches_module
$form_key = 'acp_football_matches';
add_form_key($form_key);
include($this->phpbb_root_path . 'includes/functions_user.' . $this->php_ext);
include_once($this->phpbb_root_path . 'includes/functions_user.' . $this->php_ext);
// Check and set some common vars
$action = (isset($_POST['add'])) ? 'add' : $this->request->variable('action', '');
@@ -124,12 +124,12 @@ class matches_module
$league_options .= '<option value="' . $row['league'] . '"' . $selected . '>' . $row['league_name'] . '</option>';
if ($selected <> '')
{
$league_info = $row;
$league_matchdays = $row['matchdays'];
$matches_matchday = $row['matches_on_matchday'];
$league_name = $row['league_name'];
$league_type = $row['league_type'];
$ko_league = ($row['league_type'] == LEAGUE_KO) ? true : false;
$league_info = $row;
$league_matchdays = $row['matchdays'];
$matches_matchday = $row['matches_on_matchday'];
$league_name = $row['league_name'];
$league_type = $row['league_type'];
$ko_league = ($row['league_type'] == LEAGUE_KO) ? true : false;
}
}
$db->sql_freeresult($result);
@@ -387,19 +387,19 @@ class matches_module
trigger_error($user->lang['FORM_INVALID'] . adm_back_link($this->u_action . "&amp;s=$season&amp;l=$league&amp;m=$matchday"), E_USER_WARNING);
}
$match_row['status'] = utf8_normalize_nfc($this->request->variable('match_status', '', true));
$match_row['odd_1'] = round($this->request->variable('odd_1', $match_row['odd_1']),2);
$match_row['odd_x'] = round($this->request->variable('odd_x', $match_row['odd_x']),2);
$match_row['odd_2'] = round($this->request->variable('odd_2', $match_row['odd_2']),2);
$match_row['rating'] = round($this->request->variable('rating', $match_row['rating']),2);
$match_row['team_id_home'] = utf8_normalize_nfc($this->request->variable('team_home', '', true));
$match_row['status'] = utf8_normalize_nfc($this->request->variable('match_status', '', true));
$match_row['odd_1'] = round($this->request->variable('odd_1', $match_row['odd_1']),2);
$match_row['odd_x'] = round($this->request->variable('odd_x', $match_row['odd_x']),2);
$match_row['odd_2'] = round($this->request->variable('odd_2', $match_row['odd_2']),2);
$match_row['rating'] = round($this->request->variable('rating', $match_row['rating']),2);
$match_row['team_id_home'] = utf8_normalize_nfc($this->request->variable('team_home', '', true));
$match_row['team_id_guest'] = utf8_normalize_nfc($this->request->variable('team_guest', '', true));
$match_row['formula_home'] = utf8_normalize_nfc($this->request->variable('formula_home', '', true));
$match_row['formula_home'] = utf8_normalize_nfc($this->request->variable('formula_home', '', true));
$match_row['formula_guest'] = utf8_normalize_nfc($this->request->variable('formula_guest', '', true));
$match_row['ko_match'] = $this->request->variable('match_ko', false);
$match_row['group_id'] = ($this->request->variable('group_match', false)) ? utf8_normalize_nfc($this->request->variable('match_group', '', true)) : '';
$match_row['ko_match'] = $this->request->variable('match_ko', false);
$match_row['group_id'] = ($this->request->variable('group_match', false)) ? utf8_normalize_nfc($this->request->variable('match_group', '', true)) : '';
$match_row['show_table'] = $this->request->variable('show_table', false);
if ($match_row['team_id_home'] <> '')
{
$team_arr = explode(';', $match_row['team_id_home']);
@@ -437,15 +437,6 @@ class matches_module
{
$error[] = $user->lang['NO_MATCH_BEGIN'];
}
if ($match_row['show_table'] == true)
{
$show_table = '0';
}
else
{
$show_table = '1';
}
if (!sizeof($error))
{
@@ -469,8 +460,7 @@ class matches_module
'formula_guest' => strlen($match_row['formula_guest']) ? $match_row['formula_guest'] : '',
'ko_match' => $match_row['ko_match'] ? $match_row['ko_match'] : 0,
'goals_overtime_home' => (is_numeric($match_row['goals_overtime_home'])) ? $match_row['goals_overtime_home'] : '',
'goals_overtime_guest' => (is_numeric($match_row['goals_overtime_guest'])) ? $match_row['goals_overtime_guest'] : '',
'show_table' => (int) $show_table,
'goals_overtime_guest' => (is_numeric($match_row['goals_overtime_guest'])) ? $match_row['goals_overtime_guest'] : '',
);
@@ -639,16 +629,6 @@ class matches_module
$team_home_options .= '<option value="' . $row['group_id'] . ';' . $row['team_id'] .'"' . $selected_home . '>' . $row['team_name'] . '</option>';
}
$db->sql_freeresult($result);
if($match_row['show_table'] == 1)
{
$show_table = false;
}
else
{
$show_table = true;
}
$u_back = $this->u_action . "&amp;s=$season&amp;l=$league&amp;m=$matchday";
$template->assign_vars(array(
@@ -669,8 +649,7 @@ class matches_module
'MATCH_STATUS' => $match_row['status'],
'STATUS_OPTIONS' => $status_options,
'S_GROUP_CHECKED' => (strlen($match_row['group_id']) > 0) ? true : false,
'MATCH_GROUP' => $match_group,
'S_SHOW_TABLE' => $show_table,
'MATCH_GROUP' => $match_group,
'S_KO_CHECKED' => $match_row['ko_match'],
'FORMULA_HOME' => $match_row['formula_home'],
'FORMULA_GUEST' => $match_row['formula_guest'],
@@ -739,7 +718,7 @@ class matches_module
$template->assign_vars(array(
'U_ACTION' => $this->u_action,
'U_FOOTBALL' => $helper->route('football_main_controller',array('side' => 'bet', 's' => $season, 'l' => $league, 'm' => $matchday)),
'U_FOOTBALL' => $helper->route('football_football_controller',array('side' => 'bet', 's' => $season, 'l' => $league, 'm' => $matchday)),
'S_SEASON' => $season,
'S_LEAGUE' => $league,
'S_KO_LEAGUE' => $ko_league,
@@ -783,5 +762,3 @@ class matches_module
}
}
}
?>