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/all_bets_module.php

@@ -47,10 +47,8 @@ class all_bets_module
 	{
 		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);
+		
+		$helper = $phpbb_container->get('controller.helper');
 		
 		$this->tpl_name = 'acp_football_all_bets';
 		$this->page_title = 'ACP_FOOTBALL_ALL_BETS_VIEW';
@@ -221,7 +219,6 @@ class all_bets_module
 			$split_after = $count_matches; 
 			$splits = 1;
 		}
-		$db->sql_freeresult($result);
 
 		// Make sure $start is set to the last page if it exceeds the amount
 		if ($start < 0 || $start >= $total_users)
@@ -313,7 +310,7 @@ class all_bets_module
 							$total = 0;
 						}	
 						$bet_index++;
-						$total += $user_bet['points'];
+						$total += ($user_bet['points'] == '') ? 0 : $user_bet['points'];
 						if ($user_bet['status'] < 3)
 						{
 							$colorstyle_total = ' color_provisionally';
@@ -421,7 +418,7 @@ class all_bets_module
 					$total = 0;
 				}	
 				$bet_index++;
-				$total += $user_bet['points'];
+				$total += ($user_bet['points'] == '') ? 0 : $user_bet['points'];
 				if ($user_bet['status'] < 3)
 				{
 					$colorstyle_total = ' color_provisionally';
@@ -575,7 +572,9 @@ class all_bets_module
 					)
 				);
 			}
+			$db->sql_freeresult($result_bet);
 		}
+		$db->sql_freeresult($result);
 		
 		$legend = delivery($season, $league, $matchday);
 

acp/bank_module.php

@@ -47,10 +47,8 @@ class bank_module
 	{
 		global $db, $auth, $phpbb_container, $phpbb_admin_path, $league_info, $functions_points;
 		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);
+		
+		$helper = $phpbb_container->get('controller.helper');
 		
 		if (!$this->config['football_bank'])
 		{
@@ -186,6 +184,7 @@ class bank_module
 									AND points_type IN (" . POINTS_MATCHDAY . ',' . POINTS_SEASON . ',' . POINTS_MOST_HITS . ',' . POINTS_MOST_HITS_AWAY . ')';
 							$result = $db->sql_query($sql);
 							$count_updates += $db->sql_affectedrows();
+							$db->sql_freeresult($result);
 						}
 						else
 						{
@@ -201,6 +200,7 @@ class bank_module
 									HAVING win > 0";
 							$result = $db->sql_query($sql);
 							$points_ary = $db->sql_fetchrowset($result);
+							$db->sql_freeresult($result);
 							if (!$default_matchday)
 							{
 								$matchday = (curr_matchday($season, $league) > 0) ? curr_matchday($season, $league) : 1;
@@ -353,6 +353,7 @@ class bank_module
 								AND points_type = $type";
 						$result = $db->sql_query($sql);
 						$count_updates += $db->sql_affectedrows();
+						$db->sql_freeresult($result);
 					}
 					$back_link =  $this->u_action . '&action=list&s=' . $season . '&l=' . $league . '&t=' . $type . '&start=' . $start;
 					trigger_error(sprintf($user->lang['LEAGUE_' . $points_var . ($count_updates == 1 ? '' : 'S')], $count_updates) . adm_back_link($back_link));

acp/bets_module.php

@@ -39,10 +39,8 @@ class bets_module
 	{
 		global $db, $auth, $phpbb_container, $phpbb_admin_path, $league_info, $functions_points;
 		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);
+				
+		$helper = $phpbb_container->get('controller.helper');
 
 		$this->ext_football_path = $phpbb_root_path . 'ext/football/football/';
 		if(!function_exists('season_info'))
@@ -327,6 +325,7 @@ class bets_module
 							}
 						}
 					}
+					$db->sql_freeresult($resultopen);
 					if ($count_updates > 0)
 					{
 						if ($same AND ($count_matches > 6) AND $this->config['football_same_allowed'] == 0)
@@ -360,7 +359,6 @@ class bets_module
 					{
 						$success[] = sprintf($user->lang['NO_BETS_SAVED']);
 					}
-					$db->sql_freeresult($resultopen);
 
 					// extra bets
 					$sql = 'SELECT * FROM ' . FOOTB_EXTRA . " WHERE season = $season AND league = $league  AND matchday = $matchday";
@@ -420,6 +418,7 @@ class bets_module
 							}
 						}
 					}
+					$db->sql_freeresult($resultextra);
 					if ($count_extra_updates)
 					{
 						$success[] = sprintf($user->lang['EXTRA_BET' . (($count_extra_updates == 1) ? '' : 'S') . '_SAVED'], $count_extra_updates);
@@ -584,6 +583,7 @@ class bets_module
 				)
 			);
 		}
+		$db->sql_freeresult($resultopen);
 
 		// Calculate extra bets of matchday
 		// Start select team

acp/extra_module.php

@@ -47,10 +47,8 @@ class extra_module
 	{
 		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);
+		
+		$helper = $phpbb_container->get('controller.helper');
 		
 		$this->tpl_name = 'acp_football_extra';
 		$this->page_title = 'ACP_FOOTBALL_EXTRA_MANAGE';
@@ -154,8 +152,6 @@ class extra_module
 			$db->sql_freeresult($result);
 		}
 		
-		$db->sql_freeresult($result);
-		
 		// Which page?
 		switch ($action)
 		{
@@ -267,7 +263,7 @@ class extra_module
 							$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++)
 					{

acp/football_module.php

@@ -51,10 +51,8 @@ class football_module
 	{
 		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);
+		
+		$helper = $phpbb_container->get('controller.helper');
 		
 		$user->add_lang('acp/board');
 
@@ -79,7 +77,7 @@ class football_module
 				));
 
 				// Pull the array data from the lang pack
-				foreach ($user->help as $help_ary)
+				foreach ($user->lang['FOOTBALL_HELP_FAQ'] as $help_ary)
 				{
 					if ($help_ary[0] == '--')
 					{
@@ -109,7 +107,7 @@ class football_module
 						'football_header_enable'	=> array('lang' => 'FOOTBALL_HEADER_ENABLE','validate' => 'bool',	'type' => 'radio:yes_no', 'explain' => true),
 						'football_guest_view'		=> array('lang' => 'GUEST_VIEW',		'validate' => 'bool',	'type' => 'radio:yes_no', 'explain' => true),
 						'football_user_view'		=> array('lang' => 'USER_VIEW',			'validate' => 'bool',	'type' => 'radio:yes_no', 'explain' => true),
-						'football_host_timezone'	=> array('lang' => 'HOST_TIMEZONE',		'validate' => 'string',	'type' => 'select', 'function' => 'phpbb_timezone_select', 'params' => array($template, $user, '{CONFIG_VALUE}', true), 'explain' => true),
+						'football_time_shift'		=> array('lang' => 'TIME_SHIFT',		'validate' => 'int',	'type' => 'select', 'method' => 'time_shift_select', 'params' => array('{CONFIG_VALUE}', false), 'explain' => true),
 						'football_info_display'		=> array('lang' => 'FOOTBALL_INFO',		'validate' => 'bool',	'type' => 'custom', 'method' => 'football_info', 'explain' => true),
 						'football_info'				=> false,
 						'football_win_name'			=> array('lang' => 'WIN_NAME',			'validate' => 'string',	'type' => 'text:6:6', 'explain' => true),
@@ -122,6 +120,8 @@ class football_module
 						'legend2'				=> 'GENERAL_SETTINGS',
 						'football_left_column_width'	=> array('lang' => 'LEFT_COLUMN',	'validate' => 'int',	'type' => 'text:3:3', 'explain' => true),
 						'football_right_column_width'	=> array('lang' => 'RIGHT_COLUMN',	'validate' => 'int',	'type' => 'text:3:3', 'explain' => true),
+						'football_display_last_users'	=> array('lang' => 'DISPLAY_LAST_USERS', 'validate' => 'int','type' => 'text:3:3', 'explain' => true),
+						'football_display_last_results'	=> array('lang' => 'DISPLAY_LAST_RESULTS', 'validate' => 'int','type' => 'text:3:3', 'explain' => true),
 						'football_display_ranks'		=> array('lang' => 'DISPLAY_RANKS',	'validate' => 'int',	'type' => 'text:3:3', 'explain' => true),
 						'football_users_per_page'		=> array('lang' => 'USERS_PAGE',	'validate' => 'int',	'type' => 'text:3:3', 'explain' => true),
 
@@ -364,7 +364,7 @@ class football_module
 	}
 
 	/**
-	* Adjust Cronjob EMail remember next un
+	* Adjust Cronjob EMail remember next run
 	*/
 	function next_run($value, $key = '')
 	{
@@ -421,6 +421,18 @@ class football_module
 			$year_options . ' ' . $user->lang['HOURS'] . ': ' . $hour_options . ' ' . $user->lang['MINUTES'] . ': ' . $minute_options;
 
 	}
+
+	function time_shift_select($default = 0)
+	{
+		$time_shift_options = "";
+		for ($i = -23; $i < 24; $i++)
+		{
+			$selected = ($i == $default) ? ' selected="selected"' : '';
+			$time_shift_options .= '<option value="' . $i . '"' . $selected . '>' . $i . '</option>';
+		}
+		return $time_shift_options;
+	}
+
 }
 
 ?>

acp/ko_module.php

@@ -47,10 +47,8 @@ class ko_module
 	{
 		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);
+		
+		$helper = $phpbb_container->get('controller.helper');
 		
 		$this->tpl_name = 'acp_football_ko';
 		$this->page_title = 'ACP_FOOTBALL_KO_MANAGE';

acp/leagues_module.php

@@ -47,10 +47,8 @@ class leagues_module
 	{
 		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);
+		
+		$helper = $phpbb_container->get('controller.helper');
 		
 		$this->tpl_name = 'acp_football_leagues';
 		$this->page_title = 'ACP_FOOTBALL_LEAGUES_MANAGE';
@@ -155,7 +153,6 @@ class leagues_module
 					$result = $db->sql_query($sql);
 					if (!($row = $db->sql_fetchrow($result)))
 					{
-						$db->sql_freeresult($result);
 						trigger_error($user->lang['NO_MEMBERS_SELECTED'] . adm_back_link($this->u_action . "&action=list&s=$season&l=$league"), E_USER_WARNING);
 					}
 

acp/matchdays_module.php

@@ -47,10 +47,8 @@ class matchdays_module
 	{
 		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);
+		
+		$helper = $phpbb_container->get('controller.helper');
 		
 		$this->tpl_name = 'acp_football_matchdays';
 		$this->page_title = 'ACP_FOOTBALL_MATCHDAYS_MANAGE';
@@ -325,6 +323,7 @@ class matchdays_module
 					ORDER BY matchday ASC, number ASC";
 				$result = $db->sql_query($sql);
 				$rows_matchdays = $db->sql_fetchrowset($result);
+				$db->sql_freeresult($result);
 				$row_number = 0;
 				foreach ($rows_matchdays as $row_matchday)
 				{
@@ -712,7 +711,7 @@ class matchdays_module
 						if ($data['dday1_day'] <> '--' and $data['dday1_month'] <> '--' and $data['dday1_year'] <> '--')
 						{
 							$delivery_timestamp = mktime($data['dday1_hour'], $data['dday1_min'], 0, $data['dday1_month'], $data['dday1_day'], $data['dday1_year']);
-							$local_board_time = time() + (($this->config['board_timezone'] - $this->config['football_host_timezone']) * 3600); 
+							$local_board_time = time() + ($this->config['football_time_shift'] * 3600); 
 							if ($delivery_timestamp > $local_board_time AND $matchday_row['status'] == 0)
 							{
 								// check if delivery is before all open matches 
@@ -766,6 +765,7 @@ class matchdays_module
 									// reopen matchday
 									$matchday_row['status'] = 0;
 								}
+								$db->sql_freeresult($result);
 							}
 						}
 						else

acp/matches_module.php

@@ -47,10 +47,8 @@ class matches_module
 	{
 		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);
+		
+		$helper = $phpbb_container->get('controller.helper');
 		
 		$this->tpl_name = 'acp_football_matches';
 		$this->page_title = 'ACP_FOOTBALL_MATCHES_MANAGE';
@@ -415,7 +413,7 @@ class matches_module
 						if ($data['mday_day'] <> '--' and $data['mday_month'] <> '--' and $data['mday_year'] <> '--')
 						{
 							$match_timestamp = mktime($data['mday_hour'], $data['mday_min'], 0, $data['mday_month'], $data['mday_day'], $data['mday_year']);
-							$local_board_time = time() + (($this->config['board_timezone'] - $this->config['football_host_timezone']) * 3600); 
+							$local_board_time = time() + ($this->config['football_time_shift'] * 3600); 
 							if ($match_timestamp > $local_board_time AND $match_row['status'] < 3 AND $league_info['bet_in_time'] == 1)
 							{
 								// Bet in time and match moved to future
@@ -629,7 +627,7 @@ class matches_module
 					$selected_home = ($home_id && $row['team_id'] == $home_id) ? ' selected="selected"' : '';
 					$team_home_options .= '<option value="' . $row['group_id'] . ';' . $row['team_id'] .'"' . $selected_home . '>' . $row['team_name'] . '</option>';
 				}
-
+				$db->sql_freeresult($result);
 				$u_back = $this->u_action . "&amp;s=$season&amp;l=$league&amp;m=$matchday";
 
 				$template->assign_vars(array(

acp/results_module.php

@@ -46,10 +46,8 @@ class results_module
 	{
 		global $db, $auth, $phpbb_container, $phpbb_admin_path, $league_info, $functions_points;
 		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);
+		
+		$helper = $phpbb_container->get('controller.helper');
 		
 		if ($phpbb_extension_manager->is_enabled('dmzx/ultimatepoints')) {
 			// Get an instance of the ultimatepoints functions_points
@@ -194,7 +192,7 @@ class results_module
 		{
 			trigger_error(sprintf($user->lang['NO_MATCHDAY'], $league_info['league_name'], $season) . adm_back_link($this->u_action . "&s=$season&l=$league"), E_USER_WARNING);
 		}
-		$local_board_time = time() + (($this->config['board_timezone'] - $this->config['football_host_timezone']) * 3600); 
+		$local_board_time = time() + ($this->config['football_time_shift'] * 3600); 
 	
 		// Which page?
 		switch ($action)
@@ -384,6 +382,7 @@ class results_module
 						}
 					}
 				}
+				$db->sql_freeresult($resultextra);
 				if ($count_extra_updates)
 				{
 					$success[] =  sprintf($user->lang['EXTRA_RESULT' . (($count_extra_updates == 1) ? '' : 'S') . '_SAVED'], $count_extra_updates);
@@ -770,6 +769,7 @@ class results_module
 				);
 			}
 		}
+		$db->sql_freeresult($result);
 		
 		switch ($league_info['bet_ko_type'])
 		{

acp/seasons_module.php

@@ -47,10 +47,8 @@ class seasons_module
 	{
 		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);
+		
+		$helper = $phpbb_container->get('controller.helper');
 		
 		$this->tpl_name = 'acp_football_seasons';
 		$this->page_title = 'ACP_FOOTBALL_SEASONS_MANAGE';

acp/teams_module.php

@@ -37,10 +37,8 @@ class teams_module
 	{
 		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);
+		
+		$helper = $phpbb_container->get('controller.helper');
 		
 		$this->ext_football_path = $phpbb_root_path . 'ext/football/football/';
 		if(!function_exists('season_info'))

acp/update_module.php

@@ -36,10 +36,8 @@ class update_module
 	{
 		global $db, $auth, $phpbb_container, $phpbb_admin_path, $league_info, $functions_points;
 		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);
+		
+		$helper = $phpbb_container->get('controller.helper');
 		
 		$user->add_lang_ext('football/football', 'info_acp_update');
 
@@ -90,10 +88,8 @@ class update_module
 	{
 		global $db, $auth, $phpbb_container, $phpbb_admin_path, $league_info, $functions_points, $phpbb_log;
 		global $template, $user, $config, $phpbb_extension_manager, $request, $phpbb_root_path, $phpEx, $cache;
-		$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);
+		
+		$helper = $phpbb_container->get('controller.helper');
 		
 		$this->ext_football_path = $phpbb_root_path . 'ext/football/football/';
 		if(!function_exists('season_info'))
@@ -401,6 +397,7 @@ class update_module
 					{
 						$error[] = sprintf($user->lang['MISMATCH_MATCHDAYS'], $row['matchdays']);
 					}
+					$db->sql_freeresult($result);
 					
 					$sql = 'SELECT COUNT(match_no) as matches
 							FROM ' . FOOTB_MATCHES . " 
@@ -418,6 +415,7 @@ class update_module
 					{
 						$error[] = sprintf($user->lang['MISMATCH_MATCHES'], $row['matches']);
 					}
+					$db->sql_freeresult($result);
 					
 					if (!sizeof($error))
 					{
@@ -551,6 +549,7 @@ class update_module
 						$count_updates++;
 						$effected_matchdays = ($effected_matchdays == '') ? $row['matchday'] : $effected_matchdays . ', ' . $row['matchday'];
 					}
+					$db->sql_freeresult($result);
 					if ($effected_matchdays <> '')
 					{
 						$sql = 'REPLACE INTO ' . FOOTB_MATCHDAYS . ' (season, league, matchday, status, delivery_date, delivery_date_2, delivery_date_3, matchday_name, matches)
@@ -595,6 +594,7 @@ class update_module
 						$count_updates++;
 						$effected_matchdays = ($effected_matchdays == '') ? $row['matchday'] : $effected_matchdays . ', ' . $row['matchday'];
 					}
+					$db->sql_freeresult($result);
 					if ($effected_matchdays <> '')
 					{
 						$sql = 'REPLACE INTO ' . FOOTB_MATCHDAYS . ' (season, league, matchday, status, delivery_date, delivery_date_2, delivery_date_3, matchday_name, matches)
@@ -639,6 +639,7 @@ class update_module
 						$count_updates++;
 						$effected_matchdays = ($effected_matchdays == '') ? $row['matchday'] : $effected_matchdays . ', ' . $row['matchday'];
 					}
+					$db->sql_freeresult($result);
 					if ($effected_matchdays <> '')
 					{
 						$sql = 'REPLACE INTO ' . FOOTB_MATCHDAYS . ' (season, league, matchday, status, delivery_date, delivery_date_2, delivery_date_3, matchday_name, matches)
@@ -666,7 +667,7 @@ class update_module
 				}
 					
 				// check status of matchdays
-				$local_board_time = time() + (($this->config['board_timezone'] - $this->config['football_host_timezone']) * 3600); 
+				$local_board_time = time() + ($this->config['football_time_shift'] * 3600); 
 				$sql = $sql = 'UPDATE ' . FOOTB_MATCHDAYS . " AS target 
 						INNER JOIN  
 						( 
@@ -1386,6 +1387,7 @@ class update_module
 				}
 			}
 		}
+		$db->sql_freeresult($result);
 		return $count_updates;
 	}
 

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

@@ -221,12 +221,6 @@ $template->assign_vars(array(
 	'S_SIDENAME' 				=> $sidename,
 	'S_MULTI_VIEW' 				=> $multi_view,
 	'L_TOTAL_ENTRIES'			=> ($count == 1) ? $count . ' ' .sprintf($user->lang['FOOTBALL_RECORD']) : $count . ' ' .sprintf($user->lang['FOOTBALL_RECORDS']),
-	'U_LEFT' 					=> $this->helper->route('football_main_controller', array('side' => 'ranks_total', 's' => $season, 'l' => $league, 'm' => $matchday)),
-	'LEFT_LINK' 				=> '< ' . sprintf($user->lang['RANK_TOTAL']),
-	'U_RIGHT' 					=> $this->helper->route('football_main_controller', array('side' => 'my_bets', 's' => $season, 'l' => $league, 'm' => $matchday)),
-	'RIGHT_LINK' 				=> sprintf($user->lang['MY_BETS']) . ' >',
-	'LEFT_TITLE' 				=> sprintf($user->lang['TITLE_RANK_TOTAL']),
-	'RIGHT_TITLE' 				=> sprintf($user->lang['TITLE_MY_BETS']),
 	'USERNAME' 					=> $username,
 	'POINTS'					=> $config['football_win_name'],	
 	)

block/bet.php

@@ -468,6 +468,8 @@ while ($row = $db->sql_fetchrow($result))
 		);
 	}
 }
+$db->sql_freeresult($result);
+
 $league_info = league_info($season, $league);
 $bet_explain = '';
 switch ($league_info['bet_ko_type'])
@@ -505,12 +507,6 @@ $template->assign_vars(array(
 	'S_DISPLAY_BET' 			=> true,
 	'S_SIDENAME' 				=> $sidename,
 	'BET_EXPLAIN' 				=> $bet_explain,
-	'U_LEFT' 					=> $this->helper->route('football_main_controller', array('side' => 'stat_results', 's' => $season, 'l' => $league, 'm' => $matchday)),
-	'LEFT_LINK' 				=> '< ' . sprintf($user->lang['STAT_RESULTS']),
-	'U_RIGHT' 					=> $this->helper->route('football_main_controller', array('side' => 'all_bets', 's' => $season, 'l' => $league, 'm' => $matchday)),
-	'RIGHT_LINK' 				=> sprintf($user->lang['ALL_BETS']) . ' >',
-	'LEFT_TITLE' 				=> sprintf($user->lang['TITLE_STAT_RESULTS']),
-	'RIGHT_TITLE' 				=> sprintf($user->lang['TITLE_ALL_BETS']),
 	'JOIN_LEAGUE'	 			=> ($link_rules == '') ? '' : sprintf($user->lang['JOIN_LEAGUE'], $link_rules),
 	'S_FORM_ACTION_BET' 		=> $this->helper->route('football_main_controller', array('side' => 'bet', 's' => $season, 'l' => $league, 'm' => $matchday, 'action' => 'bet')),
 	'S_FORM_ACTION_JOIN' 		=> $this->helper->route('football_main_controller', array('side' => 'bet', 's' => $season, 'l' => $league, 'm' => $matchday, 'action' => 'join')),

block/bet_popup.php

@@ -347,6 +347,7 @@ while ($row = $db->sql_fetchrow($result))
 		)
 	);
 }
+$db->sql_freeresult($result);
 
 $sidename = sprintf($user->lang['BET']);
 if ($data_bet)

block/delivery.php

@@ -11,13 +11,12 @@ 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 
+$local_board_time = time() + ($config['football_time_shift'] * 3600); 
+$sql = "SELECT 
 			m.season, 
 			m.league, 
 			m.matchday,
@@ -27,19 +26,12 @@ $sql = "(SELECT
 					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,
+			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,
@@ -50,83 +42,9 @@ $sql = "(SELECT
 		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)
-		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)
-		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
-	) 
-	ORDER BY delivery, league";
+		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)
@@ -142,7 +60,7 @@ while($row = $db->sql_fetchrow($result) AND $index < 11)
 		'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'],
+		'DELIVERY' 		=> $lang_dates[date("D", strtotime($row['delivery']))] . date(" d.m.y G:i", strtotime($row['delivery'])),
 		)
 	);
 }

block/dload_bank.php

@@ -89,6 +89,7 @@ else
 				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');

block/dload_bank_open.php

@@ -49,6 +49,7 @@ else
 			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');

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

@@ -13,7 +13,7 @@ if (!defined('IN_PHPBB'))
 }
 
 $display_last_users = false;
-// Last 5 users
+// Last users
 $sql = 'SELECT s.session_user_id
 		, u.username
 		, u.user_colour
@@ -24,10 +24,11 @@ $sql = 'SELECT s.session_user_id
 	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);
+$result = $db->sql_query_limit($sql, $config['football_display_last_users']);
 $first = true;
 while ($row = $db->sql_fetchrow($result))
 {
@@ -57,7 +58,7 @@ $db->sql_freeresult($result);
 
 // Assign specific vars
 $template->assign_vars(array(
-	'LAST_USERS'			=> sprintf($user->lang['LAST_VISITORS'], 5),
+	'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

@@ -314,14 +314,6 @@ $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']) ? '< ' . sprintf($user->lang['FOOTBALL_BANK']) : 
-																'< ' . 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']) . ' >',
-	'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,

block/my_chart.php

@@ -36,6 +36,7 @@ $sql = 'SELECT
 	
 $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)
 {
@@ -317,12 +318,6 @@ $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,

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

@@ -189,12 +189,6 @@ $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' 				=> '< ' . 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']) . ' >',
-	'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,

block/my_rank.php

@@ -163,12 +163,6 @@ $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' 				=> '< ' . 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']) . ' >',
-	'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,

block/my_table.php

@@ -137,7 +137,6 @@ $sql = 'SELECT
 		AND b.goals_home <> '' 
 		AND b.goals_guest <> '' 
 		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";
 	
@@ -234,7 +233,6 @@ $sql = 'SELECT
 		AND b.goals_home <> '' 
 		AND b.goals_guest <> '' 
 		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";
 	
@@ -302,7 +300,6 @@ $sql = 'SELECT
 		AND b.goals_home <> '' 
 		AND b.goals_guest <> '' 
 		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";
 	
@@ -368,7 +365,6 @@ $sql = 'SELECT
 		AND b.goals_home <> '' 
 		AND b.goals_guest <> '' 
 		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";
 	
@@ -417,14 +413,6 @@ $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,

block/odds.php

@@ -198,12 +198,6 @@ $template->assign_vars(array(
 	'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' 				=> '< ' . 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']) . ' >',
-	'LEFT_TITLE' 				=> sprintf($user->lang['TITLE_BET']),
-	'RIGHT_TITLE' 				=> sprintf($user->lang['TITLE_TABLE']),
 	'S_DATA_ODDS' 				=> $data_odds,
 	)
 );

block/ranks_matchday.php

@@ -159,7 +159,6 @@ while($row = $db->sql_fetchrow($result))
 		if ($rankof[$row['user_id']] == '')
 		{
 			$change_sign 	= '';
-			$change_img 	= '';
 			$change_differ 	= ' ';
 		}
 		else
@@ -167,7 +166,6 @@ while($row = $db->sql_fetchrow($result))
 			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
@@ -175,14 +173,12 @@ while($row = $db->sql_fetchrow($result))
 				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 . ')';
 				}
@@ -192,7 +188,6 @@ while($row = $db->sql_fetchrow($result))
 	else
 	{
 			$change_sign 	= '';
-			$change_img 	= '';
 			$change_differ 	= '&nbsp;';
 	}
 
@@ -228,8 +223,10 @@ while($row = $db->sql_fetchrow($result))
 	$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_IMG' 	=> $change_img,
 		'CHANGE_DIFFER'	=> $change_differ,
 		'USERID' 		=> $row['user_id'],
 		'USERNAME' 		=> $row['username'],
@@ -254,12 +251,6 @@ $template->assign_vars(array(
 	'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),

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

@@ -387,6 +387,7 @@ while ($row = $db->sql_fetchrow($result))
 		);
 	}
 }
+$db->sql_freeresult($result);
 
 $sidename = sprintf($user->lang['RESULTS']);
 switch ($league_info['bet_ko_type'])
@@ -415,12 +416,6 @@ $template->assign_vars(array(
 	'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' 				=> '< ' . 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']) . ' >',
-	'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,

block/side_table.php

@@ -112,11 +112,11 @@ else
 				$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\"/>" ;
+					$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=\"28\" height=\"28\"/>" ;
+					$logo = "<img src=\"" . $ext_path . "images/flags/blank.gif\" alt=\"\" width=\"20\" height=\"20\"/>" ;
 				}
 				  
 				$template->assign_block_vars('side_total', array(

block/stat_points.php

@@ -154,12 +154,6 @@ $template->assign_vars(array(
 	'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' 				=> '< ' . 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']) . ' >',
-	'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,

block/stat_results.php

@@ -131,12 +131,6 @@ $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' 				=> '< ' . 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']) . ' >',
-	'LEFT_TITLE' 				=> sprintf($user->lang['TITLE_STAT_POINTS']),
-	'RIGHT_TITLE' 				=> sprintf($user->lang['TITLE_BET']),
 	'S_DATA_STAT_RESULTS' 		=> $data,
 	'SEASON' 					=> $season,
 	'LEAGUE' 					=> $league,

block/table.php

@@ -429,12 +429,6 @@ $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' 				=> '< ' . 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']) . ' >',
-	'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,

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

@@ -73,6 +73,7 @@ class football_remember extends \phpbb\cron\task\base
 		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 ?
@@ -87,9 +88,8 @@ class football_remember extends \phpbb\cron\task\base
 
 		$season = curr_season();
 		//Matchdays to close in 24 hours and 24 hours later
-		$local_board_time = time() + (($this->config['board_timezone'] - $this->config['football_host_timezone']) * 3600); 
 		// shift days to test
-		$local_board_time = $local_board_time + ($days * 86400);
+		$local_board_time = time() + ($days * 86400);
 
 		if ($mode <> 'test')
 		{
@@ -105,13 +105,14 @@ class football_remember extends \phpbb\cron\task\base
 		}
 
 		$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 
+				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'))";
+					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);
@@ -137,12 +138,17 @@ class football_remember extends \phpbb\cron\task\base
 					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
@@ -151,12 +157,17 @@ class football_remember extends \phpbb\cron\task\base
 					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);

includes/export.php

@@ -121,7 +121,7 @@ if( !$result_bets = $db->sql_query($sql_bets) )
 }
 $rows_bets = $db->sql_fetchrowset($result_bets);
 $count_bets = sizeof($rows_bets);
-$db->sql_freeresult($result_results);
+$db->sql_freeresult($result_bets);
 $column = array();
 $lastcolumn = 0;
 $last_match_num = 0;

includes/functions.php

@@ -126,13 +126,14 @@ function save_ranking_matchday($season, $league, $matchday, $cash = false)
 			{
 				$matchday_status = 2;
 			}
+			$db->sql_freeresult($result);
 		}
 		
 		if ($matchday_status == 0 OR $matchday_status == 1)
 		{
 			// No matches played, so we can delete the ranking
 			$sql = 'DELETE FROM ' . FOOTB_RANKS . " WHERE season = $season AND league = $league AND matchday = $matchday";
-			$result = $db->sql_query($sql);
+			$db->sql_query($sql);
 		}
 		else
 		{
@@ -280,7 +281,7 @@ function save_ranking_matchday($season, $league, $matchday, $cash = false)
 								,0
 								,0
 								)";
-				$result = $db->sql_query($sql);
+				$db->sql_query($sql);
 			}
 			if ( sizeof($ranking_ary) == 0 )
 			{
@@ -288,7 +289,7 @@ function save_ranking_matchday($season, $league, $matchday, $cash = false)
 						WHERE season = $season 
 							AND league = $league 
 							AND matchday = $matchday";
-				$result = $db->sql_query($sql);
+				$db->sql_query($sql);
 			}
 			else
 			{
@@ -389,7 +390,7 @@ function save_ranking_matchday($season, $league, $matchday, $cash = false)
 							points_total = $points_total, 
 							win_total = $win_total 
 							WHERE season = $season AND league = $league AND matchday = $matchday AND user_id = $curr_userid";
-					$result = $db->sql_query($sql);
+					$db->sql_query($sql);
 				}
 			}
 		}
@@ -427,9 +428,9 @@ function save_ranking_matchday($season, $league, $matchday, $cash = false)
 		$result = $db->sql_query($sql);
 		if ( $next_matchday = (int) $db->sql_fetchfield('matchday'))
 		{
-			$db->sql_freeresult($result);
 			save_ranking_matchday($season, $league, $next_matchday, $cash);			
 		}
+		$db->sql_freeresult($result);
 	}
 }
 
@@ -480,7 +481,7 @@ function rollback_points($points_type, $season, $league, $matchday, $cash)
 	
 	}
 	$sql = 'DELETE FROM ' . FOOTB_POINTS . " WHERE season = $season AND league = $league AND matchday = $matchday AND points_type = $points_type";
-	$result = $db->sql_query($sql);
+	$db->sql_query($sql);
 }
 
 function set_footb_points($points_type, $season, $league, $matchday, $wins, $cash) 
@@ -897,7 +898,7 @@ function set_bet_in_time_delivery($season, $league)
 			'goals_overtime_home'	=> '',
 			'goals_overtime_guest'	=> '',
 		);
-		$local_board_time = time() + (($config['board_timezone'] - $config['football_host_timezone']) * 3600); 
+		$local_board_time = time() + ($config['football_time_shift'] * 3600); 
 		$sql = 'UPDATE ' . FOOTB_MATCHES . '
 			SET ' . $db->sql_build_array('UPDATE', $sql_ary) . "
 			WHERE season = $season AND league = $league AND matchday =" . $row['matchday'] . " AND match_datetime > FROM_UNIXTIME('$local_board_time')";
@@ -934,14 +935,20 @@ function set_bet_in_time_delivery($season, $league)
 function curr_season()
 {
 	global $db, $lang, $user;
-	$curr_user = $user->data['user_id'];
+	$user_spec = '';
+	if ($user->data['user_type']==0 OR $user->data['user_type']==3)
+	{
+		$curr_user = $user->data['user_id'];
+		$user_spec = 'AND b.user_id = ' . $curr_user;
+	}
+	
 	$sql = 'SELECT DISTINCT s.season 
 			FROM  ' . FOOTB_SEASONS . '  AS s
 			INNER JOIN ' . FOOTB_LEAGUES . ' AS l ON (l.season = s.season)
 			INNER JOIN ' . FOOTB_MATCHDAYS . ' AS m ON (m.season = s.season AND m.league = l.league)
-			INNER JOIN ' . FOOTB_BETS . " AS b ON (b.season = m.season AND b.league = m.league AND b.user_id = $curr_user) 
+			INNER JOIN ' . FOOTB_BETS . ' AS b ON (b.season = m.season AND b.league = m.league ' . $user_spec . ') 
 			WHERE m.status IN (0,1,2)
-			ORDER BY s.season ASC";
+			ORDER BY s.season ASC';
 	$result = $db->sql_query($sql);
 
 	if ($row = $db->sql_fetchrow($result))
@@ -1017,13 +1024,19 @@ function first_league($season, $complete = true)
 function current_league($season)
 {
 	global $db, $lang, $user;
-	$curr_user = $user->data['user_id'];
-	$sql = 'SELECT m.league 
+	$user_spec = '';
+	if ($user->data['user_type']==0 OR $user->data['user_type']==3)
+	{
+		$curr_user = $user->data['user_id'];
+		$user_spec = 'AND b.user_id = ' . $curr_user;
+	}
+	$sql = 'SELECT DISTINCT m.league 
 			FROM ' . FOOTB_MATCHES . ' AS m  
-			INNER JOIN ' . FOOTB_BETS . " AS b ON (b.season = m.season AND b.league = m.league AND b.user_id = $curr_user)
+			INNER JOIN ' . FOOTB_BETS . ' AS b ON (b.season = m.season AND b.league = m.league ' . $user_spec . ")
 			WHERE m.season = $season 
 			AND m.status in (0,1,2)
-			ORDER BY m.match_datetime ASC";
+			ORDER BY m.match_datetime ASC
+			LIMIT 1";
 	$result = $db->sql_query($sql);
 
 	if ($row = $db->sql_fetchrow($result))
@@ -1154,7 +1167,7 @@ function close_open_matchdays()
 {
 	global $db, $lang, $config;
 
-	$local_board_time = time() + (($config['board_timezone'] - $config['football_host_timezone']) * 3600); 
+	$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')";
 	$result = $db->sql_query($sql);
 	$toclose = $db->sql_fetchrowset($result);
@@ -1710,7 +1723,7 @@ function get_order_team_compare($team_ary, $season, $league, $group, $ranks, $ma
 			$tmp[] = $team;
 		}
 	}
-    return $tmp;
+    return (sizeof($tmp) == 0) ? $team_ary: $tmp;
 }  
 
 /**

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'
@@ -93,7 +93,8 @@ footb_rem_s = Schalter für Versand der Erinnerungsmail an die 2. E-Mail-Adresse
 		0 => 'Wie aktiviere ich die Erinnerungs-Mail Funktion?',
 		1 => 'Im Adminbereich muss unter den Tipprunden-Funktionalitäten der Cronjob für die Tipp-Erinnerungsmail aktiviert und der Termin der nächsten Ausführung gesetzt werden.<br />
 Der Cron-Job wird beim ersten Zugriff nach diesem Termin ausgeführt und sendet eine Erinnerungs-Mail für die fehlenden Tippabgaben, die im Zeitraum 24-48 Stunden nach dem Cron-Termin liegen. 
-Falls nicht ausreichend Zugriffe auf die Seite erfolgen, sollte der Cronjob automatisch z.B. von www.cronjob.de durch das Script "cron.php?cron_type=football_remember" gestartet werden.<br />
+Falls nicht ausreichend Zugriffe auf die Seite erfolgen, sollte der Cronjob automatisch z.B. von www.cronjob.de durch das Script 
+"DEINE_URL/cron.php?cron_type=football.football.cron.task.football_remember" gestartet werden.<br />
 Das versenden der Email erfolgt nur einmalig. Nach Aufruf des Cronjobs wird der nächste automatisch für den Folgetag eingeplant.
 Mit den angehängten parametern "&mode=test&days=n" kann der Versand für die um n Tage versetzte Tippabgabe getestet werden. Dabei werden nur Mails an Board-Email-Adresse versendet.'
 	),
@@ -526,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

@@ -48,6 +48,10 @@ $lang = array_merge($lang, array(
 
 	'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. ',
 
@@ -75,8 +79,8 @@ $lang = array_merge($lang, array(
 	'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. ',
+	'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. ',
@@ -120,7 +124,7 @@ $lang = array_merge($lang, array(
 	'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 geichen Uhrzeit neu eingeplant.',
+	'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. ',
@@ -185,6 +189,7 @@ $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.',

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'
@@ -96,7 +96,7 @@ footb_rem_s = switch for sending the reminder email to the second E-mail address
 		0 => 'How do I activate the reminder e-mail function? ',
 		1 => 'In the admin area in the Prediction League functionality the mail reminder cron job and the next run must be activated. <br />
 The cron job is run on the first access after this date and sends an e-mail reminder for the missing tip duties that lie in the period 24-48 hours after cron date .
-If not sufficient accesses the page, the cron job should automatically run on script "cron.php?cron_type=football_remember". <br />
+If not sufficient accesses the page, the cron job should automatically run on script "YOUR_URL/cron.php?cron_type=football.football.cron.task.football_remember". <br />
 The ship of the email takes place only once . After calling up the cron job, the next scheduled is automatically planned for the following day .
 With the appended parameters " & mode = test & days = n " can be tested the shipment for the offset to n days predictions . Only mails to board email address will be shipped .
 		In ACP a user defined prediction leagues code is to define.<br />
@@ -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/v097_beta.php

@@ -0,0 +1,30 @@
+<?php
+/**
+*
+* @package Football Football v0.97
+* @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\migrations;
+
+class v097_beta extends \phpbb\db\migration\migration
+{
+	public function effectively_installed()
+	{
+		return isset($this->config['football_version']) && version_compare($this->config['football_version'], '0.9.7', '>=');
+	}
+	
+	static public function depends_on()
+	{
+		return array('\football\football\migrations\v096_beta');
+	}
+
+	public function update_data()
+	{
+		return array(
+			array('config.update', array('football_version', '0.9.7', '0')),
+		);
+	}
+}

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

@@ -53,7 +53,7 @@
 					<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>
+						<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 -->
@@ -105,7 +105,7 @@
 				<!-- 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>
+						<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 -->

styles/prosilver/template/delivery.html

@@ -1,5 +1,5 @@
 <div class="panel">
-	<h3><span class="small-icon icon-bet"></span>&nbsp;{L_DELIVERY_LIST}</h3>
+	<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 /> 

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

@@ -14,12 +14,11 @@
 		background-image: url({S_FOOTBALL_EXT_PATH}images/site_logo.gif);
 		padding-left: 0px;
 		padding-top: 0px;
-		height: 52px;
-		width: 52px;
+		height: 75px;
+		width: 75px;
 	}
 	.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: 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;
@@ -27,3 +26,11 @@
 }
 </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

@@ -9,42 +9,36 @@
 			<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><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 class="small-icon icon-xml"><a href="{U_MENU_LINK1}" role="menuitem" target="_blank">{MENU_DESC_LINK1}</a></li>
+				<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 class="small-icon icon-xml"><a href="{U_MENU_LINK2}" role="menuitem" target="_blank">{MENU_DESC_LINK2}</a></li>
+				<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 class="small-icon icon-xml"><a href="{U_MENU_LINK3}" role="menuitem" target="_blank">{MENU_DESC_LINK3}</a></li>
+				<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 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>
+				<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 -->
-			<!-- 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>

styles/prosilver/template/event/overall_header_page_body_before.html

@@ -15,49 +15,49 @@
 			<p id="dirty"><strong>{S_FOOTBALLSIDE}</strong></p>
 			<ul class="topiclist">
 				<li class="header">
-					<dl class="icon">
+					<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 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><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 class="small-icon icon-xml"><a href="{U_MENU_LINK1}" role="menuitem" target="_blank">{MENU_DESC_LINK1}</a></li>
+				<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 class="small-icon icon-xml"><a href="{U_MENU_LINK2}" role="menuitem" target="_blank">{MENU_DESC_LINK2}</a></li>
+				<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 class="small-icon icon-xml"><a href="{U_MENU_LINK3}" role="menuitem" target="_blank">{MENU_DESC_LINK3}</a></li>
+				<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 class="icon">
+					<dl>
 						<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>
+				<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>

styles/prosilver/template/football_body.html

@@ -14,46 +14,42 @@
 <!-- [+] 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;">
+		<div id="tabs" class="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>
+				<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 small-icon icon-xml"><a href="{U_MENU_LINK1}" target="_blank"><span>{MENU_DESC_LINK1}</span></a></li>
+				<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 small-icon icon-xml"><a href="{U_MENU_LINK2}" target="_blank"><span>{MENU_DESC_LINK2}</span></a></li>
+				<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 small-icon icon-xml"><a href="{U_MENU_LINK3}" target="_blank"><span>{MENU_DESC_LINK3}</span></a></li>
+				<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 --> 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>
+				<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">
-			<!-- 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">
+			<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;">
@@ -84,7 +80,7 @@
 				<!-- 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>
+						<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 -->
@@ -104,7 +100,7 @@
 					</form>
 					<div style="float:left;">
 						<!-- IF S_NEXT_LINK -->
-						<a class="next_matchday" title="{L_SHOW_NEXT}" href="{S_NEXT_LINK}"></a>
+						<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 -->
@@ -114,6 +110,7 @@
 						{S_DELIVERY}
 					</div>
 				<!-- ENDIF -->
+				</div>
 			</div>
 
 			<!-- IF S_DISPLAY_UNDER_CONSTRUCTION -->
@@ -213,6 +210,9 @@
 		<!-- 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" />

styles/prosilver/template/football_print.html

@@ -36,7 +36,6 @@
 		<!-- 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>

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">
+<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 />
-	<!-- BEGIN last_users -->
+	<!-- END last_users --></div>

styles/prosilver/template/mobile_football_body.html

@@ -6,37 +6,37 @@
 		<strong>{L_INFORMATION}:</strong> {S_FOOTBALL_INFO}
 	</div>
 <!-- ENDIF -->
-	<div id="tabs" style="margin-top: 0px;  margin-left: 5px;">
+	<div id="tabs" class="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>
+			<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 small-icon icon-xml"><a href="{U_MENU_LINK1}" target="_blank"><span>{MENU_DESC_LINK1}</span></a></li>
+			<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 small-icon icon-xml"><a href="{U_MENU_LINK2}" target="_blank"><span>{MENU_DESC_LINK2}</span></a></li>
+			<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 small-icon icon-xml"><a href="{U_MENU_LINK3}" target="_blank"><span>{MENU_DESC_LINK3}</span></a></li>
+			<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 --> 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 <!-- 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">

styles/prosilver/template/mobile_viewplan_popup.html

@@ -1,57 +0,0 @@
-<!-- INCLUDE simple_header.html -->
-<!--//<link href="{T_THEME_PATH}/football.css" rel="stylesheet" type="text/css" media="screen, projection" /> -->
-
-<div class="panel">
-	<br />
-	<div class="navbar football_bg">
-		<div class="maintitle">{MODE_DESC} {LOGO} {TEAM} <br /> {LEAGUE} {SEASON}</div>
-	</div>
-		<br />
-<!-- IF S_DATA_PLAN -->
-	<span class="match_win">{L_WON}</span> - <span class="match_draw">{L_DRAW}</span> - <span class="match_lost">{L_LOST}</span>
-	<div class="forabg">
-		<table class="football">
-			<thead>
-				<tr>
-					<th>{L_DATE}</th>
-				<!-- IF S_DATA_GROUP -->
-					<th>{L_GR}</th>
-				<!-- ENDIF -->
-					<th colspan="5">{L_VS}</th>
-				<!-- IF S_DATA_RESULTS -->
-					<th colspan="3">{L_RESULT}</th>
-				<!-- ENDIF -->
-				</tr>
-			</thead>
-			<tbody>
-			<!-- BEGIN match -->
-				<tr class="{match.ROW_CLASS}">
-					<td>{match.MATCH_TIME}</td>
-				<!-- IF S_DATA_GROUP -->
-					<td class="td_group">{match.GROUP}</td>
-				<!-- ENDIF -->
-					<td class="td_logo">{match.LOGO_HOME}</td>
-					<td class="td_team {match.COLOR_HOME}">{match.HOME_NAME}</td>
-					<td class="td_vs">:</td>
-					<td class="td_logo">{match.LOGO_GUEST}</td>
-					<td class="td_team {match.COLOR_GUEST}">{match.GUEST_NAME}</td>
-				<!-- IF S_DATA_RESULTS -->
-					<td class="td_goals_home {match.COLOR_GOALS}">{match.GOALS_HOME}</td>
-					<td class="td_vs {match.COLOR_GOALS}">:</td>
-					<td class="td_goals_guest {match.COLOR_GOALS}">{match.GOALS_GUEST}</td>
-				<!-- ENDIF -->
-				</tr>
-			<!-- END match -->
-			</tbody>
-		</table>
-	</div>
-<!-- ELSE -->
-	<br />
-	<div class="message">{S_ERROR_MESSAGE}</div>
-	<br />
-<!-- ENDIF -->
-	<div style="text-align:center">
-		<a href="#" onclick="window.close(); return false;">{L_CLOSE_WINDOW}</a>
-	</div>
-</div>
-<!-- INCLUDE simple_footer.html -->

styles/prosilver/template/odds.html

@@ -42,7 +42,7 @@
 					<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>
+						<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 -->

styles/prosilver/template/rank_matchday.html

@@ -1,5 +1,5 @@
 <div class="panel">
-	<h3><span class="small-icon icon-rank"></span>&nbsp;{L_RANK_MATCHDAY}</h3>
+	<h3><i class="icon fa-trophy fa-fw"></i>{L_RANK_MATCHDAY}</h3>
 	<!-- IF S_DATA_RANK_MATCHDAY -->
 	<table class="forabg rank">
 		<thead>

styles/prosilver/template/rank_total.html

@@ -1,9 +1,5 @@
 <div class="panel">
-	<h3><!-- IF S_VIEW <> 'print' -->
-				<span class="small-icon icon-rank"></span>&nbsp;
-		<!-- ENDIF -->
-		{L_RANK_TOTAL}
-	</h3>
+	<h3><i class="icon fa-trophy fa-fw"></i>{L_RANK_TOTAL}</h3>
 	<!-- IF S_DATA_RANK_TOTAL -->
 	<table class="forabg rank">
 		<thead>

styles/prosilver/template/ranks.html

@@ -49,7 +49,12 @@
 						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>
+					<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 <> '' -->

styles/prosilver/template/side_table.html

@@ -1,5 +1,5 @@
 <div class="panel">
-	<h3><span class="small-icon icon-rank"></span>&nbsp;{L_TABLE_TOTAL}</h3>
+	<h3><i class="icon fa-list-ol fa-fw"></i>{L_TABLE_TOTAL}</h3>
 	<!-- IF S_DATA_SIDE_TABLE -->
 		<table class="forabg rank">
 			<thead>

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;