\ No newline at end of file
diff --git a/adm/style/acp_football_leagues.html b/adm/style/acp_football_leagues.html
index 7504d93..090bc06 100644
--- a/adm/style/acp_football_leagues.html
+++ b/adm/style/acp_football_leagues.html
@@ -33,7 +33,7 @@
-
-
+
+Diese Datei existiert doppelt: Einmal im fooball\football\styles\prsilver\template und einmal im fooball\football\adm\style Ordner
+Mit Hilfe dieser Datei werden Fussballergebnisse zum Abgleich und schnelleren Erfassung von externen Seiten,
+wie z.B. den Weltfussball.de Torverteiler, eingebunden.
+Wenn ihr einen Weltfussball.de Account habt, könnt ihr dort in der Community einen Torverteiler erstellen und den Code hier
+unter der entsprechenden Liganummer reinhängen (also 999999 mit der Liganummer bzw. wfb_tv_id ersetzen).
+Der Frame wird dann bei der Ergebnisseingabe in der Liga angezeigt, wenn der Spieltag editierbar ist.
+
+
+
+
+
+
diff --git a/block/all_bets.php b/block/all_bets.php
index b65ff46..9106415 100644
--- a/block/all_bets.php
+++ b/block/all_bets.php
@@ -7,7 +7,7 @@
*
*/
-if (!defined('IN_PHPBB') OR !defined('IN_FOOTBALL'))
+if (!defined('IN_PHPBB'))
{
exit;
}
@@ -118,7 +118,7 @@ $sql_limit = $config['football_users_per_page'] * $count_matches;
// If we've got a hightlight set pass it on to pagination.
// handle pagination.
-$base_url = $this->helper->route('football_main_controller', array('side' => 'all_bets', 's' => $season, 'l' => $league, 'm' => $matchday));
+$base_url = $this->helper->route('football_football_controller', array('side' => 'all_bets', 's' => $season, 'l' => $league, 'm' => $matchday));
$pagination = $phpbb_container->get('pagination');
if ($user->data['football_mobile'])
{
@@ -152,8 +152,8 @@ if ($count_matches > 0)
LEFT JOIN ' . USERS_TABLE . ' AS u ON (u.user_id = b.user_id)
LEFT JOIN ' . FOOTB_MATCHES . ' AS m2 ON (m2.season = m.season AND m2.league = m.league + 50 AND m2.matchday = m.matchday AND m2.team_id_home = b.user_id + 2000)
LEFT JOIN ' . FOOTB_MATCHES . " AS m3 ON (m3.season = m.season AND m3.league = m.league + 50 AND m3.matchday = m.matchday AND m3.team_id_guest = b.user_id + 2000)
- WHERE m.season = $season
- AND m.league = $league
+ WHERE m.season = $season
+ AND m.league = $league
AND m.matchday = $matchday
ORDER BY IFNULL(m2.match_no,m3.match_no) ASC, m3.match_no ASC, LOWER(u.username) ASC, m.match_datetime ASC, m.match_no ASC";
}
@@ -172,8 +172,8 @@ if ($count_matches > 0)
LEFT JOIN ' . USERS_TABLE . ' AS u ON (u.user_id = b.user_id)
LEFT JOIN ' . FOOTB_MATCHES . ' AS m2 ON (m2.season = m.season AND m2.league = m.league + 50 AND m2.matchday = m.matchday AND m2.team_id_home = b.user_id + 2000)
LEFT JOIN ' . FOOTB_MATCHES . " AS m3 ON (m3.season = m.season AND m3.league = m.league + 50 AND m3.matchday = m.matchday AND m3.team_id_guest = b.user_id + 2000)
- WHERE m.season = $season
- AND m.league = $league
+ WHERE m.season = $season
+ AND m.league = $league
AND m.matchday = $matchday
AND (m3.match_no IS NOT NULL OR m2.match_no IS NOT NULL)
ORDER BY IFNULL(m2.match_no,m3.match_no) ASC, m3.match_no ASC, LOWER(u.username) ASC, m.match_datetime ASC, m.match_no ASC";
@@ -375,7 +375,7 @@ if ($count_matches > 0)
)
);
$total = 0;
- }
+ }
$bet_index++;
$total += ($user_bet['points'] == '') ? 0 : $user_bet['points'];
if ($user_bet['status'] < 3)
@@ -393,7 +393,7 @@ if ($count_matches > 0)
$bet_home = $user_bet['bet_home'];
$bet_guest = $user_bet['bet_guest'];
}
-
+
$colorstyle_bet = color_style($user_bet['status']);
$template->assign_block_vars('match_panel.user_row.bet', array(
'BET' => $bet_home. ':'. $bet_guest,
@@ -565,4 +565,3 @@ $template->assign_vars(array(
'TOTAL_USERS' => ($total_users == 1) ? $user->lang['VIEW_BET_USER'] : sprintf($user->lang['VIEW_BET_USERS'], $total_users),
)
);
-?>
\ No newline at end of file
diff --git a/block/bank.php b/block/bank.php
index 79a8a42..fa0e7c1 100644
--- a/block/bank.php
+++ b/block/bank.php
@@ -7,6 +7,11 @@
*
*/
+if (!defined('IN_PHPBB'))
+{
+ exit;
+}
+
// Check Prediction League authorisation
if ( !$this->auth->acl_get('u_use_football') )
{
@@ -225,5 +230,3 @@ $template->assign_vars(array(
'POINTS' => $config['football_win_name'],
)
);
-
-?>
\ No newline at end of file
diff --git a/block/bet.php b/block/bet.php
index a7b0bb8..b2c0a8e 100644
--- a/block/bet.php
+++ b/block/bet.php
@@ -7,7 +7,7 @@
*
*/
-if (!defined('IN_PHPBB') OR !defined('IN_FOOTBALL'))
+if (!defined('IN_PHPBB'))
{
exit;
}
@@ -509,8 +509,8 @@ $template->assign_vars(array(
'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_FORM_ACTION_BET' => $this->helper->route('football_football_controller', array('side' => 'bet', 's' => $season, 'l' => $league, 'm' => $matchday, 'action' => 'bet')),
+ 'S_FORM_ACTION_JOIN' => $this->helper->route('football_football_controller', array('side' => 'bet', 's' => $season, 'l' => $league, 'm' => $matchday, 'action' => 'join')),
'S_USER_IS_MEMBER' => $user_is_member,
'S_DATA_BET' => $data_bet && $user_is_allowed_to_bet,
'S_DATA_GROUP' => $data_group,
@@ -527,5 +527,3 @@ $template->assign_vars(array(
'S_DISPLAY_RATING' => $display_rating,
)
);
-
-?>
\ No newline at end of file
diff --git a/block/bet_popup.php b/block/bet_popup.php
index 8b82199..1bd4d55 100644
--- a/block/bet_popup.php
+++ b/block/bet_popup.php
@@ -7,6 +7,11 @@
*
*/
+if (!defined('IN_PHPBB'))
+{
+ exit;
+}
+
// Can this user view Prediction Leagues pages?
if (!$config['football_guest_view'])
{
@@ -389,4 +394,3 @@ $template->set_filenames(array(
);
page_footer();
-?>
\ No newline at end of file
diff --git a/block/delivery.php b/block/delivery.php
index 7ce3dfa..8374473 100644
--- a/block/delivery.php
+++ b/block/delivery.php
@@ -7,7 +7,7 @@
*
*/
-if (!defined('IN_PHPBB') OR !defined('IN_FOOTBALL'))
+if (!defined('IN_PHPBB'))
{
exit;
}
@@ -43,8 +43,8 @@ $sql = "SELECT
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.status <= 0
- GROUP BY delivery, m.league
- ORDER BY delivery, m.league";
+ GROUP BY m.season, m.league, m.matchday, l.league_name_short, matchday_name, delivery
+ ORDER BY delivery, m.season, m.league";
$result = $db->sql_query($sql);
while($row = $db->sql_fetchrow($result) AND $index < 11)
@@ -55,7 +55,7 @@ while($row = $db->sql_fetchrow($result) AND $index < 11)
$template->assign_block_vars('delivery', array(
'ROW_CLASS' => $row_class,
- 'U_BET_LINK' => $this->helper->route('football_main_controller', array('side' => 'bet', 's' => $row['season'], 'l' => $row['league'], 'm' => $row['matchday'])),
+ 'U_BET_LINK' => $this->helper->route('football_football_controller', array('side' => 'bet', 's' => $row['season'], 'l' => $row['league'], 'm' => $row['matchday'])),
'LEAGUE_SHORT' => $row['league_name_short'],
'MATCHDAY_NAME' => $row['matchday_name'],
'COLOR' => ($row['bets_count'] == $row['matches_count'] && $row['extra_bets_count'] == $row['extra_count']) ? 'green' : 'red',
@@ -71,5 +71,3 @@ $template->assign_vars(array(
'S_DATA_DELIVERY' => $data_delivery,
)
);
-
-?>
\ No newline at end of file
diff --git a/block/dload_bank.php b/block/dload_bank.php
index 715ac24..b644b65 100644
--- a/block/dload_bank.php
+++ b/block/dload_bank.php
@@ -7,6 +7,11 @@
*
*/
+if (!defined('IN_PHPBB'))
+{
+ exit;
+}
+
$this->user->add_lang_ext('football/football', 'info_acp_bank');
// Check Prediction League authorisation
@@ -16,11 +21,11 @@ if ( !$this->auth->acl_get('u_use_football') )
}
$action='';
- $phpbb_root_path = './../../';
+$phpbb_root_path = './../../';
if (!$season OR !$league)
{
- redirect($this->helper->route('football_main_controller', array('side' => 'bank', 's' => $season, 'l' => $league)));
+ redirect($this->helper->route('football_football_controller', array('side' => 'bank', 's' => $season, 'l' => $league)));
}
else
{
@@ -90,14 +95,10 @@ else
}
$user_rows = $db->sql_fetchrowset($result);
$db->sql_freeresult($result);
- $export_file = $league_short . '_' . $season . '_bank.csv';
$newline = "\r\n";
- header('Pragma: no-cache');
- header("Content-Type: text/csv; name=\"$export_file\"");
- header("Content-disposition: attachment; filename=$export_file");
- $export= '';
- $export .= $league_name . ' ' . sprintf($user->lang['SEASON']) . ' ' . $season. $newline;
- $export .= sprintf($user->lang['NAME']) . ';' . $config['football_win_name'] . ';' . sprintf($user->lang['BET_POINTS']) . ';' .
+ $csv_data= '';
+ $csv_data .= $league_name . ' ' . sprintf($user->lang['SEASON']) . ' ' . $season. $newline;
+ $csv_data .= sprintf($user->lang['NAME']) . ';' . $config['football_win_name'] . ';' . sprintf($user->lang['BET_POINTS']) . ';' .
sprintf($user->lang['DEPOSITED']) . ';' . sprintf($user->lang['DEPOSIT']) . ';' . sprintf($user->lang['WINS']) . ';' .
sprintf($user->lang['PAID']) . ';' . sprintf($user->lang['PAYOUT']) . ';' . $newline;
@@ -118,7 +119,7 @@ else
$no_cash_wins = '';
$no_cash_paid = '';
}
- $export .= str_replace("\"", "\"\"", $user_row['username']) . ';' .
+ $csv_data .= str_replace("\"", "\"\"", $user_row['username']) . ';' .
str_replace('.', ',', $user_row['user_points']) . ';' .
str_replace('.', ',', $user_row['bet_points']) . $no_cash_bet_points . ';' .
str_replace('.', ',', $user_row['deposit']) . $no_cash_deposit . ';' .
@@ -127,9 +128,24 @@ else
str_replace('.', ',', $user_row['paid']) . $no_cash_paid . ';' .
str_replace('.', ',', $user_row['new_pay']) . ';' . $newline;
}
- echo utf8_decode($export);
- exit;
+
+ // Output the csv file
+ $filename = $league_short . '_' . $season . '_bank.csv';
+ $fp = fopen('php://output', 'w');
+
+ header('Content-Type: application/octet-stream');
+ header("Content-disposition: attachment; filename=\"" . basename($filename) . "\"");
+ header('Expires: 0');
+ header('Cache-Control: must-revalidate, post-check=0, pre-check=0');
+ header('Cache-Control: private', false);
+ header('Pragma: public');
+ header('Content-Transfer-Encoding: binary');
+
+ fwrite($fp, "\xEF\xBB\xBF"); // UTF-8 BOM
+
+ fwrite($fp, utf8_decode($csv_data));
+ fclose($fp);
+ exit_handler();
}
}
}
-?>
\ No newline at end of file
diff --git a/block/dload_bank_open.php b/block/dload_bank_open.php
index 502969a..36b1582 100644
--- a/block/dload_bank_open.php
+++ b/block/dload_bank_open.php
@@ -7,6 +7,11 @@
*
*/
+if (!defined('IN_PHPBB'))
+{
+ exit;
+}
+
$this->user->add_lang_ext('football/football', 'info_acp_bank');
// Check Prediction League authorisation
@@ -19,7 +24,7 @@ $action='';
if (!$season)
{
- redirect($this->helper->route('football_main_controller', array('side' => 'bank', 's' => $season)));
+ redirect($this->helper->route('football_football_controller', array('side' => 'bank', 's' => $season)));
}
else
{
@@ -50,14 +55,10 @@ else
}
$user_rows = $db->sql_fetchrowset($result);
$db->sql_freeresult($result);
- $export_file = $season. '_bank.csv';
$newline = "\r\n";
- header('Pragma: no-cache');
- header("Content-Type: text/csv; name=\"$export_file\"");
- header("Content-disposition: attachment; filename=$export_file");
- $export= '';
- $export .= sprintf($user->lang['SEASON']) . ' ' . $season. $newline;
- $export .= sprintf($user->lang['NAME']) . ';' . sprintf($user->lang['SEASON']) . ';' . sprintf($user->lang['LEAGUE']) . ';Saldo;' . $newline;
+ $csv_data= '';
+ $csv_data .= sprintf($user->lang['SEASON']) . ' ' . $season. $newline;
+ $csv_data .= sprintf($user->lang['NAME']) . ';' . sprintf($user->lang['SEASON']) . ';' . sprintf($user->lang['LEAGUE']) . ';Saldo;' . $newline;
$last_username = '';
$sum_saldo = 0.0;
@@ -65,11 +66,11 @@ else
{
if ($last_username != '' AND $last_username != $user_row['username'])
{
- $export .= str_replace("\"", "\"\"", $last_username) . ';Summe;;' .
+ $csv_data .= str_replace("\"", "\"\"", $last_username) . ';Summe;;' .
str_replace('.', ',', $sum_saldo) . ';' . $newline;
$sum_saldo = 0.0;
}
- $export .= str_replace("\"", "\"\"", $user_row['username']) . ';' .
+ $csv_data .= str_replace("\"", "\"\"", $user_row['username']) . ';' .
$user_row['season'] . ';' .
$user_row['league'] . ';' .
str_replace('.', ',', $user_row['saldo']) . ';' . $newline;
@@ -78,11 +79,25 @@ else
}
if ($last_username != '')
{
- $export .= str_replace("\"", "\"\"", $last_username) . ';Summe;;' .
+ $csv_data .= str_replace("\"", "\"\"", $last_username) . ';Summe;;' .
str_replace('.', ',', $sum_saldo) . ';' . $newline;
}
- echo utf8_decode($export);
- exit;
+ // Output the csv file
+ $filename = $season. '_bank.csv';
+ $fp = fopen('php://output', 'w');
+
+ header('Content-Type: application/octet-stream');
+ header("Content-disposition: attachment; filename=\"" . basename($filename) . "\"");
+ header('Expires: 0');
+ header('Cache-Control: must-revalidate, post-check=0, pre-check=0');
+ header('Cache-Control: private', false);
+ header('Pragma: public');
+ header('Content-Transfer-Encoding: binary');
+
+ fwrite($fp, "\xEF\xBB\xBF"); // UTF-8 BOM
+
+ fwrite($fp, utf8_decode($csv_data));
+ fclose($fp);
+ exit_handler();
}
}
-?>
\ No newline at end of file
diff --git a/block/dload_export.php b/block/dload_export.php
index 8465686..7fdf1c9 100644
--- a/block/dload_export.php
+++ b/block/dload_export.php
@@ -1,52 +1,55 @@
-auth->acl_get('u_use_football') )
-{
- trigger_error('NO_AUTH_VIEW');
-}
-
-$action='';
-
-if (!$season OR !$league)
-{
- redirect($this->helper->route('football_main_controller', array('side' => 'bet')));
-}
-else
-{
- if (user_is_member($user->data['user_id'], $season, $league))
- {
- $season_info = season_info($season);
- if (!sizeof($season_info))
- {
- $error_message = sprintf($user->lang['NO_SEASON']);
- trigger_error($error_message);
- }
- else
- {
- $league_info = league_info($season, $league);
- if (!sizeof($league_info))
- {
- $error_message = sprintf($user->lang['NO_LEAGUE']);
- trigger_error($error_message);
- }
- else
- {
- include($this->football_includes_path . 'export.' . $this->php_ext);
- }
- }
- }
- else
- {
- redirect($this->helper->route('football_main_controller', array('side' => 'bet')));
- }
-}
-
-?>
+auth->acl_get('u_use_football') )
+{
+ trigger_error('NO_AUTH_VIEW');
+}
+
+$action='';
+
+if (!$season OR !$league)
+{
+ redirect($this->helper->route('football_football_controller', array('side' => 'bet')));
+}
+else
+{
+ if (user_is_member($user->data['user_id'], $season, $league))
+ {
+ $season_info = season_info($season);
+ if (!sizeof($season_info))
+ {
+ $error_message = sprintf($user->lang['NO_SEASON']);
+ trigger_error($error_message);
+ }
+ else
+ {
+ $league_info = league_info($season, $league);
+ if (!sizeof($league_info))
+ {
+ $error_message = sprintf($user->lang['NO_LEAGUE']);
+ trigger_error($error_message);
+ }
+ else
+ {
+ include($this->football_includes_path . 'export.' . $this->php_ext);
+ }
+ }
+ }
+ else
+ {
+ redirect($this->helper->route('football_football_controller', array('side' => 'bet')));
+ }
+}
diff --git a/block/hist_popup.php b/block/hist_popup.php
index 732d782..989840e 100644
--- a/block/hist_popup.php
+++ b/block/hist_popup.php
@@ -1,1345 +1,1349 @@
-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);
-}
-
-$home_id = $this->request->variable('hid', 0);
-$guest_id = $this->request->variable('gid', 0);
-$season = $this->request->variable('s', 0);
-$league = $this->request->variable('l', 0);
-$matchday = $this->request->variable('m', 0);
-$matchnumber = $this->request->variable('mn', 0);
-$group_id = $this->request->variable('gr', '');
-
-
-// Check parms
-$error_message = '';
-$data_history = false;
-if (!$home_id OR !$guest_id OR !$season OR !$league OR !$matchday OR !$matchnumber)
-{
- $data_history = false;
- if (!$home_id)
- {
- $error_message .= sprintf($user->lang['NO_HOMETEAM']) . ' ';
- }
- if (!$guest_id)
- {
- $error_message .= sprintf($user->lang['NO_GUESTTEAM']) . ' ';
- }
- if (!$season)
- {
- $error_message .= sprintf($user->lang['NO_SEASON']) . ' ';
- }
- if (!$league)
- {
- $error_message .= sprintf($user->lang['NO_LEAGUE']) . ' ';
- }
- if (!$matchday)
- {
- $error_message .= sprintf($user->lang['NO_MATCHDAY']) . ' ';
- }
- if (!$matchnumber)
- {
- $error_message .= sprintf($user->lang['NO_MATCH']) . ' ';
- }
-}
-else
-{
- $season_info = season_info($season);
- if (sizeof($season_info))
- {
- $league_info = league_info($season, $league);
- if (sizeof($league_info))
- {
- $data_history = true;
- $data_hist = false;
- $data_home =false;
- $data_guest = false;
- $data_last_home = false;
- $data_last_away = false;
- $form_from = $matchday-5;
- $percent_home = 0;
- $percent_draw = 0;
- $percent_guest = 0;
- $stat_hist = '';
- $value_h = 0;
- $value_g = 0;
- $value_hg = 0;
- $value_gg = 0;
- $ext_path = $this->phpbb_path_helper->update_web_root_path($this->phpbb_extension_manager->get_extension_path('football/football', true));
-
- $sql = 'SELECT *
- FROM ' . FOOTB_TEAMS . "
- WHERE season = $season
- AND league = $league
- AND team_id = $home_id";
-
- $result = $db->sql_query($sql);
- if ($row = $db->sql_fetchrow($result))
- {
- $home_name = $row['team_name'];
- if ($row['team_symbol'] <> '')
- {
- $logo[$home_id] = "" ;
- }
- else
- {
- $logo[$home_id] = "" ;
- }
- }
- else
- {
- $error_message .= sprintf($user->lang['NO_HOMETEAM']) . ' ';
- $data_history = false;
- }
- $db->sql_freeresult($result);
-
- $sql = 'SELECT *
- FROM ' . FOOTB_TEAMS . "
- WHERE season = $season
- AND league = $league
- AND team_id = $guest_id";
-
- $result = $db->sql_query($sql);
- if ($row = $db->sql_fetchrow($result))
- {
- $guest_name = $row['team_name'];
- if ($row['team_symbol'] <> '')
- {
- $logo[$guest_id] = "" ;
- }
- else
- {
- $logo[$guest_id] = "" ;
- }
- }
- else
- {
- $error_message .= sprintf($user->lang['NO_GUESTTEAM']) . ' ';
- $data_history = false;
- }
- $db->sql_freeresult($result);
-
-
- // Match history
- $sql = "SELECT
- IF(mh.team_id_home = $home_id,
- IF(mh.goals_home + 0 > mh.goals_guest, '+0', IF(mh.goals_home = mh.goals_guest, '30', '-0')),
- IF(mh.goals_home + 0 < mh.goals_guest, '+90', IF(mh.goals_home = mh.goals_guest, '60', '-90'))) AS chart_points,
- mh.match_date AS season,
- mh.match_type AS league,
- mh.team_id_home AS home_id,
- mh.team_id_guest AS guest_id,
- th.team_name AS home_name,
- tg.team_name AS guest_name,
- mh.goals_home,
- mh.goals_guest
- FROM " . FOOTB_MATCHES_HIST . ' AS mh
- LEFT JOIN ' . FOOTB_TEAMS . " AS th ON (th.season = $season AND th.league = $league AND th.team_id = mh.team_id_home)
- LEFT JOIN " . FOOTB_TEAMS . " AS tg ON (tg.season = $season AND tg.league = $league AND tg.team_id = mh.team_id_guest)
- WHERE ((mh.team_id_home = $home_id AND mh.team_id_guest = $guest_id)
- OR (mh.team_id_home = $guest_id AND mh.team_id_guest = $home_id))
- ORDER BY mh.match_date ASC";
-
- $result = $db->sql_query($sql);
- $history = $db->sql_fetchrowset($result);
- $db->sql_freeresult($result);
- $history_count = sizeof($history);
- // Match history
- $sql = "SELECT
- IF(m.team_id_home = $home_id,
- IF(m.goals_home + 0 > m.goals_guest, '+0', IF(m.goals_home = m.goals_guest, '30', '-0')),
- IF(m.goals_home + 0 < m.goals_guest, '+90', IF(m.goals_home = m.goals_guest, '60', '-90'))) AS chart_points,
- m.season,
- m.league,
- m.team_id_home AS home_id,
- m.team_id_guest AS guest_id,
- th.team_name AS home_name,
- tg.team_name AS guest_name,
- m.goals_home,
- m.goals_guest
- FROM " . FOOTB_MATCHES . ' AS m
- LEFT JOIN ' . FOOTB_TEAMS . " AS th ON (th.season = $season AND th.league = $league AND th.team_id = m.team_id_home)
- LEFT JOIN " . FOOTB_TEAMS . " AS tg ON (tg.season = $season AND tg.league = $league AND tg.team_id = m.team_id_guest)
- WHERE ((m.team_id_home = $home_id AND m.team_id_guest = $guest_id) OR (m.team_id_home = $guest_id AND m.team_id_guest = $home_id))
- AND m.status IN (3,6)
- AND (m.season <> $season OR m.league <> $league OR m.match_no < $matchnumber)
- ORDER BY m.season ASC, m.matchday ASC";
-
- $result = $db->sql_query($sql);
- if ($history_count != 0)
- {
- $history = array_merge($history, $db->sql_fetchrowset($result));
- }
- else
- {
- $history = $db->sql_fetchrowset($result);
- }
- $db->sql_freeresult($result);
- $history_count = sizeof($history);
- if ($history_count != 0)
- {
- $chart_points = '';
- $data_hist = true;
- $rank = 0;
- $map_total_coords = array();
- $map_total_titles = array();
- foreach ($history as $row)
- {
- $chart_points = $chart_points . $row['chart_points'] . ',';
- $coord_start = $start + ($rank * $vert);
- $coord_end = $end + ($rank * $vert);
- if (abs($row['chart_points']) > 45)
- {
- $coords = $coord_start . ",45," . $coord_end . "," . abs($row['chart_points']);
- }
- else
- {
- $coords = $coord_start . "," . abs($row['chart_points']) . "," . $coord_end . ",45";
- }
- $map_total_coords[] = $coords;
- $map_total_titles[] = $row['home_name'] . ' - ' . $row['guest_name'] . ' ' . $row['goals_home'] . ':' . $row['goals_guest'];
- $rank++ ;
- $row_class = (!($rank % 2)) ? 'bg1 row_light' : 'bg2 row_dark';
- $template->assign_block_vars('historie', array(
- 'ROW_CLASS' => $row_class,
- 'SEASON' => $row['season'],
- 'LEAGUE' => $row['league'],
- 'HLOGO' => $logo[$row['home_id']],
- 'HNAME' => $row['home_name'],
- 'GLOGO' => $logo[$row['guest_id']],
- 'GNAME' => $row['guest_name'],
- 'GOALS_HOME' => $row['goals_home'],
- 'GOALS_GUEST' => $row['goals_guest'],
- )
- );
- }
-
- // Statistic and forecast-points for historie
- $sql = "SELECT
- SUM(IF(team_id_home = $home_id, goals_home , goals_guest)) AS hg,
- SUM(IF(team_id_home = $guest_id, goals_home , goals_guest)) AS gg,
- SUM(IF(team_id_home = $home_id, IF(goals_home + 0 > goals_guest AND goals_home <> '' AND goals_guest <> '', 1 ,0), 0)) AS hw,
- SUM(IF(team_id_home = $home_id, IF(goals_home = goals_guest AND goals_home <> '' AND goals_guest <> '', 1 ,0), 0)) AS hd,
- SUM(IF(team_id_home = $home_id, IF(goals_home + 0 < goals_guest AND goals_home <> '' AND goals_guest <> '', 1 ,0), 0)) AS hl,
- SUM(IF(team_id_home = $home_id, IF(goals_home + 0 > goals_guest, 1 ,0), IF(goals_home + 0 < goals_guest,1,0))) AS gw,
- SUM(IF(goals_home = goals_guest AND goals_home <> '' AND goals_guest <> '',1,0)) AS gd,
- SUM(IF(team_id_home = $home_id, IF(goals_home + 0 < goals_guest, 1 ,0), IF(goals_home + 0 > goals_guest,1,0))) AS gl,
- SUM(IF(team_id_home = $home_id,
- IF(goals_home + 0 > goals_guest, 3, IF(goals_home = goals_guest, 1, 0)),
- IF(goals_home + 0 < goals_guest, 4, IF(goals_home = goals_guest, 2, 0))
- )
- ) AS value_h,
- SUM(IF(team_id_home = $guest_id,
- IF(goals_home + 0 > goals_guest, 3, IF(goals_home = goals_guest, 1, 0)),
- IF(goals_home + 0 < goals_guest, 4, IF(goals_home = goals_guest, 2, 0))
- )
- ) AS value_g
- FROM " . FOOTB_MATCHES_HIST . "
- WHERE ((team_id_home = $home_id AND team_id_guest = $guest_id)
- OR (team_id_home = $guest_id AND team_id_guest = $home_id))";
-
- $result = $db->sql_query($sql);
- $row_hist = $db->sql_fetchrow($result);
- $db->sql_freeresult($result);
-
- $sql = "SELECT
- SUM(IF(team_id_home = $home_id, goals_home , goals_guest)) AS hg,
- SUM(IF(team_id_home = $guest_id, goals_home , goals_guest)) AS gg,
- SUM(IF(team_id_home = $home_id, IF(goals_home + 0 > goals_guest, 1 ,0), 0)) AS hw,
- SUM(IF(team_id_home = $home_id, IF(goals_home = goals_guest AND goals_home <> '' AND goals_guest <> '', 1 ,0), 0)) AS hd,
- SUM(IF(team_id_home = $home_id, IF(goals_home + 0 < goals_guest, 1 ,0), 0)) AS hl,
- SUM(IF(team_id_home = $home_id, IF(goals_home + 0 > goals_guest, 1 ,0), IF(goals_home + 0 < goals_guest, 1, 0))) AS gw,
- SUM(IF(goals_home = goals_guest AND goals_home <> '' AND goals_guest <> '', 1, 0)) AS gd,
- SUM(IF(team_id_home = $home_id, IF(goals_home + 0 < goals_guest, 1 ,0), IF(goals_home + 0 > goals_guest, 1, 0))) AS gl,
- SUM(IF(team_id_home = $home_id,
- IF(goals_home + 0 > goals_guest, 3, IF(goals_home = goals_guest AND goals_home <> '' AND goals_guest <> '', 1, 0)),
- IF(goals_home + 0 < goals_guest, 4, IF(goals_home = goals_guest AND goals_home <> '' AND goals_guest <> '', 2, 0))
- )
- ) AS value_h,
- SUM(IF(team_id_home = $guest_id,
- IF(goals_home + 0 > goals_guest, 3, IF(goals_home = goals_guest AND goals_home <> '' AND goals_guest <> '',1,0)),
- IF(goals_home + 0 < goals_guest,4, IF(goals_home = goals_guest AND goals_home <> '' AND goals_guest <> '',2,0))
- )
- ) AS value_g
- FROM " . FOOTB_MATCHES . "
- WHERE ((team_id_home = $home_id AND team_id_guest = $guest_id) OR (team_id_home = $guest_id AND team_id_guest = $home_id))
- AND status IN (3,6)
- AND (season <> $season OR league <> $league OR match_no < $matchnumber)";
-
- $result = $db->sql_query($sql);
- $row = $db->sql_fetchrow($result);
- if (sizeof($row_hist))
- {
- if (sizeof($row))
- {
- $row['hg'] += $row_hist['hg'];
- $row['gg'] += $row_hist['gg'];
- $row['hw'] += $row_hist['hw'];
- $row['hd'] += $row_hist['hd'];
- $row['hl'] += $row_hist['hl'];
- $row['gw'] += $row_hist['gw'];
- $row['gd'] += $row_hist['gd'];
- $row['gl'] += $row_hist['gl'];
- $row['value_h'] += $row_hist['value_h'];
- $row['value_g'] += $row_hist['value_g'];
- }
- else
- {
- $row = $row_hist;
- }
- }
-
- if (sizeof($row))
- {
- if ($history_count <= 2)
- {
- // $history_count = 1 => draws * 1/4
- // $history_count = 2 => draws * 1/6
- $percent_draw = round($row['gd'] / ((2 * $history_count) + 2),2);
- }
- else
- {
- // $history_count > 2 => draws * 1/2
- $percent_draw = round($row['gd'] / ($history_count * 2),2);
- }
- $value_h = round($row['value_h'] / ($history_count * 2),2);
- $value_g = round($row['value_g'] / ($history_count * 2),2);
-
- $stat_hist = sprintf($user->lang['THIS_MATCH']) . ': ' . $row['hw'] . '/' . $row['hd'] . '/'. $row['hl'] . ' ' .
- sprintf($user->lang['TOTAL']) . ': ' . $row['gw'] . '/'. $row['gd'] . '/' . $row['gl'] . ' ' .
- sprintf($user->lang['GOALS']) . ': ' . $row['hg'] . ':'. $row['gg'] . ' ' .
- sprintf($user->lang['FORECAST_PTS']) . ': ' . $value_h . ':' . $value_g;
-
- $template->assign_vars(array(
- 'STAT_HIST' => $stat_hist,
- )
- );
- }
- $db->sql_freeresult($result);
-
- //Charts history
- $chart_points = substr($chart_points, 0, strlen($chart_points) - 1);
- $chart= "football_root_path
- . "includes/chart_hist.php?v1=$chart_points' alt='" . sprintf($user->lang['TOTAL']) . "' usemap='#map_total'/>";
- $template->assign_block_vars('chart_hist_total', array(
- 'CHARTIMAGE' => $chart,
- )
- );
- for ($i = 0; $i < sizeof($map_total_coords); $i++)
- {
- $template->assign_block_vars('chart_hist_total.map_total', array(
- 'COORDS' => $map_total_coords[$i],
- 'TITLE' => $map_total_titles[$i],
- )
- );
- }
- }
-
-
- // Table total
-
- if ($group_id == '' OR $group_id == '??')
- {
- $where_group = '';
- }
- else
- {
- $where_group = " AND m.group_id = '" . $db->sql_escape($group_id) . "'";
- }
- $sql = "SELECT
- t.*,
- SUM(1) AS matches,
- SUM(IF((m.team_id_home = t.team_id), IF(goals_home + 0 > goals_guest, 1, 0), IF(goals_home + 0 < goals_guest, 1, 0))) AS wins,
- SUM(IF(goals_home = goals_guest AND goals_home <> '' AND goals_guest <> '', 1, 0)) AS draws,
- SUM(IF((m.team_id_home = t.team_id), IF(goals_home + 0 < goals_guest, 1, 0), IF(goals_home + 0 > goals_guest, 1, 0))) AS lost,
- SUM(IF(m.team_id_home = t.team_id,
- IF(goals_home + 0 > goals_guest, 3, IF(goals_home = goals_guest AND goals_home <> '' AND goals_guest <> '', 1, 0)),
- IF(goals_home + 0 < goals_guest, 3, IF(goals_home = goals_guest, 1, 0))
- )
- ) AS points,
- SUM(IF(m.team_id_home = t.team_id, goals_home - goals_guest, goals_guest - goals_home)) AS gdiff,
- SUM(IF(m.team_id_home = t.team_id, goals_home, goals_guest)) AS goals,
- SUM(IF(m.team_id_home = t.team_id, goals_guest, goals_home)) AS goals_against
- FROM " . FOOTB_TEAMS . " AS t
- LEFT JOIN " . FOOTB_MATCHES . " AS m ON (m.season = t.season AND m.league = t.league AND (m.team_id_home = t.team_id OR m.team_id_guest = t.team_id))
- WHERE t.season = $season
- AND t.league = $league
- AND (m.matchday < $matchday)
- AND (m.status IN (3,6)) $where_group
- GROUP BY t.team_id
- ORDER BY points DESC, gdiff DESC, goals DESC";
-
- $result = $db->sql_query($sql);
- $rank = 0;
- $current_rank = 0;
- $last_goals = 0;
- $last_goals_againts = 0;
- $last_points = 0;
- while ($row = $db->sql_fetchrow($result))
- {
- $rank++;
- if ($last_points <> $row['points'] OR $last_goals <> $row['goals'] OR $last_goals_againts <> $row['goals_against'])
- {
- $current_rank = $rank;
- }
- $last_points = $row['points'];
- $last_goals = $row['goals'];
- $last_goals_againts = $row['goals_against'];
- if ($home_id == $row['team_id'])
- {
- $data_home = true;
- $value_h += round($row['points'] / ($row['matches'] * 3), 2);
- $plfp = $current_rank . '(' . round($row['points'] / ($row['matches'] * 3), 2) . ')';
- $template->assign_block_vars('table_hometeam', array(
- 'ROW_CLASS' => 'bg2 row_dark',
- 'TABLE' => sprintf($user->lang['TABLE_TOTAL']),
- 'PLFP' => $plfp,
- 'MATCHES' => $row['matches'],
- 'WINS' => $row['wins'],
- 'DRAW' => $row['draws'],
- 'LOST' => $row['lost'],
- 'GOALS_HOME' => $row['goals'],
- 'GOALS_GUEST' => $row['goals_against'],
- 'GDIFF' => $row['gdiff'],
- 'POINTS' => $row['points'],
- )
- );
- }
- if ($guest_id == $row['team_id'])
- {
- $data_guest = true;
- $value_g += round($row['points'] / ($row['matches'] * 3),2);
- $plfp = $current_rank . '(' . round($row['points'] / ($row['matches'] * 3), 2) . ')';
- $template->assign_block_vars('table_guestteam', array(
- 'ROW_CLASS' => 'bg2 row_dark',
- 'TABLE' => sprintf($user->lang['TABLE_TOTAL']),
- 'PLFP' => $plfp,
- 'MATCHES' => $row['matches'],
- 'WINS' => $row['wins'],
- 'DRAW' => $row['draws'],
- 'LOST' => $row['lost'],
- 'GOALS_HOME' => $row['goals'],
- 'GOALS_GUEST' => $row['goals_against'],
- 'GDIFF' => $row['gdiff'],
- 'POINTS' => $row['points'],
- )
- );
- }
- }
- $db->sql_freeresult($result);
-
- // Hometable hometeam
- if ($data_home)
- {
- $sql = "SELECT
- t.*,
- SUM(1) AS matches,
- SUM(IF((m.team_id_home = t.team_id), IF(goals_home + 0 > goals_guest, 1, 0), IF(goals_home + 0 < goals_guest, 1, 0))) AS wins,
- SUM(IF(goals_home = goals_guest, 1, 0)) AS draws,
- SUM(IF((m.team_id_home = t.team_id), IF(goals_home + 0 < goals_guest, 1, 0), IF(goals_home + 0 > goals_guest, 1, 0))) AS lost,
- SUM(IF(m.team_id_home = t.team_id,
- IF(goals_home + 0 > goals_guest, 3, IF(goals_home = goals_guest AND goals_home <> '' AND goals_guest <> '', 1, 0)),
- IF(goals_home + 0 < goals_guest, 3, IF(goals_home = goals_guest, 1, 0))
- )
- ) AS points,
- SUM(IF(m.team_id_home = t.team_id, goals_home - goals_guest , goals_guest - goals_home)) AS gdiff,
- SUM(IF(m.team_id_home = t.team_id, goals_home , goals_guest)) AS goals,
- SUM(IF(m.team_id_home = t.team_id, goals_guest , goals_home)) AS goals_against
- FROM " . FOOTB_TEAMS . ' AS t
- LEFT JOIN ' . FOOTB_MATCHES . " AS m ON (m.season = t.season AND m.league = t.league AND m.team_id_home = t.team_id)
- WHERE t.season = $season
- AND t.league = $league
- AND m.matchday < $matchday
- AND m.status IN (3,6)
- GROUP BY t.team_id
- ORDER BY points DESC, gdiff DESC, goals DESC";
-
- $result = $db->sql_query($sql);
- $rank = 0;
- $current_rank = 0;
- $last_goals = 0;
- $last_goals_againts = 0;
- $last_points = 0;
- while ($row = $db->sql_fetchrow($result))
- {
- $data_home = true;
- $rank++;
- if ($last_points <> $row['points'] OR $last_goals <> $row['goals'] OR $last_goals_againts <> $row['goals_against'])
- {
- $current_rank = $rank;
- }
- $last_points = $row['points'];
- $last_goals = $row['goals'];
- $last_goals_againts = $row['goals_against'];
- if ($home_id == $row['team_id'])
- {
- $win = $row['wins'];
- $draw = $row['draws'];
- $lost = $row['lost'];
- $value_hg = round(((($win * 3) + $draw) / ($win + $draw + $lost)),2);
- $value_h += $value_hg;
- $plfp = $current_rank . '(' . $value_hg . ')';
- $template->assign_block_vars('table_hometeam', array(
- 'ROW_CLASS' => 'bg1 row_light',
- 'TABLE' => sprintf($user->lang['TABLE_HOME']),
- 'PLFP' => $plfp,
- 'MATCHES' => $row['matches'],
- 'WINS' => $row['wins'],
- 'DRAW' => $row['draws'],
- 'LOST' => $row['lost'],
- 'GOALS_HOME' => $row['goals'],
- 'GOALS_GUEST' => $row['goals_against'],
- 'GDIFF' => $row['gdiff'],
- 'POINTS' => $row['points'],
- )
- );
- }
- }
- $db->sql_freeresult($result);
- }
-
- //Away-Table guestteam
- if ($data_guest)
- {
- $sql = "SELECT
- t.*,
- SUM(1) AS matches,
- SUM(IF((m.team_id_home = t.team_id), IF(m.goals_home + 0 > m.goals_guest, 1, 0), IF(m.goals_home + 0 < m.goals_guest, 1, 0))) AS wins,
- SUM(IF(m.goals_home = m.goals_guest AND goals_home <> '' AND goals_guest <> '',1,0)) AS draws,
- SUM(IF((m.team_id_home = t.team_id), IF(m.goals_home + 0 < m.goals_guest, 1, 0), IF(m.goals_home + 0 > m.goals_guest, 1, 0))) AS lost,
- SUM(IF(m.team_id_home = t.team_id,
- IF(m.goals_home + 0 > m.goals_guest, 3, IF(m.goals_home = m.goals_guest AND goals_home <> '' AND goals_guest <> '', 1, 0)),
- IF(m.goals_home + 0 < m.goals_guest, 3, IF(m.goals_home = m.goals_guest, 1, 0))
- )
- ) AS points,
- SUM(IF(m.team_id_home = t.team_id,m.goals_home - m.goals_guest , m.goals_guest - m.goals_home)) AS gdiff,
- SUM(IF(m.team_id_home = t.team_id,m.goals_home , m.goals_guest)) AS goals,
- SUM(IF(m.team_id_home = t.team_id,m.goals_guest , m.goals_home)) AS goals_against
- FROM " . FOOTB_TEAMS . ' AS t
- LEFT JOIN ' . FOOTB_MATCHES . " AS m ON (m.season = t.season AND m.league = t.league AND m.team_id_guest = t.team_id)
- WHERE t.season = $season
- AND t.league = $league
- AND m.matchday < $matchday
- AND m.status IN (3,6)
- GROUP BY t.team_id
- ORDER BY points DESC, gdiff DESC, goals DESC";
-
- $result = $db->sql_query($sql);
- $rank = 0;
- $current_rank = 0;
- $last_goals = 0;
- $last_goals_againts = 0;
- $last_points = 0;
- while ($row = $db->sql_fetchrow($result))
- {
- $rank++;
- if ($last_points <> $row['points'] OR $last_goals <> $row['goals'] OR $last_goals_againts <> $row['goals_against'])
- {
- $current_rank = $rank;
- }
- $last_points = $row['points'];
- $last_goals = $row['goals'];
- $last_goals_againts = $row['goals_against'];
- if ($guest_id == $row['team_id'])
- {
- $data_guest = true;
- $win = $row['wins'];
- $draw = $row['draws'];
- $lost = $row['lost'];
- $value_gg = round(((($win * 4) + ($draw * 2)) / ($win + $draw + $lost)),2);
- $value_g += $value_gg;
- $plfp = $current_rank . '(' . $value_gg . ')';
- $template->assign_block_vars('table_guestteam', array(
- 'ROW_CLASS' => 'bg1 row_light',
- 'TABLE' => sprintf($user->lang['TABLE_AWAY']),
- 'PLFP' => $plfp,
- 'MATCHES' => $row['matches'],
- 'WINS' => $row['wins'],
- 'DRAW' => $row['draws'],
- 'LOST' => $row['lost'],
- 'GOALS_HOME' => $row['goals'],
- 'GOALS_GUEST' => $row['goals_against'],
- 'GDIFF' => $row['gdiff'],
- 'POINTS' => $row['points'],
- )
- );
- }
- }
- $db->sql_freeresult($result);
- }
-
- // Form-Table
- $points_home = 0;
- $points_guest = 0;
- $form_matches = 0;
- if ($data_home or $data_guest)
- {
- $sql = "SELECT
- t.*,
- SUM(1) AS matches,
- SUM(IF((m.team_id_home = t.team_id), IF(goals_home + 0 > goals_guest, 1, 0), IF(goals_home + 0 < goals_guest, 1, 0))) AS wins,
- SUM(IF(goals_home = goals_guest AND goals_home <> '' AND goals_guest <> '', 1, 0)) AS draws,
- SUM(IF((m.team_id_home = t.team_id), IF(goals_home + 0 < goals_guest, 1, 0), IF(goals_home + 0 > goals_guest, 1, 0))) AS lost,
- SUM(IF(m.team_id_home = t.team_id,
- IF(goals_home + 0 > goals_guest, 3, IF(goals_home = goals_guest AND goals_home <> '' AND goals_guest <> '', 1, 0)),
- IF(goals_home + 0 < goals_guest, 3, IF(goals_home = goals_guest, 1, 0))
- )
- ) AS points,
- SUM(IF(m.team_id_home = t.team_id, goals_home - goals_guest , goals_guest - goals_home)) AS gdiff,
- SUM(IF(m.team_id_home = t.team_id, goals_home , goals_guest)) AS goals,
- SUM(IF(m.team_id_home = t.team_id, goals_guest , goals_home)) AS goals_against
- FROM " . FOOTB_TEAMS . ' AS t
- LEFT JOIN ' . FOOTB_MATCHES . " AS m ON (m.season = t.season AND m.league = t.league AND ((m.team_id_home = t.team_id) OR (m.team_id_guest = t.team_id)))
- WHERE t.season = $season
- AND t.league = $league
- AND m.matchday >= $form_from
- AND m.matchday < $matchday
- AND m.status IN (3,6)
- GROUP BY t.team_id
- ORDER BY points DESC, gdiff DESC, goals DESC";
-
- $result = $db->sql_query($sql);
- $rank = 0;
- $current_rank = 0;
- $last_goals = 0;
- $last_goals_againts = 0;
- $last_points = 0;
- while ($row = $db->sql_fetchrow($result))
- {
- $rank++;
- if ($last_points <> $row['points'] OR $last_goals <> $row['goals'] OR $last_goals_againts <> $row['goals_against'])
- {
- $current_rank = $rank;
- }
- $last_points = $row['points'];
- $last_goals = $row['goals'];
- $last_goals_againts = $row['goals_against'];
- if ($home_id == $row['team_id'])
- {
- $points_home = $row['points'];
- if ($row['matches'] > $form_matches)
- {
- $form_matches = $row['matches'];
- }
- $data_home = true;
- $win = $row['wins'];
- $draw = $row['draws'];
- $lost = $row['lost'];
- $value_hg = round(((($win * 2) + $draw) / ($win + $draw + $lost)),2);
- $value_h += $value_hg;
- $plfp = $current_rank . '(' . $value_hg . ')';
- $template->assign_block_vars('table_hometeam', array(
- 'ROW_CLASS' => 'bg2 row_dark',
- 'TABLE' => sprintf($user->lang['TABLE_FORM']),
- 'PLFP' => $plfp,
- 'MATCHES' => $row['matches'],
- 'WINS' => $row['wins'],
- 'DRAW' => $row['draws'],
- 'LOST' => $row['lost'],
- 'GOALS_HOME' => $row['goals'],
- 'GOALS_GUEST' => $row['goals_against'],
- 'GDIFF' => $row['gdiff'],
- 'POINTS' => $row['points'],
- )
- );
- }
- if ($guest_id == $row['team_id'])
- {
- $points_guest = $row['points'];
- if ($row['matches'] > $form_matches)
- {
- $form_matches = $row['matches'];
- }
- $data_guest = true;
- $win = $row['wins'];
- $draw = $row['draws'];
- $lost = $row['lost'];
- $value_gg = round(((($win * 2) + $draw) / ($win + $draw + $lost)),2);
- $value_g += $value_gg;
- $plfp = $current_rank . '(' . $value_gg . ')';
- $template->assign_block_vars('table_guestteam', array(
- 'ROW_CLASS' => 'bg2 row_dark',
- 'TABLE' => sprintf($user->lang['TABLE_FORM']),
- 'PLFP' => $plfp,
- 'MATCHES' => $row['matches'],
- 'WINS' => $row['wins'],
- 'DRAW' => $row['draws'],
- 'LOST' => $row['lost'],
- 'GOALS_HOME' => $row['goals'],
- 'GOALS_GUEST' => $row['goals_against'],
- 'GDIFF' => $row['gdiff'],
- 'POINTS' => $row['points'],
- )
- );
- }
- }
- $db->sql_freeresult($result);
- }
-
- $matches_played = 0;
- $draws_home = 0;
- $draws_guest = 0;
-
- // Chart hometeam
- if ($data_home)
- {
- $sql = "SELECT
- IF(m.team_id_home = t.team_id,
- IF(goals_home + 0 > goals_guest, '+0', IF(goals_home = goals_guest, '30', '-0')),
- IF(goals_home + 0 < goals_guest, '+90', IF(goals_home = goals_guest, '60', '-90'))) AS chart_points,
- th.team_name AS home_name,
- tg.team_name AS guest_name,
- m.goals_home,
- m.goals_guest
- FROM " . FOOTB_TEAMS . ' AS t
- LEFT JOIN ' . FOOTB_MATCHES . ' AS m ON (m.season = t.season AND m.league = t.league
- AND (m.team_id_home = t.team_id OR m.team_id_guest = t.team_id))
- LEFT JOIN ' . FOOTB_TEAMS . " AS th ON (th.season = $season AND th.league = $league AND th.team_id = m.team_id_home)
- LEFT JOIN " . FOOTB_TEAMS . " AS tg ON (tg.season = $season AND tg.league = $league AND tg.team_id = m.team_id_guest)
- WHERE t.season = $season
- AND t.league = $league
- AND m.matchday <= $matchday
- AND m.match_no <> $matchnumber
- AND m.status IN (3,6)
- AND t.team_id=$home_id
- ORDER BY m.match_datetime ASC";
-
- $result = $db->sql_query($sql);
- $trend = $db->sql_fetchrowset($result);
- $db->sql_freeresult($result);
- $trend_count = sizeof($trend);
- $chart_points = '';
- $map_home_coords = array();
- $map_home_titles = array();
- $rank = 0;
- foreach ($trend as $row)
- {
- if ($row['chart_points'] == '30' or $row['chart_points'] == '60')
- {
- $draws_home += 1;
- }
- $chart_points = $chart_points . $row['chart_points']. ',';
- $coord_start = $start + ($rank * $vert);
- $coord_end = $end + ($rank * $vert);
- if (abs($row['chart_points']) > 45)
- {
- $coords = $coord_start . ",45," . $coord_end . "," . abs($row['chart_points']);
- }
- else
- {
- $coords = $coord_start . "," . abs($row['chart_points']) . "," . $coord_end . ",45";
- }
- $map_home_coords[] = $coords;
- $map_home_titles[] = $row['home_name'] . ' - ' . $row['guest_name'] . ' ' . $row['goals_home'] . ':' . $row['goals_guest'];
- $rank++;
- }
- $chart_points = substr($chart_points, 0, strlen($chart_points) - 1);
- $chart= "football_root_path
- . "includes/chart_hist.php?v1=$chart_points' alt='" . sprintf($user->lang['HIST_CHART']) . "' usemap='#map_home'/>";
- $template->assign_block_vars('chart_home', array(
- 'CHARTIMAGE' => $chart,
- )
- );
- for ($i = 0; $i < sizeof($map_home_coords); $i++)
- {
- $template->assign_block_vars('chart_home.map_home', array(
- 'COORDS' => $map_home_coords[$i],
- 'TITLE' => $map_home_titles[$i],
- )
- );
- }
- $matches_played = sizeof($map_home_coords);
- }
-
- //Chart guestteam
- if ($data_guest)
- {
- $sql = "SELECT
- IF(m.team_id_home = t.team_id,
- IF(goals_home + 0 > goals_guest, '+0', IF(goals_home = goals_guest, '30', '-0')),
- IF(goals_home + 0 < goals_guest, '+90', IF(goals_home = goals_guest, '60', '-90')
- )
- ) AS chart_points,
- th.team_name AS home_name,
- tg.team_name AS guest_name,
- m.goals_home,
- m.goals_guest
- FROM " . FOOTB_TEAMS . ' AS t
- LEFT JOIN ' . FOOTB_MATCHES . ' AS m ON (m.season = t.season AND m.league = t.league
- AND (m.team_id_home = t.team_id OR m.team_id_guest = t.team_id))
- LEFT JOIN ' . FOOTB_TEAMS . " AS th ON (th.season = $season AND th.league = $league AND th.team_id = m.team_id_home)
- LEFT JOIN " . FOOTB_TEAMS . " AS tg ON (tg.season = $season AND tg.league = $league AND tg.team_id = m.team_id_guest)
- WHERE t.season = $season
- AND t.league = $league
- AND m.matchday <= $matchday
- AND m.match_no <> $matchnumber
- AND m.status IN (3,6)
- AND t.team_id=$guest_id
- ORDER BY m.match_datetime ASC";
-
- $result = $db->sql_query($sql);
- $trend = $db->sql_fetchrowset($result);
- $db->sql_freeresult($result);
- $trend_count = sizeof($trend);
- $chart_points = '';
- $map_guest_coords = array();
- $map_guest_titles = array();
- $rank = 0;
- foreach ($trend as $row)
- {
- if ($row['chart_points'] == '30' or $row['chart_points'] == '60')
- {
- $draws_guest += 1;
- }
- $chart_points = $chart_points . $row['chart_points']. ',';
- $coord_start = $start + ($rank * $vert);
- $coord_end = $end + ($rank * $vert);
- if (abs($row['chart_points']) > 45)
- {
- $coords = $coord_start . ",45," . $coord_end . "," . abs($row['chart_points']);
- }
- else
- {
- $coords = $coord_start . "," . abs($row['chart_points']) . "," . $coord_end . ",45";
- }
- $map_guest_coords[] = $coords;
- $map_guest_titles[] = $row['home_name'] . ' - ' . $row['guest_name'] . ' ' . $row['goals_home'] . ':' . $row['goals_guest'];
- $rank++;
- }
- $chart_points = substr($chart_points, 0, strlen($chart_points) - 1);
- $chart= "football_root_path
- . "includes/chart_hist.php?v1=$chart_points' alt='" . sprintf($user->lang['HIST_CHART']) . "' usemap='#map_guest'/>";
- $template->assign_block_vars('chart_guest', array(
- 'CHARTIMAGE' => $chart,
- )
- );
- for ($i = 0; $i < sizeof($map_guest_coords); $i++)
- {
- $template->assign_block_vars('chart_guest.map_guest', array(
- 'COORDS' => $map_guest_coords[$i],
- 'TITLE' => $map_guest_titles[$i],
- )
- );
- }
- $matches_played = $matches_played + sizeof($map_guest_coords);
- }
-
- if ($data_home and $data_guest)
- {
- $percent_draws_season = round(($draws_home + $draws_guest) / $matches_played, 2);
- }
- else
- {
- $percent_draws_season = 0.0;
- $form_matches = 0;
- }
- if ($history_count <= 2)
- {
- switch($form_matches)
- {
- case 0:
- $percent_draw += (2 - $history_count) * 0.1;
- break;
- case 1:
- $percent_draw += (2 - $history_count) * 0.1 + round($percent_draws_season / 4, 2);
- break;
- default:
- $percent_draw += (2 - $history_count) * 0.1 + round($percent_draws_season / 2, 2);
- break;
- }
- }
- else
- {
- if (abs($points_home - $points_guest) < 3)
- {
- $equal_form_factor = 1.1;
- }
- else
- {
- $equal_form_factor = 1.0;
- }
- switch($form_matches)
- {
- case 0:
- $percent_draw = round($percent_draw * 1.5, 2);
- break;
- case 1:
- $percent_draw = round(($percent_draw * 1.5) + ($percent_draws_season / 8), 2);
- break;
- case 2:
- case 3:
- case 4:
- $percent_draw = round(($percent_draw * $equal_form_factor) + ($percent_draws_season / 4), 2);
- break;
- default:
- $percent_draw = round(($percent_draw * $equal_form_factor) + ($percent_draws_season / 2), 2);
- if ($percent_draw > 1.0)
- {
- $percent_draw = 1.0;
- }
- //$percent_draw = ($percent_draw * $equal_form_factor) + ($percent_draws_season / 2) ;
- break;
- }
- }
- $percent_draw = $percent_draw;
-
- // last matches hometeam
- $sql = "(SELECT
- match_date AS matchtime,
- IF(mh.team_id_home = $home_id, 'H', 'A') AS match_place,
- IF(mh.team_id_home = $home_id, tgh.team_name, thh.team_name) AS against,
- mh.goals_home,
- mh.goals_guest,
- IF(mh.team_id_home = $home_id,
- IF(mh.goals_home + 0 > mh.goals_guest, 1, IF(mh.goals_home = mh.goals_guest, 0, 2)),
- IF(mh.goals_home + 0 < mh.goals_guest, 1, IF(mh.goals_home = mh.goals_guest, 0, 2)
- )
- ) AS match_res
- FROM " . FOOTB_MATCHES_HIST . ' AS mh
- LEFT JOIN ' . FOOTB_TEAMS_HIST . ' AS thh ON thh.team_id = mh.team_id_home
- LEFT JOIN ' . FOOTB_TEAMS_HIST . " AS tgh ON tgh.team_id = mh.team_id_guest
- WHERE (mh.team_id_home = $home_id
- OR mh.team_id_guest = $home_id)
- )
- UNION
- (SELECT
- match_datetime AS matchtime,
- IF(m.team_id_home = $home_id, 'H', 'A') AS match_place,
- IF(m.team_id_home = $home_id, tg.team_name, th.team_name) AS against,
- m.goals_home,
- m.goals_guest,
- IF(m.team_id_home = $home_id,
- IF(m.goals_home + 0 > m.goals_guest, 1, IF(m.goals_home = m.goals_guest, 0, 2)),
- IF(m.goals_home + 0 < m.goals_guest, 1, IF(m.goals_home = m.goals_guest, 0, 2)
- )
- ) AS match_res
- FROM " . FOOTB_MATCHES . ' AS m
- LEFT JOIN ' . FOOTB_TEAMS . ' AS th ON (th.season = m.season AND th.league = m.league AND th.team_id = team_id_home)
- LEFT JOIN ' . FOOTB_TEAMS . " AS tg ON (tg.season = m.season AND tg.league = m.league AND tg.team_id = team_id_guest)
- WHERE m.season = $season
- AND m.league = $league
- AND m.matchday <= $matchday
- AND m.match_no <> $matchnumber
- AND (m.team_id_home = $home_id OR m.team_id_guest = $home_id)
- AND m.status IN(3,6)
- )
- ORDER BY matchtime";
-
- $result = $db->sql_query($sql);
- $lastmatches = $db->sql_fetchrowset($result);
- $db->sql_freeresult($result);
- $numb_matches = sizeof($lastmatches);
-
-
- if ($numb_matches > 10)
- $start = $numb_matches - 10;
- else
- $start = 0;
- $rank = 0;
- foreach ($lastmatches as $row)
- {
- $rank++;
- if ($rank > $start)
- {
- $row_class = (!($rank % 2)) ? 'bg1 row_light' : 'bg2 row_dark';
- $match_res_style='';
- switch($row['match_res'])
- {
- case 0:
- $match_res_style = 'match_draw';
- break;
- case 1:
- $match_res_style = 'match_win';
- break;
- case 2:
- $match_res_style = 'match_lost';
- break;
- }
- $template->assign_block_vars('last_hometeam', array(
- 'ROW_CLASS' => $row_class,
- 'MATCH_RESULT' => $match_res_style,
- 'PLACE' => $row['match_place'],
- 'AGAINST' => $row['against'],
- 'GOALS_HOME' => $row['goals_home'],
- 'GOALS_GUEST' => $row['goals_guest'],
- )
- );
- }
- }
-
- //last matches home hometeam
- $sql = '(SELECT
- match_date AS matchtime,
- th.team_name AS against,
- mh.goals_home,
- mh.goals_guest,
- IF(mh.goals_home + 0 > mh.goals_guest, 1, IF(mh.goals_home = mh.goals_guest, 0, 2)) AS match_res
- FROM ' . FOOTB_MATCHES_HIST . ' AS mh
- LEFT JOIN ' . FOOTB_TEAMS_HIST . " AS th ON th.team_id = mh.team_id_guest
- WHERE mh.team_id_home = $home_id
- )
- UNION
- (SELECT
- match_datetime AS matchtime,
- t.team_name AS against,
- m.goals_home,
- m.goals_guest,
- IF(m.goals_home + 0 > m.goals_guest, 1, IF(m.goals_home = m.goals_guest, 0, 2)) AS match_res
- FROM " . FOOTB_MATCHES . ' AS m
- LEFT JOIN ' . FOOTB_TEAMS . " AS t ON (t.season = m.season AND t.league = m.league AND t.team_id = m.team_id_guest)
- WHERE m.season = $season
- AND m.league = $league
- AND m.matchday <= $matchday
- AND m.match_no <> $matchnumber
- AND m.team_id_home = $home_id
- AND m.status IN (3,6)
- )
- ORDER BY matchtime";
-
- $result = $db->sql_query($sql);
- $lastmatches = $db->sql_fetchrowset($result);
- $db->sql_freeresult($result);
- $numb_matches = sizeof($lastmatches);
-
- if ($numb_matches > 5)
- $start = $numb_matches - 5;
- else
- $start = 0;
- $rank = 0;
- foreach ($lastmatches as $row)
- {
- $data_last_home = true;
- $rank++;
- if ($rank > $start)
- {
- $row_class = (!(($rank-$start) % 2)) ? 'bg1 row_light' : 'bg2 row_dark';
- $match_res_style='';
- switch($row['match_res'])
- {
- case 0:
- $match_res_style = 'match_draw';
- break;
- case 1:
- $match_res_style = 'match_win';
- break;
- case 2:
- $match_res_style = 'match_lost';
- break;
- }
- $template->assign_block_vars('lasthome_hometeam', array(
- 'ROW_CLASS' => $row_class,
- 'MATCH_RESULT' => $match_res_style,
- 'AGAINST' => $row['against'],
- 'GOALS_HOME' => $row['goals_home'],
- 'GOALS_GUEST' => $row['goals_guest'],
- )
- );
- }
- }
-
- //last game guestteam
- $sql = "(SELECT
- match_date AS matchtime,
- IF(mh.team_id_home = $guest_id, 'H', 'A') AS match_place,
- IF(mh.team_id_home = $guest_id, tgh.team_name, thh.team_name) AS against,
- mh.goals_home,
- mh.goals_guest,
- IF(mh.team_id_home = $guest_id,
- IF(mh.goals_home + 0 > mh.goals_guest, 1, IF(mh.goals_home = mh.goals_guest, 0, 2)),
- IF(mh.goals_home + 0 < mh.goals_guest, 1, IF(mh.goals_home = mh.goals_guest, 0, 2)
- )
- ) AS match_res
- FROM " . FOOTB_MATCHES_HIST . ' AS mh
- LEFT JOIN ' . FOOTB_TEAMS_HIST . ' AS thh ON thh.team_id = mh.team_id_home
- LEFT JOIN ' . FOOTB_TEAMS_HIST . " AS tgh ON tgh.team_id = mh.team_id_guest
- WHERE mh.team_id_home = $guest_id
- OR mh.team_id_guest = $guest_id
- )
- UNION
- (SELECT
- match_datetime AS matchtime,
- IF(m.team_id_home = $guest_id, 'H', 'A') AS match_place,
- IF(m.team_id_home = $guest_id, tg.team_name, th.team_name) AS against,
- m.goals_home,
- m.goals_guest,
- IF(m.team_id_home = $guest_id,
- IF(m.goals_home + 0 > m.goals_guest, 1, IF(m.goals_home = m.goals_guest, 0, 2)),
- IF(m.goals_home + 0 < m.goals_guest, 1, IF(m.goals_home = m.goals_guest, 0, 2)
- )
- ) AS match_res
- FROM " . FOOTB_MATCHES . ' AS m
- LEFT JOIN ' . FOOTB_TEAMS . ' AS th ON (th.season = m.season AND th.league = m.league AND th.team_id = team_id_home)
- LEFT JOIN ' . FOOTB_TEAMS . " AS tg ON (tg.season = m.season AND tg.league = m.league AND tg.team_id = team_id_guest)
- WHERE m.season = $season
- AND m.league = $league
- AND m.matchday <= $matchday
- AND m.match_no <> $matchnumber
- AND (m.team_id_home = $guest_id OR m.team_id_guest = $guest_id)
- AND m.status IN(3,6)
- )
- ORDER BY matchtime";
-
- $result = $db->sql_query($sql);
- $lastmatches = $db->sql_fetchrowset($result);
- $db->sql_freeresult($result);
- $numb_matches = sizeof($lastmatches);
-
- if ($numb_matches > 10)
- $start = $numb_matches - 10;
- else
- $start = 0;
- $rank = 0;
- foreach ($lastmatches as $row)
- {
- $rank++;
- if ($rank > $start)
- {
- $row_class = (!($rank % 2)) ? 'bg1 row_light' : 'bg2 row_dark';
- $match_res_style='';
- switch($row['match_res'])
- {
- case 0:
- $match_res_style = 'match_draw';
- break;
- case 1:
- $match_res_style = 'match_win';
- break;
- case 2:
- $match_res_style = 'match_lost';
- break;
- }
- $template->assign_block_vars('last_guestteam', array(
- 'ROW_CLASS' => $row_class,
- 'MATCH_RESULT' => $match_res_style,
- 'PLACE' => $row['match_place'],
- 'AGAINST' => $row['against'],
- 'GOALS_HOME' => $row['goals_home'],
- 'GOALS_GUEST' => $row['goals_guest'],
- )
- );
- }
- }
-
- //last matches away guestteam
- $sql = '(SELECT
- match_date AS matchtime,
- th.team_name AS against,
- mh.goals_home AS goals_home,
- mh.goals_guest,
- IF(mh.goals_home + 0 < mh.goals_guest, 1, IF(mh.goals_home = mh.goals_guest, 0, 2)) AS match_res
- FROM ' . FOOTB_MATCHES_HIST . ' As mh
- LEFT JOIN ' . FOOTB_TEAMS_HIST . " AS th ON th.team_id = mh.team_id_home
- WHERE mh.team_id_guest = $guest_id
- )
- UNION
- (SELECT
- match_datetime AS matchtime,
- t.team_name AS against,
- m.goals_home AS goals_home,
- m.goals_guest,
- IF(m.goals_home + 0 < m.goals_guest, 1, IF(m.goals_home = m.goals_guest, 0, 2)) AS match_res
- FROM " . FOOTB_MATCHES . ' As m
- LEFT JOIN ' . FOOTB_TEAMS . " AS t ON (t.season = m.season AND t.league = m.league AND t.team_id = m.team_id_home)
- WHERE m.season = $season AND m.league = $league AND m.matchday <= $matchday AND m.match_no <> $matchnumber
- AND m.team_id_guest = $guest_id
- AND m.status IN (3,6)
- )
- ORDER BY matchtime";
-
- $result = $db->sql_query($sql);
- $lastmatches = $db->sql_fetchrowset($result);
- $db->sql_freeresult($result);
- $numb_matches = sizeof($lastmatches);
-
- if ($numb_matches > 5)
- $start = $numb_matches - 5;
- else
- $start = 0;
- $rank = 0;
- foreach ($lastmatches as $row)
- {
- $data_last_away = true;
- $rank++;
- if ($rank > $start)
- {
- $row_class = (!(($rank-$start) % 2)) ? 'bg1 row_light' : 'bg2 row_dark';
- $match_res_style='';
- switch($row['match_res'])
- {
- case 0:
- $match_res_style = 'match_draw';
- break;
- case 1:
- $match_res_style = 'match_win';
- break;
- case 2:
- $match_res_style = 'match_lost';
- break;
- }
- $template->assign_block_vars('lastaway_guestteam', array(
- 'ROW_CLASS' => $row_class,
- 'MATCH_RESULT' => $match_res_style,
- 'AGAINST' => $row['against'],
- 'GOALS_HOME' => $row['goals_home'],
- 'GOALS_GUEST' => $row['goals_guest'],
- )
- );
- }
- }
-
- if ($history_count == 0 and !($data_home and $data_guest))
- {
- $percent_draw = 0;
- $percent_home = 0;
- $percent_guest = 0;
- }
- else
- {
- if ($value_h + $value_g == 0)
- {
- $percent_draw = 0;
- $percent_home = 0;
- $percent_guest = 0;
- }
- else
- {
- $percent_draw = round(($percent_draw * 100),0);
- $rest = 100 - $percent_draw;
- if ($rest > 0)
- {
- $percent_home = round(($rest * $value_h) / ($value_h + $value_g),0);
- $percent_guest = $rest - $percent_home;
- }
- else
- {
- $percent_home = 0;
- $percent_guest = 0;
- }
- }
- }
-
- $sql_ary = array(
- 'trend' => $percent_home . '|' . $percent_draw. '|' . $percent_guest,
- );
-
- $sql = 'UPDATE ' . FOOTB_MATCHES . ' SET ' . $db->sql_build_array('UPDATE', $sql_ary) . "
- WHERE season = $season AND league = $league AND match_no = $matchnumber";
- $result = $db->sql_query($sql);
- $db->sql_freeresult($result);
-
-
- $forecast_value = 0;
- $forecast_quote = sprintf($user->lang['FORECAST_PTS']) . ': '. $value_h. ' : '. $value_g;
- $forecast_value = $value_h - $value_g;
- if($forecast_value >= -0.5 && $forecast_value <= 0.5)
- {
- $forecast = sprintf($user->lang['TENDENCY']) . ': '. sprintf($user->lang['DRAW']);
- }
- else if($forecast_value > 0.5)
- {
- $forecast = sprintf($user->lang['TENDENCY']) . ': '. sprintf($user->lang['WIN_FOR']) . ' '. $logo[$home_id]. ' '. $home_name;
- }
- else
- {
- $forecast = sprintf($user->lang['TENDENCY']) . ': '. sprintf($user->lang['WIN_FOR']) . ' '. $logo[$guest_id]. ' '. $guest_name;;
- }
- }
- else
- {
- $data_history = false;
- $error_message .= sprintf($user->lang['NO_LEAGUE']) . ' ';
- }
- }
- else
- {
- $data_history = false;
- $error_message .= sprintf($user->lang['NO_SEASON']) . ' ';
- }
-}
-
-if ($data_history)
-{
- $main_title = $logo[$home_id]. ' '. $home_name. ' : '. $guest_name. ' '. $logo[$guest_id];
- $template->assign_vars(array(
- 'MAIN_TITLE' => $main_title,
- 'TEAM_HOME' => $logo[$home_id]. ' '. $home_name,
- 'TEAM_GUEST' => $logo[$guest_id]. ' '. $guest_name,
- 'FORECAST_QUOTE' => $forecast_quote,
- 'FORECAST' => $forecast,
- 'S_FOOTBALL_COPY' => sprintf($user->lang['FOOTBALL_COPY'], $config['football_version'], $phpbb_root_path . 'football/'),
- 'S_ERROR_MESSAGE' => $error_message,
- 'S_DATA_HISTORY' => $data_history,
- 'S_DATA_HIST' => $data_hist,
- 'S_DATA_HOME' => $data_home,
- 'S_DATA_GUEST' => $data_guest,
- 'S_DATA_LASTHOME' => $data_last_home,
- 'S_DATA_LASTAWAY' => $data_last_away,
- )
- );
-
- // output page
- page_header(sprintf($user->lang['MATCH_STATS']));
-}
-else
-{
- $template->assign_vars(array(
- 'MAIN_TITLE' => '',
- 'TEAM_HOME' => '',
- 'TEAM_GUEST' => '',
- 'FORECAST_QUOTE' => '',
- 'FORECAST' => '',
- 'S_FOOTBALL_COPY' => sprintf($user->lang['FOOTBALL_COPY'], $config['football_version'], $phpbb_root_path . 'football/'),
- 'S_ERROR_MESSAGE' => $error_message,
- 'S_DATA_HISTORY' => $data_history,
- 'S_DATA_HIST' => false,
- 'S_DATA_HOME' => false,
- 'S_DATA_GUEST' => false,
- 'S_DATA_LASTHOME' => false,
- 'S_DATA_LASTAWAY' => false,
- )
- );
-
- // output page
- page_header(sprintf($user->lang['MATCH_STATS']));
-}
-
-$template->set_filenames(array(
- 'body' => 'hist_popup.html')
-);
-
-page_footer();
-?>
\ No newline at end of file
+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);
+}
+
+$home_id = $this->request->variable('hid', 0);
+$guest_id = $this->request->variable('gid', 0);
+$season = $this->request->variable('s', 0);
+$league = $this->request->variable('l', 0);
+$matchday = $this->request->variable('m', 0);
+$matchnumber = $this->request->variable('mn', 0);
+$group_id = $this->request->variable('gr', '');
+
+
+// Check parms
+$error_message = '';
+$data_history = false;
+if (!$home_id OR !$guest_id OR !$season OR !$league OR !$matchday OR !$matchnumber)
+{
+ $data_history = false;
+ if (!$home_id)
+ {
+ $error_message .= sprintf($user->lang['NO_HOMETEAM']) . ' ';
+ }
+ if (!$guest_id)
+ {
+ $error_message .= sprintf($user->lang['NO_GUESTTEAM']) . ' ';
+ }
+ if (!$season)
+ {
+ $error_message .= sprintf($user->lang['NO_SEASON']) . ' ';
+ }
+ if (!$league)
+ {
+ $error_message .= sprintf($user->lang['NO_LEAGUE']) . ' ';
+ }
+ if (!$matchday)
+ {
+ $error_message .= sprintf($user->lang['NO_MATCHDAY']) . ' ';
+ }
+ if (!$matchnumber)
+ {
+ $error_message .= sprintf($user->lang['NO_MATCH']) . ' ';
+ }
+}
+else
+{
+ $season_info = season_info($season);
+ if (sizeof($season_info))
+ {
+ $league_info = league_info($season, $league);
+ if (sizeof($league_info))
+ {
+ $data_history = true;
+ $data_hist = false;
+ $data_home =false;
+ $data_guest = false;
+ $data_last_home = false;
+ $data_last_away = false;
+ $form_from = $matchday-5;
+ $percent_home = 0;
+ $percent_draw = 0;
+ $percent_guest = 0;
+ $stat_hist = '';
+ $value_h = 0;
+ $value_g = 0;
+ $value_hg = 0;
+ $value_gg = 0;
+ $ext_path = $this->phpbb_path_helper->update_web_root_path($this->phpbb_extension_manager->get_extension_path('football/football', true));
+
+ $sql = 'SELECT *
+ FROM ' . FOOTB_TEAMS . "
+ WHERE season = $season
+ AND league = $league
+ AND team_id = $home_id";
+
+ $result = $db->sql_query($sql);
+ if ($row = $db->sql_fetchrow($result))
+ {
+ $home_name = $row['team_name'];
+ if ($row['team_symbol'] <> '')
+ {
+ $logo[$home_id] = "" ;
+ }
+ else
+ {
+ $logo[$home_id] = "" ;
+ }
+ }
+ else
+ {
+ $error_message .= sprintf($user->lang['NO_HOMETEAM']) . ' ';
+ $data_history = false;
+ }
+ $db->sql_freeresult($result);
+
+ $sql = 'SELECT *
+ FROM ' . FOOTB_TEAMS . "
+ WHERE season = $season
+ AND league = $league
+ AND team_id = $guest_id";
+
+ $result = $db->sql_query($sql);
+ if ($row = $db->sql_fetchrow($result))
+ {
+ $guest_name = $row['team_name'];
+ if ($row['team_symbol'] <> '')
+ {
+ $logo[$guest_id] = "" ;
+ }
+ else
+ {
+ $logo[$guest_id] = "" ;
+ }
+ }
+ else
+ {
+ $error_message .= sprintf($user->lang['NO_GUESTTEAM']) . ' ';
+ $data_history = false;
+ }
+ $db->sql_freeresult($result);
+
+
+ // Match history
+ $sql = "SELECT
+ IF(mh.team_id_home = $home_id,
+ IF(mh.goals_home + 0 > mh.goals_guest, '+0', IF(mh.goals_home = mh.goals_guest, '30', '-0')),
+ IF(mh.goals_home + 0 < mh.goals_guest, '+90', IF(mh.goals_home = mh.goals_guest, '60', '-90'))) AS chart_points,
+ mh.match_date AS season,
+ mh.match_type AS league,
+ mh.team_id_home AS home_id,
+ mh.team_id_guest AS guest_id,
+ th.team_name AS home_name,
+ tg.team_name AS guest_name,
+ mh.goals_home,
+ mh.goals_guest
+ FROM " . FOOTB_MATCHES_HIST . ' AS mh
+ LEFT JOIN ' . FOOTB_TEAMS . " AS th ON (th.season = $season AND th.league = $league AND th.team_id = mh.team_id_home)
+ LEFT JOIN " . FOOTB_TEAMS . " AS tg ON (tg.season = $season AND tg.league = $league AND tg.team_id = mh.team_id_guest)
+ WHERE ((mh.team_id_home = $home_id AND mh.team_id_guest = $guest_id)
+ OR (mh.team_id_home = $guest_id AND mh.team_id_guest = $home_id))
+ ORDER BY mh.match_date ASC";
+
+ $result = $db->sql_query($sql);
+ $history = $db->sql_fetchrowset($result);
+ $db->sql_freeresult($result);
+ $history_count = sizeof($history);
+ // Match history
+ $sql = "SELECT
+ IF(m.team_id_home = $home_id,
+ IF(m.goals_home + 0 > m.goals_guest, '+0', IF(m.goals_home = m.goals_guest, '30', '-0')),
+ IF(m.goals_home + 0 < m.goals_guest, '+90', IF(m.goals_home = m.goals_guest, '60', '-90'))) AS chart_points,
+ m.season,
+ m.league,
+ m.team_id_home AS home_id,
+ m.team_id_guest AS guest_id,
+ th.team_name AS home_name,
+ tg.team_name AS guest_name,
+ m.goals_home,
+ m.goals_guest
+ FROM " . FOOTB_MATCHES . ' AS m
+ LEFT JOIN ' . FOOTB_TEAMS . " AS th ON (th.season = $season AND th.league = $league AND th.team_id = m.team_id_home)
+ LEFT JOIN " . FOOTB_TEAMS . " AS tg ON (tg.season = $season AND tg.league = $league AND tg.team_id = m.team_id_guest)
+ WHERE ((m.team_id_home = $home_id AND m.team_id_guest = $guest_id) OR (m.team_id_home = $guest_id AND m.team_id_guest = $home_id))
+ AND m.status IN (3,6)
+ AND (m.season <> $season OR m.league <> $league OR m.match_no < $matchnumber)
+ ORDER BY m.season ASC, m.matchday ASC";
+
+ $result = $db->sql_query($sql);
+ if ($history_count != 0)
+ {
+ $history = array_merge($history, $db->sql_fetchrowset($result));
+ }
+ else
+ {
+ $history = $db->sql_fetchrowset($result);
+ }
+ $db->sql_freeresult($result);
+ $history_count = sizeof($history);
+ if ($history_count != 0)
+ {
+ $chart_points = '';
+ $data_hist = true;
+ $rank = 0;
+ $map_total_coords = array();
+ $map_total_titles = array();
+ foreach ($history as $row)
+ {
+ $chart_points = $chart_points . $row['chart_points'] . ',';
+ $coord_start = $start + ($rank * $vert);
+ $coord_end = $end + ($rank * $vert);
+ if (abs($row['chart_points']) > 45)
+ {
+ $coords = $coord_start . ",45," . $coord_end . "," . abs($row['chart_points']);
+ }
+ else
+ {
+ $coords = $coord_start . "," . abs($row['chart_points']) . "," . $coord_end . ",45";
+ }
+ $map_total_coords[] = $coords;
+ $map_total_titles[] = $row['home_name'] . ' - ' . $row['guest_name'] . ' ' . $row['goals_home'] . ':' . $row['goals_guest'];
+ $rank++ ;
+ $row_class = (!($rank % 2)) ? 'bg1 row_light' : 'bg2 row_dark';
+ $template->assign_block_vars('historie', array(
+ 'ROW_CLASS' => $row_class,
+ 'SEASON' => $row['season'],
+ 'LEAGUE' => $row['league'],
+ 'HLOGO' => $logo[$row['home_id']],
+ 'HNAME' => $row['home_name'],
+ 'GLOGO' => $logo[$row['guest_id']],
+ 'GNAME' => $row['guest_name'],
+ 'GOALS_HOME' => $row['goals_home'],
+ 'GOALS_GUEST' => $row['goals_guest'],
+ )
+ );
+ }
+
+ // Statistic and forecast-points for historie
+ $sql = "SELECT
+ SUM(IF(team_id_home = $home_id, goals_home , goals_guest)) AS hg,
+ SUM(IF(team_id_home = $guest_id, goals_home , goals_guest)) AS gg,
+ SUM(IF(team_id_home = $home_id, IF(goals_home + 0 > goals_guest AND goals_home <> '' AND goals_guest <> '', 1 ,0), 0)) AS hw,
+ SUM(IF(team_id_home = $home_id, IF(goals_home = goals_guest AND goals_home <> '' AND goals_guest <> '', 1 ,0), 0)) AS hd,
+ SUM(IF(team_id_home = $home_id, IF(goals_home + 0 < goals_guest AND goals_home <> '' AND goals_guest <> '', 1 ,0), 0)) AS hl,
+ SUM(IF(team_id_home = $home_id, IF(goals_home + 0 > goals_guest, 1 ,0), IF(goals_home + 0 < goals_guest,1,0))) AS gw,
+ SUM(IF(goals_home = goals_guest AND goals_home <> '' AND goals_guest <> '',1,0)) AS gd,
+ SUM(IF(team_id_home = $home_id, IF(goals_home + 0 < goals_guest, 1 ,0), IF(goals_home + 0 > goals_guest,1,0))) AS gl,
+ SUM(IF(team_id_home = $home_id,
+ IF(goals_home + 0 > goals_guest, 3, IF(goals_home = goals_guest, 1, 0)),
+ IF(goals_home + 0 < goals_guest, 4, IF(goals_home = goals_guest, 2, 0))
+ )
+ ) AS value_h,
+ SUM(IF(team_id_home = $guest_id,
+ IF(goals_home + 0 > goals_guest, 3, IF(goals_home = goals_guest, 1, 0)),
+ IF(goals_home + 0 < goals_guest, 4, IF(goals_home = goals_guest, 2, 0))
+ )
+ ) AS value_g
+ FROM " . FOOTB_MATCHES_HIST . "
+ WHERE ((team_id_home = $home_id AND team_id_guest = $guest_id)
+ OR (team_id_home = $guest_id AND team_id_guest = $home_id))";
+
+ $result = $db->sql_query($sql);
+ $row_hist = $db->sql_fetchrow($result);
+ $db->sql_freeresult($result);
+
+ $sql = "SELECT
+ SUM(IF(team_id_home = $home_id, goals_home , goals_guest)) AS hg,
+ SUM(IF(team_id_home = $guest_id, goals_home , goals_guest)) AS gg,
+ SUM(IF(team_id_home = $home_id, IF(goals_home + 0 > goals_guest, 1 ,0), 0)) AS hw,
+ SUM(IF(team_id_home = $home_id, IF(goals_home = goals_guest AND goals_home <> '' AND goals_guest <> '', 1 ,0), 0)) AS hd,
+ SUM(IF(team_id_home = $home_id, IF(goals_home + 0 < goals_guest, 1 ,0), 0)) AS hl,
+ SUM(IF(team_id_home = $home_id, IF(goals_home + 0 > goals_guest, 1 ,0), IF(goals_home + 0 < goals_guest, 1, 0))) AS gw,
+ SUM(IF(goals_home = goals_guest AND goals_home <> '' AND goals_guest <> '', 1, 0)) AS gd,
+ SUM(IF(team_id_home = $home_id, IF(goals_home + 0 < goals_guest, 1 ,0), IF(goals_home + 0 > goals_guest, 1, 0))) AS gl,
+ SUM(IF(team_id_home = $home_id,
+ IF(goals_home + 0 > goals_guest, 3, IF(goals_home = goals_guest AND goals_home <> '' AND goals_guest <> '', 1, 0)),
+ IF(goals_home + 0 < goals_guest, 4, IF(goals_home = goals_guest AND goals_home <> '' AND goals_guest <> '', 2, 0))
+ )
+ ) AS value_h,
+ SUM(IF(team_id_home = $guest_id,
+ IF(goals_home + 0 > goals_guest, 3, IF(goals_home = goals_guest AND goals_home <> '' AND goals_guest <> '',1,0)),
+ IF(goals_home + 0 < goals_guest,4, IF(goals_home = goals_guest AND goals_home <> '' AND goals_guest <> '',2,0))
+ )
+ ) AS value_g
+ FROM " . FOOTB_MATCHES . "
+ WHERE ((team_id_home = $home_id AND team_id_guest = $guest_id) OR (team_id_home = $guest_id AND team_id_guest = $home_id))
+ AND status IN (3,6)
+ AND (season <> $season OR league <> $league OR match_no < $matchnumber)";
+
+ $result = $db->sql_query($sql);
+ $row = $db->sql_fetchrow($result);
+ if (sizeof($row_hist))
+ {
+ if (sizeof($row))
+ {
+ $row['hg'] += $row_hist['hg'];
+ $row['gg'] += $row_hist['gg'];
+ $row['hw'] += $row_hist['hw'];
+ $row['hd'] += $row_hist['hd'];
+ $row['hl'] += $row_hist['hl'];
+ $row['gw'] += $row_hist['gw'];
+ $row['gd'] += $row_hist['gd'];
+ $row['gl'] += $row_hist['gl'];
+ $row['value_h'] += $row_hist['value_h'];
+ $row['value_g'] += $row_hist['value_g'];
+ }
+ else
+ {
+ $row = $row_hist;
+ }
+ }
+
+ if (sizeof($row))
+ {
+ if ($history_count <= 2)
+ {
+ // $history_count = 1 => draws * 1/4
+ // $history_count = 2 => draws * 1/6
+ $percent_draw = round($row['gd'] / ((2 * $history_count) + 2),2);
+ }
+ else
+ {
+ // $history_count > 2 => draws * 1/2
+ $percent_draw = round($row['gd'] / ($history_count * 2),2);
+ }
+ $value_h = round($row['value_h'] / ($history_count * 2),2);
+ $value_g = round($row['value_g'] / ($history_count * 2),2);
+
+ $stat_hist = sprintf($user->lang['THIS_MATCH']) . ': ' . $row['hw'] . '/' . $row['hd'] . '/'. $row['hl'] . ' ' .
+ sprintf($user->lang['TOTAL']) . ': ' . $row['gw'] . '/'. $row['gd'] . '/' . $row['gl'] . ' ' .
+ sprintf($user->lang['GOALS']) . ': ' . $row['hg'] . ':'. $row['gg'] . ' ' .
+ sprintf($user->lang['FORECAST_PTS']) . ': ' . $value_h . ':' . $value_g;
+
+ $template->assign_vars(array(
+ 'STAT_HIST' => $stat_hist,
+ )
+ );
+ }
+ $db->sql_freeresult($result);
+
+ //Charts history
+ $chart_points = substr($chart_points, 0, strlen($chart_points) - 1);
+ $chart= "football_root_path
+ . "includes/chart_hist.php?v1=$chart_points' alt='" . sprintf($user->lang['TOTAL']) . "' usemap='#map_total'/>";
+ $template->assign_block_vars('chart_hist_total', array(
+ 'CHARTIMAGE' => $chart,
+ )
+ );
+ for ($i = 0; $i < sizeof($map_total_coords); $i++)
+ {
+ $template->assign_block_vars('chart_hist_total.map_total', array(
+ 'COORDS' => $map_total_coords[$i],
+ 'TITLE' => $map_total_titles[$i],
+ )
+ );
+ }
+ }
+
+
+ // Table total
+
+ if ($group_id == '' OR $group_id == '??')
+ {
+ $where_group = '';
+ }
+ else
+ {
+ $where_group = " AND m.group_id = '" . $db->sql_escape($group_id) . "'";
+ }
+ $sql = "SELECT
+ t.*,
+ SUM(1) AS matches,
+ SUM(IF((m.team_id_home = t.team_id), IF(goals_home + 0 > goals_guest, 1, 0), IF(goals_home + 0 < goals_guest, 1, 0))) AS wins,
+ SUM(IF(goals_home = goals_guest AND goals_home <> '' AND goals_guest <> '', 1, 0)) AS draws,
+ SUM(IF((m.team_id_home = t.team_id), IF(goals_home + 0 < goals_guest, 1, 0), IF(goals_home + 0 > goals_guest, 1, 0))) AS lost,
+ SUM(IF(m.team_id_home = t.team_id,
+ IF(goals_home + 0 > goals_guest, 3, IF(goals_home = goals_guest AND goals_home <> '' AND goals_guest <> '', 1, 0)),
+ IF(goals_home + 0 < goals_guest, 3, IF(goals_home = goals_guest, 1, 0))
+ )
+ ) AS points,
+ SUM(IF(m.team_id_home = t.team_id, goals_home - goals_guest, goals_guest - goals_home)) AS gdiff,
+ SUM(IF(m.team_id_home = t.team_id, goals_home, goals_guest)) AS goals,
+ SUM(IF(m.team_id_home = t.team_id, goals_guest, goals_home)) AS goals_against
+ FROM " . FOOTB_TEAMS . " AS t
+ LEFT JOIN " . FOOTB_MATCHES . " AS m ON (m.season = t.season AND m.league = t.league AND (m.team_id_home = t.team_id OR m.team_id_guest = t.team_id))
+ WHERE t.season = $season
+ AND t.league = $league
+ AND (m.matchday < $matchday)
+ AND (m.status IN (3,6)) $where_group
+ GROUP BY t.team_id
+ ORDER BY points DESC, gdiff DESC, goals DESC";
+
+ $result = $db->sql_query($sql);
+ $rank = 0;
+ $current_rank = 0;
+ $last_goals = 0;
+ $last_goals_againts = 0;
+ $last_points = 0;
+ while ($row = $db->sql_fetchrow($result))
+ {
+ $rank++;
+ if ($last_points <> $row['points'] OR $last_goals <> $row['goals'] OR $last_goals_againts <> $row['goals_against'])
+ {
+ $current_rank = $rank;
+ }
+ $last_points = $row['points'];
+ $last_goals = $row['goals'];
+ $last_goals_againts = $row['goals_against'];
+ if ($home_id == $row['team_id'])
+ {
+ $data_home = true;
+ $value_h += round($row['points'] / ($row['matches'] * 3), 2);
+ $plfp = $current_rank . '(' . round($row['points'] / ($row['matches'] * 3), 2) . ')';
+ $template->assign_block_vars('table_hometeam', array(
+ 'ROW_CLASS' => 'bg2 row_dark',
+ 'TABLE' => sprintf($user->lang['TABLE_TOTAL']),
+ 'PLFP' => $plfp,
+ 'MATCHES' => $row['matches'],
+ 'WINS' => $row['wins'],
+ 'DRAW' => $row['draws'],
+ 'LOST' => $row['lost'],
+ 'GOALS_HOME' => $row['goals'],
+ 'GOALS_GUEST' => $row['goals_against'],
+ 'GDIFF' => $row['gdiff'],
+ 'POINTS' => $row['points'],
+ )
+ );
+ }
+ if ($guest_id == $row['team_id'])
+ {
+ $data_guest = true;
+ $value_g += round($row['points'] / ($row['matches'] * 3),2);
+ $plfp = $current_rank . '(' . round($row['points'] / ($row['matches'] * 3), 2) . ')';
+ $template->assign_block_vars('table_guestteam', array(
+ 'ROW_CLASS' => 'bg2 row_dark',
+ 'TABLE' => sprintf($user->lang['TABLE_TOTAL']),
+ 'PLFP' => $plfp,
+ 'MATCHES' => $row['matches'],
+ 'WINS' => $row['wins'],
+ 'DRAW' => $row['draws'],
+ 'LOST' => $row['lost'],
+ 'GOALS_HOME' => $row['goals'],
+ 'GOALS_GUEST' => $row['goals_against'],
+ 'GDIFF' => $row['gdiff'],
+ 'POINTS' => $row['points'],
+ )
+ );
+ }
+ }
+ $db->sql_freeresult($result);
+
+ // Hometable hometeam
+ if ($data_home)
+ {
+ $sql = "SELECT
+ t.*,
+ SUM(1) AS matches,
+ SUM(IF((m.team_id_home = t.team_id), IF(goals_home + 0 > goals_guest, 1, 0), IF(goals_home + 0 < goals_guest, 1, 0))) AS wins,
+ SUM(IF(goals_home = goals_guest, 1, 0)) AS draws,
+ SUM(IF((m.team_id_home = t.team_id), IF(goals_home + 0 < goals_guest, 1, 0), IF(goals_home + 0 > goals_guest, 1, 0))) AS lost,
+ SUM(IF(m.team_id_home = t.team_id,
+ IF(goals_home + 0 > goals_guest, 3, IF(goals_home = goals_guest AND goals_home <> '' AND goals_guest <> '', 1, 0)),
+ IF(goals_home + 0 < goals_guest, 3, IF(goals_home = goals_guest, 1, 0))
+ )
+ ) AS points,
+ SUM(IF(m.team_id_home = t.team_id, goals_home - goals_guest , goals_guest - goals_home)) AS gdiff,
+ SUM(IF(m.team_id_home = t.team_id, goals_home , goals_guest)) AS goals,
+ SUM(IF(m.team_id_home = t.team_id, goals_guest , goals_home)) AS goals_against
+ FROM " . FOOTB_TEAMS . ' AS t
+ LEFT JOIN ' . FOOTB_MATCHES . " AS m ON (m.season = t.season AND m.league = t.league AND m.team_id_home = t.team_id)
+ WHERE t.season = $season
+ AND t.league = $league
+ AND m.matchday < $matchday
+ AND m.status IN (3,6)
+ GROUP BY t.team_id
+ ORDER BY points DESC, gdiff DESC, goals DESC";
+
+ $result = $db->sql_query($sql);
+ $rank = 0;
+ $current_rank = 0;
+ $last_goals = 0;
+ $last_goals_againts = 0;
+ $last_points = 0;
+ while ($row = $db->sql_fetchrow($result))
+ {
+ $data_home = true;
+ $rank++;
+ if ($last_points <> $row['points'] OR $last_goals <> $row['goals'] OR $last_goals_againts <> $row['goals_against'])
+ {
+ $current_rank = $rank;
+ }
+ $last_points = $row['points'];
+ $last_goals = $row['goals'];
+ $last_goals_againts = $row['goals_against'];
+ if ($home_id == $row['team_id'])
+ {
+ $win = $row['wins'];
+ $draw = $row['draws'];
+ $lost = $row['lost'];
+ $value_hg = round(((($win * 3) + $draw) / ($win + $draw + $lost)),2);
+ $value_h += $value_hg;
+ $plfp = $current_rank . '(' . $value_hg . ')';
+ $template->assign_block_vars('table_hometeam', array(
+ 'ROW_CLASS' => 'bg1 row_light',
+ 'TABLE' => sprintf($user->lang['TABLE_HOME']),
+ 'PLFP' => $plfp,
+ 'MATCHES' => $row['matches'],
+ 'WINS' => $row['wins'],
+ 'DRAW' => $row['draws'],
+ 'LOST' => $row['lost'],
+ 'GOALS_HOME' => $row['goals'],
+ 'GOALS_GUEST' => $row['goals_against'],
+ 'GDIFF' => $row['gdiff'],
+ 'POINTS' => $row['points'],
+ )
+ );
+ }
+ }
+ $db->sql_freeresult($result);
+ }
+
+ //Away-Table guestteam
+ if ($data_guest)
+ {
+ $sql = "SELECT
+ t.*,
+ SUM(1) AS matches,
+ SUM(IF((m.team_id_home = t.team_id), IF(m.goals_home + 0 > m.goals_guest, 1, 0), IF(m.goals_home + 0 < m.goals_guest, 1, 0))) AS wins,
+ SUM(IF(m.goals_home = m.goals_guest AND goals_home <> '' AND goals_guest <> '',1,0)) AS draws,
+ SUM(IF((m.team_id_home = t.team_id), IF(m.goals_home + 0 < m.goals_guest, 1, 0), IF(m.goals_home + 0 > m.goals_guest, 1, 0))) AS lost,
+ SUM(IF(m.team_id_home = t.team_id,
+ IF(m.goals_home + 0 > m.goals_guest, 3, IF(m.goals_home = m.goals_guest AND goals_home <> '' AND goals_guest <> '', 1, 0)),
+ IF(m.goals_home + 0 < m.goals_guest, 3, IF(m.goals_home = m.goals_guest, 1, 0))
+ )
+ ) AS points,
+ SUM(IF(m.team_id_home = t.team_id,m.goals_home - m.goals_guest , m.goals_guest - m.goals_home)) AS gdiff,
+ SUM(IF(m.team_id_home = t.team_id,m.goals_home , m.goals_guest)) AS goals,
+ SUM(IF(m.team_id_home = t.team_id,m.goals_guest , m.goals_home)) AS goals_against
+ FROM " . FOOTB_TEAMS . ' AS t
+ LEFT JOIN ' . FOOTB_MATCHES . " AS m ON (m.season = t.season AND m.league = t.league AND m.team_id_guest = t.team_id)
+ WHERE t.season = $season
+ AND t.league = $league
+ AND m.matchday < $matchday
+ AND m.status IN (3,6)
+ GROUP BY t.team_id
+ ORDER BY points DESC, gdiff DESC, goals DESC";
+
+ $result = $db->sql_query($sql);
+ $rank = 0;
+ $current_rank = 0;
+ $last_goals = 0;
+ $last_goals_againts = 0;
+ $last_points = 0;
+ while ($row = $db->sql_fetchrow($result))
+ {
+ $rank++;
+ if ($last_points <> $row['points'] OR $last_goals <> $row['goals'] OR $last_goals_againts <> $row['goals_against'])
+ {
+ $current_rank = $rank;
+ }
+ $last_points = $row['points'];
+ $last_goals = $row['goals'];
+ $last_goals_againts = $row['goals_against'];
+ if ($guest_id == $row['team_id'])
+ {
+ $data_guest = true;
+ $win = $row['wins'];
+ $draw = $row['draws'];
+ $lost = $row['lost'];
+ $value_gg = round(((($win * 4) + ($draw * 2)) / ($win + $draw + $lost)),2);
+ $value_g += $value_gg;
+ $plfp = $current_rank . '(' . $value_gg . ')';
+ $template->assign_block_vars('table_guestteam', array(
+ 'ROW_CLASS' => 'bg1 row_light',
+ 'TABLE' => sprintf($user->lang['TABLE_AWAY']),
+ 'PLFP' => $plfp,
+ 'MATCHES' => $row['matches'],
+ 'WINS' => $row['wins'],
+ 'DRAW' => $row['draws'],
+ 'LOST' => $row['lost'],
+ 'GOALS_HOME' => $row['goals'],
+ 'GOALS_GUEST' => $row['goals_against'],
+ 'GDIFF' => $row['gdiff'],
+ 'POINTS' => $row['points'],
+ )
+ );
+ }
+ }
+ $db->sql_freeresult($result);
+ }
+
+ // Form-Table
+ $points_home = 0;
+ $points_guest = 0;
+ $form_matches = 0;
+ if ($data_home or $data_guest)
+ {
+ $sql = "SELECT
+ t.*,
+ SUM(1) AS matches,
+ SUM(IF((m.team_id_home = t.team_id), IF(goals_home + 0 > goals_guest, 1, 0), IF(goals_home + 0 < goals_guest, 1, 0))) AS wins,
+ SUM(IF(goals_home = goals_guest AND goals_home <> '' AND goals_guest <> '', 1, 0)) AS draws,
+ SUM(IF((m.team_id_home = t.team_id), IF(goals_home + 0 < goals_guest, 1, 0), IF(goals_home + 0 > goals_guest, 1, 0))) AS lost,
+ SUM(IF(m.team_id_home = t.team_id,
+ IF(goals_home + 0 > goals_guest, 3, IF(goals_home = goals_guest AND goals_home <> '' AND goals_guest <> '', 1, 0)),
+ IF(goals_home + 0 < goals_guest, 3, IF(goals_home = goals_guest, 1, 0))
+ )
+ ) AS points,
+ SUM(IF(m.team_id_home = t.team_id, goals_home - goals_guest , goals_guest - goals_home)) AS gdiff,
+ SUM(IF(m.team_id_home = t.team_id, goals_home , goals_guest)) AS goals,
+ SUM(IF(m.team_id_home = t.team_id, goals_guest , goals_home)) AS goals_against
+ FROM " . FOOTB_TEAMS . ' AS t
+ LEFT JOIN ' . FOOTB_MATCHES . " AS m ON (m.season = t.season AND m.league = t.league AND ((m.team_id_home = t.team_id) OR (m.team_id_guest = t.team_id)))
+ WHERE t.season = $season
+ AND t.league = $league
+ AND m.matchday >= $form_from
+ AND m.matchday < $matchday
+ AND m.status IN (3,6)
+ GROUP BY t.team_id
+ ORDER BY points DESC, gdiff DESC, goals DESC";
+
+ $result = $db->sql_query($sql);
+ $rank = 0;
+ $current_rank = 0;
+ $last_goals = 0;
+ $last_goals_againts = 0;
+ $last_points = 0;
+ while ($row = $db->sql_fetchrow($result))
+ {
+ $rank++;
+ if ($last_points <> $row['points'] OR $last_goals <> $row['goals'] OR $last_goals_againts <> $row['goals_against'])
+ {
+ $current_rank = $rank;
+ }
+ $last_points = $row['points'];
+ $last_goals = $row['goals'];
+ $last_goals_againts = $row['goals_against'];
+ if ($home_id == $row['team_id'])
+ {
+ $points_home = $row['points'];
+ if ($row['matches'] > $form_matches)
+ {
+ $form_matches = $row['matches'];
+ }
+ $data_home = true;
+ $win = $row['wins'];
+ $draw = $row['draws'];
+ $lost = $row['lost'];
+ $value_hg = round(((($win * 2) + $draw) / ($win + $draw + $lost)),2);
+ $value_h += $value_hg;
+ $plfp = $current_rank . '(' . $value_hg . ')';
+ $template->assign_block_vars('table_hometeam', array(
+ 'ROW_CLASS' => 'bg2 row_dark',
+ 'TABLE' => sprintf($user->lang['TABLE_FORM']),
+ 'PLFP' => $plfp,
+ 'MATCHES' => $row['matches'],
+ 'WINS' => $row['wins'],
+ 'DRAW' => $row['draws'],
+ 'LOST' => $row['lost'],
+ 'GOALS_HOME' => $row['goals'],
+ 'GOALS_GUEST' => $row['goals_against'],
+ 'GDIFF' => $row['gdiff'],
+ 'POINTS' => $row['points'],
+ )
+ );
+ }
+ if ($guest_id == $row['team_id'])
+ {
+ $points_guest = $row['points'];
+ if ($row['matches'] > $form_matches)
+ {
+ $form_matches = $row['matches'];
+ }
+ $data_guest = true;
+ $win = $row['wins'];
+ $draw = $row['draws'];
+ $lost = $row['lost'];
+ $value_gg = round(((($win * 2) + $draw) / ($win + $draw + $lost)),2);
+ $value_g += $value_gg;
+ $plfp = $current_rank . '(' . $value_gg . ')';
+ $template->assign_block_vars('table_guestteam', array(
+ 'ROW_CLASS' => 'bg2 row_dark',
+ 'TABLE' => sprintf($user->lang['TABLE_FORM']),
+ 'PLFP' => $plfp,
+ 'MATCHES' => $row['matches'],
+ 'WINS' => $row['wins'],
+ 'DRAW' => $row['draws'],
+ 'LOST' => $row['lost'],
+ 'GOALS_HOME' => $row['goals'],
+ 'GOALS_GUEST' => $row['goals_against'],
+ 'GDIFF' => $row['gdiff'],
+ 'POINTS' => $row['points'],
+ )
+ );
+ }
+ }
+ $db->sql_freeresult($result);
+ }
+
+ $matches_played = 0;
+ $draws_home = 0;
+ $draws_guest = 0;
+
+ // Chart hometeam
+ if ($data_home)
+ {
+ $sql = "SELECT
+ IF(m.team_id_home = t.team_id,
+ IF(goals_home + 0 > goals_guest, '+0', IF(goals_home = goals_guest, '30', '-0')),
+ IF(goals_home + 0 < goals_guest, '+90', IF(goals_home = goals_guest, '60', '-90'))) AS chart_points,
+ th.team_name AS home_name,
+ tg.team_name AS guest_name,
+ m.goals_home,
+ m.goals_guest
+ FROM " . FOOTB_TEAMS . ' AS t
+ LEFT JOIN ' . FOOTB_MATCHES . ' AS m ON (m.season = t.season AND m.league = t.league
+ AND (m.team_id_home = t.team_id OR m.team_id_guest = t.team_id))
+ LEFT JOIN ' . FOOTB_TEAMS . " AS th ON (th.season = $season AND th.league = $league AND th.team_id = m.team_id_home)
+ LEFT JOIN " . FOOTB_TEAMS . " AS tg ON (tg.season = $season AND tg.league = $league AND tg.team_id = m.team_id_guest)
+ WHERE t.season = $season
+ AND t.league = $league
+ AND m.matchday <= $matchday
+ AND m.match_no <> $matchnumber
+ AND m.status IN (3,6)
+ AND t.team_id=$home_id
+ ORDER BY m.match_datetime ASC";
+
+ $result = $db->sql_query($sql);
+ $trend = $db->sql_fetchrowset($result);
+ $db->sql_freeresult($result);
+ $trend_count = sizeof($trend);
+ $chart_points = '';
+ $map_home_coords = array();
+ $map_home_titles = array();
+ $rank = 0;
+ foreach ($trend as $row)
+ {
+ if ($row['chart_points'] == '30' or $row['chart_points'] == '60')
+ {
+ $draws_home += 1;
+ }
+ $chart_points = $chart_points . $row['chart_points']. ',';
+ $coord_start = $start + ($rank * $vert);
+ $coord_end = $end + ($rank * $vert);
+ if (abs($row['chart_points']) > 45)
+ {
+ $coords = $coord_start . ",45," . $coord_end . "," . abs($row['chart_points']);
+ }
+ else
+ {
+ $coords = $coord_start . "," . abs($row['chart_points']) . "," . $coord_end . ",45";
+ }
+ $map_home_coords[] = $coords;
+ $map_home_titles[] = $row['home_name'] . ' - ' . $row['guest_name'] . ' ' . $row['goals_home'] . ':' . $row['goals_guest'];
+ $rank++;
+ }
+ $chart_points = substr($chart_points, 0, strlen($chart_points) - 1);
+ $chart= "football_root_path
+ . "includes/chart_hist.php?v1=$chart_points' alt='" . sprintf($user->lang['HIST_CHART']) . "' usemap='#map_home'/>";
+ $template->assign_block_vars('chart_home', array(
+ 'CHARTIMAGE' => $chart,
+ )
+ );
+ for ($i = 0; $i < sizeof($map_home_coords); $i++)
+ {
+ $template->assign_block_vars('chart_home.map_home', array(
+ 'COORDS' => $map_home_coords[$i],
+ 'TITLE' => $map_home_titles[$i],
+ )
+ );
+ }
+ $matches_played = sizeof($map_home_coords);
+ }
+
+ //Chart guestteam
+ if ($data_guest)
+ {
+ $sql = "SELECT
+ IF(m.team_id_home = t.team_id,
+ IF(goals_home + 0 > goals_guest, '+0', IF(goals_home = goals_guest, '30', '-0')),
+ IF(goals_home + 0 < goals_guest, '+90', IF(goals_home = goals_guest, '60', '-90')
+ )
+ ) AS chart_points,
+ th.team_name AS home_name,
+ tg.team_name AS guest_name,
+ m.goals_home,
+ m.goals_guest
+ FROM " . FOOTB_TEAMS . ' AS t
+ LEFT JOIN ' . FOOTB_MATCHES . ' AS m ON (m.season = t.season AND m.league = t.league
+ AND (m.team_id_home = t.team_id OR m.team_id_guest = t.team_id))
+ LEFT JOIN ' . FOOTB_TEAMS . " AS th ON (th.season = $season AND th.league = $league AND th.team_id = m.team_id_home)
+ LEFT JOIN " . FOOTB_TEAMS . " AS tg ON (tg.season = $season AND tg.league = $league AND tg.team_id = m.team_id_guest)
+ WHERE t.season = $season
+ AND t.league = $league
+ AND m.matchday <= $matchday
+ AND m.match_no <> $matchnumber
+ AND m.status IN (3,6)
+ AND t.team_id=$guest_id
+ ORDER BY m.match_datetime ASC";
+
+ $result = $db->sql_query($sql);
+ $trend = $db->sql_fetchrowset($result);
+ $db->sql_freeresult($result);
+ $trend_count = sizeof($trend);
+ $chart_points = '';
+ $map_guest_coords = array();
+ $map_guest_titles = array();
+ $rank = 0;
+ foreach ($trend as $row)
+ {
+ if ($row['chart_points'] == '30' or $row['chart_points'] == '60')
+ {
+ $draws_guest += 1;
+ }
+ $chart_points = $chart_points . $row['chart_points']. ',';
+ $coord_start = $start + ($rank * $vert);
+ $coord_end = $end + ($rank * $vert);
+ if (abs($row['chart_points']) > 45)
+ {
+ $coords = $coord_start . ",45," . $coord_end . "," . abs($row['chart_points']);
+ }
+ else
+ {
+ $coords = $coord_start . "," . abs($row['chart_points']) . "," . $coord_end . ",45";
+ }
+ $map_guest_coords[] = $coords;
+ $map_guest_titles[] = $row['home_name'] . ' - ' . $row['guest_name'] . ' ' . $row['goals_home'] . ':' . $row['goals_guest'];
+ $rank++;
+ }
+ $chart_points = substr($chart_points, 0, strlen($chart_points) - 1);
+ $chart= "football_root_path
+ . "includes/chart_hist.php?v1=$chart_points' alt='" . sprintf($user->lang['HIST_CHART']) . "' usemap='#map_guest'/>";
+ $template->assign_block_vars('chart_guest', array(
+ 'CHARTIMAGE' => $chart,
+ )
+ );
+ for ($i = 0; $i < sizeof($map_guest_coords); $i++)
+ {
+ $template->assign_block_vars('chart_guest.map_guest', array(
+ 'COORDS' => $map_guest_coords[$i],
+ 'TITLE' => $map_guest_titles[$i],
+ )
+ );
+ }
+ $matches_played = $matches_played + sizeof($map_guest_coords);
+ }
+
+ if ($data_home and $data_guest)
+ {
+ $percent_draws_season = round(($draws_home + $draws_guest) / $matches_played, 2);
+ }
+ else
+ {
+ $percent_draws_season = 0.0;
+ $form_matches = 0;
+ }
+ if ($history_count <= 2)
+ {
+ switch($form_matches)
+ {
+ case 0:
+ $percent_draw += (2 - $history_count) * 0.1;
+ break;
+ case 1:
+ $percent_draw += (2 - $history_count) * 0.1 + round($percent_draws_season / 4, 2);
+ break;
+ default:
+ $percent_draw += (2 - $history_count) * 0.1 + round($percent_draws_season / 2, 2);
+ break;
+ }
+ }
+ else
+ {
+ if (abs($points_home - $points_guest) < 3)
+ {
+ $equal_form_factor = 1.1;
+ }
+ else
+ {
+ $equal_form_factor = 1.0;
+ }
+ switch($form_matches)
+ {
+ case 0:
+ $percent_draw = round($percent_draw * 1.5, 2);
+ break;
+ case 1:
+ $percent_draw = round(($percent_draw * 1.5) + ($percent_draws_season / 8), 2);
+ break;
+ case 2:
+ case 3:
+ case 4:
+ $percent_draw = round(($percent_draw * $equal_form_factor) + ($percent_draws_season / 4), 2);
+ break;
+ default:
+ $percent_draw = round(($percent_draw * $equal_form_factor) + ($percent_draws_season / 2), 2);
+ if ($percent_draw > 1.0)
+ {
+ $percent_draw = 1.0;
+ }
+ //$percent_draw = ($percent_draw * $equal_form_factor) + ($percent_draws_season / 2) ;
+ break;
+ }
+ }
+ $percent_draw = $percent_draw;
+
+ // last matches hometeam
+ $sql = "(SELECT
+ match_date AS matchtime,
+ IF(mh.team_id_home = $home_id, 'H', 'A') AS match_place,
+ IF(mh.team_id_home = $home_id, tgh.team_name, thh.team_name) AS against,
+ mh.goals_home,
+ mh.goals_guest,
+ IF(mh.team_id_home = $home_id,
+ IF(mh.goals_home + 0 > mh.goals_guest, 1, IF(mh.goals_home = mh.goals_guest, 0, 2)),
+ IF(mh.goals_home + 0 < mh.goals_guest, 1, IF(mh.goals_home = mh.goals_guest, 0, 2)
+ )
+ ) AS match_res
+ FROM " . FOOTB_MATCHES_HIST . ' AS mh
+ LEFT JOIN ' . FOOTB_TEAMS_HIST . ' AS thh ON thh.team_id = mh.team_id_home
+ LEFT JOIN ' . FOOTB_TEAMS_HIST . " AS tgh ON tgh.team_id = mh.team_id_guest
+ WHERE (mh.team_id_home = $home_id
+ OR mh.team_id_guest = $home_id)
+ )
+ UNION
+ (SELECT
+ match_datetime AS matchtime,
+ IF(m.team_id_home = $home_id, 'H', 'A') AS match_place,
+ IF(m.team_id_home = $home_id, tg.team_name, th.team_name) AS against,
+ m.goals_home,
+ m.goals_guest,
+ IF(m.team_id_home = $home_id,
+ IF(m.goals_home + 0 > m.goals_guest, 1, IF(m.goals_home = m.goals_guest, 0, 2)),
+ IF(m.goals_home + 0 < m.goals_guest, 1, IF(m.goals_home = m.goals_guest, 0, 2)
+ )
+ ) AS match_res
+ FROM " . FOOTB_MATCHES . ' AS m
+ LEFT JOIN ' . FOOTB_TEAMS . ' AS th ON (th.season = m.season AND th.league = m.league AND th.team_id = team_id_home)
+ LEFT JOIN ' . FOOTB_TEAMS . " AS tg ON (tg.season = m.season AND tg.league = m.league AND tg.team_id = team_id_guest)
+ WHERE m.season = $season
+ AND m.league = $league
+ AND m.matchday <= $matchday
+ AND m.match_no <> $matchnumber
+ AND (m.team_id_home = $home_id OR m.team_id_guest = $home_id)
+ AND m.status IN(3,6)
+ )
+ ORDER BY matchtime";
+
+ $result = $db->sql_query($sql);
+ $lastmatches = $db->sql_fetchrowset($result);
+ $db->sql_freeresult($result);
+ $numb_matches = sizeof($lastmatches);
+
+
+ if ($numb_matches > 10)
+ $start = $numb_matches - 10;
+ else
+ $start = 0;
+ $rank = 0;
+ foreach ($lastmatches as $row)
+ {
+ $rank++;
+ if ($rank > $start)
+ {
+ $row_class = (!($rank % 2)) ? 'bg1 row_light' : 'bg2 row_dark';
+ $match_res_style='';
+ switch($row['match_res'])
+ {
+ case 0:
+ $match_res_style = 'match_draw';
+ break;
+ case 1:
+ $match_res_style = 'match_win';
+ break;
+ case 2:
+ $match_res_style = 'match_lost';
+ break;
+ }
+ $template->assign_block_vars('last_hometeam', array(
+ 'ROW_CLASS' => $row_class,
+ 'MATCH_RESULT' => $match_res_style,
+ 'PLACE' => $row['match_place'],
+ 'AGAINST' => $row['against'],
+ 'GOALS_HOME' => $row['goals_home'],
+ 'GOALS_GUEST' => $row['goals_guest'],
+ )
+ );
+ }
+ }
+
+ //last matches home hometeam
+ $sql = '(SELECT
+ match_date AS matchtime,
+ th.team_name AS against,
+ mh.goals_home,
+ mh.goals_guest,
+ IF(mh.goals_home + 0 > mh.goals_guest, 1, IF(mh.goals_home = mh.goals_guest, 0, 2)) AS match_res
+ FROM ' . FOOTB_MATCHES_HIST . ' AS mh
+ LEFT JOIN ' . FOOTB_TEAMS_HIST . " AS th ON th.team_id = mh.team_id_guest
+ WHERE mh.team_id_home = $home_id
+ )
+ UNION
+ (SELECT
+ match_datetime AS matchtime,
+ t.team_name AS against,
+ m.goals_home,
+ m.goals_guest,
+ IF(m.goals_home + 0 > m.goals_guest, 1, IF(m.goals_home = m.goals_guest, 0, 2)) AS match_res
+ FROM " . FOOTB_MATCHES . ' AS m
+ LEFT JOIN ' . FOOTB_TEAMS . " AS t ON (t.season = m.season AND t.league = m.league AND t.team_id = m.team_id_guest)
+ WHERE m.season = $season
+ AND m.league = $league
+ AND m.matchday <= $matchday
+ AND m.match_no <> $matchnumber
+ AND m.team_id_home = $home_id
+ AND m.status IN (3,6)
+ )
+ ORDER BY matchtime";
+
+ $result = $db->sql_query($sql);
+ $lastmatches = $db->sql_fetchrowset($result);
+ $db->sql_freeresult($result);
+ $numb_matches = sizeof($lastmatches);
+
+ if ($numb_matches > 5)
+ $start = $numb_matches - 5;
+ else
+ $start = 0;
+ $rank = 0;
+ foreach ($lastmatches as $row)
+ {
+ $data_last_home = true;
+ $rank++;
+ if ($rank > $start)
+ {
+ $row_class = (!(($rank-$start) % 2)) ? 'bg1 row_light' : 'bg2 row_dark';
+ $match_res_style='';
+ switch($row['match_res'])
+ {
+ case 0:
+ $match_res_style = 'match_draw';
+ break;
+ case 1:
+ $match_res_style = 'match_win';
+ break;
+ case 2:
+ $match_res_style = 'match_lost';
+ break;
+ }
+ $template->assign_block_vars('lasthome_hometeam', array(
+ 'ROW_CLASS' => $row_class,
+ 'MATCH_RESULT' => $match_res_style,
+ 'AGAINST' => $row['against'],
+ 'GOALS_HOME' => $row['goals_home'],
+ 'GOALS_GUEST' => $row['goals_guest'],
+ )
+ );
+ }
+ }
+
+ //last game guestteam
+ $sql = "(SELECT
+ match_date AS matchtime,
+ IF(mh.team_id_home = $guest_id, 'H', 'A') AS match_place,
+ IF(mh.team_id_home = $guest_id, tgh.team_name, thh.team_name) AS against,
+ mh.goals_home,
+ mh.goals_guest,
+ IF(mh.team_id_home = $guest_id,
+ IF(mh.goals_home + 0 > mh.goals_guest, 1, IF(mh.goals_home = mh.goals_guest, 0, 2)),
+ IF(mh.goals_home + 0 < mh.goals_guest, 1, IF(mh.goals_home = mh.goals_guest, 0, 2)
+ )
+ ) AS match_res
+ FROM " . FOOTB_MATCHES_HIST . ' AS mh
+ LEFT JOIN ' . FOOTB_TEAMS_HIST . ' AS thh ON thh.team_id = mh.team_id_home
+ LEFT JOIN ' . FOOTB_TEAMS_HIST . " AS tgh ON tgh.team_id = mh.team_id_guest
+ WHERE mh.team_id_home = $guest_id
+ OR mh.team_id_guest = $guest_id
+ )
+ UNION
+ (SELECT
+ match_datetime AS matchtime,
+ IF(m.team_id_home = $guest_id, 'H', 'A') AS match_place,
+ IF(m.team_id_home = $guest_id, tg.team_name, th.team_name) AS against,
+ m.goals_home,
+ m.goals_guest,
+ IF(m.team_id_home = $guest_id,
+ IF(m.goals_home + 0 > m.goals_guest, 1, IF(m.goals_home = m.goals_guest, 0, 2)),
+ IF(m.goals_home + 0 < m.goals_guest, 1, IF(m.goals_home = m.goals_guest, 0, 2)
+ )
+ ) AS match_res
+ FROM " . FOOTB_MATCHES . ' AS m
+ LEFT JOIN ' . FOOTB_TEAMS . ' AS th ON (th.season = m.season AND th.league = m.league AND th.team_id = team_id_home)
+ LEFT JOIN ' . FOOTB_TEAMS . " AS tg ON (tg.season = m.season AND tg.league = m.league AND tg.team_id = team_id_guest)
+ WHERE m.season = $season
+ AND m.league = $league
+ AND m.matchday <= $matchday
+ AND m.match_no <> $matchnumber
+ AND (m.team_id_home = $guest_id OR m.team_id_guest = $guest_id)
+ AND m.status IN(3,6)
+ )
+ ORDER BY matchtime";
+
+ $result = $db->sql_query($sql);
+ $lastmatches = $db->sql_fetchrowset($result);
+ $db->sql_freeresult($result);
+ $numb_matches = sizeof($lastmatches);
+
+ if ($numb_matches > 10)
+ $start = $numb_matches - 10;
+ else
+ $start = 0;
+ $rank = 0;
+ foreach ($lastmatches as $row)
+ {
+ $rank++;
+ if ($rank > $start)
+ {
+ $row_class = (!($rank % 2)) ? 'bg1 row_light' : 'bg2 row_dark';
+ $match_res_style='';
+ switch($row['match_res'])
+ {
+ case 0:
+ $match_res_style = 'match_draw';
+ break;
+ case 1:
+ $match_res_style = 'match_win';
+ break;
+ case 2:
+ $match_res_style = 'match_lost';
+ break;
+ }
+ $template->assign_block_vars('last_guestteam', array(
+ 'ROW_CLASS' => $row_class,
+ 'MATCH_RESULT' => $match_res_style,
+ 'PLACE' => $row['match_place'],
+ 'AGAINST' => $row['against'],
+ 'GOALS_HOME' => $row['goals_home'],
+ 'GOALS_GUEST' => $row['goals_guest'],
+ )
+ );
+ }
+ }
+
+ //last matches away guestteam
+ $sql = '(SELECT
+ match_date AS matchtime,
+ th.team_name AS against,
+ mh.goals_home AS goals_home,
+ mh.goals_guest,
+ IF(mh.goals_home + 0 < mh.goals_guest, 1, IF(mh.goals_home = mh.goals_guest, 0, 2)) AS match_res
+ FROM ' . FOOTB_MATCHES_HIST . ' As mh
+ LEFT JOIN ' . FOOTB_TEAMS_HIST . " AS th ON th.team_id = mh.team_id_home
+ WHERE mh.team_id_guest = $guest_id
+ )
+ UNION
+ (SELECT
+ match_datetime AS matchtime,
+ t.team_name AS against,
+ m.goals_home AS goals_home,
+ m.goals_guest,
+ IF(m.goals_home + 0 < m.goals_guest, 1, IF(m.goals_home = m.goals_guest, 0, 2)) AS match_res
+ FROM " . FOOTB_MATCHES . ' As m
+ LEFT JOIN ' . FOOTB_TEAMS . " AS t ON (t.season = m.season AND t.league = m.league AND t.team_id = m.team_id_home)
+ WHERE m.season = $season AND m.league = $league AND m.matchday <= $matchday AND m.match_no <> $matchnumber
+ AND m.team_id_guest = $guest_id
+ AND m.status IN (3,6)
+ )
+ ORDER BY matchtime";
+
+ $result = $db->sql_query($sql);
+ $lastmatches = $db->sql_fetchrowset($result);
+ $db->sql_freeresult($result);
+ $numb_matches = sizeof($lastmatches);
+
+ if ($numb_matches > 5)
+ $start = $numb_matches - 5;
+ else
+ $start = 0;
+ $rank = 0;
+ foreach ($lastmatches as $row)
+ {
+ $data_last_away = true;
+ $rank++;
+ if ($rank > $start)
+ {
+ $row_class = (!(($rank-$start) % 2)) ? 'bg1 row_light' : 'bg2 row_dark';
+ $match_res_style='';
+ switch($row['match_res'])
+ {
+ case 0:
+ $match_res_style = 'match_draw';
+ break;
+ case 1:
+ $match_res_style = 'match_win';
+ break;
+ case 2:
+ $match_res_style = 'match_lost';
+ break;
+ }
+ $template->assign_block_vars('lastaway_guestteam', array(
+ 'ROW_CLASS' => $row_class,
+ 'MATCH_RESULT' => $match_res_style,
+ 'AGAINST' => $row['against'],
+ 'GOALS_HOME' => $row['goals_home'],
+ 'GOALS_GUEST' => $row['goals_guest'],
+ )
+ );
+ }
+ }
+
+ if ($history_count == 0 and !($data_home and $data_guest))
+ {
+ $percent_draw = 0;
+ $percent_home = 0;
+ $percent_guest = 0;
+ }
+ else
+ {
+ if ($value_h + $value_g == 0)
+ {
+ $percent_draw = 0;
+ $percent_home = 0;
+ $percent_guest = 0;
+ }
+ else
+ {
+ $percent_draw = round(($percent_draw * 100),0);
+ $rest = 100 - $percent_draw;
+ if ($rest > 0)
+ {
+ $percent_home = round(($rest * $value_h) / ($value_h + $value_g),0);
+ $percent_guest = $rest - $percent_home;
+ }
+ else
+ {
+ $percent_home = 0;
+ $percent_guest = 0;
+ }
+ }
+ }
+
+ $sql_ary = array(
+ 'trend' => $percent_home . '|' . $percent_draw. '|' . $percent_guest,
+ );
+
+ $sql = 'UPDATE ' . FOOTB_MATCHES . ' SET ' . $db->sql_build_array('UPDATE', $sql_ary) . "
+ WHERE season = $season AND league = $league AND match_no = $matchnumber";
+ $result = $db->sql_query($sql);
+ $db->sql_freeresult($result);
+
+
+ $forecast_value = 0;
+ $forecast_quote = sprintf($user->lang['FORECAST_PTS']) . ': '. $value_h. ' : '. $value_g;
+ $forecast_value = $value_h - $value_g;
+ if($forecast_value >= -0.5 && $forecast_value <= 0.5)
+ {
+ $forecast = sprintf($user->lang['TENDENCY']) . ': '. sprintf($user->lang['DRAW']);
+ }
+ else if($forecast_value > 0.5)
+ {
+ $forecast = sprintf($user->lang['TENDENCY']) . ': '. sprintf($user->lang['WIN_FOR']) . ' '. $logo[$home_id]. ' '. $home_name;
+ }
+ else
+ {
+ $forecast = sprintf($user->lang['TENDENCY']) . ': '. sprintf($user->lang['WIN_FOR']) . ' '. $logo[$guest_id]. ' '. $guest_name;;
+ }
+ }
+ else
+ {
+ $data_history = false;
+ $error_message .= sprintf($user->lang['NO_LEAGUE']) . ' ';
+ }
+ }
+ else
+ {
+ $data_history = false;
+ $error_message .= sprintf($user->lang['NO_SEASON']) . ' ';
+ }
+}
+
+if ($data_history)
+{
+ $main_title = $logo[$home_id]. ' '. $home_name. ' : '. $guest_name. ' '. $logo[$guest_id];
+ $template->assign_vars(array(
+ 'MAIN_TITLE' => $main_title,
+ 'TEAM_HOME' => $logo[$home_id]. ' '. $home_name,
+ 'TEAM_GUEST' => $logo[$guest_id]. ' '. $guest_name,
+ 'FORECAST_QUOTE' => $forecast_quote,
+ 'FORECAST' => $forecast,
+ 'S_FOOTBALL_COPY' => sprintf($user->lang['FOOTBALL_COPY'], $config['football_version'], $phpbb_root_path . 'football/'),
+ 'S_ERROR_MESSAGE' => $error_message,
+ 'S_DATA_HISTORY' => $data_history,
+ 'S_DATA_HIST' => $data_hist,
+ 'S_DATA_HOME' => $data_home,
+ 'S_DATA_GUEST' => $data_guest,
+ 'S_DATA_LASTHOME' => $data_last_home,
+ 'S_DATA_LASTAWAY' => $data_last_away,
+ )
+ );
+
+ // output page
+ page_header(sprintf($user->lang['MATCH_STATS']));
+}
+else
+{
+ $template->assign_vars(array(
+ 'MAIN_TITLE' => '',
+ 'TEAM_HOME' => '',
+ 'TEAM_GUEST' => '',
+ 'FORECAST_QUOTE' => '',
+ 'FORECAST' => '',
+ 'S_FOOTBALL_COPY' => sprintf($user->lang['FOOTBALL_COPY'], $config['football_version'], $phpbb_root_path . 'football/'),
+ 'S_ERROR_MESSAGE' => $error_message,
+ 'S_DATA_HISTORY' => $data_history,
+ 'S_DATA_HIST' => false,
+ 'S_DATA_HOME' => false,
+ 'S_DATA_GUEST' => false,
+ 'S_DATA_LASTHOME' => false,
+ 'S_DATA_LASTAWAY' => false,
+ )
+ );
+
+ // output page
+ page_header(sprintf($user->lang['MATCH_STATS']));
+}
+
+$template->set_filenames(array(
+ 'body' => 'hist_popup.html')
+);
+
+page_footer();
diff --git a/block/last_results.php b/block/last_results.php
index d79892d..7dce726 100644
--- a/block/last_results.php
+++ b/block/last_results.php
@@ -1,150 +1,148 @@
-data['user_id'], $season, $league);
-$edit_mode = false;
-$display_group = false;
-$display_ko = false;
-$data_lastresults = false;
-$curr_year = date("Y");
-$matchnumber = 0;
-$match_date = "";
-
-$local_board_time = time() + ($config['football_time_shift'] * 3600);
-$sql = 'SELECT * FROM ' . FOOTB_MATCHDAYS . " WHERE status = 0 AND delivery_date < FROM_UNIXTIME('$local_board_time')";
-
-// Calculate matches AND results of matchday
-$sql = "SELECT
- m.season,
- m.league,
- m.matchday,
- m.status,
- m.match_datetime,
- LEFT(m.match_datetime, 10) AS match_date,
- l.league_name,
- t1.team_symbol AS home_symbol,
- t2.team_symbol AS guest_symbol,
- 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,
- m.goals_home,
- m.goals_guest,
- m.ko_match AS ko_match,
- m.goals_overtime_home AS kogoals_home,
- m.goals_overtime_guest AS kogoals_guest,
- 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
- FROM " . FOOTB_MATCHES . ' AS m
- LEFT JOIN ' . FOOTB_LEAGUES . ' AS l ON (l.season = m.season AND l.league = m.league)
- 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.match_datetime < FROM_UNIXTIME('$local_board_time')
- ORDER BY m.match_datetime DESC, m.league ASC
- LIMIT 100";
-
-$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_lastresults = true;
- $matchnumber++ ;
- $row_class = (!($matchnumber % 2)) ? 'bg1 row_light' : 'bg2 row_dark';
-
- if ($match_date <> $row['match_date'])
- {
- $match_date = ($match_date == "") ? $row['match_date'] : $match_date;
- if ($matchnumber > $config['football_display_last_results'] )
- {
- break;
- }
- }
- $homelogo = $row['home_symbol'];
- $homename = $row['home_name'];
- $homeshort = $row['home_short'];
-
- $guestlogo = $row['guest_symbol'];
- $guestname = $row['guest_name'];
- $guestshort = $row['guest_short'];
-
- if ($homelogo <> '')
- {
- $logoH = "" ;
- }
- else
- {
- $logoH = "" ;
- }
- if ($guestlogo <> '')
- {
- $logoG = "" ;
- }
- else
- {
- $logoG = "" ;
- }
-
-
- $goals_home = ($row['goals_home'] == '') ? '- ' : $row['goals_home'];
- $goals_guest = ($row['goals_guest'] == '') ? ' -' : $row['goals_guest'];
- $kogoals_home = ($row['kogoals_home'] == '') ? '- ' : $row['kogoals_home'];
- $kogoals_guest = ($row['kogoals_guest'] == '') ? ' -' : $row['kogoals_guest'];
- $colorstyle = color_style($row['status']);
-
- $template->assign_block_vars('last_results', array(
- 'ROW_CLASS' => $row_class,
- 'U_RESULTS_LINK'=> $this->helper->route('football_main_controller', array('side' => 'results', 's' => $row['season'], 'l' => $row['league'], 'm' => $row['matchday'])),
- 'MATCH_DATE' => $row['match_date'],
- 'MATCH_TIME' => $row['match_time'],
- 'LEAGUE_NAME' => $row['league_name'],
- 'LOGO_HOME' => $logoH,
- 'LOGO_GUEST' => $logoG,
- 'HOME_NAME' => $homename,
- 'GUEST_NAME' => $guestname,
- 'HOME_SHORT' => $homeshort,
- 'GUEST_SHORT' => $guestshort,
- 'GOALS_HOME' => $goals_home,
- 'GOALS_GUEST' => $goals_guest,
- 'COLOR_STYLE' => color_style($row['status']),
- 'KOGOALS_HOME' => $kogoals_home,
- 'KOGOALS_GUEST' => $kogoals_guest,
- 'COLOR_STYLE' => $colorstyle,
- )
- );
-}
-$db->sql_freeresult($result);
-
-
-
-$sidename = sprintf($user->lang['LAST_RESULTS']);
-
-$template->assign_vars(array(
- 'S_DISPLAY_LAST_RESULTS' => true,
- 'S_SIDENAME' => $sidename,
- 'S_DATA_LAST_RESULTS' => $data_lastresults,
- 'S_USER_IS_MEMBER' => $user_is_member,
- )
-);
-
-?>
\ No newline at end of file
+data['user_id'], $season, $league);
+$edit_mode = false;
+$display_group = false;
+$display_ko = false;
+$data_lastresults = false;
+$curr_year = date("Y");
+$matchnumber = 0;
+$match_date = "";
+
+$local_board_time = time() + ($config['football_time_shift'] * 3600);
+$sql = 'SELECT * FROM ' . FOOTB_MATCHDAYS . " WHERE status = 0 AND delivery_date < FROM_UNIXTIME('$local_board_time')";
+
+// Calculate matches AND results of matchday
+$sql = "SELECT
+ m.season,
+ m.league,
+ m.matchday,
+ m.status,
+ m.match_datetime,
+ LEFT(m.match_datetime, 10) AS match_date,
+ l.league_name,
+ t1.team_symbol AS home_symbol,
+ t2.team_symbol AS guest_symbol,
+ 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,
+ m.goals_home,
+ m.goals_guest,
+ m.ko_match AS ko_match,
+ m.goals_overtime_home AS kogoals_home,
+ m.goals_overtime_guest AS kogoals_guest,
+ 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
+ FROM " . FOOTB_MATCHES . ' AS m
+ LEFT JOIN ' . FOOTB_LEAGUES . ' AS l ON (l.season = m.season AND l.league = m.league)
+ 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.match_datetime < FROM_UNIXTIME('$local_board_time')
+ ORDER BY m.match_datetime DESC, m.league ASC
+ LIMIT 100";
+
+$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_lastresults = true;
+ $matchnumber++ ;
+ $row_class = (!($matchnumber % 2)) ? 'bg1 row_light' : 'bg2 row_dark';
+
+ if ($match_date <> $row['match_date'])
+ {
+ $match_date = ($match_date == "") ? $row['match_date'] : $match_date;
+ if ($matchnumber > $config['football_display_last_results'] )
+ {
+ break;
+ }
+ }
+ $homelogo = $row['home_symbol'];
+ $homename = $row['home_name'];
+ $homeshort = $row['home_short'];
+
+ $guestlogo = $row['guest_symbol'];
+ $guestname = $row['guest_name'];
+ $guestshort = $row['guest_short'];
+
+ if ($homelogo <> '')
+ {
+ $logoH = "" ;
+ }
+ else
+ {
+ $logoH = "" ;
+ }
+ if ($guestlogo <> '')
+ {
+ $logoG = "" ;
+ }
+ else
+ {
+ $logoG = "" ;
+ }
+
+
+ $goals_home = ($row['goals_home'] == '') ? '- ' : $row['goals_home'];
+ $goals_guest = ($row['goals_guest'] == '') ? ' -' : $row['goals_guest'];
+ $kogoals_home = ($row['kogoals_home'] == '') ? '- ' : $row['kogoals_home'];
+ $kogoals_guest = ($row['kogoals_guest'] == '') ? ' -' : $row['kogoals_guest'];
+ $colorstyle = color_style($row['status']);
+
+ $template->assign_block_vars('last_results', array(
+ 'ROW_CLASS' => $row_class,
+ 'U_RESULTS_LINK'=> $this->helper->route('football_football_controller', array('side' => 'results', 's' => $row['season'], 'l' => $row['league'], 'm' => $row['matchday'])),
+ 'MATCH_DATE' => $row['match_date'],
+ 'MATCH_TIME' => $row['match_time'],
+ 'LEAGUE_NAME' => $row['league_name'],
+ 'LOGO_HOME' => $logoH,
+ 'LOGO_GUEST' => $logoG,
+ 'HOME_NAME' => $homename,
+ 'GUEST_NAME' => $guestname,
+ 'HOME_SHORT' => $homeshort,
+ 'GUEST_SHORT' => $guestshort,
+ 'GOALS_HOME' => $goals_home,
+ 'GOALS_GUEST' => $goals_guest,
+ 'COLOR_STYLE' => color_style($row['status']),
+ 'KOGOALS_HOME' => $kogoals_home,
+ 'KOGOALS_GUEST' => $kogoals_guest,
+ 'COLOR_STYLE' => $colorstyle,
+ )
+ );
+}
+$db->sql_freeresult($result);
+
+
+
+$sidename = sprintf($user->lang['LAST_RESULTS']);
+
+$template->assign_vars(array(
+ 'S_DISPLAY_LAST_RESULTS' => true,
+ 'S_SIDENAME' => $sidename,
+ 'S_DATA_LAST_RESULTS' => $data_lastresults,
+ 'S_USER_IS_MEMBER' => $user_is_member,
+ )
+);
diff --git a/block/last_users.php b/block/last_users.php
index 36e233b..25d0543 100644
--- a/block/last_users.php
+++ b/block/last_users.php
@@ -62,5 +62,3 @@ $template->assign_vars(array(
'S_DISPLAY_LAST_USERS' => $display_last_users,
'S_LAST_USERS' => true,
));
-
-?>
\ No newline at end of file
diff --git a/block/my_bets.php b/block/my_bets.php
index 17ce719..7718cc9 100644
--- a/block/my_bets.php
+++ b/block/my_bets.php
@@ -7,7 +7,7 @@
*
*/
-if (!defined('IN_PHPBB') OR !defined('IN_FOOTBALL'))
+if (!defined('IN_PHPBB'))
{
exit;
}
@@ -320,5 +320,3 @@ $template->assign_vars(array(
'USERNAME' => $username,
)
);
-
-?>
\ No newline at end of file
diff --git a/block/my_chart.php b/block/my_chart.php
index b474712..67b388b 100644
--- a/block/my_chart.php
+++ b/block/my_chart.php
@@ -7,7 +7,7 @@
*
*/
-if (!defined('IN_PHPBB') OR !defined('IN_FOOTBALL'))
+if (!defined('IN_PHPBB'))
{
exit;
}
@@ -331,4 +331,3 @@ $template->assign_vars(array(
'USERNAME4' => $username4,
)
);
-?>
\ No newline at end of file
diff --git a/block/my_koeff.php b/block/my_koeff.php
index 52e1cc7..4643357 100644
--- a/block/my_koeff.php
+++ b/block/my_koeff.php
@@ -1,386 +1,384 @@
-request->variable('start', 0);
-$matches_on_matchday = false;
-
-if (!$user_sel)
-{
- if (user_is_member($user->data['user_id'], $season, $league))
- {
- $user_sel = $user->data['user_id'];
- }
-}
-$username = '';
-
-$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
- AND league = $league
- 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);
-// Select matches with results and tendencies
-$sql = "SELECT
- m.match_no,
- m.status,
- m.formula_home,
- m.formula_guest,
- t1.team_name_short AS home_name,
- t2.team_name_short AS guest_name,
- t1.team_id AS home_id,
- t2.team_id AS guest_id,
- m.goals_home,
- m.goals_guest,
- SUM(IF(b.goals_home + 0 > b.goals_guest AND b.goals_home <> '' AND b.goals_guest <> '', 1, 0)) AS home,
- SUM(IF(b.goals_home = b.goals_guest AND b.goals_home <> '' AND b.goals_guest <> '', 1, 0)) AS draw,
- SUM(IF(b.goals_home + 0 < b.goals_guest AND b.goals_home <> '' AND b.goals_guest <> '', 1, 0)) AS guest
- FROM " . FOOTB_MATCHES . ' AS m
- 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)
- LEFT JOIN ' . FOOTB_BETS . " AS b ON(b.season = m.season AND b.league = m.league AND b.match_no = m.match_no)
- 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);
-$matches = $db->sql_fetchrowset($result);
-$db->sql_freeresult($result);
-$count_matches = sizeof($matches);
-if ($count_matches > 11)
-{
- $split_after = 8;
- $splits = floor($count_matches / 8);
-}
-else
-{
- $split_after = $count_matches;
- $splits = 1;
-}
-
-// Make sure $start is set to the last page if it exceeds the amount
-if ($start < 0 || $start >= $total_users)
-{
- $start = ($start < 0) ? 0 : floor(($total_users - 1) / $config['football_users_per_page']) * $config['football_users_per_page'];
-}
-else
-{
- $start = floor($start / $config['football_users_per_page']) * $config['football_users_per_page'];
-}
-
-$sql_start = $start * $count_matches;
-$sql_limit = $config['football_users_per_page'] * $count_matches;
-
-// handle pagination.
-$base_url = $this->helper->route('football_main_controller', array('side' => 'my_koeff', 's' => $season, 'l' => $league, 'm' => $matchday, 'u' => "$user_sel"));
-$pagination = $phpbb_container->get('pagination');
-$pagination->generate_template_pagination($base_url, 'pagination', 'start', $total_users, $this->config['football_users_per_page'], $start);
-
-$bet_line = array();
-if ($count_matches > 0)
-{
- $matches_on_matchday = true;
- // Select user bets and points on user results
- $sql = "SELECT
- u.user_id,
- u.username,
- m.status,
- b.goals_home AS bet_home,
- b.goals_guest AS bet_guest,
- " . select_points("bu") . "
- FROM " . FOOTB_MATCHES . ' AS m
- LEFT JOIN ' . FOOTB_BETS . ' AS b ON(b.season = m.season AND b.league = m.league AND b.match_no = m.match_no)
- LEFT JOIN ' . FOOTB_BETS . " AS bu ON(bu.season = m.season AND bu.league = m.league AND bu.match_no = m.match_no AND bu.user_id = $user_sel)
- LEFT JOIN " . USERS_TABLE . " AS u ON (u.user_id = b.user_id)
- WHERE m.season = $season
- AND m.league = $league
- AND m.matchday = $matchday
- ORDER BY LOWER(u.username) ASC, m.match_datetime ASC, m.match_no ASC";
-
- $result = $db->sql_query_limit($sql, $sql_limit, $sql_start);
- $user_bets = $db->sql_fetchrowset($result);
- $db->sql_freeresult($result);
- $bet_index = 0;
- $split_index = 0;
- foreach ($user_bets AS $user_bet)
- {
- $data = true;
- if ($bet_index == $count_matches)
- {
- $bet_index = 0;
- $split_index = 0;
- }
- if (!($bet_index % $split_after))
- {
- $split_index++;
- }
- $sum_total[$user_bet['username']] = 0;
- $bet_line[$split_index][] = $user_bet;
- $bet_index++;
- }
-}
-$match_index = 0;
-$split_index = 0;
-$matchday_sum_total = 0;
-$colorstyle_total = ' color_finally';
-foreach ($matches AS $match)
-{
- if (!($match_index % $split_after))
- {
- if ($match_index > 0)
- {
- $total = 0;
- $count_user = 0;
- $bet_index = 0;
- foreach ($bet_line[$split_index] AS $user_bet)
- {
- if ($bet_index == 0)
- {
- $count_user++;
- $row_class = (!($count_user % 2)) ? 'bg1 row_light' : 'bg2 row_dark';
- if ($user_bet['user_id'] == $user->data['user_id'])
- {
- $row_class = 'bg3 row_user';
- }
- $template->assign_block_vars('match_panel.user_row', array(
- 'ROW_CLASS' => $row_class,
- 'USER_NAME' => $user_bet['username'],
- )
- );
- $total = 0;
- }
- $bet_index++;
- $total += ($user_bet['points'] == '') ? 0 : $user_bet['points'];
- if ($user_bet['status'] < 1 && !$config['football_view_bets'])
- {
- // hide bets
- $bet_home = ($user_bet['bet_home'] == '') ? ' ' : '?';
- $bet_guest = ($user_bet['bet_guest'] == '') ? ' ' : '?';
- }
- else
- {
- $bet_home = $user_bet['bet_home'];
- $bet_guest = $user_bet['bet_guest'];
- }
-
- $colorstyle_bet = color_style($user_bet['status']);
- $template->assign_block_vars('match_panel.user_row.bet', array(
- 'BET' => $bet_home. ':'. $bet_guest,
- 'COLOR_STYLE' => $colorstyle_bet,
- 'POINTS' => ($user_bet['points'] == '') ? ' ' : $user_bet['points'],
- )
- );
-
- if ($bet_index == $split_after)
- {
- $sum_total[$user_bet['username']] += $total;
- $matchday_sum_total += $total;
- $bet_index = 0;
- }
- }
-
- $template->assign_block_vars('match_panel.tendency_footer', array(
- 'S_TOTAL' => false,
- )
- );
- foreach ($matches_tendency AS $match_tendency)
- {
- $template->assign_block_vars('match_panel.tendency_footer.tendency', array(
- 'TENDENCY' => $match_tendency,
- )
- );
- }
- }
- $matches_tendency = array();
- $split_index++;
- if ($split_index == $splits)
- {
- $display_total = true;
- }
- else
- {
- $display_total = false;
- }
- $template->assign_block_vars('match_panel', array(
- 'S_TOTAL' => $display_total,
- )
- );
- }
- if (0 == $match['home_id'])
- {
- $home_info = get_team($season, $league, $match['match_no'], 'team_id_home', $match['formula_home']);
- $home_in_array = explode("#",$home_info);
- $homename = $home_in_array[3];
- }
- else
- {
- $homename = $match['home_name'];
- }
- if (0 == $match['guest_id'])
- {
- $guest_info = get_team($season, $league, $match['match_no'], 'team_id_guest', $match['formula_guest']);
- $guest_in_array = explode("#",$guest_info);
- $guestname = $guest_in_array[3];
- }
- else
- {
- $guestname = $match['guest_name'];
- }
- $colorstyle_match = color_style($match['status']);
- $template->assign_block_vars('match_panel.match_entry', array(
- 'HOME_NAME' => $homename,
- 'GUEST_NAME' => $guestname,
- 'RESULT' => $match['goals_home'] . ':' . $match['goals_guest'],
- 'COLOR_STYLE' => $colorstyle_match,
- )
- );
- if ($match['status'] < 1 && !$config['football_view_tendencies'])
- {
- // hide tendencies
- $matches_tendency[] = '?-?-?';
- }
- else
- {
- $matches_tendency[] = $match['home'] . '-' . $match['draw'] . '-' . $match['guest'];
- }
- $match_index++;
-}
-if ($count_matches > 0)
-{
- $total = 0;
- $count_user = 0;
- $bet_index = 0;
- foreach ($bet_line[$split_index] AS $user_bet)
- {
- if ($bet_index == 0)
- {
- $count_user++;
- $row_class = (!($count_user % 2)) ? 'bg1 row_light' : 'bg2 row_dark';
- if ($user_bet['user_id'] == $user->data['user_id'])
- {
- $row_class = 'bg3 row_user';
- }
- $template->assign_block_vars('match_panel.user_row', array(
- 'ROW_CLASS' => $row_class,
- 'USER_NAME' => $user_bet['username'],
- )
- );
- $total = 0;
- }
- $bet_index++;
- $total += ($user_bet['points'] == '') ? 0 : $user_bet['points'];
- if ($user_bet['status'] < 1)
- {
- if ($user_bet['bet_home'] == '')
- {
- $bet_home = '';
- }
- else
- {
- $bet_home = '?';
- }
- if ($user_bet['bet_guest'] == '')
- {
- $bet_guest = '';
- }
- else
- {
- $bet_guest = '?';
- }
- }
- else
- {
- $bet_home = $user_bet['bet_home'];
- $bet_guest = $user_bet['bet_guest'];
- }
-
- $colorstyle_bet = color_style($user_bet['status']);
- $template->assign_block_vars('match_panel.user_row.bet', array(
- 'BET' => $bet_home. ':'. $bet_guest,
- 'COLOR_STYLE' => $colorstyle_bet,
- 'POINTS' => ($user_bet['points'] == '') ? ' ' : $user_bet['points'],
- )
- );
-
- if ($bet_index == $split_after)
- {
- $sum_total[$user_bet['username']] += $total;
- $matchday_sum_total += $total;
- $template->assign_block_vars('match_panel.user_row.points', array(
- 'COLOR_STYLE' => $colorstyle_total,
- 'POINTS_TOTAL' => $sum_total[$user_bet['username']],
- )
- );
- $bet_index = 0;
- }
- }
-
- $template->assign_block_vars('match_panel.tendency_footer', array(
- 'S_TOTAL' => true,
- 'COLOR_STYLE' => $colorstyle_total, //currently ignored
- 'SUMTOTAL' => $matchday_sum_total,
- )
- );
- foreach ($matches_tendency AS $match_tendency)
- {
- $template->assign_block_vars('match_panel.tendency_footer.tendency', array(
- 'TENDENCY' => $match_tendency,
- )
- );
- }
-}
-
-$sidename = sprintf($user->lang['MY_KOEFF']);
-$template->assign_vars(array(
- 'S_DISPLAY_MY_KOEFF' => true,
- 'S_SIDENAME' => $sidename,
- '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),
- 'TOTAL_USERS' => ($total_users == 1) ? $user->lang['VIEW_BET_USER'] : sprintf($user->lang['VIEW_BET_USERS'], $total_users),
- 'USERNAME' => $username,
- )
-);
-
-?>
\ No newline at end of file
+request->variable('start', 0);
+$matches_on_matchday = false;
+
+if (!$user_sel)
+{
+ if (user_is_member($user->data['user_id'], $season, $league))
+ {
+ $user_sel = $user->data['user_id'];
+ }
+}
+$username = '';
+
+$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
+ AND league = $league
+ 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);
+// Select matches with results and tendencies
+$sql = "SELECT
+ m.match_no,
+ m.status,
+ m.formula_home,
+ m.formula_guest,
+ t1.team_name_short AS home_name,
+ t2.team_name_short AS guest_name,
+ t1.team_id AS home_id,
+ t2.team_id AS guest_id,
+ m.goals_home,
+ m.goals_guest,
+ SUM(IF(b.goals_home + 0 > b.goals_guest AND b.goals_home <> '' AND b.goals_guest <> '', 1, 0)) AS home,
+ SUM(IF(b.goals_home = b.goals_guest AND b.goals_home <> '' AND b.goals_guest <> '', 1, 0)) AS draw,
+ SUM(IF(b.goals_home + 0 < b.goals_guest AND b.goals_home <> '' AND b.goals_guest <> '', 1, 0)) AS guest
+ FROM " . FOOTB_MATCHES . ' AS m
+ 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)
+ LEFT JOIN ' . FOOTB_BETS . " AS b ON(b.season = m.season AND b.league = m.league AND b.match_no = m.match_no)
+ 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);
+$matches = $db->sql_fetchrowset($result);
+$db->sql_freeresult($result);
+$count_matches = sizeof($matches);
+if ($count_matches > 11)
+{
+ $split_after = 8;
+ $splits = floor($count_matches / 8);
+}
+else
+{
+ $split_after = $count_matches;
+ $splits = 1;
+}
+
+// Make sure $start is set to the last page if it exceeds the amount
+if ($start < 0 || $start >= $total_users)
+{
+ $start = ($start < 0) ? 0 : floor(($total_users - 1) / $config['football_users_per_page']) * $config['football_users_per_page'];
+}
+else
+{
+ $start = floor($start / $config['football_users_per_page']) * $config['football_users_per_page'];
+}
+
+$sql_start = $start * $count_matches;
+$sql_limit = $config['football_users_per_page'] * $count_matches;
+
+// handle pagination.
+$base_url = $this->helper->route('football_football_controller', array('side' => 'my_koeff', 's' => $season, 'l' => $league, 'm' => $matchday, 'u' => "$user_sel"));
+$pagination = $phpbb_container->get('pagination');
+$pagination->generate_template_pagination($base_url, 'pagination', 'start', $total_users, $this->config['football_users_per_page'], $start);
+
+$bet_line = array();
+if ($count_matches > 0)
+{
+ $matches_on_matchday = true;
+ // Select user bets and points on user results
+ $sql = "SELECT
+ u.user_id,
+ u.username,
+ m.status,
+ b.goals_home AS bet_home,
+ b.goals_guest AS bet_guest,
+ " . select_points("bu") . "
+ FROM " . FOOTB_MATCHES . ' AS m
+ LEFT JOIN ' . FOOTB_BETS . ' AS b ON(b.season = m.season AND b.league = m.league AND b.match_no = m.match_no)
+ LEFT JOIN ' . FOOTB_BETS . " AS bu ON(bu.season = m.season AND bu.league = m.league AND bu.match_no = m.match_no AND bu.user_id = $user_sel)
+ LEFT JOIN " . USERS_TABLE . " AS u ON (u.user_id = b.user_id)
+ WHERE m.season = $season
+ AND m.league = $league
+ AND m.matchday = $matchday
+ ORDER BY LOWER(u.username) ASC, m.match_datetime ASC, m.match_no ASC";
+
+ $result = $db->sql_query_limit($sql, $sql_limit, $sql_start);
+ $user_bets = $db->sql_fetchrowset($result);
+ $db->sql_freeresult($result);
+ $bet_index = 0;
+ $split_index = 0;
+ foreach ($user_bets AS $user_bet)
+ {
+ $data = true;
+ if ($bet_index == $count_matches)
+ {
+ $bet_index = 0;
+ $split_index = 0;
+ }
+ if (!($bet_index % $split_after))
+ {
+ $split_index++;
+ }
+ $sum_total[$user_bet['username']] = 0;
+ $bet_line[$split_index][] = $user_bet;
+ $bet_index++;
+ }
+}
+$match_index = 0;
+$split_index = 0;
+$matchday_sum_total = 0;
+$colorstyle_total = ' color_finally';
+foreach ($matches AS $match)
+{
+ if (!($match_index % $split_after))
+ {
+ if ($match_index > 0)
+ {
+ $total = 0;
+ $count_user = 0;
+ $bet_index = 0;
+ foreach ($bet_line[$split_index] AS $user_bet)
+ {
+ if ($bet_index == 0)
+ {
+ $count_user++;
+ $row_class = (!($count_user % 2)) ? 'bg1 row_light' : 'bg2 row_dark';
+ if ($user_bet['user_id'] == $user->data['user_id'])
+ {
+ $row_class = 'bg3 row_user';
+ }
+ $template->assign_block_vars('match_panel.user_row', array(
+ 'ROW_CLASS' => $row_class,
+ 'USER_NAME' => $user_bet['username'],
+ )
+ );
+ $total = 0;
+ }
+ $bet_index++;
+ $total += ($user_bet['points'] == '') ? 0 : $user_bet['points'];
+ if ($user_bet['status'] < 1 && !$config['football_view_bets'])
+ {
+ // hide bets
+ $bet_home = ($user_bet['bet_home'] == '') ? ' ' : '?';
+ $bet_guest = ($user_bet['bet_guest'] == '') ? ' ' : '?';
+ }
+ else
+ {
+ $bet_home = $user_bet['bet_home'];
+ $bet_guest = $user_bet['bet_guest'];
+ }
+
+ $colorstyle_bet = color_style($user_bet['status']);
+ $template->assign_block_vars('match_panel.user_row.bet', array(
+ 'BET' => $bet_home. ':'. $bet_guest,
+ 'COLOR_STYLE' => $colorstyle_bet,
+ 'POINTS' => ($user_bet['points'] == '') ? ' ' : $user_bet['points'],
+ )
+ );
+
+ if ($bet_index == $split_after)
+ {
+ $sum_total[$user_bet['username']] += $total;
+ $matchday_sum_total += $total;
+ $bet_index = 0;
+ }
+ }
+
+ $template->assign_block_vars('match_panel.tendency_footer', array(
+ 'S_TOTAL' => false,
+ )
+ );
+ foreach ($matches_tendency AS $match_tendency)
+ {
+ $template->assign_block_vars('match_panel.tendency_footer.tendency', array(
+ 'TENDENCY' => $match_tendency,
+ )
+ );
+ }
+ }
+ $matches_tendency = array();
+ $split_index++;
+ if ($split_index == $splits)
+ {
+ $display_total = true;
+ }
+ else
+ {
+ $display_total = false;
+ }
+ $template->assign_block_vars('match_panel', array(
+ 'S_TOTAL' => $display_total,
+ )
+ );
+ }
+ if (0 == $match['home_id'])
+ {
+ $home_info = get_team($season, $league, $match['match_no'], 'team_id_home', $match['formula_home']);
+ $home_in_array = explode("#",$home_info);
+ $homename = $home_in_array[3];
+ }
+ else
+ {
+ $homename = $match['home_name'];
+ }
+ if (0 == $match['guest_id'])
+ {
+ $guest_info = get_team($season, $league, $match['match_no'], 'team_id_guest', $match['formula_guest']);
+ $guest_in_array = explode("#",$guest_info);
+ $guestname = $guest_in_array[3];
+ }
+ else
+ {
+ $guestname = $match['guest_name'];
+ }
+ $colorstyle_match = color_style($match['status']);
+ $template->assign_block_vars('match_panel.match_entry', array(
+ 'HOME_NAME' => $homename,
+ 'GUEST_NAME' => $guestname,
+ 'RESULT' => $match['goals_home'] . ':' . $match['goals_guest'],
+ 'COLOR_STYLE' => $colorstyle_match,
+ )
+ );
+ if ($match['status'] < 1 && !$config['football_view_tendencies'])
+ {
+ // hide tendencies
+ $matches_tendency[] = '?-?-?';
+ }
+ else
+ {
+ $matches_tendency[] = $match['home'] . '-' . $match['draw'] . '-' . $match['guest'];
+ }
+ $match_index++;
+}
+if ($count_matches > 0)
+{
+ $total = 0;
+ $count_user = 0;
+ $bet_index = 0;
+ foreach ($bet_line[$split_index] AS $user_bet)
+ {
+ if ($bet_index == 0)
+ {
+ $count_user++;
+ $row_class = (!($count_user % 2)) ? 'bg1 row_light' : 'bg2 row_dark';
+ if ($user_bet['user_id'] == $user->data['user_id'])
+ {
+ $row_class = 'bg3 row_user';
+ }
+ $template->assign_block_vars('match_panel.user_row', array(
+ 'ROW_CLASS' => $row_class,
+ 'USER_NAME' => $user_bet['username'],
+ )
+ );
+ $total = 0;
+ }
+ $bet_index++;
+ $total += ($user_bet['points'] == '') ? 0 : $user_bet['points'];
+ if ($user_bet['status'] < 1)
+ {
+ if ($user_bet['bet_home'] == '')
+ {
+ $bet_home = '';
+ }
+ else
+ {
+ $bet_home = '?';
+ }
+ if ($user_bet['bet_guest'] == '')
+ {
+ $bet_guest = '';
+ }
+ else
+ {
+ $bet_guest = '?';
+ }
+ }
+ else
+ {
+ $bet_home = $user_bet['bet_home'];
+ $bet_guest = $user_bet['bet_guest'];
+ }
+
+ $colorstyle_bet = color_style($user_bet['status']);
+ $template->assign_block_vars('match_panel.user_row.bet', array(
+ 'BET' => $bet_home. ':'. $bet_guest,
+ 'COLOR_STYLE' => $colorstyle_bet,
+ 'POINTS' => ($user_bet['points'] == '') ? ' ' : $user_bet['points'],
+ )
+ );
+
+ if ($bet_index == $split_after)
+ {
+ $sum_total[$user_bet['username']] += $total;
+ $matchday_sum_total += $total;
+ $template->assign_block_vars('match_panel.user_row.points', array(
+ 'COLOR_STYLE' => $colorstyle_total,
+ 'POINTS_TOTAL' => $sum_total[$user_bet['username']],
+ )
+ );
+ $bet_index = 0;
+ }
+ }
+
+ $template->assign_block_vars('match_panel.tendency_footer', array(
+ 'S_TOTAL' => true,
+ 'COLOR_STYLE' => $colorstyle_total, //currently ignored
+ 'SUMTOTAL' => $matchday_sum_total,
+ )
+ );
+ foreach ($matches_tendency AS $match_tendency)
+ {
+ $template->assign_block_vars('match_panel.tendency_footer.tendency', array(
+ 'TENDENCY' => $match_tendency,
+ )
+ );
+ }
+}
+
+$sidename = sprintf($user->lang['MY_KOEFF']);
+$template->assign_vars(array(
+ 'S_DISPLAY_MY_KOEFF' => true,
+ 'S_SIDENAME' => $sidename,
+ '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),
+ 'TOTAL_USERS' => ($total_users == 1) ? $user->lang['VIEW_BET_USER'] : sprintf($user->lang['VIEW_BET_USERS'], $total_users),
+ 'USERNAME' => $username,
+ )
+);
diff --git a/block/my_points.php b/block/my_points.php
index 64b3b03..64f976b 100644
--- a/block/my_points.php
+++ b/block/my_points.php
@@ -7,7 +7,7 @@
*
*/
-if (!defined('IN_PHPBB') OR !defined('IN_FOOTBALL'))
+if (!defined('IN_PHPBB'))
{
exit;
}
@@ -195,4 +195,3 @@ $template->assign_vars(array(
'USERNAME' => $username,
)
);
-?>
\ No newline at end of file
diff --git a/block/my_rank.php b/block/my_rank.php
index 93dd4ae..bf8d124 100644
--- a/block/my_rank.php
+++ b/block/my_rank.php
@@ -7,7 +7,7 @@
*
*/
-if (!defined('IN_PHPBB') OR !defined('IN_FOOTBALL'))
+if (!defined('IN_PHPBB'))
{
exit;
}
@@ -169,5 +169,3 @@ $template->assign_vars(array(
'USERNAME' => $username,
)
);
-
-?>
\ No newline at end of file
diff --git a/block/my_table.php b/block/my_table.php
index 51b9e11..847ad03 100644
--- a/block/my_table.php
+++ b/block/my_table.php
@@ -7,7 +7,7 @@
*
*/
-if (!defined('IN_PHPBB') OR !defined('IN_FOOTBALL'))
+if (!defined('IN_PHPBB'))
{
exit;
}
@@ -426,5 +426,3 @@ $template->assign_vars(array(
'USERNAME' => $username,
)
);
-
-?>
\ No newline at end of file
diff --git a/block/odds.php b/block/odds.php
index b777e08..f217007 100644
--- a/block/odds.php
+++ b/block/odds.php
@@ -7,12 +7,14 @@
*
*/
-if (!defined('IN_PHPBB') OR !defined('IN_FOOTBALL'))
+if (!defined('IN_PHPBB'))
{
exit;
}
$data_odds = false;
+$userid = $user->data['user_id'];
+$user_is_member = user_is_member($userid, $season, $league);
$matchnumber = 0;
$lang_dates = $user->lang['datetime'];
@@ -37,6 +39,8 @@ $sql = "SELECT
t2.team_name_short AS guest_name,
t1.team_id AS home_id,
t2.team_id AS guest_id,
+ b.goals_home AS bet_home,
+ b.goals_guest AS bet_guest,
m.goals_home,
m.goals_guest,
m.goals_overtime_home AS kogoals_home,
@@ -48,13 +52,15 @@ $sql = "SELECT
m.odd_1,
m.odd_x,
m.odd_2,
- m.trend FROM " . FOOTB_MATCHES . ' AS m
- 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
- ORDER BY m.match_datetime ASC, m.match_no ASC";
+ m.trend
+ FROM " . FOOTB_MATCHES . ' AS m
+ LEFT 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
+ ORDER BY m.match_datetime ASC, m.match_no ASC";
$result = $db->sql_query($sql);
$rows = $db->sql_fetchrowset($result);
@@ -137,6 +143,8 @@ foreach ($rows as $row)
$goals_guest = ($row['goals_guest'] == '') ? ' ' : $row['goals_guest'];
$kogoals_home = ($row['kogoals_home'] == '') ? ' ' : $row['kogoals_home'];
$kogoals_guest = ($row['kogoals_guest'] == '') ? ' ' : $row['kogoals_guest'];
+ $bet_home = ($row['bet_home'] == '') ? ' ' : $row['bet_home'];
+ $bet_guest = ($row['bet_guest'] == '') ? ' ' : $row['bet_guest'];
$template->assign_block_vars('odds', array(
'ROW_CLASS' => $row_class,
@@ -154,12 +162,15 @@ foreach ($rows as $row)
'tid' => $homeid, 'mode' => 'all')),
'U_PLAN_GUEST' => $this->helper->route('football_football_popup', array('popside' => 'viewplan_popup', 's' => $season, 'l' => $league,
'tid' => $guestid, 'mode' => 'all')),
+ 'BET_HOME' => $bet_home,
+ 'BET_GUEST' => $bet_guest,
'GOALS_HOME' => $goals_home,
'GOALS_GUEST' => $goals_guest,
'COLOR_STYLE' => '',
'KOGOALS_HOME' => $kogoals_home,
'KOGOALS_GUEST' => $kogoals_guest,
'S_KO_MATCH' => $ko_match,
+ 'S_USER_IS_MEMBER' => $user_is_member,
'TREND' => $row['trend'],
'U_MATCH_STATS' => $this->helper->route('football_football_popup', array('popside' => 'hist_popup', 's' => $season, 'l' => $league,
'hid' => $homeid, 'gid' => $guestid, 'm' => $matchday,
@@ -201,5 +212,3 @@ $template->assign_vars(array(
'S_DATA_ODDS' => $data_odds,
)
);
-
-?>
\ No newline at end of file
diff --git a/block/rank_matchday.php b/block/rank_matchday.php
index 700cf45..03eaa49 100644
--- a/block/rank_matchday.php
+++ b/block/rank_matchday.php
@@ -7,7 +7,7 @@
*
*/
-if (!defined('IN_PHPBB') OR !defined('IN_FOOTBALL'))
+if (!defined('IN_PHPBB'))
{
exit;
}
@@ -35,10 +35,10 @@ if ($league <> 0)
FROM " . FOOTB_RANKS . ' AS r
LEFT Join ' . USERS_TABLE . " AS u ON (r.user_id = u.user_id)
WHERE r.season = $season
- AND r.league = $league_corr
+ AND r.league = $league_corr
AND r.matchday = $matchday
AND r.status IN (2,3)
- ORDER BY rank ASC, LOWER(u.username) ASC";
+ ORDER BY r.rank ASC, LOWER(u.username) ASC";
$result = $db->sql_query($sql);
while($row = $db->sql_fetchrow($result))
@@ -78,4 +78,3 @@ if ($league <> 0)
'WIN_NAME' => $config['football_win_name'],
));
}
-?>
\ No newline at end of file
diff --git a/block/rank_total.php b/block/rank_total.php
index 3773671..3fc4be5 100644
--- a/block/rank_total.php
+++ b/block/rank_total.php
@@ -1,94 +1,93 @@
- 0)
-{
- $sql = 'SELECT
- r.matchday AS last_matchday
- FROM '. FOOTB_RANKS . " AS r
- WHERE r.season = $season
- AND r.league = $league
- AND r.status IN (2,3)
- ORDER BY r.matchday DESC";
-
- $result = $db->sql_query_limit($sql, 1);
- if($row = $db->sql_fetchrow($result))
- {
- $last_matchday = $row['last_matchday'];
- $db->sql_freeresult($result);
- $rank_matchday = ($last_matchday < $matchday) ? $last_matchday : $matchday;
-
- $sql = 'SELECT
- r.rank_total AS rank,
- r.user_id,
- u.username,
- u.user_colour,
- r.status AS status,
- r.points_total AS points,
- r.win_total AS win
- FROM '. FOOTB_RANKS . ' AS r
- LEFT JOIN '. USERS_TABLE . " AS u ON (r.user_id = u.user_id)
- WHERE r.season = $season
- AND r.league = $league
- AND r.matchday = $rank_matchday
- AND r.status IN (2,3)
- ORDER BY points DESC, LOWER(u.username) ASC";
-
- $result = $db->sql_query($sql);
-
- $index = 0;
- while($row = $db->sql_fetchrow($result))
- {
- $index++;
- $data_rank_total = true;
- if (($index <= $config['football_display_ranks']) OR ($row['user_id'] == $user->data['user_id']))
- {
- $row_class = (!($index % 2)) ? 'bg1 row_light' : 'bg2 row_dark';
- if ($row['user_id'] == $user->data['user_id'])
- {
- $row_class = 'bg3 row_user';
- }
- $colorstyle = color_style($row['status']);
-
- $template->assign_block_vars("ranktotal", array(
- 'RANK' => $row['rank'],
- 'ROW_CLASS' => $row_class,
- 'USERID' => $row['user_id'],
- 'USERNAME' => $row['username'],
- 'U_PROFILE' => get_username_string('profile', $row['user_id'], $row['username'], $row['user_colour']),
- 'URL' => $phpbb_root_path . "profile.php?mode=viewprofile&u=" . $row['user_id'],
- 'POINTS' => $row['points'],
- 'COLOR_STYLE' => $colorstyle,
- 'WIN' => $row['win'] ,
- )
- );
- }
- }
- $db->sql_freeresult($result);
- }
- else
- {
- $data_rank_total = false;
- }
- $league_info = league_info($season, $league);
-
- $template->assign_vars(array(
- 'S_DISPLAY_RANK_TOTAL' => true,
- 'S_DATA_RANK_TOTAL' => $data_rank_total,
- 'S_WIN' => ($league_info['win_matchday'] == '0' and $league_info['win_season'] == '0') ? false : true,
- 'WIN_NAME' => $config['football_win_name'],
- )
- );
-}
-?>
\ No newline at end of file
+ 0)
+{
+ $sql = 'SELECT
+ r.matchday AS last_matchday
+ FROM '. FOOTB_RANKS . " AS r
+ WHERE r.season = $season
+ AND r.league = $league
+ AND r.status IN (2,3)
+ ORDER BY r.matchday DESC";
+
+ $result = $db->sql_query_limit($sql, 1);
+ if($row = $db->sql_fetchrow($result))
+ {
+ $last_matchday = $row['last_matchday'];
+ $db->sql_freeresult($result);
+ $rank_matchday = ($last_matchday < $matchday) ? $last_matchday : $matchday;
+
+ $sql = 'SELECT
+ r.rank_total AS rank,
+ r.user_id,
+ u.username,
+ u.user_colour,
+ r.status AS status,
+ r.points_total AS points,
+ r.win_total AS win
+ FROM '. FOOTB_RANKS . ' AS r
+ LEFT JOIN '. USERS_TABLE . " AS u ON (r.user_id = u.user_id)
+ WHERE r.season = $season
+ AND r.league = $league
+ AND r.matchday = $rank_matchday
+ AND r.status IN (2,3)
+ ORDER BY points DESC, LOWER(u.username) ASC";
+
+ $result = $db->sql_query($sql);
+
+ $index = 0;
+ while($row = $db->sql_fetchrow($result))
+ {
+ $index++;
+ $data_rank_total = true;
+ if (($index <= $config['football_display_ranks']) OR ($row['user_id'] == $user->data['user_id']))
+ {
+ $row_class = (!($index % 2)) ? 'bg1 row_light' : 'bg2 row_dark';
+ if ($row['user_id'] == $user->data['user_id'])
+ {
+ $row_class = 'bg3 row_user';
+ }
+ $colorstyle = color_style($row['status']);
+
+ $template->assign_block_vars("ranktotal", array(
+ 'RANK' => $row['rank'],
+ 'ROW_CLASS' => $row_class,
+ 'USERID' => $row['user_id'],
+ 'USERNAME' => $row['username'],
+ 'U_PROFILE' => get_username_string('profile', $row['user_id'], $row['username'], $row['user_colour']),
+ 'URL' => $phpbb_root_path . "profile.php?mode=viewprofile&u=" . $row['user_id'],
+ 'POINTS' => $row['points'],
+ 'COLOR_STYLE' => $colorstyle,
+ 'WIN' => $row['win'] ,
+ )
+ );
+ }
+ }
+ $db->sql_freeresult($result);
+ }
+ else
+ {
+ $data_rank_total = false;
+ }
+ $league_info = league_info($season, $league);
+
+ $template->assign_vars(array(
+ 'S_DISPLAY_RANK_TOTAL' => true,
+ 'S_DATA_RANK_TOTAL' => $data_rank_total,
+ 'S_WIN' => ($league_info['win_matchday'] == '0' and $league_info['win_season'] == '0') ? false : true,
+ 'WIN_NAME' => $config['football_win_name'],
+ )
+ );
+}
diff --git a/block/ranks_matchday.php b/block/ranks_matchday.php
index ceeb3bb..7bd9d32 100644
--- a/block/ranks_matchday.php
+++ b/block/ranks_matchday.php
@@ -7,7 +7,7 @@
*
*/
-if (!defined('IN_PHPBB') OR !defined('IN_FOOTBALL'))
+if (!defined('IN_PHPBB'))
{
exit;
}
@@ -53,7 +53,7 @@ $sql = "SELECT
AND b.league = $league
AND m.status IN (2,3)
AND m.matchday = $matchday
- GROUP BY user_id";
+ GROUP BY b.user_id";
$result = $db->sql_query($sql);
$usersstats = $db->sql_fetchrowset($result);
@@ -126,7 +126,7 @@ else
$sql_limit = $config['football_users_per_page'];
// handle pagination.
-$base_url = $this->helper->route('football_main_controller', array('side' => 'ranks_matchday', 's' => $season, 'l' => $league, 'm' => $matchday));
+$base_url = $this->helper->route('football_football_controller', array('side' => 'ranks_matchday', 's' => $season, 'l' => $league, 'm' => $matchday));
$pagination = $phpbb_container->get('pagination');
$pagination->generate_template_pagination($base_url, 'pagination', 'start', $total_users, $this->config['football_users_per_page'], $start);
$data_ranks = false;
@@ -224,8 +224,8 @@ while($row = $db->sql_fetchrow($result))
'ROW_CLASS' => $row_class,
'RANK' => $rankof[$row['user_id']],
'NO_CHANGES' => ($change_sign == '=') ? true : false,
- 'WORSENED' => ($change_sign == '-') ? true : false,
- 'IMPROVED' => ($change_sign == '+') ? true : false,
+ 'WORSENED' => ($change_sign == '+') ? true : false,
+ 'IMPROVED' => ($change_sign == '-') ? true : false,
'CHANGE_SIGN' => $change_sign,
'CHANGE_DIFFER' => $change_differ,
'USERID' => $row['user_id'],
@@ -257,5 +257,3 @@ $template->assign_vars(array(
'WIN_NAME' => $config['football_win_name'],
)
);
-
-?>
\ No newline at end of file
diff --git a/block/ranks_total.php b/block/ranks_total.php
index 8bd4e82..1a28a22 100644
--- a/block/ranks_total.php
+++ b/block/ranks_total.php
@@ -7,7 +7,7 @@
*
*/
-if (!defined('IN_PHPBB') OR !defined('IN_FOOTBALL'))
+if (!defined('IN_PHPBB'))
{
exit;
}
@@ -39,7 +39,7 @@ switch ($mode)
WHERE b.league = $league
AND ((b.season < $season) OR (b.season = $season AND m.matchday <= $matchday))
AND m.status IN (2,3)
- GROUP BY user_id";
+ GROUP BY b.user_id";
$result = $db->sql_query($sql);
$rows = $db->sql_fetchrowset($result);
@@ -61,7 +61,7 @@ switch ($mode)
WHERE r.league = $league
AND ((r.season < $season AND r.matchday = l.matchdays) OR (r.season = $season AND r.matchday = $matchday))
AND r.status IN (2,3)
- GROUP BY user_id
+ GROUP BY r.user_id
ORDER BY r.user_id ASC";
$result = $db->sql_query($sql);
@@ -89,7 +89,7 @@ switch ($mode)
WHERE r.league = $league
AND ((r.season < $season) OR (r.season = $season AND r.matchday <= $matchday))
AND r.status IN (2,3)
- GROUP BY user_id
+ GROUP BY r.user_id
ORDER BY points_total DESC, LOWER(u.username) ASC";
$result = $db->sql_query($sql);
@@ -114,7 +114,7 @@ switch ($mode)
$index_end = $index_start + $config['football_users_per_page'] - 1;
// handle pagination.
- $base_url = $this->helper->route('football_main_controller', array('side' => 'ranks_total', 's' => $season, 'l' => $league, 'm' => $matchday, 'mode' => 'alltime'));
+ $base_url = $this->helper->route('football_football_controller', array('side' => 'ranks_total', 's' => $season, 'l' => $league, 'm' => $matchday, 'mode' => 'alltime'));
$pagination = $phpbb_container->get('pagination');
$pagination->generate_template_pagination($base_url, 'pagination', 'start', $total_users, $this->config['football_users_per_page'], $start);
@@ -171,9 +171,9 @@ switch ($mode)
'WIN_NAME' => $config['football_win_name'],
'S_SHOW_OTHER_LINKS' => true,
'S_HEADER' => sprintf($user->lang['RANKING_ALL_TIME']),
- 'S_LINK_RANKING' => $this->helper->route('football_main_controller', array('side' => 'ranks_total', 's' => $season, 'l' => $league, 'm' => $matchday)),
+ 'S_LINK_RANKING' => $this->helper->route('football_football_controller', array('side' => 'ranks_total', 's' => $season, 'l' => $league, 'm' => $matchday)),
'S_LINK_ALL_TIME' => '',
- 'S_LINK_COMPARE' => $this->helper->route('football_main_controller', array('side' => 'ranks_total', 's' => $season, 'l' => $league, 'm' => $matchday, 'mode' => 'compare')),
+ 'S_LINK_COMPARE' => $this->helper->route('football_football_controller', array('side' => 'ranks_total', 's' => $season, 'l' => $league, 'm' => $matchday, 'mode' => 'compare')),
)
);
break;
@@ -227,8 +227,8 @@ switch ($mode)
AND r.league = $league
AND r.matchday = $matchday
AND r.status IN (2,3)
- GROUP BY season, user_id
- ORDER BY r.user_id ASC, season ASC";
+ GROUP BY r.season, r.user_id
+ ORDER BY r.user_id ASC, r.season ASC";
$result = $db->sql_query($sql);
@@ -275,7 +275,7 @@ switch ($mode)
$index_end = $index_start + $config['football_users_per_page'] - 1;
// handle pagination.
- $base_url = $this->helper->route('football_main_controller', array('side' => 'ranks_total', 's' => $season, 'l' => $league, 'm' => $matchday, 'mode' => 'compare'));
+ $base_url = $this->helper->route('football_football_controller', array('side' => 'ranks_total', 's' => $season, 'l' => $league, 'm' => $matchday, 'mode' => 'compare'));
$pagination = $phpbb_container->get('pagination');
$pagination->generate_template_pagination($base_url, 'pagination', 'start', $total_users, $this->config['football_users_per_page'], $start);
@@ -334,8 +334,8 @@ switch ($mode)
'WIN_NAME' => $config['football_win_name'],
'S_SHOW_OTHER_LINKS' => true,
'S_HEADER' => sprintf($user->lang['RANKING_COMPARE']),
- 'S_LINK_RANKING' => $this->helper->route('football_main_controller', array('side' => 'ranks_total', 's' => $season, 'l' => $league, 'm' => $matchday)),
- 'S_LINK_ALL_TIME' => $this->helper->route('football_main_controller', array('side' => 'ranks_total', 's' => $season, 'l' => $league, 'm' => $matchday, 'mode' => 'alltime')),
+ 'S_LINK_RANKING' => $this->helper->route('football_football_controller', array('side' => 'ranks_total', 's' => $season, 'l' => $league, 'm' => $matchday)),
+ 'S_LINK_ALL_TIME' => $this->helper->route('football_football_controller', array('side' => 'ranks_total', 's' => $season, 'l' => $league, 'm' => $matchday, 'mode' => 'alltime')),
'S_LINK_COMPARE' => '',
)
);
@@ -369,7 +369,7 @@ switch ($mode)
AND b.league = $league
AND m.status IN (2,3)
AND m.matchday <= $matchday
- GROUP BY user_id";
+ GROUP BY b.user_id";
$result = $db->sql_query($sql);
$rows = $db->sql_fetchrowset($result);
@@ -423,7 +423,7 @@ switch ($mode)
AND r.league = $league
AND r.matchday = $matchday
AND r.status IN (2,3)
- GROUP BY user_id
+ GROUP BY r.user_id
ORDER BY r.points_total DESC, LOWER(u.username) ASC";
$result = $db->sql_query($sql);
@@ -447,7 +447,7 @@ switch ($mode)
$index_end = $index_start + $config['football_users_per_page'] - 1;
// handle pagination.
- $base_url = $this->helper->route('football_main_controller', array('side' => 'ranks_total', 's' => $season, 'l' => $league, 'm' => $matchday));
+ $base_url = $this->helper->route('football_football_controller', array('side' => 'ranks_total', 's' => $season, 'l' => $league, 'm' => $matchday));
$pagination = $phpbb_container->get('pagination');
if ($user->data['football_mobile'])
{
@@ -482,13 +482,13 @@ switch ($mode)
{
if ($rank > $prev_rank_of[$curr_rank['user_id']])
{
- $change_sign = '-';
- $differ = $prev_rank_of[$curr_rank['user_id']] - $rank;
+ $change_sign = '+';
+ $differ = $rank - $prev_rank_of[$curr_rank['user_id']];
$change_differ = ' (' . $differ . ')';
}
else
{
- $change_sign = '+';
+ $change_sign = '-';
$differ = $prev_rank_of[$curr_rank['user_id']] - $rank;
$change_differ = ' (' . $differ . ')';
}
@@ -520,8 +520,8 @@ switch ($mode)
'ROW_CLASS' => $row_class,
'RANK' => $rank,
'NO_CHANGES' => ($change_sign == '=') ? true : false,
- 'WORSENED' => ($change_sign == '-') ? true : false,
- 'IMPROVED' => ($change_sign == '+') ? true : false,
+ 'WORSENED' => ($change_sign == '+') ? true : false,
+ 'IMPROVED' => ($change_sign == '-') ? true : false,
'CHANGE_SIGN' => $change_sign,
'CHANGE_DIFFER' => $change_differ,
'USERID' => $curr_rank['user_id'],
@@ -554,8 +554,8 @@ switch ($mode)
'WIN_NAME' => $config['football_win_name'],
'S_SHOW_OTHER_LINKS' => true,
'S_LINK_RANKING' => '',
- 'S_LINK_ALL_TIME' => $this->helper->route('football_main_controller', array('side' => 'ranks_total', 's' => $season, 'l' => $league, 'm' => $matchday, 'mode' => 'alltime')),
- 'S_LINK_COMPARE' => $this->helper->route('football_main_controller', array('side' => 'ranks_total', 's' => $season, 'l' => $league, 'm' => $matchday, 'mode' => 'compare')),
+ 'S_LINK_ALL_TIME' => $this->helper->route('football_football_controller', array('side' => 'ranks_total', 's' => $season, 'l' => $league, 'm' => $matchday, 'mode' => 'alltime')),
+ 'S_LINK_COMPARE' => $this->helper->route('football_football_controller', array('side' => 'ranks_total', 's' => $season, 'l' => $league, 'm' => $matchday, 'mode' => 'compare')),
)
);
break;
diff --git a/block/results.php b/block/results.php
index 7779a71..a3c3ed0 100644
--- a/block/results.php
+++ b/block/results.php
@@ -7,7 +7,7 @@
*
*/
-if (!defined('IN_PHPBB') OR !defined('IN_FOOTBALL'))
+if (!defined('IN_PHPBB'))
{
exit;
}
@@ -408,15 +408,16 @@ switch ($league_info['bet_ko_type'])
$label_finalresult = sprintf($user->lang['EXTRATIME_SHORT']) . '/' . sprintf($user->lang['PENALTY_SHORT']);
break;
}
-
// set correct display for usage in menu template
if($side == 'results')
{
$display_results = true;
+ $display_results_tl = false;
$sidename = sprintf($user->lang['RESULTS']);
}
if($side == 'results_tl')
{
+ $display_results = false;
$display_results_tl = true;
$sidename = sprintf($user->lang['RESULTS']);
}
@@ -428,7 +429,7 @@ $template->assign_vars(array(
'S_SIDENAME' => $sidename,
'RESULT_EXPLAIN' => $result_explain,
'LABEL_FINALRESULT' => $label_finalresult,
- 'S_FORM_ACTION_RESULT' => $this->helper->route('football_main_controller', array('side' => 'results', 's' => $season, 'l' => $league, 'm' => $matchday, 'action' => 'result')),
+ 'S_FORM_ACTION_RESULT' => $this->helper->route('football_football_controller', array('side' => 'results', 's' => $season, 'l' => $league, 'm' => $matchday, 'action' => 'result')),
'S_DATA_RESULTS' => $data_results,
'S_USER_IS_MEMBER' => $user_is_member,
'S_DISPLAY_GROUP' => $display_group,
@@ -436,5 +437,3 @@ $template->assign_vars(array(
'S_EDIT_MODE' => $edit_mode,
)
);
-
-?>
\ No newline at end of file
diff --git a/block/rules_popup.php b/block/rules_popup.php
index 723c051..e108232 100644
--- a/block/rules_popup.php
+++ b/block/rules_popup.php
@@ -1,227 +1,233 @@
-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);
-}
-
-$season = $this->request->variable('s', 0);
-$league = $this->request->variable('l', 0);
-
-// Check parms
-$error_message = '';
-if (!$season OR !$league)
-{
- $data_rules = false;
- if (!$season)
- {
- $error_message .= sprintf($user->lang['NO_SEASON']) . ' ';
- }
- if (!$league)
- {
- $error_message .= sprintf($user->lang['NO_LEAGUE']) . ' ';
- }
-}
-else
-{
- $season_info = season_info($season);
- if (sizeof($season_info))
- {
- $season_name = $season_info['season_name'];
- $league_info = league_info($season, $league);
- if (sizeof($league_info))
- {
- $data_rules = true;
- $matchdays = $league_info['matchdays'];
- $league_name = $league_info['league_name'];
-
- if ($user->data['is_registered'] and !$user->data['is_bot'])
- {
- $win_hits = '';
- $win_hits02 = '';
- $win_matchday = explode(';', "0;" . $league_info['win_matchday']);
- $win_season = explode(';',"0;" . $league_info['win_season']);
- $win_hits = $league_info['win_result'];
- $win_hits02 = $league_info['win_result_02'];
-
- if($win_hits != '' AND $win_hits != 0)
- {
- $template->assign_block_vars('wintable', array(
- 'WIN_DESC' => sprintf($user->lang['WIN_HITS']),
- )
- );
- $template->assign_block_vars('wintable.entry', array(
- 'ROW_CLASS' => 'bg1 row_light',
- 'RANK' => '1. ' . sprintf($user->lang['PLACE']),
- 'WIN' => $win_hits,
- )
- );
- }
-
- if($win_hits02 != '' AND $win_hits02 != 0 AND $config['football_win_hits02'])
- {
- $template->assign_block_vars('wintable', array(
- 'WIN_DESC' => sprintf($user->lang['WIN_HITS02']),
- )
- );
- $template->assign_block_vars('wintable.entry', array(
- 'ROW_CLASS' => 'bg1 row_light',
- 'RANK' => '1. ' . sprintf($user->lang['PLACE']),
- 'WIN' => $win_hits02,
- )
- );
- }
-
-
- if($win_matchday[1] != '' AND $win_matchday[1] != 0)
- {
- $template->assign_block_vars('wintable', array(
- 'WIN_DESC' => sprintf($user->lang['WINS_MATCHDAY']),
- )
- );
- $rank = 1;
- while ($win_matchday[$rank] != '')
- {
- $row_class = (!($rank % 2)) ? 'bg1 row_light' : 'bg2 row_dark';
- $template->assign_block_vars('wintable.entry', array(
- 'ROW_CLASS' => $row_class,
- 'RANK' => $rank . '. ' . sprintf($user->lang['PLACE']),
- 'WIN' => $win_matchday[$rank],
- )
- );
- $rank++ ;
- if ($rank > sizeof($win_matchday)-1)
- {
- break;
- }
- }
- }
-
- if($win_season[1] != '' AND $win_season[1] != 0)
- {
- $template->assign_block_vars('wintable', array(
- 'WIN_DESC' => sprintf($user->lang['WINS_SEASON']),
- )
- );
- $rank = 1;
- while ($win_season[$rank] != '')
- {
- $row_class = (!($rank % 2)) ? 'bg1 row_light' : 'bg2 row_dark';
- $template->assign_block_vars('wintable.entry', array(
- 'ROW_CLASS' => $row_class,
- 'RANK' => $rank. '. ' . sprintf($user->lang['PLACE']),
- 'WIN' => $win_season[$rank],
- )
- );
- $rank++ ;
- if ($rank > sizeof($win_season)-1)
- {
- break;
- }
- }
- }
- }
- }
- else
- {
- $data_rules = false;
- $error_message .= sprintf($user->lang['NO_LEAGUE']) . ' ';
- $league_name = '';
- }
- }
- else
- {
- $data_rules = false;
- $error_message .= sprintf($user->lang['NO_SEASON']) . ' ';
- $season_name = '';
- }
-}
-
-$sidename = sprintf($user->lang['FOOTBALL_RULES']);
-if ($data_rules)
-{
- $link_rules = append_sid($phpbb_root_path . "viewtopic.$phpEx?p=" . $league_info["rules_post_id"]);
- $points_tendency = ($league_info['points_mode'] < 3) ? sprintf($user->lang['POINTS_TENDENCY' . $league_info['points_mode']], $league_info['points_tendency']) : sprintf($user->lang['POINTS_TENDENCY'], $league_info['points_tendency']);
- $template->assign_vars(array(
- 'S_SIDENAME' => $sidename,
- 'S_DATA_RULES' => $data_rules,
- 'S_BET_IN_TIME' => $league_info['bet_in_time'],
- 'S_RULES_POST_ID' => $league_info['rules_post_id'],
- 'S_ERROR_MESSAGE' => $error_message,
- 'S_FOOTBALL_COPY' => sprintf($user->lang['FOOTBALL_COPY'], $config['football_version'], $phpbb_root_path . 'football/'),
- 'WIN_NAME' => $config['football_win_name'],
- 'JOIN_MODE' => ($league_info['join_by_user']) ? (($league_info['join_in_season']) ? sprintf($user->lang['JOIN_IN_SEASON']) : sprintf($user->lang['JOIN_BY_USER'])) : sprintf($user->lang['JOIN_BY_ADMIN']),
- 'POINTS_HIT' => sprintf($user->lang['POINTS_HIT'], $league_info['points_result']) . ' ',
- 'POINTS_TENDENCY' => $points_tendency . ' ',
- 'POINTS_DIFF' => ($league_info['points_mode'] == 4) ? sprintf($user->lang['POINTS_DIFFERENCE'], $league_info['points_diff']) . ' ' :
- (($league_info['points_mode'] == 5) ? sprintf($user->lang['POINTS_DIFFERENCE_DRAW'], $league_info['points_diff']) . ' ' : ''),
- 'POINTS_LAST' => ($league_info['points_last']) ? sprintf($user->lang['POINTS_NO_BET']) . ' ' : '',
- 'LINK_RULES' => sprintf($user->lang['LINK_RULES'], $link_rules),
- 'SEASONNAME' => $season_info['season_name'],
- 'LEAGUENAME' => $league_name,
- )
- );
-
- // output page
- page_header(sprintf($user->lang['FOOTBALL_RULES' ]) . ' ' . $league_info['league_name'] . ' ' . $season_info['season_name']);
-}
-else
-{
- $template->assign_vars(array(
- 'S_SIDENAME' => $sidename,
- 'S_DATA_RULES' => $data_rules,
- 'S_BET_IN_TIME' => false,
- 'S_RULES_POST_ID' => 0,
- 'S_ERROR_MESSAGE' => $error_message,
- 'S_FOOTBALL_COPY' => sprintf($user->lang['FOOTBALL_COPY'], $config['football_version'], $phpbb_root_path . 'football/'),
- 'WIN_NAME' => $config['football_win_name'],
- 'JOIN_MODE' => '',
- 'POINTS_HIT' => '',
- 'POINTS_TENDENCY' => '',
- 'POINTS_DIFF' => '',
- 'POINTS_LAST' => '',
- 'LINK_RULES' => '',
- 'SEASONNAME' => '',
- 'LEAGUENAME' => '',
- )
- );
-
- // output page
- page_header(sprintf($user->lang['FOOTBALL_RULES' ]));
-}
-$template->set_filenames(array(
- 'body' => 'rules_popup.html'
- )
-);
-// $template->display('popup');
-
-page_footer();
-
-?>
\ No newline at end of file
+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);
+}
+
+$season = $this->request->variable('s', 0);
+$league = $this->request->variable('l', 0);
+
+// Check parms
+$error_message = '';
+if (!$season OR !$league)
+{
+ $data_rules = false;
+ if (!$season)
+ {
+ $error_message .= sprintf($user->lang['NO_SEASON']) . ' ';
+ }
+ if (!$league)
+ {
+ $error_message .= sprintf($user->lang['NO_LEAGUE']) . ' ';
+ }
+}
+else
+{
+ $season_info = season_info($season);
+ if (sizeof($season_info))
+ {
+ $season_name = $season_info['season_name'];
+ $league_info = league_info($season, $league);
+ if (sizeof($league_info))
+ {
+ $data_rules = true;
+ $matchdays = $league_info['matchdays'];
+ $league_name = $league_info['league_name'];
+
+ if ($user->data['is_registered'] and !$user->data['is_bot'])
+ {
+ $win_hits = '';
+ $win_hits02 = '';
+ $win_matchday = explode(';', "0;" . $league_info['win_matchday']);
+ $win_season = explode(';',"0;" . $league_info['win_season']);
+ $win_hits = $league_info['win_result'];
+ $win_hits02 = $league_info['win_result_02'];
+
+ if($win_hits != '' AND $win_hits != 0)
+ {
+ $template->assign_block_vars('wintable', array(
+ 'WIN_DESC' => sprintf($user->lang['WIN_HITS']),
+ )
+ );
+ $template->assign_block_vars('wintable.entry', array(
+ 'ROW_CLASS' => 'bg1 row_light',
+ 'RANK' => '1. ' . sprintf($user->lang['PLACE']),
+ 'WIN' => $win_hits,
+ )
+ );
+ }
+
+ if($win_hits02 != '' AND $win_hits02 != 0 AND $config['football_win_hits02'])
+ {
+ $template->assign_block_vars('wintable', array(
+ 'WIN_DESC' => sprintf($user->lang['WIN_HITS02']),
+ )
+ );
+ $template->assign_block_vars('wintable.entry', array(
+ 'ROW_CLASS' => 'bg1 row_light',
+ 'RANK' => '1. ' . sprintf($user->lang['PLACE']),
+ 'WIN' => $win_hits02,
+ )
+ );
+ }
+
+
+ if($win_matchday[1] != '' AND $win_matchday[1] != 0)
+ {
+ $template->assign_block_vars('wintable', array(
+ 'WIN_DESC' => sprintf($user->lang['WINS_MATCHDAY']),
+ )
+ );
+ $rank = 1;
+ while ($win_matchday[$rank] != '')
+ {
+ $row_class = (!($rank % 2)) ? 'bg1 row_light' : 'bg2 row_dark';
+ $template->assign_block_vars('wintable.entry', array(
+ 'ROW_CLASS' => $row_class,
+ 'RANK' => $rank . '. ' . sprintf($user->lang['PLACE']),
+ 'WIN' => $win_matchday[$rank],
+ )
+ );
+ $rank++ ;
+ if ($rank > sizeof($win_matchday)-1)
+ {
+ break;
+ }
+ }
+ }
+
+ if($win_season[1] != '' AND $win_season[1] != 0)
+ {
+ $template->assign_block_vars('wintable', array(
+ 'WIN_DESC' => sprintf($user->lang['WINS_SEASON']),
+ )
+ );
+ $rank = 1;
+ while ($win_season[$rank] != '')
+ {
+ $row_class = (!($rank % 2)) ? 'bg1 row_light' : 'bg2 row_dark';
+ $template->assign_block_vars('wintable.entry', array(
+ 'ROW_CLASS' => $row_class,
+ 'RANK' => $rank. '. ' . sprintf($user->lang['PLACE']),
+ 'WIN' => $win_season[$rank],
+ )
+ );
+ $rank++ ;
+ if ($rank > sizeof($win_season)-1)
+ {
+ break;
+ }
+ }
+ }
+ }
+ }
+ else
+ {
+ $data_rules = false;
+ $error_message .= sprintf($user->lang['NO_LEAGUE']) . ' ';
+ $league_name = '';
+ }
+ }
+ else
+ {
+ $data_rules = false;
+ $error_message .= sprintf($user->lang['NO_SEASON']) . ' ';
+ $season_name = '';
+ }
+}
+
+$sidename = sprintf($user->lang['FOOTBALL_RULES']);
+if ($data_rules)
+{
+ $link_rules = append_sid($phpbb_root_path . "viewtopic.$phpEx?p=" . $league_info["rules_post_id"]);
+ $points_tendency = ($league_info['points_mode'] < 3) ? sprintf($user->lang['POINTS_TENDENCY' . $league_info['points_mode']], $league_info['points_tendency']) : sprintf($user->lang['POINTS_TENDENCY'], $league_info['points_tendency']);
+ $template->assign_vars(array(
+ 'S_SIDENAME' => $sidename,
+ 'S_DATA_RULES' => $data_rules,
+ 'S_BET_IN_TIME' => $league_info['bet_in_time'],
+ 'S_BET_POINTS' => true,
+ 'S_RULES_POST_ID' => $league_info['rules_post_id'],
+ 'S_ERROR_MESSAGE' => $error_message,
+ 'S_FOOTBALL_COPY' => sprintf($user->lang['FOOTBALL_COPY'], $config['football_version'], $phpbb_root_path . 'football/'),
+ 'WIN_NAME' => $config['football_win_name'],
+ 'JOIN_MODE' => ($league_info['join_by_user']) ? (($league_info['join_in_season']) ? sprintf($user->lang['JOIN_IN_SEASON']) : sprintf($user->lang['JOIN_BY_USER'])) : sprintf($user->lang['JOIN_BY_ADMIN']),
+ 'POINTS_HIT' => sprintf($user->lang['POINTS_HIT'], $league_info['points_result']) . ' ',
+ 'POINTS_TENDENCY' => $points_tendency . ' ',
+ 'POINTS_DIFF' => ($league_info['points_mode'] == 4) ? sprintf($user->lang['POINTS_DIFFERENCE'], $league_info['points_diff']) . ' ' :
+ (($league_info['points_mode'] == 5) ? sprintf($user->lang['POINTS_DIFFERENCE_DRAW'], $league_info['points_diff']) . ' ' : ''),
+ 'POINTS_LAST' => ($league_info['points_last']) ? sprintf($user->lang['POINTS_NO_BET']) . ' ' : '',
+ 'LINK_RULES' => sprintf($user->lang['LINK_RULES'], $link_rules),
+ 'SEASONNAME' => $season_info['season_name'],
+ 'LEAGUENAME' => $league_name,
+ 'BET_POINTS' => $league_info['bet_points'],
+ )
+ );
+
+ // output page
+ page_header(sprintf($user->lang['FOOTBALL_RULES' ]) . ' ' . $league_info['league_name'] . ' ' . $season_info['season_name']);
+}
+else
+{
+ $template->assign_vars(array(
+ 'S_SIDENAME' => $sidename,
+ 'S_DATA_RULES' => $data_rules,
+ 'S_BET_IN_TIME' => false,
+ 'S_BET_POINTS' => false,
+ 'S_RULES_POST_ID' => 0,
+ 'S_ERROR_MESSAGE' => $error_message,
+ 'S_FOOTBALL_COPY' => sprintf($user->lang['FOOTBALL_COPY'], $config['football_version'], $phpbb_root_path . 'football/'),
+ 'WIN_NAME' => $config['football_win_name'],
+ 'JOIN_MODE' => '',
+ 'POINTS_HIT' => '',
+ 'POINTS_TENDENCY' => '',
+ 'POINTS_DIFF' => '',
+ 'POINTS_LAST' => '',
+ 'LINK_RULES' => '',
+ 'SEASONNAME' => '',
+ 'LEAGUENAME' => '',
+ )
+ );
+
+ // output page
+ page_header(sprintf($user->lang['FOOTBALL_RULES' ]));
+}
+$template->set_filenames(array(
+ 'body' => 'rules_popup.html'
+ )
+);
+// $template->display('popup');
+
+page_footer();
diff --git a/block/side_table.php b/block/side_table.php
index 6747241..327ac62 100644
--- a/block/side_table.php
+++ b/block/side_table.php
@@ -7,7 +7,7 @@
*
*/
-if (!defined('IN_PHPBB') OR !defined('IN_FOOTBALL'))
+if (!defined('IN_PHPBB'))
{
exit;
}
@@ -142,4 +142,3 @@ else
)
);
}
-?>
\ No newline at end of file
diff --git a/block/stat_points.php b/block/stat_points.php
index f8afd63..b5cc4a0 100644
--- a/block/stat_points.php
+++ b/block/stat_points.php
@@ -7,7 +7,7 @@
*
*/
-if (!defined('IN_PHPBB') OR !defined('IN_FOOTBALL'))
+if (!defined('IN_PHPBB'))
{
exit;
}
@@ -160,5 +160,3 @@ $template->assign_vars(array(
'LEAGUE' => $league,
)
);
-
-?>
\ No newline at end of file
diff --git a/block/stat_results.php b/block/stat_results.php
index 17d5d03..7c059b1 100644
--- a/block/stat_results.php
+++ b/block/stat_results.php
@@ -7,7 +7,7 @@
*
*/
-if (!defined('IN_PHPBB') OR !defined('IN_FOOTBALL'))
+if (!defined('IN_PHPBB'))
{
exit;
}
@@ -136,5 +136,3 @@ $template->assign_vars(array(
'LEAGUE' => $league,
)
);
-
-?>
\ No newline at end of file
diff --git a/block/table.php b/block/table.php
index 3fd728e..2b8c8ce 100644
--- a/block/table.php
+++ b/block/table.php
@@ -7,7 +7,7 @@
*
*/
-if (!defined('IN_PHPBB') OR !defined('IN_FOOTBALL'))
+if (!defined('IN_PHPBB'))
{
exit;
}
@@ -159,7 +159,7 @@ foreach($points_ary as $group_id => $points)
)
);
}
- }
+ }
}
$db->sql_freeresult($result);
@@ -458,9 +458,13 @@ if($league > 50)
{
// Activate bonus coloumn only for tippers.
$data_bns = true;
+} else {
+ $data_bns = false;
}
if($side == 'table') {
$display_table_menu = true;
+} else {
+ $display_table_menu = false;
}
$db->sql_freeresult($result);
$sidename = sprintf($user->lang['TABLE']);
@@ -476,5 +480,3 @@ $template->assign_vars(array(
'S_DATA_BNS' => $data_bns,
)
);
-
-?>
\ No newline at end of file
diff --git a/block/under_construction.php b/block/under_construction.php
index c3c866e..270db24 100644
--- a/block/under_construction.php
+++ b/block/under_construction.php
@@ -1,23 +1,21 @@
-lang['UNDER_CONSTRUCTION']);
-$template->assign_vars(array(
- 'S_SIDENAME' => $sidename,
- 'S_DISPLAY_UNDER_CONSTRUCTION' => true,
- )
-);
-
-?>
\ No newline at end of file
+lang['UNDER_CONSTRUCTION']);
+$template->assign_vars(array(
+ 'S_SIDENAME' => $sidename,
+ 'S_DISPLAY_UNDER_CONSTRUCTION' => true,
+ )
+);
diff --git a/block/viewplan_popup.php b/block/viewplan_popup.php
index f9525a1..973cfde 100644
--- a/block/viewplan_popup.php
+++ b/block/viewplan_popup.php
@@ -1,297 +1,300 @@
-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);
-}
-
-$mode = $this->request->variable('mode', '');
-$season = $this->request->variable('s', 0);
-$league = $this->request->variable('l', 0);
-$team_id = $this->request->variable('tid', 0);
-
-switch($mode)
-{
- case 'played':
- $mode_desc = sprintf($user->lang['PLAYED_MATCHES']);
- $where = ' AND m.status IN (3,6) ';
- $data_results = true;
- break;
- case 'rest':
- $mode_desc = sprintf($user->lang['REST_MATCHES']);
- $where = ' AND m.status IN (0,1,2,4,5) ';
- $data_results = false;
- break;
- case 'home':
- $mode_desc = sprintf($user->lang['HOME_MATCHES']);
- $where = " AND m.team_id_home = $team_id AND m.status IN (3,6) ";
- $data_results = true;
- break;
- case 'away':
- $mode_desc = sprintf($user->lang['AWAY_MATCHES']);
- $where = " AND m.team_id_guest = $team_id AND m.status IN (3,6) ";
- $data_results = true;
- break;
- // ALL is Default
- default:
- $mode_desc = sprintf($user->lang['ALL_MATCHES']);
- $where = '';
- $data_results = true;
- break;
-}
-
-// Check parms
-$error_message = '';
-if (!$season OR !$league OR !$team_id)
-{
- $data_plan = false;
- if (!$season)
- {
- $error_message .= sprintf($user->lang['NO_SEASON']) . ' ';
- }
- if (!$league)
- {
- $error_message .= sprintf($user->lang['NO_LEAGUE']) . ' ';
- }
- if (!$team_id)
- {
- $error_message .= sprintf($user->lang['NO_TEAM_ID']) . ' ';
- }
-}
-else
-{
- $data_group = false;
- $lang_dates = $user->lang['datetime'];
-
-
- // Calculate matches and bets of matchday
- $sql = "SELECT
- IF(m.team_id_home = $team_id, 'H', 'A') AS match_place,
- IF(((m.status=3) OR (m.status=6)),
- IF(m.team_id_home = $team_id,
- IF(m.goals_home + 0 > m.goals_guest, 'match_win', IF(m.goals_home = m.goals_guest, 'match_draw', 'match_lost')),
- IF(m.goals_home + 0 < m.goals_guest, 'match_win', IF(m.goals_home = m.goals_guest, 'match_draw', 'match_lost'))),
- '') AS match_style,
- m.match_no,
- m.matchday,
- m.status,
- m.group_id,
- 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,
- m.goals_home,
- m.goals_guest,
- 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
- FROM " . FOOTB_MATCHES . ' AS m
- 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.team_id_home = $team_id OR m.team_id_guest = $team_id)
- $where
- GROUP BY m.match_no
- ORDER BY m.match_datetime ASC, m.match_no ASC";
- $result = $db->sql_query($sql);
- if ($row = $db->sql_fetchrow($result))
- {
- $data_plan = true;
- $matchnumber = 0;
- $ext_path = $this->phpbb_path_helper->update_web_root_path($this->phpbb_extension_manager->get_extension_path('football/football', true));
- do
- {
- $matchnumber++ ;
- $row_class = (!($matchnumber % 2)) ? 'bg1 row_light' : 'bg2 row_dark';
- $display_link = true;
- $homelogo = $row['home_symbol'];
- $guestlogo = $row['guest_symbol'];
- if ($homelogo <> '')
- {
- $logoH = "" ;
- }
- else
- {
- $logoH = "" ;
- }
- if ($guestlogo <> '')
- {
- $logoG = "" ;
- }
- else
- {
- $logoG = "" ;
- }
-
- if ($row['group_id'] == '')
- {
- $group_id = ' ';
- }
- else
- {
- $data_group = true;
- $group_id = $row['group_id'];
- }
-
- if ($row['match_place'] == 'H')
- {
- $color_home = $row['match_style'];
- $color_guest = '';
- }
- else
- {
- $color_home = '';
- $color_guest = $row['match_style'];
- }
- $color_goals = $row['match_style'];
-
- $template->assign_block_vars('match', array(
- 'ROW_CLASS' => $row_class,
- 'MATCH_TIME' => $row['match_time'],
- 'GROUP' => $group_id,
- 'LOGO_HOME' => $logoH,
- 'LOGO_GUEST' => $logoG,
- 'HOME_NAME' => $row['home_short'],
- 'GUEST_NAME' => $row['guest_short'],
- 'GOALS_HOME' => ($row['goals_home'] == '') ? ' ' : $row['goals_home'],
- 'GOALS_GUEST' => ($row['goals_guest'] == '') ? ' ' : $row['goals_guest'],
- 'COLOR_HOME' => $color_home,
- 'COLOR_GUEST' => $color_guest,
- 'COLOR_GOALS' => $color_goals,
- )
- );
- }
- while ($row = $db->sql_fetchrow($result));
- $db->sql_freeresult($result);
- }
- else
- {
- $data_plan = false;
- }
-
- $season_info = season_info($season);
- if (sizeof($season_info) == 0)
- {
- $error_message .= sprintf($user->lang['NO_SEASON']) . ' ';
- $season_name = '';
- }
- else
- {
- $season_name = $season_info["season_name"];
-
- $league_info = league_info($season, $league);
- if (sizeof($league_info) == 0)
- {
- $error_message .= sprintf($user->lang['NO_LEAGUE']) . ' ';
- $league_name = '';
-
- }
- else
- {
- $league_name = $league_info["league_name"];
-
- $team_info = team_info($season, $league, $team_id);
- if (sizeof($team_info) == 0)
- {
- $error_message .= sprintf($user->lang['NO_TEAM_ID']) . ' ';
- $team_name = '';
- $logo = '';
- }
- else
- {
- $team_name = $team_info["team_name"];
- $logo = "" ;
- }
- }
- }
-}
-
-$sidename = sprintf($user->lang['PLAN']);
-if ($data_plan)
-{
- $template->assign_vars(array(
- 'S_SIDENAME' => $sidename,
- 'S_DATA_PLAN' => $data_plan,
- 'S_DATA_GROUP' => $data_group,
- 'S_ERROR_MESSAGE' => $error_message,
- 'MODE_DESC' => $mode_desc,
- 'LOGO' => $logo,
- 'TEAM' => $team_name,
- 'SEASON' => $season_name,
- 'LEAGUE' => $league_name,
- 'S_FOOTBALL_COPY' => sprintf($user->lang['FOOTBALL_COPY'], $config['football_version'], $phpbb_root_path . 'football/'),
- 'S_DATA_RESULTS' => $data_results,
- )
- );
-
- // output page
- page_header($mode_desc . ' ' . $team_name);
-}
-else
-{
- $template->assign_vars(array(
- 'S_SIDENAME' => $sidename,
- 'S_DATA_PLAN' => $data_plan,
- 'S_DATA_GROUP' => false,
- 'S_ERROR_MESSAGE' => $error_message,
- 'MODE_DESC' => $mode_desc,
- 'LOGO' => '',
- 'TEAM' => '',
- 'SEASON' => '',
- 'LEAGUE' => '',
- 'S_FOOTBALL_COPY' => sprintf($user->lang['FOOTBALL_COPY'], $config['football_version'], $phpbb_root_path . 'football/'),
- 'S_DATA_RESULTS' => false,
- )
- );
-
- // output page
- page_header($mode_desc);
-}
-$template->set_filenames(array(
- 'body' => 'viewplan_popup.html')
-);
-
-page_footer();
-
-?>
\ No newline at end of file
+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);
+}
+
+$mode = $this->request->variable('mode', '');
+$season = $this->request->variable('s', 0);
+$league = $this->request->variable('l', 0);
+$team_id = $this->request->variable('tid', 0);
+
+switch($mode)
+{
+ case 'played':
+ $mode_desc = sprintf($user->lang['PLAYED_MATCHES']);
+ $where = ' AND m.status IN (3,6) ';
+ $data_results = true;
+ break;
+ case 'rest':
+ $mode_desc = sprintf($user->lang['REST_MATCHES']);
+ $where = ' AND m.status IN (0,1,2,4,5) ';
+ $data_results = false;
+ break;
+ case 'home':
+ $mode_desc = sprintf($user->lang['HOME_MATCHES']);
+ $where = " AND m.team_id_home = $team_id AND m.status IN (3,6) ";
+ $data_results = true;
+ break;
+ case 'away':
+ $mode_desc = sprintf($user->lang['AWAY_MATCHES']);
+ $where = " AND m.team_id_guest = $team_id AND m.status IN (3,6) ";
+ $data_results = true;
+ break;
+ // ALL is Default
+ default:
+ $mode_desc = sprintf($user->lang['ALL_MATCHES']);
+ $where = '';
+ $data_results = true;
+ break;
+}
+
+// Check parms
+$error_message = '';
+if (!$season OR !$league OR !$team_id)
+{
+ $data_plan = false;
+ if (!$season)
+ {
+ $error_message .= sprintf($user->lang['NO_SEASON']) . ' ';
+ }
+ if (!$league)
+ {
+ $error_message .= sprintf($user->lang['NO_LEAGUE']) . ' ';
+ }
+ if (!$team_id)
+ {
+ $error_message .= sprintf($user->lang['NO_TEAM_ID']) . ' ';
+ }
+}
+else
+{
+ $data_group = false;
+ $lang_dates = $user->lang['datetime'];
+
+
+ // Calculate matches and bets of matchday
+ $sql = "SELECT
+ IF(m.team_id_home = $team_id, 'H', 'A') AS match_place,
+ IF(((m.status=3) OR (m.status=6)),
+ IF(m.team_id_home = $team_id,
+ IF(m.goals_home + 0 > m.goals_guest, 'match_win', IF(m.goals_home = m.goals_guest, 'match_draw', 'match_lost')),
+ IF(m.goals_home + 0 < m.goals_guest, 'match_win', IF(m.goals_home = m.goals_guest, 'match_draw', 'match_lost'))),
+ '') AS match_style,
+ m.match_no,
+ m.matchday,
+ m.status,
+ m.group_id,
+ 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,
+ m.goals_home,
+ m.goals_guest,
+ 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
+ FROM " . FOOTB_MATCHES . ' AS m
+ 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.team_id_home = $team_id OR m.team_id_guest = $team_id)
+ $where
+ GROUP BY m.match_no
+ ORDER BY m.match_datetime ASC, m.match_no ASC";
+ $result = $db->sql_query($sql);
+ if ($row = $db->sql_fetchrow($result))
+ {
+ $data_plan = true;
+ $matchnumber = 0;
+ $ext_path = $this->phpbb_path_helper->update_web_root_path($this->phpbb_extension_manager->get_extension_path('football/football', true));
+ do
+ {
+ $matchnumber++ ;
+ $row_class = (!($matchnumber % 2)) ? 'bg1 row_light' : 'bg2 row_dark';
+ $display_link = true;
+ $homelogo = $row['home_symbol'];
+ $guestlogo = $row['guest_symbol'];
+ if ($homelogo <> '')
+ {
+ $logoH = "" ;
+ }
+ else
+ {
+ $logoH = "" ;
+ }
+ if ($guestlogo <> '')
+ {
+ $logoG = "" ;
+ }
+ else
+ {
+ $logoG = "" ;
+ }
+
+ if ($row['group_id'] == '')
+ {
+ $group_id = ' ';
+ }
+ else
+ {
+ $data_group = true;
+ $group_id = $row['group_id'];
+ }
+
+ if ($row['match_place'] == 'H')
+ {
+ $color_home = $row['match_style'];
+ $color_guest = '';
+ }
+ else
+ {
+ $color_home = '';
+ $color_guest = $row['match_style'];
+ }
+ $color_goals = $row['match_style'];
+
+ $template->assign_block_vars('match', array(
+ 'ROW_CLASS' => $row_class,
+ 'MATCH_TIME' => $row['match_time'],
+ 'GROUP' => $group_id,
+ 'LOGO_HOME' => $logoH,
+ 'LOGO_GUEST' => $logoG,
+ 'HOME_NAME' => $row['home_short'],
+ 'GUEST_NAME' => $row['guest_short'],
+ 'GOALS_HOME' => ($row['goals_home'] == '') ? ' ' : $row['goals_home'],
+ 'GOALS_GUEST' => ($row['goals_guest'] == '') ? ' ' : $row['goals_guest'],
+ 'COLOR_HOME' => $color_home,
+ 'COLOR_GUEST' => $color_guest,
+ 'COLOR_GOALS' => $color_goals,
+ )
+ );
+ }
+ while ($row = $db->sql_fetchrow($result));
+ $db->sql_freeresult($result);
+ }
+ else
+ {
+ $data_plan = false;
+ }
+
+ $season_info = season_info($season);
+ if (sizeof($season_info) == 0)
+ {
+ $error_message .= sprintf($user->lang['NO_SEASON']) . ' ';
+ $season_name = '';
+ }
+ else
+ {
+ $season_name = $season_info["season_name"];
+
+ $league_info = league_info($season, $league);
+ if (sizeof($league_info) == 0)
+ {
+ $error_message .= sprintf($user->lang['NO_LEAGUE']) . ' ';
+ $league_name = '';
+
+ }
+ else
+ {
+ $league_name = $league_info["league_name"];
+
+ $team_info = team_info($season, $league, $team_id);
+ if (sizeof($team_info) == 0)
+ {
+ $error_message .= sprintf($user->lang['NO_TEAM_ID']) . ' ';
+ $team_name = '';
+ $logo = '';
+ }
+ else
+ {
+ $team_name = $team_info["team_name"];
+ $logo = "" ;
+ }
+ }
+ }
+}
+
+$sidename = sprintf($user->lang['PLAN']);
+if ($data_plan)
+{
+ $template->assign_vars(array(
+ 'S_SIDENAME' => $sidename,
+ 'S_DATA_PLAN' => $data_plan,
+ 'S_DATA_GROUP' => $data_group,
+ 'S_ERROR_MESSAGE' => $error_message,
+ 'MODE_DESC' => $mode_desc,
+ 'LOGO' => $logo,
+ 'TEAM' => $team_name,
+ 'SEASON' => $season_name,
+ 'LEAGUE' => $league_name,
+ 'S_FOOTBALL_COPY' => sprintf($user->lang['FOOTBALL_COPY'], $config['football_version'], $phpbb_root_path . 'football/'),
+ 'S_DATA_RESULTS' => $data_results,
+ )
+ );
+
+ // output page
+ page_header($mode_desc . ' ' . $team_name);
+}
+else
+{
+ $template->assign_vars(array(
+ 'S_SIDENAME' => $sidename,
+ 'S_DATA_PLAN' => $data_plan,
+ 'S_DATA_GROUP' => false,
+ 'S_ERROR_MESSAGE' => $error_message,
+ 'MODE_DESC' => $mode_desc,
+ 'LOGO' => '',
+ 'TEAM' => '',
+ 'SEASON' => '',
+ 'LEAGUE' => '',
+ 'S_FOOTBALL_COPY' => sprintf($user->lang['FOOTBALL_COPY'], $config['football_version'], $phpbb_root_path . 'football/'),
+ 'S_DATA_RESULTS' => false,
+ )
+ );
+
+ // output page
+ page_header($mode_desc);
+}
+$template->set_filenames(array(
+ 'body' => 'viewplan_popup.html')
+);
+
+page_footer();
diff --git a/composer.json b/composer.json
index acffd07..0ff3a27 100644
--- a/composer.json
+++ b/composer.json
@@ -1,29 +1,30 @@
{
- "name": "football/football",
- "type": "phpbb-extension",
- "description": "Football Prediction League",
- "homepage": "http://football.bplaced.net",
- "version": "0.9.9",
- "time": "2017-09-09",
- "license": "GPL-2.0",
- "authors": [{
- "name": "J. Helmke",
- "email": "phpBB3.football@gmx.de",
- "homepage": "http://football.bplaced.net",
- "role": "Lead Developer"
- }],
- "require": {
- "php": ">=5.3.3"
+ "name" : "football/football",
+ "type" : "phpbb-extension",
+ "description" : "Football Prediction League",
+ "homepage" : "http://football.bplaced.net",
+ "version" : "0.9.9",
+ "time" : "2021-04-04",
+ "license" : "GPL-2.0-only",
+ "authors" : [{
+ "name" : "J. Helmke",
+ "email" : "phpBB3.football@gmx.de",
+ "homepage" : "http://football.bplaced.net",
+ "role" : "Lead Developer"
+ }
+ ],
+ "require" : {
+ "php" : ">=5.3.3"
},
- "extra": {
- "display-name": "Football Prediction League",
- "soft-require": {
- "phpbb/phpbb": ">3.1.*"
+ "extra" : {
+ "display-name" : "Football Prediction League",
+ "soft-require" : {
+ "phpbb/phpbb" : ">=3.2.8,<3.4"
},
- "version-check": {
- "host": "football.bplaced.net",
- "directory": "/updatecheck",
- "filename": "football_predictionleague.json"
+ "version-check" : {
+ "host" : "football.bplaced.net",
+ "directory" : "/updatecheck",
+ "filename" : "football_predictionleague.json"
}
}
-}
+}
\ No newline at end of file
diff --git a/config/routing.yml b/config/routing.yml
index 6dbfa2c..6875ed8 100644
--- a/config/routing.yml
+++ b/config/routing.yml
@@ -1,4 +1,4 @@
-football_main_controller:
+football_football_controller:
path: /football/{side}
defaults: { _controller: football.football.controller:handle }
diff --git a/config/services.yml b/config/services.yml
index 3f92562..a0f8a61 100644
--- a/config/services.yml
+++ b/config/services.yml
@@ -23,8 +23,8 @@ services:
- '@template'
- '@user'
- '@pagination'
- - %core.root_path%
- - %core.php_ext%
+ - '%core.root_path%'
+ - '%core.php_ext%'
football.football.controller_popup:
class: football\football\controller\popup
@@ -38,8 +38,8 @@ services:
- '@template'
- '@user'
- '@pagination'
- - %core.root_path%
- - %core.php_ext%
+ - '%core.root_path%'
+ - '%core.php_ext%'
football.football.controller_download:
class: football\football\controller\download
@@ -52,14 +52,14 @@ services:
- '@controller.helper'
- '@template'
- '@user'
- - %core.root_path%
- - %core.php_ext%
+ - '%core.root_path%'
+ - '%core.php_ext%'
football.football.version.check:
class: football\football\includes\version_check
scope: prototype
arguments:
- - %football.version_data%
+ - '%football.version_data%'
- '@config'
- '@version_helper'
- '@template'
@@ -73,8 +73,8 @@ services:
- '@path_helper'
- '@dbal.conn'
- '@user'
- - %core.root_path%
- - %core.php_ext%
+ - '%core.root_path%'
+ - '%core.php_ext%'
football.football.core.functions.points:
class: football\football\core\functions_points
@@ -92,16 +92,16 @@ services:
- '@path_helper'
- '@ext.manager'
- '@user'
- - %core.root_path%
- - %core.php_ext%
+ - '%core.root_path%'
+ - '%core.php_ext%'
tags:
- { name: event.listener }
football.football.cron.task.football_remember:
class: football\football\cron\task\football_remember
arguments:
- - %core.root_path%
- - %core.php_ext%
+ - '%core.root_path%'
+ - '%core.php_ext%'
- '@ext.manager'
- '@path_helper'
- '@dbal.conn'
diff --git a/controller/download.php b/controller/download.php
index c93fcc9..6cf2829 100644
--- a/controller/download.php
+++ b/controller/download.php
@@ -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?
diff --git a/controller/main.php b/controller/main.php
index 97268fb..efc6085 100644
--- a/controller/main.php
+++ b/controller/main.php
@@ -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,
diff --git a/controller/popup.php b/controller/popup.php
index 03077d0..390b090 100644
--- a/controller/popup.php
+++ b/controller/popup.php
@@ -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?
diff --git a/controller/xmlplan.php b/controller/xmlplan.php
index af56627..8d42f9a 100644
--- a/controller/xmlplan.php
+++ b/controller/xmlplan.php
@@ -105,7 +105,6 @@ class xmlplan
{
$message = (!empty($config['football_disable_msg'])) ? $config['football_disable_msg'] : 'FOOTBALL_DISABLED';
trigger_error($message);
- exit;
}
diff --git a/cron/task/football_remember.php b/cron/task/football_remember.php
index 95eca76..622469e 100644
--- a/cron/task/football_remember.php
+++ b/cron/task/football_remember.php
@@ -42,7 +42,7 @@ class football_remember extends \phpbb\cron\task\base
* @param string $php_ext
* @param \phpbb\extension\manager $phpbb_extension_manager
* @param \phpbb\path_helper $phpbb_path_helper
- * @param \phpbb\db\driver\driver_interfacer $db
+ * @param \phpbb\db\driver\driver_interface $db
* @param \phpbb\config\config $config
* @param \phpbb\log\log_interface $log
* @param \phpbb\user $user
@@ -333,4 +333,3 @@ class football_remember extends \phpbb\cron\task\base
}
}
}
-?>
\ No newline at end of file
diff --git a/event/main_listener.php b/event/main_listener.php
index 9574217..30588d8 100644
--- a/event/main_listener.php
+++ b/event/main_listener.php
@@ -129,7 +129,7 @@ class main_listener implements EventSubscriberInterface
}
else
{
- $event['location_url'] = $this->controller_helper->route('football_main_controller', array_merge(array('side' => $url_parts['base']), $url_parts['params']));
+ $event['location_url'] = $this->controller_helper->route('football_football_controller', array_merge(array('side' => $url_parts['base']), $url_parts['params']));
}
$db->sql_freeresult($result);
}
@@ -137,7 +137,7 @@ class main_listener implements EventSubscriberInterface
{
$event['location'] = $this->user->lang('VIEWING_FOOTBALL' . (empty($url_parts['base']) ? '' : '_' . strtoupper ($url_parts['base'])));
}
- $event['location_url'] = $this->controller_helper->route('football_main_controller', array_merge(array('side' => $url_parts['base']), $url_parts['params']));
+ $event['location_url'] = $this->controller_helper->route('football_football_controller', array_merge(array('side' => $url_parts['base']), $url_parts['params']));
}
}
@@ -217,20 +217,20 @@ class main_listener implements EventSubscriberInterface
'S_FOOTBALL_HEADER_LEAGUE' => $league,
'S_FOOTBALL_EXT_PATH' => $ext_path,
'S_FOOTBALL_HEADER_ENABLED' => $this->config['football_header_enable'] ? $in_football_ext : false,
- 'U_FOOTBALL' => $this->controller_helper->route('football_main_controller', array('side' => 'bet')),
- 'U_BET' => $this->controller_helper->route('football_main_controller', array('side' => 'bet', 's' => $season, 'l' => $league, 'm' => $matchday)),
- 'U_ALL_BETS' => $this->controller_helper->route('football_main_controller', array('side' => 'all_bets', 's' => $season, 'l' => $league, 'm' => $matchday)),
- 'U_RESULTS' => $this->controller_helper->route('football_main_controller', array('side' => 'results', 's' => $season, 'l' => $league, 'm' => $matchday)),
- 'U_RESULTS_TL' => $this->controller_helper->route('football_main_controller', array('side' => 'results_tl', 's' => $season, 'l' => $league, 'm' => $matchday)),
- 'U_TABLE' => $this->controller_helper->route('football_main_controller', array('side' => 'table', 's' => $season, 'l' => $league, 'm' => $matchday)),
- 'U_RANKS_TOTAL' => $this->controller_helper->route('football_main_controller', array('side' => 'ranks_total', 's' => $season, 'l' => $league, 'm' => $matchday)),
- 'U_RANKS_MATCHDAY' => $this->controller_helper->route('football_main_controller', array('side' => 'ranks_matchday', 's' => $season, 'l' => $league, 'm' => $matchday)),
- 'U_DELIVERY_LIST' => $this->controller_helper->route('football_main_controller', array('side' => 'delivery', 's' => $season, 'l' => $league, 'm' => $matchday)),
- 'U_LAST_VISITORS' => $this->controller_helper->route('football_main_controller', array('side' => 'last_users', 's' => $season, 'l' => $league, 'm' => $matchday)),
- 'U_FOOTBALL_BANK' => $this->controller_helper->route('football_main_controller', array('side' => 'bank', 's' => $season, 'l' => $league, 'm' => $matchday)),
+ 'U_FOOTBALL' => $this->controller_helper->route('football_football_controller', array('side' => 'bet')),
+ 'U_BET' => $this->controller_helper->route('football_football_controller', array('side' => 'bet', 's' => $season, 'l' => $league, 'm' => $matchday)),
+ 'U_ALL_BETS' => $this->controller_helper->route('football_football_controller', array('side' => 'all_bets', 's' => $season, 'l' => $league, 'm' => $matchday)),
+ 'U_RESULTS' => $this->controller_helper->route('football_football_controller', array('side' => 'results', 's' => $season, 'l' => $league, 'm' => $matchday)),
+ 'U_RESULTS_TL' => $this->controller_helper->route('football_football_controller', array('side' => 'results_tl', 's' => $season, 'l' => $league, 'm' => $matchday)),
+ 'U_TABLE' => $this->controller_helper->route('football_football_controller', array('side' => 'table', 's' => $season, 'l' => $league, 'm' => $matchday)),
+ 'U_RANKS_TOTAL' => $this->controller_helper->route('football_football_controller', array('side' => 'ranks_total', 's' => $season, 'l' => $league, 'm' => $matchday)),
+ 'U_RANKS_MATCHDAY' => $this->controller_helper->route('football_football_controller', array('side' => 'ranks_matchday', 's' => $season, 'l' => $league, 'm' => $matchday)),
+ 'U_DELIVERY_LIST' => $this->controller_helper->route('football_football_controller', array('side' => 'delivery', 's' => $season, 'l' => $league, 'm' => $matchday)),
+ 'U_LAST_VISITORS' => $this->controller_helper->route('football_football_controller', array('side' => 'last_users', 's' => $season, 'l' => $league, 'm' => $matchday)),
+ 'U_FOOTBALL_BANK' => $this->controller_helper->route('football_football_controller', array('side' => 'bank', 's' => $season, 'l' => $league, 'm' => $matchday)),
'U_RULES' => $this->controller_helper->route('football_football_popup', array('popside' => 'rules_popup', 's' => $season, 'l' => $league)),
'U_EXPORT' => $this->controller_helper->route('football_football_download', array('downside' => 'dload_export', 's' => $season, 'l' => $league)),
- 'U_ODDS' => $this->controller_helper->route('football_main_controller', array('side' => 'odds', 's' => $season, 'l' => $league, 'm' => $matchday)),
+ 'U_ODDS' => $this->controller_helper->route('football_football_controller', array('side' => 'odds', 's' => $season, 'l' => $league, 'm' => $matchday)),
'S_MENU_LINK1' => (strlen($this->config['football_menu_link1']) > 4) ? true : false,
'U_MENU_LINK1' => $this->config['football_menu_link1'],
'MENU_DESC_LINK1' => $this->config['football_menu_desc1'],
@@ -240,14 +240,14 @@ class main_listener implements EventSubscriberInterface
'S_MENU_LINK3' => (strlen($this->config['football_menu_link3']) > 4) ? true : false,
'U_MENU_LINK3' => (strpos($this->config['football_menu_link3'], 'xml/league.php') === false) ? $this->config['football_menu_link3'] : $this->config['football_menu_link3'] . "&season=$season&league=$league",
'MENU_DESC_LINK3' => $this->config['football_menu_desc3'],
- 'U_MY_BETS' => $this->controller_helper->route('football_main_controller', array('side' => 'my_bets', 's' => $season, 'l' => $league, 'm' => $matchday)),
- 'U_MY_POINTS' => $this->controller_helper->route('football_main_controller', array('side' => 'my_points', 's' => $season, 'l' => $league, 'm' => $matchday)),
- 'U_MY_TABLE' => $this->controller_helper->route('football_main_controller', array('side' => 'my_table', 's' => $season, 'l' => $league, 'm' => $matchday)),
- 'U_MY_RANK' => $this->controller_helper->route('football_main_controller', array('side' => 'my_rank', 's' => $season, 'l' => $league, 'm' => $matchday)),
- 'U_MY_CHART' => $this->controller_helper->route('football_main_controller', array('side' => 'my_chart', 's' => $season, 'l' => $league, 'm' => $matchday)),
- 'U_MY_KOEFF' => $this->controller_helper->route('football_main_controller', array('side' => 'my_koeff', 's' => $season, 'l' => $league, 'm' => $matchday)),
- 'U_STAT_RESULTS' => $this->controller_helper->route('football_main_controller', array('side' => 'stat_results', 's' => $season, 'l' => $league, 'm' => $matchday)),
- 'U_STAT_POINTS' => $this->controller_helper->route('football_main_controller', array('side' => 'stat_points', 's' => $season, 'l' => $league, 'm' => $matchday)),
+ 'U_MY_BETS' => $this->controller_helper->route('football_football_controller', array('side' => 'my_bets', 's' => $season, 'l' => $league, 'm' => $matchday)),
+ 'U_MY_POINTS' => $this->controller_helper->route('football_football_controller', array('side' => 'my_points', 's' => $season, 'l' => $league, 'm' => $matchday)),
+ 'U_MY_TABLE' => $this->controller_helper->route('football_football_controller', array('side' => 'my_table', 's' => $season, 'l' => $league, 'm' => $matchday)),
+ 'U_MY_RANK' => $this->controller_helper->route('football_football_controller', array('side' => 'my_rank', 's' => $season, 'l' => $league, 'm' => $matchday)),
+ 'U_MY_CHART' => $this->controller_helper->route('football_football_controller', array('side' => 'my_chart', 's' => $season, 'l' => $league, 'm' => $matchday)),
+ 'U_MY_KOEFF' => $this->controller_helper->route('football_football_controller', array('side' => 'my_koeff', 's' => $season, 'l' => $league, 'm' => $matchday)),
+ 'U_STAT_RESULTS' => $this->controller_helper->route('football_football_controller', array('side' => 'stat_results', 's' => $season, 'l' => $league, 'm' => $matchday)),
+ 'U_STAT_POINTS' => $this->controller_helper->route('football_football_controller', array('side' => 'stat_points', 's' => $season, 'l' => $league, 'm' => $matchday)),
));
}
diff --git a/images/index.htm b/images/index.htm
index e0cc5f3..ee1f723 100644
--- a/images/index.htm
+++ b/images/index.htm
@@ -1,10 +1,10 @@
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
diff --git a/includes/chart_hist.php b/includes/chart_hist.php
index f59aef5..4fc3a0e 100644
--- a/includes/chart_hist.php
+++ b/includes/chart_hist.php
@@ -1,66 +1,70 @@
-
+ ($rows - 2))
- imagestring($image, 3, 10, $i * $horz - 6, $maximum - (($i - 1) * 5), $colorBlack);
- else
- imagestring($image, 3, 3,$i * $horz - 6, $maximum - (($i - 1) * 5), $colorBlack);
-}
-imagestring($image, 1, 0, 0, $caption_lang[0] , $colorBlack);
-
-
-// Create grid
-for ($i = 1; $i <= $matchdays; $i++)
-{
- $label = $i + 1;
- imageline($image, $i * $vert, $horz, $i * $vert, $imgHeight - 50, $colorGrey);
- if ($i < 10)
- imagestring($image,3,$i * $vert - 3, $imgHeight - 40, $i, $colorBlack);
- else
- imagestring($image, 3, $i * $vert - 6, $imgHeight - 40, $i, $colorBlack);
-}
-
-imageline($image, 3, $imgHeight - $horz + 6, 15, $imgHeight - $horz + 6, $colorBlack);
-imagestring($image, 3, 20, $imgHeight - $horz, $caption_lang[1] , $colorBlack);
-
-imagesetthickness($image, 2);
-
-$count_values=count($graphvalues1);
-// Create line graph
-for ($i = 1; $i < $count_values; $i++)
-{
- imageline($image, $i * $vert, (($maximum - $graphvalues1[$i - 1]) * $horzp + $horz), ($i + 1) * $vert, (($maximum - $graphvalues1[$i]) * $horzp + $horz), $colorBlue);
-}
-
-$count_values=count($graphvalues2);
-// Create line graph
-for ($i = 1; $i < $count_values; $i++)
-{
- imageline($image, $i * $vert, (($maximum - $graphvalues2[$i - 1]) * $horzp + $horz), ($i + 1) * $vert, (($maximum - $graphvalues2[$i]) * $horzp + $horz), $colorGreen);
-}
-
-$count_values=count($graphvalues3);
-// Create line graph
-for ($i = 1; $i < $count_values; $i++)
-{
- imageline($image, $i * $vert, (($maximum - $graphvalues3[$i - 1]) * $horzp + $horz), ($i + 1) * $vert, (($maximum - $graphvalues3[$i]) * $horzp + $horz), $colorAzur);
-}
-
-$count_values=count($graphvalues4);
-// Create line graph
-for ($i = 1; $i < $count_values; $i++)
-{
- imageline($image, $i * $vert, (($maximum - $graphvalues4[$i - 1]) * $horzp + $horz), ($i + 1) * $vert, (($maximum - $graphvalues4[$i]) * $horzp + $horz), $colorRed);
-}
-
-$count_values=count($graphvaluesmin);
-// Create line graph
-for ($i = 1; $i < $count_values; $i++)
-{
- imageline($image, $i * $vert, (($maximum - $graphvaluesmin[$i - 1]) * $horzp + $horz), ($i + 1) * $vert, (($maximum - $graphvaluesmin[$i]) * $horzp + $horz), $colorBlack);
-}
-
-$count_values=count($graphvaluesmax);
-// Create line graph
-for ($i = 1; $i < $count_values; $i++)
-{
- imageline($image, $i * $vert, (($maximum - $graphvaluesmax[$i - 1]) * $horzp + $horz), ($i + 1) * $vert, (($maximum - $graphvaluesmax[$i]) * $horzp + $horz), $colorBlack);
-}
-
-// Output graph and clear image from memory
-imagepng($image);
-imagedestroy($image);
-?>
+ ($rows - 2))
+ imagestring($image, 3, 10, $i * $horz - 6, $maximum - (($i - 1) * 5), $colorBlack);
+ else
+ imagestring($image, 3, 3,$i * $horz - 6, $maximum - (($i - 1) * 5), $colorBlack);
+}
+imagestring($image, 1, 0, 0, $caption_lang[0] , $colorBlack);
+
+
+// Create grid
+for ($i = 1; $i <= $matchdays; $i++)
+{
+ $label = $i + 1;
+ imageline($image, $i * $vert, $horz, $i * $vert, $imgHeight - 50, $colorGrey);
+ if ($i < 10)
+ imagestring($image,3,$i * $vert - 3, $imgHeight - 40, $i, $colorBlack);
+ else
+ imagestring($image, 3, $i * $vert - 6, $imgHeight - 40, $i, $colorBlack);
+}
+
+imageline($image, 3, $imgHeight - $horz + 6, 15, $imgHeight - $horz + 6, $colorBlack);
+imagestring($image, 3, 20, $imgHeight - $horz, $caption_lang[1] , $colorBlack);
+
+imagesetthickness($image, 2);
+
+$count_values=count($graphvalues1);
+// Create line graph
+for ($i = 1; $i < $count_values; $i++)
+{
+ imageline($image, $i * $vert, (($maximum - $graphvalues1[$i - 1]) * $horzp + $horz), ($i + 1) * $vert, (($maximum - $graphvalues1[$i]) * $horzp + $horz), $colorBlue);
+}
+
+$count_values=count($graphvalues2);
+// Create line graph
+for ($i = 1; $i < $count_values; $i++)
+{
+ imageline($image, $i * $vert, (($maximum - $graphvalues2[$i - 1]) * $horzp + $horz), ($i + 1) * $vert, (($maximum - $graphvalues2[$i]) * $horzp + $horz), $colorGreen);
+}
+
+$count_values=count($graphvalues3);
+// Create line graph
+for ($i = 1; $i < $count_values; $i++)
+{
+ imageline($image, $i * $vert, (($maximum - $graphvalues3[$i - 1]) * $horzp + $horz), ($i + 1) * $vert, (($maximum - $graphvalues3[$i]) * $horzp + $horz), $colorAzur);
+}
+
+$count_values=count($graphvalues4);
+// Create line graph
+for ($i = 1; $i < $count_values; $i++)
+{
+ imageline($image, $i * $vert, (($maximum - $graphvalues4[$i - 1]) * $horzp + $horz), ($i + 1) * $vert, (($maximum - $graphvalues4[$i]) * $horzp + $horz), $colorRed);
+}
+
+$count_values=count($graphvaluesmin);
+// Create line graph
+for ($i = 1; $i < $count_values; $i++)
+{
+ imageline($image, $i * $vert, (($maximum - $graphvaluesmin[$i - 1]) * $horzp + $horz), ($i + 1) * $vert, (($maximum - $graphvaluesmin[$i]) * $horzp + $horz), $colorBlack);
+}
+
+$count_values=count($graphvaluesmax);
+// Create line graph
+for ($i = 1; $i < $count_values; $i++)
+{
+ imageline($image, $i * $vert, (($maximum - $graphvaluesmax[$i - 1]) * $horzp + $horz), ($i + 1) * $vert, (($maximum - $graphvaluesmax[$i]) * $horzp + $horz), $colorBlack);
+}
+
+// Output graph and clear image from memory
+imagepng($image);
+imagedestroy($image);
diff --git a/includes/chart_rank.php b/includes/chart_rank.php
index 273d617..b58b474 100644
--- a/includes/chart_rank.php
+++ b/includes/chart_rank.php
@@ -1,97 +1,101 @@
-
+
\ No newline at end of file
diff --git a/includes/export.php b/includes/export.php
index 8c76f21..3a78f9b 100644
--- a/includes/export.php
+++ b/includes/export.php
@@ -22,25 +22,8 @@ if( !$result = $db->sql_query($sql) )
}
$league_short = $db->sql_fetchfield('league_name_short');
$db->sql_freeresult($result);
-$export_file = $league_short . '_'. $season. '_Tipps.csv';
-$path_attachment = './../../files/' . $export_file;
$newline = "\r\n";
-
-if (!isset($_POST['send']))
-{
- header('Pragma: no-cache');
- header("Content-Type: text/csv; name=\"$export_file\"");
- header("Content-disposition: attachment; filename=$export_file");
-
-// header('Content-Type: text/x-csv');
-// header('Expires: ' . gmdate('D, d M Y H:i:m') . ' GMT');
-// header('Content-Disposition: attachment; filename='. $export_file);
- $phpbb_root_path = './../';
-}
-else
-{
- $phpbb_root_path = './../../';
-}
+$phpbb_root_path = './../../';
$sql_users = 'SELECT DISTINCT
b.user_id,
@@ -78,7 +61,7 @@ $sql_bets = "SELECT
FROM " . FOOTB_MATCHES . ' AS m
LEFT JOIN ' . FOOTB_BETS . " AS b ON (b.season = m.season AND b.league = m.league AND b.match_no = m.match_no)
WHERE m.season = $season AND m.league = $league
- ORDER BY matchday ASC, match_no ASC, user_id ASC";
+ ORDER BY m.matchday ASC, m.match_no ASC, b.user_id ASC";
if(!$result_users = $db->sql_query($sql_users))
{
@@ -96,16 +79,16 @@ foreach ($rows_users as $row_user)
$bet_column[$row_user['user_id']] = $lastcolumn;
$j++;
}
-$export_row_users = "\"\";\"\";\"\";\"\";\"\";\"\";";
+$csv_data_row_users = "\"\";\"\";\"\";\"\";\"\";\"\";";
for($j = 8; $j <= $lastcolumn; $j = $j + 3)
{
- $export_row_users .= "\"\";\"\";\"" . $column[$j] . "\"";
+ $csv_data_row_users .= "\"\";\"\";\"" . $column[$j] . "\"";
if($j != $lastcolumn)
{
- $export_row_users .= ';';
+ $csv_data_row_users .= ';';
}
}
-$export_row_users .= $newline;
+$csv_data_row_users .= $newline;
if( !$result_results = $db->sql_query($sql_results) )
{
@@ -138,16 +121,16 @@ foreach ($rows_bets as $row_bet)
{
if ($lastcolumn > 0)
{
- $export_bets[$last_match_num] = '';
+ $csv_data_bets[$last_match_num] = '';
for($j=8; $j<=$lastcolumn; $j++)
{
- $export_bets[$last_match_num] .= "\"" . $column[$j] . "\"";
+ $csv_data_bets[$last_match_num] .= "\"" . $column[$j] . "\"";
if($j!=$lastcolumn)
{
- $export_bets[$last_match_num] .= ';';
+ $csv_data_bets[$last_match_num] .= ';';
}
}
- $export_bets[$last_match_num] .= $newline;
+ $csv_data_bets[$last_match_num] .= $newline;
}
$column = array();
$last_match_num = $row_bet['match_no'];
@@ -157,21 +140,21 @@ foreach ($rows_bets as $row_bet)
$lastcolumn = $bet_column[$row_bet['user_id']] + 2;
}
}
-$export_bets[$last_match_num] = '';
+$csv_data_bets[$last_match_num] = '';
for($j = 8; $j <= $lastcolumn; $j++)
{
- $export_bets[$last_match_num] .= "\"" . $column[$j] . "\"";
+ $csv_data_bets[$last_match_num] .= "\"" . $column[$j] . "\"";
if($j != $lastcolumn)
{
- $export_bets[$last_match_num] .= ';';
+ $csv_data_bets[$last_match_num] .= ';';
}
}
-$export_bets[$last_match_num] .= $newline;
+$csv_data_bets[$last_match_num] .= $newline;
$last_matchday = 0;
-$export= '';
-$export .= 'CSV;'. $league. ';'. $season. $newline;
+$csv_data= '';
+$csv_data .= 'CSV;'. $league. ';'. $season. $newline;
$i = 0;
foreach ($rows_results as $row_result)
@@ -180,32 +163,32 @@ foreach ($rows_results as $row_result)
{
if ($last_matchday != 0)
{
- $export .= $newline;
- $export .= $newline;
- $export .= $newline;
- $export .= $newline;
- $export .= $newline;
- $export .= $newline;
- $export .= ";;". str_replace("\"", "\"\"", $row_result['match_time']). $newline;
- $export .= $newline;
- $export .= $newline;
- $export .= $newline;
- $export .= $newline;
- $export .= $newline;
+ $csv_data .= $newline;
+ $csv_data .= $newline;
+ $csv_data .= $newline;
+ $csv_data .= $newline;
+ $csv_data .= $newline;
+ $csv_data .= $newline;
+ $csv_data .= ";;". str_replace("\"", "\"\"", $row_result['match_time']). $newline;
+ $csv_data .= $newline;
+ $csv_data .= $newline;
+ $csv_data .= $newline;
+ $csv_data .= $newline;
+ $csv_data .= $newline;
}
else
{
- $export .= $newline;
- $export .= $newline;
- $export .= $newline;
- $export .= ";;". str_replace("\"", "\"\"", $row_result['match_time']). $newline;
- $export .= $newline;
- $export .= $newline;
- $export .= $newline;
- $export .= $newline;
- $export .= $newline;
+ $csv_data .= $newline;
+ $csv_data .= $newline;
+ $csv_data .= $newline;
+ $csv_data .= ";;". str_replace("\"", "\"\"", $row_result['match_time']). $newline;
+ $csv_data .= $newline;
+ $csv_data .= $newline;
+ $csv_data .= $newline;
+ $csv_data .= $newline;
+ $csv_data .= $newline;
}
- $export .= $export_row_users;
+ $csv_data .= $csv_data_row_users;
$column = array();
$last_matchday = $row_result['matchday'];
}
@@ -242,30 +225,31 @@ foreach ($rows_results as $row_result)
$column[2] = '';
$column[4] = '';
}
- $export .= "\"" . $column[0] . "\";\"" . $column[1] . "\";\"" . $column[2] . "\";\"\";\"" . $column[4] . "\";\"\";\"\";\"\";";
- if ($export_bets[$row_result['match_no']] == '')
+ $csv_data .= "\"" . $column[0] . "\";\"" . $column[1] . "\";\"" . $column[2] . "\";\"\";\"" . $column[4] . "\";\"\";\"\";\"\";";
+ if ($csv_data_bets[$row_result['match_no']] == '')
{
- $export .= $newline;
+ $csv_data .= $newline;
}
else
{
- $export .= $export_bets[$row_result['match_no']];
+ $csv_data .= $csv_data_bets[$row_result['match_no']];
}
$column = array();
$i++;
}
-if (isset($_POST['send']))
-{
- $fp = fopen($path_attachment , "b");
- ftruncate ($fp, 0);
- rewind($fp);
- fwrite ($fp, $export);
- fclose($fp);
-}
-else
-{
- echo utf8_decode($export);
- exit;
-}
-?>
+// Output the csv file
+$filename = $league_short . '_'. $season. '_Tipps.csv';
+$fp = fopen('php://output', 'w');
+
+header('Content-Type: application/octet-stream');
+header("Content-disposition: attachment; filename=\"" . basename($filename) . "\"");
+header('Expires: 0');
+header('Cache-Control: must-revalidate, post-check=0, pre-check=0');
+header('Cache-Control: private', false);
+header('Pragma: public');
+header('Content-Transfer-Encoding: binary');
+
+fwrite($fp, "\xEF\xBB\xBF"); // UTF-8 BOM
+fwrite($fp, $csv_data);
+fclose($fp);
diff --git a/includes/functions.php b/includes/functions.php
index ef8be25..a915eb9 100644
--- a/includes/functions.php
+++ b/includes/functions.php
@@ -170,8 +170,8 @@ function save_ranking_matchday($season, $league, $matchday, $cash = false)
INNER JOIN ' . FOOTB_BETS . ' AS b ON (b.season = m.season AND b.league = m.league AND b.match_no = m.match_no)
INNER JOIN ' . USERS_TABLE . " AS u ON (b.user_id = u.user_id)
WHERE m.season = $season AND m.league = $league AND m.matchday = $matchday AND m.status IN (2,3)
- GROUP BY b.user_id
- ORDER BY points DESC, nobet ASC, username ASC
+ GROUP BY u.user_id
+ ORDER BY points DESC, nobet ASC, u.username ASC
";
$result = $db->sql_query($sql);
@@ -287,21 +287,21 @@ function save_ranking_matchday($season, $league, $matchday, $cash = false)
{
$curr_rank_points = $curr_rank['points'];
$curr_rank_user = $curr_rank['user_id'] + 2000;
- $sql = 'UPDATE ' . FOOTB_MATCHES . "
+ $sql = 'UPDATE ' . FOOTB_MATCHES . "
SET goals_home = $curr_rank_points,
- status = $matchday_status
+ status = $matchday_status
WHERE season = $season AND league = $league2 AND matchday = $matchday AND team_id_home = $curr_rank_user";
$db->sql_query($sql);
- $sql = 'UPDATE ' . FOOTB_MATCHES . "
+ $sql = 'UPDATE ' . FOOTB_MATCHES . "
SET goals_guest = $curr_rank_points,
- status = $matchday_status
+ status = $matchday_status
WHERE season = $season AND league = $league2 AND matchday = $matchday AND team_id_guest = $curr_rank_user";
$db->sql_query($sql);
- $sql = 'UPDATE ' . FOOTB_MATCHDAYS . "
- SET status = $matchday_status
+ $sql = 'UPDATE ' . FOOTB_MATCHDAYS . "
+ SET status = $matchday_status
WHERE season = $season AND league = $league2 AND matchday = $matchday";
$db->sql_query($sql);
- }
+ }
}
if ( sizeof($ranking_ary) == 0 )
{
@@ -312,13 +312,13 @@ function save_ranking_matchday($season, $league, $matchday, $cash = false)
$db->sql_query($sql);
if ($league < 51)
{
- $sql = 'UPDATE ' . FOOTB_MATCHES . "
+ $sql = 'UPDATE ' . FOOTB_MATCHES . "
SET goals_home = '',
goals_guest = '',
- status = $matchday_status
+ status = $matchday_status
WHERE season = $season AND league = $league2 AND matchday = $matchday;";
$db->sql_query($sql);
- }
+ }
}
else
{
@@ -615,13 +615,13 @@ function set_footb_points($points_type, $season, $league, $matchday, $wins, $cas
function _sort_points($value_a, $value_b)
{
- if ($value_a['points'] > $value_b['points'])
+ if ($value_a['points'] > $value_b['points'])
{
- return -1;
- }
+ return -1;
+ }
else
{
- if ($value_a['points'] == $value_b['points'])
+ if ($value_a['points'] == $value_b['points'])
{
if (isset($value_a['nobet']))
{
@@ -645,12 +645,12 @@ function _sort_points($value_a, $value_b)
{
return 0;
}
- }
+ }
else
{
- return 1;
- }
- }
+ return 1;
+ }
+ }
}
@@ -893,7 +893,8 @@ function next_delivery($season, $league)
WHEN 6 THEN '" . $lang_dates['Sat'] . "'
ELSE 'Error' END,
DATE_FORMAT(delivery_date,' %d.%m.%Y %H:%i')
- ) AS deliverytime
+ ) AS deliverytime,
+ matchday
FROM " . FOOTB_MATCHDAYS . "
WHERE season = $season AND league = $league AND status = 0
ORDER BY matchday ASC
@@ -1054,7 +1055,7 @@ function first_league($season, $complete = true)
{
$join_matchday = 'INNER JOIN ' . FOOTB_MATCHDAYS . ' AS m ON (m.season = l.season AND m.league = l.league) ';
}
- $sql = 'SELECT *
+ $sql = 'SELECT l.*
FROM ' . FOOTB_LEAGUES . ' AS l ' .
$join_matchday . "
WHERE l.season = $season
@@ -1085,13 +1086,13 @@ function current_league($season)
$curr_user = $user->data['user_id'];
$user_spec = 'AND b.user_id = ' . $curr_user;
}
- $sql = 'SELECT DISTINCT m.league
+ $sql = 'SELECT DISTINCT m.league, m.match_datetime
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.league < 51
AND m.status in (0,1,2)
- ORDER BY m.match_datetime ASC
+ ORDER BY m.match_datetime ASC, m.league ASC
LIMIT 1";
$result = $db->sql_query($sql);
@@ -1723,7 +1724,7 @@ function get_order_team_compare($team_ary, $season, $league, $group, $ranks, $ma
IF(goals_home + 0 > goals_guest, 3, IF(goals_home = goals_guest, 1, 0)),
IF(goals_home + 0 < goals_guest, 3, IF(goals_home = goals_guest, 1, 0))
)
- ) + IFNULL((SELECT SUM(b.bonuspoints) FROM " . FOOTB_BONUS_DAY . " AS b WHERE b.team_id = t.team_id AND b.season = t.season AND b.league = t.league AND b.matchday <= $matchday),0)
+ ) + IFNULL((SELECT SUM(b.bonuspoints) FROM " . FOOTB_BONUS_DAY . " AS b WHERE b.team_id = t.team_id AND b.season = t.season AND b.league = t.league AND b.matchday <= $matchday),0)
+ IFNULL((SELECT SUM(c.points) FROM " . FOOTB_CORR . " AS c WHERE c.team_id = t.team_id AND c.season = t.season AND c.league = t.league AND c.matchday <= $matchday),0)
- IF(t.team_id = 20 AND t.season = 2011 AND $matchday > 7, 2, 0) AS points,
SUM(IF(m.team_id_home = t.team_id, goals_home - goals_guest, goals_guest - goals_home)) AS goals_diff,
@@ -1886,7 +1887,7 @@ function get_team($season, $league, $matchnumber, $field, $formula)
$third_group[$team]= $row['group_id'];
}
}
- }
+ }
}
// Sort 3. Place on points, diff, goals
array_multisort($points3, SORT_DESC, $diff3, SORT_DESC, $goals3, SORT_DESC, $third_team, $third_group);
@@ -2156,7 +2157,8 @@ function get_team($season, $league, $matchnumber, $field, $formula)
m.goals_overtime_home,
m.goals_overtime_guest,
m.goals_home,
- m.goals_guest
+ m.goals_guest,
+ m.match_no
FROM ' . FOOTB_MATCHES . ' AS m
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)
@@ -2376,7 +2378,7 @@ function ko_group_next_round($season, $league, $matchday_from, $matchday_to, $ma
LEFT JOIN ' . FOOTB_MATCHES . " AS m ON (m.season = t.season AND m.league = t.league AND (m.team_id_home = t.team_id OR m.team_id_guest = t.team_id) AND m.group_id = t.group_id)
WHERE t.season = $season AND t.league = $league AND m.matchday >= $matchday_from AND m.matchday <= $matchday_to AND m.status IN (3,6)
GROUP BY t.team_id
- ORDER BY group_id ASC,points DESC, goal_diff DESC, goals DESC
+ ORDER BY t.group_id ASC, points DESC, goal_diff DESC, goals DESC
";
$result = $db->sql_query($sql);
@@ -2649,7 +2651,7 @@ function bonuspoints($season, $league, $matchday)
{
$z3 = "0";
}
-
+
If ($z1 > 2)
{
$b1 = 6 / $z1;
@@ -2820,4 +2822,3 @@ function chart($season, $league, $matchday)
$i++;
}
}
-?>
\ No newline at end of file
diff --git a/includes/version_check.php b/includes/version_check.php
index 0852ace..fe3a3d7 100644
--- a/includes/version_check.php
+++ b/includes/version_check.php
@@ -1,115 +1,115 @@
-version_data = $version_data;
- $this->config = $config;
- $this->version_helper = $version_helper;
- $this->template = $template;
- $this->user = $user;
- $this->current_version = $this->config[str_replace(' ', '', $this->version_data['version'])];
- }
-
- /**
- * Check Extension version and assign template variables for version info if not
- * returning current version
- *
- * @param bool $return_version Yes if current version should be returned
- * @return string Current version if $return_version is set to true
- */
- public function check($return_version = false)
- {
- $allow_url_fopen = (int) @ini_get('allow_url_fopen');
- if ($allow_url_fopen)
- {
-
- // Set file location
- $this->version_helper->set_file_location($this->version_data['file'][0], $this->version_data['file'][1], $this->version_data['file'][2]);
- // Set current version
- $this->version_helper->set_current_version($this->current_version);
-
- $this->version_helper->force_stability(($this->config['extension_force_unstable'] || !$this->version_helper->is_stable($this->current_version)) ? 'unstable' : null);
-
- $updates = $this->version_helper->get_suggested_updates(true);
-
- // Return version if $return_version is set to true
- if ($return_version)
- {
- return $this->current_version;
- }
-
- $version_up_to_date = empty($updates);
-
- $template_data = array(
- 'AUTHOR' => $this->version_data['author'],
- 'CURRENT_VERSION' => $this->current_version,
- 'UP_TO_DATE' => sprintf((!$version_up_to_date) ? $this->user->lang['NOT_UP_TO_DATE'] : $this->user->lang['UP_TO_DATE'], $this->version_data['title']),
- 'S_UP_TO_DATE' => $version_up_to_date,
- 'U_AUTHOR' => 'http://www.phpbb.com/community/memberlist.php?mode=viewprofile&un=' . $this->version_data['author'],
- 'TITLE' => (string) $this->version_data['title'],
- 'LATEST_VERSION' => $this->current_version,
- );
-
- if (!$version_up_to_date)
- {
- $updates = array_shift($updates);
- $template_data = array_merge($template_data, array(
- 'ANNOUNCEMENT' => (string) $updates['announcement'],
- 'DOWNLOAD' => (string) $updates['download'],
- 'LATEST_VERSION' => $updates['current'],
- ));
- }
- $this->template->assign_block_vars('mods', $template_data);
- }
- }
-}
+version_data = $version_data;
+ $this->config = $config;
+ $this->version_helper = $version_helper;
+ $this->template = $template;
+ $this->user = $user;
+ $this->current_version = $this->config[str_replace(' ', '', $this->version_data['version'])];
+ }
+
+ /**
+ * Check Extension version and assign template variables for version info if not
+ * returning current version
+ *
+ * @param bool $return_version Yes if current version should be returned
+ * @return string Current version if $return_version is set to true
+ */
+ public function check($return_version = false)
+ {
+ $allow_url_fopen = (int) @ini_get('allow_url_fopen');
+ if ($allow_url_fopen)
+ {
+
+ // Set file location
+ $this->version_helper->set_file_location($this->version_data['file'][0], $this->version_data['file'][1], $this->version_data['file'][2]);
+ // Set current version
+ $this->version_helper->set_current_version($this->current_version);
+
+ $this->version_helper->force_stability(($this->config['extension_force_unstable'] || !$this->version_helper->is_stable($this->current_version)) ? 'unstable' : null);
+
+ $updates = $this->version_helper->get_suggested_updates(true);
+
+ // Return version if $return_version is set to true
+ if ($return_version)
+ {
+ return $this->current_version;
+ }
+
+ $version_up_to_date = empty($updates);
+
+ $template_data = array(
+ 'AUTHOR' => $this->version_data['author'],
+ 'CURRENT_VERSION' => $this->current_version,
+ 'UP_TO_DATE' => sprintf((!$version_up_to_date) ? $this->user->lang['NOT_UP_TO_DATE'] : $this->user->lang['UP_TO_DATE'], $this->version_data['title']),
+ 'S_UP_TO_DATE' => $version_up_to_date,
+ 'U_AUTHOR' => 'http://www.phpbb.com/community/memberlist.php?mode=viewprofile&un=' . $this->version_data['author'],
+ 'TITLE' => (string) $this->version_data['title'],
+ 'LATEST_VERSION' => $this->current_version,
+ );
+
+ if (!$version_up_to_date)
+ {
+ $updates = array_shift($updates);
+ $template_data = array_merge($template_data, array(
+ 'ANNOUNCEMENT' => (string) $updates['announcement'],
+ 'DOWNLOAD' => (string) $updates['download'],
+ 'LATEST_VERSION' => $updates['current'],
+ ));
+ }
+ $this->template->assign_block_vars('mods', $template_data);
+ }
+ }
+}
diff --git a/language/de/email/footb_board_remember.txt b/language/de/email/footb_board_remember.txt
index b68d9c1..d615362 100644
--- a/language/de/email/footb_board_remember.txt
+++ b/language/de/email/footb_board_remember.txt
@@ -1,10 +1,10 @@
-
-Hallo {SITENAME},
-Folgende Tipper haben eine Erinnerungs-Mail erhalten:
-
-{REMEMBER_LIST}
-
-
-Hier geht es zur {SITENAME}: {U_BOARD}.
-
-{EMAIL_SIG}
+
+Hallo {SITENAME},
+Folgende Tipper haben eine Erinnerungs-Mail erhalten:
+
+{REMEMBER_LIST}
+
+
+Hier geht es zur {SITENAME}: {U_BOARD}.
+
+{EMAIL_SIG}
diff --git a/language/de/email/footb_send_remember.txt b/language/de/email/footb_send_remember.txt
index 5b6675c..da85640 100644
--- a/language/de/email/footb_send_remember.txt
+++ b/language/de/email/footb_send_remember.txt
@@ -1,10 +1,10 @@
-
-Hallo Tipper {USERNAME},
-Du hast bislang noch nicht den {MATCHDAY}. Spieltag getippt.
-Bitte tipp bis zum {LEAGUE} Abgabetermin {DELIVERY} Uhr.
-
-
-Hier geht es zur {SITENAME}: {U_BOARD}.
-
-
-{EMAIL_SIG}
+
+Hallo Tipper {USERNAME},
+Du hast bislang noch nicht den {MATCHDAY}. Spieltag getippt.
+Bitte tipp bis zum {LEAGUE} Abgabetermin {DELIVERY} Uhr.
+
+
+Hier geht es zur {SITENAME}: {U_BOARD}.
+
+
+{EMAIL_SIG}
diff --git a/language/de/football.php b/language/de/football.php
index 4a4a7c3..535974a 100644
--- a/language/de/football.php
+++ b/language/de/football.php
@@ -13,12 +13,12 @@
*/
if (!defined('IN_PHPBB'))
{
- exit;
+ exit;
}
if (empty($lang) || !is_array($lang))
{
- $lang = array();
+ $lang = array();
}
// DEVELOPERS PLEASE NOTE
diff --git a/language/de/help_football.php b/language/de/help_football.php
index e7418e3..e7245bd 100644
--- a/language/de/help_football.php
+++ b/language/de/help_football.php
@@ -528,4 +528,3 @@ Datenquelle erfolgen. Benötigt man innerhalb dieser Zeit trotzdem aktualisierte
Datenquelle zu erzwingen.'
),
)));
-?>
\ No newline at end of file
diff --git a/language/de/info_acp_all_bets.php b/language/de/info_acp_all_bets.php
index f324c8e..32e9a6e 100644
--- a/language/de/info_acp_all_bets.php
+++ b/language/de/info_acp_all_bets.php
@@ -1,47 +1,47 @@
- 'Alle Tipps',
- 'ACP_FOOTBALL_ALL_BETS_MANAGEMENT' => 'Tipprunde-Alle Tipps ansehen',
- 'ACP_FOOTBALL_ALL_BETS_VIEW' => 'Alle Tipps ansehen',
- 'ACP_FOOTBALL_ALL_BETS_VIEW_EXPLAIN' => 'Hier kannst du alle Tipps der Tipper einsehen.',
-
- 'SELECT_MATCHDAY' => 'Spieltag wählen',
-));
-
+ 'Alle Tipps',
+ 'ACP_FOOTBALL_ALL_BETS_MANAGEMENT' => 'Tipprunde-Alle Tipps ansehen',
+ 'ACP_FOOTBALL_ALL_BETS_VIEW' => 'Alle Tipps ansehen',
+ 'ACP_FOOTBALL_ALL_BETS_VIEW_EXPLAIN' => 'Hier kannst du alle Tipps der Tipper einsehen.',
+
+ 'SELECT_MATCHDAY' => 'Spieltag wählen',
+));
+
?>
\ No newline at end of file
diff --git a/language/de/info_acp_bank.php b/language/de/info_acp_bank.php
index e3af3e6..478548b 100644
--- a/language/de/info_acp_bank.php
+++ b/language/de/info_acp_bank.php
@@ -1,114 +1,114 @@
- 'Konten',
- 'ACP_FOOTBALL_BANK_MANAGE' => 'Konten verwalten',
- 'ACP_FOOTBALL_BANK_MANAGE_EXPLAIN' => 'Hier kannst du alle Tipprunden Konten verwalten. Du kannst Einsätze einziehen, Ein- und Auszahlungen verwalten und kontrollieren.',
- 'ACP_FOOTBALL_BANK_MANAGEMENT' => 'Tipprunde-Konten-Verwaltung',
-
- 'BET_DEPOSIT' => 'Einsatz einzahlen',
- 'BET_DEPOSIT_EXPLAIN' => 'Hier kannst du Einzahlungen der Teilnehmer verbuchen. Bei Verrechnung in Ultimate Points, wird der UP Saldo entsprechend erhöht bzw. ausgeglichen. Ohne Verrechnung werden nur die jeweiligen Protokollsätze zum gewählten Spieltag erfasst.',
- 'BOOK' => 'buchen',
- 'BOOKED' => 'Gebucht',
-
- 'CARRYOVER_NEW_SEASON' => 'Übertrag in die nächste Saison',
- 'CARRYOVER_OLD_SEASON' => 'Übertrag aus der letzten Saison',
- 'CONFIRM_BET' => 'Bist du sicher, dass du bei den gewählten Tippern die Einsätze abbuchen möchtest?',
- 'CONFIRM_CANCEL_BET' => 'Bist du sicher, dass du bei den gewählten Tippern die Einsätze stornieren möchtest?',
- 'CONFIRM_CANCEL_DEPOSIT' => 'Bist du sicher, dass du bei den gewählten Tippern die Einzahlungen stornieren möchtest?',
- 'CONFIRM_CANCEL_PAY' => 'Bist du sicher, dass du bei den gewählten Tippern die Auszahlungen stornieren möchtest?',
- 'CONFIRM_CARRYOVER_PAY' => 'Bist du sicher, dass du bei den gewählten Tippern ein Teil der Gewinne in die neue Saison einzahlen möchtest?',
- 'CONFIRM_DEPOSIT' => 'Bist du sicher, dass du bei den gewählten Tippern die Einzahlungen buchen möchtest?',
- 'CONFIRM_LEAGUE_BET' => 'Bist du sicher, dass du bei den gewählten Ligen die Einsätze abbuchen möchtest?',
- 'CONFIRM_LEAGUE_DELETE_WIN' => 'Bist du sicher, dass du bei den gewählten Ligen alle Gewinne löschen möchtest?',
- 'CONFIRM_LEAGUE_DEPOSIT' => 'Bist du sicher, dass du bei den gewählten Ligen die Einzahlungen buchen möchtest?',
- 'CONFIRM_LEAGUE_PAY' => 'Bist du sicher, dass du bei den gewählten Ligen die Auszahlungen buchen möchtest?',
- 'CONFIRM_PAY' => 'Bist du sicher, dass du bei den gewählten Tippern die Auszahlungen buchen möchtest?',
-
- 'DEBIT_BET' => 'Einsatz abbuchen',
- 'DEBIT_BET_EXPLAIN' => 'Hier kannst du Einsätze der Teilnehmer einfordern oder stornieren. Bei Verrechnung in Ultimate Points, wird der UP Saldo entsprechend belastet.',
- 'DEPOSITED' => 'Eingezahlt',
-
- 'FOOTBALL_BANK_OFF' => 'Die Tipprunden Konten-Verwaltung wurde in den Tipprunden-Funktionalitäten deaktiviert.',
-
- 'LEAGUE_BANK' => 'Konten',
- 'LEAGUE_BANK_EXPLAIN' => 'Dies sind die aktuellen Kontenbuchungen der jeweiligen Ligen. Am Ende der Saison sollten zumindest Einsatz/Gewinn und Ein-/Auszahlungen paarweise identisch sein. Aktionen auf dieser Seite werden für alle Teilnehmer ausgeführt. Einsätze und Einzahlungen werden für den 1. Spieltag, Auszahlung für den aktuellen Spieltag gebucht. Buchungen für einzelne Teilnehmer kannst du vernehmen, indem du auf den entsprechenden Betrag klickst. Mit Klick auf den Liganamen kannst du eine Übersicht als CSV-Datei downloaden.',
- 'LEAGUE_BET' => '%s Einsatz wurde abgebucht.',
- 'LEAGUE_BETS' => '%s Einsätze wurden abgebucht.',
- 'LEAGUE_CANCEL_BET' => '%s Einsatzbuchung wurde storniert.',
- 'LEAGUE_CANCEL_BETS' => '%s Einsatzbuchungen wurden storniert.',
- 'LEAGUE_CANCEL_DEPOSIT' => '%s Einsatzzahlung wurde storniert.',
- 'LEAGUE_CANCEL_DEPOSITS' => '%s Einsatzzahlungen wurden storniert.',
- 'LEAGUE_CANCEL_PAY' => '%s Gewinnauszahlung wurde storniert.',
- 'LEAGUE_CANCEL_PAYS' => '%s Gewinnauszahlungen wurden storniert.',
- 'LEAGUE_CARRYOVER_PAY' => '%s Gewinnanteil wurde als Einzahlung in die neue Saison übertragen.',
- 'LEAGUE_CARRYOVER_PAYS' => '%s Gewinnanteile wurden als Einzahlung in die neue Saison übertragen.',
- 'LEAGUE_DELETE_WIN' => '%s Gewinn wurde gelöscht.',
- 'LEAGUE_DELETE_WINS' => '%s Gewinne wurden gelöscht.',
- 'LEAGUE_DEPOSIT' => '%s Einsatz wurde eingezahlt.',
- 'LEAGUE_DEPOSITS' => '%s Einsätze wurden eingezahlt.',
- 'LEAGUE_NAME' => 'Liganame',
- 'LEAGUE_PAY' => '%s Gewinn wurde ausgezahlt.',
- 'LEAGUE_PAYS' => '%s Gewinne wurden ausgezahlt.',
-
- 'MEMBER_BET' => 'Einsätze buchen',
- 'MEMBER_CANCEL_BET' => 'Einsätze stornieren',
- 'MEMBER_CANCEL_DEPOSITED' => 'Einzahlungen stornieren',
- 'MEMBER_CANCEL_PAID' => 'Auszahlungen stornieren',
- 'MEMBER_CARRYOVER_PAID' => 'Einzahlung in nächste Saison',
- 'MEMBER_DELETE_WINS' => 'Gewinne löschen',
- 'MEMBER_DEPOSITED' => 'Einzahlungen buchen',
- 'MEMBER_PAID' => 'Auszahlungen buchen',
-
- 'NO_LEAGUE' => 'Keine Liga angegeben.',
- 'NO_LEAGUES_SELECTED' => 'Es wurde keine Liga gewählt.',
- 'NO_MEMBERS_SELECTED' => 'Es wurde kein Mitglied ausgewählt, bzw. das gewählte Mitglied ist nicht bekannt.',
- 'NO_SEASON' => 'Es existiert keine Saison. Bitte zuerst eine Saison erstellen.',
- 'NO_VALID_CALL' => 'Unzulässiger Aufruf! Die Aktion wird abgebrochen.',
-
- 'PAID' => 'Ausgezahlt',
- 'PAY_WINS' => 'Gewinne auszahlen',
- 'PAY_WINS_EXPLAIN' => 'Hier kannst du Gewinne oder Teilgewinne auszahlen oder als Einsatz in die nächste Saison übertragen. Bei Verrechnung in Ultimate Points, wird der UP Saldo entsprechend belastet.',
-
- 'SELECT_SEASON' => 'Saison auswählen',
- 'SET_DEPOSITS' => 'Einzahlungen berechnen',
-
- 'WINS' => 'Gewinne',
-));
-
+ 'Konten',
+ 'ACP_FOOTBALL_BANK_MANAGE' => 'Konten verwalten',
+ 'ACP_FOOTBALL_BANK_MANAGE_EXPLAIN' => 'Hier kannst du alle Tipprunden Konten verwalten. Du kannst Einsätze einziehen, Ein- und Auszahlungen verwalten und kontrollieren.',
+ 'ACP_FOOTBALL_BANK_MANAGEMENT' => 'Tipprunde-Konten-Verwaltung',
+
+ 'BET_DEPOSIT' => 'Einsatz einzahlen',
+ 'BET_DEPOSIT_EXPLAIN' => 'Hier kannst du Einzahlungen der Teilnehmer verbuchen. Bei Verrechnung in Ultimate Points, wird der UP Saldo entsprechend erhöht bzw. ausgeglichen. Ohne Verrechnung werden nur die jeweiligen Protokollsätze zum gewählten Spieltag erfasst.',
+ 'BOOK' => 'buchen',
+ 'BOOKED' => 'Gebucht',
+
+ 'CARRYOVER_NEW_SEASON' => 'Übertrag in die nächste Saison',
+ 'CARRYOVER_OLD_SEASON' => 'Übertrag aus der letzten Saison',
+ 'CONFIRM_BET' => 'Bist du sicher, dass du bei den gewählten Tippern die Einsätze abbuchen möchtest?',
+ 'CONFIRM_CANCEL_BET' => 'Bist du sicher, dass du bei den gewählten Tippern die Einsätze stornieren möchtest?',
+ 'CONFIRM_CANCEL_DEPOSIT' => 'Bist du sicher, dass du bei den gewählten Tippern die Einzahlungen stornieren möchtest?',
+ 'CONFIRM_CANCEL_PAY' => 'Bist du sicher, dass du bei den gewählten Tippern die Auszahlungen stornieren möchtest?',
+ 'CONFIRM_CARRYOVER_PAY' => 'Bist du sicher, dass du bei den gewählten Tippern ein Teil der Gewinne in die neue Saison einzahlen möchtest?',
+ 'CONFIRM_DEPOSIT' => 'Bist du sicher, dass du bei den gewählten Tippern die Einzahlungen buchen möchtest?',
+ 'CONFIRM_LEAGUE_BET' => 'Bist du sicher, dass du bei den gewählten Ligen die Einsätze abbuchen möchtest?',
+ 'CONFIRM_LEAGUE_DELETE_WIN' => 'Bist du sicher, dass du bei den gewählten Ligen alle Gewinne löschen möchtest?',
+ 'CONFIRM_LEAGUE_DEPOSIT' => 'Bist du sicher, dass du bei den gewählten Ligen die Einzahlungen buchen möchtest?',
+ 'CONFIRM_LEAGUE_PAY' => 'Bist du sicher, dass du bei den gewählten Ligen die Auszahlungen buchen möchtest?',
+ 'CONFIRM_PAY' => 'Bist du sicher, dass du bei den gewählten Tippern die Auszahlungen buchen möchtest?',
+
+ 'DEBIT_BET' => 'Einsatz abbuchen',
+ 'DEBIT_BET_EXPLAIN' => 'Hier kannst du Einsätze der Teilnehmer einfordern oder stornieren. Bei Verrechnung in Ultimate Points, wird der UP Saldo entsprechend belastet.',
+ 'DEPOSITED' => 'Eingezahlt',
+
+ 'FOOTBALL_BANK_OFF' => 'Die Tipprunden Konten-Verwaltung wurde in den Tipprunden-Funktionalitäten deaktiviert.',
+
+ 'LEAGUE_BANK' => 'Konten',
+ 'LEAGUE_BANK_EXPLAIN' => 'Dies sind die aktuellen Kontenbuchungen der jeweiligen Ligen. Am Ende der Saison sollten zumindest Einsatz/Gewinn und Ein-/Auszahlungen paarweise identisch sein. Aktionen auf dieser Seite werden für alle Teilnehmer ausgeführt. Einsätze und Einzahlungen werden für den 1. Spieltag, Auszahlung für den aktuellen Spieltag gebucht. Buchungen für einzelne Teilnehmer kannst du vernehmen, indem du auf den entsprechenden Betrag klickst. Mit Klick auf den Liganamen kannst du eine Übersicht als CSV-Datei downloaden.',
+ 'LEAGUE_BET' => '%s Einsatz wurde abgebucht.',
+ 'LEAGUE_BETS' => '%s Einsätze wurden abgebucht.',
+ 'LEAGUE_CANCEL_BET' => '%s Einsatzbuchung wurde storniert.',
+ 'LEAGUE_CANCEL_BETS' => '%s Einsatzbuchungen wurden storniert.',
+ 'LEAGUE_CANCEL_DEPOSIT' => '%s Einsatzzahlung wurde storniert.',
+ 'LEAGUE_CANCEL_DEPOSITS' => '%s Einsatzzahlungen wurden storniert.',
+ 'LEAGUE_CANCEL_PAY' => '%s Gewinnauszahlung wurde storniert.',
+ 'LEAGUE_CANCEL_PAYS' => '%s Gewinnauszahlungen wurden storniert.',
+ 'LEAGUE_CARRYOVER_PAY' => '%s Gewinnanteil wurde als Einzahlung in die neue Saison übertragen.',
+ 'LEAGUE_CARRYOVER_PAYS' => '%s Gewinnanteile wurden als Einzahlung in die neue Saison übertragen.',
+ 'LEAGUE_DELETE_WIN' => '%s Gewinn wurde gelöscht.',
+ 'LEAGUE_DELETE_WINS' => '%s Gewinne wurden gelöscht.',
+ 'LEAGUE_DEPOSIT' => '%s Einsatz wurde eingezahlt.',
+ 'LEAGUE_DEPOSITS' => '%s Einsätze wurden eingezahlt.',
+ 'LEAGUE_NAME' => 'Liganame',
+ 'LEAGUE_PAY' => '%s Gewinn wurde ausgezahlt.',
+ 'LEAGUE_PAYS' => '%s Gewinne wurden ausgezahlt.',
+
+ 'MEMBER_BET' => 'Einsätze buchen',
+ 'MEMBER_CANCEL_BET' => 'Einsätze stornieren',
+ 'MEMBER_CANCEL_DEPOSITED' => 'Einzahlungen stornieren',
+ 'MEMBER_CANCEL_PAID' => 'Auszahlungen stornieren',
+ 'MEMBER_CARRYOVER_PAID' => 'Einzahlung in nächste Saison',
+ 'MEMBER_DELETE_WINS' => 'Gewinne löschen',
+ 'MEMBER_DEPOSITED' => 'Einzahlungen buchen',
+ 'MEMBER_PAID' => 'Auszahlungen buchen',
+
+ 'NO_LEAGUE' => 'Keine Liga angegeben.',
+ 'NO_LEAGUES_SELECTED' => 'Es wurde keine Liga gewählt.',
+ 'NO_MEMBERS_SELECTED' => 'Es wurde kein Mitglied ausgewählt, bzw. das gewählte Mitglied ist nicht bekannt.',
+ 'NO_SEASON' => 'Es existiert keine Saison. Bitte zuerst eine Saison erstellen.',
+ 'NO_VALID_CALL' => 'Unzulässiger Aufruf! Die Aktion wird abgebrochen.',
+
+ 'PAID' => 'Ausgezahlt',
+ 'PAY_WINS' => 'Gewinne auszahlen',
+ 'PAY_WINS_EXPLAIN' => 'Hier kannst du Gewinne oder Teilgewinne auszahlen oder als Einsatz in die nächste Saison übertragen. Bei Verrechnung in Ultimate Points, wird der UP Saldo entsprechend belastet.',
+
+ 'SELECT_SEASON' => 'Saison auswählen',
+ 'SET_DEPOSITS' => 'Einzahlungen berechnen',
+
+ 'WINS' => 'Gewinne',
+));
+
?>
\ No newline at end of file
diff --git a/language/de/info_acp_bets.php b/language/de/info_acp_bets.php
index f28e037..3e2338a 100644
--- a/language/de/info_acp_bets.php
+++ b/language/de/info_acp_bets.php
@@ -1,47 +1,47 @@
- 'Tipps',
- 'ACP_FOOTBALL_BETS_MANAGE' => 'Tipps editieren',
- 'ACP_FOOTBALL_BETS_MANAGE_EXPLAIN' => 'Hier kannst du alle Tipps der Tipper editieren.',
- 'ACP_FOOTBALL_BETS_MANAGEMENT' => 'Tipprunde-Tipps editieren',
-
- 'SELECT_MATCHDAY' => 'Spieltag wählen',
-));
-
+ 'Tipps',
+ 'ACP_FOOTBALL_BETS_MANAGE' => 'Tipps editieren',
+ 'ACP_FOOTBALL_BETS_MANAGE_EXPLAIN' => 'Hier kannst du alle Tipps der Tipper editieren.',
+ 'ACP_FOOTBALL_BETS_MANAGEMENT' => 'Tipprunde-Tipps editieren',
+
+ 'SELECT_MATCHDAY' => 'Spieltag wählen',
+));
+
?>
\ No newline at end of file
diff --git a/language/de/info_acp_extra.php b/language/de/info_acp_extra.php
index 0e9e1c1..7b38eb1 100644
--- a/language/de/info_acp_extra.php
+++ b/language/de/info_acp_extra.php
@@ -1,93 +1,93 @@
- 'Sondertipps',
- 'ACP_FOOTBALL_EXTRA_MANAGE' => 'Sondertipps verwalten',
- 'ACP_FOOTBALL_EXTRA_MANAGE_EXPLAIN' => 'Hier kannst du Sondertipps zu Spieltagen einer Liga zuordnen. Du kannst bestehende löschen oder ändern oder einen neuen Sondertipp erstellen, sowie Typ, Wertung, Punkte und den Endzeitpunkt der Sondertipps einstellen.',
- 'ACP_FOOTBALL_EXTRA_MANAGEMENT' => 'Tipprunde-Sondertipp-Verwaltung',
-
- 'EVAL_BEFORE_DELIVERY' => 'Der Auswertungs-Spieltag darf nicht vor dem Abgabe-Spieltag liegen.',
- 'EXTRA_ADD' => 'Sondertipp hinzufügen',
- 'EXTRA_ADDED' => 'Sondertipp erfolgreich hinzugefügt.',
- 'EXTRA_CONFIRM_DELETE' => 'Bist du sicher, dass du den Sondertipp "%1$s" in der %2$s. Liga aus der Saison %3$s mit allen Tipps löschen willst?',
- 'EXTRA_CREATE_FAILED' => 'Sondertipp konnte nicht erstellt werden.',
- 'EXTRA_DEF' => 'Bestehende Sondertipps',
- 'EXTRA_DEF_EXPLAIN' => 'Dies sind Sondertipps, die von dir oder einem anderen Administrator erstellt wurden. Du kannst Sondertippeinstellungen ändern oder Sondertipps löschen.',
- 'EXTRA_DELETED' => 'Sondertipp gelöscht',
- 'EXTRA_DETAILS' => 'Sondertippdaten',
- 'EXTRA_MATCHDAY' => 'Abgabe',
- 'EXTRA_MATCHDAY_EVAL' => 'Auswertung',
- 'EXTRA_MATCHDAY_EVAL_EXPLAIN' => 'Das Ergebnis des Sondertipps wird an diesem Spieltag eingegeben. Bei unterschiedlichen Spieltagen für Abgabe und Ergebnis werden die Punkte der Gesamtwertung zugerechnet, sonst fließen sie in die Spieltagswertung mit ein.',
- 'EXTRA_MATCHDAY_EXPLAIN' => 'Die Tippabgabe des Sondertipps wird mit dem ersten Abgabetermin dieses Spieltags gesperrt.',
- 'EXTRA_NO' => 'Nummer',
- 'EXTRA_NO_DELETE' => 'Du darfst keine Sondertipps löschen. Dies dürfen nur Gründungsmitglieder',
- 'EXTRA_POINTS' => 'Mögl. Punkte',
- 'EXTRA_POINTS_EXPLAIN' => 'Maximal zu erreichende Punkte in Abhängigkeit zum Punktemodus.',
- 'EXTRA_QUESTION' => 'Sondertipp Frage',
- 'EXTRA_QUESTION_EXPLAIN' => 'Freier Fragetext. Bitte eine präzise, unmissverständliche Frage zum hinterlegten Fragetyp formulieren.',
- 'EXTRA_QUESTION_TYPE' => 'Frage- bzw. Wertungs-Typ.',
- 'EXTRA_QUESTION_TYPE_EXPLAIN' => '1 = Auswahl eines Teams, Punkte nur bei Übereinstimmung 2 = Auswahl eines Teams mehrere Ergebnisse, Punkte bei einem Treffer 3 = Texteingabe, Punkte bei Übereinstimmung 4 = Texteingabe aber mehrere Ergebnisse, Punkte bei einem Treffer 5 = Zahl, Punkte abzgl. der Differenz zwischen Tipp und Ergebnis',
- 'EXTRA_STATUS' => 'Status',
- 'EXTRA_STATUS_EXPLAIN' => '0 = offen (Tippabgabe möglich) 1 = keine Tippabgabe mehr möglich und noch keine Ergebnisse 2 = vorläufige Ergebnisse liegen vor 3 = abgeschlossen, endgültige Ergebnisse liegen vor.',
- 'EXTRA_UPDATE_FAILED' => 'Die Sondertippeinstellungen konnten nicht aktualisiert werden.',
- 'EXTRA_UPDATED' => 'Sondertippeinstellungen erfolgreich aktualisiert.',
-
- 'LEAGUE' => 'Liga',
-
- 'MATCHDAY' => 'Spieltag',
-
- 'NO_EXTRA' => 'Der gewählte Sondertipp existiert nicht. Bitte zuerst einen Sondertipp in dieser Liga der Saison erstellen.',
- 'NO_EXTRA_CREATED' => 'Es wurden bislang keine Sondertipps erstellt.',
- 'NO_LEAGUE' => 'Die gewählte Liga existiert nicht in der Saison %1$s. Bitte zuerst eine Liga in der Saison %1$s erstellen.',
- 'NO_SEASON' => 'Die gewählte Saison existiert nicht. Bitte zuerst eine Saison erstellen.',
-
- 'QUESTION_TYPE' => 'Frage-Typ',
-
- 'SEASON' => 'Saison',
- 'SELECT_LEAGUE' => 'Liga auswählen',
- 'SELECT_MATCHDAY' => 'Wähle einen Spieltag',
-
- 'TOO_LARGE_EXTRA_POINTS' => 'Die Punktzahl für den Sondertipp ist zu groß. Erlaubt: 0-99',
- 'TOO_LARGE_MATCHDAY' => 'Du musst einen Abgabe-Spieltag wählen.',
- 'TOO_LARGE_MATCHDAY_EVAL' => 'Du musst einen Auswertungs-Spieltag wählen.',
- 'TOO_SMALL_EXTRA_POINTS' => 'Die Punktzahl für den Sondertipp ist zu klein. Erlaubt: 0-99',
- 'TOO_SMALL_MATCHDAY' => 'Du musst einen Abgabe-Spieltag wählen.',
- 'TOO_SMALL_MATCHDAY_EVAL' => 'Du musst einen Auswertungs-Spieltag wählen.',
-));
-
+ 'Sondertipps',
+ 'ACP_FOOTBALL_EXTRA_MANAGE' => 'Sondertipps verwalten',
+ 'ACP_FOOTBALL_EXTRA_MANAGE_EXPLAIN' => 'Hier kannst du Sondertipps zu Spieltagen einer Liga zuordnen. Du kannst bestehende löschen oder ändern oder einen neuen Sondertipp erstellen, sowie Typ, Wertung, Punkte und den Endzeitpunkt der Sondertipps einstellen.',
+ 'ACP_FOOTBALL_EXTRA_MANAGEMENT' => 'Tipprunde-Sondertipp-Verwaltung',
+
+ 'EVAL_BEFORE_DELIVERY' => 'Der Auswertungs-Spieltag darf nicht vor dem Abgabe-Spieltag liegen.',
+ 'EXTRA_ADD' => 'Sondertipp hinzufügen',
+ 'EXTRA_ADDED' => 'Sondertipp erfolgreich hinzugefügt.',
+ 'EXTRA_CONFIRM_DELETE' => 'Bist du sicher, dass du den Sondertipp "%1$s" in der %2$s. Liga aus der Saison %3$s mit allen Tipps löschen willst?',
+ 'EXTRA_CREATE_FAILED' => 'Sondertipp konnte nicht erstellt werden.',
+ 'EXTRA_DEF' => 'Bestehende Sondertipps',
+ 'EXTRA_DEF_EXPLAIN' => 'Dies sind Sondertipps, die von dir oder einem anderen Administrator erstellt wurden. Du kannst Sondertippeinstellungen ändern oder Sondertipps löschen.',
+ 'EXTRA_DELETED' => 'Sondertipp gelöscht',
+ 'EXTRA_DETAILS' => 'Sondertippdaten',
+ 'EXTRA_MATCHDAY' => 'Abgabe',
+ 'EXTRA_MATCHDAY_EVAL' => 'Auswertung',
+ 'EXTRA_MATCHDAY_EVAL_EXPLAIN' => 'Das Ergebnis des Sondertipps wird an diesem Spieltag eingegeben. Bei unterschiedlichen Spieltagen für Abgabe und Ergebnis werden die Punkte der Gesamtwertung zugerechnet, sonst fließen sie in die Spieltagswertung mit ein.',
+ 'EXTRA_MATCHDAY_EXPLAIN' => 'Die Tippabgabe des Sondertipps wird mit dem ersten Abgabetermin dieses Spieltags gesperrt.',
+ 'EXTRA_NO' => 'Nummer',
+ 'EXTRA_NO_DELETE' => 'Du darfst keine Sondertipps löschen. Dies dürfen nur Gründungsmitglieder',
+ 'EXTRA_POINTS' => 'Mögl. Punkte',
+ 'EXTRA_POINTS_EXPLAIN' => 'Maximal zu erreichende Punkte in Abhängigkeit zum Punktemodus.',
+ 'EXTRA_QUESTION' => 'Sondertipp Frage',
+ 'EXTRA_QUESTION_EXPLAIN' => 'Freier Fragetext. Bitte eine präzise, unmissverständliche Frage zum hinterlegten Fragetyp formulieren.',
+ 'EXTRA_QUESTION_TYPE' => 'Frage- bzw. Wertungs-Typ.',
+ 'EXTRA_QUESTION_TYPE_EXPLAIN' => '1 = Auswahl eines Teams, Punkte nur bei Übereinstimmung 2 = Auswahl eines Teams mehrere Ergebnisse, Punkte bei einem Treffer 3 = Texteingabe, Punkte bei Übereinstimmung 4 = Texteingabe aber mehrere Ergebnisse, Punkte bei einem Treffer 5 = Zahl, Punkte abzgl. der Differenz zwischen Tipp und Ergebnis',
+ 'EXTRA_STATUS' => 'Status',
+ 'EXTRA_STATUS_EXPLAIN' => '0 = offen (Tippabgabe möglich) 1 = keine Tippabgabe mehr möglich und noch keine Ergebnisse 2 = vorläufige Ergebnisse liegen vor 3 = abgeschlossen, endgültige Ergebnisse liegen vor.',
+ 'EXTRA_UPDATE_FAILED' => 'Die Sondertippeinstellungen konnten nicht aktualisiert werden.',
+ 'EXTRA_UPDATED' => 'Sondertippeinstellungen erfolgreich aktualisiert.',
+
+ 'LEAGUE' => 'Liga',
+
+ 'MATCHDAY' => 'Spieltag',
+
+ 'NO_EXTRA' => 'Der gewählte Sondertipp existiert nicht. Bitte zuerst einen Sondertipp in dieser Liga der Saison erstellen.',
+ 'NO_EXTRA_CREATED' => 'Es wurden bislang keine Sondertipps erstellt.',
+ 'NO_LEAGUE' => 'Die gewählte Liga existiert nicht in der Saison %1$s. Bitte zuerst eine Liga in der Saison %1$s erstellen.',
+ 'NO_SEASON' => 'Die gewählte Saison existiert nicht. Bitte zuerst eine Saison erstellen.',
+
+ 'QUESTION_TYPE' => 'Frage-Typ',
+
+ 'SEASON' => 'Saison',
+ 'SELECT_LEAGUE' => 'Liga auswählen',
+ 'SELECT_MATCHDAY' => 'Wähle einen Spieltag',
+
+ 'TOO_LARGE_EXTRA_POINTS' => 'Die Punktzahl für den Sondertipp ist zu groß. Erlaubt: 0-99',
+ 'TOO_LARGE_MATCHDAY' => 'Du musst einen Abgabe-Spieltag wählen.',
+ 'TOO_LARGE_MATCHDAY_EVAL' => 'Du musst einen Auswertungs-Spieltag wählen.',
+ 'TOO_SMALL_EXTRA_POINTS' => 'Die Punktzahl für den Sondertipp ist zu klein. Erlaubt: 0-99',
+ 'TOO_SMALL_MATCHDAY' => 'Du musst einen Abgabe-Spieltag wählen.',
+ 'TOO_SMALL_MATCHDAY_EVAL' => 'Du musst einen Auswertungs-Spieltag wählen.',
+));
+
?>
\ No newline at end of file
diff --git a/language/de/info_acp_ko.php b/language/de/info_acp_ko.php
index 8f23168..71aa650 100644
--- a/language/de/info_acp_ko.php
+++ b/language/de/info_acp_ko.php
@@ -1,70 +1,70 @@
- 'KO-Runden Gewinner',
- 'ACP_FOOTBALL_KO_MANAGE' => 'KO-Runden Gewinner ermitteln',
- 'ACP_FOOTBALL_KO_MANAGE_EXPLAIN' => 'Hier kannst du zu einer KO-Runde die Gewinner anhand der Begegnung(en) oder des Tabellenplatzes ermitteln und für kommende Spieltage freischalten. Bei der Spielplanerstellung werden nur diese Mannschaften für die Spieltage zur Auswahl angeboten. Ebenso ist es möglich Mannschaften anhand des Tabellenplatzes in eine andere KO-Liga zu überführen.',
- 'ACP_FOOTBALL_KO_MANAGEMENT' => 'Tipprunde-KO-Runden abschliessen',
-
- 'CHOOSE_LEAGUE' => 'Liga wählen',
-
- 'ERROR_FROM_TO' => 'Fehler bei der Spieltagswahl. "Von" darf nicht nach "bis" liegen.',
- 'ERROR_TARGET' => 'Fehler bei der Spieltagswahl. Der Ziel-Spieltag liegt nicht nach den Spieltagen zur Ermittlung.',
-
- 'GROUP_RANK' => 'Qualifiziert bis Tabellenplatz',
- 'GROUP_RANK_EXPLAIN' => 'Alle Mannschaften bis zu diesem Tabellenplatz qualifizieren sich.',
-
- 'KO_GROUP' => 'Qualifikation anhand des Tabellenplatzes',
- 'KO_MATCHDAYS' => 'Spieltage zur Ermittlung wählen',
- 'KO_MOVED' => 'Folgende Teams wurden in eine andere Liga kopiert',
- 'KO_NEXT' => 'Folgende Teams haben die nächste Runde erreicht',
- 'KO_NEXT_CHECK' => 'Bitte die Teams prüfen, da bei Punktgleichheit der direkte Vergleich zählen kann, hier aber nicht berücksichtigt wird. ',
-
- 'MANAGE_GROUP' => 'Ermittlung anhand des Tabellenplatzes bei Gruppenpielen',
- 'MATCHDAY_NEW' => 'Die Mannschaften qualifizieren sich bis Spieltag',
- 'MATCHDAY_TARGET' => 'Ziel-Spieltag wählen',
- 'MOVE_LEAGUE' => 'in Liga',
- 'MOVE_RANK' => 'Transfer des Tabellenplatzes',
- 'MOVE_RANK_EXPLAIN' => 'Die Mannschaften auf diesem Tabellenplatz werden in die hinterlegte Liga kopiert und sind bis zum angegeben Spieltag qualifiziert.',
-
- 'NO_KO_NEXT' => 'Es wurde kein Team in die nächste Runde gesetzt, da noch nicht alle Spiele gespielt sind!',
-
- 'PREDICTION_LEAGUE' => 'Tipprunde',
-));
-
+ 'KO-Runden Gewinner',
+ 'ACP_FOOTBALL_KO_MANAGE' => 'KO-Runden Gewinner ermitteln',
+ 'ACP_FOOTBALL_KO_MANAGE_EXPLAIN' => 'Hier kannst du zu einer KO-Runde die Gewinner anhand der Begegnung(en) oder des Tabellenplatzes ermitteln und für kommende Spieltage freischalten. Bei der Spielplanerstellung werden nur diese Mannschaften für die Spieltage zur Auswahl angeboten. Ebenso ist es möglich Mannschaften anhand des Tabellenplatzes in eine andere KO-Liga zu überführen.',
+ 'ACP_FOOTBALL_KO_MANAGEMENT' => 'Tipprunde-KO-Runden abschliessen',
+
+ 'CHOOSE_LEAGUE' => 'Liga wählen',
+
+ 'ERROR_FROM_TO' => 'Fehler bei der Spieltagswahl. "Von" darf nicht nach "bis" liegen.',
+ 'ERROR_TARGET' => 'Fehler bei der Spieltagswahl. Der Ziel-Spieltag liegt nicht nach den Spieltagen zur Ermittlung.',
+
+ 'GROUP_RANK' => 'Qualifiziert bis Tabellenplatz',
+ 'GROUP_RANK_EXPLAIN' => 'Alle Mannschaften bis zu diesem Tabellenplatz qualifizieren sich.',
+
+ 'KO_GROUP' => 'Qualifikation anhand des Tabellenplatzes',
+ 'KO_MATCHDAYS' => 'Spieltage zur Ermittlung wählen',
+ 'KO_MOVED' => 'Folgende Teams wurden in eine andere Liga kopiert',
+ 'KO_NEXT' => 'Folgende Teams haben die nächste Runde erreicht',
+ 'KO_NEXT_CHECK' => 'Bitte die Teams prüfen, da bei Punktgleichheit der direkte Vergleich zählen kann, hier aber nicht berücksichtigt wird. ',
+
+ 'MANAGE_GROUP' => 'Ermittlung anhand des Tabellenplatzes bei Gruppenpielen',
+ 'MATCHDAY_NEW' => 'Die Mannschaften qualifizieren sich bis Spieltag',
+ 'MATCHDAY_TARGET' => 'Ziel-Spieltag wählen',
+ 'MOVE_LEAGUE' => 'in Liga',
+ 'MOVE_RANK' => 'Transfer des Tabellenplatzes',
+ 'MOVE_RANK_EXPLAIN' => 'Die Mannschaften auf diesem Tabellenplatz werden in die hinterlegte Liga kopiert und sind bis zum angegeben Spieltag qualifiziert.',
+
+ 'NO_KO_NEXT' => 'Es wurde kein Team in die nächste Runde gesetzt, da noch nicht alle Spiele gespielt sind!',
+
+ 'PREDICTION_LEAGUE' => 'Tipprunde',
+));
+
?>
\ No newline at end of file
diff --git a/language/de/info_acp_matchdays.php b/language/de/info_acp_matchdays.php
index 77bbaa9..5f54b4c 100644
--- a/language/de/info_acp_matchdays.php
+++ b/language/de/info_acp_matchdays.php
@@ -1,127 +1,127 @@
- 'Spieltage',
- 'ACP_FOOTBALL_MATCHDAYS_MANAGE' => 'Spieltage verwalten',
- 'ACP_FOOTBALL_MATCHDAYS_MANAGE_EXPLAIN' => 'Hier kannst du je Liga Spieltage einer Saison zuordnen. Du kannst bestehende löschen oder ändern oder einen neuen Spieltag erstellen, sowie Typ, Anzahl der Spieltage, Gewinne, Name und Kurzbezeichnug der Spieltag einstellen.',
- 'ACP_FOOTBALL_MATCHDAYS_MANAGEMENT' => 'Tipprunde-Spieltags-Verwaltung',
- 'ADD_MATCHDAY' => 'Spieltag zur Liga hinzufügen',
-
- 'BACKWARD_DELIVERY' => 'Zeitspanne wählen',
- 'BACKWARD_DELIVERY_EXPLAIN' => 'Zeitspanne der Abgabe vor dem ersten Spielbeginn.',
-
- 'CHANGE_DELIVERY' => 'Abgabetermine ändern',
- 'CHANGE_DELIVERY_EXPLAIN' => 'Hier kannst du einmalig die zukünftigen Abgabetermine der Spieltage in Abhängigkeit zum ersten Spielbeginn neu festlegen. Hierdurch wird jedoch kein Automatismus bei zukünftigen Spielverlegungen eingerichtet. Mit Zeitspanne 0 kannst du überprüfen, ob ein Abgabetermin nach dem ersten Spielbeginn liegt und diesen entsprechend korrigieren. Soll ein einheitlicher Abgabetermin gesetzt werden, muss diese Funktion eventuell mehrfach mit unterschiedlichen Zeitspannen passend zu den Anstoßzeiten aufgerufen werden.',
-
- 'DELIVERY' => 'Abgabezeit',
- 'DELIVERY_SET_TIME' => 'Abgabezeit vor dem ersten Spielbeginn',
- 'DELIVERY_NUMBER' => 'Abgabe Nr.',
-
- 'GENERATE_MATCHDAY' => 'Fehlende Spieltage generieren',
-
- 'INVALID_DDAY1_DATE' => 'Kein gültiger Abgabetermin.',
- 'INVALID_DDAY2_DATE' => 'Kein gültiger 2. Abgabetermin.',
- 'INVALID_DDAY3_DATE' => 'Kein gültiger 3. Abgabetermin.',
-
- 'LEAGUE' => 'Liga',
-
- 'MATCHDAY' => 'Spieltag',
- 'MATCHDAY_ADDED' => 'Spieltag erfolgreich hinzugefügt.',
- 'MATCHDAY_CONFIRM_DELETE' => 'Bist du sicher, dass du den %1$s. Spieltag aus der Saison %2$s mit allen Daten (Spielplan und Tipps) löschen willst?',
- 'MATCHDAY_CONFIRM_REMOVE' => 'Bist du sicher, dass du alle überflüssigen Spieltage aus der Saison %1$s mit allen Daten (Spielplan und Tipps) löschen willst?',
- 'MATCHDAY_CREATE_FAILED' => 'Spieltag konnte nicht erstellt werden.',
- 'MATCHDAY_CREATED' => '%1$s Spieltag wurde erfolgreich erstellt.',
- 'MATCHDAY_CURRENT' => 'Aktuelle Spieltag',
- 'MATCHDAY_DEF' => 'Bestehende Spieltage',
- 'MATCHDAY_DEF_EXPLAIN' => 'Dies sind Spieltage, die von dir oder einem anderen Administrator erstellt wurden. Du kannst Spieltageinstellungen ändern oder Spieltage löschen.',
- 'MATCHDAY_DELETE' => 'Spieltag entfernen',
- 'MATCHDAY_DELETED' => 'Spieltag gelöscht',
- 'MATCHDAY_DELIVERY' => 'Abgabetermin',
- 'MATCHDAY_DELIVERY_EXPLAIN' => 'Termin an dem der Spieltag bzw. die nächsten Spiele geschlossen werden und somit keine Tippabgabe mehr möglich ist. Wurde der Spieltag bereits geschlossen (Status 1), kann dieser durch ein zukünftigen Abgabetermin wieder geöffnet werden. Andere Statusübergänge sind nur durch Eingabe bzw. Löschen der Spielergebnisse dieses Spieltags möglich.',
- 'MATCHDAY_DELIVERY2' => '2. Abgabetermin ',
- 'MATCHDAY_DELIVERY2_EXPLAIN' => 'Beim Erreichen des ersten Abgabetermins wird dieser Termin als nächster Abgabetermin für die nächsten Spiele gesetzt.',
- 'MATCHDAY_DELIVERY3' => '3. Abgabetermin',
- 'MATCHDAY_DELIVERY3_EXPLAIN' => 'Beim Erreichen des 2. Abgabetermins wird dieser Termin als nächster Abgabetermin für die nächsten Spiele gesetzt.',
- 'MATCHDAY_DETAILS' => 'Spieltagsdaten',
- 'MATCHDAY_EDIT_EXPLAIN' => 'Hier kannst du einen bestehenden Spieltag bearbeiten. Du kannst Typ, Anzahl der Spieltage, Gewinne, Namen und die Kurzbezeichnung ändern.',
- 'MATCHDAY_MATCHES' => 'Anzahl der Spiele an diesem Spieltag',
- 'MATCHDAY_MATCHES_EXPLAIN' => 'Bei KO-Runden ist die Angabe der Anzahl der Spiele je Spieltag zwingend erforderlich.',
- 'MATCHDAY_NAME' => 'Spieltagsbezeichnung',
- 'MATCHDAY_NAME_DOUBLE' => 'Die Spieltagsbezeichnung wird schon benutzt bzw. wurde doppelt vergeben.',
- 'MATCHDAY_NAME_EMPTY' => 'Die Spieltagsbezeichnung muss mindesten 3 Buchstaben lang sein.',
- 'MATCHDAY_NUMBER' => 'Die angegebene Spieltag muss numerisch (1-99) sein. Bitte eine Spieltagnummer eingeben.',
- 'MATCHDAY_STATUS' => 'Status',
- 'MATCHDAY_STATUS_EXPLAIN' => '0 = offen (Tippabgabe möglich) 1 = keine Tippabgabe mehr möglich und noch keine Ergebnisse 2 = vorläufige Ergebnisse liegen vor 3 = abgeschlossen, endgültige Ergebnisse liegen vor.',
- 'MATCHDAY_UPDATE_FAILED' => 'Spieltageinstellungen konnten nicht aktualisiert werden.',
- 'MATCHDAY_UPDATED' => 'Spieltageinstellungen erfolgreich aktualisiert.',
- 'MATCHDAYS_CREATED' => '%1$s Spieltage wurden erfolgreich erstellt.',
- 'MATCHDAYS_NO_DELETE' => 'Du darfst keine Spieltag löschen. Dies dürfen nur Gründungsmitglieder',
- 'MATCHDAYS_REMOVED' => 'Überflüssige Spieltage gelöscht',
-
- 'NEW_DELIVERY' => 'Neue Abgabezeit',
- 'NO_DELIVERIES_UPDATED' => 'Es wurden keine Abgabetermine geändert.',
- 'NO_DELIVERY' => 'Der Abgabetermin fehlt.',
- 'NO_DELIVERY2' => 'Der 2. Abgabetermin fehlt oder der 3. Abgabetermin muss gelöscht werden.',
- 'NO_LEAGUE' => 'Es existiert keine Liga in der Saison %1$s. Bitte zuerst eine Liga in der Saison %1$s erstellen.',
- 'NO_MATCHDAYS_CREATED' => 'Es wurden bislang keine Spieltage erstellt.',
- 'NO_MORE_MATCHDAYS' => 'Es wurde keine weiteren Spieltage hinzugefügt.',
- 'NO_SEASON' => 'Es existiert keine Saison. Bitte zuerst eine Saison erstellen.',
-
- 'OPEN_MATCH' => 'Das Spiel Nr. %s liegt vor dem gewählten Abgabetermin. Der Abgabetermin ist daher nicht zulässig.',
- 'OPEN_MATCHES' => 'Die Spiele Nr. %s liegen vor dem gewählten Abgabetermin. Der Abgabetermin ist daher nicht zulässig.',
-
- 'PREDICTION_LEAGUE' => 'Tipprunde',
-
- 'REMOVE_MATCHDAYS' => 'Überflüssige Spieltage entfernen',
-
- 'SEASON' => 'Saison',
- 'SELECT_LEAGUE' => 'Liga auswählen',
- 'SHOW_DELIVERY' => 'Abgabezeiten anzeigen',
-
- 'TOO_LARGE_MATCHES' => 'Die Anzahl der Spiele je Spieltag ist zu groß.',
- 'TOO_SMALL_DELIVERY2' => 'Der 2. Abgabetermin darf nicht vor dem 1. Abgabetermin liegen.',
- 'TOO_SMALL_DELIVERY3' => 'Der 3. Abgabetermin darf nicht vor dem 2. Abgabetermin liegen.',
- 'TOO_SMALL_MATCHES' => 'Die Anzahl der Spiele je Spieltag ist zu klein.',
-
- 'UPDATE_DELIVER' => '%s Abgabetermin geändert.',
- 'UPDATE_DELIVERIES' => '%s Abgabetermine geändert.',
- 'UPDATE_DELIVERY' => 'Neue Abgabezeiten',
- 'UPDATE_DELIVERY_EXPLAIN' => 'Wähle die Datensätze aus, deren Abgabezeit neu gesetzt werden soll. Rot markierte Abgabezeiten liegen nach dem neu berechneten Abgabetermin.',
-));
-
+ 'Spieltage',
+ 'ACP_FOOTBALL_MATCHDAYS_MANAGE' => 'Spieltage verwalten',
+ 'ACP_FOOTBALL_MATCHDAYS_MANAGE_EXPLAIN' => 'Hier kannst du je Liga Spieltage einer Saison zuordnen. Du kannst bestehende löschen oder ändern oder einen neuen Spieltag erstellen, sowie Typ, Anzahl der Spieltage, Gewinne, Name und Kurzbezeichnug der Spieltag einstellen.',
+ 'ACP_FOOTBALL_MATCHDAYS_MANAGEMENT' => 'Tipprunde-Spieltags-Verwaltung',
+ 'ADD_MATCHDAY' => 'Spieltag zur Liga hinzufügen',
+
+ 'BACKWARD_DELIVERY' => 'Zeitspanne wählen',
+ 'BACKWARD_DELIVERY_EXPLAIN' => 'Zeitspanne der Abgabe vor dem ersten Spielbeginn.',
+
+ 'CHANGE_DELIVERY' => 'Abgabetermine ändern',
+ 'CHANGE_DELIVERY_EXPLAIN' => 'Hier kannst du einmalig die zukünftigen Abgabetermine der Spieltage in Abhängigkeit zum ersten Spielbeginn neu festlegen. Hierdurch wird jedoch kein Automatismus bei zukünftigen Spielverlegungen eingerichtet. Mit Zeitspanne 0 kannst du überprüfen, ob ein Abgabetermin nach dem ersten Spielbeginn liegt und diesen entsprechend korrigieren. Soll ein einheitlicher Abgabetermin gesetzt werden, muss diese Funktion eventuell mehrfach mit unterschiedlichen Zeitspannen passend zu den Anstoßzeiten aufgerufen werden.',
+
+ 'DELIVERY' => 'Abgabezeit',
+ 'DELIVERY_SET_TIME' => 'Abgabezeit vor dem ersten Spielbeginn',
+ 'DELIVERY_NUMBER' => 'Abgabe Nr.',
+
+ 'GENERATE_MATCHDAY' => 'Fehlende Spieltage generieren',
+
+ 'INVALID_DDAY1_DATE' => 'Kein gültiger Abgabetermin.',
+ 'INVALID_DDAY2_DATE' => 'Kein gültiger 2. Abgabetermin.',
+ 'INVALID_DDAY3_DATE' => 'Kein gültiger 3. Abgabetermin.',
+
+ 'LEAGUE' => 'Liga',
+
+ 'MATCHDAY' => 'Spieltag',
+ 'MATCHDAY_ADDED' => 'Spieltag erfolgreich hinzugefügt.',
+ 'MATCHDAY_CONFIRM_DELETE' => 'Bist du sicher, dass du den %1$s. Spieltag aus der Saison %2$s mit allen Daten (Spielplan und Tipps) löschen willst?',
+ 'MATCHDAY_CONFIRM_REMOVE' => 'Bist du sicher, dass du alle überflüssigen Spieltage aus der Saison %1$s mit allen Daten (Spielplan und Tipps) löschen willst?',
+ 'MATCHDAY_CREATE_FAILED' => 'Spieltag konnte nicht erstellt werden.',
+ 'MATCHDAY_CREATED' => '%1$s Spieltag wurde erfolgreich erstellt.',
+ 'MATCHDAY_CURRENT' => 'Aktuelle Spieltag',
+ 'MATCHDAY_DEF' => 'Bestehende Spieltage',
+ 'MATCHDAY_DEF_EXPLAIN' => 'Dies sind Spieltage, die von dir oder einem anderen Administrator erstellt wurden. Du kannst Spieltageinstellungen ändern oder Spieltage löschen.',
+ 'MATCHDAY_DELETE' => 'Spieltag entfernen',
+ 'MATCHDAY_DELETED' => 'Spieltag gelöscht',
+ 'MATCHDAY_DELIVERY' => 'Abgabetermin',
+ 'MATCHDAY_DELIVERY_EXPLAIN' => 'Termin an dem der Spieltag bzw. die nächsten Spiele geschlossen werden und somit keine Tippabgabe mehr möglich ist. Wurde der Spieltag bereits geschlossen (Status 1), kann dieser durch ein zukünftigen Abgabetermin wieder geöffnet werden. Andere Statusübergänge sind nur durch Eingabe bzw. Löschen der Spielergebnisse dieses Spieltags möglich.',
+ 'MATCHDAY_DELIVERY2' => '2. Abgabetermin ',
+ 'MATCHDAY_DELIVERY2_EXPLAIN' => 'Beim Erreichen des ersten Abgabetermins wird dieser Termin als nächster Abgabetermin für die nächsten Spiele gesetzt.',
+ 'MATCHDAY_DELIVERY3' => '3. Abgabetermin',
+ 'MATCHDAY_DELIVERY3_EXPLAIN' => 'Beim Erreichen des 2. Abgabetermins wird dieser Termin als nächster Abgabetermin für die nächsten Spiele gesetzt.',
+ 'MATCHDAY_DETAILS' => 'Spieltagsdaten',
+ 'MATCHDAY_EDIT_EXPLAIN' => 'Hier kannst du einen bestehenden Spieltag bearbeiten. Du kannst Typ, Anzahl der Spieltage, Gewinne, Namen und die Kurzbezeichnung ändern.',
+ 'MATCHDAY_MATCHES' => 'Anzahl der Spiele an diesem Spieltag',
+ 'MATCHDAY_MATCHES_EXPLAIN' => 'Bei KO-Runden ist die Angabe der Anzahl der Spiele je Spieltag zwingend erforderlich.',
+ 'MATCHDAY_NAME' => 'Spieltagsbezeichnung',
+ 'MATCHDAY_NAME_DOUBLE' => 'Die Spieltagsbezeichnung wird schon benutzt bzw. wurde doppelt vergeben.',
+ 'MATCHDAY_NAME_EMPTY' => 'Die Spieltagsbezeichnung muss mindesten 3 Buchstaben lang sein.',
+ 'MATCHDAY_NUMBER' => 'Die angegebene Spieltag muss numerisch (1-99) sein. Bitte eine Spieltagnummer eingeben.',
+ 'MATCHDAY_STATUS' => 'Status',
+ 'MATCHDAY_STATUS_EXPLAIN' => '0 = offen (Tippabgabe möglich) 1 = keine Tippabgabe mehr möglich und noch keine Ergebnisse 2 = vorläufige Ergebnisse liegen vor 3 = abgeschlossen, endgültige Ergebnisse liegen vor.',
+ 'MATCHDAY_UPDATE_FAILED' => 'Spieltageinstellungen konnten nicht aktualisiert werden.',
+ 'MATCHDAY_UPDATED' => 'Spieltageinstellungen erfolgreich aktualisiert.',
+ 'MATCHDAYS_CREATED' => '%1$s Spieltage wurden erfolgreich erstellt.',
+ 'MATCHDAYS_NO_DELETE' => 'Du darfst keine Spieltag löschen. Dies dürfen nur Gründungsmitglieder',
+ 'MATCHDAYS_REMOVED' => 'Überflüssige Spieltage gelöscht',
+
+ 'NEW_DELIVERY' => 'Neue Abgabezeit',
+ 'NO_DELIVERIES_UPDATED' => 'Es wurden keine Abgabetermine geändert.',
+ 'NO_DELIVERY' => 'Der Abgabetermin fehlt.',
+ 'NO_DELIVERY2' => 'Der 2. Abgabetermin fehlt oder der 3. Abgabetermin muss gelöscht werden.',
+ 'NO_LEAGUE' => 'Es existiert keine Liga in der Saison %1$s. Bitte zuerst eine Liga in der Saison %1$s erstellen.',
+ 'NO_MATCHDAYS_CREATED' => 'Es wurden bislang keine Spieltage erstellt.',
+ 'NO_MORE_MATCHDAYS' => 'Es wurde keine weiteren Spieltage hinzugefügt.',
+ 'NO_SEASON' => 'Es existiert keine Saison. Bitte zuerst eine Saison erstellen.',
+
+ 'OPEN_MATCH' => 'Das Spiel Nr. %s liegt vor dem gewählten Abgabetermin. Der Abgabetermin ist daher nicht zulässig.',
+ 'OPEN_MATCHES' => 'Die Spiele Nr. %s liegen vor dem gewählten Abgabetermin. Der Abgabetermin ist daher nicht zulässig.',
+
+ 'PREDICTION_LEAGUE' => 'Tipprunde',
+
+ 'REMOVE_MATCHDAYS' => 'Überflüssige Spieltage entfernen',
+
+ 'SEASON' => 'Saison',
+ 'SELECT_LEAGUE' => 'Liga auswählen',
+ 'SHOW_DELIVERY' => 'Abgabezeiten anzeigen',
+
+ 'TOO_LARGE_MATCHES' => 'Die Anzahl der Spiele je Spieltag ist zu groß.',
+ 'TOO_SMALL_DELIVERY2' => 'Der 2. Abgabetermin darf nicht vor dem 1. Abgabetermin liegen.',
+ 'TOO_SMALL_DELIVERY3' => 'Der 3. Abgabetermin darf nicht vor dem 2. Abgabetermin liegen.',
+ 'TOO_SMALL_MATCHES' => 'Die Anzahl der Spiele je Spieltag ist zu klein.',
+
+ 'UPDATE_DELIVER' => '%s Abgabetermin geändert.',
+ 'UPDATE_DELIVERIES' => '%s Abgabetermine geändert.',
+ 'UPDATE_DELIVERY' => 'Neue Abgabezeiten',
+ 'UPDATE_DELIVERY_EXPLAIN' => 'Wähle die Datensätze aus, deren Abgabezeit neu gesetzt werden soll. Rot markierte Abgabezeiten liegen nach dem neu berechneten Abgabetermin.',
+));
+
?>
\ No newline at end of file
diff --git a/language/de/info_acp_results.php b/language/de/info_acp_results.php
index d4ad1e7..9c589c7 100644
--- a/language/de/info_acp_results.php
+++ b/language/de/info_acp_results.php
@@ -1,100 +1,100 @@
- 'Spielergebnisse',
- 'ACP_FOOTBALL_RESULTS_MANAGE' => 'Spielergebnisse eingeben',
- 'ACP_FOOTBALL_RESULTS_MANAGE_EXPLAIN' => 'Hier kannst du Spielergebnisse bestätigen, eingeben, löschen oder aus der Wertung nehmen.',
- 'ACP_FOOTBALL_RESULTS_MANAGEMENT' => 'Tipprunde-Spielergebnis-Verwaltung',
- 'ADVICE' => 'Hinweis',
-
- 'BETS_AND_RANKS' => 'Tipps und Ranglisten der',
-
- 'DAY' => 'Tag',
- 'DELETE' => 'Löschen',
- 'DELETE_EXPLAIN' => 'Spielergebnis löschen und Status auf 1 setzen.',
-
- 'GUEST' => 'Gast',
-
- 'HOME' => 'Heim',
-
- 'LEAGUE' => 'Liga',
-
- 'MATCH_BEGIN' => 'Spielbeginn',
- 'MATCH_STATUS_TITLE' => '-2=Spiel wird am 3. Abgabetermin geschlossen -1=Spiel wird am 2. Abgabetermin geschlossen 0=offen (Tippabgabe möglich), wird am Abgabetermin geschlossen 1=keine Tippabgabe mehr möglich und noch kein Ergebnis 2=vorläufiges Ergebnis liegt vor 3=endgültiges Ergebnis liegt vor 4-6= wie 1-3 jedoch ohne Wertung.',
- 'MATCHDAY' => 'Spieltag',
- 'MONTH' => 'Monat',
-
- 'NO_LEAGUE' => 'Es existiert keine Liga in der Saison %1$s. Bitte zuerst eine Liga in der Saison %1$s erstellen.',
- 'NO_MATCHDAY' => 'Es existiert kein Spieltag in %1$s Saison %2$s. Bitte zuerst Spieltage erstellen.',
- 'NO_MATCHES_CREATED' => 'Es wurden bislang keine Spielpaarungen hinterlegt.',
- 'NO_SEASON' => 'Es existiert keine Saison. Bitte zuerst eine Saison erstellen.',
- 'NO_VALUATION' => 'o. Wertung',
- 'NO_VALUATION_EXPLAIN' => 'Spiel aus der Wertung nehmen, da dieses verschoben oder manipuliert wurde.',
- 'NUMBER' => 'Nr',
-
- 'OVERTIME' => 'Verlängerung',
- 'OVERTIME_EXPLAIN' => 'Spielergebnis inkl. Verlängerung und Elfmeterschiessen.',
-
- 'PREDICTION_LEAGUE' => 'Tipprunde',
-
- 'RANKING' => 'Rangliste',
- 'RESULT' => 'Ergebnis',
- 'RESULT_DELETED' => '%1$s Spielergebnis wurde gelöscht.',
- 'RESULT_DETAILS' => 'Spielergebnisse',
- 'RESULT_EXPLAIN' => 'Spielergebnis nach 90 Minuten oder Spielzwischenstand',
- 'RESULT_NO_VALUATION' => '%1$s Spiel wurde aus der Wertung genommen.',
- 'RESULT_SAVED' => '%1$s Spielergebnis wurde gespeichert.',
- 'RESULTS_DELETED' => '%1$s Spielergebnisse wurden gelöscht.',
- 'RESULTS_NO_VALUATION' => '%1$s Spiele wurden aus der Wertung genommen.',
- 'RESULTS_SAVED' => '%1$s Spielergebnisse wurden gespeichert.',
-
- 'SAVE' => 'Speichern',
- 'SAVE_FAILED' => 'Die Spielergebnisse konnten nicht gespeichert werden.',
- 'SEASON' => 'Saison',
- 'SELECT' => 'Auswahl',
- 'SELECT_EXPLAIN' => 'Nur die hier markierten Spiele werden gespeichert/nicht gewertet/gelöscht.',
- 'SELECT_MATCHDAY' => 'Spieltag wählen',
- 'SET_STATUS_TO' => 'Der Status des Spieltages wurde auf %1$s gesetzt',
- 'STATUS' => 'Status',
-
- 'VS' => 'Begegnung',
-
- 'YEAR' => 'Jahr',
-));
-
+ 'Spielergebnisse',
+ 'ACP_FOOTBALL_RESULTS_MANAGE' => 'Spielergebnisse eingeben',
+ 'ACP_FOOTBALL_RESULTS_MANAGE_EXPLAIN' => 'Hier kannst du Spielergebnisse bestätigen, eingeben, löschen oder aus der Wertung nehmen.',
+ 'ACP_FOOTBALL_RESULTS_MANAGEMENT' => 'Tipprunde-Spielergebnis-Verwaltung',
+ 'ADVICE' => 'Hinweis',
+
+ 'BETS_AND_RANKS' => 'Tipps und Ranglisten der',
+
+ 'DAY' => 'Tag',
+ 'DELETE' => 'Löschen',
+ 'DELETE_EXPLAIN' => 'Spielergebnis löschen und Status auf 1 setzen.',
+
+ 'GUEST' => 'Gast',
+
+ 'HOME' => 'Heim',
+
+ 'LEAGUE' => 'Liga',
+
+ 'MATCH_BEGIN' => 'Spielbeginn',
+ 'MATCH_STATUS_TITLE' => '-2=Spiel wird am 3. Abgabetermin geschlossen -1=Spiel wird am 2. Abgabetermin geschlossen 0=offen (Tippabgabe möglich), wird am Abgabetermin geschlossen 1=keine Tippabgabe mehr möglich und noch kein Ergebnis 2=vorläufiges Ergebnis liegt vor 3=endgültiges Ergebnis liegt vor 4-6= wie 1-3 jedoch ohne Wertung.',
+ 'MATCHDAY' => 'Spieltag',
+ 'MONTH' => 'Monat',
+
+ 'NO_LEAGUE' => 'Es existiert keine Liga in der Saison %1$s. Bitte zuerst eine Liga in der Saison %1$s erstellen.',
+ 'NO_MATCHDAY' => 'Es existiert kein Spieltag in %1$s Saison %2$s. Bitte zuerst Spieltage erstellen.',
+ 'NO_MATCHES_CREATED' => 'Es wurden bislang keine Spielpaarungen hinterlegt.',
+ 'NO_SEASON' => 'Es existiert keine Saison. Bitte zuerst eine Saison erstellen.',
+ 'NO_VALUATION' => 'o. Wertung',
+ 'NO_VALUATION_EXPLAIN' => 'Spiel aus der Wertung nehmen, da dieses verschoben oder manipuliert wurde.',
+ 'NUMBER' => 'Nr',
+
+ 'OVERTIME' => 'Verlängerung',
+ 'OVERTIME_EXPLAIN' => 'Spielergebnis inkl. Verlängerung und Elfmeterschiessen.',
+
+ 'PREDICTION_LEAGUE' => 'Tipprunde',
+
+ 'RANKING' => 'Rangliste',
+ 'RESULT' => 'Ergebnis',
+ 'RESULT_DELETED' => '%1$s Spielergebnis wurde gelöscht.',
+ 'RESULT_DETAILS' => 'Spielergebnisse',
+ 'RESULT_EXPLAIN' => 'Spielergebnis nach 90 Minuten oder Spielzwischenstand',
+ 'RESULT_NO_VALUATION' => '%1$s Spiel wurde aus der Wertung genommen.',
+ 'RESULT_SAVED' => '%1$s Spielergebnis wurde gespeichert.',
+ 'RESULTS_DELETED' => '%1$s Spielergebnisse wurden gelöscht.',
+ 'RESULTS_NO_VALUATION' => '%1$s Spiele wurden aus der Wertung genommen.',
+ 'RESULTS_SAVED' => '%1$s Spielergebnisse wurden gespeichert.',
+
+ 'SAVE' => 'Speichern',
+ 'SAVE_FAILED' => 'Die Spielergebnisse konnten nicht gespeichert werden.',
+ 'SEASON' => 'Saison',
+ 'SELECT' => 'Auswahl',
+ 'SELECT_EXPLAIN' => 'Nur die hier markierten Spiele werden gespeichert/nicht gewertet/gelöscht.',
+ 'SELECT_MATCHDAY' => 'Spieltag wählen',
+ 'SET_STATUS_TO' => 'Der Status des Spieltages wurde auf %1$s gesetzt',
+ 'STATUS' => 'Status',
+
+ 'VS' => 'Begegnung',
+
+ 'YEAR' => 'Jahr',
+));
+
?>
\ No newline at end of file
diff --git a/language/de/info_acp_seasons.php b/language/de/info_acp_seasons.php
index 578ec04..76ae648 100644
--- a/language/de/info_acp_seasons.php
+++ b/language/de/info_acp_seasons.php
@@ -1,86 +1,86 @@
- 'Saisons',
- 'ACP_FOOTBALL_SEASONS_MANAGE' => 'Saisons verwalten',
- 'ACP_FOOTBALL_SEASONS_MANAGE_EXPLAIN' => 'Hier kannst du alle Saisons verwalten. Du kannst bestehende löschen oder ändern oder eine neue Saison erstellen, sowie Name und Kurzbezeichnug der Saison einstellen.',
- 'ACP_FOOTBALL_SEASONS_MANAGEMENT' => 'Tipprunde-Saison-Verwaltung',
-
- 'CREATE_SEASON' => 'Neue Saison erstellen',
-
- 'LEAGUES' => 'Ligen',
-
- 'NO_SEASON' => 'Keine Saison angegeben.',
- 'NO_SEASONS_CREATED' => 'Es wurden bislang keine Saisons erstellt.',
-
- 'PREDICTION_LEAGUE' => 'Tipprunde',
-
- 'SEASON' => 'Saison',
- 'SEASON_CLOSED' => 'Geschlossen',
- 'SEASON_CONFIRM_DELETE' => 'Bist du sicher, dass du die Saison %1$s mit allen Daten (Ligen, Spieltage, Spielplänen, Tipps und Ranglisten) löschen willst?',
- 'SEASON_CREATE_FAILED' => 'Saison konnte nicht erstellt werden.',
- 'SEASON_CREATED' => 'Saison erfolgreich erstellt.',
- 'SEASON_CURRENT' => 'Aktuelle Saison',
- 'SEASON_DEF' => 'Bestehende Saisons',
- 'SEASON_DEF_EXPLAIN' => 'Dies sind Saisons, die von dir oder einem anderen Administrator erstellt wurden. Du kannst Saisoneinstellungen ändern oder Saisons löschen.',
- 'SEASON_DELETE' => 'Saison entfernen',
- 'SEASON_DELETED' => 'Saison gelöscht',
- 'SEASON_DETAILS' => 'Saisondetails',
- 'SEASON_EDIT_EXPLAIN' => 'Hier kannst du eine bestehende Saison bearbeiten. Du kannst ihren Namen und die Kurzbezeichnung ändern.',
- 'SEASON_NAME' => 'Saisonname',
- 'SEASON_NAME_EMPTY' => 'Der Saisonname fehlt. Er muss mindesten 4 Zeichen lang sein.',
- 'SEASON_NAME_EXPLAIN' => 'Langbezeichnung der Saison z.B. "Saison 2010/2011"',
- 'SEASON_NAME_TAKEN' => 'Der angegebene Saisonname wird bereits benutzt. Bitte wähle einen anderen aus.',
- 'SEASON_NUMBER' => 'Die angegebene Saison muss numerisch (1963-2099) sein. Bitte die Jahreszahl, in der die Saison endet eingeben.',
- 'SEASON_SHORT' => 'Saison Kurzbezeichnung',
- 'SEASON_SHORT_EMPTY' => 'Die Saison Kurzbezeichnung fehlt, sie muss mindesten 2 Zeichen lang sein.',
- 'SEASON_SHORT_EXPLAIN' => 'Kurzbezeichnung der Saison, die in der Auswahlbox angezeigt wird.',
- 'SEASON_SHORT_TAKEN' => 'Die angegebene Kurzbezeichnung der Saison wird bereits benutzt. Bitte wähle eine andere aus.',
- 'SEASON_TAKEN' => 'Diese Saison existiert bereits. Bitte wähle eine andere Saison aus.',
- 'SEASON_UPDATE_FAILED' => 'Saisoneinstellungen konnten nicht aktualisiert werden.',
- 'SEASON_UPDATED' => 'Saisoneinstellungen erfolgreich aktualisiert.',
- 'SEASONS_NO_DELETE' => 'Du darfst keine Saison löschen. Dies dürfen nur Gründungsmitglieder',
- 'SEASONS_NO_LEAGUE' => 'Diese Saison hat keine Liga',
-
- 'TOO_LARGE_SEASON' => 'Der Wert für die Saison ist zu groß. Saison von 1963 - 2099 möglich.',
- 'TOO_SHORT_SEASON' => 'Der Saisonname muss mindesten 4 Zeichen lang sein.',
- 'TOO_SHORT_SEASON_SHORT' => 'Die Saison Kurzbezeichnung muss mindesten 2 Zeichen lang sein.',
- 'TOO_SMALL_SEASON' => 'Der Wert für die Saison ist zu klein. Saison von 1963 - 2099 möglich.',
-));
-
+ 'Saisons',
+ 'ACP_FOOTBALL_SEASONS_MANAGE' => 'Saisons verwalten',
+ 'ACP_FOOTBALL_SEASONS_MANAGE_EXPLAIN' => 'Hier kannst du alle Saisons verwalten. Du kannst bestehende löschen oder ändern oder eine neue Saison erstellen, sowie Name und Kurzbezeichnug der Saison einstellen.',
+ 'ACP_FOOTBALL_SEASONS_MANAGEMENT' => 'Tipprunde-Saison-Verwaltung',
+
+ 'CREATE_SEASON' => 'Neue Saison erstellen',
+
+ 'LEAGUES' => 'Ligen',
+
+ 'NO_SEASON' => 'Keine Saison angegeben.',
+ 'NO_SEASONS_CREATED' => 'Es wurden bislang keine Saisons erstellt.',
+
+ 'PREDICTION_LEAGUE' => 'Tipprunde',
+
+ 'SEASON' => 'Saison',
+ 'SEASON_CLOSED' => 'Geschlossen',
+ 'SEASON_CONFIRM_DELETE' => 'Bist du sicher, dass du die Saison %1$s mit allen Daten (Ligen, Spieltage, Spielplänen, Tipps und Ranglisten) löschen willst?',
+ 'SEASON_CREATE_FAILED' => 'Saison konnte nicht erstellt werden.',
+ 'SEASON_CREATED' => 'Saison erfolgreich erstellt.',
+ 'SEASON_CURRENT' => 'Aktuelle Saison',
+ 'SEASON_DEF' => 'Bestehende Saisons',
+ 'SEASON_DEF_EXPLAIN' => 'Dies sind Saisons, die von dir oder einem anderen Administrator erstellt wurden. Du kannst Saisoneinstellungen ändern oder Saisons löschen.',
+ 'SEASON_DELETE' => 'Saison entfernen',
+ 'SEASON_DELETED' => 'Saison gelöscht',
+ 'SEASON_DETAILS' => 'Saisondetails',
+ 'SEASON_EDIT_EXPLAIN' => 'Hier kannst du eine bestehende Saison bearbeiten. Du kannst ihren Namen und die Kurzbezeichnung ändern.',
+ 'SEASON_NAME' => 'Saisonname',
+ 'SEASON_NAME_EMPTY' => 'Der Saisonname fehlt. Er muss mindesten 4 Zeichen lang sein.',
+ 'SEASON_NAME_EXPLAIN' => 'Langbezeichnung der Saison z.B. "Saison 2010/2011"',
+ 'SEASON_NAME_TAKEN' => 'Der angegebene Saisonname wird bereits benutzt. Bitte wähle einen anderen aus.',
+ 'SEASON_NUMBER' => 'Die angegebene Saison muss numerisch (1963-2099) sein. Bitte die Jahreszahl, in der die Saison endet eingeben.',
+ 'SEASON_SHORT' => 'Saison Kurzbezeichnung',
+ 'SEASON_SHORT_EMPTY' => 'Die Saison Kurzbezeichnung fehlt, sie muss mindesten 2 Zeichen lang sein.',
+ 'SEASON_SHORT_EXPLAIN' => 'Kurzbezeichnung der Saison, die in der Auswahlbox angezeigt wird.',
+ 'SEASON_SHORT_TAKEN' => 'Die angegebene Kurzbezeichnung der Saison wird bereits benutzt. Bitte wähle eine andere aus.',
+ 'SEASON_TAKEN' => 'Diese Saison existiert bereits. Bitte wähle eine andere Saison aus.',
+ 'SEASON_UPDATE_FAILED' => 'Saisoneinstellungen konnten nicht aktualisiert werden.',
+ 'SEASON_UPDATED' => 'Saisoneinstellungen erfolgreich aktualisiert.',
+ 'SEASONS_NO_DELETE' => 'Du darfst keine Saison löschen. Dies dürfen nur Gründungsmitglieder',
+ 'SEASONS_NO_LEAGUE' => 'Diese Saison hat keine Liga',
+
+ 'TOO_LARGE_SEASON' => 'Der Wert für die Saison ist zu groß. Saison von 1963 - 2099 möglich.',
+ 'TOO_SHORT_SEASON' => 'Der Saisonname muss mindesten 4 Zeichen lang sein.',
+ 'TOO_SHORT_SEASON_SHORT' => 'Die Saison Kurzbezeichnung muss mindesten 2 Zeichen lang sein.',
+ 'TOO_SMALL_SEASON' => 'Der Wert für die Saison ist zu klein. Saison von 1963 - 2099 möglich.',
+));
+
?>
\ No newline at end of file
diff --git a/language/de/info_acp_teams.php b/language/de/info_acp_teams.php
index 53c9eee..5e1b96b 100644
--- a/language/de/info_acp_teams.php
+++ b/language/de/info_acp_teams.php
@@ -1,100 +1,100 @@
- 'Teams',
- 'ACP_FOOTBALL_TEAMS_MANAGE' => 'Teams verwalten',
- 'ACP_FOOTBALL_TEAMS_MANAGE_EXPLAIN' => 'Hier kannst du je Saison Teams einer Liga zuordnen. Du kannst bestehende löschen oder ändern oder eine neues Team erstellen, sowie Typ, Anzahl der Spieltage, Gewinne, Name und Kurzbezeichnug des Teams einstellen.',
- 'ACP_FOOTBALL_TEAMS_MANAGEMENT' => 'Tipprunde-Team-Verwaltung',
- 'ADD_TEAM' => 'Team zur Liga hinzufügen',
-
- 'LEAGUE' => 'Liga',
-
- 'MATCHDAY' => 'Spieltag',
-
- 'NEW_TEAM' => 'Neues Team',
- 'NO_LEAGUE' => 'Es existiert keine Liga in der Saison %1$s. Bitte zuerst eine Liga in der Saison %1$s erstellen.',
- 'NO_MATCHDAYS' => 'Bitte zuerst Spieltage anlegen, da die Mannschaften bei KO-Runden einem Spieltag zugeordnet werden müssen.',
- 'NO_SEASON' => 'Es existiert keine Saison. Bitte zuerst eine Saison erstellen.',
- 'NO_TEAM' => 'Kein Team angegeben.',
- 'NO_TEAMS_CREATED' => 'Es wurden bislang keine Teams erstellt.',
- 'NO_TEAMSYMBOL' => 'Kein Logo',
-
- 'PREDICTION_LEAGUE' => 'Tipprunde',
-
- 'SEASON' => 'Saison',
- 'SELECT_LEAGUE' => 'Liga auswählen',
-
- 'TEAM' => 'Team',
- 'TEAM_ADDED' => 'Team erfolgreich hinzugefügt.',
- 'TEAM_AWAY' => 'Auswärts',
- 'TEAM_CONFIRM_DELETE' => 'Bist du sicher, dass du %1$s aus Saison: %2$s Liga: %3$s mit allen Daten (Spieltage, Spielplänen und Tipps) löschen möchtest?',
- 'TEAM_CREATE_FAILED' => 'Team konnte nicht erstellt werden.',
- 'TEAM_CREATED' => 'Team erfolgreich erstellt.',
- 'TEAM_CURRENT' => 'Aktuelles Team',
- 'TEAM_DEF' => 'Bestehende Teams',
- 'TEAM_DEF_EXPLAIN' => 'Dies sind Teams, die von dir oder einem anderen Administrator erstellt wurden. Du kannst Teameinstellungen ändern oder Teams löschen.',
- 'TEAM_DELETE' => 'Team entfernen',
- 'TEAM_DELETED' => 'Team gelöscht',
- 'TEAM_DETAILS' => 'Teamdaten',
- 'TEAM_EDIT_EXPLAIN' => 'Hier kannst du ein bestehendes Team bearbeiten. Du kannst den Namen, die Team-Kurzbezeichnung sowie das Team-Wappen ändern.',
- 'TEAM_GROUP' => 'Gruppenspiele in Gruppe',
- 'TEAM_GROUP_EXPLAIN' => 'Buchstabe der Gruppe, in der die Gruppenspiele bestritten werden.',
- 'TEAM_MATCHES' => 'Spiele',
- 'TEAM_NAME' => 'Teamname',
- 'TEAM_NAME_DOUBLE' => 'Der Teamname wird schon benutzt bzw. wurde doppelt vergeben.',
- 'TEAM_NUMBER' => 'Dies ist keine gültige Teamnummer. Die Teamnummer muss zwischen 0 und 65535 liegen.',
- 'TEAM_ROUND' => 'Qualifiziert bis Spieltag',
- 'TEAM_ROUND_EXPLAIN' => 'Spieltag bis zu dem sich das Team vorerst qualifiziert hat. Über diesen Parameter werden bei der Spielplanerstellung nur Mannschaften zur Auswahl angeboten, die sich auch für die netsprechende Runde qualifiziert haben. Über den Menüpunkt Qualifikation kann dieser Wert automatisch nach Beendigung der Runde automatisch für alle qualifizierten Mannschaften gesetzt werden.',
- 'TEAM_SHORT' => 'Team Kurzbezeichnung',
- 'TEAM_SHORT_DOUBLE' => 'Die Kurzbezeichnung wird schon benutzt bzw. wurde doppelt vergeben.',
- 'TEAM_SHORT_EXPLAIN' => 'Maximal 10 stellige Kurzbezeichnung des Teams. Diese wird z.B. beim Export und unter Alle Tipps verwendet.',
- 'TEAM_SYMBOL' => 'Teamwappen',
- 'TEAM_SYMBOL_EXPLAIN' => 'Das optionale Teamwappen muss 28x28 Pixel groß sein.',
- 'TEAM_TAKEN' => 'Dieses Team existiert bereits in dieser Liga. Bitte wähle eine andere Teamnummer aus.',
- 'TEAM_UPDATE_FAILED' => 'Teameinstellungen konnten nicht aktualisiert werden.',
- 'TEAM_UPDATED' => 'Teameinstellungen erfolgreich aktualisiert.',
- 'TEAMS_NO_DELETE' => 'Du darfst kein Team löschen. Dies dürfen nur Gründungsmitglieder',
- 'TOO_LARGE_TEAM' => 'Die angegebene Team-ID muss numerisch (1-9999) sein. Bitte eine kleinere Teamnummer eingeben.',
- 'TOO_SHORT_TEAM_NAME' => 'Der Teamname muss mindesten 3 Zeichen lang sein.',
- 'TOO_SHORT_TEAM_SHORT' => 'Die Kurzbezeichnung muss mindesten 1 Zeichen lang sein.',
- 'TOO_SMALL_TEAM' => 'Die angegebene Team-ID muss numerisch (1-9999) sein. Bitte eine größere Teamnummer eingeben.',
-
- 'WRONG_DATA_TEAM_GROUP' => 'Keine gültige Gruppe für die Gruppenspiele. Gültige Gruppen sind A-Z.',
-));
-
+ 'Teams',
+ 'ACP_FOOTBALL_TEAMS_MANAGE' => 'Teams verwalten',
+ 'ACP_FOOTBALL_TEAMS_MANAGE_EXPLAIN' => 'Hier kannst du je Saison Teams einer Liga zuordnen. Du kannst bestehende löschen oder ändern oder eine neues Team erstellen, sowie Typ, Anzahl der Spieltage, Gewinne, Name und Kurzbezeichnug des Teams einstellen.',
+ 'ACP_FOOTBALL_TEAMS_MANAGEMENT' => 'Tipprunde-Team-Verwaltung',
+ 'ADD_TEAM' => 'Team zur Liga hinzufügen',
+
+ 'LEAGUE' => 'Liga',
+
+ 'MATCHDAY' => 'Spieltag',
+
+ 'NEW_TEAM' => 'Neues Team',
+ 'NO_LEAGUE' => 'Es existiert keine Liga in der Saison %1$s. Bitte zuerst eine Liga in der Saison %1$s erstellen.',
+ 'NO_MATCHDAYS' => 'Bitte zuerst Spieltage anlegen, da die Mannschaften bei KO-Runden einem Spieltag zugeordnet werden müssen.',
+ 'NO_SEASON' => 'Es existiert keine Saison. Bitte zuerst eine Saison erstellen.',
+ 'NO_TEAM' => 'Kein Team angegeben.',
+ 'NO_TEAMS_CREATED' => 'Es wurden bislang keine Teams erstellt.',
+ 'NO_TEAMSYMBOL' => 'Kein Logo',
+
+ 'PREDICTION_LEAGUE' => 'Tipprunde',
+
+ 'SEASON' => 'Saison',
+ 'SELECT_LEAGUE' => 'Liga auswählen',
+
+ 'TEAM' => 'Team',
+ 'TEAM_ADDED' => 'Team erfolgreich hinzugefügt.',
+ 'TEAM_AWAY' => 'Auswärts',
+ 'TEAM_CONFIRM_DELETE' => 'Bist du sicher, dass du %1$s aus Saison: %2$s Liga: %3$s mit allen Daten (Spieltage, Spielplänen und Tipps) löschen möchtest?',
+ 'TEAM_CREATE_FAILED' => 'Team konnte nicht erstellt werden.',
+ 'TEAM_CREATED' => 'Team erfolgreich erstellt.',
+ 'TEAM_CURRENT' => 'Aktuelles Team',
+ 'TEAM_DEF' => 'Bestehende Teams',
+ 'TEAM_DEF_EXPLAIN' => 'Dies sind Teams, die von dir oder einem anderen Administrator erstellt wurden. Du kannst Teameinstellungen ändern oder Teams löschen.',
+ 'TEAM_DELETE' => 'Team entfernen',
+ 'TEAM_DELETED' => 'Team gelöscht',
+ 'TEAM_DETAILS' => 'Teamdaten',
+ 'TEAM_EDIT_EXPLAIN' => 'Hier kannst du ein bestehendes Team bearbeiten. Du kannst den Namen, die Team-Kurzbezeichnung sowie das Team-Wappen ändern.',
+ 'TEAM_GROUP' => 'Gruppenspiele in Gruppe',
+ 'TEAM_GROUP_EXPLAIN' => 'Buchstabe der Gruppe, in der die Gruppenspiele bestritten werden.',
+ 'TEAM_MATCHES' => 'Spiele',
+ 'TEAM_NAME' => 'Teamname',
+ 'TEAM_NAME_DOUBLE' => 'Der Teamname wird schon benutzt bzw. wurde doppelt vergeben.',
+ 'TEAM_NUMBER' => 'Dies ist keine gültige Teamnummer. Die Teamnummer muss zwischen 0 und 65535 liegen.',
+ 'TEAM_ROUND' => 'Qualifiziert bis Spieltag',
+ 'TEAM_ROUND_EXPLAIN' => 'Spieltag bis zu dem sich das Team vorerst qualifiziert hat. Über diesen Parameter werden bei der Spielplanerstellung nur Mannschaften zur Auswahl angeboten, die sich auch für die netsprechende Runde qualifiziert haben. Über den Menüpunkt Qualifikation kann dieser Wert automatisch nach Beendigung der Runde automatisch für alle qualifizierten Mannschaften gesetzt werden.',
+ 'TEAM_SHORT' => 'Team Kurzbezeichnung',
+ 'TEAM_SHORT_DOUBLE' => 'Die Kurzbezeichnung wird schon benutzt bzw. wurde doppelt vergeben.',
+ 'TEAM_SHORT_EXPLAIN' => 'Maximal 10 stellige Kurzbezeichnung des Teams. Diese wird z.B. beim Export und unter Alle Tipps verwendet.',
+ 'TEAM_SYMBOL' => 'Teamwappen',
+ 'TEAM_SYMBOL_EXPLAIN' => 'Das optionale Teamwappen muss 28x28 Pixel groß sein.',
+ 'TEAM_TAKEN' => 'Dieses Team existiert bereits in dieser Liga. Bitte wähle eine andere Teamnummer aus.',
+ 'TEAM_UPDATE_FAILED' => 'Teameinstellungen konnten nicht aktualisiert werden.',
+ 'TEAM_UPDATED' => 'Teameinstellungen erfolgreich aktualisiert.',
+ 'TEAMS_NO_DELETE' => 'Du darfst kein Team löschen. Dies dürfen nur Gründungsmitglieder',
+ 'TOO_LARGE_TEAM' => 'Die angegebene Team-ID muss numerisch (1-9999) sein. Bitte eine kleinere Teamnummer eingeben.',
+ 'TOO_SHORT_TEAM_NAME' => 'Der Teamname muss mindesten 3 Zeichen lang sein.',
+ 'TOO_SHORT_TEAM_SHORT' => 'Die Kurzbezeichnung muss mindesten 1 Zeichen lang sein.',
+ 'TOO_SMALL_TEAM' => 'Die angegebene Team-ID muss numerisch (1-9999) sein. Bitte eine größere Teamnummer eingeben.',
+
+ 'WRONG_DATA_TEAM_GROUP' => 'Keine gültige Gruppe für die Gruppenspiele. Gültige Gruppen sind A-Z.',
+));
+
?>
\ No newline at end of file
diff --git a/language/de/info_acp_update.php b/language/de/info_acp_update.php
index cc9e9a7..486b229 100644
--- a/language/de/info_acp_update.php
+++ b/language/de/info_acp_update.php
@@ -1,138 +1,138 @@
- 'Spielplan aktualisieren',
- 'ACP_FOOTBALL_UPDATE_MANAGE' => 'Spielplan aktualisieren',
- 'ACP_FOOTBALL_UPDATE_MANAGE_EXPLAIN' => 'Hier kannst du deine Spielpläne, mit Daten von der Demoseite oder einer anderen Tipprunden-Seite aktualisieren oder neu erstellen. Wähle zuerst eine Tipprunden-Seite und Liga aus, von der das Update stammt. Nach Auswahl der Ziel-Liga bekommst du Abweichungen zwischen dieser Liga und dem Update angezeigt und kannst wählen welche Änderungen du übernehmen möchtest. Falls du eine neue Liga erstellen möchtest, werden alle Daten übernommen. ',
- 'ACP_FOOTBALL_UPDATE_MANAGEMENT' => 'Tipprunde-Spielplan aktualisieren',
-
- 'ALLOW_URL_FOPEN' => 'Die PHP-Einstellung allow_url_fopen erlaubt keinen Zugriff auf andere Seiten. Du musst die Updateidatei(en) downloaden und im Verzeichnis root/store speichern. ',
- 'CHOOSE_LEAGUES' => 'Quell- und Ziel-Spielplan wählen',
- 'CHOOSE_OTHER_LEAGUE' => 'Anderen Spielplan wählen',
- 'COMPARE_UPDATE' => 'Vergleichen mit Datenbank',
- 'CURRENT_VALUE' => 'Aktueller Wert',
-
- 'DB_INSERT_SEASON' => '%s Saison eingefügt. ',
- 'DB_INSERT_LEAGUE' => '%s Liga eingefügt. ',
- 'DB_INSERT_MATCHDAY' => '%s Spieltag eingefügt. ',
- 'DB_INSERT_MATCHDAYS' => '%s Spieltage eingefügt. ',
- 'DB_INSERT_TEAM' => '%s Mannschaft eingefügt. ',
- 'DB_INSERT_TEAMS' => '%s Mannschaften eingefügt. ',
- 'DB_INSERT_MATCH' => '%s Spiel eingefügt. ',
- 'DB_INSERT_MATCHES' => '%s Spiele eingefügt. ',
- 'DB_UPDATE_BIT_DELIVER' => '%s Spieltags-Abgabetermin mit Tippabgabe bis zum Spielbeginn korrigiert. ',
- 'DB_UPDATE_BIT_DELIVERIES' => '%s Spieltags-Abgabetermine mit Tippabgabe bis zum Spielbeginn korrigiert. ',
- 'DB_UPDATE_DELIVER' => 'Abgabetermin des Spieltags %s korrigiert. ',
- 'DB_UPDATE_DELIVERIES' => 'Abgabetermine des Spieltage %s korrigiert. ',
- 'DB_UPDATE_MATCHDAY' => '%s Spieltag aktualisiert. ',
- 'DB_UPDATE_MATCHDAYS' => '%s Spieltage aktualisiert. ',
- 'DB_UPDATE_TEAM' => '%s Mannschaft aktualisiert. ',
- 'DB_UPDATE_TEAMS' => '%s Mannschaften aktualisiert. ',
- 'DB_UPDATE_MATCH' => '%s Spiel aktualisiert. ',
- 'DB_UPDATE_MATCHES' => '%s Spiele aktualisiert. ',
- 'DB_UPDATE_STATUS_MATCHDAY' => 'An %s Spieltag wurde der Status angepasst. ',
- 'DB_UPDATE_STATUS_MATCHDAYS' => 'An %s Spieltagen wurde der Status angepasst. ',
- 'DUPLICATE_TEAM' => 'Diese Team-ID wurde doppelt zugeordnet. ',
-
- 'ERROR_OPEN_LEAGUE_XML' => 'Fehler! Die Liga XML-Datei konnte nicht geöffnet werden. Bitte den Link überprüfen. ',
- 'ERROR_OPEN_SEASON_XML' => 'Fehler! Die Saison XML-Datei konnte nicht geöffnet werden. Bitte den Link überprüfen. ',
- 'ERROR_READ_LEAGUE_XML' => 'Fehler! Die Liga XML-Datei konnte nicht gelesen werden. Bitte den Code oder die XML-Datei überprüfen. ',
- 'ERROR_READ_SEASON_XML' => 'Fehler! Die Saison XML-Datei konnte nicht gelesen werden. Bitte den Code überprüfen. ',
- 'ERROR_LOAD_LEAGUE_XML' => 'Fehler! Die Liga XML-Datei konnte nicht gelesen werden. Bitte die Datei %s überprüfen. ',
- 'ERROR_XML_CODE' => 'Fehlerhafter Code! Um die XML-Datei anzuzeigen, muss der korrekte Code beim Aufruf übergeben werden. ',
- 'ERROR_XML_CREATE' => 'Fehler! Die XML-Datei konnte nicht erzeugt werden. ',
-
- 'INSERT_LEAGUE' => 'Neue Liga anlegen',
- 'INSERT_MATCHDAYS' => 'Spieltage anlegen',
- 'INSERT_MATCHES' => 'Spielbegegnungen anlegen',
- 'INSERT_SEASON' => 'Neue Saison anlegen',
- 'INSERT_TEAMS' => 'Mannschaften anlegen',
-
- 'LEAGUE_SHORTCUT' => 'Liga Kürzel',
- 'LOAD' => 'Laden',
- 'LOG_FOOTB_UPDATE' => 'Football Prediction League Spielplan-Update » %s',
-
- 'MAP_TEAMS' => 'Teams zuordnen',
- 'MATCH_OF_GROUP' => 'Spiel in Gruppe',
- 'MATCHES' => 'Spiele',
- 'MISMATCH_LEAGUE_TYPE' => 'Der Ligatyp (%s) des Quell-Spielplans passt nicht zur vorhandenen Liga.',
- 'MISMATCH_MATCHDAYS' => 'Die Anzahl der Spieltage (%s) des Quell-Spielplans passt nicht zur vorhandenen Liga.',
- 'MISMATCH_DB_MATCHDAYS' => 'Die Anzahl der Spieltage (%s) in der Datenbank passt nicht zur vorhandenen Liga.',
- 'MISMATCH_MATCHES' => 'Die Anzahl der Spiele (%s) an einem Spieltag des Quell-Spielplans passt nicht zur vorhandenen Liga.',
- 'MISMATCH_DB_MATCHES' => 'Die Anzahl der Spiele (%s) in der Datenbank passt nicht zum Quell-Spielplan.',
- 'MISMATCH_MOM' => 'Die Anzahl der Spiele je Spieltag (%s) des Quell-Spielplans passt nicht zur vorhandenen Liga.',
- 'MISSING_TEAMS' => 'Folgende Team IDs müssen noch zugeordnet werden: %s',
-
- 'NEW_LEAGUE' => 'Neue Liga',
- 'NEW_LEAGUE_EXIST' => 'Die neue Liga %s existiert bereits. ',
- 'NEW_LEAGUE_EXPLAIN' => 'Bei einer neuen Liga bitte hier die Liganummer angeben. Bei einer bestehenden Liga darf diese Liganummer nicht überschrieben werden, da sonst eine eventuell bestehende Liga aktualisiert wird. ',
- 'NEW_TEAM' => 'Neues Team wird eingefügt',
- 'NO_DB_CHANGES' => 'Es wurden keine Änderungen durchgeführt. ',
- 'NO_DIFFERENCES' => 'Keine Unterschiede gefunden. Die Spielpläne sind identisch. ',
- 'NO_XML_LEAGUE' => 'Im Verzeichnis root/store konnte keine Update-Dateien gefunden werden. ',
- 'NO_XML_SEASON' => 'Es wurde keine Quell-Daten zum aktualisieren gefunden. ',
- 'NO_XML_ARRAY' => 'Fehler! Daten nicht mehr vorhanden. Bitte wiederhole die Aktion von vorne. ',
-
- 'OTHER_FIELDS' => 'Andere Felder',
-
- 'PREDICTION_LEAGUE' => 'Tipprunde',
-
- 'SEASON' => 'Saison',
- 'SELECT_EXPLAIN' => 'Nur die hier markierten Datensätze werden übernommen',
- 'SHOW_UPDATE' => 'Neue Liga anzeigen',
- 'SOURCE' => 'Quelle',
-
- 'TARGET' => 'Ziel',
- 'TEAM_MAPPING' => 'Teamzuordnung',
- 'TEAM_NAME_SHORT' => 'Kurzname',
- 'TRANSFER_TEAM' => 'Team übernehmen',
-
- 'UPDATE_LEAGUE' => 'Ligadaten aktualisieren',
- 'UPDATE_MATCHDAYS' => 'Spieltagsdaten aktualisieren',
- 'UPDATE_MATCHES' => 'Spielbegegnungen aktualisieren',
- 'UPDATE_ONLY_FINAL' => 'Nur endgültige Ergebnisse übernehmen',
- 'UPDATE_SAME_STATUS' => 'Ergebnisse mit gleichem Status aktualisieren',
- 'UPDATE_NEG_STATUS' => 'Negative Status übernehmen',
- 'UPDATE_TEAMS' => 'Mannschaftsdaten aktualisieren',
- 'UPDATE_THIS' => 'Änderungen in diesem Feld übernehmen',
-
- 'XML_SEASON_URL' => 'URL Quelle für das Update',
- 'XML_SEASON_URL_EXPLAIN' => 'URL zu football_xml_season.php oder localhost. Bei localhost wird nach league_* Datei in root/store gesucht. ',
-));
-
+ 'Spielplan aktualisieren',
+ 'ACP_FOOTBALL_UPDATE_MANAGE' => 'Spielplan aktualisieren',
+ 'ACP_FOOTBALL_UPDATE_MANAGE_EXPLAIN' => 'Hier kannst du deine Spielpläne, mit Daten von der Demoseite oder einer anderen Tipprunden-Seite aktualisieren oder neu erstellen. Wähle zuerst eine Tipprunden-Seite und Liga aus, von der das Update stammt. Nach Auswahl der Ziel-Liga bekommst du Abweichungen zwischen dieser Liga und dem Update angezeigt und kannst wählen welche Änderungen du übernehmen möchtest. Falls du eine neue Liga erstellen möchtest, werden alle Daten übernommen. ',
+ 'ACP_FOOTBALL_UPDATE_MANAGEMENT' => 'Tipprunde-Spielplan aktualisieren',
+
+ 'ALLOW_URL_FOPEN' => 'Die PHP-Einstellung allow_url_fopen erlaubt keinen Zugriff auf andere Seiten. Du musst die Updateidatei(en) downloaden und im Verzeichnis root/store speichern. ',
+ 'CHOOSE_LEAGUES' => 'Quell- und Ziel-Spielplan wählen',
+ 'CHOOSE_OTHER_LEAGUE' => 'Anderen Spielplan wählen',
+ 'COMPARE_UPDATE' => 'Vergleichen mit Datenbank',
+ 'CURRENT_VALUE' => 'Aktueller Wert',
+
+ 'DB_INSERT_SEASON' => '%s Saison eingefügt. ',
+ 'DB_INSERT_LEAGUE' => '%s Liga eingefügt. ',
+ 'DB_INSERT_MATCHDAY' => '%s Spieltag eingefügt. ',
+ 'DB_INSERT_MATCHDAYS' => '%s Spieltage eingefügt. ',
+ 'DB_INSERT_TEAM' => '%s Mannschaft eingefügt. ',
+ 'DB_INSERT_TEAMS' => '%s Mannschaften eingefügt. ',
+ 'DB_INSERT_MATCH' => '%s Spiel eingefügt. ',
+ 'DB_INSERT_MATCHES' => '%s Spiele eingefügt. ',
+ 'DB_UPDATE_BIT_DELIVER' => '%s Spieltags-Abgabetermin mit Tippabgabe bis zum Spielbeginn korrigiert. ',
+ 'DB_UPDATE_BIT_DELIVERIES' => '%s Spieltags-Abgabetermine mit Tippabgabe bis zum Spielbeginn korrigiert. ',
+ 'DB_UPDATE_DELIVER' => 'Abgabetermin des Spieltags %s korrigiert. ',
+ 'DB_UPDATE_DELIVERIES' => 'Abgabetermine des Spieltage %s korrigiert. ',
+ 'DB_UPDATE_MATCHDAY' => '%s Spieltag aktualisiert. ',
+ 'DB_UPDATE_MATCHDAYS' => '%s Spieltage aktualisiert. ',
+ 'DB_UPDATE_TEAM' => '%s Mannschaft aktualisiert. ',
+ 'DB_UPDATE_TEAMS' => '%s Mannschaften aktualisiert. ',
+ 'DB_UPDATE_MATCH' => '%s Spiel aktualisiert. ',
+ 'DB_UPDATE_MATCHES' => '%s Spiele aktualisiert. ',
+ 'DB_UPDATE_STATUS_MATCHDAY' => 'An %s Spieltag wurde der Status angepasst. ',
+ 'DB_UPDATE_STATUS_MATCHDAYS' => 'An %s Spieltagen wurde der Status angepasst. ',
+ 'DUPLICATE_TEAM' => 'Diese Team-ID wurde doppelt zugeordnet. ',
+
+ 'ERROR_OPEN_LEAGUE_XML' => 'Fehler! Die Liga XML-Datei konnte nicht geöffnet werden. Bitte den Link überprüfen. ',
+ 'ERROR_OPEN_SEASON_XML' => 'Fehler! Die Saison XML-Datei konnte nicht geöffnet werden. Bitte den Link überprüfen. ',
+ 'ERROR_READ_LEAGUE_XML' => 'Fehler! Die Liga XML-Datei konnte nicht gelesen werden. Bitte den Code oder die XML-Datei überprüfen. ',
+ 'ERROR_READ_SEASON_XML' => 'Fehler! Die Saison XML-Datei konnte nicht gelesen werden. Bitte den Code überprüfen. ',
+ 'ERROR_LOAD_LEAGUE_XML' => 'Fehler! Die Liga XML-Datei konnte nicht gelesen werden. Bitte die Datei %s überprüfen. ',
+ 'ERROR_XML_CODE' => 'Fehlerhafter Code! Um die XML-Datei anzuzeigen, muss der korrekte Code beim Aufruf übergeben werden. ',
+ 'ERROR_XML_CREATE' => 'Fehler! Die XML-Datei konnte nicht erzeugt werden. ',
+
+ 'INSERT_LEAGUE' => 'Neue Liga anlegen',
+ 'INSERT_MATCHDAYS' => 'Spieltage anlegen',
+ 'INSERT_MATCHES' => 'Spielbegegnungen anlegen',
+ 'INSERT_SEASON' => 'Neue Saison anlegen',
+ 'INSERT_TEAMS' => 'Mannschaften anlegen',
+
+ 'LEAGUE_SHORTCUT' => 'Liga Kürzel',
+ 'LOAD' => 'Laden',
+ 'LOG_FOOTB_UPDATE' => 'Football Prediction League Spielplan-Update » %s',
+
+ 'MAP_TEAMS' => 'Teams zuordnen',
+ 'MATCH_OF_GROUP' => 'Spiel in Gruppe',
+ 'MATCHES' => 'Spiele',
+ 'MISMATCH_LEAGUE_TYPE' => 'Der Ligatyp (%s) des Quell-Spielplans passt nicht zur vorhandenen Liga.',
+ 'MISMATCH_MATCHDAYS' => 'Die Anzahl der Spieltage (%s) des Quell-Spielplans passt nicht zur vorhandenen Liga.',
+ 'MISMATCH_DB_MATCHDAYS' => 'Die Anzahl der Spieltage (%s) in der Datenbank passt nicht zur vorhandenen Liga.',
+ 'MISMATCH_MATCHES' => 'Die Anzahl der Spiele (%s) an einem Spieltag des Quell-Spielplans passt nicht zur vorhandenen Liga.',
+ 'MISMATCH_DB_MATCHES' => 'Die Anzahl der Spiele (%s) in der Datenbank passt nicht zum Quell-Spielplan.',
+ 'MISMATCH_MOM' => 'Die Anzahl der Spiele je Spieltag (%s) des Quell-Spielplans passt nicht zur vorhandenen Liga.',
+ 'MISSING_TEAMS' => 'Folgende Team IDs müssen noch zugeordnet werden: %s',
+
+ 'NEW_LEAGUE' => 'Neue Liga',
+ 'NEW_LEAGUE_EXIST' => 'Die neue Liga %s existiert bereits. ',
+ 'NEW_LEAGUE_EXPLAIN' => 'Bei einer neuen Liga bitte hier die Liganummer angeben. Bei einer bestehenden Liga darf diese Liganummer nicht überschrieben werden, da sonst eine eventuell bestehende Liga aktualisiert wird. ',
+ 'NEW_TEAM' => 'Neues Team wird eingefügt',
+ 'NO_DB_CHANGES' => 'Es wurden keine Änderungen durchgeführt. ',
+ 'NO_DIFFERENCES' => 'Keine Unterschiede gefunden. Die Spielpläne sind identisch. ',
+ 'NO_XML_LEAGUE' => 'Im Verzeichnis root/store konnte keine Update-Dateien gefunden werden. ',
+ 'NO_XML_SEASON' => 'Es wurde keine Quell-Daten zum aktualisieren gefunden. ',
+ 'NO_XML_ARRAY' => 'Fehler! Daten nicht mehr vorhanden. Bitte wiederhole die Aktion von vorne. ',
+
+ 'OTHER_FIELDS' => 'Andere Felder',
+
+ 'PREDICTION_LEAGUE' => 'Tipprunde',
+
+ 'SEASON' => 'Saison',
+ 'SELECT_EXPLAIN' => 'Nur die hier markierten Datensätze werden übernommen',
+ 'SHOW_UPDATE' => 'Neue Liga anzeigen',
+ 'SOURCE' => 'Quelle',
+
+ 'TARGET' => 'Ziel',
+ 'TEAM_MAPPING' => 'Teamzuordnung',
+ 'TEAM_NAME_SHORT' => 'Kurzname',
+ 'TRANSFER_TEAM' => 'Team übernehmen',
+
+ 'UPDATE_LEAGUE' => 'Ligadaten aktualisieren',
+ 'UPDATE_MATCHDAYS' => 'Spieltagsdaten aktualisieren',
+ 'UPDATE_MATCHES' => 'Spielbegegnungen aktualisieren',
+ 'UPDATE_ONLY_FINAL' => 'Nur endgültige Ergebnisse übernehmen',
+ 'UPDATE_SAME_STATUS' => 'Ergebnisse mit gleichem Status aktualisieren',
+ 'UPDATE_NEG_STATUS' => 'Negative Status übernehmen',
+ 'UPDATE_TEAMS' => 'Mannschaftsdaten aktualisieren',
+ 'UPDATE_THIS' => 'Änderungen in diesem Feld übernehmen',
+
+ 'XML_SEASON_URL' => 'URL Quelle für das Update',
+ 'XML_SEASON_URL_EXPLAIN' => 'URL zu football_xml_season.php oder localhost. Bei localhost wird nach league_* Datei in root/store gesucht. ',
+));
+
?>
\ No newline at end of file
diff --git a/language/de/permissions_football.php b/language/de/permissions_football.php
index bbc2b49..15db88f 100644
--- a/language/de/permissions_football.php
+++ b/language/de/permissions_football.php
@@ -1,39 +1,39 @@
- 'Fussball',
- 'ACL_U_USE_FOOTBALL' => 'Kann Football Extension verwenden',
- 'ACL_A_FOOTBALL_CONFIG' => 'Kann Tipprundeneinstellung ändern',
- 'ACL_A_FOOTBALL_DELETE' => 'Kann Spielpläne löschen',
- 'ACL_A_FOOTBALL_EDITBETS' => 'Kann alle Tipps ansehen, eingeben und ändern',
- 'ACL_A_FOOTBALL_PLAN' => 'Kann Spielpläne erstellen und ändern',
- 'ACL_A_FOOTBALL_RESULTS' => 'Kann endgültige Spielergebnisse eingeben, ändern und löschen',
- 'ACL_A_FOOTBALL_POINTS' => 'Kann Kontodaten eingeben, ändern und löschen',
-
- 'ROLE_ADMIN_FOOTBALL' => 'Tipprunden Administrator',
- 'ROLE_DESCRIPTION_ADMIN_FOOTBALL' => 'Kann endgültige Spielergebnisse eingeben und ändern.',
-));
-
+ 'Fussball',
+ 'ACL_U_USE_FOOTBALL' => 'Kann Football Extension verwenden',
+ 'ACL_A_FOOTBALL_CONFIG' => 'Kann Tipprundeneinstellung ändern',
+ 'ACL_A_FOOTBALL_DELETE' => 'Kann Spielpläne löschen',
+ 'ACL_A_FOOTBALL_EDITBETS' => 'Kann alle Tipps ansehen, eingeben und ändern',
+ 'ACL_A_FOOTBALL_PLAN' => 'Kann Spielpläne erstellen und ändern',
+ 'ACL_A_FOOTBALL_RESULTS' => 'Kann endgültige Spielergebnisse eingeben, ändern und löschen',
+ 'ACL_A_FOOTBALL_POINTS' => 'Kann Kontodaten eingeben, ändern und löschen',
+
+ 'ROLE_ADMIN_FOOTBALL' => 'Tipprunden Administrator',
+ 'ROLE_DESCRIPTION_ADMIN_FOOTBALL' => 'Kann endgültige Spielergebnisse eingeben und ändern.',
+));
+
?>
\ No newline at end of file
diff --git a/language/en/email/footb_board_remember.txt b/language/en/email/footb_board_remember.txt
index 9c0f64e..88c6b32 100644
--- a/language/en/email/footb_board_remember.txt
+++ b/language/en/email/footb_board_remember.txt
@@ -1,10 +1,10 @@
-
-Hallo {SITENAME},
-the following users have received a reminder e-mail:
-
-{REMEMBER_LIST}
-
-
-Link to {SITENAME}: {U_BOARD}.
-
-{EMAIL_SIG}
+
+Hallo {SITENAME},
+the following users have received a reminder e-mail:
+
+{REMEMBER_LIST}
+
+
+Link to {SITENAME}: {U_BOARD}.
+
+{EMAIL_SIG}
diff --git a/language/en/email/footb_send_remember.txt b/language/en/email/footb_send_remember.txt
index bdd32cf..73f870c 100644
--- a/language/en/email/footb_send_remember.txt
+++ b/language/en/email/footb_send_remember.txt
@@ -1,10 +1,10 @@
-
-Hallo {USERNAME},
-you have not yet bet {MATCHDAY}. matchday.
-Please bet until {LEAGUE} delivery {DELIVERY}.
-
-
-Link to {SITENAME}: {U_BOARD}.
-
-
-{EMAIL_SIG}
+
+Hallo {USERNAME},
+you have not yet bet {MATCHDAY}. matchday.
+Please bet until {LEAGUE} delivery {DELIVERY}.
+
+
+Link to {SITENAME}: {U_BOARD}.
+
+
+{EMAIL_SIG}
diff --git a/language/en/football.php b/language/en/football.php
index d4934bb..3a6f5d4 100644
--- a/language/en/football.php
+++ b/language/en/football.php
@@ -43,8 +43,6 @@ $lang = array_merge($lang, array(
'FOOTB_REM_F_EXPLAIN' => 'Send reminder to your first email address, if you should not have bet?',
'FOOTB_REM_S' => 'Send Prediction League reminder to second email adress',
'FOOTB_REM_S_EXPLAIN' => 'Send reminder to your second email address, if you should not have bet?',
- 'YES' => 'Ja',
- 'NO' => 'Nein',
'ADD_NEW_TEAM' => 'The team was added to the WebTip. ',
'ALL_BETS' => 'All bets',
@@ -225,6 +223,7 @@ $lang = array_merge($lang, array(
'NO_BETS_SAVED' => 'No bets saved!',
'NO_CHANGES' => 'No changes',
'NO_DATA' => 'No data available!',
+ 'NO_GUEST_VIEW' => 'Guests are not allowed to view the prediction league. ',
'NO_GUESTTEAM' => 'The guest team chosen by you does not exist. ',
'NO_HIST' => 'No previous comparisons exist for these two teams in the database. ',
'NO_HOMEMATCHES_TEAM' => 'This team has not played at home this season yet. ',
@@ -330,6 +329,8 @@ $lang = array_merge($lang, array(
'RULES_EXPLAIN' => 'Here are only the technical basic conditions of this WebTip listed. ',
'SAMESAVED' => 'Your %d Granny-bets were saved successfully! A bet was automatically modified. ',
'SAVE' => 'Save',
+ 'SAVE_PREDICTION' => 'Save prediction',
+ 'SAVE_RESULTS' => 'Save results',
'SCORED' => 'Scored',
'SEASON' => 'Season',
'SEC_LEG_ERROR' => 'Second leg does not exist',
diff --git a/language/en/help_football.php b/language/en/help_football.php
index c87bb16..f49bd29 100644
--- a/language/en/help_football.php
+++ b/language/en/help_football.php
@@ -1,503 +1,502 @@
- array(
- array(
- 0 => '--',
- 1 => 'First steps'
- ),
- array(
- 0 => 'How do I install a league?',
- 1 => 'When you install this Extension any fixtures are included. Fixture lists can be loaded by "update fixture lists" into the database.
-For details, see under this heading.
-After installing a fixture list, the settings of the league should be processed and the delivery dates of the match days checked and adjusted if necessary.
-Select manage league to put single users or group members to the prediction league. '
- ),
- array(
- 0 => 'Other settings?',
- 1 => 'For handle the prediction league(s) you should review and assigned administrative privileges to the members. For automatic sending of
-reminder emails you can set up an external Cornjob. Look that up in the various elements of this help.'
- ),
- array(
- 0 => '--',
- 1 => 'General'
- ),
- array(
- 0 => 'Which prediction leagues are supported?',
- 1 => 'All prediction leagues on a championship or KO Round aim. So, soccer leagues, cup competitions, Champions League, Champions League,
-European Championship or World Cup. Even a mix of different competitions is supported, to this table and the statistics show, however, nothing meaningful.
-Only through the point mode Handball is the Extension and other leagues are not suitable for. '
- ),
- array(
- 0 => 'What rights exist in the Extension ',
- 1 => 'a_football_results = Can enter, modify and delete final game results
-a_football_editbets = Can See in the admin area to enter all the tips, and change it
-a_football_plan = Unable to create change game plans. Schedule and manage delete (without) and knockout rounds to determine winners
-a_football_delete = Can Fixtures and delete parts of it. Delete permission in the schedule management
-a_football_config = Can change prediction league settings: prediction league configuration
-a_football_points = Can set, change and delete points for Ultimate Points
-u_use_football = Can use Prediction League.'
- ),
- array(
- 0 => 'What roles exist in this Extension? ',
- 1 => 'The football Administrator has just the right match results enter final, otherwise no admin rights. '
- ),
- array(
- 0 => 'Which rights were roles assigned to existing ones? ',
- 1 => 'The default administrator can enter final Scores, change and delete them.
-The Global Administrator has all the rights of MODS. '
- ),
- array(
- 0 => 'Which custom profile fields have been generated by the Extension? ',
- 1 => 'footb_email = additional second email address for email alerts
-footb_rem_f = switch for sending the reminder email to the primary e-mail address.
-footb_rem_s = switch for sending the reminder email to the second E-mail address. '
- ),
- array(
- 0 => 'How do I activate the reminder e-mail function? ',
- 1 => 'In the admin area in the Prediction League functionality the mail reminder cron job and the next run must be activated.
-The cron job is run on the first access after this date and sends an e-mail reminder for the missing tip duties that lie in the period 24-48 hours after cron date .
-If not sufficient accesses the page, the cron job should automatically run on script "YOUR_URL/cron.php?cron_type=football.football.cron.task.football_remember".
-The ship of the email takes place only once . After calling up the cron job, the next scheduled is automatically planned for the following day .
-With the appended parameters " & mode = test & days = n " can be tested the shipment for the offset to n days predictions . Only mails to board email address will be shipped .
- In ACP a user defined prediction leagues code is to define.
-This code XXX must be a cronjob as www.cronjob.de by calling the script "/ football / cron_remember.php? Code = XXX" start.
-The call must be at least 24 hours and maximum 33 hours before the final matchday of the place. When multiple calls during the period reminder email will
-be sent again.
-Is the Tip levy as of Friday 20:00 clock must call on Thursday between Thu 11 and 20 clock made.
-If the cron job running daily at 13:00 clock, all the deadlines on the following day zwischen 13:00 und 22 clock and no one considered twice. '
- ),
- array(
- 0 => 'Who gets a reminder ',
- 1 => 'If enabled, reminder function get all the tipsters who play a match with status 0 not fully tapped have to hand
-in on a reminder to the shared (n) e-mail address (es).
-In addition, an e-mail with the recipient list to the Board e-mail sent (but only if at least one reminder was sent).
-The documentation process is logged to the log. '
- ),
- array(
- 0 => '--',
- 1 => 'Tip Deadline '
- ),
- array(
- 0 => 'Tip When the tax is suspended? ',
- 1 => 'As soon as someone Data from the prediction leagues will retrieve checks that match status 0 and expired tax time exist with. The to closing
-matches will state 1 and suspend for bet. '
- ),
- array(
- 0 => 'The match or matches are not delivery date closed to ',
- 1 => 'The tax date is the current host time + time difference between board and host time zone compared. If your host in the set board zone is
-located, it must be time zone in the prediction leagues settings also deposited be. '
- ),
- array(
- 0 => 'I can a matchday not edit the submission date ',
- 1 => 'You have the league settings "tip submit on each game start" is selected with. This automatically submitting time based games managed. the if
-you remember the game plan preparation, are in should "tip tax until their game starts" only after recognition of the entire game board set is. Then, the
-delivery time is automatically corrected. '
- ),
- array(
- 0 => 'The game has already begun, but I can not type yet ',
- 1 => 'The match was not yet closed, since the charge time or in the future, and the first game but has already started. Saving the charge time in
-the match day is currently the Time synchronized with the seasons and not reviewed. '
- ),
- array(
- 0 => 'checks to save the match day settings ',
- 1 => 'When saving a match day, the system checks whether the status of the game day must be corrected. If the 1 . release date in the future,
-the status of the match day 0 set to, he is in the past, 3 the status depending on the status of its games to 1, 2 or Set. '
- ),
- array(
- 0 => 'How do I make further deadlines in a game day one? ',
- 1 => 'This is only possible if "tip tax until their game starts" in the league settings to "no". Then, two more deadlines deposited will match the.
-The games to 2 deadline to be closed must schedule manual status -1 set to be on the. For the third Deadline Games is the status of the manually set to -2. '
- ),
- array(
- 0 => 'What does tip tax until their game starts',
- 1 => 'In this mode, each game for the start of the game, typed up by one. When you close the tip submit a game is determined whether any" open
-"games Matchday exist in the. If so, the charge time of the match day to the next start of the game is set, otherwise it remains on the last game and the
-match began with the congestion gets first Predictions for a fixed time before each game is not currently supported. '
- ),
- array(
- 0 => '--',
- 1 => 'Operating '
- ),
- array(
- 0 => 'How to save final scores? ',
- 1 => 'Final scores can only be stored in the admin area. Only the results of the selected matches are saved. '
- ),
- array(
- 0 => 'I can not enter final scores ',
- 1 => 'On prediction leagues functionalities "enter final scores only after match" final scores could entered only after the match (90 minutes).
-It is not possibleto enter final scores for matches with status 0. For these matches with status 0, please check delivery time. '
- ),
- array(
- 0 => 'I want to save a preliminary results',
- 1 => 'Preliminary results can be entered only in the User area. '
- ),
- array(
- 0 => 'Why do I get different leagues after calling score page? ',
- 1 => 'Calling the page "scores" the league which longest waits for a scores is automatically displayed. '
- ),
- array(
- 0 => 'Which stage status is set after saving final scores? ',
- 1 => 'After saving final scores, the stage status according to the matches is set.
-When all the matches have a status greater than 2, the stage status 3 is set up. Otherwise, stage status ist set to the minimum match status> = 0. '
- ),
- array(
- 0 => 'When rankings are updated?',
- 1 => 'After saving final or preliminary scores in the user or admin area, the stage ranking is updated. Then, the
-overall ranking is calculated and the places are stored in stage data. The remaining data in the overall ranking are not stored, they are currently calculated.
-For stage status 0 or 1, the ranking will be deleted for this stage. The ranking status is set identical to stage status. '
- ),
- array(
- 0 => 'How do I delete final scores? ',
- 1 => 'Clear final score field(s) or choose delete option and final score ist deleted for this match. The match state will be set to 1. '
- ),
- array(
- 0 => 'How do I get games from rating? ',
- 1 => 'Set switch "without rating" before saving the match. no one will receive points for that match. If there is
-no result yet, the game will be saved with state 4, preliminary scores will be state 5, final scores without rating will be state 6. '
- ),
- array(
- 0 => 'Who can see all tips?',
- 1 => 'User with admin rights a_football_editbets = "Can the admin section view, enter all tips and change" can see and edit all tips of all users in the admin area. '
- ),
- array(
- 0 => 'What is Tip entry in the admin area to observe the case?',
- 1 => 'Will to games already available results stored Tips is ranked does not automatically update the. The rankings take into account new tip not.
-The display the individual tips and "All Reviews" will be amended tips and the resulting points displayed. If the modified tips rankings included are the in,
-match the results of the match day and the subsequent store again, the rankings newly calculated that. games must not selected or altered it. '
- ),
- array(
- 0 => 'What is "KO-round winners identify"? ',
- 1 => 'order for the schedule management only teams to choose from in the corresponding round reaches have also must match the team will be registered
-to the team to remain competitive. That, and the transfer to third runners-up teams in the Champions League group stage in the Champions League can be
-performed automatically on this page. As in particular in the calculation of group placement, not all rules were taken into account in the system,
-any errors are corrected manually. This will involve teams of the status message is logged in.
-If '
- ),
- array(
- 0 => 'How to determine the winner of a knock-out round? ',
- 1 => 'For each knockout games, or knock-out rounds with a return game, it is sufficient to match the determination to select where these games have
-taken place as the target game day. Matchday to choose the last to which the team at least competition remains. '
- ),
- array(
- 0 => 'How do I determine the group winner and second group ',
- 1 => 'In Group Play are all group match to determine select and the last match day round as the target match day to be deposited next to the. The
-"determination on the basis of table space for group games" to choose and the place to which the teams qualify. If teams other league transferred to one in ,
-League is the corresponding selected, otherwise not. If no league selected, place and match ignored and not transferred Team. '
- ),
- array(
- 0 => 'The teams are already entered in the next round ',
- 1 => 'Have Schedule the formulas W (Winner) or L (Looser) deposited in, is already in the display of the encounter between the winners and losers of
-the formula stored in lot (s) are determined and entered in the schedule. Nevertheless, you should "round KO winner determined "called to be, otherwise when
-you saved the game encounter in the game schedule (in game transfer or other change), the teams to choose from and are not therefore be deleted.
-The formula G does not lead to an automatic identification, as currently used in the determination of group placement, not all special rules are included in
-the smallest up. The determination must be in the admin section on "knock-out rounds to determine winners" will be implemented and monitored. '
- ),
- array(
- 0 => 'without Tipster Tips still get points ',
- 1 => 'You have the league settings stored in that Nichttipper the last of the points to get automatically. '
- ),
- array(
- 0 => '--',
- 1 => 'Schedule Administration '
- ),
- array(
- 0 => 'How do I create a new Schedule? ',
- 1 => 'To Schedule creation is each page compulsory for bottom-up work off of. In particular Games is the correct filing of the number of match days
-and observed, so the generation process of schedule creation works in the. It was only after generation of the games in Fixtures can Tipper be included as
-previously to the number of games are missing information. Just schedule the switch "tip tax until their game starts" only after generation of the games in
-the visible. This switch should be made only after the deposit of the participating teams and all game dates Yes set to be to ensure that all deadlines set
-will be able to automatically match the in. '
- ),
- array(
- 0 => 'How do I set a new season? ',
- 1 => 'Under "Seasons Manage" you create a new season with the year, in the season ends. The season
-2010/2011 at the season 2011 so as to create. On the following page will then set appropriate default values. '
- ),
- array(
- 0 => 'How do I set up a new league? ',
- 1 => 'Under "leagues manage" you create a new league with an indication of a league point. The league number
-should apply to the seasons the same award and are over league one must run away within the season to be>. The first league so should always be the League
-number one, the second league, the league number two always get. '
- ),
- array(
- 0 => 'How do I set up a match that? ',
- 1 => 'button to generate. In a new league must match the first the missing when the match day one from the standard ". Matchday" get to name
-different, so the field is the appropriate fill, otherwise not. If a submission date filed, participating teams, this Abgabetemin in the generation of the
-start of the game used as. '
- ),
- array(
- 0 => 'How I am in a league team? ',
- 1 => 'knockout rounds before the case must necessarily match days are recorded, so the team can be assigned to a match, to which the team will remain
-in the competition. The team ID of a team leagues and should be chosen identical across all seasons over so that the statistics work in historical
-comparisons.
-All gif files in the directory / football / images flags / are selecting a team emblem or a flag to display. The arms should be the size 28px x 28px have.
-It is pointed out, the club crest copyrights are subject to, and not the rights holder used to be allowed the consent without. '
- ),
- array(
- 0 => 'How do I create the teams participating in the game schedule? ',
- 1 => 'After all match days and men were recorded, the database entries for the participating teams will be generated. was before the match a deadline
-deposited with, this is all the games of the match day as the game begins deposited with. Did not have any team a game pairing deposited in, then in the
-summary instead of the Team name a possibly deposited calculation formula. '
- ),
- array(
- 0 => 'Can a game plan gradually build me? ',
- 1 => 'Yes, you can use during the season more match in the league to add. This one carries the "Leagues Manage the change in the number of match days,
-and then goes to "match" manage where you can to match messages generate new ones. and then edit. After entering the deadlines and number of games in
-knockout rounds, have the games still be generated schedule in . To do this select new added match from and click on the generation button. The lack of
-games will be generated and also missing empty entry all tipsters in the tip table. '
- ),
- array(
- 0 => 'When can a league Tipper take in? ',
- 1 => 'games on the schedule Tipper can be added after creating the first place. Only then is the function "Manage Leagues" released. '
- ),
- array(
- 0 => 'Can I also delete match? ',
- 1 => 'Yes, chosen either match "match Manage" on the "Delete" or the last match by the number of match days in the
-league, and then reduces the "match on" Manage and there is then pressed the button displayed. Deleted is always the match with all the games and all tips. '
- ),
- array(
- 0 => 'can not play games or nobles I collect? ',
- 1 => 'If you have created a knock-out round, you have the number of games at each match deposit. Only then Button appears to complete the game board
-game board Manage. '
- ),
- array(
- 0 => 'What’s in a game installation? ',
- 1 => 'change a game date is after in "tip-out to each start of the game " back to the status of the game and the match day and there deposited
-deadline adapted to. '
- ),
- array(
- 0 => 'What are special tips? ',
- 1 => 'special tips are single tips with separate scoring. You can be a to a league season to be defined and / or flow thus either in the scoring at
-or in the overall standings one. Matchday the issue to a special tip can match are stored individually, but it should be clear. '
- ),
- array(
- 0 => 'What answer - and profit opportunities are available? ',
- 1 => 'on the question type is more in response to the selection of a team in the league, a number or text available. The result is still a number of
-values are in addition, each by " ; be separated. "Thus, with a multiple-answer questions can be deposited Choice. If question type 3 or 4 in question,
-the choice of A: B: C: ... H: be marked with the appear in the typing and Score input automatically corresponding values in a dropdown box. '
- ),
- array(
- 0 => 'What a question and answer opportunity question type 1? ',
- 1 => 'By type of question one can in response and outcome, only one team from the League team list will be selected. The maximum score is only
-awarded in full compliance, otherwise gives the Tipper 0 points.
-Sample question: Who will be the Champion '
- ),
- array(
- 0 => 'What a question and answer opportunity type of question 2? ',
- 1 => 'type of question 2, the question type 1, but the result in writing (or a more team-IDs separated by ";" separately entered). The maximum score
-is awarded if the answer to the selection team associated ID value from the result of a match.
-Sample question: Name a relegated team (ranked 16-18 on the seasons end) '
- ),
- array(
- 0 => 'What a question and answer opportunity type of question 3? ',
- 1 => 'type of question 3 In response and result only value (text or numbers) are stored one. The maximum score is awarded if the answer agrees with
-the result, otherwise gives the Tipper 0 points.
-Sample question: How much red (no yellow-red) cards are given to this match? A = 0 B = 1 C = 2 D = more than 2 '
- ),
- array(
- 0 => 'What a question and answer opportunity> type of question 4? ',
- 1 => 'type of question 4, In response a number or a text and as a result of more numbers or more texts (but not a combination of numbers and text)
-by ";" to be entered separately. The maximum score is awarded if the number or the text in the response with a value of the outcome of matches.
-Sample question: Hannover 96 = B = A rises from the cup gets C = C = is not playing international German champions'
- ),
- array(
- 0 => 'What a question and answer opportunity type of question 5?',
- 1 => 'If question type 5 can result in response and only one number can be stored. The maximum points will be awarded if the answer to the outcome
-is in accordance with, or receives maximum number of tipsters, the less the absolute difference between the response and result, no negative points.
-Sample question: How many goals are in this match? '
- ),
- array(
- 0 => 'Which ranking is flowing Special Tip a one?',
- 1 => 'If delivery and evaluation Matchday be identical, scoring runs in the match score and a ranking. If the evaluation Matchday chosen different,
-special tip flows in the overall classification and ranking one. '
- ),
- array(
- 0 => 'I Can Seasonal Tips Creating while? ',
- 1 => 'Yes, but only to match which can still be typed. Stored special tips can be moved even then. However, the status of special tips examined
-separately and corrected, if necessary, as with a shift to a no longer tippbaren match the status of the Special tips will automatically be adjusted not.'
- ),
- array(
- 0 => 'When special tip is one of the tip release blocked?',
- 1 => 'Special tips will be the first delivery date of a match day for the tip tax agreements with. If we want such a Champion tip on 3.Spieltag make
-up, it sets If the levy on Matchday 3 and evaluation on the final day. '
- ),
- array(
- 0 => '--',
- 1 => 'prediction leagues configuration '
- ),
- array(
- 0 => 'What time zone do I have to tip round set? ',
- 1 => 'If the host the same time zone of the forum is, is betting the same time zone as the forum to vote in the. If the host in a different time
-zone, then the time zone of the betting difference to set according to the . This is necessary because of supply and result input of the games system time
-functions are used. '
- ),
- array(
- 0 => 'Why is betting code uses the? ',
- 1 => 'To the memory function via cron_remember.php not outsiders can be misused, is the call of the parameters with the betting deposit code compared
-code. Take for instance the code in the admin area deposited 19032038, so should the cronjob cron_remember.php? code = for the reminder call 19,032,038th '
- ),
- array(
- 0 => 'How do I show the rankings in the main view, clearly shape the?',
- 1 => 'With the switch "Table Tipper in the overview Rankings", the match day overall list will be limited. If the rank by the not notified of an ad
-to run, so the placement will be added to the rankings below. '
- ),
- array(
- 0 => '--',
- 1 => 'Account overview / Ultimate Points (UP)'
- ),
- array(
- 0 => 'It is necessary of the Ultimate Points Extension?',
- 1 => 'No if you liked to indicate a balance, nevertheless, the Tippern of your tip round, you should instal the Ultimate Points Extension.
-Independent of Ultimate Points Extension league profits are credited to the account in phpBB3 football Extension and the Admin can register applications, payments
-and payment.'
- ),
- array(
- 0 => 'What does cause the setting "Ultimate Points integrate" in the prediction league functionalities in the Administration?',
- 1 => 'This setting has only consequences on the automatic settlement of the profits in the balance of Ultimate Points. Here one can choose
-whether profits, points or nothing from phpBB3 football Extension should flow in onto the Ultimate Points balance. The settlement of the achieved prediction
-league points can be steered, in addition, still about a factor. '
- ),
- array(
- 0 => 'Can see other my account overview?',
- 1 => 'Only who owns suitable rights, the account overview of another Tippers can question in the prediction league area.'
- ),
- array(
- 0 => 'How are wagers, deposits and payment and profits registered?',
- 1 => 'Wagers charge the account and the balance of UP and can be compensated by payments again. In the season credited profits can be paid by the
- account and the payment likewise charge the balance in UP. Profits are registered automatically about the profit distribution of the prediction
- league with the memory of the play results with the account and UP (with sedate counter). With renewed storing away of results the old reservations
- are cancelled and booked anew. Should results already exist in the following matchdays, the matching ranking lists and reservations are corrected.
- Deposits and payments-out are only for real payments.'
- ),
- array(
- 0 => 'booking wagers',
- 1 => 'If UP is installed and is activated with the beech, the wager is drawn off from the balance UP. The wager can be debited a sum to an account
- for a complete league or for single user. With the reservation for the whole league quite booked wagers are already taken into consideration before,
- so that all together at most the wager deposited in the league is debited a sum to an account. With single debit ever well-chosen user the back
- wager are put down as a default on the respective input fields. If these values are changed no examination on under or over charging occurs.'
- ),
- array(
- 0 => 'booking deposits',
- 1 => 'If UP is installed and is activated with the beech, the deposit is credited to the balance. Therefore resulted negative account balances can
-be compensated by deposits again. Deposits can be booked for a complete league or for single user. With the reservation for the whole league booked
-deposits are already taken into consideration before, so that all together at most the application deposited in the league is booked. With single
-reservation ever well-chosen user the final deposits are put down as a default on the respective input fields. If these values are changed no examination
-on under or over charging occurs.'
- ),
- array(
- 0 => 'booking payments',
- 1 => 'If UP is installed and is activated with the beech, the payment loads the balance. Therefore achieved profits can be paid in the season and
-the balance be equalised. Payments can be booked for a complete league or for single user. With the reservation for the whole league booked payment is
-already taken into consideration before, so that all together at most the profit get in the league is booked up. With single reservation ever well-chosen
-user the back payment is put down as a default on the respective input fields. If these values are changed no examination on under or over charging occurs.'
- ),
- array(
- 0 => 'Approach after the update on version 0.9.2',
- 1 => 'With the update phpBB3 football MODs on version 0.9.2 ranking lists are anew calculated (also from the years before) and the profits are
-registered automatically in the account. Besides, a settlement with the UP balance is not carried out. If this is welcome, the
-option "integrate Ultimate Points" are put accordingly and the match results of the first matchday league once more are stored away. Wagers,
-deposits and payment must be postsettled by hand in the Administration for each season. Before one should decide whether these reservations should be
-also taken into consideration in the UP balance and put accordingly the option for UP.'
- ),
- array(
- 0 => '--',
- 1 => 'Fixture list Update'
- ),
- array(
- 0 => 'How to Schedule Update',
- 1 => 'An update on the fixture list can be carried out only with data from another Football Extension site. An overview of the available seasons
-and leagues is seen on /football/xml/football_xml_season.php starting from the phpbb root directory. If this complete address entered directly
-in the browser, the XML data will be displayed. After click on a league the current data from the League shown here. If you click in this view on
-disk icon, you can download the data of the league as an XML file.
-When you start the update in the admin area under Fixture List update the saved settings for season overview is listed as an update source. If no
-Source is stored, the Football Extension Demo site is registered as a source. After loading the season overview the available leagues are offered for selection.
-If access is not supported on a different URL from your hoster you must take to download from desired leagues as an XML file and store it under root/store.
-In this case, save localhost in football settings for future calls.
-Access to the season and the league data can be protected by a code. Users of the updates must use the code xxxx when calling the Season overview by
-appending ?code=xxxx. So call /football/xml/football_xml_season.php?code=xxxx. During the subsequent call to the League data the code will be passed.
-As target, you can choose an existing league or a league by entering the new league ID. To set up a new league, the target season must exist.
-In this case, all data of the update file transferred to database after switching season and league ID.
-If an existing league is selected, first season and league-ID will be replaced and the teams compared with the database. For differing Team IDs
-or different number of teams is to do in the next step, a team mapping. Then, any deviations between update and database is displayed and you can select
-rows and columns the data to be transferred. Note different defaults for the column selection. After updating the database deadlines and status
-are automatically corrected on matchdays and the the ranking of the league is recalculated.
-In the admin log a summary of the changes are logged.'
- ),
- array(
- 0 => 'Team Mapping',
- 1 => 'The team mapping is necessary if the team IDs are not identical or the number of teams is different. Recently added teams
-e.g. in the EL the third of CL, are inserted in the database. After the mapping the program check whether all the existing teams are
-assigned. The Team IDs are exchanged on the basis of the mapping in the update data. New teams are added only during the actual update.'
- ),
- array(
- 0 => 'Match Status',
- 1 => 'When generating the XML data, the status 4-6 will be changed to 1-3, ie in the update, there are no games without evaluation.
-For games with game status < 2, the goal Fields and the state itself is not accepted. Is database sttaus larger than 3, this status is maintained
-and the update program treats the data as with the corresponding status 1-3. Prerequisite for data acquisition under consideration of the status, however,
-remains the selection of appropriate columns and records on matches.'
- ),
- array(
- 0 => 'Take over negative status',
- 1 => 'If this option is set, the negative status, but not the goals will be taken. This enables the staggered deadlines
-to take on the update. The deadlines are to take either of the update (column options in matchdays) or manually in the admin area.
-In a league with "Bet in time" the option "Take over negative status" can not be selected.'
- ),
- array(
- 0 => 'Update results with same status',
- 1 => 'Only if this option is set, the goal fields from the update with the same status in update and database will be updated. This
-overwrites already recorded (preliminary) results in the database. This also applies to games in the database without evaluation.
-Status 3 overwrites the final results with status 6 in the database. Analog overrides status 2 in the update
-preliminary results from the classification made by state 4, but only if "Take over only final results" option is not selected.'
- ),
- array(
- 0 => 'Take over only final results',
- 1 => 'If this option is set, only the goal-fields from the update record must be taken when the status of the match in the update is 3.
-Preliminary results from the update are not used. If these should be taken, this option is explicitly set off. '
- ),
- array(
- 0 => 'Using the Cache',
- 1 => 'The seasons- and the leagues-data are stored for 5 minutes in the cache, so that the data are downloaded from Source only once. If you need
-updated data within that time anyway, you have to delete the cache to force a new download from the Source.'
- ),
-)));
-?>
\ No newline at end of file
+ array(
+ array(
+ 0 => '--',
+ 1 => 'First steps'
+ ),
+ array(
+ 0 => 'How do I install a league?',
+ 1 => 'When you install this Extension any fixtures are included. Fixture lists can be loaded by "update fixture lists" into the database.
+For details, see under this heading.
+After installing a fixture list, the settings of the league should be processed and the delivery dates of the match days checked and adjusted if necessary.
+Select manage league to put single users or group members to the prediction league. '
+ ),
+ array(
+ 0 => 'Other settings?',
+ 1 => 'For handle the prediction league(s) you should review and assigned administrative privileges to the members. For automatic sending of
+reminder emails you can set up an external Cornjob. Look that up in the various elements of this help.'
+ ),
+ array(
+ 0 => '--',
+ 1 => 'General'
+ ),
+ array(
+ 0 => 'Which prediction leagues are supported?',
+ 1 => 'All prediction leagues on a championship or KO Round aim. So, soccer leagues, cup competitions, Champions League, Champions League,
+European Championship or World Cup. Even a mix of different competitions is supported, to this table and the statistics show, however, nothing meaningful.
+Only through the point mode Handball is the Extension and other leagues are not suitable for. '
+ ),
+ array(
+ 0 => 'What rights exist in the Extension ',
+ 1 => 'a_football_results = Can enter, modify and delete final game results
+a_football_editbets = Can See in the admin area to enter all the tips, and change it
+a_football_plan = Unable to create change game plans. Schedule and manage delete (without) and knockout rounds to determine winners
+a_football_delete = Can Fixtures and delete parts of it. Delete permission in the schedule management
+a_football_config = Can change prediction league settings: prediction league configuration
+a_football_points = Can set, change and delete points for Ultimate Points
+u_use_football = Can use Prediction League.'
+ ),
+ array(
+ 0 => 'What roles exist in this Extension? ',
+ 1 => 'The football Administrator has just the right match results enter final, otherwise no admin rights. '
+ ),
+ array(
+ 0 => 'Which rights were roles assigned to existing ones? ',
+ 1 => 'The default administrator can enter final Scores, change and delete them.
+The Global Administrator has all the rights of MODS. '
+ ),
+ array(
+ 0 => 'Which custom profile fields have been generated by the Extension? ',
+ 1 => 'footb_email = additional second email address for email alerts
+footb_rem_f = switch for sending the reminder email to the primary e-mail address.
+footb_rem_s = switch for sending the reminder email to the second E-mail address. '
+ ),
+ array(
+ 0 => 'How do I activate the reminder e-mail function? ',
+ 1 => 'In the admin area in the Prediction League functionality the mail reminder cron job and the next run must be activated.
+The cron job is run on the first access after this date and sends an e-mail reminder for the missing tip duties that lie in the period 24-48 hours after cron date .
+If not sufficient accesses the page, the cron job should automatically run on script "YOUR_URL/cron.php?cron_type=football.football.cron.task.football_remember".
+The ship of the email takes place only once . After calling up the cron job, the next scheduled is automatically planned for the following day .
+With the appended parameters " & mode = test & days = n " can be tested the shipment for the offset to n days predictions . Only mails to board email address will be shipped .
+ In ACP a user defined prediction leagues code is to define.
+This code XXX must be a cronjob as www.cronjob.de by calling the script "/ football / cron_remember.php? Code = XXX" start.
+The call must be at least 24 hours and maximum 33 hours before the final matchday of the place. When multiple calls during the period reminder email will
+be sent again.
+Is the Tip levy as of Friday 20:00 clock must call on Thursday between Thu 11 and 20 clock made.
+If the cron job running daily at 13:00 clock, all the deadlines on the following day zwischen 13:00 und 22 clock and no one considered twice. '
+ ),
+ array(
+ 0 => 'Who gets a reminder ',
+ 1 => 'If enabled, reminder function get all the tipsters who play a match with status 0 not fully tapped have to hand
+in on a reminder to the shared (n) e-mail address (es).
+In addition, an e-mail with the recipient list to the Board e-mail sent (but only if at least one reminder was sent).
+The documentation process is logged to the log. '
+ ),
+ array(
+ 0 => '--',
+ 1 => 'Tip Deadline '
+ ),
+ array(
+ 0 => 'Tip When the tax is suspended? ',
+ 1 => 'As soon as someone Data from the prediction leagues will retrieve checks that match status 0 and expired tax time exist with. The to closing
+matches will state 1 and suspend for bet. '
+ ),
+ array(
+ 0 => 'The match or matches are not delivery date closed to ',
+ 1 => 'The tax date is the current host time + time difference between board and host time zone compared. If your host in the set board zone is
+located, it must be time zone in the prediction leagues settings also deposited be. '
+ ),
+ array(
+ 0 => 'I can a matchday not edit the submission date ',
+ 1 => 'You have the league settings "tip submit on each game start" is selected with. This automatically submitting time based games managed. the if
+you remember the game plan preparation, are in should "tip tax until their game starts" only after recognition of the entire game board set is. Then, the
+delivery time is automatically corrected. '
+ ),
+ array(
+ 0 => 'The game has already begun, but I can not type yet ',
+ 1 => 'The match was not yet closed, since the charge time or in the future, and the first game but has already started. Saving the charge time in
+the match day is currently the Time synchronized with the seasons and not reviewed. '
+ ),
+ array(
+ 0 => 'checks to save the match day settings ',
+ 1 => 'When saving a match day, the system checks whether the status of the game day must be corrected. If the 1 . release date in the future,
+the status of the match day 0 set to, he is in the past, 3 the status depending on the status of its games to 1, 2 or Set. '
+ ),
+ array(
+ 0 => 'How do I make further deadlines in a game day one? ',
+ 1 => 'This is only possible if "tip tax until their game starts" in the league settings to "no". Then, two more deadlines deposited will match the.
+The games to 2 deadline to be closed must schedule manual status -1 set to be on the. For the third Deadline Games is the status of the manually set to -2. '
+ ),
+ array(
+ 0 => 'What does tip tax until their game starts',
+ 1 => 'In this mode, each game for the start of the game, typed up by one. When you close the tip submit a game is determined whether any" open
+"games Matchday exist in the. If so, the charge time of the match day to the next start of the game is set, otherwise it remains on the last game and the
+match began with the congestion gets first Predictions for a fixed time before each game is not currently supported. '
+ ),
+ array(
+ 0 => '--',
+ 1 => 'Operating '
+ ),
+ array(
+ 0 => 'How to save final scores? ',
+ 1 => 'Final scores can only be stored in the admin area. Only the results of the selected matches are saved. '
+ ),
+ array(
+ 0 => 'I can not enter final scores ',
+ 1 => 'On prediction leagues functionalities "enter final scores only after match" final scores could entered only after the match (90 minutes).
+It is not possibleto enter final scores for matches with status 0. For these matches with status 0, please check delivery time. '
+ ),
+ array(
+ 0 => 'I want to save a preliminary results',
+ 1 => 'Preliminary results can be entered only in the User area. '
+ ),
+ array(
+ 0 => 'Why do I get different leagues after calling score page? ',
+ 1 => 'Calling the page "scores" the league which longest waits for a scores is automatically displayed. '
+ ),
+ array(
+ 0 => 'Which stage status is set after saving final scores? ',
+ 1 => 'After saving final scores, the stage status according to the matches is set.
+When all the matches have a status greater than 2, the stage status 3 is set up. Otherwise, stage status ist set to the minimum match status> = 0. '
+ ),
+ array(
+ 0 => 'When rankings are updated?',
+ 1 => 'After saving final or preliminary scores in the user or admin area, the stage ranking is updated. Then, the
+overall ranking is calculated and the places are stored in stage data. The remaining data in the overall ranking are not stored, they are currently calculated.
+For stage status 0 or 1, the ranking will be deleted for this stage. The ranking status is set identical to stage status. '
+ ),
+ array(
+ 0 => 'How do I delete final scores? ',
+ 1 => 'Clear final score field(s) or choose delete option and final score ist deleted for this match. The match state will be set to 1. '
+ ),
+ array(
+ 0 => 'How do I get games from rating? ',
+ 1 => 'Set switch "without rating" before saving the match. no one will receive points for that match. If there is
+no result yet, the game will be saved with state 4, preliminary scores will be state 5, final scores without rating will be state 6. '
+ ),
+ array(
+ 0 => 'Who can see all tips?',
+ 1 => 'User with admin rights a_football_editbets = "Can the admin section view, enter all tips and change" can see and edit all tips of all users in the admin area. '
+ ),
+ array(
+ 0 => 'What is Tip entry in the admin area to observe the case?',
+ 1 => 'Will to games already available results stored Tips is ranked does not automatically update the. The rankings take into account new tip not.
+The display the individual tips and "All Reviews" will be amended tips and the resulting points displayed. If the modified tips rankings included are the in,
+match the results of the match day and the subsequent store again, the rankings newly calculated that. games must not selected or altered it. '
+ ),
+ array(
+ 0 => 'What is "KO-round winners identify"? ',
+ 1 => 'order for the schedule management only teams to choose from in the corresponding round reaches have also must match the team will be registered
+to the team to remain competitive. That, and the transfer to third runners-up teams in the Champions League group stage in the Champions League can be
+performed automatically on this page. As in particular in the calculation of group placement, not all rules were taken into account in the system,
+any errors are corrected manually. This will involve teams of the status message is logged in.
+If '
+ ),
+ array(
+ 0 => 'How to determine the winner of a knock-out round? ',
+ 1 => 'For each knockout games, or knock-out rounds with a return game, it is sufficient to match the determination to select where these games have
+taken place as the target game day. Matchday to choose the last to which the team at least competition remains. '
+ ),
+ array(
+ 0 => 'How do I determine the group winner and second group ',
+ 1 => 'In Group Play are all group match to determine select and the last match day round as the target match day to be deposited next to the. The
+"determination on the basis of table space for group games" to choose and the place to which the teams qualify. If teams other league transferred to one in ,
+League is the corresponding selected, otherwise not. If no league selected, place and match ignored and not transferred Team. '
+ ),
+ array(
+ 0 => 'The teams are already entered in the next round ',
+ 1 => 'Have Schedule the formulas W (Winner) or L (Looser) deposited in, is already in the display of the encounter between the winners and losers of
+the formula stored in lot (s) are determined and entered in the schedule. Nevertheless, you should "round KO winner determined "called to be, otherwise when
+you saved the game encounter in the game schedule (in game transfer or other change), the teams to choose from and are not therefore be deleted.
+The formula G does not lead to an automatic identification, as currently used in the determination of group placement, not all special rules are included in
+the smallest up. The determination must be in the admin section on "knock-out rounds to determine winners" will be implemented and monitored. '
+ ),
+ array(
+ 0 => 'without Tipster Tips still get points ',
+ 1 => 'You have the league settings stored in that Nichttipper the last of the points to get automatically. '
+ ),
+ array(
+ 0 => '--',
+ 1 => 'Schedule Administration '
+ ),
+ array(
+ 0 => 'How do I create a new Schedule? ',
+ 1 => 'To Schedule creation is each page compulsory for bottom-up work off of. In particular Games is the correct filing of the number of match days
+and observed, so the generation process of schedule creation works in the. It was only after generation of the games in Fixtures can Tipper be included as
+previously to the number of games are missing information. Just schedule the switch "tip tax until their game starts" only after generation of the games in
+the visible. This switch should be made only after the deposit of the participating teams and all game dates Yes set to be to ensure that all deadlines set
+will be able to automatically match the in. '
+ ),
+ array(
+ 0 => 'How do I set a new season? ',
+ 1 => 'Under "Seasons Manage" you create a new season with the year, in the season ends. The season
+2010/2011 at the season 2011 so as to create. On the following page will then set appropriate default values. '
+ ),
+ array(
+ 0 => 'How do I set up a new league? ',
+ 1 => 'Under "leagues manage" you create a new league with an indication of a league point. The league number
+should apply to the seasons the same award and are over league one must run away within the season to be>. The first league so should always be the League
+number one, the second league, the league number two always get. '
+ ),
+ array(
+ 0 => 'How do I set up a match that? ',
+ 1 => 'button to generate. In a new league must match the first the missing when the match day one from the standard ". Matchday" get to name
+different, so the field is the appropriate fill, otherwise not. If a submission date filed, participating teams, this Abgabetemin in the generation of the
+start of the game used as. '
+ ),
+ array(
+ 0 => 'How I am in a league team? ',
+ 1 => 'knockout rounds before the case must necessarily match days are recorded, so the team can be assigned to a match, to which the team will remain
+in the competition. The team ID of a team leagues and should be chosen identical across all seasons over so that the statistics work in historical
+comparisons.
+All gif files in the directory / football / images flags / are selecting a team emblem or a flag to display. The arms should be the size 28px x 28px have.
+It is pointed out, the club crest copyrights are subject to, and not the rights holder used to be allowed the consent without. '
+ ),
+ array(
+ 0 => 'How do I create the teams participating in the game schedule? ',
+ 1 => 'After all match days and men were recorded, the database entries for the participating teams will be generated. was before the match a deadline
+deposited with, this is all the games of the match day as the game begins deposited with. Did not have any team a game pairing deposited in, then in the
+summary instead of the Team name a possibly deposited calculation formula. '
+ ),
+ array(
+ 0 => 'Can a game plan gradually build me? ',
+ 1 => 'Yes, you can use during the season more match in the league to add. This one carries the "Leagues Manage the change in the number of match days,
+and then goes to "match" manage where you can to match messages generate new ones. and then edit. After entering the deadlines and number of games in
+knockout rounds, have the games still be generated schedule in . To do this select new added match from and click on the generation button. The lack of
+games will be generated and also missing empty entry all tipsters in the tip table. '
+ ),
+ array(
+ 0 => 'When can a league Tipper take in? ',
+ 1 => 'games on the schedule Tipper can be added after creating the first place. Only then is the function "Manage Leagues" released. '
+ ),
+ array(
+ 0 => 'Can I also delete match? ',
+ 1 => 'Yes, chosen either match "match Manage" on the "Delete" or the last match by the number of match days in the
+league, and then reduces the "match on" Manage and there is then pressed the button displayed. Deleted is always the match with all the games and all tips. '
+ ),
+ array(
+ 0 => 'can not play games or nobles I collect? ',
+ 1 => 'If you have created a knock-out round, you have the number of games at each match deposit. Only then Button appears to complete the game board
+game board Manage. '
+ ),
+ array(
+ 0 => 'What’s in a game installation? ',
+ 1 => 'change a game date is after in "tip-out to each start of the game " back to the status of the game and the match day and there deposited
+deadline adapted to. '
+ ),
+ array(
+ 0 => 'What are special tips? ',
+ 1 => 'special tips are single tips with separate scoring. You can be a to a league season to be defined and / or flow thus either in the scoring at
+or in the overall standings one. Matchday the issue to a special tip can match are stored individually, but it should be clear. '
+ ),
+ array(
+ 0 => 'What answer - and profit opportunities are available? ',
+ 1 => 'on the question type is more in response to the selection of a team in the league, a number or text available. The result is still a number of
+values are in addition, each by " ; be separated. "Thus, with a multiple-answer questions can be deposited Choice. If question type 3 or 4 in question,
+the choice of A: B: C: ... H: be marked with the appear in the typing and Score input automatically corresponding values in a dropdown box. '
+ ),
+ array(
+ 0 => 'What a question and answer opportunity question type 1? ',
+ 1 => 'By type of question one can in response and outcome, only one team from the League team list will be selected. The maximum score is only
+awarded in full compliance, otherwise gives the Tipper 0 points.
+Sample question: Who will be the Champion '
+ ),
+ array(
+ 0 => 'What a question and answer opportunity type of question 2? ',
+ 1 => 'type of question 2, the question type 1, but the result in writing (or a more team-IDs separated by ";" separately entered). The maximum score
+is awarded if the answer to the selection team associated ID value from the result of a match.
+Sample question: Name a relegated team (ranked 16-18 on the seasons end) '
+ ),
+ array(
+ 0 => 'What a question and answer opportunity type of question 3? ',
+ 1 => 'type of question 3 In response and result only value (text or numbers) are stored one. The maximum score is awarded if the answer agrees with
+the result, otherwise gives the Tipper 0 points.
+Sample question: How much red (no yellow-red) cards are given to this match? A = 0 B = 1 C = 2 D = more than 2 '
+ ),
+ array(
+ 0 => 'What a question and answer opportunity> type of question 4? ',
+ 1 => 'type of question 4, In response a number or a text and as a result of more numbers or more texts (but not a combination of numbers and text)
+by ";" to be entered separately. The maximum score is awarded if the number or the text in the response with a value of the outcome of matches.
+Sample question: Hannover 96 = B = A rises from the cup gets C = C = is not playing international German champions'
+ ),
+ array(
+ 0 => 'What a question and answer opportunity type of question 5?',
+ 1 => 'If question type 5 can result in response and only one number can be stored. The maximum points will be awarded if the answer to the outcome
+is in accordance with, or receives maximum number of tipsters, the less the absolute difference between the response and result, no negative points.
+Sample question: How many goals are in this match? '
+ ),
+ array(
+ 0 => 'Which ranking is flowing Special Tip a one?',
+ 1 => 'If delivery and evaluation Matchday be identical, scoring runs in the match score and a ranking. If the evaluation Matchday chosen different,
+special tip flows in the overall classification and ranking one. '
+ ),
+ array(
+ 0 => 'I Can Seasonal Tips Creating while? ',
+ 1 => 'Yes, but only to match which can still be typed. Stored special tips can be moved even then. However, the status of special tips examined
+separately and corrected, if necessary, as with a shift to a no longer tippbaren match the status of the Special tips will automatically be adjusted not.'
+ ),
+ array(
+ 0 => 'When special tip is one of the tip release blocked?',
+ 1 => 'Special tips will be the first delivery date of a match day for the tip tax agreements with. If we want such a Champion tip on 3.Spieltag make
+up, it sets If the levy on Matchday 3 and evaluation on the final day. '
+ ),
+ array(
+ 0 => '--',
+ 1 => 'prediction leagues configuration '
+ ),
+ array(
+ 0 => 'What time zone do I have to tip round set? ',
+ 1 => 'If the host the same time zone of the forum is, is betting the same time zone as the forum to vote in the. If the host in a different time
+zone, then the time zone of the betting difference to set according to the . This is necessary because of supply and result input of the games system time
+functions are used. '
+ ),
+ array(
+ 0 => 'Why is betting code uses the? ',
+ 1 => 'To the memory function via cron_remember.php not outsiders can be misused, is the call of the parameters with the betting deposit code compared
+code. Take for instance the code in the admin area deposited 19032038, so should the cronjob cron_remember.php? code = for the reminder call 19,032,038th '
+ ),
+ array(
+ 0 => 'How do I show the rankings in the main view, clearly shape the?',
+ 1 => 'With the switch "Table Tipper in the overview Rankings", the match day overall list will be limited. If the rank by the not notified of an ad
+to run, so the placement will be added to the rankings below. '
+ ),
+ array(
+ 0 => '--',
+ 1 => 'Account overview / Ultimate Points (UP)'
+ ),
+ array(
+ 0 => 'It is necessary of the Ultimate Points Extension?',
+ 1 => 'No if you liked to indicate a balance, nevertheless, the Tippern of your tip round, you should instal the Ultimate Points Extension.
+Independent of Ultimate Points Extension league profits are credited to the account in phpBB3 football Extension and the Admin can register applications, payments
+and payment.'
+ ),
+ array(
+ 0 => 'What does cause the setting "Ultimate Points integrate" in the prediction league functionalities in the Administration?',
+ 1 => 'This setting has only consequences on the automatic settlement of the profits in the balance of Ultimate Points. Here one can choose
+whether profits, points or nothing from phpBB3 football Extension should flow in onto the Ultimate Points balance. The settlement of the achieved prediction
+league points can be steered, in addition, still about a factor. '
+ ),
+ array(
+ 0 => 'Can see other my account overview?',
+ 1 => 'Only who owns suitable rights, the account overview of another Tippers can question in the prediction league area.'
+ ),
+ array(
+ 0 => 'How are wagers, deposits and payment and profits registered?',
+ 1 => 'Wagers charge the account and the balance of UP and can be compensated by payments again. In the season credited profits can be paid by the
+ account and the payment likewise charge the balance in UP. Profits are registered automatically about the profit distribution of the prediction
+ league with the memory of the play results with the account and UP (with sedate counter). With renewed storing away of results the old reservations
+ are cancelled and booked anew. Should results already exist in the following matchdays, the matching ranking lists and reservations are corrected.
+ Deposits and payments-out are only for real payments.'
+ ),
+ array(
+ 0 => 'booking wagers',
+ 1 => 'If UP is installed and is activated with the beech, the wager is drawn off from the balance UP. The wager can be debited a sum to an account
+ for a complete league or for single user. With the reservation for the whole league quite booked wagers are already taken into consideration before,
+ so that all together at most the wager deposited in the league is debited a sum to an account. With single debit ever well-chosen user the back
+ wager are put down as a default on the respective input fields. If these values are changed no examination on under or over charging occurs.'
+ ),
+ array(
+ 0 => 'booking deposits',
+ 1 => 'If UP is installed and is activated with the beech, the deposit is credited to the balance. Therefore resulted negative account balances can
+be compensated by deposits again. Deposits can be booked for a complete league or for single user. With the reservation for the whole league booked
+deposits are already taken into consideration before, so that all together at most the application deposited in the league is booked. With single
+reservation ever well-chosen user the final deposits are put down as a default on the respective input fields. If these values are changed no examination
+on under or over charging occurs.'
+ ),
+ array(
+ 0 => 'booking payments',
+ 1 => 'If UP is installed and is activated with the beech, the payment loads the balance. Therefore achieved profits can be paid in the season and
+the balance be equalised. Payments can be booked for a complete league or for single user. With the reservation for the whole league booked payment is
+already taken into consideration before, so that all together at most the profit get in the league is booked up. With single reservation ever well-chosen
+user the back payment is put down as a default on the respective input fields. If these values are changed no examination on under or over charging occurs.'
+ ),
+ array(
+ 0 => 'Approach after the update on version 0.9.2',
+ 1 => 'With the update phpBB3 football MODs on version 0.9.2 ranking lists are anew calculated (also from the years before) and the profits are
+registered automatically in the account. Besides, a settlement with the UP balance is not carried out. If this is welcome, the
+option "integrate Ultimate Points" are put accordingly and the match results of the first matchday league once more are stored away. Wagers,
+deposits and payment must be postsettled by hand in the Administration for each season. Before one should decide whether these reservations should be
+also taken into consideration in the UP balance and put accordingly the option for UP.'
+ ),
+ array(
+ 0 => '--',
+ 1 => 'Fixture list Update'
+ ),
+ array(
+ 0 => 'How to Schedule Update',
+ 1 => 'An update on the fixture list can be carried out only with data from another Football Extension site. An overview of the available seasons
+and leagues is seen on /football/xml/football_xml_season.php starting from the phpbb root directory. If this complete address entered directly
+in the browser, the XML data will be displayed. After click on a league the current data from the League shown here. If you click in this view on
+disk icon, you can download the data of the league as an XML file.
+When you start the update in the admin area under Fixture List update the saved settings for season overview is listed as an update source. If no
+Source is stored, the Football Extension Demo site is registered as a source. After loading the season overview the available leagues are offered for selection.
+If access is not supported on a different URL from your hoster you must take to download from desired leagues as an XML file and store it under root/store.
+In this case, save localhost in football settings for future calls.
+Access to the season and the league data can be protected by a code. Users of the updates must use the code xxxx when calling the Season overview by
+appending ?code=xxxx. So call /football/xml/football_xml_season.php?code=xxxx. During the subsequent call to the League data the code will be passed.
+As target, you can choose an existing league or a league by entering the new league ID. To set up a new league, the target season must exist.
+In this case, all data of the update file transferred to database after switching season and league ID.
+If an existing league is selected, first season and league-ID will be replaced and the teams compared with the database. For differing Team IDs
+or different number of teams is to do in the next step, a team mapping. Then, any deviations between update and database is displayed and you can select
+rows and columns the data to be transferred. Note different defaults for the column selection. After updating the database deadlines and status
+are automatically corrected on matchdays and the the ranking of the league is recalculated.
+In the admin log a summary of the changes are logged.'
+ ),
+ array(
+ 0 => 'Team Mapping',
+ 1 => 'The team mapping is necessary if the team IDs are not identical or the number of teams is different. Recently added teams
+e.g. in the EL the third of CL, are inserted in the database. After the mapping the program check whether all the existing teams are
+assigned. The Team IDs are exchanged on the basis of the mapping in the update data. New teams are added only during the actual update.'
+ ),
+ array(
+ 0 => 'Match Status',
+ 1 => 'When generating the XML data, the status 4-6 will be changed to 1-3, ie in the update, there are no games without evaluation.
+For games with game status < 2, the goal Fields and the state itself is not accepted. Is database sttaus larger than 3, this status is maintained
+and the update program treats the data as with the corresponding status 1-3. Prerequisite for data acquisition under consideration of the status, however,
+remains the selection of appropriate columns and records on matches.'
+ ),
+ array(
+ 0 => 'Take over negative status',
+ 1 => 'If this option is set, the negative status, but not the goals will be taken. This enables the staggered deadlines
+to take on the update. The deadlines are to take either of the update (column options in matchdays) or manually in the admin area.
+In a league with "Bet in time" the option "Take over negative status" can not be selected.'
+ ),
+ array(
+ 0 => 'Update results with same status',
+ 1 => 'Only if this option is set, the goal fields from the update with the same status in update and database will be updated. This
+overwrites already recorded (preliminary) results in the database. This also applies to games in the database without evaluation.
+Status 3 overwrites the final results with status 6 in the database. Analog overrides status 2 in the update
+preliminary results from the classification made by state 4, but only if "Take over only final results" option is not selected.'
+ ),
+ array(
+ 0 => 'Take over only final results',
+ 1 => 'If this option is set, only the goal-fields from the update record must be taken when the status of the match in the update is 3.
+Preliminary results from the update are not used. If these should be taken, this option is explicitly set off. '
+ ),
+ array(
+ 0 => 'Using the Cache',
+ 1 => 'The seasons- and the leagues-data are stored for 5 minutes in the cache, so that the data are downloaded from Source only once. If you need
+updated data within that time anyway, you have to delete the cache to force a new download from the Source.'
+ ),
+)));
diff --git a/language/en/info_acp_update.php b/language/en/info_acp_update.php
index b0c3f15..0388b01 100644
--- a/language/en/info_acp_update.php
+++ b/language/en/info_acp_update.php
@@ -81,6 +81,7 @@ $lang = array_merge($lang, array(
'INSERT_TEAMS' => 'Insert new teams',
'LEAGUE_SHORTCUT' => 'League shortcut',
'LOAD' => 'load',
+ 'LOG_FOOTB_UPDATE' => 'Football Prediction League fixure list update » %s',
'MAP_TEAMS' => 'Map teams',
'MATCH_OF_GROUP' => 'Match on group',
'MATCHES' => 'Matches',
diff --git a/migrations/v094_beta.php b/migrations/v094_beta.php
index 67633e1..70e9006 100644
--- a/migrations/v094_beta.php
+++ b/migrations/v094_beta.php
@@ -16,7 +16,7 @@ class v094_beta extends \phpbb\db\migration\migration
return isset($this->config['football_version']) && version_compare($this->config['football_version'], '0.9.4', '>=');
}
- // first try to update the old MOD and run this migration if update didn't change version number
+ // first try to update the old MOD and run this migration if update didn't change version number
static public function depends_on()
{
return array('\football\football\migrations\v094_beta_update');
@@ -28,9 +28,9 @@ class v094_beta extends \phpbb\db\migration\migration
return array(
'add_columns' => array(
$this->table_prefix . 'sessions' => array(
- 'football_season' => array('USINT', 0),
- 'football_league' => array('TINT:2', 0),
- 'football_matchday' => array('TINT:2', 0),
+ 'football_season' => array('USINT', 0),
+ 'football_league' => array('TINT:2', 0),
+ 'football_matchday' => array('TINT:2', 0),
'football_mobile' => array('UINT:1', 0),
'football_mobile_device' => array('VCHAR:255', NULL),
),
@@ -38,30 +38,30 @@ class v094_beta extends \phpbb\db\migration\migration
'add_tables' => array(
$this->table_prefix . 'footb_bets' => array(
'COLUMNS' => array(
- 'season' => array('USINT', 0),
- 'league' => array('TINT:2', 0),
- 'match_no' => array('USINT', 0),
- 'user_id' => array('UINT', 0),
- 'goals_home' => array('CHAR:2',''),
- 'goals_guest' => array('CHAR:2',''),
+ 'season' => array('USINT', 0),
+ 'league' => array('TINT:2', 0),
+ 'match_no' => array('USINT', 0),
+ 'user_id' => array('UINT', 0),
+ 'goals_home' => array('CHAR:2',''),
+ 'goals_guest' => array('CHAR:2',''),
'bet_time' => array('UINT:11', 0),
),
- 'PRIMARY_KEY' => array('season', 'league', 'match_no', 'user_id'),
+ 'PRIMARY_KEY' => array('season', 'league', 'match_no', 'user_id'),
),
$this->table_prefix . 'footb_extra' => array(
'COLUMNS' => array(
- 'season' => array('USINT', 0),
- 'league' => array('TINT:2', 0),
- 'extra_no' => array('USINT', 0),
- 'question_type' => array('TINT:2', 0),
- 'question' => array('VCHAR:255', ''),
- 'result' => array('VCHAR:255', ''),
- 'matchday' => array('TINT:2', 0),
- 'matchday_eval' => array('TINT:2', 0),
- 'extra_points' => array('TINT:2', 0),
- 'extra_status' => array('TINT:2', 0),
+ 'season' => array('USINT', 0),
+ 'league' => array('TINT:2', 0),
+ 'extra_no' => array('USINT', 0),
+ 'question_type' => array('TINT:2', 0),
+ 'question' => array('VCHAR:255', ''),
+ 'result' => array('VCHAR:255', ''),
+ 'matchday' => array('TINT:2', 0),
+ 'matchday_eval' => array('TINT:2', 0),
+ 'extra_points' => array('TINT:2', 0),
+ 'extra_status' => array('TINT:2', 0),
),
- 'PRIMARY_KEY' => array('season', 'league', 'extra_no'),
+ 'PRIMARY_KEY' => array('season', 'league', 'extra_no'),
'KEYS' => array(
'matchday' => array('INDEX', 'matchday'),
'eval' => array('INDEX', 'matchday_eval'),
@@ -69,55 +69,55 @@ class v094_beta extends \phpbb\db\migration\migration
),
$this->table_prefix . 'footb_extra_bets' => array(
'COLUMNS' => array(
- 'season' => array('USINT', 0),
- 'league' => array('TINT:2', 0),
- 'extra_no' => array('USINT', 0),
- 'user_id' => array('UINT', 0),
- 'bet' => array('VCHAR:255', ''),
- 'bet_points' => array('TINT:2', 0),
+ 'season' => array('USINT', 0),
+ 'league' => array('TINT:2', 0),
+ 'extra_no' => array('USINT', 0),
+ 'user_id' => array('UINT', 0),
+ 'bet' => array('VCHAR:255', ''),
+ 'bet_points' => array('TINT:2', 0),
),
- 'PRIMARY_KEY' => array('season', 'league', 'extra_no', 'user_id'),
+ 'PRIMARY_KEY' => array('season', 'league', 'extra_no', 'user_id'),
),
$this->table_prefix . 'footb_leagues' => array(
'COLUMNS' => array(
- 'season' => array('USINT', 0),
- 'league' => array('TINT:2', 0),
- 'league_name' => array('VCHAR:20', ''),
- 'league_name_short' => array('VCHAR:3', ''),
- 'league_type' => array('TINT:1', 1),
- 'matchdays' => array('TINT:2', 0),
- 'matches_on_matchday' => array('TINT:2', 0),
- 'win_result' => array('VCHAR:10', ''),
- 'win_result_02' => array('VCHAR:10', ''),
- 'win_matchday' => array('VCHAR:255', ''),
- 'win_season' => array('VCHAR:255', ''),
- 'points_mode' => array('TINT:2', 1),
- 'points_result' => array('TINT:2', 0),
- 'points_tendency' => array('TINT:2', 0),
- 'points_diff' => array('TINT:2', 0),
- 'points_last' => array('BOOL', 1),
- 'join_by_user' => array('BOOL', 0),
- 'join_in_season' => array('BOOL', 0),
- 'bet_in_time' => array('BOOL', 0),
- 'rules_post_id' => array('UINT', 0),
- 'bet_ko_type' => array('TINT:1', 1),
- 'bet_points' => array('DECIMAL', 0),
+ 'season' => array('USINT', 0),
+ 'league' => array('TINT:2', 0),
+ 'league_name' => array('VCHAR:20', ''),
+ 'league_name_short' => array('VCHAR:3', ''),
+ 'league_type' => array('TINT:1', 1),
+ 'matchdays' => array('TINT:2', 0),
+ 'matches_on_matchday' => array('TINT:2', 0),
+ 'win_result' => array('VCHAR:10', ''),
+ 'win_result_02' => array('VCHAR:10', ''),
+ 'win_matchday' => array('VCHAR:255', ''),
+ 'win_season' => array('VCHAR:255', ''),
+ 'points_mode' => array('TINT:2', 1),
+ 'points_result' => array('TINT:2', 0),
+ 'points_tendency' => array('TINT:2', 0),
+ 'points_diff' => array('TINT:2', 0),
+ 'points_last' => array('BOOL', 1),
+ 'join_by_user' => array('BOOL', 0),
+ 'join_in_season' => array('BOOL', 0),
+ 'bet_in_time' => array('BOOL', 0),
+ 'rules_post_id' => array('UINT', 0),
+ 'bet_ko_type' => array('TINT:1', 1),
+ 'bet_points' => array('DECIMAL', 0),
),
- 'PRIMARY_KEY' => array('season', 'league'),
+ 'PRIMARY_KEY' => array('season', 'league'),
),
$this->table_prefix . 'footb_matchdays' => array(
'COLUMNS' => array(
- 'season' => array('USINT', 0),
- 'league' => array('TINT:2', 0),
- 'matchday' => array('TINT:2', 0),
- 'status' => array('TINT:2', 0),
- 'delivery_date' => array('CHAR:19', ''),
- 'delivery_date_2' => array('CHAR:19', ''),
- 'delivery_date_3' => array('CHAR:19', ''),
- 'matchday_name' => array('VCHAR:30', ''),
- 'matches' => array('CHAR:2',''),
+ 'season' => array('USINT', 0),
+ 'league' => array('TINT:2', 0),
+ 'matchday' => array('TINT:2', 0),
+ 'status' => array('TINT:2', 0),
+ 'delivery_date' => array('CHAR:19', ''),
+ 'delivery_date_2' => array('CHAR:19', ''),
+ 'delivery_date_3' => array('CHAR:19', ''),
+ 'matchday_name' => array('VCHAR:30', ''),
+ 'matches' => array('CHAR:2',''),
),
- 'PRIMARY_KEY' => array('season', 'league', 'matchday'),
+ 'PRIMARY_KEY' => array('season', 'league', 'matchday'),
'KEYS' => array(
'status' => array('INDEX', 'status'),
'date' => array('INDEX', 'delivery_date'),
@@ -125,29 +125,29 @@ class v094_beta extends \phpbb\db\migration\migration
),
$this->table_prefix . 'footb_matches' => array(
'COLUMNS' => array(
- 'season' => array('USINT', 0),
- 'league' => array('TINT:2', 0),
- 'match_no' => array('USINT', 0),
- 'team_id_home' => array('USINT', 0),
- 'team_id_guest' => array('USINT', 0),
- 'goals_home' => array('CHAR:2',''),
- 'goals_guest' => array('CHAR:2',''),
- 'matchday' => array('TINT:2', 0),
- 'status' => array('TINT:2', 0),
- 'match_datetime' => array('CHAR:19', ''),
- 'group_id' => array('CHAR:1', ''),
- 'formula_home' => array('CHAR:9', ''),
- 'formula_guest' => array('CHAR:9', ''),
- 'ko_match' => array('BOOL', 0),
+ 'season' => array('USINT', 0),
+ 'league' => array('TINT:2', 0),
+ 'match_no' => array('USINT', 0),
+ 'team_id_home' => array('USINT', 0),
+ 'team_id_guest' => array('USINT', 0),
+ 'goals_home' => array('CHAR:2',''),
+ 'goals_guest' => array('CHAR:2',''),
+ 'matchday' => array('TINT:2', 0),
+ 'status' => array('TINT:2', 0),
+ 'match_datetime' => array('CHAR:19', ''),
+ 'group_id' => array('CHAR:1', ''),
+ 'formula_home' => array('CHAR:9', ''),
+ 'formula_guest' => array('CHAR:9', ''),
+ 'ko_match' => array('BOOL', 0),
'goals_overtime_home' => array('CHAR:2',''),
- 'goals_overtime_guest' => array('CHAR:2',''),
- 'trend' => array('CHAR:8', ''),
- 'odd_1' => array('DECIMAL', 0.00),
- 'odd_x' => array('DECIMAL', 0.00),
- 'odd_2' => array('DECIMAL', 0.00),
- 'rating' => array('DECIMAL', 0.00),
+ 'goals_overtime_guest' => array('CHAR:2',''),
+ 'trend' => array('CHAR:8', ''),
+ 'odd_1' => array('DECIMAL', 0.00),
+ 'odd_x' => array('DECIMAL', 0.00),
+ 'odd_2' => array('DECIMAL', 0.00),
+ 'rating' => array('DECIMAL', 0.00),
),
- 'PRIMARY_KEY' => array('season', 'league', 'match_no'),
+ 'PRIMARY_KEY' => array('season', 'league', 'match_no'),
'KEYS' => array(
'gid' => array('INDEX', 'team_id_guest'),
'hid' => array('INDEX', 'team_id_home'),
@@ -156,14 +156,14 @@ class v094_beta extends \phpbb\db\migration\migration
),
$this->table_prefix . 'footb_matches_hist' => array(
'COLUMNS' => array(
- 'match_date' => array('CHAR:10', ''),
- 'team_id_home' => array('USINT', 1),
- 'team_id_guest' => array('USINT', 1),
- 'match_type' => array('VCHAR:5', ''),
- 'goals_home' => array('CHAR:2', ''),
- 'goals_guest' => array('CHAR:2', ''),
+ 'match_date' => array('CHAR:10', ''),
+ 'team_id_home' => array('USINT', 1),
+ 'team_id_guest' => array('USINT', 1),
+ 'match_type' => array('VCHAR:5', ''),
+ 'goals_home' => array('CHAR:2', ''),
+ 'goals_guest' => array('CHAR:2', ''),
),
- 'PRIMARY_KEY' => array('match_date', 'team_id_home', 'team_id_guest'),
+ 'PRIMARY_KEY' => array('match_date', 'team_id_home', 'team_id_guest'),
'KEYS' => array(
'gid' => array('INDEX', 'team_id_guest'),
'hid' => array('INDEX', 'team_id_home'),
@@ -171,17 +171,17 @@ class v094_beta extends \phpbb\db\migration\migration
),
$this->table_prefix . 'footb_points' => array(
'COLUMNS' => array(
- 'points_id' => array('UINT', NULL, 'auto_increment'),
- 'season' => array('USINT', 0),
- 'league' => array('TINT:2', 0),
- 'matchday' => array('TINT:2', 0),
- 'points_type' => array('TINT:1', 0),
- 'user_id' => array('UINT', 0),
- 'points' => array('DECIMAL:20', 0.00),
- 'points_comment' => array('MTEXT_UNI', ''),
- 'cash' => array('BOOL', 0),
+ 'points_id' => array('UINT', NULL, 'auto_increment'),
+ 'season' => array('USINT', 0),
+ 'league' => array('TINT:2', 0),
+ 'matchday' => array('TINT:2', 0),
+ 'points_type' => array('TINT:1', 0),
+ 'user_id' => array('UINT', 0),
+ 'points' => array('DECIMAL:20', 0.00),
+ 'points_comment' => array('MTEXT_UNI', ''),
+ 'cash' => array('BOOL', 0),
),
- 'PRIMARY_KEY' => array('points_id'),
+ 'PRIMARY_KEY' => array('points_id'),
'KEYS' => array(
'user' => array('INDEX', array('season', 'league', 'user_id')),
'matchday' => array('INDEX', array('season', 'league', 'matchday')),
@@ -190,49 +190,49 @@ class v094_beta extends \phpbb\db\migration\migration
),
$this->table_prefix . 'footb_rank_matchdays' => array(
'COLUMNS' => array(
- 'season' => array('USINT', 0),
- 'league' => array('TINT:2', 0),
- 'matchday' => array('TINT:2', 0),
- 'user_id' => array('UINT', 0),
- 'status' => array('TINT:2', 0),
- 'rank' => array('USINT', 0),
- 'points' => array('USINT', 0),
- 'win' => array('DECIMAL', 0),
- 'rank_total' => array('USINT', 0),
- 'tendencies' => array('TINT:2', 0),
- 'correct_result' => array('TINT:2', 0),
- 'points_total' => array('USINT', 0),
- 'win_total' => array('DECIMAL', 0),
+ 'season' => array('USINT', 0),
+ 'league' => array('TINT:2', 0),
+ 'matchday' => array('TINT:2', 0),
+ 'user_id' => array('UINT', 0),
+ 'status' => array('TINT:2', 0),
+ 'rank' => array('USINT', 0),
+ 'points' => array('USINT', 0),
+ 'win' => array('DECIMAL', 0),
+ 'rank_total' => array('USINT', 0),
+ 'tendencies' => array('TINT:2', 0),
+ 'correct_result' => array('TINT:2', 0),
+ 'points_total' => array('USINT', 0),
+ 'win_total' => array('DECIMAL', 0),
),
- 'PRIMARY_KEY' => array('season', 'league', 'matchday', 'user_id'),
+ 'PRIMARY_KEY' => array('season', 'league', 'matchday', 'user_id'),
),
$this->table_prefix . 'footb_seasons' => array(
'COLUMNS' => array(
- 'season' => array('USINT', 0),
- 'season_name' => array('VCHAR:20', ''),
- 'season_name_short' => array('VCHAR:10', ''),
+ 'season' => array('USINT', 0),
+ 'season_name' => array('VCHAR:20', ''),
+ 'season_name_short' => array('VCHAR:10', ''),
),
- 'PRIMARY_KEY' => array('season'),
+ 'PRIMARY_KEY' => array('season'),
),
$this->table_prefix . 'footb_teams' => array(
'COLUMNS' => array(
- 'season' => array('USINT', 0),
- 'league' => array('TINT:2', 0),
- 'team_id' => array('USINT', 1),
- 'team_name' => array('VCHAR:30', ''),
- 'team_name_short' => array('VCHAR:10', ''),
- 'team_symbol' => array('VCHAR:25', ''),
- 'group_id' => array('CHAR:1', ''),
- 'matchday' => array('TINT:2', 0),
+ 'season' => array('USINT', 0),
+ 'league' => array('TINT:2', 0),
+ 'team_id' => array('USINT', 1),
+ 'team_name' => array('VCHAR:30', ''),
+ 'team_name_short' => array('VCHAR:10', ''),
+ 'team_symbol' => array('VCHAR:25', ''),
+ 'group_id' => array('CHAR:1', ''),
+ 'matchday' => array('TINT:2', 0),
),
- 'PRIMARY_KEY' => array('season', 'league', 'team_id'),
+ 'PRIMARY_KEY' => array('season', 'league', 'team_id'),
),
$this->table_prefix . 'footb_teams_hist' => array(
'COLUMNS' => array(
- 'team_id' => array('USINT', 0),
- 'team_name' => array('VCHAR:30', ''),
+ 'team_id' => array('USINT', 0),
+ 'team_name' => array('VCHAR:30', ''),
),
- 'PRIMARY_KEY' => array('team_id'),
+ 'PRIMARY_KEY' => array('team_id'),
),
),
);
@@ -349,46 +349,46 @@ class v094_beta extends \phpbb\db\migration\migration
// Add the manage mode from football_results to the ACP_FOOTBALL_OPERATION category.
array('module.add', array('acp', 'ACP_FOOTBALL_OPERATION', array(
- 'module_basename' => '\football\football\acp\results_module',
- 'module_langname' => 'ACP_FOOTBALL_RESULTS_MANAGE',
- 'module_mode' => 'manage',
- 'module_auth' => 'acl_a_football_results',
+ 'module_basename' => '\football\football\acp\results_module',
+ 'module_langname' => 'ACP_FOOTBALL_RESULTS_MANAGE',
+ 'module_mode' => 'manage',
+ 'module_auth' => 'acl_a_football_results',
),
)),
// Add the manage mode from football_all_bets to the ACP_FOOTBALL_OPERATION category.
array('module.add', array('acp', 'ACP_FOOTBALL_OPERATION', array(
- 'module_basename' => '\football\football\acp\all_bets_module',
- 'module_langname' => 'ACP_FOOTBALL_ALL_BETS_VIEW',
- 'module_mode' => 'manage',
- 'module_auth' => 'acl_a_football_editbets',
+ 'module_basename' => '\football\football\acp\all_bets_module',
+ 'module_langname' => 'ACP_FOOTBALL_ALL_BETS_VIEW',
+ 'module_mode' => 'manage',
+ 'module_auth' => 'acl_a_football_editbets',
),
)),
// Add the manage mode from football_bets to the ACP_FOOTBALL_OPERATION category.
array('module.add', array('acp', 'ACP_FOOTBALL_OPERATION', array(
- 'module_basename' => '\football\football\acp\bets_module',
- 'module_langname' => 'ACP_FOOTBALL_BETS_MANAGE',
- 'module_mode' => 'manage',
- 'module_auth' => 'acl_a_football_editbets',
+ 'module_basename' => '\football\football\acp\bets_module',
+ 'module_langname' => 'ACP_FOOTBALL_BETS_MANAGE',
+ 'module_mode' => 'manage',
+ 'module_auth' => 'acl_a_football_editbets',
),
)),
// Add the manage mode from football_ko to the ACP_FOOTBALL_OPERATION category.
array('module.add', array('acp', 'ACP_FOOTBALL_OPERATION', array(
- 'module_basename' => '\football\football\acp\ko_module',
- 'module_langname' => 'ACP_FOOTBALL_KO_MANAGE',
- 'module_mode' => 'manage',
- 'module_auth' => 'acl_a_football_plan',
+ 'module_basename' => '\football\football\acp\ko_module',
+ 'module_langname' => 'ACP_FOOTBALL_KO_MANAGE',
+ 'module_mode' => 'manage',
+ 'module_auth' => 'acl_a_football_plan',
),
)),
// Add the manage mode from football_bank to the ACP_FOOTBALL_OPERATION category.
array('module.add', array('acp', 'ACP_FOOTBALL_OPERATION', array(
- 'module_basename' => '\football\football\acp\bank_module',
- 'module_langname' => 'ACP_FOOTBALL_BANK_MANAGE',
- 'module_mode' => 'manage',
- 'module_auth' => 'acl_a_football_points',
+ 'module_basename' => '\football\football\acp\bank_module',
+ 'module_langname' => 'ACP_FOOTBALL_BANK_MANAGE',
+ 'module_mode' => 'manage',
+ 'module_auth' => 'acl_a_football_points',
),
)),
@@ -398,64 +398,64 @@ class v094_beta extends \phpbb\db\migration\migration
// Add the manage mode from football_seasons to the ACP_FOOTBALL_MANAGE category.
array('module.add', array('acp', 'ACP_FOOTBALL_MANAGE', array(
- 'module_basename' => '\football\football\acp\seasons_module',
- 'module_langname' => 'ACP_FOOTBALL_SEASONS_MANAGE',
- 'module_mode' => 'manage',
- 'module_auth' => 'acl_a_football_plan',
+ 'module_basename' => '\football\football\acp\seasons_module',
+ 'module_langname' => 'ACP_FOOTBALL_SEASONS_MANAGE',
+ 'module_mode' => 'manage',
+ 'module_auth' => 'acl_a_football_plan',
),
)),
// Add the manage mode from football_leagues to the ACP_FOOTBALL_MANAGE category.
array('module.add', array('acp', 'ACP_FOOTBALL_MANAGE', array(
- 'module_basename' => '\football\football\acp\leagues_module',
- 'module_langname' => 'ACP_FOOTBALL_LEAGUES_MANAGE',
- 'module_mode' => 'manage',
- 'module_auth' => 'acl_a_football_plan',
+ 'module_basename' => '\football\football\acp\leagues_module',
+ 'module_langname' => 'ACP_FOOTBALL_LEAGUES_MANAGE',
+ 'module_mode' => 'manage',
+ 'module_auth' => 'acl_a_football_plan',
),
)),
// Add the manage mode from football_matchdays to the ACP_FOOTBALL_MANAGE category.
array('module.add', array('acp', 'ACP_FOOTBALL_MANAGE', array(
- 'module_basename' => '\football\football\acp\matchdays_module',
- 'module_langname' => 'ACP_FOOTBALL_MATCHDAYS_MANAGE',
- 'module_mode' => 'manage',
- 'module_auth' => 'acl_a_football_plan',
+ 'module_basename' => '\football\football\acp\matchdays_module',
+ 'module_langname' => 'ACP_FOOTBALL_MATCHDAYS_MANAGE',
+ 'module_mode' => 'manage',
+ 'module_auth' => 'acl_a_football_plan',
),
)),
// Add the manage mode from football_teams to the ACP_FOOTBALL_MANAGE category.
array('module.add', array('acp', 'ACP_FOOTBALL_MANAGE', array(
- 'module_basename' => '\football\football\acp\teams_module',
- 'module_langname' => 'ACP_FOOTBALL_TEAMS_MANAGE',
- 'module_mode' => 'manage',
- 'module_auth' => 'acl_a_football_plan',
+ 'module_basename' => '\football\football\acp\teams_module',
+ 'module_langname' => 'ACP_FOOTBALL_TEAMS_MANAGE',
+ 'module_mode' => 'manage',
+ 'module_auth' => 'acl_a_football_plan',
),
)),
// Add the manage mode from football_matches to the ACP_FOOTBALL_MANAGE category.
array('module.add', array('acp', 'ACP_FOOTBALL_MANAGE', array(
- 'module_basename' => '\football\football\acp\matches_module',
- 'module_langname' => 'ACP_FOOTBALL_MATCHES_MANAGE',
- 'module_mode' => 'manage',
- 'module_auth' => 'acl_a_football_plan',
+ 'module_basename' => '\football\football\acp\matches_module',
+ 'module_langname' => 'ACP_FOOTBALL_MATCHES_MANAGE',
+ 'module_mode' => 'manage',
+ 'module_auth' => 'acl_a_football_plan',
),
)),
// Add the manage mode from football_extra to the ACP_FOOTBALL_MANAGE category.
array('module.add', array('acp', 'ACP_FOOTBALL_MANAGE', array(
- 'module_basename' => '\football\football\acp\extra_module',
- 'module_langname' => 'ACP_FOOTBALL_EXTRA_MANAGE',
- 'module_mode' => 'manage',
- 'module_auth' => 'acl_a_football_plan',
+ 'module_basename' => '\football\football\acp\extra_module',
+ 'module_langname' => 'ACP_FOOTBALL_EXTRA_MANAGE',
+ 'module_mode' => 'manage',
+ 'module_auth' => 'acl_a_football_plan',
),
)),
// Add the manage mode from football_update to the ACP_FOOTBALL_MANAGE category using the "manual" method.
array('module.add', array('acp', 'ACP_FOOTBALL_MANAGE', array(
- 'module_basename' => '\football\football\acp\update_module',
- 'module_langname' => 'ACP_FOOTBALL_UPDATE_MANAGE',
- 'module_mode' => 'manage',
- 'module_auth' => 'acl_a_football_plan',
+ 'module_basename' => '\football\football\acp\update_module',
+ 'module_langname' => 'ACP_FOOTBALL_UPDATE_MANAGE',
+ 'module_mode' => 'manage',
+ 'module_auth' => 'acl_a_football_plan',
),
)),
@@ -464,39 +464,39 @@ class v094_beta extends \phpbb\db\migration\migration
// Add the settings mode from football to the ACP_FOOTBALL_CONFIGURATION category.
array('module.add', array('acp', 'ACP_FOOTBALL_CONFIGURATION', array(
- 'module_basename' => 'football\football\acp\football_module',
- 'module_langname' => 'ACP_FOOTBALL_SETTINGS',
- 'module_mode' => 'settings',
- 'module_auth' => 'acl_a_football_config',
+ 'module_basename' => 'football\football\acp\football_module',
+ 'module_langname' => 'ACP_FOOTBALL_SETTINGS',
+ 'module_mode' => 'settings',
+ 'module_auth' => 'acl_a_football_config',
),
)),
// Add the features mode from football to the ACP_FOOTBALL_CONFIGURATION category.
array('module.add', array('acp', 'ACP_FOOTBALL_CONFIGURATION', array(
- 'module_basename' => 'football\football\acp\football_module',
- 'module_langname' => 'ACP_FOOTBALL_FEATURES',
- 'module_mode' => 'features',
- 'module_auth' => 'acl_a_football_config',
+ 'module_basename' => 'football\football\acp\football_module',
+ 'module_langname' => 'ACP_FOOTBALL_FEATURES',
+ 'module_mode' => 'features',
+ 'module_auth' => 'acl_a_football_config',
),
)),
// Add the menu mode from football to the ACP_FOOTBALL_CONFIGURATION category.
array('module.add', array('acp', 'ACP_FOOTBALL_CONFIGURATION', array(
- 'module_basename' => 'football\football\acp\football_module',
- 'module_langname' => 'ACP_FOOTBALL_MENU',
- 'module_mode' => 'menu',
- 'module_auth' => 'acl_a_football_config',
+ 'module_basename' => 'football\football\acp\football_module',
+ 'module_langname' => 'ACP_FOOTBALL_MENU',
+ 'module_mode' => 'menu',
+ 'module_auth' => 'acl_a_football_config',
),
)),
// Add the userguide mode from football to the ACP_FOOTBALL_CONFIGURATION category.
array('module.add', array('acp', 'ACP_FOOTBALL_CONFIGURATION', array(
- 'module_basename' => 'football\football\acp\football_module',
- 'module_langname' => 'ACP_FOOTBALL_USERGUIDE',
- 'module_mode' => 'userguide',
- 'module_auth' => 'acl_a_football_plan'
+ 'module_basename' => 'football\football\acp\football_module',
+ 'module_langname' => 'ACP_FOOTBALL_USERGUIDE',
+ 'module_mode' => 'userguide',
+ 'module_auth' => 'acl_a_football_plan'
),
)),
);
}
-}
\ No newline at end of file
+}
diff --git a/migrations/v094_beta_update.php b/migrations/v094_beta_update.php
index f3104db..694a36d 100644
--- a/migrations/v094_beta_update.php
+++ b/migrations/v094_beta_update.php
@@ -16,7 +16,7 @@ class v094_beta_update extends \phpbb\db\migration\migration
{
return !$this->db_tools->sql_column_exists($this->table_prefix . 'sessions', 'session_matchday');
}
-
+
static public function depends_on()
{
return array('\phpbb\db\migration\data\v310\extensions');
@@ -26,14 +26,14 @@ class v094_beta_update extends \phpbb\db\migration\migration
{
return array(
'drop_columns' => array(
- $this->table_prefix . 'sessions' => array(
+ $this->table_prefix . 'sessions' => array(
'session_season',
'session_league',
'session_matchday',
)
),
'add_columns' => array(
- $this->table_prefix . 'sessions' => array(
+ $this->table_prefix . 'sessions' => array(
'football_season' => array('USINT', 0),
'football_league' => array('TINT:2', 0),
'football_matchday' => array('TINT:2', 0),
@@ -57,7 +57,7 @@ class v094_beta_update extends \phpbb\db\migration\migration
public function revert_schema()
{
return array(
- 'drop_columns' => array(
+ 'drop_columns' => array(
$this->table_prefix . 'sessions' => array(
'football_season',
'football_league',
@@ -113,46 +113,46 @@ class v094_beta_update extends \phpbb\db\migration\migration
// Add the manage mode from football_results to the ACP_FOOTBALL_OPERATION category.
array('module.add', array('acp', 'ACP_FOOTBALL_OPERATION', array(
- 'module_basename' => '\football\football\acp\results_module',
- 'module_langname' => 'ACP_FOOTBALL_RESULTS_MANAGE',
- 'module_mode' => 'manage',
- 'module_auth' => 'acl_a_football_results',
+ 'module_basename' => '\football\football\acp\results_module',
+ 'module_langname' => 'ACP_FOOTBALL_RESULTS_MANAGE',
+ 'module_mode' => 'manage',
+ 'module_auth' => 'acl_a_football_results',
),
)),
// Add the manage mode from football_all_bets to the ACP_FOOTBALL_OPERATION category.
array('module.add', array('acp', 'ACP_FOOTBALL_OPERATION', array(
- 'module_basename' => '\football\football\acp\all_bets_module',
- 'module_langname' => 'ACP_FOOTBALL_ALL_BETS_VIEW',
- 'module_mode' => 'manage',
- 'module_auth' => 'acl_a_football_editbets',
+ 'module_basename' => '\football\football\acp\all_bets_module',
+ 'module_langname' => 'ACP_FOOTBALL_ALL_BETS_VIEW',
+ 'module_mode' => 'manage',
+ 'module_auth' => 'acl_a_football_editbets',
),
)),
// Add the manage mode from football_bets to the ACP_FOOTBALL_OPERATION category.
array('module.add', array('acp', 'ACP_FOOTBALL_OPERATION', array(
- 'module_basename' => '\football\football\acp\bets_module',
- 'module_langname' => 'ACP_FOOTBALL_BETS_MANAGE',
- 'module_mode' => 'manage',
- 'module_auth' => 'acl_a_football_editbets',
+ 'module_basename' => '\football\football\acp\bets_module',
+ 'module_langname' => 'ACP_FOOTBALL_BETS_MANAGE',
+ 'module_mode' => 'manage',
+ 'module_auth' => 'acl_a_football_editbets',
),
)),
// Add the manage mode from football_ko to the ACP_FOOTBALL_OPERATION category.
array('module.add', array('acp', 'ACP_FOOTBALL_OPERATION', array(
- 'module_basename' => '\football\football\acp\ko_module',
- 'module_langname' => 'ACP_FOOTBALL_KO_MANAGE',
- 'module_mode' => 'manage',
- 'module_auth' => 'acl_a_football_plan',
+ 'module_basename' => '\football\football\acp\ko_module',
+ 'module_langname' => 'ACP_FOOTBALL_KO_MANAGE',
+ 'module_mode' => 'manage',
+ 'module_auth' => 'acl_a_football_plan',
),
)),
// Add the manage mode from football_bank to the ACP_FOOTBALL_OPERATION category.
array('module.add', array('acp', 'ACP_FOOTBALL_OPERATION', array(
- 'module_basename' => '\football\football\acp\bank_module',
- 'module_langname' => 'ACP_FOOTBALL_BANK_MANAGE',
- 'module_mode' => 'manage',
- 'module_auth' => 'acl_a_football_points',
+ 'module_basename' => '\football\football\acp\bank_module',
+ 'module_langname' => 'ACP_FOOTBALL_BANK_MANAGE',
+ 'module_mode' => 'manage',
+ 'module_auth' => 'acl_a_football_points',
),
)),
@@ -162,64 +162,64 @@ class v094_beta_update extends \phpbb\db\migration\migration
// Add the manage mode from football_seasons to the ACP_FOOTBALL_MANAGE category.
array('module.add', array('acp', 'ACP_FOOTBALL_MANAGE', array(
- 'module_basename' => '\football\football\acp\seasons_module',
- 'module_langname' => 'ACP_FOOTBALL_SEASONS_MANAGE',
- 'module_mode' => 'manage',
- 'module_auth' => 'acl_a_football_plan',
+ 'module_basename' => '\football\football\acp\seasons_module',
+ 'module_langname' => 'ACP_FOOTBALL_SEASONS_MANAGE',
+ 'module_mode' => 'manage',
+ 'module_auth' => 'acl_a_football_plan',
),
)),
// Add the manage mode from football_leagues to the ACP_FOOTBALL_MANAGE category.
array('module.add', array('acp', 'ACP_FOOTBALL_MANAGE', array(
- 'module_basename' => '\football\football\acp\leagues_module',
- 'module_langname' => 'ACP_FOOTBALL_LEAGUES_MANAGE',
- 'module_mode' => 'manage',
- 'module_auth' => 'acl_a_football_plan',
+ 'module_basename' => '\football\football\acp\leagues_module',
+ 'module_langname' => 'ACP_FOOTBALL_LEAGUES_MANAGE',
+ 'module_mode' => 'manage',
+ 'module_auth' => 'acl_a_football_plan',
),
)),
// Add the manage mode from football_matchdays to the ACP_FOOTBALL_MANAGE category.
array('module.add', array('acp', 'ACP_FOOTBALL_MANAGE', array(
- 'module_basename' => '\football\football\acp\matchdays_module',
- 'module_langname' => 'ACP_FOOTBALL_MATCHDAYS_MANAGE',
- 'module_mode' => 'manage',
- 'module_auth' => 'acl_a_football_plan',
+ 'module_basename' => '\football\football\acp\matchdays_module',
+ 'module_langname' => 'ACP_FOOTBALL_MATCHDAYS_MANAGE',
+ 'module_mode' => 'manage',
+ 'module_auth' => 'acl_a_football_plan',
),
)),
// Add the manage mode from football_teams to the ACP_FOOTBALL_MANAGE category.
array('module.add', array('acp', 'ACP_FOOTBALL_MANAGE', array(
- 'module_basename' => '\football\football\acp\teams_module',
- 'module_langname' => 'ACP_FOOTBALL_TEAMS_MANAGE',
- 'module_mode' => 'manage',
- 'module_auth' => 'acl_a_football_plan',
+ 'module_basename' => '\football\football\acp\teams_module',
+ 'module_langname' => 'ACP_FOOTBALL_TEAMS_MANAGE',
+ 'module_mode' => 'manage',
+ 'module_auth' => 'acl_a_football_plan',
),
)),
// Add the manage mode from football_matches to the ACP_FOOTBALL_MANAGE category.
array('module.add', array('acp', 'ACP_FOOTBALL_MANAGE', array(
- 'module_basename' => '\football\football\acp\matches_module',
- 'module_langname' => 'ACP_FOOTBALL_MATCHES_MANAGE',
- 'module_mode' => 'manage',
- 'module_auth' => 'acl_a_football_plan',
+ 'module_basename' => '\football\football\acp\matches_module',
+ 'module_langname' => 'ACP_FOOTBALL_MATCHES_MANAGE',
+ 'module_mode' => 'manage',
+ 'module_auth' => 'acl_a_football_plan',
),
)),
// Add the manage mode from football_extra to the ACP_FOOTBALL_MANAGE category.
array('module.add', array('acp', 'ACP_FOOTBALL_MANAGE', array(
- 'module_basename' => '\football\football\acp\extra_module',
- 'module_langname' => 'ACP_FOOTBALL_EXTRA_MANAGE',
- 'module_mode' => 'manage',
- 'module_auth' => 'acl_a_football_plan',
+ 'module_basename' => '\football\football\acp\extra_module',
+ 'module_langname' => 'ACP_FOOTBALL_EXTRA_MANAGE',
+ 'module_mode' => 'manage',
+ 'module_auth' => 'acl_a_football_plan',
),
)),
// Add the manage mode from football_update to the ACP_FOOTBALL_MANAGE category using the "manual" method.
array('module.add', array('acp', 'ACP_FOOTBALL_MANAGE', array(
- 'module_basename' => '\football\football\acp\update_module',
- 'module_langname' => 'ACP_FOOTBALL_UPDATE_MANAGE',
- 'module_mode' => 'manage',
- 'module_auth' => 'acl_a_football_plan',
+ 'module_basename' => '\football\football\acp\update_module',
+ 'module_langname' => 'ACP_FOOTBALL_UPDATE_MANAGE',
+ 'module_mode' => 'manage',
+ 'module_auth' => 'acl_a_football_plan',
),
)),
@@ -228,37 +228,37 @@ class v094_beta_update extends \phpbb\db\migration\migration
// Add the settings mode from football to the ACP_FOOTBALL_CONFIGURATION category.
array('module.add', array('acp', 'ACP_FOOTBALL_CONFIGURATION', array(
- 'module_basename' => 'football\football\acp\football_module',
- 'module_langname' => 'ACP_FOOTBALL_SETTINGS',
- 'module_mode' => 'settings',
- 'module_auth' => 'acl_a_football_config',
+ 'module_basename' => 'football\football\acp\football_module',
+ 'module_langname' => 'ACP_FOOTBALL_SETTINGS',
+ 'module_mode' => 'settings',
+ 'module_auth' => 'acl_a_football_config',
),
)),
// Add the features mode from football to the ACP_FOOTBALL_CONFIGURATION category.
array('module.add', array('acp', 'ACP_FOOTBALL_CONFIGURATION', array(
- 'module_basename' => 'football\football\acp\football_module',
- 'module_langname' => 'ACP_FOOTBALL_FEATURES',
- 'module_mode' => 'features',
- 'module_auth' => 'acl_a_football_config',
+ 'module_basename' => 'football\football\acp\football_module',
+ 'module_langname' => 'ACP_FOOTBALL_FEATURES',
+ 'module_mode' => 'features',
+ 'module_auth' => 'acl_a_football_config',
),
)),
// Add the menu mode from football to the ACP_FOOTBALL_CONFIGURATION category.
array('module.add', array('acp', 'ACP_FOOTBALL_CONFIGURATION', array(
- 'module_basename' => 'football\football\acp\football_module',
- 'module_langname' => 'ACP_FOOTBALL_MENU',
- 'module_mode' => 'menu',
- 'module_auth' => 'acl_a_football_config',
+ 'module_basename' => 'football\football\acp\football_module',
+ 'module_langname' => 'ACP_FOOTBALL_MENU',
+ 'module_mode' => 'menu',
+ 'module_auth' => 'acl_a_football_config',
),
)),
// Add the userguide mode from football to the ACP_FOOTBALL_CONFIGURATION category.
array('module.add', array('acp', 'ACP_FOOTBALL_CONFIGURATION', array(
- 'module_basename' => 'football\football\acp\football_module',
- 'module_langname' => 'ACP_FOOTBALL_USERGUIDE',
- 'module_mode' => 'userguide',
- 'module_auth' => 'acl_a_football_plan'
+ 'module_basename' => 'football\football\acp\football_module',
+ 'module_langname' => 'ACP_FOOTBALL_USERGUIDE',
+ 'module_mode' => 'userguide',
+ 'module_auth' => 'acl_a_football_plan'
),
)),
);
diff --git a/styles/prosilver/template/all_bets.html b/styles/prosilver/template/all_bets.html
index dc744cc..2d78d12 100644
--- a/styles/prosilver/template/all_bets.html
+++ b/styles/prosilver/template/all_bets.html
@@ -1,125 +1,125 @@
-
-
\ No newline at end of file
diff --git a/styles/prosilver/template/frame_results.html b/styles/prosilver/template/frame_results.html
index 79a8292..f1bd90d 100644
--- a/styles/prosilver/template/frame_results.html
+++ b/styles/prosilver/template/frame_results.html
@@ -1,13 +1,13 @@
-
-Diese Datei existiert doppelt: Einmal im fooball\football\styles\prsilver\template und einmal im fooball\football\adm\style Ordner
-Mit Hilfe dieser Datei werden Fussballergebnisse zum Abgleich und schnelleren Erfassung von externen Seiten,
-wie z.B. den Weltfussball.de Torverteiler, eingebunden.
-Wenn ihr einen Weltfussball.de Account habt, könnt ihr dort in der Community einen Torverteiler erstellen und den Code hier
-unter der entsprechenden Liganummer reinhängen (also 999999 mit der Liganummer bzw. wfb_tv_id ersetzen).
-Der Frame wird dann bei der Ergebnisseingabe in der Liga angezeigt, wenn der Spieltag editierbar ist.
-
-
-
-
-
-
+
+Diese Datei existiert doppelt: Einmal im fooball\football\styles\prsilver\template und einmal im fooball\football\adm\style Ordner
+Mit Hilfe dieser Datei werden Fussballergebnisse zum Abgleich und schnelleren Erfassung von externen Seiten,
+wie z.B. den Weltfussball.de Torverteiler, eingebunden.
+Wenn ihr einen Weltfussball.de Account habt, könnt ihr dort in der Community einen Torverteiler erstellen und den Code hier
+unter der entsprechenden Liganummer reinhängen (also 999999 mit der Liganummer bzw. wfb_tv_id ersetzen).
+Der Frame wird dann bei der Ergebnisseingabe in der Liga angezeigt, wenn der Spieltag editierbar ist.
+
+
+
+
\ No newline at end of file
diff --git a/styles/prosilver/template/last_results.html b/styles/prosilver/template/last_results.html
index 1ba76ca..ce9a758 100644
--- a/styles/prosilver/template/last_results.html
+++ b/styles/prosilver/template/last_results.html
@@ -1,13 +1,13 @@
-
-
\ No newline at end of file
diff --git a/styles/prosilver/template/mobile_all_bets.html b/styles/prosilver/template/mobile_all_bets.html
index 5883954..3df5c12 100644
--- a/styles/prosilver/template/mobile_all_bets.html
+++ b/styles/prosilver/template/mobile_all_bets.html
@@ -1,98 +1,98 @@
-
-
+
\ No newline at end of file
diff --git a/styles/prosilver/template/mobile_odds.html b/styles/prosilver/template/mobile_odds.html
index cb6ff2a..021863e 100644
--- a/styles/prosilver/template/mobile_odds.html
+++ b/styles/prosilver/template/mobile_odds.html
@@ -1,35 +1,35 @@
-
-
-
-
-
-
{L_VS}
-
%
-
Quoten
-
-
-
-
-
-
- {odds.HOME_NAME}
-
:
-
- {odds.GUEST_NAME}
-
{odds.TREND}
-
{odds.ODD_1}
-
{odds.ODD_X}
-
{odds.ODD_2}
-
-
-
-
-
-
-
-
-
-
{L_NO_PLAN}
-
-
+
+
+
+
+
+
{L_VS}
+
%
+
Quoten
+
+
+
+
+
+
+ {odds.HOME_NAME}
+
:
+
+ {odds.GUEST_NAME}
+
{odds.TREND}
+
{odds.ODD_1}
+
{odds.ODD_X}
+
{odds.ODD_2}
+
+
+
+
+
+
+
+
+
+
{L_NO_PLAN}
+
+
\ No newline at end of file
diff --git a/styles/prosilver/template/mobile_ranks.html b/styles/prosilver/template/mobile_ranks.html
index c49e92b..a311197 100644
--- a/styles/prosilver/template/mobile_ranks.html
+++ b/styles/prosilver/template/mobile_ranks.html
@@ -1,51 +1,51 @@
-
-
-
+
\ No newline at end of file
diff --git a/styles/prosilver/template/mobile_stat_points.html b/styles/prosilver/template/mobile_stat_points.html
index b718449..f0a89f5 100644
--- a/styles/prosilver/template/mobile_stat_points.html
+++ b/styles/prosilver/template/mobile_stat_points.html
@@ -1,136 +1,136 @@
-
-
\ No newline at end of file
diff --git a/styles/prosilver/template/stat_points.html b/styles/prosilver/template/stat_points.html
index 4288052..8136d15 100644
--- a/styles/prosilver/template/stat_points.html
+++ b/styles/prosilver/template/stat_points.html
@@ -1,137 +1,137 @@
-
-
-
![' . $user->lang['BACK_TO_TOP'] . '](' . $phpbb_admin_path . 'images/icon_up.gif "' . $user->lang['BACK_TO_TOP'] . '"){kind=icon}
',
'S_VERSION_NO' => $this->config['football_version'],
@@ -242,7 +242,7 @@ class football_module
$this->page_title = $display_vars['title'];
$template->assign_vars(array(
- 'U_FOOTBALL' => $helper->route('football_main_controller',array('side' => 'bet')),
+ 'U_FOOTBALL' => $helper->route('football_football_controller',array('side' => 'bet')),
'L_TITLE' => $user->lang[$display_vars['title']],
'L_TITLE_EXPLAIN' => $user->lang[$display_vars['title'] . '_EXPLAIN'],
'S_ERROR' => (sizeof($error)) ? true : false,
@@ -434,5 +434,3 @@ class football_module
}
}
-
-?>
\ No newline at end of file
diff --git a/acp/ko_info.php b/acp/ko_info.php
index 4b31bfd..8302e9e 100644
--- a/acp/ko_info.php
+++ b/acp/ko_info.php
@@ -1,25 +1,25 @@
- '\football\football\acp\ko_module',
- 'title' => 'ACP_FOOTBALL_KO_MANAGEMENT',
- 'version' => '0.9.4',
- 'modes' => array(
- 'manage' => array('title' => 'ACP_FOOTBALL_KO_MANAGE', 'auth' => 'acl_a_football_plan', 'cat' => array('ACP_FOOTBALL_KO')),
- ),
- );
- }
-}
+ '\football\football\acp\ko_module',
+ 'title' => 'ACP_FOOTBALL_KO_MANAGEMENT',
+ 'version' => '0.9.4',
+ 'modes' => array(
+ 'manage' => array('title' => 'ACP_FOOTBALL_KO_MANAGE', 'auth' => 'acl_a_football_plan', 'cat' => array('ACP_FOOTBALL_KO')),
+ ),
+ );
+ }
+}
diff --git a/acp/ko_module.php b/acp/ko_module.php
index 5b5f41e..7753923 100644
--- a/acp/ko_module.php
+++ b/acp/ko_module.php
@@ -56,7 +56,7 @@ class ko_module
$form_key = 'acp_football_ko';
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['update'])) ? 'update' : $this->request->variable('action', '');
@@ -230,7 +230,7 @@ class ko_module
$template->assign_vars(array(
'U_ACTION' => $this->u_action,
- 'U_FOOTBALL' => $helper->route('football_main_controller',array('side' => 'bet', 's' => $season, 'l' => $league)),
+ 'U_FOOTBALL' => $helper->route('football_football_controller',array('side' => 'bet', 's' => $season, 'l' => $league)),
'S_ERROR' => (sizeof($error)) ? true : false,
'ERROR_MSG' => (sizeof($error)) ? implode('