Remove arrows in bet input fields in mozilla mobile browser

# Conflicts:
#	acp/matches_module.php
#	adm/style/acp_football_leagues.html
#	adm/style/acp_football_matches.html
#	block/all_bets.php
#	block/rank_matchday.php
#	block/ranks_total.php
#	config/services.yml
#	controller/main.php
#	event/main_listener.php
#	includes/constants.php
#	includes/functions.php
#	language/de/football.php
#	language/de/info_acp_leagues.php
#	language/de/info_acp_matches.php
#	styles/prosilver/template/all_bets.html
#	styles/prosilver/template/results.html
#	styles/prosilver/template/table.html
#	styles/prosilver/theme/football.css

.gitignore

@@ -63,3 +63,6 @@ Icon
 /images/arrow_down.gif
 /images/arrow_up.gif
 /migrations/v099_beta1.php
+/.buildpath
+/.project
+/.settings/

.idea/.gitignore

@@ -0,0 +1,3 @@
+# Default ignored files
+/shelf/
+/workspace.xml

.idea/aws.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="accountSettings">
+    <option name="activeRegion" value="us-east-1" />
+    <option name="recentlyUsedRegions">
+      <list>
+        <option value="us-east-1" />
+      </list>
+    </option>
+  </component>
+</project>

.idea/misc.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_14" project-jdk-name="openjdk-14" project-jdk-type="JavaSDK">
+    <output url="file://$PROJECT_DIR$/out" />
+  </component>
+</project>

.idea/modules.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectModuleManager">
+    <modules>
+      <module fileurl="file://$PROJECT_DIR$/.idea/phpbb_football_tlw.iml" filepath="$PROJECT_DIR$/.idea/phpbb_football_tlw.iml" />
+    </modules>
+  </component>
+</project>

.idea/php.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="PhpProjectSharedConfiguration" php_language_level="5.3.0" />
+</project>

.idea/phpbb_football_tlw.iml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$" />
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>

.idea/vcs.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="" vcs="Git" />
+  </component>
+</project>

Readme - Update from MOD.txt

@@ -1,6 +1,6 @@
-Follow the phpBB instruction to the convert from 3.0 to 3.1.
-Don't remove football MOD permissions, custom profile fields and football tables in database.
-Please remove recursive the "football MOD Version 0.9.3" ACP Modules in ACP-SYSTEM-MODUL MANAGEMENT.
-
-Unzip Football Prediction League extension in folder ext/
-Activate the Football Prediction League extension in ACP.
+Follow the phpBB instruction to the convert from 3.0 to 3.1.
+Don't remove football MOD permissions, custom profile fields and football tables in database.
+Please remove recursive the "football MOD Version 0.9.3" ACP Modules in ACP-SYSTEM-MODUL MANAGEMENT.
+
+Unzip Football Prediction League extension in folder ext/
+Activate the Football Prediction League extension in ACP.

acp/all_bets_info.php

@@ -1,25 +1,25 @@
-<?php
-/**
-*
-* @package phpBB Extension - Football Football
-* @copyright (c) 2016 football (http://football.bplaced.net)
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
-*
-*/
-
-namespace football\football\acp;
-
-class all_bets_info
-{
-	function module()
-	{
-		return array(
-			'filename'	=> '\football\football\acp\all_bets_module',
-			'title'		=> 'ACP_FOOTBALL_ALL_BETS_MANAGEMENT',
-			'version'	=> '0.9.4',
-			'modes'		=> array(
-				'manage'	=> array('title' => 'ACP_FOOTBALL_ALL_BETS_VIEW', 'auth' => 'acl_a_football_editbets', 'cat' => array('ACP_FOOTBALL_ALL_BETS')),
-			),
-		);
-	}
-}
+<?php
+/**
+*
+* @package phpBB Extension - Football Football
+* @copyright (c) 2016 football (http://football.bplaced.net)
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+namespace football\football\acp;
+
+class all_bets_info
+{
+	function module()
+	{
+		return array(
+			'filename'	=> '\football\football\acp\all_bets_module',
+			'title'		=> 'ACP_FOOTBALL_ALL_BETS_MANAGEMENT',
+			'version'	=> '0.9.4',
+			'modes'		=> array(
+				'manage'	=> array('title' => 'ACP_FOOTBALL_ALL_BETS_VIEW', 'auth' => 'acl_a_football_editbets', 'cat' => array('ACP_FOOTBALL_ALL_BETS')),
+			),
+		);
+	}
+}

acp/all_bets_module.php

@@ -56,13 +56,13 @@ class all_bets_module
 		$form_key = 'acp_football_all_bets';
 		add_form_key($form_key);
 
-		include($this->phpbb_root_path . 'includes/functions_user.' . $this->php_ext);
+		include_once($this->phpbb_root_path . 'includes/functions_user.' . $this->php_ext);
 
 		// Check and set some common vars
 		$season		= $this->request->variable('s', 0);
 		$league		= $this->request->variable('l', 0);
 		$matchday	= $this->request->variable('m', 0);
-		$start 		= $this->request->variable('start', 0);
+		$start		= $this->request->variable('start', 0);
 
 		// Grab current season
 		if (!$season)
@@ -118,11 +118,11 @@ class all_bets_module
 				$league_options .= '<option value="' . $row['league'] . '"' . $selected . '>' . $row['league_name'] . '</option>';
 				if ($selected <> '')
 				{
-					$league_matchdays 	= $row['matchdays'];
-					$matches_matchday 	= $row['matches_on_matchday'];
-					$league_name 		= $row['league_name'];
-					$league_type 		= $row['league_type'];
-					$ko_league 			= ($row['league_type'] == LEAGUE_KO) ? true : false;
+					$league_matchdays	= $row['matchdays'];
+					$matches_matchday	= $row['matches_on_matchday'];
+					$league_name		= $row['league_name'];
+					$league_type		= $row['league_type'];
+					$ko_league			= ($row['league_type'] == LEAGUE_KO) ? true : false;
 				}
 			}
 			$db->sql_freeresult($result);
@@ -320,9 +320,9 @@ class all_bets_module
 						
 						$colorstyle_bet = color_style($user_bet['status']);
 						$template->assign_block_vars('match_panel.user_row.bet', array(
-							'BET' 			=> $bet_home. ':'. $bet_guest,
-							'COLOR_STYLE' 	=> $colorstyle_bet,
-							'POINTS' 		=> ($user_bet['points'] == '') ? '&nbsp;' : $user_bet['points'],
+							'BET'			=> $bet_home. ':'. $bet_guest,
+							'COLOR_STYLE'	=> $colorstyle_bet,
+							'POINTS'		=> ($user_bet['points'] == '') ? '&nbsp;' : $user_bet['points'],
 							)
 						);
 
@@ -364,9 +364,9 @@ class all_bets_module
 			}
 			if (0 == $match['hid'])
 			{
-				$home_info 		= get_team($season, $league, $match['match_no'], 'team_id_home', $match['formula_home']);
-				$home_in_array 	= explode("#",$home_info);
-				$homename 		= $home_in_array[3];
+				$home_info		= get_team($season, $league, $match['match_no'], 'team_id_home', $match['formula_home']);
+				$home_in_array	= explode("#",$home_info);
+				$homename		= $home_in_array[3];
 			}
 			else
 			{
@@ -374,9 +374,9 @@ class all_bets_module
 			}
 			if (0 == $match['gid'])
 			{
-				$guest_info 	= get_team($season, $league, $match['match_no'], 'team_id_guest', $match['formula_guest']);
-				$guest_in_array = explode("#",$guest_info);
-				$guestname 		= $guest_in_array[3];
+				$guest_info		= get_team($season, $league, $match['match_no'], 'team_id_guest', $match['formula_guest']);
+				$guest_in_array	= explode("#",$guest_info);
+				$guestname		= $guest_in_array[3];
 			}
 			else
 			{
@@ -384,10 +384,10 @@ class all_bets_module
 			}
 			$colorstyle_match = color_style($match['status']);
 			$template->assign_block_vars('match_panel.match', array(
-				'HOME_NAME' 	=> $homename,
-				'GUEST_NAME' 	=> $guestname,
-				'RESULT' 		=> $match['goals_home']. ':'.$match['goals_guest'],
-				'COLOR_STYLE' 	=> $colorstyle_match,
+				'HOME_NAME'		=> $homename,
+				'GUEST_NAME'	=> $guestname,
+				'RESULT'		=> $match['goals_home']. ':'.$match['goals_guest'],
+				'COLOR_STYLE'	=> $colorstyle_match,
 				)
 			);
 			
@@ -428,9 +428,9 @@ class all_bets_module
 				
 				$colorstyle_bet = color_style($user_bet['status']);
 				$template->assign_block_vars('match_panel.user_row.bet', array(
-					'BET' 			=> $bet_home. ':'. $bet_guest,
-					'COLOR_STYLE' 	=> $colorstyle_bet,
-					'POINTS' 		=> ($user_bet['points'] == '') ? '&nbsp;' : $user_bet['points'],
+					'BET'			=> $bet_home. ':'. $bet_guest,
+					'COLOR_STYLE'	=> $colorstyle_bet,
+					'POINTS'		=> ($user_bet['points'] == '') ? '&nbsp;' : $user_bet['points'],
 					)
 				);
 
@@ -439,8 +439,8 @@ class all_bets_module
 					 $sum_total[$user_bet['username']] += $total;
 					 $matchday_sum_total += $total;
 					 $template->assign_block_vars('match_panel.user_row.points', array(
-						'COLOR_STYLE'    => $colorstyle_total,
-						'POINTS_TOTAL'    => $sum_total[$user_bet['username']],
+						'COLOR_STYLE'	=> $colorstyle_total,
+						'POINTS_TOTAL'	=> $sum_total[$user_bet['username']],
 						)
 					 );
 					 $bet_index = 0;
@@ -448,9 +448,9 @@ class all_bets_module
 			}
 
 			$template->assign_block_vars('match_panel.tendency_footer', array(
-				'S_TOTAL' 		=> true,
-				'COLOR_STYLE' 	=> $colorstyle_total, //currently ignored
-				'SUMTOTAL' 	=> $matchday_sum_total,
+				'S_TOTAL'		=> true,
+				'COLOR_STYLE'	=> $colorstyle_total, //currently ignored
+				'SUMTOTAL'		=> $matchday_sum_total,
 				)
 			);
 			foreach ($matches_tendency AS $match_tendency)
@@ -521,12 +521,12 @@ class all_bets_module
 			$extra_colorstyle = color_style($row['extra_status']);
 
 			$template->assign_block_vars('extra_panel', array(
-				'QUESTION' 			=> $row['question'],
-				'RESULT' 			=> ($display_type == 1) ? $row['result_team'] : $row['result'],
-				'POINTS' 			=> $row['extra_points'],
-				'EVALUATION' 		=> ($row['matchday'] == $row['matchday_eval']) ? sprintf($user->lang['MATCHDAY']) : sprintf($user->lang['TOTAL']),
-				'EVALUATION_TITLE' 	=> $eval_title,
-				'COLOR_STYLE' 		=> $extra_colorstyle,
+				'QUESTION'			=> $row['question'],
+				'RESULT'			=> ($display_type == 1) ? $row['result_team'] : $row['result'],
+				'POINTS'			=> $row['extra_points'],
+				'EVALUATION'		=> ($row['matchday'] == $row['matchday_eval']) ? sprintf($user->lang['MATCHDAY']) : sprintf($user->lang['TOTAL']),
+				'EVALUATION_TITLE'	=> $eval_title,
+				'COLOR_STYLE'		=> $extra_colorstyle,
 				)
 			);
 
@@ -564,11 +564,11 @@ class all_bets_module
 
 				
 				$template->assign_block_vars('extra_panel.user_row', array(
-					'ROW_CLASS' 	=> $row_class,
-					'USER_NAME' 	=> $user_row['username'],
-					'BET' 			=> ($display_type == 1) ? $bet_team : $bet,
-					'BET_POINTS' 	=> $user_row['bet_points'],
-					'COLOR_STYLE' 	=> $extra_colorstyle,
+					'ROW_CLASS'		=> $row_class,
+					'USER_NAME'		=> $user_row['username'],
+					'BET'			=> ($display_type == 1) ? $bet_team : $bet,
+					'BET_POINTS'	=> $user_row['bet_points'],
+					'COLOR_STYLE'	=> $extra_colorstyle,
 					)
 				);
 			}
@@ -579,21 +579,20 @@ class all_bets_module
 		$legend = delivery($season, $league, $matchday);
 
 		$template->assign_vars(array(
-			'U_FOOTBALL' 				=> $helper->route('football_main_controller',array('side' => 'all_bets', 's' => $season, 'l' => $league, 'm' => $matchday)),
+			'U_FOOTBALL'				=> $helper->route('football_football_controller',array('side' => 'all_bets', 's' => $season, 'l' => $league, 'm' => $matchday)),
 			'S_SEASON'					=> $season,
 			'S_LEAGUE'					=> $league,
 			'S_MATCHDAY'				=> $matchday,
 			'S_SEASON_OPTIONS'			=> $season_options,
 			'S_LEAGUE_OPTIONS'			=> $league_options,
 			'S_MATCHDAY_OPTIONS'		=> $matchday_options,
-			'S_DISPLAY_ALL_BETS' 		=> true,
-			'S_MATCHES_ON_MATCHDAY' 	=> $matches_on_matchday,
-			'S_SPALTEN' 				=> ($count_matches * 2)+2,
+			'S_DISPLAY_ALL_BETS'		=> true,
+			'S_MATCHES_ON_MATCHDAY'		=> $matches_on_matchday,
+			'S_SPALTEN'					=> ($count_matches * 2)+2,
 			'S_VERSION_NO'				=> $this->config['football_version'],
 			'TOTAL_USERS'				=> ($total_users == 1) ? $user->lang['VIEW_BET_USER'] : sprintf($user->lang['VIEW_BET_USERS'], $total_users),
-			'PAGE_NUMBER' 				=> $pagination->on_page($total_users, $this->config['football_users_per_page'], $start),
+			'PAGE_NUMBER'				=> $pagination->on_page($total_users, $this->config['football_users_per_page'], $start),
 			)
 		);
 	}
 }
-?>

acp/bank_info.php

@@ -1,25 +1,25 @@
-<?php
-/**
-*
-* @package phpBB Extension - Football Football
-* @copyright (c) 2016 football (http://football.bplaced.net)
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
-*
-*/
-
-namespace football\football\acp;
-
-class bank_info
-{
-	function module()
-	{
-		return array(
-			'filename'	=> '\football\football\acp\bank_module',
-			'title'		=> 'ACP_FOOTBALL_BANK_MANAGEMENT',
-			'version'	=> '0.9.2',
-			'modes'		=> array(
-				'manage'	=> array('title' => 'ACP_FOOTBALL_BANK_MANAGE', 'auth' => 'acl_a_football_plan', 'cat' => array('ACP_FOOTBALL_BANK')),
-			),
-		);
-	}
-}
+<?php
+/**
+*
+* @package phpBB Extension - Football Football
+* @copyright (c) 2016 football (http://football.bplaced.net)
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+namespace football\football\acp;
+
+class bank_info
+{
+	function module()
+	{
+		return array(
+			'filename'	=> '\football\football\acp\bank_module',
+			'title'		=> 'ACP_FOOTBALL_BANK_MANAGEMENT',
+			'version'	=> '0.9.2',
+			'modes'		=> array(
+				'manage'	=> array('title' => 'ACP_FOOTBALL_BANK_MANAGE', 'auth' => 'acl_a_football_plan', 'cat' => array('ACP_FOOTBALL_BANK')),
+			),
+		);
+	}
+}

acp/bank_module.php

@@ -73,7 +73,7 @@ class bank_module
 		$form_key = 'acp_football_bank';
 		add_form_key($form_key);
 
-		include($this->phpbb_root_path . 'includes/functions_user.' . $this->php_ext);
+		include_once($this->phpbb_root_path . 'includes/functions_user.' . $this->php_ext);
 
 		// Check and set some common vars
 		$action		= (isset($_POST['add'])) ? 'add' : ((isset($_POST['addmembers'])) ? 'addmembers' : $this->request->variable('action', ''));
@@ -555,7 +555,7 @@ class bank_module
 					'POINTS'			=> $this->config['points_name'],
 					'TARGET'			=> $target,
 					'ACTUAL'			=> $actual,
-					'U_FOOTBALL' 		=> $helper->route('football_main_controller',array('side' => 'bank', 's' => $season, 'l' => $league)),
+					'U_FOOTBALL' 		=> $helper->route('football_football_controller',array('side' => 'bank', 's' => $season, 'l' => $league)),
 					'U_ACTION'			=> $this->u_action . "&s=$season&l=$league",
 					'U_BACK'			=> $this->u_action. "&s=$season&l=$league",
 					)
@@ -593,7 +593,7 @@ class bank_module
 				{
 					$template->assign_block_vars('member', array(
 						'U_USER_EDIT'	=> append_sid("{$phpbb_admin_path}index.$phpEx", "i=users&action=edit&u={$row['user_id']}"),
-						'U_USER_BANK' 	=> $helper->route('football_main_controller',array('side' => 'bank', 's' => $season, 'l' => $league, 'u' => $row['user_id'])),
+						'U_USER_BANK' 	=> $helper->route('football_football_controller',array('side' => 'bank', 's' => $season, 'l' => $league, 'u' => $row['user_id'])),
 						'USERNAME'		=> $row['username'],
 						'POINTS'		=> $functions_points->number_format_points($row['user_points']),
 						'TARGET'		=> $functions_points->number_format_points($row['target']),
@@ -619,7 +619,7 @@ class bank_module
 		
 		$template->assign_vars(array(
 			'U_ACTION'					=> $this->u_action,
-			'U_FOOTBALL' 				=> $helper->route('football_main_controller',array('side' => 'bank', 's' => $season)),
+			'U_FOOTBALL' 				=> $helper->route('football_football_controller',array('side' => 'bank', 's' => $season)),
 			'U_DLOAD_BANK_OPEN' 		=> $helper->route('football_football_download',array('downside' => 'dload_bank_open', 's' => $season)),
 			'S_SEASON'					=> $season,
 			'S_LIST_DEPOSITED'			=> ($this->config['football_ult_points'] == UP_POINTS) ? false : true,
@@ -645,7 +645,7 @@ class bank_module
 			LEFT JOIN ' . FOOTB_POINTS . " AS p ON (p.season = $season AND p.league = l.league)
 			WHERE l.season = $season
 			GROUP BY l.league
-			ORDER BY league ASC";
+			ORDER BY l.league ASC";
 		$result = $db->sql_query($sql);
 		$rows_leagues = $db->sql_fetchrowset($result);
 		$db->sql_freeresult($result);
@@ -670,5 +670,3 @@ class bank_module
 		}
 	}
 }
-
-?>

acp/bets_info.php

@@ -1,25 +1,25 @@
-<?php
-/**
-*
-* @package phpBB Extension - Football Football
-* @copyright (c) 2016 football (http://football.bplaced.net)
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
-*
-*/
-
-namespace football\football\acp;
-
-class bets_info
-{
-	function module()
-	{
-		return array(
-			'filename'	=> '\football\football\acp\bets_module',
-			'title'		=> 'ACP_FOOTBALL_BETS_MANAGEMENT',
-			'version'	=> '0.9.4',
-			'modes'		=> array(
-				'manage'	=> array('title' => 'ACP_FOOTBALL_BETS_MANAGE', 'auth' => 'acl_a_football_editbets', 'cat' => array('ACP_FOOTBALL_BETS')),
-			),
-		);
-	}
-}
+<?php
+/**
+*
+* @package phpBB Extension - Football Football
+* @copyright (c) 2016 football (http://football.bplaced.net)
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+namespace football\football\acp;
+
+class bets_info
+{
+	function module()
+	{
+		return array(
+			'filename'	=> '\football\football\acp\bets_module',
+			'title'		=> 'ACP_FOOTBALL_BETS_MANAGEMENT',
+			'version'	=> '0.9.4',
+			'modes'		=> array(
+				'manage'	=> array('title' => 'ACP_FOOTBALL_BETS_MANAGE', 'auth' => 'acl_a_football_editbets', 'cat' => array('ACP_FOOTBALL_BETS')),
+			),
+		);
+	}
+}

acp/bets_module.php

@@ -66,7 +66,7 @@ class bets_module
 		$form_key = 'acp_football_bets';
 		add_form_key($form_key);
 
-		include($this->phpbb_root_path . 'includes/functions_user.' . $this->php_ext);
+		include_once($this->phpbb_root_path . 'includes/functions_user.' . $this->php_ext);
 
 		// Check and set some common vars
 		$action		= (isset($_POST['bet'])) ? 'bet' : $this->request->variable('action', '');
@@ -426,6 +426,9 @@ class bets_module
 					$league_info = league_info($season, $league);
 					$cash	= $this->request->variable('cash', false);
 					save_ranking_matchday($season, $league, $matchday, $cash);
+					bonuspoints($season, $league, $matchday);
+					corr($season, $league, $matchday);
+					chart($season, $league, $matchday);
 				}
 			break;
 		}
@@ -583,7 +586,7 @@ class bets_module
 				)
 			);
 		}
-		$db->sql_freeresult($resultopen);
+		$db->sql_freeresult($result);
 
 		// Calculate extra bets of matchday
 		// Start select team
@@ -730,7 +733,7 @@ class bets_module
 		$legend = delivery($season, $league, $matchday);
 
 		$template->assign_vars(array(
-			'U_FOOTBALL' 			=> $helper->route('football_main_controller',array('side' => 'bet', 's' => $season, 'l' => $league, 'm' => $matchday)),
+			'U_FOOTBALL' 			=> $helper->route('football_football_controller',array('side' => 'bet', 's' => $season, 'l' => $league, 'm' => $matchday)),
 			'S_LEGEND'				=> $legend,
 			'S_SUCCESS'				=> (sizeof($success)) ? true : false,
 			'SUCCESS_MSG'			=> (sizeof($success)) ? implode('<br />', $success) : '',
@@ -750,4 +753,3 @@ class bets_module
 		);
 	}
 }
-?>

acp/extra_info.php

@@ -1,25 +1,25 @@
-<?php
-/**
-*
-* @package phpBB Extension - Football Football
-* @copyright (c) 2016 football (http://football.bplaced.net)
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
-*
-*/
-
-namespace football\football\acp;
-
-class extra_info
-{
-	function module()
-	{
-		return array(
-			'filename'	=> '\football\football\acp\extra_module',
-			'title'		=> 'ACP_FOOTBALL_EXTRA_MANAGEMENT',
-			'version'	=> '0.9.4',
-			'modes'		=> array(
-				'manage'		=> array('title' => 'ACP_FOOTBALL_EXTRA_MANAGE', 'auth' => 'acl_a_football_plan', 'cat' => array('ACP_FOOTBALL_EXTRA')),
-			),
-		);
-	}
-}
+<?php
+/**
+*
+* @package phpBB Extension - Football Football
+* @copyright (c) 2016 football (http://football.bplaced.net)
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+namespace football\football\acp;
+
+class extra_info
+{
+	function module()
+	{
+		return array(
+			'filename'	=> '\football\football\acp\extra_module',
+			'title'		=> 'ACP_FOOTBALL_EXTRA_MANAGEMENT',
+			'version'	=> '0.9.4',
+			'modes'		=> array(
+				'manage'		=> array('title' => 'ACP_FOOTBALL_EXTRA_MANAGE', 'auth' => 'acl_a_football_plan', 'cat' => array('ACP_FOOTBALL_EXTRA')),
+			),
+		);
+	}
+}

acp/extra_module.php

@@ -56,7 +56,7 @@ class extra_module
 		$form_key = 'acp_football_extra';
 		add_form_key($form_key);
 
-		include($this->phpbb_root_path . 'includes/functions_user.' . $this->php_ext);
+		include_once($this->phpbb_root_path . 'includes/functions_user.' . $this->php_ext);
 
 		// Check and set some common vars
 		$action			= (isset($_POST['add'])) ? 'add' : ((isset($_POST['remove'])) ? 'remove' : $this->request->variable('action', ''));
@@ -415,7 +415,7 @@ class extra_module
 
 		$template->assign_vars(array(
 			'U_ACTION'			=> $this->u_action,
-			'U_FOOTBALL' 		=> $helper->route('football_main_controller',array('side' => 'bet', 's' => $season, 'l' => $league)),
+			'U_FOOTBALL' 		=> $helper->route('football_football_controller',array('side' => 'bet', 's' => $season, 'l' => $league)),
 			'S_SEASON'			=> $season,
 			'S_LEAGUE'			=> $league,
 			'S_SEASON_OPTIONS'	=> $season_options,
@@ -456,4 +456,3 @@ class extra_module
 		}
 	}
 }
-?>

acp/football_info.php

@@ -1,28 +1,28 @@
-<?php
-/**
-*
-* @package phpBB Extension - Football Football
-* @copyright (c) 2016 football (http://football.bplaced.net)
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
-*
-*/
-
-namespace football\football\acp;
-
-class football_info
-{
-	function module()
-	{
-		return array(
-			'filename'	=> '\football\football\acp\football_module',
-			'title'		=> 'ACP_FOOTBALL_MANAGEMENT',
-			'version'	=> '0.9.4',
-			'modes'		=> array(
-				'settings'	=> array('title' => 'ACP_FOOTBALL_SETTINGS', 'auth' => 'acl_a_football_config', 'cat' => array('ACP_FOOTBALL_CONFIGURATION')),
-				'features'	=> array('title' => 'ACP_FOOTBALL_FEATURES', 'auth' => 'acl_a_football_config', 'cat' => array('ACP_FOOTBALL_CONFIGURATION')),
-				'menu'		=> array('title' => 'ACP_FOOTBALL_MENU',     'auth' => 'acl_a_football_config', 'cat' => array('ACP_FOOTBALL_CONFIGURATION')),
-				'userguide'	=> array('title' => 'ACP_FOOTBALL_USERGUIDE','auth' => 'acl_a_football_plan',   'cat' => array('ACP_FOOTBALL_CONFIGURATION')),
-			),
-		);
-	}
-}
+<?php
+/**
+*
+* @package phpBB Extension - Football Football
+* @copyright (c) 2016 football (http://football.bplaced.net)
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+namespace football\football\acp;
+
+class football_info
+{
+	function module()
+	{
+		return array(
+			'filename'	=> '\football\football\acp\football_module',
+			'title'		=> 'ACP_FOOTBALL_MANAGEMENT',
+			'version'	=> '0.9.4',
+			'modes'		=> array(
+				'settings'	=> array('title' => 'ACP_FOOTBALL_SETTINGS', 'auth' => 'acl_a_football_config', 'cat' => array('ACP_FOOTBALL_CONFIGURATION')),
+				'features'	=> array('title' => 'ACP_FOOTBALL_FEATURES', 'auth' => 'acl_a_football_config', 'cat' => array('ACP_FOOTBALL_CONFIGURATION')),
+				'menu'		=> array('title' => 'ACP_FOOTBALL_MENU',	 'auth' => 'acl_a_football_config', 'cat' => array('ACP_FOOTBALL_CONFIGURATION')),
+				'userguide'	=> array('title' => 'ACP_FOOTBALL_USERGUIDE','auth' => 'acl_a_football_plan',   'cat' => array('ACP_FOOTBALL_CONFIGURATION')),
+			),
+		);
+	}
+}

acp/football_module.php

@@ -65,12 +65,12 @@ class football_module
 		switch ($mode)
 		{
 			case 'userguide':
-            	$this->page_title = 'ACP_FOOTBALL_USERGUIDE';
+				$this->page_title = 'ACP_FOOTBALL_USERGUIDE';
 				$this->tpl_name = 'acp_football_userguide';
 
 				$template->assign_vars(array(
 					'S_IN_FOOTBALL_USERGUIDE'	=> true,
-					'U_FOOTBALL' 				=> $helper->route('football_main_controller',array('side' => 'bet')),
+					'U_FOOTBALL' 				=> $helper->route('football_football_controller',array('side' => 'bet')),
 					'L_BACK_TO_TOP'				=> $user->lang['BACK_TO_TOP'],
 					'ICON_BACK_TO_TOP'			=> '<img src="' . $phpbb_admin_path . 'images/icon_up.gif" style="vertical-align: middle;" alt="' . $user->lang['BACK_TO_TOP'] . '" title="' . $user->lang['BACK_TO_TOP'] . '" />',
 					'S_VERSION_NO'				=> $this->config['football_version'],
@@ -242,7 +242,7 @@ class football_module
 		$this->page_title = $display_vars['title'];
 
 		$template->assign_vars(array(
-			'U_FOOTBALL' 		=> $helper->route('football_main_controller',array('side' => 'bet')),
+			'U_FOOTBALL' 		=> $helper->route('football_football_controller',array('side' => 'bet')),
 			'L_TITLE'			=> $user->lang[$display_vars['title']],
 			'L_TITLE_EXPLAIN'	=> $user->lang[$display_vars['title'] . '_EXPLAIN'],
 			'S_ERROR'			=> (sizeof($error)) ? true : false,
@@ -434,5 +434,3 @@ class football_module
 	}
 
 }
-
-?>

acp/ko_info.php

@@ -1,25 +1,25 @@
-<?php
-/**
-*
-* @package phpBB Extension - Football Football
-* @copyright (c) 2016 football (http://football.bplaced.net)
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
-*
-*/
-
-namespace football\football\acp;
-
-class ko_info
-{
-	function module()
-	{
-		return array(
-			'filename'	=> '\football\football\acp\ko_module',
-			'title'		=> 'ACP_FOOTBALL_KO_MANAGEMENT',
-			'version'	=> '0.9.4',
-			'modes'		=> array(
-				'manage'		=> array('title' => 'ACP_FOOTBALL_KO_MANAGE', 'auth' => 'acl_a_football_plan', 'cat' => array('ACP_FOOTBALL_KO')),
-			),
-		);
-	}
-}
+<?php
+/**
+*
+* @package phpBB Extension - Football Football
+* @copyright (c) 2016 football (http://football.bplaced.net)
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+namespace football\football\acp;
+
+class ko_info
+{
+	function module()
+	{
+		return array(
+			'filename'	=> '\football\football\acp\ko_module',
+			'title'		=> 'ACP_FOOTBALL_KO_MANAGEMENT',
+			'version'	=> '0.9.4',
+			'modes'		=> array(
+				'manage'		=> array('title' => 'ACP_FOOTBALL_KO_MANAGE', 'auth' => 'acl_a_football_plan', 'cat' => array('ACP_FOOTBALL_KO')),
+			),
+		);
+	}
+}

acp/ko_module.php

@@ -56,7 +56,7 @@ class ko_module
 		$form_key = 'acp_football_ko';
 		add_form_key($form_key);
 
-		include($this->phpbb_root_path . 'includes/functions_user.' . $this->php_ext);
+		include_once($this->phpbb_root_path . 'includes/functions_user.' . $this->php_ext);
 
 		// Check and set some common vars
 		$action				= (isset($_POST['update'])) ? 'update' : $this->request->variable('action', '');
@@ -230,7 +230,7 @@ class ko_module
 
 		$template->assign_vars(array(
 			'U_ACTION'				=> $this->u_action,
-			'U_FOOTBALL' 			=> $helper->route('football_main_controller',array('side' => 'bet', 's' => $season, 'l' => $league)),
+			'U_FOOTBALL' 			=> $helper->route('football_football_controller',array('side' => 'bet', 's' => $season, 'l' => $league)),
 			'S_ERROR'				=> (sizeof($error)) ? true : false,
 			'ERROR_MSG'				=> (sizeof($error)) ? implode('<br />', $error) : '',
 			'S_SUCCESS'				=> (sizeof($success)) ? true : false,
@@ -252,4 +252,3 @@ class ko_module
 		);
 	}
 }
-?>

acp/leagues_info.php

@@ -1,25 +1,25 @@
-<?php
-/**
-*
-* @package phpBB Extension - Football Football
-* @copyright (c) 2016 football (http://football.bplaced.net)
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
-*
-*/
-
-namespace football\football\acp;
-
-class leagues_info
-{
-	function module()
-	{
-		return array(
-			'filename'	=> '\football\football\acp\leagues_module',
-			'title'		=> 'ACP_FOOTBALL_LEAGUES_MANAGEMENT',
-			'version'	=> '0.9.4',
-			'modes'		=> array(
-				'manage'	=> array('title' => 'ACP_FOOTBALL_LEAGUES_MANAGE', 'auth' => 'acl_a_football_plan', 'cat' => array('ACP_FOOTBALL_LEAGUES')),
-			),
-		);
-	}
-}
+<?php
+/**
+*
+* @package phpBB Extension - Football Football
+* @copyright (c) 2016 football (http://football.bplaced.net)
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+namespace football\football\acp;
+
+class leagues_info
+{
+	function module()
+	{
+		return array(
+			'filename'	=> '\football\football\acp\leagues_module',
+			'title'		=> 'ACP_FOOTBALL_LEAGUES_MANAGEMENT',
+			'version'	=> '0.9.4',
+			'modes'		=> array(
+				'manage'	=> array('title' => 'ACP_FOOTBALL_LEAGUES_MANAGE', 'auth' => 'acl_a_football_plan', 'cat' => array('ACP_FOOTBALL_LEAGUES')),
+			),
+		);
+	}
+}

acp/leagues_module.php

@@ -56,7 +56,7 @@ class leagues_module
 		$form_key = 'acp_football_leagues';
 		add_form_key($form_key);
 
-		include($phpbb_root_path . 'includes/functions_user.' . $phpEx);
+		include_once($phpbb_root_path . 'includes/functions_user.' . $phpEx);
 
 		// Check and set some common vars
 		$action		= (isset($_POST['add'])) ? 'add' : ((isset($_POST['addmembers'])) ? 'addmembers' : $this->request->variable('action', ''));
@@ -416,7 +416,7 @@ class leagues_module
 			break;
 
 			case 'add':
-				if ($league > 0 AND $league <= 99)
+				if ($league > 0 AND $league <= 101)
 				{
 					if ($league_info)
 					{
@@ -494,6 +494,7 @@ class leagues_module
 						$league_info['join_in_season'] 		= $this->request->variable('league_join_in_season', $league_info['join_in_season'], true);
 						$league_info['bet_in_time'] 		= $this->request->variable('league_bet_in_time', $league_info['bet_in_time'], true);
 						$league_info['rules_post_id'] 		= $this->request->variable('league_rules_post_id', $league_info['rules_post_id'], true);
+						$league_info['bet_type'] 			= $this->request->variable('bet_type', false);
 
 						if (!$league_info['rules_post_id'] and $league_info['join_by_user'] == 1)
 						{
@@ -509,6 +510,15 @@ class leagues_module
 						{
 							$error[] = $user->lang['CHECK_HITS02_WINS'];
 						}
+						
+						if ($league_info['bet_type'] == true)
+						{
+						    $bet_type = '0';
+						}
+						else
+						{
+						    $bet_type = '1';
+						}
 
 						$matchday_wins = explode(';',$league_info['win_matchday']);
 						foreach ($matchday_wins as $matchday_win)
@@ -555,6 +565,7 @@ class leagues_module
 								'bet_in_time'			=> $league_info['bet_in_time'],
 								'rules_post_id'			=> (is_numeric($league_info['rules_post_id'])) ? $league_info['rules_post_id'] : 0,
 								'bet_points'			=> $league_info['bet_points'],
+							    'bet_type'				=> (int) $bet_type,
 							);
 
 							$data['league']				= $league;
@@ -564,8 +575,8 @@ class leagues_module
 							$data['league_matches']		= ($league_info['league_type'] == LEAGUE_KO) ? 0 : $league_info['matches_on_matchday'];
 							
 							$var_ary = array(
-								'league'			=> array('num', false, 1, 99),
-								'league_name'		=> array('string', false, 2, 20),
+								'league'			=> array('num', false, 1, 101),
+								'league_name'		=> array('string', false, 2, 25),
 								'league_short'		=> array('string', false, 1, 3),
 								'league_matchdays'	=> array('num', false, 0, 99),
 								'league_matches'	=> array('num', false, 0, 99),
@@ -620,6 +631,15 @@ class leagues_module
 				// check if matches created
 				$existing_matches_on_league = count_existing_matches($season, $league, 0);
 				
+				if ($league_info['bet_type'] == true)
+				{
+				    $bet_type = '0';
+				}
+				else
+				{
+				    $bet_type = '1';
+				}
+				
 				$u_back = $this->u_action . "&amp;s=$season";
 
 				$template->assign_vars(array(
@@ -661,7 +681,8 @@ class leagues_module
 					'LEAGUE_WIN_MATCHDAYS'	=> $league_info['win_matchday'],
 					'LEAGUE_WIN_SEASON'		=> $league_info['win_season'],
 					'POINTS_LAST_YES' 		=> ($league_info['points_last'] == 1) ? ' checked="checked"' : '',
-					'POINTS_LAST_NO' 		=> ($league_info['points_last'] == 0) ? ' checked="checked"' : '',
+				    'POINTS_LAST_NO' 		=> ($league_info['points_last'] == 0) ? ' checked="checked"' : '',
+				    'S_BET_TYPE'			=> $bet_type,
 					'U_BACK'				=> $u_back,
 					'U_ACTION'				=> "{$this->u_action}&amp;action=$action&amp;s=$season",
 					)
@@ -672,7 +693,7 @@ class leagues_module
 
 		$template->assign_vars(array(
 			'U_ACTION'			=> $this->u_action,
-			'U_FOOTBALL' 		=> $helper->route('football_main_controller',array('side' => 'bet', 's' => $season)),
+			'U_FOOTBALL' 		=> $helper->route('football_football_controller',array('side' => 'bet', 's' => $season)),
 			'S_SEASON'			=> $season,
 			'S_SEASON_OPTIONS'	=> $season_options,
 			'S_LEAGUE_ADD'		=> true,
@@ -690,8 +711,8 @@ class leagues_module
 			FROM ' . FOOTB_LEAGUES . ' AS l
 			LEFT JOIN ' . FOOTB_BETS . " AS b ON (b.season = l.season AND b.league = l.league)
 			WHERE l.season = $season
-			GROUP BY league
-			ORDER BY league ASC";
+			GROUP BY l.league
+			ORDER BY l.league ASC";
 		$result = $db->sql_query($sql);
 		$rows_leagues = $db->sql_fetchrowset($result);
 		$db->sql_freeresult($result);
@@ -730,4 +751,3 @@ class leagues_module
 		}
 	}
 }
-?>

acp/matchdays_info.php

@@ -1,25 +1,25 @@
-<?php
-/**
-*
-* @package phpBB Extension - Football Football
-* @copyright (c) 2016 football (http://football.bplaced.net)
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
-*
-*/
-
-namespace football\football\acp;
-
-class matchdays_info
-{
-	function module()
-	{
-		return array(
-			'filename'	=> '\football\football\acp\matchdays_module',
-			'title'		=> 'ACP_FOOTBALL_MATCHDAYS_MANAGEMENT',
-			'version'	=> '0.9.4',
-			'modes'		=> array(
-				'manage'	=> array('title' => 'ACP_FOOTBALL_MATCHDAYS_MANAGE', 'auth' => 'acl_a_football_plan', 'cat' => array('ACP_FOOTBALL_MATCHDAYS')),
-			),
-		);
-	}
-}
+<?php
+/**
+*
+* @package phpBB Extension - Football Football
+* @copyright (c) 2016 football (http://football.bplaced.net)
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+namespace football\football\acp;
+
+class matchdays_info
+{
+	function module()
+	{
+		return array(
+			'filename'	=> '\football\football\acp\matchdays_module',
+			'title'		=> 'ACP_FOOTBALL_MATCHDAYS_MANAGEMENT',
+			'version'	=> '0.9.4',
+			'modes'		=> array(
+				'manage'	=> array('title' => 'ACP_FOOTBALL_MATCHDAYS_MANAGE', 'auth' => 'acl_a_football_plan', 'cat' => array('ACP_FOOTBALL_MATCHDAYS')),
+			),
+		);
+	}
+}

acp/matchdays_module.php

@@ -56,7 +56,7 @@ class matchdays_module
 		$form_key = 'acp_football_matchdays';
 		add_form_key($form_key);
 
-		include($this->phpbb_root_path . 'includes/functions_user.' . $this->php_ext);
+		include_once($this->phpbb_root_path . 'includes/functions_user.' . $this->php_ext);
 
 		// Check and set some common vars
 		$action			= (isset($_POST['add'])) ? 'add' : '';
@@ -216,7 +216,7 @@ class matchdays_module
 				$show_delivery_select = false;
 				$show_delivery = true;
 				$lang_dates = $user->lang['datetime'];
-				$sql = "(SELECT md.matchday,
+				$sql = "(SELECT md.matchday AS matchday,
 							1 AS number,
 							md.delivery_date,
 							CASE DATE_FORMAT(md.delivery_date,'%w')
@@ -251,7 +251,7 @@ class matchdays_module
 					AND md.league = agg.league 
 					AND md.matchday = agg.matchday)
 					UNION
-					(SELECT md2.matchday,
+					(SELECT md2.matchday AS matchday,
 							2 AS number,
 							md2.delivery_date_2 AS delivery_date,
 							CASE DATE_FORMAT(md2.delivery_date_2,'%w')
@@ -286,7 +286,7 @@ class matchdays_module
 					AND md2.league = agg2.league 
 					AND md2.matchday = agg2.matchday)
 					UNION
-					(SELECT md3.matchday,
+					(SELECT md3.matchday AS matchday,
 							3 AS number,
 							md3.delivery_date_3 AS delivery_date,
 							CASE DATE_FORMAT(md3.delivery_date_3,'%w')
@@ -1090,7 +1090,7 @@ class matchdays_module
 
 		$template->assign_vars(array(
 			'U_ACTION'			=> $this->u_action,
-			'U_FOOTBALL' 		=> $helper->route('football_main_controller',array('side' => 'bet', 's' => $season, 'l' => $league)),
+			'U_FOOTBALL' 		=> $helper->route('football_football_controller',array('side' => 'bet', 's' => $season, 'l' => $league)),
 			'S_SEASON'			=> $season,
 			'S_LEAGUE'			=> $league,
 			'S_SEASON_OPTIONS'	=> $season_options,
@@ -1131,4 +1131,3 @@ class matchdays_module
 		}
 	}
 }
-?>

acp/matches_info.php

@@ -1,25 +1,25 @@
-<?php
-/**
-*
-* @package phpBB Extension - Football Football
-* @copyright (c) 2016 football (http://football.bplaced.net)
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
-*
-*/
-
-namespace football\football\acp;
-
-class matches_info
-{
-	function module()
-	{
-		return array(
-			'filename'	=> '\football\football\acp\matches_module',
-			'title'		=> 'ACP_FOOTBALL_MATCHES_MANAGEMENT',
-			'version'	=> '0.9.4',
-			'modes'		=> array(
-				'manage'	=> array('title' => 'ACP_FOOTBALL_MATCHES_MANAGE', 'auth' => 'acl_a_football_plan', 'cat' => array('ACP_FOOTBALL_MATCHES')),
-			),
-		);
-	}
-}
+<?php
+/**
+*
+* @package phpBB Extension - Football Football
+* @copyright (c) 2016 football (http://football.bplaced.net)
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+namespace football\football\acp;
+
+class matches_info
+{
+	function module()
+	{
+		return array(
+			'filename'	=> '\football\football\acp\matches_module',
+			'title'		=> 'ACP_FOOTBALL_MATCHES_MANAGEMENT',
+			'version'	=> '0.9.4',
+			'modes'		=> array(
+				'manage'	=> array('title' => 'ACP_FOOTBALL_MATCHES_MANAGE', 'auth' => 'acl_a_football_plan', 'cat' => array('ACP_FOOTBALL_MATCHES')),
+			),
+		);
+	}
+}

acp/matches_module.php

@@ -56,7 +56,7 @@ class matches_module
 		$form_key = 'acp_football_matches';
 		add_form_key($form_key);
 
-		include($this->phpbb_root_path . 'includes/functions_user.' . $this->php_ext);
+		include_once($this->phpbb_root_path . 'includes/functions_user.' . $this->php_ext);
 
 		// Check and set some common vars
 		$action			= (isset($_POST['add'])) ? 'add' : $this->request->variable('action', '');
@@ -124,12 +124,12 @@ class matches_module
 				$league_options .= '<option value="' . $row['league'] . '"' . $selected . '>' . $row['league_name'] . '</option>';
 				if ($selected <> '')
 				{
-					$league_info 	    = $row;
-					$league_matchdays 	= $row['matchdays'];
-					$matches_matchday 	= $row['matches_on_matchday'];
-					$league_name 		= $row['league_name'];
-					$league_type 		= $row['league_type'];
-					$ko_league 			= ($row['league_type'] == LEAGUE_KO) ? true : false;
+					$league_info		= $row;
+					$league_matchdays	= $row['matchdays'];
+					$matches_matchday	= $row['matches_on_matchday'];
+					$league_name		= $row['league_name'];
+					$league_type		= $row['league_type'];
+					$ko_league			= ($row['league_type'] == LEAGUE_KO) ? true : false;
 				}
 			}
 			$db->sql_freeresult($result);
@@ -387,18 +387,19 @@ class matches_module
 							trigger_error($user->lang['FORM_INVALID'] . adm_back_link($this->u_action . "&amp;s=$season&amp;l=$league&amp;m=$matchday"), E_USER_WARNING);
 						}
 						
-						$match_row['status'] 		= utf8_normalize_nfc($this->request->variable('match_status', '', true));
-						$match_row['odd_1'] 		= round($this->request->variable('odd_1', $match_row['odd_1']),2);
-						$match_row['odd_x'] 		= round($this->request->variable('odd_x', $match_row['odd_x']),2);
-						$match_row['odd_2'] 		= round($this->request->variable('odd_2', $match_row['odd_2']),2);
-						$match_row['rating'] 		= round($this->request->variable('rating', $match_row['rating']),2);
-						$match_row['team_id_home'] 	= utf8_normalize_nfc($this->request->variable('team_home', '', true));
+						$match_row['status']		= utf8_normalize_nfc($this->request->variable('match_status', '', true));
+						$match_row['odd_1']			= round($this->request->variable('odd_1', $match_row['odd_1']),2);
+						$match_row['odd_x']			= round($this->request->variable('odd_x', $match_row['odd_x']),2);
+						$match_row['odd_2']			= round($this->request->variable('odd_2', $match_row['odd_2']),2);
+						$match_row['rating']		= round($this->request->variable('rating', $match_row['rating']),2);
+						$match_row['team_id_home']	= utf8_normalize_nfc($this->request->variable('team_home', '', true));
 						$match_row['team_id_guest'] = utf8_normalize_nfc($this->request->variable('team_guest', '', true));
-						$match_row['formula_home'] 	= utf8_normalize_nfc($this->request->variable('formula_home', '', true));
+						$match_row['formula_home']	= utf8_normalize_nfc($this->request->variable('formula_home', '', true));
 						$match_row['formula_guest'] = utf8_normalize_nfc($this->request->variable('formula_guest', '', true));
-						$match_row['ko_match'] 		= $this->request->variable('match_ko', false);
-						$match_row['group_id'] 		= ($this->request->variable('group_match', false)) ? utf8_normalize_nfc($this->request->variable('match_group', '', true)) : '';
-						
+						$match_row['ko_match']		= $this->request->variable('match_ko', false);
+						$match_row['group_id']		= ($this->request->variable('group_match', false)) ? utf8_normalize_nfc($this->request->variable('match_group', '', true)) : '';
+						$match_row['show_table'] 	= $this->request->variable('show_table', false);
+
 						if ($match_row['team_id_home'] <> '')
 						{
 							$team_arr = explode(';', $match_row['team_id_home']);
@@ -593,7 +594,7 @@ class matches_module
 				}
 				else
 				{
-					$status_options = '<option value="' . $row['status'] . '" selected="selected">' . $row['status'] . '</option>';
+					$status_options = '<option value="' . $match_row['status'] . '" selected="selected">' . $match_row['status'] . '</option>';
 				}
 				// Grab for teams for selection
 				if ($ko_league) 
@@ -717,7 +718,7 @@ class matches_module
 
 		$template->assign_vars(array(
 			'U_ACTION'			=> $this->u_action,
-			'U_FOOTBALL' 		=> $helper->route('football_main_controller',array('side' => 'bet', 's' => $season, 'l' => $league, 'm' => $matchday)),
+			'U_FOOTBALL'		=> $helper->route('football_football_controller',array('side' => 'bet', 's' => $season, 'l' => $league, 'm' => $matchday)),
 			'S_SEASON'			=> $season,
 			'S_LEAGUE'			=> $league,
 			'S_KO_LEAGUE'		=> $ko_league,
@@ -761,5 +762,3 @@ class matches_module
 		}
 	}
 }
-
-?>

acp/results_info.php

@@ -1,25 +1,25 @@
-<?php
-/**
-*
-* @package phpBB Extension - Football Football
-* @copyright (c) 2016 football (http://football.bplaced.net)
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
-*
-*/
-
-namespace football\football\acp;
-
-class results_info
-{
-	function module()
-	{
-		return array(
-			'filename'	=> '\football\football\acp\results_module',
-			'title'		=> 'ACP_FOOTBALL_RESULTS_MANAGEMENT',
-			'version'	=> '1.0.0',
-			'modes'		=> array(
-				'manage'		=> array('title' => 'ACP_FOOTBALL_RESULTS_MANAGE', 'auth' => 'acl_a_football_results', 'cat' => array('ACP_FOOTBALL_RESULTS')),
-			),
-		);
-	}
-}
+<?php
+/**
+*
+* @package phpBB Extension - Football Football
+* @copyright (c) 2016 football (http://football.bplaced.net)
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+namespace football\football\acp;
+
+class results_info
+{
+	function module()
+	{
+		return array(
+			'filename'	=> '\football\football\acp\results_module',
+			'title'		=> 'ACP_FOOTBALL_RESULTS_MANAGEMENT',
+			'version'	=> '1.0.0',
+			'modes'		=> array(
+				'manage'		=> array('title' => 'ACP_FOOTBALL_RESULTS_MANAGE', 'auth' => 'acl_a_football_results', 'cat' => array('ACP_FOOTBALL_RESULTS')),
+			),
+		);
+	}
+}

acp/results_module.php

@@ -60,7 +60,7 @@ class results_module
 		$form_key = 'acp_football_results';
 		add_form_key($form_key);
 		
-		include($this->phpbb_root_path . 'includes/functions_user.' . $this->php_ext);
+		include_once($this->phpbb_root_path . 'includes/functions_user.' . $this->php_ext);
 
 		// Check and set some common vars
 		$action		= (isset($_POST['edit'])) ? 'edit' : $this->request->variable('action', '');
@@ -443,6 +443,9 @@ class results_module
 
 				$cash	= $this->request->variable('cash', false);
 				save_ranking_matchday($season, $league, $matchday, $cash);
+				bonuspoints($season, $league, $matchday);
+				corr($season, $league, $matchday);
+				chart($season, $league, $matchday);
 
 				// Patch delevirey
 				if ($league_info['bet_in_time'] == 1) 
@@ -793,7 +796,7 @@ class results_module
 		
 		$template->assign_vars(array(
 			'U_ACTION'			=> $this->u_action,
-			'U_FOOTBALL' 		=> $helper->route('football_main_controller',array('side' => 'results', 's' => $season, 'l' => $league, 'm' => $matchday)),
+			'U_FOOTBALL' 		=> $helper->route('football_football_controller',array('side' => 'results', 's' => $season, 'l' => $league, 'm' => $matchday)),
 			'S_LEGEND'			=> $legend,
 			'S_SUCCESS'			=> (sizeof($success)) ? true : false,
 			'SUCCESS_MSG'		=> (sizeof($success)) ? implode('<br />', $success) : '',
@@ -815,5 +818,3 @@ class results_module
 		);
 	}
 }
-
-?>

acp/seasons_module.php

@@ -56,7 +56,7 @@ class seasons_module
 		$form_key = 'acp_football_seasons';
 		add_form_key($form_key);
 
-		include($phpbb_root_path . 'includes/functions_user.' . $phpEx);
+		include_once($phpbb_root_path . 'includes/functions_user.' . $phpEx);
 
 		// Check and set some common vars
 		$action		= (isset($_POST['add'])) ? 'add' : $this->request->variable('action', '');
@@ -335,6 +335,7 @@ class seasons_module
 					'SEASON_SHORT'		=> $season_row['season_name_short'],
 					'U_BACK'			=> $u_back,
 					'U_ACTION'			=> "{$this->u_action}&action=$action&s=$season",
+					'S_VERSION_NO'		=> $this->config['football_version'],
 					)
 				);
 				return;
@@ -343,7 +344,7 @@ class seasons_module
 
 		$template->assign_vars(array(
 			'U_ACTION'		=> $this->u_action,
-			'U_FOOTBALL' 				=> $helper->route('football_main_controller',array('side' => 'bet')),
+			'U_FOOTBALL' 				=> $helper->route('football_football_controller',array('side' => 'bet')),
 			'S_SEASON_ADD'	=> true,
 			) 
 		);
@@ -356,8 +357,8 @@ class seasons_module
 				COUNT(l.league) AS leagues
 			FROM ' . FOOTB_SEASONS . ' s
 			LEFT JOIN ' . FOOTB_LEAGUES . ' l on l.season = s.season
-			GROUP BY season
-			ORDER BY season DESC';
+			GROUP BY s.season
+			ORDER BY s.season DESC';
 		$result = $db->sql_query($sql);
 		$rows_seasons = $db->sql_fetchrowset($result);
 		$db->sql_freeresult($result);
@@ -390,5 +391,3 @@ class seasons_module
 		}
 	}
 }
-
-?>

acp/teams_info.php

@@ -1,25 +1,25 @@
-<?php
-/**
-*
-* @package phpBB Extension - Football Football
-* @copyright (c) 2016 football (http://football.bplaced.net)
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
-*
-*/
-
-namespace football\football\acp;
-
-class teams_info
-{
-	function module()
-	{
-		return array(
-			'filename'	=> '\football\football\acp\teams_module',
-			'title'		=> 'ACP_FOOTBALL_TEAMS_MANAGEMENT',
-			'version'	=> '0.9.4',
-			'modes'		=> array(
-				'manage'	=> array('title' => 'ACP_FOOTBALL_TEAMS_MANAGE', 'auth' => 'acl_a_football_plan', 'cat' => array('ACP_FOOTBALL_TEAMS')),
-			),
-		);
-	}
-}
+<?php
+/**
+*
+* @package phpBB Extension - Football Football
+* @copyright (c) 2016 football (http://football.bplaced.net)
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+namespace football\football\acp;
+
+class teams_info
+{
+	function module()
+	{
+		return array(
+			'filename'	=> '\football\football\acp\teams_module',
+			'title'		=> 'ACP_FOOTBALL_TEAMS_MANAGEMENT',
+			'version'	=> '0.9.4',
+			'modes'		=> array(
+				'manage'	=> array('title' => 'ACP_FOOTBALL_TEAMS_MANAGE', 'auth' => 'acl_a_football_plan', 'cat' => array('ACP_FOOTBALL_TEAMS')),
+			),
+		);
+	}
+}

acp/teams_module.php

@@ -56,7 +56,7 @@ class teams_module
 		$form_key = 'acp_football_teams';
 		add_form_key($form_key);
 
-		include($this->phpbb_root_path . 'includes/functions_user.' . $this->php_ext);
+		include_once($this->phpbb_root_path . 'includes/functions_user.' . $this->php_ext);
 
 		// Check and set some common vars
 		$action		= (isset($_POST['add'])) ? 'add' : $this->request->variable('action', '');
@@ -177,7 +177,7 @@ class teams_module
 			$folder = $this->ext_football_path . 'images/flags/';
 			$directory  = opendir($folder);
 			$files = array(); 
-			while($file = readdir($directory))    
+			while($file = readdir($directory))
 			{
 				if( !(bool) preg_match('/.+\.(?:jpe?g|gif|png)$/i', $file) ) 
 				{
@@ -189,7 +189,10 @@ class teams_module
 
 			foreach( $files as $file ) 
 			{
-				$selected = (strtoupper($file) == strtoupper($team_row['team_symbol'])) ? ' selected="selected"' : '';
+                $selected = '';
+                if (isset($team_row) && is_array($team_row)) {
+                    $selected = (strtoupper($file) == strtoupper($team_row['team_symbol'])) ? ' selected="selected"' : '';
+                }
 				$teamsymbol_options .= '<option value="' . $file . '"' . $selected . '>' . $file . '</option>';
 			}
 			closedir($directory);		
@@ -309,7 +312,7 @@ class teams_module
 				$folder = $this->ext_football_path . 'images/flags/';
 				$directory  = opendir($folder);
 				$files = array(); 
-				while($file = readdir($directory))    
+				while($file = readdir($directory))
 				{
 					if( !(bool) preg_match('/.+\.(?:jpe?g|gif|png)$/i', $file) ) 
 					{
@@ -589,7 +592,7 @@ class teams_module
 
 		$template->assign_vars(array(
 			'U_ACTION'			=> $this->u_action,
-			'U_FOOTBALL' 		=> $helper->route('football_main_controller',array('side' => 'bet', 's' => $season, 'l' => $league)),
+			'U_FOOTBALL' 		=> $helper->route('football_football_controller',array('side' => 'bet', 's' => $season, 'l' => $league)),
 			'S_SEASON'			=> $season,
 			'S_LEAGUE'			=> $league,
 			'S_KO_LEAGUE'		=> $ko_league,
@@ -597,6 +600,7 @@ class teams_module
 			'S_LEAGUE_OPTIONS'	=> $league_options,
 			'S_TEAM_OPTIONS'	=> $team_options,
 			'S_TEAM_ADD'		=> true,
+			'S_VERSION_NO'		=> $this->config['football_version'],
 			) 
 		);
 		
@@ -609,7 +613,7 @@ class teams_module
 			WHERE t.season = $season 
 				AND t.league = $league
 			GROUP BY t.team_id
-			ORDER BY team_id ASC";
+			ORDER BY t.team_id ASC";
 		$result = $db->sql_query($sql);
 		$rows_teams = $db->sql_fetchrowset($result);
 		$db->sql_freeresult($result);
@@ -654,4 +658,3 @@ class teams_module
 		);
 	}
 }
-?>

acp/update_info.php

@@ -1,25 +1,25 @@
-<?php
-/**
-*
-* @package phpBB Extension - Football Football
-* @copyright (c) 2016 football (http://football.bplaced.net)
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
-*
-*/
-
-namespace football\football\acp;
-
-class update_info
-{
-	function module()
-	{
-		return array(
-			'filename'	=> '\football\football\acp\update_module',
-			'title'		=> 'ACP_FOOTBALL_UPDATE_MANAGEMENT',
-			'version'	=> '0.9.4',
-			'modes'		=> array(
-				'manage'	=> array('title' => 'ACP_FOOTBALL_UPDATE_MANAGE', 'auth' => 'acl_a_football_plan', 'cat' => array('ACP_FOOTBALL_UPDATE')),
-			),
-		);
-	}
-}
+<?php
+/**
+*
+* @package phpBB Extension - Football Football
+* @copyright (c) 2016 football (http://football.bplaced.net)
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+namespace football\football\acp;
+
+class update_info
+{
+	function module()
+	{
+		return array(
+			'filename'	=> '\football\football\acp\update_module',
+			'title'		=> 'ACP_FOOTBALL_UPDATE_MANAGEMENT',
+			'version'	=> '0.9.4',
+			'modes'		=> array(
+				'manage'	=> array('title' => 'ACP_FOOTBALL_UPDATE_MANAGE', 'auth' => 'acl_a_football_plan', 'cat' => array('ACP_FOOTBALL_UPDATE')),
+			),
+		);
+	}
+}

acp/update_module.php

@@ -107,7 +107,7 @@ class update_module
 		$form_key = 'acp_football_update';
 		add_form_key($form_key);
 
-		include($this->phpbb_root_path . 'includes/functions_user.' . $this->php_ext);
+		include_once($this->phpbb_root_path . 'includes/functions_user.' . $this->php_ext);
 
 		// Check and set some common vars
 		$action			= (isset($_POST['load_xml_season'])) ? 'load_xml_season' : '';
@@ -131,7 +131,7 @@ class update_module
 		$insert_season	= $this->request->variable('insert_season', false);
 		$insert_league	= $this->request->variable('insert_league', false);
 		$list			= $this->request->variable('list', false);
-		$this->xml_ary	= unserialize(urldecode($this->request->variable('xml_ary', '')));
+		$this->xml_ary	= json_decode(urldecode($this->request->variable('xml_ary', '')),true);
 		$display_team_mapping = false;
 		// Clear some vars
 		$error = array();
@@ -730,7 +730,7 @@ class update_module
 		$template->assign_vars(array(
 			'U_ACTION'				=> $this->u_action,
 			'U_CHOOSE_ACTION'		=> $this->u_action . "&action=choose",			
-			'U_FOOTBALL' 			=> $helper->route('football_main_controller',array('side' => 'bet', 's' => $season, 'l' => $league)),
+			'U_FOOTBALL' 			=> $helper->route('football_football_controller',array('side' => 'bet', 's' => $season, 'l' => $league)),
 			'S_ERROR'				=> (sizeof($error)) ? true : false,
 			'ERROR_MSG'				=> (sizeof($error)) ? implode('<br />', $error) : '',
 			'S_SUCCESS'				=> (sizeof($success)) ? true : false,
@@ -750,7 +750,7 @@ class update_module
 			'DO_MATCHES'			=> ($insert_league) ? sprintf($user->lang['INSERT_MATCHES']) : sprintf($user->lang['UPDATE_MATCHES']),
 			'XML_SEASON_URL'		=> $xml_season_url,
 			'XML_LEAGUE_URL'		=> $xml_league_url,
-			'XML_ARY'				=> (sizeof($this->xml_ary)) ? urlencode(serialize($this->xml_ary)) : '',
+			'XML_ARY'				=> (is_array($this->xml_ary) && sizeof($this->xml_ary)) ? urlencode(json_encode($this->xml_ary)) : '',
 			'S_XSEASON_OPTIONS'		=> $xseason_options,
 			'S_XLEAGUE_OPTIONS'		=> $xleague_options,
 			'S_XSEASON'				=> $xseason,
@@ -851,7 +851,7 @@ class update_module
 			{
 				$this->xml_ary['footb_teams'][$key]['team_id'] = $team_id_map_ary[$xml_team['team_id']];
 			}
-			usort($this->xml_ary['footb_teams'], 'sort_teams');
+			usort($this->xml_ary['footb_teams'], array($this, 'sort_teams'));
 
 			foreach ($this->xml_ary['footb_matches'] AS $key => $xml_team)
 			{
@@ -1144,7 +1144,7 @@ class update_module
 		{
 			if (sizeof($table_row))
 			{
-				$tpl .= '<input type="hidden" name="row_' . $id . '" value="' . urlencode(serialize($diff)) . '" />';
+				$tpl .= '<input type="hidden" name="row_' . $id . '" value="' . urlencode(json_encode($diff)) . '" />';
 				// match status update and database
 				if (substr($id, 0, 13) == 'FOOTB_MATCHES')
 				{
@@ -1160,7 +1160,7 @@ class update_module
 			else
 			{
 				// Insert team
-				$tpl .= '<input type="hidden" name="' . $id . '[]" value="' . urlencode(serialize($diff)) . '" />';
+				$tpl .= '<input type="hidden" name="' . $id . '[]" value="' . urlencode(json_encode($diff)) . '" />';
 			}
 		}
 
@@ -1171,7 +1171,7 @@ class update_module
 			{
 				if (sizeof($table_row))
 				{
-					$color_open = '<span title= "' . sprintf($user->lang['CURRENT_VALUE']) . ': ' . htmlspecialchars($table_row[$key], ENT_COMPAT, 'UTF-8') . '" style="color: red;">* ';
+					$color_open = '<span title= "' . sprintf($user->lang['CURRENT_VALUE']) . ': ' . utf8_htmlspecialchars($table_row[$key]) . '" style="color: red;">* ';
 					$color_close = '</span>';
 				}
 				else
@@ -1188,8 +1188,8 @@ class update_module
 			if (sizeof($order))
 			{
 				$value = (substr($key, 0, 7) == 'team_id') ? $value . ' ' . $this->team_ary[$value] : $value;
-				$tpl_ary[$order[$key]] = ($order[$key] % 2) ? $color_open . htmlspecialchars($value, ENT_COMPAT, 'UTF-8') . $color_close . '&nbsp;</td>' :
-										'<td>' . $color_open . htmlspecialchars($value, ENT_COMPAT, 'UTF-8') . $color_close . '<br />';			
+				$tpl_ary[$order[$key]] = ($order[$key] % 2) ? $color_open . utf8_htmlspecialchars($value) . $color_close . '&nbsp;</td>' :
+				'<td>' . $color_open . utf8_htmlspecialchars($value) . $color_close . '<br />';			
 			}
 			else
 			{
@@ -1198,14 +1198,14 @@ class update_module
 					// Write table fields
 					if (sizeof($table_row))
 					{
-						$tpl .= '<td title= "' . htmlspecialchars($table_row[$key], ENT_COMPAT, 'UTF-8') . '">' .
-									$color_open . htmlspecialchars($value, ENT_COMPAT, 'UTF-8') . $color_close . 
+						$tpl .= '<td title= "' . utf8_htmlspecialchars($table_row[$key]) . '">' .
+							$color_open . utf8_htmlspecialchars($value) . $color_close . 
 								'</td>';		
 					}
 					else
 					{
 						$tpl .= '<td title= "' . sprintf($user->lang['NEW_TEAM']) . '">' .
-									$color_open . htmlspecialchars($value, ENT_COMPAT, 'UTF-8') . $color_close . 
+							$color_open . utf8_htmlspecialchars($value) . $color_close . 
 								'</td>';		
 					}
 				}
@@ -1245,15 +1245,15 @@ class update_module
 			if (sizeof($order))
 			{
 				$value = (substr($key, 0, 7) == 'team_id') ? $value . ' ' . $this->team_ary[$value] : $value;
-				$tpl_ary[$order[$key]] = ($order[$key] % 2) ? htmlspecialchars($value, ENT_COMPAT, 'UTF-8') . '&nbsp;</td>' :
-										'<td>' . htmlspecialchars($value, ENT_COMPAT, 'UTF-8') . '<br />';			
+				$tpl_ary[$order[$key]] = ($order[$key] % 2) ? utf8_htmlspecialchars($value) . '&nbsp;</td>' :
+				'<td>' . utf8_htmlspecialchars($value) . '<br />';			
 			}
 			else
 			{
 				if ($key <> 'season' and $key <> 'league')
 				{
 					// Write XML-table fields
-					$tpl .= '<td>' . htmlspecialchars($value, ENT_COMPAT, 'UTF-8') . '</td>';
+					$tpl .= '<td>' . utf8_htmlspecialchars($value) . '</td>';
 				}
 			}
 		}
@@ -1322,7 +1322,7 @@ class update_module
 			if ($this->request->variable($table . '_' . $row['index_field'], false))
 			{
 				
-				$diff_ary = unserialize(urldecode($this->request->variable('row_' . $table . '_' . $row['index_field'], '')));
+				$diff_ary = json_decode(urldecode($this->request->variable('row_' . $table . '_' . $row['index_field'], '')),true);
 				$sql_ary = array_intersect_ukey($diff_ary, $selected_fields, 'self::key_compare_func');
 				if ($table == 'FOOTB_MATCHES')
 				{
@@ -1407,7 +1407,7 @@ class update_module
 		}
 		foreach ($insert_ary AS $insert)
 		{
-			$sql_ary = unserialize(urldecode($insert));
+			$sql_ary = json_decode(urldecode($insert),true);
 			$sql = 'INSERT INTO ' . $table_name . ' ' . $db->sql_build_array('INSERT', $sql_ary);
 			$db->sql_query($sql);
 			if ($db->sql_affectedrows())
@@ -1461,4 +1461,3 @@ class update_module
 		return $selected_fields;
 	}
 }
-?>

adm/style/acp_football.html

@@ -1,65 +1,65 @@
-<!-- INCLUDECSS css/football_acp.css -->
-<!-- INCLUDE overall_header.html -->
-
-<a id="maincontent"></a>
-<!-- IF U_FOOTBALL --><a href="{U_FOOTBALL}" style="float: {S_CONTENT_FLOW_END};">&laquo; {L_PREDICTION_LEAGUE}</a><!-- ENDIF -->
-<h1>{L_TITLE}</h1>
-<p>{L_TITLE_EXPLAIN}</p>
-
-<!-- IF S_ERROR -->
-	<div class="errorbox">
-		<h3>{L_WARNING}</h3>
-		<p>{ERROR_MSG}</p>
-	</div>
-<!-- ENDIF -->
-<!-- BEGIN mods -->
-
-	<fieldset>
-		<legend>{L_FOOTBALL_VERSION_CHECK}</legend>
-		<p style="font-weight: bold; color: <!-- IF mods.S_UP_TO_DATE -->#228822<!-- ELSE -->#BC2A4D<!-- ENDIF -->;">{mods.UP_TO_DATE}</p>
-		<dl>
-			<dt><label>{L_CURRENT_VERSION}</label></dt>
-			<dd><strong>{mods.CURRENT_VERSION}</strong></dd>
-		</dl>
-		<dl>
-			<dt><label>{L_LATEST_VERSION}</label></dt>
-			<dd><strong>{mods.LATEST_VERSION}</strong></dd>
-		</dl>
-		<!-- IF not mods.S_UP_TO_DATE -->
-			<dl>
-				<dt><label>{L_DOWNLOAD_LATEST}</label></dt>
-				<dd><strong><a href="{mods.DOWNLOAD}">{L_DOWNLOAD} {mods.TITLE} {mods.LATEST_VERSION}</a></strong></dd>
-			</dl>
-			<dl>
-				<dt><label>{L_ANNOUNCEMENT_TOPIC}</label></dt>
-				<dd><strong><a href="{mods.ANNOUNCEMENT}">{L_RELEASE_ANNOUNCEMENT}</a></strong></dd>
-			</dl>
-		<!-- ENDIF -->
-	</fieldset>
-<!-- END mods -->
-<form id="acp_football" method="post" action="{U_ACTION}">
-
-<!-- BEGIN options -->
-	<!-- IF options.S_LEGEND -->
-		<!-- IF not options.S_FIRST_ROW -->
-		</fieldset>
-		<!-- ENDIF -->
-		<fieldset>
-			<legend>{options.LEGEND}</legend>
-	<!-- ELSE -->
-		<dl>
-			<dt><label for="{options.KEY}">{options.TITLE}:</label><!-- IF options.S_EXPLAIN --><br /><span>{options.TITLE_EXPLAIN}</span><!-- ENDIF --></dt>
-			<dd>{options.CONTENT}</dd>
-		</dl>
-	<!-- ENDIF -->
-<!-- END options -->
-	<p class="submit-buttons">
-		<input class="button1" type="submit" id="submit" name="submit" value="{L_SUBMIT}" />&nbsp;
-		<input class="button2" type="reset" id="reset" name="reset" value="{L_RESET}" />
-	</p>
-	{S_FORM_TOKEN}
-		</fieldset>
-</form>
-<br />
-<div style="text-align: center;">phpBB Extension - Football Prediction League - Version {S_VERSION_NO} &copy; 2016 <a href="http://football.bplaced.net">football</a></div>
+<!-- INCLUDECSS css/football_acp.css -->
+<!-- INCLUDE overall_header.html -->
+
+<a id="maincontent"></a>
+<!-- IF U_FOOTBALL --><a href="{U_FOOTBALL}" style="float: {S_CONTENT_FLOW_END};">&laquo; {L_PREDICTION_LEAGUE}</a><!-- ENDIF -->
+<h1>{L_TITLE}</h1>
+<p>{L_TITLE_EXPLAIN}</p>
+
+<!-- IF S_ERROR -->
+	<div class="errorbox">
+		<h3>{L_WARNING}</h3>
+		<p>{ERROR_MSG}</p>
+	</div>
+<!-- ENDIF -->
+<!-- BEGIN mods -->
+
+	<fieldset>
+		<legend>{L_FOOTBALL_VERSION_CHECK}</legend>
+		<p style="font-weight: bold; color: <!-- IF mods.S_UP_TO_DATE -->#228822<!-- ELSE -->#BC2A4D<!-- ENDIF -->;">{mods.UP_TO_DATE}</p>
+		<dl>
+			<dt><label>{L_CURRENT_VERSION}</label></dt>
+			<dd><strong>{mods.CURRENT_VERSION}</strong></dd>
+		</dl>
+		<dl>
+			<dt><label>{L_LATEST_VERSION}</label></dt>
+			<dd><strong>{mods.LATEST_VERSION}</strong></dd>
+		</dl>
+		<!-- IF not mods.S_UP_TO_DATE -->
+			<dl>
+				<dt><label>{L_DOWNLOAD_LATEST}</label></dt>
+				<dd><strong><a href="{mods.DOWNLOAD}">{L_DOWNLOAD} {mods.TITLE} {mods.LATEST_VERSION}</a></strong></dd>
+			</dl>
+			<dl>
+				<dt><label>{L_ANNOUNCEMENT_TOPIC}</label></dt>
+				<dd><strong><a href="{mods.ANNOUNCEMENT}">{L_RELEASE_ANNOUNCEMENT}</a></strong></dd>
+			</dl>
+		<!-- ENDIF -->
+	</fieldset>
+<!-- END mods -->
+<form id="acp_football" method="post" action="{U_ACTION}">
+
+<!-- BEGIN options -->
+	<!-- IF options.S_LEGEND -->
+		<!-- IF not options.S_FIRST_ROW -->
+		</fieldset>
+		<!-- ENDIF -->
+		<fieldset>
+			<legend>{options.LEGEND}</legend>
+	<!-- ELSE -->
+		<dl>
+			<dt><label for="{options.KEY}">{options.TITLE}:</label><!-- IF options.S_EXPLAIN --><br /><span>{options.TITLE_EXPLAIN}</span><!-- ENDIF --></dt>
+			<dd>{options.CONTENT}</dd>
+		</dl>
+	<!-- ENDIF -->
+<!-- END options -->
+	<p class="submit-buttons">
+		<input class="button1" type="submit" id="submit" name="submit" value="{L_SUBMIT}" />&nbsp;
+		<input class="button2" type="reset" id="reset" name="reset" value="{L_RESET}" />
+	</p>
+	{S_FORM_TOKEN}
+		</fieldset>
+</form>
+<br />
+<div style="text-align: center;">phpBB Extension - Football Prediction League - Version {S_VERSION_NO} &copy; 2016 <a href="http://football.bplaced.net">football</a></div>
 <!-- INCLUDE overall_footer.html -->

adm/style/acp_football_all_bets.html

@@ -1,151 +1,151 @@
-<!-- INCLUDECSS css/football_acp.css -->
-<!-- INCLUDE overall_header.html -->
-
-<a id="maincontent"></a>
-	<!-- IF U_FOOTBALL --><a href="{U_FOOTBALL}" style="float: {S_CONTENT_FLOW_END};">&laquo; {L_PREDICTION_LEAGUE}</a><!-- ENDIF -->
-	<h1>{L_ACP_FOOTBALL_ALL_BETS_VIEW}</h1>
-	<p>{L_ACP_FOOTBALL_ALL_BETS_VIEW_EXPLAIN}</p>
-
-	<h1 style="display:inline;">{L_SELECT_MATCHDAY}:</h1>
-	<form style="display:inline;" method="post" action="{U_ACTION}">
-	<div style="display:inline; margin:0; padding:0;">
-		<select name="s" id="match_season" onchange="this.form.submit();">{S_SEASON_OPTIONS}</select>
-		{S_FORM_TOKEN}
-	</div>
-	</form>
-	<form style="display:inline;" method="post" action="{U_ACTION}">
-	<div style="display:inline; margin:0; padding:0;">
-		<input type="hidden" name="s" value="{S_SEASON}" />
-		<select name="l" id="match_league" onchange="this.form.submit();">{S_LEAGUE_OPTIONS}</select>
-		{S_FORM_TOKEN}
-	</div>
-	</form>
-	<form style="display:inline;" method="post" action="{U_ACTION}">
-	<div style="display:inline; margin:0; padding:0;">
-		<input type="hidden" name="s" value="{S_SEASON}" />
-		<input type="hidden" name="l" value="{S_LEAGUE}" />
-		<select name="m" id="match_matchday" onchange="this.form.submit();">{S_MATCHDAY_OPTIONS}</select>
-		{S_FORM_TOKEN}
-	</div>
-	</form>
-
-	<fieldset>
-		<legend>{S_LEGEND}</legend>
-	<!-- IF .pagination -->
-	<div class="pagination top-pagination">
-		<!-- INCLUDE pagination.html -->
-	</div>
-	<!-- ENDIF -->	
-
-	<!-- IF .match_panel -->
-		<!-- BEGIN match_panel -->
-		<table class="type_f">
-			<thead>
-				<tr>
-					<th style="text-align: right;"><br/></th>
-				<!-- BEGIN match -->
-					<th colspan="2">{match_panel.match.HOME_NAME}-<br />{match_panel.match.GUEST_NAME}</th>
-				<!-- END match -->
-				<!-- IF match_panel.S_TOTAL -->
-					<th style="text-align: center;"></th>
-				<!-- ENDIF -->
-				</tr>
-				<tr class="row_result">
-					<td  title="{L_RESULT_EXPLAIN}" style="text-align: right;"><b>{L_RESULT}</b></td>
-				<!-- BEGIN match -->
-					<td class="td_result {match_panel.match.COLOR_STYLE}">{match_panel.match.RESULT}</td>
-					<td class="td_pts"></td>
-				<!-- END match -->
-				<!-- IF match_panel.S_TOTAL -->
-					<td title="{L_TOTAL_EXPLAIN}" style="text-align: center;"><b>{L_TOTAL}</b></td>
-				<!-- ENDIF -->
-				</tr>
-			</thead>
-			<!-- BEGIN tendency_footer -->
-				<tfoot>
-					<tr> 
-						<td class="td_tendency" style="text-align: right;" title="{L_TEND_TEXT}">{L_TENDENCY}</td>
-					<!-- BEGIN tendency -->
-						<td class="td_tendency" colspan="2">
-							<dfn style="display: none;">{match_panel.tendency_footer.tendency.MATCH_ENTRY}</dfn>
-							{match_panel.tendency_footer.tendency.TENDENCY}
-						</td>
-					<!-- END tendency -->
-					<!-- IF match_panel.tendency_footer.S_TOTAL -->
-						<td class="td_pts_total"  title="{L_POINTS_TOTAL}">
-							<dfn style="display: none;">{L_POINTS_TOTAL}</dfn>
-							{match_panel.tendency_footer.SUMTOTAL}
-						</td>
-					<!-- ENDIF -->
-					</tr>
-				</tfoot>
-			<!-- END tendency_footer -->
-			<tbody>
-			<!-- BEGIN user_row -->
-				<tr class="{match_panel.user_row.ROW_CLASS}">
-					<td class="td_name">{match_panel.user_row.USER_NAME}</td>
-				<!-- BEGIN bet -->
-					<td class="td_result">{match_panel.user_row.bet.BET}</td>
-					<td class="{match_panel.bet.COLOR_STYLE}">{match_panel.user_row.bet.POINTS}</td>
-				<!-- END bet -->
-				<!-- BEGIN points -->
-					<td class="td_pts_total {match_panel.points.COLOR_STYLE}">{match_panel.user_row.points.POINTS_TOTAL}</td>
-				<!-- END points -->
-				</tr>
-			<!-- END user_row -->
-			</tbody>
-		</table>
-		<!-- END match_panel -->
-		
-		<!-- BEGIN extra_panel -->
-		<br />
-		<table class="type_f">
-			<thead>
-				<tr>
-					<th style="text-align:left;">{L_EXTRA_BET}</th>
-					<th style="width:70%; text-align:left;">{extra_panel.QUESTION}</th>
-					<th>{L_EVALUATION}</th>
-					<th>{L_POINTS}</th>
-				</tr>
-				<tr class="row_result">
-					<td><b>{L_RESULT}</b></td>
-					<td style="text-align:left;" class="{extra_panel.COLOR_STYLE}">{extra_panel.RESULT}</td>
-					<td style="text-align:center;">{extra_panel.EVALUATION}</td>
-					<td style="text-align:center;" title="{extra_panel.EVALUATION_TITLE}">{extra_panel.POINTS}</td>
-				</tr>
-			</thead>
-			<tbody>
-			<!-- BEGIN user_row -->
-				<tr class="{extra_panel.user_row.ROW_CLASS}">
-					<td class="td_name">{extra_panel.user_row.USER_NAME}</td>
-					<td style="text-align:left;">{extra_panel.user_row.BET}</td>
-					<td>&nbsp;</td>
-					<td style="text-align:center;" class="{extra_panel.bet.COLOR_STYLE}">{extra_panel.user_row.POINTS}</td>
-				</tr>
-			<!-- END user_row -->
-			</tbody>
-		</table>
-		<!-- IF S_VIEW == 'print' -->
-		<br />
-		<!-- ENDIF -->
-		<!-- END extra_panel -->
-		<!-- IF .pagination or TOTAL_USERS -->
-		<div class="pagination">
-			{TOTAL_USERS}
-			<!-- IF .pagination -->
-				<!-- INCLUDE pagination.html -->
-			<!-- ELSE -->
-				&bull; {PAGE_NUMBER}
-			<!-- ENDIF -->
-		</div>
-		<!-- ENDIF -->	
-		
-	<!-- ELSE -->
-		<br />
-		<div class="message">{L_NO_MATCHES_ON_MATCHDAY}</div>
-		<br />
-	<!-- ENDIF -->
-	</fieldset>
-<br />
-<div style="text-align: center;">phpBB Extension - Football Prediction League - Version {S_VERSION_NO} &copy; 2016 <a href="http://football.bplaced.net">football</a></div>
+<!-- INCLUDECSS css/football_acp.css -->
+<!-- INCLUDE overall_header.html -->
+
+<a id="maincontent"></a>
+	<!-- IF U_FOOTBALL --><a href="{U_FOOTBALL}" style="float: {S_CONTENT_FLOW_END};">&laquo; {L_PREDICTION_LEAGUE}</a><!-- ENDIF -->
+	<h1>{L_ACP_FOOTBALL_ALL_BETS_VIEW}</h1>
+	<p>{L_ACP_FOOTBALL_ALL_BETS_VIEW_EXPLAIN}</p>
+
+	<h1 style="display:inline;">{L_SELECT_MATCHDAY}:</h1>
+	<form style="display:inline;" method="post" action="{U_ACTION}">
+	<div style="display:inline; margin:0; padding:0;">
+		<select name="s" id="match_season" onchange="this.form.submit();">{S_SEASON_OPTIONS}</select>
+		{S_FORM_TOKEN}
+	</div>
+	</form>
+	<form style="display:inline;" method="post" action="{U_ACTION}">
+	<div style="display:inline; margin:0; padding:0;">
+		<input type="hidden" name="s" value="{S_SEASON}" />
+		<select name="l" id="match_league" onchange="this.form.submit();">{S_LEAGUE_OPTIONS}</select>
+		{S_FORM_TOKEN}
+	</div>
+	</form>
+	<form style="display:inline;" method="post" action="{U_ACTION}">
+	<div style="display:inline; margin:0; padding:0;">
+		<input type="hidden" name="s" value="{S_SEASON}" />
+		<input type="hidden" name="l" value="{S_LEAGUE}" />
+		<select name="m" id="match_matchday" onchange="this.form.submit();">{S_MATCHDAY_OPTIONS}</select>
+		{S_FORM_TOKEN}
+	</div>
+	</form>
+
+	<fieldset>
+		<legend>{S_LEGEND}</legend>
+	<!-- IF .pagination -->
+	<div class="pagination top-pagination">
+		<!-- INCLUDE pagination.html -->
+	</div>
+	<!-- ENDIF -->	
+
+	<!-- IF .match_panel -->
+		<!-- BEGIN match_panel -->
+		<table class="type_f">
+			<thead>
+				<tr>
+					<th style="text-align: right;"><br/></th>
+				<!-- BEGIN match -->
+					<th colspan="2">{match_panel.match.HOME_NAME}-<br />{match_panel.match.GUEST_NAME}</th>
+				<!-- END match -->
+				<!-- IF match_panel.S_TOTAL -->
+					<th style="text-align: center;"></th>
+				<!-- ENDIF -->
+				</tr>
+				<tr class="row_result">
+					<td  title="{L_RESULT_EXPLAIN}" style="text-align: right;"><b>{L_RESULT}</b></td>
+				<!-- BEGIN match -->
+					<td class="td_result {match_panel.match.COLOR_STYLE}">{match_panel.match.RESULT}</td>
+					<td class="td_pts"></td>
+				<!-- END match -->
+				<!-- IF match_panel.S_TOTAL -->
+					<td title="{L_TOTAL_EXPLAIN}" style="text-align: center;"><b>{L_TOTAL}</b></td>
+				<!-- ENDIF -->
+				</tr>
+			</thead>
+			<!-- BEGIN tendency_footer -->
+				<tfoot>
+					<tr> 
+						<td class="td_tendency" style="text-align: right;" title="{L_TEND_TEXT}">{L_TENDENCY}</td>
+					<!-- BEGIN tendency -->
+						<td class="td_tendency" colspan="2">
+							<dfn style="display: none;">{match_panel.tendency_footer.tendency.MATCH_ENTRY}</dfn>
+							{match_panel.tendency_footer.tendency.TENDENCY}
+						</td>
+					<!-- END tendency -->
+					<!-- IF match_panel.tendency_footer.S_TOTAL -->
+						<td class="td_pts_total"  title="{L_POINTS_TOTAL}">
+							<dfn style="display: none;">{L_POINTS_TOTAL}</dfn>
+							{match_panel.tendency_footer.SUMTOTAL}
+						</td>
+					<!-- ENDIF -->
+					</tr>
+				</tfoot>
+			<!-- END tendency_footer -->
+			<tbody>
+			<!-- BEGIN user_row -->
+				<tr class="{match_panel.user_row.ROW_CLASS}">
+					<td class="td_name">{match_panel.user_row.USER_NAME}</td>
+				<!-- BEGIN bet -->
+					<td class="td_result">{match_panel.user_row.bet.BET}</td>
+					<td class="{match_panel.bet.COLOR_STYLE}">{match_panel.user_row.bet.POINTS}</td>
+				<!-- END bet -->
+				<!-- BEGIN points -->
+					<td class="td_pts_total {match_panel.points.COLOR_STYLE}">{match_panel.user_row.points.POINTS_TOTAL}</td>
+				<!-- END points -->
+				</tr>
+			<!-- END user_row -->
+			</tbody>
+		</table>
+		<!-- END match_panel -->
+		
+		<!-- BEGIN extra_panel -->
+		<br />
+		<table class="type_f">
+			<thead>
+				<tr>
+					<th style="text-align:left;">{L_EXTRA_BET}</th>
+					<th style="width:70%; text-align:left;">{extra_panel.QUESTION}</th>
+					<th>{L_EVALUATION}</th>
+					<th>{L_POINTS}</th>
+				</tr>
+				<tr class="row_result">
+					<td><b>{L_RESULT}</b></td>
+					<td style="text-align:left;" class="{extra_panel.COLOR_STYLE}">{extra_panel.RESULT}</td>
+					<td style="text-align:center;">{extra_panel.EVALUATION}</td>
+					<td style="text-align:center;" title="{extra_panel.EVALUATION_TITLE}">{extra_panel.POINTS}</td>
+				</tr>
+			</thead>
+			<tbody>
+			<!-- BEGIN user_row -->
+				<tr class="{extra_panel.user_row.ROW_CLASS}">
+					<td class="td_name">{extra_panel.user_row.USER_NAME}</td>
+					<td style="text-align:left;">{extra_panel.user_row.BET}</td>
+					<td>&nbsp;</td>
+					<td style="text-align:center;" class="{extra_panel.bet.COLOR_STYLE}">{extra_panel.user_row.POINTS}</td>
+				</tr>
+			<!-- END user_row -->
+			</tbody>
+		</table>
+		<!-- IF S_VIEW == 'print' -->
+		<br />
+		<!-- ENDIF -->
+		<!-- END extra_panel -->
+		<!-- IF .pagination or TOTAL_USERS -->
+		<div class="pagination">
+			{TOTAL_USERS}
+			<!-- IF .pagination -->
+				<!-- INCLUDE pagination.html -->
+			<!-- ELSE -->
+				&bull; {PAGE_NUMBER}
+			<!-- ENDIF -->
+		</div>
+		<!-- ENDIF -->	
+		
+	<!-- ELSE -->
+		<br />
+		<div class="message">{L_NO_MATCHES_ON_MATCHDAY}</div>
+		<br />
+	<!-- ENDIF -->
+	</fieldset>
+<br />
+<div style="text-align: center;">phpBB Extension - Football Prediction League - Version {S_VERSION_NO} &copy; 2016 <a href="http://football.bplaced.net">football</a></div>
 <!-- INCLUDE overall_footer.html -->

adm/style/acp_football_bank.html

@@ -1,160 +1,160 @@
-<!-- INCLUDECSS css/football_acp.css -->
-<!-- INCLUDE overall_header.html -->
-
-<a id="maincontent"></a>
-<!-- IF S_LIST -->
-	<a href="{U_BACK}" style="float: {S_CONTENT_FLOW_END};">&laquo; {L_BACK}</a>
-	<h1>{PAGE_TYPE} :: {LEAGUE_NAME}</h1>
-	<p>{PAGE_TYPE_EXPLAIN}</p>
-
-	<form id="list" method="post" action="{U_ACTION}">
-	<p class="small" style="text-align:right;margin-bottom:0px">
-		<a href="#" onclick="setvalues('list', 'newvalue', 'curvalue', {BET_POINTS}); return false;">{L_SET_DEPOSITS}</a> &bull; 
-		<a href="#" onclick="marklist('list', 'mark', true); return false;">{L_MARK_ALL}</a> &bull; 
-		<a href="#" onclick="marklist('list', 'mark', false); return false;">{L_UNMARK_ALL}</a></p>		
-
-	<!-- IF .pagination -->
-	<div class="pagination top-pagination">
-		<!-- INCLUDE pagination.html -->
-	</div>
-	<!-- ENDIF -->	
-	<table class="type_f">
-	<thead>
-	<tr>
-		<th>{L_USERNAME}</th>
-		<!-- IF POINTS -->
-		<th>{POINTS}</th>
-		<!-- ENDIF -->
-		<th>{TARGET}</th>
-		<th>{ACTUAL}</th>
-		<th>{L_BOOK}</th>
-		<th>{L_MARK}</th>
-	</tr>
-	</thead>
-	<tbody>
-	<!-- BEGIN member -->
-			<!-- IF member.S_ROW_COUNT is even --><tr class="bg1 row_light"><!-- ELSE --><tr class="bg2 row_dark"><!-- ENDIF -->
-			<td><a href="{member.U_USER_BANK}">{member.USERNAME}</a></td>
-			<!-- IF POINTS -->
-			<td style="text-align: right;">{member.POINTS}</td>
-			<!-- ENDIF -->
-			<td style="text-align: right;">{member.TARGET}</td>
-			<td style="text-align: right;">{member.ACTUAL}<input type="hidden" name="curvalue{member.USER_ID}" id="curvalue{member.USER_ID}" value="{member.ACTUAL}" /></td>
-			<td style="text-align: right;"><input type="text" name="newvalue{member.USER_ID}" value="{member.NEW_VALUE}"
-											onchange="document.getElementById('select_{member.USER_ID}').checked = true;" /></td>
-			<td style="text-align: center;"><input type="checkbox" class="radio" name="mark[]" id="select_{member.USER_ID}" value="{member.USER_ID}" /></td>
-		</tr>
-	<!-- END member -->
-	</tbody>
-	</table>
-	<!-- IF S_CASH_POINTS -->
-	{L_CASH_POINTS} <input name="cash" type="checkbox" class="radio" checked="checked" /> 
-	<!-- ENDIF -->
-	{L_MATCHDAY}: <!-- IF S_SELECT_MATCHDAY --><input type="text" name="m" value="{S_MATCHDAY}" /><!-- ELSE -->
-									<input type="hidden" name="m" value="{S_MATCHDAY}" />{S_MATCHDAY}<!-- ENDIF -->
-	<!-- IF .pagination or TOTAL_MEMBERS -->
-	<div class="pagination">
-		{TOTAL_MEMBERS}
-		<!-- IF .pagination -->
-			<!-- INCLUDE pagination.html -->
-		<!-- ELSE -->
-			&bull; {PAGE_NUMBER}
-		<!-- ENDIF -->
-	</div>
-	<!-- ENDIF -->	
-
-	<fieldset class="quick">
-		<input type="hidden" name="s" value="{S_SEASON}" />
-		<input type="hidden" name="l" value="{S_LEAGUE}" />
-		<input type="hidden" name="t" value="{S_TYPE}" />
-		<input type="hidden" name="start" value="{S_START}" />
-		<select name="action"><option class="sep" value="">{L_SELECT_OPTION}</option>{S_ACTION_OPTIONS}</select>
-		<input class="button2" type="submit" name="update" value="{L_SUBMIT}" />
-	</fieldset>
-
-	{S_FORM_TOKEN}
-	</form>
-
-<!-- ELSE -->
-	<!-- IF U_FOOTBALL --><a href="{U_FOOTBALL}" style="float: {S_CONTENT_FLOW_END};">&laquo; {L_PREDICTION_LEAGUE}</a><!-- ENDIF -->
-	<h1>{L_ACP_FOOTBALL_BANK_MANAGE}</h1>
-	<p>{L_ACP_FOOTBALL_BANK_MANAGE_EXPLAIN}</p>
-
-	<!-- IF S_ERROR -->
-		<div class="errorbox">
-			<h3>{L_WARNING}</h3>
-			<p>{ERROR_MSG}</p>
-		</div>
-	<!-- ENDIF -->
-
-	<form style="display:inline;" method="post" action="{U_ACTION}">
-	<div style="display:inline; margin:0; padding:0;">
-		<h1 style="display:inline;">{L_SELECT_SEASON}:</h1>
-		<select name="s" id="bank_season" onchange="this.form.submit();">{S_SEASON_OPTIONS}</select>
-		{S_FORM_TOKEN}
-	</div>
-	</form>
-
-	<h1>{L_LEAGUE_BANK}</h1>
-
-	<p>{L_LEAGUE_BANK_EXPLAIN}</p>
-	<p><a href="{U_DLOAD_BANK_OPEN}">Offene Posten bis einschließlich dieser Saison</a></p>
-	<form id="overview" method="post" action="{U_ACTION}">
-	<fieldset>
-	<p class="small" style="text-align:right;margin-bottom:0px">
-		<a href="#" onclick="marklist('overview', 'markleague', true); return false;">{L_MARK_ALL}</a> &bull; 
-		<a href="#" onclick="marklist('overview', 'markleague', false); return false;">{L_UNMARK_ALL}</a>
-	</p>		
-	<table class="type_f">
-	<thead>
-	<tr>
-		<th>{L_LEAGUE}</th>
-		<th style="width: 25%">{L_LEAGUE_NAME}</th>
-		<th>{L_BET_POINTS}</th>
-		<th>{L_DEPOSITED}</th>
-		<th>{L_WINS}</th>
-		<th>{L_PAID}</th>
-		<th>{L_MARK}</th>
-	</tr>
-	</thead>
-	<tbody>
-	<!-- IF .leagues -->
-		<!-- BEGIN leagues -->
-			<!-- IF leagues.S_ROW_COUNT is even --><tr class="bg1 row_light"><!-- ELSE --><tr class="bg2 row_dark"><!-- ENDIF -->
-				<td style="text-align: center;"><strong>{leagues.LEAGUE}</strong></td>
-				<td><a href="{leagues.U_DLOAD_BANK}">{leagues.LEAGUE_NAME}</a></td>
-				<td style="text-align: right;"><a href="{leagues.U_LIST_BET_POINTS}">{leagues.BET_POINTS}</a></td>
-				<td style="text-align: right;">
-					<!-- IF S_LIST_DEPOSITED --><a href="{leagues.U_LIST_DEPOSITED}"><!-- ENDIF -->
-					{leagues.DEPOSITED}
-					<!-- IF S_LIST_DEPOSITED --></a><!-- ENDIF --></td>
-				<td style="text-align: right;">{leagues.WINS}</td>
-				<td style="text-align: right;">
-					<!-- IF S_LIST_PAID --><a href="{leagues.U_LIST_PAID}"><!-- ENDIF -->
-					{leagues.PAID}
-					<!-- IF S_LIST_PAID --></a><!-- ENDIF --></td>
-				<td style="text-align: center;"><input type="checkbox" class="radio" name="markleague[]" value="{leagues.LEAGUE}" /></td>
-			</tr>
-		<!-- END leagues -->
-	<!-- ELSE -->
-			<tr>
-				<td colspan="3" class="row3">{L_NO_LEAGUES_CREATED}</td>
-			</tr>
-	<!-- ENDIF -->
-	</tbody>
-	</table>
-	<!-- IF S_CASH_POINTS -->
-	{L_CASH_POINTS} <input name="cash" type="checkbox" class="radio" checked="checked" /> 
-	<!-- ENDIF -->
-		<fieldset class="quick">
-			<input type="hidden" name="s" value="{S_SEASON}" />
-			<select name="action"><option class="sep" value="">{L_SELECT_OPTION}</option>{S_LEAGUE_ACTION_OPTIONS}</select>
-			<input class="button2" type="submit" name="update" value="{L_SUBMIT}" />
-		</fieldset>
-
-	{S_FORM_TOKEN}
-	</fieldset>
-	</form><!-- ENDIF -->
-<br />
-<div style="text-align: center;">phpBB Extension - Football Prediction League - Version {S_VERSION_NO} &copy; 2016 <a href="http://football.bplaced.net">football</a></div>
+<!-- INCLUDECSS css/football_acp.css -->
+<!-- INCLUDE overall_header.html -->
+
+<a id="maincontent"></a>
+<!-- IF S_LIST -->
+	<a href="{U_BACK}" style="float: {S_CONTENT_FLOW_END};">&laquo; {L_BACK}</a>
+	<h1>{PAGE_TYPE} :: {LEAGUE_NAME}</h1>
+	<p>{PAGE_TYPE_EXPLAIN}</p>
+
+	<form id="list" method="post" action="{U_ACTION}">
+	<p class="small" style="text-align:right;margin-bottom:0px">
+		<a href="#" onclick="setvalues('list', 'newvalue', 'curvalue', {BET_POINTS}); return false;">{L_SET_DEPOSITS}</a> &bull; 
+		<a href="#" onclick="marklist('list', 'mark', true); return false;">{L_MARK_ALL}</a> &bull; 
+		<a href="#" onclick="marklist('list', 'mark', false); return false;">{L_UNMARK_ALL}</a></p>		
+
+	<!-- IF .pagination -->
+	<div class="pagination top-pagination">
+		<!-- INCLUDE pagination.html -->
+	</div>
+	<!-- ENDIF -->	
+	<table class="type_f">
+	<thead>
+	<tr>
+		<th>{L_USERNAME}</th>
+		<!-- IF POINTS -->
+		<th>{POINTS}</th>
+		<!-- ENDIF -->
+		<th>{TARGET}</th>
+		<th>{ACTUAL}</th>
+		<th>{L_BOOK}</th>
+		<th>{L_MARK}</th>
+	</tr>
+	</thead>
+	<tbody>
+	<!-- BEGIN member -->
+			<!-- IF member.S_ROW_COUNT is even --><tr class="bg1 row_light"><!-- ELSE --><tr class="bg2 row_dark"><!-- ENDIF -->
+			<td><a href="{member.U_USER_BANK}">{member.USERNAME}</a></td>
+			<!-- IF POINTS -->
+			<td style="text-align: right;">{member.POINTS}</td>
+			<!-- ENDIF -->
+			<td style="text-align: right;">{member.TARGET}</td>
+			<td style="text-align: right;">{member.ACTUAL}<input type="hidden" name="curvalue{member.USER_ID}" id="curvalue{member.USER_ID}" value="{member.ACTUAL}" /></td>
+			<td style="text-align: right;"><input type="text" name="newvalue{member.USER_ID}" value="{member.NEW_VALUE}"
+											onchange="document.getElementById('select_{member.USER_ID}').checked = true;" /></td>
+			<td style="text-align: center;"><input type="checkbox" class="radio" name="mark[]" id="select_{member.USER_ID}" value="{member.USER_ID}" /></td>
+		</tr>
+	<!-- END member -->
+	</tbody>
+	</table>
+	<!-- IF S_CASH_POINTS -->
+	{L_CASH_POINTS} <input name="cash" type="checkbox" class="radio" checked="checked" /> 
+	<!-- ENDIF -->
+	{L_MATCHDAY}: <!-- IF S_SELECT_MATCHDAY --><input type="text" name="m" value="{S_MATCHDAY}" /><!-- ELSE -->
+									<input type="hidden" name="m" value="{S_MATCHDAY}" />{S_MATCHDAY}<!-- ENDIF -->
+	<!-- IF .pagination or TOTAL_MEMBERS -->
+	<div class="pagination">
+		{TOTAL_MEMBERS}
+		<!-- IF .pagination -->
+			<!-- INCLUDE pagination.html -->
+		<!-- ELSE -->
+			&bull; {PAGE_NUMBER}
+		<!-- ENDIF -->
+	</div>
+	<!-- ENDIF -->	
+
+	<fieldset class="quick">
+		<input type="hidden" name="s" value="{S_SEASON}" />
+		<input type="hidden" name="l" value="{S_LEAGUE}" />
+		<input type="hidden" name="t" value="{S_TYPE}" />
+		<input type="hidden" name="start" value="{S_START}" />
+		<select name="action"><option class="sep" value="">{L_SELECT_OPTION}</option>{S_ACTION_OPTIONS}</select>
+		<input class="button2" type="submit" name="update" value="{L_SUBMIT}" />
+	</fieldset>
+
+	{S_FORM_TOKEN}
+	</form>
+
+<!-- ELSE -->
+	<!-- IF U_FOOTBALL --><a href="{U_FOOTBALL}" style="float: {S_CONTENT_FLOW_END};">&laquo; {L_PREDICTION_LEAGUE}</a><!-- ENDIF -->
+	<h1>{L_ACP_FOOTBALL_BANK_MANAGE}</h1>
+	<p>{L_ACP_FOOTBALL_BANK_MANAGE_EXPLAIN}</p>
+
+	<!-- IF S_ERROR -->
+		<div class="errorbox">
+			<h3>{L_WARNING}</h3>
+			<p>{ERROR_MSG}</p>
+		</div>
+	<!-- ENDIF -->
+
+	<form style="display:inline;" method="post" action="{U_ACTION}">
+	<div style="display:inline; margin:0; padding:0;">
+		<h1 style="display:inline;">{L_SELECT_SEASON}:</h1>
+		<select name="s" id="bank_season" onchange="this.form.submit();">{S_SEASON_OPTIONS}</select>
+		{S_FORM_TOKEN}
+	</div>
+	</form>
+
+	<h1>{L_LEAGUE_BANK}</h1>
+
+	<p>{L_LEAGUE_BANK_EXPLAIN}</p>
+	<p><a href="{U_DLOAD_BANK_OPEN}">Offene Posten bis einschließlich dieser Saison</a></p>
+	<form id="overview" method="post" action="{U_ACTION}">
+	<fieldset>
+	<p class="small" style="text-align:right;margin-bottom:0px">
+		<a href="#" onclick="marklist('overview', 'markleague', true); return false;">{L_MARK_ALL}</a> &bull; 
+		<a href="#" onclick="marklist('overview', 'markleague', false); return false;">{L_UNMARK_ALL}</a>
+	</p>		
+	<table class="type_f">
+	<thead>
+	<tr>
+		<th>{L_LEAGUE}</th>
+		<th style="width: 25%">{L_LEAGUE_NAME}</th>
+		<th>{L_BET_POINTS}</th>
+		<th>{L_DEPOSITED}</th>
+		<th>{L_WINS}</th>
+		<th>{L_PAID}</th>
+		<th>{L_MARK}</th>
+	</tr>
+	</thead>
+	<tbody>
+	<!-- IF .leagues -->
+		<!-- BEGIN leagues -->
+			<!-- IF leagues.S_ROW_COUNT is even --><tr class="bg1 row_light"><!-- ELSE --><tr class="bg2 row_dark"><!-- ENDIF -->
+				<td style="text-align: center;"><strong>{leagues.LEAGUE}</strong></td>
+				<td><a href="{leagues.U_DLOAD_BANK}">{leagues.LEAGUE_NAME}</a></td>
+				<td style="text-align: right;"><a href="{leagues.U_LIST_BET_POINTS}">{leagues.BET_POINTS}</a></td>
+				<td style="text-align: right;">
+					<!-- IF S_LIST_DEPOSITED --><a href="{leagues.U_LIST_DEPOSITED}"><!-- ENDIF -->
+					{leagues.DEPOSITED}
+					<!-- IF S_LIST_DEPOSITED --></a><!-- ENDIF --></td>
+				<td style="text-align: right;">{leagues.WINS}</td>
+				<td style="text-align: right;">
+					<!-- IF S_LIST_PAID --><a href="{leagues.U_LIST_PAID}"><!-- ENDIF -->
+					{leagues.PAID}
+					<!-- IF S_LIST_PAID --></a><!-- ENDIF --></td>
+				<td style="text-align: center;"><input type="checkbox" class="radio" name="markleague[]" value="{leagues.LEAGUE}" /></td>
+			</tr>
+		<!-- END leagues -->
+	<!-- ELSE -->
+			<tr>
+				<td colspan="3" class="row3">{L_NO_LEAGUES_CREATED}</td>
+			</tr>
+	<!-- ENDIF -->
+	</tbody>
+	</table>
+	<!-- IF S_CASH_POINTS -->
+	{L_CASH_POINTS} <input name="cash" type="checkbox" class="radio" checked="checked" /> 
+	<!-- ENDIF -->
+		<fieldset class="quick">
+			<input type="hidden" name="s" value="{S_SEASON}" />
+			<select name="action"><option class="sep" value="">{L_SELECT_OPTION}</option>{S_LEAGUE_ACTION_OPTIONS}</select>
+			<input class="button2" type="submit" name="update" value="{L_SUBMIT}" />
+		</fieldset>
+
+	{S_FORM_TOKEN}
+	</fieldset>
+	</form><!-- ENDIF -->
+<br />
+<div style="text-align: center;">phpBB Extension - Football Prediction League - Version {S_VERSION_NO} &copy; 2016 <a href="http://football.bplaced.net">football</a></div>
 <!-- INCLUDE overall_footer.html -->

adm/style/acp_football_bets.html

@@ -1,155 +1,155 @@
-<!-- INCLUDECSS css/football_acp.css -->
-<!-- INCLUDE overall_header.html -->
-
-<a id="maincontent"></a>
-	<!-- IF U_FOOTBALL --><a href="{U_FOOTBALL}" style="float: {S_CONTENT_FLOW_END};">&laquo; {L_PREDICTION_LEAGUE}</a><!-- ENDIF -->
-	<h1>{L_ACP_FOOTBALL_BETS_MANAGE}</h1>
-
-	<p>{L_ACP_FOOTBALL_BETS_MANAGE_EXPLAIN}</p>
-
-	<h1 style="display:inline;">{L_SELECT_MATCHDAY}:</h1>
-	<form style="display:inline;" method="post" action="{U_ACTION}">
-	<div style="display:inline; margin:0; padding:0;">
-		<select name="s" id="match_season" onchange="this.form.submit();">{S_SEASON_OPTIONS}</select>
-		{S_FORM_TOKEN}
-	</div>
-	</form>
-	<form style="display:inline;" method="post" action="{U_ACTION}">
-	<div style="display:inline; margin:0; padding:0;">
-		<input type="hidden" name="s" value="{S_SEASON}" />
-		<select name="l" id="match_league" onchange="this.form.submit();">{S_LEAGUE_OPTIONS}</select>
-		{S_FORM_TOKEN}
-	</div>
-	</form>
-	<form style="display:inline;" method="post" action="{U_ACTION}">
-	<div style="display:inline; margin:0; padding:0;">
-		<input type="hidden" name="s" value="{S_SEASON}" />
-		<input type="hidden" name="l" value="{S_LEAGUE}" />
-		<select name="m" id="match_matchday" onchange="this.form.submit();">{S_MATCHDAY_OPTIONS}</select>
-		{S_FORM_TOKEN}
-	</div>
-	</form>
-	<!-- IF S_USERS -->
-	<form style="display:inline;" method="post" action="{U_ACTION}">
-	<div style="display:inline; margin:0; padding:0;">
-		<input type="hidden" name="s" value="{S_SEASON}" />
-		<input type="hidden" name="l" value="{S_LEAGUE}" />
-		<input type="hidden" name="m" value="{S_MATCHDAY}" />
-		<select name="u" id="match_user" onchange="this.form.submit();">{S_USER_OPTIONS}</select>
-		{S_FORM_TOKEN}
-	</div>
-	</form>
-	<!-- ENDIF -->
-
-	<!-- IF S_SUCCESS -->
-		<div class="successbox">
-			<h3>{L_ADVICE}</h3>
-			<p>{SUCCESS_MSG}</p>
-		</div>
-	<!-- ENDIF -->
-
-	<!-- IF .bet_edit -->
-	<form method="post" action="{U_ACTION}">
-	<fieldset>
-		<legend>{S_LEGEND}</legend>
-		<input type="hidden" name="s" value="{S_SEASON}" />
-		<input type="hidden" name="l" value="{S_LEAGUE}" />
-		<input type="hidden" name="m" value="{S_MATCHDAY}" />
-		<input type="hidden" name="u" value="{S_USER}" />
-		<table class="type_f">
-			<thead>
-				<tr>
-					<th>{L_DATE}</th>
-					<th style="text-align:right">{L_NR}</th>
-				<!-- IF S_DATA_GROUP -->
-					<th>{L_GR}</th>
-				<!-- ENDIF -->
-					<th></th>
-					<th>{L_HOME}</th>
-					<th></th>
-					<th></th>
-					<th>{L_GUEST}</th>
-					<th style="text-align:right">{L_GOALS_HOME}</th>
-					<th></th>
-					<th>{L_GOALS_GUEST}</th>
-					<th>{L_BET_TIME}</th>
-				</tr>
-			</thead>
-			<tbody>
-			<!-- BEGIN bet_edit -->
-				<tr class="{bet_edit.ROW_CLASS}">
-					<td>{bet_edit.MATCH_TIME}</td>
-					<td class="td_match_no">{bet_edit.MATCH_NUMBER}</td>
-				<!-- IF S_DATA_GROUP -->
-					<td class="td_group">{bet_edit.GROUP}</td>
-				<!-- ENDIF -->
-					<td style="text-align:right; width:32px;">{bet_edit.LOGO_HOME}&nbsp;</td>
-					<td class="td_team">{bet_edit.HOME_NAME}</td>
-					<td class="td_vs">:</td>
-					<td style="text-align:right; width:32px;">{bet_edit.LOGO_GUEST}&nbsp;</td>
-					<td class="td_team">{bet_edit.GUEST_NAME}</td>
-					<td class="td_goals_home"><input style="text-align:right; width:30px;" type="number" 
-													name="goalsh{bet_edit.MATCH_NUMBER}" min="0" max="20" size="2" value="{bet_edit.BET_HOME}" /></td>
-					<td class="td_vs">:</td>
-					<td class="td_goals_guest"><input style="margin:0; width:30px;" type="number" 
-													name="goalsg{bet_edit.MATCH_NUMBER}" min="0" max="20" size="2" value="{bet_edit.BET_GUEST}" /></td>
-					<td>{bet_edit.BET_TIME}</td>
-				</tr>
-			<!-- END bet_edit -->
-			</tbody>
-		</table>
-		
-		<!-- IF S_EXTRA_BET --> 
-		<br />
-		<table class="type_f">
-			<thead>
-				<tr>
-					<th style="text-align: left;">{L_QUESTION}</th>
-					<th>{L_POSSIBLE_POINTS}</th>
-					<th>{L_EVALUATION}</th>
-					<th>{L_BET_OF}</th>
-				</tr>
-			</thead>
-			<tbody>
-			<!-- BEGIN extra_edit -->
-				<tr class="{extra_edit.ROW_CLASS}" style="height:30px">
-					<td>{extra_edit.QUESTION}</td>
-					<td style="text-align: center;">{extra_edit.EXTRA_POINTS}</td>
-					<td style="text-align: center;" title="{extra_edit.EVALUATION_TITLE}">{extra_edit.EVALUATION}</td>
-					<td style="text-align: center;">
-					<!-- IF extra_edit.S_DISPLAY_TYPE == 1 -->
-						<select name="extra{extra_edit.EXTRA_NO}">
-						<!-- BEGIN extra_option -->
-							<option {extra_edit.extra_option.S_SELECTED} value="{extra_edit.extra_option.OPTION_VALUE}">{extra_edit.extra_option.OPTION_NAME}</option>
-						<!-- END extra_option -->
-						</select>
-					<!-- ENDIF -->
-					<!-- IF extra_edit.S_DISPLAY_TYPE == 2 -->
-						<input style="display:inline; margin:0; padding:0;" type="text" name="extra{extra_edit.EXTRA_NO}" size="15" maxlength="255" value="{extra_edit.BET}"> 
-					<!-- ENDIF -->
-					</td>
-				</tr>
-			<!-- END extra_edit -->
-			</tbody>
-		</table>
-		<!-- ENDIF -->
-		<!-- IF S_CASH_POINTS -->{L_CASH_POINTS} <input name="cash" type="checkbox" class="radio" checked="checked" /> <!-- ENDIF -->
-		
-		<fieldset class="submit-buttons">
-			<input class="button1" type="submit" id="submit" name="bet" value="{L_SAVE}" />&nbsp;
-			<input class="button2" type="reset" id="reset" name="reset" value="{L_RESET}" />
-			{S_FORM_TOKEN}
-		</fieldset>
-	</fieldset>
-	</form>
-	<!-- ELSE -->
-	<fieldset>
-		<legend>{S_LEGEND}</legend>
-		<br />
-		<div class="message"><!-- IF S_USERS -->{L_NO_MATCHES_ON_MATCHDAY}<!-- ELSE -->{L_NO_USERS}<!-- ENDIF --></div>
-		<br />
-	</fieldset>
-	<!-- ENDIF -->
-<br />
-<div style="text-align: center;">phpBB Extension - Football Prediction League - Version {S_VERSION_NO} &copy; 2016 <a href="http://football.bplaced.net">football</a></div>
+<!-- INCLUDECSS css/football_acp.css -->
+<!-- INCLUDE overall_header.html -->
+
+<a id="maincontent"></a>
+	<!-- IF U_FOOTBALL --><a href="{U_FOOTBALL}" style="float: {S_CONTENT_FLOW_END};">&laquo; {L_PREDICTION_LEAGUE}</a><!-- ENDIF -->
+	<h1>{L_ACP_FOOTBALL_BETS_MANAGE}</h1>
+
+	<p>{L_ACP_FOOTBALL_BETS_MANAGE_EXPLAIN}</p>
+
+	<h1 style="display:inline;">{L_SELECT_MATCHDAY}:</h1>
+	<form style="display:inline;" method="post" action="{U_ACTION}">
+	<div style="display:inline; margin:0; padding:0;">
+		<select name="s" id="match_season" onchange="this.form.submit();">{S_SEASON_OPTIONS}</select>
+		{S_FORM_TOKEN}
+	</div>
+	</form>
+	<form style="display:inline;" method="post" action="{U_ACTION}">
+	<div style="display:inline; margin:0; padding:0;">
+		<input type="hidden" name="s" value="{S_SEASON}" />
+		<select name="l" id="match_league" onchange="this.form.submit();">{S_LEAGUE_OPTIONS}</select>
+		{S_FORM_TOKEN}
+	</div>
+	</form>
+	<form style="display:inline;" method="post" action="{U_ACTION}">
+	<div style="display:inline; margin:0; padding:0;">
+		<input type="hidden" name="s" value="{S_SEASON}" />
+		<input type="hidden" name="l" value="{S_LEAGUE}" />
+		<select name="m" id="match_matchday" onchange="this.form.submit();">{S_MATCHDAY_OPTIONS}</select>
+		{S_FORM_TOKEN}
+	</div>
+	</form>
+	<!-- IF S_USERS -->
+	<form style="display:inline;" method="post" action="{U_ACTION}">
+	<div style="display:inline; margin:0; padding:0;">
+		<input type="hidden" name="s" value="{S_SEASON}" />
+		<input type="hidden" name="l" value="{S_LEAGUE}" />
+		<input type="hidden" name="m" value="{S_MATCHDAY}" />
+		<select name="u" id="match_user" onchange="this.form.submit();">{S_USER_OPTIONS}</select>
+		{S_FORM_TOKEN}
+	</div>
+	</form>
+	<!-- ENDIF -->
+
+	<!-- IF S_SUCCESS -->
+		<div class="successbox">
+			<h3>{L_ADVICE}</h3>
+			<p>{SUCCESS_MSG}</p>
+		</div>
+	<!-- ENDIF -->
+
+	<!-- IF .bet_edit -->
+	<form method="post" action="{U_ACTION}">
+	<fieldset>
+		<legend>{S_LEGEND}</legend>
+		<input type="hidden" name="s" value="{S_SEASON}" />
+		<input type="hidden" name="l" value="{S_LEAGUE}" />
+		<input type="hidden" name="m" value="{S_MATCHDAY}" />
+		<input type="hidden" name="u" value="{S_USER}" />
+		<table class="type_f">
+			<thead>
+				<tr>
+					<th>{L_DATE}</th>
+					<th style="text-align:right">{L_NR}</th>
+				<!-- IF S_DATA_GROUP -->
+					<th>{L_GR}</th>
+				<!-- ENDIF -->
+					<th></th>
+					<th>{L_HOME}</th>
+					<th></th>
+					<th></th>
+					<th>{L_GUEST}</th>
+					<th style="text-align:right">{L_GOALS_HOME}</th>
+					<th></th>
+					<th>{L_GOALS_GUEST}</th>
+					<th>{L_BET_TIME}</th>
+				</tr>
+			</thead>
+			<tbody>
+			<!-- BEGIN bet_edit -->
+				<tr class="{bet_edit.ROW_CLASS}">
+					<td>{bet_edit.MATCH_TIME}</td>
+					<td class="td_match_no">{bet_edit.MATCH_NUMBER}</td>
+				<!-- IF S_DATA_GROUP -->
+					<td class="td_group">{bet_edit.GROUP}</td>
+				<!-- ENDIF -->
+					<td style="text-align:right; width:32px;">{bet_edit.LOGO_HOME}&nbsp;</td>
+					<td class="td_team">{bet_edit.HOME_NAME}</td>
+					<td class="td_vs">:</td>
+					<td style="text-align:right; width:32px;">{bet_edit.LOGO_GUEST}&nbsp;</td>
+					<td class="td_team">{bet_edit.GUEST_NAME}</td>
+					<td class="td_goals_home"><input style="text-align:right; width:30px;" type="number" 
+													name="goalsh{bet_edit.MATCH_NUMBER}" min="0" max="20" size="2" value="{bet_edit.BET_HOME}" /></td>
+					<td class="td_vs">:</td>
+					<td class="td_goals_guest"><input style="margin:0; width:30px;" type="number" 
+													name="goalsg{bet_edit.MATCH_NUMBER}" min="0" max="20" size="2" value="{bet_edit.BET_GUEST}" /></td>
+					<td>{bet_edit.BET_TIME}</td>
+				</tr>
+			<!-- END bet_edit -->
+			</tbody>
+		</table>
+		
+		<!-- IF S_EXTRA_BET --> 
+		<br />
+		<table class="type_f">
+			<thead>
+				<tr>
+					<th style="text-align: left;">{L_QUESTION}</th>
+					<th>{L_POSSIBLE_POINTS}</th>
+					<th>{L_EVALUATION}</th>
+					<th>{L_BET_OF}</th>
+				</tr>
+			</thead>
+			<tbody>
+			<!-- BEGIN extra_edit -->
+				<tr class="{extra_edit.ROW_CLASS}" style="height:30px">
+					<td>{extra_edit.QUESTION}</td>
+					<td style="text-align: center;">{extra_edit.EXTRA_POINTS}</td>
+					<td style="text-align: center;" title="{extra_edit.EVALUATION_TITLE}">{extra_edit.EVALUATION}</td>
+					<td style="text-align: center;">
+					<!-- IF extra_edit.S_DISPLAY_TYPE == 1 -->
+						<select name="extra{extra_edit.EXTRA_NO}">
+						<!-- BEGIN extra_option -->
+							<option {extra_edit.extra_option.S_SELECTED} value="{extra_edit.extra_option.OPTION_VALUE}">{extra_edit.extra_option.OPTION_NAME}</option>
+						<!-- END extra_option -->
+						</select>
+					<!-- ENDIF -->
+					<!-- IF extra_edit.S_DISPLAY_TYPE == 2 -->
+						<input style="display:inline; margin:0; padding:0;" type="text" name="extra{extra_edit.EXTRA_NO}" size="15" maxlength="255" value="{extra_edit.BET}"> 
+					<!-- ENDIF -->
+					</td>
+				</tr>
+			<!-- END extra_edit -->
+			</tbody>
+		</table>
+		<!-- ENDIF -->
+		<!-- IF S_CASH_POINTS -->{L_CASH_POINTS} <input name="cash" type="checkbox" class="radio" checked="checked" /> <!-- ENDIF -->
+		
+		<fieldset class="submit-buttons">
+			<input class="button1" type="submit" id="submit" name="bet" value="{L_SAVE}" />&nbsp;
+			<input class="button2" type="reset" id="reset" name="reset" value="{L_RESET}" />
+			{S_FORM_TOKEN}
+		</fieldset>
+	</fieldset>
+	</form>
+	<!-- ELSE -->
+	<fieldset>
+		<legend>{S_LEGEND}</legend>
+		<br />
+		<div class="message"><!-- IF S_USERS -->{L_NO_MATCHES_ON_MATCHDAY}<!-- ELSE -->{L_NO_USERS}<!-- ENDIF --></div>
+		<br />
+	</fieldset>
+	<!-- ENDIF -->
+<br />
+<div style="text-align: center;">phpBB Extension - Football Prediction League - Version {S_VERSION_NO} &copy; 2016 <a href="http://football.bplaced.net">football</a></div>
 <!-- INCLUDE overall_footer.html -->

adm/style/acp_football_extra.html

@@ -1,149 +1,149 @@
-<!-- INCLUDECSS css/football_acp.css -->
-<!-- INCLUDE overall_header.html -->
-
-<a id="maincontent"></a>
-<!-- IF S_EDIT -->
-	<a href="{U_BACK}" style="float: {S_CONTENT_FLOW_END};">&laquo; {L_BACK}</a>
-	<h1>{L_ACP_FOOTBALL_EXTRA_MANAGE}</h1>
-	<p>{L_MATCHDAY_EDIT_EXPLAIN}</p>
-
-	<!-- IF S_ERROR -->
-		<div class="errorbox">
-			<h3>{L_WARNING}</h3>
-			<p>{ERROR_MSG}</p>
-		</div>
-	<!-- ENDIF -->
-
-	<form id="settings" method="post" action="{U_ACTION}">
-
-	<fieldset>
-		<legend>{L_EXTRA_DETAILS}</legend>
-	<dl>
-		<dt><label for="season">{L_SEASON}:</label></dt>
-		<dd><strong>{SEASON_NAME}</strong><input name="s" type="hidden" id="season" value="{SEASON}" /></dd>
-	</dl>
-	<dl>
-		<dt><label for="league">{L_LEAGUE}:</label></dt>
-		<dd><strong>{LEAGUE_NAME}</strong><input name="l" type="hidden" id="league" value="{LEAGUE}" /></dd>
-	</dl>
-	<dl>
-		<dt><label for="extra_no">{L_EXTRA_NO}:</label></dt>
-		<dd><strong>{EXTRA_NO}</strong><input name="e" type="hidden" id="extra_no" value="{EXTRA_NO}" /></dd>
-	</dl>
-	<dl>
-		<dt><label for="question_type">{L_EXTRA_QUESTION_TYPE}:</label><br /><span>{L_EXTRA_QUESTION_TYPE_EXPLAIN}</span></dt>
-		<dd><select id="question_type" name="question_type">{S_QUESTION_TYPE_OPTIONS}</select> </dd>
-	</dl>
-	<dl>
-		<dt><label for="question">{L_EXTRA_QUESTION}:</label><br /><span>{L_EXTRA_QUESTION_EXPLAIN}</span></dt>
-		<dd><input name="question" type="text" id="question" size="80" maxlength="255" value="{QUESTION}" /></dd>
-	</dl>
-	<dl>
-		<dt><label for="matchday">{L_EXTRA_MATCHDAY}:</label><br /><span>{L_EXTRA_MATCHDAY_EXPLAIN}</span></dt>
-		<dd><select id="matchday" name="matchday">{S_MATCHDAY_OPTIONS}</select> </dd>
-	</dl>
-	<dl>
-		<dt><label for="matchday_eval">{L_EXTRA_MATCHDAY_EVAL}:</label><br /><span>{L_EXTRA_MATCHDAY_EVAL_EXPLAIN}</span></dt>
-		<dd><select id="matchday_eval" name="matchday_eval">{S_MATCHDAY_EVAL_OPTIONS}</select> </dd>
-	</dl>
-	<dl>
-		<dt><label for="extra_points">{L_EXTRA_POINTS}:</label><br /><span>{L_EXTRA_POINTS_EXPLAIN}</span></dt>
-		<dd><input name="extra_points" type="text" id="extra_points" size="2" maxlength="2" value="{EXTRA_POINTS}" /></dd>
-	</dl>
-	<dl>
-		<dt><label for="extra_status">{L_EXTRA_STATUS}:</label><br /><span>{L_EXTRA_STATUS_EXPLAIN}</span></dt>
-		<dd><select id="extra_status" name="extra_status">{S_EXTRA_STATUS_OPTIONS}</select></dd>
-	</dl>
-	</fieldset>
-
-	<fieldset class="submit-buttons">
-		<legend>{L_SUBMIT}</legend>
-		<input class="button1" type="submit" id="submit" name="update" value="{L_SUBMIT}" />&nbsp;
-		<input class="button2" type="reset" id="reset" name="reset" value="{L_RESET}" />
-		{S_FORM_TOKEN}
-	</fieldset>
-	</form>
-
-<!-- ELSE -->
-	<!-- IF U_FOOTBALL --><a href="{U_FOOTBALL}" style="float: {S_CONTENT_FLOW_END};">&laquo; {L_PREDICTION_LEAGUE}</a><!-- ENDIF -->
-	<h1>{L_ACP_FOOTBALL_EXTRA_MANAGE}</h1>
-	<p>{L_ACP_FOOTBALL_EXTRA_MANAGE_EXPLAIN}</p>
-
-	<!-- IF S_ERROR -->
-		<div class="errorbox">
-			<h3>{L_WARNING}</h3>
-			<p>{ERROR_MSG}</p>
-		</div>
-	<!-- ENDIF -->
-
-	<h1 style="display:inline;">{L_SELECT_LEAGUE}:</h1>
-	<form style="display:inline;" method="post" action="{U_ACTION}">
-	<div style="display:inline; margin:0; padding:0;">
-		<select name="s" id="matchday_season" onchange="this.form.submit();">{S_SEASON_OPTIONS}</select>
-		{S_FORM_TOKEN}
-	</div>
-	</form>
-
-	<form style="display:inline;" method="post" action="{U_ACTION}">
-	<div style="display:inline; margin:0; padding:0;">
-		<input type="hidden" name="s" value="{S_SEASON}" />
-		<select name="l" id="matchday_league" onchange="this.form.submit();">{S_LEAGUE_OPTIONS}</select>
-		{S_FORM_TOKEN}
-	</div>
-	</form>
-
-	<form id="add_extra" method="post" action="{U_ACTION}">
-	<fieldset class="quick">
-			<input type="hidden" name="s" value="{S_SEASON}" />
-			<input type="hidden" name="l" value="{S_LEAGUE}" />
-		<!-- IF S_EXTRA_ADD -->
-			<input class="button2" type="submit" name="submit" value="{L_EXTRA_ADD}" />
-			<input type="hidden" name="add" value="1" />
-		<!-- ENDIF -->
-		{S_FORM_TOKEN}
-	</fieldset>
-	</form>
-	<h1>{L_EXTRA_DEF}</h1>
-
-	<p>{L_EXTRA_DEF_EXPLAIN}</p>
-	<table class="type_f">
-	<thead>
-	<tr>
-		<th>{L_EXTRA_NO}</th>
-		<th>{L_QUESTION_TYPE}</th>
-		<th style="width: 40%">{L_EXTRA_QUESTION}</th>
-		<th>{L_EXTRA_MATCHDAY}</th>
-		<th>{L_EXTRA_MATCHDAY_EVAL}</th>
-		<th>{L_EXTRA_POINTS}</th>
-		<th>{L_STATUS}</th>
-		<th>{L_OPTIONS}</th>
-		<th>{L_ACTION}</th>
-	</tr>
-	</thead>
-	<tbody>
-	<!-- IF .extras -->
-		<!-- BEGIN extras -->
-			<tr class="{extras.ROW_CLASS}">
-				<td style="text-align:center;"><strong>{extras.EXTRA_NO}</strong></td>
-				<td style="text-align:center;">{extras.QUESTION_TYPE}</td>
-				<td>{extras.QUESTION}</td>
-				<td style="text-align:right;">{extras.MATCHDAY}</td>
-				<td style="text-align:right;">{extras.MATCHDAY_EVAL}</td>
-				<td style="text-align:center;">{extras.EXTRA_POINTS}</td>
-				<td style="text-align:center;">{extras.EXTRA_STATUS}</td>
-				<td style="text-align: center;"><a href="{extras.U_EDIT}">{L_SETTINGS}</a></td>
-				<td style="text-align: center;"><!-- IF extras.U_DELETE --><a href="{extras.U_DELETE}">{L_DELETE}</a><!-- ELSE -->{L_DELETE}<!-- ENDIF --></td>
-			</tr>
-		<!-- END extras -->
-	<!-- ELSE -->
-			<tr>
-				<td colspan="9" class="row3">{L_NO_EXTRA_CREATED}</td>
-			</tr>
-	<!-- ENDIF -->
-	</tbody>
-	</table>
-
-<!-- ENDIF -->
-<br />
-<div style="text-align: center;">phpBB Extension - Football Prediction League - Version {S_VERSION_NO} &copy; 2016 <a href="http://football.bplaced.net">football</a></div>
+<!-- INCLUDECSS css/football_acp.css -->
+<!-- INCLUDE overall_header.html -->
+
+<a id="maincontent"></a>
+<!-- IF S_EDIT -->
+	<a href="{U_BACK}" style="float: {S_CONTENT_FLOW_END};">&laquo; {L_BACK}</a>
+	<h1>{L_ACP_FOOTBALL_EXTRA_MANAGE}</h1>
+	<p>{L_MATCHDAY_EDIT_EXPLAIN}</p>
+
+	<!-- IF S_ERROR -->
+		<div class="errorbox">
+			<h3>{L_WARNING}</h3>
+			<p>{ERROR_MSG}</p>
+		</div>
+	<!-- ENDIF -->
+
+	<form id="settings" method="post" action="{U_ACTION}">
+
+	<fieldset>
+		<legend>{L_EXTRA_DETAILS}</legend>
+	<dl>
+		<dt><label for="season">{L_SEASON}:</label></dt>
+		<dd><strong>{SEASON_NAME}</strong><input name="s" type="hidden" id="season" value="{SEASON}" /></dd>
+	</dl>
+	<dl>
+		<dt><label for="league">{L_LEAGUE}:</label></dt>
+		<dd><strong>{LEAGUE_NAME}</strong><input name="l" type="hidden" id="league" value="{LEAGUE}" /></dd>
+	</dl>
+	<dl>
+		<dt><label for="extra_no">{L_EXTRA_NO}:</label></dt>
+		<dd><strong>{EXTRA_NO}</strong><input name="e" type="hidden" id="extra_no" value="{EXTRA_NO}" /></dd>
+	</dl>
+	<dl>
+		<dt><label for="question_type">{L_EXTRA_QUESTION_TYPE}:</label><br /><span>{L_EXTRA_QUESTION_TYPE_EXPLAIN}</span></dt>
+		<dd><select id="question_type" name="question_type">{S_QUESTION_TYPE_OPTIONS}</select> </dd>
+	</dl>
+	<dl>
+		<dt><label for="question">{L_EXTRA_QUESTION}:</label><br /><span>{L_EXTRA_QUESTION_EXPLAIN}</span></dt>
+		<dd><input name="question" type="text" id="question" size="80" maxlength="255" value="{QUESTION}" /></dd>
+	</dl>
+	<dl>
+		<dt><label for="matchday">{L_EXTRA_MATCHDAY}:</label><br /><span>{L_EXTRA_MATCHDAY_EXPLAIN}</span></dt>
+		<dd><select id="matchday" name="matchday">{S_MATCHDAY_OPTIONS}</select> </dd>
+	</dl>
+	<dl>
+		<dt><label for="matchday_eval">{L_EXTRA_MATCHDAY_EVAL}:</label><br /><span>{L_EXTRA_MATCHDAY_EVAL_EXPLAIN}</span></dt>
+		<dd><select id="matchday_eval" name="matchday_eval">{S_MATCHDAY_EVAL_OPTIONS}</select> </dd>
+	</dl>
+	<dl>
+		<dt><label for="extra_points">{L_EXTRA_POINTS}:</label><br /><span>{L_EXTRA_POINTS_EXPLAIN}</span></dt>
+		<dd><input name="extra_points" type="text" id="extra_points" size="2" maxlength="2" value="{EXTRA_POINTS}" /></dd>
+	</dl>
+	<dl>
+		<dt><label for="extra_status">{L_EXTRA_STATUS}:</label><br /><span>{L_EXTRA_STATUS_EXPLAIN}</span></dt>
+		<dd><select id="extra_status" name="extra_status">{S_EXTRA_STATUS_OPTIONS}</select></dd>
+	</dl>
+	</fieldset>
+
+	<fieldset class="submit-buttons">
+		<legend>{L_SUBMIT}</legend>
+		<input class="button1" type="submit" id="submit" name="update" value="{L_SUBMIT}" />&nbsp;
+		<input class="button2" type="reset" id="reset" name="reset" value="{L_RESET}" />
+		{S_FORM_TOKEN}
+	</fieldset>
+	</form>
+
+<!-- ELSE -->
+	<!-- IF U_FOOTBALL --><a href="{U_FOOTBALL}" style="float: {S_CONTENT_FLOW_END};">&laquo; {L_PREDICTION_LEAGUE}</a><!-- ENDIF -->
+	<h1>{L_ACP_FOOTBALL_EXTRA_MANAGE}</h1>
+	<p>{L_ACP_FOOTBALL_EXTRA_MANAGE_EXPLAIN}</p>
+
+	<!-- IF S_ERROR -->
+		<div class="errorbox">
+			<h3>{L_WARNING}</h3>
+			<p>{ERROR_MSG}</p>
+		</div>
+	<!-- ENDIF -->
+
+	<h1 style="display:inline;">{L_SELECT_LEAGUE}:</h1>
+	<form style="display:inline;" method="post" action="{U_ACTION}">
+	<div style="display:inline; margin:0; padding:0;">
+		<select name="s" id="matchday_season" onchange="this.form.submit();">{S_SEASON_OPTIONS}</select>
+		{S_FORM_TOKEN}
+	</div>
+	</form>
+
+	<form style="display:inline;" method="post" action="{U_ACTION}">
+	<div style="display:inline; margin:0; padding:0;">
+		<input type="hidden" name="s" value="{S_SEASON}" />
+		<select name="l" id="matchday_league" onchange="this.form.submit();">{S_LEAGUE_OPTIONS}</select>
+		{S_FORM_TOKEN}
+	</div>
+	</form>
+
+	<form id="add_extra" method="post" action="{U_ACTION}">
+	<fieldset class="quick">
+			<input type="hidden" name="s" value="{S_SEASON}" />
+			<input type="hidden" name="l" value="{S_LEAGUE}" />
+		<!-- IF S_EXTRA_ADD -->
+			<input class="button2" type="submit" name="submit" value="{L_EXTRA_ADD}" />
+			<input type="hidden" name="add" value="1" />
+		<!-- ENDIF -->
+		{S_FORM_TOKEN}
+	</fieldset>
+	</form>
+	<h1>{L_EXTRA_DEF}</h1>
+
+	<p>{L_EXTRA_DEF_EXPLAIN}</p>
+	<table class="type_f">
+	<thead>
+	<tr>
+		<th>{L_EXTRA_NO}</th>
+		<th>{L_QUESTION_TYPE}</th>
+		<th style="width: 40%">{L_EXTRA_QUESTION}</th>
+		<th>{L_EXTRA_MATCHDAY}</th>
+		<th>{L_EXTRA_MATCHDAY_EVAL}</th>
+		<th>{L_EXTRA_POINTS}</th>
+		<th>{L_STATUS}</th>
+		<th>{L_OPTIONS}</th>
+		<th>{L_ACTION}</th>
+	</tr>
+	</thead>
+	<tbody>
+	<!-- IF .extras -->
+		<!-- BEGIN extras -->
+			<tr class="{extras.ROW_CLASS}">
+				<td style="text-align:center;"><strong>{extras.EXTRA_NO}</strong></td>
+				<td style="text-align:center;">{extras.QUESTION_TYPE}</td>
+				<td>{extras.QUESTION}</td>
+				<td style="text-align:right;">{extras.MATCHDAY}</td>
+				<td style="text-align:right;">{extras.MATCHDAY_EVAL}</td>
+				<td style="text-align:center;">{extras.EXTRA_POINTS}</td>
+				<td style="text-align:center;">{extras.EXTRA_STATUS}</td>
+				<td style="text-align: center;"><a href="{extras.U_EDIT}">{L_SETTINGS}</a></td>
+				<td style="text-align: center;"><!-- IF extras.U_DELETE --><a href="{extras.U_DELETE}">{L_DELETE}</a><!-- ELSE -->{L_DELETE}<!-- ENDIF --></td>
+			</tr>
+		<!-- END extras -->
+	<!-- ELSE -->
+			<tr>
+				<td colspan="9" class="row3">{L_NO_EXTRA_CREATED}</td>
+			</tr>
+	<!-- ENDIF -->
+	</tbody>
+	</table>
+
+<!-- ENDIF -->
+<br />
+<div style="text-align: center;">phpBB Extension - Football Prediction League - Version {S_VERSION_NO} &copy; 2016 <a href="http://football.bplaced.net">football</a></div>
 <!-- INCLUDE overall_footer.html -->

adm/style/acp_football_ko.html

@@ -1,85 +1,85 @@
-<!-- INCLUDECSS css/football_acp.css -->
-<!-- INCLUDE overall_header.html -->
-
-<a id="maincontent"></a>
-	<!-- IF U_FOOTBALL --><a href="{U_FOOTBALL}" style="float: {S_CONTENT_FLOW_END};">&laquo; {L_PREDICTION_LEAGUE}</a><!-- ENDIF -->
-	<h1>{L_ACP_FOOTBALL_KO_MANAGE}</h1>
-	<p>{L_ACP_FOOTBALL_KO_MANAGE_EXPLAIN}</p>
-
-	<h1 style="display:inline;">{L_SELECT_LEAGUE}:</h1>
-	<form style="display:inline;" method="post" action="{U_ACTION}">
-	<div style="display:inline; margin:0; padding:0;">
-		<select name="s" id="match_season" onchange="this.form.submit();">{S_SEASON_OPTIONS}</select>
-		{S_FORM_TOKEN}
-	</div>
-	</form>
-	<form style="display:inline;" method="post" action="{U_ACTION}">
-	<div style="display:inline; margin:0; padding:0;">
-		<input type="hidden" name="s" value="{S_SEASON}" />
-		<select name="l" id="match_league" onchange="this.form.submit();">{S_LEAGUE_OPTIONS}</select>
-		{S_FORM_TOKEN}
-	</div>
-	</form>
-
-	<!-- IF S_ERROR -->
-		<div class="errorbox">
-			<h3>{L_WARNING}</h3>
-			<p>{ERROR_MSG}</p>
-		</div>
-	<!-- ENDIF -->
-
-	<form id="settings" method="post" action="{U_ACTION}">
-
-	<fieldset>
-		<legend>{L_KO_MATCHDAYS}</legend>
-	<dl>
-		<dt><label for="matchday_from">{L_MATCHDAY_FROM}:</label></dt>
-		<dd><select name="matchday_from" id="matchday_from" >{S_MATCHDAY_FROM_OPTIONS}</select></dd>
-	</dl>
-	<dl>
-		<dt><label for="matchday_to">{L_MATCHDAY_TO}:</label></dt>
-		<dd><select name="matchday_to" id="matchday_to" >{S_MATCHDAY_TO_OPTIONS}</select></dd>
-	</dl>
-	<input type="hidden" name="s" value="{S_SEASON}" />
-	<input type="hidden" name="l" value="{S_LEAGUE}" />
-	</fieldset>
-	
-	<fieldset>
-		<legend>{L_MATCHDAY_TARGET}</legend>
-	<dl>
-		<dt><label for="matchday_new">{L_MATCHDAY_NEW}:</label></dt>
-		<dd><select name="matchday_new" id="matchday_new" >{S_MATCHDAY_NEW_OPTIONS}</select></dd>
-	</dl>
-	</fieldset>
-
-	<fieldset>
-		<legend>{L_KO_GROUP}</legend>
-	<dl>
-		<dt><label for="matchday_new">{L_MANAGE_GROUP}:</label></dt>
-		<dd><input name="check_rank" id="check_rank" type="checkbox" value="1" class="radio" <!-- IF S_CHECK_RANK --> checked="checked"<!-- ENDIF --> /></dd>
-	</dl>
-	<dl>
-		<dt><label for="rank">{L_GROUP_RANK}:</label><br /><span>{L_GROUP_RANK_EXPLAIN}</span></dt>
-		<dd><input name="rank" type="text" id="rank" value="{S_RANK}" size="1" maxlength="1" /></dd>
-	</dl>
-	<dl>
-		<dt><label for="move_rank">{L_MOVE_RANK}:</label><br /><span>{L_MOVE_RANK_EXPLAIN}</span></dt>
-		<dd><input name="move_rank" type="text" id="move_rank" value="{S_MOVE_RANK}" size="1" maxlength="1" /> 
-			{L_MOVE_LEAGUE} 
-			<select name="move_league" id="move_league">{S_MOVE_LEAGUE_OPTIONS}</select>
-			{L_MATCHDAY}
-			<input name="move_matchday" type="text" id="move_matchday" value="{S_MOVE_MATCHDAY}" size="2" maxlength="2" /> 
-		</dd>
-	</dl>
-	</fieldset>
-
-	<fieldset class="submit-buttons">
-		<legend>{L_SUBMIT}</legend>
-		<input class="button1" type="submit" id="submit" name="update" value="{L_SUBMIT}" />&nbsp;
-		<input class="button2" type="reset" id="reset" name="reset" value="{L_RESET}" />
-		{S_FORM_TOKEN}
-	</fieldset>
-	</form>
-<br />
-<div style="text-align: center;">phpBB Extension - Football Prediction League - Version {S_VERSION_NO} &copy; 2016 <a href="http://football.bplaced.net">football</a></div>
+<!-- INCLUDECSS css/football_acp.css -->
+<!-- INCLUDE overall_header.html -->
+
+<a id="maincontent"></a>
+	<!-- IF U_FOOTBALL --><a href="{U_FOOTBALL}" style="float: {S_CONTENT_FLOW_END};">&laquo; {L_PREDICTION_LEAGUE}</a><!-- ENDIF -->
+	<h1>{L_ACP_FOOTBALL_KO_MANAGE}</h1>
+	<p>{L_ACP_FOOTBALL_KO_MANAGE_EXPLAIN}</p>
+
+	<h1 style="display:inline;">{L_SELECT_LEAGUE}:</h1>
+	<form style="display:inline;" method="post" action="{U_ACTION}">
+	<div style="display:inline; margin:0; padding:0;">
+		<select name="s" id="match_season" onchange="this.form.submit();">{S_SEASON_OPTIONS}</select>
+		{S_FORM_TOKEN}
+	</div>
+	</form>
+	<form style="display:inline;" method="post" action="{U_ACTION}">
+	<div style="display:inline; margin:0; padding:0;">
+		<input type="hidden" name="s" value="{S_SEASON}" />
+		<select name="l" id="match_league" onchange="this.form.submit();">{S_LEAGUE_OPTIONS}</select>
+		{S_FORM_TOKEN}
+	</div>
+	</form>
+
+	<!-- IF S_ERROR -->
+		<div class="errorbox">
+			<h3>{L_WARNING}</h3>
+			<p>{ERROR_MSG}</p>
+		</div>
+	<!-- ENDIF -->
+
+	<form id="settings" method="post" action="{U_ACTION}">
+
+	<fieldset>
+		<legend>{L_KO_MATCHDAYS}</legend>
+	<dl>
+		<dt><label for="matchday_from">{L_MATCHDAY_FROM}:</label></dt>
+		<dd><select name="matchday_from" id="matchday_from" >{S_MATCHDAY_FROM_OPTIONS}</select></dd>
+	</dl>
+	<dl>
+		<dt><label for="matchday_to">{L_MATCHDAY_TO}:</label></dt>
+		<dd><select name="matchday_to" id="matchday_to" >{S_MATCHDAY_TO_OPTIONS}</select></dd>
+	</dl>
+	<input type="hidden" name="s" value="{S_SEASON}" />
+	<input type="hidden" name="l" value="{S_LEAGUE}" />
+	</fieldset>
+	
+	<fieldset>
+		<legend>{L_MATCHDAY_TARGET}</legend>
+	<dl>
+		<dt><label for="matchday_new">{L_MATCHDAY_NEW}:</label></dt>
+		<dd><select name="matchday_new" id="matchday_new" >{S_MATCHDAY_NEW_OPTIONS}</select></dd>
+	</dl>
+	</fieldset>
+
+	<fieldset>
+		<legend>{L_KO_GROUP}</legend>
+	<dl>
+		<dt><label for="matchday_new">{L_MANAGE_GROUP}:</label></dt>
+		<dd><input name="check_rank" id="check_rank" type="checkbox" value="1" class="radio" <!-- IF S_CHECK_RANK --> checked="checked"<!-- ENDIF --> /></dd>
+	</dl>
+	<dl>
+		<dt><label for="rank">{L_GROUP_RANK}:</label><br /><span>{L_GROUP_RANK_EXPLAIN}</span></dt>
+		<dd><input name="rank" type="text" id="rank" value="{S_RANK}" size="1" maxlength="1" /></dd>
+	</dl>
+	<dl>
+		<dt><label for="move_rank">{L_MOVE_RANK}:</label><br /><span>{L_MOVE_RANK_EXPLAIN}</span></dt>
+		<dd><input name="move_rank" type="text" id="move_rank" value="{S_MOVE_RANK}" size="1" maxlength="1" /> 
+			{L_MOVE_LEAGUE} 
+			<select name="move_league" id="move_league">{S_MOVE_LEAGUE_OPTIONS}</select>
+			{L_MATCHDAY}
+			<input name="move_matchday" type="text" id="move_matchday" value="{S_MOVE_MATCHDAY}" size="2" maxlength="2" /> 
+		</dd>
+	</dl>
+	</fieldset>
+
+	<fieldset class="submit-buttons">
+		<legend>{L_SUBMIT}</legend>
+		<input class="button1" type="submit" id="submit" name="update" value="{L_SUBMIT}" />&nbsp;
+		<input class="button2" type="reset" id="reset" name="reset" value="{L_RESET}" />
+		{S_FORM_TOKEN}
+	</fieldset>
+	</form>
+<br />
+<div style="text-align: center;">phpBB Extension - Football Prediction League - Version {S_VERSION_NO} &copy; 2016 <a href="http://football.bplaced.net">football</a></div>
 <!-- INCLUDE overall_footer.html -->

adm/style/acp_football_leagues.html

@@ -100,6 +100,10 @@
 		</dd>
 	</dl>
 	<!-- ENDIF -->	
+	<dl>
+		<dt><label for="bet_type">{L_BET_TYPE}:</label><br /><span>{L_BET_TYPE_EXPLAIN}</span></dt>
+		<dd><input name="bet_type" type="checkbox" id="bet_type" <!-- IF S_BET_TYPE -->checked="checked" <!-- ENDIF --> /></dd>
+	</dl>
 	</fieldset>
 
 	<fieldset>

adm/style/acp_football_matchdays.html

@@ -1,285 +1,285 @@
-<!-- INCLUDECSS css/football_acp.css -->
-<!-- INCLUDE overall_header.html -->
-
-<a id="maincontent"></a>
-<!-- IF S_EDIT -->
-	<a href="{U_BACK}" style="float: {S_CONTENT_FLOW_END};">&laquo; {L_BACK}</a>
-	<h1>{L_ACP_FOOTBALL_MATCHDAYS_MANAGE}</h1>
-	<p>{L_MATCHDAY_EDIT_EXPLAIN}</p>
-
-	<!-- IF S_ERROR -->
-		<div class="errorbox">
-			<h3>{L_WARNING}</h3>
-			<p>{ERROR_MSG}</p>
-		</div>
-	<!-- ENDIF -->
-
-	<form id="settings" method="post" action="{U_ACTION}">
-
-	<fieldset>
-		<legend>{L_MATCHDAY_DETAILS}</legend>
-	<dl>
-		<dt><label for="season">{L_SEASON}:</label></dt>
-		<dd><strong>{SEASON_NAME}</strong><input name="s" type="hidden" id="season" value="{SEASON}" /></dd>
-	</dl>
-	<dl>
-		<dt><label for="league">{L_LEAGUE}:</label></dt>
-		<dd><strong>{LEAGUE_NAME}</strong><input name="l" type="hidden" id="league" value="{LEAGUE}" /></dd>
-	</dl>
-	<dl>
-		<dt><label for="matchday">{L_MATCHDAY}:</label></dt>
-		<dd><strong>{MATCHDAY}</strong><input name="m" type="hidden" id="matchday" value="{MATCHDAY}" /></dd>
-	</dl>
-	<dl>
-		<dt><label for="matchday_name">{L_MATCHDAY_NAME}:</label></dt>
-		<dd><input name="matchday_name" type="text" id="matchday_name" size="30" maxlength="30" value="{MATCHDAY_NAME}" /></dd>
-	</dl>
-	<dl>
-		<dt><label for="matchday_status">{L_MATCHDAY_STATUS}:</label><br /><span>{L_MATCHDAY_STATUS_EXPLAIN}</span></dt>
-		<dd><strong>{MATCHDAY_STATUS}</strong><input name="matchday_status" type="hidden" id="matchday_status" value="{MATCHDAY_STATUS}" /></dd>
-	</dl>
-	<!-- IF S_EDIT_DELIVERY -->
-	<dl> 
-		<dt><label for="delivery1">{L_MATCHDAY_DELIVERY}:</label><br /><span>{L_MATCHDAY_DELIVERY_EXPLAIN}</span></dt>
-		<dd>{L_DAY}: <select id="delivery1" name="dday1_day">{S_DELIVERY1_DAY_OPTIONS}</select> 
-			{L_MONTH}: <select name="dday1_month">{S_DELIVERY1_MONTH_OPTIONS}</select> 
-			{L_YEAR}: <select name="dday1_year">{S_DELIVERY1_YEAR_OPTIONS}</select>&nbsp;&nbsp;&nbsp;
-			{L_TIME}: <select name="dday1_hour">{S_DELIVERY1_HOUR_OPTIONS}</select>:
-			<select name="dday1_min">{S_DELIVERY1_MIN_OPTIONS}</select>
-		</dd>
-	</dl>
-	<dl> 
-		<dt><label for="delivery2">{L_MATCHDAY_DELIVERY2}:</label><br /><span>{L_MATCHDAY_DELIVERY2_EXPLAIN}</span></dt>
-		<dd>{L_DAY}: <select id="delivery2" name="dday2_day">{S_DELIVERY2_DAY_OPTIONS}</select> 
-			{L_MONTH}: <select name="dday2_month">{S_DELIVERY2_MONTH_OPTIONS}</select> 
-			{L_YEAR}: <select name="dday2_year">{S_DELIVERY2_YEAR_OPTIONS}</select>&nbsp;&nbsp;&nbsp;
-			{L_TIME}: <select name="dday2_hour">{S_DELIVERY2_HOUR_OPTIONS}</select>:
-			<select name="dday2_min">{S_DELIVERY2_MIN_OPTIONS}</select>
-		</dd>
-	</dl>
-	<dl> 
-		<dt><label for="delivery3">{L_MATCHDAY_DELIVERY3}:</label><br /><span>{L_MATCHDAY_DELIVERY3_EXPLAIN}</span></dt>
-		<dd>{L_DAY}: <select id="delivery3" name="dday3_day">{S_DELIVERY3_DAY_OPTIONS}</select> 
-			{L_MONTH}: <select name="dday3_month">{S_DELIVERY3_MONTH_OPTIONS}</select> 
-			{L_YEAR}: <select name="dday3_year">{S_DELIVERY3_YEAR_OPTIONS}</select>&nbsp;&nbsp;&nbsp;
-			{L_TIME}: <select name="dday3_hour">{S_DELIVERY3_HOUR_OPTIONS}</select>:
-			<select name="dday3_min">{S_DELIVERY3_MIN_OPTIONS}</select>
-		</dd>
-	</dl>
-	<!-- ELSE -->
-	<dl>
-		<dt><label for="matchday_delivery1">{L_MATCHDAY_DELIVERY}:</label><br /><span>{L_MATCHDAY_DELIVERY_EXPLAIN}</span></dt>
-		<dd>
-			{MATCHDAY_DEL1}
-		</dd>
-	</dl>
-	<dl>
-		<dt><label for="matchday_delivery2">{L_MATCHDAY_DELIVERY2}:</label><br /><span>{L_MATCHDAY_DELIVERY2_EXPLAIN}</span></dt>
-		<dd>
-			{MATCHDAY_DEL2}
-		</dd>
-	</dl>
-	<dl>
-		<dt><label for="matchday_delivery3">{L_MATCHDAY_DELIVERY3}:</label><br /><span>{L_MATCHDAY_DELIVERY3_EXPLAIN}</span></dt>
-		<dd>
-			{MATCHDAY_DEL3}
-		</dd>
-	</dl>
-	<!-- ENDIF -->
-	<!-- IF S_KO_LEAGUE -->
-	<dl>
-		<dt><label for="matchday_matches">{L_MATCHDAY_MATCHES}:</label><br /><span>{L_MATCHDAY_MATCHES_EXPLAIN}</span></dt>
-		<dd>
-		<!-- IF S_EDIT_MATCHES -->
-			<input name="matchday_matches" type="text" id="matchday_matches" size="2" maxlength="2" value="{MATCHDAY_MATCHES}" />
-		<!-- ELSE -->
-			{MATCHDAY_MATCHES}
-		<!-- ENDIF -->
-		</dd>
-	</dl>
-	<input type="hidden" name="ko_league" value="1" />
-	<!-- ENDIF -->
-	</fieldset>
-
-	<fieldset class="submit-buttons">
-		<legend>{L_SUBMIT}</legend>
-		<input class="button1" type="submit" id="submit" name="update" value="{L_SUBMIT}" />&nbsp;
-		<input class="button2" type="reset" id="reset" name="reset" value="{L_RESET}" />
-		{S_FORM_TOKEN}
-	</fieldset>
-	</form>
-
-<!-- ELSEIF S_CHANGE_DELIVERY -->
-	<a href="{U_BACK}" style="float: {S_CONTENT_FLOW_END};">&laquo; {L_BACK}</a>
-	<h1>{L_CHANGE_DELIVERY}</h1>
-	<p>{L_CHANGE_DELIVERY_EXPLAIN}</p>
-
-	<form id="change_delivery" method="post" action="{U_ACTION}">
-
-	<!-- IF S_SHOW_DELIVERY_SELECT -->
-	<fieldset>
-		<legend>{L_DELIVERY_SET_TIME}</legend>
-	<dl>
-		<dt><label> {L_BACKWARD_DELIVERY}:</label><br /><span>{L_BACKWARD_DELIVERY_EXPLAIN}</span></dt>
-		<dd>{L_DAYS}: <select id="backward_days" name="backward_days">{S_BACKWARD_DAYS_OPTIONS}</select> &nbsp;
-			{L_HOURS}: <select name="backward_hours">{S_BACKWARD_HOURS_OPTIONS}</select> &nbsp;
-			{L_MINUTES}: <select name="backward_minutes">{S_BACKWARD_MINUTES_OPTIONS}</select>
-		</dd>
-	</dl>
-	</fieldset>
-	<!-- ENDIF -->
-	<!-- IF S_SHOW_DELIVERY -->
-	<h1>{L_UPDATE_DELIVERY}</h1>
-
-	<p>{L_UPDATE_DELIVERY_EXPLAIN}</p>
-	<p class="small" style="text-align:right;margin-bottom:0px">
-		<a href="#" onclick="marklist('change_delivery', 'delivery_', true); return false;">{L_MARK_ALL}</a> &bull; 
-		<a href="#" onclick="marklist('change_delivery', 'delivery_', false); return false;">{L_UNMARK_ALL}</a>
-	</p>		
-	<table class="type_f">
-	<thead>
-	<tr>
-		<th>{L_MATCHDAY}</th>
-		<th>{L_DELIVERY_NUMBER}</th>
-		<th>{L_DELIVERY}</th>
-		<th>{L_NEW_DELIVERY}</th>
-		<th>{L_SELECT}</th>
-	</tr>
-	</thead>
-	<tbody>
-	<!-- BEGIN delivery -->
-		<tr class="{delivery.ROW_CLASS}">
-			<td style="text-align: center;"><strong>{delivery.MATCHDAY}</strong></td>
-			<td>{delivery.NUMBER}</td>
-			<td><b>{delivery.DELIVERY_DATE_DAY}</b>
-				<!-- IF delivery.DELIVERY_ERROR --><span style="color: #FF0000;"><!-- ENDIF --> 
-				{delivery.DELIVERY_DATE}
-				<!-- IF delivery.DELIVERY_ERROR --></span><!-- ENDIF --> 
-			</td>
-			<td><b>{delivery.NEW_DELIVERY_DAY}</b> {delivery.NEW_DELIVERY}
-				<input type="hidden" name="new_delivery_{delivery.MATCHDAY}_{delivery.NUMBER}" value="{delivery.NEW_DELIVERY}" />
-			</td>
-			<td>
-				<input name="delivery_{delivery.MATCHDAY}_{delivery.NUMBER}" id="delivery_{delivery.MATCHDAY}_{delivery.NUMBER}" 
-						type="checkbox" class="radio" <!-- IF delivery.SELECT_CHECKED --> checked="checked"<!-- ENDIF --> />
-			</td>
-		</tr>
-	<!-- END delivery -->
-	</tbody>
-	</table>
-	<p class="small" style="text-align:right;margin-bottom:0px">
-		<a href="#" onclick="marklist('update_delivery', 'delivery_', true); return false;">{L_MARK_ALL}</a> &bull; 
-		<a href="#" onclick="marklist('update_delivery', 'delivery_', false); return false;">{L_UNMARK_ALL}</a>
-	</p>		
-
-	<!-- ENDIF -->
-	<fieldset class="submit-buttons">
-		<legend>{L_SUBMIT}</legend>
-		<!-- IF S_SHOW_DELIVERY -->
-			<input class="button1" type="submit" id="update_delivery" name="update_delivery" value="{L_SUBMIT}" />&nbsp;
-		<!-- ELSE -->
-			<input class="button1" type="submit" id="show_delivery" name="show_delivery" value="{L_SHOW_DELIVERY}" />&nbsp;
-		<!-- ENDIF -->
-		{S_FORM_TOKEN}
-	</fieldset>
-	</form>
-<!-- ELSE -->
-	<!-- IF U_FOOTBALL --><a href="{U_FOOTBALL}" style="float: {S_CONTENT_FLOW_END};">&laquo; {L_PREDICTION_LEAGUE}</a><!-- ENDIF -->
-	<h1>{L_ACP_FOOTBALL_MATCHDAYS_MANAGE}</h1>
-	<p>{L_ACP_FOOTBALL_MATCHDAYS_MANAGE_EXPLAIN}</p>
-
-	<!-- IF S_ERROR -->
-		<div class="errorbox">
-			<h3>{L_WARNING}</h3>
-			<p>{ERROR_MSG}</p>
-		</div>
-	<!-- ENDIF -->
-
-	<h1 style="display:inline;">{L_SELECT_LEAGUE}:</h1>
-	<form style="display:inline;" method="post" action="{U_ACTION}">
-	<div style="display:inline; margin:0; padding:0;">
-		<select name="s" id="matchday_season" onchange="this.form.submit();">{S_SEASON_OPTIONS}</select>
-		{S_FORM_TOKEN}
-	</div>
-	</form>
-
-	<form style="display:inline;" method="post" action="{U_ACTION}">
-	<div style="display:inline; margin:0; padding:0;">
-		<input type="hidden" name="s" value="{S_SEASON}" />
-		<select name="l" id="matchday_league" onchange="this.form.submit();">{S_LEAGUE_OPTIONS}</select>
-		{S_FORM_TOKEN}
-	</div>
-	</form>
-
-	<form style="display:inline;" id="add_matchday" method="post" action="{U_ACTION}">
-	<fieldset class="quick">
-			<input type="hidden" name="s" value="{S_SEASON}" />
-			<input type="hidden" name="l" value="{S_LEAGUE}" />
-			<input type="hidden" name="m" value="{S_MATCHDAY}" />
-			<input type="hidden" name="ko_league" value="{KO_LEAGUE}" />
-		<!-- IF S_MATCHDAYS_REMOVE -->
-			<input class="button2" type="submit" name="submit" value="{L_REMOVE_MATCHDAYS}" />
-			<input type="hidden" name="remove" value="1" />
-		<!-- ENDIF -->
-		<!-- IF S_MATCHDAY_ADD -->
-
-			<input class="button2" type="submit" name="submit" value="{L_GENERATE_MATCHDAY}" />
-			<input type="hidden" name="add" value="1" />
-		<!-- ENDIF -->
-		{S_FORM_TOKEN}
-	</fieldset>
-	</form>
-	
-	<form style="display:inline;" id="change_delivery" method="post" action="{U_ACTION}">
-	<fieldset class="quick">
-			<input type="hidden" name="s" value="{S_SEASON}" />
-			<input type="hidden" name="l" value="{S_LEAGUE}" />
-		<!-- IF not S_MATCHDAY_ADD and not S_MATCHDAYS_REMOVE -->
-
-			<input class="button2" type="submit" name="change_delivery" value="{L_CHANGE_DELIVERY}" />
-		<!-- ENDIF -->
-		{S_FORM_TOKEN}
-	</fieldset>
-	</form>
-	
-	<h1>{L_MATCHDAY_DEF}</h1>
-
-	<p>{L_MATCHDAY_DEF_EXPLAIN}</p>
-	<table class="type_f">
-	<thead>
-	<tr>
-		<th>{L_MATCHDAY}</th>
-		<th style="width: 25%">{L_MATCHDAY_NAME}</th>
-		<th>{L_MATCHDAY_STATUS}</th>
-		<th>{L_MATCHDAY_DELIVERY}</th>
-		<th>{L_MATCHDAY_DELIVERY} 2</th>
-		<th>{L_MATCHDAY_DELIVERY} 3</th>
-		<th>{L_OPTIONS}</th>
-		<th>{L_ACTION}</th>
-	</tr>
-	</thead>
-	<tbody>
-	<!-- IF .matchdays -->
-		<!-- BEGIN matchdays -->
-			<tr class="{matchdays.ROW_CLASS}">
-				<td style="text-align: center;"><strong>{matchdays.MATCHDAY}</strong></td>
-				<td>{matchdays.MATCHDAY_NAME}</td>
-				<td style="text-align: center;">{matchdays.MATCHDAY_STATUS}</td>
-				<td>{matchdays.MATCHDAY_DELIVERY}</td>
-				<td>{matchdays.MATCHDAY_DELIVERY_2}</td>
-				<td>{matchdays.MATCHDAY_DELIVERY_3}</td>
-				<td style="text-align: center;"><a href="{matchdays.U_EDIT}">{L_SETTINGS}</a></td>
-				<td style="text-align: center;"><!-- IF matchdays.U_DELETE --><a href="{matchdays.U_DELETE}">{L_DELETE}</a><!-- ELSE -->{L_DELETE}<!-- ENDIF --></td>
-			</tr>
-		<!-- END matchdays -->
-	<!-- ELSE -->
-			<tr>
-				<td colspan="4" class="row3">{L_NO_MATCHDAYS_CREATED}</td>
-			</tr>
-	<!-- ENDIF -->
-	</tbody>
-	</table>
-<!-- ENDIF -->
-<br />
-<div style="text-align: center;">phpBB Extension - Football Prediction League - Version {S_VERSION_NO} &copy; 2016 <a href="http://football.bplaced.net">football</a></div>
+<!-- INCLUDECSS css/football_acp.css -->
+<!-- INCLUDE overall_header.html -->
+
+<a id="maincontent"></a>
+<!-- IF S_EDIT -->
+	<a href="{U_BACK}" style="float: {S_CONTENT_FLOW_END};">&laquo; {L_BACK}</a>
+	<h1>{L_ACP_FOOTBALL_MATCHDAYS_MANAGE}</h1>
+	<p>{L_MATCHDAY_EDIT_EXPLAIN}</p>
+
+	<!-- IF S_ERROR -->
+		<div class="errorbox">
+			<h3>{L_WARNING}</h3>
+			<p>{ERROR_MSG}</p>
+		</div>
+	<!-- ENDIF -->
+
+	<form id="settings" method="post" action="{U_ACTION}">
+
+	<fieldset>
+		<legend>{L_MATCHDAY_DETAILS}</legend>
+	<dl>
+		<dt><label for="season">{L_SEASON}:</label></dt>
+		<dd><strong>{SEASON_NAME}</strong><input name="s" type="hidden" id="season" value="{SEASON}" /></dd>
+	</dl>
+	<dl>
+		<dt><label for="league">{L_LEAGUE}:</label></dt>
+		<dd><strong>{LEAGUE_NAME}</strong><input name="l" type="hidden" id="league" value="{LEAGUE}" /></dd>
+	</dl>
+	<dl>
+		<dt><label for="matchday">{L_MATCHDAY}:</label></dt>
+		<dd><strong>{MATCHDAY}</strong><input name="m" type="hidden" id="matchday" value="{MATCHDAY}" /></dd>
+	</dl>
+	<dl>
+		<dt><label for="matchday_name">{L_MATCHDAY_NAME}:</label></dt>
+		<dd><input name="matchday_name" type="text" id="matchday_name" size="30" maxlength="30" value="{MATCHDAY_NAME}" /></dd>
+	</dl>
+	<dl>
+		<dt><label for="matchday_status">{L_MATCHDAY_STATUS}:</label><br /><span>{L_MATCHDAY_STATUS_EXPLAIN}</span></dt>
+		<dd><strong>{MATCHDAY_STATUS}</strong><input name="matchday_status" type="hidden" id="matchday_status" value="{MATCHDAY_STATUS}" /></dd>
+	</dl>
+	<!-- IF S_EDIT_DELIVERY -->
+	<dl> 
+		<dt><label for="delivery1">{L_MATCHDAY_DELIVERY}:</label><br /><span>{L_MATCHDAY_DELIVERY_EXPLAIN}</span></dt>
+		<dd>{L_DAY}: <select id="delivery1" name="dday1_day">{S_DELIVERY1_DAY_OPTIONS}</select> 
+			{L_MONTH}: <select name="dday1_month">{S_DELIVERY1_MONTH_OPTIONS}</select> 
+			{L_YEAR}: <select name="dday1_year">{S_DELIVERY1_YEAR_OPTIONS}</select>&nbsp;&nbsp;&nbsp;
+			{L_TIME}: <select name="dday1_hour">{S_DELIVERY1_HOUR_OPTIONS}</select>:
+			<select name="dday1_min">{S_DELIVERY1_MIN_OPTIONS}</select>
+		</dd>
+	</dl>
+	<dl> 
+		<dt><label for="delivery2">{L_MATCHDAY_DELIVERY2}:</label><br /><span>{L_MATCHDAY_DELIVERY2_EXPLAIN}</span></dt>
+		<dd>{L_DAY}: <select id="delivery2" name="dday2_day">{S_DELIVERY2_DAY_OPTIONS}</select> 
+			{L_MONTH}: <select name="dday2_month">{S_DELIVERY2_MONTH_OPTIONS}</select> 
+			{L_YEAR}: <select name="dday2_year">{S_DELIVERY2_YEAR_OPTIONS}</select>&nbsp;&nbsp;&nbsp;
+			{L_TIME}: <select name="dday2_hour">{S_DELIVERY2_HOUR_OPTIONS}</select>:
+			<select name="dday2_min">{S_DELIVERY2_MIN_OPTIONS}</select>
+		</dd>
+	</dl>
+	<dl> 
+		<dt><label for="delivery3">{L_MATCHDAY_DELIVERY3}:</label><br /><span>{L_MATCHDAY_DELIVERY3_EXPLAIN}</span></dt>
+		<dd>{L_DAY}: <select id="delivery3" name="dday3_day">{S_DELIVERY3_DAY_OPTIONS}</select> 
+			{L_MONTH}: <select name="dday3_month">{S_DELIVERY3_MONTH_OPTIONS}</select> 
+			{L_YEAR}: <select name="dday3_year">{S_DELIVERY3_YEAR_OPTIONS}</select>&nbsp;&nbsp;&nbsp;
+			{L_TIME}: <select name="dday3_hour">{S_DELIVERY3_HOUR_OPTIONS}</select>:
+			<select name="dday3_min">{S_DELIVERY3_MIN_OPTIONS}</select>
+		</dd>
+	</dl>
+	<!-- ELSE -->
+	<dl>
+		<dt><label for="matchday_delivery1">{L_MATCHDAY_DELIVERY}:</label><br /><span>{L_MATCHDAY_DELIVERY_EXPLAIN}</span></dt>
+		<dd>
+			{MATCHDAY_DEL1}
+		</dd>
+	</dl>
+	<dl>
+		<dt><label for="matchday_delivery2">{L_MATCHDAY_DELIVERY2}:</label><br /><span>{L_MATCHDAY_DELIVERY2_EXPLAIN}</span></dt>
+		<dd>
+			{MATCHDAY_DEL2}
+		</dd>
+	</dl>
+	<dl>
+		<dt><label for="matchday_delivery3">{L_MATCHDAY_DELIVERY3}:</label><br /><span>{L_MATCHDAY_DELIVERY3_EXPLAIN}</span></dt>
+		<dd>
+			{MATCHDAY_DEL3}
+		</dd>
+	</dl>
+	<!-- ENDIF -->
+	<!-- IF S_KO_LEAGUE -->
+	<dl>
+		<dt><label for="matchday_matches">{L_MATCHDAY_MATCHES}:</label><br /><span>{L_MATCHDAY_MATCHES_EXPLAIN}</span></dt>
+		<dd>
+		<!-- IF S_EDIT_MATCHES -->
+			<input name="matchday_matches" type="text" id="matchday_matches" size="2" maxlength="2" value="{MATCHDAY_MATCHES}" />
+		<!-- ELSE -->
+			{MATCHDAY_MATCHES}
+		<!-- ENDIF -->
+		</dd>
+	</dl>
+	<input type="hidden" name="ko_league" value="1" />
+	<!-- ENDIF -->
+	</fieldset>
+
+	<fieldset class="submit-buttons">
+		<legend>{L_SUBMIT}</legend>
+		<input class="button1" type="submit" id="submit" name="update" value="{L_SUBMIT}" />&nbsp;
+		<input class="button2" type="reset" id="reset" name="reset" value="{L_RESET}" />
+		{S_FORM_TOKEN}
+	</fieldset>
+	</form>
+
+<!-- ELSEIF S_CHANGE_DELIVERY -->
+	<a href="{U_BACK}" style="float: {S_CONTENT_FLOW_END};">&laquo; {L_BACK}</a>
+	<h1>{L_CHANGE_DELIVERY}</h1>
+	<p>{L_CHANGE_DELIVERY_EXPLAIN}</p>
+
+	<form id="change_delivery" method="post" action="{U_ACTION}">
+
+	<!-- IF S_SHOW_DELIVERY_SELECT -->
+	<fieldset>
+		<legend>{L_DELIVERY_SET_TIME}</legend>
+	<dl>
+		<dt><label> {L_BACKWARD_DELIVERY}:</label><br /><span>{L_BACKWARD_DELIVERY_EXPLAIN}</span></dt>
+		<dd>{L_DAYS}: <select id="backward_days" name="backward_days">{S_BACKWARD_DAYS_OPTIONS}</select> &nbsp;
+			{L_HOURS}: <select name="backward_hours">{S_BACKWARD_HOURS_OPTIONS}</select> &nbsp;
+			{L_MINUTES}: <select name="backward_minutes">{S_BACKWARD_MINUTES_OPTIONS}</select>
+		</dd>
+	</dl>
+	</fieldset>
+	<!-- ENDIF -->
+	<!-- IF S_SHOW_DELIVERY -->
+	<h1>{L_UPDATE_DELIVERY}</h1>
+
+	<p>{L_UPDATE_DELIVERY_EXPLAIN}</p>
+	<p class="small" style="text-align:right;margin-bottom:0px">
+		<a href="#" onclick="marklist('change_delivery', 'delivery_', true); return false;">{L_MARK_ALL}</a> &bull; 
+		<a href="#" onclick="marklist('change_delivery', 'delivery_', false); return false;">{L_UNMARK_ALL}</a>
+	</p>		
+	<table class="type_f">
+	<thead>
+	<tr>
+		<th>{L_MATCHDAY}</th>
+		<th>{L_DELIVERY_NUMBER}</th>
+		<th>{L_DELIVERY}</th>
+		<th>{L_NEW_DELIVERY}</th>
+		<th>{L_SELECT}</th>
+	</tr>
+	</thead>
+	<tbody>
+	<!-- BEGIN delivery -->
+		<tr class="{delivery.ROW_CLASS}">
+			<td style="text-align: center;"><strong>{delivery.MATCHDAY}</strong></td>
+			<td>{delivery.NUMBER}</td>
+			<td><b>{delivery.DELIVERY_DATE_DAY}</b>
+				<!-- IF delivery.DELIVERY_ERROR --><span style="color: #FF0000;"><!-- ENDIF --> 
+				{delivery.DELIVERY_DATE}
+				<!-- IF delivery.DELIVERY_ERROR --></span><!-- ENDIF --> 
+			</td>
+			<td><b>{delivery.NEW_DELIVERY_DAY}</b> {delivery.NEW_DELIVERY}
+				<input type="hidden" name="new_delivery_{delivery.MATCHDAY}_{delivery.NUMBER}" value="{delivery.NEW_DELIVERY}" />
+			</td>
+			<td>
+				<input name="delivery_{delivery.MATCHDAY}_{delivery.NUMBER}" id="delivery_{delivery.MATCHDAY}_{delivery.NUMBER}" 
+						type="checkbox" class="radio" <!-- IF delivery.SELECT_CHECKED --> checked="checked"<!-- ENDIF --> />
+			</td>
+		</tr>
+	<!-- END delivery -->
+	</tbody>
+	</table>
+	<p class="small" style="text-align:right;margin-bottom:0px">
+		<a href="#" onclick="marklist('update_delivery', 'delivery_', true); return false;">{L_MARK_ALL}</a> &bull; 
+		<a href="#" onclick="marklist('update_delivery', 'delivery_', false); return false;">{L_UNMARK_ALL}</a>
+	</p>		
+
+	<!-- ENDIF -->
+	<fieldset class="submit-buttons">
+		<legend>{L_SUBMIT}</legend>
+		<!-- IF S_SHOW_DELIVERY -->
+			<input class="button1" type="submit" id="update_delivery" name="update_delivery" value="{L_SUBMIT}" />&nbsp;
+		<!-- ELSE -->
+			<input class="button1" type="submit" id="show_delivery" name="show_delivery" value="{L_SHOW_DELIVERY}" />&nbsp;
+		<!-- ENDIF -->
+		{S_FORM_TOKEN}
+	</fieldset>
+	</form>
+<!-- ELSE -->
+	<!-- IF U_FOOTBALL --><a href="{U_FOOTBALL}" style="float: {S_CONTENT_FLOW_END};">&laquo; {L_PREDICTION_LEAGUE}</a><!-- ENDIF -->
+	<h1>{L_ACP_FOOTBALL_MATCHDAYS_MANAGE}</h1>
+	<p>{L_ACP_FOOTBALL_MATCHDAYS_MANAGE_EXPLAIN}</p>
+
+	<!-- IF S_ERROR -->
+		<div class="errorbox">
+			<h3>{L_WARNING}</h3>
+			<p>{ERROR_MSG}</p>
+		</div>
+	<!-- ENDIF -->
+
+	<h1 style="display:inline;">{L_SELECT_LEAGUE}:</h1>
+	<form style="display:inline;" method="post" action="{U_ACTION}">
+	<div style="display:inline; margin:0; padding:0;">
+		<select name="s" id="matchday_season" onchange="this.form.submit();">{S_SEASON_OPTIONS}</select>
+		{S_FORM_TOKEN}
+	</div>
+	</form>
+
+	<form style="display:inline;" method="post" action="{U_ACTION}">
+	<div style="display:inline; margin:0; padding:0;">
+		<input type="hidden" name="s" value="{S_SEASON}" />
+		<select name="l" id="matchday_league" onchange="this.form.submit();">{S_LEAGUE_OPTIONS}</select>
+		{S_FORM_TOKEN}
+	</div>
+	</form>
+
+	<form style="display:inline;" id="add_matchday" method="post" action="{U_ACTION}">
+	<fieldset class="quick">
+			<input type="hidden" name="s" value="{S_SEASON}" />
+			<input type="hidden" name="l" value="{S_LEAGUE}" />
+			<input type="hidden" name="m" value="{S_MATCHDAY}" />
+			<input type="hidden" name="ko_league" value="{KO_LEAGUE}" />
+		<!-- IF S_MATCHDAYS_REMOVE -->
+			<input class="button2" type="submit" name="submit" value="{L_REMOVE_MATCHDAYS}" />
+			<input type="hidden" name="remove" value="1" />
+		<!-- ENDIF -->
+		<!-- IF S_MATCHDAY_ADD -->
+
+			<input class="button2" type="submit" name="submit" value="{L_GENERATE_MATCHDAY}" />
+			<input type="hidden" name="add" value="1" />
+		<!-- ENDIF -->
+		{S_FORM_TOKEN}
+	</fieldset>
+	</form>
+	
+	<form style="display:inline;" id="change_delivery" method="post" action="{U_ACTION}">
+	<fieldset class="quick">
+			<input type="hidden" name="s" value="{S_SEASON}" />
+			<input type="hidden" name="l" value="{S_LEAGUE}" />
+		<!-- IF not S_MATCHDAY_ADD and not S_MATCHDAYS_REMOVE -->
+
+			<input class="button2" type="submit" name="change_delivery" value="{L_CHANGE_DELIVERY}" />
+		<!-- ENDIF -->
+		{S_FORM_TOKEN}
+	</fieldset>
+	</form>
+	
+	<h1>{L_MATCHDAY_DEF}</h1>
+
+	<p>{L_MATCHDAY_DEF_EXPLAIN}</p>
+	<table class="type_f">
+	<thead>
+	<tr>
+		<th>{L_MATCHDAY}</th>
+		<th style="width: 25%">{L_MATCHDAY_NAME}</th>
+		<th>{L_MATCHDAY_STATUS}</th>
+		<th>{L_MATCHDAY_DELIVERY}</th>
+		<th>{L_MATCHDAY_DELIVERY} 2</th>
+		<th>{L_MATCHDAY_DELIVERY} 3</th>
+		<th>{L_OPTIONS}</th>
+		<th>{L_ACTION}</th>
+	</tr>
+	</thead>
+	<tbody>
+	<!-- IF .matchdays -->
+		<!-- BEGIN matchdays -->
+			<tr class="{matchdays.ROW_CLASS}">
+				<td style="text-align: center;"><strong>{matchdays.MATCHDAY}</strong></td>
+				<td>{matchdays.MATCHDAY_NAME}</td>
+				<td style="text-align: center;">{matchdays.MATCHDAY_STATUS}</td>
+				<td>{matchdays.MATCHDAY_DELIVERY}</td>
+				<td>{matchdays.MATCHDAY_DELIVERY_2}</td>
+				<td>{matchdays.MATCHDAY_DELIVERY_3}</td>
+				<td style="text-align: center;"><a href="{matchdays.U_EDIT}">{L_SETTINGS}</a></td>
+				<td style="text-align: center;"><!-- IF matchdays.U_DELETE --><a href="{matchdays.U_DELETE}">{L_DELETE}</a><!-- ELSE -->{L_DELETE}<!-- ENDIF --></td>
+			</tr>
+		<!-- END matchdays -->
+	<!-- ELSE -->
+			<tr>
+				<td colspan="4" class="row3">{L_NO_MATCHDAYS_CREATED}</td>
+			</tr>
+	<!-- ENDIF -->
+	</tbody>
+	</table>
+<!-- ENDIF -->
+<br />
+<div style="text-align: center;">phpBB Extension - Football Prediction League - Version {S_VERSION_NO} &copy; 2016 <a href="http://football.bplaced.net">football</a></div>
 <!-- INCLUDE overall_footer.html -->

adm/style/acp_football_matches.html

@@ -96,6 +96,10 @@
 		<dd><input name="formula_guest" type="text" id="formula_guest" size="9" maxlength="9" value="{FORMULA_GUEST}" /></dd>
 	</dl>
 	<!-- ENDIF -->
+	<dl>
+		<dt><label for="show_table">{L_SHOW_TABLE}:</label><br /><span>{L_SHOW_TABLE_EXPLAIN}</span></dt>
+		<dd><input name="show_table" type="checkbox" class="radio" id="show_table" <!-- IF S_SHOW_TABLE --> checked="checked"<!-- ENDIF --> /></dd>
+	</dl>
 	<input type="hidden" name="ko_league" value="1" />
 	</fieldset>
 

adm/style/acp_football_results.html

@@ -1,223 +1,223 @@
-<!-- INCLUDECSS css/football_acp.css -->
-<!-- INCLUDE overall_header.html -->
-
-<a id="maincontent"></a>
-	<!-- IF U_FOOTBALL --><a href="{U_FOOTBALL}" style="float: {S_CONTENT_FLOW_END};">&laquo; {L_PREDICTION_LEAGUE}</a><!-- ENDIF -->
-	<h1>{L_ACP_FOOTBALL_RESULTS_MANAGE}</h1>
-	<p>{L_ACP_FOOTBALL_RESULTS_MANAGE_EXPLAIN}</p>
-
-	<h1 style="display:inline;">{L_SELECT_MATCHDAY}:</h1>
-	<form style="display:inline;" method="post" action="{U_ACTION}">
-	<div style="display:inline; margin:0; padding:0;">
-		<select name="s" id="match_season" onchange="this.form.submit();">{S_SEASON_OPTIONS}</select>
-		{S_FORM_TOKEN}
-	</div>
-	</form>
-	<form style="display:inline;" method="post" action="{U_ACTION}">
-	<div style="display:inline; margin:0; padding:0;">
-		<input type="hidden" name="s" value="{S_SEASON}" />
-		<select name="l" id="match_league" onchange="this.form.submit();">{S_LEAGUE_OPTIONS}</select>
-		{S_FORM_TOKEN}
-	</div>
-	</form>
-	<form style="display:inline;" method="post" action="{U_ACTION}">
-	<div style="display:inline; margin:0; padding:0;">
-		<input type="hidden" name="s" value="{S_SEASON}" />
-		<input type="hidden" name="l" value="{S_LEAGUE}" />
-		<select name="m" id="match_matchday" onchange="this.form.submit();">{S_MATCHDAY_OPTIONS}</select>
-		{S_FORM_TOKEN}
-	</div>
-	</form>
-
-	<!-- IF S_SUCCESS -->
-		<div class="successbox">
-			<h3>{L_ADVICE}</h3>
-			<p>{SUCCESS_MSG}</p>
-		</div>
-	<!-- ENDIF -->
-
-	<form id="list" method="post" action="{U_ACTION}">
-	<fieldset>
-		<legend>{S_LEGEND}</legend>
-		<p class="small" style="margin:0px">{S_TIME}</p>
-		<input type="hidden" name="s" value="{S_SEASON}" style="display:inline" />
-		<input type="hidden" name="l" value="{S_LEAGUE}" style="display:inline" />
-		<input type="hidden" name="m" value="{S_MATCHDAY}" style="display:inline" />
-		<p class="small" style="text-align:right;margin-bottom:0px">
-			<a href="#" onclick="marklist('list', 'delete_', true); return false;">{L_MARK_ALL}</a> &bull; 
-			<a href="#" onclick="marklist('list', 'delete_', false); return false;">{L_UNMARK_ALL}</a>
-		</p>		
-	<table class="type_f">
-	<thead>
-	<tr>
-		<th title="{L_SELECT_EXPLAIN}" style="text-align:center">{L_SELECT}</th>
-		<th>{L_MATCH_BEGIN}</th>
-		<th colspan="3" style="text-align:center">{L_VS}</th>
-		<th title="{L_RESULT_EXPLAIN}" colspan="3" style="text-align:center">{L_RESULT} ({RESULT_EXPLAIN})</th>
-	<!-- IF S_KO_MATCHDAY -->
-		<th title="{L_OVERTIME_EXPLAIN}" colspan="3" style="text-align:center">{LABEL_FINALRESULT}</th>
-	<!-- ENDIF -->
-		<th title="{L_MATCH_STATUS_TITLE}" style="text-align:center">{L_STATUS} </th>
-		<th title="{L_NO_VALUATION_EXPLAIN}" style="text-align:center">{L_NO_VALUATION}</th>
-		<th title="{L_DELETE_EXPLAIN}" style="text-align:center">{L_DELETE}</th>
-	</tr>
-	</thead>
-	<tbody>
-	<!-- IF .match -->
-		<!-- BEGIN match -->
-			<tr class="{match.ROW_CLASS}">
-				<td style="text-align:center">
-				<!-- IF match.EDIT -->
-					<input name="select_{match.NUMBER}" id="select_{match.NUMBER}" type="checkbox" 
-						class="radio" <!-- IF match.SELECT_CHECKED --> checked="checked"<!-- ENDIF --> />
-				<!-- ELSE -->
-					&nbsp;
-				<!-- ENDIF -->
-				</td>
-				<td> {match.BEGIN}</td>
-				<td>{match.HOME_NAME}</td>
-				<td>:</td>
-				<td style="text-align:left">{match.GUEST_NAME}</td>
-				<td style="text-align:right">
-				<!-- IF match.EDIT -->
-					<input name="goals_home_{match.NUMBER}" style="margin:0; width:30px;" 
-						type="number" min="0" max="20" size="2" value="{match.GOALS_HOME}" 
-						onchange="document.getElementById('select_{match.NUMBER}').checked = true;" />
-				<!-- ELSE -->	
-					{match.GOALS_HOME}	
-				<!-- ENDIF -->
-				</td>
-				<td style="text-align:center;width:3px;">:</td>
-				<td style="text-align:left">
-				<!-- IF match.EDIT -->
-					<input name="goals_guest_{match.NUMBER}" style="margin:0; width:30px;" 
-						type="number" min="0" max="20" size="2" value="{match.GOALS_GUEST}" 
-						onchange="document.getElementById('select_{match.NUMBER}').checked = true;" />
-				<!-- ELSE -->
-					{match.GOALS_GUEST}
-				<!-- ENDIF -->
-				</td>
-
-			<!-- IF S_KO_MATCHDAY -->
-				<td style="text-align:right">
-				<!-- IF match.KO_MATCH -->
-					<!-- IF match.EDIT -->
-					<input name="overtime_home_{match.NUMBER}" style="margin:0; width:30px;" 
-						type="number" min="0" max="20" size="2" value="{match.OVERTIME_HOME}" 
-						onchange="document.getElementById('select_{match.NUMBER}').checked = true;" />
-					<!-- ELSE -->
-						{match.OVERTIME_HOME}
-					<!-- ENDIF -->
-				<!-- ENDIF -->
-				</td>
-				<td style="text-align:center; width:3px;">:</td>
-				<td style="text-align:left">
-				<!-- IF match.KO_MATCH -->
-					<!-- IF match.EDIT -->
-					<input name="overtime_guest_{match.NUMBER}" style="margin:0; width:30px;" 
-						type="number" min="0" max="20" size="2" value="{match.OVERTIME_GUEST}" 
-						onchange="document.getElementById('select_{match.NUMBER}').checked = true;" />
-					<!-- ELSE -->
-						{match.OVERTIME_GUEST}
-					<!-- ENDIF -->
-				<!-- ENDIF -->
-				</td>
-			<!-- ENDIF -->
-				<td style="text-align:center"><input type="hidden" name="status" value="{match.STATUS}" />{match.STATUS_COLOR}</td>
-				<td style="text-align:center">
-					<input name="no_valuation_{match.NUMBER}" type="checkbox" class="radio" 
-						<!-- IF match.NO_VALUATION_CHECKED --> checked="checked"<!-- ENDIF --> 
-						 onchange="document.getElementById('select_{match.NUMBER}').checked = true;" />
-				</td>
-				<td style="text-align:center">
-					<input name="delete_{match.NUMBER}" type="checkbox" class="radio" 
-						onchange="document.getElementById('select_{match.NUMBER}').checked = true;" />
-				</td>
-			</tr>
-		<!-- END match -->
-	</tbody>
-	</table>
-	<p class="small">
-		<a href="#" onclick="marklist('list', 'select_', true); return false;">{L_MARK_ALL}</a> &bull; 
-		<a href="#" onclick="marklist('list', 'select_', false); return false;">{L_UNMARK_ALL}</a>
-	</p>
-	
-	<!-- IF S_EXTRA_RESULTS --> 
-	<br />
-	<table class="type_f">
-		<thead>
-			<tr>
-				<th style="text-align:center">{L_SELECT}</th>
-				<th style="text-align: left;">{L_QUESTION}</th>
-				<th>{L_POSSIBLE_POINTS}</th>
-				<th>{L_EVALUATION}</th>
-				<th>{L_RESULT}</th>
-				<th>{L_STATUS} </th>
-			</tr>
-		</thead>
-		<tbody>
-		<!-- BEGIN extra_result -->
-			<tr class="{extra_result.ROW_CLASS}">
-				<td style="text-align:center">
-				<!-- IF extra_result.S_EDIT_EXTRA -->
-					<input name="select{extra_result.EXTRA_NO}" id="select{extra_result.EXTRA_NO}" type="checkbox" class="radio" />
-				<!-- ELSE -->
-					&nbsp;
-				<!-- ENDIF -->
-				</td>
-				<td>{extra_result.QUESTION}</td>
-				<td style="text-align: center;">{extra_result.EXTRA_POINTS}</td>
-				<td style="text-align: center;" title="{extra_result.EVALUATION_TITLE}">{extra_result.EVALUATION}</td>
-				<td style="text-align: center;">
-			<!-- IF extra_result.S_EDIT_EXTRA -->
-				<!-- IF extra_result.S_DISPLAY_TYPE == 1 -->
-					<!-- IF S_VIEW <> 'print' -->
-					<select {extra_result.S_MULTIPLE} name="extra{extra_result.EXTRA_NO}{extra_result.S_MULTIPLE_ARR}" 
-						onchange="document.getElementById('select{extra_result.EXTRA_NO}').checked = true;">
-						<!-- BEGIN extra_option -->
-						<option {extra_result.extra_option.S_SELECTED} value="{extra_result.extra_option.OPTION_VALUE}">{extra_result.extra_option.OPTION_NAME}</option>
-						<!-- END extra_option -->
-					</select>
-					<!-- ELSE -->
-					_{extra_result.RESULT}_
-					<!-- ENDIF -->
-				<!-- ENDIF -->
-				<!-- IF extra_result.S_DISPLAY_TYPE == 2 -->
-					<!-- IF S_VIEW <> 'print' -->
-					<input style="display:inline; margin:0; padding:0;" type="text" name="extra{extra_result.EXTRA_NO}" size="15" maxlength="255" 
-						value="{extra_result.RESULT}" onchange="document.getElementById('select{extra_result.EXTRA_NO}').checked = true;"> 
-					<!-- ELSE -->
-					_{extra_result.RESULT}_
-					<!-- ENDIF -->
-				<!-- ENDIF -->
-			<!-- ELSE -->
-					{extra_result.RESULT}
-			<!-- ENDIF -->
-				</td>
-				<td style="text-align:center"><input type="hidden" name="status" value="{extra_result.STATUS}" />{extra_result.STATUS_COLOR}</td>
-			</tr>
-		<!-- END extra_result -->
-		</tbody>
-	</table>
-	<!-- ENDIF -->
-	<!-- IF S_CASH_POINTS -->{L_CASH_POINTS} <input name="cash" type="checkbox" class="radio" <!-- IF S_CASH -->checked="checked"<!-- ENDIF --> /> <!-- ENDIF -->
-
-	</fieldset>
-	<fieldset class="submit-buttons">
-		<legend>{L_SUBMIT}</legend>
-		<input class="button1" type="submit" id="submit" name="edit" value="{L_SAVE}" />&nbsp;
-		<input class="button2" type="reset" id="reset" name="reset" value="{L_RESET}" />
-		{S_FORM_TOKEN}
-	</fieldset>
-	</form>
-	<!-- ELSE -->
-			<tr>
-				<td colspan="14" class="row3">{L_NO_MATCHES}</td>
-			</tr>
-	</tbody>
-	</table>
-	<!-- ENDIF -->
-<br />
-<div style="text-align: center;">phpBB Extension - Football Prediction League - Version {S_VERSION_NO} &copy; 2016 <a href="http://football.bplaced.net">football</a></div>
-<!-- INCLUDE frame_results.html -->
+<!-- INCLUDECSS css/football_acp.css -->
+<!-- INCLUDE overall_header.html -->
+
+<a id="maincontent"></a>
+	<!-- IF U_FOOTBALL --><a href="{U_FOOTBALL}" style="float: {S_CONTENT_FLOW_END};">&laquo; {L_PREDICTION_LEAGUE}</a><!-- ENDIF -->
+	<h1>{L_ACP_FOOTBALL_RESULTS_MANAGE}</h1>
+	<p>{L_ACP_FOOTBALL_RESULTS_MANAGE_EXPLAIN}</p>
+
+	<h1 style="display:inline;">{L_SELECT_MATCHDAY}:</h1>
+	<form style="display:inline;" method="post" action="{U_ACTION}">
+	<div style="display:inline; margin:0; padding:0;">
+		<select name="s" id="match_season" onchange="this.form.submit();">{S_SEASON_OPTIONS}</select>
+		{S_FORM_TOKEN}
+	</div>
+	</form>
+	<form style="display:inline;" method="post" action="{U_ACTION}">
+	<div style="display:inline; margin:0; padding:0;">
+		<input type="hidden" name="s" value="{S_SEASON}" />
+		<select name="l" id="match_league" onchange="this.form.submit();">{S_LEAGUE_OPTIONS}</select>
+		{S_FORM_TOKEN}
+	</div>
+	</form>
+	<form style="display:inline;" method="post" action="{U_ACTION}">
+	<div style="display:inline; margin:0; padding:0;">
+		<input type="hidden" name="s" value="{S_SEASON}" />
+		<input type="hidden" name="l" value="{S_LEAGUE}" />
+		<select name="m" id="match_matchday" onchange="this.form.submit();">{S_MATCHDAY_OPTIONS}</select>
+		{S_FORM_TOKEN}
+	</div>
+	</form>
+
+	<!-- IF S_SUCCESS -->
+		<div class="successbox">
+			<h3>{L_ADVICE}</h3>
+			<p>{SUCCESS_MSG}</p>
+		</div>
+	<!-- ENDIF -->
+
+	<form id="list" method="post" action="{U_ACTION}">
+	<fieldset>
+		<legend>{S_LEGEND}</legend>
+		<p class="small" style="margin:0px">{S_TIME}</p>
+		<input type="hidden" name="s" value="{S_SEASON}" style="display:inline" />
+		<input type="hidden" name="l" value="{S_LEAGUE}" style="display:inline" />
+		<input type="hidden" name="m" value="{S_MATCHDAY}" style="display:inline" />
+		<p class="small" style="text-align:right;margin-bottom:0px">
+			<a href="#" onclick="marklist('list', 'delete_', true); return false;">{L_MARK_ALL}</a> &bull; 
+			<a href="#" onclick="marklist('list', 'delete_', false); return false;">{L_UNMARK_ALL}</a>
+		</p>		
+	<table class="type_f">
+	<thead>
+	<tr>
+		<th title="{L_SELECT_EXPLAIN}" style="text-align:center">{L_SELECT}</th>
+		<th>{L_MATCH_BEGIN}</th>
+		<th colspan="3" style="text-align:center">{L_VS}</th>
+		<th title="{L_RESULT_EXPLAIN}" colspan="3" style="text-align:center">{L_RESULT} ({RESULT_EXPLAIN})</th>
+	<!-- IF S_KO_MATCHDAY -->
+		<th title="{L_OVERTIME_EXPLAIN}" colspan="3" style="text-align:center">{LABEL_FINALRESULT}</th>
+	<!-- ENDIF -->
+		<th title="{L_MATCH_STATUS_TITLE}" style="text-align:center">{L_STATUS} </th>
+		<th title="{L_NO_VALUATION_EXPLAIN}" style="text-align:center">{L_NO_VALUATION}</th>
+		<th title="{L_DELETE_EXPLAIN}" style="text-align:center">{L_DELETE}</th>
+	</tr>
+	</thead>
+	<tbody>
+	<!-- IF .match -->
+		<!-- BEGIN match -->
+			<tr class="{match.ROW_CLASS}">
+				<td style="text-align:center">
+				<!-- IF match.EDIT -->
+					<input name="select_{match.NUMBER}" id="select_{match.NUMBER}" type="checkbox" 
+						class="radio" <!-- IF match.SELECT_CHECKED --> checked="checked"<!-- ENDIF --> />
+				<!-- ELSE -->
+					&nbsp;
+				<!-- ENDIF -->
+				</td>
+				<td> {match.BEGIN}</td>
+				<td>{match.HOME_NAME}</td>
+				<td>:</td>
+				<td style="text-align:left">{match.GUEST_NAME}</td>
+				<td style="text-align:right">
+				<!-- IF match.EDIT -->
+					<input name="goals_home_{match.NUMBER}" style="margin:0; width:30px;" 
+						type="number" min="0" max="20" size="2" value="{match.GOALS_HOME}" 
+						onchange="document.getElementById('select_{match.NUMBER}').checked = true;" />
+				<!-- ELSE -->	
+					{match.GOALS_HOME}	
+				<!-- ENDIF -->
+				</td>
+				<td style="text-align:center;width:3px;">:</td>
+				<td style="text-align:left">
+				<!-- IF match.EDIT -->
+					<input name="goals_guest_{match.NUMBER}" style="margin:0; width:30px;" 
+						type="number" min="0" max="20" size="2" value="{match.GOALS_GUEST}" 
+						onchange="document.getElementById('select_{match.NUMBER}').checked = true;" />
+				<!-- ELSE -->
+					{match.GOALS_GUEST}
+				<!-- ENDIF -->
+				</td>
+
+			<!-- IF S_KO_MATCHDAY -->
+				<td style="text-align:right">
+				<!-- IF match.KO_MATCH -->
+					<!-- IF match.EDIT -->
+					<input name="overtime_home_{match.NUMBER}" style="margin:0; width:30px;" 
+						type="number" min="0" max="20" size="2" value="{match.OVERTIME_HOME}" 
+						onchange="document.getElementById('select_{match.NUMBER}').checked = true;" />
+					<!-- ELSE -->
+						{match.OVERTIME_HOME}
+					<!-- ENDIF -->
+				<!-- ENDIF -->
+				</td>
+				<td style="text-align:center; width:3px;">:</td>
+				<td style="text-align:left">
+				<!-- IF match.KO_MATCH -->
+					<!-- IF match.EDIT -->
+					<input name="overtime_guest_{match.NUMBER}" style="margin:0; width:30px;" 
+						type="number" min="0" max="20" size="2" value="{match.OVERTIME_GUEST}" 
+						onchange="document.getElementById('select_{match.NUMBER}').checked = true;" />
+					<!-- ELSE -->
+						{match.OVERTIME_GUEST}
+					<!-- ENDIF -->
+				<!-- ENDIF -->
+				</td>
+			<!-- ENDIF -->
+				<td style="text-align:center"><input type="hidden" name="status" value="{match.STATUS}" />{match.STATUS_COLOR}</td>
+				<td style="text-align:center">
+					<input name="no_valuation_{match.NUMBER}" type="checkbox" class="radio" 
+						<!-- IF match.NO_VALUATION_CHECKED --> checked="checked"<!-- ENDIF --> 
+						 onchange="document.getElementById('select_{match.NUMBER}').checked = true;" />
+				</td>
+				<td style="text-align:center">
+					<input name="delete_{match.NUMBER}" type="checkbox" class="radio" 
+						onchange="document.getElementById('select_{match.NUMBER}').checked = true;" />
+				</td>
+			</tr>
+		<!-- END match -->
+	</tbody>
+	</table>
+	<p class="small">
+		<a href="#" onclick="marklist('list', 'select_', true); return false;">{L_MARK_ALL}</a> &bull; 
+		<a href="#" onclick="marklist('list', 'select_', false); return false;">{L_UNMARK_ALL}</a>
+	</p>
+	
+	<!-- IF S_EXTRA_RESULTS --> 
+	<br />
+	<table class="type_f">
+		<thead>
+			<tr>
+				<th style="text-align:center">{L_SELECT}</th>
+				<th style="text-align: left;">{L_QUESTION}</th>
+				<th>{L_POSSIBLE_POINTS}</th>
+				<th>{L_EVALUATION}</th>
+				<th>{L_RESULT}</th>
+				<th>{L_STATUS} </th>
+			</tr>
+		</thead>
+		<tbody>
+		<!-- BEGIN extra_result -->
+			<tr class="{extra_result.ROW_CLASS}">
+				<td style="text-align:center">
+				<!-- IF extra_result.S_EDIT_EXTRA -->
+					<input name="select{extra_result.EXTRA_NO}" id="select{extra_result.EXTRA_NO}" type="checkbox" class="radio" />
+				<!-- ELSE -->
+					&nbsp;
+				<!-- ENDIF -->
+				</td>
+				<td>{extra_result.QUESTION}</td>
+				<td style="text-align: center;">{extra_result.EXTRA_POINTS}</td>
+				<td style="text-align: center;" title="{extra_result.EVALUATION_TITLE}">{extra_result.EVALUATION}</td>
+				<td style="text-align: center;">
+			<!-- IF extra_result.S_EDIT_EXTRA -->
+				<!-- IF extra_result.S_DISPLAY_TYPE == 1 -->
+					<!-- IF S_VIEW <> 'print' -->
+					<select {extra_result.S_MULTIPLE} name="extra{extra_result.EXTRA_NO}{extra_result.S_MULTIPLE_ARR}" 
+						onchange="document.getElementById('select{extra_result.EXTRA_NO}').checked = true;">
+						<!-- BEGIN extra_option -->
+						<option {extra_result.extra_option.S_SELECTED} value="{extra_result.extra_option.OPTION_VALUE}">{extra_result.extra_option.OPTION_NAME}</option>
+						<!-- END extra_option -->
+					</select>
+					<!-- ELSE -->
+					_{extra_result.RESULT}_
+					<!-- ENDIF -->
+				<!-- ENDIF -->
+				<!-- IF extra_result.S_DISPLAY_TYPE == 2 -->
+					<!-- IF S_VIEW <> 'print' -->
+					<input style="display:inline; margin:0; padding:0;" type="text" name="extra{extra_result.EXTRA_NO}" size="15" maxlength="255" 
+						value="{extra_result.RESULT}" onchange="document.getElementById('select{extra_result.EXTRA_NO}').checked = true;"> 
+					<!-- ELSE -->
+					_{extra_result.RESULT}_
+					<!-- ENDIF -->
+				<!-- ENDIF -->
+			<!-- ELSE -->
+					{extra_result.RESULT}
+			<!-- ENDIF -->
+				</td>
+				<td style="text-align:center"><input type="hidden" name="status" value="{extra_result.STATUS}" />{extra_result.STATUS_COLOR}</td>
+			</tr>
+		<!-- END extra_result -->
+		</tbody>
+	</table>
+	<!-- ENDIF -->
+	<!-- IF S_CASH_POINTS -->{L_CASH_POINTS} <input name="cash" type="checkbox" class="radio" <!-- IF S_CASH -->checked="checked"<!-- ENDIF --> /> <!-- ENDIF -->
+
+	</fieldset>
+	<fieldset class="submit-buttons">
+		<legend>{L_SUBMIT}</legend>
+		<input class="button1" type="submit" id="submit" name="edit" value="{L_SAVE}" />&nbsp;
+		<input class="button2" type="reset" id="reset" name="reset" value="{L_RESET}" />
+		{S_FORM_TOKEN}
+	</fieldset>
+	</form>
+	<!-- ELSE -->
+			<tr>
+				<td colspan="14" class="row3">{L_NO_MATCHES}</td>
+			</tr>
+	</tbody>
+	</table>
+	<!-- ENDIF -->
+<br />
+<div style="text-align: center;">phpBB Extension - Football Prediction League - Version {S_VERSION_NO} &copy; 2016 <a href="http://football.bplaced.net">football</a></div>
+<!-- INCLUDE frame_results.html -->
 <!-- INCLUDE overall_footer.html -->

adm/style/acp_football_seasons.html

@@ -1,105 +1,105 @@
-<!-- INCLUDECSS css/football_acp.css -->
-<!-- INCLUDE overall_header.html -->
-
-<a id="maincontent"></a>
-<!-- IF S_EDIT -->
-	<a href="{U_BACK}" style="float: {S_CONTENT_FLOW_END};">&laquo; {L_BACK}</a>
-	<h1>{L_ACP_FOOTBALL_SEASONS_MANAGE}</h1>
-	<p>{L_SEASON_EDIT_EXPLAIN}</p>
-
-	<!-- IF S_ERROR -->
-		<div class="errorbox">
-			<h3>{L_WARNING}</h3>
-			<p>{ERROR_MSG}</p>
-		</div>
-	<!-- ENDIF -->
-
-	<form id="settings" method="post" action="{U_ACTION}">
-
-	<fieldset>
-		<legend>{L_SEASON_DETAILS}</legend>
-	<dl>
-		<dt><label for="season">{L_SEASON}:</label></dt>
-		<dd><!-- IF not S_ADD_SEASON --><strong>{SEASON}</strong><!-- ENDIF -->
-			<input name="s" type="<!-- IF S_ADD_SEASON -->text<!-- ELSE -->hidden<!-- ENDIF -->" id="season" value="{SEASON}" size="4" maxlength="4"  /></dd>
-	</dl>
-	<dl>
-		<dt><label for="season_name">{L_SEASON_NAME}:</label><br /><span>{L_SEASON_NAME_EXPLAIN}</span></dt>
-		<dd><input name="season_name" type="text" id="season_name" value="{SEASON_NAME}" size="20" maxlength="20" /></dd>
-	</dl>
-	<dl>
-		<dt><label for="season_short">{L_SEASON_SHORT}:</label><br /><span>{L_SEASON_SHORT_EXPLAIN}</span></dt>
-		<dd><input name="season_short" type="text" id="season_short" value="{SEASON_SHORT}" size="10" maxlength="10" /></dd>
-	</dl>
-	</fieldset>
-
-	<fieldset class="submit-buttons">
-		<legend>{L_SUBMIT}</legend>
-		<input class="button1" type="submit" id="submit" name="update" value="{L_SUBMIT}" />&nbsp;
-		<input class="button2" type="reset" id="reset" name="reset" value="{L_RESET}" />
-	<!-- IF S_ADD_SEASON -->
-		<input type="hidden" name="add" value="1" />
-	<!-- ENDIF -->
-		<input type="hidden" name="edit" value="1" />
-		{S_FORM_TOKEN}
-	</fieldset>
-	</form>
-
-<!-- ELSE -->
-	<!-- IF U_FOOTBALL --><a href="{U_FOOTBALL}" style="float: {S_CONTENT_FLOW_END};">&laquo; {L_PREDICTION_LEAGUE}</a><!-- ENDIF -->
-	<h1>{L_ACP_FOOTBALL_SEASONS_MANAGE}</h1>
-	<p>{L_ACP_FOOTBALL_SEASONS_MANAGE_EXPLAIN}</p>
-
-	<!-- IF S_ERROR -->
-		<div class="errorbox">
-			<h3>{L_WARNING}</h3>
-			<p>{ERROR_MSG}</p>
-		</div>
-	<!-- ENDIF -->
-
-	<form id="acp_football_seasons" method="post" action="{U_ACTION}">
-	<fieldset class="quick">
-		<!-- IF S_SEASON_ADD -->
-			{L_CREATE_SEASON}: <input type="text" name="s" value="" /> <input class="button2" type="submit" name="submit" value="{L_SUBMIT}" />
-			<input type="hidden" name="add" value="1" />
-		<!-- ENDIF -->
-		{S_FORM_TOKEN}
-	</fieldset>
-	</form>
-	<h1>{L_SEASON_DEF}</h1>
-
-	<p>{L_SEASON_DEF_EXPLAIN}</p>
-	<table class="type_f">
-	<thead>
-	<tr>
-		<th>{L_SEASON}</th>
-		<th style="width: 35%">{L_SEASON_NAME}</th>
-		<th>{L_SEASON_SHORT}</th>
-		<th>{L_LEAGUES}</th>
-		<th>{L_OPTIONS}</th>
-		<th>{L_ACTION}</th>
-	</tr>
-	</thead>
-	<tbody>
-	<!-- IF .seasons -->
-		<!-- BEGIN seasons -->
-			<tr class="{seasons.ROW_CLASS}">
-				<td style="text-align: center;"><strong>{seasons.SEASON}</strong></td>
-				<td>{seasons.SEASON_NAME}</td>
-				<td>{seasons.SEASON_SHORT}</td>
-				<td style="text-align: center;">{seasons.LEAGUES}</td>
-				<td style="text-align: center;"><a href="{seasons.U_EDIT}">{L_SETTINGS}</a></td>
-				<td style="text-align: center;"><!-- IF seasons.U_DELETE --><a href="{seasons.U_DELETE}">{L_DELETE}</a><!-- ELSE -->{L_DELETE}<!-- ENDIF --></td>
-			</tr>
-		<!-- END seasons -->
-	<!-- ELSE -->
-			<tr>
-				<td colspan="4" class="row3">{L_NO_SEASONS_CREATED}</td>
-			</tr>
-	<!-- ENDIF -->
-	</tbody>
-	</table>
-<!-- ENDIF -->
-<br />
-<div style="text-align: center;">phpBB Extension - Football Prediction League - Version {S_VERSION_NO} &copy; 2016 <a href="http://football.bplaced.net">football</a></div>
+<!-- INCLUDECSS css/football_acp.css -->
+<!-- INCLUDE overall_header.html -->
+
+<a id="maincontent"></a>
+<!-- IF S_EDIT -->
+	<a href="{U_BACK}" style="float: {S_CONTENT_FLOW_END};">&laquo; {L_BACK}</a>
+	<h1>{L_ACP_FOOTBALL_SEASONS_MANAGE}</h1>
+	<p>{L_SEASON_EDIT_EXPLAIN}</p>
+
+	<!-- IF S_ERROR -->
+		<div class="errorbox">
+			<h3>{L_WARNING}</h3>
+			<p>{ERROR_MSG}</p>
+		</div>
+	<!-- ENDIF -->
+
+	<form id="settings" method="post" action="{U_ACTION}">
+
+	<fieldset>
+		<legend>{L_SEASON_DETAILS}</legend>
+	<dl>
+		<dt><label for="season">{L_SEASON}:</label></dt>
+		<dd><!-- IF not S_ADD_SEASON --><strong>{SEASON}</strong><!-- ENDIF -->
+			<input name="s" type="<!-- IF S_ADD_SEASON -->text<!-- ELSE -->hidden<!-- ENDIF -->" id="season" value="{SEASON}" size="4" maxlength="4"  /></dd>
+	</dl>
+	<dl>
+		<dt><label for="season_name">{L_SEASON_NAME}:</label><br /><span>{L_SEASON_NAME_EXPLAIN}</span></dt>
+		<dd><input name="season_name" type="text" id="season_name" value="{SEASON_NAME}" size="20" maxlength="20" /></dd>
+	</dl>
+	<dl>
+		<dt><label for="season_short">{L_SEASON_SHORT}:</label><br /><span>{L_SEASON_SHORT_EXPLAIN}</span></dt>
+		<dd><input name="season_short" type="text" id="season_short" value="{SEASON_SHORT}" size="10" maxlength="10" /></dd>
+	</dl>
+	</fieldset>
+
+	<fieldset class="submit-buttons">
+		<legend>{L_SUBMIT}</legend>
+		<input class="button1" type="submit" id="submit" name="update" value="{L_SUBMIT}" />&nbsp;
+		<input class="button2" type="reset" id="reset" name="reset" value="{L_RESET}" />
+	<!-- IF S_ADD_SEASON -->
+		<input type="hidden" name="add" value="1" />
+	<!-- ENDIF -->
+		<input type="hidden" name="edit" value="1" />
+		{S_FORM_TOKEN}
+	</fieldset>
+	</form>
+
+<!-- ELSE -->
+	<!-- IF U_FOOTBALL --><a href="{U_FOOTBALL}" style="float: {S_CONTENT_FLOW_END};">&laquo; {L_PREDICTION_LEAGUE}</a><!-- ENDIF -->
+	<h1>{L_ACP_FOOTBALL_SEASONS_MANAGE}</h1>
+	<p>{L_ACP_FOOTBALL_SEASONS_MANAGE_EXPLAIN}</p>
+
+	<!-- IF S_ERROR -->
+		<div class="errorbox">
+			<h3>{L_WARNING}</h3>
+			<p>{ERROR_MSG}</p>
+		</div>
+	<!-- ENDIF -->
+
+	<form id="acp_football_seasons" method="post" action="{U_ACTION}">
+	<fieldset class="quick">
+		<!-- IF S_SEASON_ADD -->
+			{L_CREATE_SEASON}: <input type="text" name="s" value="" /> <input class="button2" type="submit" name="submit" value="{L_SUBMIT}" />
+			<input type="hidden" name="add" value="1" />
+		<!-- ENDIF -->
+		{S_FORM_TOKEN}
+	</fieldset>
+	</form>
+	<h1>{L_SEASON_DEF}</h1>
+
+	<p>{L_SEASON_DEF_EXPLAIN}</p>
+	<table class="type_f">
+	<thead>
+	<tr>
+		<th>{L_SEASON}</th>
+		<th style="width: 35%">{L_SEASON_NAME}</th>
+		<th>{L_SEASON_SHORT}</th>
+		<th>{L_LEAGUES}</th>
+		<th>{L_OPTIONS}</th>
+		<th>{L_ACTION}</th>
+	</tr>
+	</thead>
+	<tbody>
+	<!-- IF .seasons -->
+		<!-- BEGIN seasons -->
+			<tr class="{seasons.ROW_CLASS}">
+				<td style="text-align: center;"><strong>{seasons.SEASON}</strong></td>
+				<td>{seasons.SEASON_NAME}</td>
+				<td>{seasons.SEASON_SHORT}</td>
+				<td style="text-align: center;">{seasons.LEAGUES}</td>
+				<td style="text-align: center;"><a href="{seasons.U_EDIT}">{L_SETTINGS}</a></td>
+				<td style="text-align: center;"><!-- IF seasons.U_DELETE --><a href="{seasons.U_DELETE}">{L_DELETE}</a><!-- ELSE -->{L_DELETE}<!-- ENDIF --></td>
+			</tr>
+		<!-- END seasons -->
+	<!-- ELSE -->
+			<tr>
+				<td colspan="4" class="row3">{L_NO_SEASONS_CREATED}</td>
+			</tr>
+	<!-- ENDIF -->
+	</tbody>
+	</table>
+<!-- ENDIF -->
+<br />
+<div style="text-align: center;">phpBB Extension - Football Prediction League - Version {S_VERSION_NO} &copy; 2016 <a href="http://football.bplaced.net">football</a></div>
 <!-- INCLUDE overall_footer.html -->

adm/style/acp_football_teams.html

@@ -1,164 +1,164 @@
-<!-- INCLUDECSS css/football_acp.css -->
-<!-- INCLUDE overall_header.html -->
-
-<a id="maincontent"></a>
-<!-- IF S_EDIT -->
-	<a href="{U_BACK}" style="float: {S_CONTENT_FLOW_END};">&laquo; {L_BACK}</a>
-	<h1>{L_ACP_FOOTBALL_TEAMS_MANAGE}</h1>
-	<p>{L_TEAM_EDIT_EXPLAIN}</p>
-
-	<!-- IF S_ERROR -->
-		<div class="errorbox">
-			<h3>{L_WARNING}</h3>
-			<p>{ERROR_MSG}</p>
-		</div>
-	<!-- ENDIF -->
-
-	<form id="settings" method="post" action="{U_ACTION}">
-
-	<fieldset>
-		<legend>{L_TEAM_DETAILS}</legend>
-	<dl>
-		<dt><label for="team">{L_SEASON}:</label></dt>
-		<dd><strong>{SEASON_NAME}</strong><input name="s" type="hidden" id="season" value="{SEASON}" /></dd>
-	</dl>
-	<dl>
-		<dt><label for="team">{L_LEAGUE}:</label></dt>
-		<dd><strong>{LEAGUE_NAME}</strong><input name="l" type="hidden" id="league" value="{LEAGUE}" /></dd>
-	</dl>
-	<dl>
-		<dt><label for="team">{L_TEAM}:</label></dt>
-		<dd><!-- IF not S_ADD_TEAM --><strong>{TEAM}</strong><!-- ENDIF -->
-			<input name="t" type="<!-- IF S_ADD_TEAM -->text<!-- ELSE -->hidden<!-- ENDIF -->" id="team" value="{TEAM}" /></dd>
-	</dl>
-	<dl>
-		<dt><label for="team_name">{L_TEAM_NAME}:</label></dt>
-		<dd><input name="team_name" type="text" id="team_name" size="30" maxlength="30" value="{TEAM_NAME}" /></dd>
-	</dl>
-	<dl>
-		<dt><label for="team_short">{L_TEAM_SHORT}:</label><br /><span>{L_TEAM_SHORT_EXPLAIN}</span></dt>
-		<dd><input name="team_short" type="text" id="team_short" size="10" maxlength="10" value="{TEAM_SHORT}" /></dd>
-	</dl>
-	<dl>
-		<dt><label for="team_symbol">{L_TEAM_SYMBOL}:</label><br /><span>{L_TEAM_SYMBOL_EXPLAIN}</span></dt>
-		<dd><span>
-			<select style="vertical-align:top;" name="team_symbol" id="team_symbol" 
-					onchange="document.getElementById('teamsymbol').src = '{PHPBB_ROOT_PATH}images/flags/' + this.value;">
-				{TEAM_SYMBOL_OPTIONS}
-			</select>&nbsp;&nbsp;&nbsp;<img src="{TEAM_IMAGE}" id="teamsymbol" alt="{TEAM_NAME}" title="{TEAM_NAME}" /></span></dd>
-	</dl>
-	<!-- IF S_KO_LEAGUE -->
-	<dl>
-		<dt><label for="team_group">{L_TEAM_GROUP}:</label><br /><span>{L_TEAM_GROUP_EXPLAIN}</span></dt>
-		<dd><input name="team_group" type="text" id="team_group" size="1" maxlength="1" value="{TEAM_GROUP}" /></dd>
-	</dl>
-	<dl>
-		<dt><label for="team_round">{L_TEAM_ROUND}:</label><br /><span>{L_TEAM_ROUND_EXPLAIN}</span></dt>
-		<dd><select name="team_round" id="team_round">{TEAM_MATCHDAY_OPTIONS}</select></dd>
-	</dl>
-	<input type="hidden" name="ko_league" value="1" />
-	<!-- ENDIF -->
-	</fieldset>
-
-	<fieldset class="submit-buttons">
-		<legend>{L_SUBMIT}</legend>
-		<input class="button1" type="submit" id="submit" name="update" value="{L_SUBMIT}" />&nbsp;
-		<input class="button2" type="reset" id="reset" name="reset" value="{L_RESET}" />
-	<!-- IF S_ADD_TEAM -->
-		<input type="hidden" name="add" value="1" />
-	<!-- ENDIF -->
-		<input type="hidden" name="edit" value="1" />
-		{S_FORM_TOKEN}
-	</fieldset>
-	</form>
-
-<!-- ELSE -->
-	<!-- IF U_FOOTBALL --><a href="{U_FOOTBALL}" style="float: {S_CONTENT_FLOW_END};">&laquo; {L_PREDICTION_LEAGUE}</a><!-- ENDIF -->
-	<h1>{L_ACP_FOOTBALL_TEAMS_MANAGE}</h1>
-	<p>{L_ACP_FOOTBALL_TEAMS_MANAGE_EXPLAIN}</p>
-
-	<!-- IF S_ERROR -->
-		<div class="errorbox">
-			<h3>{L_WARNING}</h3>
-			<p>{ERROR_MSG}</p>
-		</div>
-	<!-- ENDIF -->
-
-	<h1 style="display:inline;">{L_SELECT_LEAGUE}:</h1>
-	<form style="display:inline;" method="post" action="{U_ACTION}">
-	<div style="display:inline; margin:0; padding:0;">
-		<select name="s" id="team_season" onchange="this.form.submit();">{S_SEASON_OPTIONS}</select>
-		{S_FORM_TOKEN}
-	</div>
-	</form>
-
-	<form style="display:inline;" method="post" action="{U_ACTION}">
-	<div style="display:inline; margin:0; padding:0;">
-		<input type="hidden" name="s" value="{S_SEASON}" />
-		<select name="l" id="team_league" onchange="this.form.submit();">{S_LEAGUE_OPTIONS}</select>
-		{S_FORM_TOKEN}
-	</div>
-	</form>
-
-	<form id="add_team" method="post" action="{U_ACTION}">
-	<fieldset class="quick">
-			<input type="hidden" name="s" value="{S_SEASON}" />
-			<input type="hidden" name="l" value="{S_LEAGUE}" />
-			<input type="hidden" name="ko_league" value="{S_KO_LEAGUE}" />
-		<!-- IF S_TEAM_ADD -->
-			{L_ADD_TEAM}: <select name="t" id="old_team">{S_TEAM_OPTIONS}</select> <input class="button2" type="submit" name="submit" value="{L_SUBMIT}" />
-			<input type="hidden" name="add" value="1" />
-		<!-- ENDIF -->
-		{S_FORM_TOKEN}
-	</fieldset>
-	</form>
-	<h1>{L_TEAM_DEF} {S_TEAMS}</h1>
-
-	<p>{L_TEAM_DEF_EXPLAIN}</p>
-	<table class="type_f">
-	<thead>
-	<tr>
-		<th>{L_TEAM}</th>
-		<th></th>
-		<th style="width: 25%">{L_TEAM_NAME}</th>
-		<th></th>
-		<th>{L_TEAM_MATCHES}</th>
-		<th>{L_TEAM_AWAY}</th>
-		<!-- IF S_KO_LEAGUE -->
-		<th>{L_GROUP}</th>
-		<th>{L_MATCHDAY}</th>
-		<!-- ENDIF -->
-		<th>{L_OPTIONS}</th>
-		<th>{L_ACTION}</th>
-	</tr>
-	</thead>
-	<tbody>
-	<!-- IF .teams -->
-		<!-- BEGIN teams -->
-			<tr class="{teams.ROW_CLASS}">
-				<td style="text-align: center;"><strong>{teams.TEAM}</strong></td>
-				<td style="text-align: center;"><img src="{teams.TEAM_IMAGE}" alt="{teams.TEAM_NAME}" title="{teams.TEAM_NAME}" width="20" height="20" /></td>
-				<td>{teams.TEAM_NAME}</td>
-				<td>{teams.TEAM_SHORT}</td>
-				<td>{teams.TEAM_MATCHES}</td>
-				<td>{teams.TEAM_HOME}</td>
-				<!-- IF S_KO_LEAGUE -->
-				<td style="text-align: center;">{teams.TEAM_GROUP}</td>
-				<td style="text-align: center;">{teams.TEAM_ROUND}</td>
-				<!-- ENDIF -->
-				<td style="text-align: center;"><a href="{teams.U_EDIT}">{L_SETTINGS}</a></td>
-				<td style="text-align: center;"><!-- IF teams.U_DELETE --><a href="{teams.U_DELETE}">{L_DELETE}</a><!-- ELSE -->{L_DELETE}<!-- ENDIF --></td>
-			</tr>
-		<!-- END teams -->
-	<!-- ELSE -->
-			<tr>
-				<td colspan="2" class="row3">{L_NO_TEAMS_CREATED}</td>
-			</tr>
-	<!-- ENDIF -->
-	</tbody>
-	</table>
-	<!-- IF S_MATCHES --> {S_MATCHES} {L_TEAM_MATCHES} <!-- ENDIF -->
-<!-- ENDIF -->
-<br />
-<div style="text-align: center;">phpBB Extension - Football Prediction League - Version {S_VERSION_NO} &copy; 2016 <a href="http://football.bplaced.net">football</a></div>
+<!-- INCLUDECSS css/football_acp.css -->
+<!-- INCLUDE overall_header.html -->
+
+<a id="maincontent"></a>
+<!-- IF S_EDIT -->
+	<a href="{U_BACK}" style="float: {S_CONTENT_FLOW_END};">&laquo; {L_BACK}</a>
+	<h1>{L_ACP_FOOTBALL_TEAMS_MANAGE}</h1>
+	<p>{L_TEAM_EDIT_EXPLAIN}</p>
+
+	<!-- IF S_ERROR -->
+		<div class="errorbox">
+			<h3>{L_WARNING}</h3>
+			<p>{ERROR_MSG}</p>
+		</div>
+	<!-- ENDIF -->
+
+	<form id="settings" method="post" action="{U_ACTION}">
+
+	<fieldset>
+		<legend>{L_TEAM_DETAILS}</legend>
+	<dl>
+		<dt><label for="team">{L_SEASON}:</label></dt>
+		<dd><strong>{SEASON_NAME}</strong><input name="s" type="hidden" id="season" value="{SEASON}" /></dd>
+	</dl>
+	<dl>
+		<dt><label for="team">{L_LEAGUE}:</label></dt>
+		<dd><strong>{LEAGUE_NAME}</strong><input name="l" type="hidden" id="league" value="{LEAGUE}" /></dd>
+	</dl>
+	<dl>
+		<dt><label for="team">{L_TEAM}:</label></dt>
+		<dd><!-- IF not S_ADD_TEAM --><strong>{TEAM}</strong><!-- ENDIF -->
+			<input name="t" type="<!-- IF S_ADD_TEAM -->text<!-- ELSE -->hidden<!-- ENDIF -->" id="team" value="{TEAM}" /></dd>
+	</dl>
+	<dl>
+		<dt><label for="team_name">{L_TEAM_NAME}:</label></dt>
+		<dd><input name="team_name" type="text" id="team_name" size="30" maxlength="30" value="{TEAM_NAME}" /></dd>
+	</dl>
+	<dl>
+		<dt><label for="team_short">{L_TEAM_SHORT}:</label><br /><span>{L_TEAM_SHORT_EXPLAIN}</span></dt>
+		<dd><input name="team_short" type="text" id="team_short" size="10" maxlength="10" value="{TEAM_SHORT}" /></dd>
+	</dl>
+	<dl>
+		<dt><label for="team_symbol">{L_TEAM_SYMBOL}:</label><br /><span>{L_TEAM_SYMBOL_EXPLAIN}</span></dt>
+		<dd><span>
+			<select style="vertical-align:top;" name="team_symbol" id="team_symbol" 
+					onchange="document.getElementById('teamsymbol').src = '{PHPBB_ROOT_PATH}images/flags/' + this.value;">
+				{TEAM_SYMBOL_OPTIONS}
+			</select>&nbsp;&nbsp;&nbsp;<img src="{TEAM_IMAGE}" id="teamsymbol" alt="{TEAM_NAME}" title="{TEAM_NAME}" /></span></dd>
+	</dl>
+	<!-- IF S_KO_LEAGUE -->
+	<dl>
+		<dt><label for="team_group">{L_TEAM_GROUP}:</label><br /><span>{L_TEAM_GROUP_EXPLAIN}</span></dt>
+		<dd><input name="team_group" type="text" id="team_group" size="1" maxlength="1" value="{TEAM_GROUP}" /></dd>
+	</dl>
+	<dl>
+		<dt><label for="team_round">{L_TEAM_ROUND}:</label><br /><span>{L_TEAM_ROUND_EXPLAIN}</span></dt>
+		<dd><select name="team_round" id="team_round">{TEAM_MATCHDAY_OPTIONS}</select></dd>
+	</dl>
+	<input type="hidden" name="ko_league" value="1" />
+	<!-- ENDIF -->
+	</fieldset>
+
+	<fieldset class="submit-buttons">
+		<legend>{L_SUBMIT}</legend>
+		<input class="button1" type="submit" id="submit" name="update" value="{L_SUBMIT}" />&nbsp;
+		<input class="button2" type="reset" id="reset" name="reset" value="{L_RESET}" />
+	<!-- IF S_ADD_TEAM -->
+		<input type="hidden" name="add" value="1" />
+	<!-- ENDIF -->
+		<input type="hidden" name="edit" value="1" />
+		{S_FORM_TOKEN}
+	</fieldset>
+	</form>
+
+<!-- ELSE -->
+	<!-- IF U_FOOTBALL --><a href="{U_FOOTBALL}" style="float: {S_CONTENT_FLOW_END};">&laquo; {L_PREDICTION_LEAGUE}</a><!-- ENDIF -->
+	<h1>{L_ACP_FOOTBALL_TEAMS_MANAGE}</h1>
+	<p>{L_ACP_FOOTBALL_TEAMS_MANAGE_EXPLAIN}</p>
+
+	<!-- IF S_ERROR -->
+		<div class="errorbox">
+			<h3>{L_WARNING}</h3>
+			<p>{ERROR_MSG}</p>
+		</div>
+	<!-- ENDIF -->
+
+	<h1 style="display:inline;">{L_SELECT_LEAGUE}:</h1>
+	<form style="display:inline;" method="post" action="{U_ACTION}">
+	<div style="display:inline; margin:0; padding:0;">
+		<select name="s" id="team_season" onchange="this.form.submit();">{S_SEASON_OPTIONS}</select>
+		{S_FORM_TOKEN}
+	</div>
+	</form>
+
+	<form style="display:inline;" method="post" action="{U_ACTION}">
+	<div style="display:inline; margin:0; padding:0;">
+		<input type="hidden" name="s" value="{S_SEASON}" />
+		<select name="l" id="team_league" onchange="this.form.submit();">{S_LEAGUE_OPTIONS}</select>
+		{S_FORM_TOKEN}
+	</div>
+	</form>
+
+	<form id="add_team" method="post" action="{U_ACTION}">
+	<fieldset class="quick">
+			<input type="hidden" name="s" value="{S_SEASON}" />
+			<input type="hidden" name="l" value="{S_LEAGUE}" />
+			<input type="hidden" name="ko_league" value="{S_KO_LEAGUE}" />
+		<!-- IF S_TEAM_ADD -->
+			{L_ADD_TEAM}: <select name="t" id="old_team">{S_TEAM_OPTIONS}</select> <input class="button2" type="submit" name="submit" value="{L_SUBMIT}" />
+			<input type="hidden" name="add" value="1" />
+		<!-- ENDIF -->
+		{S_FORM_TOKEN}
+	</fieldset>
+	</form>
+	<h1>{L_TEAM_DEF} {S_TEAMS}</h1>
+
+	<p>{L_TEAM_DEF_EXPLAIN}</p>
+	<table class="type_f">
+	<thead>
+	<tr>
+		<th>{L_TEAM}</th>
+		<th></th>
+		<th style="width: 25%">{L_TEAM_NAME}</th>
+		<th></th>
+		<th>{L_TEAM_MATCHES}</th>
+		<th>{L_TEAM_AWAY}</th>
+		<!-- IF S_KO_LEAGUE -->
+		<th>{L_GROUP}</th>
+		<th>{L_MATCHDAY}</th>
+		<!-- ENDIF -->
+		<th>{L_OPTIONS}</th>
+		<th>{L_ACTION}</th>
+	</tr>
+	</thead>
+	<tbody>
+	<!-- IF .teams -->
+		<!-- BEGIN teams -->
+			<tr class="{teams.ROW_CLASS}">
+				<td style="text-align: center;"><strong>{teams.TEAM}</strong></td>
+				<td style="text-align: center;"><img src="{teams.TEAM_IMAGE}" alt="{teams.TEAM_NAME}" title="{teams.TEAM_NAME}" width="20" height="20" /></td>
+				<td>{teams.TEAM_NAME}</td>
+				<td>{teams.TEAM_SHORT}</td>
+				<td>{teams.TEAM_MATCHES}</td>
+				<td>{teams.TEAM_HOME}</td>
+				<!-- IF S_KO_LEAGUE -->
+				<td style="text-align: center;">{teams.TEAM_GROUP}</td>
+				<td style="text-align: center;">{teams.TEAM_ROUND}</td>
+				<!-- ENDIF -->
+				<td style="text-align: center;"><a href="{teams.U_EDIT}">{L_SETTINGS}</a></td>
+				<td style="text-align: center;"><!-- IF teams.U_DELETE --><a href="{teams.U_DELETE}">{L_DELETE}</a><!-- ELSE -->{L_DELETE}<!-- ENDIF --></td>
+			</tr>
+		<!-- END teams -->
+	<!-- ELSE -->
+			<tr>
+				<td colspan="2" class="row3">{L_NO_TEAMS_CREATED}</td>
+			</tr>
+	<!-- ENDIF -->
+	</tbody>
+	</table>
+	<!-- IF S_MATCHES --> {S_MATCHES} {L_TEAM_MATCHES} <!-- ENDIF -->
+<!-- ENDIF -->
+<br />
+<div style="text-align: center;">phpBB Extension - Football Prediction League - Version {S_VERSION_NO} &copy; 2016 <a href="http://football.bplaced.net">football</a></div>
 <!-- INCLUDE overall_footer.html -->

adm/style/acp_football_update.html

@@ -1,430 +1,430 @@
-<!-- INCLUDECSS css/football_acp.css -->
-<!-- INCLUDE overall_header.html -->
-
-<a id="maincontent"></a>
-	<!-- IF U_FOOTBALL --><a href="{U_FOOTBALL}" style="float: {S_CONTENT_FLOW_END};">&laquo; {L_PREDICTION_LEAGUE}</a><!-- ENDIF -->
-	<h1>{L_ACP_FOOTBALL_UPDATE_MANAGE}</h1>
-	<p>{L_ACP_FOOTBALL_UPDATE_MANAGE_EXPLAIN}</p>
-
-	<!-- IF S_SUCCESS -->
-		<div class="successbox">
-			<h3>{L_ADVICE}</h3>
-			<p>{SUCCESS_MSG}</p>
-		</div>
-	<!-- ENDIF -->
-
-	<form id="settings" method="post" action="{U_ACTION}">
-	<fieldset>
-		<legend>{L_SOURCE}</legend>
-	<dl>
-		<dt><label for="xml_season_url">{L_XML_SEASON_URL}:</label><br /><span>{L_XML_SEASON_URL_EXPLAIN}</span></dt>
-		<dd>
-			<input name="xml_season_url" type="text" id="xml_season_url" value="{XML_SEASON_URL}" size="60" maxlength="100" 
-				<!-- IF not S_ALLOW_URL_FOPEN --> DISABLED <!-- ENDIF -->/>
-			<input class="button1" type="submit" id="load_xml_season" name="load_xml_season" value="{L_LOAD}" />&nbsp;
-		<!-- IF not S_ALLOW_URL_FOPEN -->
-			<br /> <span style="color: red;">{L_ALLOW_URL_FOPEN}</span>
-		<!-- ENDIF -->
-		</dd>
-	</dl>
-	</fieldset>
-	</form>
-	
-<!-- IF S_CHOOSE -->
-	
-	<form method="post" action="{U_CHOOSE_ACTION}">
-	<fieldset>
-		<legend>{L_CHOOSE_LEAGUES}</legend>
-	<dl>
-		<dt><label for="xs">{L_SOURCE}:</label></dt>
-		<dd>
-			<div style="display:inline; margin:0; padding:0;">
-				<input type="hidden" name="xml_season_url" value="{XML_SEASON_URL}" />
-				<input type="hidden" name="league_name" value="{S_LEAGUE_NAME}" />
-				<input type="hidden" name="xcode" value="{S_XCODE}" />
-				<select name="xs" id="xs" onchange="this.form.submit();">{S_XSEASON_OPTIONS}</select>
-			</div>
-			<div style="display:inline; margin:0; padding:0;">
-				<select name="xl" id="xl" onchange="this.form.submit();">{S_XLEAGUE_OPTIONS}</select>
-			</div>
-		</dd>
-	</dl>
-	<dl>
-		<dt><label for="s">{L_TARGET}:</label></dt>
-		<dd>
-			<div style="display:inline; margin:0; padding:0;">
-				<select name="s" id="season" onchange="this.form.submit();">{S_SEASON_OPTIONS}</select>
-			</div>
-			<div style="display:inline; margin:0; padding:0;">
-				<select name="l" id="league" onchange="this.form.submit();">{S_LEAGUE_OPTIONS}</select>
-			</div>
-			<div title="{L_NEW_LEAGUE_EXPLAIN}" style="display:inline; margin:0; padding:0;">
-				<input  name="new_league" type="text" id="new_league" value="{NEW_LEAGUE}" size="2" maxlength="2" /> 
-			</div>
-		</dd>
-	</dl>
-	
-	</fieldset>
-	<fieldset class="submit-buttons">
-		<legend>{L_SUBMIT}</legend>
-		<!-- IF S_LEAGUE -->
-			<input class="button1" type="submit" id="team_mapping" name="team_mapping" value="{L_COMPARE_UPDATE}" />&nbsp;
-		<!-- ELSE -->
-			<input class="button1" type="submit" id="load_xml_league" name="load_xml_league" value="{L_SHOW_UPDATE}" />&nbsp;
-		<!-- ENDIF -->
-		{S_FORM_TOKEN}
-	</fieldset>
-	</form>
-<!-- ENDIF -->
-
-	<!-- IF S_ERROR -->
-		<div class="errorbox">
-			<h3>{L_WARNING}</h3>
-			<p>{ERROR_MSG}</p>
-		</div>
-	<!-- ENDIF -->
-
-<!-- IF S_TEAMS -->
-	<form id="teams" method="post" action="{U_ACTION}">
-	
-	<fieldset>
-		<legend>{L_TEAM_MAPPING}</legend>
-	<!-- IF S_MISSING_TEAMS --><span style="color: red;">{S_MISSING_TEAMS}</span><!-- ENDIF -->
-	<table class="type_f">
-	<thead>
-	<tr>
-		<th>{L_TEAM}</th>
-		<th style="width: 25%">{L_TEAM_NAME}</th>
-		<th>{L_TEAM_NAME_SHORT}</th>
-		<th>{L_TEAM_MAPPING}</th>
-	</tr>
-	</thead>
-	<tbody>
-	<!-- BEGIN teams -->
-		<tr class="{teams.ROW_CLASS}">
-			<td>{teams.TEAM_ID_XML}</td>
-			<td><img src="{teams.TEAM_IMAGE_XML}" id="teamsymbol" alt="{teams.TEAM_NAME_XML}" title="{teams.TEAM_NAME_XML}" />&nbsp;&nbsp;&nbsp;
-				{teams.TEAM_NAME_XML}
-			</td>
-			<td>{teams.TEAM_NAME_SHORT_XML}</td>
-			<td <!-- IF teams.DUPLICATE_TEAM -->title="{L_DUPLICATE_TEAM}" bgcolor=#ECD5D8<!-- ENDIF -->>
-				<select name="team_id_db_{teams.TEAM_ID_XML}" id="team_id_{teams.TEAM_ID_XML}" onchange="this.form.submit();">{teams.TEAM_OPTIONS}</select>
-			</td>
-		</tr>
-	<!-- END teams -->
-	</tbody>
-	</table>
-	</fieldset>
-	<fieldset class="submit-buttons">
-		<legend>{L_SUBMIT}</legend>
-		<input type="hidden" name="xml_season_url" value="{XML_SEASON_URL}" />
-		<input type="hidden" name="league_name" value="{S_LEAGUE_NAME}" />
-		<input type="hidden" name="xml_ary" value="{XML_ARY}" />
-		<input type="hidden" name="s" value="{S_SEASON}" />
-		<input type="hidden" name="l" value="{S_LEAGUE}" />
-		<input type="hidden" name="xs" value="{S_XSEASON}" />
-		<input type="hidden" name="xl" value="{S_XLEAGUE}" />
-		<input type="hidden" name="xcode" value="{S_XCODE}" />
-		<input class="button1" type="submit" id="submit" name="map_teams" value="{L_MAP_TEAMS}" />&nbsp;
-		<input class="button1" type="submit" id="submit" name="choose" value="{L_CHOOSE_OTHER_LEAGUE}" />&nbsp;
-		{S_FORM_TOKEN}
-	</fieldset>
-	</form>
-<!-- ENDIF -->
-	
-<!-- IF S_LIST -->
-	<form id="list" method="post" action="{U_ACTION}">
-		<!-- IF S_INSERT_LEAGUE --><h1>{L_INSERT_LEAGUE}</h3><!-- ELSE --><h1>{L_UPDATE_LEAGUE}</h3><!-- ENDIF -->
-	<fieldset>
-	<dl>
-		<dt><label for="xml_season_url">{L_SEASON}:</label></dt>
-		<dd>{S_SEASON}</dd>
-	</dl>
-	<dl>
-		<dt><label for="xml_season_url">{L_LEAGUE}:</label></dt>
-		<dd>{S_LEAGUE}</dd>
-	</dl>
-	<dl>
-		<dt><label for="xml_season_url">{L_LEAGUE_NAME}:</label></dt>
-		<dd>{S_LEAGUE_NAME}</dd>
-	</dl>
-	</fieldset>
-	<!-- IF S_INSERT_SEASON -->
-	<fieldset>
-		<legend>{L_INSERT_SEASON}</legend>
-	<table class="type_f">
-	<thead>
-	<tr>
-		<th>{L_SEASON}</th>
-		<th>{L_SEASON_NAME}</th>
-		<th>{L_SEASON_SHORT}</th>
-	</tr>
-	</thead>
-	<tbody>
-	<!-- BEGIN footb_seasons -->
-		{footb_seasons.TPL}
-	<!-- END footb_seasons -->
-	</tbody>
-	</table>
-	</fieldset>
-	<!-- ENDIF -->
-	
-	<!-- IF S_INSERT_LEAGUE -->
-	<fieldset>
-		<legend>{L_INSERT_LEAGUE}</legend>
-	<table class="type_f">
-	<thead>
-	<tr>
-		<th style="width: 20%">{L_LEAGUE_NAME}</th>
-		<th>{L_LEAGUE_SHORTCUT}</th>
-		<th>{L_LEAGUE_TYPE}</th>
-		<th>{L_LEAGUE_MATCHDAYS}</th>
-		<th>{L_LEAGUE_MATCHES}</th>
-		<th>{L_LEAGUE_POINTS_MODE}</th>
-		<th>{L_LEAGUE_BET_IN_TIME}</th>
-		<th>{L_BET_TYPE_KO}</th>
-		<th>{L_OTHER_FIELDS}</th>
-	</tr>
-	</thead>
-	<tbody>
-	<!-- BEGIN footb_leagues -->
-		{footb_leagues.TPL}
-	<!-- END footb_leagues -->
-	</tbody>
-	</table>
-	</fieldset>
-	<!-- ENDIF -->
-	
-	<!-- IF .footb_matchdays -->
-	<fieldset>
-		<legend>{DO_MATCHDAYS}</legend>
-	<!-- IF not S_INSERT_LEAGUE -->
-	<p class="small" style="text-align:right;margin-bottom:0px">
-		<a href="#" onclick="marklist('list', 'FOOTB_MATCHDAYS_', true); return false;">{L_MARK_ALL}</a> &bull; 
-		<a href="#" onclick="marklist('list', 'FOOTB_MATCHDAYS_', false); return false;">{L_UNMARK_ALL}</a>
-	</p>		
-	<!-- ENDIF -->
-	<table class="type_f">
-	<thead>
-	<tr>
-		<th>{L_MATCHDAY}</th>
-		<th>{L_MATCHDAY_STATUS} 
-			<!-- IF not S_INSERT_LEAGUE -->
-				<input title="{L_UPDATE_THIS}" name="update_matchdays_status" id="update_matchdays_status" type="checkbox" class="radio" checked="checked" />
-			<!-- ENDIF -->
-		</th>
-		<th>{L_MATCHDAY_DELIVERY} 
-			<!-- IF not S_INSERT_LEAGUE -->
-				<input title="{L_UPDATE_THIS}" name="update_matchdays_delivery_date" id="update_matchdays_delivery_date" type="checkbox" class="radio" />
-			<!-- ENDIF -->
-		</th>
-		<th>{L_MATCHDAY_DELIVERY} 2 
-			<!-- IF not S_INSERT_LEAGUE -->
-				<input title="{L_UPDATE_THIS}" name="update_matchdays_delivery_date_2" id="update_matchdays_delivery_date_2" type="checkbox" class="radio" />
-			<!-- ENDIF -->
-		</th>
-		<th>{L_MATCHDAY_DELIVERY} 3 
-			<!-- IF not S_INSERT_LEAGUE -->
-				<input title="{L_UPDATE_THIS}" name="update_matchdays_delivery_date_3" id="update_matchdays_delivery_date_3" type="checkbox" class="radio" />
-			<!-- ENDIF -->
-		</th>
-		<th style="width: 25%">{L_MATCHDAY_NAME} 
-			<!-- IF not S_INSERT_LEAGUE -->
-				<input title="{L_UPDATE_THIS}" name="update_matchdays_matchday_name" id="update_matchdays_matchday_name" type="checkbox" class="radio" checked="checked" />
-			<!-- ENDIF -->
-		</th>
-		<th>{L_MATCHES} 
-			<!-- IF not S_INSERT_LEAGUE -->
-				<input title="{L_UPDATE_THIS}" name="update_matchdays_matches" id="update_matchdays_matches" type="checkbox" class="radio" checked="checked" />
-			<!-- ENDIF -->
-		</th>
-		<!-- IF not S_INSERT_LEAGUE -->
-		<th title="{L_SELECT_EXPLAIN}" style="text-align:center">{L_SELECT}</th>
-		<!-- ENDIF -->
-	</tr>
-	</thead>
-	<tbody>
-	<!-- BEGIN footb_matchdays -->
-		{footb_matchdays.TPL}
-	<!-- END footb_matchdays -->
-	</tbody>
-	</table>
-	<!-- IF not S_INSERT_LEAGUE -->
-	<p class="small" style="text-align:right;margin-bottom:0px">
-		<a href="#" onclick="marklist('list', 'FOOTB_MATCHDAYS_', true); return false;">{L_MARK_ALL}</a> &bull; 
-		<a href="#" onclick="marklist('list', 'FOOTB_MATCHDAYS_', false); return false;">{L_UNMARK_ALL}</a>
-	</p>		
-	<!-- ENDIF -->
-	</fieldset>
-	<!-- ENDIF -->
-	
-	<!-- IF .footb_teams -->
-	<fieldset>
-		<legend>{DO_TEAMS}</legend>
-	<!-- IF not S_INSERT_LEAGUE -->
-	<p class="small" style="text-align:right;margin-bottom:0px">
-		<a href="#" onclick="marklist('list', 'FOOTB_TEAMS_', true); return false;">{L_MARK_ALL}</a> &bull; 
-		<a href="#" onclick="marklist('list', 'FOOTB_TEAMS_', false); return false;">{L_UNMARK_ALL}</a>
-	</p>		
-	<!-- ENDIF -->
-	<table class="type_f">
-	<thead>
-	<tr>
-		<th>{L_TEAM}</th>
-		<th style="width: 25%">{L_TEAM_NAME} 
-			<!-- IF not S_INSERT_LEAGUE -->
-				<input title="{L_UPDATE_THIS}" name="update_teams_team_name" id="update_teams_team_nmae" type="checkbox" class="radio" />
-			<!-- ENDIF -->
-		</th>
-		<th>{L_TEAM_NAME_SHORT} 
-			<!-- IF not S_INSERT_LEAGUE -->
-				<input title="{L_UPDATE_THIS}" name="update_teams_team_name_short" id="update_teams_team_name_short" type="checkbox" class="radio" />
-			<!-- ENDIF -->
-		</th>
-		<th>{L_TEAM_SYMBOL} 
-			<!-- IF not S_INSERT_LEAGUE -->
-				<input title="{L_UPDATE_THIS}" name="update_teams_team_symbol" id="update_teams_team_symbol" type="checkbox" class="radio" />
-			<!-- ENDIF -->
-		</th>
-		<th>{L_GROUP} 
-			<!-- IF not S_INSERT_LEAGUE -->
-				<input title="{L_UPDATE_THIS}" name="update_teams_group_id" id="update_teams_group_id" type="checkbox" class="radio" checked="checked" />
-			<!-- ENDIF -->
-		</th>
-		<th>{L_MATCHDAY} 
-			<!-- IF not S_INSERT_LEAGUE -->
-				<input title="{L_UPDATE_THIS}" name="update_teams_matchday" id="update_teams_matchday" type="checkbox" class="radio" checked="checked" />
-			<!-- ENDIF -->
-		</th>
-		<!-- IF not S_INSERT_LEAGUE -->
-		<th title="{L_SELECT_EXPLAIN}" style="text-align:center">{L_SELECT}</th>
-		<!-- ENDIF -->
-	</tr>
-	</thead>
-	<tbody>
-	<!-- BEGIN footb_teams -->
-		{footb_teams.TPL}
-	<!-- END footb_teams -->
-	</tbody>
-	</table>
-	<!-- IF not S_INSERT_LEAGUE -->
-	<p class="small" style="text-align:right;margin-bottom:0px">
-		<a href="#" onclick="marklist('list', 'FOOTB_TEAMS_', true); return false;">{L_MARK_ALL}</a> &bull; 
-		<a href="#" onclick="marklist('list', 'FOOTB_TEAMS_', false); return false;">{L_UNMARK_ALL}</a>
-	</p>		
-	<!-- ENDIF -->
-	</fieldset>
-	<!-- ENDIF -->
-	
-	<!-- IF .footb_matches -->
-	<fieldset>
-		<legend>{DO_MATCHES}</legend>
-	<!-- IF not S_INSERT_LEAGUE -->
-	<p class="small"><input name="update_neg_status" id="update_neg_status" type="checkbox" class="radio" {S_CHECK_NEG_STATUS} /> {L_UPDATE_NEG_STATUS}</p>		
-	<p class="small"><input name="update_same_status" id="update_same_status" type="checkbox" class="radio" {S_CHECK_SAME_STATUS} /> {L_UPDATE_SAME_STATUS}</p>		
-	<p class="small"><input name="update_only_final" id="update_only_final" type="checkbox" class="radio" {S_CHECK_ONLY_FINAL} /> {L_UPDATE_ONLY_FINAL}</p>		
-	
-	<p class="small" style="text-align:right;margin-bottom:0px">
-		<a href="#" onclick="marklist('list', 'FOOTB_MATCHES_', true); return false;">{L_MARK_ALL}</a> &bull; 
-		<a href="#" onclick="marklist('list', 'FOOTB_MATCHES_', false); return false;">{L_UNMARK_ALL}</a>
-	</p>		
-	<!-- ENDIF -->
-	<table class="type_f">
-	<thead>
-	<tr>
-		<th>{L_MATCHDAY} 
-			<!-- IF not S_INSERT_LEAGUE -->
-				<input title="{L_UPDATE_THIS}" name="update_matches_matchday" id="update_matches_matchday" type="checkbox" class="radio" checked="checked" />
-			<!-- ENDIF --><br />
-			{L_MATCH_NUMBER}		
-		</th>
-		<th>{L_MATCH_BEGIN} 
-			<!-- IF not S_INSERT_LEAGUE -->
-				<input title="{L_UPDATE_THIS}" name="update_matches_match_datetime" id="update_matches_match_datetime" type="checkbox" class="radio" checked="checked" />
-			<!-- ENDIF --><br />
-			{L_MATCH_OF_GROUP} 
-			<!-- IF not S_INSERT_LEAGUE -->
-				<input title="{L_UPDATE_THIS}" name="update_matches_group_id" id="update_matches_group_id" type="checkbox" class="radio" checked="checked" />
-			<!-- ENDIF -->
-		</th>
-		<th>{L_MATCH_HOME} 
-			<!-- IF not S_INSERT_LEAGUE -->
-				<input title="{L_UPDATE_THIS}" name="update_matches_team_id_home" id="update_matches_team_id_home" type="checkbox" class="radio" checked="checked" />
-			<!-- ENDIF --><br />
-			{L_MATCH_GUEST} 
-			<!-- IF not S_INSERT_LEAGUE -->
-				<input title="{L_UPDATE_THIS}" name="update_matches_team_id_guest" id="update_matches_team_id_guest" type="checkbox" class="radio" checked="checked" />
-			<!-- ENDIF -->
-		</th>
-		<th>{L_RESULT} 
-			<!-- IF not S_INSERT_LEAGUE -->
-				<input title="{L_UPDATE_THIS}" name="update_matches_goals" id="update_matches_goals" type="checkbox" class="radio" checked="checked" />
-			<!-- ENDIF --><br /> 
-			&nbsp; 
-		</th>
-		<th>{L_EXTRATIME_SHORT} 
-			<!-- IF not S_INSERT_LEAGUE -->
-				<input title="{L_UPDATE_THIS}" name="update_matches_goals_overtime" id="update_matches_goals_overtime" type="checkbox" class="radio" checked="checked" />
-			<!-- ENDIF --><br />
-			&nbsp;
-		</th>
-		<th>{L_FORMULA} 
-			<!-- IF not S_INSERT_LEAGUE -->
-				<input title="{L_UPDATE_THIS}" name="update_matches_formula" id="update_matches_formula" type="checkbox" class="radio" checked="checked" />
-			<!-- ENDIF --><br />
-			&nbsp;
-		</th>
-		<th>{L_STATUS} 
-			<!-- IF not S_INSERT_LEAGUE -->
-				<input title="{L_UPDATE_THIS}" name="update_matches_status" id="update_matches_status" type="checkbox" class="radio" checked="checked" />
-			<!-- ENDIF --><br />
-			{L_KO}
-		</th>
-		<!-- IF not S_INSERT_LEAGUE -->
-		<th title="{L_SELECT_EXPLAIN}" style="text-align:center">{L_SELECT}<br />
-			&nbsp;
-		</th>
-		<!-- ENDIF -->
-	</tr>
-	</thead>
-	<tbody>
-	<!-- BEGIN footb_matches -->
-		{footb_matches.TPL}
-	<!-- END footb_matches -->
-	</tbody>
-	</table>
-	<!-- IF not S_INSERT_LEAGUE -->
-	<p class="small" style="text-align:right;margin-bottom:0px">
-		<a href="#" onclick="marklist('list', 'FOOTB_MATCHES_', true); return false;">{L_MARK_ALL}</a> &bull; 
-		<a href="#" onclick="marklist('list', 'FOOTB_MATCHES_', false); return false;">{L_UNMARK_ALL}</a>
-	</p>		
-	<!-- ENDIF -->
-	</fieldset>
-	<!-- ENDIF -->
-
-	<!-- IF .footb_matchdays or .footb_teams or .footb_matches -->
-	<fieldset class="submit-buttons">
-		<legend>{L_SUBMIT}</legend>
-		<input type="hidden" name="xml_ary" value="{XML_ARY}" />
-		<input type="hidden" name="s" value="{S_SEASON}" />
-		<input type="hidden" name="l" value="{S_LEAGUE}" />
-		<input type="hidden" name="league_name" value="{S_LEAGUE_NAME}" />
-		<input type="hidden" name="xcode" value="{S_XCODE}" />
-		<!-- IF S_INSERT_LEAGUE -->
-		<input class="button1" type="submit" id="submit" name="insert" value="{L_INSERT_LEAGUE}" />&nbsp;
-		<!-- ELSE -->
-		<input class="button1" type="submit" id="submit" name="update" value="{L_UPDATE_LEAGUE}" />&nbsp;
-		<!-- ENDIF -->
-		{S_FORM_TOKEN}
-	</fieldset>
-	<!-- ELSE -->
-		<div class="successbox">
-			<h3>{L_ADVICE}</h3>
-			<p>{L_NO_DIFFERENCES}</p>
-		</div>
-	<!-- ENDIF -->
-	</form>
-<!-- ENDIF -->
-<br />
-<div style="text-align: center;">phpBB Extension - Football Prediction League - Version {S_VERSION_NO} &copy; 2016 <a href="http://football.bplaced.net">football</a></div>
+<!-- INCLUDECSS css/football_acp.css -->
+<!-- INCLUDE overall_header.html -->
+
+<a id="maincontent"></a>
+	<!-- IF U_FOOTBALL --><a href="{U_FOOTBALL}" style="float: {S_CONTENT_FLOW_END};">&laquo; {L_PREDICTION_LEAGUE}</a><!-- ENDIF -->
+	<h1>{L_ACP_FOOTBALL_UPDATE_MANAGE}</h1>
+	<p>{L_ACP_FOOTBALL_UPDATE_MANAGE_EXPLAIN}</p>
+
+	<!-- IF S_SUCCESS -->
+		<div class="successbox">
+			<h3>{L_ADVICE}</h3>
+			<p>{SUCCESS_MSG}</p>
+		</div>
+	<!-- ENDIF -->
+
+	<form id="settings" method="post" action="{U_ACTION}">
+	<fieldset>
+		<legend>{L_SOURCE}</legend>
+	<dl>
+		<dt><label for="xml_season_url">{L_XML_SEASON_URL}:</label><br /><span>{L_XML_SEASON_URL_EXPLAIN}</span></dt>
+		<dd>
+			<input name="xml_season_url" type="text" id="xml_season_url" value="{XML_SEASON_URL}" size="60" maxlength="100" 
+				<!-- IF not S_ALLOW_URL_FOPEN --> DISABLED <!-- ENDIF -->/>
+			<input class="button1" type="submit" id="load_xml_season" name="load_xml_season" value="{L_LOAD}" />&nbsp;
+		<!-- IF not S_ALLOW_URL_FOPEN -->
+			<br /> <span style="color: red;">{L_ALLOW_URL_FOPEN}</span>
+		<!-- ENDIF -->
+		</dd>
+	</dl>
+	</fieldset>
+	</form>
+	
+<!-- IF S_CHOOSE -->
+	
+	<form method="post" action="{U_CHOOSE_ACTION}">
+	<fieldset>
+		<legend>{L_CHOOSE_LEAGUES}</legend>
+	<dl>
+		<dt><label for="xs">{L_SOURCE}:</label></dt>
+		<dd>
+			<div style="display:inline; margin:0; padding:0;">
+				<input type="hidden" name="xml_season_url" value="{XML_SEASON_URL}" />
+				<input type="hidden" name="league_name" value="{S_LEAGUE_NAME}" />
+				<input type="hidden" name="xcode" value="{S_XCODE}" />
+				<select name="xs" id="xs" onchange="this.form.submit();">{S_XSEASON_OPTIONS}</select>
+			</div>
+			<div style="display:inline; margin:0; padding:0;">
+				<select name="xl" id="xl" onchange="this.form.submit();">{S_XLEAGUE_OPTIONS}</select>
+			</div>
+		</dd>
+	</dl>
+	<dl>
+		<dt><label for="s">{L_TARGET}:</label></dt>
+		<dd>
+			<div style="display:inline; margin:0; padding:0;">
+				<select name="s" id="season" onchange="this.form.submit();">{S_SEASON_OPTIONS}</select>
+			</div>
+			<div style="display:inline; margin:0; padding:0;">
+				<select name="l" id="league" onchange="this.form.submit();">{S_LEAGUE_OPTIONS}</select>
+			</div>
+			<div title="{L_NEW_LEAGUE_EXPLAIN}" style="display:inline; margin:0; padding:0;">
+				<input  name="new_league" type="text" id="new_league" value="{NEW_LEAGUE}" size="2" maxlength="2" /> 
+			</div>
+		</dd>
+	</dl>
+	
+	</fieldset>
+	<fieldset class="submit-buttons">
+		<legend>{L_SUBMIT}</legend>
+		<!-- IF S_LEAGUE -->
+			<input class="button1" type="submit" id="team_mapping" name="team_mapping" value="{L_COMPARE_UPDATE}" />&nbsp;
+		<!-- ELSE -->
+			<input class="button1" type="submit" id="load_xml_league" name="load_xml_league" value="{L_SHOW_UPDATE}" />&nbsp;
+		<!-- ENDIF -->
+		{S_FORM_TOKEN}
+	</fieldset>
+	</form>
+<!-- ENDIF -->
+
+	<!-- IF S_ERROR -->
+		<div class="errorbox">
+			<h3>{L_WARNING}</h3>
+			<p>{ERROR_MSG}</p>
+		</div>
+	<!-- ENDIF -->
+
+<!-- IF S_TEAMS -->
+	<form id="teams" method="post" action="{U_ACTION}">
+	
+	<fieldset>
+		<legend>{L_TEAM_MAPPING}</legend>
+	<!-- IF S_MISSING_TEAMS --><span style="color: red;">{S_MISSING_TEAMS}</span><!-- ENDIF -->
+	<table class="type_f">
+	<thead>
+	<tr>
+		<th>{L_TEAM}</th>
+		<th style="width: 25%">{L_TEAM_NAME}</th>
+		<th>{L_TEAM_NAME_SHORT}</th>
+		<th>{L_TEAM_MAPPING}</th>
+	</tr>
+	</thead>
+	<tbody>
+	<!-- BEGIN teams -->
+		<tr class="{teams.ROW_CLASS}">
+			<td>{teams.TEAM_ID_XML}</td>
+			<td><img src="{teams.TEAM_IMAGE_XML}" id="teamsymbol" alt="{teams.TEAM_NAME_XML}" title="{teams.TEAM_NAME_XML}" />&nbsp;&nbsp;&nbsp;
+				{teams.TEAM_NAME_XML}
+			</td>
+			<td>{teams.TEAM_NAME_SHORT_XML}</td>
+			<td <!-- IF teams.DUPLICATE_TEAM -->title="{L_DUPLICATE_TEAM}" bgcolor=#ECD5D8<!-- ENDIF -->>
+				<select name="team_id_db_{teams.TEAM_ID_XML}" id="team_id_{teams.TEAM_ID_XML}" onchange="this.form.submit();">{teams.TEAM_OPTIONS}</select>
+			</td>
+		</tr>
+	<!-- END teams -->
+	</tbody>
+	</table>
+	</fieldset>
+	<fieldset class="submit-buttons">
+		<legend>{L_SUBMIT}</legend>
+		<input type="hidden" name="xml_season_url" value="{XML_SEASON_URL}" />
+		<input type="hidden" name="league_name" value="{S_LEAGUE_NAME}" />
+		<input type="hidden" name="xml_ary" value="{XML_ARY}" />
+		<input type="hidden" name="s" value="{S_SEASON}" />
+		<input type="hidden" name="l" value="{S_LEAGUE}" />
+		<input type="hidden" name="xs" value="{S_XSEASON}" />
+		<input type="hidden" name="xl" value="{S_XLEAGUE}" />
+		<input type="hidden" name="xcode" value="{S_XCODE}" />
+		<input class="button1" type="submit" id="submit" name="map_teams" value="{L_MAP_TEAMS}" />&nbsp;
+		<input class="button1" type="submit" id="submit" name="choose" value="{L_CHOOSE_OTHER_LEAGUE}" />&nbsp;
+		{S_FORM_TOKEN}
+	</fieldset>
+	</form>
+<!-- ENDIF -->
+	
+<!-- IF S_LIST -->
+	<form id="list" method="post" action="{U_ACTION}">
+		<!-- IF S_INSERT_LEAGUE --><h1>{L_INSERT_LEAGUE}</h3><!-- ELSE --><h1>{L_UPDATE_LEAGUE}</h3><!-- ENDIF -->
+	<fieldset>
+	<dl>
+		<dt><label for="xml_season_url">{L_SEASON}:</label></dt>
+		<dd>{S_SEASON}</dd>
+	</dl>
+	<dl>
+		<dt><label for="xml_season_url">{L_LEAGUE}:</label></dt>
+		<dd>{S_LEAGUE}</dd>
+	</dl>
+	<dl>
+		<dt><label for="xml_season_url">{L_LEAGUE_NAME}:</label></dt>
+		<dd>{S_LEAGUE_NAME}</dd>
+	</dl>
+	</fieldset>
+	<!-- IF S_INSERT_SEASON -->
+	<fieldset>
+		<legend>{L_INSERT_SEASON}</legend>
+	<table class="type_f">
+	<thead>
+	<tr>
+		<th>{L_SEASON}</th>
+		<th>{L_SEASON_NAME}</th>
+		<th>{L_SEASON_SHORT}</th>
+	</tr>
+	</thead>
+	<tbody>
+	<!-- BEGIN footb_seasons -->
+		{footb_seasons.TPL}
+	<!-- END footb_seasons -->
+	</tbody>
+	</table>
+	</fieldset>
+	<!-- ENDIF -->
+	
+	<!-- IF S_INSERT_LEAGUE -->
+	<fieldset>
+		<legend>{L_INSERT_LEAGUE}</legend>
+	<table class="type_f">
+	<thead>
+	<tr>
+		<th style="width: 20%">{L_LEAGUE_NAME}</th>
+		<th>{L_LEAGUE_SHORTCUT}</th>
+		<th>{L_LEAGUE_TYPE}</th>
+		<th>{L_LEAGUE_MATCHDAYS}</th>
+		<th>{L_LEAGUE_MATCHES}</th>
+		<th>{L_LEAGUE_POINTS_MODE}</th>
+		<th>{L_LEAGUE_BET_IN_TIME}</th>
+		<th>{L_BET_TYPE_KO}</th>
+		<th>{L_OTHER_FIELDS}</th>
+	</tr>
+	</thead>
+	<tbody>
+	<!-- BEGIN footb_leagues -->
+		{footb_leagues.TPL}
+	<!-- END footb_leagues -->
+	</tbody>
+	</table>
+	</fieldset>
+	<!-- ENDIF -->
+	
+	<!-- IF .footb_matchdays -->
+	<fieldset>
+		<legend>{DO_MATCHDAYS}</legend>
+	<!-- IF not S_INSERT_LEAGUE -->
+	<p class="small" style="text-align:right;margin-bottom:0px">
+		<a href="#" onclick="marklist('list', 'FOOTB_MATCHDAYS_', true); return false;">{L_MARK_ALL}</a> &bull; 
+		<a href="#" onclick="marklist('list', 'FOOTB_MATCHDAYS_', false); return false;">{L_UNMARK_ALL}</a>
+	</p>		
+	<!-- ENDIF -->
+	<table class="type_f">
+	<thead>
+	<tr>
+		<th>{L_MATCHDAY}</th>
+		<th>{L_MATCHDAY_STATUS} 
+			<!-- IF not S_INSERT_LEAGUE -->
+				<input title="{L_UPDATE_THIS}" name="update_matchdays_status" id="update_matchdays_status" type="checkbox" class="radio" checked="checked" />
+			<!-- ENDIF -->
+		</th>
+		<th>{L_MATCHDAY_DELIVERY} 
+			<!-- IF not S_INSERT_LEAGUE -->
+				<input title="{L_UPDATE_THIS}" name="update_matchdays_delivery_date" id="update_matchdays_delivery_date" type="checkbox" class="radio" />
+			<!-- ENDIF -->
+		</th>
+		<th>{L_MATCHDAY_DELIVERY} 2 
+			<!-- IF not S_INSERT_LEAGUE -->
+				<input title="{L_UPDATE_THIS}" name="update_matchdays_delivery_date_2" id="update_matchdays_delivery_date_2" type="checkbox" class="radio" />
+			<!-- ENDIF -->
+		</th>
+		<th>{L_MATCHDAY_DELIVERY} 3 
+			<!-- IF not S_INSERT_LEAGUE -->
+				<input title="{L_UPDATE_THIS}" name="update_matchdays_delivery_date_3" id="update_matchdays_delivery_date_3" type="checkbox" class="radio" />
+			<!-- ENDIF -->
+		</th>
+		<th style="width: 25%">{L_MATCHDAY_NAME} 
+			<!-- IF not S_INSERT_LEAGUE -->
+				<input title="{L_UPDATE_THIS}" name="update_matchdays_matchday_name" id="update_matchdays_matchday_name" type="checkbox" class="radio" checked="checked" />
+			<!-- ENDIF -->
+		</th>
+		<th>{L_MATCHES} 
+			<!-- IF not S_INSERT_LEAGUE -->
+				<input title="{L_UPDATE_THIS}" name="update_matchdays_matches" id="update_matchdays_matches" type="checkbox" class="radio" checked="checked" />
+			<!-- ENDIF -->
+		</th>
+		<!-- IF not S_INSERT_LEAGUE -->
+		<th title="{L_SELECT_EXPLAIN}" style="text-align:center">{L_SELECT}</th>
+		<!-- ENDIF -->
+	</tr>
+	</thead>
+	<tbody>
+	<!-- BEGIN footb_matchdays -->
+		{footb_matchdays.TPL}
+	<!-- END footb_matchdays -->
+	</tbody>
+	</table>
+	<!-- IF not S_INSERT_LEAGUE -->
+	<p class="small" style="text-align:right;margin-bottom:0px">
+		<a href="#" onclick="marklist('list', 'FOOTB_MATCHDAYS_', true); return false;">{L_MARK_ALL}</a> &bull; 
+		<a href="#" onclick="marklist('list', 'FOOTB_MATCHDAYS_', false); return false;">{L_UNMARK_ALL}</a>
+	</p>		
+	<!-- ENDIF -->
+	</fieldset>
+	<!-- ENDIF -->
+	
+	<!-- IF .footb_teams -->
+	<fieldset>
+		<legend>{DO_TEAMS}</legend>
+	<!-- IF not S_INSERT_LEAGUE -->
+	<p class="small" style="text-align:right;margin-bottom:0px">
+		<a href="#" onclick="marklist('list', 'FOOTB_TEAMS_', true); return false;">{L_MARK_ALL}</a> &bull; 
+		<a href="#" onclick="marklist('list', 'FOOTB_TEAMS_', false); return false;">{L_UNMARK_ALL}</a>
+	</p>		
+	<!-- ENDIF -->
+	<table class="type_f">
+	<thead>
+	<tr>
+		<th>{L_TEAM}</th>
+		<th style="width: 25%">{L_TEAM_NAME} 
+			<!-- IF not S_INSERT_LEAGUE -->
+				<input title="{L_UPDATE_THIS}" name="update_teams_team_name" id="update_teams_team_nmae" type="checkbox" class="radio" />
+			<!-- ENDIF -->
+		</th>
+		<th>{L_TEAM_NAME_SHORT} 
+			<!-- IF not S_INSERT_LEAGUE -->
+				<input title="{L_UPDATE_THIS}" name="update_teams_team_name_short" id="update_teams_team_name_short" type="checkbox" class="radio" />
+			<!-- ENDIF -->
+		</th>
+		<th>{L_TEAM_SYMBOL} 
+			<!-- IF not S_INSERT_LEAGUE -->
+				<input title="{L_UPDATE_THIS}" name="update_teams_team_symbol" id="update_teams_team_symbol" type="checkbox" class="radio" />
+			<!-- ENDIF -->
+		</th>
+		<th>{L_GROUP} 
+			<!-- IF not S_INSERT_LEAGUE -->
+				<input title="{L_UPDATE_THIS}" name="update_teams_group_id" id="update_teams_group_id" type="checkbox" class="radio" checked="checked" />
+			<!-- ENDIF -->
+		</th>
+		<th>{L_MATCHDAY} 
+			<!-- IF not S_INSERT_LEAGUE -->
+				<input title="{L_UPDATE_THIS}" name="update_teams_matchday" id="update_teams_matchday" type="checkbox" class="radio" checked="checked" />
+			<!-- ENDIF -->
+		</th>
+		<!-- IF not S_INSERT_LEAGUE -->
+		<th title="{L_SELECT_EXPLAIN}" style="text-align:center">{L_SELECT}</th>
+		<!-- ENDIF -->
+	</tr>
+	</thead>
+	<tbody>
+	<!-- BEGIN footb_teams -->
+		{footb_teams.TPL}
+	<!-- END footb_teams -->
+	</tbody>
+	</table>
+	<!-- IF not S_INSERT_LEAGUE -->
+	<p class="small" style="text-align:right;margin-bottom:0px">
+		<a href="#" onclick="marklist('list', 'FOOTB_TEAMS_', true); return false;">{L_MARK_ALL}</a> &bull; 
+		<a href="#" onclick="marklist('list', 'FOOTB_TEAMS_', false); return false;">{L_UNMARK_ALL}</a>
+	</p>		
+	<!-- ENDIF -->
+	</fieldset>
+	<!-- ENDIF -->
+	
+	<!-- IF .footb_matches -->
+	<fieldset>
+		<legend>{DO_MATCHES}</legend>
+	<!-- IF not S_INSERT_LEAGUE -->
+	<p class="small"><input name="update_neg_status" id="update_neg_status" type="checkbox" class="radio" {S_CHECK_NEG_STATUS} /> {L_UPDATE_NEG_STATUS}</p>		
+	<p class="small"><input name="update_same_status" id="update_same_status" type="checkbox" class="radio" {S_CHECK_SAME_STATUS} /> {L_UPDATE_SAME_STATUS}</p>		
+	<p class="small"><input name="update_only_final" id="update_only_final" type="checkbox" class="radio" {S_CHECK_ONLY_FINAL} /> {L_UPDATE_ONLY_FINAL}</p>		
+	
+	<p class="small" style="text-align:right;margin-bottom:0px">
+		<a href="#" onclick="marklist('list', 'FOOTB_MATCHES_', true); return false;">{L_MARK_ALL}</a> &bull; 
+		<a href="#" onclick="marklist('list', 'FOOTB_MATCHES_', false); return false;">{L_UNMARK_ALL}</a>
+	</p>		
+	<!-- ENDIF -->
+	<table class="type_f">
+	<thead>
+	<tr>
+		<th>{L_MATCHDAY} 
+			<!-- IF not S_INSERT_LEAGUE -->
+				<input title="{L_UPDATE_THIS}" name="update_matches_matchday" id="update_matches_matchday" type="checkbox" class="radio" checked="checked" />
+			<!-- ENDIF --><br />
+			{L_MATCH_NUMBER}		
+		</th>
+		<th>{L_MATCH_BEGIN} 
+			<!-- IF not S_INSERT_LEAGUE -->
+				<input title="{L_UPDATE_THIS}" name="update_matches_match_datetime" id="update_matches_match_datetime" type="checkbox" class="radio" checked="checked" />
+			<!-- ENDIF --><br />
+			{L_MATCH_OF_GROUP} 
+			<!-- IF not S_INSERT_LEAGUE -->
+				<input title="{L_UPDATE_THIS}" name="update_matches_group_id" id="update_matches_group_id" type="checkbox" class="radio" checked="checked" />
+			<!-- ENDIF -->
+		</th>
+		<th>{L_MATCH_HOME} 
+			<!-- IF not S_INSERT_LEAGUE -->
+				<input title="{L_UPDATE_THIS}" name="update_matches_team_id_home" id="update_matches_team_id_home" type="checkbox" class="radio" checked="checked" />
+			<!-- ENDIF --><br />
+			{L_MATCH_GUEST} 
+			<!-- IF not S_INSERT_LEAGUE -->
+				<input title="{L_UPDATE_THIS}" name="update_matches_team_id_guest" id="update_matches_team_id_guest" type="checkbox" class="radio" checked="checked" />
+			<!-- ENDIF -->
+		</th>
+		<th>{L_RESULT} 
+			<!-- IF not S_INSERT_LEAGUE -->
+				<input title="{L_UPDATE_THIS}" name="update_matches_goals" id="update_matches_goals" type="checkbox" class="radio" checked="checked" />
+			<!-- ENDIF --><br /> 
+			&nbsp; 
+		</th>
+		<th>{L_EXTRATIME_SHORT} 
+			<!-- IF not S_INSERT_LEAGUE -->
+				<input title="{L_UPDATE_THIS}" name="update_matches_goals_overtime" id="update_matches_goals_overtime" type="checkbox" class="radio" checked="checked" />
+			<!-- ENDIF --><br />
+			&nbsp;
+		</th>
+		<th>{L_FORMULA} 
+			<!-- IF not S_INSERT_LEAGUE -->
+				<input title="{L_UPDATE_THIS}" name="update_matches_formula" id="update_matches_formula" type="checkbox" class="radio" checked="checked" />
+			<!-- ENDIF --><br />
+			&nbsp;
+		</th>
+		<th>{L_STATUS} 
+			<!-- IF not S_INSERT_LEAGUE -->
+				<input title="{L_UPDATE_THIS}" name="update_matches_status" id="update_matches_status" type="checkbox" class="radio" checked="checked" />
+			<!-- ENDIF --><br />
+			{L_KO}
+		</th>
+		<!-- IF not S_INSERT_LEAGUE -->
+		<th title="{L_SELECT_EXPLAIN}" style="text-align:center">{L_SELECT}<br />
+			&nbsp;
+		</th>
+		<!-- ENDIF -->
+	</tr>
+	</thead>
+	<tbody>
+	<!-- BEGIN footb_matches -->
+		{footb_matches.TPL}
+	<!-- END footb_matches -->
+	</tbody>
+	</table>
+	<!-- IF not S_INSERT_LEAGUE -->
+	<p class="small" style="text-align:right;margin-bottom:0px">
+		<a href="#" onclick="marklist('list', 'FOOTB_MATCHES_', true); return false;">{L_MARK_ALL}</a> &bull; 
+		<a href="#" onclick="marklist('list', 'FOOTB_MATCHES_', false); return false;">{L_UNMARK_ALL}</a>
+	</p>		
+	<!-- ENDIF -->
+	</fieldset>
+	<!-- ENDIF -->
+
+	<!-- IF .footb_matchdays or .footb_teams or .footb_matches -->
+	<fieldset class="submit-buttons">
+		<legend>{L_SUBMIT}</legend>
+		<input type="hidden" name="xml_ary" value="{XML_ARY}" />
+		<input type="hidden" name="s" value="{S_SEASON}" />
+		<input type="hidden" name="l" value="{S_LEAGUE}" />
+		<input type="hidden" name="league_name" value="{S_LEAGUE_NAME}" />
+		<input type="hidden" name="xcode" value="{S_XCODE}" />
+		<!-- IF S_INSERT_LEAGUE -->
+		<input class="button1" type="submit" id="submit" name="insert" value="{L_INSERT_LEAGUE}" />&nbsp;
+		<!-- ELSE -->
+		<input class="button1" type="submit" id="submit" name="update" value="{L_UPDATE_LEAGUE}" />&nbsp;
+		<!-- ENDIF -->
+		{S_FORM_TOKEN}
+	</fieldset>
+	<!-- ELSE -->
+		<div class="successbox">
+			<h3>{L_ADVICE}</h3>
+			<p>{L_NO_DIFFERENCES}</p>
+		</div>
+	<!-- ENDIF -->
+	</form>
+<!-- ENDIF -->
+<br />
+<div style="text-align: center;">phpBB Extension - Football Prediction League - Version {S_VERSION_NO} &copy; 2016 <a href="http://football.bplaced.net">football</a></div>
 <!-- INCLUDE overall_footer.html -->

adm/style/acp_football_userguide.html

@@ -1,44 +1,44 @@
-<!-- INCLUDECSS css/football_acp.css -->
-<!-- INCLUDE overall_header.html -->
-
-<a id="maincontent"></a>
-<!-- IF S_IN_FOOTBALL_USERGUIDE -->
-	<!-- IF U_FOOTBALL --><a href="{U_FOOTBALL}" style="float: {S_CONTENT_FLOW_END};">&laquo; {L_PREDICTION_LEAGUE}</a><!-- ENDIF -->
-	<!-- IF S_ERROR -->
-		<div class="errorbox">
-			<h3>{L_WARNING}</h3>
-			<p>{ERROR_MSG}</p>
-		</div>
-	<!-- ENDIF -->
-
-	<h1>{L_ACP_FOOTBALL} - {L_ACP_FOOTBALL_USERGUIDE}</h1>
-	<p>{L_ACP_FOOTBALL_USERGUIDE_EXPLAIN}</p>
-
-	<fieldset id="userguidelinks">
-		<!-- BEGIN userguide_block -->
-			<div style="font-size: 0.85em; padding-bottom: 5px; margin-bottom: 0.7em; line-height: 1.40em;"><strong>{userguide_block.BLOCK_TITLE}</strong><br />
-				<!-- BEGIN userguide_row -->
-					<a href="#ug{userguide_block.S_ROW_COUNT}{userguide_block.userguide_row.S_ROW_COUNT}">{userguide_block.userguide_row.USERGUIDE_QUESTION}</a><br />
-				<!-- END userguide_row -->
-			</div>
-		<!-- END userguide_block -->
-	</fieldset>
-
-	<!-- BEGIN userguide_block -->
-	<fieldset>
-		<h2>{userguide_block.BLOCK_TITLE}</h2>
-		<!-- BEGIN userguide_row -->
-			<div style="font-size: 0.85em; padding-bottom: 5px; margin-bottom: 0.7em; line-height: 1.40em;">
-				<span id="ug{userguide_block.S_ROW_COUNT}{userguide_block.userguide_row.S_ROW_COUNT}">
-					<strong>{userguide_block.userguide_row.USERGUIDE_QUESTION}</strong></span><br />
-				{userguide_block.userguide_row.USERGUIDE_ANSWER}<br /><br />
-				<a href="#userguidelinks">{ICON_BACK_TO_TOP}&nbsp;{L_BACK_TO_TOP}</a>
-			</div>
-			<!-- IF not userguide_block.userguide_row.S_LAST_ROW --><hr class="dashed" /><!-- ENDIF -->
-		<!-- END userguide_row -->
-	</fieldset>
-	<!-- END userguide_block -->
-<!-- ENDIF -->
-<br />
-<div style="text-align: center;">phpBB Extension - Football Prediction League - Version {S_VERSION_NO} &copy; 2016 <a href="http://football.bplaced.net">football</a></div>
+<!-- INCLUDECSS css/football_acp.css -->
+<!-- INCLUDE overall_header.html -->
+
+<a id="maincontent"></a>
+<!-- IF S_IN_FOOTBALL_USERGUIDE -->
+	<!-- IF U_FOOTBALL --><a href="{U_FOOTBALL}" style="float: {S_CONTENT_FLOW_END};">&laquo; {L_PREDICTION_LEAGUE}</a><!-- ENDIF -->
+	<!-- IF S_ERROR -->
+		<div class="errorbox">
+			<h3>{L_WARNING}</h3>
+			<p>{ERROR_MSG}</p>
+		</div>
+	<!-- ENDIF -->
+
+	<h1>{L_ACP_FOOTBALL} - {L_ACP_FOOTBALL_USERGUIDE}</h1>
+	<p>{L_ACP_FOOTBALL_USERGUIDE_EXPLAIN}</p>
+
+	<fieldset id="userguidelinks">
+		<!-- BEGIN userguide_block -->
+			<div style="font-size: 0.85em; padding-bottom: 5px; margin-bottom: 0.7em; line-height: 1.40em;"><strong>{userguide_block.BLOCK_TITLE}</strong><br />
+				<!-- BEGIN userguide_row -->
+					<a href="#ug{userguide_block.S_ROW_COUNT}{userguide_block.userguide_row.S_ROW_COUNT}">{userguide_block.userguide_row.USERGUIDE_QUESTION}</a><br />
+				<!-- END userguide_row -->
+			</div>
+		<!-- END userguide_block -->
+	</fieldset>
+
+	<!-- BEGIN userguide_block -->
+	<fieldset>
+		<h2>{userguide_block.BLOCK_TITLE}</h2>
+		<!-- BEGIN userguide_row -->
+			<div style="font-size: 0.85em; padding-bottom: 5px; margin-bottom: 0.7em; line-height: 1.40em;">
+				<span id="ug{userguide_block.S_ROW_COUNT}{userguide_block.userguide_row.S_ROW_COUNT}">
+					<strong>{userguide_block.userguide_row.USERGUIDE_QUESTION}</strong></span><br />
+				{userguide_block.userguide_row.USERGUIDE_ANSWER}<br /><br />
+				<a href="#userguidelinks">{ICON_BACK_TO_TOP}&nbsp;{L_BACK_TO_TOP}</a>
+			</div>
+			<!-- IF not userguide_block.userguide_row.S_LAST_ROW --><hr class="dashed" /><!-- ENDIF -->
+		<!-- END userguide_row -->
+	</fieldset>
+	<!-- END userguide_block -->
+<!-- ENDIF -->
+<br />
+<div style="text-align: center;">phpBB Extension - Football Prediction League - Version {S_VERSION_NO} &copy; 2016 <a href="http://football.bplaced.net">football</a></div>
 <!-- INCLUDE overall_footer.html -->

adm/style/css/football_acp.css

@@ -1,87 +1,87 @@
-/* -----------------------------------------------------------------------------------------
- * @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
- * ----------------------------------------------------------------------------------------- */
-/* Table for football data */
-/* Specific column styles */
-table.type_f thead th 				{ font-weight:normal; text-transform:uppercase; line-height:1.3em; padding:0 4px 2px 4px; }
-table.type_f thead th span 			{ padding-left:7px; }
-table.type_f tfoot td {
-	padding: 3px 4px;
-	color: #FFFFFF;
-	background: #70AED3 url("../images/gradient2b.gif") bottom left repeat-x;
-	border-bottom: 1px solid #6DACD2;
-	border-top: 1px solid #327AA5;
-	text-align: left;
-	font-size: 0.75em;
-	text-transform: uppercase;
-}
-
-table.type_f tbody tr:hover, 
-table.type_f tbody tr.hover { 
-	background-color: #FFFFFF; color: #000000; 
-}
-table.type_f body td 				{ padding: 1px 2px; border-top: 1px solid #FAFAFA; }
-table.type_f tbody th 				{ padding:1px 2px; border-top: 1px solid #000000; background-color: #BFC1CF; }
-table.type_f tbody tr 				{ border: 1px solid #cfcfcf; }
-th.td_tendency 		{ text-align: center; padding: 4px 2px 0 2px; font-weight: bold; }
-th.td_pts_total  		{ text-align: right; padding: 4px 4px 0 2px; }
-td.td_rank 			{ text-align: right; }
-td.td_group 			{ text-align: center; }
-td.td_hits 			{ text-align: center; }
-td.td_wins 			{ text-align: right; padding: 0 2px 0 4px; }
-td.td_match_no 		{ text-align: right; }
-td.td_logo 			{ text-align: center; }
-td.td_team 			{ text-align: left; padding: 0 1em 0 2px; }
-td.td_team_home 		{ text-align: right; width: 155px; }
-td.td_team_guest 	{ text-align: left; width: 155px; }
-td.td_vs 			{ text-align: center; max-width: 1em; padding: 0; }
-td.td_goals_home 	{ text-align: right; max-width: 3em; padding: 0;}
-td.td_goals_guest 	{ text-align: left; max-width: 3em; padding: 0; white-space: nowrap;}
-td.td_pts 			{ text-align: right; padding: 0 2px 0 2px; }
-td.td_button 		{ text-align: right; padding-right: 4px; }
-td.td_result 		{ text-align: center; }
-td.td_season 		{ text-align: center; }
-td.td_league 		{ text-align: center; }
-td.td_pts_total 		{ text-align: right; padding: 0 4px 0 2px; }
-td.td_points	 		{ text-align: right; padding: 0 2em 0 2px; }
-td.td_fp 			{ text-align: center; }
-td.td_matches 		{ text-align: center; }
-td.td_diff 			{ text-align: right; }
-td.td_counter 		{ text-align: right; }
-td.td_name 			{ text-align: left; }
-
-table.rank td.color_finally, table.football .color_finally, .color_finally , table.football .match_win, .match_win { 
-	font-weight: bold; 
-	color: #00AA00; 
-}
-
-table.rank td.color_provisionally, table.football .color_provisionally, .color_provisionally , table.football .match_lost, .match_lost  { 
-	font-weight: bold; 
-	color: #AA0000; 
-}
-
-table.football .match_draw, .match_draw  { 
-	font-weight: bold; 
-	color: #6A6A6A; 
-}
-
-table.rank td.color_not_rated, table.football .color_not_rated, .color_not_rated { 
-	font-weight: bold; 
-	color: purple; 
-}
-
-/* Background colors where the tables iterate between two colors or mark user*/
-.row_light 		{ background-color: #e1ebf2; }
-.row_dark 		{ background-color: #cadceb; }
-.row_user 		{ background-color: #99CC99; }
-.row_group td	{ background-color: #12A3EB; color: #FFFFFF !important; }
-.row_result 		{ background-color: #BFC1CF; }
-.row_result  td 	{ padding: 1px 2px; }
-
-
-.message {
-	font-weight: bold;
-	color: #AA0000;
-}
+/* -----------------------------------------------------------------------------------------
+ * @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
+ * ----------------------------------------------------------------------------------------- */
+/* Table for football data */
+/* Specific column styles */
+table.type_f thead th 				{ font-weight:normal; text-transform:uppercase; line-height:1.3em; padding:0 4px 2px 4px; }
+table.type_f thead th span 			{ padding-left:7px; }
+table.type_f tfoot td {
+	padding: 3px 4px;
+	color: #FFFFFF;
+	background: #70AED3 url("../images/gradient2b.gif") bottom left repeat-x;
+	border-bottom: 1px solid #6DACD2;
+	border-top: 1px solid #327AA5;
+	text-align: left;
+	font-size: 0.75em;
+	text-transform: uppercase;
+}
+
+table.type_f tbody tr:hover, 
+table.type_f tbody tr.hover { 
+	background-color: #FFFFFF; color: #000000; 
+}
+table.type_f body td 				{ padding: 1px 2px; border-top: 1px solid #FAFAFA; }
+table.type_f tbody th 				{ padding:1px 2px; border-top: 1px solid #000000; background-color: #BFC1CF; }
+table.type_f tbody tr 				{ border: 1px solid #cfcfcf; }
+th.td_tendency 		{ text-align: center; padding: 4px 2px 0 2px; font-weight: bold; }
+th.td_pts_total  		{ text-align: right; padding: 4px 4px 0 2px; }
+td.td_rank 			{ text-align: right; }
+td.td_group 			{ text-align: center; }
+td.td_hits 			{ text-align: center; }
+td.td_wins 			{ text-align: right; padding: 0 2px 0 4px; }
+td.td_match_no 		{ text-align: right; }
+td.td_logo 			{ text-align: center; }
+td.td_team 			{ text-align: left; padding: 0 1em 0 2px; }
+td.td_team_home 		{ text-align: right; width: 155px; }
+td.td_team_guest 	{ text-align: left; width: 155px; }
+td.td_vs 			{ text-align: center; max-width: 1em; padding: 0; }
+td.td_goals_home 	{ text-align: right; max-width: 3em; padding: 0;}
+td.td_goals_guest 	{ text-align: left; max-width: 3em; padding: 0; white-space: nowrap;}
+td.td_pts 			{ text-align: right; padding: 0 2px 0 2px; }
+td.td_button 		{ text-align: right; padding-right: 4px; }
+td.td_result 		{ text-align: center; }
+td.td_season 		{ text-align: center; }
+td.td_league 		{ text-align: center; }
+td.td_pts_total 		{ text-align: right; padding: 0 4px 0 2px; }
+td.td_points	 		{ text-align: right; padding: 0 2em 0 2px; }
+td.td_fp 			{ text-align: center; }
+td.td_matches 		{ text-align: center; }
+td.td_diff 			{ text-align: right; }
+td.td_counter 		{ text-align: right; }
+td.td_name 			{ text-align: left; }
+
+table.rank td.color_finally, table.football .color_finally, .color_finally , table.football .match_win, .match_win { 
+	font-weight: bold; 
+	color: #00AA00; 
+}
+
+table.rank td.color_provisionally, table.football .color_provisionally, .color_provisionally , table.football .match_lost, .match_lost  { 
+	font-weight: bold; 
+	color: #AA0000; 
+}
+
+table.football .match_draw, .match_draw  { 
+	font-weight: bold; 
+	color: #6A6A6A; 
+}
+
+table.rank td.color_not_rated, table.football .color_not_rated, .color_not_rated { 
+	font-weight: bold; 
+	color: purple; 
+}
+
+/* Background colors where the tables iterate between two colors or mark user*/
+.row_light 		{ background-color: #e1ebf2; }
+.row_dark 		{ background-color: #cadceb; }
+.row_user 		{ background-color: #99CC99; }
+.row_group td	{ background-color: #12A3EB; color: #FFFFFF !important; }
+.row_result 		{ background-color: #BFC1CF; }
+.row_result  td 	{ padding: 1px 2px; }
+
+
+.message {
+	font-weight: bold;
+	color: #AA0000;
+}

adm/style/frame_results.html

@@ -1,13 +1,13 @@
-<!-- IF 0 -->
-Diese Datei existiert doppelt: Einmal im fooball\football\styles\prsilver\template und einmal im fooball\football\adm\style Ordner
-Mit Hilfe dieser Datei werden Fussballergebnisse zum Abgleich und schnelleren Erfassung von externen Seiten,
-wie z.B. den Weltfussball.de Torverteiler, eingebunden.
-Wenn ihr einen Weltfussball.de Account habt, könnt ihr dort in der Community einen Torverteiler erstellen und den Code hier 
-unter der entsprechenden Liganummer reinhängen (also 999999 mit der Liganummer bzw. wfb_tv_id ersetzen).
-Der Frame wird dann bei der Ergebnisseingabe in der Liga angezeigt, wenn der Spieltag editierbar ist.
-<!-- ENDIF -->
-<!-- IF S_EDIT_MODE -->
-	<!-- IF S_LEAGUE == 999999 -->
-		<div id="tor_v1" style="width:400px;text-align:right;font-family:Arial,Helvetica,Verdana,sans-serif;color:#000000;font-size:8pt;background-color:#cadceb;"><div id="iTorV1"></div>Der Torverteiler - pr&auml;sentiert von <a href="http://www.weltfussball.de/" target="_blank">weltfussball.de</a>&nbsp;<br />Alles &uuml;ber <a href="http://www.weltfussball.de/" target="_blank">Fu&szlig;ball</a> oder direkt zur <a href="http://www.weltfussball.de/wettbewerb/bundesliga/">Bundesliga</a>&nbsp;</div><script type="text/javascript">var wfb_tv_id="999999";</script><script id="wfb_link" type="text/javascript" src="http://www.weltfussball.de/js/get_tv.js"></script>
-	<!-- ENDIF -->
-<!-- ENDIF -->
+<!-- IF 0 -->
+Diese Datei existiert doppelt: Einmal im fooball\football\styles\prsilver\template und einmal im fooball\football\adm\style Ordner
+Mit Hilfe dieser Datei werden Fussballergebnisse zum Abgleich und schnelleren Erfassung von externen Seiten,
+wie z.B. den Weltfussball.de Torverteiler, eingebunden.
+Wenn ihr einen Weltfussball.de Account habt, könnt ihr dort in der Community einen Torverteiler erstellen und den Code hier 
+unter der entsprechenden Liganummer reinhängen (also 999999 mit der Liganummer bzw. wfb_tv_id ersetzen).
+Der Frame wird dann bei der Ergebnisseingabe in der Liga angezeigt, wenn der Spieltag editierbar ist.
+<!-- ENDIF -->
+<!-- IF S_EDIT_MODE -->
+	<!-- IF S_LEAGUE == 999999 -->
+		<div id="tor_v1" style="width:400px;text-align:right;font-family:Arial,Helvetica,Verdana,sans-serif;color:#000000;font-size:8pt;background-color:#cadceb;"><div id="iTorV1"></div>Der Torverteiler - pr&auml;sentiert von <a href="http://www.weltfussball.de/" target="_blank">weltfussball.de</a>&nbsp;<br />Alles &uuml;ber <a href="http://www.weltfussball.de/" target="_blank">Fu&szlig;ball</a> oder direkt zur <a href="http://www.weltfussball.de/wettbewerb/bundesliga/">Bundesliga</a>&nbsp;</div><script type="text/javascript">var wfb_tv_id="999999";</script><script id="wfb_link" type="text/javascript" src="http://www.weltfussball.de/js/get_tv.js"></script>
+	<!-- ENDIF -->
+<!-- ENDIF -->

block/all_bets.php

@@ -7,18 +7,30 @@
 *
 */
 
-if (!defined('IN_PHPBB') OR !defined('IN_FOOTBALL'))
+if (!defined('IN_PHPBB'))
 {
 	exit;
 }
 
 $start = $this->request->variable('start', 0);
 $matches_on_matchday = false;
-
-$sql = 'SELECT COUNT(DISTINCT  user_id) AS num_users
-		FROM  ' . FOOTB_BETS . " 
-		WHERE  season = $season AND league = $league";
-		
+$league_info = league_info($season, $league);
+if($league_info['bet_type'])
+{
+	$sql = 'SELECT COUNT(DISTINCT  b.user_id) AS num_users
+		FROM  ' . FOOTB_MATCHES . ' AS m
+		LEFT JOIN ' . FOOTB_BETS . " AS b ON (b.season = m.season AND b.league = m.league AND b.match_no = m.match_no)
+		WHERE  b.season = $season AND b.league = $league AND m.matchday = $matchday";
+}
+else
+{
+	$sql = 'SELECT COUNT(DISTINCT  b.user_id) AS num_users
+			FROM  ' . FOOTB_MATCHES . ' AS m
+			LEFT JOIN ' . FOOTB_BETS . ' AS b ON (b.season = m.season AND b.league = m.league AND b.match_no = m.match_no)
+			LEFT JOIN ' . FOOTB_MATCHES . ' AS m2 ON (m2.season = m.season AND m2.league = m.league + 50 AND m2.matchday = m.matchday  AND m2.team_id_home = b.user_id + 2000)
+			LEFT JOIN ' . FOOTB_MATCHES . " AS m3 ON (m3.season = m.season AND m3.league = m.league + 50 AND m3.matchday = m.matchday  AND m3.team_id_guest = b.user_id + 2000)
+			WHERE  b.season = $season AND b.league = $league AND m.matchday = $matchday AND (m2.match_no IS NOT NULL || m3.match_no IS NOT NULL) ";
+}
 $result = $db->sql_query($sql);
 $total_users = (int) $db->sql_fetchfield('num_users');
 $db->sql_freeresult($result);
@@ -36,7 +48,19 @@ $sql = "SELECT
 		m.goals_guest,
 		SUM(IF(b.goals_home + 0 > b.goals_guest AND b.goals_home <> '' AND b.goals_guest <> '', 1, 0)) AS home,
 		SUM(IF(b.goals_home = b.goals_guest AND b.goals_home <> '' AND b.goals_guest <> '', 1, 0)) AS draw,
-		SUM(IF(b.goals_home + 0 < b.goals_guest AND b.goals_home <> '' AND b.goals_guest <> '', 1, 0)) AS guest
+		SUM(IF(b.goals_home + 0 < b.goals_guest AND b.goals_home <> '' AND b.goals_guest <> '', 1, 0)) AS guest,
+		CONCAT(
+			CASE DATE_FORMAT(m.match_datetime,'%w')
+			  WHEN 0 THEN '" . $lang_dates['Sun'] . "'
+			  WHEN 1 THEN '" . $lang_dates['Mon'] . "'
+			  WHEN 2 THEN '" . $lang_dates['Tue'] . "'
+			  WHEN 3 THEN '" . $lang_dates['Wed'] . "'
+			  WHEN 4 THEN '" . $lang_dates['Thu'] . "'
+			  WHEN 5 THEN '" . $lang_dates['Fri'] . "'
+			  WHEN 6 THEN '" . $lang_dates['Sat'] . "'
+			  ELSE 'Error' END,
+			DATE_FORMAT(m.match_datetime,' %d.%m. %H:%i')
+		) AS match_time
 	FROM  " . FOOTB_MATCHES . ' AS m
 	LEFT JOIN ' . FOOTB_TEAMS . ' AS t1 ON (t1.season = m.season AND t1.league = m.league AND t1.team_id = m.team_id_home)
 	LEFT JOIN ' . FOOTB_TEAMS . ' AS t2 ON (t2.season = m.season AND t2.league = m.league AND t2.team_id = m.team_id_guest)
@@ -67,7 +91,7 @@ if ($user->data['football_mobile'])
 }
 else
 {
-	if ($count_matches > 11)
+	if ($count_matches > 12)
 	{
 		$split_after = 8;
 		$splits = ceil($count_matches / 8);
@@ -94,7 +118,7 @@ $sql_limit = $config['football_users_per_page'] * $count_matches;
 
 // If we've got a hightlight set pass it on to pagination.
 // handle pagination.
-$base_url = $this->helper->route('football_main_controller', array('side' => 'all_bets', 's' => $season, 'l' => $league, 'm' => $matchday));
+$base_url = $this->helper->route('football_football_controller', array('side' => 'all_bets', 's' => $season, 'l' => $league, 'm' => $matchday));
 $pagination = $phpbb_container->get('pagination');
 if ($user->data['football_mobile'])
 {
@@ -113,21 +137,47 @@ if ($count_matches > 0)
 {
 	$matches_on_matchday = true;
 
-	$sql = "SELECT
-			u.user_id,
-			u.username,
-			m.status,
-			b.goals_home AS bet_home,
-			b.goals_guest AS bet_guest,
-			" . select_points() . '
-		FROM  ' . FOOTB_MATCHES . ' AS m
-		LEFT JOIN ' . FOOTB_BETS . ' AS b ON (b.season = m.season AND b.league = m.league AND b.match_no = m.match_no)
-		LEFT JOIN ' . USERS_TABLE . " AS u ON (u.user_id = b.user_id)
-		WHERE m.season = $season 
-			AND m.league = $league 
-			AND m.matchday = $matchday
-		ORDER BY LOWER(u.username) ASC, m.match_datetime ASC, m.match_no ASC";
-		
+	if($league_info['bet_type'])
+	{
+		$sql = "SELECT
+				u.user_id,
+				u.username,
+				m.status,
+				b.goals_home AS bet_home,
+				b.goals_guest AS bet_guest,
+				IFNULL(m2.match_no,m3.match_no),
+				" . select_points() . '
+			FROM  ' . FOOTB_MATCHES . ' AS m
+			LEFT JOIN ' . FOOTB_BETS . ' AS b ON (b.season = m.season AND b.league = m.league AND b.match_no = m.match_no)
+				LEFT JOIN ' . USERS_TABLE . ' AS u ON (u.user_id = b.user_id)
+				LEFT JOIN ' . FOOTB_MATCHES . ' AS m2 ON (m2.season = m.season AND m2.league = m.league + 50 AND m2.matchday = m.matchday  AND m2.team_id_home = b.user_id + 2000)
+				LEFT JOIN ' . FOOTB_MATCHES . " AS m3 ON (m3.season = m.season AND m3.league = m.league + 50 AND m3.matchday = m.matchday  AND m3.team_id_guest = b.user_id + 2000)
+			WHERE m.season = $season
+				AND m.league = $league
+				AND m.matchday = $matchday
+				ORDER BY IFNULL(m2.match_no,m3.match_no) ASC, m3.match_no ASC, LOWER(u.username) ASC, m.match_datetime ASC, m.match_no ASC";
+	}
+	else
+	{
+		$sql = "SELECT
+				u.user_id,
+				u.username,
+				m.status,
+				b.goals_home AS bet_home,
+				b.goals_guest AS bet_guest,
+				IFNULL(m2.match_no,m3.match_no),
+				" . select_points() . '
+			FROM  ' . FOOTB_MATCHES . ' AS m
+			LEFT JOIN ' . FOOTB_BETS . ' AS b ON (b.season = m.season AND b.league = m.league AND b.match_no = m.match_no)
+			LEFT JOIN ' . USERS_TABLE . ' AS u ON (u.user_id = b.user_id)
+			LEFT JOIN ' . FOOTB_MATCHES . ' AS m2 ON (m2.season = m.season AND m2.league = m.league + 50 AND m2.matchday = m.matchday  AND m2.team_id_home = b.user_id + 2000)
+			LEFT JOIN ' . FOOTB_MATCHES . " AS m3 ON (m3.season = m.season AND m3.league = m.league + 50 AND m3.matchday = m.matchday  AND m3.team_id_guest = b.user_id + 2000)
+			WHERE m.season = $season
+				AND m.league = $league
+				AND m.matchday = $matchday
+				AND (m3.match_no IS NOT NULL OR m2.match_no IS NOT NULL)
+			ORDER BY IFNULL(m2.match_no,m3.match_no) ASC, m3.match_no ASC, LOWER(u.username) ASC, m.match_datetime ASC, m.match_no ASC";
+	}
 	$result = $db->sql_query_limit($sql, $sql_limit, $sql_start);
 	$user_bets = $db->sql_fetchrowset($result);
 	$db->sql_freeresult($result);
@@ -164,56 +214,67 @@ foreach ($matches AS $match)
 			$count_user = 0;
 			$bet_index = 0;
 			$last_match_index = 0;
-			foreach ($bet_line[$split_index] AS $user_bet)
-			{
-				if ($bet_index == 0)
-				{
-					$count_user++;
-					$row_class = (!($count_user % 2)) ? 'bg1 row_light' : 'bg2 row_dark';
-					if ($user_bet['user_id'] == $user->data['user_id'])
-					{
-						$row_class = 'bg3  row_user';
-					}
-					$template->assign_block_vars('match_panel.user_row', array(
-						'ROW_CLASS' => $row_class,
-						'USER_NAME' => $user_bet['username'],
-						)
-					);
-					$total = 0;
-				}	
-				$bet_index++;
-				$total += ($user_bet['points'] == '') ? 0 : $user_bet['points'];
-				if ($user_bet['status'] < 3)
-				{
-					$colorstyle_total = ' color_provisionally';
-				}
-				if ($user_bet['status'] < 1 && !$config['football_view_bets'])
-				{
-					// hide bets
-					$bet_home = ($user_bet['bet_home'] == '') ? '&nbsp;' : '?';
-					$bet_guest = ($user_bet['bet_guest'] == '') ? '&nbsp;' : '?';
-				}
-				else
-				{
-					$bet_home = $user_bet['bet_home'];
-					$bet_guest = $user_bet['bet_guest'];
-				}
-				
-				$colorstyle_bet = color_style($user_bet['status']);
-				$template->assign_block_vars('match_panel.user_row.bet', array(
-					'BET' 			=> $bet_home. ':'. $bet_guest,
-					'COLOR_STYLE' 	=> $colorstyle_bet,
-					'POINTS' 		=> ($user_bet['points'] == '') ? '&nbsp;' : $user_bet['points'],
-					)
-				);
+			if(!empty($bet_line))
+            {
+                foreach ($bet_line[$split_index] AS $user_bet)
+                {
+                    if ($bet_index == 0)
+                    {
+                        $count_user++;
+                        $league_info = league_info($season, $league);
+                        if ($league_info['bet_type'])
+                        {
+                            $row_class = (!($count_user % 2)) ? 'bg1 row_light' : 'bg2 row_dark';
+                        }
+                        else
+                        {
+                            $row_class = (!(($count_user + ($count_user % 2)) % 4)) ? 'bg1 row_light' : 'bg2 row_dark';
+                        }
+                        if ($user_bet['user_id'] == $user->data['user_id'])
+                        {
+                            $row_class = 'bg3  row_user';
+                        }
+                        $template->assign_block_vars('match_panel.user_row', array(
+                            'ROW_CLASS' => $row_class,
+                            'USER_NAME' => $user_bet['username'],
+                            )
+                        );
+                        $total = 0;
+                    }
+                    $bet_index++;
+                    $total += ($user_bet['points'] == '') ? 0 : $user_bet['points'];
+                    if ($user_bet['status'] < 3)
+                    {
+                        $colorstyle_total = ' color_provisionally';
+                    }
+                    if ($user_bet['status'] < 1 && !$config['football_view_bets'])
+                    {
+                        // hide bets
+                        $bet_home = ($user_bet['bet_home'] == '') ? '&nbsp;' : '?';
+                        $bet_guest = ($user_bet['bet_guest'] == '') ? '&nbsp;' : '?';
+                    }
+                    else
+                    {
+                        $bet_home = $user_bet['bet_home'];
+                        $bet_guest = $user_bet['bet_guest'];
+                    }
 
-				if ($bet_index == $split_after)
-				{
-					$sum_total[$user_bet['username']] += $total;
-					$matchday_sum_total += $total;
-					$bet_index = 0;
-				}
-			}
+                    $colorstyle_bet = color_style($user_bet['status']);
+                    $template->assign_block_vars('match_panel.user_row.bet', array(
+                        'BET' 			=> $bet_home. ':'. $bet_guest,
+                        'COLOR_STYLE' 	=> $colorstyle_bet,
+                        'POINTS' 		=> ($user_bet['points'] == '') ? '&nbsp;' : $user_bet['points'],
+                        )
+                    );
+
+                    if ($bet_index == $split_after)
+                    {
+                        $sum_total[$user_bet['username']] += $total;
+                        $matchday_sum_total += $total;
+                        $bet_index = 0;
+                    }
+                }
+            }
 
 			$template->assign_block_vars('match_panel.tendency_footer', array(
 				'S_TOTAL' => false,
@@ -264,10 +325,11 @@ foreach ($matches AS $match)
 	}
 	$colorstyle_match = color_style($match['status']);
 	$template->assign_block_vars('match_panel.match_entry', array(
-		'HOME_NAME' 	=> $homename,
-		'GUEST_NAME' 	=> $guestname,
-		'RESULT' 		=> $match['goals_home']. ':'.$match['goals_guest'],
-		'COLOR_STYLE' 	=> $colorstyle_match,
+    		'HOME_NAME' 	=> $homename,
+    		'GUEST_NAME' 	=> $guestname,
+    		'RESULT' 		=> $match['goals_home']. ':'.$match['goals_guest'],
+    		'COLOR_STYLE' 	=> $colorstyle_match,
+    		'MATCH_TIME' 	=> $match['match_time'],
 		)
 	);
 	if ($match['status'] < 1 && !$config['football_view_tendencies'])
@@ -287,59 +349,70 @@ if ($count_matches > 0)
 	$total = 0;
 	$count_user = 0;
 	$bet_index = 0;
-	foreach ($bet_line[$split_index] AS $user_bet)
+	if(!empty($bet_line))
 	{
-		if ($bet_index == 0)
+		foreach ($bet_line[$split_index] AS $user_bet)
 		{
-			$count_user++;
-			$row_class = (!($count_user % 2)) ? 'bg1 row_light' : 'bg2 row_dark';
-			if ($user_bet['user_id'] == $user->data['user_id'])
+			if ($bet_index == 0)
 			{
-				$row_class = 'bg3  row_user';
+				$count_user++;
+				$league_info = league_info($season, $league);
+				if ($league_info['bet_type'])
+				{
+					$row_class = (!($count_user % 2)) ? 'bg1 row_light' : 'bg2 row_dark';
+				}
+				else
+				{
+					$row_class = (!(($count_user + ($count_user % 2)) % 4)) ? 'bg1 row_light' : 'bg2 row_dark';
+				}
+				if ($user_bet['user_id'] == $user->data['user_id'])
+				{
+					$row_class = 'bg3  row_user';
+				}
+				$template->assign_block_vars('match_panel.user_row', array(
+					'ROW_CLASS' => $row_class,
+					'USER_NAME' => $user_bet['username'],
+					)
+				);
+				$total = 0;
+			}
+			$bet_index++;
+			$total += ($user_bet['points'] == '') ? 0 : $user_bet['points'];
+			if ($user_bet['status'] < 3)
+			{
+				$colorstyle_total = ' color_provisionally';
+			}
+			if ($user_bet['status'] < 1 && !$config['football_view_bets'])
+			{
+				// hide bets
+				$bet_home = ($user_bet['bet_home'] == '') ? '' : '?';
+				$bet_guest = ($user_bet['bet_guest'] == '') ? '' : '?';
+			}
+			else
+			{
+				$bet_home = $user_bet['bet_home'];
+				$bet_guest = $user_bet['bet_guest'];
 			}
-			$template->assign_block_vars('match_panel.user_row', array(
-				'ROW_CLASS' => $row_class,
-				'USER_NAME' => $user_bet['username'],
-				)
-			);
-			$total = 0;
-		}	
-		$bet_index++;
-		$total += ($user_bet['points'] == '') ? 0 : $user_bet['points'];
-		if ($user_bet['status'] < 3)
-		{
-			$colorstyle_total = ' color_provisionally';
-		}
-		if ($user_bet['status'] < 1 && !$config['football_view_bets'])
-		{
-			// hide bets
-			$bet_home = ($user_bet['bet_home'] == '') ? '' : '?';
-			$bet_guest = ($user_bet['bet_guest'] == '') ? '' : '?';
-		}
-		else
-		{
-			$bet_home = $user_bet['bet_home'];
-			$bet_guest = $user_bet['bet_guest'];
-		}
-		
-		$colorstyle_bet = color_style($user_bet['status']);
-		$template->assign_block_vars('match_panel.user_row.bet', array(
-			'BET' 			=> $bet_home. ':'. $bet_guest,
-			'COLOR_STYLE' 	=> $colorstyle_bet,
-			'POINTS' 		=> ($user_bet['points'] == '') ? '&nbsp;' : $user_bet['points'],
-			)
-		);
 
-		if ($bet_index == $last_match_index)
-		{
-			$sum_total[$user_bet['username']] += $total;
-			$matchday_sum_total += $total;
-			$template->assign_block_vars('match_panel.user_row.points', array(
-				'COLOR_STYLE' 	=> $colorstyle_total,
-				'POINTS_TOTAL' 	=> $sum_total[$user_bet['username']],
+			$colorstyle_bet = color_style($user_bet['status']);
+			$template->assign_block_vars('match_panel.user_row.bet', array(
+				'BET' 			=> $bet_home. ':'. $bet_guest,
+				'COLOR_STYLE' 	=> $colorstyle_bet,
+				'POINTS' 		=> ($user_bet['points'] == '') ? '&nbsp;' : $user_bet['points'],
 				)
 			);
-			$bet_index = 0;
+
+			if ($bet_index == $last_match_index)
+			{
+				$sum_total[$user_bet['username']] += $total;
+				$matchday_sum_total += $total;
+				$template->assign_block_vars('match_panel.user_row.points', array(
+					'COLOR_STYLE' 	=> $colorstyle_total,
+					'POINTS_TOTAL' 	=> $sum_total[$user_bet['username']],
+					)
+				);
+				$bet_index = 0;
+			}
 		}
 	}
 
@@ -450,7 +523,7 @@ while ($row = $db->sql_fetchrow($result))
 	while ($user_row = $db->sql_fetchrow($result_bet))
 	{
 		$bet_number++ ;
-		$row_class = (!($bet_number % 2)) ? 'bg1 row_light' : 'bg2 row_dark';
+		$row_class = (!(($count_user + ($count_user % 2)) % 4)) ? 'bg1 row_light' : 'bg2 row_dark';
 		if ($user_row['user_id'] == $user->data['user_id'])
 		{
 			$row_class = 'bg3  row_user';
@@ -492,4 +565,3 @@ $template->assign_vars(array(
 	'TOTAL_USERS'				=> ($total_users == 1) ? $user->lang['VIEW_BET_USER'] : sprintf($user->lang['VIEW_BET_USERS'], $total_users),
 	)
 );
-?>

block/bank.php

@@ -7,6 +7,11 @@
 *
 */
 
+if (!defined('IN_PHPBB'))
+{
+	exit;
+}
+
 // Check Prediction League authorisation 
 if ( !$this->auth->acl_get('u_use_football') )
 {
@@ -225,5 +230,3 @@ $template->assign_vars(array(
 	'POINTS'					=> $config['football_win_name'],	
 	)
 );
-
-?>

block/bet.php

@@ -7,7 +7,7 @@
 *
 */
 
-if (!defined('IN_PHPBB') OR !defined('IN_FOOTBALL'))
+if (!defined('IN_PHPBB'))
 {
 	exit;
 }
@@ -20,7 +20,9 @@ $join_league = false;
 $matchnumber = 0;
 $userid =  $user->data['user_id'];
 $lang_dates = $user->lang['datetime'];
+$league_info = league_info($season, $league);
 $user_is_member = user_is_member($userid, $season, $league);
+$user_is_allowed_to_bet = $league_info['bet_type'] ? true : user_is_allowed_to_bet($userid, $season, $league, $matchday);
 $display_rating = false;
 
 // Calculate multiple delivery
@@ -470,7 +472,6 @@ while ($row = $db->sql_fetchrow($result))
 }
 $db->sql_freeresult($result);
 
-$league_info = league_info($season, $league);
 $bet_explain = '';
 switch ($league_info['bet_ko_type'])
 {
@@ -508,10 +509,10 @@ $template->assign_vars(array(
 	'S_SIDENAME' 				=> $sidename,
 	'BET_EXPLAIN' 				=> $bet_explain,
 	'JOIN_LEAGUE'	 			=> ($link_rules == '') ? '' : sprintf($user->lang['JOIN_LEAGUE'], $link_rules),
-	'S_FORM_ACTION_BET' 		=> $this->helper->route('football_main_controller', array('side' => 'bet', 's' => $season, 'l' => $league, 'm' => $matchday, 'action' => 'bet')),
-	'S_FORM_ACTION_JOIN' 		=> $this->helper->route('football_main_controller', array('side' => 'bet', 's' => $season, 'l' => $league, 'm' => $matchday, 'action' => 'join')),
+	'S_FORM_ACTION_BET' 		=> $this->helper->route('football_football_controller', array('side' => 'bet', 's' => $season, 'l' => $league, 'm' => $matchday, 'action' => 'bet')),
+	'S_FORM_ACTION_JOIN' 		=> $this->helper->route('football_football_controller', array('side' => 'bet', 's' => $season, 'l' => $league, 'm' => $matchday, 'action' => 'join')),
 	'S_USER_IS_MEMBER' 			=> $user_is_member,
-	'S_DATA_BET' 				=> $data_bet,
+	'S_DATA_BET' 				=> $data_bet && $user_is_allowed_to_bet,
 	'S_DATA_GROUP'				=> $data_group,
 	'S_DATA_BET_RESULTS'		=> $data_bet_results,
 	'S_EDIT_MODE' 				=> $edit_mode,
@@ -526,5 +527,3 @@ $template->assign_vars(array(
 	'S_DISPLAY_RATING'			=> $display_rating,
 	)
 );
-
-?>

block/bet_popup.php

@@ -7,6 +7,11 @@
 *
 */
 
+if (!defined('IN_PHPBB'))
+{
+	exit;
+}
+
 // Can this user view Prediction Leagues pages?
 if (!$config['football_guest_view'])
 {
@@ -389,4 +394,3 @@ $template->set_filenames(array(
 );
 
 page_footer();
-?>

block/delivery.php

@@ -7,7 +7,7 @@
 *
 */
 
-if (!defined('IN_PHPBB') OR !defined('IN_FOOTBALL'))
+if (!defined('IN_PHPBB'))
 {
 	exit;
 }
@@ -43,8 +43,8 @@ $sql = "SELECT
 		LEFT JOIN " . FOOTB_EXTRA . " AS e ON (e.season = m.season AND e.league = m.league AND e.matchday = m.matchday  AND e.extra_status = 0)
 		LEFT JOIN " . FOOTB_EXTRA_BETS . " AS eb ON (eb.season = m.season AND eb.league = m.league AND eb.extra_no = e.extra_no AND eb.user_id = $user_id)
 		WHERE m.status <= 0 
-		GROUP BY delivery, m.league
-		ORDER BY delivery, m.league";
+		GROUP BY m.season, m.league, m.matchday, l.league_name_short, matchday_name, delivery
+		ORDER BY delivery, m.season, m.league";
 	
 $result = $db->sql_query($sql);
 while($row = $db->sql_fetchrow($result) AND $index < 11)
@@ -55,7 +55,7 @@ while($row = $db->sql_fetchrow($result) AND $index < 11)
 		
 	$template->assign_block_vars('delivery', array(
 		'ROW_CLASS' 	=> $row_class,
-		'U_BET_LINK'	=> $this->helper->route('football_main_controller', array('side' => 'bet', 's' =>  $row['season'], 'l' => $row['league'], 'm' => $row['matchday'])),
+		'U_BET_LINK'	=> $this->helper->route('football_football_controller', array('side' => 'bet', 's' =>  $row['season'], 'l' => $row['league'], 'm' => $row['matchday'])),
 		'LEAGUE_SHORT' 	=> $row['league_name_short'],
 		'MATCHDAY_NAME' => $row['matchday_name'],
 		'COLOR'			=> ($row['bets_count'] == $row['matches_count'] && $row['extra_bets_count'] == $row['extra_count']) ? 'green' : 'red',
@@ -71,5 +71,3 @@ $template->assign_vars(array(
 	'S_DATA_DELIVERY' 		=> $data_delivery,
 	)
 );
-
-?>

block/dload_bank.php

@@ -7,6 +7,11 @@
 *
 */
 
+if (!defined('IN_PHPBB'))
+{
+	exit;
+}
+
 $this->user->add_lang_ext('football/football', 'info_acp_bank');
 
 // Check Prediction League authorisation 
@@ -16,11 +21,11 @@ if ( !$this->auth->acl_get('u_use_football') )
 }
 
 $action='';
-	$phpbb_root_path = './../../';
+$phpbb_root_path = './../../';
 
 if (!$season OR !$league)
 {
-	redirect($this->helper->route('football_main_controller', array('side' => 'bank', 's' => $season, 'l' => $league)));
+	redirect($this->helper->route('football_football_controller', array('side' => 'bank', 's' => $season, 'l' => $league)));
 }
 else
 {
@@ -90,14 +95,10 @@ else
 			}
 			$user_rows = $db->sql_fetchrowset($result);
 			$db->sql_freeresult($result);
-			$export_file = $league_short . '_' . $season . '_bank.csv';
 			$newline = "\r\n";
-			header('Pragma: no-cache');
-			header("Content-Type: text/csv; name=\"$export_file\"");
-			header("Content-disposition: attachment; filename=$export_file");
-			$export= '';
-			$export .= $league_name . ' ' . sprintf($user->lang['SEASON']) . ' ' . $season. $newline;
-			$export .= sprintf($user->lang['NAME']) . ';' . $config['football_win_name'] . ';' . sprintf($user->lang['BET_POINTS']) . ';' . 
+			$csv_data= '';
+			$csv_data .= $league_name . ' ' . sprintf($user->lang['SEASON']) . ' ' . $season. $newline;
+			$csv_data .= sprintf($user->lang['NAME']) . ';' . $config['football_win_name'] . ';' . sprintf($user->lang['BET_POINTS']) . ';' . 
 						sprintf($user->lang['DEPOSITED']) . ';' . sprintf($user->lang['DEPOSIT']) . ';' . sprintf($user->lang['WINS']) . ';' . 
 						sprintf($user->lang['PAID']) . ';' . sprintf($user->lang['PAYOUT']) . ';' . $newline;
 
@@ -118,7 +119,7 @@ else
 					$no_cash_wins = '';
 					$no_cash_paid = '';
 				}
-				$export .= str_replace("\"", "\"\"", $user_row['username']) . ';' . 
+				$csv_data .= str_replace("\"", "\"\"", $user_row['username']) . ';' . 
 							str_replace('.', ',', $user_row['user_points']) . ';' .
 							str_replace('.', ',', $user_row['bet_points']) . $no_cash_bet_points . ';' .
 							str_replace('.', ',', $user_row['deposit']) . $no_cash_deposit . ';' .
@@ -127,9 +128,24 @@ else
 							str_replace('.', ',', $user_row['paid']) . $no_cash_paid . ';' .
 							str_replace('.', ',', $user_row['new_pay']) . ';' . $newline;
 			}
-			echo utf8_decode($export);
-			exit;
+
+			// Output the csv file
+			$filename = $league_short . '_' . $season . '_bank.csv';
+			$fp = fopen('php://output', 'w');
+			
+			header('Content-Type: application/octet-stream');
+			header("Content-disposition: attachment; filename=\"" . basename($filename) . "\"");
+			header('Expires: 0');
+			header('Cache-Control: must-revalidate, post-check=0, pre-check=0');
+			header('Cache-Control: private', false);
+			header('Pragma: public');
+			header('Content-Transfer-Encoding: binary');
+			
+			fwrite($fp, "\xEF\xBB\xBF"); // UTF-8 BOM
+			
+			fwrite($fp, utf8_decode($csv_data));
+			fclose($fp);
+			exit_handler();
 		}
 	}
 }
-?>

block/dload_bank_open.php

@@ -7,6 +7,11 @@
 *
 */
 
+if (!defined('IN_PHPBB'))
+{
+	exit;
+}
+
 $this->user->add_lang_ext('football/football', 'info_acp_bank');
 
 // Check Prediction League authorisation 
@@ -19,7 +24,7 @@ $action='';
 
 if (!$season)
 {
-	redirect($this->helper->route('football_main_controller', array('side' => 'bank', 's' => $season)));
+	redirect($this->helper->route('football_football_controller', array('side' => 'bank', 's' => $season)));
 }
 else
 {
@@ -50,14 +55,10 @@ else
 		}
 		$user_rows = $db->sql_fetchrowset($result);
 		$db->sql_freeresult($result);
-		$export_file = $season. '_bank.csv';
 		$newline = "\r\n";
-		header('Pragma: no-cache');
-		header("Content-Type: text/csv; name=\"$export_file\"");
-		header("Content-disposition: attachment; filename=$export_file");
-		$export= '';
-		$export .= sprintf($user->lang['SEASON']) . ' ' . $season. $newline;
-		$export .= sprintf($user->lang['NAME']) . ';' . sprintf($user->lang['SEASON']) . ';' . sprintf($user->lang['LEAGUE']) . ';Saldo;' . $newline;
+		$csv_data= '';
+		$csv_data .= sprintf($user->lang['SEASON']) . ' ' . $season. $newline;
+		$csv_data .= sprintf($user->lang['NAME']) . ';' . sprintf($user->lang['SEASON']) . ';' . sprintf($user->lang['LEAGUE']) . ';Saldo;' . $newline;
 
 		$last_username = '';
 		$sum_saldo = 0.0;
@@ -65,11 +66,11 @@ else
 		{
 			if ($last_username != '' AND $last_username != $user_row['username'])
 			{
-				$export .= str_replace("\"", "\"\"", $last_username) . ';Summe;;' . 
+				$csv_data .= str_replace("\"", "\"\"", $last_username) . ';Summe;;' . 
 						str_replace('.', ',', $sum_saldo) . ';' . $newline;
 				$sum_saldo = 0.0;
 			}
-			$export .= str_replace("\"", "\"\"", $user_row['username']) . ';' . 
+			$csv_data .= str_replace("\"", "\"\"", $user_row['username']) . ';' . 
 						$user_row['season'] . ';' .
 						$user_row['league'] . ';' .
 						str_replace('.', ',', $user_row['saldo']) . ';' . $newline;
@@ -78,11 +79,25 @@ else
 		}
 		if ($last_username != '')
 		{
-			$export .= str_replace("\"", "\"\"", $last_username) . ';Summe;;' . 
+			$csv_data .= str_replace("\"", "\"\"", $last_username) . ';Summe;;' . 
 					str_replace('.', ',', $sum_saldo) . ';' . $newline;
 		}
-		echo utf8_decode($export);
-		exit;
+		// Output the csv file
+		$filename = $season. '_bank.csv';
+		$fp = fopen('php://output', 'w');
+		
+		header('Content-Type: application/octet-stream');
+		header("Content-disposition: attachment; filename=\"" . basename($filename) . "\"");
+		header('Expires: 0');
+		header('Cache-Control: must-revalidate, post-check=0, pre-check=0');
+		header('Cache-Control: private', false);
+		header('Pragma: public');
+		header('Content-Transfer-Encoding: binary');
+		
+		fwrite($fp, "\xEF\xBB\xBF"); // UTF-8 BOM
+		
+		fwrite($fp, utf8_decode($csv_data));
+		fclose($fp);
+		exit_handler();
 	}
 }
-?>

block/dload_export.php

@@ -1,52 +1,55 @@
-<?php
-/**
-*
-* @package phpBB Extension - Football Football
-* @copyright (c) 2016 football (http://football.bplaced.net)
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
-*
-*/
-
-// Check Prediction League authorisation 
-if ( !$this->auth->acl_get('u_use_football') )
-{
-	trigger_error('NO_AUTH_VIEW');
-}
-
-$action='';
-
-if (!$season OR !$league)
-{
-	redirect($this->helper->route('football_main_controller', array('side' => 'bet')));
-}
-else
-{
-	if (user_is_member($user->data['user_id'], $season, $league))
-	{
-		$season_info = season_info($season);
-		if (!sizeof($season_info))
-		{
-			$error_message = sprintf($user->lang['NO_SEASON']);
-			trigger_error($error_message);
-		}
-		else
-		{
-			$league_info = league_info($season, $league);
-			if (!sizeof($league_info))
-			{
-				$error_message = sprintf($user->lang['NO_LEAGUE']);
-				trigger_error($error_message);
-			}
-			else
-			{
-				include($this->football_includes_path . 'export.' . $this->php_ext);
-			}
-		}
-	}
-	else
-	{
-		redirect($this->helper->route('football_main_controller', array('side' => 'bet')));
-	}
-}
-
-?>
+<?php
+/**
+*
+* @package phpBB Extension - Football Football
+* @copyright (c) 2016 football (http://football.bplaced.net)
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+if (!defined('IN_PHPBB'))
+{
+	exit;
+}
+
+// Check Prediction League authorisation 
+if ( !$this->auth->acl_get('u_use_football') )
+{
+	trigger_error('NO_AUTH_VIEW');
+}
+
+$action='';
+
+if (!$season OR !$league)
+{
+	redirect($this->helper->route('football_football_controller', array('side' => 'bet')));
+}
+else
+{
+	if (user_is_member($user->data['user_id'], $season, $league))
+	{
+		$season_info = season_info($season);
+		if (!sizeof($season_info))
+		{
+			$error_message = sprintf($user->lang['NO_SEASON']);
+			trigger_error($error_message);
+		}
+		else
+		{
+			$league_info = league_info($season, $league);
+			if (!sizeof($league_info))
+			{
+				$error_message = sprintf($user->lang['NO_LEAGUE']);
+				trigger_error($error_message);
+			}
+			else
+			{
+				include($this->football_includes_path . 'export.' . $this->php_ext);
+			}
+		}
+	}
+	else
+	{
+		redirect($this->helper->route('football_football_controller', array('side' => 'bet')));
+	}
+}

block/last_results.php

@@ -1,150 +1,148 @@
-<?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,
-	)
-);
-
-?>
+<?php
+/**
+*
+* @package phpBB Extension - Football Football
+* @copyright (c) 2016 football (http://football.bplaced.net)
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+if (!defined('IN_PHPBB'))
+{
+	exit;
+}
+
+$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_football_controller', array('side' => 'results', 's' =>  $row['season'], 'l' => $row['league'], 'm' => $row['matchday'])),
+		'MATCH_DATE' 	=> $row['match_date'],
+		'MATCH_TIME' 	=> $row['match_time'],
+		'LEAGUE_NAME' 	=> $row['league_name'],
+		'LOGO_HOME' 	=> $logoH,
+		'LOGO_GUEST' 	=> $logoG,
+		'HOME_NAME' 	=> $homename,
+		'GUEST_NAME' 	=> $guestname,
+		'HOME_SHORT' 	=> $homeshort,
+		'GUEST_SHORT' 	=> $guestshort,
+		'GOALS_HOME' 	=> $goals_home,
+		'GOALS_GUEST'	=> $goals_guest,
+		'COLOR_STYLE' 	=> color_style($row['status']),
+		'KOGOALS_HOME' 	=> $kogoals_home,
+		'KOGOALS_GUEST'	=> $kogoals_guest,
+		'COLOR_STYLE' 	=> $colorstyle,
+		)
+	);
+}
+$db->sql_freeresult($result);
+
+
+
+$sidename = sprintf($user->lang['LAST_RESULTS']);
+
+$template->assign_vars(array(
+	'S_DISPLAY_LAST_RESULTS' 	=> true,
+	'S_SIDENAME' 				=> $sidename,
+	'S_DATA_LAST_RESULTS' 		=> $data_lastresults,
+	'S_USER_IS_MEMBER' 			=> $user_is_member,
+	)
+);

block/last_users.php

@@ -62,5 +62,3 @@ $template->assign_vars(array(
 	'S_DISPLAY_LAST_USERS'	=> $display_last_users,
 	'S_LAST_USERS'			=> true,
 ));
-
-?>

block/my_bets.php

@@ -7,7 +7,7 @@
 *
 */
 
-if (!defined('IN_PHPBB') OR !defined('IN_FOOTBALL'))
+if (!defined('IN_PHPBB'))
 {
 	exit;
 }
@@ -320,5 +320,3 @@ $template->assign_vars(array(
 	'USERNAME' 					=> $username,
 	)
 );
-
-?>

block/my_chart.php

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

block/my_koeff.php

@@ -1,386 +1,384 @@
-<?php
-/**
-*
-* @package phpBB Extension - Football Football
-* @copyright (c) 2016 football (http://football.bplaced.net)
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
-*
-*/
-
-if (!defined('IN_PHPBB') OR !defined('IN_FOOTBALL'))
-{
-	exit;
-}
-
-$start = $this->request->variable('start', 0);
-$matches_on_matchday = false;
-
-if (!$user_sel)
-{
-	if (user_is_member($user->data['user_id'], $season, $league))
-	{
-		$user_sel =  $user->data['user_id'];
-	}
-}
-$username = '';
-
-$data = false;
-// Select user 
-$total_users = 0;
-$sql = 'SELECT DISTINCT
-		u.user_id,
-		u.username
-	FROM ' . FOOTB_BETS . ' AS b
-	LEFT JOIN ' . USERS_TABLE . " AS u ON (u.user_id = b.user_id)
-	WHERE season = $season 
-		AND league = $league
-	ORDER BY LOWER(u.username) ASC";
-	
-$result = $db->sql_query($sql);
-
-while($row = $db->sql_fetchrow($result))
-{
-	$total_users++;
-	if ($user_sel == $row['user_id'] OR !$user_sel)
-	{
-		$selectid = ' selected="selected"';
-		$username = $row['username'];
-		$user_sel = $row['user_id'];
-	}
-	else
-	{
-		$selectid = '';
-	}
-	$template->assign_block_vars('form_user', array(
-		'S_USER' 		=> $row['user_id'],
-		'S_USERNAME' 	=> $row['username'],
-		'S_SELECTEDID' 	=> $selectid,
-		)
-	);
-}
-$db->sql_freeresult($result);
-// Select matches with results and tendencies
-$sql = "SELECT
-		m.match_no,
-		m.status,
-		m.formula_home,
-		m.formula_guest,
-		t1.team_name_short AS home_name,
-		t2.team_name_short AS guest_name,
-		t1.team_id AS home_id,
-		t2.team_id AS guest_id,
-		m.goals_home,
-		m.goals_guest,
-		SUM(IF(b.goals_home + 0 > b.goals_guest AND b.goals_home <> '' AND b.goals_guest <> '', 1, 0)) AS home,
-		SUM(IF(b.goals_home = b.goals_guest AND b.goals_home <> '' AND b.goals_guest <> '', 1, 0)) AS draw,
-		SUM(IF(b.goals_home + 0 < b.goals_guest AND b.goals_home <> '' AND b.goals_guest <> '', 1, 0)) AS guest
-	FROM  " . FOOTB_MATCHES . ' AS m
-	LEFT JOIN ' . FOOTB_TEAMS . ' AS t1 ON (t1.season=m.season AND t1.league = m.league AND t1.team_id = m.team_id_home)
-	LEFT JOIN ' . FOOTB_TEAMS . ' AS t2 ON (t2.season=m.season AND t2.league = m.league AND t2.team_id = m.team_id_guest)
-	LEFT JOIN ' . FOOTB_BETS . " AS b ON(b.season = m.season AND b.league = m.league AND b.match_no = m.match_no)
-	WHERE  m.season = $season 
-		AND m.league = $league 
-		AND m.matchday = $matchday
-	GROUP BY m.match_no
-	ORDER BY m.match_datetime ASC, m.match_no ASC";
-
-$result = $db->sql_query($sql);
-$matches = $db->sql_fetchrowset($result);
-$db->sql_freeresult($result);
-$count_matches = sizeof($matches);
-if ($count_matches > 11)
-{
-	$split_after = 8;
-	$splits = floor($count_matches / 8);
-}
-else
-{
-	$split_after = $count_matches; 
-	$splits = 1;
-}
-
-// Make sure $start is set to the last page if it exceeds the amount
-if ($start < 0 || $start >= $total_users)
-{
-	$start = ($start < 0) ? 0 : floor(($total_users - 1) / $config['football_users_per_page']) * $config['football_users_per_page'];
-}
-else
-{
-	$start = floor($start / $config['football_users_per_page']) * $config['football_users_per_page'];
-}
-
-$sql_start = $start * $count_matches;
-$sql_limit = $config['football_users_per_page'] * $count_matches;
-
-// handle pagination.
-$base_url = $this->helper->route('football_main_controller', array('side' => 'my_koeff', 's' => $season, 'l' => $league, 'm' => $matchday, 'u' => "$user_sel"));
-$pagination = $phpbb_container->get('pagination');
-$pagination->generate_template_pagination($base_url, 'pagination', 'start', $total_users, $this->config['football_users_per_page'], $start);
-
-$bet_line = array();
-if ($count_matches > 0)
-{
-	$matches_on_matchday = true;
-	// 	Select user bets and points on user results
-	$sql = "SELECT
-			u.user_id,
-			u.username,
-			m.status,
-			b.goals_home AS bet_home,
-			b.goals_guest AS bet_guest,
-			" . select_points("bu") . "
-		FROM  " . FOOTB_MATCHES . ' AS m
-		LEFT JOIN ' . FOOTB_BETS . ' AS b ON(b.season = m.season AND b.league = m.league AND b.match_no = m.match_no)
-		LEFT JOIN ' . FOOTB_BETS . " AS bu ON(bu.season = m.season AND bu.league = m.league AND bu.match_no = m.match_no AND bu.user_id = $user_sel)
-		LEFT JOIN " . USERS_TABLE . "  AS u ON (u.user_id = b.user_id)
-		WHERE  m.season = $season 
-			AND m.league = $league 
-			AND m.matchday = $matchday
-		ORDER BY LOWER(u.username) ASC, m.match_datetime ASC, m.match_no ASC";
-		
-	$result = $db->sql_query_limit($sql, $sql_limit, $sql_start);
-	$user_bets = $db->sql_fetchrowset($result);
-	$db->sql_freeresult($result);
-	$bet_index = 0;
-	$split_index = 0;
-	foreach ($user_bets AS $user_bet)
-	{
-		$data = true;
-		if ($bet_index == $count_matches)
-		{
-			$bet_index = 0;
-			$split_index = 0;
-		}
-		if (!($bet_index % $split_after))
-		{
-			$split_index++;
-		}
-		$sum_total[$user_bet['username']] = 0;
-		$bet_line[$split_index][] = $user_bet;
-		$bet_index++; 
-	}
-}
-$match_index = 0;
-$split_index = 0;
-$matchday_sum_total = 0;
-$colorstyle_total = ' color_finally';
-foreach ($matches AS $match)
-{
-	if (!($match_index % $split_after))
-	{
-		if ($match_index > 0) 
-		{
-			$total = 0;
-			$count_user = 0;
-			$bet_index = 0;
-			foreach ($bet_line[$split_index] AS $user_bet)
-			{
-				if ($bet_index == 0)
-				{
-					$count_user++;
-					$row_class = (!($count_user % 2)) ? 'bg1 row_light' : 'bg2 row_dark';
-					if ($user_bet['user_id'] == $user->data['user_id'])
-					{
-						$row_class = 'bg3  row_user';
-					}
-					$template->assign_block_vars('match_panel.user_row', array(
-						'ROW_CLASS' => $row_class,
-						'USER_NAME' => $user_bet['username'],
-						)
-					);
-					$total = 0;
-				}	
-				$bet_index++;
-				$total += ($user_bet['points'] == '') ? 0 : $user_bet['points'];
-				if ($user_bet['status'] < 1 && !$config['football_view_bets'])
-				{
-					// hide bets
-					$bet_home = ($user_bet['bet_home'] == '') ? '&nbsp;' : '?';
-					$bet_guest = ($user_bet['bet_guest'] == '') ? '&nbsp;' : '?';
-				}
-				else
-				{
-					$bet_home = $user_bet['bet_home'];
-					$bet_guest = $user_bet['bet_guest'];
-				}
-				
-				$colorstyle_bet = color_style($user_bet['status']);
-				$template->assign_block_vars('match_panel.user_row.bet', array(
-					'BET' 			=> $bet_home. ':'. $bet_guest,
-					'COLOR_STYLE' 	=> $colorstyle_bet,
-					'POINTS' 		=> ($user_bet['points'] == '') ? '&nbsp;' : $user_bet['points'],
-					)
-				);
-
-				if ($bet_index == $split_after)
-				{
-					$sum_total[$user_bet['username']] += $total;
-					$matchday_sum_total += $total;
-					$bet_index = 0;
-				}
-			}
-
-			$template->assign_block_vars('match_panel.tendency_footer', array(
-				'S_TOTAL' => false,
-				)
-			);
-			foreach ($matches_tendency AS $match_tendency)
-			{
-				$template->assign_block_vars('match_panel.tendency_footer.tendency', array(
-					'TENDENCY' => $match_tendency,
-					)
-				);
-			}
-		}
-		$matches_tendency = array();
-		$split_index++;
-		if ($split_index == $splits)
-		{
-			$display_total = true;
-		}
-		else
-		{
-			$display_total = false;
-		}
-		$template->assign_block_vars('match_panel', array(
-			'S_TOTAL' => $display_total,
-			)
-		);
-	}
-	if (0 == $match['home_id'])
-	{
-		$home_info 		= get_team($season, $league, $match['match_no'], 'team_id_home', $match['formula_home']);
-		$home_in_array 	= explode("#",$home_info);
-		$homename 		= $home_in_array[3];
-	}
-	else
-	{
-		$homename = $match['home_name'];
-	}
-	if (0 == $match['guest_id'])
-	{
-		$guest_info 	= get_team($season, $league, $match['match_no'], 'team_id_guest', $match['formula_guest']);
-		$guest_in_array = explode("#",$guest_info);
-		$guestname 		= $guest_in_array[3];
-	}
-	else
-	{
-		$guestname = $match['guest_name'];
-	}
-	$colorstyle_match = color_style($match['status']);
-	$template->assign_block_vars('match_panel.match_entry', array(
-		'HOME_NAME' 	=> $homename,
-		'GUEST_NAME' 	=> $guestname,
-		'RESULT' 		=> $match['goals_home'] . ':' . $match['goals_guest'],
-		'COLOR_STYLE' 	=> $colorstyle_match,
-		)
-	);
-	if ($match['status'] < 1 && !$config['football_view_tendencies'])
-	{
-		// hide tendencies
-		$matches_tendency[] =  '?-?-?';
-	}
-	else
-	{
-		$matches_tendency[] = $match['home'] . '-' . $match['draw'] . '-' . $match['guest'];
-	}
-	$match_index++;
-}
-if ($count_matches > 0)
-{
-	$total = 0;
-	$count_user = 0;
-	$bet_index = 0;
-	foreach ($bet_line[$split_index] AS $user_bet)
-	{
-		if ($bet_index == 0)
-		{
-			$count_user++;
-			$row_class = (!($count_user % 2)) ? 'bg1 row_light' : 'bg2 row_dark';
-			if ($user_bet['user_id'] == $user->data['user_id'])
-			{
-				$row_class = 'bg3  row_user';
-			}
-			$template->assign_block_vars('match_panel.user_row', array(
-				'ROW_CLASS' => $row_class,
-				'USER_NAME' => $user_bet['username'],
-				)
-			);
-			$total = 0;
-		}	
-		$bet_index++;
-		$total += ($user_bet['points'] == '') ? 0 : $user_bet['points'];
-		if ($user_bet['status'] < 1)
-		{
-			if ($user_bet['bet_home'] == '')
-			{
-				$bet_home = '';
-			}
-			else
-			{
-				$bet_home = '?';
-			}
-			if ($user_bet['bet_guest'] == '')
-			{
-				$bet_guest = '';
-			}
-			else
-			{
-				$bet_guest = '?';
-			}
-		}
-		else
-		{
-			$bet_home = $user_bet['bet_home'];
-			$bet_guest = $user_bet['bet_guest'];
-		}
-		
-		$colorstyle_bet = color_style($user_bet['status']);
-		$template->assign_block_vars('match_panel.user_row.bet', array(
-			'BET' 			=> $bet_home. ':'. $bet_guest,
-			'COLOR_STYLE' 	=> $colorstyle_bet,
-			'POINTS' 		=> ($user_bet['points'] == '') ? '&nbsp;' : $user_bet['points'],
-			)
-		);
-
-		if ($bet_index == $split_after)
-		{
-			$sum_total[$user_bet['username']] += $total;
-			$matchday_sum_total += $total;
-			$template->assign_block_vars('match_panel.user_row.points', array(
-				'COLOR_STYLE' 	=> $colorstyle_total,
-				'POINTS_TOTAL' 	=> $sum_total[$user_bet['username']],
-				)
-			);
-			$bet_index = 0;
-		}
-	}
-
-	$template->assign_block_vars('match_panel.tendency_footer', array(
-		'S_TOTAL' 		=> true,
-		'COLOR_STYLE' 	=> $colorstyle_total, //currently ignored
-		'SUMTOTAL' 		=> $matchday_sum_total,
-		)
-	);
-	foreach ($matches_tendency AS $match_tendency)
-	{
-		$template->assign_block_vars('match_panel.tendency_footer.tendency', array(
-			'TENDENCY' => $match_tendency,
-			)
-		);
-	}
-}
-
-$sidename = sprintf($user->lang['MY_KOEFF']);
-$template->assign_vars(array(
-	'S_DISPLAY_MY_KOEFF' 		=> true,
-	'S_SIDENAME' 				=> $sidename,
-	'S_MATCHES_ON_MATCHDAY' 	=> $matches_on_matchday,
-	'S_SPALTEN' 				=> ($count_matches * 2) + 2,
-	'PAGE_NUMBER' 				=> $pagination->on_page($total_users, $this->config['football_users_per_page'], $start),
-	'TOTAL_USERS'				=> ($total_users == 1) ? $user->lang['VIEW_BET_USER'] : sprintf($user->lang['VIEW_BET_USERS'], $total_users),
-	'USERNAME' 					=> $username,
-	)
-);
-
-?>
+<?php
+/**
+*
+* @package phpBB Extension - Football Football
+* @copyright (c) 2016 football (http://football.bplaced.net)
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+if (!defined('IN_PHPBB'))
+{
+	exit;
+}
+
+$start = $this->request->variable('start', 0);
+$matches_on_matchday = false;
+
+if (!$user_sel)
+{
+	if (user_is_member($user->data['user_id'], $season, $league))
+	{
+		$user_sel =  $user->data['user_id'];
+	}
+}
+$username = '';
+
+$data = false;
+// Select user 
+$total_users = 0;
+$sql = 'SELECT DISTINCT
+		u.user_id,
+		u.username
+	FROM ' . FOOTB_BETS . ' AS b
+	LEFT JOIN ' . USERS_TABLE . " AS u ON (u.user_id = b.user_id)
+	WHERE season = $season 
+		AND league = $league
+	ORDER BY LOWER(u.username) ASC";
+	
+$result = $db->sql_query($sql);
+
+while($row = $db->sql_fetchrow($result))
+{
+	$total_users++;
+	if ($user_sel == $row['user_id'] OR !$user_sel)
+	{
+		$selectid = ' selected="selected"';
+		$username = $row['username'];
+		$user_sel = $row['user_id'];
+	}
+	else
+	{
+		$selectid = '';
+	}
+	$template->assign_block_vars('form_user', array(
+		'S_USER' 		=> $row['user_id'],
+		'S_USERNAME' 	=> $row['username'],
+		'S_SELECTEDID' 	=> $selectid,
+		)
+	);
+}
+$db->sql_freeresult($result);
+// Select matches with results and tendencies
+$sql = "SELECT
+		m.match_no,
+		m.status,
+		m.formula_home,
+		m.formula_guest,
+		t1.team_name_short AS home_name,
+		t2.team_name_short AS guest_name,
+		t1.team_id AS home_id,
+		t2.team_id AS guest_id,
+		m.goals_home,
+		m.goals_guest,
+		SUM(IF(b.goals_home + 0 > b.goals_guest AND b.goals_home <> '' AND b.goals_guest <> '', 1, 0)) AS home,
+		SUM(IF(b.goals_home = b.goals_guest AND b.goals_home <> '' AND b.goals_guest <> '', 1, 0)) AS draw,
+		SUM(IF(b.goals_home + 0 < b.goals_guest AND b.goals_home <> '' AND b.goals_guest <> '', 1, 0)) AS guest
+	FROM  " . FOOTB_MATCHES . ' AS m
+	LEFT JOIN ' . FOOTB_TEAMS . ' AS t1 ON (t1.season=m.season AND t1.league = m.league AND t1.team_id = m.team_id_home)
+	LEFT JOIN ' . FOOTB_TEAMS . ' AS t2 ON (t2.season=m.season AND t2.league = m.league AND t2.team_id = m.team_id_guest)
+	LEFT JOIN ' . FOOTB_BETS . " AS b ON(b.season = m.season AND b.league = m.league AND b.match_no = m.match_no)
+	WHERE  m.season = $season 
+		AND m.league = $league 
+		AND m.matchday = $matchday
+	GROUP BY m.match_no
+	ORDER BY m.match_datetime ASC, m.match_no ASC";
+
+$result = $db->sql_query($sql);
+$matches = $db->sql_fetchrowset($result);
+$db->sql_freeresult($result);
+$count_matches = sizeof($matches);
+if ($count_matches > 11)
+{
+	$split_after = 8;
+	$splits = floor($count_matches / 8);
+}
+else
+{
+	$split_after = $count_matches; 
+	$splits = 1;
+}
+
+// Make sure $start is set to the last page if it exceeds the amount
+if ($start < 0 || $start >= $total_users)
+{
+	$start = ($start < 0) ? 0 : floor(($total_users - 1) / $config['football_users_per_page']) * $config['football_users_per_page'];
+}
+else
+{
+	$start = floor($start / $config['football_users_per_page']) * $config['football_users_per_page'];
+}
+
+$sql_start = $start * $count_matches;
+$sql_limit = $config['football_users_per_page'] * $count_matches;
+
+// handle pagination.
+$base_url = $this->helper->route('football_football_controller', array('side' => 'my_koeff', 's' => $season, 'l' => $league, 'm' => $matchday, 'u' => "$user_sel"));
+$pagination = $phpbb_container->get('pagination');
+$pagination->generate_template_pagination($base_url, 'pagination', 'start', $total_users, $this->config['football_users_per_page'], $start);
+
+$bet_line = array();
+if ($count_matches > 0)
+{
+	$matches_on_matchday = true;
+	// 	Select user bets and points on user results
+	$sql = "SELECT
+			u.user_id,
+			u.username,
+			m.status,
+			b.goals_home AS bet_home,
+			b.goals_guest AS bet_guest,
+			" . select_points("bu") . "
+		FROM  " . FOOTB_MATCHES . ' AS m
+		LEFT JOIN ' . FOOTB_BETS . ' AS b ON(b.season = m.season AND b.league = m.league AND b.match_no = m.match_no)
+		LEFT JOIN ' . FOOTB_BETS . " AS bu ON(bu.season = m.season AND bu.league = m.league AND bu.match_no = m.match_no AND bu.user_id = $user_sel)
+		LEFT JOIN " . USERS_TABLE . "  AS u ON (u.user_id = b.user_id)
+		WHERE  m.season = $season 
+			AND m.league = $league 
+			AND m.matchday = $matchday
+		ORDER BY LOWER(u.username) ASC, m.match_datetime ASC, m.match_no ASC";
+		
+	$result = $db->sql_query_limit($sql, $sql_limit, $sql_start);
+	$user_bets = $db->sql_fetchrowset($result);
+	$db->sql_freeresult($result);
+	$bet_index = 0;
+	$split_index = 0;
+	foreach ($user_bets AS $user_bet)
+	{
+		$data = true;
+		if ($bet_index == $count_matches)
+		{
+			$bet_index = 0;
+			$split_index = 0;
+		}
+		if (!($bet_index % $split_after))
+		{
+			$split_index++;
+		}
+		$sum_total[$user_bet['username']] = 0;
+		$bet_line[$split_index][] = $user_bet;
+		$bet_index++; 
+	}
+}
+$match_index = 0;
+$split_index = 0;
+$matchday_sum_total = 0;
+$colorstyle_total = ' color_finally';
+foreach ($matches AS $match)
+{
+	if (!($match_index % $split_after))
+	{
+		if ($match_index > 0) 
+		{
+			$total = 0;
+			$count_user = 0;
+			$bet_index = 0;
+			foreach ($bet_line[$split_index] AS $user_bet)
+			{
+				if ($bet_index == 0)
+				{
+					$count_user++;
+					$row_class = (!($count_user % 2)) ? 'bg1 row_light' : 'bg2 row_dark';
+					if ($user_bet['user_id'] == $user->data['user_id'])
+					{
+						$row_class = 'bg3  row_user';
+					}
+					$template->assign_block_vars('match_panel.user_row', array(
+						'ROW_CLASS' => $row_class,
+						'USER_NAME' => $user_bet['username'],
+						)
+					);
+					$total = 0;
+				}	
+				$bet_index++;
+				$total += ($user_bet['points'] == '') ? 0 : $user_bet['points'];
+				if ($user_bet['status'] < 1 && !$config['football_view_bets'])
+				{
+					// hide bets
+					$bet_home = ($user_bet['bet_home'] == '') ? '&nbsp;' : '?';
+					$bet_guest = ($user_bet['bet_guest'] == '') ? '&nbsp;' : '?';
+				}
+				else
+				{
+					$bet_home = $user_bet['bet_home'];
+					$bet_guest = $user_bet['bet_guest'];
+				}
+				
+				$colorstyle_bet = color_style($user_bet['status']);
+				$template->assign_block_vars('match_panel.user_row.bet', array(
+					'BET' 			=> $bet_home. ':'. $bet_guest,
+					'COLOR_STYLE' 	=> $colorstyle_bet,
+					'POINTS' 		=> ($user_bet['points'] == '') ? '&nbsp;' : $user_bet['points'],
+					)
+				);
+
+				if ($bet_index == $split_after)
+				{
+					$sum_total[$user_bet['username']] += $total;
+					$matchday_sum_total += $total;
+					$bet_index = 0;
+				}
+			}
+
+			$template->assign_block_vars('match_panel.tendency_footer', array(
+				'S_TOTAL' => false,
+				)
+			);
+			foreach ($matches_tendency AS $match_tendency)
+			{
+				$template->assign_block_vars('match_panel.tendency_footer.tendency', array(
+					'TENDENCY' => $match_tendency,
+					)
+				);
+			}
+		}
+		$matches_tendency = array();
+		$split_index++;
+		if ($split_index == $splits)
+		{
+			$display_total = true;
+		}
+		else
+		{
+			$display_total = false;
+		}
+		$template->assign_block_vars('match_panel', array(
+			'S_TOTAL' => $display_total,
+			)
+		);
+	}
+	if (0 == $match['home_id'])
+	{
+		$home_info 		= get_team($season, $league, $match['match_no'], 'team_id_home', $match['formula_home']);
+		$home_in_array 	= explode("#",$home_info);
+		$homename 		= $home_in_array[3];
+	}
+	else
+	{
+		$homename = $match['home_name'];
+	}
+	if (0 == $match['guest_id'])
+	{
+		$guest_info 	= get_team($season, $league, $match['match_no'], 'team_id_guest', $match['formula_guest']);
+		$guest_in_array = explode("#",$guest_info);
+		$guestname 		= $guest_in_array[3];
+	}
+	else
+	{
+		$guestname = $match['guest_name'];
+	}
+	$colorstyle_match = color_style($match['status']);
+	$template->assign_block_vars('match_panel.match_entry', array(
+		'HOME_NAME' 	=> $homename,
+		'GUEST_NAME' 	=> $guestname,
+		'RESULT' 		=> $match['goals_home'] . ':' . $match['goals_guest'],
+		'COLOR_STYLE' 	=> $colorstyle_match,
+		)
+	);
+	if ($match['status'] < 1 && !$config['football_view_tendencies'])
+	{
+		// hide tendencies
+		$matches_tendency[] =  '?-?-?';
+	}
+	else
+	{
+		$matches_tendency[] = $match['home'] . '-' . $match['draw'] . '-' . $match['guest'];
+	}
+	$match_index++;
+}
+if ($count_matches > 0)
+{
+	$total = 0;
+	$count_user = 0;
+	$bet_index = 0;
+	foreach ($bet_line[$split_index] AS $user_bet)
+	{
+		if ($bet_index == 0)
+		{
+			$count_user++;
+			$row_class = (!($count_user % 2)) ? 'bg1 row_light' : 'bg2 row_dark';
+			if ($user_bet['user_id'] == $user->data['user_id'])
+			{
+				$row_class = 'bg3  row_user';
+			}
+			$template->assign_block_vars('match_panel.user_row', array(
+				'ROW_CLASS' => $row_class,
+				'USER_NAME' => $user_bet['username'],
+				)
+			);
+			$total = 0;
+		}	
+		$bet_index++;
+		$total += ($user_bet['points'] == '') ? 0 : $user_bet['points'];
+		if ($user_bet['status'] < 1)
+		{
+			if ($user_bet['bet_home'] == '')
+			{
+				$bet_home = '';
+			}
+			else
+			{
+				$bet_home = '?';
+			}
+			if ($user_bet['bet_guest'] == '')
+			{
+				$bet_guest = '';
+			}
+			else
+			{
+				$bet_guest = '?';
+			}
+		}
+		else
+		{
+			$bet_home = $user_bet['bet_home'];
+			$bet_guest = $user_bet['bet_guest'];
+		}
+		
+		$colorstyle_bet = color_style($user_bet['status']);
+		$template->assign_block_vars('match_panel.user_row.bet', array(
+			'BET' 			=> $bet_home. ':'. $bet_guest,
+			'COLOR_STYLE' 	=> $colorstyle_bet,
+			'POINTS' 		=> ($user_bet['points'] == '') ? '&nbsp;' : $user_bet['points'],
+			)
+		);
+
+		if ($bet_index == $split_after)
+		{
+			$sum_total[$user_bet['username']] += $total;
+			$matchday_sum_total += $total;
+			$template->assign_block_vars('match_panel.user_row.points', array(
+				'COLOR_STYLE' 	=> $colorstyle_total,
+				'POINTS_TOTAL' 	=> $sum_total[$user_bet['username']],
+				)
+			);
+			$bet_index = 0;
+		}
+	}
+
+	$template->assign_block_vars('match_panel.tendency_footer', array(
+		'S_TOTAL' 		=> true,
+		'COLOR_STYLE' 	=> $colorstyle_total, //currently ignored
+		'SUMTOTAL' 		=> $matchday_sum_total,
+		)
+	);
+	foreach ($matches_tendency AS $match_tendency)
+	{
+		$template->assign_block_vars('match_panel.tendency_footer.tendency', array(
+			'TENDENCY' => $match_tendency,
+			)
+		);
+	}
+}
+
+$sidename = sprintf($user->lang['MY_KOEFF']);
+$template->assign_vars(array(
+	'S_DISPLAY_MY_KOEFF' 		=> true,
+	'S_SIDENAME' 				=> $sidename,
+	'S_MATCHES_ON_MATCHDAY' 	=> $matches_on_matchday,
+	'S_SPALTEN' 				=> ($count_matches * 2) + 2,
+	'PAGE_NUMBER' 				=> $pagination->on_page($total_users, $this->config['football_users_per_page'], $start),
+	'TOTAL_USERS'				=> ($total_users == 1) ? $user->lang['VIEW_BET_USER'] : sprintf($user->lang['VIEW_BET_USERS'], $total_users),
+	'USERNAME' 					=> $username,
+	)
+);

block/my_points.php

@@ -7,7 +7,7 @@
 *
 */
 
-if (!defined('IN_PHPBB') OR !defined('IN_FOOTBALL'))
+if (!defined('IN_PHPBB'))
 {
 	exit;
 }
@@ -195,4 +195,3 @@ $template->assign_vars(array(
 	'USERNAME' 					=> $username,
 	)
 );
-?>

block/my_rank.php

@@ -7,7 +7,7 @@
 *
 */
 
-if (!defined('IN_PHPBB') OR !defined('IN_FOOTBALL'))
+if (!defined('IN_PHPBB'))
 {
 	exit;
 }
@@ -169,5 +169,3 @@ $template->assign_vars(array(
 	'USERNAME' 					=> $username,
 	)
 );
-
-?>

block/my_table.php

@@ -7,7 +7,7 @@
 *
 */
 
-if (!defined('IN_PHPBB') OR !defined('IN_FOOTBALL'))
+if (!defined('IN_PHPBB'))
 {
 	exit;
 }
@@ -137,6 +137,7 @@ $sql = 'SELECT
 		AND b.goals_home <> '' 
 		AND b.goals_guest <> '' 
 		AND m.matchday <= $matchday 
+        AND m.show_table = 0
 	GROUP BY t.team_id
 	ORDER BY t.group_id ASC, points DESC, goals_diff DESC, goals DESC";
 	
@@ -233,6 +234,7 @@ $sql = 'SELECT
 		AND b.goals_home <> '' 
 		AND b.goals_guest <> '' 
 		AND m.matchday >= $form_from 
+        AND m.show_table = 0
 	GROUP BY t.team_id
 	ORDER BY t.group_id ASC, points DESC, goals_diff DESC, goals DESC";
 	
@@ -300,6 +302,7 @@ $sql = 'SELECT
 		AND b.goals_home <> '' 
 		AND b.goals_guest <> '' 
 		AND m.matchday <= $matchday 
+        AND m.show_table = 0
 	GROUP BY t.team_id
 	ORDER BY t.group_id ASC, points DESC, goals_diff DESC, goals DESC";
 	
@@ -365,6 +368,7 @@ $sql = 'SELECT
 		AND b.goals_home <> '' 
 		AND b.goals_guest <> '' 
 		AND m.matchday <= $matchday 
+        AND m.show_table = 0
 	GROUP BY t.team_id
 	ORDER BY t.group_id ASC, points DESC, goals_diff DESC, goals DESC";
 	
@@ -422,5 +426,3 @@ $template->assign_vars(array(
 	'USERNAME' 					=> $username,
 	)
 );
-	
-?>

block/odds.php

@@ -7,12 +7,14 @@
 *
 */
 
-if (!defined('IN_PHPBB') OR !defined('IN_FOOTBALL'))
+if (!defined('IN_PHPBB'))
 {
 	exit;
 }
 
 $data_odds 	= false;
+$userid =  $user->data['user_id'];
+$user_is_member = user_is_member($userid, $season, $league);
 $matchnumber = 0;
 $lang_dates 	= $user->lang['datetime'];
 
@@ -37,6 +39,8 @@ $sql = "SELECT
 		t2.team_name_short AS guest_name,
 		t1.team_id AS home_id,
 		t2.team_id AS guest_id,
+		b.goals_home AS bet_home,
+		b.goals_guest AS bet_guest,
 		m.goals_home,
 		m.goals_guest,
 		m.goals_overtime_home AS kogoals_home,
@@ -48,13 +52,15 @@ $sql = "SELECT
 		m.odd_1,
 		m.odd_x,
 		m.odd_2,
-		m.trend	FROM " . FOOTB_MATCHES . ' AS m
-	LEFT JOIN ' . FOOTB_TEAMS . ' AS t1 ON (t1.season = m.season AND t1.league = m.league AND t1.team_id = m.team_id_home)
-	LEFT JOIN ' . FOOTB_TEAMS . " AS t2 ON (t2.season = m.season AND t2.league = m.league AND t2.team_id = m.team_id_guest)
-	WHERE  m.season = $season 
-		AND m.league = $league
-		AND m.matchday = $matchday
-	ORDER BY m.match_datetime ASC, m.match_no ASC";
+		m.trend	
+		FROM " . FOOTB_MATCHES . ' AS m
+		LEFT JOIN ' . FOOTB_BETS . " AS b ON (b.season = m.season AND b.league = m.league AND b.match_no = m.match_no AND b.user_id = $userid)
+		LEFT JOIN " . FOOTB_TEAMS . ' AS t1 ON (t1.season = m.season AND t1.league = m.league AND t1.team_id = m.team_id_home)
+		LEFT JOIN ' . FOOTB_TEAMS . " AS t2 ON (t2.season = m.season AND t2.league = m.league AND t2.team_id = m.team_id_guest)
+		WHERE  m.season = $season 
+			AND m.league = $league
+			AND m.matchday = $matchday
+		ORDER BY m.match_datetime ASC, m.match_no ASC";
 	
 $result = $db->sql_query($sql);
 $rows = $db->sql_fetchrowset($result);
@@ -137,6 +143,8 @@ foreach ($rows as $row)
 	$goals_guest	= ($row['goals_guest'] == '') ? ' ' : $row['goals_guest'];
 	$kogoals_home	= ($row['kogoals_home'] == '') ? ' ' : $row['kogoals_home'];
 	$kogoals_guest	= ($row['kogoals_guest'] == '') ? ' ' : $row['kogoals_guest'];
+	$bet_home		= ($row['bet_home'] == '') ? ' ' : $row['bet_home'];
+	$bet_guest 		= ($row['bet_guest'] == '') ? ' ' : $row['bet_guest'];
 
 	$template->assign_block_vars('odds', array(
 		'ROW_CLASS' 	=> $row_class,
@@ -154,12 +162,15 @@ foreach ($rows as $row)
 																			'tid' => $homeid, 'mode' => 'all')),
 		'U_PLAN_GUEST'	=> $this->helper->route('football_football_popup', array('popside' => 'viewplan_popup', 's' => $season, 'l' => $league,
 																			'tid' => $guestid, 'mode' => 'all')),
+		'BET_HOME' 		=> $bet_home,
+		'BET_GUEST' 	=> $bet_guest,
 		'GOALS_HOME' 	=> $goals_home,
 		'GOALS_GUEST'	=> $goals_guest,
 		'COLOR_STYLE' 	=> '',
 		'KOGOALS_HOME' 	=> $kogoals_home,
 		'KOGOALS_GUEST'	=> $kogoals_guest,
 		'S_KO_MATCH' 	=> $ko_match,
+		'S_USER_IS_MEMBER' => $user_is_member,
 		'TREND' 		=> $row['trend'],
 		'U_MATCH_STATS'	=> $this->helper->route('football_football_popup', array('popside' => 'hist_popup', 's' => $season, 'l' => $league,
 																			'hid' => $homeid, 'gid' => $guestid, 'm' => $matchday, 
@@ -201,5 +212,3 @@ $template->assign_vars(array(
 	'S_DATA_ODDS' 				=> $data_odds,
 	)
 );
-
-?>

block/rank_matchday.php

@@ -7,11 +7,20 @@
 *
 */
 
-if (!defined('IN_PHPBB') OR !defined('IN_FOOTBALL'))
+if (!defined('IN_PHPBB'))
 {
 	exit;
 }
 
+if ($league > 50)
+{
+    $league_corr = $league - 50;
+}
+else
+{
+    $league_corr = $league;
+}
+
 if ($league <> 0)
 {
 	$data_rank_matchday = false;
@@ -26,10 +35,10 @@ if ($league <> 0)
 		FROM  " . FOOTB_RANKS . ' AS r
 		LEFT Join ' . USERS_TABLE . " AS u ON (r.user_id = u.user_id)
 		WHERE r.season = $season 
-			AND r.league = $league 
+			AND r.league = $league_corr
 			AND r.matchday = $matchday 
 			AND r.status IN (2,3)
-		ORDER BY rank ASC, LOWER(u.username) ASC";
+		ORDER BY r.rank ASC, LOWER(u.username) ASC";
 		
 	$result = $db->sql_query($sql);
 	while($row = $db->sql_fetchrow($result))
@@ -50,7 +59,7 @@ if ($league <> 0)
 				'ROW_CLASS' 	=> $row_class,
 				'USERID' 		=> $row['user_id'],
 				'USERNAME' 		=> $row['username'],
-				'U_BET_USER'	=> $this->helper->route('football_football_popup', array('popside' => 'bet_popup', 's' => $season, 'l' => $league,
+				'U_BET_USER'	=> $this->helper->route('football_football_popup', array('popside' => 'bet_popup', 's' => $season, 'l' => $league_corr,
 																					'm' => $matchday, 'u' => $row['user_id'])),
 				'POINTS' 		=> $row['points'],
 				'COLOR_STYLE' 	=> $colorstyle,
@@ -60,7 +69,7 @@ if ($league <> 0)
 		}
 	}
 	$db->sql_freeresult($result);
-	$league_info = league_info($season, $league);
+	$league_info = league_info($season, $league_corr);
 
 	$template->assign_vars(array(
 		'S_DISPLAY_RANK_MATCHDAY' 	=> true,
@@ -69,4 +78,3 @@ if ($league <> 0)
 		'WIN_NAME' 					=> $config['football_win_name'],
 	));
 }
-?>

block/rank_total.php

@@ -1,94 +1,93 @@
-<?php
-/**
-*
-* @package phpBB Extension - Football Football
-* @copyright (c) 2016 football (http://football.bplaced.net)
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
-*
-*/
-
-if (!defined('IN_PHPBB') OR !defined('IN_FOOTBALL'))
-{
-	exit;
-}
-
-if ($league <> 0)
-{
-	$sql = 'SELECT
-				r.matchday AS last_matchday
-			FROM '. FOOTB_RANKS . " AS r
-			WHERE r.season = $season 
-				AND r.league = $league 
-				AND r.status IN (2,3)
-			ORDER BY r.matchday DESC";
-			
-	$result = $db->sql_query_limit($sql, 1);
-	if($row = $db->sql_fetchrow($result))
-	{
-		$last_matchday = $row['last_matchday'];
-		$db->sql_freeresult($result);
-		$rank_matchday = ($last_matchday < $matchday) ? $last_matchday : $matchday;
-
-		$sql = 'SELECT
-					r.rank_total AS rank,
-					r.user_id,
-					u.username,
-					u.user_colour,
-					r.status AS status,
-					r.points_total AS points,
-					r.win_total AS win
-				FROM '. FOOTB_RANKS . ' AS r
-				LEFT JOIN '. USERS_TABLE . " AS u ON (r.user_id = u.user_id)
-				WHERE r.season = $season 
-					AND r.league = $league 
-					AND r.matchday = $rank_matchday 
-					AND r.status IN (2,3)
-				ORDER BY points DESC, LOWER(u.username) ASC";
-				
-		$result = $db->sql_query($sql);
-
-		$index = 0;
-		while($row = $db->sql_fetchrow($result))
-		{
-			$index++;
-			$data_rank_total = true;
-			if (($index <= $config['football_display_ranks']) OR ($row['user_id'] == $user->data['user_id']))
-			{
-				$row_class = (!($index % 2)) ? 'bg1 row_light' : 'bg2 row_dark';
-				if ($row['user_id'] == $user->data['user_id'])
-				{
-					$row_class = 'bg3  row_user';
-				}
-				$colorstyle = color_style($row['status']);
-
-				$template->assign_block_vars("ranktotal", array(
-					'RANK' 			=> $row['rank'],
-					'ROW_CLASS' 	=> $row_class,
-					'USERID' 		=> $row['user_id'],
-					'USERNAME' 		=> $row['username'],
-					'U_PROFILE'		=> get_username_string('profile', $row['user_id'], $row['username'], $row['user_colour']),
-					'URL' 			=> $phpbb_root_path . "profile.php?mode=viewprofile&u=" . $row['user_id'],
-					'POINTS' 		=> $row['points'],
-					'COLOR_STYLE'	=> $colorstyle,
-					'WIN' 			=> $row['win'] ,
-					)
-				);
-			}
-		}
-		$db->sql_freeresult($result);
-	}
-	else
-	{
-		$data_rank_total = false;
-	}
-	$league_info = league_info($season, $league);
-
-	$template->assign_vars(array(
-		'S_DISPLAY_RANK_TOTAL' 	=> true,
-		'S_DATA_RANK_TOTAL' 	=> $data_rank_total,
-		'S_WIN' 				=> ($league_info['win_matchday'] == '0' and $league_info['win_season'] == '0') ? false : true,
-		'WIN_NAME' 				=> $config['football_win_name'],
-		)
-	);
-}
-?>
+<?php
+/**
+*
+* @package phpBB Extension - Football Football
+* @copyright (c) 2016 football (http://football.bplaced.net)
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+if (!defined('IN_PHPBB'))
+{
+	exit;
+}
+
+if ($league <> 0)
+{
+	$sql = 'SELECT
+				r.matchday AS last_matchday
+			FROM '. FOOTB_RANKS . " AS r
+			WHERE r.season = $season 
+				AND r.league = $league 
+				AND r.status IN (2,3)
+			ORDER BY r.matchday DESC";
+			
+	$result = $db->sql_query_limit($sql, 1);
+	if($row = $db->sql_fetchrow($result))
+	{
+		$last_matchday = $row['last_matchday'];
+		$db->sql_freeresult($result);
+		$rank_matchday = ($last_matchday < $matchday) ? $last_matchday : $matchday;
+
+		$sql = 'SELECT
+					r.rank_total AS rank,
+					r.user_id,
+					u.username,
+					u.user_colour,
+					r.status AS status,
+					r.points_total AS points,
+					r.win_total AS win
+				FROM '. FOOTB_RANKS . ' AS r
+				LEFT JOIN '. USERS_TABLE . " AS u ON (r.user_id = u.user_id)
+				WHERE r.season = $season 
+					AND r.league = $league 
+					AND r.matchday = $rank_matchday 
+					AND r.status IN (2,3)
+				ORDER BY points DESC, LOWER(u.username) ASC";
+				
+		$result = $db->sql_query($sql);
+
+		$index = 0;
+		while($row = $db->sql_fetchrow($result))
+		{
+			$index++;
+			$data_rank_total = true;
+			if (($index <= $config['football_display_ranks']) OR ($row['user_id'] == $user->data['user_id']))
+			{
+				$row_class = (!($index % 2)) ? 'bg1 row_light' : 'bg2 row_dark';
+				if ($row['user_id'] == $user->data['user_id'])
+				{
+					$row_class = 'bg3  row_user';
+				}
+				$colorstyle = color_style($row['status']);
+
+				$template->assign_block_vars("ranktotal", array(
+					'RANK' 			=> $row['rank'],
+					'ROW_CLASS' 	=> $row_class,
+					'USERID' 		=> $row['user_id'],
+					'USERNAME' 		=> $row['username'],
+					'U_PROFILE'		=> get_username_string('profile', $row['user_id'], $row['username'], $row['user_colour']),
+					'URL' 			=> $phpbb_root_path . "profile.php?mode=viewprofile&u=" . $row['user_id'],
+					'POINTS' 		=> $row['points'],
+					'COLOR_STYLE'	=> $colorstyle,
+					'WIN' 			=> $row['win'] ,
+					)
+				);
+			}
+		}
+		$db->sql_freeresult($result);
+	}
+	else
+	{
+		$data_rank_total = false;
+	}
+	$league_info = league_info($season, $league);
+
+	$template->assign_vars(array(
+		'S_DISPLAY_RANK_TOTAL' 	=> true,
+		'S_DATA_RANK_TOTAL' 	=> $data_rank_total,
+		'S_WIN' 				=> ($league_info['win_matchday'] == '0' and $league_info['win_season'] == '0') ? false : true,
+		'WIN_NAME' 				=> $config['football_win_name'],
+		)
+	);
+}

block/ranks_matchday.php

@@ -7,7 +7,7 @@
 *
 */
 
-if (!defined('IN_PHPBB') OR !defined('IN_FOOTBALL'))
+if (!defined('IN_PHPBB'))
 {
 	exit;
 }
@@ -53,7 +53,7 @@ $sql = "SELECT
 		AND b.league = $league 
 		AND m.status IN (2,3) 
 		AND m.matchday = $matchday
-	GROUP BY user_id";
+	GROUP BY b.user_id";
 
 $result = $db->sql_query($sql);
 $usersstats = $db->sql_fetchrowset($result);
@@ -126,7 +126,7 @@ else
 $sql_limit = $config['football_users_per_page'];
 
 // handle pagination.
-$base_url = $this->helper->route('football_main_controller', array('side' => 'ranks_matchday', 's' => $season, 'l' => $league, 'm' => $matchday));
+$base_url = $this->helper->route('football_football_controller', array('side' => 'ranks_matchday', 's' => $season, 'l' => $league, 'm' => $matchday));
 $pagination = $phpbb_container->get('pagination');
 $pagination->generate_template_pagination($base_url, 'pagination', 'start', $total_users, $this->config['football_users_per_page'], $start);
 																$data_ranks = false;
@@ -172,13 +172,13 @@ while($row = $db->sql_fetchrow($result))
 			{
 				if ($rankof[$row['user_id']] > $prevrankof[$row['user_id']])
 				{
-					$change_sign 	= '+';
-					$differ 		= $rankof[$row['user_id']] - $prevrankof[$row['user_id']];
+					$change_sign 	= '-';
+					$differ 		= $prevrankof[$row['user_id']] - $rankof[$row['user_id']];
 					$change_differ 	= ' (' . $differ . ')';
 				}
 				else
 				{
-					$change_sign 	= '-';
+					$change_sign 	= '+';
 					$differ 		= $prevrankof[$row['user_id']] - $rankof[$row['user_id']];
 					$change_differ 	= ' (' . $differ . ')';
 				}
@@ -224,8 +224,8 @@ while($row = $db->sql_fetchrow($result))
 		'ROW_CLASS' 	=> $row_class,
 		'RANK' 			=> $rankof[$row['user_id']],
 		'NO_CHANGES'	=> ($change_sign == '=') ? true : false,
-		'WORSENED'		=> ($change_sign == '-') ? true : false,
-		'IMPROVED'		=> ($change_sign == '+') ? true : false,
+		'WORSENED'		=> ($change_sign == '+') ? true : false,
+		'IMPROVED'		=> ($change_sign == '-') ? true : false,
 		'CHANGE_SIGN' 	=> $change_sign,
 		'CHANGE_DIFFER'	=> $change_differ,
 		'USERID' 		=> $row['user_id'],
@@ -257,5 +257,3 @@ $template->assign_vars(array(
 	'WIN_NAME' 					=> $config['football_win_name'],
 	)
 );
-
-?>

block/ranks_total.php

@@ -7,7 +7,7 @@
 *
 */
 
-if (!defined('IN_PHPBB') OR !defined('IN_FOOTBALL'))
+if (!defined('IN_PHPBB'))
 {
 	exit;
 }
@@ -39,7 +39,7 @@ switch ($mode)
 				WHERE b.league = $league 
 					AND ((b.season < $season) OR (b.season = $season AND m.matchday <= $matchday))
 					AND m.status IN (2,3) 
-				GROUP BY user_id";
+				GROUP BY b.user_id";
 
 		$result = $db->sql_query($sql);
 		$rows = $db->sql_fetchrowset($result);
@@ -61,7 +61,7 @@ switch ($mode)
 				WHERE r.league = $league 
 					AND ((r.season < $season AND r.matchday = l.matchdays) OR (r.season = $season AND r.matchday = $matchday))
 					AND r.status IN (2,3) 
-				GROUP BY user_id
+				GROUP BY r.user_id
 				ORDER BY r.user_id ASC";
 				
 		$result = $db->sql_query($sql);
@@ -89,7 +89,7 @@ switch ($mode)
 				WHERE r.league = $league 
 					AND ((r.season < $season) OR (r.season = $season AND r.matchday <= $matchday))
 					AND r.status IN (2,3) 
-				GROUP BY user_id
+				GROUP BY r.user_id
 				ORDER BY points_total DESC, LOWER(u.username) ASC";
 				
 		$result = $db->sql_query($sql);
@@ -114,7 +114,7 @@ switch ($mode)
 		$index_end = $index_start + $config['football_users_per_page'] - 1;
 
 		// handle pagination.
-		$base_url = $this->helper->route('football_main_controller', array('side' => 'ranks_total', 's' => $season, 'l' => $league, 'm' => $matchday, 'mode' => 'alltime'));
+		$base_url = $this->helper->route('football_football_controller', array('side' => 'ranks_total', 's' => $season, 'l' => $league, 'm' => $matchday, 'mode' => 'alltime'));
 		$pagination = $phpbb_container->get('pagination');
 		$pagination->generate_template_pagination($base_url, 'pagination', 'start', $total_users, $this->config['football_users_per_page'], $start);
 
@@ -171,9 +171,9 @@ switch ($mode)
 			'WIN_NAME' 					=> $config['football_win_name'],
 			'S_SHOW_OTHER_LINKS'		=> true,
 			'S_HEADER'					=> sprintf($user->lang['RANKING_ALL_TIME']),
-			'S_LINK_RANKING'			=> $this->helper->route('football_main_controller', array('side' => 'ranks_total', 's' => $season, 'l' => $league, 'm' => $matchday)),
+			'S_LINK_RANKING'			=> $this->helper->route('football_football_controller', array('side' => 'ranks_total', 's' => $season, 'l' => $league, 'm' => $matchday)),
 			'S_LINK_ALL_TIME'			=> '',
-			'S_LINK_COMPARE'			=> $this->helper->route('football_main_controller', array('side' => 'ranks_total', 's' => $season, 'l' => $league, 'm' => $matchday, 'mode' => 'compare')),
+			'S_LINK_COMPARE'			=> $this->helper->route('football_football_controller', array('side' => 'ranks_total', 's' => $season, 'l' => $league, 'm' => $matchday, 'mode' => 'compare')),
 			)
 		);
 	break;
@@ -227,8 +227,8 @@ switch ($mode)
 					AND r.league = $league 
 					AND r.matchday = $matchday
 					AND r.status IN (2,3) 
-				GROUP BY season, user_id
-				ORDER BY r.user_id ASC, season ASC";
+				GROUP BY r.season, r.user_id
+				ORDER BY r.user_id ASC, r.season ASC";
 				
 		$result = $db->sql_query($sql);
 
@@ -275,7 +275,7 @@ switch ($mode)
 		$index_end = $index_start + $config['football_users_per_page'] - 1;
 
 		// handle pagination.
-		$base_url = $this->helper->route('football_main_controller', array('side' => 'ranks_total', 's' => $season, 'l' => $league, 'm' => $matchday, 'mode' => 'compare'));
+		$base_url = $this->helper->route('football_football_controller', array('side' => 'ranks_total', 's' => $season, 'l' => $league, 'm' => $matchday, 'mode' => 'compare'));
 		$pagination = $phpbb_container->get('pagination');
 		$pagination->generate_template_pagination($base_url, 'pagination', 'start', $total_users, $this->config['football_users_per_page'], $start);
 
@@ -330,12 +330,12 @@ switch ($mode)
 			'S_SIDENAME' 				=> $sidename,
 			'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,
+			'S_WIN' 					=> ($league_info['win_matchday'] == '0' and $league_info['win_season'] == '0') ? false : (($this->auth->acl_gets('a_')) ? true : false),
 			'WIN_NAME' 					=> $config['football_win_name'],
 			'S_SHOW_OTHER_LINKS'		=> true,
 			'S_HEADER'					=> sprintf($user->lang['RANKING_COMPARE']),
-			'S_LINK_RANKING'			=> $this->helper->route('football_main_controller', array('side' => 'ranks_total', 's' => $season, 'l' => $league, 'm' => $matchday)),
-			'S_LINK_ALL_TIME'			=> $this->helper->route('football_main_controller', array('side' => 'ranks_total', 's' => $season, 'l' => $league, 'm' => $matchday, 'mode' => 'alltime')),
+			'S_LINK_RANKING'			=> $this->helper->route('football_football_controller', array('side' => 'ranks_total', 's' => $season, 'l' => $league, 'm' => $matchday)),
+			'S_LINK_ALL_TIME'			=> $this->helper->route('football_football_controller', array('side' => 'ranks_total', 's' => $season, 'l' => $league, 'm' => $matchday, 'mode' => 'alltime')),
 			'S_LINK_COMPARE'			=> '',
 			)
 		);
@@ -369,7 +369,7 @@ switch ($mode)
 					AND b.league = $league 
 					AND m.status IN (2,3) 
 					AND m.matchday <= $matchday
-				GROUP BY user_id";
+				GROUP BY b.user_id";
 
 		$result = $db->sql_query($sql);
 		$rows = $db->sql_fetchrowset($result);
@@ -423,7 +423,7 @@ switch ($mode)
 					AND r.league = $league 
 					AND r.matchday = $matchday 
 					AND r.status IN (2,3)
-				GROUP BY user_id
+				GROUP BY r.user_id
 				ORDER BY r.points_total DESC, LOWER(u.username) ASC";
 				
 		$result = $db->sql_query($sql);
@@ -447,7 +447,7 @@ switch ($mode)
 		$index_end = $index_start + $config['football_users_per_page'] - 1;
 
 		// handle pagination.
-		$base_url = $this->helper->route('football_main_controller', array('side' => 'ranks_total', 's' => $season, 'l' => $league, 'm' => $matchday));
+		$base_url = $this->helper->route('football_football_controller', array('side' => 'ranks_total', 's' => $season, 'l' => $league, 'm' => $matchday));
 		$pagination = $phpbb_container->get('pagination');
 		if ($user->data['football_mobile'])
 		{
@@ -520,8 +520,8 @@ switch ($mode)
 					'ROW_CLASS' 	=> $row_class,
 					'RANK' 			=> $rank,
 					'NO_CHANGES'	=> ($change_sign == '=') ? true : false,
-					'WORSENED'		=> ($change_sign == '-') ? true : false,
-					'IMPROVED'		=> ($change_sign == '+') ? true : false,
+					'WORSENED'		=> ($change_sign == '+') ? true : false,
+					'IMPROVED'		=> ($change_sign == '-') ? true : false,
 					'CHANGE_SIGN' 	=> $change_sign,
 					'CHANGE_DIFFER'	=> $change_differ,
 					'USERID' 		=> $curr_rank['user_id'],
@@ -554,8 +554,8 @@ switch ($mode)
 			'WIN_NAME' 					=> $config['football_win_name'],
 			'S_SHOW_OTHER_LINKS'		=> true,
 			'S_LINK_RANKING'			=> '',
-			'S_LINK_ALL_TIME'			=> $this->helper->route('football_main_controller', array('side' => 'ranks_total', 's' => $season, 'l' => $league, 'm' => $matchday, 'mode' => 'alltime')),
-			'S_LINK_COMPARE'			=> $this->helper->route('football_main_controller', array('side' => 'ranks_total', 's' => $season, 'l' => $league, 'm' => $matchday, 'mode' => 'compare')),
+			'S_LINK_ALL_TIME'			=> $this->helper->route('football_football_controller', array('side' => 'ranks_total', 's' => $season, 'l' => $league, 'm' => $matchday, 'mode' => 'alltime')),
+			'S_LINK_COMPARE'			=> $this->helper->route('football_football_controller', array('side' => 'ranks_total', 's' => $season, 'l' => $league, 'm' => $matchday, 'mode' => 'compare')),
 			)
 		);
 	break;

block/results.php

@@ -7,7 +7,7 @@
 *
 */
 
-if (!defined('IN_PHPBB') OR !defined('IN_FOOTBALL'))
+if (!defined('IN_PHPBB'))
 {
 	exit;
 }
@@ -389,7 +389,6 @@ while ($row = $db->sql_fetchrow($result))
 }
 $db->sql_freeresult($result);
 
-$sidename = sprintf($user->lang['RESULTS']);
 switch ($league_info['bet_ko_type'])
 {
 	case BET_KO_90:
@@ -402,6 +401,7 @@ switch ($league_info['bet_ko_type'])
 		break;
 	case BET_KO_PENALTY:
 		$result_explain = sprintf($user->lang['PENALTY']);
+        $label_finalresult = sprintf($user->lang['PENALTY']);
 		$display_ko = false;
 		break;
 	default:
@@ -409,14 +409,28 @@ switch ($league_info['bet_ko_type'])
 		$label_finalresult = sprintf($user->lang['EXTRATIME_SHORT']) . '/' . sprintf($user->lang['PENALTY_SHORT']);
 		break;
 }
+// set correct display for usage in menu template
+if($side == 'results')
+{
+    $display_results = true;
+    $display_results_tl = false;
+    $sidename = sprintf($user->lang['RESULTS']);
+}
+if($side == 'results_tl')
+{
+    $display_results = false;
+    $display_results_tl = true;
+    $sidename = sprintf($user->lang['RESULTS']);
+}
 
 $template->assign_vars(array(
-	'S_DISPLAY_RESULTS' 		=> true,
+    'S_DISPLAY_RESULTS' 		=> $display_results,
+    'S_DISPLAY_RESULTS_TL' 		=> $display_results_tl,
 	'S_EXTRA_RESULTS' 			=> $extra_results,
 	'S_SIDENAME' 				=> $sidename,
 	'RESULT_EXPLAIN' 			=> $result_explain,
 	'LABEL_FINALRESULT' 		=> $label_finalresult,
-	'S_FORM_ACTION_RESULT' 		=> $this->helper->route('football_main_controller', array('side' => 'results', 's' => $season, 'l' => $league, 'm' => $matchday, 'action' => 'result')),
+	'S_FORM_ACTION_RESULT' 		=> $this->helper->route('football_football_controller', array('side' => 'results', 's' => $season, 'l' => $league, 'm' => $matchday, 'action' => 'result')),
 	'S_DATA_RESULTS' 			=> $data_results,
 	'S_USER_IS_MEMBER' 			=> $user_is_member,
 	'S_DISPLAY_GROUP'			=> $display_group,
@@ -424,5 +438,3 @@ $template->assign_vars(array(
 	'S_EDIT_MODE' 				=> $edit_mode,
 	)
 );
-
-?>

block/rules_popup.php

@@ -1,227 +1,233 @@
-<?php
-/**
-*
-* @package phpBB Extension - Football Football
-* @copyright (c) 2016 football (http://football.bplaced.net)
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
-*
-*/
-
-// Can this user view Prediction Leagues pages?
-if (!$config['football_guest_view'])
-{
-	if ($user->data['user_id'] == ANONYMOUS)
-	{
-		trigger_error('NO_GUEST_VIEW');
-	}
-}
-if (!$config['football_user_view'])
-{
-	// Only Prediction League member should see this page
-	// Check Prediction League authorisation 
-	if ( !$this->auth->acl_get('u_use_football') )
-	{
-		trigger_error('NO_AUTH_VIEW');
-	}
-}
-
-// Football disabled?
-if ($config['football_disable'])
-{
-	$message = (!empty($config['football_disable_msg'])) ? $config['football_disable_msg'] : 'FOOTBALL_DISABLED';
-	trigger_error($message);
-}
-
-$season		= $this->request->variable('s', 0);
-$league		= $this->request->variable('l', 0);
-
-// Check parms
-$error_message = '';
-if (!$season OR !$league)
-{
-	$data_rules = false;
-	if (!$season)
-	{	
-		$error_message .= sprintf($user->lang['NO_SEASON']) . '<br />';
-	}
-	if (!$league)
-	{	
-		$error_message .= sprintf($user->lang['NO_LEAGUE']) . '<br />';
-	}
-}
-else
-{
-	$season_info = season_info($season);
-	if (sizeof($season_info))
-	{
-		$season_name = $season_info['season_name'];
-		$league_info = league_info($season, $league);
-		if (sizeof($league_info))
-		{
-			$data_rules = true;
-			$matchdays 		= $league_info['matchdays'];
-			$league_name 	= $league_info['league_name'];
-
-			if ($user->data['is_registered'] and !$user->data['is_bot'])
-			{
-				$win_hits 			= '';
-				$win_hits02 		= '';
-				$win_matchday 	= explode(';', "0;" . $league_info['win_matchday']);
-				$win_season 	= explode(';',"0;" . $league_info['win_season']);
-				$win_hits 		= $league_info['win_result'];
-				$win_hits02 	= $league_info['win_result_02'];
-
-				if($win_hits != '' AND $win_hits != 0)
-				{
-					$template->assign_block_vars('wintable', array(
-						'WIN_DESC' 	=> sprintf($user->lang['WIN_HITS']),
-						)
-					);
-					$template->assign_block_vars('wintable.entry', array(
-						'ROW_CLASS' => 'bg1 row_light',
-						'RANK' 		=> '1. ' . sprintf($user->lang['PLACE']),
-						'WIN' 		=> $win_hits,
-						)
-					);
-				}
-
-				if($win_hits02 != '' AND $win_hits02 != 0 AND $config['football_win_hits02'])
-				{
-					$template->assign_block_vars('wintable', array(
-						'WIN_DESC' 	=> sprintf($user->lang['WIN_HITS02']),
-						)
-					);
-					$template->assign_block_vars('wintable.entry', array(
-						'ROW_CLASS' => 'bg1 row_light',
-						'RANK' 		=> '1. ' . sprintf($user->lang['PLACE']),
-						'WIN' 		=> $win_hits02,
-						)
-					);
-				}
-
-
-				if($win_matchday[1] != '' AND $win_matchday[1] != 0)
-				{
-					$template->assign_block_vars('wintable', array(
-						'WIN_DESC' 	=> sprintf($user->lang['WINS_MATCHDAY']),
-						)
-					);
-					$rank = 1;
-					while ($win_matchday[$rank] != '')
-					{
-						$row_class = (!($rank % 2)) ? 'bg1 row_light' : 'bg2 row_dark';
-						$template->assign_block_vars('wintable.entry', array(
-							'ROW_CLASS' => $row_class,
-							'RANK' 	=> $rank . '. ' . sprintf($user->lang['PLACE']),
-							'WIN' 	=> $win_matchday[$rank],
-							)
-						);
-						$rank++ ;
-						if ($rank > sizeof($win_matchday)-1)
-						{
-							break;
-						}
-					}
-				}
-
-				if($win_season[1] != '' AND $win_season[1] != 0)
-				{
-					$template->assign_block_vars('wintable', array(
-						'WIN_DESC' 	=> sprintf($user->lang['WINS_SEASON']),
-						)
-					);
-					$rank = 1;
-					while ($win_season[$rank] != '')
-					{
-						$row_class = (!($rank % 2)) ? 'bg1 row_light' : 'bg2 row_dark';
-						$template->assign_block_vars('wintable.entry', array(
-							'ROW_CLASS' => $row_class,
-							'RANK' 		=> $rank. '. ' . sprintf($user->lang['PLACE']),
-							'WIN' 		=> $win_season[$rank],
-							)
-						);
-						$rank++ ;
-						if ($rank > sizeof($win_season)-1)
-						{
-							break;
-						}
-					}
-				}
-			}			
-		}
-		else
-		{
-			$data_rules = false;
-			$error_message .= sprintf($user->lang['NO_LEAGUE']) . '<br />';
-			$league_name = '';
-		}
-	}
-	else
-	{
-		$data_rules = false;
-		$error_message .= sprintf($user->lang['NO_SEASON']) . '<br />';
-		$season_name = '';
-	}
-}
-
-$sidename = sprintf($user->lang['FOOTBALL_RULES']);
-if ($data_rules)
-{
-	$link_rules = append_sid($phpbb_root_path . "viewtopic.$phpEx?p=" .  $league_info["rules_post_id"]);
-	$points_tendency = ($league_info['points_mode'] < 3) ? sprintf($user->lang['POINTS_TENDENCY' . $league_info['points_mode']], $league_info['points_tendency']) : sprintf($user->lang['POINTS_TENDENCY'], $league_info['points_tendency']);
-	$template->assign_vars(array(
-		'S_SIDENAME' 		=> $sidename,
-		'S_DATA_RULES'		=> $data_rules,
-		'S_BET_IN_TIME'		=> $league_info['bet_in_time'],
-		'S_RULES_POST_ID'	=> $league_info['rules_post_id'],
-		'S_ERROR_MESSAGE'	=> $error_message,
-		'S_FOOTBALL_COPY' 	=> sprintf($user->lang['FOOTBALL_COPY'], $config['football_version'], $phpbb_root_path . 'football/'),
-		'WIN_NAME' 			=> $config['football_win_name'],
-		'JOIN_MODE'			=> ($league_info['join_by_user']) ? (($league_info['join_in_season']) ? sprintf($user->lang['JOIN_IN_SEASON']) : sprintf($user->lang['JOIN_BY_USER'])) : sprintf($user->lang['JOIN_BY_ADMIN']),
-		'POINTS_HIT'		=> sprintf($user->lang['POINTS_HIT'], $league_info['points_result']) . '<br/>',
-		'POINTS_TENDENCY'	=> $points_tendency . '<br/>',
-		'POINTS_DIFF'		=> ($league_info['points_mode'] == 4) ? sprintf($user->lang['POINTS_DIFFERENCE'], $league_info['points_diff']) . '<br/>' : 
-								(($league_info['points_mode'] == 5) ? sprintf($user->lang['POINTS_DIFFERENCE_DRAW'], $league_info['points_diff']) . '<br/>' : ''),
-		'POINTS_LAST'		=> ($league_info['points_last']) ? sprintf($user->lang['POINTS_NO_BET']) . '<br/>' : '',
-		'LINK_RULES'	 	=> sprintf($user->lang['LINK_RULES'], $link_rules),
-		'SEASONNAME'	 	=> $season_info['season_name'],
-		'LEAGUENAME'	 	=> $league_name,
-		)
-	);
-
-	// output page
-	page_header(sprintf($user->lang['FOOTBALL_RULES'	]) . ' ' . $league_info['league_name'] . ' ' . $season_info['season_name']);
-}
-else
-{
-	$template->assign_vars(array(
-		'S_SIDENAME' 		=> $sidename,
-		'S_DATA_RULES'		=> $data_rules,
-		'S_BET_IN_TIME'		=> false,
-		'S_RULES_POST_ID'	=> 0,
-		'S_ERROR_MESSAGE'	=> $error_message,
-		'S_FOOTBALL_COPY' 	=> sprintf($user->lang['FOOTBALL_COPY'], $config['football_version'], $phpbb_root_path . 'football/'),
-		'WIN_NAME' 			=> $config['football_win_name'],
-		'JOIN_MODE'			=> '',
-		'POINTS_HIT'		=> '',
-		'POINTS_TENDENCY'	=> '',
-		'POINTS_DIFF'		=> '',
-		'POINTS_LAST'		=> '',
-		'LINK_RULES'	 	=> '',
-		'SEASONNAME'	 	=> '',
-		'LEAGUENAME'	 	=> '',
-		)
-	);
-
-	// output page
-	page_header(sprintf($user->lang['FOOTBALL_RULES'	]));
-}
-$template->set_filenames(array(
-	'body' => 'rules_popup.html'
-	)
-);
-//	$template->display('popup');
-
-page_footer();
-
-?>
+<?php
+/**
+*
+* @package phpBB Extension - Football Football
+* @copyright (c) 2016 football (http://football.bplaced.net)
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+if (!defined('IN_PHPBB'))
+{
+	exit;
+}
+
+// Can this user view Prediction Leagues pages?
+if (!$config['football_guest_view'])
+{
+	if ($user->data['user_id'] == ANONYMOUS)
+	{
+		trigger_error('NO_GUEST_VIEW');
+	}
+}
+if (!$config['football_user_view'])
+{
+	// Only Prediction League member should see this page
+	// Check Prediction League authorisation 
+	if ( !$this->auth->acl_get('u_use_football') )
+	{
+		trigger_error('NO_AUTH_VIEW');
+	}
+}
+
+// Football disabled?
+if ($config['football_disable'])
+{
+	$message = (!empty($config['football_disable_msg'])) ? $config['football_disable_msg'] : 'FOOTBALL_DISABLED';
+	trigger_error($message);
+}
+
+$season		= $this->request->variable('s', 0);
+$league		= $this->request->variable('l', 0);
+
+// Check parms
+$error_message = '';
+if (!$season OR !$league)
+{
+	$data_rules = false;
+	if (!$season)
+	{	
+		$error_message .= sprintf($user->lang['NO_SEASON']) . '<br />';
+	}
+	if (!$league)
+	{	
+		$error_message .= sprintf($user->lang['NO_LEAGUE']) . '<br />';
+	}
+}
+else
+{
+	$season_info = season_info($season);
+	if (sizeof($season_info))
+	{
+		$season_name = $season_info['season_name'];
+		$league_info = league_info($season, $league);
+		if (sizeof($league_info))
+		{
+			$data_rules = true;
+			$matchdays 		= $league_info['matchdays'];
+			$league_name 	= $league_info['league_name'];
+
+			if ($user->data['is_registered'] and !$user->data['is_bot'])
+			{
+				$win_hits 			= '';
+				$win_hits02 		= '';
+				$win_matchday 	= explode(';', "0;" . $league_info['win_matchday']);
+				$win_season 	= explode(';',"0;" . $league_info['win_season']);
+				$win_hits 		= $league_info['win_result'];
+				$win_hits02 	= $league_info['win_result_02'];
+
+				if($win_hits != '' AND $win_hits != 0)
+				{
+					$template->assign_block_vars('wintable', array(
+						'WIN_DESC' 	=> sprintf($user->lang['WIN_HITS']),
+						)
+					);
+					$template->assign_block_vars('wintable.entry', array(
+						'ROW_CLASS' => 'bg1 row_light',
+						'RANK' 		=> '1. ' . sprintf($user->lang['PLACE']),
+						'WIN' 		=> $win_hits,
+						)
+					);
+				}
+
+				if($win_hits02 != '' AND $win_hits02 != 0 AND $config['football_win_hits02'])
+				{
+					$template->assign_block_vars('wintable', array(
+						'WIN_DESC' 	=> sprintf($user->lang['WIN_HITS02']),
+						)
+					);
+					$template->assign_block_vars('wintable.entry', array(
+						'ROW_CLASS' => 'bg1 row_light',
+						'RANK' 		=> '1. ' . sprintf($user->lang['PLACE']),
+						'WIN' 		=> $win_hits02,
+						)
+					);
+				}
+
+
+				if($win_matchday[1] != '' AND $win_matchday[1] != 0)
+				{
+					$template->assign_block_vars('wintable', array(
+						'WIN_DESC' 	=> sprintf($user->lang['WINS_MATCHDAY']),
+						)
+					);
+					$rank = 1;
+					while ($win_matchday[$rank] != '')
+					{
+						$row_class = (!($rank % 2)) ? 'bg1 row_light' : 'bg2 row_dark';
+						$template->assign_block_vars('wintable.entry', array(
+							'ROW_CLASS' => $row_class,
+							'RANK' 	=> $rank . '. ' . sprintf($user->lang['PLACE']),
+							'WIN' 	=> $win_matchday[$rank],
+							)
+						);
+						$rank++ ;
+						if ($rank > sizeof($win_matchday)-1)
+						{
+							break;
+						}
+					}
+				}
+
+				if($win_season[1] != '' AND $win_season[1] != 0)
+				{
+					$template->assign_block_vars('wintable', array(
+						'WIN_DESC' 	=> sprintf($user->lang['WINS_SEASON']),
+						)
+					);
+					$rank = 1;
+					while ($win_season[$rank] != '')
+					{
+						$row_class = (!($rank % 2)) ? 'bg1 row_light' : 'bg2 row_dark';
+						$template->assign_block_vars('wintable.entry', array(
+							'ROW_CLASS' => $row_class,
+							'RANK' 		=> $rank. '. ' . sprintf($user->lang['PLACE']),
+							'WIN' 		=> $win_season[$rank],
+							)
+						);
+						$rank++ ;
+						if ($rank > sizeof($win_season)-1)
+						{
+							break;
+						}
+					}
+				}
+			}			
+		}
+		else
+		{
+			$data_rules = false;
+			$error_message .= sprintf($user->lang['NO_LEAGUE']) . '<br />';
+			$league_name = '';
+		}
+	}
+	else
+	{
+		$data_rules = false;
+		$error_message .= sprintf($user->lang['NO_SEASON']) . '<br />';
+		$season_name = '';
+	}
+}
+
+$sidename = sprintf($user->lang['FOOTBALL_RULES']);
+if ($data_rules)
+{
+	$link_rules = append_sid($phpbb_root_path . "viewtopic.$phpEx?p=" .  $league_info["rules_post_id"]);
+	$points_tendency = ($league_info['points_mode'] < 3) ? sprintf($user->lang['POINTS_TENDENCY' . $league_info['points_mode']], $league_info['points_tendency']) : sprintf($user->lang['POINTS_TENDENCY'], $league_info['points_tendency']);
+	$template->assign_vars(array(
+		'S_SIDENAME' 		=> $sidename,
+		'S_DATA_RULES'		=> $data_rules,
+		'S_BET_IN_TIME'		=> $league_info['bet_in_time'],
+		'S_BET_POINTS'		=> true,
+		'S_RULES_POST_ID'	=> $league_info['rules_post_id'],
+		'S_ERROR_MESSAGE'	=> $error_message,
+		'S_FOOTBALL_COPY' 	=> sprintf($user->lang['FOOTBALL_COPY'], $config['football_version'], $phpbb_root_path . 'football/'),
+		'WIN_NAME' 			=> $config['football_win_name'],
+		'JOIN_MODE'			=> ($league_info['join_by_user']) ? (($league_info['join_in_season']) ? sprintf($user->lang['JOIN_IN_SEASON']) : sprintf($user->lang['JOIN_BY_USER'])) : sprintf($user->lang['JOIN_BY_ADMIN']),
+		'POINTS_HIT'		=> sprintf($user->lang['POINTS_HIT'], $league_info['points_result']) . '<br/>',
+		'POINTS_TENDENCY'	=> $points_tendency . '<br/>',
+		'POINTS_DIFF'		=> ($league_info['points_mode'] == 4) ? sprintf($user->lang['POINTS_DIFFERENCE'], $league_info['points_diff']) . '<br/>' : 
+								(($league_info['points_mode'] == 5) ? sprintf($user->lang['POINTS_DIFFERENCE_DRAW'], $league_info['points_diff']) . '<br/>' : ''),
+		'POINTS_LAST'		=> ($league_info['points_last']) ? sprintf($user->lang['POINTS_NO_BET']) . '<br/>' : '',
+		'LINK_RULES'	 	=> sprintf($user->lang['LINK_RULES'], $link_rules),
+		'SEASONNAME'	 	=> $season_info['season_name'],
+		'LEAGUENAME'	 	=> $league_name,
+		'BET_POINTS'	 	=> $league_info['bet_points'],
+		)
+	);
+
+	// output page
+	page_header(sprintf($user->lang['FOOTBALL_RULES'	]) . ' ' . $league_info['league_name'] . ' ' . $season_info['season_name']);
+}
+else
+{
+	$template->assign_vars(array(
+		'S_SIDENAME' 		=> $sidename,
+		'S_DATA_RULES'		=> $data_rules,
+		'S_BET_IN_TIME'		=> false,
+		'S_BET_POINTS'		=> false,
+		'S_RULES_POST_ID'	=> 0,
+		'S_ERROR_MESSAGE'	=> $error_message,
+		'S_FOOTBALL_COPY' 	=> sprintf($user->lang['FOOTBALL_COPY'], $config['football_version'], $phpbb_root_path . 'football/'),
+		'WIN_NAME' 			=> $config['football_win_name'],
+		'JOIN_MODE'			=> '',
+		'POINTS_HIT'		=> '',
+		'POINTS_TENDENCY'	=> '',
+		'POINTS_DIFF'		=> '',
+		'POINTS_LAST'		=> '',
+		'LINK_RULES'	 	=> '',
+		'SEASONNAME'	 	=> '',
+		'LEAGUENAME'	 	=> '',
+		)
+	);
+
+	// output page
+	page_header(sprintf($user->lang['FOOTBALL_RULES'	]));
+}
+$template->set_filenames(array(
+	'body' => 'rules_popup.html'
+	)
+);
+//	$template->display('popup');
+
+page_footer();

block/side_table.php

@@ -7,7 +7,7 @@
 *
 */
 
-if (!defined('IN_PHPBB') OR !defined('IN_FOOTBALL'))
+if (!defined('IN_PHPBB'))
 {
 	exit;
 }
@@ -142,4 +142,3 @@ else
 		)
 	);
 }
-?>

block/stat_points.php

@@ -7,7 +7,7 @@
 *
 */
 
-if (!defined('IN_PHPBB') OR !defined('IN_FOOTBALL'))
+if (!defined('IN_PHPBB'))
 {
 	exit;
 }
@@ -160,5 +160,3 @@ $template->assign_vars(array(
 	'LEAGUE' 					=> $league,
 	)
 );
-
-?>

block/stat_results.php

@@ -7,7 +7,7 @@
 *
 */
 
-if (!defined('IN_PHPBB') OR !defined('IN_FOOTBALL'))
+if (!defined('IN_PHPBB'))
 {
 	exit;
 }
@@ -136,5 +136,3 @@ $template->assign_vars(array(
 	'LEAGUE' 					=> $league,
 	)
 );
-
-?>

block/table.php

@@ -7,7 +7,7 @@
 *
 */
 
-if (!defined('IN_PHPBB') OR !defined('IN_FOOTBALL'))
+if (!defined('IN_PHPBB'))
 {
 	exit;
 }
@@ -42,17 +42,23 @@ $rank = 0;
 $sql = "SELECT
 		t.*,
 		SUM(1) AS matches,
-		SUM(IF((m.team_id_home = t.team_id), IF(goals_home + 0 > goals_guest, 1, 0), IF(goals_home + 0 < goals_guest, 1, 0))) AS win,
-		SUM(IF(goals_home = goals_guest, 1, 0)) AS draw,
-		SUM(IF((m.team_id_home = t.team_id), IF(goals_home + 0 < goals_guest, 1, 0), IF(goals_home + 0 > goals_guest, 1, 0))) AS lost,
+       SUM(IF((m.team_id_home = t.team_id), IF(goals_home + 0 > goals_guest, 1, 0), IF(goals_home + 0 < goals_guest, 1, 0)))
+	   + IFNULL((SELECT SUM(c.win) FROM " . FOOTB_CORR . " AS c WHERE c.team_id = t.team_id AND c.season = t.season AND c.league = t.league AND c.matchday <= $matchday),0)AS win,
+       SUM(IF(goals_home = goals_guest, 1, 0))
+	   + IFNULL((SELECT SUM(c.draw) FROM " . FOOTB_CORR . " AS c WHERE c.team_id = t.team_id AND c.season = t.season AND c.league = t.league AND c.matchday <= $matchday),0)AS draw,
+       SUM(IF((m.team_id_home = t.team_id), IF(goals_home + 0 < goals_guest, 1, 0), IF(goals_home + 0 > goals_guest, 1, 0)))
+	   + IFNULL((SELECT SUM(c.lost) FROM " . FOOTB_CORR . " AS c WHERE c.team_id = t.team_id AND c.season = t.season AND c.league = t.league AND c.matchday <= $matchday),0)AS lost,
 		SUM(IF(m.team_id_home = t.team_id, 
 				IF(goals_home + 0 > goals_guest, 3, IF(goals_home = goals_guest, 1, 0)), 
 				IF(goals_home + 0 < goals_guest, 3, IF(goals_home = goals_guest, 1, 0))
 			)
-		) - IF(t.team_id = 20 AND t.season = 2011 AND $matchday > 7, 2, 0) AS points,
+		) + IFNULL((SELECT SUM(b.bonuspoints) FROM " . FOOTB_BONUS_DAY . " AS b WHERE b.team_id = t.team_id AND b.season = t.season AND b.league = t.league AND b.matchday <= $matchday), 0) 
+	    		+ IFNULL((SELECT SUM(c.points) FROM " . FOOTB_CORR . " AS c WHERE c.team_id = t.team_id AND c.season = t.season AND c.league = t.league AND c.matchday <= $matchday),0)
+			- IF(t.team_id = 20 AND t.season = 2011 AND $matchday > 7, 2, 0) AS points,
 		SUM(IF(m.team_id_home = t.team_id, goals_home - goals_guest , goals_guest - goals_home)) AS goals_diff,
 		SUM(IF(m.team_id_home = t.team_id, goals_home , goals_guest)) AS goals,
-		SUM(IF(m.team_id_home = t.team_id, goals_guest , goals_home)) AS goals_against
+       SUM(IF(m.team_id_home = t.team_id, goals_guest , goals_home)) AS goals_against,
+       IFNULL((SELECT SUM(b.bonuspoints) FROM " . FOOTB_BONUS_DAY . " AS b WHERE b.team_id = t.team_id AND b.season = t.season AND b.league = t.league AND b.matchday <= $matchday), 0) AS bonus
 	FROM " . FOOTB_TEAMS . ' AS t
 	LEFT JOIN ' . FOOTB_MATCHES . " AS m ON (m.season = t.season AND m.league = t.league 
 											AND (m.team_id_home = t.team_id OR m.team_id_guest = t.team_id) AND m.group_id = t.group_id)
@@ -60,6 +66,7 @@ $sql = "SELECT
 		AND t.league = $league 
 		AND m.matchday <= $matchday 
 		AND m.status IN (2,3,5,6)
+        AND m.show_table = 0
 	GROUP BY t.team_id
 	ORDER BY t.group_id ASC, points DESC, goals_diff DESC, goals DESC, t.team_name ASC";
 	
@@ -147,37 +154,45 @@ foreach($points_ary as $group_id => $points)
 				'GOALS' 		=> $row['goals'],
 				'GOALS_AGAINST' => $row['goals_against'],
 				'GOALS_DIFF' 	=> $row['goals_diff'],
-				'POINTS' 		=> $row['points'],
+				'BONUS' 		=> round($row['bonus'],2),
+				'POINTS' 		=> round($row['points'],2),
 				)
 			);
 		}		
-	}     
+	}
 }
 
 $db->sql_freeresult($result);
 $rank = 0;
 // Get form-table-information
-$sql = 'SELECT
+$sql = "SELECT
 		t.*,
 		SUM(1) AS matches,
-		SUM(IF((m.team_id_home = t.team_id), IF(goals_home + 0 > goals_guest, 1, 0), IF(goals_home + 0 < goals_guest, 1, 0))) AS win,
-		SUM(IF(goals_home = goals_guest, 1, 0)) AS draw,
-		SUM(IF((m.team_id_home = t.team_id), IF(goals_home + 0 < goals_guest, 1, 0), IF(goals_home + 0 > goals_guest, 1, 0))) AS lost,
-		SUM(IF(m.team_id_home = t.team_id, 
-				IF(goals_home + 0 > goals_guest, 3, IF(goals_home = goals_guest, 1, 0)), 
+       SUM(IF((m.team_id_home = t.team_id), IF(goals_home + 0 > goals_guest, 1, 0), IF(goals_home + 0 < goals_guest, 1, 0)))
+	   + IFNULL((SELECT SUM(c.win) FROM " . FOOTB_CORR . " AS c WHERE c.team_id = t.team_id AND c.season = t.season AND c.league = t.league AND c.matchday <= $matchday AND c.matchday >= $form_from),0)AS win,
+       SUM(IF(goals_home = goals_guest, 1, 0))
+	   + IFNULL((SELECT SUM(c.draw) FROM " . FOOTB_CORR . " AS c WHERE c.team_id = t.team_id AND c.season = t.season AND c.league = t.league AND c.matchday <= $matchday AND c.matchday >= $form_from),0)AS draw,
+       SUM(IF((m.team_id_home = t.team_id), IF(goals_home + 0 < goals_guest, 1, 0), IF(goals_home + 0 > goals_guest, 1, 0)))
+	   + IFNULL((SELECT SUM(c.lost) FROM " . FOOTB_CORR . " AS c WHERE c.team_id = t.team_id AND c.season = t.season AND c.league = t.league AND c.matchday <= $matchday AND c.matchday >= $form_from),0)AS lost,
+		SUM(IF(m.team_id_home = t.team_id,
+				IF(goals_home + 0 > goals_guest, 3, IF(goals_home = goals_guest, 1, 0)),
 				IF(goals_home + 0 < goals_guest, 3, IF(goals_home = goals_guest, 1, 0))
 			)
-		) AS points,
+		) + IFNULL((SELECT SUM(b.bonuspoints) FROM " . FOOTB_BONUS_DAY . " AS b WHERE b.team_id = t.team_id AND b.season = t.season AND b.league = t.league AND b.matchday <= $matchday AND b.matchday >= $form_from),0)
+	    		+ IFNULL((SELECT SUM(c.points) FROM " . FOOTB_CORR . " AS c WHERE c.team_id = t.team_id AND c.season = t.season AND c.league = t.league AND c.matchday <= $matchday AND c.matchday >= $form_from),0)
+			- IF(t.team_id = 20 AND t.season = 2011 AND $matchday > 7, 2, 0) AS points,
 		SUM(IF(m.team_id_home = t.team_id, goals_home - goals_guest , goals_guest - goals_home)) AS goals_diff,
-		SUM(IF(m.team_id_home = t.team_id, goals_home, goals_guest)) AS goals,
-		SUM(IF(m.team_id_home = t.team_id, goals_guest, goals_home)) AS goals_against
-	FROM ' . FOOTB_TEAMS . ' AS t
-	LEFT JOIN ' . FOOTB_MATCHES . " AS m ON (m.season = t.season AND m.league = t.league 
+		SUM(IF(m.team_id_home = t.team_id, goals_home , goals_guest)) AS goals,
+       SUM(IF(m.team_id_home = t.team_id, goals_guest , goals_home)) AS goals_against,
+       IFNULL((SELECT SUM(b.bonuspoints) FROM " . FOOTB_BONUS_DAY . " AS b WHERE b.team_id = t.team_id AND b.season = t.season AND b.league = t.league AND b.matchday <= $matchday AND b.matchday >= $form_from),0) AS bonus
+	FROM " . FOOTB_TEAMS . ' AS t
+	LEFT JOIN ' . FOOTB_MATCHES . " AS m ON (m.season = t.season AND m.league = t.league
 											AND (m.team_id_home = t.team_id OR m.team_id_guest = t.team_id) AND m.group_id = t.group_id)
 	WHERE t.season = $season 
 		AND t.league = $league 
 		AND m.matchday >= $form_from 
 		AND m.status IN (2, 3,5,6)
+        AND m.show_table = 0
 	GROUP BY t.team_id
 	ORDER BY t.group_id ASC, points DESC, goals_diff DESC, goals DESC, t.team_name ASC";
 	
@@ -241,8 +256,9 @@ while($row = $db->sql_fetchrow($result))
 			'LOST' 			=> $row['lost'],
 			'GOALS' 		=> $row['goals'],
 			'GOALS_AGAINST' => $row['goals_against'],
-			'GOALS_DIFF' 	=> $row['goals_diff'],
-			'POINTS' 		=> $row['points'],
+		    'GOALS_DIFF' 	=> $row['goals_diff'],
+		    'BONUS' 		=> round($row['bonus'],2),
+		    'POINTS' 		=> round($row['points'],2),
 			)
 		);
 	}
@@ -250,23 +266,29 @@ while($row = $db->sql_fetchrow($result))
 $db->sql_freeresult($result);
 $rank = 0;
 // Get home-table-information
-$sql = 'SELECT
+$sql = "SELECT
 		t.*,
 		SUM(1) AS matches,
-		SUM(IF(goals_home + 0 > goals_guest, 1, 0)) AS win,
-		SUM(IF(goals_home = goals_guest, 1, 0)) AS draw,
-		SUM(IF(goals_home + 0 < goals_guest, 1, 0)) AS lost,
-		SUM(IF(goals_home + 0 > goals_guest, 3, IF(goals_home = goals_guest, 1, 0))) AS points,
+		SUM(IF(goals_home + 0 > goals_guest, 1, 0))
+			+ IFNULL((SELECT SUM(c.win) FROM " . FOOTB_CORR . " AS c WHERE c.team_id = t.team_id AND c.season = t.season AND c.league = t.league AND c.matchday  <= $matchday AND c.home = 1 ),0)AS win,
+		SUM(IF(goals_home = goals_guest, 1, 0))
+			+ IFNULL((SELECT SUM(c.draw) FROM " . FOOTB_CORR . " AS c WHERE c.team_id = t.team_id AND c.season = t.season AND c.league = t.league AND c.matchday  <= $matchday AND c.home = 1 ),0)AS draw,
+		SUM(IF(goals_home + 0 < goals_guest, 1, 0))
+			+ IFNULL((SELECT SUM(c.lost) FROM " . FOOTB_CORR . " AS c WHERE c.team_id = t.team_id AND c.season = t.season AND c.league = t.league AND c.matchday  <= $matchday AND c.home = 1 ),0)AS lost,
+		SUM(IF(goals_home + 0 > goals_guest, 3, IF(goals_home = goals_guest, 1, 0)))+ IFNULL((SELECT SUM(b.bonuspoints) FROM " . FOOTB_BONUS_DAY . " AS b WHERE b.team_id = t.team_id AND b.season = t.season AND b.league = t.league AND b.matchday <= $matchday AND home = '1'),0)
+			+ IFNULL((SELECT SUM(c.points) FROM " . FOOTB_CORR . " AS c WHERE c.team_id = t.team_id AND c.season = t.season AND c.league = t.league AND c.matchday  <= $matchday AND c.home = 1 ),0)AS points,
 		SUM(goals_home - goals_guest) AS goals_diff,
 		SUM(goals_home) AS goals,
-		SUM(goals_guest) AS goals_against
-	FROM ' . FOOTB_TEAMS . ' AS t
+		SUM(goals_guest) AS goals_against,
+			IFNULL((SELECT SUM(b.bonuspoints) FROM " . FOOTB_BONUS_DAY . " AS b WHERE b.team_id = t.team_id AND b.season = t.season AND b.league = t.league AND home = '1'),0) AS bonus
+	FROM " . FOOTB_TEAMS . ' AS t
 	LEFT JOIN ' . FOOTB_MATCHES . " AS m ON (m.season = t.season AND m.league = t.league 
 											AND m.team_id_home = t.team_id AND m.group_id = t.group_id)
 	WHERE t.season = $season 
 		AND t.league = $league 
 		AND m.matchday <= $matchday 
 		AND m.status IN (2, 3,5,6)
+        AND m.show_table = 0
 	GROUP BY t.team_id
 	ORDER BY t.group_id ASC, points DESC, goals_diff DESC, goals DESC, t.team_name ASC";
 	
@@ -329,8 +351,9 @@ while($row = $db->sql_fetchrow($result))
 			'LOST' 			=> $row['lost'],
 			'GOALS' 		=> $row['goals'],
 			'GOALS_AGAINST' => $row['goals_against'],
-			'GOALS_DIFF' 	=> $row['goals_diff'],
-			'POINTS' 		=> $row['points'],
+		    'GOALS_DIFF' 	=> $row['goals_diff'],
+		    'BONUS' 		=> round($row['bonus'],2),
+		    'POINTS' 		=> round($row['points'],2),
 			)
 		);
 	}
@@ -338,23 +361,29 @@ while($row = $db->sql_fetchrow($result))
 $db->sql_freeresult($result);
 $rank = 0;
 // Get away-table-information
-$sql = 'SELECT
+$sql = "SELECT
 		t.*,
 		SUM(1) AS matches,
-		SUM(IF(goals_home + 0 < goals_guest, 1, 0)) AS win,
-		SUM(IF(goals_home = goals_guest, 1, 0)) AS draw,
-		SUM(IF(goals_home + 0 > goals_guest, 1, 0)) AS lost,
-		SUM(IF(goals_home + 0 < goals_guest, 3, IF(goals_home = goals_guest, 1, 0))) AS points,
+		SUM(IF(goals_home + 0 < goals_guest, 1, 0))
+			+ IFNULL((SELECT SUM(c.win) FROM " . FOOTB_CORR . " AS c WHERE c.team_id = t.team_id AND c.season = t.season AND c.league = t.league AND c.matchday  <= $matchday AND c.home = 0 ),0)AS win,
+		SUM(IF(goals_home = goals_guest, 1, 0))
+			+ IFNULL((SELECT SUM(c.draw) FROM " . FOOTB_CORR . " AS c WHERE c.team_id = t.team_id AND c.season = t.season AND c.league = t.league AND c.matchday  <= $matchday AND c.home = 0 ),0)AS draw,
+		SUM(IF(goals_home + 0 > goals_guest, 1, 0))
+			+ IFNULL((SELECT SUM(c.lost) FROM " . FOOTB_CORR . " AS c WHERE c.team_id = t.team_id AND c.season = t.season AND c.league = t.league AND c.matchday  <= $matchday AND c.home = 0 ),0)AS lost,
+		SUM(IF(goals_home + 0 < goals_guest, 3, IF(goals_home = goals_guest, 1, 0))) + IFNULL((SELECT SUM(b.bonuspoints) FROM " . FOOTB_BONUS_DAY . " AS b WHERE b.team_id = t.team_id AND b.season = t.season AND b.league = t.league AND b.matchday <= $matchday AND home = '0'),0)
+			+ IFNULL((SELECT SUM(c.points) FROM " . FOOTB_CORR . " AS c WHERE c.team_id = t.team_id AND c.season = t.season AND c.league = t.league AND c.matchday  <= $matchday AND c.home = 0 ),0)AS points,
 		SUM(goals_guest - goals_home) AS goals_diff,
 		SUM(goals_guest) AS goals,
-		SUM(goals_home) AS goals_against
-	FROM ' . FOOTB_TEAMS . ' AS t
+		SUM(goals_home) AS goals_against,
+			IFNULL((SELECT SUM(b.bonuspoints) FROM " . FOOTB_BONUS_DAY . " AS b WHERE b.team_id = t.team_id AND b.season = t.season AND b.league = t.league AND home = '0'),0) AS bonus
+	FROM " . FOOTB_TEAMS . ' AS t
 	LEFT JOIN ' . FOOTB_MATCHES . " AS m ON (m.season = t.season AND m.league = t.league 
 											AND m.team_id_guest = t.team_id AND m.group_id = t.group_id)
 	WHERE t.season = $season 
 		AND t.league = $league 
 		AND m.matchday <= $matchday 
 		AND m.status IN (2, 3,5,6)
+        AND m.show_table = 0
 	GROUP BY t.team_id
 	ORDER BY t.group_id ASC, points DESC, goals_diff DESC, goals DESC, t.team_name ASC";
 	
@@ -417,24 +446,37 @@ while($row = $db->sql_fetchrow($result))
 			'LOST' 			=> $row['lost'],
 			'GOALS' 		=> $row['goals'],
 			'GOALS_AGAINST' => $row['goals_against'],
-			'GOALS_DIFF' 	=> $row['goals_diff'],
-			'POINTS' 		=> $row['points'],
+		    'GOALS_DIFF' 	=> $row['goals_diff'],
+		    'BONUS' 		=> round($row['bonus'],2),
+		    'POINTS' 		=> round($row['points'],2),
 			)
 		);
 	}
 }
 
+if($league > 50)
+{
+    // Activate bonus coloumn only for tippers.
+    $data_bns = true;
+} else {
+    $data_bns = false;
+}
+if($side == 'table') {
+    $display_table_menu = true;
+} else {
+    $display_table_menu = false;
+}
 $db->sql_freeresult($result);
 $sidename = sprintf($user->lang['TABLE']);
 $template->assign_vars(array(
-	'S_DISPLAY_TABLE' 			=> true,
+    'S_DISPLAY_TABLE' 			=> true,
+    'S_DISPLAY_TABLE_MENU' 		=> $display_table_menu,
 	'S_SIDENAME' 				=> $sidename,
 	'S_DATA_TABLE' 				=> $data_table,
 	'S_DATA_FORM' 				=> $data_form,
 	'SEASON' 					=> $season,
 	'LEAGUE' 					=> $league,
 	'TEXT_FORM' 				=> $text_form,
+	'S_DATA_BNS'				=> $data_bns,
 	)
 );
-	
-?>

block/under_construction.php

@@ -1,23 +1,21 @@
-<?php
-/**
-*
-* @package Football
-* @version $Id: under_construction.php 1 2010-05-17 22:09:43Z football $
-* @copyright (c) 2010 football (http://football.bplaced.net)
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
-*
-*/
-
-if ( !defined('IN_PHPBB') OR !defined('IN_FOOTBALL') )
-{
-	exit;
-}
-
-$sidename = sprintf($user->lang['UNDER_CONSTRUCTION']);
-$template->assign_vars(array(
-	'S_SIDENAME' 					=> $sidename,
-	'S_DISPLAY_UNDER_CONSTRUCTION' 	=> true,
-	)
-);
-
-?>
+<?php
+/**
+*
+* @package Football
+* @version $Id: under_construction.php 1 2010-05-17 22:09:43Z football $
+* @copyright (c) 2010 football (http://football.bplaced.net)
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+*
+*/
+
+if (!defined('IN_PHPBB'))
+{
+	exit;
+}
+
+$sidename = sprintf($user->lang['UNDER_CONSTRUCTION']);
+$template->assign_vars(array(
+	'S_SIDENAME' 					=> $sidename,
+	'S_DISPLAY_UNDER_CONSTRUCTION' 	=> true,
+	)
+);

block/viewplan_popup.php

@@ -1,297 +1,300 @@
-<?php
-/**
-*
-* @package phpBB Extension - Football Football
-* @copyright (c) 2016 football (http://football.bplaced.net)
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
-*
-*/
-
-// Can this user view Prediction Leagues pages?
-if (!$config['football_guest_view'])
-{
-	if ($user->data['user_id'] == ANONYMOUS)
-	{
-		trigger_error('NO_GUEST_VIEW');
-	}
-}
-if (!$config['football_user_view'])
-{
-	// Only Prediction League member should see this page
-	// Check Prediction League authorisation 
-	if ( !$this->auth->acl_get('u_use_football') )
-	{
-		trigger_error('NO_AUTH_VIEW');
-	}
-}
-
-// Football disabled?
-if ($config['football_disable'])
-{
-	$message = (!empty($config['football_disable_msg'])) ? $config['football_disable_msg'] : 'FOOTBALL_DISABLED';
-	trigger_error($message);
-}
-
-$mode		= $this->request->variable('mode', '');
-$season		= $this->request->variable('s', 0);
-$league		= $this->request->variable('l', 0);
-$team_id	= $this->request->variable('tid', 0);
-
-switch($mode)
-{
-	case 'played':
-		$mode_desc = sprintf($user->lang['PLAYED_MATCHES']);
-		$where = ' AND m.status IN (3,6) ';
-		$data_results = true;
-	break;
-	case 'rest':
-		$mode_desc = sprintf($user->lang['REST_MATCHES']);
-		$where = ' AND m.status IN (0,1,2,4,5) ';
-		$data_results = false;
-		break;
-	case 'home':
-		$mode_desc = sprintf($user->lang['HOME_MATCHES']);
-		$where = " AND m.team_id_home = $team_id AND m.status IN (3,6) ";
-		$data_results = true;
-	break;
-	case 'away':
-		$mode_desc = sprintf($user->lang['AWAY_MATCHES']);
-		$where = " AND m.team_id_guest = $team_id AND m.status IN (3,6) ";
-		$data_results = true;
-	break;
-	// ALL is Default
-	default:
-		$mode_desc = sprintf($user->lang['ALL_MATCHES']);
-		$where = '';
-		$data_results = true;
-	break;
-}
-
-// Check parms
-$error_message = '';
-if (!$season OR !$league OR !$team_id)
-{
-	$data_plan = false;
-	if (!$season)
-	{	
-		$error_message .= sprintf($user->lang['NO_SEASON']) . '<br />';
-	}
-	if (!$league)
-	{	
-		$error_message .= sprintf($user->lang['NO_LEAGUE']) . '<br />';
-	}
-	if (!$team_id)
-	{	
-		$error_message .= sprintf($user->lang['NO_TEAM_ID']) . '<br />';
-	}
-}
-else
-{
-	$data_group = false;
-	$lang_dates = $user->lang['datetime'];
-
-
-	// Calculate matches and bets of matchday
-	$sql = "SELECT
-			IF(m.team_id_home = $team_id, 'H', 'A') AS match_place,
-			IF(((m.status=3) OR (m.status=6)), 
-				IF(m.team_id_home = $team_id, 
-					IF(m.goals_home + 0 > m.goals_guest, 'match_win', IF(m.goals_home = m.goals_guest, 'match_draw', 'match_lost')),
-					IF(m.goals_home + 0 < m.goals_guest, 'match_win', IF(m.goals_home = m.goals_guest, 'match_draw', 'match_lost'))),
-				'') AS match_style,
-			m.match_no,
-			m.matchday,
-			m.status,
-			m.group_id,
-			t1.team_symbol AS home_symbol,
-			t2.team_symbol AS guest_symbol,
-			t1.team_id AS home_id,
-			t2.team_id AS guest_id,
-			t1.team_name AS home_name,
-			t2.team_name AS guest_name,
-			t1.team_name_short AS home_short,
-			t2.team_name_short AS guest_short,
-			m.goals_home, 
-			m.goals_guest,
-			CONCAT(
-				CASE DATE_FORMAT(m.match_datetime,'%w')
-				  WHEN 0 THEN '" . $lang_dates['Sun'] . "'
-				  WHEN 1 THEN '" . $lang_dates['Mon'] . "'
-				  WHEN 2 THEN '" . $lang_dates['Tue'] . "'
-				  WHEN 3 THEN '" . $lang_dates['Wed'] . "'
-				  WHEN 4 THEN '" . $lang_dates['Thu'] . "'
-				  WHEN 5 THEN '" . $lang_dates['Fri'] . "'
-				  WHEN 6 THEN '" . $lang_dates['Sat'] . "'
-				  ELSE 'Error' END,
-				DATE_FORMAT(m.match_datetime,' %d.%m. %H:%i')
-			) AS match_time
-		FROM  " . FOOTB_MATCHES . ' AS m
-		LEFT JOIN ' . FOOTB_TEAMS . ' AS t1 ON (t1.season = m.season AND t1.league = m.league AND t1.team_id=m.team_id_home)
-		LEFT JOIN ' . FOOTB_TEAMS . " AS t2 ON (t2.season = m.season AND t2.league = m.league AND t2.team_id=m.team_id_guest)
-		WHERE m.season = $season 
-			AND m.league = $league 
-			AND (m.team_id_home = $team_id OR m.team_id_guest = $team_id) 
-			$where
-		GROUP BY m.match_no
-		ORDER BY m.match_datetime ASC, m.match_no ASC";
-	$result = $db->sql_query($sql);
-	if ($row = $db->sql_fetchrow($result))
-	{
-		$data_plan = true;
-		$matchnumber = 0;
-		$ext_path = $this->phpbb_path_helper->update_web_root_path($this->phpbb_extension_manager->get_extension_path('football/football', true));
-		do
-		{
-			$matchnumber++ ;
-			$row_class = (!($matchnumber % 2)) ? 'bg1 row_light' : 'bg2 row_dark';
-			$display_link = true;
-			$homelogo = $row['home_symbol'];
-			$guestlogo = $row['guest_symbol'];
-			if ($homelogo <> '')
-			{
-				$logoH = "<img src=\"" . $ext_path . 'images/flags/' . $homelogo . "\" alt=\"" . $homelogo . "\" width=\"28\" height=\"28\"/>" ;
-			}
-			else
-			{
-				$logoH = "<img src=\"" . $ext_path . "images/flags/blank.gif\" alt=\"\" width=\"28\" height=\"28\"/>" ;
-			}
-			if ($guestlogo <> '')
-			{
-				$logoG = "<img src=\"" . $ext_path . 'images/flags/' . $guestlogo . "\" alt=\"" . $guestlogo . "\" width=\"28\" height=\"28\"/>" ;
-			}
-			else
-			{
-				$logoG = "<img src=\"" . $ext_path . "images/flags/blank.gif\" alt=\"\" width=\"28\" height=\"28\"/>" ;
-			}
-
-			if ($row['group_id'] == '')
-			{
-				$group_id = '&nbsp;';
-			}
-			else
-			{
-				$data_group = true;
-				$group_id = $row['group_id'];
-			}
-
-			if ($row['match_place'] == 'H')
-			{
-				$color_home = $row['match_style'];
-				$color_guest = '';
-			}
-			else
-			{
-				$color_home = '';
-				$color_guest = $row['match_style'];
-			}
-			$color_goals = $row['match_style'];
-			
-			$template->assign_block_vars('match', array(
-				'ROW_CLASS' 	=> $row_class,
-				'MATCH_TIME' 	=> $row['match_time'],
-				'GROUP' 		=> $group_id,
-				'LOGO_HOME' 	=> $logoH,
-				'LOGO_GUEST' 	=> $logoG,
-				'HOME_NAME' 	=> $row['home_short'],
-				'GUEST_NAME' 	=> $row['guest_short'],
-				'GOALS_HOME' 	=> ($row['goals_home'] == '') ? '&nbsp;' : $row['goals_home'],
-				'GOALS_GUEST'	=> ($row['goals_guest'] == '') ? '&nbsp;' : $row['goals_guest'],
-				'COLOR_HOME' 	=> $color_home,
-				'COLOR_GUEST' 	=> $color_guest,
-				'COLOR_GOALS' 	=> $color_goals,
-				)
-			);
-		}
-		while ($row = $db->sql_fetchrow($result));
-		$db->sql_freeresult($result);
-	}
-	else
-	{
-		$data_plan = false;
-	}
-
-	$season_info = season_info($season);
-	if (sizeof($season_info) == 0)
-	{	
-		$error_message .= sprintf($user->lang['NO_SEASON']) . '<br />';
-		$season_name = '';
-	}
-	else
-	{
-		$season_name = $season_info["season_name"];
-
-		$league_info = league_info($season, $league);
-		if (sizeof($league_info) == 0)
-		{	
-			$error_message .= sprintf($user->lang['NO_LEAGUE']) . '<br />';
-			$league_name = '';
-			
-		}
-		else
-		{
-			$league_name = $league_info["league_name"];
-		
-			$team_info = team_info($season, $league, $team_id);
-			if (sizeof($team_info) == 0)
-			{	
-				$error_message .= sprintf($user->lang['NO_TEAM_ID']) . '<br />';
-				$team_name = '';
-				$logo = '';
-			}
-			else
-			{
-				$team_name = $team_info["team_name"];
-				$logo = "<img src=\"" . $ext_path . 'images/flags/' . $team_info["team_symbol"] . "\" alt=\"" . $team_info["team_symbol"] . "\" width=\"28\" height=\"28\"/>" ;
-			}
-		}
-	}
-}
-
-$sidename = sprintf($user->lang['PLAN']);
-if ($data_plan)
-{
-	$template->assign_vars(array(
-		'S_SIDENAME' 		=> $sidename,
-		'S_DATA_PLAN' 		=> $data_plan,
-		'S_DATA_GROUP'		=> $data_group,
-		'S_ERROR_MESSAGE'	=> $error_message,
-		'MODE_DESC'	 		=> $mode_desc,
-		'LOGO'	 			=> $logo,
-		'TEAM'	 			=> $team_name,
-		'SEASON'	 		=> $season_name,
-		'LEAGUE'	 		=> $league_name,
-		'S_FOOTBALL_COPY' 	=> sprintf($user->lang['FOOTBALL_COPY'], $config['football_version'], $phpbb_root_path . 'football/'),
-		'S_DATA_RESULTS'	=> $data_results,
-		)
-	);
-
-	// output page
-	page_header($mode_desc . ' ' . $team_name);
-}
-else
-{
-	$template->assign_vars(array(
-		'S_SIDENAME' 		=> $sidename,
-		'S_DATA_PLAN' 		=> $data_plan,
-		'S_DATA_GROUP'		=> false,
-		'S_ERROR_MESSAGE'	=> $error_message,
-		'MODE_DESC'	 		=> $mode_desc,
-		'LOGO'	 			=> '',
-		'TEAM'	 			=> '',
-		'SEASON'	 		=> '',
-		'LEAGUE'	 		=> '',
-		'S_FOOTBALL_COPY' 	=> sprintf($user->lang['FOOTBALL_COPY'], $config['football_version'], $phpbb_root_path . 'football/'),
-		'S_DATA_RESULTS'	=> false,
-		)
-	);
-
-	// output page
-	page_header($mode_desc);
-}
-$template->set_filenames(array(
-	'body' => 'viewplan_popup.html')
-);
-
-page_footer();
-
-?>
+<?php
+/**
+*
+* @package phpBB Extension - Football Football
+* @copyright (c) 2016 football (http://football.bplaced.net)
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+if (!defined('IN_PHPBB'))
+{
+	exit;
+}
+
+// Can this user view Prediction Leagues pages?
+if (!$config['football_guest_view'])
+{
+	if ($user->data['user_id'] == ANONYMOUS)
+	{
+		trigger_error('NO_GUEST_VIEW');
+	}
+}
+if (!$config['football_user_view'])
+{
+	// Only Prediction League member should see this page
+	// Check Prediction League authorisation 
+	if ( !$this->auth->acl_get('u_use_football') )
+	{
+		trigger_error('NO_AUTH_VIEW');
+	}
+}
+
+// Football disabled?
+if ($config['football_disable'])
+{
+	$message = (!empty($config['football_disable_msg'])) ? $config['football_disable_msg'] : 'FOOTBALL_DISABLED';
+	trigger_error($message);
+}
+
+$mode		= $this->request->variable('mode', '');
+$season		= $this->request->variable('s', 0);
+$league		= $this->request->variable('l', 0);
+$team_id	= $this->request->variable('tid', 0);
+
+switch($mode)
+{
+	case 'played':
+		$mode_desc = sprintf($user->lang['PLAYED_MATCHES']);
+		$where = ' AND m.status IN (3,6) ';
+		$data_results = true;
+	break;
+	case 'rest':
+		$mode_desc = sprintf($user->lang['REST_MATCHES']);
+		$where = ' AND m.status IN (0,1,2,4,5) ';
+		$data_results = false;
+		break;
+	case 'home':
+		$mode_desc = sprintf($user->lang['HOME_MATCHES']);
+		$where = " AND m.team_id_home = $team_id AND m.status IN (3,6) ";
+		$data_results = true;
+	break;
+	case 'away':
+		$mode_desc = sprintf($user->lang['AWAY_MATCHES']);
+		$where = " AND m.team_id_guest = $team_id AND m.status IN (3,6) ";
+		$data_results = true;
+	break;
+	// ALL is Default
+	default:
+		$mode_desc = sprintf($user->lang['ALL_MATCHES']);
+		$where = '';
+		$data_results = true;
+	break;
+}
+
+// Check parms
+$error_message = '';
+if (!$season OR !$league OR !$team_id)
+{
+	$data_plan = false;
+	if (!$season)
+	{	
+		$error_message .= sprintf($user->lang['NO_SEASON']) . '<br />';
+	}
+	if (!$league)
+	{	
+		$error_message .= sprintf($user->lang['NO_LEAGUE']) . '<br />';
+	}
+	if (!$team_id)
+	{	
+		$error_message .= sprintf($user->lang['NO_TEAM_ID']) . '<br />';
+	}
+}
+else
+{
+	$data_group = false;
+	$lang_dates = $user->lang['datetime'];
+
+
+	// Calculate matches and bets of matchday
+	$sql = "SELECT
+			IF(m.team_id_home = $team_id, 'H', 'A') AS match_place,
+			IF(((m.status=3) OR (m.status=6)), 
+				IF(m.team_id_home = $team_id, 
+					IF(m.goals_home + 0 > m.goals_guest, 'match_win', IF(m.goals_home = m.goals_guest, 'match_draw', 'match_lost')),
+					IF(m.goals_home + 0 < m.goals_guest, 'match_win', IF(m.goals_home = m.goals_guest, 'match_draw', 'match_lost'))),
+				'') AS match_style,
+			m.match_no,
+			m.matchday,
+			m.status,
+			m.group_id,
+			t1.team_symbol AS home_symbol,
+			t2.team_symbol AS guest_symbol,
+			t1.team_id AS home_id,
+			t2.team_id AS guest_id,
+			t1.team_name AS home_name,
+			t2.team_name AS guest_name,
+			t1.team_name_short AS home_short,
+			t2.team_name_short AS guest_short,
+			m.goals_home, 
+			m.goals_guest,
+			CONCAT(
+				CASE DATE_FORMAT(m.match_datetime,'%w')
+				  WHEN 0 THEN '" . $lang_dates['Sun'] . "'
+				  WHEN 1 THEN '" . $lang_dates['Mon'] . "'
+				  WHEN 2 THEN '" . $lang_dates['Tue'] . "'
+				  WHEN 3 THEN '" . $lang_dates['Wed'] . "'
+				  WHEN 4 THEN '" . $lang_dates['Thu'] . "'
+				  WHEN 5 THEN '" . $lang_dates['Fri'] . "'
+				  WHEN 6 THEN '" . $lang_dates['Sat'] . "'
+				  ELSE 'Error' END,
+				DATE_FORMAT(m.match_datetime,' %d.%m. %H:%i')
+			) AS match_time
+		FROM  " . FOOTB_MATCHES . ' AS m
+		LEFT JOIN ' . FOOTB_TEAMS . ' AS t1 ON (t1.season = m.season AND t1.league = m.league AND t1.team_id=m.team_id_home)
+		LEFT JOIN ' . FOOTB_TEAMS . " AS t2 ON (t2.season = m.season AND t2.league = m.league AND t2.team_id=m.team_id_guest)
+		WHERE m.season = $season 
+			AND m.league = $league 
+			AND (m.team_id_home = $team_id OR m.team_id_guest = $team_id) 
+			$where
+		GROUP BY m.match_no
+		ORDER BY m.match_datetime ASC, m.match_no ASC";
+	$result = $db->sql_query($sql);
+	if ($row = $db->sql_fetchrow($result))
+	{
+		$data_plan = true;
+		$matchnumber = 0;
+		$ext_path = $this->phpbb_path_helper->update_web_root_path($this->phpbb_extension_manager->get_extension_path('football/football', true));
+		do
+		{
+			$matchnumber++ ;
+			$row_class = (!($matchnumber % 2)) ? 'bg1 row_light' : 'bg2 row_dark';
+			$display_link = true;
+			$homelogo = $row['home_symbol'];
+			$guestlogo = $row['guest_symbol'];
+			if ($homelogo <> '')
+			{
+				$logoH = "<img src=\"" . $ext_path . 'images/flags/' . $homelogo . "\" alt=\"" . $homelogo . "\" width=\"28\" height=\"28\"/>" ;
+			}
+			else
+			{
+				$logoH = "<img src=\"" . $ext_path . "images/flags/blank.gif\" alt=\"\" width=\"28\" height=\"28\"/>" ;
+			}
+			if ($guestlogo <> '')
+			{
+				$logoG = "<img src=\"" . $ext_path . 'images/flags/' . $guestlogo . "\" alt=\"" . $guestlogo . "\" width=\"28\" height=\"28\"/>" ;
+			}
+			else
+			{
+				$logoG = "<img src=\"" . $ext_path . "images/flags/blank.gif\" alt=\"\" width=\"28\" height=\"28\"/>" ;
+			}
+
+			if ($row['group_id'] == '')
+			{
+				$group_id = '&nbsp;';
+			}
+			else
+			{
+				$data_group = true;
+				$group_id = $row['group_id'];
+			}
+
+			if ($row['match_place'] == 'H')
+			{
+				$color_home = $row['match_style'];
+				$color_guest = '';
+			}
+			else
+			{
+				$color_home = '';
+				$color_guest = $row['match_style'];
+			}
+			$color_goals = $row['match_style'];
+			
+			$template->assign_block_vars('match', array(
+				'ROW_CLASS' 	=> $row_class,
+				'MATCH_TIME' 	=> $row['match_time'],
+				'GROUP' 		=> $group_id,
+				'LOGO_HOME' 	=> $logoH,
+				'LOGO_GUEST' 	=> $logoG,
+				'HOME_NAME' 	=> $row['home_short'],
+				'GUEST_NAME' 	=> $row['guest_short'],
+				'GOALS_HOME' 	=> ($row['goals_home'] == '') ? '&nbsp;' : $row['goals_home'],
+				'GOALS_GUEST'	=> ($row['goals_guest'] == '') ? '&nbsp;' : $row['goals_guest'],
+				'COLOR_HOME' 	=> $color_home,
+				'COLOR_GUEST' 	=> $color_guest,
+				'COLOR_GOALS' 	=> $color_goals,
+				)
+			);
+		}
+		while ($row = $db->sql_fetchrow($result));
+		$db->sql_freeresult($result);
+	}
+	else
+	{
+		$data_plan = false;
+	}
+
+	$season_info = season_info($season);
+	if (sizeof($season_info) == 0)
+	{	
+		$error_message .= sprintf($user->lang['NO_SEASON']) . '<br />';
+		$season_name = '';
+	}
+	else
+	{
+		$season_name = $season_info["season_name"];
+
+		$league_info = league_info($season, $league);
+		if (sizeof($league_info) == 0)
+		{	
+			$error_message .= sprintf($user->lang['NO_LEAGUE']) . '<br />';
+			$league_name = '';
+			
+		}
+		else
+		{
+			$league_name = $league_info["league_name"];
+		
+			$team_info = team_info($season, $league, $team_id);
+			if (sizeof($team_info) == 0)
+			{	
+				$error_message .= sprintf($user->lang['NO_TEAM_ID']) . '<br />';
+				$team_name = '';
+				$logo = '';
+			}
+			else
+			{
+				$team_name = $team_info["team_name"];
+				$logo = "<img src=\"" . $ext_path . 'images/flags/' . $team_info["team_symbol"] . "\" alt=\"" . $team_info["team_symbol"] . "\" width=\"28\" height=\"28\"/>" ;
+			}
+		}
+	}
+}
+
+$sidename = sprintf($user->lang['PLAN']);
+if ($data_plan)
+{
+	$template->assign_vars(array(
+		'S_SIDENAME' 		=> $sidename,
+		'S_DATA_PLAN' 		=> $data_plan,
+		'S_DATA_GROUP'		=> $data_group,
+		'S_ERROR_MESSAGE'	=> $error_message,
+		'MODE_DESC'	 		=> $mode_desc,
+		'LOGO'	 			=> $logo,
+		'TEAM'	 			=> $team_name,
+		'SEASON'	 		=> $season_name,
+		'LEAGUE'	 		=> $league_name,
+		'S_FOOTBALL_COPY' 	=> sprintf($user->lang['FOOTBALL_COPY'], $config['football_version'], $phpbb_root_path . 'football/'),
+		'S_DATA_RESULTS'	=> $data_results,
+		)
+	);
+
+	// output page
+	page_header($mode_desc . ' ' . $team_name);
+}
+else
+{
+	$template->assign_vars(array(
+		'S_SIDENAME' 		=> $sidename,
+		'S_DATA_PLAN' 		=> $data_plan,
+		'S_DATA_GROUP'		=> false,
+		'S_ERROR_MESSAGE'	=> $error_message,
+		'MODE_DESC'	 		=> $mode_desc,
+		'LOGO'	 			=> '',
+		'TEAM'	 			=> '',
+		'SEASON'	 		=> '',
+		'LEAGUE'	 		=> '',
+		'S_FOOTBALL_COPY' 	=> sprintf($user->lang['FOOTBALL_COPY'], $config['football_version'], $phpbb_root_path . 'football/'),
+		'S_DATA_RESULTS'	=> false,
+		)
+	);
+
+	// output page
+	page_header($mode_desc);
+}
+$template->set_filenames(array(
+	'body' => 'viewplan_popup.html')
+);
+
+page_footer();

composer.json

@@ -1,29 +1,30 @@
 {
-	"name": "football/football",
-	"type": "phpbb-extension",
-	"description": "Football Prediction League",
-	"homepage": "http://football.bplaced.net",
-	"version": "0.9.9",
-	"time": "2017-09-09",
-	"license": "GPL-2.0",
-	"authors": [{
-			"name": "J. Helmke",
-			"email": "phpBB3.football@gmx.de",
-			"homepage": "http://football.bplaced.net",
-			"role": "Lead Developer"
-		}],
-	"require": {
-		"php": ">=5.3.3"
+	"name" : "football/football",
+	"type" : "phpbb-extension",
+	"description" : "Football Prediction League",
+	"homepage" : "http://football.bplaced.net",
+	"version" : "0.9.9",
+	"time" : "2021-04-04",
+	"license" : "GPL-2.0-only",
+	"authors" : [{
+			"name" : "J. Helmke",
+			"email" : "phpBB3.football@gmx.de",
+			"homepage" : "http://football.bplaced.net",
+			"role" : "Lead Developer"
+		}
+	],
+	"require" : {
+		"php" : ">=5.3.3"
 	},
-	"extra": {
-		"display-name": "Football Prediction League",
-		"soft-require": {
-			"phpbb/phpbb": ">3.1.*"
+	"extra" : {
+		"display-name" : "Football Prediction League",
+		"soft-require" : {
+			"phpbb/phpbb" : ">=3.2.8,<3.4"
 		},
-		"version-check": {
-			"host": "football.bplaced.net",
-			"directory": "/updatecheck",
-			"filename": "football_predictionleague.json"
+		"version-check" : {
+			"host" : "football.bplaced.net",
+			"directory" : "/updatecheck",
+			"filename" : "football_predictionleague.json"
 		}
 	}
-}
+}

config/routing.yml

@@ -1,4 +1,4 @@
-football_main_controller:
+football_football_controller:
     path: /football/{side}
     defaults: { _controller: football.football.controller:handle }
 

config/services.yml

@@ -12,102 +12,102 @@ services:
     football.football.controller:
         class: football\football\controller\main
         arguments:
-            - @auth
-            - @config
-            - @ext.manager
-            - @notification_manager
-            - @log
-            - @path_helper
-            - @dbal.conn           
-            - @controller.helper
-            - @template
-            - @user
-            - @pagination
-            - %core.root_path% 
-            - %core.php_ext%	
+            - '@auth'
+            - '@config'
+            - '@ext.manager'
+            - '@notification_manager'
+            - '@log'
+            - '@path_helper'
+            - '@dbal.conn'
+            - '@controller.helper'
+            - '@template'
+            - '@user'
+            - '@pagination'
+            - '%core.root_path%'
+            - '%core.php_ext%'
             
     football.football.controller_popup:
         class: football\football\controller\popup
         arguments:
-            - @auth
-            - @config
-            - @ext.manager
-            - @path_helper
-            - @dbal.conn           
-            - @controller.helper
-            - @template
-            - @user
-            - @pagination
-            - %core.root_path% 
-            - %core.php_ext%	
+            - '@auth'
+            - '@config'
+            - '@ext.manager'
+            - '@path_helper'
+            - '@dbal.conn'
+            - '@controller.helper'
+            - '@template'
+            - '@user'
+            - '@pagination'
+            - '%core.root_path%'
+            - '%core.php_ext%'
 
     football.football.controller_download:
         class: football\football\controller\download
         arguments:
-            - @auth
-            - @config
-            - @ext.manager
-            - @path_helper
-            - @dbal.conn           
-            - @controller.helper
-            - @template
-            - @user
-            - %core.root_path% 
-            - %core.php_ext%	
+            - '@auth'
+            - '@config'
+            - '@ext.manager'
+            - '@path_helper'
+            - '@dbal.conn'
+            - '@controller.helper'
+            - '@template'
+            - '@user'
+            - '%core.root_path%'
+            - '%core.php_ext%'
 
     football.football.version.check:
         class: football\football\includes\version_check
         scope: prototype
         arguments:
-            - %football.version_data%
-            - @config
-            - @version_helper
-            - @template
-            - @user
+            - '%football.version_data%'
+            - '@config'
+            - '@version_helper'
+            - '@template'
+            - '@user'
 
     football.football.controller_xml:
         class: football\football\controller\xmlplan
         arguments:
-            - @config
-            - @ext.manager
-            - @path_helper
-            - @dbal.conn
-            - @user
-            - %core.root_path%
-            - %core.php_ext%
+            - '@config'
+            - '@ext.manager'
+            - '@path_helper'
+            - '@dbal.conn'
+            - '@user'
+            - '%core.root_path%'
+            - '%core.php_ext%'
 
     football.football.core.functions.points:
         class: football\football\core\functions_points
         arguments:
-            - @user
-            - @dbal.conn
+            - '@user'
+            - '@dbal.conn'
 
     football.football.listener:
         class: football\football\event\main_listener
         arguments:
-            - @auth
-            - @config
-            - @controller.helper
-            - @template
-            - @path_helper
-            - @ext.manager
-            - @user
-            - %core.root_path%
-            - %core.php_ext%
+            - '@auth'
+            - '@config'
+            - '@controller.helper'
+            - '@template'
+            - '@path_helper'
+            - '@ext.manager'
+            - '@user'
+            - '%core.root_path%'
+            - '%core.php_ext%'
         tags:
             - { name: event.listener }            
 
     football.football.cron.task.football_remember:
         class: football\football\cron\task\football_remember
         arguments:
-            - %core.root_path%
-            - %core.php_ext%
-            - @ext.manager
-            - @path_helper
-            - @dbal.conn
-            - @config
-            - @log
-            - @user
+            - '%core.root_path%'
+            - '%core.php_ext%'
+            - '@ext.manager'
+            - '@path_helper'
+            - '@dbal.conn'
+            - '@config'
+            - '@log'
+            - '@user'
         calls:
             - [set_name, [football.football.cron.task.football_remember]]
         tags:

controller/download.php

@@ -122,7 +122,6 @@ class download
 		{
 			$message = (!empty($config['football_disable_msg'])) ? $config['football_disable_msg'] : 'FOOTBALL_DISABLED';
 			trigger_error($message);
-			exit;
 		}
 
 		// Can this user view Prediction Leagues pages?

controller/main.php

@@ -45,7 +45,7 @@ class main
 	/* @var \phpbb\user */
 	protected $user;
 	
-	/** @var \phpbb\pagination */
+	/* @var \phpbb\pagination */
 	protected $pagination;
 	
 	/* @var phpBB root path */
@@ -137,7 +137,6 @@ class main
 		{
 			$message = (!empty($config['football_disable_msg'])) ? $config['football_disable_msg'] : 'FOOTBALL_DISABLED';
 			trigger_error($message);
-			exit;
 		}
 
 		// Can this user view Prediction Leagues pages?
@@ -732,6 +731,9 @@ class main
 				}
 				calculate_extra_points($season, $league, $matchday);
 				save_ranking_matchday($season, $league, $matchday);
+				bonuspoints($season, $league, $matchday);
+				corr($season, $league, $matchday);
+				chart($season, $league, $matchday);
 			break;
 			case 'join':
 				join_league($season, $league, $user->data['user_id']);
@@ -750,18 +752,18 @@ class main
 				INNER JOIN ' . FOOTB_LEAGUES . ' AS l ON (l.season = s.season)
 				INNER JOIN ' . FOOTB_MATCHDAYS . ' AS sp ON (sp.season = s.season AND sp.league = l.league)
 				WHERE 1
-				ORDER BY season DESC';
+				ORDER BY s.season DESC';
 		$result = $db->sql_query($sql);
 		while( $row = $db->sql_fetchrow($result))
 		{
 			$selected = ($season && $row['season'] == $season) ? ' selected="selected"' : '';
 			if ($selected)
 			{
-				$season_name = htmlspecialchars($row['season_name_short']);
+				$season_name = utf8_htmlspecialchars($row['season_name_short']);
 			}
 			$template->assign_block_vars('form_season', array(
-				'S_SEASON' 		=> htmlspecialchars($row['season']),
-				'S_SEASONNAME' 	=> htmlspecialchars($row['season_name_short']),
+				'S_SEASON' 		=> utf8_htmlspecialchars($row['season']),
+				'S_SEASONNAME' 	=> utf8_htmlspecialchars($row['season_name_short']),
 				'S_SELECTED' 	=> $selected));
 		}
 		$db->sql_freeresult($result);
@@ -782,11 +784,40 @@ class main
 		}
 
 		$league_name = '';
-		$sql = 'SELECT * FROM ' . FOOTB_LEAGUES . " WHERE season = $season AND league_type >= 1";
+		if ($side == 'table' OR $side == 'results_tl')
+		{
+		    $sql = 'SELECT * FROM ' . FOOTB_LEAGUES . " WHERE season = $season AND league_type >= 1 AND (league >= 50 OR bet_type = 1) ORDER BY sort ASC";
+		}
+		else
+		{
+		    $sql = 'SELECT * FROM ' . FOOTB_LEAGUES . " WHERE season = $season AND league_type >= 1  AND league < 50";
+		}
 		$result = $db->sql_query($sql);
 		while( $row = $db->sql_fetchrow($result))
 		{
-			$selected = ($league && $row['league'] == $league) ? ' selected="selected"' : '';
+		    $selected = ($league && $row['league'] == $league) ? ' selected="selected"' : '';
+		    if ($side == 'table' && $league_info['bet_type'])
+		    {
+		        $side = 'ranks_total';
+		    }
+		    elseif ($side == 'ranks_total' && !$league_info['bet_type'])
+		    {
+		        $side = 'table';
+		    }
+		    elseif ($side == 'table' OR $side == 'results_tl')
+		    {
+		        if ($league < 51)
+		        {
+		            $league = $league + 50;
+		        }
+		    }
+		    else
+		    {
+		        if ($league > 50)
+		        {
+		            $league = $league - 50;
+		        }
+		    }
 			if ($selected)
 			{
 				$league_name = $row['league_name'];
@@ -905,7 +936,7 @@ class main
 		// Start matchday list
 			if ($side == 'bet')
 			{
-				include($this->football_root_path . 'block/side_table.' . $this->php_ext);
+
 			}
 			else
 			{
@@ -915,18 +946,18 @@ class main
 
 		//*****************************************************************************
 
-		// Start total list
-			include($this->football_root_path . 'block/rank_total.' . $this->php_ext);
-		// End total list
-
-		//*****************************************************************************
-
 		// Start delivery list
 			include($this->football_root_path . 'block/delivery.' . $this->php_ext);
 		// End delivery list
 
 		//*****************************************************************************
 		}
+
+		if ($side == 'bet')
+		{
+		    include($this->football_root_path . 'block/table.' . $this->php_ext);
+		}
+
 		// Start assign vars
 		$sql_ary = array(
 			'football_season'	=> (int) $season,
@@ -945,9 +976,9 @@ class main
 		$print_start = ($start) ? "start=$start&amp;" : '';
 		
 		$template->assign_vars(array(
-			'U_PRINT_FOOTBALL'	=> $this->helper->route('football_main_controller', array('side' => $side, 's' => $season, 'l' => $league, 'm' => $matchday, 'view' => 'print')),
-			'U_MOBILE_SWITCH'	=> $this->helper->route('football_main_controller', array('side' => $side, 's' => $season, 'l' => $league, 'm' => $matchday, 'action' => 'switch')),
-			'U_SIDE_LINK'		=> $this->helper->route('football_main_controller', array('side' => $side, 's' => $season, 'l' => $league, 'm' => $matchday)),
+			'U_PRINT_FOOTBALL'	=> $this->helper->route('football_football_controller', array('side' => $side, 's' => $season, 'l' => $league, 'm' => $matchday, 'view' => 'print')),
+			'U_MOBILE_SWITCH'	=> $this->helper->route('football_football_controller', array('side' => $side, 's' => $season, 'l' => $league, 'm' => $matchday, 'action' => 'switch')),
+			'U_SIDE_LINK'		=> $this->helper->route('football_football_controller', array('side' => $side, 's' => $season, 'l' => $league, 'm' => $matchday)),
 			'L_TOP_RANKSP' 		=> sprintf($user->lang['RANKING']) . ' ' . $matchday . '. ' . sprintf($user->lang['MATCHDAY']),
 			'L_TOP_RANKGESAMT' 	=> sprintf($user->lang['TOTAL_RANKING']) . ' ' . $matchday . '. ' . sprintf($user->lang['MATCHDAY']),
 			'PHPBB_ROOT_PATH'	=> $this->phpbb_root_path,
@@ -966,20 +997,21 @@ class main
 			'S_SEASON_NAME' 	=> $season_name,
 			'S_LEAGUE_NAME' 	=> $league_name,
 			'S_MATCHDAY_NAME' 	=> $matchday_name,
-			'S_FORMSELF' 		=> $this->helper->route('football_main_controller', array('side' => $side)),
+			'S_FORMSELF' 		=> $this->helper->route('football_football_controller', array('side' => $side)),
 			'S_DELIVERY' 		=> delivery($season, $league, $matchday),
 			// For nav_delivery
 			'S_PREV_LINK' 		=> $prev_link,
 			'S_PREV_CLASS' 		=> $prev_class,
 			'S_PREV_DEADLINE' 	=> $prev_deadline,
-			'S_CURR_LINK' 		=> $this->helper->route('football_main_controller', array('side' => $side, 's' => $season, 'l' => $league)),
+			'S_CURR_LINK' 		=> $this->helper->route('football_football_controller', array('side' => $side, 's' => $season, 'l' => $league)),
 			'S_CURR_MATCHDAY' 	=> $curr_matchday,
 			'S_NEXT_LINK' 		=> $next_link,
 			'S_NEXT_CLASS' 		=> $next_class,
 			'S_NEXT_DEADLINE' 	=> $next_deadline,
 			'S_DBMSG' 			=> $dbmsg,
-			'FOOTBALL_LEFT_COLUMN' 	=> $config['football_left_column_width'],
-			'FOOTBALL_RIGHT_COLUMN' => $config['football_right_column_width'],
+		    'FOOTBALL_LEFT_COLUMN' 	=> $config['football_left_column_width'],
+		    'FOOTBALL_RIGHT_COLUMN' => $config['football_right_column_width'],
+		    'S_BET_TYPE' 		=> $league_info['bet_type'],
 
 		));
 		// End assign vars
@@ -989,6 +1021,10 @@ class main
 		{
 			include($this->football_root_path . 'block/under_construction.' . $this->php_ext);
 		}
+		elseif ($side == 'results_tl')
+		{
+		    include($this->football_root_path . 'block/results.' . $this->php_ext);
+		}
 		else
 		{
 			include($this->football_root_path . 'block/' . $side . '.' . $this->php_ext);

controller/popup.php

@@ -39,7 +39,7 @@ class popup
 	/* @var \phpbb\user */
 	protected $user;
 	
-	/** @var \phpbb\pagination */
+	/* @var \phpbb\pagination */
 	protected $pagination;
 	
 	/* @var phpBB root path */
@@ -128,7 +128,6 @@ class popup
 		{
 			$message = (!empty($config['football_disable_msg'])) ? $config['football_disable_msg'] : 'FOOTBALL_DISABLED';
 			trigger_error($message);
-			exit;
 		}
 
 		// Can this user view Prediction Leagues pages?

controller/xmlplan.php

@@ -105,7 +105,6 @@ class xmlplan
 		{
 			$message = (!empty($config['football_disable_msg'])) ? $config['football_disable_msg'] : 'FOOTBALL_DISABLED';
 			trigger_error($message);
-			exit;
 		}
 
 

cron/task/football_remember.php

@@ -42,7 +42,7 @@ class football_remember extends \phpbb\cron\task\base
 	* @param string									$php_ext
 	* @param \phpbb\extension\manager				$phpbb_extension_manager
 	* @param \phpbb\path_helper						$phpbb_path_helper
-	* @param \phpbb\db\driver\driver_interfacer		$db
+	* @param \phpbb\db\driver\driver_interface		$db
 	* @param \phpbb\config\config					$config
 	* @param \phpbb\log\log_interface 				$log
 	* @param \phpbb\user							$user
@@ -333,4 +333,3 @@ class football_remember extends \phpbb\cron\task\base
 		}
 	}
 }
-?>

event/main_listener.php

@@ -129,7 +129,7 @@ class main_listener implements EventSubscriberInterface
 				}
 				else
 				{
-					$event['location_url'] = $this->controller_helper->route('football_main_controller', array_merge(array('side' => $url_parts['base']), $url_parts['params']));
+					$event['location_url'] = $this->controller_helper->route('football_football_controller', array_merge(array('side' => $url_parts['base']), $url_parts['params']));
 				}
 				$db->sql_freeresult($result);
 			}
@@ -137,7 +137,7 @@ class main_listener implements EventSubscriberInterface
 			{
 				$event['location'] = $this->user->lang('VIEWING_FOOTBALL' . (empty($url_parts['base']) ? '' : '_' . strtoupper ($url_parts['base'])));
 			}
-			$event['location_url'] = $this->controller_helper->route('football_main_controller', array_merge(array('side' => $url_parts['base']), $url_parts['params']));
+			$event['location_url'] = $this->controller_helper->route('football_football_controller', array_merge(array('side' => $url_parts['base']), $url_parts['params']));
 		}
 	}
 
@@ -217,19 +217,20 @@ class main_listener implements EventSubscriberInterface
 				'S_FOOTBALL_HEADER_LEAGUE'	 => $league,
 				'S_FOOTBALL_EXT_PATH' => $ext_path,
 				'S_FOOTBALL_HEADER_ENABLED'	 => $this->config['football_header_enable'] ? $in_football_ext : false,
-				'U_FOOTBALL'		=> $this->controller_helper->route('football_main_controller', array('side' => 'bet')),
-				'U_BET'				=> $this->controller_helper->route('football_main_controller', array('side' => 'bet', 's' => $season, 'l' => $league, 'm' => $matchday)),
-				'U_ALL_BETS'		=> $this->controller_helper->route('football_main_controller', array('side' => 'all_bets', 's' => $season, 'l' => $league, 'm' => $matchday)),
-				'U_RESULTS'			=> $this->controller_helper->route('football_main_controller', array('side' => 'results', 's' => $season, 'l' => $league, 'm' => $matchday)),
-				'U_TABLE'			=> $this->controller_helper->route('football_main_controller', array('side' => 'table', 's' => $season, 'l' => $league, 'm' => $matchday)),
-				'U_RANKS_TOTAL'		=> $this->controller_helper->route('football_main_controller', array('side' => 'ranks_total', 's' => $season, 'l' => $league, 'm' => $matchday)),
-				'U_RANKS_MATCHDAY'	=> $this->controller_helper->route('football_main_controller', array('side' => 'ranks_matchday', 's' => $season, 'l' => $league, 'm' => $matchday)),
-				'U_DELIVERY_LIST'	=> $this->controller_helper->route('football_main_controller', array('side' => 'delivery', 's' => $season, 'l' => $league, 'm' => $matchday)),
-				'U_LAST_VISITORS'	=> $this->controller_helper->route('football_main_controller', array('side' => 'last_users', 's' => $season, 'l' => $league, 'm' => $matchday)),
-				'U_FOOTBALL_BANK'	=> $this->controller_helper->route('football_main_controller', array('side' => 'bank', 's' => $season, 'l' => $league, 'm' => $matchday)),
+				'U_FOOTBALL'		=> $this->controller_helper->route('football_football_controller', array('side' => 'bet')),
+				'U_BET'				=> $this->controller_helper->route('football_football_controller', array('side' => 'bet', 's' => $season, 'l' => $league, 'm' => $matchday)),
+				'U_ALL_BETS'		=> $this->controller_helper->route('football_football_controller', array('side' => 'all_bets', 's' => $season, 'l' => $league, 'm' => $matchday)),
+				'U_RESULTS'			=> $this->controller_helper->route('football_football_controller', array('side' => 'results', 's' => $season, 'l' => $league, 'm' => $matchday)),
+        	    'U_RESULTS_TL'		=> $this->controller_helper->route('football_football_controller', array('side' => 'results_tl', 's' => $season, 'l' => $league, 'm' => $matchday)),
+				'U_TABLE'			=> $this->controller_helper->route('football_football_controller', array('side' => 'table', 's' => $season, 'l' => $league, 'm' => $matchday)),
+				'U_RANKS_TOTAL'		=> $this->controller_helper->route('football_football_controller', array('side' => 'ranks_total', 's' => $season, 'l' => $league, 'm' => $matchday)),
+				'U_RANKS_MATCHDAY'	=> $this->controller_helper->route('football_football_controller', array('side' => 'ranks_matchday', 's' => $season, 'l' => $league, 'm' => $matchday)),
+				'U_DELIVERY_LIST'	=> $this->controller_helper->route('football_football_controller', array('side' => 'delivery', 's' => $season, 'l' => $league, 'm' => $matchday)),
+				'U_LAST_VISITORS'	=> $this->controller_helper->route('football_football_controller', array('side' => 'last_users', 's' => $season, 'l' => $league, 'm' => $matchday)),
+				'U_FOOTBALL_BANK'	=> $this->controller_helper->route('football_football_controller', array('side' => 'bank', 's' => $season, 'l' => $league, 'm' => $matchday)),
 				'U_RULES'			=> $this->controller_helper->route('football_football_popup', array('popside' => 'rules_popup', 's' => $season, 'l' => $league)),
 				'U_EXPORT'			=> $this->controller_helper->route('football_football_download', array('downside' => 'dload_export', 's' => $season, 'l' => $league)),
-				'U_ODDS'			=> $this->controller_helper->route('football_main_controller', array('side' => 'odds', 's' => $season, 'l' => $league, 'm' => $matchday)),
+				'U_ODDS'			=> $this->controller_helper->route('football_football_controller', array('side' => 'odds', 's' => $season, 'l' => $league, 'm' => $matchday)),
 				'S_MENU_LINK1'		=> (strlen($this->config['football_menu_link1']) > 4) ? true : false,
 				'U_MENU_LINK1'		=> $this->config['football_menu_link1'],
 				'MENU_DESC_LINK1'	=> $this->config['football_menu_desc1'],
@@ -239,14 +240,14 @@ class main_listener implements EventSubscriberInterface
 				'S_MENU_LINK3'		=> (strlen($this->config['football_menu_link3']) > 4) ? true : false,
 				'U_MENU_LINK3'		=> (strpos($this->config['football_menu_link3'], 'xml/league.php') === false) ? $this->config['football_menu_link3'] : $this->config['football_menu_link3'] . "&season=$season&league=$league",
 				'MENU_DESC_LINK3'	=> $this->config['football_menu_desc3'],
-				'U_MY_BETS'			=> $this->controller_helper->route('football_main_controller', array('side' => 'my_bets', 's' => $season, 'l' => $league, 'm' => $matchday)),
-				'U_MY_POINTS'		=> $this->controller_helper->route('football_main_controller', array('side' => 'my_points', 's' => $season, 'l' => $league, 'm' => $matchday)),
-				'U_MY_TABLE'		=> $this->controller_helper->route('football_main_controller', array('side' => 'my_table', 's' => $season, 'l' => $league, 'm' => $matchday)),
-				'U_MY_RANK'			=> $this->controller_helper->route('football_main_controller', array('side' => 'my_rank', 's' => $season, 'l' => $league, 'm' => $matchday)),
-				'U_MY_CHART'		=> $this->controller_helper->route('football_main_controller', array('side' => 'my_chart', 's' => $season, 'l' => $league, 'm' => $matchday)),
-				'U_MY_KOEFF'		=> $this->controller_helper->route('football_main_controller', array('side' => 'my_koeff', 's' => $season, 'l' => $league, 'm' => $matchday)),
-				'U_STAT_RESULTS'	=> $this->controller_helper->route('football_main_controller', array('side' => 'stat_results', 's' => $season, 'l' => $league, 'm' => $matchday)),
-				'U_STAT_POINTS'		=> $this->controller_helper->route('football_main_controller', array('side' => 'stat_points', 's' => $season, 'l' => $league, 'm' => $matchday)),
+				'U_MY_BETS'			=> $this->controller_helper->route('football_football_controller', array('side' => 'my_bets', 's' => $season, 'l' => $league, 'm' => $matchday)),
+				'U_MY_POINTS'		=> $this->controller_helper->route('football_football_controller', array('side' => 'my_points', 's' => $season, 'l' => $league, 'm' => $matchday)),
+				'U_MY_TABLE'		=> $this->controller_helper->route('football_football_controller', array('side' => 'my_table', 's' => $season, 'l' => $league, 'm' => $matchday)),
+				'U_MY_RANK'			=> $this->controller_helper->route('football_football_controller', array('side' => 'my_rank', 's' => $season, 'l' => $league, 'm' => $matchday)),
+				'U_MY_CHART'		=> $this->controller_helper->route('football_football_controller', array('side' => 'my_chart', 's' => $season, 'l' => $league, 'm' => $matchday)),
+				'U_MY_KOEFF'		=> $this->controller_helper->route('football_football_controller', array('side' => 'my_koeff', 's' => $season, 'l' => $league, 'm' => $matchday)),
+				'U_STAT_RESULTS'	=> $this->controller_helper->route('football_football_controller', array('side' => 'stat_results', 's' => $season, 'l' => $league, 'm' => $matchday)),
+				'U_STAT_POINTS'		=> $this->controller_helper->route('football_football_controller', array('side' => 'stat_points', 's' => $season, 'l' => $league, 'm' => $matchday)),
 		));
 	}