Version 0.9.9

-replace icons with font awesome icons
-display icons on tabs and hide it on mobile access
-new block last results
-new config values for last users, last results
-replace config value football_host_timezone with football_time_shift
-fixed errors on php 7
-remove unnecessary sql_freeresult calls
-fixed non-numeric value errors

.gitignore

@@ -39,3 +39,27 @@ Icon
 # Files that might appear on external disk
 .Spotlight-V100
 .Trashes
+/styles/prosilver/theme/images/right_arrow.png
+/styles/prosilver/theme/images/icon_allbets.gif
+/styles/prosilver/theme/images/icon_ball.gif
+/styles/prosilver/theme/images/icon_ball2.gif
+/styles/prosilver/theme/images/icon_bet.gif
+/styles/prosilver/theme/images/icon_bookmark.gif
+/styles/prosilver/theme/images/icon_download.gif
+/styles/prosilver/theme/images/icon_info.gif
+/styles/prosilver/theme/images/icon_list.gif
+/styles/prosilver/theme/images/icon_mark.gif
+/styles/prosilver/theme/images/icon_odds.gif
+/styles/prosilver/theme/images/icon_points.gif
+/styles/prosilver/theme/images/icon_print.gif
+/styles/prosilver/theme/images/icon_rank.gif
+/styles/prosilver/theme/images/icon_results.gif
+/styles/prosilver/theme/images/icon_rules.gif
+/styles/prosilver/theme/images/icon_statistic.gif
+/styles/prosilver/theme/images/icon_statistics.gif
+/styles/prosilver/theme/images/icon_xml.gif
+/styles/prosilver/theme/images/left_arrow.png
+/images/no_change.gif
+/images/arrow_down.gif
+/images/arrow_up.gif
+/migrations/v099_beta1.php

acp/extra_module.php

@@ -1,463 +1,459 @@
-<?php
-/**
-*
-* @package phpBB Extension - Football Football
-* @copyright (c) 2016 football (http://football.bplaced.net)
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
-*
-*/
-
-namespace football\football\acp;
-
-class extra_module
-{
-	public $u_action;
-
-	protected $db, $user, $template, $config, $phpbb_root_path, $phpbb_admin_path, $phpEx;
-	protected $root_path, $request, $php_ext, $log;
-
-
-	public function __construct()
-	{
-		global $db, $user, $request, $template;
-		global $config, $phpbb_root_path, $phpbb_admin_path, $phpEx;
-
-		$user->add_lang_ext('football/football', 'football');
-		$user->add_lang_ext('football/football', 'info_acp_extra');
-
-		$this->root_path = $phpbb_root_path . 'ext/football/football/';
-
-		$this->config = $config;
-		$this->request = $request;
-		$this->phpbb_root_path = $phpbb_root_path;
-		$this->phpbb_admin_path = $phpbb_admin_path;
-		$this->php_ext = $phpEx;
-
-		if(!function_exists('season_info'))
-		{
-			include($this->root_path . 'includes/functions.' . $this->php_ext);
-		}
-		if (!defined('FOOTB_SEASONS'))
-		{
-			include($this->root_path . 'includes/constants.' . $this->php_ext);
-		}
-	}
-
-	function main($id, $mode)
-	{
-		global $db, $auth, $phpbb_container, $phpbb_admin_path, $league_info;
-		global $template, $user, $config, $phpbb_extension_manager, $request, $phpbb_root_path, $phpEx;
-		$provider			= new \phpbb\controller\ provider();
-		$symphony_request	= new \phpbb\ symfony_request($request);
-		$filesystem			= new \phpbb\ filesystem();
-		$helper				= new \phpbb\controller\ helper($template, $user, $config, $provider, $phpbb_extension_manager, $symphony_request, $request, $filesystem, $phpbb_root_path, $phpEx);
-
-		$this->tpl_name = 'acp_football_extra';
-		$this->page_title = 'ACP_FOOTBALL_EXTRA_MANAGE';
-
-		$form_key = 'acp_football_extra';
-		add_form_key($form_key);
-
-		include($this->phpbb_root_path . 'includes/functions_user.' . $this->php_ext);
-
-		// Check and set some common vars
-		$action			= (isset($_POST['add'])) ? 'add' : ((isset($_POST['remove'])) ? 'remove' : $this->request->variable('action', ''));
-		$edit			= $this->request->variable('edit', 0);
-		$season			= $this->request->variable('s', 0);
-		$league			= $this->request->variable('l', 0);
-		$matchday		= $this->request->variable('matchday', 0);
-		$matchday_eval	= $this->request->variable('matchday_eval', 0);
-		$extra_no		= $this->request->variable('e', 0);
-		$update			= (isset($_POST['update'])) ? true : false;
-
-		// Clear some vars
-		$extra_row = array();
-		$error = array();
-
-		// Grab current season
-		if (!$season)
-		{
-			$season = curr_season();
-		}
-
-		// Grab basic data for select season
-		if ($season)
-		{
-			$sql = 'SELECT *
-				FROM ' . FOOTB_SEASONS . '
-				ORDER BY season DESC';
-			$result = $db->sql_query($sql);
-
-			$season_options = '';
-			while ($row = $db->sql_fetchrow($result))
-			{
-				$selected = ($season && $row['season'] == $season) ? ' selected="selected"' : '';
-				$season_options .= '<option value="' . $row['season'] . '"' . $selected . '>' . $row['season_name_short'] . '</option>';
-				if ($selected <> '')
-				{
-					$season_name = $row['season_name_short'];
-				}
-			}
-			$db->sql_freeresult($result);
-		}
-		else
-		{
-			trigger_error($user->lang['NO_SEASON'] . adm_back_link($this->u_action), E_USER_WARNING);
-		}
-
-		// Grab current league
-		if (!$league)
-		{
-			$league = first_league($season, false);
-		}
-
-		// Grab basic data for select league
-		if ($league)
-		{
-			$sql = 'SELECT *
-				FROM ' . FOOTB_LEAGUES . "
-				WHERE season = $season
-				ORDER BY league ASC";
-			$result = $db->sql_query($sql);
-
-			$league_options = '';
-			while ($row = $db->sql_fetchrow($result))
-			{
-				$selected = ($league && $row['league'] == $league) ? ' selected="selected"' : '';
-				$league_options .= '<option value="' . $row['league'] . '"' . $selected . '>' . $row['league_name'] . '</option>';
-				if ($selected <> '')
-				{
-					$league_matchdays = $row['matchdays'];
-					$league_name = $row['league_name'];
-					$league_type = $row['league_type'];
-					$ko_league = ($row['league_type'] == LEAGUE_KO) ? true : false;
-				}
-			}
-			$db->sql_freeresult($result);
-		}
-		else
-		{
-			trigger_error(sprintf($user->lang['NO_LEAGUE'], $season) . adm_back_link($this->u_action . "&amp;s=$season"), E_USER_WARNING);
-		}
-
-		// Grab basic data for extra bets, if extra bet is set and exists
-		if ($extra_no)
-		{
-			$sql = 'SELECT *
-				FROM ' . FOOTB_EXTRA . "
-				WHERE season = $season 
-					AND league = $league 
-					AND extra_no = $extra_no";
-			$result = $db->sql_query($sql);
-			$extra_row = $db->sql_fetchrow($result);
-			$existing_extra = sizeof($extra_row);
-			$db->sql_freeresult($result);
-		}
-
-		$db->sql_freeresult($result);
-		
-		// Which page?
-		switch ($action)
-		{
-			case 'delete':
-				if (!$season)
-				{
-					trigger_error($user->lang['NO_SEASON'] . adm_back_link($this->u_action), E_USER_WARNING);
-				}
-
-				if (!$league)
-				{
-					trigger_error($user->lang['NO_LEAGUE'] . adm_back_link($this->u_action . "&amp;s=$season"), E_USER_WARNING);
-				}
-
-				if (!$extra_no)
-				{
-					trigger_error($user->lang['NO_EXTRA'] . adm_back_link($this->u_action . "&amp;s=$season&amp;l=$league"), E_USER_WARNING);
-				}
-
-				if (confirm_box(true))
-				{
-					$error = '';
-
-					if (!$auth->acl_get('a_football_delete'))
-					{
-						trigger_error($user->lang['NO_AUTH_OPERATION'] . adm_back_link($this->u_action . "&amp;s=$season&amp;l=$league"), E_USER_WARNING);
-					}
-					if ($user->data['user_type'] != USER_FOUNDER && $this->config['football_founder_delete'])
-					{
-						trigger_error($user->lang['EXTRA_NO_DELETE'] . adm_back_link($this->u_action . "&amp;s=$season&amp;l=$league"), E_USER_WARNING);
-					}
-
-					// Delete extra
-					$sql = 'DELETE FROM ' . FOOTB_EXTRA . "
-							WHERE season = $season AND league = $league AND extra_no = $extra_no";
-					$db->sql_query($sql);
-
-					// Delete extra bets
-					$sql = 'DELETE FROM ' . FOOTB_EXTRA_BETS . "
-							WHERE  season = $season 
-								AND league = $league 
-								AND extra_no = $extra_no";
-					$db->sql_query($sql);
-
-					trigger_error($user->lang['EXTRA_DELETED'] . adm_back_link($this->u_action . "&amp;s=$season&amp;l=$league"));
-				}
-				else
-				{
-					confirm_box(false, sprintf($user->lang['EXTRA_CONFIRM_DELETE'], $extra_row['question'], $league, $season), build_hidden_fields(array(
-						's'			=> $season,
-						'l'			=> $league,
-						'e'			=> $extra_no,
-						'mode'		=> $mode,
-						'action'	=> $action))
-					);
-				}
-			break;
-
-			case 'add':
-				$sql = "SELECT 
-						max(extra_no) AS max_extra_no
-					FROM " . FOOTB_EXTRA . " 
-					WHERE season = $season 
-						AND league = $league";
-				$result = $db->sql_query($sql);
-				$row_extra = $db->sql_fetchrow($result);
-				$existing_extra = sizeof($row_extra);
-				$db->sql_freeresult($result);
-				$extra_no = ($existing_extra) ? $row_extra['max_extra_no'] + 1 : 1;
-				$extra_row['extra_no'] 		= $extra_no;
-				$extra_row['question_type'] = $this->request->variable('question_type', 3);
-				$extra_row['question'] 		= utf8_normalize_nfc($this->request->variable('question', '', true));
-				$extra_row['matchday']		= $this->request->variable('matchday', 0);
-				$extra_row['matchday_eval']	= $this->request->variable('matchday_eval', 0);
-				$extra_row['result']		= utf8_normalize_nfc($this->request->variable('result', ''));
-				$extra_row['extra_points']	= $this->request->variable('extra_points', 0);
-				$extra_row['extra_status']	= $this->request->variable('extra_status', 0);
-				// No break for edit add
-			case 'edit':
-				$error_msg = array();
-
-				if (!sizeof($error))
-				{
-					if ($action == 'edit' && !$extra_no)
-					{
-						trigger_error($user->lang['NO_EXTRA'] . adm_back_link($this->u_action . "&amp;s=$season&amp;l=$league"), E_USER_WARNING);
-					}
-					
-					$matchday = $extra_row['matchday'];
-					$matchday_eval = $extra_row['matchday_eval'];
-
-					$sql = 'SELECT *
-						FROM ' . FOOTB_MATCHDAYS . "
-						WHERE season = $season 
-							AND league = $league 
-						ORDER BY matchday ASC";
-					$result = $db->sql_query($sql);
-
-					$matchday_options 		= '<option value="0"' . ((!$matchday) ? ' selected="selected"' : '') . '>' . $user->lang['SELECT_MATCHDAY'] . '</option>';
-					$matchday_eval_options 	= '<option value="0"' . ((!$matchday_eval) ? ' selected="selected"' : '') . '>' . $user->lang['SELECT_MATCHDAY'] . '</option>';
-					while ($row = $db->sql_fetchrow($result))
-					{
-						if ($row['status'] == 0 or $action == 'edit')
-						{
-							$selected_matchday 	= ($matchday && $row['matchday'] == $matchday) ? ' selected="selected"' : '';
-							$selected_eval 		= ($matchday_eval && $row['matchday'] == $matchday_eval) ? ' selected="selected"' : '';
-							$day_name 			= (strlen($row['matchday_name']) > 0) ? $row['matchday_name'] : $row['matchday'] . '. ' . sprintf($user->lang['MATCHDAY']);
-							$matchday_options 		.= '<option value="' . $row['matchday'] . '"' . $selected_matchday . '>' . $day_name . '</option>';
-							$matchday_eval_options 	.= '<option value="' . $row['matchday'] . '"' . $selected_eval . '>' . $day_name . '</option>';
-						}
-					}
-					
-					$question_type_options = '';
-					for($i = 1; $i<= 5; $i++)
-					{
-						$selected = ($i == $extra_row['question_type']) ? ' selected="selected"' : '';
-						$question_type_options .= '<option value="' . $i . '"' . $selected . '>' . $i . '</option>';
-					}
-
-					$extra_status_options = '';
-					for($i = 0; $i<= 3; $i++)
-					{
-						$selected = ($i == $extra_row['extra_status']) ? ' selected="selected"' : '';
-						$extra_status_options .= '<option value="' . $i . '"' . $selected . '>' . $i . '</option>';
-					}
-				
-
-					// Did we submit?
-					if ($update)
-					{
-						$data = array();
-						if (!check_form_key($form_key))
-						{
-							trigger_error($user->lang['FORM_INVALID'] . adm_back_link($this->u_action . "&amp;s=$season&amp;l=$league"), E_USER_WARNING);
-						}
-						$extra_row['extra_no'] 		= $extra_no;
-						$extra_row['question_type'] = $this->request->variable('question_type', $extra_row['question_type']);
-						$extra_row['question'] 		= $this->request->variable('question', $extra_row['question'], true);
-						$extra_row['matchday']		= $this->request->variable('matchday', $extra_row['matchday']);
-						$extra_row['matchday_eval']	= $this->request->variable('matchday_eval', $extra_row['matchday_eval']);
-						$extra_row['extra_points']	= $this->request->variable('extra_points', $extra_row['extra_points']);
-						$extra_row['extra_status']	= $this->request->variable('extra_status', $extra_row['extra_status']);
-
-						$data['extra_points'] 	= (int) $extra_row['extra_points'];
-						$data['matchday'] 		= (int) $extra_row['matchday'];
-						$data['matchday_eval'] 	= (int) $extra_row['matchday_eval'];
-						
-						if ($data['matchday_eval'] <  $data['matchday'])
-						{
-							$error[] = $user->lang['EVAL_BEFORE_DELIVERY'];
-						}
-						
-
-						if (!sizeof($error))
-						{
-							$sql_ary = array(
-								'season'			=> (int) $season,
-								'league'			=> (int) $league,
-								'extra_no'			=> (int) $extra_no,
-								'question_type'		=> (int) $extra_row['question_type'],
-								'question'			=> strlen($extra_row['question']) ? $extra_row['question'] : '',
-								'matchday'			=> (int) $extra_row['matchday'],
-								'matchday_eval'		=> (int) $extra_row['matchday_eval'],
-								'result'			=> $extra_row['result'],
-								'extra_points'		=> (int) $extra_row['extra_points'],
-								'extra_status'		=> (int) $extra_row['extra_status'],
-							);
-
-							$var_ary = array(
-								'extra_points'	=> array('num', false, 0, 99),
-								'matchday'		=> array('num', false, 1),
-								'matchday_eval'	=> array('num', false, 1),
-							);
-							if (!($error_vals = validate_data($data, $var_ary)))
-							{
-								if ($action == 'add')
-								{
-									$sql = 'INSERT INTO ' . FOOTB_EXTRA . ' ' . $db->sql_build_array('INSERT', $sql_ary);
-									$db->sql_query($sql);
-								}
-								else
-								{
-									$sql = 'UPDATE ' . FOOTB_EXTRA . '
-										SET ' . $db->sql_build_array('UPDATE', $sql_ary) . "
-										WHERE season = $season AND league = $league AND extra_no = $extra_no";
-									$db->sql_query($sql);
-								}
-								trigger_error($user->lang['EXTRA_UPDATED'] . adm_back_link($this->u_action . "&amp;s=$season&amp;l=$league"));
-							}
-							else
-							{
-								foreach ($error_vals as $error_val)
-								{
-										$error_msg[] = $user->lang[$error_val];
-								}
-								$error[] =  $user->lang['EXTRA_UPDATE_FAILED'];
-								$error = array_merge($error, $error_msg);
-							}
-						}
-					}
-				}
-		
-				$u_back = $this->u_action . "&amp;s=$season&amp;l=$league";
-
-				$template->assign_vars(array(
-					'S_EDIT'					=> true,
-					'S_ADD_EXTRA'				=> ($action == 'add') ? true : false,
-					'S_ERROR'					=> (sizeof($error)) ? true : false,
-					'S_EDIT_EXTRAS'				=> ($existing_extra) ? false : true,
-					'S_QUESTION_TYPE_OPTIONS'	=> $question_type_options,
-					'S_MATCHDAY_OPTIONS'		=> $matchday_options,
-					'S_MATCHDAY_EVAL_OPTIONS' 	=> $matchday_eval_options,
-					'S_EXTRA_STATUS_OPTIONS' 	=> $extra_status_options,
-					'S_VERSION_NO'				=> $this->config['football_version'],
-					'ERROR_MSG'					=> (sizeof($error)) ? implode('<br />', $error) : '',
-					'SEASON'					=> $season,
-					'SEASON_NAME'				=> $season_name,
-					'LEAGUE'					=> $league,
-					'LEAGUE_NAME'				=> $league_name,
-					'EXTRA_NO'					=> $extra_no,
-					'QUESTION_TYPE'				=> $extra_row['question_type'],
-					'QUESTION'					=> $extra_row['question'],
-					'MATCHDAY'					=> $extra_row['matchday'],
-					'MATCHDAY_EVAL'				=> $extra_row['matchday_eval'],
-					'MATCHDAY_OPTION'			=> $extra_row['matchday'],
-					'MATCHDAY_EVAL'				=> $extra_row['matchday_eval'],
-					'RESULT'					=> $extra_row['result'],
-					'EXTRA_POINTS'				=> $extra_row['extra_points'],
-					'EXTRA_STATUS'				=> $extra_row['extra_status'],
-					'U_BACK'					=> $u_back,
-					'U_ACTION'					=> "{$this->u_action}&amp;action=$action&amp;s=$season&amp;l=$league",
-					)
-				);
-				return;
-			break;
-		}
-		
-		// Check open matchday in league
-		$sql = 'SELECT *
-			FROM ' . FOOTB_MATCHDAYS . " 
-			WHERE season = $season 
-				AND league = $league
-				AND status <= 0";
-		$result = $db->sql_query($sql);
-		$open_matchdays = sizeof($db->sql_fetchrowset($result));
-		$db->sql_freeresult($result);
-		
-		// Get us all the extra
-		$sql = "SELECT e.*,
-				m1.matchday_name AS matchday_name,
-				m2.matchday_name AS matchday_eval_name
-			FROM " . FOOTB_EXTRA . ' AS e
-			LEFT JOIN ' . FOOTB_MATCHDAYS . ' AS m1 ON (m1.season = e.season AND m1.league = e.league AND m1.matchday = e.matchday) 
-			LEFT JOIN ' . FOOTB_MATCHDAYS . " AS m2 ON (m2.season = e.season AND m2.league = e.league AND m2.matchday = e.matchday_eval) 
-			WHERE e.season = $season 
-				AND e.league = $league
-			ORDER BY e.extra_no ASC";
-		$result = $db->sql_query($sql);
-		$rows_extra = $db->sql_fetchrowset($result);
-		$db->sql_freeresult($result);
-
-		$template->assign_vars(array(
-			'U_ACTION'			=> $this->u_action,
-			'U_FOOTBALL' 		=> $helper->route('football_main_controller',array('side' => 'bet', 's' => $season, 'l' => $league)),
-			'S_SEASON'			=> $season,
-			'S_LEAGUE'			=> $league,
-			'S_SEASON_OPTIONS'	=> $season_options,
-			'S_LEAGUE_OPTIONS'	=> $league_options,
-			'S_EXTRA_ADD'		=> ($open_matchdays) ? true : false,
-			'S_VERSION_NO'		=> $this->config['football_version'],
-			) 
-		);
-
-		// Check if the user is allowed to delete a extra.
-		if ($user->data['user_type'] != USER_FOUNDER && $this->config['football_founder_delete'])
-		{
-			$allow_delete = false;
-		}
-		else
-		{
-			$allow_delete = true;
-		}
-
-		$row_number = 0;
-		foreach ($rows_extra as $row_extra)
-		{
-			$row_number++;
-			$row_class = (!($row_number % 2)) ? 'bg1 row_light' : 'bg2 row_dark';
-			$template->assign_block_vars('extras', array(
-				'ROW_CLASS'			=> $row_class,
-				'EXTRA_NO'			=> $row_extra['extra_no'],
-				'QUESTION_TYPE'		=> $row_extra['question_type'],
-				'QUESTION'			=> $row_extra['question'],
-				'MATCHDAY'			=> (strlen($row_extra['matchday_name']) > 0) ? $row_extra['matchday_name'] : $row_extra['matchday'] . '. ' . sprintf($user->lang['MATCHDAY']),
-				'MATCHDAY_EVAL'		=> (strlen($row_extra['matchday_name']) > 0) ? $row_extra['matchday_eval_name'] : $row_extra['matchday_eval'] . '. ' . sprintf($user->lang['MATCHDAY']),
-				'EXTRA_POINTS'		=> $row_extra['extra_points'],
-				'EXTRA_STATUS'		=> $row_extra['extra_status'],
-				'U_EDIT'	=> "{$this->u_action}&amp;action=edit&amp;s=" . $season . "&amp;l=" .$league . "&amp;e=" .$row_extra['extra_no'],
-				'U_DELETE'	=> ($allow_delete) ? "{$this->u_action}&amp;action=delete&amp;s=" . $season . "&amp;l=" . $league . "&amp;e=" . $row_extra['extra_no'] : '',
-				)
-			);
-		}
-	}
-}
+<?php
+/**
+*
+* @package phpBB Extension - Football Football
+* @copyright (c) 2016 football (http://football.bplaced.net)
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+namespace football\football\acp;
+
+class extra_module
+{
+	public $u_action;
+
+	protected $db, $user, $template, $config, $phpbb_root_path, $phpbb_admin_path, $phpEx;
+	protected $root_path, $request, $php_ext, $log;
+
+
+	public function __construct()
+	{
+		global $db, $user, $request, $template;
+		global $config, $phpbb_root_path, $phpbb_admin_path, $phpEx;
+
+		$user->add_lang_ext('football/football', 'football');
+		$user->add_lang_ext('football/football', 'info_acp_extra');
+
+		$this->root_path = $phpbb_root_path . 'ext/football/football/';
+
+		$this->config = $config;
+		$this->request = $request;
+		$this->phpbb_root_path = $phpbb_root_path;
+		$this->phpbb_admin_path = $phpbb_admin_path;
+		$this->php_ext = $phpEx;
+
+		if(!function_exists('season_info'))
+		{
+			include($this->root_path . 'includes/functions.' . $this->php_ext);
+		}
+		if (!defined('FOOTB_SEASONS'))
+		{
+			include($this->root_path . 'includes/constants.' . $this->php_ext);
+		}
+	}
+
+	function main($id, $mode)
+	{
+		global $db, $auth, $phpbb_container, $phpbb_admin_path, $league_info;
+		global $template, $user, $config, $phpbb_extension_manager, $request, $phpbb_root_path, $phpEx;
+		
+		$helper = $phpbb_container->get('controller.helper');
+		
+		$this->tpl_name = 'acp_football_extra';
+		$this->page_title = 'ACP_FOOTBALL_EXTRA_MANAGE';
+
+		$form_key = 'acp_football_extra';
+		add_form_key($form_key);
+
+		include($this->phpbb_root_path . 'includes/functions_user.' . $this->php_ext);
+
+		// Check and set some common vars
+		$action			= (isset($_POST['add'])) ? 'add' : ((isset($_POST['remove'])) ? 'remove' : $this->request->variable('action', ''));
+		$edit			= $this->request->variable('edit', 0);
+		$season			= $this->request->variable('s', 0);
+		$league			= $this->request->variable('l', 0);
+		$matchday		= $this->request->variable('matchday', 0);
+		$matchday_eval	= $this->request->variable('matchday_eval', 0);
+		$extra_no		= $this->request->variable('e', 0);
+		$update			= (isset($_POST['update'])) ? true : false;
+
+		// Clear some vars
+		$extra_row = array();
+		$error = array();
+
+		// Grab current season
+		if (!$season)
+		{
+			$season = curr_season();
+		}
+
+		// Grab basic data for select season
+		if ($season)
+		{
+			$sql = 'SELECT *
+				FROM ' . FOOTB_SEASONS . '
+				ORDER BY season DESC';
+			$result = $db->sql_query($sql);
+
+			$season_options = '';
+			while ($row = $db->sql_fetchrow($result))
+			{
+				$selected = ($season && $row['season'] == $season) ? ' selected="selected"' : '';
+				$season_options .= '<option value="' . $row['season'] . '"' . $selected . '>' . $row['season_name_short'] . '</option>';
+				if ($selected <> '')
+				{
+					$season_name = $row['season_name_short'];
+				}
+			}
+			$db->sql_freeresult($result);
+		}
+		else
+		{
+			trigger_error($user->lang['NO_SEASON'] . adm_back_link($this->u_action), E_USER_WARNING);
+		}
+
+		// Grab current league
+		if (!$league)
+		{
+			$league = first_league($season, false);
+		}
+
+		// Grab basic data for select league
+		if ($league)
+		{
+			$sql = 'SELECT *
+				FROM ' . FOOTB_LEAGUES . "
+				WHERE season = $season
+				ORDER BY league ASC";
+			$result = $db->sql_query($sql);
+
+			$league_options = '';
+			while ($row = $db->sql_fetchrow($result))
+			{
+				$selected = ($league && $row['league'] == $league) ? ' selected="selected"' : '';
+				$league_options .= '<option value="' . $row['league'] . '"' . $selected . '>' . $row['league_name'] . '</option>';
+				if ($selected <> '')
+				{
+					$league_matchdays = $row['matchdays'];
+					$league_name = $row['league_name'];
+					$league_type = $row['league_type'];
+					$ko_league = ($row['league_type'] == LEAGUE_KO) ? true : false;
+				}
+			}
+			$db->sql_freeresult($result);
+		}
+		else
+		{
+			trigger_error(sprintf($user->lang['NO_LEAGUE'], $season) . adm_back_link($this->u_action . "&amp;s=$season"), E_USER_WARNING);
+		}
+
+		// Grab basic data for extra bets, if extra bet is set and exists
+		if ($extra_no)
+		{
+			$sql = 'SELECT *
+				FROM ' . FOOTB_EXTRA . "
+				WHERE season = $season 
+					AND league = $league 
+					AND extra_no = $extra_no";
+			$result = $db->sql_query($sql);
+			$extra_row = $db->sql_fetchrow($result);
+			$existing_extra = sizeof($extra_row);
+			$db->sql_freeresult($result);
+		}
+		
+		// Which page?
+		switch ($action)
+		{
+			case 'delete':
+				if (!$season)
+				{
+					trigger_error($user->lang['NO_SEASON'] . adm_back_link($this->u_action), E_USER_WARNING);
+				}
+
+				if (!$league)
+				{
+					trigger_error($user->lang['NO_LEAGUE'] . adm_back_link($this->u_action . "&amp;s=$season"), E_USER_WARNING);
+				}
+
+				if (!$extra_no)
+				{
+					trigger_error($user->lang['NO_EXTRA'] . adm_back_link($this->u_action . "&amp;s=$season&amp;l=$league"), E_USER_WARNING);
+				}
+
+				if (confirm_box(true))
+				{
+					$error = '';
+
+					if (!$auth->acl_get('a_football_delete'))
+					{
+						trigger_error($user->lang['NO_AUTH_OPERATION'] . adm_back_link($this->u_action . "&amp;s=$season&amp;l=$league"), E_USER_WARNING);
+					}
+					if ($user->data['user_type'] != USER_FOUNDER && $this->config['football_founder_delete'])
+					{
+						trigger_error($user->lang['EXTRA_NO_DELETE'] . adm_back_link($this->u_action . "&amp;s=$season&amp;l=$league"), E_USER_WARNING);
+					}
+
+					// Delete extra
+					$sql = 'DELETE FROM ' . FOOTB_EXTRA . "
+							WHERE season = $season AND league = $league AND extra_no = $extra_no";
+					$db->sql_query($sql);
+
+					// Delete extra bets
+					$sql = 'DELETE FROM ' . FOOTB_EXTRA_BETS . "
+							WHERE  season = $season 
+								AND league = $league 
+								AND extra_no = $extra_no";
+					$db->sql_query($sql);
+
+					trigger_error($user->lang['EXTRA_DELETED'] . adm_back_link($this->u_action . "&amp;s=$season&amp;l=$league"));
+				}
+				else
+				{
+					confirm_box(false, sprintf($user->lang['EXTRA_CONFIRM_DELETE'], $extra_row['question'], $league, $season), build_hidden_fields(array(
+						's'			=> $season,
+						'l'			=> $league,
+						'e'			=> $extra_no,
+						'mode'		=> $mode,
+						'action'	=> $action))
+					);
+				}
+			break;
+
+			case 'add':
+				$sql = "SELECT 
+						max(extra_no) AS max_extra_no
+					FROM " . FOOTB_EXTRA . " 
+					WHERE season = $season 
+						AND league = $league";
+				$result = $db->sql_query($sql);
+				$row_extra = $db->sql_fetchrow($result);
+				$existing_extra = sizeof($row_extra);
+				$db->sql_freeresult($result);
+				$extra_no = ($existing_extra) ? $row_extra['max_extra_no'] + 1 : 1;
+				$extra_row['extra_no'] 		= $extra_no;
+				$extra_row['question_type'] = $this->request->variable('question_type', 3);
+				$extra_row['question'] 		= utf8_normalize_nfc($this->request->variable('question', '', true));
+				$extra_row['matchday']		= $this->request->variable('matchday', 0);
+				$extra_row['matchday_eval']	= $this->request->variable('matchday_eval', 0);
+				$extra_row['result']		= utf8_normalize_nfc($this->request->variable('result', ''));
+				$extra_row['extra_points']	= $this->request->variable('extra_points', 0);
+				$extra_row['extra_status']	= $this->request->variable('extra_status', 0);
+				// No break for edit add
+			case 'edit':
+				$error_msg = array();
+
+				if (!sizeof($error))
+				{
+					if ($action == 'edit' && !$extra_no)
+					{
+						trigger_error($user->lang['NO_EXTRA'] . adm_back_link($this->u_action . "&amp;s=$season&amp;l=$league"), E_USER_WARNING);
+					}
+					
+					$matchday = $extra_row['matchday'];
+					$matchday_eval = $extra_row['matchday_eval'];
+
+					$sql = 'SELECT *
+						FROM ' . FOOTB_MATCHDAYS . "
+						WHERE season = $season 
+							AND league = $league 
+						ORDER BY matchday ASC";
+					$result = $db->sql_query($sql);
+
+					$matchday_options 		= '<option value="0"' . ((!$matchday) ? ' selected="selected"' : '') . '>' . $user->lang['SELECT_MATCHDAY'] . '</option>';
+					$matchday_eval_options 	= '<option value="0"' . ((!$matchday_eval) ? ' selected="selected"' : '') . '>' . $user->lang['SELECT_MATCHDAY'] . '</option>';
+					while ($row = $db->sql_fetchrow($result))
+					{
+						if ($row['status'] == 0 or $action == 'edit')
+						{
+							$selected_matchday 	= ($matchday && $row['matchday'] == $matchday) ? ' selected="selected"' : '';
+							$selected_eval 		= ($matchday_eval && $row['matchday'] == $matchday_eval) ? ' selected="selected"' : '';
+							$day_name 			= (strlen($row['matchday_name']) > 0) ? $row['matchday_name'] : $row['matchday'] . '. ' . sprintf($user->lang['MATCHDAY']);
+							$matchday_options 		.= '<option value="' . $row['matchday'] . '"' . $selected_matchday . '>' . $day_name . '</option>';
+							$matchday_eval_options 	.= '<option value="' . $row['matchday'] . '"' . $selected_eval . '>' . $day_name . '</option>';
+						}
+					}
+					$db->sql_freeresult($result);
+					$question_type_options = '';
+					for($i = 1; $i<= 5; $i++)
+					{
+						$selected = ($i == $extra_row['question_type']) ? ' selected="selected"' : '';
+						$question_type_options .= '<option value="' . $i . '"' . $selected . '>' . $i . '</option>';
+					}
+
+					$extra_status_options = '';
+					for($i = 0; $i<= 3; $i++)
+					{
+						$selected = ($i == $extra_row['extra_status']) ? ' selected="selected"' : '';
+						$extra_status_options .= '<option value="' . $i . '"' . $selected . '>' . $i . '</option>';
+					}
+				
+
+					// Did we submit?
+					if ($update)
+					{
+						$data = array();
+						if (!check_form_key($form_key))
+						{
+							trigger_error($user->lang['FORM_INVALID'] . adm_back_link($this->u_action . "&amp;s=$season&amp;l=$league"), E_USER_WARNING);
+						}
+						$extra_row['extra_no'] 		= $extra_no;
+						$extra_row['question_type'] = $this->request->variable('question_type', $extra_row['question_type']);
+						$extra_row['question'] 		= $this->request->variable('question', $extra_row['question'], true);
+						$extra_row['matchday']		= $this->request->variable('matchday', $extra_row['matchday']);
+						$extra_row['matchday_eval']	= $this->request->variable('matchday_eval', $extra_row['matchday_eval']);
+						$extra_row['extra_points']	= $this->request->variable('extra_points', $extra_row['extra_points']);
+						$extra_row['extra_status']	= $this->request->variable('extra_status', $extra_row['extra_status']);
+
+						$data['extra_points'] 	= (int) $extra_row['extra_points'];
+						$data['matchday'] 		= (int) $extra_row['matchday'];
+						$data['matchday_eval'] 	= (int) $extra_row['matchday_eval'];
+						
+						if ($data['matchday_eval'] <  $data['matchday'])
+						{
+							$error[] = $user->lang['EVAL_BEFORE_DELIVERY'];
+						}
+						
+
+						if (!sizeof($error))
+						{
+							$sql_ary = array(
+								'season'			=> (int) $season,
+								'league'			=> (int) $league,
+								'extra_no'			=> (int) $extra_no,
+								'question_type'		=> (int) $extra_row['question_type'],
+								'question'			=> strlen($extra_row['question']) ? $extra_row['question'] : '',
+								'matchday'			=> (int) $extra_row['matchday'],
+								'matchday_eval'		=> (int) $extra_row['matchday_eval'],
+								'result'			=> $extra_row['result'],
+								'extra_points'		=> (int) $extra_row['extra_points'],
+								'extra_status'		=> (int) $extra_row['extra_status'],
+							);
+
+							$var_ary = array(
+								'extra_points'	=> array('num', false, 0, 99),
+								'matchday'		=> array('num', false, 1),
+								'matchday_eval'	=> array('num', false, 1),
+							);
+							if (!($error_vals = validate_data($data, $var_ary)))
+							{
+								if ($action == 'add')
+								{
+									$sql = 'INSERT INTO ' . FOOTB_EXTRA . ' ' . $db->sql_build_array('INSERT', $sql_ary);
+									$db->sql_query($sql);
+								}
+								else
+								{
+									$sql = 'UPDATE ' . FOOTB_EXTRA . '
+										SET ' . $db->sql_build_array('UPDATE', $sql_ary) . "
+										WHERE season = $season AND league = $league AND extra_no = $extra_no";
+									$db->sql_query($sql);
+								}
+								trigger_error($user->lang['EXTRA_UPDATED'] . adm_back_link($this->u_action . "&amp;s=$season&amp;l=$league"));
+							}
+							else
+							{
+								foreach ($error_vals as $error_val)
+								{
+										$error_msg[] = $user->lang[$error_val];
+								}
+								$error[] =  $user->lang['EXTRA_UPDATE_FAILED'];
+								$error = array_merge($error, $error_msg);
+							}
+						}
+					}
+				}
+		
+				$u_back = $this->u_action . "&amp;s=$season&amp;l=$league";
+
+				$template->assign_vars(array(
+					'S_EDIT'					=> true,
+					'S_ADD_EXTRA'				=> ($action == 'add') ? true : false,
+					'S_ERROR'					=> (sizeof($error)) ? true : false,
+					'S_EDIT_EXTRAS'				=> ($existing_extra) ? false : true,
+					'S_QUESTION_TYPE_OPTIONS'	=> $question_type_options,
+					'S_MATCHDAY_OPTIONS'		=> $matchday_options,
+					'S_MATCHDAY_EVAL_OPTIONS' 	=> $matchday_eval_options,
+					'S_EXTRA_STATUS_OPTIONS' 	=> $extra_status_options,
+					'S_VERSION_NO'				=> $this->config['football_version'],
+					'ERROR_MSG'					=> (sizeof($error)) ? implode('<br />', $error) : '',
+					'SEASON'					=> $season,
+					'SEASON_NAME'				=> $season_name,
+					'LEAGUE'					=> $league,
+					'LEAGUE_NAME'				=> $league_name,
+					'EXTRA_NO'					=> $extra_no,
+					'QUESTION_TYPE'				=> $extra_row['question_type'],
+					'QUESTION'					=> $extra_row['question'],
+					'MATCHDAY'					=> $extra_row['matchday'],
+					'MATCHDAY_EVAL'				=> $extra_row['matchday_eval'],
+					'MATCHDAY_OPTION'			=> $extra_row['matchday'],
+					'MATCHDAY_EVAL'				=> $extra_row['matchday_eval'],
+					'RESULT'					=> $extra_row['result'],
+					'EXTRA_POINTS'				=> $extra_row['extra_points'],
+					'EXTRA_STATUS'				=> $extra_row['extra_status'],
+					'U_BACK'					=> $u_back,
+					'U_ACTION'					=> "{$this->u_action}&amp;action=$action&amp;s=$season&amp;l=$league",
+					)
+				);
+				return;
+			break;
+		}
+		
+		// Check open matchday in league
+		$sql = 'SELECT *
+			FROM ' . FOOTB_MATCHDAYS . " 
+			WHERE season = $season 
+				AND league = $league
+				AND status <= 0";
+		$result = $db->sql_query($sql);
+		$open_matchdays = sizeof($db->sql_fetchrowset($result));
+		$db->sql_freeresult($result);
+		
+		// Get us all the extra
+		$sql = "SELECT e.*,
+				m1.matchday_name AS matchday_name,
+				m2.matchday_name AS matchday_eval_name
+			FROM " . FOOTB_EXTRA . ' AS e
+			LEFT JOIN ' . FOOTB_MATCHDAYS . ' AS m1 ON (m1.season = e.season AND m1.league = e.league AND m1.matchday = e.matchday) 
+			LEFT JOIN ' . FOOTB_MATCHDAYS . " AS m2 ON (m2.season = e.season AND m2.league = e.league AND m2.matchday = e.matchday_eval) 
+			WHERE e.season = $season 
+				AND e.league = $league
+			ORDER BY e.extra_no ASC";
+		$result = $db->sql_query($sql);
+		$rows_extra = $db->sql_fetchrowset($result);
+		$db->sql_freeresult($result);
+
+		$template->assign_vars(array(
+			'U_ACTION'			=> $this->u_action,
+			'U_FOOTBALL' 		=> $helper->route('football_main_controller',array('side' => 'bet', 's' => $season, 'l' => $league)),
+			'S_SEASON'			=> $season,
+			'S_LEAGUE'			=> $league,
+			'S_SEASON_OPTIONS'	=> $season_options,
+			'S_LEAGUE_OPTIONS'	=> $league_options,
+			'S_EXTRA_ADD'		=> ($open_matchdays) ? true : false,
+			'S_VERSION_NO'		=> $this->config['football_version'],
+			) 
+		);
+
+		// Check if the user is allowed to delete a extra.
+		if ($user->data['user_type'] != USER_FOUNDER && $this->config['football_founder_delete'])
+		{
+			$allow_delete = false;
+		}
+		else
+		{
+			$allow_delete = true;
+		}
+
+		$row_number = 0;
+		foreach ($rows_extra as $row_extra)
+		{
+			$row_number++;
+			$row_class = (!($row_number % 2)) ? 'bg1 row_light' : 'bg2 row_dark';
+			$template->assign_block_vars('extras', array(
+				'ROW_CLASS'			=> $row_class,
+				'EXTRA_NO'			=> $row_extra['extra_no'],
+				'QUESTION_TYPE'		=> $row_extra['question_type'],
+				'QUESTION'			=> $row_extra['question'],
+				'MATCHDAY'			=> (strlen($row_extra['matchday_name']) > 0) ? $row_extra['matchday_name'] : $row_extra['matchday'] . '. ' . sprintf($user->lang['MATCHDAY']),
+				'MATCHDAY_EVAL'		=> (strlen($row_extra['matchday_name']) > 0) ? $row_extra['matchday_eval_name'] : $row_extra['matchday_eval'] . '. ' . sprintf($user->lang['MATCHDAY']),
+				'EXTRA_POINTS'		=> $row_extra['extra_points'],
+				'EXTRA_STATUS'		=> $row_extra['extra_status'],
+				'U_EDIT'	=> "{$this->u_action}&amp;action=edit&amp;s=" . $season . "&amp;l=" .$league . "&amp;e=" .$row_extra['extra_no'],
+				'U_DELETE'	=> ($allow_delete) ? "{$this->u_action}&amp;action=delete&amp;s=" . $season . "&amp;l=" . $league . "&amp;e=" . $row_extra['extra_no'] : '',
+				)
+			);
+		}
+	}
+}
 ?>

acp/football_module.php

@@ -1,426 +1,438 @@
-<?php
-/**
-*
-* @package phpBB Extension - Football Football
-* @copyright (c) 2016 football (http://football.bplaced.net)
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
-*
-*/
-
-namespace football\football\acp;
-
-class football_module
-{
-	var $new_config = array();
-	public $u_action;
-
-	protected $db, $user, $template, $config, $phpbb_root_path, $phpbb_admin_path, $phpEx;
-	protected $root_path, $request, $php_ext, $log, $phpbb_container, $version_check;
-
-
-	public function __construct()
-	{
-		global $db, $user, $request, $template, $phpbb_container;
-		global $config, $phpbb_root_path, $phpbb_admin_path, $phpEx;
-
-		$user->add_lang_ext('football/football', 'help_football');
-		$user->add_lang_ext('football/football', 'football');
-		$user->add_lang_ext('football/football', 'info_acp_football');
-
-		$this->root_path = $phpbb_root_path . 'ext/football/football/';
-
-		$this->config = $config;
-		$this->request = $request;
-		$this->phpbb_root_path = $phpbb_root_path;
-		$this->phpbb_admin_path = $phpbb_admin_path;
-		$this->php_ext = $phpEx;
-		$this->phpbb_container = $phpbb_container;
-		$this->version_check = $this->phpbb_container->get('football.football.version.check');
-
-		if(!function_exists('season_info'))
-		{
-			include($this->root_path . 'includes/functions.' . $this->php_ext);
-		}
-		if (!defined('FOOTB_SEASONS'))
-		{
-			include($this->root_path . 'includes/constants.' . $this->php_ext);
-		}
-	}
-
-	function main($id, $mode)
-	{
-		global $db, $auth, $phpbb_container, $phpbb_admin_path, $league_info, $phpbb_log;
-		global $template, $user, $config, $phpbb_extension_manager, $request, $phpbb_root_path, $phpEx;
-		$provider			= new \phpbb\controller\ provider();
-		$symphony_request	= new \phpbb\ symfony_request($request);
-		$filesystem			= new \phpbb\ filesystem();
-		$helper				= new \phpbb\controller\ helper($template, $user, $config, $provider, $phpbb_extension_manager, $symphony_request, $request, $filesystem, $phpbb_root_path, $phpEx);
-
-		$user->add_lang('acp/board');
-
-		$action	= $this->request->variable('action', '');
-		$submit = (isset($_POST['submit'])) ? true : false;
-
-		$form_key = 'acp_football';
-		add_form_key($form_key);
-
-		switch ($mode)
-		{
-			case 'userguide':
-            	$this->page_title = 'ACP_FOOTBALL_USERGUIDE';
-				$this->tpl_name = 'acp_football_userguide';
-
-				$template->assign_vars(array(
-					'S_IN_FOOTBALL_USERGUIDE'	=> true,
-					'U_FOOTBALL' 				=> $helper->route('football_main_controller',array('side' => 'bet')),
-					'L_BACK_TO_TOP'				=> $user->lang['BACK_TO_TOP'],
-					'ICON_BACK_TO_TOP'			=> '<img src="' . $phpbb_admin_path . 'images/icon_up.gif" style="vertical-align: middle;" alt="' . $user->lang['BACK_TO_TOP'] . '" title="' . $user->lang['BACK_TO_TOP'] . '" />',
-					'S_VERSION_NO'				=> $this->config['football_version'],
-				));
-
-				// Pull the array data from the lang pack
-				foreach ($user->help as $help_ary)
-				{
-					if ($help_ary[0] == '--')
-					{
-						$template->assign_block_vars('userguide_block', array(
-							'BLOCK_TITLE'		=> $help_ary[1])
-						);
-
-						continue;
-					}
-
-					$template->assign_block_vars('userguide_block.userguide_row', array(
-						'USERGUIDE_QUESTION'		=> $help_ary[0],
-						'USERGUIDE_ANSWER'			=> $help_ary[1])
-					);
-				}
-				return;
-			break;
-			case 'settings':
-				$display_vars = array(
-					'title'	=> 'ACP_FOOTBALL_SETTINGS',
-					'vars'	=> array(
-						'legend1'				=> 'ACP_FOOTBALL_SETTINGS',
-						'football_name'				=> array('lang' => 'FOOTBALL_NAME',		'validate' => 'string',	'type' => 'text:25:25', 'explain' => true),
-						'football_disable'			=> array('lang' => 'DISABLE_FOOTBALL',	'validate' => 'bool',	'type' => 'custom', 'method' => 'football_disable', 'explain' => true),
-						'football_disable_msg'		=> false,
-						'football_fullscreen'		=> array('lang' => 'FOOTBALL_FULLSCREEN','validate' => 'bool',	'type' => 'radio:yes_no', 'explain' => true),
-						'football_header_enable'	=> array('lang' => 'FOOTBALL_HEADER_ENABLE','validate' => 'bool',	'type' => 'radio:yes_no', 'explain' => true),
-						'football_guest_view'		=> array('lang' => 'GUEST_VIEW',		'validate' => 'bool',	'type' => 'radio:yes_no', 'explain' => true),
-						'football_user_view'		=> array('lang' => 'USER_VIEW',			'validate' => 'bool',	'type' => 'radio:yes_no', 'explain' => true),
-						'football_host_timezone'	=> array('lang' => 'HOST_TIMEZONE',		'validate' => 'string',	'type' => 'select', 'function' => 'phpbb_timezone_select', 'params' => array($template, $user, '{CONFIG_VALUE}', true), 'explain' => true),
-						'football_info_display'		=> array('lang' => 'FOOTBALL_INFO',		'validate' => 'bool',	'type' => 'custom', 'method' => 'football_info', 'explain' => true),
-						'football_info'				=> false,
-						'football_win_name'			=> array('lang' => 'WIN_NAME',			'validate' => 'string',	'type' => 'text:6:6', 'explain' => true),
-						'football_code'				=> array('lang' => 'FOOTBALL_CODE',		'validate' => 'string',	'type' => 'text:25:25', 'explain' => true),
-						'football_style'			=> array('lang' => 'FOOTBALL_STYLE',	'validate' => 'int',	'type' => 'select', 'function' => 'style_select', 'params' => array('{CONFIG_VALUE}', false), 'explain' => false),
-						'football_override_style'	=> array('lang' => 'FOOTBALL_OVERRIDE_STYLE',	'validate' => 'bool',	'type' => 'radio:yes_no', 'explain' => true),
-						'football_update_source'	=> array('lang' => 'FOOTBALL_UPDATE_SOURCE',	'validate' => 'string',	'type' => 'text:80:255', 'explain' => true),
-						'football_update_code'		=> array('lang' => 'FOOTBALL_UPDATE_CODE',		'validate' => 'string',	'type' => 'text:25:255', 'explain' => true),
-
-						'legend2'				=> 'GENERAL_SETTINGS',
-						'football_left_column_width'	=> array('lang' => 'LEFT_COLUMN',	'validate' => 'int',	'type' => 'text:3:3', 'explain' => true),
-						'football_right_column_width'	=> array('lang' => 'RIGHT_COLUMN',	'validate' => 'int',	'type' => 'text:3:3', 'explain' => true),
-						'football_display_ranks'		=> array('lang' => 'DISPLAY_RANKS',	'validate' => 'int',	'type' => 'text:3:3', 'explain' => true),
-						'football_users_per_page'		=> array('lang' => 'USERS_PAGE',	'validate' => 'int',	'type' => 'text:3:3', 'explain' => true),
-
-						'legend3'				=> 'ACP_SUBMIT_CHANGES',
-					)
-				);
-				// show the extension version check on Settings page
-				$this->version_check->check();
-			break;
-
-			case 'features':
-				$display_vars = array(
-					'title'	=> 'ACP_FOOTBALL_FEATURES',
-					'vars'	=> array(
-						'legend1'				=> 'ACP_FOOTBALL_FEATURES',
-						'football_founder_delete'	=> array('lang' => 'FOUNDER_DELETE',	'validate' => 'bool',	'type' => 'radio:yes_no', 'explain' => true),
-						'football_results_at_time'	=> array('lang' => 'RESULTS_AT_TIME',	'validate' => 'bool',	'type' => 'radio:yes_no', 'explain' => true),
-						'football_win_hits02'		=> array('lang' => 'WIN_HITS02',		'validate' => 'bool',	'type' => 'radio:yes_no', 'explain' => true),
-						'football_same_allowed'		=> array('lang' => 'SAME_ALLOWED',		'validate' => 'bool',	'type' => 'radio:yes_no', 'explain' => true),
-						'football_season_start'		=> array('lang' => 'FOOTBALL_SEASON_START',	'validate' => 'int', 'type' => 'select', 'method' => 'season_select', 'params' => array('{CONFIG_VALUE}', false), 'explain' => true),
-						'football_view_current'		=> array('lang' => 'VIEW_CURRENT',		'validate' => 'bool',	'type' => 'radio:yes_no', 'explain' => true),
-						'football_view_bets'		=> array('lang' => 'VIEW_BETS',			'validate' => 'bool',	'type' => 'radio:yes_no', 'explain' => true),
-						'football_view_tendencies'	=> array('lang' => 'VIEW_TENDENCIES',	'validate' => 'bool',	'type' => 'radio:yes_no', 'explain' => true),
-						'football_bank'				=> array('lang' => 'BANK',				'validate' => 'bool',	'type' => 'radio:yes_no', 'explain' => true),
-						'football_ult_points'		=> array('lang' => 'ULT_POINTS',		'validate' => 'int',	'type' => 'custom', 'method' => 'select_up_method', 'explain' => true),
-						'football_ult_points_factor'=> array('lang' => 'ULT_POINTS_FACTOR',	'validate' => 'dec:3:2','type' => 'text:4:10', 'explain' => true),
-						'football_remember_enable'	=> array('lang' => 'FOOTBALL_REMEMBER_ENABLE',	'validate' => 'bool',	'type' => 'radio:yes_no', 'explain' => true),
-						'football_remember_next_run'=> array('lang' => 'FOOTBALL_REMEMBER_NEXT_RUN','validate' => 'int',	'type' => 'custom', 'method' => 'next_run', 'explain' => true),
-			
-						'legend2'				=> 'ACP_SUBMIT_CHANGES',
-					)
-				);
-			break;
-
-			case 'menu':
-				$display_vars = array(
-					'title'	=> 'ACP_FOOTBALL_MENU',
-					'vars'	=> array(
-						'legend1'				=> 'ACP_FOOTBALL_MENU',
-						'football_breadcrumb'	=> array('lang' => 'FOOTBALL_BREADCRUMB', 'validate' => 'bool',	'type' => 'radio:yes_no', 	'explain' => true),
-						'football_side'			=> array('lang' => 'FOOTBALL_SIDE',	'validate' => 'bool',	'type' => 'radio:yes_no', 	'explain' => true),
-						'football_menu'			=> array('lang' => 'FOOTBALL_MENU',	'validate' => 'bool',	'type' => 'radio:yes_no', 	'explain' => true),
-						'football_menu_link1'	=> array('lang' => 'MENU_LINK1',	'validate' => 'string',	'type' => 'text:80:255',	'explain' => true),
-						'football_menu_desc1'	=> array('lang' => 'MENU_DESC1',	'validate' => 'string',	'type' => 'text:20:20',		'explain' => true),
-						'football_menu_link2'	=> array('lang' => 'MENU_LINK2',	'validate' => 'string',	'type' => 'text:80:255',	'explain' => false),
-						'football_menu_desc2'	=> array('lang' => 'MENU_DESC2',	'validate' => 'string',	'type' => 'text:20:20',		'explain' => false),
-						'football_menu_link3'	=> array('lang' => 'MENU_LINK3',	'validate' => 'string',	'type' => 'text:80:255', 	'explain' => false),
-						'football_menu_desc3'	=> array('lang' => 'MENU_DESC3',	'validate' => 'string',	'type' => 'text:20:20',		'explain' => false),
-					)
-				);
-			break;
-
-			default:
-				trigger_error('NO_MODE', E_USER_ERROR);
-			break;
-		}
-
-		if (isset($display_vars['lang']))
-		{
-			$user->add_lang($display_vars['lang']);
-		}
-
-		$this->new_config = $this->config;
-		$cfg_array = (isset($_REQUEST['config'])) ? utf8_normalize_nfc($this->request->variable('config', array('' => ''), true)) : $this->new_config;
-		$error = array();
-
-		// We validate the complete config if whished
-		validate_config_vars($display_vars['vars'], $cfg_array, $error);
-
-		if ($submit && !check_form_key($form_key))
-		{
-			$error[] = $user->lang['FORM_INVALID'];
-		}
-		// Do not write values if there is an error
-		if (sizeof($error))
-		{
-			$submit = false;
-		}
-
-		// We go through the display_vars to make sure no one is trying to set variables he/she is not allowed to...
-		foreach ($display_vars['vars'] as $this->config_name => $null)
-		{
-			if (!isset($cfg_array[$this->config_name]) || strpos($this->config_name, 'legend') !== false)
-			{
-				continue;
-			}
-			$this->new_config[$this->config_name] = $this->config_value = $cfg_array[$this->config_name];
-			
-			if ($submit)
-			{
-				if ($this->config_name == 'football_ult_points' && $this->config_value)
-				{
-					$this->config->set('football_bank', 1);
-				}
-				if ($this->config_name == 'football_remember_enable')
-				{
-					$day 	= $this->request->variable('next_run_day', 0);
-					$month 	= $this->request->variable('next_run_month', 0);
-					$year 	= $this->request->variable('next_run_year', 0);
-					$hour 	= $this->request->variable('next_run_hour', 0);
-					$minute = $this->request->variable('next_run_minute', 0);
-
-					$next_run = mktime($hour, $minute, 0, $month, $day, $year);
-					$this->config->set('football_remember_next_run', $next_run);
-				}
-				$this->config->set($this->config_name, $this->config_value);
-			}
-		}
-
-		if ($submit)
-		{
-			$phpbb_log->add('admin', $user->data['user_id'], $user->ip, 'LOG_FOOTBALL_' . strtoupper($mode));
-
-			trigger_error($user->lang['CONFIG_UPDATED'] . adm_back_link($this->u_action));
-		}
-
-		$this->tpl_name = 'acp_football';
-		$this->page_title = $display_vars['title'];
-
-		$template->assign_vars(array(
-			'U_FOOTBALL' 		=> $helper->route('football_main_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,
-			'ERROR_MSG'			=> implode('<br />', $error),
-			'U_ACTION'			=> $this->u_action,
-			'S_VERSION_NO'		=> $this->config['football_version'],
-			)
-		);
-
-		// Output relevant page
-		foreach ($display_vars['vars'] as $this->config_key => $vars)
-		{
-			if (!is_array($vars) && strpos($this->config_key, 'legend') === false)
-			{
-				continue;
-			}
-
-			if (strpos($this->config_key, 'legend') !== false)
-			{
-				$template->assign_block_vars('options', array(
-					'S_LEGEND'		=> true,
-					'LEGEND'		=> (isset($user->lang[$vars])) ? $user->lang[$vars] : $vars,
-					)
-				);
-
-				continue;
-			}
-
-			$type = explode(':', $vars['type']);
-
-			$l_explain = '';
-			if ($vars['explain'] && isset($vars['lang_explain']))
-			{
-				$l_explain = (isset($user->lang[$vars['lang_explain']])) ? $user->lang[$vars['lang_explain']] : $vars['lang_explain'];
-			}
-			else if ($vars['explain'])
-			{
-				$l_explain = (isset($user->lang[$vars['lang'] . '_EXPLAIN'])) ? $user->lang[$vars['lang'] . '_EXPLAIN'] : '';
-			}
-
-			$content = build_cfg_template($type, $this->config_key, $this->new_config, $this->config_key, $vars);
-
-			if (empty($content))
-			{
-				continue;
-			}
-
-			$template->assign_block_vars('options', array(
-				'KEY'			=> $this->config_key,
-				'TITLE'			=> (isset($user->lang[$vars['lang']])) ? $user->lang[$vars['lang']] : $vars['lang'],
-				'S_EXPLAIN'		=> $vars['explain'],
-				'TITLE_EXPLAIN'	=> $l_explain,
-				'CONTENT'		=> $content,
-				)
-			);
-
-			unset($display_vars['vars'][$this->config_key]);
-		}
-	}
-
-	/**
-	* Football disable option and message
-	*/
-	function football_disable($value, $key)
-	{
-		global $user;
-
-		$radio_ary = array(1 => 'YES', 0 => 'NO');
-
-		return h_radio('config[football_disable]', $radio_ary, $value) . '<br /><input id="' . $key . '" type="text" name="config[football_disable_msg]" maxlength="255" size="80" value="' . $this->new_config['football_disable_msg'] . '" />';
-	}
-
-	/**
-	* Football info option and message
-	*/
-	function football_info($value, $key)
-	{
-		global $user;
-
-		$radio_ary = array(1 => 'YES', 0 => 'NO');
-
-		return h_radio('config[football_info_display]', $radio_ary, $value) . '<br /><input id="' . $key . '" type="text" name="config[football_info]" maxlength="255" size="80" value="' . $this->new_config['football_info'] . '" />';
-	}
-
-	/**
-	* Select ultimate points method
-	*/
-	function select_up_method($value, $key = '')
-	{
-		global $user, $config;
-
-		$radio_ary = array(UP_NONE => 'UP_NONE', UP_WINS => 'UP_WINS', UP_POINTS => 'UP_POINTS');
-
-		return h_radio('config[football_ult_points]', $radio_ary, $value, $key);
-	}
-
-
-	function season_select($default = 0)
-	{
-		global $user, $db;
-
-		$sql = 'SELECT DISTINCT s.season, s.season_name_short FROM ' . FOOTB_SEASONS . ' AS s
-				INNER JOIN ' . FOOTB_LEAGUES . ' AS l ON (l.season = s.season)
-				INNER JOIN ' . FOOTB_MATCHDAYS . ' AS md ON (md.season = s.season AND md.league = l.league)
-				WHERE 1
-				ORDER BY s.season DESC';
-		$result = $db->sql_query($sql);
-
-		$selected = (0 == $default) ? ' selected="selected"' : '';
-		$season_options = '<option value="0"' . $selected . '>' . $user->lang['AUTO'] . '</option>';
-		while ($row = $db->sql_fetchrow($result))
-		{
-			$selected = ($row['season'] == $default) ? ' selected="selected"' : '';
-			$season_options .= '<option value="' . $row['season'] . '"' . $selected . '>' . $row['season_name_short'] . '</option>';
-		}
-		$db->sql_freeresult($result);
-
-		return $season_options;
-	}
-
-	/**
-	* Adjust Cronjob EMail remember next un
-	*/
-	function next_run($value, $key = '')
-	{
-		global $user, $db;
-		$next_run = getdate($this->config['football_remember_next_run']);
-		
-		// Days
-		$day_options = '<select name="next_run_day" id="next_run_day">';
-		for ($i = 1; $i < 32; $i++)
-		{
-			$selected = ($i == $next_run['mday']) ? ' selected="selected"' : '';
-			$day_options .= '<option value="' . $i . '"' . $selected . '>' . $i . '</option>';
-		}
-		$day_options .= '</select>';
-		
-		// Months
-		$month_options = '<select name="next_run_month" id="next_run_month">';
-		for ($i = 1; $i < 13; $i++)
-		{
-			$selected = ($i == $next_run['mon']) ? ' selected="selected"' : '';
-			$month_options .= '<option value="' . $i . '"' . $selected . '>' . $i . '</option>';
-		}
-		$month_options .= '</select>';
-
-		// Years
-		$year_options = '<select name="next_run_year" id="next_run_year">';
-		for ($i = date("Y"); $i < (date("Y") + 1); $i++)
-		{
-			$selected = ($i == $next_run['year']) ? ' selected="selected"' : '';
-			$year_options .= '<option value="' . $i . '"' . $selected . '>' . $i . '</option>';
-		}
-		$year_options .= '</select>';
-
-		// Hours
-		$hour_options = '<select name="next_run_hour" id="next_run_hour">';
-		for ($i = 0; $i < 24; $i++)
-		{
-			$selected = ($i == $next_run['hours']) ? ' selected="selected"' : '';
-			$hour_options .= '<option value="' . $i . '"' . $selected . '>' . $i . '</option>';
-		}
-		$hour_options .= '</select>';
-
-		// Minutes
-		$minute_options = '<select name="next_run_minute" id="next_run_minute">';
-		for ($i = 0; $i < 60; $i++)
-		{
-			$selected = ($i == $next_run['minutes']) ? ' selected="selected"' : '';
-			$minute_options .= '<option value="' . $i . '"' . $selected . '>' . $i . '</option>';
-		}
-		$minute_options .= '</select>';
-
-
-		return $user->lang['DAY'] . ': ' . $day_options . ' ' . $user->lang['MONTH'] . ': ' . $month_options . ' ' . $user->lang['YEAR'] . ': ' . 
-			$year_options . ' ' . $user->lang['HOURS'] . ': ' . $hour_options . ' ' . $user->lang['MINUTES'] . ': ' . $minute_options;
-
-	}
-}
-
+<?php
+/**
+*
+* @package phpBB Extension - Football Football
+* @copyright (c) 2016 football (http://football.bplaced.net)
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+namespace football\football\acp;
+
+class football_module
+{
+	var $new_config = array();
+	public $u_action;
+
+	protected $db, $user, $template, $config, $phpbb_root_path, $phpbb_admin_path, $phpEx;
+	protected $root_path, $request, $php_ext, $log, $phpbb_container, $version_check;
+
+
+	public function __construct()
+	{
+		global $db, $user, $request, $template, $phpbb_container;
+		global $config, $phpbb_root_path, $phpbb_admin_path, $phpEx;
+
+		$user->add_lang_ext('football/football', 'help_football');
+		$user->add_lang_ext('football/football', 'football');
+		$user->add_lang_ext('football/football', 'info_acp_football');
+
+		$this->root_path = $phpbb_root_path . 'ext/football/football/';
+
+		$this->config = $config;
+		$this->request = $request;
+		$this->phpbb_root_path = $phpbb_root_path;
+		$this->phpbb_admin_path = $phpbb_admin_path;
+		$this->php_ext = $phpEx;
+		$this->phpbb_container = $phpbb_container;
+		$this->version_check = $this->phpbb_container->get('football.football.version.check');
+
+		if(!function_exists('season_info'))
+		{
+			include($this->root_path . 'includes/functions.' . $this->php_ext);
+		}
+		if (!defined('FOOTB_SEASONS'))
+		{
+			include($this->root_path . 'includes/constants.' . $this->php_ext);
+		}
+	}
+
+	function main($id, $mode)
+	{
+		global $db, $auth, $phpbb_container, $phpbb_admin_path, $league_info, $phpbb_log;
+		global $template, $user, $config, $phpbb_extension_manager, $request, $phpbb_root_path, $phpEx;
+		
+		$helper = $phpbb_container->get('controller.helper');
+		
+		$user->add_lang('acp/board');
+
+		$action	= $this->request->variable('action', '');
+		$submit = (isset($_POST['submit'])) ? true : false;
+
+		$form_key = 'acp_football';
+		add_form_key($form_key);
+
+		switch ($mode)
+		{
+			case 'userguide':
+            	$this->page_title = 'ACP_FOOTBALL_USERGUIDE';
+				$this->tpl_name = 'acp_football_userguide';
+
+				$template->assign_vars(array(
+					'S_IN_FOOTBALL_USERGUIDE'	=> true,
+					'U_FOOTBALL' 				=> $helper->route('football_main_controller',array('side' => 'bet')),
+					'L_BACK_TO_TOP'				=> $user->lang['BACK_TO_TOP'],
+					'ICON_BACK_TO_TOP'			=> '<img src="' . $phpbb_admin_path . 'images/icon_up.gif" style="vertical-align: middle;" alt="' . $user->lang['BACK_TO_TOP'] . '" title="' . $user->lang['BACK_TO_TOP'] . '" />',
+					'S_VERSION_NO'				=> $this->config['football_version'],
+				));
+
+				// Pull the array data from the lang pack
+				foreach ($user->lang['FOOTBALL_HELP_FAQ'] as $help_ary)
+				{
+					if ($help_ary[0] == '--')
+					{
+						$template->assign_block_vars('userguide_block', array(
+							'BLOCK_TITLE'		=> $help_ary[1])
+						);
+
+						continue;
+					}
+
+					$template->assign_block_vars('userguide_block.userguide_row', array(
+						'USERGUIDE_QUESTION'		=> $help_ary[0],
+						'USERGUIDE_ANSWER'			=> $help_ary[1])
+					);
+				}
+				return;
+			break;
+			case 'settings':
+				$display_vars = array(
+					'title'	=> 'ACP_FOOTBALL_SETTINGS',
+					'vars'	=> array(
+						'legend1'				=> 'ACP_FOOTBALL_SETTINGS',
+						'football_name'				=> array('lang' => 'FOOTBALL_NAME',		'validate' => 'string',	'type' => 'text:25:25', 'explain' => true),
+						'football_disable'			=> array('lang' => 'DISABLE_FOOTBALL',	'validate' => 'bool',	'type' => 'custom', 'method' => 'football_disable', 'explain' => true),
+						'football_disable_msg'		=> false,
+						'football_fullscreen'		=> array('lang' => 'FOOTBALL_FULLSCREEN','validate' => 'bool',	'type' => 'radio:yes_no', 'explain' => true),
+						'football_header_enable'	=> array('lang' => 'FOOTBALL_HEADER_ENABLE','validate' => 'bool',	'type' => 'radio:yes_no', 'explain' => true),
+						'football_guest_view'		=> array('lang' => 'GUEST_VIEW',		'validate' => 'bool',	'type' => 'radio:yes_no', 'explain' => true),
+						'football_user_view'		=> array('lang' => 'USER_VIEW',			'validate' => 'bool',	'type' => 'radio:yes_no', 'explain' => true),
+						'football_time_shift'		=> array('lang' => 'TIME_SHIFT',		'validate' => 'int',	'type' => 'select', 'method' => 'time_shift_select', 'params' => array('{CONFIG_VALUE}', false), 'explain' => true),
+						'football_info_display'		=> array('lang' => 'FOOTBALL_INFO',		'validate' => 'bool',	'type' => 'custom', 'method' => 'football_info', 'explain' => true),
+						'football_info'				=> false,
+						'football_win_name'			=> array('lang' => 'WIN_NAME',			'validate' => 'string',	'type' => 'text:6:6', 'explain' => true),
+						'football_code'				=> array('lang' => 'FOOTBALL_CODE',		'validate' => 'string',	'type' => 'text:25:25', 'explain' => true),
+						'football_style'			=> array('lang' => 'FOOTBALL_STYLE',	'validate' => 'int',	'type' => 'select', 'function' => 'style_select', 'params' => array('{CONFIG_VALUE}', false), 'explain' => false),
+						'football_override_style'	=> array('lang' => 'FOOTBALL_OVERRIDE_STYLE',	'validate' => 'bool',	'type' => 'radio:yes_no', 'explain' => true),
+						'football_update_source'	=> array('lang' => 'FOOTBALL_UPDATE_SOURCE',	'validate' => 'string',	'type' => 'text:80:255', 'explain' => true),
+						'football_update_code'		=> array('lang' => 'FOOTBALL_UPDATE_CODE',		'validate' => 'string',	'type' => 'text:25:255', 'explain' => true),
+
+						'legend2'				=> 'GENERAL_SETTINGS',
+						'football_left_column_width'	=> array('lang' => 'LEFT_COLUMN',	'validate' => 'int',	'type' => 'text:3:3', 'explain' => true),
+						'football_right_column_width'	=> array('lang' => 'RIGHT_COLUMN',	'validate' => 'int',	'type' => 'text:3:3', 'explain' => true),
+						'football_display_last_users'	=> array('lang' => 'DISPLAY_LAST_USERS', 'validate' => 'int','type' => 'text:3:3', 'explain' => true),
+						'football_display_last_results'	=> array('lang' => 'DISPLAY_LAST_RESULTS', 'validate' => 'int','type' => 'text:3:3', 'explain' => true),
+						'football_display_ranks'		=> array('lang' => 'DISPLAY_RANKS',	'validate' => 'int',	'type' => 'text:3:3', 'explain' => true),
+						'football_users_per_page'		=> array('lang' => 'USERS_PAGE',	'validate' => 'int',	'type' => 'text:3:3', 'explain' => true),
+
+						'legend3'				=> 'ACP_SUBMIT_CHANGES',
+					)
+				);
+				// show the extension version check on Settings page
+				$this->version_check->check();
+			break;
+
+			case 'features':
+				$display_vars = array(
+					'title'	=> 'ACP_FOOTBALL_FEATURES',
+					'vars'	=> array(
+						'legend1'				=> 'ACP_FOOTBALL_FEATURES',
+						'football_founder_delete'	=> array('lang' => 'FOUNDER_DELETE',	'validate' => 'bool',	'type' => 'radio:yes_no', 'explain' => true),
+						'football_results_at_time'	=> array('lang' => 'RESULTS_AT_TIME',	'validate' => 'bool',	'type' => 'radio:yes_no', 'explain' => true),
+						'football_win_hits02'		=> array('lang' => 'WIN_HITS02',		'validate' => 'bool',	'type' => 'radio:yes_no', 'explain' => true),
+						'football_same_allowed'		=> array('lang' => 'SAME_ALLOWED',		'validate' => 'bool',	'type' => 'radio:yes_no', 'explain' => true),
+						'football_season_start'		=> array('lang' => 'FOOTBALL_SEASON_START',	'validate' => 'int', 'type' => 'select', 'method' => 'season_select', 'params' => array('{CONFIG_VALUE}', false), 'explain' => true),
+						'football_view_current'		=> array('lang' => 'VIEW_CURRENT',		'validate' => 'bool',	'type' => 'radio:yes_no', 'explain' => true),
+						'football_view_bets'		=> array('lang' => 'VIEW_BETS',			'validate' => 'bool',	'type' => 'radio:yes_no', 'explain' => true),
+						'football_view_tendencies'	=> array('lang' => 'VIEW_TENDENCIES',	'validate' => 'bool',	'type' => 'radio:yes_no', 'explain' => true),
+						'football_bank'				=> array('lang' => 'BANK',				'validate' => 'bool',	'type' => 'radio:yes_no', 'explain' => true),
+						'football_ult_points'		=> array('lang' => 'ULT_POINTS',		'validate' => 'int',	'type' => 'custom', 'method' => 'select_up_method', 'explain' => true),
+						'football_ult_points_factor'=> array('lang' => 'ULT_POINTS_FACTOR',	'validate' => 'dec:3:2','type' => 'text:4:10', 'explain' => true),
+						'football_remember_enable'	=> array('lang' => 'FOOTBALL_REMEMBER_ENABLE',	'validate' => 'bool',	'type' => 'radio:yes_no', 'explain' => true),
+						'football_remember_next_run'=> array('lang' => 'FOOTBALL_REMEMBER_NEXT_RUN','validate' => 'int',	'type' => 'custom', 'method' => 'next_run', 'explain' => true),
+			
+						'legend2'				=> 'ACP_SUBMIT_CHANGES',
+					)
+				);
+			break;
+
+			case 'menu':
+				$display_vars = array(
+					'title'	=> 'ACP_FOOTBALL_MENU',
+					'vars'	=> array(
+						'legend1'				=> 'ACP_FOOTBALL_MENU',
+						'football_breadcrumb'	=> array('lang' => 'FOOTBALL_BREADCRUMB', 'validate' => 'bool',	'type' => 'radio:yes_no', 	'explain' => true),
+						'football_side'			=> array('lang' => 'FOOTBALL_SIDE',	'validate' => 'bool',	'type' => 'radio:yes_no', 	'explain' => true),
+						'football_menu'			=> array('lang' => 'FOOTBALL_MENU',	'validate' => 'bool',	'type' => 'radio:yes_no', 	'explain' => true),
+						'football_menu_link1'	=> array('lang' => 'MENU_LINK1',	'validate' => 'string',	'type' => 'text:80:255',	'explain' => true),
+						'football_menu_desc1'	=> array('lang' => 'MENU_DESC1',	'validate' => 'string',	'type' => 'text:20:20',		'explain' => true),
+						'football_menu_link2'	=> array('lang' => 'MENU_LINK2',	'validate' => 'string',	'type' => 'text:80:255',	'explain' => false),
+						'football_menu_desc2'	=> array('lang' => 'MENU_DESC2',	'validate' => 'string',	'type' => 'text:20:20',		'explain' => false),
+						'football_menu_link3'	=> array('lang' => 'MENU_LINK3',	'validate' => 'string',	'type' => 'text:80:255', 	'explain' => false),
+						'football_menu_desc3'	=> array('lang' => 'MENU_DESC3',	'validate' => 'string',	'type' => 'text:20:20',		'explain' => false),
+					)
+				);
+			break;
+
+			default:
+				trigger_error('NO_MODE', E_USER_ERROR);
+			break;
+		}
+
+		if (isset($display_vars['lang']))
+		{
+			$user->add_lang($display_vars['lang']);
+		}
+
+		$this->new_config = $this->config;
+		$cfg_array = (isset($_REQUEST['config'])) ? utf8_normalize_nfc($this->request->variable('config', array('' => ''), true)) : $this->new_config;
+		$error = array();
+
+		// We validate the complete config if whished
+		validate_config_vars($display_vars['vars'], $cfg_array, $error);
+
+		if ($submit && !check_form_key($form_key))
+		{
+			$error[] = $user->lang['FORM_INVALID'];
+		}
+		// Do not write values if there is an error
+		if (sizeof($error))
+		{
+			$submit = false;
+		}
+
+		// We go through the display_vars to make sure no one is trying to set variables he/she is not allowed to...
+		foreach ($display_vars['vars'] as $this->config_name => $null)
+		{
+			if (!isset($cfg_array[$this->config_name]) || strpos($this->config_name, 'legend') !== false)
+			{
+				continue;
+			}
+			$this->new_config[$this->config_name] = $this->config_value = $cfg_array[$this->config_name];
+			
+			if ($submit)
+			{
+				if ($this->config_name == 'football_ult_points' && $this->config_value)
+				{
+					$this->config->set('football_bank', 1);
+				}
+				if ($this->config_name == 'football_remember_enable')
+				{
+					$day 	= $this->request->variable('next_run_day', 0);
+					$month 	= $this->request->variable('next_run_month', 0);
+					$year 	= $this->request->variable('next_run_year', 0);
+					$hour 	= $this->request->variable('next_run_hour', 0);
+					$minute = $this->request->variable('next_run_minute', 0);
+
+					$next_run = mktime($hour, $minute, 0, $month, $day, $year);
+					$this->config->set('football_remember_next_run', $next_run);
+				}
+				$this->config->set($this->config_name, $this->config_value);
+			}
+		}
+
+		if ($submit)
+		{
+			$phpbb_log->add('admin', $user->data['user_id'], $user->ip, 'LOG_FOOTBALL_' . strtoupper($mode));
+
+			trigger_error($user->lang['CONFIG_UPDATED'] . adm_back_link($this->u_action));
+		}
+
+		$this->tpl_name = 'acp_football';
+		$this->page_title = $display_vars['title'];
+
+		$template->assign_vars(array(
+			'U_FOOTBALL' 		=> $helper->route('football_main_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,
+			'ERROR_MSG'			=> implode('<br />', $error),
+			'U_ACTION'			=> $this->u_action,
+			'S_VERSION_NO'		=> $this->config['football_version'],
+			)
+		);
+
+		// Output relevant page
+		foreach ($display_vars['vars'] as $this->config_key => $vars)
+		{
+			if (!is_array($vars) && strpos($this->config_key, 'legend') === false)
+			{
+				continue;
+			}
+
+			if (strpos($this->config_key, 'legend') !== false)
+			{
+				$template->assign_block_vars('options', array(
+					'S_LEGEND'		=> true,
+					'LEGEND'		=> (isset($user->lang[$vars])) ? $user->lang[$vars] : $vars,
+					)
+				);
+
+				continue;
+			}
+
+			$type = explode(':', $vars['type']);
+
+			$l_explain = '';
+			if ($vars['explain'] && isset($vars['lang_explain']))
+			{
+				$l_explain = (isset($user->lang[$vars['lang_explain']])) ? $user->lang[$vars['lang_explain']] : $vars['lang_explain'];
+			}
+			else if ($vars['explain'])
+			{
+				$l_explain = (isset($user->lang[$vars['lang'] . '_EXPLAIN'])) ? $user->lang[$vars['lang'] . '_EXPLAIN'] : '';
+			}
+
+			$content = build_cfg_template($type, $this->config_key, $this->new_config, $this->config_key, $vars);
+
+			if (empty($content))
+			{
+				continue;
+			}
+
+			$template->assign_block_vars('options', array(
+				'KEY'			=> $this->config_key,
+				'TITLE'			=> (isset($user->lang[$vars['lang']])) ? $user->lang[$vars['lang']] : $vars['lang'],
+				'S_EXPLAIN'		=> $vars['explain'],
+				'TITLE_EXPLAIN'	=> $l_explain,
+				'CONTENT'		=> $content,
+				)
+			);
+
+			unset($display_vars['vars'][$this->config_key]);
+		}
+	}
+
+	/**
+	* Football disable option and message
+	*/
+	function football_disable($value, $key)
+	{
+		global $user;
+
+		$radio_ary = array(1 => 'YES', 0 => 'NO');
+
+		return h_radio('config[football_disable]', $radio_ary, $value) . '<br /><input id="' . $key . '" type="text" name="config[football_disable_msg]" maxlength="255" size="80" value="' . $this->new_config['football_disable_msg'] . '" />';
+	}
+
+	/**
+	* Football info option and message
+	*/
+	function football_info($value, $key)
+	{
+		global $user;
+
+		$radio_ary = array(1 => 'YES', 0 => 'NO');
+
+		return h_radio('config[football_info_display]', $radio_ary, $value) . '<br /><input id="' . $key . '" type="text" name="config[football_info]" maxlength="255" size="80" value="' . $this->new_config['football_info'] . '" />';
+	}
+
+	/**
+	* Select ultimate points method
+	*/
+	function select_up_method($value, $key = '')
+	{
+		global $user, $config;
+
+		$radio_ary = array(UP_NONE => 'UP_NONE', UP_WINS => 'UP_WINS', UP_POINTS => 'UP_POINTS');
+
+		return h_radio('config[football_ult_points]', $radio_ary, $value, $key);
+	}
+
+
+	function season_select($default = 0)
+	{
+		global $user, $db;
+
+		$sql = 'SELECT DISTINCT s.season, s.season_name_short FROM ' . FOOTB_SEASONS . ' AS s
+				INNER JOIN ' . FOOTB_LEAGUES . ' AS l ON (l.season = s.season)
+				INNER JOIN ' . FOOTB_MATCHDAYS . ' AS md ON (md.season = s.season AND md.league = l.league)
+				WHERE 1
+				ORDER BY s.season DESC';
+		$result = $db->sql_query($sql);
+
+		$selected = (0 == $default) ? ' selected="selected"' : '';
+		$season_options = '<option value="0"' . $selected . '>' . $user->lang['AUTO'] . '</option>';
+		while ($row = $db->sql_fetchrow($result))
+		{
+			$selected = ($row['season'] == $default) ? ' selected="selected"' : '';
+			$season_options .= '<option value="' . $row['season'] . '"' . $selected . '>' . $row['season_name_short'] . '</option>';
+		}
+		$db->sql_freeresult($result);
+
+		return $season_options;
+	}
+
+	/**
+	* Adjust Cronjob EMail remember next run
+	*/
+	function next_run($value, $key = '')
+	{
+		global $user, $db;
+		$next_run = getdate($this->config['football_remember_next_run']);
+		
+		// Days
+		$day_options = '<select name="next_run_day" id="next_run_day">';
+		for ($i = 1; $i < 32; $i++)
+		{
+			$selected = ($i == $next_run['mday']) ? ' selected="selected"' : '';
+			$day_options .= '<option value="' . $i . '"' . $selected . '>' . $i . '</option>';
+		}
+		$day_options .= '</select>';
+		
+		// Months
+		$month_options = '<select name="next_run_month" id="next_run_month">';
+		for ($i = 1; $i < 13; $i++)
+		{
+			$selected = ($i == $next_run['mon']) ? ' selected="selected"' : '';
+			$month_options .= '<option value="' . $i . '"' . $selected . '>' . $i . '</option>';
+		}
+		$month_options .= '</select>';
+
+		// Years
+		$year_options = '<select name="next_run_year" id="next_run_year">';
+		for ($i = date("Y"); $i < (date("Y") + 1); $i++)
+		{
+			$selected = ($i == $next_run['year']) ? ' selected="selected"' : '';
+			$year_options .= '<option value="' . $i . '"' . $selected . '>' . $i . '</option>';
+		}
+		$year_options .= '</select>';
+
+		// Hours
+		$hour_options = '<select name="next_run_hour" id="next_run_hour">';
+		for ($i = 0; $i < 24; $i++)
+		{
+			$selected = ($i == $next_run['hours']) ? ' selected="selected"' : '';
+			$hour_options .= '<option value="' . $i . '"' . $selected . '>' . $i . '</option>';
+		}
+		$hour_options .= '</select>';
+
+		// Minutes
+		$minute_options = '<select name="next_run_minute" id="next_run_minute">';
+		for ($i = 0; $i < 60; $i++)
+		{
+			$selected = ($i == $next_run['minutes']) ? ' selected="selected"' : '';
+			$minute_options .= '<option value="' . $i . '"' . $selected . '>' . $i . '</option>';
+		}
+		$minute_options .= '</select>';
+
+
+		return $user->lang['DAY'] . ': ' . $day_options . ' ' . $user->lang['MONTH'] . ': ' . $month_options . ' ' . $user->lang['YEAR'] . ': ' . 
+			$year_options . ' ' . $user->lang['HOURS'] . ': ' . $hour_options . ' ' . $user->lang['MINUTES'] . ': ' . $minute_options;
+
+	}
+
+	function time_shift_select($default = 0)
+	{
+		$time_shift_options = "";
+		for ($i = -23; $i < 24; $i++)
+		{
+			$selected = ($i == $default) ? ' selected="selected"' : '';
+			$time_shift_options .= '<option value="' . $i . '"' . $selected . '>' . $i . '</option>';
+		}
+		return $time_shift_options;
+	}
+
+}
+
 ?>

acp/ko_module.php

@@ -1,257 +1,255 @@
-<?php
-/**
-*
-* @package phpBB Extension - Football Football
-* @copyright (c) 2016 football (http://football.bplaced.net)
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
-*
-*/
-
-namespace football\football\acp;
-
-class ko_module
-{
-	public $u_action;
-
-	protected $db, $user, $template, $config, $phpbb_root_path, $phpbb_admin_path, $phpEx;
-	protected $root_path, $request, $php_ext, $log;
-
-
-	public function __construct()
-	{
-		global $db, $user, $request, $template;
-		global $config, $phpbb_root_path, $phpbb_admin_path, $phpEx;
-
-		$user->add_lang_ext('football/football', 'football');
-		$user->add_lang_ext('football/football', 'info_acp_ko');
-
-		$this->root_path = $phpbb_root_path . 'ext/football/football/';
-
-		$this->config = $config;
-		$this->request = $request;
-		$this->phpbb_root_path = $phpbb_root_path;
-		$this->phpbb_admin_path = $phpbb_admin_path;
-		$this->php_ext = $phpEx;
-
-		if(!function_exists('season_info'))
-		{
-			include($this->root_path . 'includes/functions.' . $this->php_ext);
-		}
-		if (!defined('FOOTB_SEASONS'))
-		{
-			include($this->root_path . 'includes/constants.' . $this->php_ext);
-		}
-	}
-
-	function main($id, $mode)
-	{
-		global $db, $auth, $phpbb_container, $phpbb_admin_path, $league_info;
-		global $template, $user, $config, $phpbb_extension_manager, $request, $phpbb_root_path, $phpEx;
-		$provider			= new \phpbb\controller\ provider();
-		$symphony_request	= new \phpbb\ symfony_request($request);
-		$filesystem			= new \phpbb\ filesystem();
-		$helper				= new \phpbb\controller\ helper($template, $user, $config, $provider, $phpbb_extension_manager, $symphony_request, $request, $filesystem, $phpbb_root_path, $phpEx);
-
-		$this->tpl_name = 'acp_football_ko';
-		$this->page_title = 'ACP_FOOTBALL_KO_MANAGE';
-
-		$form_key = 'acp_football_ko';
-		add_form_key($form_key);
-
-		include($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', '');
-		$season				= $this->request->variable('s', 0);
-		$league				= $this->request->variable('l', 0);
-		$matchday_from		= $this->request->variable('matchday_from', 0);
-		$matchday_to		= $this->request->variable('matchday_to', 0);
-		$matchday_new		= $this->request->variable('matchday_new', 0);
-		$check_rank			= $this->request->variable('check_rank', 0);
-		$rank				= $this->request->variable('rank', 2);
-		$move_rank			= $this->request->variable('move_rank', 3);
-		$move_league		= $this->request->variable('move_league', 0);
-		$move_matchday		= $this->request->variable('move_matchday', 8);
-
-		// Clear some vars
-		$error = array();
-		$success = array();
-
-		$curr_season = curr_season();
-		// Grab current season
-		if (!$season)
-		{
-			$season = $curr_season;
-		}
-
-		// Grab basic data for select season
-		if ($season)
-		{
-			$sql = 'SELECT 
-					DISTINCT s.*
-				FROM ' .  FOOTB_SEASONS . ' AS s
-				LEFT JOIN ' . FOOTB_LEAGUES . ' AS l ON (l.season = s.season)
-				WHERE l.league_type = 2
-				ORDER BY s.season DESC';
-			$result = $db->sql_query($sql);
-
-			$season_options = '';
-			while ($row = $db->sql_fetchrow($result))
-			{
-				$selected = ($season && $row['season'] == $season) ? ' selected="selected"' : '';
-				$season_options .= '<option value="' . $row['season'] . '"' . $selected . '>' . $row['season_name_short'] . '</option>';
-				if ($selected <> '')
-				{
-					$season_name = $row['season_name_short'];
-				}
-			}
-			$db->sql_freeresult($result);
-		}
-		else
-		{
-			trigger_error($user->lang['NO_SEASON'] . adm_back_link($this->u_action), E_USER_WARNING);
-		}
-
-		// Grab basic data for select league
-		$sql = 'SELECT *
-			FROM ' . FOOTB_LEAGUES . '
-			WHERE season = ' . $season . ' 
-				AND league_type = ' . LEAGUE_KO . '
-			ORDER BY league ASC';
-		$result = $db->sql_query($sql);
-
-		$league_options = '';
-		if ($move_league == 0)
-		{
-			$league_move_options = '<option value="0" selected="selected">' . sprintf($user->lang['CHOOSE_LEAGUE']) . '</option>';
-		}
-		else
-		{
-			$league_move_options = '<option value="0">' . sprintf($user->lang['CHOOSE_LEAGUE']) . '</option>';
-		}
-		while ($row = $db->sql_fetchrow($result))
-		{
-			// Grab current league
-			if (!$league)
-			{
-				$league = $row['league'];
-			}
-			$selected = ($league && $row['league'] == $league) ? ' selected="selected"' : '';
-			$league_options .= '<option value="' . $row['league'] . '"' . $selected . '>' . $row['league_name'] . '</option>';
-			if ($selected <> '')
-			{
-				$league_matchdays = $row['matchdays'];
-				$matches_matchday = $row['matches_on_matchday'];
-				$league_name 	  = $row['league_name'];
-			}
-			else
-			{
-				$selected_move = ($move_league && $row['league'] == $move_league) ? ' selected="selected"' : '';
-				$league_move_options .= '<option value="' . $row['league'] . '"' . $selected_move . '>' . $row['league_name'] . '</option>';
-			}
-		}
-		$db->sql_freeresult($result);
-		
-		if (!$league)
-		{
-			trigger_error(sprintf($user->lang['NO_LEAGUE'], $season) . adm_back_link($this->u_action . "&amp;s=$season"), E_USER_WARNING);
-		}
-
-		// Grab basic data for select matchday
-		if (!$matchday_from)
-		{
-			$matchday_from = curr_matchday($season, $league);
-			if ($matchday_from > 1)
-			{
-				$matchday_from = $matchday_from - 1;
-			}
-		}
-		if (!$matchday_to)
-		{
-			$matchday_to = $matchday_from;
-		}
-		if (!$matchday_new)
-		{
-			$matchday_new = $matchday_to + 1;
-		}
-		
-		$sql = 'SELECT *
-			FROM ' . FOOTB_MATCHDAYS . "
-			WHERE season = $season 
-				AND league = $league 
-			ORDER BY matchday ASC";
-		$result = $db->sql_query($sql);
-
-		$matchday_from_options = '';
-		$matchday_to_options = '';
-		$matchday_new_options = '';
-		while ($row = $db->sql_fetchrow($result))
-		{
-			$selected_from 		= ($matchday_from && $row['matchday'] == $matchday_from) ? ' selected="selected"' : '';
-			$selected_to 		= ($matchday_to && $row['matchday'] == $matchday_to) ? ' selected="selected"' : '';
-			$selected_new 		= ($matchday_new && $row['matchday'] == $matchday_new) ? ' selected="selected"' : '';
-			$day_name 			= (strlen($row['matchday_name']) > 0) ? $row['matchday_name'] : $row['matchday'] . '. ' . sprintf($user->lang['MATCHDAY']);
-			$matchday_from_options .= '<option value="' . $row['matchday'] . '"' . $selected_from . '>' . $day_name . '</option>';
-			$matchday_to_options .= '<option value="' . $row['matchday'] . '"' . $selected_to . '>' . $day_name . '</option>';
-			$matchday_new_options .= '<option value="' . $row['matchday'] . '"' . $selected_new . '>' . $day_name . '</option>';
-		}
-		$db->sql_freeresult($result);
-		if ($matchday_from_options == '')
-		{
-			trigger_error(sprintf($user->lang['NO_MATCHDAY'], $league_name, $season) . adm_back_link($this->u_action . "&amp;s=$season&amp;l=$league"), E_USER_WARNING);
-		}
-	
-		// Which page?
-		switch ($action)
-		{
-			case 'update':
-				{
-					if ($matchday_from > $matchday_to) 
-					{
-						$error[] =  sprintf($user->lang['ERROR_FROM_TO']);
-					}
-					if ($matchday_new <= $matchday_to) 
-					{
-						$error[] =  sprintf($user->lang['ERROR_TARGET']);
-					}
-					if (!sizeof($error))
-					{
-						if (1 == $check_rank)
-						{
-							$success = ko_group_next_round($season, $league, $matchday_from, $matchday_to, $matchday_new, $rank, $move_rank, $move_league, $move_matchday);
-						}
-						else
-						{
-							$success = ko_next_round($season, $league, $matchday_from, $matchday_to, $matchday_new);
-						}
-						trigger_error($success . adm_back_link($this->u_action));
-					}
-				}
-			break;
-		}
-
-		$template->assign_vars(array(
-			'U_ACTION'				=> $this->u_action,
-			'U_FOOTBALL' 			=> $helper->route('football_main_controller',array('side' => 'bet', 's' => $season, 'l' => $league)),
-			'S_ERROR'				=> (sizeof($error)) ? true : false,
-			'ERROR_MSG'				=> (sizeof($error)) ? implode('<br />', $error) : '',
-			'S_SUCCESS'				=> (sizeof($success)) ? true : false,
-			'SUCCESS_MSG'			=> (sizeof($success)) ? implode('<br />', $success) : '',
-			'S_SEASON_OPTIONS'		=> $season_options,
-			'S_LEAGUE_OPTIONS'		=> $league_options,
-			'S_SEASON'				=> $season,
-			'S_LEAGUE'				=> $league,
-			'S_MATCHDAY_FROM_OPTIONS'=> $matchday_from_options,
-			'S_MATCHDAY_TO_OPTIONS'	=> $matchday_to_options,
-			'S_MATCHDAY_NEW_OPTIONS'=> $matchday_new_options,
-			'S_CHECK_RANK' 			=> $check_rank,
-			'S_RANK' 				=> $rank,
-			'S_MOVE_RANK' 			=> $move_rank,
-			'S_MOVE_LEAGUE_OPTIONS'	=> $league_move_options,
-			'S_MOVE_MATCHDAY' 		=> $move_matchday,
-			'S_VERSION_NO'			=> $this->config['football_version'],
-			)
-		);
-	}
-}
+<?php
+/**
+*
+* @package phpBB Extension - Football Football
+* @copyright (c) 2016 football (http://football.bplaced.net)
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+namespace football\football\acp;
+
+class ko_module
+{
+	public $u_action;
+
+	protected $db, $user, $template, $config, $phpbb_root_path, $phpbb_admin_path, $phpEx;
+	protected $root_path, $request, $php_ext, $log;
+
+
+	public function __construct()
+	{
+		global $db, $user, $request, $template;
+		global $config, $phpbb_root_path, $phpbb_admin_path, $phpEx;
+
+		$user->add_lang_ext('football/football', 'football');
+		$user->add_lang_ext('football/football', 'info_acp_ko');
+
+		$this->root_path = $phpbb_root_path . 'ext/football/football/';
+
+		$this->config = $config;
+		$this->request = $request;
+		$this->phpbb_root_path = $phpbb_root_path;
+		$this->phpbb_admin_path = $phpbb_admin_path;
+		$this->php_ext = $phpEx;
+
+		if(!function_exists('season_info'))
+		{
+			include($this->root_path . 'includes/functions.' . $this->php_ext);
+		}
+		if (!defined('FOOTB_SEASONS'))
+		{
+			include($this->root_path . 'includes/constants.' . $this->php_ext);
+		}
+	}
+
+	function main($id, $mode)
+	{
+		global $db, $auth, $phpbb_container, $phpbb_admin_path, $league_info;
+		global $template, $user, $config, $phpbb_extension_manager, $request, $phpbb_root_path, $phpEx;
+		
+		$helper = $phpbb_container->get('controller.helper');
+		
+		$this->tpl_name = 'acp_football_ko';
+		$this->page_title = 'ACP_FOOTBALL_KO_MANAGE';
+
+		$form_key = 'acp_football_ko';
+		add_form_key($form_key);
+
+		include($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', '');
+		$season				= $this->request->variable('s', 0);
+		$league				= $this->request->variable('l', 0);
+		$matchday_from		= $this->request->variable('matchday_from', 0);
+		$matchday_to		= $this->request->variable('matchday_to', 0);
+		$matchday_new		= $this->request->variable('matchday_new', 0);
+		$check_rank			= $this->request->variable('check_rank', 0);
+		$rank				= $this->request->variable('rank', 2);
+		$move_rank			= $this->request->variable('move_rank', 3);
+		$move_league		= $this->request->variable('move_league', 0);
+		$move_matchday		= $this->request->variable('move_matchday', 8);
+
+		// Clear some vars
+		$error = array();
+		$success = array();
+
+		$curr_season = curr_season();
+		// Grab current season
+		if (!$season)
+		{
+			$season = $curr_season;
+		}
+
+		// Grab basic data for select season
+		if ($season)
+		{
+			$sql = 'SELECT 
+					DISTINCT s.*
+				FROM ' .  FOOTB_SEASONS . ' AS s
+				LEFT JOIN ' . FOOTB_LEAGUES . ' AS l ON (l.season = s.season)
+				WHERE l.league_type = 2
+				ORDER BY s.season DESC';
+			$result = $db->sql_query($sql);
+
+			$season_options = '';
+			while ($row = $db->sql_fetchrow($result))
+			{
+				$selected = ($season && $row['season'] == $season) ? ' selected="selected"' : '';
+				$season_options .= '<option value="' . $row['season'] . '"' . $selected . '>' . $row['season_name_short'] . '</option>';
+				if ($selected <> '')
+				{
+					$season_name = $row['season_name_short'];
+				}
+			}
+			$db->sql_freeresult($result);
+		}
+		else
+		{
+			trigger_error($user->lang['NO_SEASON'] . adm_back_link($this->u_action), E_USER_WARNING);
+		}
+
+		// Grab basic data for select league
+		$sql = 'SELECT *
+			FROM ' . FOOTB_LEAGUES . '
+			WHERE season = ' . $season . ' 
+				AND league_type = ' . LEAGUE_KO . '
+			ORDER BY league ASC';
+		$result = $db->sql_query($sql);
+
+		$league_options = '';
+		if ($move_league == 0)
+		{
+			$league_move_options = '<option value="0" selected="selected">' . sprintf($user->lang['CHOOSE_LEAGUE']) . '</option>';
+		}
+		else
+		{
+			$league_move_options = '<option value="0">' . sprintf($user->lang['CHOOSE_LEAGUE']) . '</option>';
+		}
+		while ($row = $db->sql_fetchrow($result))
+		{
+			// Grab current league
+			if (!$league)
+			{
+				$league = $row['league'];
+			}
+			$selected = ($league && $row['league'] == $league) ? ' selected="selected"' : '';
+			$league_options .= '<option value="' . $row['league'] . '"' . $selected . '>' . $row['league_name'] . '</option>';
+			if ($selected <> '')
+			{
+				$league_matchdays = $row['matchdays'];
+				$matches_matchday = $row['matches_on_matchday'];
+				$league_name 	  = $row['league_name'];
+			}
+			else
+			{
+				$selected_move = ($move_league && $row['league'] == $move_league) ? ' selected="selected"' : '';
+				$league_move_options .= '<option value="' . $row['league'] . '"' . $selected_move . '>' . $row['league_name'] . '</option>';
+			}
+		}
+		$db->sql_freeresult($result);
+		
+		if (!$league)
+		{
+			trigger_error(sprintf($user->lang['NO_LEAGUE'], $season) . adm_back_link($this->u_action . "&amp;s=$season"), E_USER_WARNING);
+		}
+
+		// Grab basic data for select matchday
+		if (!$matchday_from)
+		{
+			$matchday_from = curr_matchday($season, $league);
+			if ($matchday_from > 1)
+			{
+				$matchday_from = $matchday_from - 1;
+			}
+		}
+		if (!$matchday_to)
+		{
+			$matchday_to = $matchday_from;
+		}
+		if (!$matchday_new)
+		{
+			$matchday_new = $matchday_to + 1;
+		}
+		
+		$sql = 'SELECT *
+			FROM ' . FOOTB_MATCHDAYS . "
+			WHERE season = $season 
+				AND league = $league 
+			ORDER BY matchday ASC";
+		$result = $db->sql_query($sql);
+
+		$matchday_from_options = '';
+		$matchday_to_options = '';
+		$matchday_new_options = '';
+		while ($row = $db->sql_fetchrow($result))
+		{
+			$selected_from 		= ($matchday_from && $row['matchday'] == $matchday_from) ? ' selected="selected"' : '';
+			$selected_to 		= ($matchday_to && $row['matchday'] == $matchday_to) ? ' selected="selected"' : '';
+			$selected_new 		= ($matchday_new && $row['matchday'] == $matchday_new) ? ' selected="selected"' : '';
+			$day_name 			= (strlen($row['matchday_name']) > 0) ? $row['matchday_name'] : $row['matchday'] . '. ' . sprintf($user->lang['MATCHDAY']);
+			$matchday_from_options .= '<option value="' . $row['matchday'] . '"' . $selected_from . '>' . $day_name . '</option>';
+			$matchday_to_options .= '<option value="' . $row['matchday'] . '"' . $selected_to . '>' . $day_name . '</option>';
+			$matchday_new_options .= '<option value="' . $row['matchday'] . '"' . $selected_new . '>' . $day_name . '</option>';
+		}
+		$db->sql_freeresult($result);
+		if ($matchday_from_options == '')
+		{
+			trigger_error(sprintf($user->lang['NO_MATCHDAY'], $league_name, $season) . adm_back_link($this->u_action . "&amp;s=$season&amp;l=$league"), E_USER_WARNING);
+		}
+	
+		// Which page?
+		switch ($action)
+		{
+			case 'update':
+				{
+					if ($matchday_from > $matchday_to) 
+					{
+						$error[] =  sprintf($user->lang['ERROR_FROM_TO']);
+					}
+					if ($matchday_new <= $matchday_to) 
+					{
+						$error[] =  sprintf($user->lang['ERROR_TARGET']);
+					}
+					if (!sizeof($error))
+					{
+						if (1 == $check_rank)
+						{
+							$success = ko_group_next_round($season, $league, $matchday_from, $matchday_to, $matchday_new, $rank, $move_rank, $move_league, $move_matchday);
+						}
+						else
+						{
+							$success = ko_next_round($season, $league, $matchday_from, $matchday_to, $matchday_new);
+						}
+						trigger_error($success . adm_back_link($this->u_action));
+					}
+				}
+			break;
+		}
+
+		$template->assign_vars(array(
+			'U_ACTION'				=> $this->u_action,
+			'U_FOOTBALL' 			=> $helper->route('football_main_controller',array('side' => 'bet', 's' => $season, 'l' => $league)),
+			'S_ERROR'				=> (sizeof($error)) ? true : false,
+			'ERROR_MSG'				=> (sizeof($error)) ? implode('<br />', $error) : '',
+			'S_SUCCESS'				=> (sizeof($success)) ? true : false,
+			'SUCCESS_MSG'			=> (sizeof($success)) ? implode('<br />', $success) : '',
+			'S_SEASON_OPTIONS'		=> $season_options,
+			'S_LEAGUE_OPTIONS'		=> $league_options,
+			'S_SEASON'				=> $season,
+			'S_LEAGUE'				=> $league,
+			'S_MATCHDAY_FROM_OPTIONS'=> $matchday_from_options,
+			'S_MATCHDAY_TO_OPTIONS'	=> $matchday_to_options,
+			'S_MATCHDAY_NEW_OPTIONS'=> $matchday_new_options,
+			'S_CHECK_RANK' 			=> $check_rank,
+			'S_RANK' 				=> $rank,
+			'S_MOVE_RANK' 			=> $move_rank,
+			'S_MOVE_LEAGUE_OPTIONS'	=> $league_move_options,
+			'S_MOVE_MATCHDAY' 		=> $move_matchday,
+			'S_VERSION_NO'			=> $this->config['football_version'],
+			)
+		);
+	}
+}
 ?>

acp/seasons_module.php

@@ -1,396 +1,394 @@
-<?php
-/**
-*
-* @package phpBB Extension - Football Football
-* @copyright (c) 2016 football (http://football.bplaced.net)
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
-*
-*/
-
-namespace football\football\acp;
-
-class seasons_module
-{
-	public $u_action;
-
-	protected $db, $user, $template, $config, $phpbb_root_path, $phpbb_admin_path, $phpEx;
-	protected $root_path, $request, $php_ext, $log;
-
-
-	public function __construct()
-	{
-		global $db, $user, $request, $template;
-		global $config, $phpbb_root_path, $phpbb_admin_path, $phpEx;
-
-		$user->add_lang_ext('football/football', 'football');
-		$user->add_lang_ext('football/football', 'info_acp_seasons');
-
-		$this->root_path = $phpbb_root_path . 'ext/football/football/';
-
-		$this->config = $config;
-		$this->request = $request;
-		$this->phpbb_root_path = $phpbb_root_path;
-		$this->phpbb_admin_path = $phpbb_admin_path;
-		$this->php_ext = $phpEx;
-
-		if(!function_exists('season_info'))
-		{
-			include($this->root_path . 'includes/functions.' . $this->php_ext);
-		}
-		if (!defined('FOOTB_SEASONS'))
-		{
-			include($this->root_path . 'includes/constants.' . $this->php_ext);
-		}
-	}
-	
-	function main($id, $mode)
-	{
-		global $db, $auth, $phpbb_container, $phpbb_admin_path, $league_info;
-		global $template, $user, $config, $phpbb_extension_manager, $request, $phpbb_root_path, $phpEx;
-		$provider			= new \phpbb\controller\ provider();
-		$symphony_request	= new \phpbb\ symfony_request($request);
-		$filesystem			= new \phpbb\ filesystem();
-		$helper				= new \phpbb\controller\ helper($template, $user, $config, $provider, $phpbb_extension_manager, $symphony_request, $request, $filesystem, $phpbb_root_path, $phpEx);
-
-		$this->tpl_name = 'acp_football_seasons';
-		$this->page_title = 'ACP_FOOTBALL_SEASONS_MANAGE';
-
-		$form_key = 'acp_football_seasons';
-		add_form_key($form_key);
-
-		include($phpbb_root_path . 'includes/functions_user.' . $phpEx);
-
-		// Check and set some common vars
-		$action		= (isset($_POST['add'])) ? 'add' : $this->request->variable('action', '');
-		$season		= $this->request->variable('s', 0);
-		$edit		= $this->request->variable('edit', 0);
-		$update		= (isset($_POST['update'])) ? true : false;
-
-		// Clear some vars
-		$season_row = array();
-		$error = array();
-
-		// Grab basic data for season, if season is set and exists
-		if ($season)
-		{
-			$sql = 'SELECT *
-				FROM ' . FOOTB_SEASONS . "
-				WHERE season = $season";
-			$result = $db->sql_query($sql);
-			$season_row = $db->sql_fetchrow($result);
-			$db->sql_freeresult($result);
-		}
-
-		// Which page?
-		switch ($action)
-		{
-			case 'delete':
-				if (!$season)
-				{
-					trigger_error($user->lang['NO_SEASON'] . adm_back_link($this->u_action), E_USER_WARNING);
-				}
-
-				if (confirm_box(true))
-				{
-					$error = '';
-					if (!$auth->acl_get('a_football_delete'))
-					{
-						trigger_error($user->lang['NO_AUTH_OPERATION'] . adm_back_link($this->u_action), E_USER_WARNING);
-					}
-					if ($user->data['user_type'] != USER_FOUNDER && $this->config['football_founder_delete'])
-					{
-						trigger_error($user->lang['SEASONS_NO_DELETE'] . adm_back_link($this->u_action), E_USER_WARNING);
-					}
-					// Delete season
-					$sql = 'DELETE FROM ' . FOOTB_SEASONS . "
-						WHERE season = $season";
-					$db->sql_query($sql);
-
-					// Delete leagues
-					$sql = 'DELETE FROM ' . FOOTB_LEAGUES . "
-						WHERE season = $season";
-					$db->sql_query($sql);
-
-					// Delete matchdays
-					$sql = 'DELETE FROM ' . FOOTB_MATCHDAYS . "
-						WHERE season = $season";
-					$db->sql_query($sql);
-
-					// Delete matches
-					$sql = 'DELETE FROM ' . FOOTB_MATCHES . "
-						WHERE season = $season";
-					$db->sql_query($sql);
-
-					// Delete teams
-					$sql = 'DELETE FROM ' . FOOTB_TEAMS . "
-						WHERE season = $season";
-					$db->sql_query($sql);
-
-					// Delete ranks
-					$sql = 'DELETE FROM ' . FOOTB_RANKS . "
-						WHERE season = $season";
-					$db->sql_query($sql);
-
-					// Delete bets
-					$sql = 'DELETE FROM ' . FOOTB_BETS . "
-						WHERE season = $season";
-					$db->sql_query($sql);
-
-					trigger_error($user->lang['SEASON_DELETED'] . adm_back_link($this->u_action));
-				}
-				else
-				{
-					confirm_box(false, sprintf($user->lang['SEASON_CONFIRM_DELETE'], $season), build_hidden_fields(array(
-						's'			=> $season,
-						'mode'		=> $mode,
-						'action'	=> $action))
-					);
-				}
-			break;
-
-			case 'add':
-				if ($season >= 1963 AND $season <= 2099)
-				{
-					if ($season_row)
-					{
-						if ($edit)
-						{
-							$error[] =  $user->lang['SEASON_TAKEN'];
-						}
-						else
-						{
-							trigger_error($user->lang['SEASON_TAKEN'] . adm_back_link($this->u_action), E_USER_WARNING);
-						}
-					}
-					$season_row['season_name'] = utf8_normalize_nfc($this->request->variable('season_name', '', true));
-					if ($season_row['season_name'] <> '')
-					{
-						$sql = 'SELECT 
-								season_name
-							FROM ' . FOOTB_SEASONS . "
-							WHERE season_name = '" . $season_row['season_name'] . "'";
-						$result = $db->sql_query($sql);
-						$row = $db->sql_fetchrow($result);
-						$db->sql_freeresult($result);
-
-						if ($row)
-						{
-							$error[] =  $user->lang['SEASON_NAME_TAKEN'];
-						}
-					}
-					else
-					{
-						$intseason = ((int) $season) - 1;
-						$season_row['season_name'] = $user->lang['SEASON'] . ' ' . $intseason . '/' . $season;
-					}
-
-					$season_row['season_name_short'] = utf8_normalize_nfc($this->request->variable('season_short', '', true));
-					if ($season_row['season_name_short'] <> '')
-					{
-						$sql = 'SELECT 
-								season_name_short
-							FROM ' . FOOTB_SEASONS . "
-							WHERE season_name_short = '" . $season_row['season_name_short'] . "'";
-						$result = $db->sql_query($sql);
-						$row = $db->sql_fetchrow($result);
-						$db->sql_freeresult($result);
-
-						if ($row)
-						{
-							$error[] =  $user->lang['SEASON_SHORT_TAKEN'];
-						}
-					}
-					else
-					{
-						$intseason = ((int) $season) - 1;
-						$season_row['season_name_short'] = $intseason . '/' . $season;
-					}
-				}
-				else 
-				{
-					trigger_error($user->lang['SEASON_NUMBER'] . adm_back_link($this->u_action), E_USER_WARNING);
-				}
-				// No break for edit add
-			case 'edit':
-				$data = array();
-
-				if (!sizeof($error))
-				{
-					if ($action == 'edit' && !$season)
-					{
-						trigger_error($user->lang['NO_SEASON'] . adm_back_link($this->u_action), E_USER_WARNING);
-					}
-
-					// Did we submit?
-					if ($update)
-					{
-						if (!check_form_key($form_key))
-						{
-							trigger_error($user->lang['FORM_INVALID'] . adm_back_link($this->u_action), E_USER_WARNING);
-							return;
-						}
-
-						$season_row['season_name'] = utf8_normalize_nfc($this->request->variable('season_name', '', true));
-						if ($season_row['season_name'] <> '')
-						{
-							$sql = 'SELECT 
-									season
-								FROM ' . FOOTB_SEASONS . "
-								WHERE season_name = '" . $season_row['season_name'] . "'";
-							$result = $db->sql_query($sql);
-							$row = $db->sql_fetchrow($result);
-							$db->sql_freeresult($result);
-
-							if ($row)
-							{
-								if ($row['season'] <> $season)
-								{
-									$error[] =  $user->lang['SEASON_NAME_TAKEN'];
-								}
-							}
-						}
-						else
-						{
-							$error[] =  $user->lang['SEASON_NAME_EMPTY'];
-						}
-
-						$season_row['season_name_short'] = utf8_normalize_nfc($this->request->variable('season_short', '', true));
-						if ($season_row['season_name_short'] <> '')
-						{
-							$sql = 'SELECT 
-									season
-								FROM ' . FOOTB_SEASONS . "
-								WHERE season_name_short = '" . $season_row['season_name_short'] . "'";
-							$result = $db->sql_query($sql);
-							$row = $db->sql_fetchrow($result);
-							$db->sql_freeresult($result);
-
-							if ($row)
-							{
-								if ($row['season'] <> $season)
-								{
-									$error[] =  $user->lang['SEASON_SHORT_TAKEN'];
-								}
-							}
-						}
-						else
-						{
-							$error[] =  $user->lang['SEASON_SHORT_EMPTY'];
-						}
-						if (!sizeof($error))
-						{
-							$sql_ary = array(
-								'season'			=> (int) $season,
-								'season_name'		=> $season_row['season_name'],
-								'season_name_short'	=> $season_row['season_name_short'],
-							);
-
-							$data['season']			= $season;
-							$data['season_name']	= $this->request->variable('season_name', '');
-							$data['season_short']	= $this->request->variable('season_short', '');
-							
-							$var_ary = array(
-								'season'		=> array('num', false, 1963, 2099),
-								'season_name'	=> array('string', false, 4, 20),
-								'season_short'	=> array('string', false, 2, 10),
-							);
-							if (!($error_vals = validate_data($data, $var_ary)))
-							{
-								if ($action == 'add')
-								{
-									$sql = 'INSERT INTO ' . FOOTB_SEASONS . ' ' . $db->sql_build_array('INSERT', $sql_ary);
-									$db->sql_query($sql);
-								}
-								else
-								{
-									$sql = 'UPDATE ' . FOOTB_SEASONS . '
-										SET ' . $db->sql_build_array('UPDATE', $sql_ary) . "
-										WHERE season = $season";
-									$db->sql_query($sql);
-								}
-								$message = ($action == 'edit') ? 'SEASON_UPDATED' : 'SEASON_CREATED';
-								trigger_error($user->lang[$message] . adm_back_link($this->u_action));
-							}
-							else
-							{
-								foreach ($error_vals as $error_val)
-								{
-										$error_msg[] = $user->lang[$error_val];
-								}
-								$message = ($action == 'edit') ? 'SEASON_UPDATE_FAILED' : 'SEASON_CREATE_FAILED';
-								$error[] =  $user->lang[$message];
-								$error = array_merge($error, $error_msg);
-							}
-						}
-					}
-				}
-
-				$u_back = $this->u_action;
-
-				$template->assign_vars(array(
-					'S_EDIT'			=> true,
-					'S_ADD_SEASON'		=> ($action == 'add') ? true : false,
-					'S_ERROR'			=> (sizeof($error)) ? true : false,
-					'ERROR_MSG'			=> (sizeof($error)) ? implode('<br />', $error) : '',
-					'SEASON'			=> $season,
-					'SEASON_NAME'		=> $season_row['season_name'],
-					'SEASON_SHORT'		=> $season_row['season_name_short'],
-					'U_BACK'			=> $u_back,
-					'U_ACTION'			=> "{$this->u_action}&amp;action=$action&amp;s=$season",
-					)
-				);
-				return;
-			break;
-		}
-
-		$template->assign_vars(array(
-			'U_ACTION'		=> $this->u_action,
-			'U_FOOTBALL' 				=> $helper->route('football_main_controller',array('side' => 'bet')),
-			'S_SEASON_ADD'	=> true,
-			) 
-		);
-		
-		// Get us all the seasons
-		$sql = 'SELECT 
-				s.season, 
-				s.season_name, 
-				s.season_name_short, 
-				COUNT(l.league) AS leagues
-			FROM ' . FOOTB_SEASONS . ' s
-			LEFT JOIN ' . FOOTB_LEAGUES . ' l on l.season = s.season
-			GROUP BY season
-			ORDER BY season DESC';
-		$result = $db->sql_query($sql);
-		$rows_seasons = $db->sql_fetchrowset($result);
-		$db->sql_freeresult($result);
-
-		// Check if the user is allowed to delete a season.
-		if ($user->data['user_type'] != USER_FOUNDER && $this->config['football_founder_delete'])
-		{
-			$allow_delete = false;
-		}
-		else
-		{
-			$allow_delete = true;
-		}
-
-		$row_number = 0;
-		foreach ($rows_seasons as $row_season)
-		{
-			$row_number++;
-			$row_class = (!($row_number % 2)) ? 'bg1 row_light' : 'bg2 row_dark';
-			$template->assign_block_vars('seasons', array(
-				'ROW_CLASS'		=> $row_class,
-				'SEASON'		=> $row_season['season'],
-				'SEASON_NAME'	=> $row_season['season_name'],
-				'SEASON_SHORT'	=> $row_season['season_name_short'],
-				'LEAGUES'		=> $row_season['leagues'],
-				'U_EDIT'		=> "{$this->u_action}&amp;action=edit&amp;s=" .$row_season['season'],
-				'U_DELETE'		=> ($allow_delete) ? "{$this->u_action}&amp;action=delete&amp;s=" . $row_season['season'] : '',
-				)
-			);
-		}
-	}
-}
-
+<?php
+/**
+*
+* @package phpBB Extension - Football Football
+* @copyright (c) 2016 football (http://football.bplaced.net)
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+namespace football\football\acp;
+
+class seasons_module
+{
+	public $u_action;
+
+	protected $db, $user, $template, $config, $phpbb_root_path, $phpbb_admin_path, $phpEx;
+	protected $root_path, $request, $php_ext, $log;
+
+
+	public function __construct()
+	{
+		global $db, $user, $request, $template;
+		global $config, $phpbb_root_path, $phpbb_admin_path, $phpEx;
+
+		$user->add_lang_ext('football/football', 'football');
+		$user->add_lang_ext('football/football', 'info_acp_seasons');
+
+		$this->root_path = $phpbb_root_path . 'ext/football/football/';
+
+		$this->config = $config;
+		$this->request = $request;
+		$this->phpbb_root_path = $phpbb_root_path;
+		$this->phpbb_admin_path = $phpbb_admin_path;
+		$this->php_ext = $phpEx;
+
+		if(!function_exists('season_info'))
+		{
+			include($this->root_path . 'includes/functions.' . $this->php_ext);
+		}
+		if (!defined('FOOTB_SEASONS'))
+		{
+			include($this->root_path . 'includes/constants.' . $this->php_ext);
+		}
+	}
+	
+	function main($id, $mode)
+	{
+		global $db, $auth, $phpbb_container, $phpbb_admin_path, $league_info;
+		global $template, $user, $config, $phpbb_extension_manager, $request, $phpbb_root_path, $phpEx;
+		
+		$helper = $phpbb_container->get('controller.helper');
+		
+		$this->tpl_name = 'acp_football_seasons';
+		$this->page_title = 'ACP_FOOTBALL_SEASONS_MANAGE';
+
+		$form_key = 'acp_football_seasons';
+		add_form_key($form_key);
+
+		include($phpbb_root_path . 'includes/functions_user.' . $phpEx);
+
+		// Check and set some common vars
+		$action		= (isset($_POST['add'])) ? 'add' : $this->request->variable('action', '');
+		$season		= $this->request->variable('s', 0);
+		$edit		= $this->request->variable('edit', 0);
+		$update		= (isset($_POST['update'])) ? true : false;
+
+		// Clear some vars
+		$season_row = array();
+		$error = array();
+
+		// Grab basic data for season, if season is set and exists
+		if ($season)
+		{
+			$sql = 'SELECT *
+				FROM ' . FOOTB_SEASONS . "
+				WHERE season = $season";
+			$result = $db->sql_query($sql);
+			$season_row = $db->sql_fetchrow($result);
+			$db->sql_freeresult($result);
+		}
+
+		// Which page?
+		switch ($action)
+		{
+			case 'delete':
+				if (!$season)
+				{
+					trigger_error($user->lang['NO_SEASON'] . adm_back_link($this->u_action), E_USER_WARNING);
+				}
+
+				if (confirm_box(true))
+				{
+					$error = '';
+					if (!$auth->acl_get('a_football_delete'))
+					{
+						trigger_error($user->lang['NO_AUTH_OPERATION'] . adm_back_link($this->u_action), E_USER_WARNING);
+					}
+					if ($user->data['user_type'] != USER_FOUNDER && $this->config['football_founder_delete'])
+					{
+						trigger_error($user->lang['SEASONS_NO_DELETE'] . adm_back_link($this->u_action), E_USER_WARNING);
+					}
+					// Delete season
+					$sql = 'DELETE FROM ' . FOOTB_SEASONS . "
+						WHERE season = $season";
+					$db->sql_query($sql);
+
+					// Delete leagues
+					$sql = 'DELETE FROM ' . FOOTB_LEAGUES . "
+						WHERE season = $season";
+					$db->sql_query($sql);
+
+					// Delete matchdays
+					$sql = 'DELETE FROM ' . FOOTB_MATCHDAYS . "
+						WHERE season = $season";
+					$db->sql_query($sql);
+
+					// Delete matches
+					$sql = 'DELETE FROM ' . FOOTB_MATCHES . "
+						WHERE season = $season";
+					$db->sql_query($sql);
+
+					// Delete teams
+					$sql = 'DELETE FROM ' . FOOTB_TEAMS . "
+						WHERE season = $season";
+					$db->sql_query($sql);
+
+					// Delete ranks
+					$sql = 'DELETE FROM ' . FOOTB_RANKS . "
+						WHERE season = $season";
+					$db->sql_query($sql);
+
+					// Delete bets
+					$sql = 'DELETE FROM ' . FOOTB_BETS . "
+						WHERE season = $season";
+					$db->sql_query($sql);
+
+					trigger_error($user->lang['SEASON_DELETED'] . adm_back_link($this->u_action));
+				}
+				else
+				{
+					confirm_box(false, sprintf($user->lang['SEASON_CONFIRM_DELETE'], $season), build_hidden_fields(array(
+						's'			=> $season,
+						'mode'		=> $mode,
+						'action'	=> $action))
+					);
+				}
+			break;
+
+			case 'add':
+				if ($season >= 1963 AND $season <= 2099)
+				{
+					if ($season_row)
+					{
+						if ($edit)
+						{
+							$error[] =  $user->lang['SEASON_TAKEN'];
+						}
+						else
+						{
+							trigger_error($user->lang['SEASON_TAKEN'] . adm_back_link($this->u_action), E_USER_WARNING);
+						}
+					}
+					$season_row['season_name'] = utf8_normalize_nfc($this->request->variable('season_name', '', true));
+					if ($season_row['season_name'] <> '')
+					{
+						$sql = 'SELECT 
+								season_name
+							FROM ' . FOOTB_SEASONS . "
+							WHERE season_name = '" . $season_row['season_name'] . "'";
+						$result = $db->sql_query($sql);
+						$row = $db->sql_fetchrow($result);
+						$db->sql_freeresult($result);
+
+						if ($row)
+						{
+							$error[] =  $user->lang['SEASON_NAME_TAKEN'];
+						}
+					}
+					else
+					{
+						$intseason = ((int) $season) - 1;
+						$season_row['season_name'] = $user->lang['SEASON'] . ' ' . $intseason . '/' . $season;
+					}
+
+					$season_row['season_name_short'] = utf8_normalize_nfc($this->request->variable('season_short', '', true));
+					if ($season_row['season_name_short'] <> '')
+					{
+						$sql = 'SELECT 
+								season_name_short
+							FROM ' . FOOTB_SEASONS . "
+							WHERE season_name_short = '" . $season_row['season_name_short'] . "'";
+						$result = $db->sql_query($sql);
+						$row = $db->sql_fetchrow($result);
+						$db->sql_freeresult($result);
+
+						if ($row)
+						{
+							$error[] =  $user->lang['SEASON_SHORT_TAKEN'];
+						}
+					}
+					else
+					{
+						$intseason = ((int) $season) - 1;
+						$season_row['season_name_short'] = $intseason . '/' . $season;
+					}
+				}
+				else 
+				{
+					trigger_error($user->lang['SEASON_NUMBER'] . adm_back_link($this->u_action), E_USER_WARNING);
+				}
+				// No break for edit add
+			case 'edit':
+				$data = array();
+
+				if (!sizeof($error))
+				{
+					if ($action == 'edit' && !$season)
+					{
+						trigger_error($user->lang['NO_SEASON'] . adm_back_link($this->u_action), E_USER_WARNING);
+					}
+
+					// Did we submit?
+					if ($update)
+					{
+						if (!check_form_key($form_key))
+						{
+							trigger_error($user->lang['FORM_INVALID'] . adm_back_link($this->u_action), E_USER_WARNING);
+							return;
+						}
+
+						$season_row['season_name'] = utf8_normalize_nfc($this->request->variable('season_name', '', true));
+						if ($season_row['season_name'] <> '')
+						{
+							$sql = 'SELECT 
+									season
+								FROM ' . FOOTB_SEASONS . "
+								WHERE season_name = '" . $season_row['season_name'] . "'";
+							$result = $db->sql_query($sql);
+							$row = $db->sql_fetchrow($result);
+							$db->sql_freeresult($result);
+
+							if ($row)
+							{
+								if ($row['season'] <> $season)
+								{
+									$error[] =  $user->lang['SEASON_NAME_TAKEN'];
+								}
+							}
+						}
+						else
+						{
+							$error[] =  $user->lang['SEASON_NAME_EMPTY'];
+						}
+
+						$season_row['season_name_short'] = utf8_normalize_nfc($this->request->variable('season_short', '', true));
+						if ($season_row['season_name_short'] <> '')
+						{
+							$sql = 'SELECT 
+									season
+								FROM ' . FOOTB_SEASONS . "
+								WHERE season_name_short = '" . $season_row['season_name_short'] . "'";
+							$result = $db->sql_query($sql);
+							$row = $db->sql_fetchrow($result);
+							$db->sql_freeresult($result);
+
+							if ($row)
+							{
+								if ($row['season'] <> $season)
+								{
+									$error[] =  $user->lang['SEASON_SHORT_TAKEN'];
+								}
+							}
+						}
+						else
+						{
+							$error[] =  $user->lang['SEASON_SHORT_EMPTY'];
+						}
+						if (!sizeof($error))
+						{
+							$sql_ary = array(
+								'season'			=> (int) $season,
+								'season_name'		=> $season_row['season_name'],
+								'season_name_short'	=> $season_row['season_name_short'],
+							);
+
+							$data['season']			= $season;
+							$data['season_name']	= $this->request->variable('season_name', '');
+							$data['season_short']	= $this->request->variable('season_short', '');
+							
+							$var_ary = array(
+								'season'		=> array('num', false, 1963, 2099),
+								'season_name'	=> array('string', false, 4, 20),
+								'season_short'	=> array('string', false, 2, 10),
+							);
+							if (!($error_vals = validate_data($data, $var_ary)))
+							{
+								if ($action == 'add')
+								{
+									$sql = 'INSERT INTO ' . FOOTB_SEASONS . ' ' . $db->sql_build_array('INSERT', $sql_ary);
+									$db->sql_query($sql);
+								}
+								else
+								{
+									$sql = 'UPDATE ' . FOOTB_SEASONS . '
+										SET ' . $db->sql_build_array('UPDATE', $sql_ary) . "
+										WHERE season = $season";
+									$db->sql_query($sql);
+								}
+								$message = ($action == 'edit') ? 'SEASON_UPDATED' : 'SEASON_CREATED';
+								trigger_error($user->lang[$message] . adm_back_link($this->u_action));
+							}
+							else
+							{
+								foreach ($error_vals as $error_val)
+								{
+										$error_msg[] = $user->lang[$error_val];
+								}
+								$message = ($action == 'edit') ? 'SEASON_UPDATE_FAILED' : 'SEASON_CREATE_FAILED';
+								$error[] =  $user->lang[$message];
+								$error = array_merge($error, $error_msg);
+							}
+						}
+					}
+				}
+
+				$u_back = $this->u_action;
+
+				$template->assign_vars(array(
+					'S_EDIT'			=> true,
+					'S_ADD_SEASON'		=> ($action == 'add') ? true : false,
+					'S_ERROR'			=> (sizeof($error)) ? true : false,
+					'ERROR_MSG'			=> (sizeof($error)) ? implode('<br />', $error) : '',
+					'SEASON'			=> $season,
+					'SEASON_NAME'		=> $season_row['season_name'],
+					'SEASON_SHORT'		=> $season_row['season_name_short'],
+					'U_BACK'			=> $u_back,
+					'U_ACTION'			=> "{$this->u_action}&amp;action=$action&amp;s=$season",
+					)
+				);
+				return;
+			break;
+		}
+
+		$template->assign_vars(array(
+			'U_ACTION'		=> $this->u_action,
+			'U_FOOTBALL' 				=> $helper->route('football_main_controller',array('side' => 'bet')),
+			'S_SEASON_ADD'	=> true,
+			) 
+		);
+		
+		// Get us all the seasons
+		$sql = 'SELECT 
+				s.season, 
+				s.season_name, 
+				s.season_name_short, 
+				COUNT(l.league) AS leagues
+			FROM ' . FOOTB_SEASONS . ' s
+			LEFT JOIN ' . FOOTB_LEAGUES . ' l on l.season = s.season
+			GROUP BY season
+			ORDER BY season DESC';
+		$result = $db->sql_query($sql);
+		$rows_seasons = $db->sql_fetchrowset($result);
+		$db->sql_freeresult($result);
+
+		// Check if the user is allowed to delete a season.
+		if ($user->data['user_type'] != USER_FOUNDER && $this->config['football_founder_delete'])
+		{
+			$allow_delete = false;
+		}
+		else
+		{
+			$allow_delete = true;
+		}
+
+		$row_number = 0;
+		foreach ($rows_seasons as $row_season)
+		{
+			$row_number++;
+			$row_class = (!($row_number % 2)) ? 'bg1 row_light' : 'bg2 row_dark';
+			$template->assign_block_vars('seasons', array(
+				'ROW_CLASS'		=> $row_class,
+				'SEASON'		=> $row_season['season'],
+				'SEASON_NAME'	=> $row_season['season_name'],
+				'SEASON_SHORT'	=> $row_season['season_name_short'],
+				'LEAGUES'		=> $row_season['leagues'],
+				'U_EDIT'		=> "{$this->u_action}&amp;action=edit&amp;s=" .$row_season['season'],
+				'U_DELETE'		=> ($allow_delete) ? "{$this->u_action}&amp;action=delete&amp;s=" . $row_season['season'] : '',
+				)
+			);
+		}
+	}
+}
+
 ?>

block/all_bets.php

@@ -78,7 +78,6 @@ else
 		$splits = 1;
 	}
 }
-$db->sql_freeresult($result);
 
 // Make sure $start is set to the last page if it exceeds the amount
 if ($start < 0 || $start >= $total_users)
@@ -183,7 +182,7 @@ foreach ($matches AS $match)
 					$total = 0;
 				}	
 				$bet_index++;
-				$total += $user_bet['points'];
+				$total += ($user_bet['points'] == '') ? 0 : $user_bet['points'];
 				if ($user_bet['status'] < 3)
 				{
 					$colorstyle_total = ' color_provisionally';
@@ -306,7 +305,7 @@ if ($count_matches > 0)
 			$total = 0;
 		}	
 		$bet_index++;
-		$total += $user_bet['points'];
+		$total += ($user_bet['points'] == '') ? 0 : $user_bet['points'];
 		if ($user_bet['status'] < 3)
 		{
 			$colorstyle_total = ' color_provisionally';
@@ -479,19 +478,14 @@ while ($row = $db->sql_fetchrow($result))
 			)
 		);
 	}
+	$db->sql_freeresult($result_bet);
 }
-
+$db->sql_freeresult($result);
 
 $sidename = sprintf($user->lang['ALL_BETS']);
 $template->assign_vars(array(
 	'S_DISPLAY_ALL_BETS' 		=> true,
 	'S_SIDENAME' 				=> $sidename,
-	'U_LEFT' 					=> $this->helper->route('football_main_controller', array('side' => 'bet', 's' => $season, 'l' => $league, 'm' => $matchday)),
-	'LEFT_LINK' 				=> '&lt; ' . sprintf($user->lang['BET']),
-	'U_RIGHT' 					=> $this->helper->route('football_main_controller', array('side' => 'results', 's' => $season, 'l' => $league, 'm' => $matchday)),
-	'RIGHT_LINK' 				=> sprintf($user->lang['RESULTS']) . ' &gt;',
-	'LEFT_TITLE' 				=> sprintf($user->lang['TITLE_BET']),
-	'RIGHT_TITLE' 				=> sprintf($user->lang['TITLE_RESULTS']),
 	'S_MATCHES_ON_MATCHDAY' 	=> $matches_on_matchday,
 	'S_SPALTEN' 				=> ($count_matches * 2) + 2,
 	'PAGE_NUMBER' 				=> $pagination->on_page($total_users, $this->config['football_users_per_page'], $start),

block/bank.php

@@ -1,235 +1,229 @@
-<?php
-/**
-*
-* @package phpBB Extension - Football Football
-* @copyright (c) 2016 football (http://football.bplaced.net)
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
-*
-*/
-
-// Check Prediction League authorisation 
-if ( !$this->auth->acl_get('u_use_football') )
-{
-	trigger_error('NO_AUTH_VIEW');
-
-}
-
-global $phpbb_extension_manager;
-if ($phpbb_extension_manager->is_enabled('dmzx/ultimatepoints'))
-{
-	$this->user->add_lang_ext('dmzx/ultimatepoints', 'common');
-	// Get an instance of the ultimatepoints functions_points
-	$functions_points = $phpbb_container->get('dmzx.ultimatepoints.core.functions.points');
-}
-else
-{
-	// Get an instance of the football functions_points
-	$functions_points = $phpbb_container->get('football.football.core.functions.points');
-}
-
-if (!$user_sel)
-{
-	if (user_is_member($user->data['user_id'], $season, $league) or $league == 0)
-	{
-		$user_sel =  $user->data['user_id'];
-	}
-}
-
-$username = '';
-$member = true;
-if ($this->auth->acl_get('a_football_points'))
-{
-	$where_user = '';
-	$multi_view = true;
-}
-else
-{
-	$multi_view = false;
-	if (user_is_member($user->data['user_id'], $season, $league))
-	{
-		$where_user = ' AND b.user_id = ' . $user->data['user_id'] . ' ';
-		$user_sel =  $user->data['user_id'];
-	}
-	else
-	{
-		if ($league)
-		{
-			$member = false;
-		}
-	}
-}
-$where_league = '';
-if ($league)
-{
-	$where_league = " AND b.league = $league";
-}
-
-$data = false;
-// Select user 
-$total_users = 0;
-$sql = 'SELECT DISTINCT
-		u.user_id,
-		u.username
-	FROM ' . FOOTB_BETS . ' AS b
-	LEFT JOIN ' . USERS_TABLE . " AS u ON (u.user_id = b.user_id)
-	WHERE season = $season 
-		$where_league
-		$where_user
-	ORDER BY LOWER(u.username) ASC";
-	
-$result = $db->sql_query($sql);
-
-while($row = $db->sql_fetchrow($result))
-{
-	$total_users++;
-	if ($user_sel == $row['user_id'] OR !$user_sel)
-	{
-		$selectid = ' selected="selected"';
-		$username = $row['username'];
-		$user_sel = $row['user_id'];
-	}
-	else
-	{
-		$selectid = '';
-	}
-	$template->assign_block_vars('form_user', array(
-		'S_USER' 		=> $row['user_id'],
-		'S_USERNAME' 	=> $row['username'],
-		'S_SELECTEDID' 	=> $selectid,
-		)
-	);
-}
-$db->sql_freeresult($result);
-		
-$where_season = '';
-if ($season)
-{
-	$where_season = " AND fp.season = $season";
-}
-
-$where_league = '';
-$order_by = 'ORDER BY fp.points_type ASC, fp.matchday ASC, fp.league ASC';
-
-if ($league)
-{
-	$where_league = " AND fp.league = $league";
-	$order_by = 'ORDER BY fp.league ASC, fp.matchday ASC, fp.points_type ASC';
-}
-
-// The different book types
-$types	=	array(
-	0			=>	'--',
-	1			=>	sprintf($user->lang['FOOTBALL_BET_POINTS']),
-	2			=>	$user->lang['FOOTBALL_DEPOSIT'],
-	3			=>	sprintf($user->lang['FOOTBALL_WIN']),
-	4			=>	$user->lang['FOOTBALL_WIN'],
-	5			=>	$user->lang['FOOTBALL_WIN'],
-	6			=>	$user->lang['FOOTBALL_WIN'],
-	7			=>	$user->lang['FOOTBALL_PAYOUT'],
-);
-
-// Grab the football points
-$sql = 'SELECT fp.season,
-			s.season_name, 
-			s.season_name_short,
-			fp.league,
-			l.league_name,
-			l.league_name_short,
-			fp.matchday,
-			md.matchday_name,
-			fp.points_type,
-			fp.points,
-			fp.points_comment,
-			fp.cash
-		FROM ' . FOOTB_POINTS . ' AS fp
-		INNER JOIN ' . FOOTB_SEASONS . ' AS s ON (s.season = fp.season)
-		INNER JOIN ' . FOOTB_LEAGUES . ' AS l ON (l.season = fp.season AND l.league = fp.league)
-		INNER JOIN ' . FOOTB_MATCHDAYS . ' AS md ON (md.season = fp.season AND md.league = fp.league AND md.matchday = fp.matchday)
-		WHERE user_id = ' . (int) $user_sel . "
-		$where_season
-		$where_league 
-		$order_by";
-$result = $db->sql_query($sql);
-
-$current_balance = 0.00;
-$count = 0;
-// Start looping all the football points
-while ($row = $db->sql_fetchrow($result))
-{
-	$count = $count + 1;
-	if ($row['points_type'] == POINTS_BET OR $row['points_type'] == POINTS_PAID)
-	{
-		$points_sign = '-';
-		$points_style = " color: red;";
-		$current_balance -= $row['points'];
-	}
-	else
-	{
-		$points_sign = '+';
-		$points_style = " color: green;";
-		$current_balance += $row['points'];
-	}
-	// Add the items to the template
-	$template->assign_block_vars('football', array(
-		'SEASON'		=>	$season,
-		'SEASON_NAME'	=>	$season_name,
-		'LEAGUE'		=>	$row['league'],
-		'LEAGUE_NAME'	=>	$row['league_name'],
-		'LEAGUE_SHORT'	=>	$row['league_name_short'],
-		'MATCHDAY'		=>	$row['matchday'],
-		'MATCHDAY_NAME'	=>	($row['matchday_name'] == '') ? $row['matchday'] . '.' . sprintf($user->lang['FOOTBALL_MATCHDAY']) : $row['matchday_name'],
-		'MATCHDAY_SHORT'=>	$row['matchday'] . '.' . sprintf($user->lang['MATCHDAY_SHORT']),
-		'POINTS_SIGN'	=>	$points_sign,
-		'POINTS_STYLE'	=>	$points_style,
-		'POINTS_TYPE'	=>	$types[$row['points_type']],
-		'S_CASH'		=>	$row['cash'],
-		'POINTS'		=>	$functions_points->number_format_points($row['points']),
-		'COMMENT'		=>	nl2br($row['points_comment']),
-	));
-}
-$db->sql_freeresult($result);
-
-if ($current_balance < 0)
-{
-	$points_style = " color: red;";
-}
-else
-{
-	$points_style = " color: green;";
-}
-
-$template->assign_block_vars('football', array(
-	'SEASON'		=>	$season,
-	'SEASON_NAME'	=>	'',
-	'LEAGUE'		=>	$league,
-	'LEAGUE_NAME'	=>	'',
-	'MATCHDAY'		=>	'',
-	'MATCHDAY_NAME'	=>	'',
-	'POINTS_SIGN'	=>	'',
-	'POINTS_STYLE'	=>	$points_style,
-	'POINTS_TYPE'	=>	'',
-	'S_CASH'		=>	1,
-	'POINTS'		=>	$functions_points->number_format_points($current_balance),
-	'COMMENT'		=>	($league == 0) ? sprintf($user->lang['FOOTBALL_BALANCES']) : sprintf($user->lang['FOOTBALL_BALANCE']),
-));
-
-$sidename = sprintf($user->lang['FOOTBALL_BANK']);
-$template->assign_vars(array(
-	'S_DISPLAY_BANK' 			=> true,
-	'S_MATCHDAY_HIDE' 			=> true,
-	'S_MEMBER' 					=> $member,
-	'S_SIDENAME' 				=> $sidename,
-	'S_MULTI_VIEW' 				=> $multi_view,
-	'L_TOTAL_ENTRIES'			=> ($count == 1) ? $count . ' ' .sprintf($user->lang['FOOTBALL_RECORD']) : $count . ' ' .sprintf($user->lang['FOOTBALL_RECORDS']),
-	'U_LEFT' 					=> $this->helper->route('football_main_controller', array('side' => 'ranks_total', 's' => $season, 'l' => $league, 'm' => $matchday)),
-	'LEFT_LINK' 				=> '&lt; ' . sprintf($user->lang['RANK_TOTAL']),
-	'U_RIGHT' 					=> $this->helper->route('football_main_controller', array('side' => 'my_bets', 's' => $season, 'l' => $league, 'm' => $matchday)),
-	'RIGHT_LINK' 				=> sprintf($user->lang['MY_BETS']) . ' &gt;',
-	'LEFT_TITLE' 				=> sprintf($user->lang['TITLE_RANK_TOTAL']),
-	'RIGHT_TITLE' 				=> sprintf($user->lang['TITLE_MY_BETS']),
-	'USERNAME' 					=> $username,
-	'POINTS'					=> $config['football_win_name'],	
-	)
-);
-
+<?php
+/**
+*
+* @package phpBB Extension - Football Football
+* @copyright (c) 2016 football (http://football.bplaced.net)
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+// Check Prediction League authorisation 
+if ( !$this->auth->acl_get('u_use_football') )
+{
+	trigger_error('NO_AUTH_VIEW');
+
+}
+
+global $phpbb_extension_manager;
+if ($phpbb_extension_manager->is_enabled('dmzx/ultimatepoints'))
+{
+	$this->user->add_lang_ext('dmzx/ultimatepoints', 'common');
+	// Get an instance of the ultimatepoints functions_points
+	$functions_points = $phpbb_container->get('dmzx.ultimatepoints.core.functions.points');
+}
+else
+{
+	// Get an instance of the football functions_points
+	$functions_points = $phpbb_container->get('football.football.core.functions.points');
+}
+
+if (!$user_sel)
+{
+	if (user_is_member($user->data['user_id'], $season, $league) or $league == 0)
+	{
+		$user_sel =  $user->data['user_id'];
+	}
+}
+
+$username = '';
+$member = true;
+if ($this->auth->acl_get('a_football_points'))
+{
+	$where_user = '';
+	$multi_view = true;
+}
+else
+{
+	$multi_view = false;
+	if (user_is_member($user->data['user_id'], $season, $league))
+	{
+		$where_user = ' AND b.user_id = ' . $user->data['user_id'] . ' ';
+		$user_sel =  $user->data['user_id'];
+	}
+	else
+	{
+		if ($league)
+		{
+			$member = false;
+		}
+	}
+}
+$where_league = '';
+if ($league)
+{
+	$where_league = " AND b.league = $league";
+}
+
+$data = false;
+// Select user 
+$total_users = 0;
+$sql = 'SELECT DISTINCT
+		u.user_id,
+		u.username
+	FROM ' . FOOTB_BETS . ' AS b
+	LEFT JOIN ' . USERS_TABLE . " AS u ON (u.user_id = b.user_id)
+	WHERE season = $season 
+		$where_league
+		$where_user
+	ORDER BY LOWER(u.username) ASC";
+	
+$result = $db->sql_query($sql);
+
+while($row = $db->sql_fetchrow($result))
+{
+	$total_users++;
+	if ($user_sel == $row['user_id'] OR !$user_sel)
+	{
+		$selectid = ' selected="selected"';
+		$username = $row['username'];
+		$user_sel = $row['user_id'];
+	}
+	else
+	{
+		$selectid = '';
+	}
+	$template->assign_block_vars('form_user', array(
+		'S_USER' 		=> $row['user_id'],
+		'S_USERNAME' 	=> $row['username'],
+		'S_SELECTEDID' 	=> $selectid,
+		)
+	);
+}
+$db->sql_freeresult($result);
+		
+$where_season = '';
+if ($season)
+{
+	$where_season = " AND fp.season = $season";
+}
+
+$where_league = '';
+$order_by = 'ORDER BY fp.points_type ASC, fp.matchday ASC, fp.league ASC';
+
+if ($league)
+{
+	$where_league = " AND fp.league = $league";
+	$order_by = 'ORDER BY fp.league ASC, fp.matchday ASC, fp.points_type ASC';
+}
+
+// The different book types
+$types	=	array(
+	0			=>	'--',
+	1			=>	sprintf($user->lang['FOOTBALL_BET_POINTS']),
+	2			=>	$user->lang['FOOTBALL_DEPOSIT'],
+	3			=>	sprintf($user->lang['FOOTBALL_WIN']),
+	4			=>	$user->lang['FOOTBALL_WIN'],
+	5			=>	$user->lang['FOOTBALL_WIN'],
+	6			=>	$user->lang['FOOTBALL_WIN'],
+	7			=>	$user->lang['FOOTBALL_PAYOUT'],
+);
+
+// Grab the football points
+$sql = 'SELECT fp.season,
+			s.season_name, 
+			s.season_name_short,
+			fp.league,
+			l.league_name,
+			l.league_name_short,
+			fp.matchday,
+			md.matchday_name,
+			fp.points_type,
+			fp.points,
+			fp.points_comment,
+			fp.cash
+		FROM ' . FOOTB_POINTS . ' AS fp
+		INNER JOIN ' . FOOTB_SEASONS . ' AS s ON (s.season = fp.season)
+		INNER JOIN ' . FOOTB_LEAGUES . ' AS l ON (l.season = fp.season AND l.league = fp.league)
+		INNER JOIN ' . FOOTB_MATCHDAYS . ' AS md ON (md.season = fp.season AND md.league = fp.league AND md.matchday = fp.matchday)
+		WHERE user_id = ' . (int) $user_sel . "
+		$where_season
+		$where_league 
+		$order_by";
+$result = $db->sql_query($sql);
+
+$current_balance = 0.00;
+$count = 0;
+// Start looping all the football points
+while ($row = $db->sql_fetchrow($result))
+{
+	$count = $count + 1;
+	if ($row['points_type'] == POINTS_BET OR $row['points_type'] == POINTS_PAID)
+	{
+		$points_sign = '-';
+		$points_style = " color: red;";
+		$current_balance -= $row['points'];
+	}
+	else
+	{
+		$points_sign = '+';
+		$points_style = " color: green;";
+		$current_balance += $row['points'];
+	}
+	// Add the items to the template
+	$template->assign_block_vars('football', array(
+		'SEASON'		=>	$season,
+		'SEASON_NAME'	=>	$season_name,
+		'LEAGUE'		=>	$row['league'],
+		'LEAGUE_NAME'	=>	$row['league_name'],
+		'LEAGUE_SHORT'	=>	$row['league_name_short'],
+		'MATCHDAY'		=>	$row['matchday'],
+		'MATCHDAY_NAME'	=>	($row['matchday_name'] == '') ? $row['matchday'] . '.' . sprintf($user->lang['FOOTBALL_MATCHDAY']) : $row['matchday_name'],
+		'MATCHDAY_SHORT'=>	$row['matchday'] . '.' . sprintf($user->lang['MATCHDAY_SHORT']),
+		'POINTS_SIGN'	=>	$points_sign,
+		'POINTS_STYLE'	=>	$points_style,
+		'POINTS_TYPE'	=>	$types[$row['points_type']],
+		'S_CASH'		=>	$row['cash'],
+		'POINTS'		=>	$functions_points->number_format_points($row['points']),
+		'COMMENT'		=>	nl2br($row['points_comment']),
+	));
+}
+$db->sql_freeresult($result);
+
+if ($current_balance < 0)
+{
+	$points_style = " color: red;";
+}
+else
+{
+	$points_style = " color: green;";
+}
+
+$template->assign_block_vars('football', array(
+	'SEASON'		=>	$season,
+	'SEASON_NAME'	=>	'',
+	'LEAGUE'		=>	$league,
+	'LEAGUE_NAME'	=>	'',
+	'MATCHDAY'		=>	'',
+	'MATCHDAY_NAME'	=>	'',
+	'POINTS_SIGN'	=>	'',
+	'POINTS_STYLE'	=>	$points_style,
+	'POINTS_TYPE'	=>	'',
+	'S_CASH'		=>	1,
+	'POINTS'		=>	$functions_points->number_format_points($current_balance),
+	'COMMENT'		=>	($league == 0) ? sprintf($user->lang['FOOTBALL_BALANCES']) : sprintf($user->lang['FOOTBALL_BALANCE']),
+));
+
+$sidename = sprintf($user->lang['FOOTBALL_BANK']);
+$template->assign_vars(array(
+	'S_DISPLAY_BANK' 			=> true,
+	'S_MATCHDAY_HIDE' 			=> true,
+	'S_MEMBER' 					=> $member,
+	'S_SIDENAME' 				=> $sidename,
+	'S_MULTI_VIEW' 				=> $multi_view,
+	'L_TOTAL_ENTRIES'			=> ($count == 1) ? $count . ' ' .sprintf($user->lang['FOOTBALL_RECORD']) : $count . ' ' .sprintf($user->lang['FOOTBALL_RECORDS']),
+	'USERNAME' 					=> $username,
+	'POINTS'					=> $config['football_win_name'],	
+	)
+);
+
 ?>

block/bet_popup.php

@@ -1,391 +1,392 @@
-<?php
-/**
-*
-* @package phpBB Extension - Football Football
-* @copyright (c) 2016 football (http://football.bplaced.net)
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
-*
-*/
-
-// Can this user view Prediction Leagues pages?
-if (!$config['football_guest_view'])
-{
-	if ($user->data['user_id'] == ANONYMOUS)
-	{
-		trigger_error('NO_GUEST_VIEW');
-	}
-}
-if (!$config['football_user_view'])
-{
-	// Only Prediction League member should see this page
-	// Check Prediction League authorisation 
-	if ( !$this->auth->acl_get('u_use_football') )
-	{
-		trigger_error('NO_AUTH_VIEW');
-	}
-}
-
-// Football disabled?
-if ($config['football_disable'])
-{
-	$message = (!empty($config['football_disable_msg'])) ? $config['football_disable_msg'] : 'FOOTBALL_DISABLED';
-	trigger_error($message);
-}
-
-$userid		= $this->request->variable('u', 0);
-$season		= $this->request->variable('s', 0);
-$league		= $this->request->variable('l', 0);
-$matchday	= $this->request->variable('m', 0);
-
-$error_message = '';
-$username = '?';
-if (!$userid OR !$season OR !$league OR !$matchday)
-{
-	$data_bet = false;
-	if (!$userid)
-	{	
-		$error_message .= sprintf($user->lang['NO_USERID']) . '<br />';
-	}
-	if (!$season)
-	{	
-		$error_message .= sprintf($user->lang['NO_SEASON']) . '<br />';
-	}
-	if (!$league)
-	{	
-		$error_message .= sprintf($user->lang['NO_LEAGUE']) . '<br />';
-	}
-	if (!$matchday)
-	{	
-		$error_message .= sprintf($user->lang['NO_MATCHDAY']) . '<br />';
-	}
-}
-else
-{
-	$season_info = season_info($season);
-	if (sizeof($season_info))
-	{
-		$league_info = league_info($season, $league);
-		if (sizeof($league_info))
-		{
-			// Get username
-			$sql = 'SELECT username
-				FROM ' . USERS_TABLE . " 
-				WHERE user_id = $userid ";
-			$result = $db->sql_query($sql);
-			if ($row = $db->sql_fetchrow($result))
-			{
-				$username = $row['username'];
-			}
-			else
-			{
-				$data_bet = false;
-				$error_message .= sprintf($user->lang['NO_USERID']) . '<br />';
-			}
-			$db->sql_freeresult($result);
-			
-			$display_group = false;
-			$lang_dates = $user->lang['datetime'];
-			// Required for select_points function:
-			$league_info = league_info($season, $league);
-
-			// Calculate matches and bets of matchday
-			$sql = "SELECT
-					m.league,
-					m.match_no,
-					m.matchday,
-					m.status,
-					m.group_id,
-					m.formula_home,
-					m.formula_guest,
-					t1.team_symbol AS home_symbol,
-					t2.team_symbol AS guest_symbol,
-					t1.team_id AS home_id,
-					t2.team_id AS guest_id,
-					t1.team_name AS home_name,
-					t2.team_name AS guest_name,
-					b.goals_home AS bet_home,
-					b.goals_guest AS bet_guest,
-					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,
-					" . select_points() . "
-				FROM  " . FOOTB_MATCHES . ' AS m
-				INNER JOIN ' . FOOTB_BETS . " AS b ON (b.season = m.season AND b.league = m.league AND b.match_no = m.match_no AND b.user_id = $userid)
-				LEFT JOIN " . FOOTB_TEAMS . ' AS t1 ON (t1.season = m.season AND t1.league = m.league AND t1.team_id = m.team_id_home)
-				LEFT JOIN ' . FOOTB_TEAMS . " AS t2 ON (t2.season = m.season AND t2.league = m.league AND t2.team_id = m.team_id_guest)
-				WHERE m.season = $season 
-					AND m.league = $league 
-					AND m.matchday = $matchday
-				GROUP BY m.match_no
-				ORDER BY m.match_datetime ASC, m.match_no ASC";
-				
-			$result = $db->sql_query($sql);
-			if ($row = $db->sql_fetchrow($result))
-			{
-				$data_bet = 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;
-					if (0 == $row['home_id'])
-					{
-						$home_info = get_team($season, $league, $row['match_no'], 'team_id_home', $row['formula_home']);
-						$home_in_array = explode("#",$home_info);
-						$homelogo = $home_in_array[0];
-						$homeid = $home_in_array[1];
-						$homename = $home_in_array[2];
-					}
-					else
-					{
-						$homelogo = $row['home_symbol'];
-						$homeid = $row['home_id'];
-						$homename = $row['home_name'];
-					}
-					if (0 == $row['guest_id'])
-					{
-						$guest_info = get_team($season, $league, $row['match_no'], 'team_id_guest', $row['formula_guest']);
-						$guest_in_array = explode("#",$guest_info);
-						$guestlogo = $guest_in_array[0];
-						$guestid = $guest_in_array[1];
-						$guestname = $guest_in_array[2];
-					}
-					else
-					{
-						$guestlogo = $row['guest_symbol'];
-						$guestid = $row['guest_id'];
-						$guestname = $row['guest_name'];
-					}
-					if ($homelogo <> '')
-					{
-						$logoH = "<img src=\"" . $ext_path . 'images/flags/' . $homelogo . "\" alt=\"" . $homelogo . "\" width=\"28\" height=\"28\"/>" ;
-					}
-					else
-					{
-						$logoH = "<img src=\"" . $ext_path . "images/flags/blank.gif\" alt=\"\" width=\"28\" height=\"28\"/>" ;
-					}
-					if ($guestlogo <> '')
-					{
-						$logoG = "<img src=\"" . $ext_path . 'images/flags/' . $guestlogo . "\" alt=\"" . $guestlogo . "\" width=\"28\" height=\"28\"/>" ;
-					}
-					else
-					{
-						$logoG = "<img src=\"" . $ext_path . "images/flags/blank.gif\" alt=\"\" width=\"28\" height=\"28\"/>" ;
-					}
-
-					if ($row['group_id'] == '')
-					{
-						$group_id = '&nbsp;';
-					}
-					else
-					{
-						$display_group = true;
-						$group_id = $row['group_id'];
-					}
-					
-
-					if ($row['status'] < 1 && !$config['football_view_bets'])
-					{
-						// hide bets
-						$bet_home = ($row['bet_home'] == '') ? '&nbsp;' : '?';
-						$bet_guest = ($row['bet_guest'] == '') ? '&nbsp;' : '?';
-					}
-					else
-					{
-						$bet_home = ($row['bet_home'] == '') ? '&nbsp;' : $row['bet_home'];
-						$bet_guest = ($row['bet_guest'] == '') ? '&nbsp;' : $row['bet_guest'];
-					}
-
-					$colorstyle = color_style($row['status']);
-					$template->assign_block_vars('bet_view', array(
-						'ROW_CLASS' 	=> $row_class,
-						'LEAGUE_ID' 	=> $row['league'],
-						'MATCH_NUMBER' 	=> $row['match_no'],
-						'MATCHDAY' 		=> $row['matchday'],
-						'STATUS' 		=> $row['status'],
-						'MATCH_TIME' 	=> $row['match_time'],
-						'GROUP' 		=> $group_id,
-						'HOME_ID' 		=> $homeid,
-						'GUEST_ID' 		=> $guestid,
-						'LOGO_HOME' 	=> $logoH,
-						'LOGO_GUEST' 	=> $logoG,
-						'HOME_NAME' 	=> $homename,
-						'GUEST_NAME' 	=> $guestname,
-						'BET_HOME' 		=> $bet_home,
-						'BET_GUEST' 	=> $bet_guest,
-						'GOALS_HOME' 	=> ($row['goals_home'] == '') ? '&nbsp;' : $row['goals_home'],
-						'GOALS_GUEST'	=> ($row['goals_guest'] == '') ? '&nbsp;' : $row['goals_guest'],
-						'POINTS' 		=> ($row['points'] == '') ? '&nbsp;' : $row['points'],
-						'COLOR_STYLE' 	=> $colorstyle,
-						)
-					);
-				}
-				while ($row = $db->sql_fetchrow($result));
-				$db->sql_freeresult($result);
-			}
-			else
-			{
-				$data_bet = false;
-				$error_message .= sprintf($user->lang['NO_BETS']) . '<br />';
-			}
-		}
-		else
-		{
-			$data_bet = false;
-			$error_message .= sprintf($user->lang['NO_LEAGUE']) . '<br />';
-		}
-	}
-	else
-	{
-		$data_bet = false;
-		$error_message .= sprintf($user->lang['NO_SEASON']) . '<br />';
-	}
-}
-
-// Calculate extra bets of matchday
-$sql = "SELECT e.*,
-		eb.bet,
-		eb.bet_points,
-		t1.team_name AS result_team,
-		t2.team_name AS bet_team
-	FROM  " . FOOTB_EXTRA . ' AS e
-	LEFT JOIN ' . FOOTB_EXTRA_BETS . " AS eb ON (eb.season = e.season AND eb.league = e.league AND eb.extra_no = e.extra_no AND eb.user_id = $userid)
-	LEFT JOIN " . FOOTB_TEAMS . ' AS t1 ON (t1.season = e.season AND t1.league = e.league AND t1.team_id = e.result)
-	LEFT JOIN ' . FOOTB_TEAMS . " AS t2 ON (t2.season = e.season AND t2.league = e.league AND t2.team_id = eb.bet)
-	WHERE e.season = $season 
-		AND e.league = $league 
-		AND e.matchday = $matchday
-	ORDER BY e.extra_no ASC";
-	
-$result = $db->sql_query($sql);
-
-$extra_bet = false;
-$extranumber = 0;
-
-while ($row = $db->sql_fetchrow($result))
-{
-	$extra_bet = true;
-	$extranumber++ ;
-	$row_class = (!($extranumber % 2)) ? 'bg1 row_light' : 'bg2 row_dark';
-
-	if ($row['extra_status'] < 1 && !$config['football_view_bets'])
-	{
-		// hide bets
-		$bet = ($row['bet'] == '') ? '&nbsp;' : '?';
-		$bet_team = ($row['bet_team'] == NULL) ? '&nbsp;' : '?';
-	}
-	else
-	{
-		$bet = ($row['bet'] == '') ? '&nbsp;' : $row['bet'];
-		$bet_team = ($row['bet_team'] == NULL) ? '&nbsp;' : $row['bet_team'];
-	}
-	$extra_colorstyle = color_style($row['extra_status']);
-
-	switch($row['question_type'])
-	{
-		case '1':
-			{
-				$display_type = 1;
-				$eval_title = sprintf($user->lang['EXTRA_HIT']);
-			}
-			break;
-		case '2':
-			{
-				$display_type = 1;
-				$eval_title = sprintf($user->lang['EXTRA_MULTI_HIT']);
-			}
-			break;
-		case '3':
-			{
-				$display_type = 2;
-				$eval_title = sprintf($user->lang['EXTRA_HIT']);
-			}
-			break;
-		case '4':
-			{
-				$display_type = 2;
-				$eval_title = sprintf($user->lang['EXTRA_DIFFERENCE']);
-			}
-			break;
-		case '5':
-			{
-				$display_type = 2;
-				$eval_title = sprintf($user->lang['EXTRA_MULTI_HIT']);
-			}
-			break;
-		default :
-			{
-				$display_type = 2;
-				$eval_title = '';
-			}
-			break;
-	}
-	
-	$template->assign_block_vars('extra_view', array(
-		'ROW_CLASS' 	=> $row_class,
-		'QUESTION' 		=> $row['question'],
-		'EXTRA_POINTS' 	=> $row['extra_points'],
-		'EVALUATION' 	=> ($row['matchday'] == $row['matchday_eval']) ? sprintf($user->lang['MATCHDAY']) : sprintf($user->lang['TOTAL']),
-		'EVALUATION_TITLE' 	=> $eval_title,
-		'RESULT' 		=> ($display_type == 1) ? $row['result_team'] : $row['result'],
-		'BET' 			=> ($display_type == 1) ? $bet_team : $bet,
-		'BET_POINTS' 	=> $row['bet_points'],
-		'COLOR_STYLE' 	=> $extra_colorstyle,
-		)
-	);
-}
-
-$sidename = sprintf($user->lang['BET']);
-if ($data_bet)
-{
-	$template->assign_vars(array(
-		'S_SIDENAME' 				=> $sidename,
-		'S_USER_NAME'	 			=> $username,
-		'S_ERROR_MESSAGE'			=> $error_message,
-		'S_FROM'	 				=> sprintf($user->lang['FROM_DAY_SEASON'], $matchday, $season),
-		'S_FOOTBALL_COPY' 			=> sprintf($user->lang['FOOTBALL_COPY'], $config['football_version'], $phpbb_root_path . 'football/'),
-		'S_DATA_BET' 				=> $data_bet,
-		'S_DISPLAY_GROUP'			=> $display_group,
-		'S_EXTRA_BET' 				=> $extra_bet,
-		)
-	);
-
-	// output page
-	page_header(sprintf($user->lang['BETS_OF']) . ' ' . $username);
-}
-else
-{
-	$template->assign_vars(array(
-		'S_SIDENAME' 				=> $sidename,
-		'S_USER_NAME'	 			=> '',
-		'S_ERROR_MESSAGE'			=> $error_message,
-		'S_FROM'	 				=> '',
-		'S_FOOTBALL_COPY' 			=> sprintf($user->lang['FOOTBALL_COPY'], $config['football_version'], $phpbb_root_path . 'football/'),
-		'S_DATA_BET' 				=> $data_bet,
-		'S_DISPLAY_GROUP'			=> false,
-		)
-	);
-
-	// output page
-	page_header(sprintf($user->lang['BETS_OF']));
-}
-
-$template->set_filenames(array(
-	'body' => 'bet_popup.html')
-);
-
-page_footer();
+<?php
+/**
+*
+* @package phpBB Extension - Football Football
+* @copyright (c) 2016 football (http://football.bplaced.net)
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+// Can this user view Prediction Leagues pages?
+if (!$config['football_guest_view'])
+{
+	if ($user->data['user_id'] == ANONYMOUS)
+	{
+		trigger_error('NO_GUEST_VIEW');
+	}
+}
+if (!$config['football_user_view'])
+{
+	// Only Prediction League member should see this page
+	// Check Prediction League authorisation 
+	if ( !$this->auth->acl_get('u_use_football') )
+	{
+		trigger_error('NO_AUTH_VIEW');
+	}
+}
+
+// Football disabled?
+if ($config['football_disable'])
+{
+	$message = (!empty($config['football_disable_msg'])) ? $config['football_disable_msg'] : 'FOOTBALL_DISABLED';
+	trigger_error($message);
+}
+
+$userid		= $this->request->variable('u', 0);
+$season		= $this->request->variable('s', 0);
+$league		= $this->request->variable('l', 0);
+$matchday	= $this->request->variable('m', 0);
+
+$error_message = '';
+$username = '?';
+if (!$userid OR !$season OR !$league OR !$matchday)
+{
+	$data_bet = false;
+	if (!$userid)
+	{	
+		$error_message .= sprintf($user->lang['NO_USERID']) . '<br />';
+	}
+	if (!$season)
+	{	
+		$error_message .= sprintf($user->lang['NO_SEASON']) . '<br />';
+	}
+	if (!$league)
+	{	
+		$error_message .= sprintf($user->lang['NO_LEAGUE']) . '<br />';
+	}
+	if (!$matchday)
+	{	
+		$error_message .= sprintf($user->lang['NO_MATCHDAY']) . '<br />';
+	}
+}
+else
+{
+	$season_info = season_info($season);
+	if (sizeof($season_info))
+	{
+		$league_info = league_info($season, $league);
+		if (sizeof($league_info))
+		{
+			// Get username
+			$sql = 'SELECT username
+				FROM ' . USERS_TABLE . " 
+				WHERE user_id = $userid ";
+			$result = $db->sql_query($sql);
+			if ($row = $db->sql_fetchrow($result))
+			{
+				$username = $row['username'];
+			}
+			else
+			{
+				$data_bet = false;
+				$error_message .= sprintf($user->lang['NO_USERID']) . '<br />';
+			}
+			$db->sql_freeresult($result);
+			
+			$display_group = false;
+			$lang_dates = $user->lang['datetime'];
+			// Required for select_points function:
+			$league_info = league_info($season, $league);
+
+			// Calculate matches and bets of matchday
+			$sql = "SELECT
+					m.league,
+					m.match_no,
+					m.matchday,
+					m.status,
+					m.group_id,
+					m.formula_home,
+					m.formula_guest,
+					t1.team_symbol AS home_symbol,
+					t2.team_symbol AS guest_symbol,
+					t1.team_id AS home_id,
+					t2.team_id AS guest_id,
+					t1.team_name AS home_name,
+					t2.team_name AS guest_name,
+					b.goals_home AS bet_home,
+					b.goals_guest AS bet_guest,
+					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,
+					" . select_points() . "
+				FROM  " . FOOTB_MATCHES . ' AS m
+				INNER JOIN ' . FOOTB_BETS . " AS b ON (b.season = m.season AND b.league = m.league AND b.match_no = m.match_no AND b.user_id = $userid)
+				LEFT JOIN " . FOOTB_TEAMS . ' AS t1 ON (t1.season = m.season AND t1.league = m.league AND t1.team_id = m.team_id_home)
+				LEFT JOIN ' . FOOTB_TEAMS . " AS t2 ON (t2.season = m.season AND t2.league = m.league AND t2.team_id = m.team_id_guest)
+				WHERE m.season = $season 
+					AND m.league = $league 
+					AND m.matchday = $matchday
+				GROUP BY m.match_no
+				ORDER BY m.match_datetime ASC, m.match_no ASC";
+				
+			$result = $db->sql_query($sql);
+			if ($row = $db->sql_fetchrow($result))
+			{
+				$data_bet = 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;
+					if (0 == $row['home_id'])
+					{
+						$home_info = get_team($season, $league, $row['match_no'], 'team_id_home', $row['formula_home']);
+						$home_in_array = explode("#",$home_info);
+						$homelogo = $home_in_array[0];
+						$homeid = $home_in_array[1];
+						$homename = $home_in_array[2];
+					}
+					else
+					{
+						$homelogo = $row['home_symbol'];
+						$homeid = $row['home_id'];
+						$homename = $row['home_name'];
+					}
+					if (0 == $row['guest_id'])
+					{
+						$guest_info = get_team($season, $league, $row['match_no'], 'team_id_guest', $row['formula_guest']);
+						$guest_in_array = explode("#",$guest_info);
+						$guestlogo = $guest_in_array[0];
+						$guestid = $guest_in_array[1];
+						$guestname = $guest_in_array[2];
+					}
+					else
+					{
+						$guestlogo = $row['guest_symbol'];
+						$guestid = $row['guest_id'];
+						$guestname = $row['guest_name'];
+					}
+					if ($homelogo <> '')
+					{
+						$logoH = "<img src=\"" . $ext_path . 'images/flags/' . $homelogo . "\" alt=\"" . $homelogo . "\" width=\"28\" height=\"28\"/>" ;
+					}
+					else
+					{
+						$logoH = "<img src=\"" . $ext_path . "images/flags/blank.gif\" alt=\"\" width=\"28\" height=\"28\"/>" ;
+					}
+					if ($guestlogo <> '')
+					{
+						$logoG = "<img src=\"" . $ext_path . 'images/flags/' . $guestlogo . "\" alt=\"" . $guestlogo . "\" width=\"28\" height=\"28\"/>" ;
+					}
+					else
+					{
+						$logoG = "<img src=\"" . $ext_path . "images/flags/blank.gif\" alt=\"\" width=\"28\" height=\"28\"/>" ;
+					}
+
+					if ($row['group_id'] == '')
+					{
+						$group_id = '&nbsp;';
+					}
+					else
+					{
+						$display_group = true;
+						$group_id = $row['group_id'];
+					}
+					
+
+					if ($row['status'] < 1 && !$config['football_view_bets'])
+					{
+						// hide bets
+						$bet_home = ($row['bet_home'] == '') ? '&nbsp;' : '?';
+						$bet_guest = ($row['bet_guest'] == '') ? '&nbsp;' : '?';
+					}
+					else
+					{
+						$bet_home = ($row['bet_home'] == '') ? '&nbsp;' : $row['bet_home'];
+						$bet_guest = ($row['bet_guest'] == '') ? '&nbsp;' : $row['bet_guest'];
+					}
+
+					$colorstyle = color_style($row['status']);
+					$template->assign_block_vars('bet_view', array(
+						'ROW_CLASS' 	=> $row_class,
+						'LEAGUE_ID' 	=> $row['league'],
+						'MATCH_NUMBER' 	=> $row['match_no'],
+						'MATCHDAY' 		=> $row['matchday'],
+						'STATUS' 		=> $row['status'],
+						'MATCH_TIME' 	=> $row['match_time'],
+						'GROUP' 		=> $group_id,
+						'HOME_ID' 		=> $homeid,
+						'GUEST_ID' 		=> $guestid,
+						'LOGO_HOME' 	=> $logoH,
+						'LOGO_GUEST' 	=> $logoG,
+						'HOME_NAME' 	=> $homename,
+						'GUEST_NAME' 	=> $guestname,
+						'BET_HOME' 		=> $bet_home,
+						'BET_GUEST' 	=> $bet_guest,
+						'GOALS_HOME' 	=> ($row['goals_home'] == '') ? '&nbsp;' : $row['goals_home'],
+						'GOALS_GUEST'	=> ($row['goals_guest'] == '') ? '&nbsp;' : $row['goals_guest'],
+						'POINTS' 		=> ($row['points'] == '') ? '&nbsp;' : $row['points'],
+						'COLOR_STYLE' 	=> $colorstyle,
+						)
+					);
+				}
+				while ($row = $db->sql_fetchrow($result));
+				$db->sql_freeresult($result);
+			}
+			else
+			{
+				$data_bet = false;
+				$error_message .= sprintf($user->lang['NO_BETS']) . '<br />';
+			}
+		}
+		else
+		{
+			$data_bet = false;
+			$error_message .= sprintf($user->lang['NO_LEAGUE']) . '<br />';
+		}
+	}
+	else
+	{
+		$data_bet = false;
+		$error_message .= sprintf($user->lang['NO_SEASON']) . '<br />';
+	}
+}
+
+// Calculate extra bets of matchday
+$sql = "SELECT e.*,
+		eb.bet,
+		eb.bet_points,
+		t1.team_name AS result_team,
+		t2.team_name AS bet_team
+	FROM  " . FOOTB_EXTRA . ' AS e
+	LEFT JOIN ' . FOOTB_EXTRA_BETS . " AS eb ON (eb.season = e.season AND eb.league = e.league AND eb.extra_no = e.extra_no AND eb.user_id = $userid)
+	LEFT JOIN " . FOOTB_TEAMS . ' AS t1 ON (t1.season = e.season AND t1.league = e.league AND t1.team_id = e.result)
+	LEFT JOIN ' . FOOTB_TEAMS . " AS t2 ON (t2.season = e.season AND t2.league = e.league AND t2.team_id = eb.bet)
+	WHERE e.season = $season 
+		AND e.league = $league 
+		AND e.matchday = $matchday
+	ORDER BY e.extra_no ASC";
+	
+$result = $db->sql_query($sql);
+
+$extra_bet = false;
+$extranumber = 0;
+
+while ($row = $db->sql_fetchrow($result))
+{
+	$extra_bet = true;
+	$extranumber++ ;
+	$row_class = (!($extranumber % 2)) ? 'bg1 row_light' : 'bg2 row_dark';
+
+	if ($row['extra_status'] < 1 && !$config['football_view_bets'])
+	{
+		// hide bets
+		$bet = ($row['bet'] == '') ? '&nbsp;' : '?';
+		$bet_team = ($row['bet_team'] == NULL) ? '&nbsp;' : '?';
+	}
+	else
+	{
+		$bet = ($row['bet'] == '') ? '&nbsp;' : $row['bet'];
+		$bet_team = ($row['bet_team'] == NULL) ? '&nbsp;' : $row['bet_team'];
+	}
+	$extra_colorstyle = color_style($row['extra_status']);
+
+	switch($row['question_type'])
+	{
+		case '1':
+			{
+				$display_type = 1;
+				$eval_title = sprintf($user->lang['EXTRA_HIT']);
+			}
+			break;
+		case '2':
+			{
+				$display_type = 1;
+				$eval_title = sprintf($user->lang['EXTRA_MULTI_HIT']);
+			}
+			break;
+		case '3':
+			{
+				$display_type = 2;
+				$eval_title = sprintf($user->lang['EXTRA_HIT']);
+			}
+			break;
+		case '4':
+			{
+				$display_type = 2;
+				$eval_title = sprintf($user->lang['EXTRA_DIFFERENCE']);
+			}
+			break;
+		case '5':
+			{
+				$display_type = 2;
+				$eval_title = sprintf($user->lang['EXTRA_MULTI_HIT']);
+			}
+			break;
+		default :
+			{
+				$display_type = 2;
+				$eval_title = '';
+			}
+			break;
+	}
+	
+	$template->assign_block_vars('extra_view', array(
+		'ROW_CLASS' 	=> $row_class,
+		'QUESTION' 		=> $row['question'],
+		'EXTRA_POINTS' 	=> $row['extra_points'],
+		'EVALUATION' 	=> ($row['matchday'] == $row['matchday_eval']) ? sprintf($user->lang['MATCHDAY']) : sprintf($user->lang['TOTAL']),
+		'EVALUATION_TITLE' 	=> $eval_title,
+		'RESULT' 		=> ($display_type == 1) ? $row['result_team'] : $row['result'],
+		'BET' 			=> ($display_type == 1) ? $bet_team : $bet,
+		'BET_POINTS' 	=> $row['bet_points'],
+		'COLOR_STYLE' 	=> $extra_colorstyle,
+		)
+	);
+}
+$db->sql_freeresult($result);
+
+$sidename = sprintf($user->lang['BET']);
+if ($data_bet)
+{
+	$template->assign_vars(array(
+		'S_SIDENAME' 				=> $sidename,
+		'S_USER_NAME'	 			=> $username,
+		'S_ERROR_MESSAGE'			=> $error_message,
+		'S_FROM'	 				=> sprintf($user->lang['FROM_DAY_SEASON'], $matchday, $season),
+		'S_FOOTBALL_COPY' 			=> sprintf($user->lang['FOOTBALL_COPY'], $config['football_version'], $phpbb_root_path . 'football/'),
+		'S_DATA_BET' 				=> $data_bet,
+		'S_DISPLAY_GROUP'			=> $display_group,
+		'S_EXTRA_BET' 				=> $extra_bet,
+		)
+	);
+
+	// output page
+	page_header(sprintf($user->lang['BETS_OF']) . ' ' . $username);
+}
+else
+{
+	$template->assign_vars(array(
+		'S_SIDENAME' 				=> $sidename,
+		'S_USER_NAME'	 			=> '',
+		'S_ERROR_MESSAGE'			=> $error_message,
+		'S_FROM'	 				=> '',
+		'S_FOOTBALL_COPY' 			=> sprintf($user->lang['FOOTBALL_COPY'], $config['football_version'], $phpbb_root_path . 'football/'),
+		'S_DATA_BET' 				=> $data_bet,
+		'S_DISPLAY_GROUP'			=> false,
+		)
+	);
+
+	// output page
+	page_header(sprintf($user->lang['BETS_OF']));
+}
+
+$template->set_filenames(array(
+	'body' => 'bet_popup.html')
+);
+
+page_footer();
 ?>

block/delivery.php

@@ -1,193 +1,75 @@
-<?php
-/**
-*
-* @package phpBB Extension - Football Football
-* @copyright (c) 2016 football (http://football.bplaced.net)
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
-*
-*/
-
-if (!defined('IN_PHPBB') OR !defined('IN_FOOTBALL'))
-{
-	exit;
-}
-
-$data_delivery = false;
-$user_id = $user->data['user_id'];
-$lang_dates = $user->lang['datetime'];
-$index = 0;
-$local_board_time = time() + (($config['board_timezone'] - $config['football_host_timezone']) * 3600); 
-$sql = "(SELECT 
-			m.season, 
-			m.league, 
-			m.matchday,
-			l.league_name_short, 
-			CASE m.matchday_name 
-				WHEN '' 
-					THEN CONCAT(m.matchday, '." . sprintf($user->lang['MATCHDAY']) . "') 
-					ELSE m.matchday_name 
-			END AS matchday_name, 
-			CONCAT(
-				CASE DATE_FORMAT(m.delivery_date,'%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.delivery_date,' %d.%m.%y %H:%i')
-			) as delivery_time,
-			m.delivery_date AS delivery,
-			SUM(IF(((b.goals_home = '') OR (b.goals_guest = '')), 0, 1)) AS bets_count,
-			COUNT(*) AS matches_count,
-			SUM(IF(eb.extra_no > 0, IF(eb.bet = '', 0, 1), 0)) AS extra_bets_count,
-			SUM(IF(e.extra_no > 0, 1, 0)) AS extra_count
-		FROM " . FOOTB_MATCHDAYS . " AS m
-		JOIN " . FOOTB_LEAGUES . " AS l ON(l.season = m.season AND l.league = m.league AND l.bet_in_time = 0)
-		JOIN " . FOOTB_MATCHES . " AS ma ON (ma.season = m.season AND ma.league = m.league AND ma.matchday = m.matchday AND ma.status = 0)
-		JOIN " . FOOTB_BETS . " AS b ON (b.season = m.season AND b.league = m.league AND b.match_no = ma.match_no AND b.user_id = $user_id)
-		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.delivery_date > FROM_UNIXTIME('$local_board_time') 
-			AND m.status <= 0 
-		GROUP BY m.delivery_date, m.league, b.user_id
-	) 
-	UNION
-	(SELECT 
-			m.season, 
-			m.league, 
-			m.matchday,
-			l.league_name_short, 
-			CASE m.matchday_name 
-				WHEN '' 
-					THEN CONCAT(m.matchday, '." . sprintf($user->lang['MATCHDAY']) . "') 
-					ELSE m.matchday_name 
-			END AS matchday_name, 
-			CONCAT(
-				CASE DATE_FORMAT(m.delivery_date_2,'%w')
-					WHEN 0 THEN '" . $lang_dates['Sun'] . "'
-					WHEN 1 THEN '" . $lang_dates['Mon'] . "'
-					WHEN 2 THEN '" . $lang_dates['Tue'] . "'
-					WHEN 3 THEN '" . $lang_dates['Wed'] . "'
-					WHEN 4 THEN '" . $lang_dates['Thu'] . "'
-					WHEN 5 THEN '" . $lang_dates['Fri'] . "'
-					WHEN 6 THEN '" . $lang_dates['Sat'] . "'
-					ELSE 'Error' END,
-				DATE_FORMAT(m.delivery_date_2,' %d.%m.%y %H:%i')
-			) as delivery_time,
-			m.delivery_date_2 AS delivery ,
-			SUM(IF(((b.goals_home = '') OR (b.goals_guest = '')), 0, 1)) AS bets_count,
-			COUNT(*) AS matches_count,
-			0 AS extra_bets_count,
-			0 AS extra_count
-		FROM " . FOOTB_MATCHDAYS . " AS m
-		JOIN " . FOOTB_LEAGUES . " AS l ON(l.season = m.season AND l.league = m.league AND l.bet_in_time = 0)
-		JOIN " . FOOTB_MATCHES . " AS ma ON (ma.season = m.season AND ma.league = m.league AND ma.matchday = m.matchday AND ma.status = -1)
-		JOIN " . FOOTB_BETS . " AS b ON (b.season = ma.season AND b.league = ma.league AND b.match_no = ma.match_no AND b.user_id = $user_id)
-		WHERE m.delivery_date_2 > FROM_UNIXTIME('$local_board_time') 
-			AND m.status <= 0
-		GROUP BY m.delivery_date, m.league, b.user_id
-	) 
-	UNION
-	(SELECT 
-			m.season, 
-			m.league, 
-			m.matchday,
-			l.league_name_short, 
-			CASE m.matchday_name 
-				WHEN '' 
-					THEN CONCAT(m.matchday, '." . sprintf($user->lang['MATCHDAY']) . "') 
-					ELSE m.matchday_name 
-			END AS matchday_name, 
-			CONCAT(
-				CASE DATE_FORMAT(m.delivery_date_3,'%w')
-					WHEN 0 THEN '" . $lang_dates['Sun'] . "'
-					WHEN 1 THEN '" . $lang_dates['Mon'] . "'
-					WHEN 2 THEN '" . $lang_dates['Tue'] . "'
-					WHEN 3 THEN '" . $lang_dates['Wed'] . "'
-					WHEN 4 THEN '" . $lang_dates['Thu'] . "'
-					WHEN 5 THEN '" . $lang_dates['Fri'] . "'
-					WHEN 6 THEN '" . $lang_dates['Sat'] . "'
-					ELSE 'Error' END,
-				DATE_FORMAT(m.delivery_date_3,' %d.%m.%y %H:%i')
-			) as delivery_time,
-			m.delivery_date_3 AS delivery, 
-			SUM(IF(((b.goals_home = '') OR (b.goals_guest = '')), 0, 1)) AS bets_count,
-			COUNT(*) AS matches_count,
-			0 AS extra_bets_count,
-			0 AS extra_count
-		FROM " . FOOTB_MATCHDAYS . " AS m
-		JOIN " . FOOTB_LEAGUES . " AS l ON(l.season = m.season AND l.league = m.league AND l.bet_in_time = 0)
-		JOIN " . FOOTB_MATCHES . " AS ma ON (ma.season = m.season AND ma.league = m.league AND ma.matchday = m.matchday AND ma.status = -2)
-		JOIN " . FOOTB_BETS . " AS b ON (b.season = ma.season AND b.league = ma.league AND b.match_no = ma.match_no AND b.user_id = $user_id)
-		WHERE m.delivery_date_3 > FROM_UNIXTIME('$local_board_time')
-			AND m.status <= 0
-		GROUP BY m.delivery_date, m.league, b.user_id
-	) 
-	UNION
-	(SELECT 
-			m.season, 
-			m.league, 
-			m.matchday,
-			l.league_name_short, 
-			CASE m.matchday_name 
-				WHEN '' 
-					THEN CONCAT(m.matchday, '." . sprintf($user->lang['MATCHDAY']) . "') 
-					ELSE m.matchday_name 
-			END AS matchday_name, 
-			CONCAT(
-				CASE DATE_FORMAT(ma.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(ma.match_datetime,' %d.%m.%y %H:%i')
-			) as delivery_time,
-			ma.match_datetime AS delivery, 
-			SUM(IF(((b.goals_home = '') OR (b.goals_guest = '')), 0, 1)) AS bets_count,
-			COUNT(*) AS matches_count,
-			0 AS extra_bets_count,
-			0 AS extra_count
-		FROM " . FOOTB_MATCHDAYS . " AS m
-		JOIN " . FOOTB_LEAGUES . " AS l ON(l.season = m.season AND l.league = m.league AND l.bet_in_time = 1)
-		JOIN " . FOOTB_MATCHES . " AS ma ON (ma.season = m.season AND ma.league = m.league AND ma.matchday = m.matchday AND ma.status = 0)
-		JOIN " . FOOTB_BETS . " AS b ON (b.season = ma.season AND b.league = ma.league AND b.match_no = ma.match_no AND b.user_id = $user_id)
-		WHERE ma.match_datetime > FROM_UNIXTIME('$local_board_time')
-			AND m.status <= 0
-		GROUP BY ma.match_datetime, m.league, b.user_id
-	) 
-	ORDER BY delivery, league";
-	
-$result = $db->sql_query($sql);
-while($row = $db->sql_fetchrow($result) AND $index < 11)
-{
-	$index++;
-	$data_delivery = true;
-	$row_class = (!($index % 2)) ? 'bg1 row_light' : 'bg2 row_dark';
-		
-	$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'])),
-		'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',
-		'TITLE'			=> ($row['bets_count'] == $row['matches_count']) ? sprintf($user->lang['DELIVERY_READY']) : sprintf($user->lang['DELIVERY_NOT_READY']),
-		'DELIVERY' 		=> $row['delivery_time'],
-		)
-	);
-}
-$db->sql_freeresult($result);
-
-$template->assign_vars(array(
-	'S_DISPLAY_DELIVERY' 	=> $data_delivery,
-	'S_DATA_DELIVERY' 		=> $data_delivery,
-	)
-);
-
+<?php
+/**
+*
+* @package phpBB Extension - Football Football
+* @copyright (c) 2016 football (http://football.bplaced.net)
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+if (!defined('IN_PHPBB') OR !defined('IN_FOOTBALL'))
+{
+	exit;
+}
+$data_delivery = false;
+$user_id = $user->data['user_id'];
+$lang_dates = $user->lang['datetime'];
+$index = 0;
+$local_board_time = time() + ($config['football_time_shift'] * 3600); 
+$sql = "SELECT 
+			m.season, 
+			m.league, 
+			m.matchday,
+			l.league_name_short, 
+			CASE m.matchday_name 
+				WHEN '' 
+					THEN CONCAT(m.matchday, '." . sprintf($user->lang['MATCHDAY']) . "') 
+					ELSE m.matchday_name 
+			END AS matchday_name, 
+			IF(l.bet_in_time = 0, IF(ma.status = 0, m.delivery_date
+												  , IF(ma.status = -1, m.delivery_date_2
+																	 , m.delivery_date_3
+													  )
+									)
+								, ma.match_datetime) AS delivery,
+			SUM(IF(((b.goals_home = '') OR (b.goals_guest = '')), 0, 1)) AS bets_count,
+			COUNT(*) AS matches_count,
+			SUM(IF(eb.extra_no > 0, IF(eb.bet = '', 0, 1), 0)) AS extra_bets_count,
+			SUM(IF(e.extra_no > 0, 1, 0)) AS extra_count
+		FROM " . FOOTB_MATCHDAYS . " AS m
+		JOIN " . FOOTB_LEAGUES . " AS l ON(l.season = m.season AND l.league = m.league)
+		JOIN " . FOOTB_MATCHES . " AS ma ON (ma.season = m.season AND ma.league = m.league AND ma.matchday = m.matchday AND ma.status = 0)
+		JOIN " . FOOTB_BETS . " AS b ON (b.season = m.season AND b.league = m.league AND b.match_no = ma.match_no AND b.user_id = $user_id)
+		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";
+	
+$result = $db->sql_query($sql);
+while($row = $db->sql_fetchrow($result) AND $index < 11)
+{
+	$index++;
+	$data_delivery = true;
+	$row_class = (!($index % 2)) ? 'bg1 row_light' : 'bg2 row_dark';
+		
+	$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'])),
+		'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',
+		'TITLE'			=> ($row['bets_count'] == $row['matches_count']) ? sprintf($user->lang['DELIVERY_READY']) : sprintf($user->lang['DELIVERY_NOT_READY']),
+		'DELIVERY' 		=> $lang_dates[date("D", strtotime($row['delivery']))] . date(" d.m.y G:i", strtotime($row['delivery'])),
+		)
+	);
+}
+$db->sql_freeresult($result);
+
+$template->assign_vars(array(
+	'S_DISPLAY_DELIVERY' 	=> $data_delivery,
+	'S_DATA_DELIVERY' 		=> $data_delivery,
+	)
+);
+
 ?>

block/dload_bank.php

@@ -1,134 +1,135 @@
-<?php
-/**
-*
-* @package phpBB Extension - Football Football
-* @copyright (c) 2016 football (http://football.bplaced.net)
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
-*
-*/
-
-$this->user->add_lang_ext('football/football', 'info_acp_bank');
-
-// Check Prediction League authorisation 
-if ( !$this->auth->acl_get('u_use_football') )
-{
-	trigger_error('NO_AUTH_VIEW');
-}
-
-$action='';
-	$phpbb_root_path = './../../';
-
-if (!$season OR !$league)
-{
-	redirect($this->helper->route('football_main_controller', array('side' => 'bank', 's' => $season, 'l' => $league)));
-}
-else
-{
-	$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
-		{
-			$bet_points = $league_info['bet_points'];
-			$league_name =$league_info['league_name'];
-			$league_short =$league_info['league_name_short'];
-
-			$user_points = '';
-			global $phpbb_extension_manager;
-			if ($phpbb_extension_manager->is_enabled('dmzx/ultimatepoints') && $config['points_enable'])
-			{
-				$user_points = 'u.user_points,';
-			}
-			else
-			{
-				$user_points = "0.00 AS user_points,";
-			}
-
-			// Grab the members points
-			$sql = "SELECT 
-					b.user_id,
-					u.username, 
-					$user_points
-					$bet_points AS bet_points,
-					SUM(IF(p.points_type = " . POINTS_BET . ', IF(p.cash = 0, p.points, 0.00), 0.00)) AS no_cash_bet_points,
-					SUM(IF(p.points_type = ' . POINTS_DEPOSITED . ', IF(p.cash = 0, p.points, 0.00), 0.00)) AS no_cash_deposit,
-					SUM(IF(p.points_type IN (' . POINTS_MATCHDAY . ',' . POINTS_SEASON . ',' . POINTS_MOST_HITS . ',' . POINTS_MOST_HITS_AWAY . '), 
-							IF(p.cash = 0, p.points, 0.00),
-							0.00)) AS no_cash_wins,
-					SUM(IF(p.points_type = ' . POINTS_PAID . ', IF(p.cash = 0, p.points, 0.00), 0.00)) AS no_cash_paid,
-					SUM(IF(p.points_type = ' . POINTS_DEPOSITED . ', p.points, 0.00)) AS deposit,
-					IF(SUM(IF(p.points_type IN (' . POINTS_BET . ',' . POINTS_PAID . '), p.points, p.points * -1.0)) > 0,
-						SUM(IF(p.points_type IN (' . POINTS_BET . ',' . POINTS_PAID . '), p.points, p.points * -1.0)), 0.00) AS new_deposit,
-					SUM(IF(p.points_type IN (' . POINTS_MATCHDAY . ',' . POINTS_SEASON . ',' . POINTS_MOST_HITS . ',' . POINTS_MOST_HITS_AWAY . '),
-							p.points, 0.00)) AS wins,
-					SUM(IF(p.points_type = ' . POINTS_PAID . ', p.points, 0.00)) AS paid,
-					IF(SUM(IF(p.points_type IN (' . POINTS_BET . ',' . POINTS_PAID . '), p.points * -1.0, p.points)) > 0,
-						SUM(IF(p.points_type IN (' . POINTS_BET . ',' . POINTS_PAID . '), p.points * -1.0, p.points)), 0.00) AS new_pay
-				FROM ' . FOOTB_BETS . ' AS b
-				JOIN ' . USERS_TABLE . ' AS u ON (u.user_id = b.user_id)
-				LEFT JOIN ' . FOOTB_POINTS . " AS p ON (p.season = $season AND p.league = $league AND p.user_id = b.user_id)
-				WHERE b.season = $season
-					AND b.league = $league
-					AND b.match_no = 1
-				GROUP BY b.user_id
-				ORDER BY u.username ASC";
-				
-			if(!$result = $db->sql_query($sql))
-			{
-				trigger_error('NO_LEAGUE');
-			}
-			$user_rows = $db->sql_fetchrowset($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']) . ';' . 
-						sprintf($user->lang['DEPOSITED']) . ';' . sprintf($user->lang['DEPOSIT']) . ';' . sprintf($user->lang['WINS']) . ';' . 
-						sprintf($user->lang['PAID']) . ';' . sprintf($user->lang['PAYOUT']) . ';' . $newline;
-
-			$curr_season = curr_season();			
-			foreach ($user_rows as $user_row)
-			{
-				if ($phpbb_extension_manager->is_enabled('dmzx/ultimatepoints') && $config['points_enable'] && $season == $curr_season)
-				{
-					$no_cash_bet_points = ($user_row['no_cash_bet_points'] == 0.00) ? '' : ' (' . str_replace('.', ',', $user_row['no_cash_bet_points']) . ')';
-					$no_cash_deposit = ($user_row['no_cash_deposit'] == 0.00) ? '' : ' (' . str_replace('.', ',', $user_row['no_cash_deposit']) . ')';
-					$no_cash_wins = ($user_row['no_cash_wins'] == 0.00) ? '' : ' (' . str_replace('.', ',', $user_row['no_cash_wins']) . ')';
-					$no_cash_paid = ($user_row['no_cash_paid'] == 0.00) ? '' : ' (' . str_replace('.', ',', $user_row['no_cash_paid']) . ')';
-				}
-				else
-				{
-					$no_cash_bet_points = '';
-					$no_cash_deposit = '';
-					$no_cash_wins = '';
-					$no_cash_paid = '';
-				}
-				$export .= 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 . ';' .
-							str_replace('.', ',', $user_row['new_deposit']) . ';' .
-							str_replace('.', ',', $user_row['wins']) . $no_cash_wins . ';' .
-							str_replace('.', ',', $user_row['paid']) . $no_cash_paid . ';' .
-							str_replace('.', ',', $user_row['new_pay']) . ';' . $newline;
-			}
-			echo utf8_decode($export);
-			exit;
-		}
-	}
-}
+<?php
+/**
+*
+* @package phpBB Extension - Football Football
+* @copyright (c) 2016 football (http://football.bplaced.net)
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+$this->user->add_lang_ext('football/football', 'info_acp_bank');
+
+// Check Prediction League authorisation 
+if ( !$this->auth->acl_get('u_use_football') )
+{
+	trigger_error('NO_AUTH_VIEW');
+}
+
+$action='';
+	$phpbb_root_path = './../../';
+
+if (!$season OR !$league)
+{
+	redirect($this->helper->route('football_main_controller', array('side' => 'bank', 's' => $season, 'l' => $league)));
+}
+else
+{
+	$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
+		{
+			$bet_points = $league_info['bet_points'];
+			$league_name =$league_info['league_name'];
+			$league_short =$league_info['league_name_short'];
+
+			$user_points = '';
+			global $phpbb_extension_manager;
+			if ($phpbb_extension_manager->is_enabled('dmzx/ultimatepoints') && $config['points_enable'])
+			{
+				$user_points = 'u.user_points,';
+			}
+			else
+			{
+				$user_points = "0.00 AS user_points,";
+			}
+
+			// Grab the members points
+			$sql = "SELECT 
+					b.user_id,
+					u.username, 
+					$user_points
+					$bet_points AS bet_points,
+					SUM(IF(p.points_type = " . POINTS_BET . ', IF(p.cash = 0, p.points, 0.00), 0.00)) AS no_cash_bet_points,
+					SUM(IF(p.points_type = ' . POINTS_DEPOSITED . ', IF(p.cash = 0, p.points, 0.00), 0.00)) AS no_cash_deposit,
+					SUM(IF(p.points_type IN (' . POINTS_MATCHDAY . ',' . POINTS_SEASON . ',' . POINTS_MOST_HITS . ',' . POINTS_MOST_HITS_AWAY . '), 
+							IF(p.cash = 0, p.points, 0.00),
+							0.00)) AS no_cash_wins,
+					SUM(IF(p.points_type = ' . POINTS_PAID . ', IF(p.cash = 0, p.points, 0.00), 0.00)) AS no_cash_paid,
+					SUM(IF(p.points_type = ' . POINTS_DEPOSITED . ', p.points, 0.00)) AS deposit,
+					IF(SUM(IF(p.points_type IN (' . POINTS_BET . ',' . POINTS_PAID . '), p.points, p.points * -1.0)) > 0,
+						SUM(IF(p.points_type IN (' . POINTS_BET . ',' . POINTS_PAID . '), p.points, p.points * -1.0)), 0.00) AS new_deposit,
+					SUM(IF(p.points_type IN (' . POINTS_MATCHDAY . ',' . POINTS_SEASON . ',' . POINTS_MOST_HITS . ',' . POINTS_MOST_HITS_AWAY . '),
+							p.points, 0.00)) AS wins,
+					SUM(IF(p.points_type = ' . POINTS_PAID . ', p.points, 0.00)) AS paid,
+					IF(SUM(IF(p.points_type IN (' . POINTS_BET . ',' . POINTS_PAID . '), p.points * -1.0, p.points)) > 0,
+						SUM(IF(p.points_type IN (' . POINTS_BET . ',' . POINTS_PAID . '), p.points * -1.0, p.points)), 0.00) AS new_pay
+				FROM ' . FOOTB_BETS . ' AS b
+				JOIN ' . USERS_TABLE . ' AS u ON (u.user_id = b.user_id)
+				LEFT JOIN ' . FOOTB_POINTS . " AS p ON (p.season = $season AND p.league = $league AND p.user_id = b.user_id)
+				WHERE b.season = $season
+					AND b.league = $league
+					AND b.match_no = 1
+				GROUP BY b.user_id
+				ORDER BY u.username ASC";
+				
+			if(!$result = $db->sql_query($sql))
+			{
+				trigger_error('NO_LEAGUE');
+			}
+			$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']) . ';' . 
+						sprintf($user->lang['DEPOSITED']) . ';' . sprintf($user->lang['DEPOSIT']) . ';' . sprintf($user->lang['WINS']) . ';' . 
+						sprintf($user->lang['PAID']) . ';' . sprintf($user->lang['PAYOUT']) . ';' . $newline;
+
+			$curr_season = curr_season();			
+			foreach ($user_rows as $user_row)
+			{
+				if ($phpbb_extension_manager->is_enabled('dmzx/ultimatepoints') && $config['points_enable'] && $season == $curr_season)
+				{
+					$no_cash_bet_points = ($user_row['no_cash_bet_points'] == 0.00) ? '' : ' (' . str_replace('.', ',', $user_row['no_cash_bet_points']) . ')';
+					$no_cash_deposit = ($user_row['no_cash_deposit'] == 0.00) ? '' : ' (' . str_replace('.', ',', $user_row['no_cash_deposit']) . ')';
+					$no_cash_wins = ($user_row['no_cash_wins'] == 0.00) ? '' : ' (' . str_replace('.', ',', $user_row['no_cash_wins']) . ')';
+					$no_cash_paid = ($user_row['no_cash_paid'] == 0.00) ? '' : ' (' . str_replace('.', ',', $user_row['no_cash_paid']) . ')';
+				}
+				else
+				{
+					$no_cash_bet_points = '';
+					$no_cash_deposit = '';
+					$no_cash_wins = '';
+					$no_cash_paid = '';
+				}
+				$export .= 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 . ';' .
+							str_replace('.', ',', $user_row['new_deposit']) . ';' .
+							str_replace('.', ',', $user_row['wins']) . $no_cash_wins . ';' .
+							str_replace('.', ',', $user_row['paid']) . $no_cash_paid . ';' .
+							str_replace('.', ',', $user_row['new_pay']) . ';' . $newline;
+			}
+			echo utf8_decode($export);
+			exit;
+		}
+	}
+}
 ?>

block/dload_bank_open.php

@@ -1,87 +1,88 @@
-<?php
-/**
-*
-* @package phpBB Extension - Football Football
-* @copyright (c) 2016 football (http://football.bplaced.net)
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
-*
-*/
-
-$this->user->add_lang_ext('football/football', 'info_acp_bank');
-
-// Check Prediction League authorisation 
-if ( !$this->auth->acl_get('u_use_football') )
-{
-	trigger_error('NO_AUTH_VIEW');
-}
-
-$action='';
-
-if (!$season)
-{
-	redirect($this->helper->route('football_main_controller', array('side' => 'bank', 's' => $season)));
-}
-else
-{
-	$season_info = season_info($season);
-	if (!sizeof($season_info))
-	{
-		$error_message = sprintf($user->lang['NO_SEASON']);
-		trigger_error($error_message);
-	}
-	else
-	{
-		// Grab the members points
-		$sql = 'SELECT 
-				u.username, 
-				p.season, 
-				p.league, 
-				round(sum(if(p.points_type IN (' . POINTS_BET . ',' . POINTS_PAID . '), p.points * -1.0, p.points)),2) as saldo 
-			FROM ' . FOOTB_POINTS . ' AS p
-			JOIN ' . USERS_TABLE . " AS u ON (u.user_id = p.user_id)
-			WHERE p.season <= $season
-			GROUP BY p.season, p.league, u.username
-			HAVING saldo <> 0.00
-			ORDER BY u.username, p.season, p.league";
-
-		if(!$result = $db->sql_query($sql))
-		{
-			trigger_error('NO_SEASON');
-		}
-		$user_rows = $db->sql_fetchrowset($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;
-
-		$last_username = '';
-		$sum_saldo = 0.0;
-		foreach ($user_rows as $user_row)
-		{
-			if ($last_username != '' AND $last_username != $user_row['username'])
-			{
-				$export .= str_replace("\"", "\"\"", $last_username) . ';Summe;;' . 
-						str_replace('.', ',', $sum_saldo) . ';' . $newline;
-				$sum_saldo = 0.0;
-			}
-			$export .= str_replace("\"", "\"\"", $user_row['username']) . ';' . 
-						$user_row['season'] . ';' .
-						$user_row['league'] . ';' .
-						str_replace('.', ',', $user_row['saldo']) . ';' . $newline;
-			$sum_saldo += $user_row['saldo'];
-			$last_username = $user_row['username'];
-		}
-		if ($last_username != '')
-		{
-			$export .= str_replace("\"", "\"\"", $last_username) . ';Summe;;' . 
-					str_replace('.', ',', $sum_saldo) . ';' . $newline;
-		}
-		echo utf8_decode($export);
-		exit;
-	}
-}
+<?php
+/**
+*
+* @package phpBB Extension - Football Football
+* @copyright (c) 2016 football (http://football.bplaced.net)
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+$this->user->add_lang_ext('football/football', 'info_acp_bank');
+
+// Check Prediction League authorisation 
+if ( !$this->auth->acl_get('u_use_football') )
+{
+	trigger_error('NO_AUTH_VIEW');
+}
+
+$action='';
+
+if (!$season)
+{
+	redirect($this->helper->route('football_main_controller', array('side' => 'bank', 's' => $season)));
+}
+else
+{
+	$season_info = season_info($season);
+	if (!sizeof($season_info))
+	{
+		$error_message = sprintf($user->lang['NO_SEASON']);
+		trigger_error($error_message);
+	}
+	else
+	{
+		// Grab the members points
+		$sql = 'SELECT 
+				u.username, 
+				p.season, 
+				p.league, 
+				round(sum(if(p.points_type IN (' . POINTS_BET . ',' . POINTS_PAID . '), p.points * -1.0, p.points)),2) as saldo 
+			FROM ' . FOOTB_POINTS . ' AS p
+			JOIN ' . USERS_TABLE . " AS u ON (u.user_id = p.user_id)
+			WHERE p.season <= $season
+			GROUP BY p.season, p.league, u.username
+			HAVING saldo <> 0.00
+			ORDER BY u.username, p.season, p.league";
+
+		if(!$result = $db->sql_query($sql))
+		{
+			trigger_error('NO_SEASON');
+		}
+		$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;
+
+		$last_username = '';
+		$sum_saldo = 0.0;
+		foreach ($user_rows as $user_row)
+		{
+			if ($last_username != '' AND $last_username != $user_row['username'])
+			{
+				$export .= str_replace("\"", "\"\"", $last_username) . ';Summe;;' . 
+						str_replace('.', ',', $sum_saldo) . ';' . $newline;
+				$sum_saldo = 0.0;
+			}
+			$export .= str_replace("\"", "\"\"", $user_row['username']) . ';' . 
+						$user_row['season'] . ';' .
+						$user_row['league'] . ';' .
+						str_replace('.', ',', $user_row['saldo']) . ';' . $newline;
+			$sum_saldo += $user_row['saldo'];
+			$last_username = $user_row['username'];
+		}
+		if ($last_username != '')
+		{
+			$export .= str_replace("\"", "\"\"", $last_username) . ';Summe;;' . 
+					str_replace('.', ',', $sum_saldo) . ';' . $newline;
+		}
+		echo utf8_decode($export);
+		exit;
+	}
+}
 ?>

block/hist_popup.php

@@ -91,6 +91,10 @@ else
 			$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;
@@ -115,7 +119,6 @@ else
 				{
 					$logo[$home_id] = "<img src=\"" . $ext_path . "images/flags/blank.gif\" alt=\"\" width=\"28\" height=\"28\"/>" ;
 				}
-				$db->sql_freeresult($result);
 			}
 			else
 			{
@@ -142,7 +145,6 @@ else
 				{
 					$logo[$guest_id] = "<img src=\"" . $ext_path . "images/flags/blank.gif\" alt=\"\" width=\"28\" height=\"28\"/>" ;
 				}
-				$db->sql_freeresult($result);
 			}
 			else
 			{
@@ -245,7 +247,6 @@ else
 						)
 					);
 				}
-				$db->sql_freeresult($result);
 
 				// Statistic and forecast-points for historie 
 				$sql = "SELECT
@@ -322,10 +323,6 @@ else
 					}
 				}
 				
-				$stat_hist = '';
-				$percent_home = 0;
-				$percent_draw = 0;
-				$percent_guest = 0;
 				if (sizeof($row))
 				{
 					if ($history_count <= 2)
@@ -1003,7 +1000,6 @@ else
 					);
 				}
 			}
-			$db->sql_freeresult($result);
 
 			//last matches home hometeam
 			$sql = '(SELECT
@@ -1074,7 +1070,6 @@ else
 					);
 				}
 			}
-			$db->sql_freeresult($result);
 			
 			//last game guestteam
 			$sql = "(SELECT
@@ -1158,7 +1153,6 @@ else
 					);
 				}
 			}
-			$db->sql_freeresult($result);
 
 			//last matches away guestteam
 			$sql = '(SELECT
@@ -1226,7 +1220,6 @@ else
 					);
 				}
 			}
-			$db->sql_freeresult($result);
 			
 			if ($history_count == 0 and !($data_home and $data_guest))
 			{
@@ -1266,7 +1259,7 @@ else
 			$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;

block/last_results.php

@@ -0,0 +1,150 @@
+<?php
+/**
+*
+* @package phpBB Extension - Football Football
+* @copyright (c) 2016 football (http://football.bplaced.net)
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+if (!defined('IN_PHPBB') OR !defined('IN_FOOTBALL'))
+{
+	exit;
+}
+
+$user_is_member = user_is_member($user->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 = "<img src=\"" . $ext_path . 'images/flags/' . $homelogo . "\" alt=\"" . $homelogo . "\" width=\"20\" height=\"20\"/>" ;
+	}
+	else
+	{
+		$logoH = "<img src=\"" . $ext_path . "images/flags/blank.gif\" alt=\"\" width=\"20\" height=\"20\"/>" ;
+	}
+	if ($guestlogo <> '')
+	{
+		$logoG = "<img src=\"" . $ext_path . 'images/flags/' . $guestlogo . "\" alt=\"" . $guestlogo . "\" width=\"20\" height=\"20\"/>" ;
+	}
+	else
+	{
+		$logoG = "<img src=\"" . $ext_path . "images/flags/blank.gif\" alt=\"\" width=\"20\" height=\"20\"/>" ;
+	}
+
+
+	$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,
+	)
+);
+
+?>

block/last_users.php

@@ -1,66 +1,66 @@
-<?php
-/**
-*
-* @package phpBB Extension - Football Football
-* @copyright (c) 2016 football (http://football.bplaced.net)
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
-*
-*/
-
-if (!defined('IN_PHPBB'))
-{
-   exit;
-}
-
-$display_last_users = false;
-// Last 5 users
-$sql = 'SELECT s.session_user_id
-		, u.username
-		, u.user_colour
-		, u.user_lastvisit
-		, MAX(s.session_time) AS session_time
-		, IF(MAX(s.session_time) > u.user_lastvisit, MAX(s.session_time), u.user_lastvisit) AS lastvisit
-		, IF(MAX(s.session_time) > u.user_lastvisit, MAX(CONCAT(s.session_time,s.session_browser)), "") AS session_browser
-	FROM ' . USERS_TABLE . ' AS u
-	LEFT JOIN ' . SESSIONS_TABLE . ' AS s ON (u.user_id = s.session_user_id)
-	WHERE u.user_lastvisit > 0
-	AND u.user_type IN (0,3)
-	GROUP BY u.user_id 
-	ORDER BY lastvisit DESC';
-
-$result = $db->sql_query_limit($sql, 5);
-$first = true;
-while ($row = $db->sql_fetchrow($result))
-{
-	if (!$row['lastvisit'] && $first == true)
-	{
-		 $display_last_users = false;
-	}
-	else 
-	{
-		$display_last_users = true;
-		if($row['lastvisit'] > 0)
-		{
-			$browser = '';
-			if (preg_match('/iPad|iPhone|iOS|Opera Mobi|BlackBerry|Android|IEMobile|Symbian/', $row['session_browser'], $match_browser))
-			{
-				$browser = ' (' . $match_browser[0] . ')';
-			}
-			$template->assign_block_vars('last_users', array(
-				'USER_NAME'			=> get_username_string('full', '', $row['username'], $row['user_colour']) . $browser,
-				'LAST_VISIT_DATE'	=> $user->format_date($row['lastvisit']),
-			));
-		}
-	}
-	$first = false;
-}
-$db->sql_freeresult($result);
-
-// Assign specific vars
-$template->assign_vars(array(
-	'LAST_USERS'			=> sprintf($user->lang['LAST_VISITORS'], 5),
-	'S_DISPLAY_LAST_USERS'	=> $display_last_users,
-	'S_LAST_USERS'			=> true,
-));
-
+<?php
+/**
+*
+* @package phpBB Extension - Football Football
+* @copyright (c) 2016 football (http://football.bplaced.net)
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+if (!defined('IN_PHPBB'))
+{
+   exit;
+}
+
+$display_last_users = false;
+// Last users
+$sql = 'SELECT s.session_user_id
+		, u.username
+		, u.user_colour
+		, u.user_lastvisit
+		, MAX(s.session_time) AS session_time
+		, IF(MAX(s.session_time) > u.user_lastvisit, MAX(s.session_time), u.user_lastvisit) AS lastvisit
+		, IF(MAX(s.session_time) > u.user_lastvisit, MAX(CONCAT(s.session_time,s.session_browser)), "") AS session_browser
+	FROM ' . USERS_TABLE . ' AS u
+	LEFT JOIN ' . SESSIONS_TABLE . ' AS s ON (u.user_id = s.session_user_id)
+	WHERE u.user_lastvisit > 0
+	AND u.user_type IN (0,3)
+	GROUP BY u.user_id 
+	ORDER BY lastvisit DESC';
+
+$result = $db->sql_query_limit($sql, $config['football_display_last_users']);
+$first = true;
+while ($row = $db->sql_fetchrow($result))
+{
+	if (!$row['lastvisit'] && $first == true)
+	{
+		 $display_last_users = false;
+	}
+	else 
+	{
+		$display_last_users = true;
+		if($row['lastvisit'] > 0)
+		{
+			$browser = '';
+			if (preg_match('/iPad|iPhone|iOS|Opera Mobi|BlackBerry|Android|IEMobile|Symbian/', $row['session_browser'], $match_browser))
+			{
+				$browser = ' (' . $match_browser[0] . ')';
+			}
+			$template->assign_block_vars('last_users', array(
+				'USER_NAME'			=> get_username_string('full', '', $row['username'], $row['user_colour']) . $browser,
+				'LAST_VISIT_DATE'	=> $user->format_date($row['lastvisit']),
+			));
+		}
+	}
+	$first = false;
+}
+$db->sql_freeresult($result);
+
+// Assign specific vars
+$template->assign_vars(array(
+	'LAST_USERS'			=> sprintf($user->lang['LAST_VISITORS'], $config['football_display_last_users']),
+	'S_DISPLAY_LAST_USERS'	=> $display_last_users,
+	'S_LAST_USERS'			=> true,
+));
+
 ?>

block/my_bets.php

@@ -1,332 +1,324 @@
-<?php
-/**
-*
-* @package phpBB Extension - Football Football
-* @copyright (c) 2016 football (http://football.bplaced.net)
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
-*
-*/
-
-if (!defined('IN_PHPBB') OR !defined('IN_FOOTBALL'))
-{
-	exit;
-}
-
-if (!$user_sel)
-{
-	if (user_is_member($user->data['user_id'], $season, $league))
-	{
-		$user_sel =  $user->data['user_id'];
-	}
-}
-$username = '';
-
-$data = false;
-// select user 
-$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";
-
-$numb_users = 0;		
-$result = $db->sql_query($sql);
-while($row = $db->sql_fetchrow($result))
-{
-	$numb_users++;
-	$data = true;
-	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);
-
-// All bets of selected user group by bet
-$rank 				= 0;
-$bets_home_win 		= 0;
-$bets_draw 			= 0;
-$bets_guest_win 	= 0;
-$win_home_win 		= 0;
-$win_draw 			= 0;
-$win_guest_win 		= 0;
-$points_home_win 	= 0;
-$points_draw 		= 0;
-$points_guest_win 	= 0;
-
-$sql = 'SELECT
-		COUNT(b.match_no) AS bets,
-		b.goals_home,
-		b.goals_guest,
-		SUM(IF((b.goals_home + 0 < b.goals_guest) <> (m.goals_home + 0 < m.goals_guest) 
-				OR (b.goals_home = b.goals_guest) <> (m.goals_home = m.goals_guest)
-				OR (b.goals_home + 0 > b.goals_guest) <> (m.goals_home + 0 > m.goals_guest),
-				0,
-				IF((b.goals_home = m.goals_home) AND (b.goals_guest = m.goals_guest), 1, 0)
-			)
-		) AS hits,
-		SUM(IF((b.goals_home + 0 < b.goals_guest) <> (m.goals_home + 0 < m.goals_guest) 
-				OR (b.goals_home = b.goals_guest) <> (m.goals_home = m.goals_guest)
-				OR (b.goals_home + 0 > b.goals_guest) <> (m.goals_home + 0 > m.goals_guest),
-				0,
-				IF((b.goals_home = m.goals_home) AND (b.goals_guest = m.goals_guest), 0, 1)
-			)
-		) AS tendencies,
-		' . select_points('m',true) . '
-	FROM ' . FOOTB_BETS . ' AS b
-	LEFT JOIN ' . FOOTB_MATCHES . " AS m ON (m.season = b.season AND m.league = b.league AND m.match_no = b.match_no)
-	WHERE b.season = $season 
-		AND b.league = $league 
-		AND b.goals_home <> '' 
-		AND b.goals_guest <> '' 
-		AND m.status = 3 
-		AND b.user_id = $user_sel 
-		AND m.matchday <= $matchday
-	GROUP by b.goals_home, b.goals_guest
-	ORDER by bets DESC";
-	
-$result = $db->sql_query($sql);
-
-while($row = $db->sql_fetchrow($result))
-{
-	if ($row['goals_home'] > $row['goals_guest'])
-	{
-		$bets_home_win 		+= $row['bets'];
-		$win_home_win 		+= $row['hits'] + $row['tendencies'];
-		$points_home_win 	+= $row['points'];
-	}
-	if ($row['goals_home'] == $row['goals_guest'])
-	{
-		$bets_draw 			+= $row['bets'];
-		$win_draw 			+= $row['hits'] + $row['tendencies'];
-		$points_draw 		+= $row['points'];
-	}
-	if ($row['goals_home'] < $row['goals_guest'])
-	{
-		$bets_guest_win 	+= $row['bets'];
-		$win_guest_win 		+= $row['hits'] + $row['tendencies'];
-		$points_guest_win 	+= $row['points'];
-	}
-	$rank++;
-	$row_class = (!($rank % 2)) ? 'bg1 row_light' : 'bg2 row_dark';
-	$template->assign_block_vars('bets', array(
-		'ROW_CLASS' 	=> $row_class,
-		'GOALSHOME' 	=> $row['goals_home'],
-		'GOALSGUEST' 	=> $row['goals_guest'],
-		'COUNT' 		=> $row['bets'],
-		'DIRECTHITS' 	=> $row['hits'],
-		'TENDENCIES' 	=> $row['tendencies'],
-		'TOTAL' 		=> $row['hits'] + $row['tendencies'],
-		'POINTS' 		=> $row['points'],
-		'AVERAGE' 		=> round($row['points'] / $row['bets'],1),
-		)
-	);
-}
-$db->sql_freeresult($result);
-
-// Tendencies of all results
-$sql = "SELECT
-		SUM(IF(goals_home + 0 > goals_guest,1,0)) AS SUM_HOME_WIN,
-		SUM(IF(goals_home = goals_guest,1,0)) AS SUM_DRAW,
-		SUM(IF(goals_home + 0 < goals_guest,1,0)) AS SUM_GUEST_WIN
-	FROM " . FOOTB_MATCHES . " 
-	WHERE season = $season 
-		AND league = $league 
-		AND status = 3 
-		AND matchday <= $matchday";
-		
-$result = $db->sql_query($sql);
-
-while($row = $db->sql_fetchrow($result))
-{
-	$template->assign_block_vars('bets_wdl', array(
-		'ROW_CLASS' 	=> 'bg2 row_dark',
-		'SCORE' 		=> sprintf($user->lang['PLAYED']),
-		'HOMEWIN' 	=> $row['SUM_HOME_WIN'],
-		'DRAW' 		=> $row['SUM_DRAW'],
-		'GUESTWIN' 	=> $row['SUM_GUEST_WIN'],
-		)
-	);
-	// Muliply with user of this league
-	$template->assign_block_vars('bets_wdl_all', array(
-		'ROW_CLASS' 	=> 'bg2 row_dark',
-		'SCORE' 		=> sprintf($user->lang['PLAYED']),
-		'HOMEWIN' 	=> $row['SUM_HOME_WIN'] * $numb_users,
-		'DRAW' 		=> $row['SUM_DRAW'] * $numb_users,
-		'GUESTWIN' 	=> $row['SUM_GUEST_WIN'] * $numb_users,
-		)
-	);
-}
-$db->sql_freeresult($result);
-
-// Count tendencies (bets of selected user)
-$template->assign_block_vars('bets_wdl', array(
-	'ROW_CLASS' 	=> 'bg1 row_light',
-	'SCORE' 		=> sprintf($user->lang['GUESSED']),
-	'HOMEWIN' 	=> $bets_home_win,
-	'DRAW' 		=> $bets_draw,
-	'GUESTWIN' 	=> $bets_guest_win,
-	)
-);
-// Scored with tendency (bets of selected user)
-$template->assign_block_vars('bets_wdl', array(
-	'ROW_CLASS' 	=> 'bg2 row_dark',
-	'SCORE' 		=> sprintf($user->lang['SCORED']),
-	'HOMEWIN' 	=> $win_home_win,
-	'DRAW' 		=> $win_draw,
-	'GUESTWIN' 	=> $win_guest_win,
-	)
-);
-// Points with tendency (bets of selected user)
-$template->assign_block_vars('bets_wdl', array(
-	'ROW_CLASS' 	=> 'bg1 row_light',
-	'SCORE' 		=> sprintf($user->lang['POINTS']),
-	'HOMEWIN' 	=> $points_home_win,
-	'DRAW' 		=> $points_draw,
-	'GUESTWIN' 	=> $points_guest_win,
-	)
-);
-
-// All bets of all users group by bet
-$rank 				= 0;
-$bets_home_win 		= 0;
-$bets_draw 			= 0;
-$bets_guest_win 	= 0;
-$win_home_win 		= 0;
-$win_draw 			= 0;
-$win_guest_win 		= 0;
-$points_home_win 	= 0;
-$points_draw 		= 0;
-$points_guest_win 	= 0;
-
-$sql = 'SELECT
-		COUNT(b.match_no) AS bets,
-		b.goals_home,
-		b.goals_guest,
-		SUM(IF((b.goals_home + 0 < b.goals_guest) <> (m.goals_home + 0 < m.goals_guest) 
-				OR (b.goals_home = b.goals_guest) <> (m.goals_home = m.goals_guest) 
-				OR (b.goals_home + 0 > b.goals_guest) <> (m.goals_home + 0 > m.goals_guest),
-				0,
-				IF((b.goals_home = m.goals_home) AND (b.goals_guest = m.goals_guest), 1, 0)
-			)
-		) AS hits,
-		SUM(IF((b.goals_home + 0 < b.goals_guest) <> (m.goals_home + 0 < m.goals_guest) 
-				OR (b.goals_home = b.goals_guest) <> (m.goals_home = m.goals_guest) 
-				OR (b.goals_home + 0 > b.goals_guest) <> (m.goals_home + 0 > m.goals_guest),
-				0,
-				IF((b.goals_home = m.goals_home) AND (b.goals_guest = m.goals_guest), 0, 1)
-			)
-		) AS tendencies,
-		' . select_points('m',true) . '
-	FROM ' . FOOTB_BETS . ' AS b
-	LEFT JOIN ' . FOOTB_MATCHES . " AS m ON (m.season = b.season AND m.league = b.league AND m.match_no = b.match_no)
-	WHERE b.season = $season 
-		AND b.league = $league 
-		AND b.goals_home <> '' 
-		AND b.goals_guest <> '' 
-		AND m.status = 3 
-		AND m.matchday <= $matchday
-	GROUP by b.goals_home, b.goals_guest
-	ORDER by bets DESC";
-	
-$result = $db->sql_query($sql);
-
-while($row = $db->sql_fetchrow($result))
-{
-	if ($row['goals_home'] > $row['goals_guest'])
-	{
-		$bets_home_win 		+= $row['bets'];
-		$win_home_win 		+= $row['hits'] + $row['tendencies'];
-		$points_home_win 	+= $row['points'];
-	}
-	if ($row['goals_home'] == $row['goals_guest'])
-	{
-		$bets_draw 			+= $row['bets'];
-		$win_draw 			+= $row['hits'] + $row['tendencies'];
-		$points_draw 		+= $row['points'];
-	}
-	if ($row['goals_home'] < $row['goals_guest'])
-	{
-		$bets_guest_win 	+= $row['bets'];
-		$win_guest_win 		+= $row['hits'] + $row['tendencies'];
-		$points_guest_win 	+= $row['points'];
-	}
-	$rank++;
-	$row_class = (!($rank % 2)) ? 'bg1 row_light' : 'bg2 row_dark';
-	$template->assign_block_vars('allbets', array(
-		'ROW_CLASS' 	=> $row_class,
-		'GOALSHOME' 	=> $row['goals_home'],
-		'GOALSGUEST' 	=> $row['goals_guest'],
-		'COUNT' 		=> $row['bets'],
-		'DIRECTHITS' 	=> $row['hits'],
-		'TENDENCIES' 	=> $row['tendencies'],
-		'TOTAL' 		=> $row['hits'] + $row['tendencies'],
-		'POINTS' 		=> $row['points'],
-		'AVERAGE' 	=> round($row['points'] / $row['bets'],1),
-		)
-	);
-}
-$db->sql_freeresult($result);
-
-// Count tendencies (bets of all user)
-$template->assign_block_vars('bets_wdl_all', array(
-	'ROW_CLASS' 	=> 'bg2 row_dark',
-	'SCORE' 		=> sprintf($user->lang['GUESSED']),
-	'HOMEWIN' 	=> $bets_home_win,
-	'DRAW' 		=> $bets_draw,
-	'GUESTWIN' 	=> $bets_guest_win,
-	)
-);
-// Scored with tendency (bets of all user)
-$template->assign_block_vars('bets_wdl_all', array(
-	'ROW_CLASS' 	=> 'bg1 row_light',
-	'SCORE' 		=> sprintf($user->lang['SCORED']),
-	'HOMEWIN' 	=> $win_home_win,
-	'DRAW' 		=> $win_draw,
-	'GUESTWIN' 	=> $win_guest_win,
-	)
-);
-// Points with tendency (bets of all user)
-$template->assign_block_vars('bets_wdl_all', array(
-	'ROW_CLASS' 	=> 'bg2 row_dark',
-	'SCORE' 		=> sprintf($user->lang['POINTS']),
-	'HOMEWIN' 	=> $points_home_win,
-	'DRAW' 		=> $points_draw,
-	'GUESTWIN' 	=> $points_guest_win,
-	)
-);
-
-$sidename = sprintf($user->lang['MY_BETS']);
-$template->assign_vars(array(
-	'S_DISPLAY_MY_BETS' 		=> true,
-	'S_SIDENAME' 				=> $sidename,
-	'U_LEFT' 					=> ($config['football_bank']) ? $this->helper->route('football_main_controller', array('side' => 'bank', 's' => $season, 'l' => $league, 'm' => $matchday)) :
-																$this->helper->route('football_main_controller', array('side' => 'ranks_total', 's' => $season, 'l' => $league, 'm' => $matchday)),
-	'LEFT_LINK' 				=> ($config['football_bank']) ? '&lt; ' . sprintf($user->lang['FOOTBALL_BANK']) : 
-																'&lt; ' . sprintf($user->lang['RANK_TOTAL']),
-	'U_RIGHT' 					=> $this->helper->route('football_main_controller', array('side' => 'my_points', 's' => $season, 'l' => $league, 'm' => $matchday)),
-	'RIGHT_LINK' 				=> sprintf($user->lang['MY_POINTS']) . ' &gt;',
-	'LEFT_TITLE' 				=> ($config['football_bank']) ? sprintf($user->lang['TITLE_FOOTBALL_BANK']) : sprintf($user->lang['TITLE_RANK_TOTAL']),
-	'RIGHT_TITLE' 				=> sprintf($user->lang['TITLE_MY_POINTS']),
-	'S_DATA_MY_BETS' 			=> $data,
-	'SEASON' 					=> $season,
-	'LEAGUE' 					=> $league,
-	'USERNAME' 					=> $username,
-	)
-);
-
+<?php
+/**
+*
+* @package phpBB Extension - Football Football
+* @copyright (c) 2016 football (http://football.bplaced.net)
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+if (!defined('IN_PHPBB') OR !defined('IN_FOOTBALL'))
+{
+	exit;
+}
+
+if (!$user_sel)
+{
+	if (user_is_member($user->data['user_id'], $season, $league))
+	{
+		$user_sel =  $user->data['user_id'];
+	}
+}
+$username = '';
+
+$data = false;
+// select user 
+$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";
+
+$numb_users = 0;		
+$result = $db->sql_query($sql);
+while($row = $db->sql_fetchrow($result))
+{
+	$numb_users++;
+	$data = true;
+	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);
+
+// All bets of selected user group by bet
+$rank 				= 0;
+$bets_home_win 		= 0;
+$bets_draw 			= 0;
+$bets_guest_win 	= 0;
+$win_home_win 		= 0;
+$win_draw 			= 0;
+$win_guest_win 		= 0;
+$points_home_win 	= 0;
+$points_draw 		= 0;
+$points_guest_win 	= 0;
+
+$sql = 'SELECT
+		COUNT(b.match_no) AS bets,
+		b.goals_home,
+		b.goals_guest,
+		SUM(IF((b.goals_home + 0 < b.goals_guest) <> (m.goals_home + 0 < m.goals_guest) 
+				OR (b.goals_home = b.goals_guest) <> (m.goals_home = m.goals_guest)
+				OR (b.goals_home + 0 > b.goals_guest) <> (m.goals_home + 0 > m.goals_guest),
+				0,
+				IF((b.goals_home = m.goals_home) AND (b.goals_guest = m.goals_guest), 1, 0)
+			)
+		) AS hits,
+		SUM(IF((b.goals_home + 0 < b.goals_guest) <> (m.goals_home + 0 < m.goals_guest) 
+				OR (b.goals_home = b.goals_guest) <> (m.goals_home = m.goals_guest)
+				OR (b.goals_home + 0 > b.goals_guest) <> (m.goals_home + 0 > m.goals_guest),
+				0,
+				IF((b.goals_home = m.goals_home) AND (b.goals_guest = m.goals_guest), 0, 1)
+			)
+		) AS tendencies,
+		' . select_points('m',true) . '
+	FROM ' . FOOTB_BETS . ' AS b
+	LEFT JOIN ' . FOOTB_MATCHES . " AS m ON (m.season = b.season AND m.league = b.league AND m.match_no = b.match_no)
+	WHERE b.season = $season 
+		AND b.league = $league 
+		AND b.goals_home <> '' 
+		AND b.goals_guest <> '' 
+		AND m.status = 3 
+		AND b.user_id = $user_sel 
+		AND m.matchday <= $matchday
+	GROUP by b.goals_home, b.goals_guest
+	ORDER by bets DESC";
+	
+$result = $db->sql_query($sql);
+
+while($row = $db->sql_fetchrow($result))
+{
+	if ($row['goals_home'] > $row['goals_guest'])
+	{
+		$bets_home_win 		+= $row['bets'];
+		$win_home_win 		+= $row['hits'] + $row['tendencies'];
+		$points_home_win 	+= $row['points'];
+	}
+	if ($row['goals_home'] == $row['goals_guest'])
+	{
+		$bets_draw 			+= $row['bets'];
+		$win_draw 			+= $row['hits'] + $row['tendencies'];
+		$points_draw 		+= $row['points'];
+	}
+	if ($row['goals_home'] < $row['goals_guest'])
+	{
+		$bets_guest_win 	+= $row['bets'];
+		$win_guest_win 		+= $row['hits'] + $row['tendencies'];
+		$points_guest_win 	+= $row['points'];
+	}
+	$rank++;
+	$row_class = (!($rank % 2)) ? 'bg1 row_light' : 'bg2 row_dark';
+	$template->assign_block_vars('bets', array(
+		'ROW_CLASS' 	=> $row_class,
+		'GOALSHOME' 	=> $row['goals_home'],
+		'GOALSGUEST' 	=> $row['goals_guest'],
+		'COUNT' 		=> $row['bets'],
+		'DIRECTHITS' 	=> $row['hits'],
+		'TENDENCIES' 	=> $row['tendencies'],
+		'TOTAL' 		=> $row['hits'] + $row['tendencies'],
+		'POINTS' 		=> $row['points'],
+		'AVERAGE' 		=> round($row['points'] / $row['bets'],1),
+		)
+	);
+}
+$db->sql_freeresult($result);
+
+// Tendencies of all results
+$sql = "SELECT
+		SUM(IF(goals_home + 0 > goals_guest,1,0)) AS SUM_HOME_WIN,
+		SUM(IF(goals_home = goals_guest,1,0)) AS SUM_DRAW,
+		SUM(IF(goals_home + 0 < goals_guest,1,0)) AS SUM_GUEST_WIN
+	FROM " . FOOTB_MATCHES . " 
+	WHERE season = $season 
+		AND league = $league 
+		AND status = 3 
+		AND matchday <= $matchday";
+		
+$result = $db->sql_query($sql);
+
+while($row = $db->sql_fetchrow($result))
+{
+	$template->assign_block_vars('bets_wdl', array(
+		'ROW_CLASS' 	=> 'bg2 row_dark',
+		'SCORE' 		=> sprintf($user->lang['PLAYED']),
+		'HOMEWIN' 	=> $row['SUM_HOME_WIN'],
+		'DRAW' 		=> $row['SUM_DRAW'],
+		'GUESTWIN' 	=> $row['SUM_GUEST_WIN'],
+		)
+	);
+	// Muliply with user of this league
+	$template->assign_block_vars('bets_wdl_all', array(
+		'ROW_CLASS' 	=> 'bg2 row_dark',
+		'SCORE' 		=> sprintf($user->lang['PLAYED']),
+		'HOMEWIN' 	=> $row['SUM_HOME_WIN'] * $numb_users,
+		'DRAW' 		=> $row['SUM_DRAW'] * $numb_users,
+		'GUESTWIN' 	=> $row['SUM_GUEST_WIN'] * $numb_users,
+		)
+	);
+}
+$db->sql_freeresult($result);
+
+// Count tendencies (bets of selected user)
+$template->assign_block_vars('bets_wdl', array(
+	'ROW_CLASS' 	=> 'bg1 row_light',
+	'SCORE' 		=> sprintf($user->lang['GUESSED']),
+	'HOMEWIN' 	=> $bets_home_win,
+	'DRAW' 		=> $bets_draw,
+	'GUESTWIN' 	=> $bets_guest_win,
+	)
+);
+// Scored with tendency (bets of selected user)
+$template->assign_block_vars('bets_wdl', array(
+	'ROW_CLASS' 	=> 'bg2 row_dark',
+	'SCORE' 		=> sprintf($user->lang['SCORED']),
+	'HOMEWIN' 	=> $win_home_win,
+	'DRAW' 		=> $win_draw,
+	'GUESTWIN' 	=> $win_guest_win,
+	)
+);
+// Points with tendency (bets of selected user)
+$template->assign_block_vars('bets_wdl', array(
+	'ROW_CLASS' 	=> 'bg1 row_light',
+	'SCORE' 		=> sprintf($user->lang['POINTS']),
+	'HOMEWIN' 	=> $points_home_win,
+	'DRAW' 		=> $points_draw,
+	'GUESTWIN' 	=> $points_guest_win,
+	)
+);
+
+// All bets of all users group by bet
+$rank 				= 0;
+$bets_home_win 		= 0;
+$bets_draw 			= 0;
+$bets_guest_win 	= 0;
+$win_home_win 		= 0;
+$win_draw 			= 0;
+$win_guest_win 		= 0;
+$points_home_win 	= 0;
+$points_draw 		= 0;
+$points_guest_win 	= 0;
+
+$sql = 'SELECT
+		COUNT(b.match_no) AS bets,
+		b.goals_home,
+		b.goals_guest,
+		SUM(IF((b.goals_home + 0 < b.goals_guest) <> (m.goals_home + 0 < m.goals_guest) 
+				OR (b.goals_home = b.goals_guest) <> (m.goals_home = m.goals_guest) 
+				OR (b.goals_home + 0 > b.goals_guest) <> (m.goals_home + 0 > m.goals_guest),
+				0,
+				IF((b.goals_home = m.goals_home) AND (b.goals_guest = m.goals_guest), 1, 0)
+			)
+		) AS hits,
+		SUM(IF((b.goals_home + 0 < b.goals_guest) <> (m.goals_home + 0 < m.goals_guest) 
+				OR (b.goals_home = b.goals_guest) <> (m.goals_home = m.goals_guest) 
+				OR (b.goals_home + 0 > b.goals_guest) <> (m.goals_home + 0 > m.goals_guest),
+				0,
+				IF((b.goals_home = m.goals_home) AND (b.goals_guest = m.goals_guest), 0, 1)
+			)
+		) AS tendencies,
+		' . select_points('m',true) . '
+	FROM ' . FOOTB_BETS . ' AS b
+	LEFT JOIN ' . FOOTB_MATCHES . " AS m ON (m.season = b.season AND m.league = b.league AND m.match_no = b.match_no)
+	WHERE b.season = $season 
+		AND b.league = $league 
+		AND b.goals_home <> '' 
+		AND b.goals_guest <> '' 
+		AND m.status = 3 
+		AND m.matchday <= $matchday
+	GROUP by b.goals_home, b.goals_guest
+	ORDER by bets DESC";
+	
+$result = $db->sql_query($sql);
+
+while($row = $db->sql_fetchrow($result))
+{
+	if ($row['goals_home'] > $row['goals_guest'])
+	{
+		$bets_home_win 		+= $row['bets'];
+		$win_home_win 		+= $row['hits'] + $row['tendencies'];
+		$points_home_win 	+= $row['points'];
+	}
+	if ($row['goals_home'] == $row['goals_guest'])
+	{
+		$bets_draw 			+= $row['bets'];
+		$win_draw 			+= $row['hits'] + $row['tendencies'];
+		$points_draw 		+= $row['points'];
+	}
+	if ($row['goals_home'] < $row['goals_guest'])
+	{
+		$bets_guest_win 	+= $row['bets'];
+		$win_guest_win 		+= $row['hits'] + $row['tendencies'];
+		$points_guest_win 	+= $row['points'];
+	}
+	$rank++;
+	$row_class = (!($rank % 2)) ? 'bg1 row_light' : 'bg2 row_dark';
+	$template->assign_block_vars('allbets', array(
+		'ROW_CLASS' 	=> $row_class,
+		'GOALSHOME' 	=> $row['goals_home'],
+		'GOALSGUEST' 	=> $row['goals_guest'],
+		'COUNT' 		=> $row['bets'],
+		'DIRECTHITS' 	=> $row['hits'],
+		'TENDENCIES' 	=> $row['tendencies'],
+		'TOTAL' 		=> $row['hits'] + $row['tendencies'],
+		'POINTS' 		=> $row['points'],
+		'AVERAGE' 	=> round($row['points'] / $row['bets'],1),
+		)
+	);
+}
+$db->sql_freeresult($result);
+
+// Count tendencies (bets of all user)
+$template->assign_block_vars('bets_wdl_all', array(
+	'ROW_CLASS' 	=> 'bg2 row_dark',
+	'SCORE' 		=> sprintf($user->lang['GUESSED']),
+	'HOMEWIN' 	=> $bets_home_win,
+	'DRAW' 		=> $bets_draw,
+	'GUESTWIN' 	=> $bets_guest_win,
+	)
+);
+// Scored with tendency (bets of all user)
+$template->assign_block_vars('bets_wdl_all', array(
+	'ROW_CLASS' 	=> 'bg1 row_light',
+	'SCORE' 		=> sprintf($user->lang['SCORED']),
+	'HOMEWIN' 	=> $win_home_win,
+	'DRAW' 		=> $win_draw,
+	'GUESTWIN' 	=> $win_guest_win,
+	)
+);
+// Points with tendency (bets of all user)
+$template->assign_block_vars('bets_wdl_all', array(
+	'ROW_CLASS' 	=> 'bg2 row_dark',
+	'SCORE' 		=> sprintf($user->lang['POINTS']),
+	'HOMEWIN' 	=> $points_home_win,
+	'DRAW' 		=> $points_draw,
+	'GUESTWIN' 	=> $points_guest_win,
+	)
+);
+
+$sidename = sprintf($user->lang['MY_BETS']);
+$template->assign_vars(array(
+	'S_DISPLAY_MY_BETS' 		=> true,
+	'S_SIDENAME' 				=> $sidename,
+	'S_DATA_MY_BETS' 			=> $data,
+	'SEASON' 					=> $season,
+	'LEAGUE' 					=> $league,
+	'USERNAME' 					=> $username,
+	)
+);
+
 ?>

block/my_chart.php

@@ -1,339 +1,334 @@
-<?php
-/**
-*
-* @package phpBB Extension - Football Football
-* @copyright (c) 2016 football (http://football.bplaced.net)
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
-*
-*/
-
-if (!defined('IN_PHPBB') OR !defined('IN_FOOTBALL'))
-{
-	exit;
-}
-
-$data = false;
-$user1 = '';
-$user2 = '';
-$user3 = '';
-$user4 = '';
-$username  = '';
-$username2 = '';
-$username3 = '';
-$username4 = '';
-// Calculate rank total
-$sql = 'SELECT
-		r.user_id,
-		u.username,
-		SUM(r.points) 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";
-	
-$result = $db->sql_query($sql);
-$current_ranks = $db->sql_fetchrowset($result);
-$total_users = sizeof($current_ranks);
-if ($total_users > 3 AND $total_users <= 50)
-{
-	$data = true;
-	$middle = round($total_users / 2,0);
-	// If user = leader then first = seconde
-	$user_first = $current_ranks[0]['user_id'];
-	if ($user_first == $user->data['user_id'])
-		$user_first = $current_ranks[1]['user_id'];
-	// If user = middle then middle = middle - 1
-	$user_middle = $current_ranks[$middle-1]['user_id'];
-	if ($user_middle == $user->data['user_id'])
-		$user_middle = $current_ranks[$middle]['user_id'];
-	// If user = last then last  = last but one
-	$user_last = $current_ranks[$total_users - 1]['user_id'];
-	if ($user_last == $user->data['user_id'])
-		$user_last = $current_ranks[$total_users - 2]['user_id'];
-
-	if (user_is_member($user->data['user_id'], $season, $league))
-	{
-		// Take user, leader, middle and last
-		$user1 = $this->request->variable('user1', $user->data['user_id']);
-		$user2 = $this->request->variable('user2', $user_first);
-		$user3 = $this->request->variable('user3', $user_middle);
-		$user4 = $this->request->variable('user4', $user_last);
-	}
-	else
-	{
-		// Only take leader, middle and last
-		$user1 = $this->request->variable('user1', $user_first);
-		$user2 = $this->request->variable('user2', $user_middle);
-		$user3 = $this->request->variable('user3', $user_last);
-		$user4 = $this->request->variable('user4', 0);
-	}
-
-	// Add empty choice
-	$template->assign_block_vars('form_user2', array(
-		'S_USERNAME' 	=> sprintf($user->lang['OPTION_USER']),
-		'S_USERID' 		=> 0,
-		'S_SELECTEDID2' => '',
-		)
-	);
-	$template->assign_block_vars('form_user3', array(
-		'S_USERNAME' 	=> sprintf($user->lang['OPTION_USER']),
-		'S_USERID' 		=> 0,
-		'S_SELECTEDID3' => '',
-		)
-	);
-	$template->assign_block_vars('form_user4', array(
-		'S_USERNAME' 	=> sprintf($user->lang['OPTION_USER']),
-		'S_USERID' 		=> 0,
-		'S_SELECTEDID4' => '',
-		)
-	);
-
-	// Start select user
-	foreach ($current_ranks as $rank_user)
-	{
-		$curr_userid =$rank_user['user_id'];
-		if ($user1 == $curr_userid)
-		{
-			$selectid1 = ' selected="selected"';
-			$username  = $rank_user['username'];
-		}
-		else
-		{
-			$selectid1 = '';
-		}
-		if ($user2 == $curr_userid)
-		{
-			$selectid2 = ' selected="selected"';
-			$username2 = $rank_user['username'];
-		}
-		else
-		{
-			$selectid2 = '';
-		}
-		if ($user3 == $curr_userid)
-		{
-			$selectid3 = ' selected="selected"';
-			$username3 = $rank_user['username'];
-		}
-		else
-		{
-			$selectid3 = '';
-		}
-		if ($user4 == $curr_userid)
-		{
-			$selectid4 = ' selected="selected"';
-			$username4 = $rank_user['username'];
-		}
-		else
-		{
-			$selectid4 = '';
-		}
-		if ($curr_userid != $user2 AND $curr_userid != $user3 AND $curr_userid != $user4)
-			$template->assign_block_vars('form_user1', array(
-				'S_USERNAME' 	=> $rank_user['username'],
-				'S_USERID' 		=> $curr_userid,
-				'S_SELECTEDID' 	=> $selectid1));
-		if ($curr_userid != $user1 AND $curr_userid != $user3 AND $curr_userid != $user4)
-			$template->assign_block_vars('form_user2', array(
-				'S_USERNAME' 	=> $rank_user['username'],
-				'S_USERID' 		=> $curr_userid,
-				'S_SELECTEDID' 	=> $selectid2));
-		if ($curr_userid != $user1 AND $curr_userid != $user2 AND $curr_userid != $user4)
-			$template->assign_block_vars('form_user3', array(
-				'S_USERNAME' 	=> $rank_user['username'],
-				'S_USERID' 		=> $curr_userid,
-				'S_SELECTEDID' 	=> $selectid3));
-		if ($curr_userid != $user1 AND $curr_userid != $user2 AND $curr_userid != $user3)
-			$template->assign_block_vars('form_user4', array(
-				'S_USERNAME' 	=> $rank_user['username'],
-				'S_USERID' 		=> $curr_userid,
-				'S_SELECTEDID' 	=> $selectid4));
-	}
-
-	$ranks_total_1 	= '';
-	$ranks_dayl_1 	= '';
-	$points_1 		= '';
-	$sql = 'SELECT *
-		FROM ' . FOOTB_RANKS . " 
-		WHERE season = $season 
-			AND league = $league 
-			AND matchday <= $matchday 
-			AND user_id = $user1
-		ORDER BY matchday ASC";
-		
-	$result = $db->sql_query($sql);
-
-	while($row = $db->sql_fetchrow($result))
-	{
-		$points_1 		= $points_1. $row['points']. ',';
-		$ranks_total_1 	= $ranks_total_1. $row['rank_total']. ',';
-		$ranks_dayl_1 	= $ranks_dayl_1. $row['rank']. ',';
-	}
-	$points_1 		= substr($points_1, 0, strlen($points_1) - 1);
-	$ranks_total_1 	= substr($ranks_total_1, 0, strlen($ranks_total_1) - 1);
-	$ranks_dayl_1 	= substr($ranks_dayl_1, 0, strlen($ranks_dayl_1) - 1);
-	$db->sql_freeresult($result);
-
-	$ranks_total_2 	= '';
-	$ranks_dayl_2 	= '';
-	$points_2 		= '';
-	if ($user2 != 0)
-	{
-		$sql = 'SELECT *
-			FROM ' . FOOTB_RANKS . " 
-			WHERE season = $season 
-				AND league = $league 
-				AND matchday <= $matchday 
-				AND user_id = $user2
-			ORDER BY matchday ASC";
-			
-		$result = $db->sql_query($sql);
-
-		while($row = $db->sql_fetchrow($result))
-		{
-			$points_2 		= $points_2 . $row['points']. ',';
-			$ranks_total_2 	= $ranks_total_2 . $row['rank_total']. ',';
-			$ranks_dayl_2 	= $ranks_dayl_2 . $row['rank']. ',';
-		}
-		$points_2 		= substr($points_2, 0, strlen($points_2) - 1);
-		$ranks_total_2 	= substr($ranks_total_2, 0, strlen($ranks_total_2) - 1);
-		$ranks_dayl_2 	= substr($ranks_dayl_2, 0, strlen($ranks_dayl_2) - 1);
-		$db->sql_freeresult($result);
-	}
-
-	$ranks_total_3 	= '';
-	$ranks_dayl_3 	= '';
-	$points_3 		= '';
-	if ($user3 != 0)
-	{
-		$sql = 'SELECT *
-			FROM ' . FOOTB_RANKS . " 
-			WHERE season = $season 
-				AND league = $league 
-				AND matchday <= $matchday 
-				AND user_id = $user3
-			ORDER BY matchday ASC";
-			
-		$result = $db->sql_query($sql);
-
-		while($row = $db->sql_fetchrow($result))
-		{
-			$points_3 		= $points_3. $row['points']. ',';
-			$ranks_total_3 	= $ranks_total_3. $row['rank_total']. ',';
-			$ranks_dayl_3 	= $ranks_dayl_3. $row['rank']. ',';
-		}
-		$points_3 		= substr($points_3,0,strlen($points_3)-1);
-		$ranks_total_3 	= substr($ranks_total_3,0,strlen($ranks_total_3)-1);
-		$ranks_dayl_3 	= substr($ranks_dayl_3,0,strlen($ranks_dayl_3)-1);
-		$db->sql_freeresult($result);
-	}
-
-	$ranks_total_4 	= '';
-	$ranks_dayl_4 	= '';
-	$points_4 		= '';
-	if ($user4 != 0)
-	{
-		$sql = 'SELECT *
-			FROM ' . FOOTB_RANKS . " 
-			WHERE season = $season 
-				AND league = $league 
-				AND matchday <= $matchday 
-				AND user_id = $user4
-			ORDER BY matchday ASC";
-			
-		$result = $db->sql_query($sql);
-
-		while($row = $db->sql_fetchrow($result))
-		{
-			$points_4 		= $points_4. $row['points']. ',';
-			$sptagplatz 	= $row['rank'];
-			$ranks_total_4 	= $ranks_total_4. $row['rank_total']. ',';
-			$ranks_dayl_4 	= $ranks_dayl_4. $row['rank']. ',';
-		}
-		$points_4 		= substr($points_4,0,strlen($points_4)-1);
-		$ranks_total_4 	= substr($ranks_total_4,0,strlen($ranks_total_4)-1);
-		$ranks_dayl_4 	= substr($ranks_dayl_4,0,strlen($ranks_dayl_4)-1);
-		$db->sql_freeresult($result);
-	}
-
-	$min = '';
-	$max = '';
-	if ($user1 != 0)
-	{
-		$sql = 'SELECT
-				MIN(points) As points_min,
-				MAX(points) As points_max
-			FROM ' . FOOTB_RANKS . " 
-			WHERE season = $season 
-				AND league = $league 
-				AND matchday <= $matchday
-			GROUP BY matchday
-			ORDER BY matchday ASC";
-			
-		$result = $db->sql_query($sql);
-
-		while($row = $db->sql_fetchrow($result))
-		{
-			$min = $min. $row['points_min']. ',';
-			$max = $max. $row['points_max']. ',';
-		}
-		$min = substr($min,0,strlen($min)-1);
-		$max = substr($max,0,strlen($max)-1);
-		$db->sql_freeresult($result);
-	}
-	// Create and display charts
-	$chart= "<img src='". generate_board_url() . '/' . $this->football_root_path
-		. "includes/chart_rank.php?t=$total_users&amp;m=$matchday&amp;v1=$ranks_total_1&amp;v2=$ranks_total_2&amp;v3=$ranks_total_3&amp;v4=$ranks_total_4&amp;c=" 
-		. sprintf($user->lang['PLACE']) . "' alt='" 
-		. sprintf($user->lang['CHART_TOTAL'])
-		. "'/>";
-	$template->assign_block_vars('chart_rank', array(
-		'CHARTIMAGE' => $chart,
-		)
-	);
-	$chart= "<img src='". generate_board_url() . '/' . $this->football_root_path
-		. "includes/chart_rank.php?t=$total_users&amp;m=$matchday&amp;v1=$ranks_dayl_1&amp;v2=$ranks_dayl_2&amp;v3=$ranks_dayl_3&amp;v4=$ranks_dayl_4&amp;c=" 
-		. sprintf($user->lang['PLACE']) . "' alt='" 
-		. sprintf($user->lang['CHART_MATCHDAY'])
-		. "'/>";
-	$template->assign_block_vars('chart_matchtdays', array(
-		'CHARTIMAGE' => $chart,
-		)
-	);
-	$chart= "<img src='". generate_board_url() . '/' . $this->football_root_path
-		. "includes/chart_points.php?m=$matchday&amp;v1=$points_1&amp;v2=$points_2&amp;v3=$points_3&amp;v4=$points_4&amp;min=$min&amp;max=$max&amp;c=" 
-		. sprintf($user->lang['POINTS']) . ',' . sprintf($user->lang['BANDWIDTH']) . "' alt='" 
-		. sprintf($user->lang['CHART_POINTS'])
-		. "'/>";
-	$template->assign_block_vars('chart_points', array(
-		'CHARTIMAGE' => $chart,
-		)
-	);
-}
-$sidename = sprintf($user->lang['MY_CHART']);
-$template->assign_vars(array(
-	'S_DISPLAY_MY_CHART' 		=> true,
-	'S_SIDENAME' 				=> $sidename,
-	'U_LEFT' 					=> $this->helper->route('football_main_controller', array('side' => 'my_rank', 's' => $season, 'l' => $league, 'm' => $matchday)),
-	'LEFT_LINK' 				=> '&lt; ' . sprintf($user->lang['MY_RANK']),
-	'U_RIGHT' 					=> $this->helper->route('football_main_controller', array('side' => 'my_koeff', 's' => $season, 'l' => $league, 'm' => $matchday)),
-	'RIGHT_LINK' 				=> sprintf($user->lang['MY_KOEFF']) . ' &gt;',
-	'LEFT_TITLE' 				=> sprintf($user->lang['TITLE_MY_RANKS']),
-	'RIGHT_TITLE' 				=> sprintf($user->lang['TITLE_MY_KOEFF']),
-	'S_DATA_MY_CHART' 			=> $data,
-	'SEASON' 					=> $season,
-	'LEAGUE' 					=> $league,
-	'S_USER1' 					=> $user1,
-	'S_USER2' 					=> $user2,
-	'S_USER3' 					=> $user3,
-	'S_USER4' 					=> $user4,
-	'USERNAME1' 				=> $username,
-	'USERNAME2' 				=> $username2,
-	'USERNAME3' 				=> $username3,
-	'USERNAME4' 				=> $username4,
-	)
-);
+<?php
+/**
+*
+* @package phpBB Extension - Football Football
+* @copyright (c) 2016 football (http://football.bplaced.net)
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+if (!defined('IN_PHPBB') OR !defined('IN_FOOTBALL'))
+{
+	exit;
+}
+
+$data = false;
+$user1 = '';
+$user2 = '';
+$user3 = '';
+$user4 = '';
+$username  = '';
+$username2 = '';
+$username3 = '';
+$username4 = '';
+// Calculate rank total
+$sql = 'SELECT
+		r.user_id,
+		u.username,
+		SUM(r.points) 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";
+	
+$result = $db->sql_query($sql);
+$current_ranks = $db->sql_fetchrowset($result);
+$db->sql_freeresult($result);
+$total_users = sizeof($current_ranks);
+if ($total_users > 3 AND $total_users <= 50)
+{
+	$data = true;
+	$middle = round($total_users / 2,0);
+	// If user = leader then first = seconde
+	$user_first = $current_ranks[0]['user_id'];
+	if ($user_first == $user->data['user_id'])
+		$user_first = $current_ranks[1]['user_id'];
+	// If user = middle then middle = middle - 1
+	$user_middle = $current_ranks[$middle-1]['user_id'];
+	if ($user_middle == $user->data['user_id'])
+		$user_middle = $current_ranks[$middle]['user_id'];
+	// If user = last then last  = last but one
+	$user_last = $current_ranks[$total_users - 1]['user_id'];
+	if ($user_last == $user->data['user_id'])
+		$user_last = $current_ranks[$total_users - 2]['user_id'];
+
+	if (user_is_member($user->data['user_id'], $season, $league))
+	{
+		// Take user, leader, middle and last
+		$user1 = $this->request->variable('user1', $user->data['user_id']);
+		$user2 = $this->request->variable('user2', $user_first);
+		$user3 = $this->request->variable('user3', $user_middle);
+		$user4 = $this->request->variable('user4', $user_last);
+	}
+	else
+	{
+		// Only take leader, middle and last
+		$user1 = $this->request->variable('user1', $user_first);
+		$user2 = $this->request->variable('user2', $user_middle);
+		$user3 = $this->request->variable('user3', $user_last);
+		$user4 = $this->request->variable('user4', 0);
+	}
+
+	// Add empty choice
+	$template->assign_block_vars('form_user2', array(
+		'S_USERNAME' 	=> sprintf($user->lang['OPTION_USER']),
+		'S_USERID' 		=> 0,
+		'S_SELECTEDID2' => '',
+		)
+	);
+	$template->assign_block_vars('form_user3', array(
+		'S_USERNAME' 	=> sprintf($user->lang['OPTION_USER']),
+		'S_USERID' 		=> 0,
+		'S_SELECTEDID3' => '',
+		)
+	);
+	$template->assign_block_vars('form_user4', array(
+		'S_USERNAME' 	=> sprintf($user->lang['OPTION_USER']),
+		'S_USERID' 		=> 0,
+		'S_SELECTEDID4' => '',
+		)
+	);
+
+	// Start select user
+	foreach ($current_ranks as $rank_user)
+	{
+		$curr_userid =$rank_user['user_id'];
+		if ($user1 == $curr_userid)
+		{
+			$selectid1 = ' selected="selected"';
+			$username  = $rank_user['username'];
+		}
+		else
+		{
+			$selectid1 = '';
+		}
+		if ($user2 == $curr_userid)
+		{
+			$selectid2 = ' selected="selected"';
+			$username2 = $rank_user['username'];
+		}
+		else
+		{
+			$selectid2 = '';
+		}
+		if ($user3 == $curr_userid)
+		{
+			$selectid3 = ' selected="selected"';
+			$username3 = $rank_user['username'];
+		}
+		else
+		{
+			$selectid3 = '';
+		}
+		if ($user4 == $curr_userid)
+		{
+			$selectid4 = ' selected="selected"';
+			$username4 = $rank_user['username'];
+		}
+		else
+		{
+			$selectid4 = '';
+		}
+		if ($curr_userid != $user2 AND $curr_userid != $user3 AND $curr_userid != $user4)
+			$template->assign_block_vars('form_user1', array(
+				'S_USERNAME' 	=> $rank_user['username'],
+				'S_USERID' 		=> $curr_userid,
+				'S_SELECTEDID' 	=> $selectid1));
+		if ($curr_userid != $user1 AND $curr_userid != $user3 AND $curr_userid != $user4)
+			$template->assign_block_vars('form_user2', array(
+				'S_USERNAME' 	=> $rank_user['username'],
+				'S_USERID' 		=> $curr_userid,
+				'S_SELECTEDID' 	=> $selectid2));
+		if ($curr_userid != $user1 AND $curr_userid != $user2 AND $curr_userid != $user4)
+			$template->assign_block_vars('form_user3', array(
+				'S_USERNAME' 	=> $rank_user['username'],
+				'S_USERID' 		=> $curr_userid,
+				'S_SELECTEDID' 	=> $selectid3));
+		if ($curr_userid != $user1 AND $curr_userid != $user2 AND $curr_userid != $user3)
+			$template->assign_block_vars('form_user4', array(
+				'S_USERNAME' 	=> $rank_user['username'],
+				'S_USERID' 		=> $curr_userid,
+				'S_SELECTEDID' 	=> $selectid4));
+	}
+
+	$ranks_total_1 	= '';
+	$ranks_dayl_1 	= '';
+	$points_1 		= '';
+	$sql = 'SELECT *
+		FROM ' . FOOTB_RANKS . " 
+		WHERE season = $season 
+			AND league = $league 
+			AND matchday <= $matchday 
+			AND user_id = $user1
+		ORDER BY matchday ASC";
+		
+	$result = $db->sql_query($sql);
+
+	while($row = $db->sql_fetchrow($result))
+	{
+		$points_1 		= $points_1. $row['points']. ',';
+		$ranks_total_1 	= $ranks_total_1. $row['rank_total']. ',';
+		$ranks_dayl_1 	= $ranks_dayl_1. $row['rank']. ',';
+	}
+	$points_1 		= substr($points_1, 0, strlen($points_1) - 1);
+	$ranks_total_1 	= substr($ranks_total_1, 0, strlen($ranks_total_1) - 1);
+	$ranks_dayl_1 	= substr($ranks_dayl_1, 0, strlen($ranks_dayl_1) - 1);
+	$db->sql_freeresult($result);
+
+	$ranks_total_2 	= '';
+	$ranks_dayl_2 	= '';
+	$points_2 		= '';
+	if ($user2 != 0)
+	{
+		$sql = 'SELECT *
+			FROM ' . FOOTB_RANKS . " 
+			WHERE season = $season 
+				AND league = $league 
+				AND matchday <= $matchday 
+				AND user_id = $user2
+			ORDER BY matchday ASC";
+			
+		$result = $db->sql_query($sql);
+
+		while($row = $db->sql_fetchrow($result))
+		{
+			$points_2 		= $points_2 . $row['points']. ',';
+			$ranks_total_2 	= $ranks_total_2 . $row['rank_total']. ',';
+			$ranks_dayl_2 	= $ranks_dayl_2 . $row['rank']. ',';
+		}
+		$points_2 		= substr($points_2, 0, strlen($points_2) - 1);
+		$ranks_total_2 	= substr($ranks_total_2, 0, strlen($ranks_total_2) - 1);
+		$ranks_dayl_2 	= substr($ranks_dayl_2, 0, strlen($ranks_dayl_2) - 1);
+		$db->sql_freeresult($result);
+	}
+
+	$ranks_total_3 	= '';
+	$ranks_dayl_3 	= '';
+	$points_3 		= '';
+	if ($user3 != 0)
+	{
+		$sql = 'SELECT *
+			FROM ' . FOOTB_RANKS . " 
+			WHERE season = $season 
+				AND league = $league 
+				AND matchday <= $matchday 
+				AND user_id = $user3
+			ORDER BY matchday ASC";
+			
+		$result = $db->sql_query($sql);
+
+		while($row = $db->sql_fetchrow($result))
+		{
+			$points_3 		= $points_3. $row['points']. ',';
+			$ranks_total_3 	= $ranks_total_3. $row['rank_total']. ',';
+			$ranks_dayl_3 	= $ranks_dayl_3. $row['rank']. ',';
+		}
+		$points_3 		= substr($points_3,0,strlen($points_3)-1);
+		$ranks_total_3 	= substr($ranks_total_3,0,strlen($ranks_total_3)-1);
+		$ranks_dayl_3 	= substr($ranks_dayl_3,0,strlen($ranks_dayl_3)-1);
+		$db->sql_freeresult($result);
+	}
+
+	$ranks_total_4 	= '';
+	$ranks_dayl_4 	= '';
+	$points_4 		= '';
+	if ($user4 != 0)
+	{
+		$sql = 'SELECT *
+			FROM ' . FOOTB_RANKS . " 
+			WHERE season = $season 
+				AND league = $league 
+				AND matchday <= $matchday 
+				AND user_id = $user4
+			ORDER BY matchday ASC";
+			
+		$result = $db->sql_query($sql);
+
+		while($row = $db->sql_fetchrow($result))
+		{
+			$points_4 		= $points_4. $row['points']. ',';
+			$sptagplatz 	= $row['rank'];
+			$ranks_total_4 	= $ranks_total_4. $row['rank_total']. ',';
+			$ranks_dayl_4 	= $ranks_dayl_4. $row['rank']. ',';
+		}
+		$points_4 		= substr($points_4,0,strlen($points_4)-1);
+		$ranks_total_4 	= substr($ranks_total_4,0,strlen($ranks_total_4)-1);
+		$ranks_dayl_4 	= substr($ranks_dayl_4,0,strlen($ranks_dayl_4)-1);
+		$db->sql_freeresult($result);
+	}
+
+	$min = '';
+	$max = '';
+	if ($user1 != 0)
+	{
+		$sql = 'SELECT
+				MIN(points) As points_min,
+				MAX(points) As points_max
+			FROM ' . FOOTB_RANKS . " 
+			WHERE season = $season 
+				AND league = $league 
+				AND matchday <= $matchday
+			GROUP BY matchday
+			ORDER BY matchday ASC";
+			
+		$result = $db->sql_query($sql);
+
+		while($row = $db->sql_fetchrow($result))
+		{
+			$min = $min. $row['points_min']. ',';
+			$max = $max. $row['points_max']. ',';
+		}
+		$min = substr($min,0,strlen($min)-1);
+		$max = substr($max,0,strlen($max)-1);
+		$db->sql_freeresult($result);
+	}
+	// Create and display charts
+	$chart= "<img src='". generate_board_url() . '/' . $this->football_root_path
+		. "includes/chart_rank.php?t=$total_users&amp;m=$matchday&amp;v1=$ranks_total_1&amp;v2=$ranks_total_2&amp;v3=$ranks_total_3&amp;v4=$ranks_total_4&amp;c=" 
+		. sprintf($user->lang['PLACE']) . "' alt='" 
+		. sprintf($user->lang['CHART_TOTAL'])
+		. "'/>";
+	$template->assign_block_vars('chart_rank', array(
+		'CHARTIMAGE' => $chart,
+		)
+	);
+	$chart= "<img src='". generate_board_url() . '/' . $this->football_root_path
+		. "includes/chart_rank.php?t=$total_users&amp;m=$matchday&amp;v1=$ranks_dayl_1&amp;v2=$ranks_dayl_2&amp;v3=$ranks_dayl_3&amp;v4=$ranks_dayl_4&amp;c=" 
+		. sprintf($user->lang['PLACE']) . "' alt='" 
+		. sprintf($user->lang['CHART_MATCHDAY'])
+		. "'/>";
+	$template->assign_block_vars('chart_matchtdays', array(
+		'CHARTIMAGE' => $chart,
+		)
+	);
+	$chart= "<img src='". generate_board_url() . '/' . $this->football_root_path
+		. "includes/chart_points.php?m=$matchday&amp;v1=$points_1&amp;v2=$points_2&amp;v3=$points_3&amp;v4=$points_4&amp;min=$min&amp;max=$max&amp;c=" 
+		. sprintf($user->lang['POINTS']) . ',' . sprintf($user->lang['BANDWIDTH']) . "' alt='" 
+		. sprintf($user->lang['CHART_POINTS'])
+		. "'/>";
+	$template->assign_block_vars('chart_points', array(
+		'CHARTIMAGE' => $chart,
+		)
+	);
+}
+$sidename = sprintf($user->lang['MY_CHART']);
+$template->assign_vars(array(
+	'S_DISPLAY_MY_CHART' 		=> true,
+	'S_SIDENAME' 				=> $sidename,
+	'S_DATA_MY_CHART' 			=> $data,
+	'SEASON' 					=> $season,
+	'LEAGUE' 					=> $league,
+	'S_USER1' 					=> $user1,
+	'S_USER2' 					=> $user2,
+	'S_USER3' 					=> $user3,
+	'S_USER4' 					=> $user4,
+	'USERNAME1' 				=> $username,
+	'USERNAME2' 				=> $username2,
+	'USERNAME3' 				=> $username3,
+	'USERNAME4' 				=> $username4,
+	)
+);
 ?>

block/my_koeff.php

@@ -98,7 +98,6 @@ else
 	$split_after = $count_matches; 
 	$splits = 1;
 }
-$db->sql_freeresult($result);
 
 // Make sure $start is set to the last page if it exceeds the amount
 if ($start < 0 || $start >= $total_users)
@@ -192,7 +191,7 @@ foreach ($matches AS $match)
 					$total = 0;
 				}	
 				$bet_index++;
-				$total += $user_bet['points'];
+				$total += ($user_bet['points'] == '') ? 0 : $user_bet['points'];
 				if ($user_bet['status'] < 1 && !$config['football_view_bets'])
 				{
 					// hide bets
@@ -310,7 +309,7 @@ if ($count_matches > 0)
 			$total = 0;
 		}	
 		$bet_index++;
-		$total += $user_bet['points'];
+		$total += ($user_bet['points'] == '') ? 0 : $user_bet['points'];
 		if ($user_bet['status'] < 1)
 		{
 			if ($user_bet['bet_home'] == '')
@@ -376,12 +375,6 @@ $sidename = sprintf($user->lang['MY_KOEFF']);
 $template->assign_vars(array(
 	'S_DISPLAY_MY_KOEFF' 		=> true,
 	'S_SIDENAME' 				=> $sidename,
-	'U_LEFT' 					=> $this->helper->route('football_main_controller', array('side' => 'my_chart', 's' => $season, 'l' => $league, 'm' => $matchday)),
-	'LEFT_LINK' 				=> '&lt; ' . sprintf($user->lang['MY_CHART']),
-	'U_RIGHT' 					=> $this->helper->route('football_main_controller', array('side' => 'stat_points', 's' => $season, 'l' => $league, 'm' => $matchday)),
-	'RIGHT_LINK' 				=> sprintf($user->lang['STAT_POINTS']) . ' &gt;',
-	'LEFT_TITLE' 				=> sprintf($user->lang['TITLE_MY_CHART']),
-	'RIGHT_TITLE' 				=> sprintf($user->lang['TITLE_STAT_POINTS']),
 	'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),

block/my_points.php

@@ -1,204 +1,198 @@
-<?php
-/**
-*
-* @package phpBB Extension - Football Football
-* @copyright (c) 2016 football (http://football.bplaced.net)
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
-*
-*/
-
-if (!defined('IN_PHPBB') OR !defined('IN_FOOTBALL'))
-{
-	exit;
-}
-
-if (!$user_sel)
-{
-	if (user_is_member($user->data['user_id'], $season, $league))
-	{
-		$user_sel =  $user->data['user_id'];
-	}
-}
-$username = '';
-$ext_path = $this->phpbb_path_helper->update_web_root_path($this->phpbb_extension_manager->get_extension_path('football/football', true));
-
-$data = false;
-// Select user 
-$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))
-{
-	$data = true;
-	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);
-
-$rank = 0;
-// Select sum of users points group by team
-$sql = "SELECT
-		t.*,
-		SUM(1) AS bets,
-		SUM(IF((m.team_id_home = t.team_id), 
-				IF(b.goals_home + 0 > b.goals_guest, 1, 0), 
-				IF(b.goals_home + 0 < b.goals_guest, 1, 0)
-			)
-		) AS win,
-		SUM(IF(b.goals_home = b.goals_guest, 1, 0)) AS draw,
-		SUM(IF((m.team_id_home = t.team_id), 
-				IF(b.goals_home + 0 < b.goals_guest, 1, 0), 
-				IF(b.goals_home + 0 > b.goals_guest, 1, 0)
-			)
-		) AS lost,
-		SUM(IF((b.goals_home + 0 < b.goals_guest) <> (m.goals_home + 0 < m.goals_guest) 
-				OR (b.goals_home = b.goals_guest) <> (m.goals_home = m.goals_guest) 
-				OR (b.goals_home + 0 > b.goals_guest) <> (m.goals_home + 0 > m.goals_guest),
-				0,
-				IF((b.goals_home = m.goals_home) AND (b.goals_guest=m.goals_guest),
-					0,1
-				)
-			)
-		)AS tendencies,
-		SUM(IF((b.goals_home = m.goals_home) AND (b.goals_guest=m.goals_guest),1,0))AS hits,
-		" . select_points('m',true) . "
-	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_BETS . " AS b ON (b.season = t.season AND b.league = t.league AND b.match_no=m.match_no)
-	WHERE t.season = $season 
-		AND t.league = $league 
-		AND m.status IN (3,6) 
-		AND b.user_id = $user_sel 
-		AND b.goals_home <> '' 
-		AND b.goals_guest <> '' 
-		AND m.matchday <= $matchday
-	GROUP BY t.team_id
-	ORDER BY points DESC";
-	
-$result = $db->sql_query($sql);
-
-while($row = $db->sql_fetchrow($result))
-{
-	$rank++;
-	$row_class = (!($rank % 2)) ? 'bg1 row_light' : 'bg2 row_dark';
-	$logo = "<img src=\"" . $ext_path . 'images/flags/' . $row['team_symbol'] . "\" alt=\"" . $row['team_symbol'] . "\" width=\"28\" height=\"28\"/>" ;
-	$template->assign_block_vars('points', array(
-		'ROW_CLASS' 	=> $row_class,
-		'RANK' 			=> $rank,
-		'LOGO' 			=> $logo,
-		'TEAM' 			=> $row['team_name_short'],
-		'COUNT' 		=> $row['bets'],
-		'WIN' 			=> $row['win'],
-		'DRAW' 			=> $row['draw'],
-		'LOST' 			=> $row['lost'],
-		'DIRECTHITS' 	=> $row['hits'],
-		'TENDENCIES' 	=> $row['tendencies'],
-		'TOTAL' 		=> $row['hits'] + $row['tendencies'],
-		'POINTS' 		=> $row['points'],
-		)
-	);
-}
-$db->sql_freeresult($result);
-
-$rank = 0;
-// Select sum of all users points group by team
-$sql = "SELECT
-		t.*,
-		SUM(1) AS bets,
-		SUM(IF((m.team_id_home = t.team_id), 
-				IF(b.goals_home + 0 > b.goals_guest, 1, 0), 
-				IF(b.goals_home + 0 < b.goals_guest, 1, 0)
-			)
-		) AS win,
-		SUM(IF(b.goals_home = b.goals_guest, 1, 0)) AS draw,
-		SUM(IF((m.team_id_home = t.team_id), 
-				IF(b.goals_home + 0 < b.goals_guest, 1, 0), 
-				IF(b.goals_home + 0 > b.goals_guest, 1, 0)
-			)
-		) AS lost,
-		SUM(IF((b.goals_home + 0 < b.goals_guest) <> (m.goals_home + 0 < m.goals_guest) 
-				OR (b.goals_home = b.goals_guest) <> (m.goals_home = m.goals_guest) 
-				OR (b.goals_home + 0 > b.goals_guest) <> (m.goals_home + 0 > m.goals_guest),
-				0,
-				IF((b.goals_home = m.goals_home) AND (b.goals_guest = m.goals_guest), 0, 1)
-			)
-		)AS tendencies,
-		SUM(IF((b.goals_home = m.goals_home) AND (b.goals_guest = m.goals_guest), 1, 0)) AS hits,
-		" . select_points('m',true) . "
-	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_BETS . " AS b ON (b.season = t.season AND b.league = t.league AND b.match_no=m.match_no)
-	WHERE t.season = $season 
-		AND t.league = $league 
-		AND b.goals_home <> '' 
-		AND b.goals_guest <> '' 
-		AND m.status IN (3,6) 
-		AND m.matchday <= $matchday
-	GROUP BY t.team_id
-	ORDER BY points DESC";
-	
-$result = $db->sql_query($sql);
-
-while($row = $db->sql_fetchrow($result))
-{
-	$rank++;
-	$row_class = (!($rank % 2)) ? 'bg1 row_light' : 'bg2 row_dark';
-	$logo = "<img src=\"" . $ext_path . 'images/flags/' . $row['team_symbol'] . "\" alt=\"" . $row['team_symbol'] . "\" width=\"28\" height=\"28\"/>" ;
-	$template->assign_block_vars('allpoints', array(
-		'ROW_CLASS' 	=> $row_class,
-		'RANK' 			=> $rank,
-		'LOGO' 			=> $logo,
-		'TEAM' 			=> $row['team_name_short'],
-		'COUNT' 		=> $row['bets'],
-		'WIN' 			=> $row['win'],
-		'DRAW' 			=> $row['draw'],
-		'LOST' 			=> $row['lost'],
-		'DIRECTHITS' 	=> $row['hits'],
-		'TENDENCIES' 	=> $row['tendencies'],
-		'TOTAL' 		=> $row['hits'] + $row['tendencies'],
-		'POINTS' 		=> $row['points'],
-		)
-	);
-}
-$db->sql_freeresult($result);
-
-$sidename = sprintf($user->lang['MY_POINTS']);
-$template->assign_vars(array(
-	'S_DISPLAY_MY_POINTS' 		=> true,
-	'S_SIDENAME' 				=> $sidename,
-	'U_LEFT' 					=> $this->helper->route('football_main_controller', array('side' => 'my_bets', 's' => $season, 'l' => $league, 'm' => $matchday)),
-	'LEFT_LINK' 				=> '&lt; ' . sprintf($user->lang['MY_BETS']),
-	'U_RIGHT' 					=> $this->helper->route('football_main_controller', array('side' => 'my_table', 's' => $season, 'l' => $league, 'm' => $matchday)),
-	'RIGHT_LINK' 				=> sprintf($user->lang['MY_TABLE']) . ' &gt;',
-	'LEFT_TITLE' 				=> sprintf($user->lang['TITLE_MY_BETS']),
-	'RIGHT_TITLE' 				=> sprintf($user->lang['TITLE_MY_TABLE']),
-	'S_DATA_MY_POINTS' 			=> $data,
-	'SEASON' 					=> $season,
-	'LEAGUE' 					=> $league,
-	'USERNAME' 					=> $username,
-	)
-);
+<?php
+/**
+*
+* @package phpBB Extension - Football Football
+* @copyright (c) 2016 football (http://football.bplaced.net)
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+if (!defined('IN_PHPBB') OR !defined('IN_FOOTBALL'))
+{
+	exit;
+}
+
+if (!$user_sel)
+{
+	if (user_is_member($user->data['user_id'], $season, $league))
+	{
+		$user_sel =  $user->data['user_id'];
+	}
+}
+$username = '';
+$ext_path = $this->phpbb_path_helper->update_web_root_path($this->phpbb_extension_manager->get_extension_path('football/football', true));
+
+$data = false;
+// Select user 
+$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))
+{
+	$data = true;
+	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);
+
+$rank = 0;
+// Select sum of users points group by team
+$sql = "SELECT
+		t.*,
+		SUM(1) AS bets,
+		SUM(IF((m.team_id_home = t.team_id), 
+				IF(b.goals_home + 0 > b.goals_guest, 1, 0), 
+				IF(b.goals_home + 0 < b.goals_guest, 1, 0)
+			)
+		) AS win,
+		SUM(IF(b.goals_home = b.goals_guest, 1, 0)) AS draw,
+		SUM(IF((m.team_id_home = t.team_id), 
+				IF(b.goals_home + 0 < b.goals_guest, 1, 0), 
+				IF(b.goals_home + 0 > b.goals_guest, 1, 0)
+			)
+		) AS lost,
+		SUM(IF((b.goals_home + 0 < b.goals_guest) <> (m.goals_home + 0 < m.goals_guest) 
+				OR (b.goals_home = b.goals_guest) <> (m.goals_home = m.goals_guest) 
+				OR (b.goals_home + 0 > b.goals_guest) <> (m.goals_home + 0 > m.goals_guest),
+				0,
+				IF((b.goals_home = m.goals_home) AND (b.goals_guest=m.goals_guest),
+					0,1
+				)
+			)
+		)AS tendencies,
+		SUM(IF((b.goals_home = m.goals_home) AND (b.goals_guest=m.goals_guest),1,0))AS hits,
+		" . select_points('m',true) . "
+	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_BETS . " AS b ON (b.season = t.season AND b.league = t.league AND b.match_no=m.match_no)
+	WHERE t.season = $season 
+		AND t.league = $league 
+		AND m.status IN (3,6) 
+		AND b.user_id = $user_sel 
+		AND b.goals_home <> '' 
+		AND b.goals_guest <> '' 
+		AND m.matchday <= $matchday
+	GROUP BY t.team_id
+	ORDER BY points DESC";
+	
+$result = $db->sql_query($sql);
+
+while($row = $db->sql_fetchrow($result))
+{
+	$rank++;
+	$row_class = (!($rank % 2)) ? 'bg1 row_light' : 'bg2 row_dark';
+	$logo = "<img src=\"" . $ext_path . 'images/flags/' . $row['team_symbol'] . "\" alt=\"" . $row['team_symbol'] . "\" width=\"28\" height=\"28\"/>" ;
+	$template->assign_block_vars('points', array(
+		'ROW_CLASS' 	=> $row_class,
+		'RANK' 			=> $rank,
+		'LOGO' 			=> $logo,
+		'TEAM' 			=> $row['team_name_short'],
+		'COUNT' 		=> $row['bets'],
+		'WIN' 			=> $row['win'],
+		'DRAW' 			=> $row['draw'],
+		'LOST' 			=> $row['lost'],
+		'DIRECTHITS' 	=> $row['hits'],
+		'TENDENCIES' 	=> $row['tendencies'],
+		'TOTAL' 		=> $row['hits'] + $row['tendencies'],
+		'POINTS' 		=> $row['points'],
+		)
+	);
+}
+$db->sql_freeresult($result);
+
+$rank = 0;
+// Select sum of all users points group by team
+$sql = "SELECT
+		t.*,
+		SUM(1) AS bets,
+		SUM(IF((m.team_id_home = t.team_id), 
+				IF(b.goals_home + 0 > b.goals_guest, 1, 0), 
+				IF(b.goals_home + 0 < b.goals_guest, 1, 0)
+			)
+		) AS win,
+		SUM(IF(b.goals_home = b.goals_guest, 1, 0)) AS draw,
+		SUM(IF((m.team_id_home = t.team_id), 
+				IF(b.goals_home + 0 < b.goals_guest, 1, 0), 
+				IF(b.goals_home + 0 > b.goals_guest, 1, 0)
+			)
+		) AS lost,
+		SUM(IF((b.goals_home + 0 < b.goals_guest) <> (m.goals_home + 0 < m.goals_guest) 
+				OR (b.goals_home = b.goals_guest) <> (m.goals_home = m.goals_guest) 
+				OR (b.goals_home + 0 > b.goals_guest) <> (m.goals_home + 0 > m.goals_guest),
+				0,
+				IF((b.goals_home = m.goals_home) AND (b.goals_guest = m.goals_guest), 0, 1)
+			)
+		)AS tendencies,
+		SUM(IF((b.goals_home = m.goals_home) AND (b.goals_guest = m.goals_guest), 1, 0)) AS hits,
+		" . select_points('m',true) . "
+	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_BETS . " AS b ON (b.season = t.season AND b.league = t.league AND b.match_no=m.match_no)
+	WHERE t.season = $season 
+		AND t.league = $league 
+		AND b.goals_home <> '' 
+		AND b.goals_guest <> '' 
+		AND m.status IN (3,6) 
+		AND m.matchday <= $matchday
+	GROUP BY t.team_id
+	ORDER BY points DESC";
+	
+$result = $db->sql_query($sql);
+
+while($row = $db->sql_fetchrow($result))
+{
+	$rank++;
+	$row_class = (!($rank % 2)) ? 'bg1 row_light' : 'bg2 row_dark';
+	$logo = "<img src=\"" . $ext_path . 'images/flags/' . $row['team_symbol'] . "\" alt=\"" . $row['team_symbol'] . "\" width=\"28\" height=\"28\"/>" ;
+	$template->assign_block_vars('allpoints', array(
+		'ROW_CLASS' 	=> $row_class,
+		'RANK' 			=> $rank,
+		'LOGO' 			=> $logo,
+		'TEAM' 			=> $row['team_name_short'],
+		'COUNT' 		=> $row['bets'],
+		'WIN' 			=> $row['win'],
+		'DRAW' 			=> $row['draw'],
+		'LOST' 			=> $row['lost'],
+		'DIRECTHITS' 	=> $row['hits'],
+		'TENDENCIES' 	=> $row['tendencies'],
+		'TOTAL' 		=> $row['hits'] + $row['tendencies'],
+		'POINTS' 		=> $row['points'],
+		)
+	);
+}
+$db->sql_freeresult($result);
+
+$sidename = sprintf($user->lang['MY_POINTS']);
+$template->assign_vars(array(
+	'S_DISPLAY_MY_POINTS' 		=> true,
+	'S_SIDENAME' 				=> $sidename,
+	'S_DATA_MY_POINTS' 			=> $data,
+	'SEASON' 					=> $season,
+	'LEAGUE' 					=> $league,
+	'USERNAME' 					=> $username,
+	)
+);
 ?>

block/my_rank.php

@@ -1,179 +1,173 @@
-<?php
-/**
-*
-* @package phpBB Extension - Football Football
-* @copyright (c) 2016 football (http://football.bplaced.net)
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
-*
-*/
-
-if (!defined('IN_PHPBB') OR !defined('IN_FOOTBALL'))
-{
-	exit;
-}
-
-if (!$user_sel)
-{
-	if (user_is_member($user->data['user_id'], $season, $league))
-	{
-		$user_sel =  $user->data['user_id'];
-	}
-}
-$username = '';
-
-$data = false;
-// select user 
-$sql = 'SELECT DISTINCT
-		u.user_id,
-		u.username
-	FROM ' . FOOTB_BETS . ' AS w
-	LEFT JOIN ' . USERS_TABLE . " AS u ON (u.user_id = w.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))
-{
-	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);
-
-$rank = 0;
-// Get ranks 1-3 of selected user
-$sql = 'SELECT
-		season,
-		COUNT(matchday) AS matchdays,
-		SUM(points) AS points,
-		SUM(IF(rank = 1, 1, 0)) AS rank1,
-		SUM(IF(rank = 2, 1, 0)) AS rank2,
-		SUM(IF(rank = 3, 1, 0)) AS rank3
-	FROM ' . FOOTB_RANKS . " 
-	WHERE season = $season 
-		AND league = $league 
-		AND user_id = $user_sel
-	GROUP BY user_id, season
-	ORDER BY season ASC";
-	
-$result = $db->sql_query($sql);
-
-while($row = $db->sql_fetchrow($result))
-{
-	$rank++;
-	$row_class = (!($rank % 2)) ? 'bg1 row_light' : 'bg2 row_dark';
-	$template->assign_block_vars('myrank', array(
-		'ROW_CLASS' 	=> $row_class,
-		'SEASON' 		=> $row['season'],
-		'MATCHDAYS' 	=> $row['matchdays'],
-		'POINTS' 		=> $row['points'],
-		'RANK1' 		=> $row['rank1'],
-		'RANK2' 		=> $row['rank2'],
-		'RANK3' 		=> $row['rank3'],
-		)
-	);
-}
-$db->sql_freeresult($result);
-
-$rank = 0;
-// Get all ranks 1-3 of selected user
-$sql = 'SELECT
-		COUNT(matchday) AS matchdays,
-		rank
-	FROM ' . FOOTB_RANKS . " 
-	WHERE season = $season 
-		AND league = $league 
-		AND user_id = $user_sel
-	GROUP BY user_id, rank
-	ORDER BY rank ASC";
-	
-$result = $db->sql_query($sql);
-
-while($row = $db->sql_fetchrow($result))
-{
-	$rank++;
-	$row_class = (!($rank % 2)) ? 'bg1 row_light' : 'bg2 row_dark';
-	$template->assign_block_vars('season_ranks', array(
-		'ROW_CLASS' 	=> $row_class,
-		'RANK' 			=> $row['rank'],
-		'MATCHDAYS' 	=> $row['matchdays'],
-		)
-	);
-}
-$db->sql_freeresult($result);
-
-$rank = 0;
-// Get ranks 1-3 of all users
-$sql = 'SELECT
-		r.user_id,
-		u.username,
-		COUNT(r.matchday) AS matchdays,
-		SUM(r.points) AS points,
-		SUM(IF(r.rank =1, 1, 0)) AS rank1,
-		SUM(IF(r.rank =2, 1, 0)) AS rank2,
-		SUM(IF(r.rank =3, 1, 0)) AS rank3
-	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
-	GROUP BY r.user_id
-	ORDER BY rank1 DESC, rank2 DESC, rank3 DESC";
-
-$result = $db->sql_query($sql);
-while($row = $db->sql_fetchrow($result))
-{
-	$data = true;
-	$rank++;
-	$row_class = (!($rank % 2)) ? 'bg1 row_light' : 'bg2 row_dark';
-	if ($row['user_id'] == $user->data['user_id'])
-	{
-		$row_class = 'bg3  row_user';
-	}
-	$template->assign_block_vars('allranks', array(
-		'ROW_CLASS' 	=> $row_class,
-		'NAME' 			=> $row['username'],
-		'MATCHDAYS' 	=> $row['matchdays'],
-		'POINTS' 		=> $row['points'],
-		'AVERAGE' 		=> round($row['points'] / $row['matchdays'],1),
-		'RANK1' 		=> $row['rank1'],
-		'RANK2' 		=> $row['rank2'],
-		'RANK3' 		=> $row['rank3'],
-		)
-	);
-}
-$db->sql_freeresult($result);
-
-$sidename = sprintf($user->lang['MY_RANK']);
-$template->assign_vars(array(
-	'S_DISPLAY_MY_RANK' 		=> true,
-	'S_MATCHDAY_HIDE' 			=> true,
-	'S_SIDENAME' 				=> $sidename,
-	'U_LEFT' 					=> $this->helper->route('football_main_controller', array('side' => 'my_table', 's' => $season, 'l' => $league, 'm' => $matchday)),
-	'LEFT_LINK' 				=> '&lt; ' . sprintf($user->lang['MY_TABLE']),
-	'U_RIGHT' 					=> $this->helper->route('football_main_controller', array('side' => 'my_chart', 's' => $season, 'l' => $league, 'm' => $matchday)),
-	'RIGHT_LINK' 				=> sprintf($user->lang['MY_CHART']) . ' &gt;',
-	'LEFT_TITLE' 				=> sprintf($user->lang['TITLE_MY_TABLE']),
-	'RIGHT_TITLE' 				=> sprintf($user->lang['TITLE_MY_CHART']),
-	'S_DATA_MY_RANK' 			=> $data,
-	'SEASON' 					=> $season,
-	'LEAGUE' 					=> $league,
-	'USERNAME' 					=> $username,
-	)
-);
-
+<?php
+/**
+*
+* @package phpBB Extension - Football Football
+* @copyright (c) 2016 football (http://football.bplaced.net)
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+if (!defined('IN_PHPBB') OR !defined('IN_FOOTBALL'))
+{
+	exit;
+}
+
+if (!$user_sel)
+{
+	if (user_is_member($user->data['user_id'], $season, $league))
+	{
+		$user_sel =  $user->data['user_id'];
+	}
+}
+$username = '';
+
+$data = false;
+// select user 
+$sql = 'SELECT DISTINCT
+		u.user_id,
+		u.username
+	FROM ' . FOOTB_BETS . ' AS w
+	LEFT JOIN ' . USERS_TABLE . " AS u ON (u.user_id = w.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))
+{
+	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);
+
+$rank = 0;
+// Get ranks 1-3 of selected user
+$sql = 'SELECT
+		season,
+		COUNT(matchday) AS matchdays,
+		SUM(points) AS points,
+		SUM(IF(rank = 1, 1, 0)) AS rank1,
+		SUM(IF(rank = 2, 1, 0)) AS rank2,
+		SUM(IF(rank = 3, 1, 0)) AS rank3
+	FROM ' . FOOTB_RANKS . " 
+	WHERE season = $season 
+		AND league = $league 
+		AND user_id = $user_sel
+	GROUP BY user_id, season
+	ORDER BY season ASC";
+	
+$result = $db->sql_query($sql);
+
+while($row = $db->sql_fetchrow($result))
+{
+	$rank++;
+	$row_class = (!($rank % 2)) ? 'bg1 row_light' : 'bg2 row_dark';
+	$template->assign_block_vars('myrank', array(
+		'ROW_CLASS' 	=> $row_class,
+		'SEASON' 		=> $row['season'],
+		'MATCHDAYS' 	=> $row['matchdays'],
+		'POINTS' 		=> $row['points'],
+		'RANK1' 		=> $row['rank1'],
+		'RANK2' 		=> $row['rank2'],
+		'RANK3' 		=> $row['rank3'],
+		)
+	);
+}
+$db->sql_freeresult($result);
+
+$rank = 0;
+// Get all ranks 1-3 of selected user
+$sql = 'SELECT
+		COUNT(matchday) AS matchdays,
+		rank
+	FROM ' . FOOTB_RANKS . " 
+	WHERE season = $season 
+		AND league = $league 
+		AND user_id = $user_sel
+	GROUP BY user_id, rank
+	ORDER BY rank ASC";
+	
+$result = $db->sql_query($sql);
+
+while($row = $db->sql_fetchrow($result))
+{
+	$rank++;
+	$row_class = (!($rank % 2)) ? 'bg1 row_light' : 'bg2 row_dark';
+	$template->assign_block_vars('season_ranks', array(
+		'ROW_CLASS' 	=> $row_class,
+		'RANK' 			=> $row['rank'],
+		'MATCHDAYS' 	=> $row['matchdays'],
+		)
+	);
+}
+$db->sql_freeresult($result);
+
+$rank = 0;
+// Get ranks 1-3 of all users
+$sql = 'SELECT
+		r.user_id,
+		u.username,
+		COUNT(r.matchday) AS matchdays,
+		SUM(r.points) AS points,
+		SUM(IF(r.rank =1, 1, 0)) AS rank1,
+		SUM(IF(r.rank =2, 1, 0)) AS rank2,
+		SUM(IF(r.rank =3, 1, 0)) AS rank3
+	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
+	GROUP BY r.user_id
+	ORDER BY rank1 DESC, rank2 DESC, rank3 DESC";
+
+$result = $db->sql_query($sql);
+while($row = $db->sql_fetchrow($result))
+{
+	$data = true;
+	$rank++;
+	$row_class = (!($rank % 2)) ? 'bg1 row_light' : 'bg2 row_dark';
+	if ($row['user_id'] == $user->data['user_id'])
+	{
+		$row_class = 'bg3  row_user';
+	}
+	$template->assign_block_vars('allranks', array(
+		'ROW_CLASS' 	=> $row_class,
+		'NAME' 			=> $row['username'],
+		'MATCHDAYS' 	=> $row['matchdays'],
+		'POINTS' 		=> $row['points'],
+		'AVERAGE' 		=> round($row['points'] / $row['matchdays'],1),
+		'RANK1' 		=> $row['rank1'],
+		'RANK2' 		=> $row['rank2'],
+		'RANK3' 		=> $row['rank3'],
+		)
+	);
+}
+$db->sql_freeresult($result);
+
+$sidename = sprintf($user->lang['MY_RANK']);
+$template->assign_vars(array(
+	'S_DISPLAY_MY_RANK' 		=> true,
+	'S_MATCHDAY_HIDE' 			=> true,
+	'S_SIDENAME' 				=> $sidename,
+	'S_DATA_MY_RANK' 			=> $data,
+	'SEASON' 					=> $season,
+	'LEAGUE' 					=> $league,
+	'USERNAME' 					=> $username,
+	)
+);
+
 ?>

block/my_table.php

@@ -1,434 +1,426 @@
-<?php
-/**
-*
-* @package phpBB Extension - Football Football
-* @copyright (c) 2016 football (http://football.bplaced.net)
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
-*
-*/
-
-if (!defined('IN_PHPBB') OR !defined('IN_FOOTBALL'))
-{
-	exit;
-}
-
-if (!$user_sel)
-{
-	if (user_is_member($user->data['user_id'], $season, $league))
-	{
-		$user_sel =  $user->data['user_id'];
-	}
-}
-$username = '';
-$ext_path = $this->phpbb_path_helper->update_web_root_path($this->phpbb_extension_manager->get_extension_path('football/football', true));
-
-// select user 
-$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);
-
-if ($user_sel == 900)
-{
-	$selectid = ' selected="selected"';
-	$username = 'Alle';
-	$user_sel = 900;
-	$where_user = "";
-}
-else
-{
-	$selectid = '';
-	$where_user = "b.user_id = $user_sel AND ";
-}
-$template->assign_block_vars('form_user', array(
-	'S_USER'		=> 900,
-	'S_USERNAME' 	=> 'Alle',
-	'S_SELECTEDID' 	=> $selectid,
-	)
-);
-
-while($row = $db->sql_fetchrow($result))
-{
-	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);
-
-$data_table = false;
-$data_form = false;
-if ($matchday > 5)
-{
-	$form_from = $matchday - 5;
-}
-else
-{
-	$form_from = 1;
-}
-
-$sql = '
-	SELECT *
-	FROM ' . FOOTB_LEAGUES . " 
-	WHERE season = $season 
-		AND league = $league";
-		
-$result = $db->sql_query($sql);
-$row = $db->sql_fetchrow($result);
-$league_type = $row['league_type'];
-$db->sql_freeresult($result);
-
-$text_form = sprintf($user->lang['TABLE_FORM_FROM'], $form_from);
-
-$rank = 0;
-// Select table on selected user bets
-$sql = 'SELECT
-		t.*,
-		SUM(1) AS matches,
-		SUM(IF((m.team_id_home = t.team_id), 
-				IF(b.goals_home + 0 > b.goals_guest, 1, 0), 
-				IF(b.goals_home + 0 < b.goals_guest, 1, 0)
-			)
-		) AS win,
-		SUM(IF(b.goals_home = b.goals_guest, 1, 0)) AS draw,
-		SUM(IF((m.team_id_home = t.team_id), 
-				IF(b.goals_home + 0 < b.goals_guest, 1, 0), 
-				IF(b.goals_home + 0 > b.goals_guest, 1, 0)
-			)
-		) AS lost,
-		SUM(IF(m.team_id_home = t.team_id, 
-				IF(b.goals_home + 0 > b.goals_guest, 3, IF(b.goals_home = b.goals_guest, 1, 0)), 
-				IF(b.goals_home + 0 < b.goals_guest, 3, IF(b.goals_home = b.goals_guest, 1, 0))
-			)
-		) AS points,
-		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, 1, 0)), 
-				IF(m.goals_home + 0 < m.goals_guest, 3, IF(m.goals_home = m.goals_guest, 1, 0))
-			)
-		) AS realpoints,
-		SUM(IF(m.team_id_home = t.team_id, b.goals_home - b.goals_guest, b.goals_guest - b.goals_home)) AS goals_diff,
-		SUM(IF(m.team_id_home = t.team_id, b.goals_home, b.goals_guest)) AS goals,
-		SUM(IF(m.team_id_home = t.team_id, b.goals_guest, b.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) AND m.group_id = t.group_id)
-	LEFT JOIN ' . FOOTB_BETS . " AS b ON (b.season = t.season AND b.league = t.league AND b.match_no = m.match_no)
-	WHERE $where_user 
-		t.season = $season 
-		AND t.league = $league 
-		AND b.goals_home <> '' 
-		AND b.goals_guest <> '' 
-		AND m.matchday <= $matchday 
-	GROUP BY t.team_id
-	ORDER BY t.group_id ASC, points DESC, goals_diff DESC, goals DESC";
-	
-$result = $db->sql_query($sql);
-$lastGroup = '';
-$sumdiff = 0;
-while($row = $db->sql_fetchrow($result))
-{
-	if ($lastGroup != $row['group_id'])
-	{
-		$lastGroup = $row['group_id'];
-		$rank = 0;
-		$template->assign_block_vars('total', array(
-			'GROUP' => sprintf($user->lang['GROUP']) . ' ' . $row['group_id'],
-			)
-		);
-	}
-	if ($league_type != 2 OR $row['group_id'] != '')
-	{
-		$data_table = true;
-		$rank++;
-		$row_class = (!($rank % 2)) ? 'bg1 row_light' : 'bg2 row_dark';
-		$logo = "<img src=\"" . $ext_path . 'images/flags/' . $row['team_symbol'] . "\" alt=\"" . $row['team_symbol'] . "\" width=\"28\" height=\"28\"/>" ;
-		$pdiff = $row['points'] - $row['realpoints'];
-		if ($pdiff >= 0)
-		{
-			$sumdiff += $pdiff;
-			$pdiff = ' (+' . $pdiff . ')';
-
-		}
-		else
-		{
-			$sumdiff -= $pdiff;
-			$pdiff = ' (' . $pdiff . ')';
-		}
-		if ($user_sel == 900)
-		{
-			$pdiff = '';
-		}
-
-		$template->assign_block_vars('total', array(
-			'RANK' 			=> $rank . '.',
-			'ROW_CLASS' 	=> $row_class,
-			'LOGO' 			=> $logo,
-			'TEAM_ID' 		=> $row['team_id'],
-			'TEAM' 			=> $row['team_name_short'],
-			'U_PLAN_TEAM'	=> $this->helper->route('football_football_popup', array('popside' => 'viewplan_popup', 's' => $season, 'l' => $league,
-																				'tid' => $row['team_id'], 'mode' => 'played')),
-			'GAMES' 		=> $row['matches'],
-			'WIN' 			=> $row['win'],
-			'DRAW' 			=> $row['draw'],
-			'LOST' 			=> $row['lost'],
-			'GOALS' 		=> $row['goals'],
-			'GOALS_AGAINST' => $row['goals_against'],
-			'GOALS_DIFF' 	=> $row['goals_diff'],
-			'POINTS' 		=> $row['points'] . $pdiff,
-			)
-		);
-	}
-}
-$db->sql_freeresult($result);
-
-$rank = 0;
-// Select formtable on selected user bets
-$sql = 'SELECT
-		t.*,
-		SUM(1) AS matches,
-		SUM(IF((m.team_id_home = t.team_id), 
-				IF(b.goals_home + 0 > b.goals_guest, 1, 0), 
-				IF(b.goals_home + 0 < b.goals_guest, 1, 0)
-			)
-		) AS win,
-		SUM(IF(b.goals_home = b.goals_guest, 1, 0)) AS draw,
-		SUM(IF((m.team_id_home = t.team_id), 
-				IF(b.goals_home + 0 < b.goals_guest, 1, 0), 
-				IF(b.goals_home + 0 > b.goals_guest, 1, 0)
-			)
-		) AS lost,
-		SUM(IF(m.team_id_home = t.team_id, 
-				IF(b.goals_home + 0 > b.goals_guest, 3, IF(b.goals_home = b.goals_guest, 1, 0)), 
-				IF(b.goals_home + 0 < b.goals_guest, 3, IF(b.goals_home = b.goals_guest, 1, 0))
-			)
-		) AS points,
-		SUM(IF(m.team_id_home = t.team_id, b.goals_home - b.goals_guest, b.goals_guest - b.goals_home)) AS goals_diff,
-		SUM(IF(m.team_id_home = t.team_id, b.goals_home, b.goals_guest)) AS goals,
-		SUM(IF(m.team_id_home = t.team_id, b.goals_guest, b.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) AND m.group_id = t.group_id)
-	LEFT JOIN ' . FOOTB_BETS . " AS b ON (b.season = t.season AND b.league = t.league AND b.match_no = m.match_no)
-	WHERE $where_user 
-		t.season = $season 
-		AND t.league = $league 
-		AND b.goals_home <> '' 
-		AND b.goals_guest <> '' 
-		AND m.matchday >= $form_from 
-	GROUP BY t.team_id
-	ORDER BY t.group_id ASC, points DESC, goals_diff DESC, goals DESC";
-	
-$result = $db->sql_query($sql);
-$lastGroup = '';
-while($row = $db->sql_fetchrow($result))
-{
-	$data_form = true;
-	if ($lastGroup != $row['group_id'])
-	{
-		$lastGroup = $row['group_id'];
-		$rank = 0;
-		$template->assign_block_vars('form', array(
-			'GROUP' => sprintf($user->lang['GROUP']) . ' ' . $row['group_id'],
-			)
-		);
-	}
-	if ($league_type != 2 OR $row['group_id'] != '')
-	{
-		$rank++;
-		$row_class = (!($rank % 2)) ? 'bg1 row_light' : 'bg2 row_dark';
-		$logo = "<img src=\"" . $ext_path . 'images/flags/' . $row['team_symbol'] . "\" alt=\"" . $row['team_symbol'] . "\" width=\"28\" height=\"28\"/>" ;
-
-		$template->assign_block_vars('form', array(
-			'RANK' 			=> $rank . '.',
-			'ROW_CLASS' 	=> $row_class,
-			'LOGO' 			=> $logo,
-			'TEAM_ID' 		=> $row['team_id'],
-			'TEAM' 			=> $row['team_name_short'],
-			'U_PLAN_TEAM'	=> $this->helper->route('football_football_popup', array('popside' => 'viewplan_popup', 's' => $season, 'l' => $league,
-																				'tid' => $row['team_id'], 'mode' => 'rest')),
-			'GAMES' 		=> $row['matches'],
-			'WIN' 			=> $row['win'],
-			'DRAW' 			=> $row['draw'],
-			'LOST' 			=> $row['lost'],
-			'GOALS' 		=> $row['goals'],
-			'GOALS_AGAINST' => $row['goals_against'],
-			'GOALS_DIFF' 	=> $row['goals_diff'],
-			'POINTS' 		=> $row['points'],
-			)
-		);
-	}
-}
-$db->sql_freeresult($result);
-
-$rank = 0;
-// Select home-table on selected user bets
-$sql = 'SELECT
-		t.*,
-		SUM(1) AS matches,
-		SUM(IF(b.goals_home + 0 > b.goals_guest, 1, 0)) AS win,
-		SUM(IF(b.goals_home = b.goals_guest, 1, 0)) AS draw,
-		SUM(IF(b.goals_home + 0 < b.goals_guest, 1, 0)) AS lost,
-		SUM(IF(b.goals_home + 0 > b.goals_guest, 3, IF(b.goals_home = b.goals_guest, 1, 0))) AS points,
-		SUM(b.goals_home - b.goals_guest) AS goals_diff,
-		SUM(b.goals_home) AS goals,
-		SUM(b.goals_guest) 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 AND m.group_id = t.group_id)
-	LEFT JOIN ' . FOOTB_BETS . " AS b ON (b.season = t.season AND b.league = t.league AND b.match_no = m.match_no)
-	WHERE $where_user 
-		t.season = $season 
-		AND t.league = $league 
-		AND b.goals_home <> '' 
-		AND b.goals_guest <> '' 
-		AND m.matchday <= $matchday 
-	GROUP BY t.team_id
-	ORDER BY t.group_id ASC, points DESC, goals_diff DESC, goals DESC";
-	
-$result = $db->sql_query($sql);
-$lastGroup = '';
-while($row = $db->sql_fetchrow($result))
-{
-	if ($lastGroup != $row['group_id'])
-	{
-		$lastGroup = $row['group_id'];
-		$rank = 0;
-		$template->assign_block_vars('home', array(
-			'GROUP' => sprintf($user->lang['GROUP']) . ' ' . $row['group_id'],
-			)
-		);
-	}
-	if ($league_type != 2 OR $row['group_id'] != '')
-	{
-		$rank++;
-		$row_class = (!($rank % 2)) ? 'bg1 row_light' : 'bg2 row_dark';
-		$logo = "<img src=\"" . $ext_path . 'images/flags/' . $row['team_symbol'] . "\" alt=\"" . $row['team_symbol'] . "\" width=\"28\" height=\"28\"/>" ;
-
-		$template->assign_block_vars('home', array(
-			'RANK' 			=> $rank . '.',
-			'ROW_CLASS' 	=> $row_class,
-			'LOGO' 			=> $logo,
-			'TEAM_ID' 		=> $row['team_id'],
-			'TEAM' 			=> $row['team_name_short'],
-			'U_PLAN_TEAM'	=> $this->helper->route('football_football_popup', array('popside' => 'viewplan_popup', 's' => $season, 'l' => $league,
-																				'tid' => $row['team_id'], 'mode' => 'home')),
-			'GAMES' 		=> $row['matches'],
-			'WIN' 			=> $row['win'],
-			'DRAW' 			=> $row['draw'],
-			'LOST' 			=> $row['lost'],
-			'GOALS' 		=> $row['goals'],
-			'GOALS_AGAINST' => $row['goals_against'],
-			'GOALS_DIFF' 	=> $row['goals_diff'],
-			'POINTS' 		=> $row['points'],
-			)
-		);
-	}
-}
-$db->sql_freeresult($result);
-
-$rank = 0;
-// Select away-table on selected user bets
-$sql = 'SELECT
-		t.*,
-		SUM(1) AS matches,
-		SUM(IF(b.goals_home + 0 < b.goals_guest, 1, 0)) AS win,
-		SUM(IF(b.goals_home = b.goals_guest, 1, 0)) AS draw,
-		SUM(IF(b.goals_home + 0 > b.goals_guest, 1, 0)) AS lost,
-		SUM(IF(b.goals_home + 0 < b.goals_guest, 3, IF(b.goals_home = b.goals_guest, 1, 0))) AS points,
-		SUM(b.goals_guest - b.goals_home) AS goals_diff,
-		SUM(b.goals_guest) AS goals,
-		SUM(b.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 AND m.group_id = t.group_id)
-	LEFT JOIN ' . FOOTB_BETS . " AS b ON (b.season = t.season AND b.league = t.league AND b.match_no = m.match_no)
-	WHERE $where_user 
-		t.season = $season 
-		AND t.league = $league 
-		AND b.goals_home <> '' 
-		AND b.goals_guest <> '' 
-		AND m.matchday <= $matchday 
-	GROUP BY t.team_id
-	ORDER BY t.group_id ASC, points DESC, goals_diff DESC, goals DESC";
-	
-$result = $db->sql_query($sql);
-$lastGroup = '';
-while($row = $db->sql_fetchrow($result))
-{
-	if ($lastGroup != $row['group_id'])
-	{
-		$lastGroup = $row['group_id'];
-		$rank = 0;
-		$template->assign_block_vars('away', array(
-			'GROUP' 	=> sprintf($user->lang['GROUP']) . ' ' . $row['group_id'],
-			)
-		);
-	}
-	if ($league_type != 2 OR $row['group_id'] != '')
-	{
-		$rank++;
-		$row_class = (!($rank % 2)) ? 'bg1 row_light' : 'bg2 row_dark';
-		$logo = "<img src=\"" . $ext_path . 'images/flags/' . $row['team_symbol'] . "\" alt=\"" . $row['team_symbol'] . "\" width=\"28\" height=\"28\"/>" ;
-
-		$template->assign_block_vars('away', array(
-			'RANK' 			=> $rank . '.',
-			'ROW_CLASS' 	=> $row_class,
-			'LOGO' 			=> $logo,
-			'TEAM_ID' 		=> $row['team_id'],
-			'TEAM' 			=> $row['team_name_short'],
-			'U_PLAN_TEAM'	=> $this->helper->route('football_football_popup', array('popside' => 'viewplan_popup', 's' => $season, 'l' => $league,
-																				'tid' => $row['team_id'], 'mode' => 'away')),
-			'GAMES' 		=> $row['matches'],
-			'WIN' 			=> $row['win'],
-			'DRAW' 			=> $row['draw'],
-			'LOST' 			=> $row['lost'],
-			'GOALS' 		=> $row['goals'],
-			'GOALS_AGAINST' => $row['goals_against'],
-			'GOALS_DIFF' 	=> $row['goals_diff'],
-			'POINTS' 		=> $row['points'],
-			)
-		);
-	}
-}
-$db->sql_freeresult($result);
-
-$sidename = sprintf($user->lang['MY_TABLE']);
-$template->assign_vars(array(
-	'S_DISPLAY_MY_TABLE' 		=> true,
-	'S_SIDENAME' 				=> $sidename,
-	'U_LEFT' 					=> $this->helper->route('football_main_controller', array('side' => 'my_points', 's' => $season, 'l' => $league, 'm' => $matchday)),
-	'LEFT_LINK' 				=> '&lt; ' . sprintf($user->lang['MY_TABLE']),
-	'LEFT_LINK' 				=> '&lt; '	. sprintf($user->lang['MY_POINTS']),
-	'U_RIGHT' 					=> $this->helper->route('football_main_controller', array('side' => 'my_rank', 's' => $season, 'l' => $league, 'm' => $matchday)),
-	'LEFT_LINK' 				=> '&lt; ' . sprintf($user->lang['MY_TABLE']),
-	'RIGHT_LINK' 				=> sprintf($user->lang['MY_RANK'])	. ' &gt;',
-	'LEFT_TITLE' 				=> sprintf($user->lang['TITLE_MY_POINTS']),
-	'RIGHT_TITLE' 				=> sprintf($user->lang['TITLE_MY_RANKS']),
-	'S_DATA_MY_TABLE' 			=> $data_table,
-	'S_DATA_FORM' 				=> $data_form,
-	'SEASON' 					=> $season,
-	'LEAGUE' 					=> $league,
-	'TEXT_FORM' 				=> $text_form,
-	'S_PDIFF' 					=> $sumdiff,
-	'USERNAME' 					=> $username,
-	)
-);
-	
+<?php
+/**
+*
+* @package phpBB Extension - Football Football
+* @copyright (c) 2016 football (http://football.bplaced.net)
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+if (!defined('IN_PHPBB') OR !defined('IN_FOOTBALL'))
+{
+	exit;
+}
+
+if (!$user_sel)
+{
+	if (user_is_member($user->data['user_id'], $season, $league))
+	{
+		$user_sel =  $user->data['user_id'];
+	}
+}
+$username = '';
+$ext_path = $this->phpbb_path_helper->update_web_root_path($this->phpbb_extension_manager->get_extension_path('football/football', true));
+
+// select user 
+$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);
+
+if ($user_sel == 900)
+{
+	$selectid = ' selected="selected"';
+	$username = 'Alle';
+	$user_sel = 900;
+	$where_user = "";
+}
+else
+{
+	$selectid = '';
+	$where_user = "b.user_id = $user_sel AND ";
+}
+$template->assign_block_vars('form_user', array(
+	'S_USER'		=> 900,
+	'S_USERNAME' 	=> 'Alle',
+	'S_SELECTEDID' 	=> $selectid,
+	)
+);
+
+while($row = $db->sql_fetchrow($result))
+{
+	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);
+
+$data_table = false;
+$data_form = false;
+if ($matchday > 5)
+{
+	$form_from = $matchday - 5;
+}
+else
+{
+	$form_from = 1;
+}
+
+$sql = '
+	SELECT *
+	FROM ' . FOOTB_LEAGUES . " 
+	WHERE season = $season 
+		AND league = $league";
+		
+$result = $db->sql_query($sql);
+$row = $db->sql_fetchrow($result);
+$league_type = $row['league_type'];
+$db->sql_freeresult($result);
+
+$text_form = sprintf($user->lang['TABLE_FORM_FROM'], $form_from);
+
+$rank = 0;
+// Select table on selected user bets
+$sql = 'SELECT
+		t.*,
+		SUM(1) AS matches,
+		SUM(IF((m.team_id_home = t.team_id), 
+				IF(b.goals_home + 0 > b.goals_guest, 1, 0), 
+				IF(b.goals_home + 0 < b.goals_guest, 1, 0)
+			)
+		) AS win,
+		SUM(IF(b.goals_home = b.goals_guest, 1, 0)) AS draw,
+		SUM(IF((m.team_id_home = t.team_id), 
+				IF(b.goals_home + 0 < b.goals_guest, 1, 0), 
+				IF(b.goals_home + 0 > b.goals_guest, 1, 0)
+			)
+		) AS lost,
+		SUM(IF(m.team_id_home = t.team_id, 
+				IF(b.goals_home + 0 > b.goals_guest, 3, IF(b.goals_home = b.goals_guest, 1, 0)), 
+				IF(b.goals_home + 0 < b.goals_guest, 3, IF(b.goals_home = b.goals_guest, 1, 0))
+			)
+		) AS points,
+		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, 1, 0)), 
+				IF(m.goals_home + 0 < m.goals_guest, 3, IF(m.goals_home = m.goals_guest, 1, 0))
+			)
+		) AS realpoints,
+		SUM(IF(m.team_id_home = t.team_id, b.goals_home - b.goals_guest, b.goals_guest - b.goals_home)) AS goals_diff,
+		SUM(IF(m.team_id_home = t.team_id, b.goals_home, b.goals_guest)) AS goals,
+		SUM(IF(m.team_id_home = t.team_id, b.goals_guest, b.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) AND m.group_id = t.group_id)
+	LEFT JOIN ' . FOOTB_BETS . " AS b ON (b.season = t.season AND b.league = t.league AND b.match_no = m.match_no)
+	WHERE $where_user 
+		t.season = $season 
+		AND t.league = $league 
+		AND b.goals_home <> '' 
+		AND b.goals_guest <> '' 
+		AND m.matchday <= $matchday 
+	GROUP BY t.team_id
+	ORDER BY t.group_id ASC, points DESC, goals_diff DESC, goals DESC";
+	
+$result = $db->sql_query($sql);
+$lastGroup = '';
+$sumdiff = 0;
+while($row = $db->sql_fetchrow($result))
+{
+	if ($lastGroup != $row['group_id'])
+	{
+		$lastGroup = $row['group_id'];
+		$rank = 0;
+		$template->assign_block_vars('total', array(
+			'GROUP' => sprintf($user->lang['GROUP']) . ' ' . $row['group_id'],
+			)
+		);
+	}
+	if ($league_type != 2 OR $row['group_id'] != '')
+	{
+		$data_table = true;
+		$rank++;
+		$row_class = (!($rank % 2)) ? 'bg1 row_light' : 'bg2 row_dark';
+		$logo = "<img src=\"" . $ext_path . 'images/flags/' . $row['team_symbol'] . "\" alt=\"" . $row['team_symbol'] . "\" width=\"28\" height=\"28\"/>" ;
+		$pdiff = $row['points'] - $row['realpoints'];
+		if ($pdiff >= 0)
+		{
+			$sumdiff += $pdiff;
+			$pdiff = ' (+' . $pdiff . ')';
+
+		}
+		else
+		{
+			$sumdiff -= $pdiff;
+			$pdiff = ' (' . $pdiff . ')';
+		}
+		if ($user_sel == 900)
+		{
+			$pdiff = '';
+		}
+
+		$template->assign_block_vars('total', array(
+			'RANK' 			=> $rank . '.',
+			'ROW_CLASS' 	=> $row_class,
+			'LOGO' 			=> $logo,
+			'TEAM_ID' 		=> $row['team_id'],
+			'TEAM' 			=> $row['team_name_short'],
+			'U_PLAN_TEAM'	=> $this->helper->route('football_football_popup', array('popside' => 'viewplan_popup', 's' => $season, 'l' => $league,
+																				'tid' => $row['team_id'], 'mode' => 'played')),
+			'GAMES' 		=> $row['matches'],
+			'WIN' 			=> $row['win'],
+			'DRAW' 			=> $row['draw'],
+			'LOST' 			=> $row['lost'],
+			'GOALS' 		=> $row['goals'],
+			'GOALS_AGAINST' => $row['goals_against'],
+			'GOALS_DIFF' 	=> $row['goals_diff'],
+			'POINTS' 		=> $row['points'] . $pdiff,
+			)
+		);
+	}
+}
+$db->sql_freeresult($result);
+
+$rank = 0;
+// Select formtable on selected user bets
+$sql = 'SELECT
+		t.*,
+		SUM(1) AS matches,
+		SUM(IF((m.team_id_home = t.team_id), 
+				IF(b.goals_home + 0 > b.goals_guest, 1, 0), 
+				IF(b.goals_home + 0 < b.goals_guest, 1, 0)
+			)
+		) AS win,
+		SUM(IF(b.goals_home = b.goals_guest, 1, 0)) AS draw,
+		SUM(IF((m.team_id_home = t.team_id), 
+				IF(b.goals_home + 0 < b.goals_guest, 1, 0), 
+				IF(b.goals_home + 0 > b.goals_guest, 1, 0)
+			)
+		) AS lost,
+		SUM(IF(m.team_id_home = t.team_id, 
+				IF(b.goals_home + 0 > b.goals_guest, 3, IF(b.goals_home = b.goals_guest, 1, 0)), 
+				IF(b.goals_home + 0 < b.goals_guest, 3, IF(b.goals_home = b.goals_guest, 1, 0))
+			)
+		) AS points,
+		SUM(IF(m.team_id_home = t.team_id, b.goals_home - b.goals_guest, b.goals_guest - b.goals_home)) AS goals_diff,
+		SUM(IF(m.team_id_home = t.team_id, b.goals_home, b.goals_guest)) AS goals,
+		SUM(IF(m.team_id_home = t.team_id, b.goals_guest, b.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) AND m.group_id = t.group_id)
+	LEFT JOIN ' . FOOTB_BETS . " AS b ON (b.season = t.season AND b.league = t.league AND b.match_no = m.match_no)
+	WHERE $where_user 
+		t.season = $season 
+		AND t.league = $league 
+		AND b.goals_home <> '' 
+		AND b.goals_guest <> '' 
+		AND m.matchday >= $form_from 
+	GROUP BY t.team_id
+	ORDER BY t.group_id ASC, points DESC, goals_diff DESC, goals DESC";
+	
+$result = $db->sql_query($sql);
+$lastGroup = '';
+while($row = $db->sql_fetchrow($result))
+{
+	$data_form = true;
+	if ($lastGroup != $row['group_id'])
+	{
+		$lastGroup = $row['group_id'];
+		$rank = 0;
+		$template->assign_block_vars('form', array(
+			'GROUP' => sprintf($user->lang['GROUP']) . ' ' . $row['group_id'],
+			)
+		);
+	}
+	if ($league_type != 2 OR $row['group_id'] != '')
+	{
+		$rank++;
+		$row_class = (!($rank % 2)) ? 'bg1 row_light' : 'bg2 row_dark';
+		$logo = "<img src=\"" . $ext_path . 'images/flags/' . $row['team_symbol'] . "\" alt=\"" . $row['team_symbol'] . "\" width=\"28\" height=\"28\"/>" ;
+
+		$template->assign_block_vars('form', array(
+			'RANK' 			=> $rank . '.',
+			'ROW_CLASS' 	=> $row_class,
+			'LOGO' 			=> $logo,
+			'TEAM_ID' 		=> $row['team_id'],
+			'TEAM' 			=> $row['team_name_short'],
+			'U_PLAN_TEAM'	=> $this->helper->route('football_football_popup', array('popside' => 'viewplan_popup', 's' => $season, 'l' => $league,
+																				'tid' => $row['team_id'], 'mode' => 'rest')),
+			'GAMES' 		=> $row['matches'],
+			'WIN' 			=> $row['win'],
+			'DRAW' 			=> $row['draw'],
+			'LOST' 			=> $row['lost'],
+			'GOALS' 		=> $row['goals'],
+			'GOALS_AGAINST' => $row['goals_against'],
+			'GOALS_DIFF' 	=> $row['goals_diff'],
+			'POINTS' 		=> $row['points'],
+			)
+		);
+	}
+}
+$db->sql_freeresult($result);
+
+$rank = 0;
+// Select home-table on selected user bets
+$sql = 'SELECT
+		t.*,
+		SUM(1) AS matches,
+		SUM(IF(b.goals_home + 0 > b.goals_guest, 1, 0)) AS win,
+		SUM(IF(b.goals_home = b.goals_guest, 1, 0)) AS draw,
+		SUM(IF(b.goals_home + 0 < b.goals_guest, 1, 0)) AS lost,
+		SUM(IF(b.goals_home + 0 > b.goals_guest, 3, IF(b.goals_home = b.goals_guest, 1, 0))) AS points,
+		SUM(b.goals_home - b.goals_guest) AS goals_diff,
+		SUM(b.goals_home) AS goals,
+		SUM(b.goals_guest) 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 AND m.group_id = t.group_id)
+	LEFT JOIN ' . FOOTB_BETS . " AS b ON (b.season = t.season AND b.league = t.league AND b.match_no = m.match_no)
+	WHERE $where_user 
+		t.season = $season 
+		AND t.league = $league 
+		AND b.goals_home <> '' 
+		AND b.goals_guest <> '' 
+		AND m.matchday <= $matchday 
+	GROUP BY t.team_id
+	ORDER BY t.group_id ASC, points DESC, goals_diff DESC, goals DESC";
+	
+$result = $db->sql_query($sql);
+$lastGroup = '';
+while($row = $db->sql_fetchrow($result))
+{
+	if ($lastGroup != $row['group_id'])
+	{
+		$lastGroup = $row['group_id'];
+		$rank = 0;
+		$template->assign_block_vars('home', array(
+			'GROUP' => sprintf($user->lang['GROUP']) . ' ' . $row['group_id'],
+			)
+		);
+	}
+	if ($league_type != 2 OR $row['group_id'] != '')
+	{
+		$rank++;
+		$row_class = (!($rank % 2)) ? 'bg1 row_light' : 'bg2 row_dark';
+		$logo = "<img src=\"" . $ext_path . 'images/flags/' . $row['team_symbol'] . "\" alt=\"" . $row['team_symbol'] . "\" width=\"28\" height=\"28\"/>" ;
+
+		$template->assign_block_vars('home', array(
+			'RANK' 			=> $rank . '.',
+			'ROW_CLASS' 	=> $row_class,
+			'LOGO' 			=> $logo,
+			'TEAM_ID' 		=> $row['team_id'],
+			'TEAM' 			=> $row['team_name_short'],
+			'U_PLAN_TEAM'	=> $this->helper->route('football_football_popup', array('popside' => 'viewplan_popup', 's' => $season, 'l' => $league,
+																				'tid' => $row['team_id'], 'mode' => 'home')),
+			'GAMES' 		=> $row['matches'],
+			'WIN' 			=> $row['win'],
+			'DRAW' 			=> $row['draw'],
+			'LOST' 			=> $row['lost'],
+			'GOALS' 		=> $row['goals'],
+			'GOALS_AGAINST' => $row['goals_against'],
+			'GOALS_DIFF' 	=> $row['goals_diff'],
+			'POINTS' 		=> $row['points'],
+			)
+		);
+	}
+}
+$db->sql_freeresult($result);
+
+$rank = 0;
+// Select away-table on selected user bets
+$sql = 'SELECT
+		t.*,
+		SUM(1) AS matches,
+		SUM(IF(b.goals_home + 0 < b.goals_guest, 1, 0)) AS win,
+		SUM(IF(b.goals_home = b.goals_guest, 1, 0)) AS draw,
+		SUM(IF(b.goals_home + 0 > b.goals_guest, 1, 0)) AS lost,
+		SUM(IF(b.goals_home + 0 < b.goals_guest, 3, IF(b.goals_home = b.goals_guest, 1, 0))) AS points,
+		SUM(b.goals_guest - b.goals_home) AS goals_diff,
+		SUM(b.goals_guest) AS goals,
+		SUM(b.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 AND m.group_id = t.group_id)
+	LEFT JOIN ' . FOOTB_BETS . " AS b ON (b.season = t.season AND b.league = t.league AND b.match_no = m.match_no)
+	WHERE $where_user 
+		t.season = $season 
+		AND t.league = $league 
+		AND b.goals_home <> '' 
+		AND b.goals_guest <> '' 
+		AND m.matchday <= $matchday 
+	GROUP BY t.team_id
+	ORDER BY t.group_id ASC, points DESC, goals_diff DESC, goals DESC";
+	
+$result = $db->sql_query($sql);
+$lastGroup = '';
+while($row = $db->sql_fetchrow($result))
+{
+	if ($lastGroup != $row['group_id'])
+	{
+		$lastGroup = $row['group_id'];
+		$rank = 0;
+		$template->assign_block_vars('away', array(
+			'GROUP' 	=> sprintf($user->lang['GROUP']) . ' ' . $row['group_id'],
+			)
+		);
+	}
+	if ($league_type != 2 OR $row['group_id'] != '')
+	{
+		$rank++;
+		$row_class = (!($rank % 2)) ? 'bg1 row_light' : 'bg2 row_dark';
+		$logo = "<img src=\"" . $ext_path . 'images/flags/' . $row['team_symbol'] . "\" alt=\"" . $row['team_symbol'] . "\" width=\"28\" height=\"28\"/>" ;
+
+		$template->assign_block_vars('away', array(
+			'RANK' 			=> $rank . '.',
+			'ROW_CLASS' 	=> $row_class,
+			'LOGO' 			=> $logo,
+			'TEAM_ID' 		=> $row['team_id'],
+			'TEAM' 			=> $row['team_name_short'],
+			'U_PLAN_TEAM'	=> $this->helper->route('football_football_popup', array('popside' => 'viewplan_popup', 's' => $season, 'l' => $league,
+																				'tid' => $row['team_id'], 'mode' => 'away')),
+			'GAMES' 		=> $row['matches'],
+			'WIN' 			=> $row['win'],
+			'DRAW' 			=> $row['draw'],
+			'LOST' 			=> $row['lost'],
+			'GOALS' 		=> $row['goals'],
+			'GOALS_AGAINST' => $row['goals_against'],
+			'GOALS_DIFF' 	=> $row['goals_diff'],
+			'POINTS' 		=> $row['points'],
+			)
+		);
+	}
+}
+$db->sql_freeresult($result);
+
+$sidename = sprintf($user->lang['MY_TABLE']);
+$template->assign_vars(array(
+	'S_DISPLAY_MY_TABLE' 		=> true,
+	'S_SIDENAME' 				=> $sidename,
+	'S_DATA_MY_TABLE' 			=> $data_table,
+	'S_DATA_FORM' 				=> $data_form,
+	'SEASON' 					=> $season,
+	'LEAGUE' 					=> $league,
+	'TEXT_FORM' 				=> $text_form,
+	'S_PDIFF' 					=> $sumdiff,
+	'USERNAME' 					=> $username,
+	)
+);
+	
 ?>

block/odds.php

@@ -1,211 +1,205 @@
-<?php
-/**
-*
-* @package phpBB Extension - Football Football
-* @copyright (c) 2016 football (http://football.bplaced.net)
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
-*
-*/
-
-if (!defined('IN_PHPBB') OR !defined('IN_FOOTBALL'))
-{
-	exit;
-}
-
-$data_odds 	= false;
-$matchnumber = 0;
-$lang_dates 	= $user->lang['datetime'];
-
-$sql = "SELECT
-		m.league,
-		m.match_no,
-		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,
-		t1.team_symbol AS home_symbol,
-		t2.team_symbol AS guest_symbol,
-		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,
-		m.goals_overtime_home AS kogoals_home,
-		m.goals_overtime_guest AS kogoals_guest,
-		m.ko_match,
-		m.group_id,
-		m.formula_home,
-		m.formula_guest,
-		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";
-	
-$result = $db->sql_query($sql);
-$rows = $db->sql_fetchrowset($result);
-
-$league_info = league_info($season, $league);
-$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))
-foreach ($rows as $row)
-{
-	$data_odds = true;
-	$matchnumber++ ;
-	$row_class = (!($matchnumber % 2)) ? 'bg1 row_light' : 'bg2 row_dark';
-	if (0 == $row['home_id'])
-	{
-		$home_info 		= get_team($season, $league, $row['match_no'], 'team_id_home', $row['formula_home']);
-		$home_in_array 	= explode("#",$home_info);
-		$homelogo 		= $home_in_array[0];
-		$homeid 		= $home_in_array[1];
-		$homename 		= $home_in_array[2];
-	}
-	else
-	{
-		$homelogo 	= $row['home_symbol'];
-		$homeid 	= $row['home_id'];
-		$homename 	= $row['home_name'];
-	}
-	if (0 == $row['guest_id'])
-	{
-		$guest_info 	= get_team($season, $league, $row['match_no'], 'team_id_guest', $row['formula_guest']);
-		$guest_in_array = explode("#",$guest_info);
-		$guestlogo 		= $guest_in_array[0];
-		$guestid 		= $guest_in_array[1];
-		$guestname 		= $guest_in_array[2];
-	}
-	else
-	{
-		$guestlogo 	= $row['guest_symbol'];
-		$guestid 	= $row['guest_id'];
-		$guestname 	= $row['guest_name'];
-	}
-	if ($homelogo <> '')
-	{
-		$logoH = "<img src=\"" . $ext_path . 'images/flags/' . $homelogo . "\" alt=\"" . $homelogo . "\" width=\"28\" height=\"28\"/>" ;
-	}
-	else
-	{
-		$logoH = "<img src=\"" . $ext_path . "images/flags/blank.gif\" alt=\"\" width=\"28\" height=\"28\"/>" ;
-	}
-	if ($guestlogo <> '')
-	{
-		$logoG = "<img src=\"" . $ext_path . 'images/flags/' . $guestlogo . "\" alt=\"" . $guestlogo . "\" width=\"28\" height=\"28\"/>" ;
-	}
-	else
-	{
-		$logoG = "<img src=\"" . $ext_path . "images/flags/blank.gif\" alt=\"\" width=\"28\" height=\"28\"/>" ;
-	}
-
-	if ($row['ko_match'])
-	{
-		$display_ko = true;
-		$ko_match = true;
-	}
-	else
-	{
-		$ko_match = false;
-	}
-
-	if ($row['group_id'] == '')
-	{
-		$group_id = '&nbsp;';
-	}
-	else
-	{
-		$display_group = true;
-		$group_id = $row['group_id'];
-	}
-
-	$edit_match 	= false;
-	$goals_home		= ($row['goals_home'] == '') ? '&nbsp;' : $row['goals_home'];
-	$goals_guest	= ($row['goals_guest'] == '') ? '&nbsp;' : $row['goals_guest'];
-	$kogoals_home	= ($row['kogoals_home'] == '') ? '&nbsp;' : $row['kogoals_home'];
-	$kogoals_guest	= ($row['kogoals_guest'] == '') ? '&nbsp;' : $row['kogoals_guest'];
-
-	$template->assign_block_vars('odds', array(
-		'ROW_CLASS' 	=> $row_class,
-		'MATCH_NUMBER' 	=> $row['match_no'],
-		'MATCHDAY' 		=> $matchday,
-		'MATCH_TIME' 	=> $row['match_time'],
-		'GROUP' 		=> $group_id,
-		'HOME_ID' 		=> $homeid,
-		'GUEST_ID' 		=> $guestid,
-		'LOGO_HOME' 	=> $logoH,
-		'LOGO_GUEST' 	=> $logoG,
-		'HOME_NAME' 	=> $homename,
-		'GUEST_NAME' 	=> $guestname,
-		'U_PLAN_HOME'	=> $this->helper->route('football_football_popup', array('popside' => 'viewplan_popup', 's' => $season, 'l' => $league,
-																			'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')),
-		'GOALS_HOME' 	=> $goals_home,
-		'GOALS_GUEST'	=> $goals_guest,
-		'COLOR_STYLE' 	=> '',
-		'KOGOALS_HOME' 	=> $kogoals_home,
-		'KOGOALS_GUEST'	=> $kogoals_guest,
-		'S_KO_MATCH' 	=> $ko_match,
-		'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, 
-																			'mn' => $row['match_no'], 'gr' => $row['group_id'])),
-		'ODD_1' 		=> $row['odd_1'],
-		'ODD_X' 		=> $row['odd_x'],
-		'ODD_2' 		=> $row['odd_2'],
-		)
-	);
-}
-$db->sql_freeresult($result);
-
-$sidename = 'Chancen';
-switch ($league_info['bet_ko_type'])
-{
-	case BET_KO_90:
-		$result_explain = sprintf($user->lang['MIN90']);
-		$label_finalresult = sprintf($user->lang['EXTRATIME_SHORT']) . '/' . sprintf($user->lang['PENALTY_SHORT']);
-		break;
-	case BET_KO_EXTRATIME:
-		$result_explain = sprintf($user->lang['EXTRATIME_SHORT']);
-		$label_finalresult = sprintf($user->lang['PENALTY']);
-		break;
-	case BET_KO_PENALTY:
-		$result_explain = sprintf($user->lang['PENALTY']);
-		$display_ko = false;
-		break;
-	default:
-		$result_explain = sprintf($user->lang['MIN90']);
-		$label_finalresult = sprintf($user->lang['EXTRATIME_SHORT']) . '/' . sprintf($user->lang['PENALTY_SHORT']);
-		break;
-}
-
-$template->assign_vars(array(
-	'S_DISPLAY_ODDS' 			=> true,
-	'S_SIDENAME' 				=> $sidename,
-	'RESULT_EXPLAIN' 			=> $result_explain,
-	'LABEL_FINALRESULT' 		=> $label_finalresult,
-	'U_LEFT' 					=> $this->helper->route('football_main_controller', array('side' => 'bet', 's' => $season, 'l' => $league, 'm' => $matchday)),
-	'LEFT_LINK' 				=> '&lt; ' . sprintf($user->lang['BET']),
-	'U_RIGHT' 					=> $this->helper->route('football_main_controller', array('side' => 'table', 's' => $season, 'l' => $league, 'm' => $matchday)),
-	'RIGHT_LINK' 				=> sprintf($user->lang['TABLE']) . ' &gt;',
-	'LEFT_TITLE' 				=> sprintf($user->lang['TITLE_BET']),
-	'RIGHT_TITLE' 				=> sprintf($user->lang['TITLE_TABLE']),
-	'S_DATA_ODDS' 				=> $data_odds,
-	)
-);
-
+<?php
+/**
+*
+* @package phpBB Extension - Football Football
+* @copyright (c) 2016 football (http://football.bplaced.net)
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+if (!defined('IN_PHPBB') OR !defined('IN_FOOTBALL'))
+{
+	exit;
+}
+
+$data_odds 	= false;
+$matchnumber = 0;
+$lang_dates 	= $user->lang['datetime'];
+
+$sql = "SELECT
+		m.league,
+		m.match_no,
+		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,
+		t1.team_symbol AS home_symbol,
+		t2.team_symbol AS guest_symbol,
+		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,
+		m.goals_overtime_home AS kogoals_home,
+		m.goals_overtime_guest AS kogoals_guest,
+		m.ko_match,
+		m.group_id,
+		m.formula_home,
+		m.formula_guest,
+		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";
+	
+$result = $db->sql_query($sql);
+$rows = $db->sql_fetchrowset($result);
+
+$league_info = league_info($season, $league);
+$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))
+foreach ($rows as $row)
+{
+	$data_odds = true;
+	$matchnumber++ ;
+	$row_class = (!($matchnumber % 2)) ? 'bg1 row_light' : 'bg2 row_dark';
+	if (0 == $row['home_id'])
+	{
+		$home_info 		= get_team($season, $league, $row['match_no'], 'team_id_home', $row['formula_home']);
+		$home_in_array 	= explode("#",$home_info);
+		$homelogo 		= $home_in_array[0];
+		$homeid 		= $home_in_array[1];
+		$homename 		= $home_in_array[2];
+	}
+	else
+	{
+		$homelogo 	= $row['home_symbol'];
+		$homeid 	= $row['home_id'];
+		$homename 	= $row['home_name'];
+	}
+	if (0 == $row['guest_id'])
+	{
+		$guest_info 	= get_team($season, $league, $row['match_no'], 'team_id_guest', $row['formula_guest']);
+		$guest_in_array = explode("#",$guest_info);
+		$guestlogo 		= $guest_in_array[0];
+		$guestid 		= $guest_in_array[1];
+		$guestname 		= $guest_in_array[2];
+	}
+	else
+	{
+		$guestlogo 	= $row['guest_symbol'];
+		$guestid 	= $row['guest_id'];
+		$guestname 	= $row['guest_name'];
+	}
+	if ($homelogo <> '')
+	{
+		$logoH = "<img src=\"" . $ext_path . 'images/flags/' . $homelogo . "\" alt=\"" . $homelogo . "\" width=\"28\" height=\"28\"/>" ;
+	}
+	else
+	{
+		$logoH = "<img src=\"" . $ext_path . "images/flags/blank.gif\" alt=\"\" width=\"28\" height=\"28\"/>" ;
+	}
+	if ($guestlogo <> '')
+	{
+		$logoG = "<img src=\"" . $ext_path . 'images/flags/' . $guestlogo . "\" alt=\"" . $guestlogo . "\" width=\"28\" height=\"28\"/>" ;
+	}
+	else
+	{
+		$logoG = "<img src=\"" . $ext_path . "images/flags/blank.gif\" alt=\"\" width=\"28\" height=\"28\"/>" ;
+	}
+
+	if ($row['ko_match'])
+	{
+		$display_ko = true;
+		$ko_match = true;
+	}
+	else
+	{
+		$ko_match = false;
+	}
+
+	if ($row['group_id'] == '')
+	{
+		$group_id = '&nbsp;';
+	}
+	else
+	{
+		$display_group = true;
+		$group_id = $row['group_id'];
+	}
+
+	$edit_match 	= false;
+	$goals_home		= ($row['goals_home'] == '') ? '&nbsp;' : $row['goals_home'];
+	$goals_guest	= ($row['goals_guest'] == '') ? '&nbsp;' : $row['goals_guest'];
+	$kogoals_home	= ($row['kogoals_home'] == '') ? '&nbsp;' : $row['kogoals_home'];
+	$kogoals_guest	= ($row['kogoals_guest'] == '') ? '&nbsp;' : $row['kogoals_guest'];
+
+	$template->assign_block_vars('odds', array(
+		'ROW_CLASS' 	=> $row_class,
+		'MATCH_NUMBER' 	=> $row['match_no'],
+		'MATCHDAY' 		=> $matchday,
+		'MATCH_TIME' 	=> $row['match_time'],
+		'GROUP' 		=> $group_id,
+		'HOME_ID' 		=> $homeid,
+		'GUEST_ID' 		=> $guestid,
+		'LOGO_HOME' 	=> $logoH,
+		'LOGO_GUEST' 	=> $logoG,
+		'HOME_NAME' 	=> $homename,
+		'GUEST_NAME' 	=> $guestname,
+		'U_PLAN_HOME'	=> $this->helper->route('football_football_popup', array('popside' => 'viewplan_popup', 's' => $season, 'l' => $league,
+																			'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')),
+		'GOALS_HOME' 	=> $goals_home,
+		'GOALS_GUEST'	=> $goals_guest,
+		'COLOR_STYLE' 	=> '',
+		'KOGOALS_HOME' 	=> $kogoals_home,
+		'KOGOALS_GUEST'	=> $kogoals_guest,
+		'S_KO_MATCH' 	=> $ko_match,
+		'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, 
+																			'mn' => $row['match_no'], 'gr' => $row['group_id'])),
+		'ODD_1' 		=> $row['odd_1'],
+		'ODD_X' 		=> $row['odd_x'],
+		'ODD_2' 		=> $row['odd_2'],
+		)
+	);
+}
+$db->sql_freeresult($result);
+
+$sidename = 'Chancen';
+switch ($league_info['bet_ko_type'])
+{
+	case BET_KO_90:
+		$result_explain = sprintf($user->lang['MIN90']);
+		$label_finalresult = sprintf($user->lang['EXTRATIME_SHORT']) . '/' . sprintf($user->lang['PENALTY_SHORT']);
+		break;
+	case BET_KO_EXTRATIME:
+		$result_explain = sprintf($user->lang['EXTRATIME_SHORT']);
+		$label_finalresult = sprintf($user->lang['PENALTY']);
+		break;
+	case BET_KO_PENALTY:
+		$result_explain = sprintf($user->lang['PENALTY']);
+		$display_ko = false;
+		break;
+	default:
+		$result_explain = sprintf($user->lang['MIN90']);
+		$label_finalresult = sprintf($user->lang['EXTRATIME_SHORT']) . '/' . sprintf($user->lang['PENALTY_SHORT']);
+		break;
+}
+
+$template->assign_vars(array(
+	'S_DISPLAY_ODDS' 			=> true,
+	'S_SIDENAME' 				=> $sidename,
+	'RESULT_EXPLAIN' 			=> $result_explain,
+	'LABEL_FINALRESULT' 		=> $label_finalresult,
+	'S_DATA_ODDS' 				=> $data_odds,
+	)
+);
+
 ?>

block/ranks_matchday.php

@@ -1,270 +1,261 @@
-<?php
-/**
-*
-* @package phpBB Extension - Football Football
-* @copyright (c) 2016 football (http://football.bplaced.net)
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
-*
-*/
-
-if (!defined('IN_PHPBB') OR !defined('IN_FOOTBALL'))
-{
-	exit;
-}
-
-$start = $this->request->variable('start', 0);
-$win_user_most_hits = array();
-$win_user_most_hits_away = array();
-$season_wins = array();
-$win_user_most_hits = win_user_most_hits($season, $league, $matchday);
-$win_user_most_hits_away = win_user_most_hits_away($season, $league, $matchday);
-
-// Statistics of matchday
-$sql = "SELECT
-		b.user_id,
-		COUNT(b.match_no) AS matches,
-		SUM(IF(b.goals_home <> '' AND b.goals_guest <> '', 1, 0)) AS bets,
-		SUM(IF(b.goals_home <> '' AND b.goals_guest <> '',
-				IF((b.goals_home = m.goals_home) AND (b.goals_guest = m.goals_guest), 1, 0),
-				0
-			)
-		) AS hits,
-		SUM(IF(b.goals_home <> '' AND b.goals_guest <> '',
-				IF((m.goals_home <= m.goals_guest), 
-					IF((b.goals_home = m.goals_home) AND (b.goals_guest = m.goals_guest), 1, 0),
-					0
-				),
-				0
-			)
-		) AS hits02,
-		SUM(IF(b.goals_home <> '' AND b.goals_guest <> '',
-				IF((b.goals_home + 0 < b.goals_guest) <> (m.goals_home + 0 < m.goals_guest) OR 
-				   (b.goals_home = b.goals_guest) <> (m.goals_home = m.goals_guest) OR 
-				   (b.goals_home + 0 > b.goals_guest) <> (m.goals_home + 0 > m.goals_guest),
-					0,
-					IF((b.goals_home = m.goals_home) AND (b.goals_guest = m.goals_guest), 0, 1)
-				),
-				0
-			)
-		) AS tendency
-	FROM " . FOOTB_BETS . ' AS b
-	LEFT JOIN ' . FOOTB_MATCHES . " AS m ON (m.season = b.season AND m.league = b.league AND m.match_no = b.match_no)
-	WHERE b.season = $season 
-		AND b.league = $league 
-		AND m.status IN (2,3) 
-		AND m.matchday = $matchday
-	GROUP BY user_id";
-
-$result = $db->sql_query($sql);
-$usersstats = $db->sql_fetchrowset($result);
-$db->sql_freeresult($result);
-foreach ($usersstats AS $userstats)
-{
-	$betsof[$userstats['user_id']] 			= $userstats['bets'];
-	$nobetsof[$userstats['user_id']] 		= $userstats['matches'] - $userstats['bets'];
-	$tendenciesof[$userstats['user_id']] 	= $userstats['tendency'];
-	$hitsof[$userstats['user_id']] 			= $userstats['hits'];
-	$hits02of[$userstats['user_id']] 		= $userstats['hits02'];
-}
-
-// ranks of matchday
-$sql = 'SELECT
-		rank,
-		user_id
-	FROM '. FOOTB_RANKS . "
-	WHERE season = $season 
-		AND league = $league 
-		AND matchday = $matchday 
-		AND status IN (2,3)
-	ORDER BY rank ASC, user_id ASC";
-$result = $db->sql_query($sql);
-$ranks = $db->sql_fetchrowset($result);
-$db->sql_freeresult($result);
-$total_users = sizeof($ranks);
-foreach ($ranks AS $rank)
-{
-	$rankof[$rank['user_id']] = $rank['rank'];
-}
-
-if ($matchday > 1)
-{
-	// rank previous matchday
-	$sql = 'SELECT
-			rank AS last_rang,
-			user_id
-		FROM '. FOOTB_RANKS . "
-		WHERE season = $season 
-			AND league = $league 
-			AND matchday = ($matchday-1) 
-			AND status IN (2,3)
-		ORDER BY last_rang ASC, user_id ASC";
-		
-	$result = $db->sql_query($sql);
-	$ranks = $db->sql_fetchrowset($result);
-	$db->sql_freeresult($result);
-
-	foreach ($ranks AS $rank)
-	{
-		$prevrankof[$rank['user_id']] = $rank['last_rang'];
-	}
-}
-
-if ($matchday == $maxmatchday)
-{
-	$season_wins = season_wins($season, $league, $matchday);
-}
-
-// Make sure $start is set to the last page if it exceeds the amount
-if ($start < 0 || $start >= $total_users)
-{
-	$sql_start = ($start < 0) ? 0 : floor(($total_users - 1) / $config['football_users_per_page']) * $config['football_users_per_page'];
-}
-else
-{
-	$sql_start = floor($start / $config['football_users_per_page']) * $config['football_users_per_page'];
-}
-$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));
-$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;
-$index = 0;
-$ext_path = $this->phpbb_path_helper->update_web_root_path($this->phpbb_extension_manager->get_extension_path('football/football', true));
-
-$sql = 'SELECT
-		r.rank,
-		r.status,
-		r.user_id,
-		r.points,
-		r.win AS wins,
-		u.user_colour,
-		u.username
-	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 = $matchday 
-		AND r.status IN (2,3)
-	ORDER BY r.rank ASC, r.points DESC, LOWER(u.username) ASC";
-
-$result = $db->sql_query_limit($sql, $sql_limit, $sql_start);
-while($row = $db->sql_fetchrow($result))
-{
-	$index++;
-	$data_ranks = true;
-	if (isset($prevrankof[$row['user_id']]))
-	{
-		if ($rankof[$row['user_id']] == '')
-		{
-			$change_sign 	= '';
-			$change_img 	= '';
-			$change_differ 	= '&nbsp;';
-		}
-		else
-		{
-			if ($rankof[$row['user_id']] == $prevrankof[$row['user_id']])
-			{
-				$change_sign 	= '=';
-				$change_img 	= "<img src=\"" . $ext_path . "images/no_change.gif\" alt=\"" . $user->lang['NO_CHANGES'] . "\"/>";
-				$change_differ 	= '&nbsp;';
-			}
-			else
-			{
-				if ($rankof[$row['user_id']] > $prevrankof[$row['user_id']])
-				{
-					$change_sign 	= '+';
-					$change_img 	= "<img src=\"" . $ext_path . "images/arrow_down.gif\" alt=\"" . $user->lang['WORSENED'] . "\"/>";
-					$differ 		= $rankof[$row['user_id']] - $prevrankof[$row['user_id']];
-					$change_differ 	= ' (' . $differ . ')';
-				}
-				else
-				{
-					$change_sign 	= '-';
-					$change_img 	= "<img src=\"" . $ext_path . "images/arrow_up.gif\" alt=\""	. $user->lang['IMPROVED'] . "\"/>";
-					$differ 		= $prevrankof[$row['user_id']] - $rankof[$row['user_id']];
-					$change_differ 	= ' (' . $differ . ')';
-				}
-			}
-		}
-	}
-	else
-	{
-			$change_sign 	= '';
-			$change_img 	= '';
-			$change_differ 	= '&nbsp;';
-	}
-
-	if ($matchday == $maxmatchday)
-	{
-		// if someone didn't bet the hole Season
-		if(!isset($win_user_most_hits[$row['user_id']]['win']))
-		{
-			$win_user_most_hits[$row['user_id']]['win'] = 0;
-		}
-		if(!isset($win_user_most_hits_away[$row['user_id']]['win']))
-		{
-			$win_user_most_hits_away[$row['user_id']]['win'] = 0;
-		}
-		if(!isset($season_wins[$row['user_id']]['win']))
-		{
-			$season_wins[$row['user_id']]['win'] = 0;
-		}
-		$win_total = sprintf('%01.2f',$row['wins'] + $win_user_most_hits[$row['user_id']]['win'] + $win_user_most_hits_away[$row['user_id']]['win'] 
-						+ $season_wins[$row['user_id']]['win']);
-	}
-	else
-	{
-		$win_total = sprintf('%01.2f',$row['wins']);
-	}
-	$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('rankstotal', array(
-		'ROW_CLASS' 	=> $row_class,
-		'RANK' 			=> $rankof[$row['user_id']],
-		'CHANGE_SIGN' 	=> $change_sign,
-		'CHANGE_IMG' 	=> $change_img,
-		'CHANGE_DIFFER'	=> $change_differ,
-		'USERID' 		=> $row['user_id'],
-		'USERNAME' 		=> $row['username'],
-		'U_PROFILE'		=> get_username_string('profile', $row['user_id'], $row['username'], $row['user_colour']),
-		'BETS' 			=> $betsof[$row['user_id']],
-		'NOBETS' 		=> ($nobetsof[$row['user_id']] == 0) ? '&nbsp;' : $nobetsof[$row['user_id']],
-		'TENDENCIES'	=> ($tendenciesof[$row['user_id']] == 0) ? '&nbsp;' : $tendenciesof[$row['user_id']],
-		'DIRECTHITS' 	=> ($hitsof[$row['user_id']] == 0) ? '&nbsp;' : $hitsof[$row['user_id']],
-		'DIRECTHITS02' 	=> ($hits02of[$row['user_id']] == 0) ? '&nbsp;' : $hits02of[$row['user_id']],
-		'POINTS' 		=> $row['points'],
-		'COLOR_STYLE'	=> $colorstyle,
-		'WIN' 			=> $win_total,
-		)
-	);
-}
-$db->sql_freeresult($result);
-$league_info = league_info($season, $league);
-
-$sidename = sprintf($user->lang['RANK_MATCHDAY']);
-$template->assign_vars(array(
-	'S_DISPLAY_RANKS_MATCHDAY'	=> true,
-	'S_DISPLAY_HITS02'			=> $config['football_win_hits02'],
-	'S_SIDENAME' 				=> $sidename,
-	'S_WIN' 					=> ($league_info['win_matchday'] == '0') ? false : true,
-	'U_LEFT' 					=> $this->helper->route('football_main_controller', array('side' => 'table', 's' => $season, 'l' => $league, 'm' => $matchday)),
-	'LEFT_LINK' 				=> '&lt; ' . sprintf($user->lang['TABLE']),
-	'U_RIGHT' 					=> $this->helper->route('football_main_controller', array('side' => 'ranks_total', 's' => $season, 'l' => $league, 'm' => $matchday)),
-	'RIGHT_LINK' 				=> sprintf($user->lang['RANK_TOTAL']) . ' &gt;',
-	'LEFT_TITLE' 				=> sprintf($user->lang['TITLE_TABLE']),
-	'RIGHT_TITLE' 				=> sprintf($user->lang['TITLE_RANK_TOTAL']),
-	'S_DATA_RANKS' 				=> $data_ranks,
-	'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),
-	'WIN_NAME' 					=> $config['football_win_name'],
-	)
-);
-
+<?php
+/**
+*
+* @package phpBB Extension - Football Football
+* @copyright (c) 2016 football (http://football.bplaced.net)
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+if (!defined('IN_PHPBB') OR !defined('IN_FOOTBALL'))
+{
+	exit;
+}
+
+$start = $this->request->variable('start', 0);
+$win_user_most_hits = array();
+$win_user_most_hits_away = array();
+$season_wins = array();
+$win_user_most_hits = win_user_most_hits($season, $league, $matchday);
+$win_user_most_hits_away = win_user_most_hits_away($season, $league, $matchday);
+
+// Statistics of matchday
+$sql = "SELECT
+		b.user_id,
+		COUNT(b.match_no) AS matches,
+		SUM(IF(b.goals_home <> '' AND b.goals_guest <> '', 1, 0)) AS bets,
+		SUM(IF(b.goals_home <> '' AND b.goals_guest <> '',
+				IF((b.goals_home = m.goals_home) AND (b.goals_guest = m.goals_guest), 1, 0),
+				0
+			)
+		) AS hits,
+		SUM(IF(b.goals_home <> '' AND b.goals_guest <> '',
+				IF((m.goals_home <= m.goals_guest), 
+					IF((b.goals_home = m.goals_home) AND (b.goals_guest = m.goals_guest), 1, 0),
+					0
+				),
+				0
+			)
+		) AS hits02,
+		SUM(IF(b.goals_home <> '' AND b.goals_guest <> '',
+				IF((b.goals_home + 0 < b.goals_guest) <> (m.goals_home + 0 < m.goals_guest) OR 
+				   (b.goals_home = b.goals_guest) <> (m.goals_home = m.goals_guest) OR 
+				   (b.goals_home + 0 > b.goals_guest) <> (m.goals_home + 0 > m.goals_guest),
+					0,
+					IF((b.goals_home = m.goals_home) AND (b.goals_guest = m.goals_guest), 0, 1)
+				),
+				0
+			)
+		) AS tendency
+	FROM " . FOOTB_BETS . ' AS b
+	LEFT JOIN ' . FOOTB_MATCHES . " AS m ON (m.season = b.season AND m.league = b.league AND m.match_no = b.match_no)
+	WHERE b.season = $season 
+		AND b.league = $league 
+		AND m.status IN (2,3) 
+		AND m.matchday = $matchday
+	GROUP BY user_id";
+
+$result = $db->sql_query($sql);
+$usersstats = $db->sql_fetchrowset($result);
+$db->sql_freeresult($result);
+foreach ($usersstats AS $userstats)
+{
+	$betsof[$userstats['user_id']] 			= $userstats['bets'];
+	$nobetsof[$userstats['user_id']] 		= $userstats['matches'] - $userstats['bets'];
+	$tendenciesof[$userstats['user_id']] 	= $userstats['tendency'];
+	$hitsof[$userstats['user_id']] 			= $userstats['hits'];
+	$hits02of[$userstats['user_id']] 		= $userstats['hits02'];
+}
+
+// ranks of matchday
+$sql = 'SELECT
+		rank,
+		user_id
+	FROM '. FOOTB_RANKS . "
+	WHERE season = $season 
+		AND league = $league 
+		AND matchday = $matchday 
+		AND status IN (2,3)
+	ORDER BY rank ASC, user_id ASC";
+$result = $db->sql_query($sql);
+$ranks = $db->sql_fetchrowset($result);
+$db->sql_freeresult($result);
+$total_users = sizeof($ranks);
+foreach ($ranks AS $rank)
+{
+	$rankof[$rank['user_id']] = $rank['rank'];
+}
+
+if ($matchday > 1)
+{
+	// rank previous matchday
+	$sql = 'SELECT
+			rank AS last_rang,
+			user_id
+		FROM '. FOOTB_RANKS . "
+		WHERE season = $season 
+			AND league = $league 
+			AND matchday = ($matchday-1) 
+			AND status IN (2,3)
+		ORDER BY last_rang ASC, user_id ASC";
+		
+	$result = $db->sql_query($sql);
+	$ranks = $db->sql_fetchrowset($result);
+	$db->sql_freeresult($result);
+
+	foreach ($ranks AS $rank)
+	{
+		$prevrankof[$rank['user_id']] = $rank['last_rang'];
+	}
+}
+
+if ($matchday == $maxmatchday)
+{
+	$season_wins = season_wins($season, $league, $matchday);
+}
+
+// Make sure $start is set to the last page if it exceeds the amount
+if ($start < 0 || $start >= $total_users)
+{
+	$sql_start = ($start < 0) ? 0 : floor(($total_users - 1) / $config['football_users_per_page']) * $config['football_users_per_page'];
+}
+else
+{
+	$sql_start = floor($start / $config['football_users_per_page']) * $config['football_users_per_page'];
+}
+$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));
+$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;
+$index = 0;
+$ext_path = $this->phpbb_path_helper->update_web_root_path($this->phpbb_extension_manager->get_extension_path('football/football', true));
+
+$sql = 'SELECT
+		r.rank,
+		r.status,
+		r.user_id,
+		r.points,
+		r.win AS wins,
+		u.user_colour,
+		u.username
+	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 = $matchday 
+		AND r.status IN (2,3)
+	ORDER BY r.rank ASC, r.points DESC, LOWER(u.username) ASC";
+
+$result = $db->sql_query_limit($sql, $sql_limit, $sql_start);
+while($row = $db->sql_fetchrow($result))
+{
+	$index++;
+	$data_ranks = true;
+	if (isset($prevrankof[$row['user_id']]))
+	{
+		if ($rankof[$row['user_id']] == '')
+		{
+			$change_sign 	= '';
+			$change_differ 	= '&nbsp;';
+		}
+		else
+		{
+			if ($rankof[$row['user_id']] == $prevrankof[$row['user_id']])
+			{
+				$change_sign 	= '=';
+				$change_differ 	= '&nbsp;';
+			}
+			else
+			{
+				if ($rankof[$row['user_id']] > $prevrankof[$row['user_id']])
+				{
+					$change_sign 	= '+';
+					$differ 		= $rankof[$row['user_id']] - $prevrankof[$row['user_id']];
+					$change_differ 	= ' (' . $differ . ')';
+				}
+				else
+				{
+					$change_sign 	= '-';
+					$differ 		= $prevrankof[$row['user_id']] - $rankof[$row['user_id']];
+					$change_differ 	= ' (' . $differ . ')';
+				}
+			}
+		}
+	}
+	else
+	{
+			$change_sign 	= '';
+			$change_differ 	= '&nbsp;';
+	}
+
+	if ($matchday == $maxmatchday)
+	{
+		// if someone didn't bet the hole Season
+		if(!isset($win_user_most_hits[$row['user_id']]['win']))
+		{
+			$win_user_most_hits[$row['user_id']]['win'] = 0;
+		}
+		if(!isset($win_user_most_hits_away[$row['user_id']]['win']))
+		{
+			$win_user_most_hits_away[$row['user_id']]['win'] = 0;
+		}
+		if(!isset($season_wins[$row['user_id']]['win']))
+		{
+			$season_wins[$row['user_id']]['win'] = 0;
+		}
+		$win_total = sprintf('%01.2f',$row['wins'] + $win_user_most_hits[$row['user_id']]['win'] + $win_user_most_hits_away[$row['user_id']]['win'] 
+						+ $season_wins[$row['user_id']]['win']);
+	}
+	else
+	{
+		$win_total = sprintf('%01.2f',$row['wins']);
+	}
+	$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('rankstotal', array(
+		'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,
+		'CHANGE_SIGN' 	=> $change_sign,
+		'CHANGE_DIFFER'	=> $change_differ,
+		'USERID' 		=> $row['user_id'],
+		'USERNAME' 		=> $row['username'],
+		'U_PROFILE'		=> get_username_string('profile', $row['user_id'], $row['username'], $row['user_colour']),
+		'BETS' 			=> $betsof[$row['user_id']],
+		'NOBETS' 		=> ($nobetsof[$row['user_id']] == 0) ? '&nbsp;' : $nobetsof[$row['user_id']],
+		'TENDENCIES'	=> ($tendenciesof[$row['user_id']] == 0) ? '&nbsp;' : $tendenciesof[$row['user_id']],
+		'DIRECTHITS' 	=> ($hitsof[$row['user_id']] == 0) ? '&nbsp;' : $hitsof[$row['user_id']],
+		'DIRECTHITS02' 	=> ($hits02of[$row['user_id']] == 0) ? '&nbsp;' : $hits02of[$row['user_id']],
+		'POINTS' 		=> $row['points'],
+		'COLOR_STYLE'	=> $colorstyle,
+		'WIN' 			=> $win_total,
+		)
+	);
+}
+$db->sql_freeresult($result);
+$league_info = league_info($season, $league);
+
+$sidename = sprintf($user->lang['RANK_MATCHDAY']);
+$template->assign_vars(array(
+	'S_DISPLAY_RANKS_MATCHDAY'	=> true,
+	'S_DISPLAY_HITS02'			=> $config['football_win_hits02'],
+	'S_SIDENAME' 				=> $sidename,
+	'S_WIN' 					=> ($league_info['win_matchday'] == '0') ? false : true,
+	'S_DATA_RANKS' 				=> $data_ranks,
+	'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),
+	'WIN_NAME' 					=> $config['football_win_name'],
+	)
+);
+
 ?>

block/ranks_total.php

@@ -157,7 +157,6 @@ switch ($mode)
 			}
 			$index++;
 		}
-		$db->sql_freeresult($result);
 
 		$sidename = sprintf($user->lang['RANK_TOTAL']);
 		$league_info = league_info($season, $league);
@@ -166,13 +165,6 @@ switch ($mode)
 			'S_DISPLAY_HITS02'			=> $config['football_win_hits02'],
 			'S_DATA_RANKS' 				=> $data_ranks,
 			'S_SIDENAME' 				=> $sidename,
-			'U_LEFT' 					=> $this->helper->route('football_main_controller', array('side' => 'ranks_matchday', 's' => $season, 'l' => $league, 'm' => $matchday)),
-			'LEFT_LINK' 				=> '< ' . sprintf($user->lang['RANK_MATCHDAY']),
-			'U_RIGHT' 					=> ($config['football_bank']) ? $this->helper->route('football_main_controller', array('side' => 'bank', 's' => $season, 'l' => $league, 'm' => $matchday)) : 
-																		$this->helper->route('football_main_controller', array('side' => 'my_bets', 's' => $season, 'l' => $league, 'm' => $matchday)),
-			'RIGHT_LINK' 				=> ($config['football_bank']) ? sprintf($user->lang['FOOTBALL_BANK']) . ' >' : sprintf($user->lang['MY_BETS']) . ' >',
-			'LEFT_TITLE' 				=> sprintf($user->lang['TITLE_RANK_MATCHDAY']),
-			'RIGHT_TITLE' 				=> ($config['football_bank']) ? sprintf($user->lang['TITLE_FOOTBALL_BANK']) : sprintf($user->lang['TITLE_MY_BETS']),
 			'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),
 			'S_WIN' 					=> false,
@@ -328,7 +320,6 @@ switch ($mode)
 			}
 			$index++;
 		}
-		$db->sql_freeresult($result);
 
 		$sidename = sprintf($user->lang['RANK_TOTAL']);
 		$league_info = league_info($season, $league);
@@ -337,13 +328,6 @@ switch ($mode)
 			'S_DISPLAY_HITS02'			=> $config['football_win_hits02'],
 			'S_DATA_RANKS' 				=> $data_ranks,
 			'S_SIDENAME' 				=> $sidename,
-			'U_LEFT' 					=> $this->helper->route('football_main_controller', array('side' => 'ranks_matchday', 's' => $season, 'l' => $league, 'm' => $matchday)),
-			'LEFT_LINK' 				=> '< ' . sprintf($user->lang['RANK_MATCHDAY']),
-			'U_RIGHT' 					=> ($config['football_bank']) ? $this->helper->route('football_main_controller', array('side' => 'bank', 's' => $season, 'l' => $league, 'm' => $matchday)) : 
-																		$this->helper->route('football_main_controller', array('side' => 'my_bets', 's' => $season, 'l' => $league, 'm' => $matchday)),
-			'RIGHT_LINK' 				=> ($config['football_bank']) ? sprintf($user->lang['FOOTBALL_BANK']) . ' >' : sprintf($user->lang['MY_BETS']) . ' >',
-			'LEFT_TITLE' 				=> sprintf($user->lang['TITLE_RANK_MATCHDAY']),
-			'RIGHT_TITLE' 				=> ($config['football_bank']) ? sprintf($user->lang['TITLE_FOOTBALL_BANK']) : sprintf($user->lang['TITLE_MY_BETS']),
 			'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),
 			'S_WIN' 					=> ($league_info['win_matchday'] == '0' and $league_info['win_season'] == '0') ? false : ($this->auth->acl_gets('a_')) ? true : false,
@@ -492,7 +476,6 @@ switch ($mode)
 					if ($rank == $prev_rank_of[$curr_rank['user_id']])
 					{
 						$change_sign 	= '=';
-						$change_img 	= "<img src=\"" . $ext_path . "images/no_change.gif\" alt=\"" . $user->lang['NO_CHANGES'] . "\"/>";
 						$change_differ 	= '';
 					}
 					else
@@ -500,14 +483,12 @@ switch ($mode)
 						if ($rank > $prev_rank_of[$curr_rank['user_id']])
 						{
 							$change_sign 	= '+';
-							$change_img 	= "<img src=\"" . $ext_path . "images/arrow_down.gif\" alt=\"" . $user->lang['WORSENED'] . "\"/>";
 							$differ 		= $rank - $prev_rank_of[$curr_rank['user_id']];
 							$change_differ 	= ' (' . $differ . ')';
 						}
 						else
 						{
 							$change_sign 	= '-';
-							$change_img 	= "<img src=\"" . $ext_path . "images/arrow_up.gif\" alt=\""	. $user->lang['IMPROVED'] . "\"/>";
 							$differ 		= $prev_rank_of[$curr_rank['user_id']] - $rank;
 							$change_differ 	= ' (' . $differ . ')';
 						}
@@ -516,7 +497,6 @@ switch ($mode)
 				else
 				{
 					$change_sign 	= '';
-					$change_img 	= '';
 					$change_differ 	= '';
 				}
 
@@ -539,8 +519,10 @@ switch ($mode)
 				$template->assign_block_vars('rankstotal', array(
 					'ROW_CLASS' 	=> $row_class,
 					'RANK' 			=> $rank,
+					'NO_CHANGES'	=> ($change_sign == '=') ? true : false,
+					'WORSENED'		=> ($change_sign == '-') ? true : false,
+					'IMPROVED'		=> ($change_sign == '+') ? true : false,
 					'CHANGE_SIGN' 	=> $change_sign,
-					'CHANGE_IMG' 	=> $change_img,
 					'CHANGE_DIFFER'	=> $change_differ,
 					'USERID' 		=> $curr_rank['user_id'],
 					'USERNAME' 		=> $curr_rank['username'],
@@ -558,7 +540,6 @@ switch ($mode)
 			}
 			$index++;
 		}
-		$db->sql_freeresult($result);
 
 		$sidename = sprintf($user->lang['RANK_TOTAL']);
 		$league_info = league_info($season, $league);
@@ -567,13 +548,6 @@ switch ($mode)
 			'S_DISPLAY_HITS02'			=> $config['football_win_hits02'],
 			'S_DATA_RANKS' 				=> $data_ranks,
 			'S_SIDENAME' 				=> $sidename,
-			'U_LEFT' 					=> $this->helper->route('football_main_controller', array('side' => 'ranks_matchday', 's' => $season, 'l' => $league, 'm' => $matchday)),
-			'LEFT_LINK' 				=> '&lt; ' . sprintf($user->lang['RANK_MATCHDAY']),
-			'U_RIGHT' 					=> ($config['football_bank']) ? $this->helper->route('football_main_controller', array('side' => 'bank', 's' => $season, 'l' => $league, 'm' => $matchday)) :
-																		$this->helper->route('football_main_controller', array('side' => 'my_bets', 's' => $season, 'l' => $league, 'm' => $matchday)),
-			'RIGHT_LINK' 				=> ($config['football_bank']) ? sprintf($user->lang['FOOTBALL_BANK']) . ' &gt;' : sprintf($user->lang['MY_BETS']) . ' &gt;',
-			'LEFT_TITLE' 				=> sprintf($user->lang['TITLE_RANK_MATCHDAY']),
-			'RIGHT_TITLE' 				=> ($config['football_bank']) ? sprintf($user->lang['TITLE_FOOTBALL_BANK']) : sprintf($user->lang['TITLE_MY_BETS']),
 			'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),
 			'S_WIN' 					=> ($league_info['win_matchday'] == '0' and $league_info['win_season'] == '0') ? false : true,

block/results.php

@@ -1,433 +1,428 @@
-<?php
-/**
-*
-* @package phpBB Extension - Football Football
-* @copyright (c) 2016 football (http://football.bplaced.net)
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
-*
-*/
-
-if (!defined('IN_PHPBB') OR !defined('IN_FOOTBALL'))
-{
-	exit;
-}
-
-$user_is_member = user_is_member($user->data['user_id'], $season, $league);
-$edit_mode 		= false;
-$display_group 	= false;
-$display_ko 	= false;
-$data_results 	= false;
-$lang_dates 	= $user->lang['datetime'];
-$matchnumber 	= 0;
-$editstatus 	= array(1, 2, 4, 5);
-
-$league_info = league_info($season, $league);
-// Calculate matches AND results of matchday
-$sql = "SELECT
-		m.match_no,
-		m.matchday,
-		m.status,
-		m.group_id,
-		m.formula_home,
-		m.formula_guest,
-		t1.team_symbol AS home_symbol,
-		t2.team_symbol AS guest_symbol,
-		t1.team_id AS home_id,
-		t2.team_id AS guest_id,
-		t1.team_name AS home_name,
-		t2.team_name AS guest_name,
-		t1.team_name_short AS home_short,
-		t2.team_name_short AS guest_short,
-		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_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);
-$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_results = true;
-	$matchnumber++ ;
-	$row_class = (!($matchnumber % 2)) ? 'bg1 row_light' : 'bg2 row_dark';
-	if (0 == $row['home_id'])
-	{
-		$home_info 		= get_team($season, $league, $row['match_no'], 'team_id_home', $row['formula_home']);
-		$home_in_array 	= explode("#",$home_info);
-		$homelogo 		= $home_in_array[0];
-		$homeid 		= $home_in_array[1];
-		$homename 		= $home_in_array[2];
-		$homeshort 		= $home_in_array[2];
-	}
-	else
-	{
-		$homelogo 	= $row['home_symbol'];
-		$homeid 	= $row['home_id'];
-		$homename 	= $row['home_name'];
-		$homeshort 	= $row['home_short'];
-	}
-	if (0 == $row['guest_id'])
-	{
-		$guest_info 	= get_team($season, $league, $row['match_no'], 'team_id_guest', $row['formula_guest']);
-		$guest_in_array = explode("#",$guest_info);
-		$guestlogo 		= $guest_in_array[0];
-		$guestid 		= $guest_in_array[1];
-		$guestname 		= $guest_in_array[2];
-		$guestshort 	= $guest_in_array[2];
-	}
-	else
-	{
-		$guestlogo 	= $row['guest_symbol'];
-		$guestid 	= $row['guest_id'];
-		$guestname 	= $row['guest_name'];
-		$guestshort	= $row['guest_short'];
-	}
-	if ($homelogo <> '')
-	{
-		$logoH = "<img src=\"" . $ext_path . 'images/flags/' . $homelogo . "\" alt=\"" . $homelogo . "\" width=\"28\" height=\"28\"/>" ;
-	}
-	else
-	{
-		$logoH = "<img src=\"" . $ext_path . "images/flags/blank.gif\" alt=\"\" width=\"28\" height=\"28\"/>" ;
-	}
-	if ($guestlogo <> '')
-	{
-		$logoG = "<img src=\"" . $ext_path . 'images/flags/' . $guestlogo . "\" alt=\"" . $guestlogo . "\" width=\"28\" height=\"28\"/>" ;
-	}
-	else
-	{
-		$logoG = "<img src=\"" . $ext_path . "images/flags/blank.gif\" alt=\"\" width=\"28\" height=\"28\"/>" ;
-	}
-
-	if ($row['ko_match'])
-	{
-		$display_ko = true;
-		$ko_match = true;
-	}
-	else
-	{
-		$ko_match = false;
-	}
-
-	if ($row['group_id'] == '')
-	{
-		$group_id = '&nbsp;';
-	}
-	else
-	{
-		$display_group = true;
-		$group_id = $row['group_id'];
-	}
-	
-
-	if (in_array($row['status'], $editstatus) AND $user_is_member)
-	{
-		$edit_mode 		= true;
-		$edit_match 	= true;
-		$goals_home		= $row['goals_home'];
-		$goals_guest	= $row['goals_guest'];
-		$kogoals_home	= $row['kogoals_home'];
-		$kogoals_guest	= $row['kogoals_guest'];
-	}
-	else
-	{
-		$edit_match 	= false;
-		$goals_home		= ($row['goals_home'] == '') ? '&nbsp;' : $row['goals_home'];
-		$goals_guest	= ($row['goals_guest'] == '') ? '&nbsp;' : $row['goals_guest'];
-		$kogoals_home	= ($row['kogoals_home'] == '') ? '&nbsp;' : $row['kogoals_home'];
-		$kogoals_guest	= ($row['kogoals_guest'] == '') ? '&nbsp;' : $row['kogoals_guest'];
-	}
-	$template->assign_block_vars('result', array(
-		'ROW_CLASS' 	=> $row_class,
-		'MATCH_NUMBER' 	=> $row['match_no'],
-		'MATCHDAY' 		=> $row['matchday'],
-		'STATUS' 		=> $row['status'],
-		'MATCH_TIME' 	=> $row['match_time'],
-		'GROUP' 		=> $group_id,
-		'HOME_ID' 		=> $homeid,
-		'GUEST_ID' 		=> $guestid,
-		'LOGO_HOME' 	=> $logoH,
-		'LOGO_GUEST' 	=> $logoG,
-		'HOME_NAME' 	=> $homename,
-		'GUEST_NAME' 	=> $guestname,
-		'HOME_SHORT' 	=> $homeshort,
-		'GUEST_SHORT' 	=> $guestshort,
-		'U_PLAN_HOME'	=> $this->helper->route('football_football_popup', array('popside' => 'viewplan_popup', 's' => $season, 'l' => $league,
-																			'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')),
-		'GOALS_HOME' 	=> $goals_home,
-		'GOALS_GUEST'	=> $goals_guest,
-		'COLOR_STYLE' 	=> color_style($row['status']),
-		'KOGOALS_HOME' 	=> $kogoals_home,
-		'KOGOALS_GUEST'	=> $kogoals_guest,
-		'S_KO_MATCH' 	=> $ko_match,
-		'S_EDIT_MATCH' 	=> $edit_match,
-		)
-	);
-}
-$db->sql_freeresult($result);
-
-// Calculate extra bets of matchday
-// Start select team
-$sql = 'SELECT 
-			team_id AS option_value,
-			team_name AS option_name
-		FROM ' . FOOTB_TEAMS . "
-		WHERE season = $season 
-		AND league = $league 
-		ORDER BY team_name ASC";
-		
-$result = $db->sql_query($sql);
-$option_rows = $db->sql_fetchrowset($result);
-$db->sql_freeresult($result);
-
-if ($edit_mode)
-{
-	$template->assign_block_vars('worldfootball', array('LEAGUE' => $league-1,));
-}
-
-$sql = "SELECT e.*,
-		t1.team_name AS result_team
-	FROM  " . FOOTB_EXTRA . ' AS e
-	LEFT JOIN ' . FOOTB_TEAMS . " AS t1 ON (t1.season = e.season AND t1.league = e.league AND t1.team_id = e.result)
-	WHERE e.season = $season 
-		AND e.league = $league 
-		AND e.matchday_eval = $matchday
-	ORDER BY e.extra_no ASC";
-	
-$result = $db->sql_query($sql);
-
-$extra_results = false;
-$extranumber = 0;
-while ($row = $db->sql_fetchrow($result))
-{
-	$extra_results = true;
-	$extranumber++ ;
-	$row_class = (!($extranumber % 2)) ? 'bg1 row_light' : 'bg2 row_dark';
-
-	switch($row['question_type'])
-	{
-		case '1':
-			{
-				$display_type = 1;
-				$eval_title = sprintf($user->lang['EXTRA_HIT']);
-			}
-			break;
-		case '2':
-			{
-				$display_type = 1;
-				$eval_title = sprintf($user->lang['EXTRA_MULTI_HIT']);
-			}
-			break;
-		case '3':
-			{
-				$display_type = 2;
-				$eval_title = sprintf($user->lang['EXTRA_HIT']);
-			}
-			break;
-		case '4':
-		case '5':
-			{
-				$display_type = 2;
-				$eval_title = sprintf($user->lang['EXTRA_DIFFERENCE']);
-			}
-			break;
-		default :
-			{
-				$display_type = 2;
-				$eval_title = '';
-			}
-			break;
-	}
-
-	if ($row['extra_status'] > 0 && $row['extra_status'] < 3 && $user_is_member)
-	{
-		$edit_mode = true;
-		$result_extra = ($row['result_team'] == NULL) ? '' : $row['result_team'];
-
-		$multiple = '';
-		switch($row['question_type'])
-		{
-			case '2':
-				{
-					$multiple = ' multiple="multiple" size="3" ';
-				}
-				break;
-			case '4':
-				{
-					$option_arr = array();
-					for ($i = 65; $i <= 72; $i++) 
-					{
-						if (strstr($row['question'], chr($i) . ':'))
-						{
-							$option_arr[] = array(
-								'option_value'	=> chr($i),
-								'option_name'	=> chr($i),
-							);
-						}
-					}
-					if (sizeof($option_arr) > 1)
-					{
-						$display_type = 1;
-						$option_rows = $option_arr;
-						$result_extra = $row['result'];
-						$multiple = ' multiple="multiple" size="3" ';
-					}
-				}
-				break;
-			case '3':
-				{
-					$option_arr = array();
-					for ($i = 65; $i <= 72; $i++) 
-					{
-						if (strstr($row['question'], chr($i) . ':'))
-						{
-							$option_arr[] = array(
-								'option_value'	=> chr($i),
-								'option_name'	=> chr($i),
-							);
-						}
-					}
-					if (sizeof($option_arr) > 1)
-					{
-						$display_type = 1;
-						$option_rows = $option_arr;
-						$result_extra = $row['result'];
-					}
-				}
-				break;
-		}
-		
-		$template->assign_block_vars('extra_result', array(
-			'ROW_CLASS' 		=> $row_class,
-			'EXTRA_NO' 			=> $row['extra_no'],
-			'S_EDIT_EXTRA' 		=> true,
-			'QUESTION' 			=> $row['question'],
-			'EXTRA_POINTS' 		=> $row['extra_points'],
-			'EVALUATION' 		=> ($row['matchday'] == $row['matchday_eval']) ? sprintf($user->lang['MATCHDAY']) : sprintf($user->lang['TOTAL']),
-			'EVALUATION_TITLE' 	=> $eval_title,
-			'RESULT' 			=> ($display_type == 1) ? $result_extra : $row['result'],
-			'S_DISPLAY_TYPE'	=> $display_type,
-			)
-		);
-		
-		if ($display_type == 1)
-		{
-			$selected = ($row['result'] == '') ? ' selected="selected"' : '';
-			
-			$template->assign_block_vars('extra_result.extra_option', array(
-				'OPTION_VALUE' 	=> '',
-				'OPTION_NAME' 	=> sprintf($user->lang['SELECT']),
-				'S_SELECTED' 	=> $selected));
-				
-			foreach ($option_rows as $option_row)
-			{
-				if (strstr($row['result'], ';'))
-				{
-					$selected = '';
-					$result_arr = explode(';', $row['result']);
-					foreach($result_arr AS $result_value)
-					{
-						if ($result_value <> '')
-						{
-							if ($option_row['option_value'] == $result_value)
-							{
-								$selected = ' selected="selected"';
-							}
-						}
-					}
-				}
-				else
-				{
-					$selected = ($option_row['option_value'] == $row['result']) ? ' selected="selected"' : '';
-				}
-				$template->assign_block_vars('extra_result.extra_option', array(
-					'OPTION_VALUE' 	=> $option_row['option_value'],
-					'OPTION_NAME' 	=> $option_row['option_name'],
-					'S_SELECTED' 	=> $selected));
-			}
-		}
-	}
-	else
-	{
-		$extra_colorstyle = color_style($row['extra_status']);
-		$extra_result = ($row['result'] == '') ? '&nbsp;' : $row['result'];
-		$result_extra = ($row['result_team'] == NULL) ? '&nbsp;' : $row['result_team'];
-		
-		$template->assign_block_vars('extra_result', array(
-			'ROW_CLASS' 		=> $row_class,
-			'S_EDIT_EXTRA' 		=> false,
-			'QUESTION' 			=> $row['question'],
-			'EXTRA_POINTS' 		=> $row['extra_points'],
-			'EVALUATION' 		=> ($row['matchday'] == $row['matchday_eval']) ? sprintf($user->lang['MATCHDAY']) : sprintf($user->lang['TOTAL']),
-			'RESULT' 			=> ($display_type == 1) ? $result_extra : $extra_result,
-			'COLOR_STYLE' 		=> $extra_colorstyle,
-			)
-		);
-	}
-}
-
-$sidename = sprintf($user->lang['RESULTS']);
-switch ($league_info['bet_ko_type'])
-{
-	case BET_KO_90:
-		$result_explain = sprintf($user->lang['MIN90']);
-		$label_finalresult = sprintf($user->lang['EXTRATIME_SHORT']) . '/' . sprintf($user->lang['PENALTY_SHORT']);
-		break;
-	case BET_KO_EXTRATIME:
-		$result_explain = sprintf($user->lang['EXTRATIME_SHORT']);
-		$label_finalresult = sprintf($user->lang['PENALTY']);
-		break;
-	case BET_KO_PENALTY:
-		$result_explain = sprintf($user->lang['PENALTY']);
-		$display_ko = false;
-		break;
-	default:
-		$result_explain = sprintf($user->lang['MIN90']);
-		$label_finalresult = sprintf($user->lang['EXTRATIME_SHORT']) . '/' . sprintf($user->lang['PENALTY_SHORT']);
-		break;
-}
-
-$template->assign_vars(array(
-	'S_DISPLAY_RESULTS' 		=> true,
-	'S_EXTRA_RESULTS' 			=> $extra_results,
-	'S_SIDENAME' 				=> $sidename,
-	'RESULT_EXPLAIN' 			=> $result_explain,
-	'LABEL_FINALRESULT' 		=> $label_finalresult,
-	'U_LEFT' 					=> $this->helper->route('football_main_controller', array('side' => 'all_bets', 's' => $season, 'l' => $league, 'm' => $matchday)),
-	'LEFT_LINK' 				=> '&lt; ' . sprintf($user->lang['ALL_BETS']),
-	'U_RIGHT' 					=> $this->helper->route('football_main_controller', array('side' => 'table', 's' => $season, 'l' => $league, 'm' => $matchday)),
-	'RIGHT_LINK' 				=> sprintf($user->lang['TABLE']) . ' &gt;',
-	'LEFT_TITLE' 				=> sprintf($user->lang['TITLE_ALL_BETS']),
-	'RIGHT_TITLE' 				=> sprintf($user->lang['TITLE_TABLE']),
-	'S_FORM_ACTION_RESULT' 		=> $this->helper->route('football_main_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,
-	'S_DISPLAY_KO'				=> $display_ko,
-	'S_EDIT_MODE' 				=> $edit_mode,
-	)
-);
-
+<?php
+/**
+*
+* @package phpBB Extension - Football Football
+* @copyright (c) 2016 football (http://football.bplaced.net)
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+if (!defined('IN_PHPBB') OR !defined('IN_FOOTBALL'))
+{
+	exit;
+}
+
+$user_is_member = user_is_member($user->data['user_id'], $season, $league);
+$edit_mode 		= false;
+$display_group 	= false;
+$display_ko 	= false;
+$data_results 	= false;
+$lang_dates 	= $user->lang['datetime'];
+$matchnumber 	= 0;
+$editstatus 	= array(1, 2, 4, 5);
+
+$league_info = league_info($season, $league);
+// Calculate matches AND results of matchday
+$sql = "SELECT
+		m.match_no,
+		m.matchday,
+		m.status,
+		m.group_id,
+		m.formula_home,
+		m.formula_guest,
+		t1.team_symbol AS home_symbol,
+		t2.team_symbol AS guest_symbol,
+		t1.team_id AS home_id,
+		t2.team_id AS guest_id,
+		t1.team_name AS home_name,
+		t2.team_name AS guest_name,
+		t1.team_name_short AS home_short,
+		t2.team_name_short AS guest_short,
+		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_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);
+$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_results = true;
+	$matchnumber++ ;
+	$row_class = (!($matchnumber % 2)) ? 'bg1 row_light' : 'bg2 row_dark';
+	if (0 == $row['home_id'])
+	{
+		$home_info 		= get_team($season, $league, $row['match_no'], 'team_id_home', $row['formula_home']);
+		$home_in_array 	= explode("#",$home_info);
+		$homelogo 		= $home_in_array[0];
+		$homeid 		= $home_in_array[1];
+		$homename 		= $home_in_array[2];
+		$homeshort 		= $home_in_array[2];
+	}
+	else
+	{
+		$homelogo 	= $row['home_symbol'];
+		$homeid 	= $row['home_id'];
+		$homename 	= $row['home_name'];
+		$homeshort 	= $row['home_short'];
+	}
+	if (0 == $row['guest_id'])
+	{
+		$guest_info 	= get_team($season, $league, $row['match_no'], 'team_id_guest', $row['formula_guest']);
+		$guest_in_array = explode("#",$guest_info);
+		$guestlogo 		= $guest_in_array[0];
+		$guestid 		= $guest_in_array[1];
+		$guestname 		= $guest_in_array[2];
+		$guestshort 	= $guest_in_array[2];
+	}
+	else
+	{
+		$guestlogo 	= $row['guest_symbol'];
+		$guestid 	= $row['guest_id'];
+		$guestname 	= $row['guest_name'];
+		$guestshort	= $row['guest_short'];
+	}
+	if ($homelogo <> '')
+	{
+		$logoH = "<img src=\"" . $ext_path . 'images/flags/' . $homelogo . "\" alt=\"" . $homelogo . "\" width=\"28\" height=\"28\"/>" ;
+	}
+	else
+	{
+		$logoH = "<img src=\"" . $ext_path . "images/flags/blank.gif\" alt=\"\" width=\"28\" height=\"28\"/>" ;
+	}
+	if ($guestlogo <> '')
+	{
+		$logoG = "<img src=\"" . $ext_path . 'images/flags/' . $guestlogo . "\" alt=\"" . $guestlogo . "\" width=\"28\" height=\"28\"/>" ;
+	}
+	else
+	{
+		$logoG = "<img src=\"" . $ext_path . "images/flags/blank.gif\" alt=\"\" width=\"28\" height=\"28\"/>" ;
+	}
+
+	if ($row['ko_match'])
+	{
+		$display_ko = true;
+		$ko_match = true;
+	}
+	else
+	{
+		$ko_match = false;
+	}
+
+	if ($row['group_id'] == '')
+	{
+		$group_id = '&nbsp;';
+	}
+	else
+	{
+		$display_group = true;
+		$group_id = $row['group_id'];
+	}
+	
+
+	if (in_array($row['status'], $editstatus) AND $user_is_member)
+	{
+		$edit_mode 		= true;
+		$edit_match 	= true;
+		$goals_home		= $row['goals_home'];
+		$goals_guest	= $row['goals_guest'];
+		$kogoals_home	= $row['kogoals_home'];
+		$kogoals_guest	= $row['kogoals_guest'];
+	}
+	else
+	{
+		$edit_match 	= false;
+		$goals_home		= ($row['goals_home'] == '') ? '&nbsp;' : $row['goals_home'];
+		$goals_guest	= ($row['goals_guest'] == '') ? '&nbsp;' : $row['goals_guest'];
+		$kogoals_home	= ($row['kogoals_home'] == '') ? '&nbsp;' : $row['kogoals_home'];
+		$kogoals_guest	= ($row['kogoals_guest'] == '') ? '&nbsp;' : $row['kogoals_guest'];
+	}
+	$template->assign_block_vars('result', array(
+		'ROW_CLASS' 	=> $row_class,
+		'MATCH_NUMBER' 	=> $row['match_no'],
+		'MATCHDAY' 		=> $row['matchday'],
+		'STATUS' 		=> $row['status'],
+		'MATCH_TIME' 	=> $row['match_time'],
+		'GROUP' 		=> $group_id,
+		'HOME_ID' 		=> $homeid,
+		'GUEST_ID' 		=> $guestid,
+		'LOGO_HOME' 	=> $logoH,
+		'LOGO_GUEST' 	=> $logoG,
+		'HOME_NAME' 	=> $homename,
+		'GUEST_NAME' 	=> $guestname,
+		'HOME_SHORT' 	=> $homeshort,
+		'GUEST_SHORT' 	=> $guestshort,
+		'U_PLAN_HOME'	=> $this->helper->route('football_football_popup', array('popside' => 'viewplan_popup', 's' => $season, 'l' => $league,
+																			'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')),
+		'GOALS_HOME' 	=> $goals_home,
+		'GOALS_GUEST'	=> $goals_guest,
+		'COLOR_STYLE' 	=> color_style($row['status']),
+		'KOGOALS_HOME' 	=> $kogoals_home,
+		'KOGOALS_GUEST'	=> $kogoals_guest,
+		'S_KO_MATCH' 	=> $ko_match,
+		'S_EDIT_MATCH' 	=> $edit_match,
+		)
+	);
+}
+$db->sql_freeresult($result);
+
+// Calculate extra bets of matchday
+// Start select team
+$sql = 'SELECT 
+			team_id AS option_value,
+			team_name AS option_name
+		FROM ' . FOOTB_TEAMS . "
+		WHERE season = $season 
+		AND league = $league 
+		ORDER BY team_name ASC";
+		
+$result = $db->sql_query($sql);
+$option_rows = $db->sql_fetchrowset($result);
+$db->sql_freeresult($result);
+
+if ($edit_mode)
+{
+	$template->assign_block_vars('worldfootball', array('LEAGUE' => $league-1,));
+}
+
+$sql = "SELECT e.*,
+		t1.team_name AS result_team
+	FROM  " . FOOTB_EXTRA . ' AS e
+	LEFT JOIN ' . FOOTB_TEAMS . " AS t1 ON (t1.season = e.season AND t1.league = e.league AND t1.team_id = e.result)
+	WHERE e.season = $season 
+		AND e.league = $league 
+		AND e.matchday_eval = $matchday
+	ORDER BY e.extra_no ASC";
+	
+$result = $db->sql_query($sql);
+
+$extra_results = false;
+$extranumber = 0;
+while ($row = $db->sql_fetchrow($result))
+{
+	$extra_results = true;
+	$extranumber++ ;
+	$row_class = (!($extranumber % 2)) ? 'bg1 row_light' : 'bg2 row_dark';
+
+	switch($row['question_type'])
+	{
+		case '1':
+			{
+				$display_type = 1;
+				$eval_title = sprintf($user->lang['EXTRA_HIT']);
+			}
+			break;
+		case '2':
+			{
+				$display_type = 1;
+				$eval_title = sprintf($user->lang['EXTRA_MULTI_HIT']);
+			}
+			break;
+		case '3':
+			{
+				$display_type = 2;
+				$eval_title = sprintf($user->lang['EXTRA_HIT']);
+			}
+			break;
+		case '4':
+		case '5':
+			{
+				$display_type = 2;
+				$eval_title = sprintf($user->lang['EXTRA_DIFFERENCE']);
+			}
+			break;
+		default :
+			{
+				$display_type = 2;
+				$eval_title = '';
+			}
+			break;
+	}
+
+	if ($row['extra_status'] > 0 && $row['extra_status'] < 3 && $user_is_member)
+	{
+		$edit_mode = true;
+		$result_extra = ($row['result_team'] == NULL) ? '' : $row['result_team'];
+
+		$multiple = '';
+		switch($row['question_type'])
+		{
+			case '2':
+				{
+					$multiple = ' multiple="multiple" size="3" ';
+				}
+				break;
+			case '4':
+				{
+					$option_arr = array();
+					for ($i = 65; $i <= 72; $i++) 
+					{
+						if (strstr($row['question'], chr($i) . ':'))
+						{
+							$option_arr[] = array(
+								'option_value'	=> chr($i),
+								'option_name'	=> chr($i),
+							);
+						}
+					}
+					if (sizeof($option_arr) > 1)
+					{
+						$display_type = 1;
+						$option_rows = $option_arr;
+						$result_extra = $row['result'];
+						$multiple = ' multiple="multiple" size="3" ';
+					}
+				}
+				break;
+			case '3':
+				{
+					$option_arr = array();
+					for ($i = 65; $i <= 72; $i++) 
+					{
+						if (strstr($row['question'], chr($i) . ':'))
+						{
+							$option_arr[] = array(
+								'option_value'	=> chr($i),
+								'option_name'	=> chr($i),
+							);
+						}
+					}
+					if (sizeof($option_arr) > 1)
+					{
+						$display_type = 1;
+						$option_rows = $option_arr;
+						$result_extra = $row['result'];
+					}
+				}
+				break;
+		}
+		
+		$template->assign_block_vars('extra_result', array(
+			'ROW_CLASS' 		=> $row_class,
+			'EXTRA_NO' 			=> $row['extra_no'],
+			'S_EDIT_EXTRA' 		=> true,
+			'QUESTION' 			=> $row['question'],
+			'EXTRA_POINTS' 		=> $row['extra_points'],
+			'EVALUATION' 		=> ($row['matchday'] == $row['matchday_eval']) ? sprintf($user->lang['MATCHDAY']) : sprintf($user->lang['TOTAL']),
+			'EVALUATION_TITLE' 	=> $eval_title,
+			'RESULT' 			=> ($display_type == 1) ? $result_extra : $row['result'],
+			'S_DISPLAY_TYPE'	=> $display_type,
+			)
+		);
+		
+		if ($display_type == 1)
+		{
+			$selected = ($row['result'] == '') ? ' selected="selected"' : '';
+			
+			$template->assign_block_vars('extra_result.extra_option', array(
+				'OPTION_VALUE' 	=> '',
+				'OPTION_NAME' 	=> sprintf($user->lang['SELECT']),
+				'S_SELECTED' 	=> $selected));
+				
+			foreach ($option_rows as $option_row)
+			{
+				if (strstr($row['result'], ';'))
+				{
+					$selected = '';
+					$result_arr = explode(';', $row['result']);
+					foreach($result_arr AS $result_value)
+					{
+						if ($result_value <> '')
+						{
+							if ($option_row['option_value'] == $result_value)
+							{
+								$selected = ' selected="selected"';
+							}
+						}
+					}
+				}
+				else
+				{
+					$selected = ($option_row['option_value'] == $row['result']) ? ' selected="selected"' : '';
+				}
+				$template->assign_block_vars('extra_result.extra_option', array(
+					'OPTION_VALUE' 	=> $option_row['option_value'],
+					'OPTION_NAME' 	=> $option_row['option_name'],
+					'S_SELECTED' 	=> $selected));
+			}
+		}
+	}
+	else
+	{
+		$extra_colorstyle = color_style($row['extra_status']);
+		$extra_result = ($row['result'] == '') ? '&nbsp;' : $row['result'];
+		$result_extra = ($row['result_team'] == NULL) ? '&nbsp;' : $row['result_team'];
+		
+		$template->assign_block_vars('extra_result', array(
+			'ROW_CLASS' 		=> $row_class,
+			'S_EDIT_EXTRA' 		=> false,
+			'QUESTION' 			=> $row['question'],
+			'EXTRA_POINTS' 		=> $row['extra_points'],
+			'EVALUATION' 		=> ($row['matchday'] == $row['matchday_eval']) ? sprintf($user->lang['MATCHDAY']) : sprintf($user->lang['TOTAL']),
+			'RESULT' 			=> ($display_type == 1) ? $result_extra : $extra_result,
+			'COLOR_STYLE' 		=> $extra_colorstyle,
+			)
+		);
+	}
+}
+$db->sql_freeresult($result);
+
+$sidename = sprintf($user->lang['RESULTS']);
+switch ($league_info['bet_ko_type'])
+{
+	case BET_KO_90:
+		$result_explain = sprintf($user->lang['MIN90']);
+		$label_finalresult = sprintf($user->lang['EXTRATIME_SHORT']) . '/' . sprintf($user->lang['PENALTY_SHORT']);
+		break;
+	case BET_KO_EXTRATIME:
+		$result_explain = sprintf($user->lang['EXTRATIME_SHORT']);
+		$label_finalresult = sprintf($user->lang['PENALTY']);
+		break;
+	case BET_KO_PENALTY:
+		$result_explain = sprintf($user->lang['PENALTY']);
+		$display_ko = false;
+		break;
+	default:
+		$result_explain = sprintf($user->lang['MIN90']);
+		$label_finalresult = sprintf($user->lang['EXTRATIME_SHORT']) . '/' . sprintf($user->lang['PENALTY_SHORT']);
+		break;
+}
+
+$template->assign_vars(array(
+	'S_DISPLAY_RESULTS' 		=> true,
+	'S_EXTRA_RESULTS' 			=> $extra_results,
+	'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_DATA_RESULTS' 			=> $data_results,
+	'S_USER_IS_MEMBER' 			=> $user_is_member,
+	'S_DISPLAY_GROUP'			=> $display_group,
+	'S_DISPLAY_KO'				=> $display_ko,
+	'S_EDIT_MODE' 				=> $edit_mode,
+	)
+);
+
 ?>

block/side_table.php

@@ -1,145 +1,145 @@
-<?php
-/**
-*
-* @package phpBB Extension - Football Football
-* @copyright (c) 2016 football (http://football.bplaced.net)
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
-*
-*/
-
-if (!defined('IN_PHPBB') OR !defined('IN_FOOTBALL'))
-{
-	exit;
-}
-
-$data_table = false;
-
-$ext_path = $this->phpbb_path_helper->update_web_root_path($this->phpbb_extension_manager->get_extension_path('football/football', true));
-
-$sql = 'SELECT *
-	FROM ' . FOOTB_RANKS . " 
-	WHERE season = $season 
-		AND league = $league
-		AND matchday = $matchday";
-$result = $db->sql_query($sql);
-$row = $db->sql_fetchrow($result);
-$db->sql_freeresult($result);
-
-if ($row)
-{
-	include($this->football_root_path . 'block/rank_matchday.' . $this->php_ext);
-}	
-else
-{
-	$rank = 0;
-	// Get table-information
-	$sql = "SELECT
-				t.*,
-				SUM(1) AS matches,
-				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,
-				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
-			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 
-				AND m.status IN (2,3,5,6)
-			GROUP BY t.team_id
-			ORDER BY t.group_id ASC, points DESC, goals_diff DESC, goals DESC, t.team_name ASC";
-		
-	$result = $db->sql_query($sql);
-
-	$table_ary = array();
-	$points_ary = array();
-	$ranks_ary = array();
-	while( $row = $db->sql_fetchrow($result))
-	{
-		$table_ary[$row['team_id']] = $row;
-		$points_ary[$row['group_id']][$row['points']][]=$row['team_id']; 
-		$ranks_ary[] = $row['team_id'];
-	}
-	$last_group = '';
-	$rank = 0;
-	$current_rank = 0;
-	$last_goals = 0;
-	$last_goals_againts = 0;
-	$last_points = 0;
-	foreach($points_ary as $group_id => $points)
-	{
-		$data_table = true;
-		if ($last_group != $group_id)
-		{
-			$last_group =$group_id;
-			$rank = 0;
-			$last_goals = 0;
-			$last_goals_againts = 0;
-			$last_points = 0;
-			$template->assign_block_vars('side_total', array(
-				'GROUP' => sprintf($user->lang['GROUP']) . ' ' .$group_id,
-				)
-			);
-		}
-
-		foreach($points as $point => $teams)
-		{
-			if(count($teams) > 1 AND $group_id != '')
-			{
-				// Compare teams with equal points and sort
-				$teams = get_order_team_compare($teams, $season, $league, $group_id, $ranks_ary, $matchday);
-			}
-			foreach($teams as $key => $team)
-			{
-				$row = $table_ary[$team];
-				$rank++;
-				if ($last_points <> $row['points'] OR $last_goals <> $row['goals'] OR $last_goals_againts <> $row['goals_against'])
-				{
-					$current_rank = $rank . '.';
-				}
-				else
-				{
-					$current_rank = '';
-				}
-				$last_points = $row['points'];
-				$last_goals = $row['goals'];
-				$last_goals_againts = $row['goals_against'];
-				$row_class = (!($rank % 2)) ? 'bg1 row_light' : 'bg2 row_dark';
-				if ($row['team_symbol'] <> '')
-				{
-					$logo = "<img src=\"" . $ext_path . 'images/flags/' . $row['team_symbol'] . "\" alt=\"" . $row['team_symbol'] . "\" width=\"28\" height=\"28\"/>" ;
-				}
-				else
-				{
-					$logo = "<img src=\"" . $ext_path . "images/flags/blank.gif\" alt=\"\" width=\"28\" height=\"28\"/>" ;
-				}
-				  
-				$template->assign_block_vars('side_total', array(
-					'RANK' 			=> $current_rank,
-					'ROW_CLASS' 	=> $row_class,
-					'LOGO' 			=> $logo,
-					'TEAM_ID' 		=> $row['team_id'],
-					'TEAM_SHORT' 	=> $row['team_name_short'],
-					'U_PLAN_TEAM'	=> $this->helper->route('football_football_popup', array('popside' => 'viewplan_popup', 's' => $season, 'l' => $row['league'],
-																						'tid' => $row['team_id'], 'mode' => 'played')),
-					'GAMES' 		=> $row['matches'],
-					'POINTS' 		=> $row['points'],
-					)
-				);
-			}		
-		}
-	}
-	$db->sql_freeresult($result);
-
-	$template->assign_vars(array(
-		'S_DISPLAY_SIDE_TABLE' 			=> true,
-		'S_DATA_SIDE_TABLE' 		=> $data_table,
-		)
-	);
-}
+<?php
+/**
+*
+* @package phpBB Extension - Football Football
+* @copyright (c) 2016 football (http://football.bplaced.net)
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+if (!defined('IN_PHPBB') OR !defined('IN_FOOTBALL'))
+{
+	exit;
+}
+
+$data_table = false;
+
+$ext_path = $this->phpbb_path_helper->update_web_root_path($this->phpbb_extension_manager->get_extension_path('football/football', true));
+
+$sql = 'SELECT *
+	FROM ' . FOOTB_RANKS . " 
+	WHERE season = $season 
+		AND league = $league
+		AND matchday = $matchday";
+$result = $db->sql_query($sql);
+$row = $db->sql_fetchrow($result);
+$db->sql_freeresult($result);
+
+if ($row)
+{
+	include($this->football_root_path . 'block/rank_matchday.' . $this->php_ext);
+}	
+else
+{
+	$rank = 0;
+	// Get table-information
+	$sql = "SELECT
+				t.*,
+				SUM(1) AS matches,
+				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,
+				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
+			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 
+				AND m.status IN (2,3,5,6)
+			GROUP BY t.team_id
+			ORDER BY t.group_id ASC, points DESC, goals_diff DESC, goals DESC, t.team_name ASC";
+		
+	$result = $db->sql_query($sql);
+
+	$table_ary = array();
+	$points_ary = array();
+	$ranks_ary = array();
+	while( $row = $db->sql_fetchrow($result))
+	{
+		$table_ary[$row['team_id']] = $row;
+		$points_ary[$row['group_id']][$row['points']][]=$row['team_id']; 
+		$ranks_ary[] = $row['team_id'];
+	}
+	$last_group = '';
+	$rank = 0;
+	$current_rank = 0;
+	$last_goals = 0;
+	$last_goals_againts = 0;
+	$last_points = 0;
+	foreach($points_ary as $group_id => $points)
+	{
+		$data_table = true;
+		if ($last_group != $group_id)
+		{
+			$last_group =$group_id;
+			$rank = 0;
+			$last_goals = 0;
+			$last_goals_againts = 0;
+			$last_points = 0;
+			$template->assign_block_vars('side_total', array(
+				'GROUP' => sprintf($user->lang['GROUP']) . ' ' .$group_id,
+				)
+			);
+		}
+
+		foreach($points as $point => $teams)
+		{
+			if(count($teams) > 1 AND $group_id != '')
+			{
+				// Compare teams with equal points and sort
+				$teams = get_order_team_compare($teams, $season, $league, $group_id, $ranks_ary, $matchday);
+			}
+			foreach($teams as $key => $team)
+			{
+				$row = $table_ary[$team];
+				$rank++;
+				if ($last_points <> $row['points'] OR $last_goals <> $row['goals'] OR $last_goals_againts <> $row['goals_against'])
+				{
+					$current_rank = $rank . '.';
+				}
+				else
+				{
+					$current_rank = '';
+				}
+				$last_points = $row['points'];
+				$last_goals = $row['goals'];
+				$last_goals_againts = $row['goals_against'];
+				$row_class = (!($rank % 2)) ? 'bg1 row_light' : 'bg2 row_dark';
+				if ($row['team_symbol'] <> '')
+				{
+					$logo = "<img src=\"" . $ext_path . 'images/flags/' . $row['team_symbol'] . "\" alt=\"" . $row['team_symbol'] . "\" width=\"20\" height=\"20\"/>" ;
+				}
+				else
+				{
+					$logo = "<img src=\"" . $ext_path . "images/flags/blank.gif\" alt=\"\" width=\"20\" height=\"20\"/>" ;
+				}
+				  
+				$template->assign_block_vars('side_total', array(
+					'RANK' 			=> $current_rank,
+					'ROW_CLASS' 	=> $row_class,
+					'LOGO' 			=> $logo,
+					'TEAM_ID' 		=> $row['team_id'],
+					'TEAM_SHORT' 	=> $row['team_name_short'],
+					'U_PLAN_TEAM'	=> $this->helper->route('football_football_popup', array('popside' => 'viewplan_popup', 's' => $season, 'l' => $row['league'],
+																						'tid' => $row['team_id'], 'mode' => 'played')),
+					'GAMES' 		=> $row['matches'],
+					'POINTS' 		=> $row['points'],
+					)
+				);
+			}		
+		}
+	}
+	$db->sql_freeresult($result);
+
+	$template->assign_vars(array(
+		'S_DISPLAY_SIDE_TABLE' 			=> true,
+		'S_DATA_SIDE_TABLE' 		=> $data_table,
+		)
+	);
+}
 ?>

block/stat_points.php

@@ -1,170 +1,164 @@
-<?php
-/**
-*
-* @package phpBB Extension - Football Football
-* @copyright (c) 2016 football (http://football.bplaced.net)
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
-*
-*/
-
-if (!defined('IN_PHPBB') OR !defined('IN_FOOTBALL'))
-{
-	exit;
-}
-
-$data = false;
-$data_all = false;
-$rank = 0;
-$sql = 'SELECT
-		r.user_id,
-		u.username,
-		r.*
-	FROM ' . FOOTB_RANKS . ' AS r
-	LEFT JOIN ' . USERS_TABLE . "  AS u ON (u.user_id = r.user_id)
-	WHERE season = $season 
-		AND league = $league
-	ORDER BY r.points DESC";
-
-$result = $db->sql_query_limit($sql, 20);
-while($row = $db->sql_fetchrow($result))
-{
-	$data = true;
-	$rank++;
-	$row_class = (!($rank % 2)) ? 'bg1 row_light' : 'bg2 row_dark';
-	if ($row['user_id'] == $user->data['user_id'])
-	{
-		$row_class = 'bg3  row_user';
-	}
-	$template->assign_block_vars('top20', array(
-		'ROW_CLASS' 	=> $row_class,
-		'NAME' 			=> $row['username'],
-		'MATCHDAY' 		=> $row['matchday'],
-		'POINTS' 		=> $row['points'],
-		'WIN' 			=> $row['win'],
-		'DIRECTHITS' 	=> $row['correct_result'],
-		'TENDENCIES' 	=> $row['tendencies'] - $row['correct_result'],
-		'TOTAL' 		=> $row['tendencies'],
-		)
-	);
-}
-$db->sql_freeresult($result);
-
-$rank = 0;
-$sql = 'SELECT
-		r.user_id,
-		u.username,
-		r.*
-	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 
-	ORDER BY r.points ASC";
-
-$result = $db->sql_query_limit($sql, 20);
-while($row = $db->sql_fetchrow($result))
-{
-	$rank++;
-	$row_class = (!($rank % 2)) ? 'bg1 row_light' : 'bg2 row_dark';
-	if ($row['user_id'] == $user->data['user_id'])
-	{
-		$row_class = 'bg3  row_user';
-	}
-	$template->assign_block_vars('flop20', array(
-		'ROW_CLASS' 	=> $row_class,
-		'NAME' 			=> $row['username'],
-		'MATCHDAY' 		=> $row['matchday'],
-		'POINTS' 		=> $row['points'],
-		'DIRECTHITS' 	=> $row['correct_result'],
-		'TENDENCIES' 	=> $row['tendencies'] - $row['correct_result'],
-		'TOTAL' 		=> $row['tendencies'],
-		)
-	);
-}
-$db->sql_freeresult($result);
-
-$rank = 0;
-$sql = 'SELECT
-		r.user_id,
-		u.username,
-		r.*
-	FROM ' . FOOTB_RANKS . ' AS r
-	LEFT JOIN ' . USERS_TABLE . "  AS u ON (u.user_id = r.user_id)
-	WHERE league = $league
-	ORDER BY r.points DESC";
-
-$result = $db->sql_query_limit($sql, 20);
-while($row = $db->sql_fetchrow($result))
-{
-	$data_all = true;
-	$rank++;
-	$row_class = (!($rank % 2)) ? 'bg1 row_light' : 'bg2 row_dark';
-	if ($row['user_id'] == $user->data['user_id'])
-	{
-		$row_class = 'bg3  row_user';
-	}
-	$template->assign_block_vars('alltop20', array(
-		'ROW_CLASS' 	=> $row_class,
-		'NAME' 			=> $row['username'],
-		'SEASON' 		=> $row['season'],
-		'MATCHDAY' 		=> $row['matchday'],
-		'POINTS' 		=> $row['points'],
-		'WIN' 			=> $row['win'],
-		'DIRECTHITS' 	=> $row['correct_result'],
-		'TENDENCIES' 	=> $row['tendencies'] - $row['correct_result'],
-		'TOTAL' 		=> $row['tendencies'],
-		)
-	);
-}
-$db->sql_freeresult($result);
-
-$rank = 0;
-$sql = 'SELECT
-		r.user_id,
-		u.username,
-		COUNT(points) AS count_zero
-	FROM ' . FOOTB_RANKS . ' AS r
-	LEFT JOIN ' . USERS_TABLE . " AS u ON (u.user_id = r.user_id)
-	WHERE r.league = $league 
-		AND r.points = 0
-	GROUP BY r.user_id
-	ORDER BY count_zero DESC";
-
-$result = $db->sql_query_limit($sql, 20);
-while($row = $db->sql_fetchrow($result))
-{
-	$rank++;
-	$row_class = (!($rank % 2)) ? 'bg1 row_light' : 'bg2 row_dark';
-	if ($row['user_id'] == $user->data['user_id'])
-	{
-		$row_class = 'bg3  row_user';
-	}
-	$template->assign_block_vars('allflop20', array(
-		'ROW_CLASS' => $row_class,
-		'NAME' 		=> $row['username'],
-		'COUNTZERO' => $row['count_zero'],
-		)
-	);
-}
-$db->sql_freeresult($result);
-
-$league_info = league_info($season, $league);
-$sidename = sprintf($user->lang['STAT_POINTS']);
-$template->assign_vars(array(
-	'S_DISPLAY_STAT_POINTS' 	=> true,
-	'S_MATCHDAY_HIDE' 			=> true,
-	'S_SIDENAME' 				=> $sidename,
-	'S_WIN' 					=> ($league_info['win_matchday'] == '0') ? false : true,
-	'U_LEFT' 					=> $this->helper->route('football_main_controller', array('side' => 'my_koeff', 's' => $season, 'l' => $league, 'm' => $matchday)),
-	'LEFT_LINK' 				=> '&lt; ' . sprintf($user->lang['MY_KOEFF']),
-	'U_RIGHT' 					=> $this->helper->route('football_main_controller', array('side' => 'stat_results', 's' => $season, 'l' => $league, 'm' => $matchday)),
-	'RIGHT_LINK' 				=> sprintf($user->lang['STAT_RESULTS']) . ' &gt;',
-	'LEFT_TITLE' 				=> sprintf($user->lang['TITLE_MY_KOEFF']),
-	'RIGHT_TITLE' 				=> sprintf($user->lang['TITLE_STAT_RESULTS']),
-	'S_DATA_STAT_POINTS' 		=> $data,
-	'S_DATA_ALL_POINTS' 		=> $data_all,
-	'SEASON' 					=> $season,
-	'LEAGUE' 					=> $league,
-	)
-);
-
+<?php
+/**
+*
+* @package phpBB Extension - Football Football
+* @copyright (c) 2016 football (http://football.bplaced.net)
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+if (!defined('IN_PHPBB') OR !defined('IN_FOOTBALL'))
+{
+	exit;
+}
+
+$data = false;
+$data_all = false;
+$rank = 0;
+$sql = 'SELECT
+		r.user_id,
+		u.username,
+		r.*
+	FROM ' . FOOTB_RANKS . ' AS r
+	LEFT JOIN ' . USERS_TABLE . "  AS u ON (u.user_id = r.user_id)
+	WHERE season = $season 
+		AND league = $league
+	ORDER BY r.points DESC";
+
+$result = $db->sql_query_limit($sql, 20);
+while($row = $db->sql_fetchrow($result))
+{
+	$data = true;
+	$rank++;
+	$row_class = (!($rank % 2)) ? 'bg1 row_light' : 'bg2 row_dark';
+	if ($row['user_id'] == $user->data['user_id'])
+	{
+		$row_class = 'bg3  row_user';
+	}
+	$template->assign_block_vars('top20', array(
+		'ROW_CLASS' 	=> $row_class,
+		'NAME' 			=> $row['username'],
+		'MATCHDAY' 		=> $row['matchday'],
+		'POINTS' 		=> $row['points'],
+		'WIN' 			=> $row['win'],
+		'DIRECTHITS' 	=> $row['correct_result'],
+		'TENDENCIES' 	=> $row['tendencies'] - $row['correct_result'],
+		'TOTAL' 		=> $row['tendencies'],
+		)
+	);
+}
+$db->sql_freeresult($result);
+
+$rank = 0;
+$sql = 'SELECT
+		r.user_id,
+		u.username,
+		r.*
+	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 
+	ORDER BY r.points ASC";
+
+$result = $db->sql_query_limit($sql, 20);
+while($row = $db->sql_fetchrow($result))
+{
+	$rank++;
+	$row_class = (!($rank % 2)) ? 'bg1 row_light' : 'bg2 row_dark';
+	if ($row['user_id'] == $user->data['user_id'])
+	{
+		$row_class = 'bg3  row_user';
+	}
+	$template->assign_block_vars('flop20', array(
+		'ROW_CLASS' 	=> $row_class,
+		'NAME' 			=> $row['username'],
+		'MATCHDAY' 		=> $row['matchday'],
+		'POINTS' 		=> $row['points'],
+		'DIRECTHITS' 	=> $row['correct_result'],
+		'TENDENCIES' 	=> $row['tendencies'] - $row['correct_result'],
+		'TOTAL' 		=> $row['tendencies'],
+		)
+	);
+}
+$db->sql_freeresult($result);
+
+$rank = 0;
+$sql = 'SELECT
+		r.user_id,
+		u.username,
+		r.*
+	FROM ' . FOOTB_RANKS . ' AS r
+	LEFT JOIN ' . USERS_TABLE . "  AS u ON (u.user_id = r.user_id)
+	WHERE league = $league
+	ORDER BY r.points DESC";
+
+$result = $db->sql_query_limit($sql, 20);
+while($row = $db->sql_fetchrow($result))
+{
+	$data_all = true;
+	$rank++;
+	$row_class = (!($rank % 2)) ? 'bg1 row_light' : 'bg2 row_dark';
+	if ($row['user_id'] == $user->data['user_id'])
+	{
+		$row_class = 'bg3  row_user';
+	}
+	$template->assign_block_vars('alltop20', array(
+		'ROW_CLASS' 	=> $row_class,
+		'NAME' 			=> $row['username'],
+		'SEASON' 		=> $row['season'],
+		'MATCHDAY' 		=> $row['matchday'],
+		'POINTS' 		=> $row['points'],
+		'WIN' 			=> $row['win'],
+		'DIRECTHITS' 	=> $row['correct_result'],
+		'TENDENCIES' 	=> $row['tendencies'] - $row['correct_result'],
+		'TOTAL' 		=> $row['tendencies'],
+		)
+	);
+}
+$db->sql_freeresult($result);
+
+$rank = 0;
+$sql = 'SELECT
+		r.user_id,
+		u.username,
+		COUNT(points) AS count_zero
+	FROM ' . FOOTB_RANKS . ' AS r
+	LEFT JOIN ' . USERS_TABLE . " AS u ON (u.user_id = r.user_id)
+	WHERE r.league = $league 
+		AND r.points = 0
+	GROUP BY r.user_id
+	ORDER BY count_zero DESC";
+
+$result = $db->sql_query_limit($sql, 20);
+while($row = $db->sql_fetchrow($result))
+{
+	$rank++;
+	$row_class = (!($rank % 2)) ? 'bg1 row_light' : 'bg2 row_dark';
+	if ($row['user_id'] == $user->data['user_id'])
+	{
+		$row_class = 'bg3  row_user';
+	}
+	$template->assign_block_vars('allflop20', array(
+		'ROW_CLASS' => $row_class,
+		'NAME' 		=> $row['username'],
+		'COUNTZERO' => $row['count_zero'],
+		)
+	);
+}
+$db->sql_freeresult($result);
+
+$league_info = league_info($season, $league);
+$sidename = sprintf($user->lang['STAT_POINTS']);
+$template->assign_vars(array(
+	'S_DISPLAY_STAT_POINTS' 	=> true,
+	'S_MATCHDAY_HIDE' 			=> true,
+	'S_SIDENAME' 				=> $sidename,
+	'S_WIN' 					=> ($league_info['win_matchday'] == '0') ? false : true,
+	'S_DATA_STAT_POINTS' 		=> $data,
+	'S_DATA_ALL_POINTS' 		=> $data_all,
+	'SEASON' 					=> $season,
+	'LEAGUE' 					=> $league,
+	)
+);
+
 ?>

block/stat_results.php

@@ -1,146 +1,140 @@
-<?php
-/**
-*
-* @package phpBB Extension - Football Football
-* @copyright (c) 2016 football (http://football.bplaced.net)
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
-*
-*/
-
-if (!defined('IN_PHPBB') OR !defined('IN_FOOTBALL'))
-{
-	exit;
-}
-
-$data = false;
-$ext_path = $this->phpbb_path_helper->update_web_root_path($this->phpbb_extension_manager->get_extension_path('football/football', true));
-
-$rank = 0;
-// Select results and count
-$sql = 'SELECT
-		COUNT(DISTINCT(m.match_no)) AS count_result,
-		COUNT(m.match_no) AS count_bets,
-		m.goals_home,
-		m.goals_guest,
-		SUM(IF((b.goals_home + 0 < b.goals_guest) <> (m.goals_home + 0 < m.goals_guest) 
-				OR (b.goals_home = b.goals_guest) <> (m.goals_home = m.goals_guest) 
-				OR (b.goals_home + 0 > b.goals_guest) <> (m.goals_home + 0 > m.goals_guest),
-				0,
-				IF((b.goals_home = m.goals_home) AND (b.goals_guest = m.goals_guest), 1, 0)
-			)
-		)  AS hits,
-		SUM(IF((b.goals_home + 0 < b.goals_guest) <> (m.goals_home + 0 < m.goals_guest) 
-				OR (b.goals_home = b.goals_guest) <> (m.goals_home = m.goals_guest) 
-				OR (b.goals_home + 0 > b.goals_guest) <> (m.goals_home + 0 > m.goals_guest),
-				0,
-				IF((b.goals_home = m.goals_home) AND (b.goals_guest = m.goals_guest), 0, 1)
-			)
-		)  AS tendencies,
-		' . select_points('m',true) . '
-	FROM ' . FOOTB_MATCHES . ' AS m
-	LEFT JOIN ' . FOOTB_BETS . " AS b ON (m.season = b.season AND m.league = b.league AND m.match_no = b.match_no)
-	WHERE m.season = $season 
-		AND m.league = $league 
-		AND b.goals_home <> '' 
-		AND b.goals_guest <> '' 
-		AND (m.status IN (3,6)) 
-		AND m.matchday <= $matchday
-	GROUP BY m.goals_home, m.goals_guest
-	ORDER BY count_bets DESC";
-
-$result = $db->sql_query($sql);
-while($row = $db->sql_fetchrow($result))
-{
-	$data = true;
-	$rank++;
-	$row_class = (!($rank % 2)) ? 'bg1 row_light' : 'bg2 row_dark';
-	$template->assign_block_vars('result', array(
-		'ROW_CLASS' 	=> $row_class,
-		'GOALS_HOME' 	=> $row['goals_home'],
-		'GOALS_GUEST' 	=> $row['goals_guest'],
-		'RESULTS' 		=> $row['count_result'],
-		'BETS' 			=> $row['count_bets'],
-		'HITS' 			=> $row['hits'],
-		'TENDENCIES' 	=> $row['tendencies'],
-		'TOTAL' 		=> $row['hits'] + $row['tendencies'],
-		'POINTS' 		=> $row['points'],
-		'AVERAGE' 		=> round($row['points'] / $row['count_bets'],1),
-		)
-	);
-}
-$db->sql_freeresult($result);
-// Get goaldifferences by team
-$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 draw,
-		SUM(IF((m.team_id_home = t.team_id), IF(goals_home + 0 > (goals_guest+2), 1, 0), IF((goals_home + 2) < goals_guest, 1, 0))) AS plus3,
-		SUM(IF((m.team_id_home = t.team_id), IF(goals_home = (goals_guest+2), 1, 0), IF((goals_home + 2) = goals_guest, 1, 0))) AS plus2,
-		SUM(IF((m.team_id_home = t.team_id), IF(goals_home = (goals_guest+1), 1, 0), IF((goals_home + 1) = goals_guest, 1, 0))) AS plus1,
-		SUM(IF((m.team_id_home = t.team_id), IF((goals_home + 1) = goals_guest, 1, 0), IF(goals_home = (goals_guest + 1), 1, 0))) AS minus1,
-		SUM(IF((m.team_id_home = t.team_id), IF((goals_home + 2) = goals_guest, 1, 0), IF(goals_home = (goals_guest + 2), 1, 0))) AS minus2,
-		SUM(IF((m.team_id_home = t.team_id), IF((goals_home + 2) < goals_guest, 1, 0), IF(goals_home + 0 > (goals_guest + 2), 1, 0))) AS minus3,
-		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,
-		SUM(IF(m.team_id_home = t.team_id, goals_home - goals_guest , goals_guest - goals_home)) AS goal_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_get
-	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.season = $season 
-		AND m.league = $league 
-		AND m.status IN (3,6) 
-		AND m.matchday <= $matchday
-	GROUP BY t.team_id
-	ORDER BY points DESC, goal_diff DESC, goals DESC";
-	
-$result = $db->sql_query($sql);
-$rank = 0;
-while($row = $db->sql_fetchrow($result))
-{
-	$rank++;
-	$row_class = (!($rank % 2)) ? 'bg1 row_light' : 'bg2 row_dark';
-	$logo = "<img src=\"" . $ext_path . 'images/flags/' . $row['team_symbol'] . "\" alt=\"" . $row['team_symbol'] . "\" width=\"28\" height=\"28\"/>" ;
-	$template->assign_block_vars('points', array(
-		'ROW_CLASS' 	=> $row_class,
-		'RANK' 			=> $rank,
-		'LOGO' 			=> $logo,
-		'TEAM' 			=> $row['team_name_short'],
-		'MATCHES' 		=> $row['matches'],
-		'PLUS3' 		=> $row['plus3'],
-		'PLUS2' 		=> $row['plus2'],
-		'PLUS1' 		=> $row['plus1'],
-		'DRAW' 			=> $row['draw'],
-		'MINUS1' 		=> $row['minus1'],
-		'MINUS2'	 	=> $row['minus2'],
-		'MINUS3' 		=> $row['minus3'],
-		'GOALS_DIFF' 	=> $row['goal_diff'],
-		'POINTS' 		=> $row['points'],
-		)
-	);
-}
-$db->sql_freeresult($result);
-
-$sidename = sprintf($user->lang['STAT_RESULTS']);
-$template->assign_vars(array(
-	'S_DISPLAY_STAT_RESULTS' 	=> true,
-	'S_SIDENAME' 				=> $sidename,
-	'U_LEFT' 					=> $this->helper->route('football_main_controller', array('side' => 'stat_points', 's' => $season, 'l' => $league, 'm' => $matchday)),
-	'LEFT_LINK' 				=> '&lt; ' . sprintf($user->lang['STAT_POINTS']),
-	'U_RIGHT' 					=> $this->helper->route('football_main_controller', array('side' => 'bet', 's' => $season, 'l' => $league, 'm' => $matchday)),
-	'RIGHT_LINK' 				=> sprintf($user->lang['BET']) . ' &gt;',
-	'LEFT_TITLE' 				=> sprintf($user->lang['TITLE_STAT_POINTS']),
-	'RIGHT_TITLE' 				=> sprintf($user->lang['TITLE_BET']),
-	'S_DATA_STAT_RESULTS' 		=> $data,
-	'SEASON' 					=> $season,
-	'LEAGUE' 					=> $league,
-	)
-);
-
+<?php
+/**
+*
+* @package phpBB Extension - Football Football
+* @copyright (c) 2016 football (http://football.bplaced.net)
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+if (!defined('IN_PHPBB') OR !defined('IN_FOOTBALL'))
+{
+	exit;
+}
+
+$data = false;
+$ext_path = $this->phpbb_path_helper->update_web_root_path($this->phpbb_extension_manager->get_extension_path('football/football', true));
+
+$rank = 0;
+// Select results and count
+$sql = 'SELECT
+		COUNT(DISTINCT(m.match_no)) AS count_result,
+		COUNT(m.match_no) AS count_bets,
+		m.goals_home,
+		m.goals_guest,
+		SUM(IF((b.goals_home + 0 < b.goals_guest) <> (m.goals_home + 0 < m.goals_guest) 
+				OR (b.goals_home = b.goals_guest) <> (m.goals_home = m.goals_guest) 
+				OR (b.goals_home + 0 > b.goals_guest) <> (m.goals_home + 0 > m.goals_guest),
+				0,
+				IF((b.goals_home = m.goals_home) AND (b.goals_guest = m.goals_guest), 1, 0)
+			)
+		)  AS hits,
+		SUM(IF((b.goals_home + 0 < b.goals_guest) <> (m.goals_home + 0 < m.goals_guest) 
+				OR (b.goals_home = b.goals_guest) <> (m.goals_home = m.goals_guest) 
+				OR (b.goals_home + 0 > b.goals_guest) <> (m.goals_home + 0 > m.goals_guest),
+				0,
+				IF((b.goals_home = m.goals_home) AND (b.goals_guest = m.goals_guest), 0, 1)
+			)
+		)  AS tendencies,
+		' . select_points('m',true) . '
+	FROM ' . FOOTB_MATCHES . ' AS m
+	LEFT JOIN ' . FOOTB_BETS . " AS b ON (m.season = b.season AND m.league = b.league AND m.match_no = b.match_no)
+	WHERE m.season = $season 
+		AND m.league = $league 
+		AND b.goals_home <> '' 
+		AND b.goals_guest <> '' 
+		AND (m.status IN (3,6)) 
+		AND m.matchday <= $matchday
+	GROUP BY m.goals_home, m.goals_guest
+	ORDER BY count_bets DESC";
+
+$result = $db->sql_query($sql);
+while($row = $db->sql_fetchrow($result))
+{
+	$data = true;
+	$rank++;
+	$row_class = (!($rank % 2)) ? 'bg1 row_light' : 'bg2 row_dark';
+	$template->assign_block_vars('result', array(
+		'ROW_CLASS' 	=> $row_class,
+		'GOALS_HOME' 	=> $row['goals_home'],
+		'GOALS_GUEST' 	=> $row['goals_guest'],
+		'RESULTS' 		=> $row['count_result'],
+		'BETS' 			=> $row['count_bets'],
+		'HITS' 			=> $row['hits'],
+		'TENDENCIES' 	=> $row['tendencies'],
+		'TOTAL' 		=> $row['hits'] + $row['tendencies'],
+		'POINTS' 		=> $row['points'],
+		'AVERAGE' 		=> round($row['points'] / $row['count_bets'],1),
+		)
+	);
+}
+$db->sql_freeresult($result);
+// Get goaldifferences by team
+$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 draw,
+		SUM(IF((m.team_id_home = t.team_id), IF(goals_home + 0 > (goals_guest+2), 1, 0), IF((goals_home + 2) < goals_guest, 1, 0))) AS plus3,
+		SUM(IF((m.team_id_home = t.team_id), IF(goals_home = (goals_guest+2), 1, 0), IF((goals_home + 2) = goals_guest, 1, 0))) AS plus2,
+		SUM(IF((m.team_id_home = t.team_id), IF(goals_home = (goals_guest+1), 1, 0), IF((goals_home + 1) = goals_guest, 1, 0))) AS plus1,
+		SUM(IF((m.team_id_home = t.team_id), IF((goals_home + 1) = goals_guest, 1, 0), IF(goals_home = (goals_guest + 1), 1, 0))) AS minus1,
+		SUM(IF((m.team_id_home = t.team_id), IF((goals_home + 2) = goals_guest, 1, 0), IF(goals_home = (goals_guest + 2), 1, 0))) AS minus2,
+		SUM(IF((m.team_id_home = t.team_id), IF((goals_home + 2) < goals_guest, 1, 0), IF(goals_home + 0 > (goals_guest + 2), 1, 0))) AS minus3,
+		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,
+		SUM(IF(m.team_id_home = t.team_id, goals_home - goals_guest , goals_guest - goals_home)) AS goal_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_get
+	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.season = $season 
+		AND m.league = $league 
+		AND m.status IN (3,6) 
+		AND m.matchday <= $matchday
+	GROUP BY t.team_id
+	ORDER BY points DESC, goal_diff DESC, goals DESC";
+	
+$result = $db->sql_query($sql);
+$rank = 0;
+while($row = $db->sql_fetchrow($result))
+{
+	$rank++;
+	$row_class = (!($rank % 2)) ? 'bg1 row_light' : 'bg2 row_dark';
+	$logo = "<img src=\"" . $ext_path . 'images/flags/' . $row['team_symbol'] . "\" alt=\"" . $row['team_symbol'] . "\" width=\"28\" height=\"28\"/>" ;
+	$template->assign_block_vars('points', array(
+		'ROW_CLASS' 	=> $row_class,
+		'RANK' 			=> $rank,
+		'LOGO' 			=> $logo,
+		'TEAM' 			=> $row['team_name_short'],
+		'MATCHES' 		=> $row['matches'],
+		'PLUS3' 		=> $row['plus3'],
+		'PLUS2' 		=> $row['plus2'],
+		'PLUS1' 		=> $row['plus1'],
+		'DRAW' 			=> $row['draw'],
+		'MINUS1' 		=> $row['minus1'],
+		'MINUS2'	 	=> $row['minus2'],
+		'MINUS3' 		=> $row['minus3'],
+		'GOALS_DIFF' 	=> $row['goal_diff'],
+		'POINTS' 		=> $row['points'],
+		)
+	);
+}
+$db->sql_freeresult($result);
+
+$sidename = sprintf($user->lang['STAT_RESULTS']);
+$template->assign_vars(array(
+	'S_DISPLAY_STAT_RESULTS' 	=> true,
+	'S_SIDENAME' 				=> $sidename,
+	'S_DATA_STAT_RESULTS' 		=> $data,
+	'SEASON' 					=> $season,
+	'LEAGUE' 					=> $league,
+	)
+);
+
 ?>

block/table.php

@@ -1,446 +1,440 @@
-<?php
-/**
-*
-* @package phpBB Extension - Football Football
-* @copyright (c) 2016 football (http://football.bplaced.net)
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
-*
-*/
-
-if (!defined('IN_PHPBB') OR !defined('IN_FOOTBALL'))
-{
-	exit;
-}
-
-
-$data_table = false;
-$data_form = false;
-
-if ($matchday > 5)
-{
-	$form_from = $matchday - 5;
-}
-else
-{
-	$form_from = 1;
-}
-$ext_path = $this->phpbb_path_helper->update_web_root_path($this->phpbb_extension_manager->get_extension_path('football/football', true));
-
-$sql = 'SELECT *
-	FROM ' . FOOTB_LEAGUES . " 
-	WHERE season = $season 
-		AND league = $league";
-$result = $db->sql_query($sql);
-$row = $db->sql_fetchrow($result);
-$league_type = $row['league_type'];
-$db->sql_freeresult($result);
-
-$text_form = sprintf($user->lang['TABLE_FORM_FROM'], $form_from);
-
-$rank = 0;
-// Get table-information
-$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, 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,
-		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
-	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 
-		AND m.status IN (2,3,5,6)
-	GROUP BY t.team_id
-	ORDER BY t.group_id ASC, points DESC, goals_diff DESC, goals DESC, t.team_name ASC";
-	
-$result = $db->sql_query($sql);
-
-$table_ary = array();
-$points_ary = array();
-$ranks_ary = array();
-$rank = 0;
-while( $row = $db->sql_fetchrow($result))
-{
-	$rank++;
-	$table_ary[$row['team_id']] = $row;
-	$points_ary[$row['group_id']][$row['points']][]=$row['team_id']; 
-	$ranks_ary[] = $row['team_id'];
-}
-
-$last_group = '';
-$rank = 0;
-$current_rank = 0;
-$last_goals = 0;
-$last_goals_againts = 0;
-$last_points = 0;
-foreach($points_ary as $group_id => $points)
-{
-	$data_table = true;
-	if ($last_group != $group_id)
-	{
-		$last_group =$group_id;
-		$rank = 0;
-		$last_goals = 0;
-		$last_goals_againts = 0;
-		$last_points = 0;
-		$template->assign_block_vars('total', array(
-			'GROUP' => sprintf($user->lang['GROUP']) . ' ' .$group_id,
-			)
-		);
-	}
-	
-	foreach($points as $point => $teams)
-	{
-		if(count($teams) > 1 AND  $group_id != '')
-		{
-			// Compare teams with equal points and sort
-			$teams = get_order_team_compare($teams, $season, $league, $group_id, $ranks_ary, $matchday);
-		}
-		foreach($teams as $key => $team)
-		{
-			$row = $table_ary[$team];
-			$rank++;
-			if ($last_points <> $row['points'] OR $last_goals <> $row['goals'] OR $last_goals_againts <> $row['goals_against'])
-			{
-				$current_rank = $rank . '.';
-			}
-			else
-			{
-				$current_rank = '';
-			}
-			$last_points = $row['points'];
-			$last_goals = $row['goals'];
-			$last_goals_againts = $row['goals_against'];
-			$row_class = (!($rank % 2)) ? 'bg1 row_light' : 'bg2 row_dark';
-			if ($row['team_symbol'] <> '')
-			{
-				$logo = "<img src=\"" . $ext_path . 'images/flags/' . $row['team_symbol'] . "\" alt=\"" . $row['team_symbol'] . "\" width=\"28\" height=\"28\"/>" ;
-			}
-			else
-			{
-				$logo = "<img src=\"" . $ext_path . "images/flags/blank.gif\" alt=\"\" width=\"28\" height=\"28\"/>" ;
-			}
-			  
-			$template->assign_block_vars('total', array(
-				'RANK' 			=> $current_rank,
-				'ROW_CLASS' 	=> $row_class,
-				'LOGO' 			=> $logo,
-				'TEAM_ID' 		=> $row['team_id'],
-				'TEAM' 			=> $row['team_name'],
-				'TEAM_SHORT' 	=> $row['team_name_short'],
-				'U_PLAN_TEAM'	=> $this->helper->route('football_football_popup', array('popside' => 'viewplan_popup', 's' => $season, 'l' => $row['league'],
-																					'tid' => $row['team_id'], 'mode' => 'played')),
-				'GAMES' 		=> $row['matches'],
-				'WIN' 			=> $row['win'],
-				'DRAW' 			=> $row['draw'],
-				'LOST' 			=> $row['lost'],
-				'GOALS' 		=> $row['goals'],
-				'GOALS_AGAINST' => $row['goals_against'],
-				'GOALS_DIFF' 	=> $row['goals_diff'],
-				'POINTS' 		=> $row['points'],
-				)
-			);
-		}		
-	}     
-}
-
-$db->sql_freeresult($result);
-$rank = 0;
-// Get form-table-information
-$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, 3, IF(goals_home = 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 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
-	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)
-	GROUP BY t.team_id
-	ORDER BY t.group_id ASC, points DESC, goals_diff DESC, goals DESC, t.team_name ASC";
-	
-$result = $db->sql_query($sql);
-$last_group = '';
-$current_rank = 0;
-$last_goals = 0;
-$last_goals_againts = 0;
-$last_points = 0;
-while($row = $db->sql_fetchrow($result))
-{
-	if ($last_group != $row['group_id'])
-	{
-		$last_group = $row['group_id'];
-		$rank = 0;
-		$last_goals = 0;
-		$last_goals_againts = 0;
-		$last_points = 0;
-		$template->assign_block_vars('form', array(
-			'GROUP' => sprintf($user->lang['GROUP']) . ' ' . $row['group_id'],
-			)
-		);
-	}
-	if ($league_type != 2 OR $row['group_id'] != '')
-	{
-		$data_form = true;
-		$rank++;
-		if ($last_points <> $row['points'] OR $last_goals <> $row['goals'] OR $last_goals_againts <> $row['goals_against'])
-		{
-			$current_rank = $rank . '.';
-		}
-		else
-		{
-			$current_rank = '';
-		}
-		$last_points = $row['points'];
-		$last_goals = $row['goals'];
-		$last_goals_againts = $row['goals_against'];
-		$row_class = (!($rank % 2)) ? 'bg1 row_light' : 'bg2 row_dark';
-		if ($row['team_symbol'] <> '')
-		{
-			$logo = "<img src=\"" . $ext_path . 'images/flags/' . $row['team_symbol'] . "\" alt=\"" . $row['team_symbol'] . "\" width=\"28\" height=\"28\"/>" ;
-		}
-		else
-		{
-			$logo = "<img src=\"" . $ext_path . "images/flags/blank.gif\" alt=\"\" width=\"28\" height=\"28\"/>" ;
-		}
-
-		$template->assign_block_vars('form', array(
-			'RANK' 			=> $current_rank,
-			'ROW_CLASS' 	=> $row_class,
-			'LOGO' 			=> $logo,
-			'TEAM_ID' 		=> $row['team_id'],
-			'TEAM' 			=> $row['team_name'],
-			'TEAM_SHORT' 	=> $row['team_name_short'],
-			'U_PLAN_TEAM'	=> $this->helper->route('football_football_popup', array('popside' => 'viewplan_popup', 's' => $season, 'l' => $row['league'],
-																				'tid' => $row['team_id'], 'mode' => 'rest')),
-			'GAMES' 		=> $row['matches'],
-			'WIN' 			=> $row['win'],
-			'DRAW' 			=> $row['draw'],
-			'LOST' 			=> $row['lost'],
-			'GOALS' 		=> $row['goals'],
-			'GOALS_AGAINST' => $row['goals_against'],
-			'GOALS_DIFF' 	=> $row['goals_diff'],
-			'POINTS' 		=> $row['points'],
-			)
-		);
-	}
-}
-$db->sql_freeresult($result);
-$rank = 0;
-// Get home-table-information
-$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(goals_home - goals_guest) AS goals_diff,
-		SUM(goals_home) AS goals,
-		SUM(goals_guest) 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 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)
-	GROUP BY t.team_id
-	ORDER BY t.group_id ASC, points DESC, goals_diff DESC, goals DESC, t.team_name ASC";
-	
-$result = $db->sql_query($sql);
-$last_group = '';
-$current_rank = 0;
-$last_goals = 0;
-$last_goals_againts = 0;
-$last_points = 0;
-while($row = $db->sql_fetchrow($result))
-{
-	if ($last_group != $row['group_id'])
-	{
-		$last_group = $row['group_id'];
-		$rank = 0;
-		$last_goals = 0;
-		$last_goals_againts = 0;
-		$last_points = 0;
-		$template->assign_block_vars('home', array(
-			'GROUP' => sprintf($user->lang['GROUP']) . ' ' . $row['group_id'],
-			)
-		);
-	}
-	if ($league_type != 2 OR $row['group_id'] != '')
-	{
-		$rank++;
-		if ($last_points <> $row['points'] OR $last_goals <> $row['goals'] OR $last_goals_againts <> $row['goals_against'])
-		{
-			$current_rank = $rank . '.';
-		}
-		else
-		{
-			$current_rank = '';
-		}
-		$last_points = $row['points'];
-		$last_goals = $row['goals'];
-		$last_goals_againts = $row['goals_against'];
-		$row_class = (!($rank % 2)) ? 'bg1 row_light' : 'bg2 row_dark';
-		if ($row['team_symbol'] <> '')
-		{
-			$logo = "<img src=\"" . $ext_path . 'images/flags/' . $row['team_symbol'] . "\" alt=\"" . $row['team_symbol'] . "\" width=\"28\" height=\"28\"/>" ;
-		}
-		else
-		{
-			$logo = "<img src=\"" . $ext_path . "images/flags/blank.gif\" alt=\"\" width=\"28\" height=\"28\"/>" ;
-		}
-
-		$template->assign_block_vars('home', array(
-			'RANK' 			=> $current_rank,
-			'ROW_CLASS' 	=> $row_class,
-			'LOGO' 			=> $logo,
-			'TEAM_ID' 		=> $row['team_id'],
-			'TEAM' 			=> $row['team_name'],
-			'TEAM_SHORT' 	=> $row['team_name_short'],
-			'U_PLAN_TEAM'	=> $this->helper->route('football_football_popup', array('popside' => 'viewplan_popup', 's' => $season, 'l' => $row['league'],
-																				'tid' => $row['team_id'], 'mode' => 'home')),
-			'GAMES' 		=> $row['matches'],
-			'WIN' 			=> $row['win'],
-			'DRAW' 			=> $row['draw'],
-			'LOST' 			=> $row['lost'],
-			'GOALS' 		=> $row['goals'],
-			'GOALS_AGAINST' => $row['goals_against'],
-			'GOALS_DIFF' 	=> $row['goals_diff'],
-			'POINTS' 		=> $row['points'],
-			)
-		);
-	}
-}
-$db->sql_freeresult($result);
-$rank = 0;
-// Get away-table-information
-$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(goals_guest - goals_home) AS goals_diff,
-		SUM(goals_guest) AS goals,
-		SUM(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 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)
-	GROUP BY t.team_id
-	ORDER BY t.group_id ASC, points DESC, goals_diff DESC, goals DESC, t.team_name ASC";
-	
-$result = $db->sql_query($sql);
-$last_group = '';
-$current_rank = 0;
-$last_goals = 0;
-$last_goals_againts = 0;
-$last_points = 0;
-while($row = $db->sql_fetchrow($result))
-{
-	if ($last_group != $row['group_id'])
-	{
-		$last_group = $row['group_id'];
-		$rank = 0;
-		$last_goals = 0;
-		$last_goals_againts = 0;
-		$last_points = 0;
-		$template->assign_block_vars('away', array(
-			'GROUP' => sprintf($user->lang['GROUP']) . ' ' . $row['group_id'],
-			)
-		);
-	}
-	if ($league_type != 2 OR $row['group_id'] != '')
-	{
-		$rank++;
-		if ($last_points <> $row['points'] OR $last_goals <> $row['goals'] OR $last_goals_againts <> $row['goals_against'])
-		{
-			$current_rank = $rank . '.';
-		}
-		else
-		{
-			$current_rank = '';
-		}
-		$last_points = $row['points'];
-		$last_goals = $row['goals'];
-		$last_goals_againts = $row['goals_against'];
-		$row_class = (!($rank % 2)) ? 'bg1 row_light' : 'bg2 row_dark';
-		if ($row['team_symbol'] <> '')
-		{
-			$logo = "<img src=\"" . $ext_path . 'images/flags/' . $row['team_symbol'] . "\" alt=\"" . $row['team_symbol'] . "\" width=\"28\" height=\"28\"/>" ;
-		}
-		else
-		{
-			$logo = "<img src=\"" . $ext_path . "images/flags/blank.gif\" alt=\"\" width=\"28\" height=\"28\"/>" ;
-		}
-
-		$template->assign_block_vars('away', array(
-			'RANK' 			=> $current_rank,
-			'ROW_CLASS' 	=> $row_class,
-			'LOGO' 			=> $logo,
-			'TEAM_ID' 		=> $row['team_id'],
-			'TEAM' 			=> $row['team_name'],
-			'TEAM_SHORT' 	=> $row['team_name_short'],
-			'U_PLAN_TEAM'	=> $this->helper->route('football_football_popup', array('popside' => 'viewplan_popup', 's' => $season, 'l' => $row['league'],
-																				'tid' => $row['team_id'], 'mode' => 'away')),
-			'GAMES' 		=> $row['matches'],
-			'WIN' 			=> $row['win'],
-			'DRAW' 			=> $row['draw'],
-			'LOST' 			=> $row['lost'],
-			'GOALS' 		=> $row['goals'],
-			'GOALS_AGAINST' => $row['goals_against'],
-			'GOALS_DIFF' 	=> $row['goals_diff'],
-			'POINTS' 		=> $row['points'],
-			)
-		);
-	}
-}
-
-$db->sql_freeresult($result);
-$sidename = sprintf($user->lang['TABLE']);
-$template->assign_vars(array(
-	'S_DISPLAY_TABLE' 			=> true,
-	'S_SIDENAME' 				=> $sidename,
-	'U_LEFT' 					=> $this->helper->route('football_main_controller', array('side' => 'results', 's' => $season, 'l' => $league, 'm' => $matchday)),
-	'LEFT_LINK' 				=> '&lt; ' . sprintf($user->lang['RESULTS']),
-	'U_RIGHT' 					=> $this->helper->route('football_main_controller', array('side' => 'ranks_matchday', 's' => $season, 'l' => $league, 'm' => $matchday)),
-	'RIGHT_LINK' 				=> sprintf($user->lang['RANK_MATCHDAY']) . ' &gt;',
-	'LEFT_TITLE' 				=> sprintf($user->lang['TITLE_RESULTS']),
-	'RIGHT_TITLE' 				=> sprintf($user->lang['TITLE_RANK_MATCHDAY']),
-	'S_DATA_TABLE' 				=> $data_table,
-	'S_DATA_FORM' 				=> $data_form,
-	'SEASON' 					=> $season,
-	'LEAGUE' 					=> $league,
-	'TEXT_FORM' 				=> $text_form,
-	)
-);
-	
+<?php
+/**
+*
+* @package phpBB Extension - Football Football
+* @copyright (c) 2016 football (http://football.bplaced.net)
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+if (!defined('IN_PHPBB') OR !defined('IN_FOOTBALL'))
+{
+	exit;
+}
+
+
+$data_table = false;
+$data_form = false;
+
+if ($matchday > 5)
+{
+	$form_from = $matchday - 5;
+}
+else
+{
+	$form_from = 1;
+}
+$ext_path = $this->phpbb_path_helper->update_web_root_path($this->phpbb_extension_manager->get_extension_path('football/football', true));
+
+$sql = 'SELECT *
+	FROM ' . FOOTB_LEAGUES . " 
+	WHERE season = $season 
+		AND league = $league";
+$result = $db->sql_query($sql);
+$row = $db->sql_fetchrow($result);
+$league_type = $row['league_type'];
+$db->sql_freeresult($result);
+
+$text_form = sprintf($user->lang['TABLE_FORM_FROM'], $form_from);
+
+$rank = 0;
+// Get table-information
+$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, 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,
+		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
+	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 
+		AND m.status IN (2,3,5,6)
+	GROUP BY t.team_id
+	ORDER BY t.group_id ASC, points DESC, goals_diff DESC, goals DESC, t.team_name ASC";
+	
+$result = $db->sql_query($sql);
+
+$table_ary = array();
+$points_ary = array();
+$ranks_ary = array();
+$rank = 0;
+while( $row = $db->sql_fetchrow($result))
+{
+	$rank++;
+	$table_ary[$row['team_id']] = $row;
+	$points_ary[$row['group_id']][$row['points']][]=$row['team_id']; 
+	$ranks_ary[] = $row['team_id'];
+}
+
+$last_group = '';
+$rank = 0;
+$current_rank = 0;
+$last_goals = 0;
+$last_goals_againts = 0;
+$last_points = 0;
+foreach($points_ary as $group_id => $points)
+{
+	$data_table = true;
+	if ($last_group != $group_id)
+	{
+		$last_group =$group_id;
+		$rank = 0;
+		$last_goals = 0;
+		$last_goals_againts = 0;
+		$last_points = 0;
+		$template->assign_block_vars('total', array(
+			'GROUP' => sprintf($user->lang['GROUP']) . ' ' .$group_id,
+			)
+		);
+	}
+	
+	foreach($points as $point => $teams)
+	{
+		if(count($teams) > 1 AND  $group_id != '')
+		{
+			// Compare teams with equal points and sort
+			$teams = get_order_team_compare($teams, $season, $league, $group_id, $ranks_ary, $matchday);
+		}
+		foreach($teams as $key => $team)
+		{
+			$row = $table_ary[$team];
+			$rank++;
+			if ($last_points <> $row['points'] OR $last_goals <> $row['goals'] OR $last_goals_againts <> $row['goals_against'])
+			{
+				$current_rank = $rank . '.';
+			}
+			else
+			{
+				$current_rank = '';
+			}
+			$last_points = $row['points'];
+			$last_goals = $row['goals'];
+			$last_goals_againts = $row['goals_against'];
+			$row_class = (!($rank % 2)) ? 'bg1 row_light' : 'bg2 row_dark';
+			if ($row['team_symbol'] <> '')
+			{
+				$logo = "<img src=\"" . $ext_path . 'images/flags/' . $row['team_symbol'] . "\" alt=\"" . $row['team_symbol'] . "\" width=\"28\" height=\"28\"/>" ;
+			}
+			else
+			{
+				$logo = "<img src=\"" . $ext_path . "images/flags/blank.gif\" alt=\"\" width=\"28\" height=\"28\"/>" ;
+			}
+			  
+			$template->assign_block_vars('total', array(
+				'RANK' 			=> $current_rank,
+				'ROW_CLASS' 	=> $row_class,
+				'LOGO' 			=> $logo,
+				'TEAM_ID' 		=> $row['team_id'],
+				'TEAM' 			=> $row['team_name'],
+				'TEAM_SHORT' 	=> $row['team_name_short'],
+				'U_PLAN_TEAM'	=> $this->helper->route('football_football_popup', array('popside' => 'viewplan_popup', 's' => $season, 'l' => $row['league'],
+																					'tid' => $row['team_id'], 'mode' => 'played')),
+				'GAMES' 		=> $row['matches'],
+				'WIN' 			=> $row['win'],
+				'DRAW' 			=> $row['draw'],
+				'LOST' 			=> $row['lost'],
+				'GOALS' 		=> $row['goals'],
+				'GOALS_AGAINST' => $row['goals_against'],
+				'GOALS_DIFF' 	=> $row['goals_diff'],
+				'POINTS' 		=> $row['points'],
+				)
+			);
+		}		
+	}     
+}
+
+$db->sql_freeresult($result);
+$rank = 0;
+// Get form-table-information
+$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, 3, IF(goals_home = 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 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
+	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)
+	GROUP BY t.team_id
+	ORDER BY t.group_id ASC, points DESC, goals_diff DESC, goals DESC, t.team_name ASC";
+	
+$result = $db->sql_query($sql);
+$last_group = '';
+$current_rank = 0;
+$last_goals = 0;
+$last_goals_againts = 0;
+$last_points = 0;
+while($row = $db->sql_fetchrow($result))
+{
+	if ($last_group != $row['group_id'])
+	{
+		$last_group = $row['group_id'];
+		$rank = 0;
+		$last_goals = 0;
+		$last_goals_againts = 0;
+		$last_points = 0;
+		$template->assign_block_vars('form', array(
+			'GROUP' => sprintf($user->lang['GROUP']) . ' ' . $row['group_id'],
+			)
+		);
+	}
+	if ($league_type != 2 OR $row['group_id'] != '')
+	{
+		$data_form = true;
+		$rank++;
+		if ($last_points <> $row['points'] OR $last_goals <> $row['goals'] OR $last_goals_againts <> $row['goals_against'])
+		{
+			$current_rank = $rank . '.';
+		}
+		else
+		{
+			$current_rank = '';
+		}
+		$last_points = $row['points'];
+		$last_goals = $row['goals'];
+		$last_goals_againts = $row['goals_against'];
+		$row_class = (!($rank % 2)) ? 'bg1 row_light' : 'bg2 row_dark';
+		if ($row['team_symbol'] <> '')
+		{
+			$logo = "<img src=\"" . $ext_path . 'images/flags/' . $row['team_symbol'] . "\" alt=\"" . $row['team_symbol'] . "\" width=\"28\" height=\"28\"/>" ;
+		}
+		else
+		{
+			$logo = "<img src=\"" . $ext_path . "images/flags/blank.gif\" alt=\"\" width=\"28\" height=\"28\"/>" ;
+		}
+
+		$template->assign_block_vars('form', array(
+			'RANK' 			=> $current_rank,
+			'ROW_CLASS' 	=> $row_class,
+			'LOGO' 			=> $logo,
+			'TEAM_ID' 		=> $row['team_id'],
+			'TEAM' 			=> $row['team_name'],
+			'TEAM_SHORT' 	=> $row['team_name_short'],
+			'U_PLAN_TEAM'	=> $this->helper->route('football_football_popup', array('popside' => 'viewplan_popup', 's' => $season, 'l' => $row['league'],
+																				'tid' => $row['team_id'], 'mode' => 'rest')),
+			'GAMES' 		=> $row['matches'],
+			'WIN' 			=> $row['win'],
+			'DRAW' 			=> $row['draw'],
+			'LOST' 			=> $row['lost'],
+			'GOALS' 		=> $row['goals'],
+			'GOALS_AGAINST' => $row['goals_against'],
+			'GOALS_DIFF' 	=> $row['goals_diff'],
+			'POINTS' 		=> $row['points'],
+			)
+		);
+	}
+}
+$db->sql_freeresult($result);
+$rank = 0;
+// Get home-table-information
+$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(goals_home - goals_guest) AS goals_diff,
+		SUM(goals_home) AS goals,
+		SUM(goals_guest) 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 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)
+	GROUP BY t.team_id
+	ORDER BY t.group_id ASC, points DESC, goals_diff DESC, goals DESC, t.team_name ASC";
+	
+$result = $db->sql_query($sql);
+$last_group = '';
+$current_rank = 0;
+$last_goals = 0;
+$last_goals_againts = 0;
+$last_points = 0;
+while($row = $db->sql_fetchrow($result))
+{
+	if ($last_group != $row['group_id'])
+	{
+		$last_group = $row['group_id'];
+		$rank = 0;
+		$last_goals = 0;
+		$last_goals_againts = 0;
+		$last_points = 0;
+		$template->assign_block_vars('home', array(
+			'GROUP' => sprintf($user->lang['GROUP']) . ' ' . $row['group_id'],
+			)
+		);
+	}
+	if ($league_type != 2 OR $row['group_id'] != '')
+	{
+		$rank++;
+		if ($last_points <> $row['points'] OR $last_goals <> $row['goals'] OR $last_goals_againts <> $row['goals_against'])
+		{
+			$current_rank = $rank . '.';
+		}
+		else
+		{
+			$current_rank = '';
+		}
+		$last_points = $row['points'];
+		$last_goals = $row['goals'];
+		$last_goals_againts = $row['goals_against'];
+		$row_class = (!($rank % 2)) ? 'bg1 row_light' : 'bg2 row_dark';
+		if ($row['team_symbol'] <> '')
+		{
+			$logo = "<img src=\"" . $ext_path . 'images/flags/' . $row['team_symbol'] . "\" alt=\"" . $row['team_symbol'] . "\" width=\"28\" height=\"28\"/>" ;
+		}
+		else
+		{
+			$logo = "<img src=\"" . $ext_path . "images/flags/blank.gif\" alt=\"\" width=\"28\" height=\"28\"/>" ;
+		}
+
+		$template->assign_block_vars('home', array(
+			'RANK' 			=> $current_rank,
+			'ROW_CLASS' 	=> $row_class,
+			'LOGO' 			=> $logo,
+			'TEAM_ID' 		=> $row['team_id'],
+			'TEAM' 			=> $row['team_name'],
+			'TEAM_SHORT' 	=> $row['team_name_short'],
+			'U_PLAN_TEAM'	=> $this->helper->route('football_football_popup', array('popside' => 'viewplan_popup', 's' => $season, 'l' => $row['league'],
+																				'tid' => $row['team_id'], 'mode' => 'home')),
+			'GAMES' 		=> $row['matches'],
+			'WIN' 			=> $row['win'],
+			'DRAW' 			=> $row['draw'],
+			'LOST' 			=> $row['lost'],
+			'GOALS' 		=> $row['goals'],
+			'GOALS_AGAINST' => $row['goals_against'],
+			'GOALS_DIFF' 	=> $row['goals_diff'],
+			'POINTS' 		=> $row['points'],
+			)
+		);
+	}
+}
+$db->sql_freeresult($result);
+$rank = 0;
+// Get away-table-information
+$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(goals_guest - goals_home) AS goals_diff,
+		SUM(goals_guest) AS goals,
+		SUM(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 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)
+	GROUP BY t.team_id
+	ORDER BY t.group_id ASC, points DESC, goals_diff DESC, goals DESC, t.team_name ASC";
+	
+$result = $db->sql_query($sql);
+$last_group = '';
+$current_rank = 0;
+$last_goals = 0;
+$last_goals_againts = 0;
+$last_points = 0;
+while($row = $db->sql_fetchrow($result))
+{
+	if ($last_group != $row['group_id'])
+	{
+		$last_group = $row['group_id'];
+		$rank = 0;
+		$last_goals = 0;
+		$last_goals_againts = 0;
+		$last_points = 0;
+		$template->assign_block_vars('away', array(
+			'GROUP' => sprintf($user->lang['GROUP']) . ' ' . $row['group_id'],
+			)
+		);
+	}
+	if ($league_type != 2 OR $row['group_id'] != '')
+	{
+		$rank++;
+		if ($last_points <> $row['points'] OR $last_goals <> $row['goals'] OR $last_goals_againts <> $row['goals_against'])
+		{
+			$current_rank = $rank . '.';
+		}
+		else
+		{
+			$current_rank = '';
+		}
+		$last_points = $row['points'];
+		$last_goals = $row['goals'];
+		$last_goals_againts = $row['goals_against'];
+		$row_class = (!($rank % 2)) ? 'bg1 row_light' : 'bg2 row_dark';
+		if ($row['team_symbol'] <> '')
+		{
+			$logo = "<img src=\"" . $ext_path . 'images/flags/' . $row['team_symbol'] . "\" alt=\"" . $row['team_symbol'] . "\" width=\"28\" height=\"28\"/>" ;
+		}
+		else
+		{
+			$logo = "<img src=\"" . $ext_path . "images/flags/blank.gif\" alt=\"\" width=\"28\" height=\"28\"/>" ;
+		}
+
+		$template->assign_block_vars('away', array(
+			'RANK' 			=> $current_rank,
+			'ROW_CLASS' 	=> $row_class,
+			'LOGO' 			=> $logo,
+			'TEAM_ID' 		=> $row['team_id'],
+			'TEAM' 			=> $row['team_name'],
+			'TEAM_SHORT' 	=> $row['team_name_short'],
+			'U_PLAN_TEAM'	=> $this->helper->route('football_football_popup', array('popside' => 'viewplan_popup', 's' => $season, 'l' => $row['league'],
+																				'tid' => $row['team_id'], 'mode' => 'away')),
+			'GAMES' 		=> $row['matches'],
+			'WIN' 			=> $row['win'],
+			'DRAW' 			=> $row['draw'],
+			'LOST' 			=> $row['lost'],
+			'GOALS' 		=> $row['goals'],
+			'GOALS_AGAINST' => $row['goals_against'],
+			'GOALS_DIFF' 	=> $row['goals_diff'],
+			'POINTS' 		=> $row['points'],
+			)
+		);
+	}
+}
+
+$db->sql_freeresult($result);
+$sidename = sprintf($user->lang['TABLE']);
+$template->assign_vars(array(
+	'S_DISPLAY_TABLE' 			=> true,
+	'S_SIDENAME' 				=> $sidename,
+	'S_DATA_TABLE' 				=> $data_table,
+	'S_DATA_FORM' 				=> $data_form,
+	'SEASON' 					=> $season,
+	'LEAGUE' 					=> $league,
+	'TEXT_FORM' 				=> $text_form,
+	)
+);
+	
 ?>

composer.json

@@ -1,10 +1,10 @@
 {
 	"name": "football/football",
 	"type": "phpbb-extension",
-	"description": "Football Prediction League for phpBB 3.1",
+	"description": "Football Prediction League",
 	"homepage": "http://football.bplaced.net",
-	"version": "0.9.6",
-	"time": "2016-05-29",
+	"version": "0.9.9",
+	"time": "2017-09-09",
 	"license": "GPL-2.0",
 	"authors": [{
 			"name": "J. Helmke",
@@ -18,7 +18,7 @@
 	"extra": {
 		"display-name": "Football Prediction League",
 		"soft-require": {
-			"phpbb/phpbb": "3.1.*"
+			"phpbb/phpbb": ">3.1.*"
 		},
 		"version-check": {
 			"host": "football.bplaced.net",

controller/main.php

@@ -308,8 +308,8 @@ class main
 					$user_id = $user->data['user_id'];
 					$sql = 'SELECT * FROM ' . FOOTB_MATCHES . " WHERE season = $season AND league = $league AND matchday = $matchday AND status <= 0";
 					$resultopen = $db->sql_query($sql);
-					
 					$rows = $db->sql_fetchrowset($resultopen);
+					$db->sql_freeresult($resultopen);
 				
 					$count_matches = 0;
 					$count_updates = 0;
@@ -419,7 +419,6 @@ class main
 					{
 						$dbmsg = sprintf($user->lang['NO_BETS_SAVED']);
 					}
-					$db->sql_freeresult($resultopen);
 					
 					// extra bets
 					$sql = 'SELECT * FROM ' . FOOTB_EXTRA . " WHERE season = $season AND league = $league  AND matchday = $matchday AND extra_status <= 0";
@@ -479,6 +478,7 @@ class main
 							}
 						}
 					}
+					$db->sql_freeresult($resultextra);
 					if ($count_extra_updates)
 					{
 						$dbmsg = $dbmsg . ' ' . sprintf($user->lang['EXTRA_BET' . (($count_extra_updates == 1) ? '' : 'S') . '_SAVED'], $count_extra_updates);
@@ -725,6 +725,7 @@ class main
 						}
 					}
 				}
+				$db->sql_freeresult($resultextra);
 				if ($count_extra_updates)
 				{
 					$dbmsg = $dbmsg . ' ' . sprintf($user->lang['EXTRA_RESULT' . (($count_extra_updates == 1) ? '' : 'S') . '_SAVED'], $count_extra_updates);
@@ -823,7 +824,7 @@ class main
 			$league_type = $row['league_type'];
 			$db->sql_freeresult($result);
 			$lang_dates = $user->lang['datetime'];
-			$local_board_time = time() + (($config['board_timezone'] - $config['football_host_timezone']) * 3600); 
+			$local_board_time = time() + ($config['football_time_shift'] * 3600); 
 			$sql = "SELECT *,
 					CONCAT(
 						CASE DATE_FORMAT(delivery_date,'%w')
@@ -1000,7 +1001,14 @@ class main
 		else
 		{
 			$mobile = '';
-			include($this->football_root_path . 'block/last_users.' . $this->php_ext);
+			if ($config['football_display_last_users'] > 0)
+			{
+				include($this->football_root_path . 'block/last_users.' . $this->php_ext);
+			}
+			if ($config['football_display_last_results'] > 0)
+			{
+				include($this->football_root_path . 'block/last_results.' . $this->php_ext);				
+			}
 		}
 		// Send data to the template file
 		if ($view == 'print') 

cron/task/football_remember.php

@@ -1,334 +1,336 @@
-<?php
-/**
-*
-* @package phpBB Extension - Football Football
-* @copyright (c) 2016 football (http://football.bplaced.net)
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
-*
-*/
-
-namespace football\football\cron\task;
-
-class football_remember extends \phpbb\cron\task\base
-{
-	/* @var string phpBB root path */
-	protected $root_path;
-
-	/* @var string phpEx */
-	protected $php_ext;
-
-	/* @var \phpbb\extension\manager */
-	protected $phpbb_extension_manager;
-
-	/* @var \phpbb\path_helper */
-	protected $phpbb_path_helper;
-
-	/* @var \phpbb\db\driver\driver_interface */
-	protected $db;
-
-	/* @var \phpbb\config\config */
-	protected $config;
-
-	/* @var \phpbb\log\log_interface */
-	protected $log;
-
-	/* @var \phpbb\user */
-	protected $user;
-
-	/**
-	* Constructor
-	*
-	* @param string									$root_path
-	* @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\config\config					$config
-	* @param \phpbb\log\log_interface 				$log
-	* @param \phpbb\user							$user
-	*/
-	public function __construct($root_path, $php_ext, \phpbb\extension\manager $phpbb_extension_manager, \phpbb\path_helper $phpbb_path_helper, \phpbb\db\driver\driver_interface $db, \phpbb\config\config $config, \phpbb\log\log_interface $log, \phpbb\user $user)
-	{
-		$this->root_path				= $root_path;
-		$this->php_ext 					= $php_ext;
-		$this->phpbb_extension_manager 	= $phpbb_extension_manager;
-		$this->phpbb_path_helper		= $phpbb_path_helper;
-		$this->db 						= $db;
-		$this->config 					= $config;
-		$this->phpbb_log 				= $log;
-		$this->user 					= $user;
-	}
-
-	/**
-	* Runs this cron task.
-	*
-	* @return null
-	*/
-	public function run()
-	{
-		global $request;
-
-		$ext_path = $this->phpbb_path_helper->update_web_root_path($this->phpbb_extension_manager->get_extension_path('football/football', true));
-		include($ext_path . 'includes/functions.' . $this->php_ext);
-		include($ext_path . 'includes/constants.' . $this->php_ext);
-
-		// Load extension language file
-		$this->user->add_lang_ext('football/football', 'info_acp_football');
-		
-		// mode=test ?
-		$mode = $request->variable('mode', '');
-		$days = $request->variable('days', 0);
-
-		//Mail Settings
-		$use_queue 		= false;
-		$used_method 	= NOTIFY_EMAIL;
-		$priority 		= MAIL_NORMAL_PRIORITY;
-
-
-		$season = curr_season();
-		//Matchdays to close in 24 hours and 24 hours later
-		// shift days to test
-		$local_board_time = time() + ($days * 86400);
-
-		if ($mode <> 'test')
-		{
-			// Update next run 
-			$run_time = getdate($this->config['football_remember_next_run']);
-			$next_run = mktime($run_time['hours'], $run_time['minutes'], 0, date("n"), date("j") + 1, date("Y"));
-			$this->config->set('football_remember_next_run', $next_run, true);
-		}
-		else
-		{
-			$message = sprintf($this->user->lang['LOG_FOOTBALL_MSG_TEST' . (($days == 0) ? '' : '_TRAVEL')], date("d.m.Y H:i", $local_board_time));
-			$this->phpbb_log->add('admin', ANONYMOUS, '', 'LOG_FOOTBALL_REMEMBER_CRON_TEST', false, array($message));
-		}
-
-		$sql = 'SELECT
-				 m.*,
-				 l.*
-				 FROM ' . FOOTB_MATCHDAYS . ' AS m
-				 LEFT JOIN ' . FOOTB_LEAGUES . " AS l ON (l.season = m.season AND l.league = m.league)
-				 WHERE m.season >= $season AND m.status = 0 
-					AND (DATE_SUB(m.delivery_date, INTERVAL '1 23:59' DAY_MINUTE) < FROM_UNIXTIME('$local_board_time'))
-					AND (DATE_SUB(m.delivery_date, INTERVAL '1 00:00' DAY_MINUTE) > FROM_UNIXTIME('$local_board_time'))";
-		$result = $this->db->sql_query($sql);
-		$toclose = $this->db->sql_fetchrowset($result);
-		$this->db->sql_freeresult($result);
-
-		// If we found matchdays to close, search missing bets and mail them
-		foreach ($toclose as $close)
-		{
-			// prepare some variables
-			$first_mail 	= true;
-			$season 		= $close['season'];
-			$league 		= $close['league'];
-			$league_name 	= $close['league_name'];
-			$league_short 	= $close['league_name_short'];
-			$delivery 		= $close['delivery_date'];
-			$matchday 		= $close['matchday'];
-			$subject 		= sprintf($this->user->lang['FOOTBALL_REMEMBER_SUBJECT'], $league_short, $matchday);
-			$usernames 		= '';
-
-			// find missing users 
-			$sql = 'SELECT
-					u.user_email AS user_email,
-					u.username AS username,
-					u.user_id AS userid,
-					u.user_lang 
-					FROM ' . FOOTB_MATCHES . ' AS m
-					LEFT JOIN ' . FOOTB_LEAGUES . ' AS l ON (l.season = m.season AND l.league = m.league)
-					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 ' . PROFILE_FIELDS_DATA_TABLE. ' AS p ON p.user_id = b.user_id
-					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 
-						AND ((b.goals_home = '') OR (b.goals_guest = '')) 
-						AND m.status = 0 AND p.pf_footb_rem_f = 1
-						AND (l.bet_in_time = 0 OR 
-								(l.bet_in_time = 1 
-									AND (DATE_SUB(m.match_datetime, INTERVAL '1 23:59' DAY_MINUTE) < FROM_UNIXTIME('$local_board_time'))
-									AND (DATE_SUB(m.match_datetime, INTERVAL '1 00:00' DAY_MINUTE) > FROM_UNIXTIME('$local_board_time'))))
-					GROUP BY b.user_id
-					UNION
-					SELECT
-					p.pf_footb_email  AS user_email,
-					u.username AS username,
-					u.user_id AS userid,
-					u.user_lang
-					FROM " . FOOTB_MATCHES . ' AS m
-					LEFT JOIN ' . FOOTB_LEAGUES . ' AS l ON (l.season = m.season AND l.league = m.league)
-					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 ' . PROFILE_FIELDS_DATA_TABLE. ' AS p ON p.user_id = b.user_id
-					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 
-						AND ((b.goals_home = '') OR (b.goals_guest = '')) 
-						AND m.status = 0 AND p.pf_footb_rem_s = 1
-						AND (l.bet_in_time = 0 OR 
-								(l.bet_in_time = 1 
-									AND (DATE_SUB(m.match_datetime, INTERVAL '1 23:59' DAY_MINUTE) < FROM_UNIXTIME('$local_board_time'))
-									AND (DATE_SUB(m.match_datetime, INTERVAL '1 00:00' DAY_MINUTE) > FROM_UNIXTIME('$local_board_time'))))
-					GROUP BY b.user_id
-					";
-			$result = $this->db->sql_query($sql);
-			$row = $this->db->sql_fetchrow($result);
-
-			if (!$row)
-			{
-				$this->db->sql_freeresult($result);
-			}
-			else
-			{
-
-				// Send the messages
-				include_once($this->root_path . 'includes/functions_messenger.' . $this->php_ext);
-				$messenger = new \messenger($use_queue);
-				include_once($this->root_path . 'includes/functions_user.' . $this->php_ext);
-				$errored = false;
-				$messenger->headers('X-AntiAbuse: Board servername - ' . $this->config['server_name']);
-				$messenger->headers('X-AntiAbuse: User_id - ' . ANONYMOUS);
-				$messenger->headers('X-AntiAbuse: Username - CRON TASK Football remember');
-				$messenger->headers('X-AntiAbuse: User IP - ' . $this->user->ip);
-				$messenger->subject(htmlspecialchars_decode($subject));
-				$messenger->set_mail_priority($priority);
-
-				do
-				{
-					// Send the messages
-					$used_lang = $row['user_lang'];
-					$mail_template_path = $ext_path . 'language/' . $used_lang . '/email/';
-
-					if ($mode <> 'test')
-					{
-						$messenger->to($row['user_email'], $row['username']);
-					}
-					else
-					{
-						// test send to board email
-						$messenger->to($this->config['board_email'], $this->config['sitename']);
-					}
-					$messenger->template('footb_send_remember', $used_lang, $mail_template_path);
-
-					$messenger->assign_vars(array(
-						'USERNAME'		=> $row['username'],
-						'LEAGUE'		=> $league_name,
-						'MATCHDAY'		=> $matchday,
-						'DELIVERY'		=> $delivery,
-						'CONTACT_EMAIL' => $this->config['board_contact'])
-					);
-
-					if ($mode <> 'test')
-					{
-						if (!($messenger->send($used_method)))
-						{
-							$message = '<strong>' . sprintf($this->user->lang['FOOTBALL_REMEMBER_ERROR_EMAIL'], $league_short, $row['user_email']) . '</strong>';
-							$this->phpbb_log->add('critical', ANONYMOUS, '', 'LOG_ERROR_EMAIL', false, array($message));
-							$usernames .= (($usernames != '') ? ', ' : '') . $row['username']. '!';
-						}
-						else
-						{
-							$usernames .= (($usernames != '') ? ', ' : '') . $row['username'];
-						}
-					}
-					else
-					{
-						// Test mode
-						if ($first_mail)
-						{
-							// only send one mail
-							if (!($messenger->send($used_method)))
-							{
-								$message = '<strong>' . sprintf($this->user->lang['FOOTBALL_REMEMBER_ERROR_EMAIL'], $league_short, $row['user_email']) . '</strong>';
-								$this->phpbb_log->add('critical', ANONYMOUS, '', 'LOG_ERROR_EMAIL', false, array($message));
-								$usernames .= (($usernames != '') ? ', ' : '') . $row['username']. '!';
-							}
-							else
-							{
-								$usernames .= (($usernames != '') ? ', ' : '') . $row['username'];
-							}
-							$first_mail = false;
-						}
-						else
-						{
-							$usernames .= (($usernames != '') ? ', ' : '') . $row['username'];
-						}
-					}
-				}
-				while ($row = $this->db->sql_fetchrow($result));
-				$this->db->sql_freeresult($result);
-				
-				// Only if mails have already been sent previously 
-				if ($usernames <> '')
-				{
-					// send mail to board administration
-					$used_lang = $this->config['default_lang'];
-					$mail_template_path = $ext_path . 'language/' . $used_lang . '/email/';
-					$subject = sprintf($this->user->lang['FOOTBALL_REMEMBER_SUBJECT_BOARD'], $league_short, $matchday);
-					$messenger->to($this->config['board_email'], $this->config['sitename']);
-					$messenger->subject(htmlspecialchars_decode($subject));
-					$messenger->template('footb_board_remember', $used_lang, $mail_template_path);
-					$messenger->assign_vars(array(
-						'CONTACT_EMAIL' => $this->config['board_contact'],
-						'REMEMBER_LIST'	=> $usernames,
-						)
-					);
-
-					if (!($messenger->send($used_method)))
-					{
-						$message = '<strong>' . sprintf($this->user->lang['FOOTBALL_REMEMBER_ERROR_EMAIL_BOARD'], $league_short, $this->config['board_email']) . '</strong>';
-						$this->phpbb_log->add('critical', ANONYMOUS, '', 'LOG_ERROR_EMAIL', false, array($message));
-					}
-					else
-					{
-						$log_subject = sprintf($this->user->lang['FOOTBALL_REMEMBER_SEND'], $league_short, $usernames) ;
-						$this->phpbb_log->add('admin', ANONYMOUS, '', 'LOG_FOOTBALL_REMEMBER_CRON', false, array($log_subject));
-					}
-				}
-				else
-				{
-					// Log the cronjob run
-					$log_subject = sprintf($this->user->lang['FOOTBALL_REMEMBER_NOBODY']) ;
-					$this->phpbb_log->add('admin', ANONYMOUS, '', 'LOG_FOOTBALL_REMEMBER_CRON', false, array($log_subject));
-				}
-			}
-		}
-		if (sizeof($toclose) == 0)
-		{
-			// Log the cronjob run
-			$log_subject = sprintf($this->user->lang['FOOTBALL_REMEMBER_NO_DELIVERY']) ;
-			$this->phpbb_log->add('admin', ANONYMOUS, '', 'LOG_FOOTBALL_REMEMBER_CRON', false, array($log_subject));
-		}
-
-		return;
-	}
-
-	/**
-	* Returns whether this cron task can run, given current board configuration.
-	*
-	* @return bool
-	*/
-	public function is_runnable()
-	{
-		return (bool) $this->config['football_remember_enable'];
-	}
-
-	/**
-	* Returns whether this cron task should run now, because next run time
-	* has passed.
-	*
-	* @return bool
-	*/
-	public function should_run()
-	{
-		global $request;
-		$mode = $request->variable('mode', '');
-
-		if ($mode <> 'test')
-		{
-			return $this->config['football_remember_next_run'] < time();
-		}
-		else
-		{
-			return true;
-		}
-	}
-}
+<?php
+/**
+*
+* @package phpBB Extension - Football Football
+* @copyright (c) 2016 football (http://football.bplaced.net)
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+namespace football\football\cron\task;
+
+class football_remember extends \phpbb\cron\task\base
+{
+	/* @var string phpBB root path */
+	protected $root_path;
+
+	/* @var string phpEx */
+	protected $php_ext;
+
+	/* @var \phpbb\extension\manager */
+	protected $phpbb_extension_manager;
+
+	/* @var \phpbb\path_helper */
+	protected $phpbb_path_helper;
+
+	/* @var \phpbb\db\driver\driver_interface */
+	protected $db;
+
+	/* @var \phpbb\config\config */
+	protected $config;
+
+	/* @var \phpbb\log\log_interface */
+	protected $log;
+
+	/* @var \phpbb\user */
+	protected $user;
+
+	/**
+	* Constructor
+	*
+	* @param string									$root_path
+	* @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\config\config					$config
+	* @param \phpbb\log\log_interface 				$log
+	* @param \phpbb\user							$user
+	*/
+	public function __construct($root_path, $php_ext, \phpbb\extension\manager $phpbb_extension_manager, \phpbb\path_helper $phpbb_path_helper, \phpbb\db\driver\driver_interface $db, \phpbb\config\config $config, \phpbb\log\log_interface $log, \phpbb\user $user)
+	{
+		$this->root_path				= $root_path;
+		$this->php_ext 					= $php_ext;
+		$this->phpbb_extension_manager 	= $phpbb_extension_manager;
+		$this->phpbb_path_helper		= $phpbb_path_helper;
+		$this->db 						= $db;
+		$this->config 					= $config;
+		$this->phpbb_log 				= $log;
+		$this->user 					= $user;
+	}
+
+	/**
+	* Runs this cron task.
+	*
+	* @return null
+	*/
+	public function run()
+	{
+		global $request;
+
+		$ext_path = $this->phpbb_path_helper->update_web_root_path($this->phpbb_extension_manager->get_extension_path('football/football', true));
+		include($ext_path . 'includes/functions.' . $this->php_ext);
+		include($ext_path . 'includes/constants.' . $this->php_ext);
+
+		// Load extension language file
+		$this->user->setup();
+		$this->user->add_lang_ext('football/football', 'info_acp_football');
+
+		// mode=test ?
+		$mode = $request->variable('mode', '');
+		$days = $request->variable('days', 0);
+
+		//Mail Settings
+		$use_queue 		= false;
+		$used_method 	= NOTIFY_EMAIL;
+		$priority 		= MAIL_NORMAL_PRIORITY;
+
+
+		$season = curr_season();
+		//Matchdays to close in 24 hours and 24 hours later
+		// shift days to test
+		$local_board_time = time() + ($days * 86400);
+
+		if ($mode <> 'test')
+		{
+			// Update next run 
+			$run_time = getdate($this->config['football_remember_next_run']);
+			$next_run = mktime($run_time['hours'], $run_time['minutes'], 0, date("n"), date("j") + 1, date("Y"));
+			$this->config->set('football_remember_next_run', $next_run, true);
+		}
+		else
+		{
+			$message = sprintf($this->user->lang['LOG_FOOTBALL_MSG_TEST' . (($days == 0) ? '' : '_TRAVEL')], date("d.m.Y H:i", $local_board_time));
+			$this->phpbb_log->add('admin', ANONYMOUS, '', 'LOG_FOOTBALL_REMEMBER_CRON_TEST', false, array($message));
+		}
+
+		$sql = 'SELECT
+				m.*,
+				l.*
+				FROM ' . FOOTB_MATCHDAYS . ' AS m
+				LEFT JOIN ' . FOOTB_LEAGUES . " AS l ON (l.season = m.season AND l.league = m.league)
+				WHERE m.season >= $season AND m.status = 0 
+					AND (DATE_SUB(m.delivery_date, INTERVAL '1 23:59' DAY_MINUTE) < FROM_UNIXTIME('$local_board_time'))
+					AND (DATE_SUB(m.delivery_date, INTERVAL '1 00:00' DAY_MINUTE) > FROM_UNIXTIME('$local_board_time'))
+				GROUP BY m.season, m.league, m.matchday";
+		$result = $this->db->sql_query($sql);
+		$toclose = $this->db->sql_fetchrowset($result);
+		$this->db->sql_freeresult($result);
+
+		// If we found matchdays to close, search missing bets and mail them
+		foreach ($toclose as $close)
+		{
+			// prepare some variables
+			$first_mail 	= true;
+			$season 		= $close['season'];
+			$league 		= $close['league'];
+			$league_name 	= $close['league_name'];
+			$league_short 	= $close['league_name_short'];
+			$delivery 		= $close['delivery_date'];
+			$matchday 		= $close['matchday'];
+			$subject 		= sprintf($this->user->lang['FOOTBALL_REMEMBER_SUBJECT'], $league_short, $matchday);
+			$usernames 		= '';
+
+			// find missing users 
+			$sql = 'SELECT
+					u.user_email AS user_email,
+					u.username AS username,
+					u.user_id AS userid,
+					u.user_lang 
+					FROM ' . FOOTB_MATCHES . ' AS m
+					LEFT JOIN ' . FOOTB_LEAGUES . ' AS l ON (l.season = m.season AND l.league = m.league)
+					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 ' . PROFILE_FIELDS_DATA_TABLE. ' AS p ON p.user_id = b.user_id
+					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 
+						AND ((b.goals_home = '') OR (b.goals_guest = '')) 
+						AND m.status = 0 AND p.pf_footb_rem_f = 1
+						AND (l.bet_in_time = 0 OR 
+								(l.bet_in_time = 1 
+									AND (DATE_SUB(m.match_datetime, INTERVAL '1 23:59' DAY_MINUTE) < FROM_UNIXTIME('$local_board_time'))
+									AND (DATE_SUB(m.match_datetime, INTERVAL '1 00:00' DAY_MINUTE) > FROM_UNIXTIME('$local_board_time'))))
+					GROUP BY b.user_id
+					UNION
+					SELECT
+					p.pf_footb_email  AS user_email,
+					u.username AS username,
+					u.user_id AS userid,
+					u.user_lang
+					FROM " . FOOTB_MATCHES . ' AS m
+					LEFT JOIN ' . FOOTB_LEAGUES . ' AS l ON (l.season = m.season AND l.league = m.league)
+					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 ' . PROFILE_FIELDS_DATA_TABLE. ' AS p ON p.user_id = b.user_id
+					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 
+						AND ((b.goals_home = '') OR (b.goals_guest = '')) 
+						AND m.status = 0 AND p.pf_footb_rem_s = 1
+						AND (l.bet_in_time = 0 OR 
+								(l.bet_in_time = 1 
+									AND (DATE_SUB(m.match_datetime, INTERVAL '1 23:59' DAY_MINUTE) < FROM_UNIXTIME('$local_board_time'))
+									AND (DATE_SUB(m.match_datetime, INTERVAL '1 00:00' DAY_MINUTE) > FROM_UNIXTIME('$local_board_time'))))
+					GROUP BY b.user_id
+					";
+			$result = $this->db->sql_query($sql);
+			$row = $this->db->sql_fetchrow($result);
+
+			if (!$row)
+			{
+				$this->db->sql_freeresult($result);
+			}
+			else
+			{
+
+				// Send the messages
+				include_once($this->root_path . 'includes/functions_messenger.' . $this->php_ext);
+				$messenger = new \messenger($use_queue);
+				include_once($this->root_path . 'includes/functions_user.' . $this->php_ext);
+				$errored = false;
+				$messenger->headers('X-AntiAbuse: Board servername - ' . $this->config['server_name']);
+				$messenger->headers('X-AntiAbuse: User_id - ' . ANONYMOUS);
+				$messenger->headers('X-AntiAbuse: Username - CRON TASK Football remember');
+				$messenger->headers('X-AntiAbuse: User IP - ' . $this->user->ip);
+				$messenger->subject(htmlspecialchars_decode($subject));
+				$messenger->set_mail_priority($priority);
+
+				do
+				{
+					// Send the messages
+					$used_lang = $row['user_lang'];
+					$mail_template_path = $ext_path . 'language/' . $used_lang . '/email/';
+
+					if ($mode <> 'test')
+					{
+						$messenger->to($row['user_email'], $row['username']);
+					}
+					else
+					{
+						// test send to board email
+						$messenger->to($this->config['board_email'], $this->config['sitename']);
+					}
+					$messenger->template('footb_send_remember', $used_lang, $mail_template_path);
+
+					$messenger->assign_vars(array(
+						'USERNAME'		=> $row['username'],
+						'LEAGUE'		=> $league_name,
+						'MATCHDAY'		=> $matchday,
+						'DELIVERY'		=> $delivery,
+						'CONTACT_EMAIL' => $this->config['board_contact'])
+					);
+
+					if ($mode <> 'test')
+					{
+						if (!($messenger->send($used_method)))
+						{
+							$message = '<strong>' . sprintf($this->user->lang['FOOTBALL_REMEMBER_ERROR_EMAIL'], $league_short, $row['user_email']) . '</strong>';
+							$this->phpbb_log->add('critical', ANONYMOUS, '', 'LOG_ERROR_EMAIL', false, array($message));
+							$usernames .= (($usernames != '') ? ', ' : '') . $row['username']. '!';
+						}
+						else
+						{
+							$usernames .= (($usernames != '') ? ', ' : '') . $row['username'];
+						}
+					}
+					else
+					{
+						// Test mode
+						if ($first_mail)
+						{
+							// only send one mail
+							if (!($messenger->send($used_method)))
+							{
+								$message = '<strong>' . sprintf($this->user->lang['FOOTBALL_REMEMBER_ERROR_EMAIL'], $league_short, $row['user_email']) . '</strong>';
+								$this->phpbb_log->add('critical', ANONYMOUS, '', 'LOG_ERROR_EMAIL', false, array($message));
+								$usernames .= (($usernames != '') ? ', ' : '') . $row['username']. '!';
+							}
+							else
+							{
+								$usernames .= (($usernames != '') ? ', ' : '') . $row['username'];
+							}
+							$first_mail = false;
+						}
+						else
+						{
+							$usernames .= (($usernames != '') ? ', ' : '') . $row['username'];
+						}
+					}
+				}
+				while ($row = $this->db->sql_fetchrow($result));
+				$this->db->sql_freeresult($result);
+				
+				// Only if mails have already been sent previously 
+				if ($usernames <> '')
+				{
+					// send mail to board administration
+					$used_lang = $this->config['default_lang'];
+					$mail_template_path = $ext_path . 'language/' . $used_lang . '/email/';
+					$subject = sprintf($this->user->lang['FOOTBALL_REMEMBER_SUBJECT_BOARD'], $league_short, $matchday);
+					$messenger->to($this->config['board_email'], $this->config['sitename']);
+					$messenger->subject(htmlspecialchars_decode($subject));
+					$messenger->template('footb_board_remember', $used_lang, $mail_template_path);
+					$messenger->assign_vars(array(
+						'CONTACT_EMAIL' => $this->config['board_contact'],
+						'REMEMBER_LIST'	=> $usernames,
+						)
+					);
+
+					if (!($messenger->send($used_method)))
+					{
+						$message = '<strong>' . sprintf($this->user->lang['FOOTBALL_REMEMBER_ERROR_EMAIL_BOARD'], $league_short, $this->config['board_email']) . '</strong>';
+						$this->phpbb_log->add('critical', ANONYMOUS, '', 'LOG_ERROR_EMAIL', false, array($message));
+					}
+					else
+					{
+						$log_subject = sprintf($this->user->lang['FOOTBALL_REMEMBER_SEND'], $league_short, $usernames) ;
+						$this->phpbb_log->add('admin', ANONYMOUS, '', 'LOG_FOOTBALL_REMEMBER_CRON', false, array($log_subject));
+					}
+				}
+				else
+				{
+					// Log the cronjob run
+					$log_subject = sprintf($this->user->lang['FOOTBALL_REMEMBER_NOBODY']) ;
+					$this->phpbb_log->add('admin', ANONYMOUS, '', 'LOG_FOOTBALL_REMEMBER_CRON', false, array($log_subject));
+				}
+			}
+		}
+		if (sizeof($toclose) == 0)
+		{
+			// Log the cronjob run
+			$log_subject = sprintf($this->user->lang['FOOTBALL_REMEMBER_NO_DELIVERY']) ;
+			$this->phpbb_log->add('admin', ANONYMOUS, '', 'LOG_FOOTBALL_REMEMBER_CRON', false, array($log_subject));
+		}
+
+		return;
+	}
+
+	/**
+	* Returns whether this cron task can run, given current board configuration.
+	*
+	* @return bool
+	*/
+	public function is_runnable()
+	{
+		return (bool) $this->config['football_remember_enable'];
+	}
+
+	/**
+	* Returns whether this cron task should run now, because next run time
+	* has passed.
+	*
+	* @return bool
+	*/
+	public function should_run()
+	{
+		global $request;
+		$mode = $request->variable('mode', '');
+
+		if ($mode <> 'test')
+		{
+			return $this->config['football_remember_next_run'] < time();
+		}
+		else
+		{
+			return true;
+		}
+	}
+}
 ?>

includes/export.php

@@ -1,271 +1,271 @@
-<?php
-/**
-*
-* @package phpBB Extension - Football Football
-* @copyright (c) 2016 football (http://football.bplaced.net)
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
-*
-*/
-
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-$sql = 'SELECT *
-		FROM ' . FOOTB_LEAGUES . " 
-		WHERE season = $season 
-			AND league = $league";
-if( !$result = $db->sql_query($sql) )
-{
-	trigger_error('NO_LEAGUE');
-}
-$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 = './../../';
-}
-
-$sql_users = 'SELECT DISTINCT
-				b.user_id,
-				u.username
-				FROM ' . FOOTB_BETS . ' AS b
-				LEFT JOIN ' . USERS_TABLE . " AS u ON (u.user_id = b.user_id)
-				WHERE b.season = $season AND b.league = $league
-				ORDER BY b.user_id ASC";
-
-$sql_results = "SELECT
-				m.match_no,
-				DATE_FORMAT(m.match_datetime,'%d.%m.%Y') AS match_time,
-				m.matchday,
-				m.formula_home,
-				m.formula_guest,
-				t1.team_id AS hid,
-				t2.team_id AS gid,
-				t1.team_name_short AS team_home,
-				t2.team_name_short AS team_guest,
-				m.status,
-				m.goals_home,
-				m.goals_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)
-				WHERE m.season = $season AND m.league = $league
-				ORDER BY m.match_no ASC";
-
-$sql_bets = "SELECT
-				m.matchday,
-				m.match_no,
-				b.user_id,
-				IF(m.status > 0, b.goals_home, '') AS bet_home,
-				IF(m.status > 0, b.goals_guest, '') AS bet_guest
-				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";
-
-if(!$result_users = $db->sql_query($sql_users))
-{
-	trigger_error('NO_USER');
-}
-$rows_users = $db->sql_fetchrowset($result_users);
-$count_user = sizeof($rows_users);
-$db->sql_freeresult($result_users);
-$j = 0;
-$column = array();
-foreach ($rows_users as $row_user)
-{
-	$column[(8 + (3 * ($j)))] = str_replace("\"", "\"\"", $row_user['username']);
-	$lastcolumn = 8 + (3 * ($j));
-	$bet_column[$row_user['user_id']] = $lastcolumn;
-	$j++;
-}
-$export_row_users = "\"\";\"\";\"\";\"\";\"\";\"\";";
-for($j = 8; $j <= $lastcolumn; $j = $j + 3)
-{
-	$export_row_users .= "\"\";\"\";\"" . $column[$j] . "\"";
-	if($j != $lastcolumn)
-	{
-		$export_row_users .= ';';
-	}
-}
-$export_row_users .= $newline;
-
-if( !$result_results = $db->sql_query($sql_results) )
-{
-	trigger_error('NO_RESULTS');
-}
-$rows_results = $db->sql_fetchrowset($result_results);
-$count_results = sizeof($rows_results);
-$db->sql_freeresult($result_results);
-
-if( !$result_bets = $db->sql_query($sql_bets) )
-{
-	trigger_error('NO_BETS');
-}
-$rows_bets = $db->sql_fetchrowset($result_bets);
-$count_bets = sizeof($rows_bets);
-$db->sql_freeresult($result_results);
-$column = array();
-$lastcolumn = 0;
-$last_match_num = 0;
-foreach ($rows_bets as $row_bet)
-{
-	if ($row_bet['match_no'] == $last_match_num)
-	{
-		$column[$bet_column[$row_bet['user_id']]] = str_replace("\"", "\"\"", $row_bet['bet_home']);
-		$column[$bet_column[$row_bet['user_id']] + 1] = str_replace("\"", "\"\"", $row_bet['bet_guest']);
-		$column[$bet_column[$row_bet['user_id']] + 2] = '';
-		$lastcolumn = $bet_column[$row_bet['user_id']] + 2;
-	}
-	else
-	{
-		if ($lastcolumn > 0) 
-		{
-			$export_bets[$last_match_num] = '';
-			for($j=8; $j<=$lastcolumn; $j++)
-			{
-				$export_bets[$last_match_num] .= "\"" . $column[$j] . "\"";
-				if($j!=$lastcolumn)
-				{
-					$export_bets[$last_match_num] .= ';';
-				}
-			}
-			$export_bets[$last_match_num] .= $newline;
-		}
-		$column = array();
-		$last_match_num = $row_bet['match_no'];
-		$column[$bet_column[$row_bet['user_id']]] = str_replace("\"", "\"\"", $row_bet['bet_home']);
-		$column[$bet_column[$row_bet['user_id']] + 1] = str_replace("\"", "\"\"", $row_bet['bet_guest']);
-		$column[$bet_column[$row_bet['user_id']] + 2] = '';
-		$lastcolumn = $bet_column[$row_bet['user_id']] + 2;
-	}
-}
-$export_bets[$last_match_num] = '';
-for($j = 8; $j <= $lastcolumn; $j++)
-{
-	$export_bets[$last_match_num] .= "\"" . $column[$j] . "\"";
-	if($j != $lastcolumn)
-	{
-		$export_bets[$last_match_num] .= ';';
-	}
-}
-$export_bets[$last_match_num] .= $newline;
-
-$last_matchday = 0;
-
-$export= '';
-$export .= 'CSV;'. $league. ';'. $season. $newline;
-
-$i = 0;
-foreach ($rows_results as $row_result)
-{
-	if ($last_matchday != $row_result['matchday'])
-	{
-		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;
-		}
-		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;
-		}
-		$export .= $export_row_users;
-		$column = array();
-		$last_matchday = $row_result['matchday'];
-	}
-	if (0 == $row_result['hid'])
-	{
-		$home_info 		= get_team($season, $league, $row_result['match_no'], 'team_id_home', $row_result['formula_home']);
-		$home_in_array 	= explode("#",$home_info);
-		$homename 		= $home_in_array[3];
-	}
-	else
-	{
-		$homename = $row_result['team_home'];
-	}
-	if (0 == $row_result['gid'])
-	{
-		$guest_info 	= get_team($season, $league, $row_result['match_no'], 'team_id_guest', $row_result['formula_guest']);
-		$guest_in_array = explode("#",$guest_info);
-		$guestname 		= $guest_in_array[3];
-	}
-	else
-	{
-		$guestname = $row_result['team_guest'];
-	}
-	$column[0] = str_replace("\"", "\"\"", $homename);
-	$column[1] = str_replace("\"", "\"\"", $guestname);
-
-	if ($row_result['status'] == 3)
-	{
-		$column[2] = str_replace("\"", "\"\"", $row_result['goals_home']);
-		$column[4] = str_replace("\"", "\"\"", $row_result['goals_guest']);
-	}
-	else
-	{
-		$column[2] = '';
-		$column[4] = '';
-	}
-	$export .= "\"" . $column[0] . "\";\"" . $column[1] . "\";\"" . $column[2] . "\";\"\";\"" . $column[4] . "\";\"\";\"\";\"\";";
-	if ($export_bets[$row_result['match_no']] == '') 
-	{
-		$export .= $newline;
-	}
-	else
-	{
-		$export .= $export_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;
-}
-?>
+<?php
+/**
+*
+* @package phpBB Extension - Football Football
+* @copyright (c) 2016 football (http://football.bplaced.net)
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+if (!defined('IN_PHPBB'))
+{
+	exit;
+}
+
+$sql = 'SELECT *
+		FROM ' . FOOTB_LEAGUES . " 
+		WHERE season = $season 
+			AND league = $league";
+if( !$result = $db->sql_query($sql) )
+{
+	trigger_error('NO_LEAGUE');
+}
+$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 = './../../';
+}
+
+$sql_users = 'SELECT DISTINCT
+				b.user_id,
+				u.username
+				FROM ' . FOOTB_BETS . ' AS b
+				LEFT JOIN ' . USERS_TABLE . " AS u ON (u.user_id = b.user_id)
+				WHERE b.season = $season AND b.league = $league
+				ORDER BY b.user_id ASC";
+
+$sql_results = "SELECT
+				m.match_no,
+				DATE_FORMAT(m.match_datetime,'%d.%m.%Y') AS match_time,
+				m.matchday,
+				m.formula_home,
+				m.formula_guest,
+				t1.team_id AS hid,
+				t2.team_id AS gid,
+				t1.team_name_short AS team_home,
+				t2.team_name_short AS team_guest,
+				m.status,
+				m.goals_home,
+				m.goals_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)
+				WHERE m.season = $season AND m.league = $league
+				ORDER BY m.match_no ASC";
+
+$sql_bets = "SELECT
+				m.matchday,
+				m.match_no,
+				b.user_id,
+				IF(m.status > 0, b.goals_home, '') AS bet_home,
+				IF(m.status > 0, b.goals_guest, '') AS bet_guest
+				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";
+
+if(!$result_users = $db->sql_query($sql_users))
+{
+	trigger_error('NO_USER');
+}
+$rows_users = $db->sql_fetchrowset($result_users);
+$count_user = sizeof($rows_users);
+$db->sql_freeresult($result_users);
+$j = 0;
+$column = array();
+foreach ($rows_users as $row_user)
+{
+	$column[(8 + (3 * ($j)))] = str_replace("\"", "\"\"", $row_user['username']);
+	$lastcolumn = 8 + (3 * ($j));
+	$bet_column[$row_user['user_id']] = $lastcolumn;
+	$j++;
+}
+$export_row_users = "\"\";\"\";\"\";\"\";\"\";\"\";";
+for($j = 8; $j <= $lastcolumn; $j = $j + 3)
+{
+	$export_row_users .= "\"\";\"\";\"" . $column[$j] . "\"";
+	if($j != $lastcolumn)
+	{
+		$export_row_users .= ';';
+	}
+}
+$export_row_users .= $newline;
+
+if( !$result_results = $db->sql_query($sql_results) )
+{
+	trigger_error('NO_RESULTS');
+}
+$rows_results = $db->sql_fetchrowset($result_results);
+$count_results = sizeof($rows_results);
+$db->sql_freeresult($result_results);
+
+if( !$result_bets = $db->sql_query($sql_bets) )
+{
+	trigger_error('NO_BETS');
+}
+$rows_bets = $db->sql_fetchrowset($result_bets);
+$count_bets = sizeof($rows_bets);
+$db->sql_freeresult($result_bets);
+$column = array();
+$lastcolumn = 0;
+$last_match_num = 0;
+foreach ($rows_bets as $row_bet)
+{
+	if ($row_bet['match_no'] == $last_match_num)
+	{
+		$column[$bet_column[$row_bet['user_id']]] = str_replace("\"", "\"\"", $row_bet['bet_home']);
+		$column[$bet_column[$row_bet['user_id']] + 1] = str_replace("\"", "\"\"", $row_bet['bet_guest']);
+		$column[$bet_column[$row_bet['user_id']] + 2] = '';
+		$lastcolumn = $bet_column[$row_bet['user_id']] + 2;
+	}
+	else
+	{
+		if ($lastcolumn > 0) 
+		{
+			$export_bets[$last_match_num] = '';
+			for($j=8; $j<=$lastcolumn; $j++)
+			{
+				$export_bets[$last_match_num] .= "\"" . $column[$j] . "\"";
+				if($j!=$lastcolumn)
+				{
+					$export_bets[$last_match_num] .= ';';
+				}
+			}
+			$export_bets[$last_match_num] .= $newline;
+		}
+		$column = array();
+		$last_match_num = $row_bet['match_no'];
+		$column[$bet_column[$row_bet['user_id']]] = str_replace("\"", "\"\"", $row_bet['bet_home']);
+		$column[$bet_column[$row_bet['user_id']] + 1] = str_replace("\"", "\"\"", $row_bet['bet_guest']);
+		$column[$bet_column[$row_bet['user_id']] + 2] = '';
+		$lastcolumn = $bet_column[$row_bet['user_id']] + 2;
+	}
+}
+$export_bets[$last_match_num] = '';
+for($j = 8; $j <= $lastcolumn; $j++)
+{
+	$export_bets[$last_match_num] .= "\"" . $column[$j] . "\"";
+	if($j != $lastcolumn)
+	{
+		$export_bets[$last_match_num] .= ';';
+	}
+}
+$export_bets[$last_match_num] .= $newline;
+
+$last_matchday = 0;
+
+$export= '';
+$export .= 'CSV;'. $league. ';'. $season. $newline;
+
+$i = 0;
+foreach ($rows_results as $row_result)
+{
+	if ($last_matchday != $row_result['matchday'])
+	{
+		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;
+		}
+		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;
+		}
+		$export .= $export_row_users;
+		$column = array();
+		$last_matchday = $row_result['matchday'];
+	}
+	if (0 == $row_result['hid'])
+	{
+		$home_info 		= get_team($season, $league, $row_result['match_no'], 'team_id_home', $row_result['formula_home']);
+		$home_in_array 	= explode("#",$home_info);
+		$homename 		= $home_in_array[3];
+	}
+	else
+	{
+		$homename = $row_result['team_home'];
+	}
+	if (0 == $row_result['gid'])
+	{
+		$guest_info 	= get_team($season, $league, $row_result['match_no'], 'team_id_guest', $row_result['formula_guest']);
+		$guest_in_array = explode("#",$guest_info);
+		$guestname 		= $guest_in_array[3];
+	}
+	else
+	{
+		$guestname = $row_result['team_guest'];
+	}
+	$column[0] = str_replace("\"", "\"\"", $homename);
+	$column[1] = str_replace("\"", "\"\"", $guestname);
+
+	if ($row_result['status'] == 3)
+	{
+		$column[2] = str_replace("\"", "\"\"", $row_result['goals_home']);
+		$column[4] = str_replace("\"", "\"\"", $row_result['goals_guest']);
+	}
+	else
+	{
+		$column[2] = '';
+		$column[4] = '';
+	}
+	$export .= "\"" . $column[0] . "\";\"" . $column[1] . "\";\"" . $column[2] . "\";\"\";\"" . $column[4] . "\";\"\";\"\";\"\";";
+	if ($export_bets[$row_result['match_no']] == '') 
+	{
+		$export .= $newline;
+	}
+	else
+	{
+		$export .= $export_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;
+}
+?>

language/de/football.php

@@ -193,6 +193,7 @@ $lang = array_merge($lang, array(
 	'LAST_GAMES'					=> 'Die letzten Spiele',
 	'LAST_GAMES_AWAY'				=> 'Die letzten Auswärtsspiele',
 	'LAST_GAMES_HOME'				=> 'Die letzten Heimspiele',
+	'LAST_RESULTS'					=> 'Die letzten Ergebnisse',
 	'LAST_VISITORS'					=> 'Die letzten %s Besuche',
 	'LEAGUE'						=> 'Liga',
 	'LINK_PREDICTION_LEAGUE'		=> 'Zur Tipprunde',

language/de/help_football.php

@@ -37,7 +37,7 @@ if ( empty($lang) || !is_array($lang) )
 // ’ » „ “ — …
 //
 
-$help = array(
+$lang = array_merge($lang, array('FOOTBALL_HELP_FAQ' => array(
 	array(
 		0 => '--',
 		1 => 'Erste Schritte'
@@ -527,5 +527,5 @@ mit gleichem Status aktualisieren" zu wählen.'
 Datenquelle erfolgen. Benötigt man innerhalb dieser Zeit trotzdem aktualisierte Daten, so muss man den Cache löschen um einen erneuten Download von der
 Datenquelle zu erzwingen.' 
 	),
-);
+)));
 ?>

language/de/info_acp_football.php

@@ -1,205 +1,210 @@
-<?php
-/**
-* 
-* info_acp_football [Deutsch — Du]
-*
-* @package language
-* @version $Id: info_acp_football.php 12 2011-03-13 08:03:31Z football $ 
-* @copyright (c) 2010 football (http://football.bplaced.net)
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
-*
-*/
-
-/**
-* DO NOT CHANGE
-*/
-if (!defined('IN_PHPBB'))
-{
-	exit;
-}
-
-if (empty($lang) || !is_array($lang))
-{
-	$lang = array();
-}
-
-// DEVELOPERS PLEASE NOTE
-//
-// All language files should use UTF-8 as their encoding and the files must not contain a BOM.
-//
-// Placeholders can now contain order information, e.g. instead of
-// 'Page %s of %s' you can (and should) write 'Page %1$s of %2$s', this allows
-// translators to re-order the output of data while ensuring it remains correct
-//
-// You do not need this where single placeholders are used, e.g. 'Message %d' is fine
-// equally where a string contains only two placeholders which are used to wrap text
-// in a url you again do not need to specify an order e.g., 'Click %sHERE%s' is fine
-
-// Football Settings
-$lang = array_merge($lang, array(
-	'ACP_FOOTBALL'						=> 'Fussball',
-	'ACP_FOOTBALL_MANAGEMENT'			=> 'Tipprunde-Verwalten',
-	'ACP_FOOTBALL_OPERATION'			=> 'Spielbetrieb',
-	'ACP_FOOTBALL_MANAGE'				=> 'Spielplan Verwaltung',
-	
-	'ACP_FOOTBALL_CONFIGURATION'		=> 'Tipprunden-Konfiguration',
-	'ACP_FOOTBALL_SETTINGS'				=> 'Tipprunden-Einstellungen',
-	'ACP_FOOTBALL_SETTINGS_EXPLAIN'		=> 'Hier kannst du einige grundlegende Einstellungen der Tipprunde vornehmen, ihr einen passenden Namen und eine Beschreibung geben und, neben anderen Werten, die Standard-Einstellungen für die Anzeige anpassen. ',
-
-	'DISABLE_FOOTBALL'					=> 'Tipprunde deaktivieren',
-	'DISABLE_FOOTBALL_EXPLAIN'			=> 'Hiermit sperrst du die Tipprunde für alle Benutzer. Wenn du möchtest, kannst du eine kurze Nachricht (bis zu 255 Zeichen) angeben. ',
-	'DISPLAY_RANKS'						=> 'Anzahl angezeigter Tipper in den Übersichts-Ranglisten',
-	'DISPLAY_RANKS_EXPLAIN'				=> 'Limitiert die Anzeige der Spieltags- und Gesamtrangliste in der Hauptansicht. Die eigene Platzierung wird ggf. unten angehängt. ',
-
-	'FOOTBALL_CODE'						=> 'Tipprunden Code',
-	'FOOTBALL_CODE_EXPLAIN'				=> 'Zugangscode zur Tipprunde z.B. für Cronjobs. ',
-	'FOOTBALL_FULLSCREEN'				=> 'Tipprunden-Seiten im Fullscreen-Modus',
-	'FOOTBALL_FULLSCREEN_EXPLAIN'		=> 'Hiermit kannst Du, abweichend vom Forum, die Tipprundenseiten mit minimalen Seitenrändern anzeigen lassen. ',
-	'FOOTBALL_HEADER_ENABLE'			=> 'Header-Bild je Liga verwenden',
-	'FOOTBALL_HEADER_ENABLE_EXPLAIN'	=> 'Hiermit kannst Du festlegen, ob je Liga die zugehöriges Bild im Header angezeigt werden soll. ',
-	'FOOTBALL_INFO'						=> 'Tipprunden Information anzeigen',
-	'FOOTBALL_INFO_EXPLAIN'				=> 'Hiermit kannst Du eine kurze Information (bis zu 255 Zeichen) oberhalb der Tippdaten anzeigen lassen. ',
-	'FOOTBALL_NAME'						=> 'Name der Tipprunde',
-	'FOOTBALL_NAME_EXPLAIN'				=> 'Name der im Tipprunden-Menu verwendet wird, um zur Hauptseite zu gelangen. ',
-	'FOOTBALL_OVERRIDE_STYLE'			=> 'Style überschreiben',
-	'FOOTBALL_OVERRIDE_STYLE_EXPLAIN'	=> 'Verwendet für die Tipprunde immer den Standard-Tipprunden-Style. ',
-	'FOOTBALL_STYLE'					=> 'Standard Tipprunden Style',
-	'FOOTBALL_UPDATE_SOURCE'			=> 'Update Quelle',
-	'FOOTBALL_UPDATE_SOURCE_EXPLAIN'	=> 'Link zur Quelle des Updates. Falls leer, wird automatisch <var>http://football.bplaced.net/football/xml/football_xml_season.php</var> gewählt. ',
-	'FOOTBALL_UPDATE_CODE'				=> 'Update Code',
-	'FOOTBALL_UPDATE_CODE_EXPLAIN'		=> 'Nur mit diesem Code können Updates von dieser Seite heruntergeladen werden. ',
-
-	'GUEST_VIEW'						=> 'Tipprunde für Gäste sichtbar',
-	'GUEST_VIEW_EXPLAIN'				=> 'Soll die Tipprunde für Gäste sichtbar sein?',
-
-	'USER_VIEW'							=> 'Tipprunde nur für Teilnehmer sichtbar',
-	'USER_VIEW_EXPLAIN'					=> 'Soll die Tipprunde nur für Tipprunden-Teilnehmer sichtbar sein?',
-
-	'HOST_TIMEZONE'						=> 'Host Zeitzone',
-	'HOST_TIMEZONE_EXPLAIN'				=> 'Differenz zur Board Zeitzone wenn dein Host in einer anderen Zeitzone steht, damit die Tippabgabe korrekt funktioniert. ',
-
-	'LEFT_COLUMN'						=> 'Spaltenbreite Links in Pixeln',
-	'LEFT_COLUMN_EXPLAIN'				=> 'Optimale Breite 180 Pixel. Dieser Wert sollte nicht unterschritten werden. ',
-
-	'PREDICTION_LEAGUE'					=> 'Tipprunde',
-
-	'RIGHT_COLUMN'						=> 'Spaltenbreite Rechts in Pixeln',
-	'RIGHT_COLUMN_EXPLAIN'				=> 'Optimal 180 Pixel. Dieser Wert wird durch externe Einblendungen ggf. übersteuert. ',
-
-	'USERS_PAGE'						=> 'Tipper pro Seite',
-	'USERS_PAGE_EXPLAIN'				=> 'Anzahl der Tipper je Seite in der Hauptrangliste und Alle Tipps. ',
-	
-	'WIN_NAME'							=> 'Gewinn Name (oder Währung)',
-	'WIN_NAME_EXPLAIN'					=> 'Der Name, der für die Gewinne in der Tipprunde angezeigt werden soll',
-
-	'ANNOUNCEMENT_TOPIC'				=> 'Release Ankündigung',
-	'CURRENT_VERSION'					=> 'Derzeitige Version',
-	'DOWNLOAD_LATEST'					=> 'Neueste Version herunterladen',
-	'LATEST_VERSION'					=> 'Neueste Version',
-	'NOT_UP_TO_DATE'					=> '%s ist nicht aktuell',
-	'RELEASE_ANNOUNCEMENT'				=> 'Ankündigungsthema',
-	'UP_TO_DATE'						=> '%s ist aktuell',
-	'FOOTBALL_VERSION_CHECK'			=> 'Football Prediction League Extension Version Check',
-
-));
-
-// Football Features 
-$lang = array_merge($lang, array(
-	'ACP_FOOTBALL_FEATURES'				=> 'Tipprunden-Funktionalitäten',
-	'ACP_FOOTBALL_FEATURES_EXPLAIN'		=> 'Hier kannst du einige Funktionen der Tipprunde aktivieren bzw. deaktivieren',
-
-	'AUTO'								=> 'Auto',
-
-	'BANK'								=> 'Tipprunden Konto verwalten',
-	'BANK_EXPLAIN'						=> 'Sollen Tipprunden Konten mit Einsätzen und Gewinnen gepflegt werden?',
-
-	'FOOTBALL_SEASON_START'				=> 'Starte in Saison',
-	'FOOTBALL_SEASON_START_EXPLAIN'		=> 'Starte in dieser oder in der automatisch ermittelten Saison, wenn noch keine ausgewählt wurde. ',
-
-	'FOOTBALL_REMEMBER_ENABLE'			=> 'Cronjob für die Tipp-Erinnerungsmail aktivieren',
-	'FOOTBALL_REMEMBER_ENABLE_EXPLAIN'	=> 'Hier kannst Du angeben, ob 1 Tag vor Tippabgabe eine Erinnerungsmail versendet werden soll.',
-
-	'FOOTBALL_REMEMBER_NEXT_RUN'		=> 'Nächster Cronjoblauf für die Tipp-Erinnerungsmail',
-	'FOOTBALL_REMEMBER_NEXT_RUN_EXPLAIN'=> 'Hier kannst Du einstellen, wann der Cronjob für die Tipp-Erinnerungsmail frühestens wieder aufgerufen wird. Nach Ausführung wird der Cronjob für den Folgetag zur gleichen Uhrzeit neu eingeplant.',
-
-	'FOUNDER_DELETE'					=> 'Nur Gründungsmitglieder dürfen löschen',
-	'FOUNDER_DELETE_EXPLAIN'			=> 'Löschung von Spielplandaten wie Saisons, Ligen, Teams, Spieltage und Spielpläne nur auf Gründungsmitglieder beschränken. ',
-
-	'RESULTS_AT_TIME'					=> 'Eingabe endgültiger Spielergebnisse erst nach Spielende',
-	'RESULTS_AT_TIME_EXPLAIN'			=> 'Eingabe der endgültigen Spielergebnisse im Adminbereich erst nach Spielende freigeben. Die Eingabe von vorläufigen Spielergebnissen durch die Tipper ist hiervon unabhängig. ',
-
-	'SAME_ALLOWED'						=> 'Alle Tipps an einem Spieltag gleich',
-	'SAME_ALLOWED_EXPLAIN'				=> 'Identische Tipps (Oma-Tipps) bei allen Spielen eines Spieltags erlauben bzw. verbieten. ',
-
-	'ULT_POINTS'						=> 'Ultimate Points einbinden',
-	'ULT_POINTS_EXPLAIN'				=> 'Soll es möglich sein, die Punkte oder Gewinne in Ultimate Points verrechnen zu lassen? Dazu muss Ultimate Points installiert sein. ',
-	'ULT_POINTS_FACTOR'					=> 'Ultimate Points Faktor',
-	'ULT_POINTS_FACTOR_EXPLAIN'			=> 'Faktor mit dem die Punkte je Spieltag in Ultimate Points gutgeschrieben werden. ',
-	'UP_NONE'							=> 'Keine',
-	'UP_POINTS'							=> 'Punkte',
-	'UP_WINS'							=> 'Gewinne',
-
-	'VIEW_BETS'							=> 'Tipps immer Anzeigen',
-	'VIEW_BETS_EXPLAIN'					=> 'Sollen alle Tipps sofort angezeigt werden? Wenn Nein, dann werden sie erst nach Tippabgabeschluss angezeigt. ',
-	'VIEW_CURRENT'						=> 'Anzeige startet in aktueller Liga',
-	'VIEW_CURRENT_EXPLAIN'				=> 'Soll beim ersten Aufruf die Liga angezeigt werden, in der die nächsten Spiele stattfinden? Sonst wird immer die erste Liga angezeigt',
-	'VIEW_TENDENCIES'					=> 'Tipp-Tendenzen immer Anzeigen',
-	'VIEW_TENDENCIES_EXPLAIN'			=> 'Sollen alle Tipp-Tendenzen sofort angezeigt werden? Wenn Nein, dann werden sie erst nach Tippabgabeschluss angezeigt. ',
-
-	'WIN_HITS02'						=> 'Gewinne Volltreffer-Wertung mit Auswärtspunkten',
-	'WIN_HITS02_EXPLAIN'				=> 'Sollen Gewinne der Volltreffer-Wertung mit Auswärtspunkten angezeigt werden? Wenn Nein, muss sichergestellt werden, dass dazu keine Gewinne in den bestehenden Ligen hinterlegt wurden. ',
-));
-
-// Football Menu
-$lang = array_merge($lang, array(
-	'ACP_FOOTBALL_MENU'					=> 'Tipprunden-Menu',
-	'ACP_FOOTBALL_MENU_EXPLAIN'			=> 'Hier kannst du Links für das Tipprunden-Menu hinterlegen. Die Linkbeschriftung kannst du frei wählen. ',
-
-	'FOOTBALL_BREADCRUMB'				=> 'Tipprunden breadcrumb anzeigen',
-	'FOOTBALL_BREADCRUMB_EXPLAIN'		=> 'Soll ein Breadcrumb-Link für die Tipprunden angezeigt werden? ',
-	'FOOTBALL_SIDE'						=> 'Tipprunden Sidebar anzeigen',
-	'FOOTBALL_SIDE_EXPLAIN'				=> 'Soll die Tipprunden Sidebar mit den Menüeinträgen angezeigt werden? ',
-	'FOOTBALL_MENU'						=> 'Tipprunden Menu anzeigen',
-	'FOOTBALL_MENU_EXPLAIN'				=> 'Soll das Tipprunden Dropdown Menü in der Navigationsleiste angezeigt werden? ',
-	'MENU_DESC1'						=> 'Beschriftung http-Link 1',
-	'MENU_DESC1_EXPLAIN'				=> 'Die Beschriftung des Links darf keine unzulässigen Sonderzeichen enthalten und höchsten 20 Zeichen lang sein. ',
-	'MENU_DESC2'						=> 'Beschriftung http-Link 2',
-	'MENU_DESC3'						=> 'Beschriftung http-Link 3',
-	'MENU_LINK1'						=> 'Http-Link 1',
-	'MENU_LINK1_EXPLAIN'				=> 'Bitte hier nur http Links eingeben. ',
-	'MENU_LINK2'						=> 'Http-Link 2',
-	'MENU_LINK3'						=> 'Http-Link 3',
-	'MENU_NO_LINK'						=> 'Kein Link hinterlegt',
-));
-
-
-// Football Help
-$lang = array_merge($lang, array(
-	'ACP_FOOTBALL_USERGUIDE'			=> 'Benutzerhilfe',
-	'ACP_FOOTBALL_USERGUIDE_EXPLAIN'	=> 'Hier findest du Hilfe für die Einstellungen des phpBB3 Football MODs.<br />Wenn du Fragen hast, dann schaue bitte immer zuerst hier!',
-));
-
-
-#// Football Logs
-$lang = array_merge($lang, array(
-	'LOG_FOOTBALL_FEATURES'				=> '<strong>Tipprunden-Funktionalitäten geändert</strong>',
-	'LOG_FOOTBALL_MENU'					=> '<strong>Tipprunden-Menu geändert</strong>',
-	'LOG_FOOTBALL_SETTINGS'				=> '<strong>Tipprunde-Einstellungen geändert</strong>',
-
-	'LOG_FOOTBALL_MSG_TEST'				=> 'Aufruf am %s.',
-	'LOG_FOOTBALL_MSG_TEST_TRAVEL'		=> 'Aufruf mit Zeitreise zum %s.',
-	
-	'LOG_FOOTBALL_REMEMBER_CRON'		=> '<strong>Cronjob Football remember ausgeführt</strong><br />» %s',
-	'LOG_FOOTBALL_REMEMBER_CRON_TEST'	=> '<strong>Cronjob Football remember Testaufruf</strong><br />» %s',
-
-	'FOOTBALL_REMEMBER_SUBJECT'			=> 'Bitte %1$s %2$d. Spieltag tippen',
-	'FOOTBALL_REMEMBER_SUBJECT_BOARD'	=> 'Versendete Erinnerungs-Mails %1$s %2$d',
-	'FOOTBALL_REMEMBER_ERROR_EMAIL'		=> '%1$s  Erinnerungs-Mail an: %2$s gescheitert',
-	'FOOTBALL_REMEMBER_ERROR_EMAIL_BOARD'=> '%1$s Versandliste Erinnerungs-Mail an: %2$s gescheitert',
-	'FOOTBALL_REMEMBER_NOBODY'			=> 'Es muss niemand erinnert werden.',
-	'FOOTBALL_REMEMBER_NO_DELIVERY'		=> 'Keine anstehende Tippabgabe im Zeitraum.',
-	'FOOTBALL_REMEMBER_SEND'			=> '%1$s  Erinnerungs-Mail an: %2$s',
-
-));
-
+<?php
+/**
+* 
+* info_acp_football [Deutsch — Du]
+*
+* @package language
+* @version $Id: info_acp_football.php 12 2011-03-13 08:03:31Z football $ 
+* @copyright (c) 2010 football (http://football.bplaced.net)
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+*
+*/
+
+/**
+* DO NOT CHANGE
+*/
+if (!defined('IN_PHPBB'))
+{
+	exit;
+}
+
+if (empty($lang) || !is_array($lang))
+{
+	$lang = array();
+}
+
+// DEVELOPERS PLEASE NOTE
+//
+// All language files should use UTF-8 as their encoding and the files must not contain a BOM.
+//
+// Placeholders can now contain order information, e.g. instead of
+// 'Page %s of %s' you can (and should) write 'Page %1$s of %2$s', this allows
+// translators to re-order the output of data while ensuring it remains correct
+//
+// You do not need this where single placeholders are used, e.g. 'Message %d' is fine
+// equally where a string contains only two placeholders which are used to wrap text
+// in a url you again do not need to specify an order e.g., 'Click %sHERE%s' is fine
+
+// Football Settings
+$lang = array_merge($lang, array(
+	'ACP_FOOTBALL'						=> 'Fussball',
+	'ACP_FOOTBALL_MANAGEMENT'			=> 'Tipprunde-Verwalten',
+	'ACP_FOOTBALL_OPERATION'			=> 'Spielbetrieb',
+	'ACP_FOOTBALL_MANAGE'				=> 'Spielplan Verwaltung',
+	
+	'ACP_FOOTBALL_CONFIGURATION'		=> 'Tipprunden-Konfiguration',
+	'ACP_FOOTBALL_SETTINGS'				=> 'Tipprunden-Einstellungen',
+	'ACP_FOOTBALL_SETTINGS_EXPLAIN'		=> 'Hier kannst du einige grundlegende Einstellungen der Tipprunde vornehmen, ihr einen passenden Namen und eine Beschreibung geben und, neben anderen Werten, die Standard-Einstellungen für die Anzeige anpassen. ',
+
+	'DISABLE_FOOTBALL'					=> 'Tipprunde deaktivieren',
+	'DISABLE_FOOTBALL_EXPLAIN'			=> 'Hiermit sperrst du die Tipprunde für alle Benutzer. Wenn du möchtest, kannst du eine kurze Nachricht (bis zu 255 Zeichen) angeben. ',
+	'DISPLAY_LAST_USERS'				=> 'Anzahl anzuzeigender letzter Besucher des Forums',
+	'DISPLAY_LAST_USERS_EXPLAIN'		=> 'Limitiert die Anzeige der letzten Besucher im selbigen Tipprunden-Block. Mit 0 wird die Anzeige des Blocks unterdrückt. ',
+	'DISPLAY_LAST_RESULTS'				=> 'Anzahl maximal anzuzeigender letzter Spielergebnisse',
+	'DISPLAY_LAST_RESULTS_EXPLAIN'		=> 'Limitiert die Anzeige der letzten Spielergebnisse im selbigen Tipprunden-Block. Finden mehr Spiele am letzten Tag statt, werden alle Ergebnisse dieses Tages angezeigt. Mit 0 wird die Anzeige des Blocks unterdrückt. ',
+	'DISPLAY_RANKS'						=> 'Anzahl angezeigter Tipper in den Übersichts-Ranglisten',
+	'DISPLAY_RANKS_EXPLAIN'				=> 'Limitiert die Anzeige der Spieltags- und Gesamtrangliste in der Hauptansicht. Die eigene Platzierung wird ggf. unten angehängt. ',
+
+	'FOOTBALL_CODE'						=> 'Tipprunden Code',
+	'FOOTBALL_CODE_EXPLAIN'				=> 'Zugangscode zur Tipprunde z.B. für Cronjobs. ',
+	'FOOTBALL_FULLSCREEN'				=> 'Tipprunden-Seiten im Fullscreen-Modus',
+	'FOOTBALL_FULLSCREEN_EXPLAIN'		=> 'Hiermit kannst Du, abweichend vom Forum, die Tipprundenseiten mit minimalen Seitenrändern anzeigen lassen. ',
+	'FOOTBALL_HEADER_ENABLE'			=> 'Header-Bild je Liga verwenden',
+	'FOOTBALL_HEADER_ENABLE_EXPLAIN'	=> 'Hiermit kannst Du festlegen, ob je Liga die zugehöriges Bild im Header angezeigt werden soll. ',
+	'FOOTBALL_INFO'						=> 'Tipprunden Information anzeigen',
+	'FOOTBALL_INFO_EXPLAIN'				=> 'Hiermit kannst Du eine kurze Information (bis zu 255 Zeichen) oberhalb der Tippdaten anzeigen lassen. ',
+	'FOOTBALL_NAME'						=> 'Name der Tipprunde',
+	'FOOTBALL_NAME_EXPLAIN'				=> 'Name der im Tipprunden-Menu verwendet wird, um zur Hauptseite zu gelangen. ',
+	'FOOTBALL_OVERRIDE_STYLE'			=> 'Style überschreiben',
+	'FOOTBALL_OVERRIDE_STYLE_EXPLAIN'	=> 'Verwendet für die Tipprunde immer den Standard-Tipprunden-Style. ',
+	'FOOTBALL_STYLE'					=> 'Standard Tipprunden Style',
+	'FOOTBALL_UPDATE_SOURCE'			=> 'Update Quelle',
+	'FOOTBALL_UPDATE_SOURCE_EXPLAIN'	=> 'Link zur Quelle des Updates. Falls leer, wird automatisch <var>http://football.bplaced.net/football/xml/football_xml_season.php</var> gewählt. ',
+	'FOOTBALL_UPDATE_CODE'				=> 'Update Code',
+	'FOOTBALL_UPDATE_CODE_EXPLAIN'		=> 'Nur mit diesem Code können Updates von dieser Seite heruntergeladen werden. ',
+
+	'GUEST_VIEW'						=> 'Tipprunde für Gäste sichtbar',
+	'GUEST_VIEW_EXPLAIN'				=> 'Soll die Tipprunde für Gäste sichtbar sein?',
+
+	'USER_VIEW'							=> 'Tipprunde nur für Teilnehmer sichtbar',
+	'USER_VIEW_EXPLAIN'					=> 'Soll die Tipprunde nur für Tipprunden-Teilnehmer sichtbar sein?',
+
+	'TIME_SHIFT'						=> 'Zeitverschiebung',
+	'TIME_SHIFT_EXPLAIN'				=> 'Differenz in Stunden zur Board Zeitzone wenn dein Host in einer anderen Zeitzone steht, damit die Tippabgabe korrekt funktioniert. ',
+
+	'LEFT_COLUMN'						=> 'Spaltenbreite Links in Pixeln',
+	'LEFT_COLUMN_EXPLAIN'				=> 'Optimale Breite 180 Pixel. Dieser Wert sollte nicht unterschritten werden. ',
+
+	'PREDICTION_LEAGUE'					=> 'Tipprunde',
+
+	'RIGHT_COLUMN'						=> 'Spaltenbreite Rechts in Pixeln',
+	'RIGHT_COLUMN_EXPLAIN'				=> 'Optimal 180 Pixel. Dieser Wert wird durch externe Einblendungen ggf. übersteuert. ',
+
+	'USERS_PAGE'						=> 'Tipper pro Seite',
+	'USERS_PAGE_EXPLAIN'				=> 'Anzahl der Tipper je Seite in der Hauptrangliste und Alle Tipps. ',
+	
+	'WIN_NAME'							=> 'Gewinn Name (oder Währung)',
+	'WIN_NAME_EXPLAIN'					=> 'Der Name, der für die Gewinne in der Tipprunde angezeigt werden soll',
+
+	'ANNOUNCEMENT_TOPIC'				=> 'Release Ankündigung',
+	'CURRENT_VERSION'					=> 'Derzeitige Version',
+	'DOWNLOAD_LATEST'					=> 'Neueste Version herunterladen',
+	'LATEST_VERSION'					=> 'Neueste Version',
+	'NOT_UP_TO_DATE'					=> '%s ist nicht aktuell',
+	'RELEASE_ANNOUNCEMENT'				=> 'Ankündigungsthema',
+	'UP_TO_DATE'						=> '%s ist aktuell',
+	'FOOTBALL_VERSION_CHECK'			=> 'Football Prediction League Extension Version Check',
+
+));
+
+// Football Features 
+$lang = array_merge($lang, array(
+	'ACP_FOOTBALL_FEATURES'				=> 'Tipprunden-Funktionalitäten',
+	'ACP_FOOTBALL_FEATURES_EXPLAIN'		=> 'Hier kannst du einige Funktionen der Tipprunde aktivieren bzw. deaktivieren',
+
+	'AUTO'								=> 'Auto',
+
+	'BANK'								=> 'Tipprunden Konto verwalten',
+	'BANK_EXPLAIN'						=> 'Sollen Tipprunden Konten mit Einsätzen und Gewinnen gepflegt werden?',
+
+	'FOOTBALL_SEASON_START'				=> 'Starte in Saison',
+	'FOOTBALL_SEASON_START_EXPLAIN'		=> 'Starte in dieser oder in der automatisch ermittelten Saison, wenn noch keine ausgewählt wurde. ',
+
+	'FOOTBALL_REMEMBER_ENABLE'			=> 'Cronjob für die Tipp-Erinnerungsmail aktivieren',
+	'FOOTBALL_REMEMBER_ENABLE_EXPLAIN'	=> 'Hier kannst Du angeben, ob 1 Tag vor Tippabgabe eine Erinnerungsmail versendet werden soll.',
+
+	'FOOTBALL_REMEMBER_NEXT_RUN'		=> 'Nächster Cronjoblauf für die Tipp-Erinnerungsmail',
+	'FOOTBALL_REMEMBER_NEXT_RUN_EXPLAIN'=> 'Hier kannst Du einstellen, wann der Cronjob für die Tipp-Erinnerungsmail frühestens wieder aufgerufen wird. Nach Ausführung wird der Cronjob für den Folgetag zur gleichen Uhrzeit neu eingeplant.',
+
+	'FOUNDER_DELETE'					=> 'Nur Gründungsmitglieder dürfen löschen',
+	'FOUNDER_DELETE_EXPLAIN'			=> 'Löschung von Spielplandaten wie Saisons, Ligen, Teams, Spieltage und Spielpläne nur auf Gründungsmitglieder beschränken. ',
+
+	'RESULTS_AT_TIME'					=> 'Eingabe endgültiger Spielergebnisse erst nach Spielende',
+	'RESULTS_AT_TIME_EXPLAIN'			=> 'Eingabe der endgültigen Spielergebnisse im Adminbereich erst nach Spielende freigeben. Die Eingabe von vorläufigen Spielergebnissen durch die Tipper ist hiervon unabhängig. ',
+
+	'SAME_ALLOWED'						=> 'Alle Tipps an einem Spieltag gleich',
+	'SAME_ALLOWED_EXPLAIN'				=> 'Identische Tipps (Oma-Tipps) bei allen Spielen eines Spieltags erlauben bzw. verbieten. ',
+
+	'ULT_POINTS'						=> 'Ultimate Points einbinden',
+	'ULT_POINTS_EXPLAIN'				=> 'Soll es möglich sein, die Punkte oder Gewinne in Ultimate Points verrechnen zu lassen? Dazu muss Ultimate Points installiert sein. ',
+	'ULT_POINTS_FACTOR'					=> 'Ultimate Points Faktor',
+	'ULT_POINTS_FACTOR_EXPLAIN'			=> 'Faktor mit dem die Punkte je Spieltag in Ultimate Points gutgeschrieben werden. ',
+	'UP_NONE'							=> 'Keine',
+	'UP_POINTS'							=> 'Punkte',
+	'UP_WINS'							=> 'Gewinne',
+
+	'VIEW_BETS'							=> 'Tipps immer Anzeigen',
+	'VIEW_BETS_EXPLAIN'					=> 'Sollen alle Tipps sofort angezeigt werden? Wenn Nein, dann werden sie erst nach Tippabgabeschluss angezeigt. ',
+	'VIEW_CURRENT'						=> 'Anzeige startet in aktueller Liga',
+	'VIEW_CURRENT_EXPLAIN'				=> 'Soll beim ersten Aufruf die Liga angezeigt werden, in der die nächsten Spiele stattfinden? Sonst wird immer die erste Liga angezeigt',
+	'VIEW_TENDENCIES'					=> 'Tipp-Tendenzen immer Anzeigen',
+	'VIEW_TENDENCIES_EXPLAIN'			=> 'Sollen alle Tipp-Tendenzen sofort angezeigt werden? Wenn Nein, dann werden sie erst nach Tippabgabeschluss angezeigt. ',
+
+	'WIN_HITS02'						=> 'Gewinne Volltreffer-Wertung mit Auswärtspunkten',
+	'WIN_HITS02_EXPLAIN'				=> 'Sollen Gewinne der Volltreffer-Wertung mit Auswärtspunkten angezeigt werden? Wenn Nein, muss sichergestellt werden, dass dazu keine Gewinne in den bestehenden Ligen hinterlegt wurden. ',
+));
+
+// Football Menu
+$lang = array_merge($lang, array(
+	'ACP_FOOTBALL_MENU'					=> 'Tipprunden-Menu',
+	'ACP_FOOTBALL_MENU_EXPLAIN'			=> 'Hier kannst du Links für das Tipprunden-Menu hinterlegen. Die Linkbeschriftung kannst du frei wählen. ',
+
+	'FOOTBALL_BREADCRUMB'				=> 'Tipprunden breadcrumb anzeigen',
+	'FOOTBALL_BREADCRUMB_EXPLAIN'		=> 'Soll ein Breadcrumb-Link für die Tipprunden angezeigt werden? ',
+	'FOOTBALL_SIDE'						=> 'Tipprunden Sidebar anzeigen',
+	'FOOTBALL_SIDE_EXPLAIN'				=> 'Soll die Tipprunden Sidebar mit den Menüeinträgen angezeigt werden? ',
+	'FOOTBALL_MENU'						=> 'Tipprunden Menu anzeigen',
+	'FOOTBALL_MENU_EXPLAIN'				=> 'Soll das Tipprunden Dropdown Menü in der Navigationsleiste angezeigt werden? ',
+	'MENU_DESC1'						=> 'Beschriftung http-Link 1',
+	'MENU_DESC1_EXPLAIN'				=> 'Die Beschriftung des Links darf keine unzulässigen Sonderzeichen enthalten und höchsten 20 Zeichen lang sein. ',
+	'MENU_DESC2'						=> 'Beschriftung http-Link 2',
+	'MENU_DESC3'						=> 'Beschriftung http-Link 3',
+	'MENU_LINK1'						=> 'Http-Link 1',
+	'MENU_LINK1_EXPLAIN'				=> 'Bitte hier nur http Links eingeben. ',
+	'MENU_LINK2'						=> 'Http-Link 2',
+	'MENU_LINK3'						=> 'Http-Link 3',
+	'MENU_NO_LINK'						=> 'Kein Link hinterlegt',
+));
+
+
+// Football Help
+$lang = array_merge($lang, array(
+	'ACP_FOOTBALL_USERGUIDE'			=> 'Benutzerhilfe',
+	'ACP_FOOTBALL_USERGUIDE_EXPLAIN'	=> 'Hier findest du Hilfe für die Einstellungen des phpBB3 Football MODs.<br />Wenn du Fragen hast, dann schaue bitte immer zuerst hier!',
+));
+
+
+#// Football Logs
+$lang = array_merge($lang, array(
+	'LOG_FOOTBALL_FEATURES'				=> '<strong>Tipprunden-Funktionalitäten geändert</strong>',
+	'LOG_FOOTBALL_MENU'					=> '<strong>Tipprunden-Menu geändert</strong>',
+	'LOG_FOOTBALL_SETTINGS'				=> '<strong>Tipprunde-Einstellungen geändert</strong>',
+	'LOG_PL_BACKUP'						=> '<strong>Tipprunden Backup</strong>',
+
+	'LOG_FOOTBALL_MSG_TEST'				=> 'Aufruf am %s.',
+	'LOG_FOOTBALL_MSG_TEST_TRAVEL'		=> 'Aufruf mit Zeitreise zum %s.',
+	
+	'LOG_FOOTBALL_REMEMBER_CRON'		=> '<strong>Cronjob Football remember ausgeführt</strong><br />» %s',
+	'LOG_FOOTBALL_REMEMBER_CRON_TEST'	=> '<strong>Cronjob Football remember Testaufruf</strong><br />» %s',
+
+	'FOOTBALL_REMEMBER_SUBJECT'			=> 'Bitte %1$s %2$d. Spieltag tippen',
+	'FOOTBALL_REMEMBER_SUBJECT_BOARD'	=> 'Versendete Erinnerungs-Mails %1$s %2$d',
+	'FOOTBALL_REMEMBER_ERROR_EMAIL'		=> '%1$s  Erinnerungs-Mail an: %2$s gescheitert',
+	'FOOTBALL_REMEMBER_ERROR_EMAIL_BOARD'=> '%1$s Versandliste Erinnerungs-Mail an: %2$s gescheitert',
+	'FOOTBALL_REMEMBER_NOBODY'			=> 'Es muss niemand erinnert werden.',
+	'FOOTBALL_REMEMBER_NO_DELIVERY'		=> 'Keine anstehende Tippabgabe im Zeitraum.',
+	'FOOTBALL_REMEMBER_SEND'			=> '%1$s  Erinnerungs-Mail an: %2$s',
+
+));
+
 ?>

language/en/football.php

@@ -185,6 +185,7 @@ $lang = array_merge($lang, array(
 	'LAST_GAMES'						=> 'The last matches',
 	'LAST_GAMES_AWAY'					=> 'The last away matches',
 	'LAST_GAMES_HOME'					=> 'The last home matches',
+	'LAST_RESULTS'						=> 'Last results',
 	'LAST_VISITORS'						=> 'Last %s visitors',
 	'LEAGUE'							=> 'League',
 	'LINK_PREDICTION_LEAGUE'			=> 'To the WebtTip',

language/en/help_football.php

@@ -40,7 +40,7 @@ if ( empty($lang) || !is_array($lang) )
 // ’ » „ “ — …
 //
 
-$help = array(
+$lang = array_merge($lang, array('FOOTBALL_HELP_FAQ' => array(
 	array(
 		0 => '--',
 		1 => 'First steps'
@@ -499,5 +499,5 @@ Preliminary results from the update are not used. If these should be taken, this
 		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.' 
 	),
-);
+)));
 ?>

language/en/info_acp_football.php

@@ -46,6 +46,10 @@ $lang = array_merge($lang, array(
 	'ACP_FOOTBALL_SETTINGS_EXPLAIN'			=> 'Here you can carry out some basic settings of the Prediction League, give it a suitable name and description and define a football side announcement and other values. ',
 	'DISABLE_FOOTBALL'						=> 'Deactivate Prediction League',
 	'DISABLE_FOOTBALL_EXPLAIN'				=> 'You can disable the Prediction League for all users. If you wanted, you can display a short message (up to 255 signs). ',
+	'DISPLAY_LAST_USERS'					=> 'Number of board visitors to display',
+	'DISPLAY_LAST_USERS_EXPLAIN'			=> 'Limits the last visitors to display in block. 0 is used to suppress the display of the block. ',
+	'DISPLAY_LAST_RESULTS'					=> 'Number of match results to display',
+	'DISPLAY_LAST_RESULTS_EXPLAIN'			=> 'Limits the last match results to display in block. If more matches are played on the last day, all results of that day are displayed. 0 is used to suppress the display of the block. ',
 	'DISPLAY_RANKS'							=> 'Number of indicated User in total ranking',
 	'DISPLAY_RANKS_EXPLAIN'					=> 'Announcement of users in the ranking lists. The ownrank is suspended if necessary below. ',
 	'FOOTBALL_CODE'							=> 'Prediction League Code',
@@ -71,8 +75,8 @@ $lang = array_merge($lang, array(
 	'GUEST_VIEW_EXPLAIN'					=> 'Should guests be able to see the Prediction League?',
 	'USER_VIEW'								=> 'Prediction League only for participants visible',
 	'USER_VIEW_EXPLAIN'						=> 'Should the Prediction League only to participants be visible?',
-	'HOST_TIMEZONE'							=> 'Host Timezone',
-	'HOST_TIMEZONE_EXPLAIN'					=> 'Difference to the Board time zone if your Host in another time zone stands, so that the tip delivery correctly functions. ',
+	'TIME_SHIFT'							=> 'Time shift',
+	'TIME_SHIFT_EXPLAIN'					=> 'Difference in hours to board time zone if host is in another time zone, so that the tip delivery works correctly. ',
 	'LEFT_COLUMN'							=> 'Left column width in pixels',
 	'LEFT_COLUMN_EXPLAIN'					=> 'Optimum width 180 pixels. This value should not be fell short. ',
 	'PREDICTION_LEAGUE'						=> 'Prediction League',
@@ -146,6 +150,7 @@ $lang = array_merge($lang, array(
 	'LOG_FOOTBALL_MSG_TEST_TRAVEL'			=> 'Call with time travel to %s.',
 	'LOG_FOOTBALL_REMEMBER_CRON'			=> 'Cronjob Football remember running %s',
 	'LOG_FOOTBALL_REMEMBER_CRON_TEST'		=> 'Cronjob Football remember test call %s',
+	'LOG_PL_BACKUP'							=> '<strong>Prediction League backup</strong>',
 	'FOOTBALL_REMEMBER_SUBJECT'				=> 'Please bet %1$s %2$d. matchday',
 	'FOOTBALL_REMEMBER_SUBJECT_BOARD'		=> 'Sent reminder mails %1$s %2$d',
 	'FOOTBALL_REMEMBER_ERROR_EMAIL'			=> '%1$s reminder email to: %2$d failed',

migrations/v094_beta_update.php

@@ -58,23 +58,13 @@ class v094_beta_update extends \phpbb\db\migration\migration
 	{
 		return array(
 			'drop_columns'        => array(
-				$this->table_prefix . 'groups'        => array(
-					'group_teampage',
-				),
 				$this->table_prefix . 'sessions' 			=> array(
+					'football_season',
+					'football_league',
+					'football_matchday',
 					'football_mobile',
 					'football_mobile_device',
 				),
-				$this->table_prefix . 'footb_bets'		=> array(
-					'bet_time',
-				),
-				$this->table_prefix . 'footb_matches'	=> array(
-					'trend',
-					'odd_1',
-					'odd_x',
-					'odd_2',
-					'rating',
-				),
 			)
 		);
 	}

migrations/v098_beta.php

@@ -0,0 +1,30 @@
+<?php
+/**
+*
+* @package Football Football v0.98
+* @copyright (c) 2017 football (http://football.bplaced.net)
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+namespace football\football\migrations;
+
+class v098_beta extends \phpbb\db\migration\migration
+{
+	public function effectively_installed()
+	{
+		return isset($this->config['football_version']) && version_compare($this->config['football_version'], '0.9.8', '>=');
+	}
+	
+	static public function depends_on()
+	{
+		return array('\football\football\migrations\v097_beta');
+	}
+
+	public function update_data()
+	{
+		return array(
+			array('config.update', array('football_version', '0.9.8', '0')),
+		);
+	}
+}

migrations/v099_beta.php

@@ -0,0 +1,34 @@
+<?php
+/**
+*
+* @package Football Football v0.9.9
+* @copyright (c) 2017 football (http://football.bplaced.net)
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+namespace football\football\migrations;
+
+class v099_beta extends \phpbb\db\migration\migration
+{
+	public function effectively_installed()
+	{
+		return isset($this->config['football_version']) && version_compare($this->config['football_version'], '0.9.9', '>=');
+	}
+	
+	static public function depends_on()
+	{
+		return array('\football\football\migrations\v098_beta');
+	}
+
+	public function update_data()
+	{
+		return array(
+			array('config.remove', array('football_host_timezone')),
+			array('config.add', array('football_time_shift', '1', '0')),
+			array('config.add', array('football_display_last_users', '5', '0')),
+			array('config.add', array('football_display_last_results', '0', '0')),
+			array('config.update', array('football_version', '0.9.9', '0')),
+		);
+	}
+}

styles/prosilver/template/bet.html

@@ -1,220 +1,220 @@
-<!-- IF S_DATA_BET --> 
-	<!-- IF S_EDIT_MODE -->
-	<form method="post" action="{S_FORM_ACTION_BET}" name="betform">
-	<!-- ELSE -->
-		<span class="color_finally">{L_FINALLY}</span> - <span class="color_provisionally">{L_PROVISIONALLY}</span> - <span class="color_not_rated">{L_NOT_RATED}</span><br />
-	<!-- ENDIF -->
-	<div class="forabg">
-		<table class="football">
-			<thead>
-				<tr>
-					<th>{L_DATE}</th>
-					<th style="text-align: right;">{L_NR}</th>
-				<!-- IF S_DATA_GROUP -->
-					<th>{L_GR}</th>
-				<!-- ENDIF -->
-					<th style="text-align: center;" colspan="5">{L_VS}</th>
-					<th style="text-align: center;" colspan="4">{L_BET_OF} ({BET_EXPLAIN})</th>
-				<!-- IF S_DISPLAY_RATING -->
-					<th style="text-align: center;">{L_RATING}</th>
-				<!-- ENDIF -->
-				<!-- IF S_DATA_BET_RESULTS -->
-					<th style="text-align: center;" colspan="3">{L_RESULT}</th>
-					<th>{L_POINTS}</th>
-				<!-- ENDIF -->
-					<th></th>
-				</tr>
-			</thead>
-			<tbody>
-			<!-- BEGIN bet_view -->
-				<tr class="{bet_view.ROW_CLASS}">
-					<td>{bet_view.MATCH_TIME}</td>
-					<td class="td_match_no">{bet_view.MATCH_NUMBER}</td>
-				<!-- IF S_DATA_GROUP -->
-					<td class="td_group">{bet_view.GROUP}</td>
-				<!-- ENDIF -->
-					<td class="td_logo">{bet_view.LOGO_HOME}</td>
-					<td class="td_team"  style="cursor:pointer;" title="{L_SHOW_PLAN}" onclick="popup('{bet_view.U_PLAN_HOME}', 625,625);return false;">
-						{bet_view.HOME_NAME}</td>
-					<td class="td_vs">:</td>
-					<td class="td_logo">{bet_view.LOGO_GUEST}</td>
-					<td class="td_team"  style="cursor:pointer;" title="{L_SHOW_PLAN}" onclick="popup('{bet_view.U_PLAN_GUEST}', 625,625);return false;">
-						{bet_view.GUEST_NAME}</td>
-					<td class="td_goals_home">{bet_view.BET_HOME}</td>
-					<td class="td_vs">:</td>
-					<td class="td_goals_guest" title="{bet_view.TREND} {bet_view.ODDS}">{bet_view.BET_GUEST}</td>
-					<td class="td_vs"></td>
-					<!-- IF S_DISPLAY_RATING -->
-					<td class="td_points">{bet_view.RATING}</td>
-					<!-- ENDIF -->
-					<td class="td_goals_home {bet_view.COLOR_STYLE}">{bet_view.GOALS_HOME}</td>
-					<td class="td_vs">:</td>
-					<td class="td_goals_guest {bet_view.COLOR_STYLE}">{bet_view.GOALS_GUEST}</td>
-					<td class="td_points {bet_view.COLOR_STYLE}">{bet_view.POINTS}</td>
-					<td class="td_button">
-				<!-- IF S_VIEW <> 'print' and bet_view.DISPLAY_LINK -->
-						<a class="match_info" title="{L_MATCH_STATS}" href="{bet_view.U_MATCH_STATS}" onclick="javascript:popup(this.href, 818, 750, '_matchstats'); return false;"></a>
-				<!-- ELSE -->	
-						<img src="./../../ext/football/football/images/spacer.gif" alt="" width="28" height="28" />
-				<!-- ENDIF -->
-					</td>
-				</tr>
-			<!-- END bet_view -->
-			<!-- BEGIN bet_edit -->
-				<tr class="{bet_edit.ROW_CLASS}">
-					<td class="td_datetime">{bet_edit.MATCH_TIME}</td>
-					<td class="td_match_no">{bet_edit.MATCH_NUMBER}</td>
-				<!-- IF S_DATA_GROUP -->
-					<td class="td_group">{bet_edit.GROUP}</td>
-				<!-- ENDIF -->
-					<td class="td_logo">{bet_edit.LOGO_HOME}&nbsp;</td>
-					<td class="td_team"  style="cursor:pointer;" title="{L_SHOW_PLAN}" onclick="popup('{bet_edit.U_PLAN_HOME}', 625,625);return false;">
-						{bet_edit.HOME_NAME}
-					</td>
-					<td class="td_vs">:</td>
-					<td class="td_logo">{bet_edit.LOGO_GUEST}&nbsp;</td>
-					<td class="td_team"  style="cursor:pointer;" title="{L_SHOW_PLAN}" onclick="popup('{bet_edit.U_PLAN_GUEST}', 625,625);return false;">
-						{bet_edit.GUEST_NAME}
-					</td>
-					<td class="td_goals_home">
-				<!-- IF S_VIEW <> 'print' -->
-						<input type="number" style="width:30px" name="goalsh{bet_edit.MATCH_NUMBER}" min="0" max="20" size="2" value="{bet_edit.BET_HOME}">
-				<!-- ELSE -->
-						_{bet_edit.BET_HOME}_
-				<!-- ENDIF -->
-					</td>
-					<td class="td_vs">:</td>
-					<td class="td_goals_guest"  title="{bet_edit.TREND} {bet_edit.ODDS}">
-				<!-- IF S_VIEW <> 'print' -->
-						<input type="number" style="width:30px" name="goalsg{bet_edit.MATCH_NUMBER}" min="0" max="20" size="2" value="{bet_edit.BET_GUEST}"> 
-				<!-- ELSE -->
-						_{bet_edit.BET_GUEST}_
-				<!-- ENDIF -->
-					</td>
-					<td class="td_vs">{bet_edit.DELIVERTAG}</td>
-				<!-- IF S_DISPLAY_RATING -->
-					<td class="td_points">
-						<input style="display:inline; margin:0; padding:0;" type="number" style="width:30px" name="rating{bet_edit.MATCH_NUMBER}" min="0" max="10" size="2" value="{bet_edit.RATING}"> 
-					</td>
-				<!-- ENDIF -->
-				<!-- IF bet_edit.DATA_RESULTS -->
-					<td class="td_goals_home">&nbsp;</td>
-					<td class="td_vs">&nbsp;</td>
-					<td class="td_goals_guest">&nbsp;</td>
-					<td class="td_points">&nbsp;</td>
-				<!-- ENDIF -->
-					<td class="td_button">
-				<!-- IF S_VIEW <> 'print' and bet_edit.DISPLAY_LINK -->
-						<a class="match_info" title="{L_MATCH_STATS}" href="{bet_edit.U_MATCH_STATS}" onclick="javascript:popup(this.href, 818, 750, '_matchstats'); return false;"></a>
-				<!-- ELSE -->	
-						<img src="./../../ext/football/football/images/spacer.gif" alt="" width="28" height="28" />
-				<!-- ENDIF -->
-					</td>
-				</tr>
-			<!-- END bet_edit -->
-			</tbody>
-		</table>
-	</div>
-
-	<!-- IF S_DISPLAY_DELIVERY2 or S_DISPLAY_DELIVERY3 -->
-	<div class="left-box"  style="margin-bottom:5px">
-		<!-- IF S_DISPLAY_DELIVERY2 -->
-		<strong style='color:green'>*&nbsp; {L_DELIVERY_UNTIL} {S_DELIVERY2} </strong><br />
-		<!-- ENDIF -->
-		<!-- IF S_DISPLAY_DELIVERY3 -->
-		<strong style='color:green'>**&nbsp; {L_DELIVERY_UNTIL} {S_DELIVERY3} </strong><br />
-		<!-- ENDIF -->
-	</div>
-	<!-- ENDIF -->
-
-	<!-- IF S_EXTRA_BET --> 
-	<br />
-	<div class="forabg">
-		<table class="football">
-			<thead>
-				<tr>
-					<th style="text-align: left;">{L_QUESTION}</th>
-					<th>{L_POSSIBLE_POINTS}</th>
-					<th>{L_EVALUATION}</th>
-					<th>{L_BET_OF}</th>
-				<!-- IF S_EXTRA_RESULTS -->
-					<th>{L_RESULT}</th>
-					<th>{L_POINTS}</th>
-				<!-- ENDIF -->
-				</tr>
-			</thead>
-			<tbody>
-			<!-- BEGIN extra_view -->
-				<tr class="{extra_view.ROW_CLASS}">
-					<td>{extra_view.QUESTION}</td>
-					<td style="text-align: center;">{extra_view.EXTRA_POINTS}</td>
-					<td style="text-align: center;">{extra_view.EVALUATION}</td>
-					<td style="text-align: center;">{extra_view.BET}</td>
-					<td style="text-align: center;">{extra_view.RESULT}</td>
-					<td class="td_points {extra_view.COLOR_STYLE}">{extra_view.BET_POINTS}</td>
-				</tr>
-			<!-- END extra_view -->
-			<!-- BEGIN extra_edit -->
-				<tr class="{extra_edit.ROW_CLASS}" style="height:30px">
-					<td>{extra_edit.QUESTION}</td>
-					<td style="text-align: center;">{extra_edit.EXTRA_POINTS}</td>
-					<td style="text-align: center;" title="{extra_edit.EVALUATION_TITLE}">{extra_edit.EVALUATION}</td>
-					<td style="text-align: center;">
-				<!-- IF extra_edit.S_DISPLAY_TYPE == 1 -->
-					<!-- IF S_VIEW <> 'print' -->
-						<select name="extra{extra_edit.EXTRA_NO}">
-						<!-- BEGIN extra_option -->
-							<option {extra_edit.extra_option.S_SELECTED} value="{extra_edit.extra_option.OPTION_VALUE}">{extra_edit.extra_option.OPTION_NAME}</option>
-						<!-- END extra_option -->
-						</select>
-					<!-- ELSE -->
-						_{extra_edit.BET}_
-					<!-- ENDIF -->
-				<!-- ENDIF -->
-				<!-- IF extra_edit.S_DISPLAY_TYPE == 2 -->
-					<!-- IF S_VIEW <> 'print' -->
-						<input style="display:inline; margin:0; padding:0;" type="text" name="extra{extra_edit.EXTRA_NO}" size="15" maxlength="255" value="{extra_edit.BET}"> 
-					<!-- ELSE -->
-						_{extra_edit.BET}_
-					<!-- ENDIF -->
-				<!-- ENDIF -->
-					</td>
-				</tr>
-			<!-- END extra_edit -->
-			</tbody>
-		</table>
-	</div>
-	<!-- ENDIF -->
-
-	<!-- IF S_EDIT_MODE -->
-		<!-- IF S_VIEW <> 'print' -->
-		<div class="right-box" style="margin-bottom:5px">
-			<div class="message">{S_DBMSG}&nbsp;&nbsp;&nbsp;<input class="button1" type="submit" value="{L_BET}"></div>
-		</div>
-		<!-- ENDIF -->
-	</form>
-	<!-- ELSE -->
-		<br /> 
-	<!-- ENDIF -->
-
-	<!-- INCLUDE nav_delivery.html -->
-<!-- ELSE -->
-	<br />
-	<!-- IF S_USER_IS_MEMBER -->
-	<div class="message">{L_NO_MATCHES_ON_MATCHDAY}</div>
-	<!-- ELSE -->
-	<div class="message">{L_NO_MEMBER}</div>
-		<!-- IF S_JOIN_LEAGUE -->
-			<br />
-			<br />
-			<div>
-			<form method="post" action="{S_FORM_ACTION_JOIN}" name="joinform">
-				<strong>{JOIN_LEAGUE} </strong><br />
-				<br />
-				<input class="button1" type="submit" value="{L_JOIN}">
-			</form>
-			</div>
-		<!-- ENDIF -->
-	<!-- ENDIF -->
-	<br />
-<!-- ENDIF -->
+<!-- IF S_DATA_BET --> 
+	<!-- IF S_EDIT_MODE -->
+	<form method="post" action="{S_FORM_ACTION_BET}" name="betform">
+	<!-- ELSE -->
+		<span class="color_finally">{L_FINALLY}</span> - <span class="color_provisionally">{L_PROVISIONALLY}</span> - <span class="color_not_rated">{L_NOT_RATED}</span><br />
+	<!-- ENDIF -->
+	<div class="forabg">
+		<table class="football">
+			<thead>
+				<tr>
+					<th>{L_DATE}</th>
+					<th style="text-align: right;">{L_NR}</th>
+				<!-- IF S_DATA_GROUP -->
+					<th>{L_GR}</th>
+				<!-- ENDIF -->
+					<th style="text-align: center;" colspan="5">{L_VS}</th>
+					<th style="text-align: center;" colspan="4">{L_BET_OF} ({BET_EXPLAIN})</th>
+				<!-- IF S_DISPLAY_RATING -->
+					<th style="text-align: center;">{L_RATING}</th>
+				<!-- ENDIF -->
+				<!-- IF S_DATA_BET_RESULTS -->
+					<th style="text-align: center;" colspan="3">{L_RESULT}</th>
+					<th>{L_POINTS}</th>
+				<!-- ENDIF -->
+					<th></th>
+				</tr>
+			</thead>
+			<tbody>
+			<!-- BEGIN bet_view -->
+				<tr class="{bet_view.ROW_CLASS}">
+					<td>{bet_view.MATCH_TIME}</td>
+					<td class="td_match_no">{bet_view.MATCH_NUMBER}</td>
+				<!-- IF S_DATA_GROUP -->
+					<td class="td_group">{bet_view.GROUP}</td>
+				<!-- ENDIF -->
+					<td class="td_logo">{bet_view.LOGO_HOME}</td>
+					<td class="td_team"  style="cursor:pointer;" title="{L_SHOW_PLAN}" onclick="popup('{bet_view.U_PLAN_HOME}', 625,625);return false;">
+						{bet_view.HOME_NAME}</td>
+					<td class="td_vs">:</td>
+					<td class="td_logo">{bet_view.LOGO_GUEST}</td>
+					<td class="td_team"  style="cursor:pointer;" title="{L_SHOW_PLAN}" onclick="popup('{bet_view.U_PLAN_GUEST}', 625,625);return false;">
+						{bet_view.GUEST_NAME}</td>
+					<td class="td_goals_home">{bet_view.BET_HOME}</td>
+					<td class="td_vs">:</td>
+					<td class="td_goals_guest" title="{bet_view.TREND} {bet_view.ODDS}">{bet_view.BET_GUEST}</td>
+					<td class="td_vs"></td>
+					<!-- IF S_DISPLAY_RATING -->
+					<td class="td_points">{bet_view.RATING}</td>
+					<!-- ENDIF -->
+					<td class="td_goals_home {bet_view.COLOR_STYLE}">{bet_view.GOALS_HOME}</td>
+					<td class="td_vs">:</td>
+					<td class="td_goals_guest {bet_view.COLOR_STYLE}">{bet_view.GOALS_GUEST}</td>
+					<td class="td_points {bet_view.COLOR_STYLE}">{bet_view.POINTS}</td>
+					<td class="td_button">
+				<!-- IF S_VIEW <> 'print' and bet_view.DISPLAY_LINK -->
+						<a title="{L_MATCH_STATS}" href="{bet_view.U_MATCH_STATS}" onclick="javascript:popup(this.href, 818, 750, '_matchstats'); return false;"><i class="icon fa-bar-chart fa-fw"></i></a>
+				<!-- ELSE -->	
+						<img src="./../../ext/football/football/images/spacer.gif" alt="" width="28" height="28" />
+				<!-- ENDIF -->
+					</td>
+				</tr>
+			<!-- END bet_view -->
+			<!-- BEGIN bet_edit -->
+				<tr class="{bet_edit.ROW_CLASS}">
+					<td class="td_datetime">{bet_edit.MATCH_TIME}</td>
+					<td class="td_match_no">{bet_edit.MATCH_NUMBER}</td>
+				<!-- IF S_DATA_GROUP -->
+					<td class="td_group">{bet_edit.GROUP}</td>
+				<!-- ENDIF -->
+					<td class="td_logo">{bet_edit.LOGO_HOME}&nbsp;</td>
+					<td class="td_team"  style="cursor:pointer;" title="{L_SHOW_PLAN}" onclick="popup('{bet_edit.U_PLAN_HOME}', 625,625);return false;">
+						{bet_edit.HOME_NAME}
+					</td>
+					<td class="td_vs">:</td>
+					<td class="td_logo">{bet_edit.LOGO_GUEST}&nbsp;</td>
+					<td class="td_team"  style="cursor:pointer;" title="{L_SHOW_PLAN}" onclick="popup('{bet_edit.U_PLAN_GUEST}', 625,625);return false;">
+						{bet_edit.GUEST_NAME}
+					</td>
+					<td class="td_goals_home">
+				<!-- IF S_VIEW <> 'print' -->
+						<input type="number" style="width:30px" name="goalsh{bet_edit.MATCH_NUMBER}" min="0" max="20" size="2" value="{bet_edit.BET_HOME}">
+				<!-- ELSE -->
+						_{bet_edit.BET_HOME}_
+				<!-- ENDIF -->
+					</td>
+					<td class="td_vs">:</td>
+					<td class="td_goals_guest"  title="{bet_edit.TREND} {bet_edit.ODDS}">
+				<!-- IF S_VIEW <> 'print' -->
+						<input type="number" style="width:30px" name="goalsg{bet_edit.MATCH_NUMBER}" min="0" max="20" size="2" value="{bet_edit.BET_GUEST}"> 
+				<!-- ELSE -->
+						_{bet_edit.BET_GUEST}_
+				<!-- ENDIF -->
+					</td>
+					<td class="td_vs">{bet_edit.DELIVERTAG}</td>
+				<!-- IF S_DISPLAY_RATING -->
+					<td class="td_points">
+						<input style="display:inline; margin:0; padding:0;" type="number" style="width:30px" name="rating{bet_edit.MATCH_NUMBER}" min="0" max="10" size="2" value="{bet_edit.RATING}"> 
+					</td>
+				<!-- ENDIF -->
+				<!-- IF bet_edit.DATA_RESULTS -->
+					<td class="td_goals_home">&nbsp;</td>
+					<td class="td_vs">&nbsp;</td>
+					<td class="td_goals_guest">&nbsp;</td>
+					<td class="td_points">&nbsp;</td>
+				<!-- ENDIF -->
+					<td class="td_button">
+				<!-- IF S_VIEW <> 'print' and bet_edit.DISPLAY_LINK -->
+						<a title="{L_MATCH_STATS}" href="{bet_edit.U_MATCH_STATS}" onclick="javascript:popup(this.href, 818, 750, '_matchstats'); return false;"><i class="icon fa-bar-chart fa-fw"></i></a>
+				<!-- ELSE -->	
+						<img src="./../../ext/football/football/images/spacer.gif" alt="" width="28" height="28" />
+				<!-- ENDIF -->
+					</td>
+				</tr>
+			<!-- END bet_edit -->
+			</tbody>
+		</table>
+	</div>
+
+	<!-- IF S_DISPLAY_DELIVERY2 or S_DISPLAY_DELIVERY3 -->
+	<div class="left-box"  style="margin-bottom:5px">
+		<!-- IF S_DISPLAY_DELIVERY2 -->
+		<strong style='color:green'>*&nbsp; {L_DELIVERY_UNTIL} {S_DELIVERY2} </strong><br />
+		<!-- ENDIF -->
+		<!-- IF S_DISPLAY_DELIVERY3 -->
+		<strong style='color:green'>**&nbsp; {L_DELIVERY_UNTIL} {S_DELIVERY3} </strong><br />
+		<!-- ENDIF -->
+	</div>
+	<!-- ENDIF -->
+
+	<!-- IF S_EXTRA_BET --> 
+	<br />
+	<div class="forabg">
+		<table class="football">
+			<thead>
+				<tr>
+					<th style="text-align: left;">{L_QUESTION}</th>
+					<th>{L_POSSIBLE_POINTS}</th>
+					<th>{L_EVALUATION}</th>
+					<th>{L_BET_OF}</th>
+				<!-- IF S_EXTRA_RESULTS -->
+					<th>{L_RESULT}</th>
+					<th>{L_POINTS}</th>
+				<!-- ENDIF -->
+				</tr>
+			</thead>
+			<tbody>
+			<!-- BEGIN extra_view -->
+				<tr class="{extra_view.ROW_CLASS}">
+					<td>{extra_view.QUESTION}</td>
+					<td style="text-align: center;">{extra_view.EXTRA_POINTS}</td>
+					<td style="text-align: center;">{extra_view.EVALUATION}</td>
+					<td style="text-align: center;">{extra_view.BET}</td>
+					<td style="text-align: center;">{extra_view.RESULT}</td>
+					<td class="td_points {extra_view.COLOR_STYLE}">{extra_view.BET_POINTS}</td>
+				</tr>
+			<!-- END extra_view -->
+			<!-- BEGIN extra_edit -->
+				<tr class="{extra_edit.ROW_CLASS}" style="height:30px">
+					<td>{extra_edit.QUESTION}</td>
+					<td style="text-align: center;">{extra_edit.EXTRA_POINTS}</td>
+					<td style="text-align: center;" title="{extra_edit.EVALUATION_TITLE}">{extra_edit.EVALUATION}</td>
+					<td style="text-align: center;">
+				<!-- IF extra_edit.S_DISPLAY_TYPE == 1 -->
+					<!-- IF S_VIEW <> 'print' -->
+						<select name="extra{extra_edit.EXTRA_NO}">
+						<!-- BEGIN extra_option -->
+							<option {extra_edit.extra_option.S_SELECTED} value="{extra_edit.extra_option.OPTION_VALUE}">{extra_edit.extra_option.OPTION_NAME}</option>
+						<!-- END extra_option -->
+						</select>
+					<!-- ELSE -->
+						_{extra_edit.BET}_
+					<!-- ENDIF -->
+				<!-- ENDIF -->
+				<!-- IF extra_edit.S_DISPLAY_TYPE == 2 -->
+					<!-- IF S_VIEW <> 'print' -->
+						<input style="display:inline; margin:0; padding:0;" type="text" name="extra{extra_edit.EXTRA_NO}" size="15" maxlength="255" value="{extra_edit.BET}"> 
+					<!-- ELSE -->
+						_{extra_edit.BET}_
+					<!-- ENDIF -->
+				<!-- ENDIF -->
+					</td>
+				</tr>
+			<!-- END extra_edit -->
+			</tbody>
+		</table>
+	</div>
+	<!-- ENDIF -->
+
+	<!-- IF S_EDIT_MODE -->
+		<!-- IF S_VIEW <> 'print' -->
+		<div class="right-box" style="margin-bottom:5px">
+			<div class="message">{S_DBMSG}&nbsp;&nbsp;&nbsp;<input class="button1" type="submit" value="{L_BET}"></div>
+		</div>
+		<!-- ENDIF -->
+	</form>
+	<!-- ELSE -->
+		<br /> 
+	<!-- ENDIF -->
+
+	<!-- INCLUDE nav_delivery.html -->
+<!-- ELSE -->
+	<br />
+	<!-- IF S_USER_IS_MEMBER -->
+	<div class="message">{L_NO_MATCHES_ON_MATCHDAY}</div>
+	<!-- ELSE -->
+	<div class="message">{L_NO_MEMBER}</div>
+		<!-- IF S_JOIN_LEAGUE -->
+			<br />
+			<br />
+			<div>
+			<form method="post" action="{S_FORM_ACTION_JOIN}" name="joinform">
+				<strong>{JOIN_LEAGUE} </strong><br />
+				<br />
+				<input class="button1" type="submit" value="{L_JOIN}">
+			</form>
+			</div>
+		<!-- ENDIF -->
+	<!-- ENDIF -->
+	<br />
+<!-- ENDIF -->

styles/prosilver/template/delivery.html

@@ -1,11 +1,11 @@
-<div class="panel">
-	<h3><span class="small-icon icon-bet"></span>&nbsp;{L_DELIVERY_LIST}</h3>
-	<!-- BEGIN delivery -->
-		<span style="cursor:pointer;" title="{delivery.TITLE}" onclick="location.href='{delivery.U_BET_LINK}'">
-			<span> <strong style="color:{delivery.COLOR};">{delivery.DELIVERY} </strong></span> <br /> 
-			<span class="gensmall"><strong>{delivery.LEAGUE_SHORT} </strong></span>
-			<span class="gensmall" >{delivery.MATCHDAY_NAME}</span>
-		</span><hr />
-	<!-- END delivery -->
-</div>
-
+<div class="panel">
+	<h3><i class="icon fa-calendar fa-fw"></i>{L_DELIVERY_LIST}</h3>
+	<!-- BEGIN delivery -->
+		<span style="cursor:pointer;" title="{delivery.TITLE}" onclick="location.href='{delivery.U_BET_LINK}'">
+			<span> <strong style="color:{delivery.COLOR};">{delivery.DELIVERY} </strong></span> <br /> 
+			<span class="gensmall"><strong>{delivery.LEAGUE_SHORT} </strong></span>
+			<span class="gensmall" >{delivery.MATCHDAY_NAME}</span>
+		</span><hr />
+	<!-- END delivery -->
+</div>
+

styles/prosilver/template/event/overall_footer_breadcrumb_prepend.html

@@ -1 +1 @@
-<!-- IF U_FOOTBALL and S_FOOTBALL_BREADCRUMB--><span class="crumb"><a href="{U_FOOTBALL}" data-navbar-reference="football">{S_FOOTBALL_NAME}</a></span><!-- ENDIF -->
+<!-- IF U_FOOTBALL and S_FOOTBALL_BREADCRUMB--><span class="crumb"><a href="{U_FOOTBALL}" data-navbar-reference="football"><i class="icon fa-futbol-o fa-fw"></i>{S_FOOTBALL_NAME}</a></span><!-- ENDIF -->

styles/prosilver/template/event/overall_header_breadcrumb_prepend.html

@@ -1 +1 @@
-<!-- IF U_FOOTBALL and S_FOOTBALL_BREADCRUMB--><span class="crumb"><a href="{U_FOOTBALL}" data-navbar-reference="football">{S_FOOTBALL_NAME}</a></span><!-- ENDIF -->
+<!-- IF U_FOOTBALL and S_FOOTBALL_BREADCRUMB--><span class="crumb"><a href="{U_FOOTBALL}" data-navbar-reference="football"><i class="icon fa-futbol-o fa-fw"></i>{S_FOOTBALL_NAME}</a></span><!-- ENDIF -->

styles/prosilver/template/event/overall_header_head_append.html

@@ -1,29 +1,36 @@
-	<!-- IF S_FOOTBALL_FULLSCREEN -->
-	<!-- INCLUDECSS @football_football/fullscreen.css -->
-	<!-- ENDIF -->
-	<!-- IF S_VIEW == 'print' -->
-		<!-- INCLUDECSS @football_football/football_print.css -->
-	<!-- ELSE -->
-		<!-- INCLUDECSS @football_football/football.css -->
-	<!-- ENDIF -->
-	<!-- INCLUDECSS @football_football/football_side.css -->
-<!-- IF S_FOOTBALL_HEADER_ENABLED -->
-<style>
-@media screen and (min-width: 700px){
-	.imageset.site_logo {
-		background-image: url({S_FOOTBALL_EXT_PATH}images/site_logo.gif);
-		padding-left: 0px;
-		padding-top: 0px;
-		height: 52px;
-		width: 52px;
-	}
-	.headerbar 	{
-		background: url({S_FOOTBALL_EXT_PATH}styles/prosilver/theme/images/header{S_FOOTBALL_HEADER_LEAGUE}.gif) 300px 5px no-repeat,
-		url({S_FOOTBALL_EXT_PATH}styles/prosilver/theme/images/header.jpg) 0px 0px;
-		background-color: #12A3EB;
-		margin-bottom: 4px;
-		width: auto;
-	}
-}
-</style>
-<!-- ENDIF -->
+	<!-- IF S_FOOTBALL_FULLSCREEN -->
+	<!-- INCLUDECSS @football_football/fullscreen.css -->
+	<!-- ENDIF -->
+	<!-- IF S_VIEW == 'print' -->
+		<!-- INCLUDECSS @football_football/football_print.css -->
+	<!-- ELSE -->
+		<!-- INCLUDECSS @football_football/football.css -->
+	<!-- ENDIF -->
+	<!-- INCLUDECSS @football_football/football_side.css -->
+<!-- IF S_FOOTBALL_HEADER_ENABLED -->
+<style>
+@media screen and (min-width: 700px){
+	.imageset.site_logo {
+		background-image: url({S_FOOTBALL_EXT_PATH}images/site_logo.gif);
+		padding-left: 0px;
+		padding-top: 0px;
+		height: 75px;
+		width: 75px;
+	}
+	.headerbar 	{
+		background: url({S_FOOTBALL_EXT_PATH}styles/prosilver/theme/images/header{S_FOOTBALL_HEADER_LEAGUE}.jpg) 0px 0px no-repeat;
+		background-color: #12A3EB;
+		margin-bottom: 4px;
+		width: auto;
+	}
+}
+</style>
+<!-- ENDIF -->
+<style>
+@media screen and (max-width: 700px){
+	li.tab i.icon {
+		display: none;
+	}
+
+}
+</style>

styles/prosilver/template/event/overall_header_navigation_prepend.html

@@ -1,53 +1,47 @@
-<!-- IF not S_FOOTBALL_MOBILE -->
-<li id="football-links" class="leftside no-bulletin <!-- IF not S_DISPLAY_FOOTBALL_MENU --> hidden<!-- ENDIF --> " data-skip-responsive="true">
-	<div class="header-profile dropdown-container">
-		<a href="{U_BET}" class="header-avatar dropdown-trigger" title="{L_FOOTBALL_MENU}">
-		<img class="avatar" src="{ROOT_PATH}ext/football/football/styles/prosilver/theme/images/icon_football.gif" alt="Football-Icon"> 
-		<span class="username">{S_FOOTBALL_NAME}</span></a>
-		<div class="dropdown hidden">
-			<div class="pointer"><div class="pointer-inner"></div></div>
-			<ul class="dropdown-contents" role="menu">
-			<!-- EVENT navbar_header_football_links_before -->
-			<!-- IF not S_IS_BOT -->
-				<li class="small-icon icon-bet"><a href="{U_BET}" role="menuitem">{L_BET}</a></li>
-				<li class="small-icon icon-allbets"><a href="{U_ALL_BETS}" role="menuitem">{L_ALL_BETS}</a></li>
-				<li class="small-icon icon-results"><a href="{U_RESULTS}" role="menuitem">{L_RESULTS}</a></li>
-				<li class="small-icon icon-rank"><a href="{U_RANKS_MATCHDAY}" role="menuitem">{L_RANK_MATCHDAY}</a></li>
-				<li class="small-icon icon-rank"><a href="{U_RANKS_TOTAL}" role="menuitem">{L_RANK_TOTAL}</a></li>
-				<li class="small-icon icon-list"><a href="{U_TABLE}" role="menuitem">{L_TABLE}</a></li>
-				<li class="small-icon icon-points"><a href="{U_FOOTBALL_BANK}" role="menuitem">{L_FOOTBALL_BANK}</a></li>
-				<li class="small-icon icon-rules"><a href="{U_RULES}" role="menuitem" target="popup" onclick="popup('{U_RULES}', 625,625);return false;">{L_RULES}</a></li>
-				<li class="small-icon icon-odds"><a href="{U_ODDS}" role="menuitem">{L_ODDS}</a></li>
-				<li class="separator"></li>
-				<!-- IF S_MENU_LINK1-->
-				<li class="small-icon icon-xml"><a href="{U_MENU_LINK1}" role="menuitem" target="_blank">{MENU_DESC_LINK1}</a></li>
-				<!-- ENDIF -->
-				<!-- IF S_MENU_LINK2-->
-				<li class="small-icon icon-xml"><a href="{U_MENU_LINK2}" role="menuitem" target="_blank">{MENU_DESC_LINK2}</a></li>
-				<!-- ENDIF -->
-				<!-- IF S_MENU_LINK3-->
-				<li class="small-icon icon-xml"><a href="{U_MENU_LINK3}" role="menuitem" target="_blank">{MENU_DESC_LINK3}</a></li>
-				<!-- ENDIF -->
-				<li class="separator"></li>
-				<li class="small-icon icon-statistics"><a href="{U_MY_BETS}" role="menuitem">{L_MY_BETS}</a></li>
-				<li class="small-icon icon-statistics"><a href="{U_MY_POINTS}" role="menuitem">{L_MY_POINTS}</a></li>
-				<li class="small-icon icon-statistics"><a href="{U_MY_TABLE}" role="menuitem">{L_MY_TABLE}</a></li>
-				<li class="small-icon icon-statistics"><a href="{U_MY_RANK}" role="menuitem">{L_MY_RANK}</a></li>
-				<li class="small-icon icon-statistics"><a href="{U_MY_CHART}" role="menuitem">{L_MY_CHART}</a></li>
-				<li class="small-icon icon-statistics"><a href="{U_MY_KOEFF}" role="menuitem">{L_MY_KOEFF}</a></li>
-				<li class="small-icon icon-statistics"><a href="{U_STAT_POINTS}" role="menuitem">{L_STAT_POINTS}</a></li>
-				<li class="small-icon icon-statistics"><a href="{U_STAT_RESULTS}" role="menuitem">{L_STAT_RESULTS}</a></li>
-				<li class="small-icon icon-download"><a href="{U_EXPORT}" role="menuitem">{L_EXPORT}</a></li>
-			<!-- ENDIF -->
-			<!-- IF S_DISPLAY_FOOTBALL -->
-				<li class="separator"></li>
-				<!-- IF U_TEAM --><li class="small-icon icon-odds"><a href="{U_FOOTBALL_ODDS}" role="menuitem">{L_FOOTBALL_ODDS}</a></li><!-- ENDIF -->
-			<!-- ENDIF -->
-			<li class="separator"></li>
-
-			<!-- EVENT navbar_header_football_links_after -->
-			</ul>
-		</div>
-	</div>
-</li>
+<!-- IF not S_FOOTBALL_MOBILE -->
+<li id="football-links" class="leftside no-bulletin <!-- IF not S_DISPLAY_FOOTBALL_MENU --> hidden<!-- ENDIF --> " data-skip-responsive="true">
+	<div class="header-profile dropdown-container">
+		<a href="{U_BET}" class="header-avatar dropdown-trigger" title="{L_FOOTBALL_MENU}">
+		<img class="avatar" src="{ROOT_PATH}ext/football/football/styles/prosilver/theme/images/icon_football.gif" alt="Football-Icon"> 
+		<span class="username">{S_FOOTBALL_NAME}</span></a>
+		<div class="dropdown hidden">
+			<div class="pointer"><div class="pointer-inner"></div></div>
+			<ul class="dropdown-contents" role="menu">
+			<!-- EVENT navbar_header_football_links_before -->
+			<!-- IF not S_IS_BOT -->
+				<li><a href="{U_BET}" role="menuitem"><i class="icon fa-futbol-o fa-fw"></i>{L_BET}</a></li>
+				<li><a href="{U_ALL_BETS}" role="menuitem"><i class="icon fa-group fa-fw"></i>{L_ALL_BETS}</a></li>
+				<li><a href="{U_RESULTS}" role="menuitem"><i class="icon fa-check-square-o fa-fw"></i>{L_RESULTS}</a></li>
+				<li><a href="{U_RANKS_MATCHDAY}" role="menuitem"><i class="icon fa-trophy fa-fw"></i>{L_RANK_MATCHDAY}</a></li>
+				<li><a href="{U_RANKS_TOTAL}" role="menuitem"><i class="icon fa-trophy fa-fw"></i>{L_RANK_TOTAL}</a></li>
+				<li><a href="{U_TABLE}" role="menuitem"><i class="icon fa-list-ol fa-fw"></i>{L_TABLE}</a></li>
+				<li><a href="{U_FOOTBALL_BANK}" role="menuitem"><i class="icon fa-bank fa-fw"></i>{L_FOOTBALL_BANK}</a></li>
+				<li><a href="{U_RULES}" role="menuitem" target="popup" onclick="popup('{U_RULES}', 625,625);return false;"><i class="icon fa-paragraph fa-fw"></i>{L_RULES}</a></li>
+				<li><a href="{U_ODDS}" role="menuitem"><i class="icon fa-line-chart fa-fw"></i>{L_ODDS}</a></li>
+				<li class="separator"></li>
+				<!-- IF S_MENU_LINK1-->
+				<li><a href="{U_MENU_LINK1}" role="menuitem" target="_blank"><i class="icon fa-external-link fa-fw"></i>{MENU_DESC_LINK1}</a></li>
+				<!-- ENDIF -->
+				<!-- IF S_MENU_LINK2-->
+				<li><a href="{U_MENU_LINK2}" role="menuitem" target="_blank"><i class="icon fa-external-link fa-fw"></i>{MENU_DESC_LINK2}</a></li>
+				<!-- ENDIF -->
+				<!-- IF S_MENU_LINK3-->
+				<li><a href="{U_MENU_LINK3}" role="menuitem" target="_blank"><i class="icon fa-external-link fa-fw"></i>{MENU_DESC_LINK3}</a></li>
+				<!-- ENDIF -->
+				<li class="separator"></li>
+				<li><a href="{U_MY_BETS}" role="menuitem"><i class="icon fa-area-chart fa-fw"></i>{L_MY_BETS}</a></li>
+				<li><a href="{U_MY_POINTS}" role="menuitem"><i class="icon fa-area-chart fa-fw"></i>{L_MY_POINTS}</a></li>
+				<li><a href="{U_MY_TABLE}" role="menuitem"><i class="icon fa-area-chart fa-fw"></i>{L_MY_TABLE}</a></li>
+				<li><a href="{U_MY_RANK}" role="menuitem"><i class="icon fa-area-chart fa-fw"></i>{L_MY_RANK}</a></li>
+				<li><a href="{U_MY_CHART}" role="menuitem"><i class="icon fa-area-chart fa-fw"></i>{L_MY_CHART}</a></li>
+				<li><a href="{U_MY_KOEFF}" role="menuitem"><i class="icon fa-area-chart fa-fw"></i>{L_MY_KOEFF}</a></li>
+				<li><a href="{U_STAT_POINTS}" role="menuitem"><i class="icon fa-area-chart fa-fw"></i>{L_STAT_POINTS}</a></li>
+				<li><a href="{U_STAT_RESULTS}" role="menuitem"><i class="icon fa-area-chart fa-fw"></i>{L_STAT_RESULTS}</a></li>
+				<li><a href="{U_EXPORT}" role="menuitem"><i class="icon fa-file-excel-o fa-fw"></i>{L_EXPORT}</a></li>
+			<!-- ENDIF -->
+			<!-- EVENT navbar_header_football_links_after -->
+			</ul>
+		</div>
+	</div>
+</li>
 <!-- ENDIF -->

styles/prosilver/template/event/overall_header_page_body_before.html

@@ -1,64 +1,64 @@
-<!-- IF S_FOOTBALL_SIDE -->
-	<!--[if lt IE 7]>
-		<style type="text/css">
-		/* hover fix for i6 < 7 */
-		#footballside {
-			background-color: expression(
-				this.onmouseover = new Function("this.className += ' iehover';"),
-				this.onmouseout = new Function("this.className = this.className.replace('iehover', '');")
-			);
-		}	
-		</style>
-	<![endif]-->
-	<div id="footballside">
-		<div class="forabg">
-			<p id="dirty"><strong>{S_FOOTBALLSIDE}</strong></p>
-			<ul class="topiclist">
-				<li class="header">
-					<dl class="icon">
-						<dt><a href="{U_FOOTBALL}"><span>{S_FOOTBALL_NAME}</span></a></dt><dd></dd>
-					</dl>
-				</li>
-			</ul>
-			<ul class="topiclist forums" role="menu">
-				<li class="small-icon icon-bet"><a href="{U_BET}" role="menuitem">{L_BET}</a></li>
-				<li class="small-icon icon-allbets"><a href="{U_ALL_BETS}" role="menuitem">{L_ALL_BETS}</a></li>
-				<li class="small-icon icon-results"><a href="{U_RESULTS}" role="menuitem">{L_RESULTS}</a></li>
-				<li class="small-icon icon-list"><a href="{U_TABLE}" role="menuitem">{L_TABLE}</a></li>
-				<li class="small-icon icon-rank"><a href="{U_RANKS_TOTAL}" role="menuitem">{L_RANK_TOTAL}</a></li>
-				<li class="small-icon icon-rank"><a href="{U_RANKS_MATCHDAY}" role="menuitem">{L_RANK_MATCHDAY}</a></li>
-				<li class="small-icon icon-points"><a href="{U_FOOTBALL_BANK}" role="menuitem">{L_FOOTBALL_BANK}</a></li>
-				<li class="small-icon icon-rules"><a href="{U_RULES}" role="menuitem" target="popup" onclick="popup('{U_RULES}', 625,625);return false;">{L_RULES}</a></li>
-				<li class="small-icon icon-download"><a href="{U_EXPORT}" role="menuitem">{L_EXPORT}</a></li>
-				<li class="small-icon icon-odds"><a href="{U_ODDS}" role="menuitem">{L_ODDS}</a></li>
-				<li class="separator"></li>
-				<!-- IF S_MENU_LINK1-->
-				<li class="small-icon icon-xml"><a href="{U_MENU_LINK1}" role="menuitem" target="_blank">{MENU_DESC_LINK1}</a></li>
-				<!-- ENDIF -->
-				<!-- IF S_MENU_LINK2-->
-				<li class="small-icon icon-xml"><a href="{U_MENU_LINK2}" role="menuitem" target="_blank">{MENU_DESC_LINK2}</a></li>
-				<!-- ENDIF -->
-				<!-- IF S_MENU_LINK3-->
-				<li class="small-icon icon-xml"><a href="{U_MENU_LINK3}" role="menuitem" target="_blank">{MENU_DESC_LINK3}</a></li>
-				<!-- ENDIF -->
-			</ul>
-			<ul class="topiclist cat">
-				<li class="header">
-					<dl class="icon">
-						<dt>{L_STATISTICS}</dt><dd></dd>
-					</dl>
-				</li>
-			</ul>
-			<ul class="topiclist forums" role="menu">
-				<li class="small-icon icon-statistics"><a href="{U_MY_BETS}" role="menuitem">{L_MY_BETS}</a></li>
-				<li class="small-icon icon-statistics"><a href="{U_MY_POINTS}" role="menuitem">{L_MY_POINTS}</a></li>
-				<li class="small-icon icon-statistics"><a href="{U_MY_TABLE}" role="menuitem">{L_MY_TABLE}</a></li>
-				<li class="small-icon icon-statistics"><a href="{U_MY_RANK}" role="menuitem">{L_MY_RANK}</a></li>
-				<li class="small-icon icon-statistics"><a href="{U_MY_CHART}" role="menuitem">{L_MY_CHART}</a></li>
-				<li class="small-icon icon-statistics"><a href="{U_MY_KOEFF}" role="menuitem">{L_MY_KOEFF}</a></li>
-				<li class="small-icon icon-statistics"><a href="{U_STAT_POINTS}" role="menuitem">{L_STAT_POINTS}</a></li>
-				<li class="small-icon icon-statistics"><a href="{U_STAT_RESULTS}" role="menuitem">{L_STAT_RESULTS}</a></li>
-			</ul>
-		</div>
-	</div>
+<!-- IF S_FOOTBALL_SIDE -->
+	<!--[if lt IE 7]>
+		<style type="text/css">
+		/* hover fix for i6 < 7 */
+		#footballside {
+			background-color: expression(
+				this.onmouseover = new Function("this.className += ' iehover';"),
+				this.onmouseout = new Function("this.className = this.className.replace('iehover', '');")
+			);
+		}	
+		</style>
+	<![endif]-->
+	<div id="footballside">
+		<div class="forabg">
+			<p id="dirty"><strong>{S_FOOTBALLSIDE}</strong></p>
+			<ul class="topiclist">
+				<li class="header">
+					<dl>
+						<dt><a href="{U_FOOTBALL}"><span>{S_FOOTBALL_NAME}</span></a></dt><dd></dd>
+					</dl>
+				</li>
+			</ul>
+			<ul class="topiclist forums" role="menu">
+				<li><a href="{U_BET}" role="menuitem"><i class="icon fa-futbol-o fa-fw"></i>{L_BET}</a></li>
+				<li><a href="{U_ALL_BETS}" role="menuitem"><i class="icon fa-group fa-fw"></i>{L_ALL_BETS}</a></li>
+				<li><a href="{U_RESULTS}" role="menuitem"><i class="icon fa-check-square-o fa-fw"></i>{L_RESULTS}</a></li>
+				<li><a href="{U_TABLE}" role="menuitem"><i class="icon fa-list-ol fa-fw"></i>{L_TABLE}</a></li>
+				<li><a href="{U_RANKS_TOTAL}" role="menuitem"><i class="icon fa-trophy fa-fw"></i>{L_RANK_TOTAL}</a></li>
+				<li><a href="{U_RANKS_MATCHDAY}" role="menuitem"><i class="icon fa-trophy fa-fw"></i>{L_RANK_MATCHDAY}</a></li>
+				<li><a href="{U_FOOTBALL_BANK}" role="menuitem"><i class="icon fa-bank fa-fw"></i>{L_FOOTBALL_BANK}</a></li>
+				<li><a href="{U_RULES}" role="menuitem" target="popup" onclick="popup('{U_RULES}', 625,625);return false;"><i class="icon fa-paragraph fa-fw"></i>{L_RULES}</a></li>
+				<li><a href="{U_EXPORT}" role="menuitem"><i class="icon fa-file-excel-o fa-fw"></i>{L_EXPORT}</a></li>
+				<li><a href="{U_ODDS}" role="menuitem"><i class="icon fa-line-chart fa-fw"></i>{L_ODDS}</a></li>
+				<li class="separator"></li>
+				<!-- IF S_MENU_LINK1-->
+				<li><a href="{U_MENU_LINK1}" role="menuitem" target="_blank"><i class="icon fa-external-link fa-fw"></i>{MENU_DESC_LINK1}</a></li>
+				<!-- ENDIF -->
+				<!-- IF S_MENU_LINK2-->
+				<li><a href="{U_MENU_LINK2}" role="menuitem" target="_blank"><i class="icon fa-external-link fa-fw"></i>{MENU_DESC_LINK2}</a></li>
+				<!-- ENDIF -->
+				<!-- IF S_MENU_LINK3-->
+				<li><a href="{U_MENU_LINK3}" role="menuitem" target="_blank"><i class="icon fa-external-link fa-fw"></i>{MENU_DESC_LINK3}</a></li>
+				<!-- ENDIF -->
+			</ul>
+			<ul class="topiclist cat">
+				<li class="header">
+					<dl>
+						<dt>{L_STATISTICS}</dt><dd></dd>
+					</dl>
+				</li>
+			</ul>
+			<ul class="topiclist forums" role="menu">
+				<li><a href="{U_MY_BETS}" role="menuitem"><i class="icon fa-area-chart fa-fw"></i>{L_MY_BETS}</a></li>
+				<li><a href="{U_MY_POINTS}" role="menuitem"><i class="icon fa-area-chart fa-fw"></i>{L_MY_POINTS}</a></li>
+				<li><a href="{U_MY_TABLE}" role="menuitem"><i class="icon fa-area-chart fa-fw"></i>{L_MY_TABLE}</a></li>
+				<li><a href="{U_MY_RANK}" role="menuitem"><i class="icon fa-area-chart fa-fw"></i>{L_MY_RANK}</a></li>
+				<li><a href="{U_MY_CHART}" role="menuitem"><i class="icon fa-area-chart fa-fw"></i>{L_MY_CHART}</a></li>
+				<li><a href="{U_MY_KOEFF}" role="menuitem"><i class="icon fa-area-chart fa-fw"></i>{L_MY_KOEFF}</a></li>
+				<li><a href="{U_STAT_POINTS}" role="menuitem"><i class="icon fa-area-chart fa-fw"></i>{L_STAT_POINTS}</a></li>
+				<li><a href="{U_STAT_RESULTS}" role="menuitem"><i class="icon fa-area-chart fa-fw"></i>{L_STAT_RESULTS}</a></li>
+			</ul>
+		</div>
+	</div>
 <!-- ENDIF -->

styles/prosilver/template/football_body.html

@@ -1,220 +1,220 @@
-<!-- DEFINE $S_IN_FOOTBALL = 1 -->
-<!-- INCLUDE overall_header.html -->
-
-<!-- $Id: football_body.html 2 2010-06-05 22:09:02Z football $ //-->
-
-
-<!-- IF S_FOOTBALL_INFO --> 
-	<div id="information" class="rules">
-		<strong>{L_INFORMATION}:</strong> {S_FOOTBALL_INFO}
-	</div>
-<!-- ENDIF -->
-
-<div id="football-body">
-<!-- [+] center block area -->
-	<div id="football-center-wrapper">
-		<div id="football-center" style="margin: 0 {FOOTBALL_RIGHT_COLUMN}px 0 {FOOTBALL_LEFT_COLUMN}px; padding: 0 4px;">
-		<div id="tabs" style="margin-top: 0px;  margin-left: 5px;">
-			<ul>
-				<li class="tab <!-- IF S_DISPLAY_BET -->activetab<!-- ENDIF --> small-icon icon-bet"><a href="{U_BET}"><span>{L_BET}</span></a></li>
-				<li class="tab <!-- IF S_DISPLAY_ALL_BETS -->activetab<!-- ENDIF --> small-icon icon-allbets"><a href="{U_ALL_BETS}"><span>{L_ALL_BETS}</span></a></li>
-				<li class="tab <!-- IF S_DISPLAY_RESULTS -->activetab<!-- ENDIF --> small-icon icon-results"><a href="{U_RESULTS}"><span>{L_RESULTS}</span></a></li>
-				<li class="tab <!-- IF S_DISPLAY_RANKS_MATCHDAY -->activetab<!-- ENDIF --> small-icon icon-rank"><a href="{U_RANKS_MATCHDAY}"><span>{L_RANK_MATCHDAY}</span></a></li>
-				<li class="tab <!-- IF S_DISPLAY_RANKS_TOTAL -->activetab<!-- ENDIF --> small-icon icon-rank"><a href="{U_RANKS_TOTAL}"><span>{L_RANK_TOTAL}</span></a></li>
-				<li class="tab <!-- IF S_DISPLAY_TABLE -->activetab<!-- ENDIF --> small-icon icon-list"><a href="{U_TABLE}"><span>{L_TABLE}</span></a></li>
-				<li class="tab <!-- IF S_DISPLAY_BANK -->activetab<!-- ENDIF --> small-icon icon-points"><a href="{U_FOOTBALL_BANK}"><span>{L_FOOTBALL_BANK}</span></a></li>
-				<li class="tab small-icon icon-rules"><a href="{U_RULES}" target="popup" onclick="popup('{U_RULES}', 625,625);return false;"><span>{L_RULES}</span></a></li>
-				<li class="tab <!-- IF S_DISPLAY_ODDS -->activetab<!-- ENDIF --> small-icon icon-odds"><a href="{U_ODDS}"><span>{L_ODDS}</span></a></li>
-				<li class="tab  small-icon icon-print"><a href="{U_PRINT_FOOTBALL}" accesskey="d" target="_blank"><span>{L_PRINT_FOOTBALL}</span></a></li>
-				<!-- IF S_MENU_LINK1-->
-				<li class="tab small-icon icon-xml"><a href="{U_MENU_LINK1}" target="_blank"><span>{MENU_DESC_LINK1}</span></a></li>
-				<!-- ENDIF -->
-				<!-- IF S_MENU_LINK2-->
-				<li class="tab small-icon icon-xml"><a href="{U_MENU_LINK2}" target="_blank"><span>{MENU_DESC_LINK2}</span></a></li>
-				<!-- ENDIF -->
-				<!-- IF S_MENU_LINK3-->
-				<li class="tab small-icon icon-xml"><a href="{U_MENU_LINK3}" target="_blank"><span>{MENU_DESC_LINK3}</span></a></li>
-				<!-- ENDIF -->
-				<li class="tab <!-- IF S_DISPLAY_MY_BETS -->activetab<!-- ENDIF --> small-icon icon-statistics"><a href="{U_MY_BETS}"><span>{L_MY_BETS}</span></a></li>
-				<li class="tab <!-- IF S_DISPLAY_MY_POINTS -->activetab<!-- ENDIF --> small-icon icon-statistics"><a href="{U_MY_POINTS}"><span>{L_MY_POINTS}</span></a></li>
-				<li class="tab <!-- IF S_DISPLAY_MY_TABLE -->activetab<!-- ENDIF --> small-icon icon-statistics"><a href="{U_MY_TABLE}"><span>{L_MY_TABLE}</span></a></li>
-				<li class="tab <!-- IF S_DISPLAY_MY_RANK -->activetab<!-- ENDIF --> small-icon icon-statistics"><a href="{U_MY_RANK}"><span>{L_MY_RANK}</span></a></li>
-				<li class="tab <!-- IF S_DISPLAY_MY_CHART -->activetab<!-- ENDIF --> small-icon icon-statistics"><a href="{U_MY_CHART}"><span>{L_MY_CHART}</span></a></li>
-				<li class="tab <!-- IF S_DISPLAY_MY_KOEFF -->activetab<!-- ENDIF --> small-icon icon-statistics"><a href="{U_MY_KOEFF}"><span>{L_MY_KOEFF}</span></a></li>
-				<li class="tab <!-- IF S_DISPLAY_STAT_POINTS -->activetab<!-- ENDIF --> small-icon icon-statistics"><a href="{U_STAT_POINTS}"><span>{L_STAT_POINTS}</span></a></li>
-				<li class="tab <!-- IF S_DISPLAY_STAT_RESULTS -->activetab<!-- ENDIF --> small-icon icon-statistics"><a href="{U_STAT_RESULTS}"><span>{L_STAT_RESULTS}</span></a></li>
-				<li class="tab small-icon icon-download"><a href="{U_EXPORT}"><span>{L_EXPORT}</span></a></li>
-			</ul>
-		</div>
-
-		<div class="panel">
-			<!-- IF S_FOOTBALL_TABS --> 
-			<div class="left-box football-h3" style="margin-left:5px; width:35%"><a title="{LEFT_TITLE}" href="{U_LEFT}">{LEFT_LINK}</a></div>
-				<div class="right-box football-h3" style="margin-right:5px; width:35%"><a title="{RIGHT_TITLE}" href="{U_RIGHT}">{RIGHT_LINK}</a></div>
-				<div style="display:inline; text-align:center;"><div ><H3>{S_SIDENAME} <a href="{U_PRINT_FOOTBALL}" title="{L_PRINT_FOOTBALL}" accesskey="p" class="football_print" style="vertical-align: top;"></a></H3></div></div>
-			<!-- ENDIF -->
-			<div class="navbar football_bg">
-				<!-- IF .form_season -->
-					<form style="display:inline; margin:0; padding:0;" action="{S_FORMSELF}" method="post">
-					<div style="float:left;">
-						<select name="s" onchange="this.form.submit();" title="{L_OPTION_SEASON}">
-					<!-- BEGIN form_season -->
-							<option {form_season.S_SELECTED} value="{form_season.S_SEASON}">{form_season.S_SEASONNAME}</option>
-					<!-- END form_season -->
-						</select>
-						<input type="hidden" name="side" value="{S_SIDE}"/>
-					</div>
-					</form>
-				<!-- ENDIF -->
-				<!-- IF .form_league -->
-					<form style="display:inline; margin:0; padding:0;" action="{S_FORMSELF}" method="post">
-					<div style="float:left;">
-					&nbsp;
-						<input type="hidden" name="side" value="{S_SIDE}"/>
-						<input type="hidden" name="s" value="{S_SEASON}"/>
-						<select name="l" onchange="this.form.submit();" title="{L_OPTION_LEAGUE}">
-					<!-- BEGIN form_league -->
-							<option {form_league.S_SELECTED} value="{form_league.S_LEAGUE}">{form_league.S_LEAGUENAME}</option>
-					<!-- END form_league -->
-						</select>
-					&nbsp;
-					</div>
-					</form>
-				<!-- ENDIF -->
-				<!-- IF .form_matchday and not S_MATCHDAY_HIDE -->
-					<div style="float:left;">
-						<!-- IF S_PREV_LINK -->
-						<a class="prev_matchday" title="{L_SHOW_PREV}" href="{S_PREV_LINK}"></a>
-						<!-- ELSE -->
-							&nbsp;&nbsp;&nbsp;&nbsp;
-						<!-- ENDIF -->
-					</div>
-					<form style="display:inline;  margin:0; padding:0;" action="{S_FORMSELF}" method="post">
-					<div style="float:left;">
-						<select name="m" onchange="this.form.submit();" title="{L_OPTION_MATCHDAY}">
-					<!-- BEGIN form_matchday -->
-							<option {form_matchday.S_SELECTED} value="{form_matchday.S_MATCHDAY}">{form_matchday.S_MATCHDAYNAME} {form_matchday.S_CURRENT}</option>
-					<!-- END form_matchday -->
-						</select>
-						<input type="hidden" name="side" value="{S_SIDE}"/>
-						<input type="hidden" name="s" value="{S_SEASON}"/>
-						<input type="hidden" name="l" value="{S_LEAGUE}"/>
-						<input type="hidden" name="u" value="{S_USER_SEL}"/>
-					</div>
-					</form>
-					<div style="float:left;">
-						<!-- IF S_NEXT_LINK -->
-						<a class="next_matchday" title="{L_SHOW_NEXT}" href="{S_NEXT_LINK}"></a>
-						<!-- ELSE -->
-							&nbsp;&nbsp;&nbsp;&nbsp;
-						<!-- ENDIF -->
-					&nbsp;
-					</div>
-					<div style="display:inline; margin:0; vertical-align:center; white-space:nowrap; line-height: 2em;">
-						{S_DELIVERY}
-					</div>
-				<!-- ENDIF -->
-			</div>
-
-			<!-- IF S_DISPLAY_UNDER_CONSTRUCTION -->
-				<!-- INCLUDE under_construction.html -->
-			<!-- ENDIF -->
-
-			<!-- IF S_DISPLAY_BET -->
-				<!-- INCLUDE bet.html -->
-			<!-- ENDIF -->
-
-			<!-- IF S_DISPLAY_ALL_BETS -->
-				<!-- INCLUDE all_bets.html -->
-			<!-- ENDIF -->
-
-			<!-- IF S_DISPLAY_RESULTS -->
-				<!-- INCLUDE results.html -->
-			<!-- ENDIF -->
-
-			<!-- IF S_DISPLAY_RANKS_MATCHDAY -->
-				<!-- INCLUDE ranks.html -->
-			<!-- ENDIF -->
-
-			<!-- IF S_DISPLAY_RANKS_TOTAL -->
-				<!-- INCLUDE ranks.html -->
-			<!-- ENDIF -->
-
-			<!-- IF S_DISPLAY_BANK -->
-				<!-- INCLUDE bank.html -->
-			<!-- ENDIF -->
-
-			<!-- IF S_DISPLAY_TABLE -->
-				<!-- INCLUDE table.html -->
-			<!-- ENDIF -->
-
-			<!-- IF S_DISPLAY_ODDS -->
-				<!-- INCLUDE odds.html -->
-			<!-- ENDIF -->
-
-			<!-- IF S_DISPLAY_MY_BETS -->
-				<!-- INCLUDE my_bets.html -->
-			<!-- ENDIF -->
-
-			<!-- IF S_DISPLAY_MY_POINTS -->
-				<!-- INCLUDE my_points.html -->
-			<!-- ENDIF -->
-
-			<!-- IF S_DISPLAY_MY_TABLE -->
-				<!-- INCLUDE my_table.html -->
-			<!-- ENDIF -->
-
-			<!-- IF S_DISPLAY_MY_RANK -->
-				<!-- INCLUDE my_rank.html -->
-			<!-- ENDIF -->
-
-			<!-- IF S_DISPLAY_MY_CHART -->
-				<!-- INCLUDE my_chart.html -->
-			<!-- ENDIF -->
-
-			<!-- IF S_DISPLAY_MY_KOEFF -->
-				<!-- INCLUDE my_koeff.html -->
-			<!-- ENDIF -->
-
-			<!-- IF S_DISPLAY_STAT_RESULTS -->
-				<!-- INCLUDE stat_results.html -->
-			<!-- ENDIF -->
-
-			<!-- IF S_DISPLAY_STAT_POINTS -->
-				<!-- INCLUDE stat_points.html -->
-			<!-- ENDIF -->
-		</div>
-		<div class="copyright">
-			<!-- IF S_FOOTBALL_COPY -->{S_FOOTBALL_COPY}<!-- ENDIF -->
-			<br /><strong><a href="{U_MOBILE_SWITCH}">{L_SWITCH_MOBILE}</a></strong>
-		</div>
-		</div>
-	</div>
-<!-- [-] center block area -->
-<!-- [+] left block area -->
-	<div id="football-left" style="width: {FOOTBALL_LEFT_COLUMN}px;">
-
-	<!-- IF S_DISPLAY_RANK_MATCHDAY -->
-		<!-- INCLUDE rank_matchday.html -->
-	<!-- ENDIF -->
-	<!-- IF S_DISPLAY_SIDE_TABLE -->
-		<!-- INCLUDE side_table.html -->
-	<!-- ENDIF -->
-	<!-- IF S_DISPLAY_DELIVERY -->
-		<!-- INCLUDE delivery.html -->
-	<!-- ENDIF -->
-	<!-- IF S_DISPLAY_LAST_USERS -->
-		<!-- INCLUDE last_users.html -->
-	<!-- ENDIF -->
-	</div>
-<!-- [-] left block area -->
-<!-- [+] right block area -->
-	<div id="football-right" style="width: {FOOTBALL_RIGHT_COLUMN}px; margin-<!-- IF S_CONTENT_DIRECTION eq 'rtl' -->right<!-- ELSE -->left<!-- ENDIF -->: -{FOOTBALL_RIGHT_COLUMN}px;">
-		<!-- IF S_DISPLAY_RANK_TOTAL -->
-			<!-- INCLUDE rank_total.html -->
-		<!-- ENDIF -->
-	</div>
-<!-- [-] right block area -->
-	<br class="football-clear" />
-</div>
+<!-- DEFINE $S_IN_FOOTBALL = 1 -->
+<!-- INCLUDE overall_header.html -->
+
+<!-- $Id: football_body.html 2 2010-06-05 22:09:02Z football $ //-->
+
+
+<!-- IF S_FOOTBALL_INFO --> 
+	<div id="information" class="rules">
+		<strong>{L_INFORMATION}:</strong> {S_FOOTBALL_INFO}
+	</div>
+<!-- ENDIF -->
+
+<div id="football-body">
+<!-- [+] center block area -->
+	<div id="football-center-wrapper">
+		<div id="football-center" style="margin: 0 {FOOTBALL_RIGHT_COLUMN}px 0 {FOOTBALL_LEFT_COLUMN}px; padding: 0 4px;">
+		<div id="tabs" class="tabs" style="margin-top: 0px;  margin-left: 5px;">
+			<ul>
+				<li class="tab <!-- IF S_DISPLAY_BET -->activetab<!-- ENDIF -->"><a href="{U_BET}"><span><i class="icon fa-futbol-o fa-fw"></i>{L_BET}</span></a></li>
+				<li class="tab <!-- IF S_DISPLAY_ALL_BETS -->activetab<!-- ENDIF -->"><a href="{U_ALL_BETS}"><span><i class="icon fa-group fa-fw"></i>{L_ALL_BETS}</span></a></li>
+				<li class="tab <!-- IF S_DISPLAY_RESULTS -->activetab<!-- ENDIF -->"><a href="{U_RESULTS}"><span><i class="icon fa-check-square-o fa-fw"></i>{L_RESULTS}</span></a></li>
+				<li class="tab <!-- IF S_DISPLAY_RANKS_MATCHDAY -->activetab<!-- ENDIF -->"><a href="{U_RANKS_MATCHDAY}"><span><i class="icon fa-trophy fa-fw"></i>{L_RANK_MATCHDAY}</span></a></li>
+				<li class="tab <!-- IF S_DISPLAY_RANKS_TOTAL -->activetab<!-- ENDIF -->"><a href="{U_RANKS_TOTAL}"><span><i class="icon fa-trophy fa-fw"></i>{L_RANK_TOTAL}</span></a></li>
+				<li class="tab <!-- IF S_DISPLAY_TABLE -->activetab<!-- ENDIF -->"><a href="{U_TABLE}"><span><i class="icon fa-list-ol fa-fw"></i>{L_TABLE}</span></a></li>
+				<li class="tab <!-- IF S_DISPLAY_BANK -->activetab<!-- ENDIF -->"><a href="{U_FOOTBALL_BANK}"><span><i class="icon fa-bank fa-fw"></i>{L_FOOTBALL_BANK}</span></a></li>
+				<li class="tab"><a href="{U_RULES}" target="popup" onclick="popup('{U_RULES}', 625,625);return false;"><span><i class="icon fa-paragraph fa-fw"></i>{L_RULES}</span></a></li>
+				<li class="tab <!-- IF S_DISPLAY_ODDS -->activetab<!-- ENDIF -->"><a href="{U_ODDS}"><span><i class="icon fa-line-chart fa-fw"></i>{L_ODDS}</span></a></li>
+				<li class="tab"><a href="{U_PRINT_FOOTBALL}" accesskey="d" target="_blank"><span><i class="icon fa-print fa-fw"></i>{L_PRINT_FOOTBALL}</span></a></li>
+				<!-- IF S_MENU_LINK1-->
+				<li class="tab"><a href="{U_MENU_LINK1}" target="_blank"><span><i class="icon fa-external-link fa-fw"></i>{MENU_DESC_LINK1}</span></a></li>
+				<!-- ENDIF -->
+				<!-- IF S_MENU_LINK2-->
+				<li class="tab"><a href="{U_MENU_LINK2}" target="_blank"><span><i class="icon fa-external-link fa-fw"></i>{MENU_DESC_LINK2}</span></a></li>
+				<!-- ENDIF -->
+				<!-- IF S_MENU_LINK3-->
+				<li class="tab"><a href="{U_MENU_LINK3}" target="_blank"><span><i class="icon fa-external-link fa-fw"></i>{MENU_DESC_LINK3}</span></a></li>
+				<!-- ENDIF -->
+				<li class="tab <!-- IF S_DISPLAY_MY_BETS -->activetab<!-- ENDIF -->"><a href="{U_MY_BETS}"><span><i class="icon fa-area-chart fa-fw"></i>{L_MY_BETS}</span></a></li>
+				<li class="tab <!-- IF S_DISPLAY_MY_POINTS -->activetab<!-- ENDIF -->"><a href="{U_MY_POINTS}"><span><i class="icon fa-area-chart fa-fw"></i>{L_MY_POINTS}</span></a></li>
+				<li class="tab <!-- IF S_DISPLAY_MY_TABLE -->activetab<!-- ENDIF -->"><a href="{U_MY_TABLE}"><span><i class="icon fa-area-chart fa-fw"></i>{L_MY_TABLE}</span></a></li>
+				<li class="tab <!-- IF S_DISPLAY_MY_RANK -->activetab<!-- ENDIF -->"><a href="{U_MY_RANK}"><span><i class="icon fa-area-chart fa-fw"></i>{L_MY_RANK}</span></a></li>
+				<li class="tab <!-- IF S_DISPLAY_MY_CHART -->activetab<!-- ENDIF -->"><a href="{U_MY_CHART}"><span><i class="icon fa-area-chart fa-fw"></i>{L_MY_CHART}</span></a></li>
+				<li class="tab <!-- IF S_DISPLAY_MY_KOEFF -->activetab<!-- ENDIF -->"><a href="{U_MY_KOEFF}"><span><i class="icon fa-area-chart fa-fw"></i>{L_MY_KOEFF}</span></a></li>
+				<li class="tab <!-- IF S_DISPLAY_STAT_POINTS -->activetab<!-- ENDIF -->"><a href="{U_STAT_POINTS}"><span><i class="icon fa-area-chart fa-fw"></i>{L_STAT_POINTS}</span></a></li>
+				<li class="tab <!-- IF S_DISPLAY_STAT_RESULTS -->activetab<!-- ENDIF -->"><a href="{U_STAT_RESULTS}"><span><i class="icon fa-area-chart fa-fw"></i>{L_STAT_RESULTS}</span></a></li>
+				<li class="tab"><a href="{U_EXPORT}"><span><i class="icon fa-file-excel-o fa-fw"></i>{L_EXPORT}</span></a></li>
+			</ul>
+		</div>
+
+		<div class="panel">
+			<div class="navbar football_nav">
+				<div>
+				<!-- IF .form_season -->
+					<form style="display:inline; margin:0; padding:0;" action="{S_FORMSELF}" method="post">
+					<div style="float:left;">
+						<select name="s" onchange="this.form.submit();" title="{L_OPTION_SEASON}">
+					<!-- BEGIN form_season -->
+							<option {form_season.S_SELECTED} value="{form_season.S_SEASON}">{form_season.S_SEASONNAME}</option>
+					<!-- END form_season -->
+						</select>
+						<input type="hidden" name="side" value="{S_SIDE}"/>
+					</div>
+					</form>
+				<!-- ENDIF -->
+				<!-- IF .form_league -->
+					<form style="display:inline; margin:0; padding:0;" action="{S_FORMSELF}" method="post">
+					<div style="float:left;">
+					&nbsp;
+						<input type="hidden" name="side" value="{S_SIDE}"/>
+						<input type="hidden" name="s" value="{S_SEASON}"/>
+						<select name="l" onchange="this.form.submit();" title="{L_OPTION_LEAGUE}">
+					<!-- BEGIN form_league -->
+							<option {form_league.S_SELECTED} value="{form_league.S_LEAGUE}">{form_league.S_LEAGUENAME}</option>
+					<!-- END form_league -->
+						</select>
+					&nbsp;
+					</div>
+					</form>
+				<!-- ENDIF -->
+				<!-- IF .form_matchday and not S_MATCHDAY_HIDE -->
+					<div style="float:left;">
+						<!-- IF S_PREV_LINK -->
+						<a title="{L_SHOW_PREV}" href="{S_PREV_LINK}"><i class="icon fa-minus-square fa-fw" style="line-height: 2em; text-align: right;"></i></a>
+						<!-- ELSE -->
+							&nbsp;&nbsp;&nbsp;&nbsp;
+						<!-- ENDIF -->
+					</div>
+					<form style="display:inline;  margin:0; padding:0;" action="{S_FORMSELF}" method="post">
+					<div style="float:left;">
+						<select name="m" onchange="this.form.submit();" title="{L_OPTION_MATCHDAY}">
+					<!-- BEGIN form_matchday -->
+							<option {form_matchday.S_SELECTED} value="{form_matchday.S_MATCHDAY}">{form_matchday.S_MATCHDAYNAME} {form_matchday.S_CURRENT}</option>
+					<!-- END form_matchday -->
+						</select>
+						<input type="hidden" name="side" value="{S_SIDE}"/>
+						<input type="hidden" name="s" value="{S_SEASON}"/>
+						<input type="hidden" name="l" value="{S_LEAGUE}"/>
+						<input type="hidden" name="u" value="{S_USER_SEL}"/>
+					</div>
+					</form>
+					<div style="float:left;">
+						<!-- IF S_NEXT_LINK -->
+						<a title="{L_SHOW_NEXT}" href="{S_NEXT_LINK}"><i class="icon fa-plus-square fa-fw" style="line-height: 2em;"></i></a>
+						<!-- ELSE -->
+							&nbsp;&nbsp;&nbsp;&nbsp;
+						<!-- ENDIF -->
+					&nbsp;
+					</div>
+					<div style="display:inline; margin:0; vertical-align:center; white-space:nowrap; line-height: 2em;">
+						{S_DELIVERY}
+					</div>
+				<!-- ENDIF -->
+				</div>
+			</div>
+
+			<!-- IF S_DISPLAY_UNDER_CONSTRUCTION -->
+				<!-- INCLUDE under_construction.html -->
+			<!-- ENDIF -->
+
+			<!-- IF S_DISPLAY_BET -->
+				<!-- INCLUDE bet.html -->
+			<!-- ENDIF -->
+
+			<!-- IF S_DISPLAY_ALL_BETS -->
+				<!-- INCLUDE all_bets.html -->
+			<!-- ENDIF -->
+
+			<!-- IF S_DISPLAY_RESULTS -->
+				<!-- INCLUDE results.html -->
+			<!-- ENDIF -->
+
+			<!-- IF S_DISPLAY_RANKS_MATCHDAY -->
+				<!-- INCLUDE ranks.html -->
+			<!-- ENDIF -->
+
+			<!-- IF S_DISPLAY_RANKS_TOTAL -->
+				<!-- INCLUDE ranks.html -->
+			<!-- ENDIF -->
+
+			<!-- IF S_DISPLAY_BANK -->
+				<!-- INCLUDE bank.html -->
+			<!-- ENDIF -->
+
+			<!-- IF S_DISPLAY_TABLE -->
+				<!-- INCLUDE table.html -->
+			<!-- ENDIF -->
+
+			<!-- IF S_DISPLAY_ODDS -->
+				<!-- INCLUDE odds.html -->
+			<!-- ENDIF -->
+
+			<!-- IF S_DISPLAY_MY_BETS -->
+				<!-- INCLUDE my_bets.html -->
+			<!-- ENDIF -->
+
+			<!-- IF S_DISPLAY_MY_POINTS -->
+				<!-- INCLUDE my_points.html -->
+			<!-- ENDIF -->
+
+			<!-- IF S_DISPLAY_MY_TABLE -->
+				<!-- INCLUDE my_table.html -->
+			<!-- ENDIF -->
+
+			<!-- IF S_DISPLAY_MY_RANK -->
+				<!-- INCLUDE my_rank.html -->
+			<!-- ENDIF -->
+
+			<!-- IF S_DISPLAY_MY_CHART -->
+				<!-- INCLUDE my_chart.html -->
+			<!-- ENDIF -->
+
+			<!-- IF S_DISPLAY_MY_KOEFF -->
+				<!-- INCLUDE my_koeff.html -->
+			<!-- ENDIF -->
+
+			<!-- IF S_DISPLAY_STAT_RESULTS -->
+				<!-- INCLUDE stat_results.html -->
+			<!-- ENDIF -->
+
+			<!-- IF S_DISPLAY_STAT_POINTS -->
+				<!-- INCLUDE stat_points.html -->
+			<!-- ENDIF -->
+		</div>
+		<div class="copyright">
+			<!-- IF S_FOOTBALL_COPY -->{S_FOOTBALL_COPY}<!-- ENDIF -->
+			<br /><strong><a href="{U_MOBILE_SWITCH}">{L_SWITCH_MOBILE}</a></strong>
+		</div>
+		</div>
+	</div>
+<!-- [-] center block area -->
+<!-- [+] left block area -->
+	<div id="football-left" style="width: {FOOTBALL_LEFT_COLUMN}px;">
+
+	<!-- IF S_DISPLAY_RANK_MATCHDAY -->
+		<!-- INCLUDE rank_matchday.html -->
+	<!-- ENDIF -->
+	<!-- IF S_DISPLAY_SIDE_TABLE -->
+		<!-- INCLUDE side_table.html -->
+	<!-- ENDIF -->
+	<!-- IF S_DISPLAY_DELIVERY -->
+		<!-- INCLUDE delivery.html -->
+	<!-- ENDIF -->
+	<!-- IF S_DISPLAY_LAST_USERS -->
+		<!-- INCLUDE last_users.html -->
+	<!-- ENDIF -->
+	</div>
+<!-- [-] left block area -->
+<!-- [+] right block area -->
+	<div id="football-right" style="width: {FOOTBALL_RIGHT_COLUMN}px; margin-<!-- IF S_CONTENT_DIRECTION eq 'rtl' -->right<!-- ELSE -->left<!-- ENDIF -->: -{FOOTBALL_RIGHT_COLUMN}px;">
+		<!-- IF S_DISPLAY_RANK_TOTAL -->
+			<!-- INCLUDE rank_total.html -->
+		<!-- ENDIF -->
+	<!-- IF S_DISPLAY_LAST_RESULTS -->
+		<!-- INCLUDE last_results.html -->
+	<!-- ENDIF -->
+	</div>
+<!-- [-] right block area -->
+	<br class="football-clear" />
+</div>
 <!-- INCLUDE overall_footer.html -->

styles/prosilver/template/football_print.html

@@ -1,117 +1,116 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" dir="{S_CONTENT_DIRECTION}" lang="{S_USER_LANG}" xml:lang="{S_USER_LANG}">
-<head>
-
-<meta http-equiv="Content-Type" content="text/html; charset={S_CONTENT_ENCODING}" />
-<meta name="resource-type" content="document" />
-<meta name="distribution" content="global" />
-<meta name="copyright" content="phpBB3 Football Extension by football" />
-<meta name="keywords" content="phpBB3, Football, Extension, Tipprunde, Prediction, League, Soccer" />
-<meta name="description" content="" />
-<meta name="robots" CONTENT="noindex" />
-{META}
-<title>{SITENAME} &bull; {PAGE_TITLE}</title>
-<link href="./../../ext/football/football/styles/prosilver/theme/football_print.css" rel="stylesheet" type="text/css" />
-</head>
-
-<body id="phpbb" style="width:100%">
-<div id="wrap">
-	<a id="top" accesskey="t"></a>
-
-	<div id="page-header">
-	<!-- IF S_DISPLAY_BANK -->
-		<h2><a href="{U_SIDE_LINK}">{S_SIDENAME}</a> &bull; {S_SEASON_NAME} &bull; {S_LEAGUE_NAME}</h2>
-	<!-- ELSE -->
-		<h2><a href="{U_SIDE_LINK}">{S_SIDENAME}</a> &bull; {S_SEASON_NAME} &bull; {S_LEAGUE_NAME} &bull; {S_MATCHDAY_NAME}</h2>
-		<p>{S_DELIVERY}</p>
-	<!-- ENDIF -->
-	</div>
-
-	<div id="page-body">
-		<div class="page-number">{PAGE_NUMBER}</div>
-		<!-- IF S_DISPLAY_BET -->
-			<!-- INCLUDE bet.html -->
-		<!-- ENDIF -->
-
-		<!-- IF S_DISPLAY_ALL_BETS -->
-			<table class="football">
-				<tr>
-					style="vertical-align: top;"
-					<!-- INCLUDE all_bets.html -->
-					</td>
-					<td style="width:4px; vertical-align: top;"></td>
-					<td style="width:{FOOTBALL_RIGHT_COLUMN}px; vertical-align: top;">
-					<!-- IF S_DISPLAY_RANK_TOTAL -->
-						<!-- INCLUDE rank_total.html -->
-					<!-- ENDIF -->
-					</td>
-				</tr>
-			</table>
-		<!-- ENDIF -->
-
-		<!-- IF S_DISPLAY_RESULTS -->
-			<!-- INCLUDE results.html -->
-		<!-- ENDIF -->
-
-		<!-- IF S_DISPLAY_RANKS_MATCHDAY -->
-			<!-- INCLUDE ranks.html -->
-		<!-- ENDIF -->
-
-		<!-- IF S_DISPLAY_RANKS_TOTAL -->
-			<!-- INCLUDE ranks.html -->
-		<!-- ENDIF -->
-
-		<!-- IF S_DISPLAY_TABLE -->
-			<!-- INCLUDE table.html -->
-		<!-- ENDIF -->
-
-		<!-- IF S_DISPLAY_ODDS -->
-			<!-- INCLUDE odds.html -->
-		<!-- ENDIF -->
-		
-		<!-- IF S_DISPLAY_MY_BETS -->
-			<!-- INCLUDE my_bets.html -->
-		<!-- ENDIF -->
-		
-		<!-- IF S_DISPLAY_MY_POINTS -->
-			<!-- INCLUDE my_points.html -->
-		<!-- ENDIF -->
-		
-		<!-- IF S_DISPLAY_MY_TABLE -->
-			<!-- INCLUDE my_table.html -->
-		<!-- ENDIF -->
-		
-		<!-- IF S_DISPLAY_MY_RANK -->
-			<!-- INCLUDE my_rank.html -->
-		<!-- ENDIF -->
-		
-		<!-- IF S_DISPLAY_MY_CHART -->
-			<!-- INCLUDE my_chart.html -->
-		<!-- ENDIF -->
-		
-		<!-- IF S_DISPLAY_MY_KOEFF -->
-			<!-- INCLUDE my_koeff.html -->
-		<!-- ENDIF -->
-
-		<!-- IF S_DISPLAY_STAT_RESULTS -->
-			<!-- INCLUDE stat_results.html -->
-		<!-- ENDIF -->
-
-		<!-- IF S_DISPLAY_STAT_POINTS -->
-			<!-- INCLUDE stat_points.html -->
-		<!-- ENDIF -->
-
-		<!-- IF S_DISPLAY_BANK -->
-			<!-- INCLUDE bank.html -->
-		<!-- ENDIF -->
-
-		</div>
-
-	<div id="page-footer">
-		<div class="copyright">		
-			<!-- IF S_FOOTBALL_COPY --><br />{S_FOOTBALL_COPY}<!-- ENDIF -->
-		</div>
-	</div>
-</div>
-</body>
-</html>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" dir="{S_CONTENT_DIRECTION}" lang="{S_USER_LANG}" xml:lang="{S_USER_LANG}">
+<head>
+
+<meta http-equiv="Content-Type" content="text/html; charset={S_CONTENT_ENCODING}" />
+<meta name="resource-type" content="document" />
+<meta name="distribution" content="global" />
+<meta name="copyright" content="phpBB3 Football Extension by football" />
+<meta name="keywords" content="phpBB3, Football, Extension, Tipprunde, Prediction, League, Soccer" />
+<meta name="description" content="" />
+<meta name="robots" CONTENT="noindex" />
+{META}
+<title>{SITENAME} &bull; {PAGE_TITLE}</title>
+<link href="./../../ext/football/football/styles/prosilver/theme/football_print.css" rel="stylesheet" type="text/css" />
+</head>
+
+<body id="phpbb" style="width:100%">
+<div id="wrap">
+	<a id="top" accesskey="t"></a>
+
+	<div id="page-header">
+	<!-- IF S_DISPLAY_BANK -->
+		<h2><a href="{U_SIDE_LINK}">{S_SIDENAME}</a> &bull; {S_SEASON_NAME} &bull; {S_LEAGUE_NAME}</h2>
+	<!-- ELSE -->
+		<h2><a href="{U_SIDE_LINK}">{S_SIDENAME}</a> &bull; {S_SEASON_NAME} &bull; {S_LEAGUE_NAME} &bull; {S_MATCHDAY_NAME}</h2>
+		<p>{S_DELIVERY}</p>
+	<!-- ENDIF -->
+	</div>
+
+	<div id="page-body">
+		<div class="page-number">{PAGE_NUMBER}</div>
+		<!-- IF S_DISPLAY_BET -->
+			<!-- INCLUDE bet.html -->
+		<!-- ENDIF -->
+
+		<!-- IF S_DISPLAY_ALL_BETS -->
+			<table class="football">
+				<tr>
+					<!-- INCLUDE all_bets.html -->
+					</td>
+					<td style="width:4px; vertical-align: top;"></td>
+					<td style="width:{FOOTBALL_RIGHT_COLUMN}px; vertical-align: top;">
+					<!-- IF S_DISPLAY_RANK_TOTAL -->
+						<!-- INCLUDE rank_total.html -->
+					<!-- ENDIF -->
+					</td>
+				</tr>
+			</table>
+		<!-- ENDIF -->
+
+		<!-- IF S_DISPLAY_RESULTS -->
+			<!-- INCLUDE results.html -->
+		<!-- ENDIF -->
+
+		<!-- IF S_DISPLAY_RANKS_MATCHDAY -->
+			<!-- INCLUDE ranks.html -->
+		<!-- ENDIF -->
+
+		<!-- IF S_DISPLAY_RANKS_TOTAL -->
+			<!-- INCLUDE ranks.html -->
+		<!-- ENDIF -->
+
+		<!-- IF S_DISPLAY_TABLE -->
+			<!-- INCLUDE table.html -->
+		<!-- ENDIF -->
+
+		<!-- IF S_DISPLAY_ODDS -->
+			<!-- INCLUDE odds.html -->
+		<!-- ENDIF -->
+		
+		<!-- IF S_DISPLAY_MY_BETS -->
+			<!-- INCLUDE my_bets.html -->
+		<!-- ENDIF -->
+		
+		<!-- IF S_DISPLAY_MY_POINTS -->
+			<!-- INCLUDE my_points.html -->
+		<!-- ENDIF -->
+		
+		<!-- IF S_DISPLAY_MY_TABLE -->
+			<!-- INCLUDE my_table.html -->
+		<!-- ENDIF -->
+		
+		<!-- IF S_DISPLAY_MY_RANK -->
+			<!-- INCLUDE my_rank.html -->
+		<!-- ENDIF -->
+		
+		<!-- IF S_DISPLAY_MY_CHART -->
+			<!-- INCLUDE my_chart.html -->
+		<!-- ENDIF -->
+		
+		<!-- IF S_DISPLAY_MY_KOEFF -->
+			<!-- INCLUDE my_koeff.html -->
+		<!-- ENDIF -->
+
+		<!-- IF S_DISPLAY_STAT_RESULTS -->
+			<!-- INCLUDE stat_results.html -->
+		<!-- ENDIF -->
+
+		<!-- IF S_DISPLAY_STAT_POINTS -->
+			<!-- INCLUDE stat_points.html -->
+		<!-- ENDIF -->
+
+		<!-- IF S_DISPLAY_BANK -->
+			<!-- INCLUDE bank.html -->
+		<!-- ENDIF -->
+
+		</div>
+
+	<div id="page-footer">
+		<div class="copyright">		
+			<!-- IF S_FOOTBALL_COPY --><br />{S_FOOTBALL_COPY}<!-- ENDIF -->
+		</div>
+	</div>
+</div>
+</body>
+</html>

styles/prosilver/template/last_results.html

@@ -0,0 +1,13 @@
+<!-- IF S_DATA_LAST_RESULTS -->
+<div class="panel">	<h3><i class="icon fa-check-square-o fa-fw"></i>{L_LAST_RESULTS}</h3>
+	<!-- BEGIN last_results -->
+		<div style="text-align:center;" class="{last_results.COLOR_STYLE}" title="{last_results.LEAGUE_NAME}: {last_results.MATCH_TIME}"
+			onclick="location.href='{last_results.U_RESULTS_LINK}'">
+			{last_results.LOGO_HOME} {last_results.GOALS_HOME}:{last_results.GOALS_GUEST} {last_results.LOGO_GUEST}
+		</div> 
+		<!-- IF last_results.KOGOALS_HOME != '- ' -->
+		<div style="text-align:center;">({last_results.KOGOALS_HOME}:{last_results.KOGOALS_GUEST})</div> 
+		<!-- ENDIF -->
+		<div style="text-align:center;">{last_results.HOME_SHORT} - {last_results.GUEST_SHORT}</div><hr />
+	<!-- END last_results --></div>
+<!-- ENDIF -->		

styles/prosilver/template/last_users.html

@@ -1,4 +1,4 @@
-<div class="panel">
-	<h3><span class="small-icon icon-allbets"></span>&nbsp;{LAST_USERS}</h3>
-
-	<!-- BEGIN last_users -->
+<div class="panel">	<h3><i class="icon fa-sign-in fa-fw"></i>{LAST_USERS}</h3>
+	<!-- BEGIN last_users -->
+		<span class="genmed">{last_users.USER_NAME}</span> <br /> <span class="gensmall">{last_users.LAST_VISIT_DATE}</span><hr />
+	<!-- END last_users --></div>

styles/prosilver/template/mobile_football_body.html

@@ -1,179 +1,179 @@
 <!-- DEFINE $S_IN_FOOTBALL = 1 -->
-<!-- INCLUDE overall_header.html -->
-
-<!-- IF S_FOOTBALL_INFO --> 
-	<div id="information" class="rules">
-		<strong>{L_INFORMATION}:</strong> {S_FOOTBALL_INFO}
-	</div>
-<!-- ENDIF -->
-	<div id="tabs" style="margin-top: 0px;  margin-left: 5px;">
-		<ul>
-			<li class="tab <!-- IF S_DISPLAY_BET -->activetab<!-- ENDIF --> small-icon icon-bet"><a href="{U_BET}"><span>{L_BET}</span></a></li>
-			<li class="tab <!-- IF S_DISPLAY_ALL_BETS -->activetab<!-- ENDIF --> small-icon icon-allbets"><a href="{U_ALL_BETS}"><span>{L_BETS}</span></a></li>
-			<li class="tab <!-- IF S_DISPLAY_RESULTS -->activetab<!-- ENDIF --> small-icon icon-results"><a href="{U_RESULTS}"><span>{L_RESULTS_SHORT_DOT}</span></a></li>
-			<li class="tab <!-- IF S_DISPLAY_RANKS_MATCHDAY -->activetab<!-- ENDIF --> small-icon icon-rank"><a href="{U_RANKS_MATCHDAY}"><span>{L_MATCHDAY_SHORT}</span></a></li>
-			<li class="tab <!-- IF S_DISPLAY_RANKS_TOTAL -->activetab<!-- ENDIF --> small-icon icon-rank"><a href="{U_RANKS_TOTAL}"><span>{L_TOTAL}</span></a></li>
-			<li class="tab <!-- IF S_DISPLAY_TABLE -->activetab<!-- ENDIF --> small-icon icon-list"><a href="{U_TABLE}"><span>{L_TABLE}</span></a></li>
-			<li class="tab <!-- IF S_DISPLAY_DELIVERY -->activetab<!-- ENDIF --> small-icon icon-bet"><a href="{U_DELIVERY_LIST}"><span>{L_DATES}</span></a></li>
-			<li class="tab <!-- IF S_DISPLAY_LAST_USERS -->activetab<!-- ENDIF --> small-icon icon-allbets"><a href="{U_LAST_VISITORS}"><span>{L_USERS}</span></a></li>
-			<li class="tab <!-- IF S_DISPLAY_BANK -->activetab<!-- ENDIF --> small-icon icon-points"><a href="{U_FOOTBALL_BANK}"><span>{L_FOOTBALL_BANK}</span></a></li>
-			<li class="tab small-icon icon-rules"><a href="{U_RULES}" target="popup" onclick="popup('{U_RULES}', 625,625);return false;"><span>{L_RULES}</span></a></li>
-			<li class="tab <!-- IF S_DISPLAY_ODDS -->activetab<!-- ENDIF --> small-icon icon-odds"><a href="{U_ODDS}"><span>{L_ODDS}</span></a></li>
-			<li class="tab  small-icon icon-print"><a href="{U_PRINT_FOOTBALL}" accesskey="d" target="_blank"><span>{L_PRINT_FOOTBALL}</span></a></li>
-			<!-- IF S_MENU_LINK1-->
-			<li class="tab small-icon icon-xml"><a href="{U_MENU_LINK1}" target="_blank"><span>{MENU_DESC_LINK1}</span></a></li>
-			<!-- ENDIF -->
-			<!-- IF S_MENU_LINK2-->
-			<li class="tab small-icon icon-xml"><a href="{U_MENU_LINK2}" target="_blank"><span>{MENU_DESC_LINK2}</span></a></li>
-			<!-- ENDIF -->
-			<!-- IF S_MENU_LINK3-->
-			<li class="tab small-icon icon-xml"><a href="{U_MENU_LINK3}" target="_blank"><span>{MENU_DESC_LINK3}</span></a></li>
-			<!-- ENDIF -->
-			<li class="tab <!-- IF S_DISPLAY_MY_BETS -->activetab<!-- ENDIF --> small-icon icon-statistics"><a href="{U_MY_BETS}"><span>{L_MY_BETS}</span></a></li>
-			<li class="tab <!-- IF S_DISPLAY_MY_POINTS -->activetab<!-- ENDIF --> small-icon icon-statistics"><a href="{U_MY_POINTS}"><span>{L_MY_POINTS}</span></a></li>
-			<li class="tab <!-- IF S_DISPLAY_MY_TABLE -->activetab<!-- ENDIF --> small-icon icon-statistics"><a href="{U_MY_TABLE}"><span>{L_MY_TABLE}</span></a></li>
-			<li class="tab <!-- IF S_DISPLAY_MY_RANK -->activetab<!-- ENDIF --> small-icon icon-statistics"><a href="{U_MY_RANK}"><span>{L_MY_RANK}</span></a></li>
-			<li class="tab <!-- IF S_DISPLAY_MY_CHART -->activetab<!-- ENDIF --> small-icon icon-statistics"><a href="{U_MY_CHART}"><span>{L_MY_CHART}</span></a></li>
-			<li class="tab <!-- IF S_DISPLAY_MY_KOEFF -->activetab<!-- ENDIF --> small-icon icon-statistics"><a href="{U_MY_KOEFF}"><span>{L_MY_KOEFF}</span></a></li>
-			<li class="tab <!-- IF S_DISPLAY_STAT_POINTS -->activetab<!-- ENDIF --> small-icon icon-statistics"><a href="{U_STAT_POINTS}"><span>{L_STAT_POINTS}</span></a></li>
-			<li class="tab <!-- IF S_DISPLAY_STAT_RESULTS -->activetab<!-- ENDIF --> small-icon icon-statistics"><a href="{U_STAT_RESULTS}"><span>{L_STAT_RESULTS}</span></a></li>
-		</ul>
-	</div>
-	<div class="panel">
-
-		<!-- IF !S_DISPLAY_LAST_USERS and !S_DISPLAY_DELIVERY -->
-		<div style="line-height: 0.7em;">
-			<br />
-		</div>
-		<div class="navbar football_bg">
-			<!-- IF .form_season -->
-			<form style="display:inline; margin:0; padding:0;" action="{S_FORMSELF}" method="post">
-				<div style="float:left;">
-					<select name="s" onchange="this.form.submit();" title="{L_OPTION_SEASON}">
-					<!-- BEGIN form_season -->
-						<option {form_season.S_SELECTED} value="{form_season.S_SEASON}">{form_season.S_SEASON}</option> -->
-					<!-- END form_season -->
-					</select>
-					<input type="hidden" name="side" value="{S_SIDE}"/>
-				</div>
-			</form>
-			<!-- ENDIF -->
-			<!-- IF .form_league -->
-			<form style="display:inline; margin:0; padding:0;" action="{S_FORMSELF}" method="post">
-				<div style="float:left;">
-					<select name="l" onchange="this.form.submit();" title="{L_OPTION_LEAGUE}">
-					<!-- BEGIN form_league -->
-						<option {form_league.S_SELECTED} value="{form_league.S_LEAGUE}">{form_league.S_LEAGUENAME}</option>
-					<!-- END form_league -->
-					</select>
-					<input type="hidden" name="side" value="{S_SIDE}"/>
-					<input type="hidden" name="s" value="{S_SEASON}"/>
-				</div>
-			</form>
-			<!-- ENDIF -->
-			<!-- IF .form_matchday and not S_MATCHDAY_HIDE -->
-			<form style="display:inline;  margin:0; padding:0;" action="{S_FORMSELF}" method="post">
-				<div style="float:left;">
-					<select name="m" onchange="this.form.submit();" title="{L_OPTION_MATCHDAY}">
-					<!-- BEGIN form_matchday -->
-						<option {form_matchday.S_SELECTED} value="{form_matchday.S_MATCHDAY}">{form_matchday.S_MATCHDAY}. {L_MATCHDAY}{form_matchday.S_CURRENT}</option>
-					<!-- END form_matchday -->
-					</select>
-					<input type="hidden" name="side" value="{S_SIDE}"/>
-					<input type="hidden" name="s" value="{S_SEASON}"/>
-					<input type="hidden" name="l" value="{S_LEAGUE}"/>
-					<input type="hidden" name="u" value="{S_USER_SEL}"/>
-				</div>
-			</form>
-			<!-- ENDIF -->
-		</div>
-		<div style="clear: both; font-size: 0.6em; margin 0px; vertical-align:center; white-space:nowrap; line-height: 1.5em;">
-			<!-- IF .form_matchday and not S_MATCHDAY_HIDE -->
-			{S_DELIVERY}
-			<!-- ELSE -->
-			<br />
-			<!-- ENDIF -->
-		</div>
-		<!-- ENDIF -->
-			<!-- IF S_DISPLAY_UNDER_CONSTRUCTION -->
-				<!-- INCLUDE mobile_under_construction.html -->
-			<!-- ENDIF -->
-
-			<!-- IF S_DISPLAY_BET -->
-				<!-- INCLUDE mobile_bet.html -->
-			<!-- ENDIF -->
-
-			<!-- IF S_DISPLAY_ALL_BETS -->
-				<!-- INCLUDE mobile_all_bets.html -->
-			<!-- ENDIF -->
-
-			<!-- IF S_DISPLAY_RESULTS -->
-				<!-- INCLUDE mobile_results.html -->
-			<!-- ENDIF -->
-
-			<!-- IF S_DISPLAY_RANKS_MATCHDAY -->
-				<!-- INCLUDE mobile_ranks.html -->
-			<!-- ENDIF -->
-
-			<!-- IF S_DISPLAY_RANKS_TOTAL -->
-				<!-- INCLUDE mobile_ranks.html -->
-			<!-- ENDIF -->
-
-			<!-- IF S_DISPLAY_BANK -->
-				<!-- INCLUDE mobile_bank.html -->
-			<!-- ENDIF -->
-
-			<!-- IF S_DISPLAY_TABLE -->
-				<!-- INCLUDE mobile_table.html -->
-			<!-- ENDIF -->
-
-			<!-- IF S_DISPLAY_LAST_USERS -->
-				<!-- INCLUDE mobile_last_users.html -->
-			<!-- ENDIF -->
-			
-			<!-- IF S_DISPLAY_ODDS -->
-				<!-- INCLUDE mobile_odds.html -->
-			<!-- ENDIF -->
-			
-			<!-- IF S_DISPLAY_MY_BETS -->
-				<!-- INCLUDE mobile_my_bets.html -->
-			<!-- ENDIF -->
-
-			<!-- IF S_DISPLAY_MY_POINTS -->
-				<!-- INCLUDE mobile_my_points.html -->
-			<!-- ENDIF -->
-
-			<!-- IF S_DISPLAY_MY_TABLE -->
-				<!-- INCLUDE mobile_my_table.html -->
-			<!-- ENDIF -->
-
-			<!-- IF S_DISPLAY_MY_RANK -->
-				<!-- INCLUDE mobile_my_rank.html -->
-			<!-- ENDIF -->
-
-			<!-- IF S_DISPLAY_MY_CHART -->
-				<!-- INCLUDE mobile_my_chart.html -->
-			<!-- ENDIF -->
-
-			<!-- IF S_DISPLAY_MY_KOEFF -->
-				<!-- INCLUDE mobile_my_koeff.html -->
-			<!-- ENDIF -->
-
-			<!-- IF S_DISPLAY_STAT_RESULTS -->
-				<!-- INCLUDE mobile_stat_results.html -->
-			<!-- ENDIF -->
-
-			<!-- IF S_DISPLAY_STAT_POINTS -->
-				<!-- INCLUDE mobile_stat_points.html -->
-			<!-- ENDIF -->
-			
-			<!-- IF S_DISPLAY_DELIVERY -->
-				<!-- INCLUDE mobile_delivery.html -->
-			<!-- ENDIF -->
-	</div>
-	<div class="copyright">
-		<!-- IF S_FOOTBALL_COPY -->{S_FOOTBALL_COPY}<!-- ENDIF -->
-		<br /><strong><a href="{U_MOBILE_SWITCH}">{L_SWITCH_DESKTOP}</a></strong>
-	</div>
-				
+<!-- INCLUDE overall_header.html -->
+
+<!-- IF S_FOOTBALL_INFO --> 
+	<div id="information" class="rules">
+		<strong>{L_INFORMATION}:</strong> {S_FOOTBALL_INFO}
+	</div>
+<!-- ENDIF -->
+	<div id="tabs" class="tabs" style="margin-top: 0px;  margin-left: 5px;">
+		<ul>
+			<li class="tab <!-- IF S_DISPLAY_BET -->activetab<!-- ENDIF -->"><a href="{U_BET}"><span><i class="icon fa-futbol-o fa-fw"></i>{L_BET}</span></a></li>
+			<li class="tab <!-- IF S_DISPLAY_ALL_BETS -->activetab<!-- ENDIF -->"><a href="{U_ALL_BETS}"><span><i class="icon fa-group fa-fw"></i>{L_BETS}</span></a></li>
+			<li class="tab <!-- IF S_DISPLAY_RESULTS -->activetab<!-- ENDIF -->"><a href="{U_RESULTS}"><span><i class="icon fa-check-square-o fa-fw"></i>{L_RESULTS_SHORT_DOT}</span></a></li>
+			<li class="tab <!-- IF S_DISPLAY_RANKS_MATCHDAY -->activetab<!-- ENDIF -->"><a href="{U_RANKS_MATCHDAY}"><span><i class="icon fa-trophy fa-fw"></i>{L_MATCHDAY_SHORT}</span></a></li>
+			<li class="tab <!-- IF S_DISPLAY_RANKS_TOTAL -->activetab<!-- ENDIF -->"><a href="{U_RANKS_TOTAL}"><span><i class="icon fa-trophy fa-fw"></i>{L_TOTAL}</span></a></li>
+			<li class="tab <!-- IF S_DISPLAY_TABLE -->activetab<!-- ENDIF -->"><a href="{U_TABLE}"><span><i class="icon fa-list-ol fa-fw"></i>{L_TABLE}</span></a></li>
+			<li class="tab <!-- IF S_DISPLAY_DELIVERY -->activetab<!-- ENDIF -->"><a href="{U_DELIVERY_LIST}"><span><i class="icon fa-calendar fa-fw"></i>{L_DATES}</span></a></li>
+			<li class="tab <!-- IF S_DISPLAY_LAST_USERS -->activetab<!-- ENDIF -->"><a href="{U_LAST_VISITORS}"><span><i class="icon fa-sign-in fa-fw"></i>{L_USERS}</span></a></li>
+			<li class="tab <!-- IF S_DISPLAY_BANK -->activetab<!-- ENDIF -->"><a href="{U_FOOTBALL_BANK}"><span><i class="icon fa-bank fa-fw"></i>{L_FOOTBALL_BANK}</span></a></li>
+			<li class="tab"><a href="{U_RULES}" target="popup" onclick="popup('{U_RULES}', 625,625);return false;"><span><i class="icon fa-paragraph fa-fw"></i>{L_RULES}</span></a></li>
+			<li class="tab <!-- IF S_DISPLAY_ODDS -->activetab<!-- ENDIF -->"><a href="{U_ODDS}"><span><i class="icon fa-line-chart fa-fw"></i>{L_ODDS}</span></a></li>
+			<li class="tab"><a href="{U_PRINT_FOOTBALL}" accesskey="d" target="_blank"><span><i class="icon fa-print fa-fw"></i>{L_PRINT_FOOTBALL}</span></a></li>
+			<!-- IF S_MENU_LINK1-->
+			<li class="tab"><a href="{U_MENU_LINK1}" target="_blank"><span><i class="icon fa-external-link fa-fw"></i>{MENU_DESC_LINK1}</span></a></li>
+			<!-- ENDIF -->
+			<!-- IF S_MENU_LINK2-->
+			<li class="tab"><a href="{U_MENU_LINK2}" target="_blank"><span><i class="icon fa-external-link fa-fw"></i>{MENU_DESC_LINK2}</span></a></li>
+			<!-- ENDIF -->
+			<!-- IF S_MENU_LINK3-->
+			<li class="tab"><a href="{U_MENU_LINK3}" target="_blank"><span><i class="icon fa-external-link fa-fw"></i>{MENU_DESC_LINK3}</span></a></li>
+			<!-- ENDIF -->
+			<li class="tab <!-- IF S_DISPLAY_MY_BETS -->activetab<!-- ENDIF -->"><a href="{U_MY_BETS}"><span><i class="icon fa-area-chart fa-fw"></i>{L_MY_BETS}</span></a></li>
+			<li class="tab <!-- IF S_DISPLAY_MY_POINTS -->activetab<!-- ENDIF -->"><a href="{U_MY_POINTS}"><span><i class="icon fa-area-chart fa-fw"></i>{L_MY_POINTS}</span></a></li>
+			<li class="tab <!-- IF S_DISPLAY_MY_TABLE -->activetab<!-- ENDIF -->"><a href="{U_MY_TABLE}"><span><i class="icon fa-area-chart fa-fw"></i>{L_MY_TABLE}</span></a></li>
+			<li class="tab <!-- IF S_DISPLAY_MY_RANK -->activetab<!-- ENDIF -->"><a href="{U_MY_RANK}"><span><i class="icon fa-area-chart fa-fw"></i>{L_MY_RANK}</span></a></li>
+			<li class="tab <!-- IF S_DISPLAY_MY_CHART -->activetab<!-- ENDIF -->"><a href="{U_MY_CHART}"><span><i class="icon fa-area-chart fa-fw"></i>{L_MY_CHART}</span></a></li>
+			<li class="tab <!-- IF S_DISPLAY_MY_KOEFF -->activetab<!-- ENDIF -->"><a href="{U_MY_KOEFF}"><span><i class="icon fa-area-chart fa-fw"></i>{L_MY_KOEFF}</span></a></li>
+			<li class="tab <!-- IF S_DISPLAY_STAT_POINTS -->activetab<!-- ENDIF -->"><a href="{U_STAT_POINTS}"><span><i class="icon fa-area-chart fa-fw"></i>{L_STAT_POINTS}</span></a></li>
+			<li class="tab <!-- IF S_DISPLAY_STAT_RESULTS -->activetab<!-- ENDIF -->"><a href="{U_STAT_RESULTS}"><span><i class="icon fa-area-chart fa-fw"></i>{L_STAT_RESULTS}</span></a></li>
+		</ul>
+	</div>
+	<div class="panel">
+
+		<!-- IF !S_DISPLAY_LAST_USERS and !S_DISPLAY_DELIVERY -->
+		<div style="line-height: 0.7em;">
+			<br />
+		</div>
+		<div class="navbar football_bg">
+			<!-- IF .form_season -->
+			<form style="display:inline; margin:0; padding:0;" action="{S_FORMSELF}" method="post">
+				<div style="float:left;">
+					<select name="s" onchange="this.form.submit();" title="{L_OPTION_SEASON}">
+					<!-- BEGIN form_season -->
+						<option {form_season.S_SELECTED} value="{form_season.S_SEASON}">{form_season.S_SEASON}</option> -->
+					<!-- END form_season -->
+					</select>
+					<input type="hidden" name="side" value="{S_SIDE}"/>
+				</div>
+			</form>
+			<!-- ENDIF -->
+			<!-- IF .form_league -->
+			<form style="display:inline; margin:0; padding:0;" action="{S_FORMSELF}" method="post">
+				<div style="float:left;">
+					<select name="l" onchange="this.form.submit();" title="{L_OPTION_LEAGUE}">
+					<!-- BEGIN form_league -->
+						<option {form_league.S_SELECTED} value="{form_league.S_LEAGUE}">{form_league.S_LEAGUENAME}</option>
+					<!-- END form_league -->
+					</select>
+					<input type="hidden" name="side" value="{S_SIDE}"/>
+					<input type="hidden" name="s" value="{S_SEASON}"/>
+				</div>
+			</form>
+			<!-- ENDIF -->
+			<!-- IF .form_matchday and not S_MATCHDAY_HIDE -->
+			<form style="display:inline;  margin:0; padding:0;" action="{S_FORMSELF}" method="post">
+				<div style="float:left;">
+					<select name="m" onchange="this.form.submit();" title="{L_OPTION_MATCHDAY}">
+					<!-- BEGIN form_matchday -->
+						<option {form_matchday.S_SELECTED} value="{form_matchday.S_MATCHDAY}">{form_matchday.S_MATCHDAY}. {L_MATCHDAY}{form_matchday.S_CURRENT}</option>
+					<!-- END form_matchday -->
+					</select>
+					<input type="hidden" name="side" value="{S_SIDE}"/>
+					<input type="hidden" name="s" value="{S_SEASON}"/>
+					<input type="hidden" name="l" value="{S_LEAGUE}"/>
+					<input type="hidden" name="u" value="{S_USER_SEL}"/>
+				</div>
+			</form>
+			<!-- ENDIF -->
+		</div>
+		<div style="clear: both; font-size: 0.6em; margin 0px; vertical-align:center; white-space:nowrap; line-height: 1.5em;">
+			<!-- IF .form_matchday and not S_MATCHDAY_HIDE -->
+			{S_DELIVERY}
+			<!-- ELSE -->
+			<br />
+			<!-- ENDIF -->
+		</div>
+		<!-- ENDIF -->
+			<!-- IF S_DISPLAY_UNDER_CONSTRUCTION -->
+				<!-- INCLUDE mobile_under_construction.html -->
+			<!-- ENDIF -->
+
+			<!-- IF S_DISPLAY_BET -->
+				<!-- INCLUDE mobile_bet.html -->
+			<!-- ENDIF -->
+
+			<!-- IF S_DISPLAY_ALL_BETS -->
+				<!-- INCLUDE mobile_all_bets.html -->
+			<!-- ENDIF -->
+
+			<!-- IF S_DISPLAY_RESULTS -->
+				<!-- INCLUDE mobile_results.html -->
+			<!-- ENDIF -->
+
+			<!-- IF S_DISPLAY_RANKS_MATCHDAY -->
+				<!-- INCLUDE mobile_ranks.html -->
+			<!-- ENDIF -->
+
+			<!-- IF S_DISPLAY_RANKS_TOTAL -->
+				<!-- INCLUDE mobile_ranks.html -->
+			<!-- ENDIF -->
+
+			<!-- IF S_DISPLAY_BANK -->
+				<!-- INCLUDE mobile_bank.html -->
+			<!-- ENDIF -->
+
+			<!-- IF S_DISPLAY_TABLE -->
+				<!-- INCLUDE mobile_table.html -->
+			<!-- ENDIF -->
+
+			<!-- IF S_DISPLAY_LAST_USERS -->
+				<!-- INCLUDE mobile_last_users.html -->
+			<!-- ENDIF -->
+			
+			<!-- IF S_DISPLAY_ODDS -->
+				<!-- INCLUDE mobile_odds.html -->
+			<!-- ENDIF -->
+			
+			<!-- IF S_DISPLAY_MY_BETS -->
+				<!-- INCLUDE mobile_my_bets.html -->
+			<!-- ENDIF -->
+
+			<!-- IF S_DISPLAY_MY_POINTS -->
+				<!-- INCLUDE mobile_my_points.html -->
+			<!-- ENDIF -->
+
+			<!-- IF S_DISPLAY_MY_TABLE -->
+				<!-- INCLUDE mobile_my_table.html -->
+			<!-- ENDIF -->
+
+			<!-- IF S_DISPLAY_MY_RANK -->
+				<!-- INCLUDE mobile_my_rank.html -->
+			<!-- ENDIF -->
+
+			<!-- IF S_DISPLAY_MY_CHART -->
+				<!-- INCLUDE mobile_my_chart.html -->
+			<!-- ENDIF -->
+
+			<!-- IF S_DISPLAY_MY_KOEFF -->
+				<!-- INCLUDE mobile_my_koeff.html -->
+			<!-- ENDIF -->
+
+			<!-- IF S_DISPLAY_STAT_RESULTS -->
+				<!-- INCLUDE mobile_stat_results.html -->
+			<!-- ENDIF -->
+
+			<!-- IF S_DISPLAY_STAT_POINTS -->
+				<!-- INCLUDE mobile_stat_points.html -->
+			<!-- ENDIF -->
+			
+			<!-- IF S_DISPLAY_DELIVERY -->
+				<!-- INCLUDE mobile_delivery.html -->
+			<!-- ENDIF -->
+	</div>
+	<div class="copyright">
+		<!-- IF S_FOOTBALL_COPY -->{S_FOOTBALL_COPY}<!-- ENDIF -->
+		<br /><strong><a href="{U_MOBILE_SWITCH}">{L_SWITCH_DESKTOP}</a></strong>
+	</div>
+				
 <!-- INCLUDE overall_footer.html -->

styles/prosilver/template/odds.html

@@ -1,68 +1,68 @@
-<!-- IF S_DATA_ODDS -->
-	<div class="forabg">
-		<table class="football">
-			<thead>
-				<tr>
-					<th>{L_DATE}</th>
-				<!-- IF S_DISPLAY_GROUP -->
-					<th>{L_GR}</th>
-				<!-- ENDIF -->
-					<th style="text-align: center;" colspan="5">{L_VS}</th>
-					<th style="text-align: center;" colspan="3">{L_RESULT} ({RESULT_EXPLAIN})</th>
-				<!-- IF S_DISPLAY_KO -->
-					<th style="text-align: center;" colspan="3">{LABEL_FINALRESULT}</th>
-				<!-- ENDIF -->
-					<th>%</th>					
-					<th></th>					
-					<th style="text-align: center;" colspan="3">Quoten</th>
-				</tr>
-			</thead>
-			<tbody>
-		<!-- BEGIN odds -->
-				<tr class="{odds.ROW_CLASS}">
-					<td class="td_datetime">{odds.MATCH_TIME}</td>
-				<!-- IF S_DISPLAY_GROUP -->
-					<td class="td_group">{odds.GROUP}</td>
-				<!-- ENDIF -->
-					<td class="td_logo">{odds.LOGO_HOME}</td>
-					<td class="td_team"  style="cursor:pointer;" title="{L_SHOW_PLAYED}" onclick="popup('{odds.U_PLAN_HOME}', 625,625);return false;">
-						{odds.HOME_NAME}</td>
-					<td class="td_vs">:</td>
-					<td class="td_logo">{odds.LOGO_GUEST}</td>
-					<td class="td_team"  style="cursor:pointer;" title="{L_SHOW_PLAYED}" onclick="popup('{odds.U_PLAN_GUEST}', 625,625);return false;">
-						{odds.GUEST_NAME}</td>
-					<td class="td_goals_home {odds.COLOR_STYLE}">{odds.GOALS_HOME}</td>
-					<td class="td_vs">:</td>
-					<td class="td_goals_guest {odds.COLOR_STYLE}">{odds.GOALS_GUEST}</td>
-				<!-- IF S_DISPLAY_KO -->
-					<td class="td_goals_home {odds.COLOR_STYLE}">{odds.KOGOALS_HOME}</td>
-					<td class="td_vs">:</td>
-					<td class="td_goals_guest {odds.COLOR_STYLE}">{odds.KOGOALS_GUEST}</td>
-				<!-- ENDIF -->
-					<td style="text-align: center;">{odds.TREND}</td>
-					<td class="td_button">
-				<!-- IF S_VIEW <> 'print' -->
-						<a class="match_info" title="{L_MATCH_STATS}" href="{odds.U_MATCH_STATS}" onclick="popup(this.href, 818, 450, '_matchstats'); return false;"></a>
-				<!-- ELSE -->	
-						<img src="./../../ext/football/football/images/spacer.gif" alt="" width="28" height="28" />
-				<!-- ENDIF -->
-					</td>
-					<td class="td_group">{odds.ODD_1}</td>
-					<td style="text-align: center;">{odds.ODD_X}</td>
-					<td class="td_group">{odds.ODD_2}</td>
-				</tr>
-		<!-- END odds -->
-			</tbody>
-		</table>
-	</div>
-
-		<div class="right-box" style="margin-bottom:5px; height:2em">
-		</div>
-		<br />
-	<!-- INCLUDE nav_delivery.html -->
-<!-- ELSE -->
-	<br />
-	<div class="message">{L_NO_PLAN}</div>
-	<br />
-	<br />
+<!-- IF S_DATA_ODDS -->
+	<div class="forabg">
+		<table class="football">
+			<thead>
+				<tr>
+					<th>{L_DATE}</th>
+				<!-- IF S_DISPLAY_GROUP -->
+					<th>{L_GR}</th>
+				<!-- ENDIF -->
+					<th style="text-align: center;" colspan="5">{L_VS}</th>
+					<th style="text-align: center;" colspan="3">{L_RESULT} ({RESULT_EXPLAIN})</th>
+				<!-- IF S_DISPLAY_KO -->
+					<th style="text-align: center;" colspan="3">{LABEL_FINALRESULT}</th>
+				<!-- ENDIF -->
+					<th>%</th>					
+					<th></th>					
+					<th style="text-align: center;" colspan="3">Quoten</th>
+				</tr>
+			</thead>
+			<tbody>
+		<!-- BEGIN odds -->
+				<tr class="{odds.ROW_CLASS}">
+					<td class="td_datetime">{odds.MATCH_TIME}</td>
+				<!-- IF S_DISPLAY_GROUP -->
+					<td class="td_group">{odds.GROUP}</td>
+				<!-- ENDIF -->
+					<td class="td_logo">{odds.LOGO_HOME}</td>
+					<td class="td_team"  style="cursor:pointer;" title="{L_SHOW_PLAYED}" onclick="popup('{odds.U_PLAN_HOME}', 625,625);return false;">
+						{odds.HOME_NAME}</td>
+					<td class="td_vs">:</td>
+					<td class="td_logo">{odds.LOGO_GUEST}</td>
+					<td class="td_team"  style="cursor:pointer;" title="{L_SHOW_PLAYED}" onclick="popup('{odds.U_PLAN_GUEST}', 625,625);return false;">
+						{odds.GUEST_NAME}</td>
+					<td class="td_goals_home {odds.COLOR_STYLE}">{odds.GOALS_HOME}</td>
+					<td class="td_vs">:</td>
+					<td class="td_goals_guest {odds.COLOR_STYLE}">{odds.GOALS_GUEST}</td>
+				<!-- IF S_DISPLAY_KO -->
+					<td class="td_goals_home {odds.COLOR_STYLE}">{odds.KOGOALS_HOME}</td>
+					<td class="td_vs">:</td>
+					<td class="td_goals_guest {odds.COLOR_STYLE}">{odds.KOGOALS_GUEST}</td>
+				<!-- ENDIF -->
+					<td style="text-align: center;">{odds.TREND}</td>
+					<td class="td_button">
+				<!-- IF S_VIEW <> 'print' -->
+						<a title="{L_MATCH_STATS}" href="{odds.U_MATCH_STATS}" onclick="popup(this.href, 818, 450, '_matchstats'); return false;"><i class="icon fa-bar-chart fa-fw"></i></a>
+				<!-- ELSE -->	
+						<img src="./../../ext/football/football/images/spacer.gif" alt="" width="28" height="28" />
+				<!-- ENDIF -->
+					</td>
+					<td class="td_group">{odds.ODD_1}</td>
+					<td style="text-align: center;">{odds.ODD_X}</td>
+					<td class="td_group">{odds.ODD_2}</td>
+				</tr>
+		<!-- END odds -->
+			</tbody>
+		</table>
+	</div>
+
+		<div class="right-box" style="margin-bottom:5px; height:2em">
+		</div>
+		<br />
+	<!-- INCLUDE nav_delivery.html -->
+<!-- ELSE -->
+	<br />
+	<div class="message">{L_NO_PLAN}</div>
+	<br />
+	<br />
 <!-- ENDIF -->

styles/prosilver/template/rank_matchday.html

@@ -1,32 +1,32 @@
-<div class="panel">
-	<h3><span class="small-icon icon-rank"></span>&nbsp;{L_RANK_MATCHDAY}</h3>
-	<!-- IF S_DATA_RANK_MATCHDAY -->
-	<table class="forabg rank">
-		<thead>
-			<tr>
-				<th>{L_RANK_SHORT_DOT}</th>
-				<th style="text-align: left;">{L_NAME}</th>
-				<th>{L_POINTS_SHORT_DOT}</th>
-				<!-- IF S_WIN -->
-				<th style="text-align: right;">{WIN_NAME}</th>
-				<!-- ENDIF -->
-			</tr>
-		</thead>
-		<tbody>
-			<!-- BEGIN rank -->
-			<tr class="{rank.ROW_CLASS}"  style="cursor:pointer;" title="{L_SHOW_BETS}" onclick="popup('{rank.U_BET_USER}', 725,500,'_{rank.USERNAME}');return false;">
-				<td class="td_rank">{rank.RANK}</td>
-				<td class="td_name">{rank.USERNAME}</td>
-				<td class="td_pts {rank.COLOR_STYLE}">{rank.POINTS}</td>
-				<!-- IF S_WIN -->
-				<td class="td_wins">{rank.WIN}</td>
-				<!-- ENDIF -->
-			</tr>
-			<!-- END rank -->
-		</tbody>
-	</table>
-	<!-- ELSE -->
-	<div class="message">{L_NO_RESULTS}</div>
-	<br />
-	<!-- ENDIF -->
-</div >
+<div class="panel">
+	<h3><i class="icon fa-trophy fa-fw"></i>{L_RANK_MATCHDAY}</h3>
+	<!-- IF S_DATA_RANK_MATCHDAY -->
+	<table class="forabg rank">
+		<thead>
+			<tr>
+				<th>{L_RANK_SHORT_DOT}</th>
+				<th style="text-align: left;">{L_NAME}</th>
+				<th>{L_POINTS_SHORT_DOT}</th>
+				<!-- IF S_WIN -->
+				<th style="text-align: right;">{WIN_NAME}</th>
+				<!-- ENDIF -->
+			</tr>
+		</thead>
+		<tbody>
+			<!-- BEGIN rank -->
+			<tr class="{rank.ROW_CLASS}"  style="cursor:pointer;" title="{L_SHOW_BETS}" onclick="popup('{rank.U_BET_USER}', 725,500,'_{rank.USERNAME}');return false;">
+				<td class="td_rank">{rank.RANK}</td>
+				<td class="td_name">{rank.USERNAME}</td>
+				<td class="td_pts {rank.COLOR_STYLE}">{rank.POINTS}</td>
+				<!-- IF S_WIN -->
+				<td class="td_wins">{rank.WIN}</td>
+				<!-- ENDIF -->
+			</tr>
+			<!-- END rank -->
+		</tbody>
+	</table>
+	<!-- ELSE -->
+	<div class="message">{L_NO_RESULTS}</div>
+	<br />
+	<!-- ENDIF -->
+</div >

styles/prosilver/template/rank_total.html

@@ -1,37 +1,33 @@
-<div class="panel">
-	<h3><!-- IF S_VIEW <> 'print' -->
-				<span class="small-icon icon-rank"></span>&nbsp;
-		<!-- ENDIF -->
-		{L_RANK_TOTAL}
-	</h3>
-	<!-- IF S_DATA_RANK_TOTAL -->
-	<table class="forabg rank">
-		<thead>
-			<tr>
-				<th>{L_RANK_SHORT_DOT}</th>
-				<th style="text-align: left;">{L_NAME}</th>
-				<th>{L_POINTS_SHORT_DOT}</th>
-				<!-- IF S_WIN -->
-				<th style="text-align: right;">{WIN_NAME}</th>
-				<!-- ENDIF -->
-			</tr>
-		</thead>
-		<tbody>
-			<!-- BEGIN ranktotal -->
-			<tr class="{ranktotal.ROW_CLASS}"  style="cursor:pointer;" title="{L_SHOW_PROFILE}"
-					onclick="window.location.href='{ranktotal.U_PROFILE}';">
-				<td class="td_rank">{ranktotal.RANK}</td>
-				<td class="td_name">{ranktotal.USERNAME}</td>
-				<td class="td_pts {ranktotal.COLOR_STYLE}">{ranktotal.POINTS}</td>
-				<!-- IF S_WIN -->
-				<td class="td_wins">{ranktotal.WIN}</td>
-				<!-- ENDIF -->
-			</tr>
-			<!-- END ranktotal -->
-		</tbody>
-	</table>
-	<!-- ELSE -->
-	<div class="message">{L_NO_RESULTS}</div>
-	<br />
-	<!-- ENDIF -->
+<div class="panel">
+	<h3><i class="icon fa-trophy fa-fw"></i>{L_RANK_TOTAL}</h3>
+	<!-- IF S_DATA_RANK_TOTAL -->
+	<table class="forabg rank">
+		<thead>
+			<tr>
+				<th>{L_RANK_SHORT_DOT}</th>
+				<th style="text-align: left;">{L_NAME}</th>
+				<th>{L_POINTS_SHORT_DOT}</th>
+				<!-- IF S_WIN -->
+				<th style="text-align: right;">{WIN_NAME}</th>
+				<!-- ENDIF -->
+			</tr>
+		</thead>
+		<tbody>
+			<!-- BEGIN ranktotal -->
+			<tr class="{ranktotal.ROW_CLASS}"  style="cursor:pointer;" title="{L_SHOW_PROFILE}"
+					onclick="window.location.href='{ranktotal.U_PROFILE}';">
+				<td class="td_rank">{ranktotal.RANK}</td>
+				<td class="td_name">{ranktotal.USERNAME}</td>
+				<td class="td_pts {ranktotal.COLOR_STYLE}">{ranktotal.POINTS}</td>
+				<!-- IF S_WIN -->
+				<td class="td_wins">{ranktotal.WIN}</td>
+				<!-- ENDIF -->
+			</tr>
+			<!-- END ranktotal -->
+		</tbody>
+	</table>
+	<!-- ELSE -->
+	<div class="message">{L_NO_RESULTS}</div>
+	<br />
+	<!-- ENDIF -->
 </div>

styles/prosilver/template/ranks.html

@@ -1,108 +1,113 @@
-<!-- IF S_DATA_RANKS --> 
-	<!-- IF S_HEADER -->
-	<div style="text-align:center">
-		<h3>{S_HEADER}</h3>
-	</div>
-	<!-- ENDIF -->
-	<div class="left-box">
-		<span class="color_finally">{L_FINALLY}</span> - <span class="color_provisionally">{L_PROVISIONALLY}</span>
-	</div>
-	<!-- IF S_VIEW <> 'print' -->
-		<!-- IF S_VIEW <> 'print' -->
-			<!-- IF .pagination -->
-			<div class="pagination top-pagination">
-				<!-- INCLUDE pagination.html -->
-			</div>
-			<!-- ENDIF -->	
-		<!-- ENDIF -->
-	<!-- ENDIF -->
-	<br style="clear:both"/>
-	<div class="forabg">
-		<table class="football">
-			<thead>
-				<tr> 
-					<th>{L_PLACE}</th>
-					<!-- IF not S_HEADER -->
-					<th title="{L_TEND_RANK}">{L_TENDENCY}</th>
-					<!-- ENDIF -->
-					<th style="text-align:left">{L_NAME}</th>
-					<!-- IF S_LINK_RANKING <> '' and S_LINK_ALL_TIME <> '' -->
-					<th>{L_SEASON}</th>
-					<th>{L_PLACE}</th>
-					<!-- ENDIF -->
-					<th title="{L_CNT_BET}">{L_BETS}</th>
-					<th title="{L_CNT_NO_BET}">{L_NO_BET}</th>
-					<th title="{L_CNT_TEND}">{L_TENDENCIES}</th>
-					<th title="{L_CNT_HIT}">{L_DIRECTHITS}</th>
-					<!-- IF not S_HEADER and S_DISPLAY_HITS02 -->
-					<th title="{L_CNT_HIT02}">{L_DIRECTHITS02}</th>
-					<!-- ENDIF -->
-					<th style="text-align: right;">{L_POINTS}</th>
-					<!-- IF S_WIN -->
-					<th style="text-align: right;">{WIN_NAME}</th>
-					<!-- ENDIF -->
-				</tr>
-			</thead>
-			<tbody>
-			<!-- BEGIN rankstotal -->
-				<tr class="{rankstotal.ROW_CLASS}"  style="cursor:pointer;" title="{L_SHOW_PROFILE}"
-						onclick="window.location.href='{rankstotal.U_PROFILE}';">
-					<td class="td_rank">{rankstotal.RANK}</td>
-					<!-- IF not S_HEADER -->
-					<td><!-- IF S_VIEW == 'print' -->{rankstotal.CHANGE_SIGN}<!-- ELSE -->{rankstotal.CHANGE_IMG}<!-- ENDIF -->{rankstotal.CHANGE_DIFFER}</td>
-					<!-- ENDIF -->
-					<td class="td_name">{rankstotal.USERNAME}</td>
-					<!-- IF S_LINK_RANKING <> '' and S_LINK_ALL_TIME <> '' -->
-					<td class="td_hits">{rankstotal.SEASON}</td>
-					<td class="td_rank">{rankstotal.SEASON_RANK}</td>
-					<!-- ENDIF -->
-					<td class="td_hits">{rankstotal.BETS}</td>
-					<td class="td_hits">{rankstotal.NOBETS}</td>
-					<td class="td_hits">{rankstotal.TENDENCIES}</td>
-					<td class="td_hits">{rankstotal.DIRECTHITS}</td>
-					<!-- IF not S_HEADER and S_DISPLAY_HITS02 -->
-					<td class="td_hits">{rankstotal.DIRECTHITS02}</td>
-					<!-- ENDIF -->
-					<td class="td_pts {rankstotal.COLOR_STYLE}">{rankstotal.POINTS}</td>
-					<!-- IF S_WIN -->
-					<td class="td_wins">{rankstotal.WIN}</td>
-					<!-- ENDIF -->
-				</tr>
-			<!-- END rankstotal -->
-			</tbody>
-		</table>
-	</div>
-	<!-- IF S_SHOW_OTHER_LINKS -->	
-	<div class="left-box">
-		<!-- IF S_LINK_RANKING <> '' -->
-		<a href="{S_LINK_RANKING}" title="{L_TITLE_RANKING}"><strong>{L_RANKING}</strong></a>  &bull; 
-		<!-- ENDIF -->
-		<!-- IF S_LINK_ALL_TIME <> '' -->
-		<a href="{S_LINK_ALL_TIME}" title="{L_TITLE_RANKING_All_TIME}"><strong>{L_RANKING_ALL_TIME}</strong></a>
-		<!-- ENDIF -->
-		<!-- IF S_LINK_ALL_TIME <> '' and S_LINK_COMPARE <> '' --> &bull; <!-- ENDIF -->
-		<!-- IF S_LINK_COMPARE <> '' -->
-		<a href="{S_LINK_COMPARE}" title="{L_TITLE_RANKING_COMPARE}"><strong>{L_RANKING_COMPARE}</strong></a>
-		<!-- ENDIF -->
-	</div>
-	<!-- ENDIF -->
-
-	<!-- IF S_VIEW <> 'print' -->
-		<!-- IF .pagination or TOTAL_USERS -->
-		<div class="pagination">
-			{TOTAL_USERS}
-			<!-- IF .pagination -->
-				<!-- INCLUDE pagination.html -->
-			<!-- ELSE -->
-				&bull; {PAGE_NUMBER}
-			<!-- ENDIF -->
-		</div>
-		<!-- ENDIF -->	
-	<!-- ENDIF -->
-	<!-- INCLUDE nav_delivery.html -->
-
-<!-- ELSE -->
-	<br />
-	<div class="message">{L_NO_RESULTS}</div>
-	<br />
-<!-- ENDIF -->
+<!-- IF S_DATA_RANKS --> 
+	<!-- IF S_HEADER -->
+	<div style="text-align:center">
+		<h3>{S_HEADER}</h3>
+	</div>
+	<!-- ENDIF -->
+	<div class="left-box">
+		<span class="color_finally">{L_FINALLY}</span> - <span class="color_provisionally">{L_PROVISIONALLY}</span>
+	</div>
+	<!-- IF S_VIEW <> 'print' -->
+		<!-- IF S_VIEW <> 'print' -->
+			<!-- IF .pagination -->
+			<div class="pagination top-pagination">
+				<!-- INCLUDE pagination.html -->
+			</div>
+			<!-- ENDIF -->	
+		<!-- ENDIF -->
+	<!-- ENDIF -->
+	<br style="clear:both"/>
+	<div class="forabg">
+		<table class="football">
+			<thead>
+				<tr> 
+					<th>{L_PLACE}</th>
+					<!-- IF not S_HEADER -->
+					<th title="{L_TEND_RANK}">{L_TENDENCY}</th>
+					<!-- ENDIF -->
+					<th style="text-align:left">{L_NAME}</th>
+					<!-- IF S_LINK_RANKING <> '' and S_LINK_ALL_TIME <> '' -->
+					<th>{L_SEASON}</th>
+					<th>{L_PLACE}</th>
+					<!-- ENDIF -->
+					<th title="{L_CNT_BET}">{L_BETS}</th>
+					<th title="{L_CNT_NO_BET}">{L_NO_BET}</th>
+					<th title="{L_CNT_TEND}">{L_TENDENCIES}</th>
+					<th title="{L_CNT_HIT}">{L_DIRECTHITS}</th>
+					<!-- IF not S_HEADER and S_DISPLAY_HITS02 -->
+					<th title="{L_CNT_HIT02}">{L_DIRECTHITS02}</th>
+					<!-- ENDIF -->
+					<th style="text-align: right;">{L_POINTS}</th>
+					<!-- IF S_WIN -->
+					<th style="text-align: right;">{WIN_NAME}</th>
+					<!-- ENDIF -->
+				</tr>
+			</thead>
+			<tbody>
+			<!-- BEGIN rankstotal -->
+				<tr class="{rankstotal.ROW_CLASS}"  style="cursor:pointer;" title="{L_SHOW_PROFILE}"
+						onclick="window.location.href='{rankstotal.U_PROFILE}';">
+					<td class="td_rank">{rankstotal.RANK}</td>
+					<!-- IF not S_HEADER -->
+					<td><!-- IF S_VIEW == 'print' -->{rankstotal.CHANGE_SIGN}
+						<!-- ELSE -->	<!-- IF rankstotal.WORSENED -->	<i class="icon fa-arrow-down fa-fw icon-red" aria-hidden="true"></i><!-- ENDIF -->
+										<!-- IF rankstotal.NO_CHANGES --><i class="icon fa-circle fa-fw icon-gray" aria-hidden="true"></i><!-- ENDIF -->
+										<!-- IF rankstotal.IMPROVED --><i class="icon fa-arrow-up fa-fw icon-green" aria-hidden="true"></i><!-- ENDIF -->
+						<!-- ENDIF -->{rankstotal.CHANGE_DIFFER}
+					</td>
+					<!-- ENDIF -->
+					<td class="td_name">{rankstotal.USERNAME}</td>
+					<!-- IF S_LINK_RANKING <> '' and S_LINK_ALL_TIME <> '' -->
+					<td class="td_hits">{rankstotal.SEASON}</td>
+					<td class="td_rank">{rankstotal.SEASON_RANK}</td>
+					<!-- ENDIF -->
+					<td class="td_hits">{rankstotal.BETS}</td>
+					<td class="td_hits">{rankstotal.NOBETS}</td>
+					<td class="td_hits">{rankstotal.TENDENCIES}</td>
+					<td class="td_hits">{rankstotal.DIRECTHITS}</td>
+					<!-- IF not S_HEADER and S_DISPLAY_HITS02 -->
+					<td class="td_hits">{rankstotal.DIRECTHITS02}</td>
+					<!-- ENDIF -->
+					<td class="td_pts {rankstotal.COLOR_STYLE}">{rankstotal.POINTS}</td>
+					<!-- IF S_WIN -->
+					<td class="td_wins">{rankstotal.WIN}</td>
+					<!-- ENDIF -->
+				</tr>
+			<!-- END rankstotal -->
+			</tbody>
+		</table>
+	</div>
+	<!-- IF S_SHOW_OTHER_LINKS -->	
+	<div class="left-box">
+		<!-- IF S_LINK_RANKING <> '' -->
+		<a href="{S_LINK_RANKING}" title="{L_TITLE_RANKING}"><strong>{L_RANKING}</strong></a>  &bull; 
+		<!-- ENDIF -->
+		<!-- IF S_LINK_ALL_TIME <> '' -->
+		<a href="{S_LINK_ALL_TIME}" title="{L_TITLE_RANKING_All_TIME}"><strong>{L_RANKING_ALL_TIME}</strong></a>
+		<!-- ENDIF -->
+		<!-- IF S_LINK_ALL_TIME <> '' and S_LINK_COMPARE <> '' --> &bull; <!-- ENDIF -->
+		<!-- IF S_LINK_COMPARE <> '' -->
+		<a href="{S_LINK_COMPARE}" title="{L_TITLE_RANKING_COMPARE}"><strong>{L_RANKING_COMPARE}</strong></a>
+		<!-- ENDIF -->
+	</div>
+	<!-- ENDIF -->
+
+	<!-- IF S_VIEW <> 'print' -->
+		<!-- IF .pagination or TOTAL_USERS -->
+		<div class="pagination">
+			{TOTAL_USERS}
+			<!-- IF .pagination -->
+				<!-- INCLUDE pagination.html -->
+			<!-- ELSE -->
+				&bull; {PAGE_NUMBER}
+			<!-- ENDIF -->
+		</div>
+		<!-- ENDIF -->	
+	<!-- ENDIF -->
+	<!-- INCLUDE nav_delivery.html -->
+
+<!-- ELSE -->
+	<br />
+	<div class="message">{L_NO_RESULTS}</div>
+	<br />
+<!-- ENDIF -->

styles/prosilver/template/side_table.html

@@ -1,36 +1,36 @@
-<div class="panel">
-	<h3><span class="small-icon icon-rank"></span>&nbsp;{L_TABLE_TOTAL}</h3>
-	<!-- IF S_DATA_SIDE_TABLE -->
-		<table class="forabg rank">
-			<thead>
-				<tr>
-					<th>{L_RANK_SHORT}</th>
-					<th  colspan="2" style="text-align: center;">{L_TEAM}</th>
-					<th>{L_GAMES_SHORT}</th>
-					<th style="text-align: right;">{L_POINTS_SHORT}</th>
-				</tr>
-			</thead>
-			<tbody>
-			<!-- BEGIN side_total -->
-				<!-- IF side_total.GROUP <> '' -->
-				<tr class="row_group">
-					<td colspan="12" style="text-align: center;">{side_total.GROUP}</td>
-				</tr>
-				<!-- ELSE -->
-				<tr class="{side_total.ROW_CLASS}"  style="cursor:pointer;" title="{L_SHOW_PLAYED}" onclick="popup('{side_total.U_PLAN_TEAM}');return false;">
-					<td class="td_rank">{side_total.RANK}</td>
-					<td class="td_logo">{side_total.LOGO}</td>
-					<td class="td_team">{side_total.TEAM_SHORT}</td>
-					<td class="td_hits">{side_total.GAMES}</td>
-					<td class="td_pts">{side_total.POINTS}</td>
-				</tr>
-				<!-- ENDIF -->
-			<!-- END side_total -->
-		</tbody>
-		</table>
-	<!-- ELSE -->
-	<div class="message">{L_NO_TABLE}</div>
-	<br />
-	<!-- ENDIF -->
-</div>
-
+<div class="panel">
+	<h3><i class="icon fa-list-ol fa-fw"></i>{L_TABLE_TOTAL}</h3>
+	<!-- IF S_DATA_SIDE_TABLE -->
+		<table class="forabg rank">
+			<thead>
+				<tr>
+					<th>{L_RANK_SHORT}</th>
+					<th  colspan="2" style="text-align: center;">{L_TEAM}</th>
+					<th>{L_GAMES_SHORT}</th>
+					<th style="text-align: right;">{L_POINTS_SHORT}</th>
+				</tr>
+			</thead>
+			<tbody>
+			<!-- BEGIN side_total -->
+				<!-- IF side_total.GROUP <> '' -->
+				<tr class="row_group">
+					<td colspan="12" style="text-align: center;">{side_total.GROUP}</td>
+				</tr>
+				<!-- ELSE -->
+				<tr class="{side_total.ROW_CLASS}"  style="cursor:pointer;" title="{L_SHOW_PLAYED}" onclick="popup('{side_total.U_PLAN_TEAM}');return false;">
+					<td class="td_rank">{side_total.RANK}</td>
+					<td class="td_logo">{side_total.LOGO}</td>
+					<td class="td_team">{side_total.TEAM_SHORT}</td>
+					<td class="td_hits">{side_total.GAMES}</td>
+					<td class="td_pts">{side_total.POINTS}</td>
+				</tr>
+				<!-- ENDIF -->
+			<!-- END side_total -->
+		</tbody>
+		</table>
+	<!-- ELSE -->
+	<div class="message">{L_NO_TABLE}</div>
+	<br />
+	<!-- ENDIF -->
+</div>
+

styles/prosilver/theme/football.css

@@ -3,6 +3,15 @@
  * @copyright (c) 2016 football (http://football.bplaced.net)
  * @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
  * ----------------------------------------------------------------------------------------- */
+.fa-paragraph:before {
+    font-weight: bold;
+    content: '§';
+}
+
+ul.dropdown-contents i.icon {
+	display: inline;
+	float: left;
+}
 
 .football-table-scroll { 
     overflow-x:auto;
@@ -31,34 +40,6 @@
 	font-size: 0;
 }
 
-
-span.small-icon {
-	display: inline-block;
-	vertical-align: top;
-	overflow: hidden;
-	width: 16px;
-	height: 14px;
-}
-
-.icon-allbets		{ background-image: url("./images/icon_allbets.gif"); }
-.icon-ball			{ background-image: url("./images/icon_ball.gif"); }
-.icon-ball2			{ background-image: url("./images/icon_ball2.gif"); }
-.icon-bet			{ background-image: url("./images/icon_bet.gif"); }
-.icon-bookmark		{ background-image: url("./images/icon_bookmark.gif"); }
-.icon-download		{ background-image: url("./images/icon_download.gif"); }
-.icon-football		{ background-image: url("./images/icon_football.gif"); background-repeat: no-repeat; }
-.icon-info			{ background-image: url("./images/icon_info.gif"); }
-.icon-list			{ background-image: url("./images/icon_list.gif"); }
-.icon-mark			{ background-image: url("./images/icon_mark.gif"); }
-.icon-odds			{ background-image: url("./images/icon_odds.gif"); }
-.icon-points		{ background-image: url("./images/icon_points.gif"); }
-.icon-print			{ background-image: url("./images/icon_print.gif"); }
-.icon-rank			{ background-image: url("./images/icon_rank.gif"); }
-.icon-results		{ background-image: url("./images/icon_results.gif"); }
-.icon-rules			{ background-image: url("./images/icon_rules.gif"); }
-.icon-statistics	{ background-image: url("./images/icon_statistics.gif"); }
-.icon-xml			{ background-image: url("./images/icon_xml.gif"); }
-
 /**
 * Replacement for table layout
 */
@@ -163,6 +144,13 @@ div.info {
 	width: 155px;
 }
 
+.football_nav {
+	margin-bottom: 5px;
+	padding: 5px 5px;
+	clear: both; 
+	line-height:2em;
+}
+
 .football_bg {
 	margin-bottom: 5px;
 	padding: 0 5px;
@@ -266,42 +254,6 @@ a.pastlink:hover, a.futurelink:hover  {
 	text-decoration: underline; 
 }
 
-a.football_print {
-	background-image: url("./images/icon_print.gif");
-	display: inline-block;
-	vertical-align: top;
-	overflow: hidden;
-	width: 16px;
-	height: 14px;
-}
-
-a.match_info {
-	display: block;
-	overflow: hidden;
-	width: 28px;
-	height: 28px;
-	text-indent: -5000px;
-	text-align: left;
-	background-repeat: no-repeat;
-	background-image: url("./images/icon_statistic.gif");
-}
-
-a.prev_matchday {
-	background: transparent url("./images/left_arrow.png") no-repeat scroll 50% 0;
-	display: inline-block;
-	overflow: hidden;
-	width: 16px;
-	height: 16px;
-}
-
-a.next_matchday {
-	background: transparent url("./images/right_arrow.png") no-repeat scroll 0 0;
-	display: inline-block;
-	overflow: hidden;
-	width: 16px;
-	height: 16px;
-}
-
 .message {
 	font-weight: bold;
 	color: #AA0000;