change color to green

acp/bets_module.php

@@ -426,6 +426,9 @@ class bets_module
 					$league_info = league_info($season, $league);
 					$cash	= $this->request->variable('cash', false);
 					save_ranking_matchday($season, $league, $matchday, $cash);
+					bonuspoints($season, $league, $matchday);
+					corr($season, $league, $matchday);
+					chart($season, $league, $matchday);
 				}
 			break;
 		}

acp/results_module.php

@@ -443,6 +443,9 @@ class results_module
 
 				$cash	= $this->request->variable('cash', false);
 				save_ranking_matchday($season, $league, $matchday, $cash);
+				bonuspoints($season, $league, $matchday);
+				corr($season, $league, $matchday);
+				chart($season, $league, $matchday);
 
 				// Patch delevirey
 				if ($league_info['bet_in_time'] == 1) 

block/all_bets.php

@@ -14,11 +14,23 @@ if (!defined('IN_PHPBB') OR !defined('IN_FOOTBALL'))
 
 $start = $this->request->variable('start', 0);
 $matches_on_matchday = false;
-
-$sql = 'SELECT COUNT(DISTINCT  user_id) AS num_users
-		FROM  ' . FOOTB_BETS . " 
-		WHERE  season = $season AND league = $league";
-		
+$league_info = league_info($season, $league);
+if($league_info['bet_type'])
+{
+	$sql = 'SELECT COUNT(DISTINCT  b.user_id) AS num_users
+		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  b.season = $season AND b.league = $league AND m.matchday = $matchday";
+}
+else
+{
+	$sql = 'SELECT COUNT(DISTINCT  b.user_id) AS num_users
+			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_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  b.season = $season AND b.league = $league AND m.matchday = $matchday AND (m2.match_no IS NOT NULL || m3.match_no IS NOT NULL) ";
+}
 $result = $db->sql_query($sql);
 $total_users = (int) $db->sql_fetchfield('num_users');
 $db->sql_freeresult($result);
@@ -36,7 +48,19 @@ $sql = "SELECT
 		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
+		SUM(IF(b.goals_home + 0 < b.goals_guest AND b.goals_home <> '' AND b.goals_guest <> '', 1, 0)) AS 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)
@@ -67,7 +91,7 @@ if ($user->data['football_mobile'])
 }
 else
 {
-	if ($count_matches > 11)
+	if ($count_matches > 12)
 	{
 		$split_after = 8;
 		$splits = ceil($count_matches / 8);
@@ -113,21 +137,47 @@ if ($count_matches > 0)
 {
 	$matches_on_matchday = true;
 
+	if($league_info['bet_type'])
+	{
 		$sql = "SELECT
 				u.user_id,
 				u.username,
 				m.status,
 				b.goals_home AS bet_home,
 				b.goals_guest AS bet_guest,
+				IFNULL(m2.match_no,m3.match_no),
 				" . select_points() . '
 			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 ' . USERS_TABLE . " AS u ON (u.user_id = b.user_id)
+				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 
 				AND m.matchday = $matchday
-		ORDER BY LOWER(u.username) ASC, m.match_datetime ASC, m.match_no ASC";
-		
+				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";
+	}
+	else
+	{
+		$sql = "SELECT
+				u.user_id,
+				u.username,
+				m.status,
+				b.goals_home AS bet_home,
+				b.goals_guest AS bet_guest,
+				IFNULL(m2.match_no,m3.match_no),
+				" . select_points() . '
+			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 ' . 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 
+				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";
+	}
 	$result = $db->sql_query_limit($sql, $sql_limit, $sql_start);
 	$user_bets = $db->sql_fetchrowset($result);
 	$db->sql_freeresult($result);
@@ -169,7 +219,15 @@ foreach ($matches AS $match)
 				if ($bet_index == 0)
 				{
 					$count_user++;
+					$league_info = league_info($season, $league);
+					if ($league_info['bet_type'])
+					{
 						$row_class = (!($count_user % 2)) ? 'bg1 row_light' : 'bg2 row_dark';
+					}
+					else
+					{
+						$row_class = (!(($count_user + ($count_user % 2)) % 4)) ? 'bg1 row_light' : 'bg2 row_dark';
+					}
 					if ($user_bet['user_id'] == $user->data['user_id'])
 					{
 						$row_class = 'bg3  row_user';
@@ -268,6 +326,7 @@ foreach ($matches AS $match)
     		'GUEST_NAME' 	=> $guestname,
     		'RESULT' 		=> $match['goals_home']. ':'.$match['goals_guest'],
     		'COLOR_STYLE' 	=> $colorstyle_match,
+    		'MATCH_TIME' 	=> $match['match_time'],
 		)
 	);
 	if ($match['status'] < 1 && !$config['football_view_tendencies'])
@@ -287,12 +346,22 @@ if ($count_matches > 0)
 	$total = 0;
 	$count_user = 0;
 	$bet_index = 0;
+	if(!empty($bet_line))
+	{
 		foreach ($bet_line[$split_index] AS $user_bet)
 		{
 			if ($bet_index == 0)
 			{
 				$count_user++;
+				$league_info = league_info($season, $league);
+				if ($league_info['bet_type'])
+				{
 					$row_class = (!($count_user % 2)) ? 'bg1 row_light' : 'bg2 row_dark';
+				}
+				else
+				{
+					$row_class = (!(($count_user + ($count_user % 2)) % 4)) ? 'bg1 row_light' : 'bg2 row_dark';
+				}
 				if ($user_bet['user_id'] == $user->data['user_id'])
 				{
 					$row_class = 'bg3  row_user';
@@ -342,6 +411,7 @@ if ($count_matches > 0)
 				$bet_index = 0;
 			}
 		}
+	}
 
 	$template->assign_block_vars('match_panel.tendency_footer', array(
 		'S_TOTAL' 		=> true,
@@ -450,7 +520,7 @@ while ($row = $db->sql_fetchrow($result))
 	while ($user_row = $db->sql_fetchrow($result_bet))
 	{
 		$bet_number++ ;
-		$row_class = (!($bet_number % 2)) ? 'bg1 row_light' : 'bg2 row_dark';
+		$row_class = (!(($count_user + ($count_user % 2)) % 4)) ? 'bg1 row_light' : 'bg2 row_dark';
 		if ($user_row['user_id'] == $user->data['user_id'])
 		{
 			$row_class = 'bg3  row_user';

block/my_chart.php

@@ -22,17 +22,17 @@ $username2 = '';
 $username3 = '';
 $username4 = '';
 // Calculate rank total
-$sql = 'SELECT
+$sql = "SELECT
 		r.user_id,
 		u.username,
-		SUM(r.points) AS points_total
-	FROM ' . FOOTB_RANKS . ' AS r 
+		(SELECT SUM(c.rank_total) FROM " . FOOTB_MY_CHART . " AS c WHERE c.user_id = (r.user_id) AND c.season = r.season AND c.league = r.league AND c.matchday = $matchday) AS points_total
+	FROM " . FOOTB_RANKS . ' AS r 
 	LEFT JOIN ' . USERS_TABLE . " AS u ON (u.user_id = r.user_id)
 	WHERE r.season = $season 
 		AND r.league = $league 
 		AND r.matchday <= $matchday
 	GROUP BY r.user_id
-	ORDER BY points_total DESC, LOWER(u.username) ASC";
+	ORDER BY points_total ASC, LOWER(u.username) ASC";
 	
 $result = $db->sql_query($sql);
 $current_ranks = $db->sql_fetchrowset($result);
@@ -158,7 +158,7 @@ if ($total_users > 3 AND $total_users <= 50)
 	$ranks_dayl_1 	= '';
 	$points_1 		= '';
 	$sql = 'SELECT *
-		FROM ' . FOOTB_RANKS . " 
+		FROM ' . FOOTB_MY_CHART . " 
 		WHERE season = $season 
 			AND league = $league 
 			AND matchday <= $matchday 
@@ -211,7 +211,7 @@ if ($total_users > 3 AND $total_users <= 50)
 	if ($user3 != 0)
 	{
 		$sql = 'SELECT *
-			FROM ' . FOOTB_RANKS . " 
+			FROM ' . FOOTB_MY_CHART . " 
 			WHERE season = $season 
 				AND league = $league 
 				AND matchday <= $matchday 
@@ -238,7 +238,7 @@ if ($total_users > 3 AND $total_users <= 50)
 	if ($user4 != 0)
 	{
 		$sql = 'SELECT *
-			FROM ' . FOOTB_RANKS . " 
+			FROM ' . FOOTB_MY_CHART . " 
 			WHERE season = $season 
 				AND league = $league 
 				AND matchday <= $matchday 
@@ -267,7 +267,7 @@ if ($total_users > 3 AND $total_users <= 50)
 		$sql = 'SELECT
 				MIN(points) As points_min,
 				MAX(points) As points_max
-			FROM ' . FOOTB_RANKS . " 
+			FROM ' . FOOTB_MY_CHART . " 
 			WHERE season = $season 
 				AND league = $league 
 				AND matchday <= $matchday

block/my_table.php

@@ -137,6 +137,7 @@ $sql = 'SELECT
 		AND b.goals_home <> '' 
 		AND b.goals_guest <> '' 
 		AND m.matchday <= $matchday 
+        AND m.show_table = 0
 	GROUP BY t.team_id
 	ORDER BY t.group_id ASC, points DESC, goals_diff DESC, goals DESC";
 	
@@ -233,6 +234,7 @@ $sql = 'SELECT
 		AND b.goals_home <> '' 
 		AND b.goals_guest <> '' 
 		AND m.matchday >= $form_from 
+        AND m.show_table = 0
 	GROUP BY t.team_id
 	ORDER BY t.group_id ASC, points DESC, goals_diff DESC, goals DESC";
 	
@@ -300,6 +302,7 @@ $sql = 'SELECT
 		AND b.goals_home <> '' 
 		AND b.goals_guest <> '' 
 		AND m.matchday <= $matchday 
+        AND m.show_table = 0
 	GROUP BY t.team_id
 	ORDER BY t.group_id ASC, points DESC, goals_diff DESC, goals DESC";
 	
@@ -365,6 +368,7 @@ $sql = 'SELECT
 		AND b.goals_home <> '' 
 		AND b.goals_guest <> '' 
 		AND m.matchday <= $matchday 
+        AND m.show_table = 0
 	GROUP BY t.team_id
 	ORDER BY t.group_id ASC, points DESC, goals_diff DESC, goals DESC";
 	

block/rank_matchday.php

@@ -12,6 +12,15 @@ if (!defined('IN_PHPBB') OR !defined('IN_FOOTBALL'))
 	exit;
 }
 
+if ($league > 50)
+{
+    $league_corr = $league - 50;
+}
+else
+{
+    $league_corr = $league;
+}
+
 if ($league <> 0)
 {
 	$data_rank_matchday = false;
@@ -26,7 +35,7 @@ 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 
+			AND r.league = $league_corr 
 			AND r.matchday = $matchday 
 			AND r.status IN (2,3)
 		ORDER BY rank ASC, LOWER(u.username) ASC";
@@ -50,7 +59,7 @@ if ($league <> 0)
 				'ROW_CLASS' 	=> $row_class,
 				'USERID' 		=> $row['user_id'],
 				'USERNAME' 		=> $row['username'],
-				'U_BET_USER'	=> $this->helper->route('football_football_popup', array('popside' => 'bet_popup', 's' => $season, 'l' => $league,
+				'U_BET_USER'	=> $this->helper->route('football_football_popup', array('popside' => 'bet_popup', 's' => $season, 'l' => $league_corr,
 																					'm' => $matchday, 'u' => $row['user_id'])),
 				'POINTS' 		=> $row['points'],
 				'COLOR_STYLE' 	=> $colorstyle,
@@ -60,7 +69,7 @@ if ($league <> 0)
 		}
 	}
 	$db->sql_freeresult($result);
-	$league_info = league_info($season, $league);
+	$league_info = league_info($season, $league_corr);
 
 	$template->assign_vars(array(
 		'S_DISPLAY_RANK_MATCHDAY' 	=> true,

block/results.php

@@ -389,7 +389,6 @@ while ($row = $db->sql_fetchrow($result))
 }
 $db->sql_freeresult($result);
 
-$sidename = sprintf($user->lang['RESULTS']);
 switch ($league_info['bet_ko_type'])
 {
 	case BET_KO_90:
@@ -410,8 +409,21 @@ switch ($league_info['bet_ko_type'])
 		break;
 }
 
+// set correct display for usage in menu template
+if($side == 'results')
+{
+    $display_results = true;
+    $sidename = sprintf($user->lang['RESULTS']);
+}
+if($side == 'results_tl')
+{
+    $display_results_tl = true;
+    $sidename = sprintf($user->lang['RESULTS']);
+}
+
 $template->assign_vars(array(
-	'S_DISPLAY_RESULTS' 		=> true,
+    'S_DISPLAY_RESULTS' 		=> $display_results,
+    'S_DISPLAY_RESULTS_TL' 		=> $display_results_tl,
 	'S_EXTRA_RESULTS' 			=> $extra_results,
 	'S_SIDENAME' 				=> $sidename,
 	'RESULT_EXPLAIN' 			=> $result_explain,

block/table.php

@@ -42,17 +42,23 @@ $rank = 0;
 $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 win,
-		SUM(IF(goals_home = goals_guest, 1, 0)) AS draw,
-		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, 1, 0), IF(goals_home + 0 < goals_guest, 1, 0)))
+	   + IFNULL((SELECT SUM(c.win) 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)AS win,
+       SUM(IF(goals_home = goals_guest, 1, 0))
+	   + IFNULL((SELECT SUM(c.draw) 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)AS draw,
+       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)))
+	   + IFNULL((SELECT SUM(c.lost) 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)AS lost,
 		SUM(IF(m.team_id_home = t.team_id, 
 				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))
 			)
-		) - IF(t.team_id = 20 AND t.season = 2011 AND $matchday > 7, 2, 0) AS points,
+		) + 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,
 		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
+       SUM(IF(m.team_id_home = t.team_id, goals_guest , goals_home)) AS goals_against,
+       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) AS bonus
 	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) AND m.group_id = t.group_id)
@@ -60,6 +66,7 @@ $sql = "SELECT
 		AND t.league = $league 
 		AND m.matchday <= $matchday 
 		AND m.status IN (2,3,5,6)
+        AND m.show_table = 0
 	GROUP BY t.team_id
 	ORDER BY t.group_id ASC, points DESC, goals_diff DESC, goals DESC, t.team_name ASC";
 	
@@ -147,7 +154,8 @@ foreach($points_ary as $group_id => $points)
 				'GOALS' 		=> $row['goals'],
 				'GOALS_AGAINST' => $row['goals_against'],
 				'GOALS_DIFF' 	=> $row['goals_diff'],
-				'POINTS' 		=> $row['points'],
+				'BONUS' 		=> round($row['bonus'],2),
+				'POINTS' 		=> round($row['points'],2),
 				)
 			);
 		}		
@@ -157,27 +165,34 @@ foreach($points_ary as $group_id => $points)
 $db->sql_freeresult($result);
 $rank = 0;
 // Get form-table-information
-$sql = 'SELECT
+$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 win,
-		SUM(IF(goals_home = goals_guest, 1, 0)) AS draw,
-		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, 1, 0), IF(goals_home + 0 < goals_guest, 1, 0)))
+	   + IFNULL((SELECT SUM(c.win) 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)AS win,
+       SUM(IF(goals_home = goals_guest, 1, 0))
+	   + IFNULL((SELECT SUM(c.draw) 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)AS draw,
+       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)))
+	   + IFNULL((SELECT SUM(c.lost) 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)AS lost,
 		SUM(IF(m.team_id_home = t.team_id,
 				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))
 			)
-		) AS points,
+		) + 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,
-		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
+		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,
+       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) AS bonus
+	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) AND m.group_id = t.group_id)
 	WHERE t.season = $season 
 		AND t.league = $league 
 		AND m.matchday >= $form_from 
 		AND m.status IN (2, 3,5,6)
+        AND m.show_table = 0
 	GROUP BY t.team_id
 	ORDER BY t.group_id ASC, points DESC, goals_diff DESC, goals DESC, t.team_name ASC";
 	
@@ -242,7 +257,8 @@ while($row = $db->sql_fetchrow($result))
 			'GOALS' 		=> $row['goals'],
 			'GOALS_AGAINST' => $row['goals_against'],
 		    'GOALS_DIFF' 	=> $row['goals_diff'],
-			'POINTS' 		=> $row['points'],
+		    'BONUS' 		=> round($row['bonus'],2),
+		    'POINTS' 		=> round($row['points'],2),
 			)
 		);
 	}
@@ -250,23 +266,29 @@ while($row = $db->sql_fetchrow($result))
 $db->sql_freeresult($result);
 $rank = 0;
 // Get home-table-information
-$sql = 'SELECT
+$sql = "SELECT
 		t.*,
 		SUM(1) AS matches,
-		SUM(IF(goals_home + 0 > goals_guest, 1, 0)) AS win,
-		SUM(IF(goals_home = goals_guest, 1, 0)) AS draw,
-		SUM(IF(goals_home + 0 < goals_guest, 1, 0)) AS lost,
-		SUM(IF(goals_home + 0 > goals_guest, 3, IF(goals_home = goals_guest, 1, 0))) AS points,
+		SUM(IF(goals_home + 0 > goals_guest, 1, 0))
+			+ IFNULL((SELECT SUM(c.win) 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 AND c.home = 1 ),0)AS win,
+		SUM(IF(goals_home = goals_guest, 1, 0))
+			+ IFNULL((SELECT SUM(c.draw) 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 AND c.home = 1 ),0)AS draw,
+		SUM(IF(goals_home + 0 < goals_guest, 1, 0))
+			+ IFNULL((SELECT SUM(c.lost) 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 AND c.home = 1 ),0)AS lost,
+		SUM(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 AND home = '1'),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 AND c.home = 1 ),0)AS points,
 		SUM(goals_home - goals_guest) AS goals_diff,
 		SUM(goals_home) AS goals,
-		SUM(goals_guest) AS goals_against
-	FROM ' . FOOTB_TEAMS . ' AS t
+		SUM(goals_guest) AS goals_against,
+			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 home = '1'),0) AS bonus
+	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 AND m.group_id = t.group_id)
 	WHERE t.season = $season 
 		AND t.league = $league 
 		AND m.matchday <= $matchday 
 		AND m.status IN (2, 3,5,6)
+        AND m.show_table = 0
 	GROUP BY t.team_id
 	ORDER BY t.group_id ASC, points DESC, goals_diff DESC, goals DESC, t.team_name ASC";
 	
@@ -330,7 +352,8 @@ while($row = $db->sql_fetchrow($result))
 			'GOALS' 		=> $row['goals'],
 			'GOALS_AGAINST' => $row['goals_against'],
 		    'GOALS_DIFF' 	=> $row['goals_diff'],
-			'POINTS' 		=> $row['points'],
+		    'BONUS' 		=> round($row['bonus'],2),
+		    'POINTS' 		=> round($row['points'],2),
 			)
 		);
 	}
@@ -338,23 +361,29 @@ while($row = $db->sql_fetchrow($result))
 $db->sql_freeresult($result);
 $rank = 0;
 // Get away-table-information
-$sql = 'SELECT
+$sql = "SELECT
 		t.*,
 		SUM(1) AS matches,
-		SUM(IF(goals_home + 0 < goals_guest, 1, 0)) AS win,
-		SUM(IF(goals_home = goals_guest, 1, 0)) AS draw,
-		SUM(IF(goals_home + 0 > goals_guest, 1, 0)) AS lost,
-		SUM(IF(goals_home + 0 < goals_guest, 3, IF(goals_home = goals_guest, 1, 0))) AS points,
+		SUM(IF(goals_home + 0 < goals_guest, 1, 0))
+			+ IFNULL((SELECT SUM(c.win) 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 AND c.home = 0 ),0)AS win,
+		SUM(IF(goals_home = goals_guest, 1, 0))
+			+ IFNULL((SELECT SUM(c.draw) 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 AND c.home = 0 ),0)AS draw,
+		SUM(IF(goals_home + 0 > goals_guest, 1, 0))
+			+ IFNULL((SELECT SUM(c.lost) 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 AND c.home = 0 ),0)AS lost,
+		SUM(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 AND home = '0'),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 AND c.home = 0 ),0)AS points,
 		SUM(goals_guest - goals_home) AS goals_diff,
 		SUM(goals_guest) AS goals,
-		SUM(goals_home) AS goals_against
-	FROM ' . FOOTB_TEAMS . ' AS t
+		SUM(goals_home) AS goals_against,
+			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 home = '0'),0) AS bonus
+	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 AND m.group_id = t.group_id)
 	WHERE t.season = $season 
 		AND t.league = $league 
 		AND m.matchday <= $matchday 
 		AND m.status IN (2, 3,5,6)
+        AND m.show_table = 0
 	GROUP BY t.team_id
 	ORDER BY t.group_id ASC, points DESC, goals_diff DESC, goals DESC, t.team_name ASC";
 	
@@ -418,22 +447,33 @@ while($row = $db->sql_fetchrow($result))
 			'GOALS' 		=> $row['goals'],
 			'GOALS_AGAINST' => $row['goals_against'],
 		    'GOALS_DIFF' 	=> $row['goals_diff'],
-			'POINTS' 		=> $row['points'],
+		    'BONUS' 		=> round($row['bonus'],2),
+		    'POINTS' 		=> round($row['points'],2),
 			)
 		);
 	}
 }
 
+if($league > 50)
+{
+    // Activate bonus coloumn only for tippers.
+    $data_bns = true;
+}
+if($side == 'table') {
+    $display_table_menu = true;
+}
 $db->sql_freeresult($result);
 $sidename = sprintf($user->lang['TABLE']);
 $template->assign_vars(array(
     'S_DISPLAY_TABLE' 			=> true,
+    'S_DISPLAY_TABLE_MENU' 		=> $display_table_menu,
 	'S_SIDENAME' 				=> $sidename,
 	'S_DATA_TABLE' 				=> $data_table,
 	'S_DATA_FORM' 				=> $data_form,
 	'SEASON' 					=> $season,
 	'LEAGUE' 					=> $league,
 	'TEXT_FORM' 				=> $text_form,
+	'S_DATA_BNS'				=> $data_bns,
 	)
 );
 	

controller/main.php

@@ -732,6 +732,9 @@ class main
 				}
 				calculate_extra_points($season, $league, $matchday);
 				save_ranking_matchday($season, $league, $matchday);
+				bonuspoints($season, $league, $matchday);
+				corr($season, $league, $matchday);
+				chart($season, $league, $matchday);
 			break;
 			case 'join':
 				join_league($season, $league, $user->data['user_id']);
@@ -782,11 +785,36 @@ class main
 		}
 
 		$league_name = '';
-		$sql = 'SELECT * FROM ' . FOOTB_LEAGUES . " WHERE season = $season AND league_type >= 1";
+		if ($side == 'table' OR $side == 'results_tl')
+		{
+		    $sql = 'SELECT * FROM ' . FOOTB_LEAGUES . " WHERE season = $season AND league_type >= 1 AND (league >= 50 OR bet_type = 1) ORDER BY sort ASC";
+		}
+		else
+		{
+		    $sql = 'SELECT * FROM ' . FOOTB_LEAGUES . " WHERE season = $season AND league_type >= 1  AND league < 50";
+		}
 		$result = $db->sql_query($sql);
 		while( $row = $db->sql_fetchrow($result))
 		{
 		    $selected = ($league && $row['league'] == $league) ? ' selected="selected"' : '';
+		    if ($side == 'table' && $league_info['bet_type'])
+		    {
+		        
+		    }
+		    elseif ($side == 'table' OR $side == 'results_tl')
+		    {
+		        if ($league < 51)
+		        {
+		            $league = $league + 50;
+		        }
+		    }
+		    else
+		    {
+		        if ($league > 50)
+		        {
+		            $league = $league - 50;
+		        }
+		    }
 			if ($selected)
 			{
 				$league_name = $row['league_name'];
@@ -905,7 +933,7 @@ class main
 		// Start matchday list
 			if ($side == 'bet')
 			{
-				include($this->football_root_path . 'block/side_table.' . $this->php_ext);
+				include($this->football_root_path . 'block/table.' . $this->php_ext);
 			}
 			else
 			{
@@ -915,12 +943,6 @@ class main
 
 		//*****************************************************************************
 
-		// Start total list
-			include($this->football_root_path . 'block/rank_total.' . $this->php_ext);
-		// End total list
-
-		//*****************************************************************************
-
 		// Start delivery list
 			include($this->football_root_path . 'block/delivery.' . $this->php_ext);
 		// End delivery list
@@ -989,6 +1011,10 @@ class main
 		{
 			include($this->football_root_path . 'block/under_construction.' . $this->php_ext);
 		}
+		elseif ($side == 'results_tl')
+		{
+		    include($this->football_root_path . 'block/results.' . $this->php_ext);
+		}
 		else
 		{
 			include($this->football_root_path . 'block/' . $side . '.' . $this->php_ext);

event/main_listener.php

@@ -221,6 +221,7 @@ class main_listener implements EventSubscriberInterface
 				'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)),