diff --git a/.gitignore b/.gitignore
index 6a130e6..c0f2e53 100644
--- a/.gitignore
+++ b/.gitignore
@@ -39,3 +39,26 @@ Icon
# Files that might appear on external disk
.Spotlight-V100
.Trashes
+/styles/prosilver/theme/images/right_arrow.png
+/styles/prosilver/theme/images/icon_allbets.gif
+/styles/prosilver/theme/images/icon_ball.gif
+/styles/prosilver/theme/images/icon_ball2.gif
+/styles/prosilver/theme/images/icon_bet.gif
+/styles/prosilver/theme/images/icon_bookmark.gif
+/styles/prosilver/theme/images/icon_download.gif
+/styles/prosilver/theme/images/icon_info.gif
+/styles/prosilver/theme/images/icon_list.gif
+/styles/prosilver/theme/images/icon_mark.gif
+/styles/prosilver/theme/images/icon_odds.gif
+/styles/prosilver/theme/images/icon_points.gif
+/styles/prosilver/theme/images/icon_print.gif
+/styles/prosilver/theme/images/icon_rank.gif
+/styles/prosilver/theme/images/icon_results.gif
+/styles/prosilver/theme/images/icon_rules.gif
+/styles/prosilver/theme/images/icon_statistic.gif
+/styles/prosilver/theme/images/icon_statistics.gif
+/styles/prosilver/theme/images/icon_xml.gif
+/styles/prosilver/theme/images/left_arrow.png
+/images/no_change.gif
+/images/arrow_down.gif
+/images/arrow_up.gif
diff --git a/acp/all_bets_module.php b/acp/all_bets_module.php
index dc4268b..69a6276 100644
--- a/acp/all_bets_module.php
+++ b/acp/all_bets_module.php
@@ -219,7 +219,6 @@ class all_bets_module
$split_after = $count_matches;
$splits = 1;
}
- $db->sql_freeresult($result);
// Make sure $start is set to the last page if it exceeds the amount
if ($start < 0 || $start >= $total_users)
@@ -311,7 +310,7 @@ class all_bets_module
$total = 0;
}
$bet_index++;
- $total += $user_bet['points'];
+ $total += ($user_bet['points'] == '') ? 0 : $user_bet['points'];
if ($user_bet['status'] < 3)
{
$colorstyle_total = ' color_provisionally';
@@ -419,7 +418,7 @@ class all_bets_module
$total = 0;
}
$bet_index++;
- $total += $user_bet['points'];
+ $total += ($user_bet['points'] == '') ? 0 : $user_bet['points'];
if ($user_bet['status'] < 3)
{
$colorstyle_total = ' color_provisionally';
@@ -573,7 +572,9 @@ class all_bets_module
)
);
}
+ $db->sql_freeresult($result_bet);
}
+ $db->sql_freeresult($result);
$legend = delivery($season, $league, $matchday);
diff --git a/acp/bank_module.php b/acp/bank_module.php
index af79a1d..35db83a 100644
--- a/acp/bank_module.php
+++ b/acp/bank_module.php
@@ -184,6 +184,7 @@ class bank_module
AND points_type IN (" . POINTS_MATCHDAY . ',' . POINTS_SEASON . ',' . POINTS_MOST_HITS . ',' . POINTS_MOST_HITS_AWAY . ')';
$result = $db->sql_query($sql);
$count_updates += $db->sql_affectedrows();
+ $db->sql_freeresult($result);
}
else
{
@@ -199,6 +200,7 @@ class bank_module
HAVING win > 0";
$result = $db->sql_query($sql);
$points_ary = $db->sql_fetchrowset($result);
+ $db->sql_freeresult($result);
if (!$default_matchday)
{
$matchday = (curr_matchday($season, $league) > 0) ? curr_matchday($season, $league) : 1;
@@ -351,6 +353,7 @@ class bank_module
AND points_type = $type";
$result = $db->sql_query($sql);
$count_updates += $db->sql_affectedrows();
+ $db->sql_freeresult($result);
}
$back_link = $this->u_action . '&action=list&s=' . $season . '&l=' . $league . '&t=' . $type . '&start=' . $start;
trigger_error(sprintf($user->lang['LEAGUE_' . $points_var . ($count_updates == 1 ? '' : 'S')], $count_updates) . adm_back_link($back_link));
diff --git a/acp/bets_module.php b/acp/bets_module.php
index c0e1e81..f2b26e1 100644
--- a/acp/bets_module.php
+++ b/acp/bets_module.php
@@ -325,6 +325,7 @@ class bets_module
}
}
}
+ $db->sql_freeresult($resultopen);
if ($count_updates > 0)
{
if ($same AND ($count_matches > 6) AND $this->config['football_same_allowed'] == 0)
@@ -358,7 +359,6 @@ class bets_module
{
$success[] = sprintf($user->lang['NO_BETS_SAVED']);
}
- $db->sql_freeresult($resultopen);
// extra bets
$sql = 'SELECT * FROM ' . FOOTB_EXTRA . " WHERE season = $season AND league = $league AND matchday = $matchday";
@@ -418,6 +418,7 @@ class bets_module
}
}
}
+ $db->sql_freeresult($resultextra);
if ($count_extra_updates)
{
$success[] = sprintf($user->lang['EXTRA_BET' . (($count_extra_updates == 1) ? '' : 'S') . '_SAVED'], $count_extra_updates);
@@ -582,7 +583,8 @@ class bets_module
)
);
}
-
+ $db->sql_freeresult($resultopen);
+
// Calculate extra bets of matchday
// Start select team
$sql = 'SELECT
diff --git a/acp/extra_module.php b/acp/extra_module.php
index 7cd2ab0..d07a2e7 100644
--- a/acp/extra_module.php
+++ b/acp/extra_module.php
@@ -151,8 +151,6 @@ class extra_module
$existing_extra = sizeof($extra_row);
$db->sql_freeresult($result);
}
-
- $db->sql_freeresult($result);
// Which page?
switch ($action)
@@ -265,7 +263,7 @@ class extra_module
$matchday_eval_options .= '' . $day_name . ' ';
}
}
-
+ $db->sql_freeresult($result);
$question_type_options = '';
for($i = 1; $i<= 5; $i++)
{
diff --git a/acp/football_module.php b/acp/football_module.php
index 6e3a91c..935cf55 100644
--- a/acp/football_module.php
+++ b/acp/football_module.php
@@ -107,7 +107,7 @@ class football_module
'football_header_enable' => array('lang' => 'FOOTBALL_HEADER_ENABLE','validate' => 'bool', 'type' => 'radio:yes_no', 'explain' => true),
'football_guest_view' => array('lang' => 'GUEST_VIEW', 'validate' => 'bool', 'type' => 'radio:yes_no', 'explain' => true),
'football_user_view' => array('lang' => 'USER_VIEW', 'validate' => 'bool', 'type' => 'radio:yes_no', 'explain' => true),
- 'football_host_timezone' => array('lang' => 'HOST_TIMEZONE', 'validate' => 'string', 'type' => 'select', 'function' => 'phpbb_timezone_select', 'params' => array($template, $user, '{CONFIG_VALUE}', true), 'explain' => true),
+ 'football_time_shift' => array('lang' => 'TIME_SHIFT', 'validate' => 'int', 'type' => 'select', 'method' => 'time_shift_select', 'params' => array('{CONFIG_VALUE}', false), 'explain' => true),
'football_info_display' => array('lang' => 'FOOTBALL_INFO', 'validate' => 'bool', 'type' => 'custom', 'method' => 'football_info', 'explain' => true),
'football_info' => false,
'football_win_name' => array('lang' => 'WIN_NAME', 'validate' => 'string', 'type' => 'text:6:6', 'explain' => true),
@@ -120,6 +120,8 @@ class football_module
'legend2' => 'GENERAL_SETTINGS',
'football_left_column_width' => array('lang' => 'LEFT_COLUMN', 'validate' => 'int', 'type' => 'text:3:3', 'explain' => true),
'football_right_column_width' => array('lang' => 'RIGHT_COLUMN', 'validate' => 'int', 'type' => 'text:3:3', 'explain' => true),
+ 'football_display_last_users' => array('lang' => 'DISPLAY_LAST_USERS', 'validate' => 'int','type' => 'text:3:3', 'explain' => true),
+ 'football_display_last_results' => array('lang' => 'DISPLAY_LAST_RESULTS', 'validate' => 'int','type' => 'text:3:3', 'explain' => true),
'football_display_ranks' => array('lang' => 'DISPLAY_RANKS', 'validate' => 'int', 'type' => 'text:3:3', 'explain' => true),
'football_users_per_page' => array('lang' => 'USERS_PAGE', 'validate' => 'int', 'type' => 'text:3:3', 'explain' => true),
@@ -362,7 +364,7 @@ class football_module
}
/**
- * Adjust Cronjob EMail remember next un
+ * Adjust Cronjob EMail remember next run
*/
function next_run($value, $key = '')
{
@@ -419,6 +421,18 @@ class football_module
$year_options . ' ' . $user->lang['HOURS'] . ': ' . $hour_options . ' ' . $user->lang['MINUTES'] . ': ' . $minute_options;
}
+
+ function time_shift_select($default = 0)
+ {
+ $time_shift_options = "";
+ for ($i = -23; $i < 24; $i++)
+ {
+ $selected = ($i == $default) ? ' selected="selected"' : '';
+ $time_shift_options .= '' . $i . ' ';
+ }
+ return $time_shift_options;
+ }
+
}
?>
\ No newline at end of file
diff --git a/acp/leagues_module.php b/acp/leagues_module.php
index 8cd554e..5312f1c 100644
--- a/acp/leagues_module.php
+++ b/acp/leagues_module.php
@@ -153,7 +153,6 @@ class leagues_module
$result = $db->sql_query($sql);
if (!($row = $db->sql_fetchrow($result)))
{
- $db->sql_freeresult($result);
trigger_error($user->lang['NO_MEMBERS_SELECTED'] . adm_back_link($this->u_action . "&action=list&s=$season&l=$league"), E_USER_WARNING);
}
diff --git a/acp/matchdays_module.php b/acp/matchdays_module.php
index 1a9c48f..0895fb5 100644
--- a/acp/matchdays_module.php
+++ b/acp/matchdays_module.php
@@ -323,6 +323,7 @@ class matchdays_module
ORDER BY matchday ASC, number ASC";
$result = $db->sql_query($sql);
$rows_matchdays = $db->sql_fetchrowset($result);
+ $db->sql_freeresult($result);
$row_number = 0;
foreach ($rows_matchdays as $row_matchday)
{
@@ -710,7 +711,7 @@ class matchdays_module
if ($data['dday1_day'] <> '--' and $data['dday1_month'] <> '--' and $data['dday1_year'] <> '--')
{
$delivery_timestamp = mktime($data['dday1_hour'], $data['dday1_min'], 0, $data['dday1_month'], $data['dday1_day'], $data['dday1_year']);
- $local_board_time = time() + (($this->config['board_timezone'] - $this->config['football_host_timezone']) * 3600);
+ $local_board_time = time() + ($this->config['football_time_shift'] * 3600);
if ($delivery_timestamp > $local_board_time AND $matchday_row['status'] == 0)
{
// check if delivery is before all open matches
@@ -764,6 +765,7 @@ class matchdays_module
// reopen matchday
$matchday_row['status'] = 0;
}
+ $db->sql_freeresult($result);
}
}
else
diff --git a/acp/matches_module.php b/acp/matches_module.php
index 0522a50..3ecd9fe 100644
--- a/acp/matches_module.php
+++ b/acp/matches_module.php
@@ -413,7 +413,7 @@ class matches_module
if ($data['mday_day'] <> '--' and $data['mday_month'] <> '--' and $data['mday_year'] <> '--')
{
$match_timestamp = mktime($data['mday_hour'], $data['mday_min'], 0, $data['mday_month'], $data['mday_day'], $data['mday_year']);
- $local_board_time = time() + (($this->config['board_timezone'] - $this->config['football_host_timezone']) * 3600);
+ $local_board_time = time() + ($this->config['football_time_shift'] * 3600);
if ($match_timestamp > $local_board_time AND $match_row['status'] < 3 AND $league_info['bet_in_time'] == 1)
{
// Bet in time and match moved to future
@@ -627,7 +627,7 @@ class matches_module
$selected_home = ($home_id && $row['team_id'] == $home_id) ? ' selected="selected"' : '';
$team_home_options .= '' . $row['team_name'] . ' ';
}
-
+ $db->sql_freeresult($result);
$u_back = $this->u_action . "&s=$season&l=$league&m=$matchday";
$template->assign_vars(array(
diff --git a/acp/results_module.php b/acp/results_module.php
index 7569fd9..976733d 100644
--- a/acp/results_module.php
+++ b/acp/results_module.php
@@ -192,7 +192,7 @@ class results_module
{
trigger_error(sprintf($user->lang['NO_MATCHDAY'], $league_info['league_name'], $season) . adm_back_link($this->u_action . "&s=$season&l=$league"), E_USER_WARNING);
}
- $local_board_time = time() + (($this->config['board_timezone'] - $this->config['football_host_timezone']) * 3600);
+ $local_board_time = time() + ($this->config['football_time_shift'] * 3600);
// Which page?
switch ($action)
@@ -382,6 +382,7 @@ class results_module
}
}
}
+ $db->sql_freeresult($resultextra);
if ($count_extra_updates)
{
$success[] = sprintf($user->lang['EXTRA_RESULT' . (($count_extra_updates == 1) ? '' : 'S') . '_SAVED'], $count_extra_updates);
@@ -768,6 +769,7 @@ class results_module
);
}
}
+ $db->sql_freeresult($result);
switch ($league_info['bet_ko_type'])
{
diff --git a/acp/update_module.php b/acp/update_module.php
index 725e12d..e8ca43a 100644
--- a/acp/update_module.php
+++ b/acp/update_module.php
@@ -397,6 +397,7 @@ class update_module
{
$error[] = sprintf($user->lang['MISMATCH_MATCHDAYS'], $row['matchdays']);
}
+ $db->sql_freeresult($result);
$sql = 'SELECT COUNT(match_no) as matches
FROM ' . FOOTB_MATCHES . "
@@ -414,6 +415,7 @@ class update_module
{
$error[] = sprintf($user->lang['MISMATCH_MATCHES'], $row['matches']);
}
+ $db->sql_freeresult($result);
if (!sizeof($error))
{
@@ -547,6 +549,7 @@ class update_module
$count_updates++;
$effected_matchdays = ($effected_matchdays == '') ? $row['matchday'] : $effected_matchdays . ', ' . $row['matchday'];
}
+ $db->sql_freeresult($result);
if ($effected_matchdays <> '')
{
$sql = 'REPLACE INTO ' . FOOTB_MATCHDAYS . ' (season, league, matchday, status, delivery_date, delivery_date_2, delivery_date_3, matchday_name, matches)
@@ -591,6 +594,7 @@ class update_module
$count_updates++;
$effected_matchdays = ($effected_matchdays == '') ? $row['matchday'] : $effected_matchdays . ', ' . $row['matchday'];
}
+ $db->sql_freeresult($result);
if ($effected_matchdays <> '')
{
$sql = 'REPLACE INTO ' . FOOTB_MATCHDAYS . ' (season, league, matchday, status, delivery_date, delivery_date_2, delivery_date_3, matchday_name, matches)
@@ -635,6 +639,7 @@ class update_module
$count_updates++;
$effected_matchdays = ($effected_matchdays == '') ? $row['matchday'] : $effected_matchdays . ', ' . $row['matchday'];
}
+ $db->sql_freeresult($result);
if ($effected_matchdays <> '')
{
$sql = 'REPLACE INTO ' . FOOTB_MATCHDAYS . ' (season, league, matchday, status, delivery_date, delivery_date_2, delivery_date_3, matchday_name, matches)
@@ -662,7 +667,7 @@ class update_module
}
// check status of matchdays
- $local_board_time = time() + (($this->config['board_timezone'] - $this->config['football_host_timezone']) * 3600);
+ $local_board_time = time() + ($this->config['football_time_shift'] * 3600);
$sql = $sql = 'UPDATE ' . FOOTB_MATCHDAYS . " AS target
INNER JOIN
(
@@ -1382,6 +1387,7 @@ class update_module
}
}
}
+ $db->sql_freeresult($result);
return $count_updates;
}
diff --git a/block/all_bets.php b/block/all_bets.php
index a3b06a5..edc3445 100644
--- a/block/all_bets.php
+++ b/block/all_bets.php
@@ -78,7 +78,6 @@ else
$splits = 1;
}
}
-$db->sql_freeresult($result);
// Make sure $start is set to the last page if it exceeds the amount
if ($start < 0 || $start >= $total_users)
@@ -183,7 +182,7 @@ foreach ($matches AS $match)
$total = 0;
}
$bet_index++;
- $total += $user_bet['points'];
+ $total += ($user_bet['points'] == '') ? 0 : $user_bet['points'];
if ($user_bet['status'] < 3)
{
$colorstyle_total = ' color_provisionally';
@@ -306,7 +305,7 @@ if ($count_matches > 0)
$total = 0;
}
$bet_index++;
- $total += $user_bet['points'];
+ $total += ($user_bet['points'] == '') ? 0 : $user_bet['points'];
if ($user_bet['status'] < 3)
{
$colorstyle_total = ' color_provisionally';
@@ -479,19 +478,14 @@ while ($row = $db->sql_fetchrow($result))
)
);
}
+ $db->sql_freeresult($result_bet);
}
-
+$db->sql_freeresult($result);
$sidename = sprintf($user->lang['ALL_BETS']);
$template->assign_vars(array(
'S_DISPLAY_ALL_BETS' => true,
'S_SIDENAME' => $sidename,
- 'U_LEFT' => $this->helper->route('football_main_controller', array('side' => 'bet', 's' => $season, 'l' => $league, 'm' => $matchday)),
- 'LEFT_LINK' => '< ' . sprintf($user->lang['BET']),
- 'U_RIGHT' => $this->helper->route('football_main_controller', array('side' => 'results', 's' => $season, 'l' => $league, 'm' => $matchday)),
- 'RIGHT_LINK' => sprintf($user->lang['RESULTS']) . ' >',
- 'LEFT_TITLE' => sprintf($user->lang['TITLE_BET']),
- 'RIGHT_TITLE' => sprintf($user->lang['TITLE_RESULTS']),
'S_MATCHES_ON_MATCHDAY' => $matches_on_matchday,
'S_SPALTEN' => ($count_matches * 2) + 2,
'PAGE_NUMBER' => $pagination->on_page($total_users, $this->config['football_users_per_page'], $start),
diff --git a/block/bank.php b/block/bank.php
index fb820cd..79a8a42 100644
--- a/block/bank.php
+++ b/block/bank.php
@@ -1,235 +1,229 @@
-auth->acl_get('u_use_football') )
-{
- trigger_error('NO_AUTH_VIEW');
-
-}
-
-global $phpbb_extension_manager;
-if ($phpbb_extension_manager->is_enabled('dmzx/ultimatepoints'))
-{
- $this->user->add_lang_ext('dmzx/ultimatepoints', 'common');
- // Get an instance of the ultimatepoints functions_points
- $functions_points = $phpbb_container->get('dmzx.ultimatepoints.core.functions.points');
-}
-else
-{
- // Get an instance of the football functions_points
- $functions_points = $phpbb_container->get('football.football.core.functions.points');
-}
-
-if (!$user_sel)
-{
- if (user_is_member($user->data['user_id'], $season, $league) or $league == 0)
- {
- $user_sel = $user->data['user_id'];
- }
-}
-
-$username = '';
-$member = true;
-if ($this->auth->acl_get('a_football_points'))
-{
- $where_user = '';
- $multi_view = true;
-}
-else
-{
- $multi_view = false;
- if (user_is_member($user->data['user_id'], $season, $league))
- {
- $where_user = ' AND b.user_id = ' . $user->data['user_id'] . ' ';
- $user_sel = $user->data['user_id'];
- }
- else
- {
- if ($league)
- {
- $member = false;
- }
- }
-}
-$where_league = '';
-if ($league)
-{
- $where_league = " AND b.league = $league";
-}
-
-$data = false;
-// Select user
-$total_users = 0;
-$sql = 'SELECT DISTINCT
- u.user_id,
- u.username
- FROM ' . FOOTB_BETS . ' AS b
- LEFT JOIN ' . USERS_TABLE . " AS u ON (u.user_id = b.user_id)
- WHERE season = $season
- $where_league
- $where_user
- ORDER BY LOWER(u.username) ASC";
-
-$result = $db->sql_query($sql);
-
-while($row = $db->sql_fetchrow($result))
-{
- $total_users++;
- if ($user_sel == $row['user_id'] OR !$user_sel)
- {
- $selectid = ' selected="selected"';
- $username = $row['username'];
- $user_sel = $row['user_id'];
- }
- else
- {
- $selectid = '';
- }
- $template->assign_block_vars('form_user', array(
- 'S_USER' => $row['user_id'],
- 'S_USERNAME' => $row['username'],
- 'S_SELECTEDID' => $selectid,
- )
- );
-}
-$db->sql_freeresult($result);
-
-$where_season = '';
-if ($season)
-{
- $where_season = " AND fp.season = $season";
-}
-
-$where_league = '';
-$order_by = 'ORDER BY fp.points_type ASC, fp.matchday ASC, fp.league ASC';
-
-if ($league)
-{
- $where_league = " AND fp.league = $league";
- $order_by = 'ORDER BY fp.league ASC, fp.matchday ASC, fp.points_type ASC';
-}
-
-// The different book types
-$types = array(
- 0 => '--',
- 1 => sprintf($user->lang['FOOTBALL_BET_POINTS']),
- 2 => $user->lang['FOOTBALL_DEPOSIT'],
- 3 => sprintf($user->lang['FOOTBALL_WIN']),
- 4 => $user->lang['FOOTBALL_WIN'],
- 5 => $user->lang['FOOTBALL_WIN'],
- 6 => $user->lang['FOOTBALL_WIN'],
- 7 => $user->lang['FOOTBALL_PAYOUT'],
-);
-
-// Grab the football points
-$sql = 'SELECT fp.season,
- s.season_name,
- s.season_name_short,
- fp.league,
- l.league_name,
- l.league_name_short,
- fp.matchday,
- md.matchday_name,
- fp.points_type,
- fp.points,
- fp.points_comment,
- fp.cash
- FROM ' . FOOTB_POINTS . ' AS fp
- INNER JOIN ' . FOOTB_SEASONS . ' AS s ON (s.season = fp.season)
- INNER JOIN ' . FOOTB_LEAGUES . ' AS l ON (l.season = fp.season AND l.league = fp.league)
- INNER JOIN ' . FOOTB_MATCHDAYS . ' AS md ON (md.season = fp.season AND md.league = fp.league AND md.matchday = fp.matchday)
- WHERE user_id = ' . (int) $user_sel . "
- $where_season
- $where_league
- $order_by";
-$result = $db->sql_query($sql);
-
-$current_balance = 0.00;
-$count = 0;
-// Start looping all the football points
-while ($row = $db->sql_fetchrow($result))
-{
- $count = $count + 1;
- if ($row['points_type'] == POINTS_BET OR $row['points_type'] == POINTS_PAID)
- {
- $points_sign = '-';
- $points_style = " color: red;";
- $current_balance -= $row['points'];
- }
- else
- {
- $points_sign = '+';
- $points_style = " color: green;";
- $current_balance += $row['points'];
- }
- // Add the items to the template
- $template->assign_block_vars('football', array(
- 'SEASON' => $season,
- 'SEASON_NAME' => $season_name,
- 'LEAGUE' => $row['league'],
- 'LEAGUE_NAME' => $row['league_name'],
- 'LEAGUE_SHORT' => $row['league_name_short'],
- 'MATCHDAY' => $row['matchday'],
- 'MATCHDAY_NAME' => ($row['matchday_name'] == '') ? $row['matchday'] . '.' . sprintf($user->lang['FOOTBALL_MATCHDAY']) : $row['matchday_name'],
- 'MATCHDAY_SHORT'=> $row['matchday'] . '.' . sprintf($user->lang['MATCHDAY_SHORT']),
- 'POINTS_SIGN' => $points_sign,
- 'POINTS_STYLE' => $points_style,
- 'POINTS_TYPE' => $types[$row['points_type']],
- 'S_CASH' => $row['cash'],
- 'POINTS' => $functions_points->number_format_points($row['points']),
- 'COMMENT' => nl2br($row['points_comment']),
- ));
-}
-$db->sql_freeresult($result);
-
-if ($current_balance < 0)
-{
- $points_style = " color: red;";
-}
-else
-{
- $points_style = " color: green;";
-}
-
-$template->assign_block_vars('football', array(
- 'SEASON' => $season,
- 'SEASON_NAME' => '',
- 'LEAGUE' => $league,
- 'LEAGUE_NAME' => '',
- 'MATCHDAY' => '',
- 'MATCHDAY_NAME' => '',
- 'POINTS_SIGN' => '',
- 'POINTS_STYLE' => $points_style,
- 'POINTS_TYPE' => '',
- 'S_CASH' => 1,
- 'POINTS' => $functions_points->number_format_points($current_balance),
- 'COMMENT' => ($league == 0) ? sprintf($user->lang['FOOTBALL_BALANCES']) : sprintf($user->lang['FOOTBALL_BALANCE']),
-));
-
-$sidename = sprintf($user->lang['FOOTBALL_BANK']);
-$template->assign_vars(array(
- 'S_DISPLAY_BANK' => true,
- 'S_MATCHDAY_HIDE' => true,
- 'S_MEMBER' => $member,
- 'S_SIDENAME' => $sidename,
- 'S_MULTI_VIEW' => $multi_view,
- 'L_TOTAL_ENTRIES' => ($count == 1) ? $count . ' ' .sprintf($user->lang['FOOTBALL_RECORD']) : $count . ' ' .sprintf($user->lang['FOOTBALL_RECORDS']),
- 'U_LEFT' => $this->helper->route('football_main_controller', array('side' => 'ranks_total', 's' => $season, 'l' => $league, 'm' => $matchday)),
- 'LEFT_LINK' => '< ' . sprintf($user->lang['RANK_TOTAL']),
- 'U_RIGHT' => $this->helper->route('football_main_controller', array('side' => 'my_bets', 's' => $season, 'l' => $league, 'm' => $matchday)),
- 'RIGHT_LINK' => sprintf($user->lang['MY_BETS']) . ' >',
- 'LEFT_TITLE' => sprintf($user->lang['TITLE_RANK_TOTAL']),
- 'RIGHT_TITLE' => sprintf($user->lang['TITLE_MY_BETS']),
- 'USERNAME' => $username,
- 'POINTS' => $config['football_win_name'],
- )
-);
-
+auth->acl_get('u_use_football') )
+{
+ trigger_error('NO_AUTH_VIEW');
+
+}
+
+global $phpbb_extension_manager;
+if ($phpbb_extension_manager->is_enabled('dmzx/ultimatepoints'))
+{
+ $this->user->add_lang_ext('dmzx/ultimatepoints', 'common');
+ // Get an instance of the ultimatepoints functions_points
+ $functions_points = $phpbb_container->get('dmzx.ultimatepoints.core.functions.points');
+}
+else
+{
+ // Get an instance of the football functions_points
+ $functions_points = $phpbb_container->get('football.football.core.functions.points');
+}
+
+if (!$user_sel)
+{
+ if (user_is_member($user->data['user_id'], $season, $league) or $league == 0)
+ {
+ $user_sel = $user->data['user_id'];
+ }
+}
+
+$username = '';
+$member = true;
+if ($this->auth->acl_get('a_football_points'))
+{
+ $where_user = '';
+ $multi_view = true;
+}
+else
+{
+ $multi_view = false;
+ if (user_is_member($user->data['user_id'], $season, $league))
+ {
+ $where_user = ' AND b.user_id = ' . $user->data['user_id'] . ' ';
+ $user_sel = $user->data['user_id'];
+ }
+ else
+ {
+ if ($league)
+ {
+ $member = false;
+ }
+ }
+}
+$where_league = '';
+if ($league)
+{
+ $where_league = " AND b.league = $league";
+}
+
+$data = false;
+// Select user
+$total_users = 0;
+$sql = 'SELECT DISTINCT
+ u.user_id,
+ u.username
+ FROM ' . FOOTB_BETS . ' AS b
+ LEFT JOIN ' . USERS_TABLE . " AS u ON (u.user_id = b.user_id)
+ WHERE season = $season
+ $where_league
+ $where_user
+ ORDER BY LOWER(u.username) ASC";
+
+$result = $db->sql_query($sql);
+
+while($row = $db->sql_fetchrow($result))
+{
+ $total_users++;
+ if ($user_sel == $row['user_id'] OR !$user_sel)
+ {
+ $selectid = ' selected="selected"';
+ $username = $row['username'];
+ $user_sel = $row['user_id'];
+ }
+ else
+ {
+ $selectid = '';
+ }
+ $template->assign_block_vars('form_user', array(
+ 'S_USER' => $row['user_id'],
+ 'S_USERNAME' => $row['username'],
+ 'S_SELECTEDID' => $selectid,
+ )
+ );
+}
+$db->sql_freeresult($result);
+
+$where_season = '';
+if ($season)
+{
+ $where_season = " AND fp.season = $season";
+}
+
+$where_league = '';
+$order_by = 'ORDER BY fp.points_type ASC, fp.matchday ASC, fp.league ASC';
+
+if ($league)
+{
+ $where_league = " AND fp.league = $league";
+ $order_by = 'ORDER BY fp.league ASC, fp.matchday ASC, fp.points_type ASC';
+}
+
+// The different book types
+$types = array(
+ 0 => '--',
+ 1 => sprintf($user->lang['FOOTBALL_BET_POINTS']),
+ 2 => $user->lang['FOOTBALL_DEPOSIT'],
+ 3 => sprintf($user->lang['FOOTBALL_WIN']),
+ 4 => $user->lang['FOOTBALL_WIN'],
+ 5 => $user->lang['FOOTBALL_WIN'],
+ 6 => $user->lang['FOOTBALL_WIN'],
+ 7 => $user->lang['FOOTBALL_PAYOUT'],
+);
+
+// Grab the football points
+$sql = 'SELECT fp.season,
+ s.season_name,
+ s.season_name_short,
+ fp.league,
+ l.league_name,
+ l.league_name_short,
+ fp.matchday,
+ md.matchday_name,
+ fp.points_type,
+ fp.points,
+ fp.points_comment,
+ fp.cash
+ FROM ' . FOOTB_POINTS . ' AS fp
+ INNER JOIN ' . FOOTB_SEASONS . ' AS s ON (s.season = fp.season)
+ INNER JOIN ' . FOOTB_LEAGUES . ' AS l ON (l.season = fp.season AND l.league = fp.league)
+ INNER JOIN ' . FOOTB_MATCHDAYS . ' AS md ON (md.season = fp.season AND md.league = fp.league AND md.matchday = fp.matchday)
+ WHERE user_id = ' . (int) $user_sel . "
+ $where_season
+ $where_league
+ $order_by";
+$result = $db->sql_query($sql);
+
+$current_balance = 0.00;
+$count = 0;
+// Start looping all the football points
+while ($row = $db->sql_fetchrow($result))
+{
+ $count = $count + 1;
+ if ($row['points_type'] == POINTS_BET OR $row['points_type'] == POINTS_PAID)
+ {
+ $points_sign = '-';
+ $points_style = " color: red;";
+ $current_balance -= $row['points'];
+ }
+ else
+ {
+ $points_sign = '+';
+ $points_style = " color: green;";
+ $current_balance += $row['points'];
+ }
+ // Add the items to the template
+ $template->assign_block_vars('football', array(
+ 'SEASON' => $season,
+ 'SEASON_NAME' => $season_name,
+ 'LEAGUE' => $row['league'],
+ 'LEAGUE_NAME' => $row['league_name'],
+ 'LEAGUE_SHORT' => $row['league_name_short'],
+ 'MATCHDAY' => $row['matchday'],
+ 'MATCHDAY_NAME' => ($row['matchday_name'] == '') ? $row['matchday'] . '.' . sprintf($user->lang['FOOTBALL_MATCHDAY']) : $row['matchday_name'],
+ 'MATCHDAY_SHORT'=> $row['matchday'] . '.' . sprintf($user->lang['MATCHDAY_SHORT']),
+ 'POINTS_SIGN' => $points_sign,
+ 'POINTS_STYLE' => $points_style,
+ 'POINTS_TYPE' => $types[$row['points_type']],
+ 'S_CASH' => $row['cash'],
+ 'POINTS' => $functions_points->number_format_points($row['points']),
+ 'COMMENT' => nl2br($row['points_comment']),
+ ));
+}
+$db->sql_freeresult($result);
+
+if ($current_balance < 0)
+{
+ $points_style = " color: red;";
+}
+else
+{
+ $points_style = " color: green;";
+}
+
+$template->assign_block_vars('football', array(
+ 'SEASON' => $season,
+ 'SEASON_NAME' => '',
+ 'LEAGUE' => $league,
+ 'LEAGUE_NAME' => '',
+ 'MATCHDAY' => '',
+ 'MATCHDAY_NAME' => '',
+ 'POINTS_SIGN' => '',
+ 'POINTS_STYLE' => $points_style,
+ 'POINTS_TYPE' => '',
+ 'S_CASH' => 1,
+ 'POINTS' => $functions_points->number_format_points($current_balance),
+ 'COMMENT' => ($league == 0) ? sprintf($user->lang['FOOTBALL_BALANCES']) : sprintf($user->lang['FOOTBALL_BALANCE']),
+));
+
+$sidename = sprintf($user->lang['FOOTBALL_BANK']);
+$template->assign_vars(array(
+ 'S_DISPLAY_BANK' => true,
+ 'S_MATCHDAY_HIDE' => true,
+ 'S_MEMBER' => $member,
+ 'S_SIDENAME' => $sidename,
+ 'S_MULTI_VIEW' => $multi_view,
+ 'L_TOTAL_ENTRIES' => ($count == 1) ? $count . ' ' .sprintf($user->lang['FOOTBALL_RECORD']) : $count . ' ' .sprintf($user->lang['FOOTBALL_RECORDS']),
+ 'USERNAME' => $username,
+ 'POINTS' => $config['football_win_name'],
+ )
+);
+
?>
\ No newline at end of file
diff --git a/block/bet.php b/block/bet.php
index dce1b52..56124e9 100644
--- a/block/bet.php
+++ b/block/bet.php
@@ -1,534 +1,530 @@
-data['user_id'];
-$lang_dates = $user->lang['datetime'];
-$user_is_member = user_is_member($userid, $season, $league);
-$display_rating = false;
-
-// Calculate multiple delivery
-$display_delivery2 = false;
-$display_delivery3 = false;
-$delivery2 = '';
-$delivery3 = '';
-$sql = "SELECT
- delivery_date_2,
- delivery_date_3,
- CONCAT(
- CASE DATE_FORMAT(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(delivery_date_2,' %d.%m.%Y %H:%i')
- ) as deliverytime2,
- CONCAT(
- CASE DATE_FORMAT(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(delivery_date_3,' %d.%m.%Y %H:%i')
- ) as deliverytime3
- FROM " . FOOTB_MATCHDAYS . "
- WHERE season = $season
- AND league = $league
- AND matchday = $matchday";
-
-$result = $db->sql_query($sql);
-
-if ($row = $db->sql_fetchrow($result))
-{
- if ($row['delivery_date_2'] <> '')
- {
- $display_delivery2 = true;
- $delivery2 = $row['deliverytime2'];
- }
- if ($row['delivery_date_3'] <> '')
- {
- $display_delivery3 = true;
- $delivery3 = $row['deliverytime3'];
- }
-}
-$db->sql_freeresult($result);
-
-// Calculate matches and bets of matchday
-$sql = "SELECT
- m.league,
- m.match_no,
- m.matchday,
- m.status,
- m.group_id,
- m.formula_home,
- m.formula_guest,
- t1.team_symbol AS home_symbol,
- t2.team_symbol AS guest_symbol,
- t1.team_id AS home_id,
- t2.team_id AS guest_id,
- t1.team_name AS home_name,
- t2.team_name AS guest_name,
- t1.team_name_short AS home_short,
- t2.team_name_short AS guest_short,
- b.goals_home AS bet_home,
- b.goals_guest AS bet_guest,
- m.goals_home,
- m.goals_guest,
- m.trend,
- m.odd_1,
- m.odd_x,
- m.odd_2,
- m.rating,
- CONCAT(
- CASE DATE_FORMAT(m.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(m.match_datetime,' %d.%m. %H:%i')
- ) AS match_time,
- " . select_points() . '
- FROM ' . FOOTB_MATCHES . ' AS m
- INNER JOIN ' . FOOTB_BETS . " AS b ON (b.season = m.season AND b.league = m.league AND b.match_no = m.match_no AND b.user_id = $userid)
- LEFT JOIN " . FOOTB_TEAMS . ' AS t1 ON (t1.season = m.season AND t1.league = m.league AND t1.team_id = m.team_id_home)
- LEFT JOIN ' . FOOTB_TEAMS . " AS t2 ON (t2.season = m.season AND t2.league = m.league AND t2.team_id = m.team_id_guest)
- WHERE m.season = $season
- AND m.league = $league
- AND m.matchday = $matchday
- GROUP BY m.match_no
- ORDER BY m.match_datetime ASC, m.match_no ASC";
-
-$result = $db->sql_query($sql);
-$ext_path = $this->phpbb_path_helper->update_web_root_path($this->phpbb_extension_manager->get_extension_path('football/football', true));
-
-while ($row = $db->sql_fetchrow($result))
-{
- $data_bet = true;
- $matchnumber++ ;
- $row_class = (!($matchnumber % 2)) ? 'bg1 row_light' : 'bg2 row_dark';
- $display_link = true;
- $display_rating = ($display_rating || ($row['rating'] <> '0.00'));
-
- if (0 == $row['home_id'])
- {
- $display_link = false;
- $home_info = get_team($season, $league, $row['match_no'], 'team_id_home', $row['formula_home']);
- $home_in_array = explode("#",$home_info);
- $homelogo = $home_in_array[0];
- $homeid = $home_in_array[1];
- $homename = $home_in_array[2];
- $homeshort = $home_in_array[2];
- }
- else
- {
- $homelogo = $row['home_symbol'];
- $homeid = $row['home_id'];
- $homename = $row['home_name'];
- $homeshort = $row['home_short'];
- }
-
- if (0 == $row['guest_id'])
- {
- $display_link = false;
- $guest_info = get_team($season, $league, $row['match_no'], 'team_id_guest', $row['formula_guest']);
- $guest_in_array = explode("#",$guest_info);
- $guestlogo = $guest_in_array[0];
- $guestid = $guest_in_array[1];
- $guestname = $guest_in_array[2];
- $guestshort = $guest_in_array[2];
- }
- else
- {
- $guestlogo = $row['guest_symbol'];
- $guestid = $row['guest_id'];
- $guestname = $row['guest_name'];
- $guestshort = $row['guest_short'];
- }
- if ($homelogo <> '')
- {
- $logoH = "* ";
- }
- else
- {
- if ($row['status'] == -2)
- {
- $delivertag = "** ";
- }
- else
- {
- $delivertag = '';
- }
- }
-
- if ($row['group_id'] == '')
- {
- $group_id = ' ';
- }
- else
- {
- $data_group = true;
- $group_id = $row['group_id'];
- }
-
- if ($row['status'] <= 0)
- {
- $edit_mode = true;
- $template->assign_block_vars('bet_edit', array(
- 'ROW_CLASS' => $row_class,
- 'LEAGUE_ID' => $row['league'],
- 'MATCH_NUMBER' => $row['match_no'],
- 'MATCHDAY' => $row['matchday'],
- 'STATUS' => $row['status'],
- 'MATCH_TIME' => $row['match_time'],
- 'GROUP' => $group_id,
- 'HOME_ID' => $homeid,
- 'GUEST_ID' => $guestid,
- 'LOGO_HOME' => $logoH,
- 'LOGO_GUEST' => $logoG,
- 'HOME_NAME' => $homename,
- 'GUEST_NAME' => $guestname,
- 'HOME_SHORT' => $homeshort,
- 'GUEST_SHORT' => $guestshort,
- 'U_PLAN_HOME' => $this->helper->route('football_football_popup', array('popside' => 'viewplan_popup', 's' => $season, 'l' => $row['league'],
- 'tid' => $homeid, 'mode' => 'all')),
- 'U_PLAN_GUEST' => $this->helper->route('football_football_popup', array('popside' => 'viewplan_popup', 's' => $season, 'l' => $row['league'],
- 'tid' => $guestid, 'mode' => 'all')),
- 'BET_HOME' => $row['bet_home'],
- 'BET_GUEST' => $row['bet_guest'],
- 'DELIVERTAG' => $delivertag,
- 'GOALS_HOME' => ($row['goals_home'] == '') ? ' ' : $row['goals_home'],
- 'GOALS_GUEST' => ($row['goals_guest'] == '') ? ' ' : $row['goals_guest'],
- 'POINTS' => ($row['points'] == '') ? ' ' : $row['points'],
- 'U_MATCH_STATS' => $this->helper->route('football_football_popup', array('popside' => 'hist_popup', 's' => $season, 'l' => $row['league'],
- 'hid' => $homeid, 'gid' => $guestid, 'm' => $row['matchday'],
- 'mn' => $row['match_no'], 'gr' => $row['group_id'])),
- 'DATA_RESULTS' => $data_bet_results,
- 'DISPLAY_LINK' => $display_link,
- 'TREND' => $row['trend'],
- 'ODDS' => ($row['odd_1'] == '') ? '' : $row['odd_1'] . '|' . $row['odd_x'] . '|' . $row['odd_2'],
- 'RATING' => $row['rating'],
- )
- );
- }
- else
- {
- $data_bet_results = true;
- $colorstyle = color_style($row['status']);
-
- $template->assign_block_vars('bet_view', array(
- 'ROW_CLASS' => $row_class,
- 'LEAGUE_ID' => $row['league'],
- 'MATCH_NUMBER' => $row['match_no'],
- 'MATCHDAY' => $row['matchday'],
- 'STATUS' => $row['status'],
- 'MATCH_TIME' => $row['match_time'],
- 'GROUP' => $group_id,
- 'HOME_ID' => $homeid,
- 'GUEST_ID' => $guestid,
- 'LOGO_HOME' => $logoH,
- 'LOGO_GUEST' => $logoG,
- 'HOME_NAME' => $homename,
- 'GUEST_NAME' => $guestname,
- 'HOME_SHORT' => $homeshort,
- 'GUEST_SHORT' => $guestshort,
- 'BET_HOME' => ($row['bet_home'] == '') ? ' ' : $row['bet_home'],
- 'BET_GUEST' => ($row['bet_guest'] == '') ? ' ' : $row['bet_guest'],
- 'GOALS_HOME' => ($row['goals_home'] == '') ? ' ' : $row['goals_home'],
- 'GOALS_GUEST' => ($row['goals_guest'] == '') ? ' ' : $row['goals_guest'],
- 'POINTS' => ($row['points'] == '') ? ' ' : $row['points'],
- 'U_PLAN_HOME' => $this->helper->route('football_football_popup', array('popside' => 'viewplan_popup', 's' => $season, 'l' => $row['league'],
- 'tid' => $homeid, 'mode' => 'all')),
- 'U_PLAN_GUEST' => $this->helper->route('football_football_popup', array('popside' => 'viewplan_popup', 's' => $season, 'l' => $row['league'],
- 'tid' => $guestid, 'mode' => 'all')),
- 'U_MATCH_STATS' => $this->helper->route('football_football_popup', array('popside' => 'hist_popup', 's' => $season, 'l' => $row['league'],
- 'hid' => $homeid, 'gid' => $guestid, 'm' => $row['matchday'],
- 'mn' => $row['match_no'], 'gr' => $row['group_id'])),
- 'COLOR_STYLE' => $colorstyle,
- 'DISPLAY_LINK' => $display_link,
- 'TREND' => $row['trend'],
- 'ODDS' => ($row['odd_1'] == '') ? '' : $row['odd_1'] . '|' . $row['odd_x'] . '|' . $row['odd_2'],
- 'RATING' => $row['rating'],
- )
- );
- }
-}
-$db->sql_freeresult($result);
-
-// Calculate extra bets of matchday
-// Start select team
-$sql = 'SELECT
- team_id AS option_value,
- team_name AS option_name
- FROM ' . FOOTB_TEAMS . "
- WHERE season = $season
- AND league = $league
- ORDER BY team_name ASC";
-
-$result = $db->sql_query($sql);
-$option_rows = $db->sql_fetchrowset($result);
-$db->sql_freeresult($result);
-
-$sql = "SELECT e.*,
- eb.bet,
- eb.bet_points,
- t1.team_name AS result_team,
- t2.team_name AS bet_team
- FROM " . FOOTB_EXTRA . ' AS e
- LEFT JOIN ' . FOOTB_EXTRA_BETS . " AS eb ON (eb.season = e.season AND eb.league = e.league AND eb.extra_no = e.extra_no AND eb.user_id = $userid)
- LEFT JOIN " . FOOTB_TEAMS . ' AS t1 ON (t1.season = e.season AND t1.league = e.league AND t1.team_id = e.result)
- LEFT JOIN ' . FOOTB_TEAMS . " AS t2 ON (t2.season = e.season AND t2.league = e.league AND t2.team_id = eb.bet)
- WHERE e.season = $season
- AND e.league = $league
- AND e.matchday = $matchday
- ORDER BY e.extra_no ASC";
-
-$result = $db->sql_query($sql);
-
-$extra_bet = false;
-$extra_edit = false;
-$extra_results = false;
-$extranumber = 0;
-
-while ($row = $db->sql_fetchrow($result))
-{
- $extra_bet = true;
- $extranumber++ ;
- $row_class = (!($extranumber % 2)) ? 'bg1 row_light' : 'bg2 row_dark';
-
- switch($row['question_type'])
- {
- case '1':
- {
- $display_type = 1;
- $eval_title = sprintf($user->lang['EXTRA_HIT']);
- }
- break;
- case '2':
- {
- $display_type = 1;
- $eval_title = sprintf($user->lang['EXTRA_MULTI_HIT']);
- }
- break;
- case '3':
- {
- $display_type = 2;
- $eval_title = sprintf($user->lang['EXTRA_HIT']);
- }
- break;
- case '4':
- {
- $display_type = 2;
- $eval_title = sprintf($user->lang['EXTRA_MULTI_HIT']);
- }
- break;
- case '5':
- {
- $display_type = 2;
- $eval_title = sprintf($user->lang['EXTRA_DIFFERENCE']);
- }
- break;
- default :
- {
- $display_type = 2;
- $eval_title = '';
- }
- break;
- }
-
- if ($row['extra_status'] <= 0)
- {
- // edit extra bets
- $extra_edit = true;
- $bet_extra = ($row['bet_team'] == NULL) ? '' : $row['bet_team'];
-
- switch($row['question_type'])
- {
- case '3':
- case '4':
- {
- $option_arr = array();
- for ($i = 65; $i <= 72; $i++)
- {
- if (strstr($row['question'], chr($i) . ':'))
- {
- $option_arr[] = array(
- 'option_value' => chr($i),
- 'option_name' => chr($i),
- );
- }
- }
- if (sizeof($option_arr) > 1)
- {
- $display_type = 1;
- $option_rows = $option_arr;
- $bet_extra = $row['bet'];
- }
- }
- break;
- }
-
- $template->assign_block_vars('extra_edit', array(
- 'ROW_CLASS' => $row_class,
- 'EXTRA_NO' => $row['extra_no'],
- 'QUESTION' => $row['question'],
- 'EXTRA_POINTS' => $row['extra_points'],
- 'EVALUATION' => ($row['matchday'] == $row['matchday_eval']) ? sprintf($user->lang['MATCHDAY']) : sprintf($user->lang['TOTAL']),
- 'EVALUATION_TITLE' => $eval_title,
- 'BET' => ($display_type == 1) ? $bet_extra : $row['bet'],
- 'S_DISPLAY_TYPE' => $display_type,
- )
- );
-
- if ($display_type == 1)
- {
- $selected = ($row['bet'] == '') ? ' selected="selected"' : '';
-
- $template->assign_block_vars('extra_edit.extra_option', array(
- 'OPTION_VALUE' => '',
- 'OPTION_NAME' => sprintf($user->lang['SELECT']),
- 'S_SELECTED' => $selected));
-
- foreach ($option_rows as $option_row)
- {
- $selected = ($row['bet'] && $option_row['option_value'] == $row['bet']) ? ' selected="selected"' : '';
- $template->assign_block_vars('extra_edit.extra_option', array(
- 'OPTION_VALUE' => $option_row['option_value'],
- 'OPTION_NAME' => $option_row['option_name'],
- 'S_SELECTED' => $selected));
- }
- }
- }
- else
- {
- // view extra bets
- $extra_results = true;
- $extra_colorstyle = color_style($row['extra_status']);
- $extra_result = ($row['result'] == '') ? ' ' : $row['result'];
- $result_extra = ($row['result_team'] == NULL) ? ' ' : $row['result_team'];
- $bet = ($row['bet'] == '') ? ' ' : $row['bet'];
- $bet_extra = ($row['bet_team'] == NULL) ? ' ' : $row['bet_team'];
-
- $template->assign_block_vars('extra_view', array(
- 'ROW_CLASS' => $row_class,
- 'QUESTION' => $row['question'],
- 'EXTRA_POINTS' => $row['extra_points'],
- 'EVALUATION' => ($row['matchday'] == $row['matchday_eval']) ? sprintf($user->lang['MATCHDAY']) : sprintf($user->lang['TOTAL']),
- 'EVALUATION_TITLE' => $eval_title,
- 'RESULT' => ($display_type == 1) ? $result_extra : $extra_result,
- 'BET' => ($display_type == 1) ? $bet_extra : $bet,
- 'BET_POINTS' => $row['bet_points'],
- 'COLOR_STYLE' => $extra_colorstyle,
- )
- );
- }
-}
-$league_info = league_info($season, $league);
-$bet_explain = '';
-switch ($league_info['bet_ko_type'])
-{
- case BET_KO_90:
- $bet_explain = sprintf($user->lang['MIN90']);
- break;
- case BET_KO_EXTRATIME:
- $bet_explain = sprintf($user->lang['EXTRATIME_SHORT']);
- break;
- case BET_KO_PENALTY:
- $bet_explain = sprintf($user->lang['PENALTY']);
- break;
- default:
- $bet_explain = sprintf($user->lang['MIN90']);
- break;
-}
-
-$link_rules = '';
-if (!$data_bet AND join_allowed($season, $league) AND $user->data['user_id'] != ANONYMOUS)
-{
- if ($league_info["rules_post_id"])
- {
- $join_league = true;
- $link_rules = append_sid($phpbb_root_path . "viewtopic.$phpEx?p=" . $league_info["rules_post_id"]);
- }
- else
- {
- $link_rules = '';
- }
-}
-
-$sidename = sprintf($user->lang['BET']);
-$template->assign_vars(array(
- 'S_DISPLAY_BET' => true,
- 'S_SIDENAME' => $sidename,
- 'BET_EXPLAIN' => $bet_explain,
- 'U_LEFT' => $this->helper->route('football_main_controller', array('side' => 'stat_results', 's' => $season, 'l' => $league, 'm' => $matchday)),
- 'LEFT_LINK' => '< ' . sprintf($user->lang['STAT_RESULTS']),
- 'U_RIGHT' => $this->helper->route('football_main_controller', array('side' => 'all_bets', 's' => $season, 'l' => $league, 'm' => $matchday)),
- 'RIGHT_LINK' => sprintf($user->lang['ALL_BETS']) . ' >',
- 'LEFT_TITLE' => sprintf($user->lang['TITLE_STAT_RESULTS']),
- 'RIGHT_TITLE' => sprintf($user->lang['TITLE_ALL_BETS']),
- 'JOIN_LEAGUE' => ($link_rules == '') ? '' : sprintf($user->lang['JOIN_LEAGUE'], $link_rules),
- 'S_FORM_ACTION_BET' => $this->helper->route('football_main_controller', array('side' => 'bet', 's' => $season, 'l' => $league, 'm' => $matchday, 'action' => 'bet')),
- 'S_FORM_ACTION_JOIN' => $this->helper->route('football_main_controller', array('side' => 'bet', 's' => $season, 'l' => $league, 'm' => $matchday, 'action' => 'join')),
- 'S_USER_IS_MEMBER' => $user_is_member,
- 'S_DATA_BET' => $data_bet,
- 'S_DATA_GROUP' => $data_group,
- 'S_DATA_BET_RESULTS' => $data_bet_results,
- 'S_EDIT_MODE' => $edit_mode,
- 'S_DISPLAY_DELIVERY2' => $display_delivery2,
- 'S_DISPLAY_DELIVERY3' => $display_delivery3,
- 'S_DELIVERY2' => $delivery2,
- 'S_DELIVERY3' => $delivery3,
- 'S_JOIN_LEAGUE' => $join_league,
- 'S_EXTRA_BET' => $extra_bet,
- 'S_EXTRA_RESULTS' => $extra_results,
- 'S_EXTRA_EDIT' => $extra_edit,
- 'S_DISPLAY_RATING' => $display_rating,
- )
-);
-
+data['user_id'];
+$lang_dates = $user->lang['datetime'];
+$user_is_member = user_is_member($userid, $season, $league);
+$display_rating = false;
+
+// Calculate multiple delivery
+$display_delivery2 = false;
+$display_delivery3 = false;
+$delivery2 = '';
+$delivery3 = '';
+$sql = "SELECT
+ delivery_date_2,
+ delivery_date_3,
+ CONCAT(
+ CASE DATE_FORMAT(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(delivery_date_2,' %d.%m.%Y %H:%i')
+ ) as deliverytime2,
+ CONCAT(
+ CASE DATE_FORMAT(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(delivery_date_3,' %d.%m.%Y %H:%i')
+ ) as deliverytime3
+ FROM " . FOOTB_MATCHDAYS . "
+ WHERE season = $season
+ AND league = $league
+ AND matchday = $matchday";
+
+$result = $db->sql_query($sql);
+
+if ($row = $db->sql_fetchrow($result))
+{
+ if ($row['delivery_date_2'] <> '')
+ {
+ $display_delivery2 = true;
+ $delivery2 = $row['deliverytime2'];
+ }
+ if ($row['delivery_date_3'] <> '')
+ {
+ $display_delivery3 = true;
+ $delivery3 = $row['deliverytime3'];
+ }
+}
+$db->sql_freeresult($result);
+
+// Calculate matches and bets of matchday
+$sql = "SELECT
+ m.league,
+ m.match_no,
+ m.matchday,
+ m.status,
+ m.group_id,
+ m.formula_home,
+ m.formula_guest,
+ t1.team_symbol AS home_symbol,
+ t2.team_symbol AS guest_symbol,
+ t1.team_id AS home_id,
+ t2.team_id AS guest_id,
+ t1.team_name AS home_name,
+ t2.team_name AS guest_name,
+ t1.team_name_short AS home_short,
+ t2.team_name_short AS guest_short,
+ b.goals_home AS bet_home,
+ b.goals_guest AS bet_guest,
+ m.goals_home,
+ m.goals_guest,
+ m.trend,
+ m.odd_1,
+ m.odd_x,
+ m.odd_2,
+ m.rating,
+ CONCAT(
+ CASE DATE_FORMAT(m.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(m.match_datetime,' %d.%m. %H:%i')
+ ) AS match_time,
+ " . select_points() . '
+ FROM ' . FOOTB_MATCHES . ' AS m
+ INNER JOIN ' . FOOTB_BETS . " AS b ON (b.season = m.season AND b.league = m.league AND b.match_no = m.match_no AND b.user_id = $userid)
+ LEFT JOIN " . FOOTB_TEAMS . ' AS t1 ON (t1.season = m.season AND t1.league = m.league AND t1.team_id = m.team_id_home)
+ LEFT JOIN ' . FOOTB_TEAMS . " AS t2 ON (t2.season = m.season AND t2.league = m.league AND t2.team_id = m.team_id_guest)
+ WHERE m.season = $season
+ AND m.league = $league
+ AND m.matchday = $matchday
+ GROUP BY m.match_no
+ ORDER BY m.match_datetime ASC, m.match_no ASC";
+
+$result = $db->sql_query($sql);
+$ext_path = $this->phpbb_path_helper->update_web_root_path($this->phpbb_extension_manager->get_extension_path('football/football', true));
+
+while ($row = $db->sql_fetchrow($result))
+{
+ $data_bet = true;
+ $matchnumber++ ;
+ $row_class = (!($matchnumber % 2)) ? 'bg1 row_light' : 'bg2 row_dark';
+ $display_link = true;
+ $display_rating = ($display_rating || ($row['rating'] <> '0.00'));
+
+ if (0 == $row['home_id'])
+ {
+ $display_link = false;
+ $home_info = get_team($season, $league, $row['match_no'], 'team_id_home', $row['formula_home']);
+ $home_in_array = explode("#",$home_info);
+ $homelogo = $home_in_array[0];
+ $homeid = $home_in_array[1];
+ $homename = $home_in_array[2];
+ $homeshort = $home_in_array[2];
+ }
+ else
+ {
+ $homelogo = $row['home_symbol'];
+ $homeid = $row['home_id'];
+ $homename = $row['home_name'];
+ $homeshort = $row['home_short'];
+ }
+
+ if (0 == $row['guest_id'])
+ {
+ $display_link = false;
+ $guest_info = get_team($season, $league, $row['match_no'], 'team_id_guest', $row['formula_guest']);
+ $guest_in_array = explode("#",$guest_info);
+ $guestlogo = $guest_in_array[0];
+ $guestid = $guest_in_array[1];
+ $guestname = $guest_in_array[2];
+ $guestshort = $guest_in_array[2];
+ }
+ else
+ {
+ $guestlogo = $row['guest_symbol'];
+ $guestid = $row['guest_id'];
+ $guestname = $row['guest_name'];
+ $guestshort = $row['guest_short'];
+ }
+ if ($homelogo <> '')
+ {
+ $logoH = "* ";
+ }
+ else
+ {
+ if ($row['status'] == -2)
+ {
+ $delivertag = "** ";
+ }
+ else
+ {
+ $delivertag = '';
+ }
+ }
+
+ if ($row['group_id'] == '')
+ {
+ $group_id = ' ';
+ }
+ else
+ {
+ $data_group = true;
+ $group_id = $row['group_id'];
+ }
+
+ if ($row['status'] <= 0)
+ {
+ $edit_mode = true;
+ $template->assign_block_vars('bet_edit', array(
+ 'ROW_CLASS' => $row_class,
+ 'LEAGUE_ID' => $row['league'],
+ 'MATCH_NUMBER' => $row['match_no'],
+ 'MATCHDAY' => $row['matchday'],
+ 'STATUS' => $row['status'],
+ 'MATCH_TIME' => $row['match_time'],
+ 'GROUP' => $group_id,
+ 'HOME_ID' => $homeid,
+ 'GUEST_ID' => $guestid,
+ 'LOGO_HOME' => $logoH,
+ 'LOGO_GUEST' => $logoG,
+ 'HOME_NAME' => $homename,
+ 'GUEST_NAME' => $guestname,
+ 'HOME_SHORT' => $homeshort,
+ 'GUEST_SHORT' => $guestshort,
+ 'U_PLAN_HOME' => $this->helper->route('football_football_popup', array('popside' => 'viewplan_popup', 's' => $season, 'l' => $row['league'],
+ 'tid' => $homeid, 'mode' => 'all')),
+ 'U_PLAN_GUEST' => $this->helper->route('football_football_popup', array('popside' => 'viewplan_popup', 's' => $season, 'l' => $row['league'],
+ 'tid' => $guestid, 'mode' => 'all')),
+ 'BET_HOME' => $row['bet_home'],
+ 'BET_GUEST' => $row['bet_guest'],
+ 'DELIVERTAG' => $delivertag,
+ 'GOALS_HOME' => ($row['goals_home'] == '') ? ' ' : $row['goals_home'],
+ 'GOALS_GUEST' => ($row['goals_guest'] == '') ? ' ' : $row['goals_guest'],
+ 'POINTS' => ($row['points'] == '') ? ' ' : $row['points'],
+ 'U_MATCH_STATS' => $this->helper->route('football_football_popup', array('popside' => 'hist_popup', 's' => $season, 'l' => $row['league'],
+ 'hid' => $homeid, 'gid' => $guestid, 'm' => $row['matchday'],
+ 'mn' => $row['match_no'], 'gr' => $row['group_id'])),
+ 'DATA_RESULTS' => $data_bet_results,
+ 'DISPLAY_LINK' => $display_link,
+ 'TREND' => $row['trend'],
+ 'ODDS' => ($row['odd_1'] == '') ? '' : $row['odd_1'] . '|' . $row['odd_x'] . '|' . $row['odd_2'],
+ 'RATING' => $row['rating'],
+ )
+ );
+ }
+ else
+ {
+ $data_bet_results = true;
+ $colorstyle = color_style($row['status']);
+
+ $template->assign_block_vars('bet_view', array(
+ 'ROW_CLASS' => $row_class,
+ 'LEAGUE_ID' => $row['league'],
+ 'MATCH_NUMBER' => $row['match_no'],
+ 'MATCHDAY' => $row['matchday'],
+ 'STATUS' => $row['status'],
+ 'MATCH_TIME' => $row['match_time'],
+ 'GROUP' => $group_id,
+ 'HOME_ID' => $homeid,
+ 'GUEST_ID' => $guestid,
+ 'LOGO_HOME' => $logoH,
+ 'LOGO_GUEST' => $logoG,
+ 'HOME_NAME' => $homename,
+ 'GUEST_NAME' => $guestname,
+ 'HOME_SHORT' => $homeshort,
+ 'GUEST_SHORT' => $guestshort,
+ 'BET_HOME' => ($row['bet_home'] == '') ? ' ' : $row['bet_home'],
+ 'BET_GUEST' => ($row['bet_guest'] == '') ? ' ' : $row['bet_guest'],
+ 'GOALS_HOME' => ($row['goals_home'] == '') ? ' ' : $row['goals_home'],
+ 'GOALS_GUEST' => ($row['goals_guest'] == '') ? ' ' : $row['goals_guest'],
+ 'POINTS' => ($row['points'] == '') ? ' ' : $row['points'],
+ 'U_PLAN_HOME' => $this->helper->route('football_football_popup', array('popside' => 'viewplan_popup', 's' => $season, 'l' => $row['league'],
+ 'tid' => $homeid, 'mode' => 'all')),
+ 'U_PLAN_GUEST' => $this->helper->route('football_football_popup', array('popside' => 'viewplan_popup', 's' => $season, 'l' => $row['league'],
+ 'tid' => $guestid, 'mode' => 'all')),
+ 'U_MATCH_STATS' => $this->helper->route('football_football_popup', array('popside' => 'hist_popup', 's' => $season, 'l' => $row['league'],
+ 'hid' => $homeid, 'gid' => $guestid, 'm' => $row['matchday'],
+ 'mn' => $row['match_no'], 'gr' => $row['group_id'])),
+ 'COLOR_STYLE' => $colorstyle,
+ 'DISPLAY_LINK' => $display_link,
+ 'TREND' => $row['trend'],
+ 'ODDS' => ($row['odd_1'] == '') ? '' : $row['odd_1'] . '|' . $row['odd_x'] . '|' . $row['odd_2'],
+ 'RATING' => $row['rating'],
+ )
+ );
+ }
+}
+$db->sql_freeresult($result);
+
+// Calculate extra bets of matchday
+// Start select team
+$sql = 'SELECT
+ team_id AS option_value,
+ team_name AS option_name
+ FROM ' . FOOTB_TEAMS . "
+ WHERE season = $season
+ AND league = $league
+ ORDER BY team_name ASC";
+
+$result = $db->sql_query($sql);
+$option_rows = $db->sql_fetchrowset($result);
+$db->sql_freeresult($result);
+
+$sql = "SELECT e.*,
+ eb.bet,
+ eb.bet_points,
+ t1.team_name AS result_team,
+ t2.team_name AS bet_team
+ FROM " . FOOTB_EXTRA . ' AS e
+ LEFT JOIN ' . FOOTB_EXTRA_BETS . " AS eb ON (eb.season = e.season AND eb.league = e.league AND eb.extra_no = e.extra_no AND eb.user_id = $userid)
+ LEFT JOIN " . FOOTB_TEAMS . ' AS t1 ON (t1.season = e.season AND t1.league = e.league AND t1.team_id = e.result)
+ LEFT JOIN ' . FOOTB_TEAMS . " AS t2 ON (t2.season = e.season AND t2.league = e.league AND t2.team_id = eb.bet)
+ WHERE e.season = $season
+ AND e.league = $league
+ AND e.matchday = $matchday
+ ORDER BY e.extra_no ASC";
+
+$result = $db->sql_query($sql);
+
+$extra_bet = false;
+$extra_edit = false;
+$extra_results = false;
+$extranumber = 0;
+
+while ($row = $db->sql_fetchrow($result))
+{
+ $extra_bet = true;
+ $extranumber++ ;
+ $row_class = (!($extranumber % 2)) ? 'bg1 row_light' : 'bg2 row_dark';
+
+ switch($row['question_type'])
+ {
+ case '1':
+ {
+ $display_type = 1;
+ $eval_title = sprintf($user->lang['EXTRA_HIT']);
+ }
+ break;
+ case '2':
+ {
+ $display_type = 1;
+ $eval_title = sprintf($user->lang['EXTRA_MULTI_HIT']);
+ }
+ break;
+ case '3':
+ {
+ $display_type = 2;
+ $eval_title = sprintf($user->lang['EXTRA_HIT']);
+ }
+ break;
+ case '4':
+ {
+ $display_type = 2;
+ $eval_title = sprintf($user->lang['EXTRA_MULTI_HIT']);
+ }
+ break;
+ case '5':
+ {
+ $display_type = 2;
+ $eval_title = sprintf($user->lang['EXTRA_DIFFERENCE']);
+ }
+ break;
+ default :
+ {
+ $display_type = 2;
+ $eval_title = '';
+ }
+ break;
+ }
+
+ if ($row['extra_status'] <= 0)
+ {
+ // edit extra bets
+ $extra_edit = true;
+ $bet_extra = ($row['bet_team'] == NULL) ? '' : $row['bet_team'];
+
+ switch($row['question_type'])
+ {
+ case '3':
+ case '4':
+ {
+ $option_arr = array();
+ for ($i = 65; $i <= 72; $i++)
+ {
+ if (strstr($row['question'], chr($i) . ':'))
+ {
+ $option_arr[] = array(
+ 'option_value' => chr($i),
+ 'option_name' => chr($i),
+ );
+ }
+ }
+ if (sizeof($option_arr) > 1)
+ {
+ $display_type = 1;
+ $option_rows = $option_arr;
+ $bet_extra = $row['bet'];
+ }
+ }
+ break;
+ }
+
+ $template->assign_block_vars('extra_edit', array(
+ 'ROW_CLASS' => $row_class,
+ 'EXTRA_NO' => $row['extra_no'],
+ 'QUESTION' => $row['question'],
+ 'EXTRA_POINTS' => $row['extra_points'],
+ 'EVALUATION' => ($row['matchday'] == $row['matchday_eval']) ? sprintf($user->lang['MATCHDAY']) : sprintf($user->lang['TOTAL']),
+ 'EVALUATION_TITLE' => $eval_title,
+ 'BET' => ($display_type == 1) ? $bet_extra : $row['bet'],
+ 'S_DISPLAY_TYPE' => $display_type,
+ )
+ );
+
+ if ($display_type == 1)
+ {
+ $selected = ($row['bet'] == '') ? ' selected="selected"' : '';
+
+ $template->assign_block_vars('extra_edit.extra_option', array(
+ 'OPTION_VALUE' => '',
+ 'OPTION_NAME' => sprintf($user->lang['SELECT']),
+ 'S_SELECTED' => $selected));
+
+ foreach ($option_rows as $option_row)
+ {
+ $selected = ($row['bet'] && $option_row['option_value'] == $row['bet']) ? ' selected="selected"' : '';
+ $template->assign_block_vars('extra_edit.extra_option', array(
+ 'OPTION_VALUE' => $option_row['option_value'],
+ 'OPTION_NAME' => $option_row['option_name'],
+ 'S_SELECTED' => $selected));
+ }
+ }
+ }
+ else
+ {
+ // view extra bets
+ $extra_results = true;
+ $extra_colorstyle = color_style($row['extra_status']);
+ $extra_result = ($row['result'] == '') ? ' ' : $row['result'];
+ $result_extra = ($row['result_team'] == NULL) ? ' ' : $row['result_team'];
+ $bet = ($row['bet'] == '') ? ' ' : $row['bet'];
+ $bet_extra = ($row['bet_team'] == NULL) ? ' ' : $row['bet_team'];
+
+ $template->assign_block_vars('extra_view', array(
+ 'ROW_CLASS' => $row_class,
+ 'QUESTION' => $row['question'],
+ 'EXTRA_POINTS' => $row['extra_points'],
+ 'EVALUATION' => ($row['matchday'] == $row['matchday_eval']) ? sprintf($user->lang['MATCHDAY']) : sprintf($user->lang['TOTAL']),
+ 'EVALUATION_TITLE' => $eval_title,
+ 'RESULT' => ($display_type == 1) ? $result_extra : $extra_result,
+ 'BET' => ($display_type == 1) ? $bet_extra : $bet,
+ 'BET_POINTS' => $row['bet_points'],
+ 'COLOR_STYLE' => $extra_colorstyle,
+ )
+ );
+ }
+}
+$db->sql_freeresult($result);
+
+$league_info = league_info($season, $league);
+$bet_explain = '';
+switch ($league_info['bet_ko_type'])
+{
+ case BET_KO_90:
+ $bet_explain = sprintf($user->lang['MIN90']);
+ break;
+ case BET_KO_EXTRATIME:
+ $bet_explain = sprintf($user->lang['EXTRATIME_SHORT']);
+ break;
+ case BET_KO_PENALTY:
+ $bet_explain = sprintf($user->lang['PENALTY']);
+ break;
+ default:
+ $bet_explain = sprintf($user->lang['MIN90']);
+ break;
+}
+
+$link_rules = '';
+if (!$data_bet AND join_allowed($season, $league) AND $user->data['user_id'] != ANONYMOUS)
+{
+ if ($league_info["rules_post_id"])
+ {
+ $join_league = true;
+ $link_rules = append_sid($phpbb_root_path . "viewtopic.$phpEx?p=" . $league_info["rules_post_id"]);
+ }
+ else
+ {
+ $link_rules = '';
+ }
+}
+
+$sidename = sprintf($user->lang['BET']);
+$template->assign_vars(array(
+ 'S_DISPLAY_BET' => true,
+ 'S_SIDENAME' => $sidename,
+ 'BET_EXPLAIN' => $bet_explain,
+ 'JOIN_LEAGUE' => ($link_rules == '') ? '' : sprintf($user->lang['JOIN_LEAGUE'], $link_rules),
+ 'S_FORM_ACTION_BET' => $this->helper->route('football_main_controller', array('side' => 'bet', 's' => $season, 'l' => $league, 'm' => $matchday, 'action' => 'bet')),
+ 'S_FORM_ACTION_JOIN' => $this->helper->route('football_main_controller', array('side' => 'bet', 's' => $season, 'l' => $league, 'm' => $matchday, 'action' => 'join')),
+ 'S_USER_IS_MEMBER' => $user_is_member,
+ 'S_DATA_BET' => $data_bet,
+ 'S_DATA_GROUP' => $data_group,
+ 'S_DATA_BET_RESULTS' => $data_bet_results,
+ 'S_EDIT_MODE' => $edit_mode,
+ 'S_DISPLAY_DELIVERY2' => $display_delivery2,
+ 'S_DISPLAY_DELIVERY3' => $display_delivery3,
+ 'S_DELIVERY2' => $delivery2,
+ 'S_DELIVERY3' => $delivery3,
+ 'S_JOIN_LEAGUE' => $join_league,
+ 'S_EXTRA_BET' => $extra_bet,
+ 'S_EXTRA_RESULTS' => $extra_results,
+ 'S_EXTRA_EDIT' => $extra_edit,
+ 'S_DISPLAY_RATING' => $display_rating,
+ )
+);
+
?>
\ No newline at end of file
diff --git a/block/bet_popup.php b/block/bet_popup.php
index f892cd5..8b82199 100644
--- a/block/bet_popup.php
+++ b/block/bet_popup.php
@@ -1,391 +1,392 @@
-data['user_id'] == ANONYMOUS)
- {
- trigger_error('NO_GUEST_VIEW');
- }
-}
-if (!$config['football_user_view'])
-{
- // Only Prediction League member should see this page
- // Check Prediction League authorisation
- if ( !$this->auth->acl_get('u_use_football') )
- {
- trigger_error('NO_AUTH_VIEW');
- }
-}
-
-// Football disabled?
-if ($config['football_disable'])
-{
- $message = (!empty($config['football_disable_msg'])) ? $config['football_disable_msg'] : 'FOOTBALL_DISABLED';
- trigger_error($message);
-}
-
-$userid = $this->request->variable('u', 0);
-$season = $this->request->variable('s', 0);
-$league = $this->request->variable('l', 0);
-$matchday = $this->request->variable('m', 0);
-
-$error_message = '';
-$username = '?';
-if (!$userid OR !$season OR !$league OR !$matchday)
-{
- $data_bet = false;
- if (!$userid)
- {
- $error_message .= sprintf($user->lang['NO_USERID']) . '{L_NO_MATCHES_ON_MATCHDAY}
-
- {L_NO_MEMBER}
-
-
-
-
-
-
- {L_NO_MATCHES_ON_MATCHDAY}
+
+ {L_NO_MEMBER}
+
+
+
+
+
+
+
-
- {delivery.DELIVERY} {delivery.LEAGUE_SHORT} {delivery.MATCHDAY_NAME}
-
+
+ {delivery.DELIVERY} {delivery.LEAGUE_SHORT} {delivery.MATCHDAY_NAME}
+ {S_FOOTBALL_NAME} {S_FOOTBALL_NAME} 
- {S_FOOTBALL_NAME}
- 
-
-