Version 0.9.9

- several bugfixes
- Code cleaning

.gitignore

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

Readme - Update from MOD.txt

@@ -1,6 +1,6 @@
-Follow the phpBB instruction to the convert from 3.0 to 3.1.
+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.
+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.
+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/
+Unzip Football Prediction League extension in folder ext/
-Activate the Football Prediction League extension in ACP.
+Activate the Football Prediction League extension in ACP.

acp/all_bets_info.php

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

acp/all_bets_module.php

@@ -62,7 +62,7 @@ class all_bets_module
 		$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'];
+					$league_matchdays	= $row['matchdays'];
-					$matches_matchday 	= $row['matches_on_matchday'];
+					$matches_matchday	= $row['matches_on_matchday'];
-					$league_name 		= $row['league_name'];
+					$league_name		= $row['league_name'];
-					$league_type 		= $row['league_type'];
+					$league_type		= $row['league_type'];
-					$ko_league 			= ($row['league_type'] == LEAGUE_KO) ? true : false;
+					$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,
+							'BET'			=> $bet_home. ':'. $bet_guest,
-							'COLOR_STYLE' 	=> $colorstyle_bet,
+							'COLOR_STYLE'	=> $colorstyle_bet,
-							'POINTS' 		=> ($user_bet['points'] == '') ? '&nbsp;' : $user_bet['points'],
+							'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_info		= get_team($season, $league, $match['match_no'], 'team_id_home', $match['formula_home']);
-				$home_in_array 	= explode("#",$home_info);
+				$home_in_array	= explode("#",$home_info);
-				$homename 		= $home_in_array[3];
+				$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_info		= get_team($season, $league, $match['match_no'], 'team_id_guest', $match['formula_guest']);
-				$guest_in_array = explode("#",$guest_info);
+				$guest_in_array	= explode("#",$guest_info);
-				$guestname 		= $guest_in_array[3];
+				$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,
+				'HOME_NAME'		=> $homename,
-				'GUEST_NAME' 	=> $guestname,
+				'GUEST_NAME'	=> $guestname,
-				'RESULT' 		=> $match['goals_home']. ':'.$match['goals_guest'],
+				'RESULT'		=> $match['goals_home']. ':'.$match['goals_guest'],
-				'COLOR_STYLE' 	=> $colorstyle_match,
+				'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,
+					'BET'			=> $bet_home. ':'. $bet_guest,
-					'COLOR_STYLE' 	=> $colorstyle_bet,
+					'COLOR_STYLE'	=> $colorstyle_bet,
-					'POINTS' 		=> ($user_bet['points'] == '') ? '&nbsp;' : $user_bet['points'],
+					'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,
+						'COLOR_STYLE'	=> $colorstyle_total,
-						'POINTS_TOTAL'    => $sum_total[$user_bet['username']],
+						'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,
+				'S_TOTAL'		=> true,
-				'COLOR_STYLE' 	=> $colorstyle_total, //currently ignored
+				'COLOR_STYLE'	=> $colorstyle_total, //currently ignored
-				'SUMTOTAL' 	=> $matchday_sum_total,
+				'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'],
+				'QUESTION'			=> $row['question'],
-				'RESULT' 			=> ($display_type == 1) ? $row['result_team'] : $row['result'],
+				'RESULT'			=> ($display_type == 1) ? $row['result_team'] : $row['result'],
-				'POINTS' 			=> $row['extra_points'],
+				'POINTS'			=> $row['extra_points'],
-				'EVALUATION' 		=> ($row['matchday'] == $row['matchday_eval']) ? sprintf($user->lang['MATCHDAY']) : sprintf($user->lang['TOTAL']),
+				'EVALUATION'		=> ($row['matchday'] == $row['matchday_eval']) ? sprintf($user->lang['MATCHDAY']) : sprintf($user->lang['TOTAL']),
-				'EVALUATION_TITLE' 	=> $eval_title,
+				'EVALUATION_TITLE'	=> $eval_title,
-				'COLOR_STYLE' 		=> $extra_colorstyle,
+				'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,
+					'ROW_CLASS'		=> $row_class,
-					'USER_NAME' 	=> $user_row['username'],
+					'USER_NAME'		=> $user_row['username'],
-					'BET' 			=> ($display_type == 1) ? $bet_team : $bet,
+					'BET'			=> ($display_type == 1) ? $bet_team : $bet,
-					'BET_POINTS' 	=> $user_row['bet_points'],
+					'BET_POINTS'	=> $user_row['bet_points'],
-					'COLOR_STYLE' 	=> $extra_colorstyle,
+					'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_DISPLAY_ALL_BETS'		=> true,
-			'S_MATCHES_ON_MATCHDAY' 	=> $matches_on_matchday,
+			'S_MATCHES_ON_MATCHDAY'		=> $matches_on_matchday,
-			'S_SPALTEN' 				=> ($count_matches * 2)+2,
+			'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
+<?php
-/**
+/**
-*
+*
-* @package phpBB Extension - Football Football
+* @package phpBB Extension - Football Football
-* @copyright (c) 2016 football (http://football.bplaced.net)
+* @copyright (c) 2016 football (http://football.bplaced.net)
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
-*
+*
-*/
+*/
-
+
-namespace football\football\acp;
+namespace football\football\acp;
-
+
-class bank_info
+class bank_info
-{
+{
-	function module()
+	function module()
-	{
+	{
-		return array(
+		return array(
-			'filename'	=> '\football\football\acp\bank_module',
+			'filename'	=> '\football\football\acp\bank_module',
-			'title'		=> 'ACP_FOOTBALL_BANK_MANAGEMENT',
+			'title'		=> 'ACP_FOOTBALL_BANK_MANAGEMENT',
-			'version'	=> '0.9.2',
+			'version'	=> '0.9.2',
-			'modes'		=> array(
+			'modes'		=> array(
-				'manage'	=> array('title' => 'ACP_FOOTBALL_BANK_MANAGE', 'auth' => 'acl_a_football_plan', 'cat' => array('ACP_FOOTBALL_BANK')),
+				'manage'	=> array('title' => 'ACP_FOOTBALL_BANK_MANAGE', 'auth' => 'acl_a_football_plan', 'cat' => array('ACP_FOOTBALL_BANK')),
-			),
+			),
-		);
+		);
-	}
+	}
-}
+}

acp/bank_module.php

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

acp/bets_module.php

@@ -583,7 +583,7 @@ class bets_module
 				)
 			);
 		}
-		$db->sql_freeresult($resultopen);
+		$db->sql_freeresult($result);
 
 		// Calculate extra bets of matchday
 		// Start select team
@@ -730,7 +730,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 +750,3 @@ class bets_module
 		);
 	}
 }
-?>

acp/extra_info.php

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

acp/extra_module.php

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

acp/ko_module.php

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

acp/leagues_module.php

@@ -672,7 +672,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 +690,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
+			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);
@@ -730,4 +730,3 @@ class leagues_module
 		}
 	}
 }
-?>

acp/matchdays_info.php

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

acp/matchdays_module.php

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

acp/matches_module.php

@@ -124,12 +124,12 @@ class matches_module
 				$league_options .= '<option value="' . $row['league'] . '"' . $selected . '>' . $row['league_name'] . '</option>';
 				if ($selected <> '')
 				{
-					$league_info 	    = $row;
+					$league_info		= $row;
-					$league_matchdays 	= $row['matchdays'];
+					$league_matchdays	= $row['matchdays'];
-					$matches_matchday 	= $row['matches_on_matchday'];
+					$matches_matchday	= $row['matches_on_matchday'];
-					$league_name 		= $row['league_name'];
+					$league_name		= $row['league_name'];
-					$league_type 		= $row['league_type'];
+					$league_type		= $row['league_type'];
-					$ko_league 			= ($row['league_type'] == LEAGUE_KO) ? true : false;
+					$ko_league			= ($row['league_type'] == LEAGUE_KO) ? true : false;
 				}
 			}
 			$db->sql_freeresult($result);
@@ -387,17 +387,17 @@ 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['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_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_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['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['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_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['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['group_id']		= ($this->request->variable('group_match', false)) ? utf8_normalize_nfc($this->request->variable('match_group', '', true)) : '';
 						
 						if ($match_row['team_id_home'] <> '')
 						{
@@ -717,7 +717,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 +761,3 @@ class matches_module
 		}
 	}
 }
-
-?>

acp/results_info.php

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

acp/results_module.php

@@ -793,7 +793,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 +815,3 @@ class results_module
 		);
 	}
 }
-
-?>

acp/seasons_module.php

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

acp/teams_module.php

@@ -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) ) 
 				{
@@ -309,7 +309,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 +589,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 +597,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 +610,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 +655,3 @@ class teams_module
 		);
 	}
 }
-?>

acp/update_info.php

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

acp/update_module.php

@@ -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>' :
+				$tpl_ary[$order[$key]] = ($order[$key] % 2) ? $color_open . utf8_htmlspecialchars($value) . $color_close . '&nbsp;</td>' :
-										'<td>' . $color_open . htmlspecialchars($value, ENT_COMPAT, 'UTF-8') . $color_close . '<br />';			
+				'<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') . '">' .
+						$tpl .= '<td title= "' . utf8_htmlspecialchars($table_row[$key]) . '">' .
-									$color_open . htmlspecialchars($value, ENT_COMPAT, 'UTF-8') . $color_close . 
+							$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>' :
+				$tpl_ary[$order[$key]] = ($order[$key] % 2) ? utf8_htmlspecialchars($value) . '&nbsp;</td>' :
-										'<td>' . htmlspecialchars($value, ENT_COMPAT, 'UTF-8') . '<br />';			
+				'<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 -->
+<!-- INCLUDECSS css/football_acp.css -->
-<!-- INCLUDE overall_header.html -->
+<!-- INCLUDE overall_header.html -->
-
+
-<a id="maincontent"></a>
+<a id="maincontent"></a>
-<!-- IF U_FOOTBALL --><a href="{U_FOOTBALL}" style="float: {S_CONTENT_FLOW_END};">&laquo; {L_PREDICTION_LEAGUE}</a><!-- ENDIF -->
+<!-- IF U_FOOTBALL --><a href="{U_FOOTBALL}" style="float: {S_CONTENT_FLOW_END};">&laquo; {L_PREDICTION_LEAGUE}</a><!-- ENDIF -->
-<h1>{L_TITLE}</h1>
+<h1>{L_TITLE}</h1>
-<p>{L_TITLE_EXPLAIN}</p>
+<p>{L_TITLE_EXPLAIN}</p>
-
+
-<!-- IF S_ERROR -->
+<!-- IF S_ERROR -->
-	<div class="errorbox">
+	<div class="errorbox">
-		<h3>{L_WARNING}</h3>
+		<h3>{L_WARNING}</h3>
-		<p>{ERROR_MSG}</p>
+		<p>{ERROR_MSG}</p>
-	</div>
+	</div>
-<!-- ENDIF -->
+<!-- ENDIF -->
-<!-- BEGIN mods -->
+<!-- BEGIN mods -->
-
+
-	<fieldset>
+	<fieldset>
-		<legend>{L_FOOTBALL_VERSION_CHECK}</legend>
+		<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>
+		<p style="font-weight: bold; color: <!-- IF mods.S_UP_TO_DATE -->#228822<!-- ELSE -->#BC2A4D<!-- ENDIF -->;">{mods.UP_TO_DATE}</p>
-		<dl>
+		<dl>
-			<dt><label>{L_CURRENT_VERSION}</label></dt>
+			<dt><label>{L_CURRENT_VERSION}</label></dt>
-			<dd><strong>{mods.CURRENT_VERSION}</strong></dd>
+			<dd><strong>{mods.CURRENT_VERSION}</strong></dd>
-		</dl>
+		</dl>
-		<dl>
+		<dl>
-			<dt><label>{L_LATEST_VERSION}</label></dt>
+			<dt><label>{L_LATEST_VERSION}</label></dt>
-			<dd><strong>{mods.LATEST_VERSION}</strong></dd>
+			<dd><strong>{mods.LATEST_VERSION}</strong></dd>
-		</dl>
+		</dl>
-		<!-- IF not mods.S_UP_TO_DATE -->
+		<!-- IF not mods.S_UP_TO_DATE -->
-			<dl>
+			<dl>
-				<dt><label>{L_DOWNLOAD_LATEST}</label></dt>
+				<dt><label>{L_DOWNLOAD_LATEST}</label></dt>
-				<dd><strong><a href="{mods.DOWNLOAD}">{L_DOWNLOAD} {mods.TITLE} {mods.LATEST_VERSION}</a></strong></dd>
+				<dd><strong><a href="{mods.DOWNLOAD}">{L_DOWNLOAD} {mods.TITLE} {mods.LATEST_VERSION}</a></strong></dd>
-			</dl>
+			</dl>
-			<dl>
+			<dl>
-				<dt><label>{L_ANNOUNCEMENT_TOPIC}</label></dt>
+				<dt><label>{L_ANNOUNCEMENT_TOPIC}</label></dt>
-				<dd><strong><a href="{mods.ANNOUNCEMENT}">{L_RELEASE_ANNOUNCEMENT}</a></strong></dd>
+				<dd><strong><a href="{mods.ANNOUNCEMENT}">{L_RELEASE_ANNOUNCEMENT}</a></strong></dd>
-			</dl>
+			</dl>
-		<!-- ENDIF -->
+		<!-- ENDIF -->
-	</fieldset>
+	</fieldset>
-<!-- END mods -->
+<!-- END mods -->
-<form id="acp_football" method="post" action="{U_ACTION}">
+<form id="acp_football" method="post" action="{U_ACTION}">
-
+
-<!-- BEGIN options -->
+<!-- BEGIN options -->
-	<!-- IF options.S_LEGEND -->
+	<!-- IF options.S_LEGEND -->
-		<!-- IF not options.S_FIRST_ROW -->
+		<!-- IF not options.S_FIRST_ROW -->
-		</fieldset>
+		</fieldset>
-		<!-- ENDIF -->
+		<!-- ENDIF -->
-		<fieldset>
+		<fieldset>
-			<legend>{options.LEGEND}</legend>
+			<legend>{options.LEGEND}</legend>
-	<!-- ELSE -->
+	<!-- ELSE -->
-		<dl>
+		<dl>
-			<dt><label for="{options.KEY}">{options.TITLE}:</label><!-- IF options.S_EXPLAIN --><br /><span>{options.TITLE_EXPLAIN}</span><!-- ENDIF --></dt>
+			<dt><label for="{options.KEY}">{options.TITLE}:</label><!-- IF options.S_EXPLAIN --><br /><span>{options.TITLE_EXPLAIN}</span><!-- ENDIF --></dt>
-			<dd>{options.CONTENT}</dd>
+			<dd>{options.CONTENT}</dd>
-		</dl>
+		</dl>
-	<!-- ENDIF -->
+	<!-- ENDIF -->
-<!-- END options -->
+<!-- END options -->
-	<p class="submit-buttons">
+	<p class="submit-buttons">
-		<input class="button1" type="submit" id="submit" name="submit" value="{L_SUBMIT}" />&nbsp;
+		<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}" />
+		<input class="button2" type="reset" id="reset" name="reset" value="{L_RESET}" />
-	</p>
+	</p>
-	{S_FORM_TOKEN}
+	{S_FORM_TOKEN}
-		</fieldset>
+		</fieldset>
-</form>
+</form>
-<br />
+<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>
+<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 -->
+<!-- INCLUDECSS css/football_acp.css -->
-<!-- INCLUDE overall_header.html -->
+<!-- INCLUDE overall_header.html -->
-
+
-<a id="maincontent"></a>
+<a id="maincontent"></a>
-	<!-- IF U_FOOTBALL --><a href="{U_FOOTBALL}" style="float: {S_CONTENT_FLOW_END};">&laquo; {L_PREDICTION_LEAGUE}</a><!-- ENDIF -->
+	<!-- 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>
+	<h1>{L_ACP_FOOTBALL_ALL_BETS_VIEW}</h1>
-	<p>{L_ACP_FOOTBALL_ALL_BETS_VIEW_EXPLAIN}</p>
+	<p>{L_ACP_FOOTBALL_ALL_BETS_VIEW_EXPLAIN}</p>
-
+
-	<h1 style="display:inline;">{L_SELECT_MATCHDAY}:</h1>
+	<h1 style="display:inline;">{L_SELECT_MATCHDAY}:</h1>
-	<form style="display:inline;" method="post" action="{U_ACTION}">
+	<form style="display:inline;" method="post" action="{U_ACTION}">
-	<div style="display:inline; margin:0; padding:0;">
+	<div style="display:inline; margin:0; padding:0;">
-		<select name="s" id="match_season" onchange="this.form.submit();">{S_SEASON_OPTIONS}</select>
+		<select name="s" id="match_season" onchange="this.form.submit();">{S_SEASON_OPTIONS}</select>
-		{S_FORM_TOKEN}
+		{S_FORM_TOKEN}
-	</div>
+	</div>
-	</form>
+	</form>
-	<form style="display:inline;" method="post" action="{U_ACTION}">
+	<form style="display:inline;" method="post" action="{U_ACTION}">
-	<div style="display:inline; margin:0; padding:0;">
+	<div style="display:inline; margin:0; padding:0;">
-		<input type="hidden" name="s" value="{S_SEASON}" />
+		<input type="hidden" name="s" value="{S_SEASON}" />
-		<select name="l" id="match_league" onchange="this.form.submit();">{S_LEAGUE_OPTIONS}</select>
+		<select name="l" id="match_league" onchange="this.form.submit();">{S_LEAGUE_OPTIONS}</select>
-		{S_FORM_TOKEN}
+		{S_FORM_TOKEN}
-	</div>
+	</div>
-	</form>
+	</form>
-	<form style="display:inline;" method="post" action="{U_ACTION}">
+	<form style="display:inline;" method="post" action="{U_ACTION}">
-	<div style="display:inline; margin:0; padding:0;">
+	<div style="display:inline; margin:0; padding:0;">
-		<input type="hidden" name="s" value="{S_SEASON}" />
+		<input type="hidden" name="s" value="{S_SEASON}" />
-		<input type="hidden" name="l" value="{S_LEAGUE}" />
+		<input type="hidden" name="l" value="{S_LEAGUE}" />
-		<select name="m" id="match_matchday" onchange="this.form.submit();">{S_MATCHDAY_OPTIONS}</select>
+		<select name="m" id="match_matchday" onchange="this.form.submit();">{S_MATCHDAY_OPTIONS}</select>
-		{S_FORM_TOKEN}
+		{S_FORM_TOKEN}
-	</div>
+	</div>
-	</form>
+	</form>
-
+
-	<fieldset>
+	<fieldset>
-		<legend>{S_LEGEND}</legend>
+		<legend>{S_LEGEND}</legend>
-	<!-- IF .pagination -->
+	<!-- IF .pagination -->
-	<div class="pagination top-pagination">
+	<div class="pagination top-pagination">
-		<!-- INCLUDE pagination.html -->
+		<!-- INCLUDE pagination.html -->
-	</div>
+	</div>
-	<!-- ENDIF -->	
+	<!-- ENDIF -->	
-
+
-	<!-- IF .match_panel -->
+	<!-- IF .match_panel -->
-		<!-- BEGIN match_panel -->
+		<!-- BEGIN match_panel -->
-		<table class="type_f">
+		<table class="type_f">
-			<thead>
+			<thead>
-				<tr>
+				<tr>
-					<th style="text-align: right;"><br/></th>
+					<th style="text-align: right;"><br/></th>
-				<!-- BEGIN match -->
+				<!-- BEGIN match -->
-					<th colspan="2">{match_panel.match.HOME_NAME}-<br />{match_panel.match.GUEST_NAME}</th>
+					<th colspan="2">{match_panel.match.HOME_NAME}-<br />{match_panel.match.GUEST_NAME}</th>
-				<!-- END match -->
+				<!-- END match -->
-				<!-- IF match_panel.S_TOTAL -->
+				<!-- IF match_panel.S_TOTAL -->
-					<th style="text-align: center;"></th>
+					<th style="text-align: center;"></th>
-				<!-- ENDIF -->
+				<!-- ENDIF -->
-				</tr>
+				</tr>
-				<tr class="row_result">
+				<tr class="row_result">
-					<td  title="{L_RESULT_EXPLAIN}" style="text-align: right;"><b>{L_RESULT}</b></td>
+					<td  title="{L_RESULT_EXPLAIN}" style="text-align: right;"><b>{L_RESULT}</b></td>
-				<!-- BEGIN match -->
+				<!-- BEGIN match -->
-					<td class="td_result {match_panel.match.COLOR_STYLE}">{match_panel.match.RESULT}</td>
+					<td class="td_result {match_panel.match.COLOR_STYLE}">{match_panel.match.RESULT}</td>
-					<td class="td_pts"></td>
+					<td class="td_pts"></td>
-				<!-- END match -->
+				<!-- END match -->
-				<!-- IF match_panel.S_TOTAL -->
+				<!-- IF match_panel.S_TOTAL -->
-					<td title="{L_TOTAL_EXPLAIN}" style="text-align: center;"><b>{L_TOTAL}</b></td>
+					<td title="{L_TOTAL_EXPLAIN}" style="text-align: center;"><b>{L_TOTAL}</b></td>
-				<!-- ENDIF -->
+				<!-- ENDIF -->
-				</tr>
+				</tr>
-			</thead>
+			</thead>
-			<!-- BEGIN tendency_footer -->
+			<!-- BEGIN tendency_footer -->
-				<tfoot>
+				<tfoot>
-					<tr> 
+					<tr> 
-						<td class="td_tendency" style="text-align: right;" title="{L_TEND_TEXT}">{L_TENDENCY}</td>
+						<td class="td_tendency" style="text-align: right;" title="{L_TEND_TEXT}">{L_TENDENCY}</td>
-					<!-- BEGIN tendency -->
+					<!-- BEGIN tendency -->
-						<td class="td_tendency" colspan="2">
+						<td class="td_tendency" colspan="2">
-							<dfn style="display: none;">{match_panel.tendency_footer.tendency.MATCH_ENTRY}</dfn>
+							<dfn style="display: none;">{match_panel.tendency_footer.tendency.MATCH_ENTRY}</dfn>
-							{match_panel.tendency_footer.tendency.TENDENCY}
+							{match_panel.tendency_footer.tendency.TENDENCY}
-						</td>
+						</td>
-					<!-- END tendency -->
+					<!-- END tendency -->
-					<!-- IF match_panel.tendency_footer.S_TOTAL -->
+					<!-- IF match_panel.tendency_footer.S_TOTAL -->
-						<td class="td_pts_total"  title="{L_POINTS_TOTAL}">
+						<td class="td_pts_total"  title="{L_POINTS_TOTAL}">
-							<dfn style="display: none;">{L_POINTS_TOTAL}</dfn>
+							<dfn style="display: none;">{L_POINTS_TOTAL}</dfn>
-							{match_panel.tendency_footer.SUMTOTAL}
+							{match_panel.tendency_footer.SUMTOTAL}
-						</td>
+						</td>
-					<!-- ENDIF -->
+					<!-- ENDIF -->
-					</tr>
+					</tr>
-				</tfoot>
+				</tfoot>
-			<!-- END tendency_footer -->
+			<!-- END tendency_footer -->
-			<tbody>
+			<tbody>
-			<!-- BEGIN user_row -->
+			<!-- BEGIN user_row -->
-				<tr class="{match_panel.user_row.ROW_CLASS}">
+				<tr class="{match_panel.user_row.ROW_CLASS}">
-					<td class="td_name">{match_panel.user_row.USER_NAME}</td>
+					<td class="td_name">{match_panel.user_row.USER_NAME}</td>
-				<!-- BEGIN bet -->
+				<!-- BEGIN bet -->
-					<td class="td_result">{match_panel.user_row.bet.BET}</td>
+					<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>
+					<td class="{match_panel.bet.COLOR_STYLE}">{match_panel.user_row.bet.POINTS}</td>
-				<!-- END bet -->
+				<!-- END bet -->
-				<!-- BEGIN points -->
+				<!-- BEGIN points -->
-					<td class="td_pts_total {match_panel.points.COLOR_STYLE}">{match_panel.user_row.points.POINTS_TOTAL}</td>
+					<td class="td_pts_total {match_panel.points.COLOR_STYLE}">{match_panel.user_row.points.POINTS_TOTAL}</td>
-				<!-- END points -->
+				<!-- END points -->
-				</tr>
+				</tr>
-			<!-- END user_row -->
+			<!-- END user_row -->
-			</tbody>
+			</tbody>
-		</table>
+		</table>
-		<!-- END match_panel -->
+		<!-- END match_panel -->
-		
+		
-		<!-- BEGIN extra_panel -->
+		<!-- BEGIN extra_panel -->
-		<br />
+		<br />
-		<table class="type_f">
+		<table class="type_f">
-			<thead>
+			<thead>
-				<tr>
+				<tr>
-					<th style="text-align:left;">{L_EXTRA_BET}</th>
+					<th style="text-align:left;">{L_EXTRA_BET}</th>
-					<th style="width:70%; text-align:left;">{extra_panel.QUESTION}</th>
+					<th style="width:70%; text-align:left;">{extra_panel.QUESTION}</th>
-					<th>{L_EVALUATION}</th>
+					<th>{L_EVALUATION}</th>
-					<th>{L_POINTS}</th>
+					<th>{L_POINTS}</th>
-				</tr>
+				</tr>
-				<tr class="row_result">
+				<tr class="row_result">
-					<td><b>{L_RESULT}</b></td>
+					<td><b>{L_RESULT}</b></td>
-					<td style="text-align:left;" class="{extra_panel.COLOR_STYLE}">{extra_panel.RESULT}</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;">{extra_panel.EVALUATION}</td>
-					<td style="text-align:center;" title="{extra_panel.EVALUATION_TITLE}">{extra_panel.POINTS}</td>
+					<td style="text-align:center;" title="{extra_panel.EVALUATION_TITLE}">{extra_panel.POINTS}</td>
-				</tr>
+				</tr>
-			</thead>
+			</thead>
-			<tbody>
+			<tbody>
-			<!-- BEGIN user_row -->
+			<!-- BEGIN user_row -->
-				<tr class="{extra_panel.user_row.ROW_CLASS}">
+				<tr class="{extra_panel.user_row.ROW_CLASS}">
-					<td class="td_name">{extra_panel.user_row.USER_NAME}</td>
+					<td class="td_name">{extra_panel.user_row.USER_NAME}</td>
-					<td style="text-align:left;">{extra_panel.user_row.BET}</td>
+					<td style="text-align:left;">{extra_panel.user_row.BET}</td>
-					<td>&nbsp;</td>
+					<td>&nbsp;</td>
-					<td style="text-align:center;" class="{extra_panel.bet.COLOR_STYLE}">{extra_panel.user_row.POINTS}</td>
+					<td style="text-align:center;" class="{extra_panel.bet.COLOR_STYLE}">{extra_panel.user_row.POINTS}</td>
-				</tr>
+				</tr>
-			<!-- END user_row -->
+			<!-- END user_row -->
-			</tbody>
+			</tbody>
-		</table>
+		</table>
-		<!-- IF S_VIEW == 'print' -->
+		<!-- IF S_VIEW == 'print' -->
-		<br />
+		<br />
-		<!-- ENDIF -->
+		<!-- ENDIF -->
-		<!-- END extra_panel -->
+		<!-- END extra_panel -->
-		<!-- IF .pagination or TOTAL_USERS -->
+		<!-- IF .pagination or TOTAL_USERS -->
-		<div class="pagination">
+		<div class="pagination">
-			{TOTAL_USERS}
+			{TOTAL_USERS}
-			<!-- IF .pagination -->
+			<!-- IF .pagination -->
-				<!-- INCLUDE pagination.html -->
+				<!-- INCLUDE pagination.html -->
-			<!-- ELSE -->
+			<!-- ELSE -->
-				&bull; {PAGE_NUMBER}
+				&bull; {PAGE_NUMBER}
-			<!-- ENDIF -->
+			<!-- ENDIF -->
-		</div>
+		</div>
-		<!-- ENDIF -->	
+		<!-- ENDIF -->	
-		
+		
-	<!-- ELSE -->
+	<!-- ELSE -->
-		<br />
+		<br />
-		<div class="message">{L_NO_MATCHES_ON_MATCHDAY}</div>
+		<div class="message">{L_NO_MATCHES_ON_MATCHDAY}</div>
-		<br />
+		<br />
-	<!-- ENDIF -->
+	<!-- ENDIF -->
-	</fieldset>
+	</fieldset>
-<br />
+<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>
+<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 -->
+<!-- INCLUDECSS css/football_acp.css -->
-<!-- INCLUDE overall_header.html -->
+<!-- INCLUDE overall_header.html -->
-
+
-<a id="maincontent"></a>
+<a id="maincontent"></a>
-<!-- IF S_LIST -->
+<!-- IF S_LIST -->
-	<a href="{U_BACK}" style="float: {S_CONTENT_FLOW_END};">&laquo; {L_BACK}</a>
+	<a href="{U_BACK}" style="float: {S_CONTENT_FLOW_END};">&laquo; {L_BACK}</a>
-	<h1>{PAGE_TYPE} :: {LEAGUE_NAME}</h1>
+	<h1>{PAGE_TYPE} :: {LEAGUE_NAME}</h1>
-	<p>{PAGE_TYPE_EXPLAIN}</p>
+	<p>{PAGE_TYPE_EXPLAIN}</p>
-
+
-	<form id="list" method="post" action="{U_ACTION}">
+	<form id="list" method="post" action="{U_ACTION}">
-	<p class="small" style="text-align:right;margin-bottom:0px">
+	<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="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', true); return false;">{L_MARK_ALL}</a> &bull; 
-		<a href="#" onclick="marklist('list', 'mark', false); return false;">{L_UNMARK_ALL}</a></p>		
+		<a href="#" onclick="marklist('list', 'mark', false); return false;">{L_UNMARK_ALL}</a></p>		
-
+
-	<!-- IF .pagination -->
+	<!-- IF .pagination -->
-	<div class="pagination top-pagination">
+	<div class="pagination top-pagination">
-		<!-- INCLUDE pagination.html -->
+		<!-- INCLUDE pagination.html -->
-	</div>
+	</div>
-	<!-- ENDIF -->	
+	<!-- ENDIF -->	
-	<table class="type_f">
+	<table class="type_f">
-	<thead>
+	<thead>
-	<tr>
+	<tr>
-		<th>{L_USERNAME}</th>
+		<th>{L_USERNAME}</th>
-		<!-- IF POINTS -->
+		<!-- IF POINTS -->
-		<th>{POINTS}</th>
+		<th>{POINTS}</th>
-		<!-- ENDIF -->
+		<!-- ENDIF -->
-		<th>{TARGET}</th>
+		<th>{TARGET}</th>
-		<th>{ACTUAL}</th>
+		<th>{ACTUAL}</th>
-		<th>{L_BOOK}</th>
+		<th>{L_BOOK}</th>
-		<th>{L_MARK}</th>
+		<th>{L_MARK}</th>
-	</tr>
+	</tr>
-	</thead>
+	</thead>
-	<tbody>
+	<tbody>
-	<!-- BEGIN member -->
+	<!-- BEGIN member -->
-			<!-- IF member.S_ROW_COUNT is even --><tr class="bg1 row_light"><!-- ELSE --><tr class="bg2 row_dark"><!-- ENDIF -->
+			<!-- 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>
+			<td><a href="{member.U_USER_BANK}">{member.USERNAME}</a></td>
-			<!-- IF POINTS -->
+			<!-- IF POINTS -->
-			<td style="text-align: right;">{member.POINTS}</td>
+			<td style="text-align: right;">{member.POINTS}</td>
-			<!-- ENDIF -->
+			<!-- ENDIF -->
-			<td style="text-align: right;">{member.TARGET}</td>
+			<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;">{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}"
+			<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>
+											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>
+			<td style="text-align: center;"><input type="checkbox" class="radio" name="mark[]" id="select_{member.USER_ID}" value="{member.USER_ID}" /></td>
-		</tr>
+		</tr>
-	<!-- END member -->
+	<!-- END member -->
-	</tbody>
+	</tbody>
-	</table>
+	</table>
-	<!-- IF S_CASH_POINTS -->
+	<!-- IF S_CASH_POINTS -->
-	{L_CASH_POINTS} <input name="cash" type="checkbox" class="radio" checked="checked" /> 
+	{L_CASH_POINTS} <input name="cash" type="checkbox" class="radio" checked="checked" /> 
-	<!-- ENDIF -->
+	<!-- ENDIF -->
-	{L_MATCHDAY}: <!-- IF S_SELECT_MATCHDAY --><input type="text" name="m" value="{S_MATCHDAY}" /><!-- ELSE -->
+	{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 -->
+									<input type="hidden" name="m" value="{S_MATCHDAY}" />{S_MATCHDAY}<!-- ENDIF -->
-	<!-- IF .pagination or TOTAL_MEMBERS -->
+	<!-- IF .pagination or TOTAL_MEMBERS -->
-	<div class="pagination">
+	<div class="pagination">
-		{TOTAL_MEMBERS}
+		{TOTAL_MEMBERS}
-		<!-- IF .pagination -->
+		<!-- IF .pagination -->
-			<!-- INCLUDE pagination.html -->
+			<!-- INCLUDE pagination.html -->
-		<!-- ELSE -->
+		<!-- ELSE -->
-			&bull; {PAGE_NUMBER}
+			&bull; {PAGE_NUMBER}
-		<!-- ENDIF -->
+		<!-- ENDIF -->
-	</div>
+	</div>
-	<!-- ENDIF -->	
+	<!-- ENDIF -->	
-
+
-	<fieldset class="quick">
+	<fieldset class="quick">
-		<input type="hidden" name="s" value="{S_SEASON}" />
+		<input type="hidden" name="s" value="{S_SEASON}" />
-		<input type="hidden" name="l" value="{S_LEAGUE}" />
+		<input type="hidden" name="l" value="{S_LEAGUE}" />
-		<input type="hidden" name="t" value="{S_TYPE}" />
+		<input type="hidden" name="t" value="{S_TYPE}" />
-		<input type="hidden" name="start" value="{S_START}" />
+		<input type="hidden" name="start" value="{S_START}" />
-		<select name="action"><option class="sep" value="">{L_SELECT_OPTION}</option>{S_ACTION_OPTIONS}</select>
+		<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}" />
+		<input class="button2" type="submit" name="update" value="{L_SUBMIT}" />
-	</fieldset>
+	</fieldset>
-
+
-	{S_FORM_TOKEN}
+	{S_FORM_TOKEN}
-	</form>
+	</form>
-
+
-<!-- ELSE -->
+<!-- ELSE -->
-	<!-- IF U_FOOTBALL --><a href="{U_FOOTBALL}" style="float: {S_CONTENT_FLOW_END};">&laquo; {L_PREDICTION_LEAGUE}</a><!-- ENDIF -->
+	<!-- 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>
+	<h1>{L_ACP_FOOTBALL_BANK_MANAGE}</h1>
-	<p>{L_ACP_FOOTBALL_BANK_MANAGE_EXPLAIN}</p>
+	<p>{L_ACP_FOOTBALL_BANK_MANAGE_EXPLAIN}</p>
-
+
-	<!-- IF S_ERROR -->
+	<!-- IF S_ERROR -->
-		<div class="errorbox">
+		<div class="errorbox">
-			<h3>{L_WARNING}</h3>
+			<h3>{L_WARNING}</h3>
-			<p>{ERROR_MSG}</p>
+			<p>{ERROR_MSG}</p>
-		</div>
+		</div>
-	<!-- ENDIF -->
+	<!-- ENDIF -->
-
+
-	<form style="display:inline;" method="post" action="{U_ACTION}">
+	<form style="display:inline;" method="post" action="{U_ACTION}">
-	<div style="display:inline; margin:0; padding:0;">
+	<div style="display:inline; margin:0; padding:0;">
-		<h1 style="display:inline;">{L_SELECT_SEASON}:</h1>
+		<h1 style="display:inline;">{L_SELECT_SEASON}:</h1>
-		<select name="s" id="bank_season" onchange="this.form.submit();">{S_SEASON_OPTIONS}</select>
+		<select name="s" id="bank_season" onchange="this.form.submit();">{S_SEASON_OPTIONS}</select>
-		{S_FORM_TOKEN}
+		{S_FORM_TOKEN}
-	</div>
+	</div>
-	</form>
+	</form>
-
+
-	<h1>{L_LEAGUE_BANK}</h1>
+	<h1>{L_LEAGUE_BANK}</h1>
-
+
-	<p>{L_LEAGUE_BANK_EXPLAIN}</p>
+	<p>{L_LEAGUE_BANK_EXPLAIN}</p>
-	<p><a href="{U_DLOAD_BANK_OPEN}">Offene Posten bis einschließlich dieser Saison</a></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}">
+	<form id="overview" method="post" action="{U_ACTION}">
-	<fieldset>
+	<fieldset>
-	<p class="small" style="text-align:right;margin-bottom:0px">
+	<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', true); return false;">{L_MARK_ALL}</a> &bull; 
-		<a href="#" onclick="marklist('overview', 'markleague', false); return false;">{L_UNMARK_ALL}</a>
+		<a href="#" onclick="marklist('overview', 'markleague', false); return false;">{L_UNMARK_ALL}</a>
-	</p>		
+	</p>		
-	<table class="type_f">
+	<table class="type_f">
-	<thead>
+	<thead>
-	<tr>
+	<tr>
-		<th>{L_LEAGUE}</th>
+		<th>{L_LEAGUE}</th>
-		<th style="width: 25%">{L_LEAGUE_NAME}</th>
+		<th style="width: 25%">{L_LEAGUE_NAME}</th>
-		<th>{L_BET_POINTS}</th>
+		<th>{L_BET_POINTS}</th>
-		<th>{L_DEPOSITED}</th>
+		<th>{L_DEPOSITED}</th>
-		<th>{L_WINS}</th>
+		<th>{L_WINS}</th>
-		<th>{L_PAID}</th>
+		<th>{L_PAID}</th>
-		<th>{L_MARK}</th>
+		<th>{L_MARK}</th>
-	</tr>
+	</tr>
-	</thead>
+	</thead>
-	<tbody>
+	<tbody>
-	<!-- IF .leagues -->
+	<!-- IF .leagues -->
-		<!-- BEGIN leagues -->
+		<!-- BEGIN leagues -->
-			<!-- IF leagues.S_ROW_COUNT is even --><tr class="bg1 row_light"><!-- ELSE --><tr class="bg2 row_dark"><!-- ENDIF -->
+			<!-- 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 style="text-align: center;"><strong>{leagues.LEAGUE}</strong></td>
-				<td><a href="{leagues.U_DLOAD_BANK}">{leagues.LEAGUE_NAME}</a></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;"><a href="{leagues.U_LIST_BET_POINTS}">{leagues.BET_POINTS}</a></td>
-				<td style="text-align: right;">
+				<td style="text-align: right;">
-					<!-- IF S_LIST_DEPOSITED --><a href="{leagues.U_LIST_DEPOSITED}"><!-- ENDIF -->
+					<!-- IF S_LIST_DEPOSITED --><a href="{leagues.U_LIST_DEPOSITED}"><!-- ENDIF -->
-					{leagues.DEPOSITED}
+					{leagues.DEPOSITED}
-					<!-- IF S_LIST_DEPOSITED --></a><!-- ENDIF --></td>
+					<!-- IF S_LIST_DEPOSITED --></a><!-- ENDIF --></td>
-				<td style="text-align: right;">{leagues.WINS}</td>
+				<td style="text-align: right;">{leagues.WINS}</td>
-				<td style="text-align: right;">
+				<td style="text-align: right;">
-					<!-- IF S_LIST_PAID --><a href="{leagues.U_LIST_PAID}"><!-- ENDIF -->
+					<!-- IF S_LIST_PAID --><a href="{leagues.U_LIST_PAID}"><!-- ENDIF -->
-					{leagues.PAID}
+					{leagues.PAID}
-					<!-- IF S_LIST_PAID --></a><!-- ENDIF --></td>
+					<!-- IF S_LIST_PAID --></a><!-- ENDIF --></td>
-				<td style="text-align: center;"><input type="checkbox" class="radio" name="markleague[]" value="{leagues.LEAGUE}" /></td>
+				<td style="text-align: center;"><input type="checkbox" class="radio" name="markleague[]" value="{leagues.LEAGUE}" /></td>
-			</tr>
+			</tr>
-		<!-- END leagues -->
+		<!-- END leagues -->
-	<!-- ELSE -->
+	<!-- ELSE -->
-			<tr>
+			<tr>
-				<td colspan="3" class="row3">{L_NO_LEAGUES_CREATED}</td>
+				<td colspan="3" class="row3">{L_NO_LEAGUES_CREATED}</td>
-			</tr>
+			</tr>
-	<!-- ENDIF -->
+	<!-- ENDIF -->
-	</tbody>
+	</tbody>
-	</table>
+	</table>
-	<!-- IF S_CASH_POINTS -->
+	<!-- IF S_CASH_POINTS -->
-	{L_CASH_POINTS} <input name="cash" type="checkbox" class="radio" checked="checked" /> 
+	{L_CASH_POINTS} <input name="cash" type="checkbox" class="radio" checked="checked" /> 
-	<!-- ENDIF -->
+	<!-- ENDIF -->
-		<fieldset class="quick">
+		<fieldset class="quick">
-			<input type="hidden" name="s" value="{S_SEASON}" />
+			<input type="hidden" name="s" value="{S_SEASON}" />
-			<select name="action"><option class="sep" value="">{L_SELECT_OPTION}</option>{S_LEAGUE_ACTION_OPTIONS}</select>
+			<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}" />
+			<input class="button2" type="submit" name="update" value="{L_SUBMIT}" />
-		</fieldset>
+		</fieldset>
-
+
-	{S_FORM_TOKEN}
+	{S_FORM_TOKEN}
-	</fieldset>
+	</fieldset>
-	</form><!-- ENDIF -->
+	</form><!-- ENDIF -->
-<br />
+<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>
+<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 -->
+<!-- INCLUDECSS css/football_acp.css -->
-<!-- INCLUDE overall_header.html -->
+<!-- INCLUDE overall_header.html -->
-
+
-<a id="maincontent"></a>
+<a id="maincontent"></a>
-	<!-- IF U_FOOTBALL --><a href="{U_FOOTBALL}" style="float: {S_CONTENT_FLOW_END};">&laquo; {L_PREDICTION_LEAGUE}</a><!-- ENDIF -->
+	<!-- 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>
+	<h1>{L_ACP_FOOTBALL_BETS_MANAGE}</h1>
-
+
-	<p>{L_ACP_FOOTBALL_BETS_MANAGE_EXPLAIN}</p>
+	<p>{L_ACP_FOOTBALL_BETS_MANAGE_EXPLAIN}</p>
-
+
-	<h1 style="display:inline;">{L_SELECT_MATCHDAY}:</h1>
+	<h1 style="display:inline;">{L_SELECT_MATCHDAY}:</h1>
-	<form style="display:inline;" method="post" action="{U_ACTION}">
+	<form style="display:inline;" method="post" action="{U_ACTION}">
-	<div style="display:inline; margin:0; padding:0;">
+	<div style="display:inline; margin:0; padding:0;">
-		<select name="s" id="match_season" onchange="this.form.submit();">{S_SEASON_OPTIONS}</select>
+		<select name="s" id="match_season" onchange="this.form.submit();">{S_SEASON_OPTIONS}</select>
-		{S_FORM_TOKEN}
+		{S_FORM_TOKEN}
-	</div>
+	</div>
-	</form>
+	</form>
-	<form style="display:inline;" method="post" action="{U_ACTION}">
+	<form style="display:inline;" method="post" action="{U_ACTION}">
-	<div style="display:inline; margin:0; padding:0;">
+	<div style="display:inline; margin:0; padding:0;">
-		<input type="hidden" name="s" value="{S_SEASON}" />
+		<input type="hidden" name="s" value="{S_SEASON}" />
-		<select name="l" id="match_league" onchange="this.form.submit();">{S_LEAGUE_OPTIONS}</select>
+		<select name="l" id="match_league" onchange="this.form.submit();">{S_LEAGUE_OPTIONS}</select>
-		{S_FORM_TOKEN}
+		{S_FORM_TOKEN}
-	</div>
+	</div>
-	</form>
+	</form>
-	<form style="display:inline;" method="post" action="{U_ACTION}">
+	<form style="display:inline;" method="post" action="{U_ACTION}">
-	<div style="display:inline; margin:0; padding:0;">
+	<div style="display:inline; margin:0; padding:0;">
-		<input type="hidden" name="s" value="{S_SEASON}" />
+		<input type="hidden" name="s" value="{S_SEASON}" />
-		<input type="hidden" name="l" value="{S_LEAGUE}" />
+		<input type="hidden" name="l" value="{S_LEAGUE}" />
-		<select name="m" id="match_matchday" onchange="this.form.submit();">{S_MATCHDAY_OPTIONS}</select>
+		<select name="m" id="match_matchday" onchange="this.form.submit();">{S_MATCHDAY_OPTIONS}</select>
-		{S_FORM_TOKEN}
+		{S_FORM_TOKEN}
-	</div>
+	</div>
-	</form>
+	</form>
-	<!-- IF S_USERS -->
+	<!-- IF S_USERS -->
-	<form style="display:inline;" method="post" action="{U_ACTION}">
+	<form style="display:inline;" method="post" action="{U_ACTION}">
-	<div style="display:inline; margin:0; padding:0;">
+	<div style="display:inline; margin:0; padding:0;">
-		<input type="hidden" name="s" value="{S_SEASON}" />
+		<input type="hidden" name="s" value="{S_SEASON}" />
-		<input type="hidden" name="l" value="{S_LEAGUE}" />
+		<input type="hidden" name="l" value="{S_LEAGUE}" />
-		<input type="hidden" name="m" value="{S_MATCHDAY}" />
+		<input type="hidden" name="m" value="{S_MATCHDAY}" />
-		<select name="u" id="match_user" onchange="this.form.submit();">{S_USER_OPTIONS}</select>
+		<select name="u" id="match_user" onchange="this.form.submit();">{S_USER_OPTIONS}</select>
-		{S_FORM_TOKEN}
+		{S_FORM_TOKEN}
-	</div>
+	</div>
-	</form>
+	</form>
-	<!-- ENDIF -->
+	<!-- ENDIF -->
-
+
-	<!-- IF S_SUCCESS -->
+	<!-- IF S_SUCCESS -->
-		<div class="successbox">
+		<div class="successbox">
-			<h3>{L_ADVICE}</h3>
+			<h3>{L_ADVICE}</h3>
-			<p>{SUCCESS_MSG}</p>
+			<p>{SUCCESS_MSG}</p>
-		</div>
+		</div>
-	<!-- ENDIF -->
+	<!-- ENDIF -->
-
+
-	<!-- IF .bet_edit -->
+	<!-- IF .bet_edit -->
-	<form method="post" action="{U_ACTION}">
+	<form method="post" action="{U_ACTION}">
-	<fieldset>
+	<fieldset>
-		<legend>{S_LEGEND}</legend>
+		<legend>{S_LEGEND}</legend>
-		<input type="hidden" name="s" value="{S_SEASON}" />
+		<input type="hidden" name="s" value="{S_SEASON}" />
-		<input type="hidden" name="l" value="{S_LEAGUE}" />
+		<input type="hidden" name="l" value="{S_LEAGUE}" />
-		<input type="hidden" name="m" value="{S_MATCHDAY}" />
+		<input type="hidden" name="m" value="{S_MATCHDAY}" />
-		<input type="hidden" name="u" value="{S_USER}" />
+		<input type="hidden" name="u" value="{S_USER}" />
-		<table class="type_f">
+		<table class="type_f">
-			<thead>
+			<thead>
-				<tr>
+				<tr>
-					<th>{L_DATE}</th>
+					<th>{L_DATE}</th>
-					<th style="text-align:right">{L_NR}</th>
+					<th style="text-align:right">{L_NR}</th>
-				<!-- IF S_DATA_GROUP -->
+				<!-- IF S_DATA_GROUP -->
-					<th>{L_GR}</th>
+					<th>{L_GR}</th>
-				<!-- ENDIF -->
+				<!-- ENDIF -->
-					<th></th>
+					<th></th>
-					<th>{L_HOME}</th>
+					<th>{L_HOME}</th>
-					<th></th>
+					<th></th>
-					<th></th>
+					<th></th>
-					<th>{L_GUEST}</th>
+					<th>{L_GUEST}</th>
-					<th style="text-align:right">{L_GOALS_HOME}</th>
+					<th style="text-align:right">{L_GOALS_HOME}</th>
-					<th></th>
+					<th></th>
-					<th>{L_GOALS_GUEST}</th>
+					<th>{L_GOALS_GUEST}</th>
-					<th>{L_BET_TIME}</th>
+					<th>{L_BET_TIME}</th>
-				</tr>
+				</tr>
-			</thead>
+			</thead>
-			<tbody>
+			<tbody>
-			<!-- BEGIN bet_edit -->
+			<!-- BEGIN bet_edit -->
-				<tr class="{bet_edit.ROW_CLASS}">
+				<tr class="{bet_edit.ROW_CLASS}">
-					<td>{bet_edit.MATCH_TIME}</td>
+					<td>{bet_edit.MATCH_TIME}</td>
-					<td class="td_match_no">{bet_edit.MATCH_NUMBER}</td>
+					<td class="td_match_no">{bet_edit.MATCH_NUMBER}</td>
-				<!-- IF S_DATA_GROUP -->
+				<!-- IF S_DATA_GROUP -->
-					<td class="td_group">{bet_edit.GROUP}</td>
+					<td class="td_group">{bet_edit.GROUP}</td>
-				<!-- ENDIF -->
+				<!-- ENDIF -->
-					<td style="text-align:right; width:32px;">{bet_edit.LOGO_HOME}&nbsp;</td>
+					<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_team">{bet_edit.HOME_NAME}</td>
-					<td class="td_vs">:</td>
+					<td class="td_vs">:</td>
-					<td style="text-align:right; width:32px;">{bet_edit.LOGO_GUEST}&nbsp;</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_team">{bet_edit.GUEST_NAME}</td>
-					<td class="td_goals_home"><input style="text-align:right; width:30px;" type="number" 
+					<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>
+													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_vs">:</td>
-					<td class="td_goals_guest"><input style="margin:0; width:30px;" type="number" 
+					<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>
+													name="goalsg{bet_edit.MATCH_NUMBER}" min="0" max="20" size="2" value="{bet_edit.BET_GUEST}" /></td>
-					<td>{bet_edit.BET_TIME}</td>
+					<td>{bet_edit.BET_TIME}</td>
-				</tr>
+				</tr>
-			<!-- END bet_edit -->
+			<!-- END bet_edit -->
-			</tbody>
+			</tbody>
-		</table>
+		</table>
-		
+		
-		<!-- IF S_EXTRA_BET --> 
+		<!-- IF S_EXTRA_BET --> 
-		<br />
+		<br />
-		<table class="type_f">
+		<table class="type_f">
-			<thead>
+			<thead>
-				<tr>
+				<tr>
-					<th style="text-align: left;">{L_QUESTION}</th>
+					<th style="text-align: left;">{L_QUESTION}</th>
-					<th>{L_POSSIBLE_POINTS}</th>
+					<th>{L_POSSIBLE_POINTS}</th>
-					<th>{L_EVALUATION}</th>
+					<th>{L_EVALUATION}</th>
-					<th>{L_BET_OF}</th>
+					<th>{L_BET_OF}</th>
-				</tr>
+				</tr>
-			</thead>
+			</thead>
-			<tbody>
+			<tbody>
-			<!-- BEGIN extra_edit -->
+			<!-- BEGIN extra_edit -->
-				<tr class="{extra_edit.ROW_CLASS}" style="height:30px">
+				<tr class="{extra_edit.ROW_CLASS}" style="height:30px">
-					<td>{extra_edit.QUESTION}</td>
+					<td>{extra_edit.QUESTION}</td>
-					<td style="text-align: center;">{extra_edit.EXTRA_POINTS}</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;" title="{extra_edit.EVALUATION_TITLE}">{extra_edit.EVALUATION}</td>
-					<td style="text-align: center;">
+					<td style="text-align: center;">
-					<!-- IF extra_edit.S_DISPLAY_TYPE == 1 -->
+					<!-- IF extra_edit.S_DISPLAY_TYPE == 1 -->
-						<select name="extra{extra_edit.EXTRA_NO}">
+						<select name="extra{extra_edit.EXTRA_NO}">
-						<!-- BEGIN extra_option -->
+						<!-- BEGIN extra_option -->
-							<option {extra_edit.extra_option.S_SELECTED} value="{extra_edit.extra_option.OPTION_VALUE}">{extra_edit.extra_option.OPTION_NAME}</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 -->
+						<!-- END extra_option -->
-						</select>
+						</select>
-					<!-- ENDIF -->
+					<!-- ENDIF -->
-					<!-- IF extra_edit.S_DISPLAY_TYPE == 2 -->
+					<!-- 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}"> 
+						<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 -->
+					<!-- ENDIF -->
-					</td>
+					</td>
-				</tr>
+				</tr>
-			<!-- END extra_edit -->
+			<!-- END extra_edit -->
-			</tbody>
+			</tbody>
-		</table>
+		</table>
-		<!-- ENDIF -->
+		<!-- ENDIF -->
-		<!-- IF S_CASH_POINTS -->{L_CASH_POINTS} <input name="cash" type="checkbox" class="radio" checked="checked" /> <!-- ENDIF -->
+		<!-- IF S_CASH_POINTS -->{L_CASH_POINTS} <input name="cash" type="checkbox" class="radio" checked="checked" /> <!-- ENDIF -->
-		
+		
-		<fieldset class="submit-buttons">
+		<fieldset class="submit-buttons">
-			<input class="button1" type="submit" id="submit" name="bet" value="{L_SAVE}" />&nbsp;
+			<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}" />
+			<input class="button2" type="reset" id="reset" name="reset" value="{L_RESET}" />
-			{S_FORM_TOKEN}
+			{S_FORM_TOKEN}
-		</fieldset>
+		</fieldset>
-	</fieldset>
+	</fieldset>
-	</form>
+	</form>
-	<!-- ELSE -->
+	<!-- ELSE -->
-	<fieldset>
+	<fieldset>
-		<legend>{S_LEGEND}</legend>
+		<legend>{S_LEGEND}</legend>
-		<br />
+		<br />
-		<div class="message"><!-- IF S_USERS -->{L_NO_MATCHES_ON_MATCHDAY}<!-- ELSE -->{L_NO_USERS}<!-- ENDIF --></div>
+		<div class="message"><!-- IF S_USERS -->{L_NO_MATCHES_ON_MATCHDAY}<!-- ELSE -->{L_NO_USERS}<!-- ENDIF --></div>
-		<br />
+		<br />
-	</fieldset>
+	</fieldset>
-	<!-- ENDIF -->
+	<!-- ENDIF -->
-<br />
+<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>
+<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 -->
+<!-- INCLUDECSS css/football_acp.css -->
-<!-- INCLUDE overall_header.html -->
+<!-- INCLUDE overall_header.html -->
-
+
-<a id="maincontent"></a>
+<a id="maincontent"></a>
-<!-- IF S_EDIT -->
+<!-- IF S_EDIT -->
-	<a href="{U_BACK}" style="float: {S_CONTENT_FLOW_END};">&laquo; {L_BACK}</a>
+	<a href="{U_BACK}" style="float: {S_CONTENT_FLOW_END};">&laquo; {L_BACK}</a>
-	<h1>{L_ACP_FOOTBALL_EXTRA_MANAGE}</h1>
+	<h1>{L_ACP_FOOTBALL_EXTRA_MANAGE}</h1>
-	<p>{L_MATCHDAY_EDIT_EXPLAIN}</p>
+	<p>{L_MATCHDAY_EDIT_EXPLAIN}</p>
-
+
-	<!-- IF S_ERROR -->
+	<!-- IF S_ERROR -->
-		<div class="errorbox">
+		<div class="errorbox">
-			<h3>{L_WARNING}</h3>
+			<h3>{L_WARNING}</h3>
-			<p>{ERROR_MSG}</p>
+			<p>{ERROR_MSG}</p>
-		</div>
+		</div>
-	<!-- ENDIF -->
+	<!-- ENDIF -->
-
+
-	<form id="settings" method="post" action="{U_ACTION}">
+	<form id="settings" method="post" action="{U_ACTION}">
-
+
-	<fieldset>
+	<fieldset>
-		<legend>{L_EXTRA_DETAILS}</legend>
+		<legend>{L_EXTRA_DETAILS}</legend>
-	<dl>
+	<dl>
-		<dt><label for="season">{L_SEASON}:</label></dt>
+		<dt><label for="season">{L_SEASON}:</label></dt>
-		<dd><strong>{SEASON_NAME}</strong><input name="s" type="hidden" id="season" value="{SEASON}" /></dd>
+		<dd><strong>{SEASON_NAME}</strong><input name="s" type="hidden" id="season" value="{SEASON}" /></dd>
-	</dl>
+	</dl>
-	<dl>
+	<dl>
-		<dt><label for="league">{L_LEAGUE}:</label></dt>
+		<dt><label for="league">{L_LEAGUE}:</label></dt>
-		<dd><strong>{LEAGUE_NAME}</strong><input name="l" type="hidden" id="league" value="{LEAGUE}" /></dd>
+		<dd><strong>{LEAGUE_NAME}</strong><input name="l" type="hidden" id="league" value="{LEAGUE}" /></dd>
-	</dl>
+	</dl>
-	<dl>
+	<dl>
-		<dt><label for="extra_no">{L_EXTRA_NO}:</label></dt>
+		<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>
+		<dd><strong>{EXTRA_NO}</strong><input name="e" type="hidden" id="extra_no" value="{EXTRA_NO}" /></dd>
-	</dl>
+	</dl>
-	<dl>
+	<dl>
-		<dt><label for="question_type">{L_EXTRA_QUESTION_TYPE}:</label><br /><span>{L_EXTRA_QUESTION_TYPE_EXPLAIN}</span></dt>
+		<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>
+		<dd><select id="question_type" name="question_type">{S_QUESTION_TYPE_OPTIONS}</select> </dd>
-	</dl>
+	</dl>
-	<dl>
+	<dl>
-		<dt><label for="question">{L_EXTRA_QUESTION}:</label><br /><span>{L_EXTRA_QUESTION_EXPLAIN}</span></dt>
+		<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>
+		<dd><input name="question" type="text" id="question" size="80" maxlength="255" value="{QUESTION}" /></dd>
-	</dl>
+	</dl>
-	<dl>
+	<dl>
-		<dt><label for="matchday">{L_EXTRA_MATCHDAY}:</label><br /><span>{L_EXTRA_MATCHDAY_EXPLAIN}</span></dt>
+		<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>
+		<dd><select id="matchday" name="matchday">{S_MATCHDAY_OPTIONS}</select> </dd>
-	</dl>
+	</dl>
-	<dl>
+	<dl>
-		<dt><label for="matchday_eval">{L_EXTRA_MATCHDAY_EVAL}:</label><br /><span>{L_EXTRA_MATCHDAY_EVAL_EXPLAIN}</span></dt>
+		<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>
+		<dd><select id="matchday_eval" name="matchday_eval">{S_MATCHDAY_EVAL_OPTIONS}</select> </dd>
-	</dl>
+	</dl>
-	<dl>
+	<dl>
-		<dt><label for="extra_points">{L_EXTRA_POINTS}:</label><br /><span>{L_EXTRA_POINTS_EXPLAIN}</span></dt>
+		<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>
+		<dd><input name="extra_points" type="text" id="extra_points" size="2" maxlength="2" value="{EXTRA_POINTS}" /></dd>
-	</dl>
+	</dl>
-	<dl>
+	<dl>
-		<dt><label for="extra_status">{L_EXTRA_STATUS}:</label><br /><span>{L_EXTRA_STATUS_EXPLAIN}</span></dt>
+		<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>
+		<dd><select id="extra_status" name="extra_status">{S_EXTRA_STATUS_OPTIONS}</select></dd>
-	</dl>
+	</dl>
-	</fieldset>
+	</fieldset>
-
+
-	<fieldset class="submit-buttons">
+	<fieldset class="submit-buttons">
-		<legend>{L_SUBMIT}</legend>
+		<legend>{L_SUBMIT}</legend>
-		<input class="button1" type="submit" id="submit" name="update" value="{L_SUBMIT}" />&nbsp;
+		<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}" />
+		<input class="button2" type="reset" id="reset" name="reset" value="{L_RESET}" />
-		{S_FORM_TOKEN}
+		{S_FORM_TOKEN}
-	</fieldset>
+	</fieldset>
-	</form>
+	</form>
-
+
-<!-- ELSE -->
+<!-- ELSE -->
-	<!-- IF U_FOOTBALL --><a href="{U_FOOTBALL}" style="float: {S_CONTENT_FLOW_END};">&laquo; {L_PREDICTION_LEAGUE}</a><!-- ENDIF -->
+	<!-- 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>
+	<h1>{L_ACP_FOOTBALL_EXTRA_MANAGE}</h1>
-	<p>{L_ACP_FOOTBALL_EXTRA_MANAGE_EXPLAIN}</p>
+	<p>{L_ACP_FOOTBALL_EXTRA_MANAGE_EXPLAIN}</p>
-
+
-	<!-- IF S_ERROR -->
+	<!-- IF S_ERROR -->
-		<div class="errorbox">
+		<div class="errorbox">
-			<h3>{L_WARNING}</h3>
+			<h3>{L_WARNING}</h3>
-			<p>{ERROR_MSG}</p>
+			<p>{ERROR_MSG}</p>
-		</div>
+		</div>
-	<!-- ENDIF -->
+	<!-- ENDIF -->
-
+
-	<h1 style="display:inline;">{L_SELECT_LEAGUE}:</h1>
+	<h1 style="display:inline;">{L_SELECT_LEAGUE}:</h1>
-	<form style="display:inline;" method="post" action="{U_ACTION}">
+	<form style="display:inline;" method="post" action="{U_ACTION}">
-	<div style="display:inline; margin:0; padding:0;">
+	<div style="display:inline; margin:0; padding:0;">
-		<select name="s" id="matchday_season" onchange="this.form.submit();">{S_SEASON_OPTIONS}</select>
+		<select name="s" id="matchday_season" onchange="this.form.submit();">{S_SEASON_OPTIONS}</select>
-		{S_FORM_TOKEN}
+		{S_FORM_TOKEN}
-	</div>
+	</div>
-	</form>
+	</form>
-
+
-	<form style="display:inline;" method="post" action="{U_ACTION}">
+	<form style="display:inline;" method="post" action="{U_ACTION}">
-	<div style="display:inline; margin:0; padding:0;">
+	<div style="display:inline; margin:0; padding:0;">
-		<input type="hidden" name="s" value="{S_SEASON}" />
+		<input type="hidden" name="s" value="{S_SEASON}" />
-		<select name="l" id="matchday_league" onchange="this.form.submit();">{S_LEAGUE_OPTIONS}</select>
+		<select name="l" id="matchday_league" onchange="this.form.submit();">{S_LEAGUE_OPTIONS}</select>
-		{S_FORM_TOKEN}
+		{S_FORM_TOKEN}
-	</div>
+	</div>
-	</form>
+	</form>
-
+
-	<form id="add_extra" method="post" action="{U_ACTION}">
+	<form id="add_extra" method="post" action="{U_ACTION}">
-	<fieldset class="quick">
+	<fieldset class="quick">
-			<input type="hidden" name="s" value="{S_SEASON}" />
+			<input type="hidden" name="s" value="{S_SEASON}" />
-			<input type="hidden" name="l" value="{S_LEAGUE}" />
+			<input type="hidden" name="l" value="{S_LEAGUE}" />
-		<!-- IF S_EXTRA_ADD -->
+		<!-- IF S_EXTRA_ADD -->
-			<input class="button2" type="submit" name="submit" value="{L_EXTRA_ADD}" />
+			<input class="button2" type="submit" name="submit" value="{L_EXTRA_ADD}" />
-			<input type="hidden" name="add" value="1" />
+			<input type="hidden" name="add" value="1" />
-		<!-- ENDIF -->
+		<!-- ENDIF -->
-		{S_FORM_TOKEN}
+		{S_FORM_TOKEN}
-	</fieldset>
+	</fieldset>
-	</form>
+	</form>
-	<h1>{L_EXTRA_DEF}</h1>
+	<h1>{L_EXTRA_DEF}</h1>
-
+
-	<p>{L_EXTRA_DEF_EXPLAIN}</p>
+	<p>{L_EXTRA_DEF_EXPLAIN}</p>
-	<table class="type_f">
+	<table class="type_f">
-	<thead>
+	<thead>
-	<tr>
+	<tr>
-		<th>{L_EXTRA_NO}</th>
+		<th>{L_EXTRA_NO}</th>
-		<th>{L_QUESTION_TYPE}</th>
+		<th>{L_QUESTION_TYPE}</th>
-		<th style="width: 40%">{L_EXTRA_QUESTION}</th>
+		<th style="width: 40%">{L_EXTRA_QUESTION}</th>
-		<th>{L_EXTRA_MATCHDAY}</th>
+		<th>{L_EXTRA_MATCHDAY}</th>
-		<th>{L_EXTRA_MATCHDAY_EVAL}</th>
+		<th>{L_EXTRA_MATCHDAY_EVAL}</th>
-		<th>{L_EXTRA_POINTS}</th>
+		<th>{L_EXTRA_POINTS}</th>
-		<th>{L_STATUS}</th>
+		<th>{L_STATUS}</th>
-		<th>{L_OPTIONS}</th>
+		<th>{L_OPTIONS}</th>
-		<th>{L_ACTION}</th>
+		<th>{L_ACTION}</th>
-	</tr>
+	</tr>
-	</thead>
+	</thead>
-	<tbody>
+	<tbody>
-	<!-- IF .extras -->
+	<!-- IF .extras -->
-		<!-- BEGIN extras -->
+		<!-- BEGIN extras -->
-			<tr class="{extras.ROW_CLASS}">
+			<tr class="{extras.ROW_CLASS}">
-				<td style="text-align:center;"><strong>{extras.EXTRA_NO}</strong></td>
+				<td style="text-align:center;"><strong>{extras.EXTRA_NO}</strong></td>
-				<td style="text-align:center;">{extras.QUESTION_TYPE}</td>
+				<td style="text-align:center;">{extras.QUESTION_TYPE}</td>
-				<td>{extras.QUESTION}</td>
+				<td>{extras.QUESTION}</td>
-				<td style="text-align:right;">{extras.MATCHDAY}</td>
+				<td style="text-align:right;">{extras.MATCHDAY}</td>
-				<td style="text-align:right;">{extras.MATCHDAY_EVAL}</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_POINTS}</td>
-				<td style="text-align:center;">{extras.EXTRA_STATUS}</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;"><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>
+				<td style="text-align: center;"><!-- IF extras.U_DELETE --><a href="{extras.U_DELETE}">{L_DELETE}</a><!-- ELSE -->{L_DELETE}<!-- ENDIF --></td>
-			</tr>
+			</tr>
-		<!-- END extras -->
+		<!-- END extras -->
-	<!-- ELSE -->
+	<!-- ELSE -->
-			<tr>
+			<tr>
-				<td colspan="9" class="row3">{L_NO_EXTRA_CREATED}</td>
+				<td colspan="9" class="row3">{L_NO_EXTRA_CREATED}</td>
-			</tr>
+			</tr>
-	<!-- ENDIF -->
+	<!-- ENDIF -->
-	</tbody>
+	</tbody>
-	</table>
+	</table>
-
+
-<!-- ENDIF -->
+<!-- ENDIF -->
-<br />
+<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>
+<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 -->
+<!-- INCLUDECSS css/football_acp.css -->
-<!-- INCLUDE overall_header.html -->
+<!-- INCLUDE overall_header.html -->
-
+
-<a id="maincontent"></a>
+<a id="maincontent"></a>
-	<!-- IF U_FOOTBALL --><a href="{U_FOOTBALL}" style="float: {S_CONTENT_FLOW_END};">&laquo; {L_PREDICTION_LEAGUE}</a><!-- ENDIF -->
+	<!-- 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>
+	<h1>{L_ACP_FOOTBALL_KO_MANAGE}</h1>
-	<p>{L_ACP_FOOTBALL_KO_MANAGE_EXPLAIN}</p>
+	<p>{L_ACP_FOOTBALL_KO_MANAGE_EXPLAIN}</p>
-
+
-	<h1 style="display:inline;">{L_SELECT_LEAGUE}:</h1>
+	<h1 style="display:inline;">{L_SELECT_LEAGUE}:</h1>
-	<form style="display:inline;" method="post" action="{U_ACTION}">
+	<form style="display:inline;" method="post" action="{U_ACTION}">
-	<div style="display:inline; margin:0; padding:0;">
+	<div style="display:inline; margin:0; padding:0;">
-		<select name="s" id="match_season" onchange="this.form.submit();">{S_SEASON_OPTIONS}</select>
+		<select name="s" id="match_season" onchange="this.form.submit();">{S_SEASON_OPTIONS}</select>
-		{S_FORM_TOKEN}
+		{S_FORM_TOKEN}
-	</div>
+	</div>
-	</form>
+	</form>
-	<form style="display:inline;" method="post" action="{U_ACTION}">
+	<form style="display:inline;" method="post" action="{U_ACTION}">
-	<div style="display:inline; margin:0; padding:0;">
+	<div style="display:inline; margin:0; padding:0;">
-		<input type="hidden" name="s" value="{S_SEASON}" />
+		<input type="hidden" name="s" value="{S_SEASON}" />
-		<select name="l" id="match_league" onchange="this.form.submit();">{S_LEAGUE_OPTIONS}</select>
+		<select name="l" id="match_league" onchange="this.form.submit();">{S_LEAGUE_OPTIONS}</select>
-		{S_FORM_TOKEN}
+		{S_FORM_TOKEN}
-	</div>
+	</div>
-	</form>
+	</form>
-
+
-	<!-- IF S_ERROR -->
+	<!-- IF S_ERROR -->
-		<div class="errorbox">
+		<div class="errorbox">
-			<h3>{L_WARNING}</h3>
+			<h3>{L_WARNING}</h3>
-			<p>{ERROR_MSG}</p>
+			<p>{ERROR_MSG}</p>
-		</div>
+		</div>
-	<!-- ENDIF -->
+	<!-- ENDIF -->
-
+
-	<form id="settings" method="post" action="{U_ACTION}">
+	<form id="settings" method="post" action="{U_ACTION}">
-
+
-	<fieldset>
+	<fieldset>
-		<legend>{L_KO_MATCHDAYS}</legend>
+		<legend>{L_KO_MATCHDAYS}</legend>
-	<dl>
+	<dl>
-		<dt><label for="matchday_from">{L_MATCHDAY_FROM}:</label></dt>
+		<dt><label for="matchday_from">{L_MATCHDAY_FROM}:</label></dt>
-		<dd><select name="matchday_from" id="matchday_from" >{S_MATCHDAY_FROM_OPTIONS}</select></dd>
+		<dd><select name="matchday_from" id="matchday_from" >{S_MATCHDAY_FROM_OPTIONS}</select></dd>
-	</dl>
+	</dl>
-	<dl>
+	<dl>
-		<dt><label for="matchday_to">{L_MATCHDAY_TO}:</label></dt>
+		<dt><label for="matchday_to">{L_MATCHDAY_TO}:</label></dt>
-		<dd><select name="matchday_to" id="matchday_to" >{S_MATCHDAY_TO_OPTIONS}</select></dd>
+		<dd><select name="matchday_to" id="matchday_to" >{S_MATCHDAY_TO_OPTIONS}</select></dd>
-	</dl>
+	</dl>
-	<input type="hidden" name="s" value="{S_SEASON}" />
+	<input type="hidden" name="s" value="{S_SEASON}" />
-	<input type="hidden" name="l" value="{S_LEAGUE}" />
+	<input type="hidden" name="l" value="{S_LEAGUE}" />
-	</fieldset>
+	</fieldset>
-	
+	
-	<fieldset>
+	<fieldset>
-		<legend>{L_MATCHDAY_TARGET}</legend>
+		<legend>{L_MATCHDAY_TARGET}</legend>
-	<dl>
+	<dl>
-		<dt><label for="matchday_new">{L_MATCHDAY_NEW}:</label></dt>
+		<dt><label for="matchday_new">{L_MATCHDAY_NEW}:</label></dt>
-		<dd><select name="matchday_new" id="matchday_new" >{S_MATCHDAY_NEW_OPTIONS}</select></dd>
+		<dd><select name="matchday_new" id="matchday_new" >{S_MATCHDAY_NEW_OPTIONS}</select></dd>
-	</dl>
+	</dl>
-	</fieldset>
+	</fieldset>
-
+
-	<fieldset>
+	<fieldset>
-		<legend>{L_KO_GROUP}</legend>
+		<legend>{L_KO_GROUP}</legend>
-	<dl>
+	<dl>
-		<dt><label for="matchday_new">{L_MANAGE_GROUP}:</label></dt>
+		<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>
+		<dd><input name="check_rank" id="check_rank" type="checkbox" value="1" class="radio" <!-- IF S_CHECK_RANK --> checked="checked"<!-- ENDIF --> /></dd>
-	</dl>
+	</dl>
-	<dl>
+	<dl>
-		<dt><label for="rank">{L_GROUP_RANK}:</label><br /><span>{L_GROUP_RANK_EXPLAIN}</span></dt>
+		<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>
+		<dd><input name="rank" type="text" id="rank" value="{S_RANK}" size="1" maxlength="1" /></dd>
-	</dl>
+	</dl>
-	<dl>
+	<dl>
-		<dt><label for="move_rank">{L_MOVE_RANK}:</label><br /><span>{L_MOVE_RANK_EXPLAIN}</span></dt>
+		<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" /> 
+		<dd><input name="move_rank" type="text" id="move_rank" value="{S_MOVE_RANK}" size="1" maxlength="1" /> 
-			{L_MOVE_LEAGUE} 
+			{L_MOVE_LEAGUE} 
-			<select name="move_league" id="move_league">{S_MOVE_LEAGUE_OPTIONS}</select>
+			<select name="move_league" id="move_league">{S_MOVE_LEAGUE_OPTIONS}</select>
-			{L_MATCHDAY}
+			{L_MATCHDAY}
-			<input name="move_matchday" type="text" id="move_matchday" value="{S_MOVE_MATCHDAY}" size="2" maxlength="2" /> 
+			<input name="move_matchday" type="text" id="move_matchday" value="{S_MOVE_MATCHDAY}" size="2" maxlength="2" /> 
-		</dd>
+		</dd>
-	</dl>
+	</dl>
-	</fieldset>
+	</fieldset>
-
+
-	<fieldset class="submit-buttons">
+	<fieldset class="submit-buttons">
-		<legend>{L_SUBMIT}</legend>
+		<legend>{L_SUBMIT}</legend>
-		<input class="button1" type="submit" id="submit" name="update" value="{L_SUBMIT}" />&nbsp;
+		<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}" />
+		<input class="button2" type="reset" id="reset" name="reset" value="{L_RESET}" />
-		{S_FORM_TOKEN}
+		{S_FORM_TOKEN}
-	</fieldset>
+	</fieldset>
-	</form>
+	</form>
-<br />
+<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>
+<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

@@ -1,321 +1,321 @@
-<!-- INCLUDECSS css/football_acp.css -->
+<!-- INCLUDECSS css/football_acp.css -->
-<!-- INCLUDE overall_header.html -->
+<!-- INCLUDE overall_header.html -->
-
+
-<a id="maincontent"></a>
+<a id="maincontent"></a>
-<!-- IF S_EDIT -->
+<!-- IF S_EDIT -->
-	<a href="{U_BACK}" style="float: {S_CONTENT_FLOW_END};">&laquo; {L_BACK}</a>
+	<a href="{U_BACK}" style="float: {S_CONTENT_FLOW_END};">&laquo; {L_BACK}</a>
-	<h1>{L_ACP_FOOTBALL_LEAGUES_MANAGE}</h1>
+	<h1>{L_ACP_FOOTBALL_LEAGUES_MANAGE}</h1>
-	<p>{L_LEAGUE_EDIT_EXPLAIN}</p>
+	<p>{L_LEAGUE_EDIT_EXPLAIN}</p>
-
+
-	<!-- IF S_ERROR -->
+	<!-- IF S_ERROR -->
-		<div class="errorbox">
+		<div class="errorbox">
-			<h3>{L_WARNING}</h3>
+			<h3>{L_WARNING}</h3>
-			<p>{ERROR_MSG}</p>
+			<p>{ERROR_MSG}</p>
-		</div>
+		</div>
-	<!-- ENDIF -->
+	<!-- ENDIF -->
-
+
-	<form id="settings" method="post" action="{U_ACTION}">
+	<form id="settings" method="post" action="{U_ACTION}">
-
+
-	<fieldset>
+	<fieldset>
-		<legend>{L_LEAGUE_DETAILS}</legend>
+		<legend>{L_LEAGUE_DETAILS}</legend>
-	<dl>
+	<dl>
-		<dt><label for="season">{L_SEASON}:</label></dt>
+		<dt><label for="season">{L_SEASON}:</label></dt>
-		<dd><strong>{SEASON}</strong><input name="l" type="hidden" id="season" value="{SEASON}" /></dd>
+		<dd><strong>{SEASON}</strong><input name="l" type="hidden" id="season" value="{SEASON}" /></dd>
-	</dl>
+	</dl>
-	<dl>
+	<dl>
-		<dt><label for="league">{L_LEAGUE}:</label></dt>
+		<dt><label for="league">{L_LEAGUE}:</label></dt>
-		<dd>
+		<dd>
-		<!-- IF not S_ADD_LEAGUE -->
+		<!-- IF not S_ADD_LEAGUE -->
-			<strong>{LEAGUE}</strong>
+			<strong>{LEAGUE}</strong>
-		<!-- ENDIF -->
+		<!-- ENDIF -->
-			<input name="l" type="<!-- IF S_ADD_LEAGUE -->text<!-- ELSE -->hidden<!-- ENDIF -->" id="league" value="{LEAGUE}" />
+			<input name="l" type="<!-- IF S_ADD_LEAGUE -->text<!-- ELSE -->hidden<!-- ENDIF -->" id="league" value="{LEAGUE}" />
-		</dd>
+		</dd>
-	</dl>
+	</dl>
-	<dl>
+	<dl>
-		<dt><label for="league_name">{L_LEAGUE_NAME}:</label></dt>
+		<dt><label for="league_name">{L_LEAGUE_NAME}:</label></dt>
-		<dd><input name="league_name" type="text" id="league_name" size="20" maxlength="20" value="{LEAGUE_NAME}" /></dd>
+		<dd><input name="league_name" type="text" id="league_name" size="20" maxlength="20" value="{LEAGUE_NAME}" /></dd>
-	</dl>
+	</dl>
-	<dl>
+	<dl>
-		<dt><label for="league_short">{L_LEAGUE_SHORT}:</label><br /><span>{L_LEAGUE_SHORT_EXPLAIN}</span></dt>
+		<dt><label for="league_short">{L_LEAGUE_SHORT}:</label><br /><span>{L_LEAGUE_SHORT_EXPLAIN}</span></dt>
-		<dd><input name="league_short" type="text" id="league_short" size="3" maxlength="3" value="{LEAGUE_SHORT}" /></dd>
+		<dd><input name="league_short" type="text" id="league_short" size="3" maxlength="3" value="{LEAGUE_SHORT}" /></dd>
-	</dl>
+	</dl>
-	<dl>
+	<dl>
-		<dt><label for="league_type">{L_LEAGUE_TYPE}:</label><br /><span>{L_LEAGUE_TYPE_EXPLAIN}</span></dt>
+		<dt><label for="league_type">{L_LEAGUE_TYPE}:</label><br /><span>{L_LEAGUE_TYPE_EXPLAIN}</span></dt>
-		<dd>
+		<dd>
-			<label><input name="league_type" type="radio" class="radio" id="league_type" value="{LEAGUE_TYPE_CHAMP}"{LEAGUE_CHAMP} /> {L_LEAGUE_CHAMP}</label>
+			<label><input name="league_type" type="radio" class="radio" id="league_type" value="{LEAGUE_TYPE_CHAMP}"{LEAGUE_CHAMP} /> {L_LEAGUE_CHAMP}</label>
-			<label><input name="league_type" type="radio" class="radio" value="{LEAGUE_TYPE_KO}"{LEAGUE_KO} /> {L_LEAGUE_KO}</label>
+			<label><input name="league_type" type="radio" class="radio" value="{LEAGUE_TYPE_KO}"{LEAGUE_KO} /> {L_LEAGUE_KO}</label>
-		</dd>
+		</dd>
-	</dl>
+	</dl>
-	<dl>
+	<dl>
-		<dt><label for="bet_ko_type">{L_BET_TYPE_KO}:</label><br /><span>{L_BET_TYPE_KO_EXPLAIN}</span></dt>
+		<dt><label for="bet_ko_type">{L_BET_TYPE_KO}:</label><br /><span>{L_BET_TYPE_KO_EXPLAIN}</span></dt>
-		<dd>
+		<dd>
-			<label><input name="bet_ko_type" type="radio" class="radio" id="bet_ko_type" value="{BET_TYPE_KO_90}"{BET_KO_90} /> {L_MIN90}</label>
+			<label><input name="bet_ko_type" type="radio" class="radio" id="bet_ko_type" value="{BET_TYPE_KO_90}"{BET_KO_90} /> {L_MIN90}</label>
-			<label><input name="bet_ko_type" type="radio" class="radio" value="{BET_TYPE_KO_EXTRATIME}"{BET_KO_EXTRATIME} /> {L_EXTRATIME}</label>
+			<label><input name="bet_ko_type" type="radio" class="radio" value="{BET_TYPE_KO_EXTRATIME}"{BET_KO_EXTRATIME} /> {L_EXTRATIME}</label>
-			<label><input name="bet_ko_type" type="radio" class="radio" value="{BET_TYPE_KO_PENALTY}"{BET_KO_PENALTY} /> {L_PENALTY}</label>
+			<label><input name="bet_ko_type" type="radio" class="radio" value="{BET_TYPE_KO_PENALTY}"{BET_KO_PENALTY} /> {L_PENALTY}</label>
-		</dd>
+		</dd>
-	</dl>
+	</dl>
-	<dl>
+	<dl>
-		<dt><label for="league_matchdays">{L_LEAGUE_MATCHDAYS}:</label><br /><span>{L_LEAGUE_MATCHDAYS_EXPLAIN}</span></dt>
+		<dt><label for="league_matchdays">{L_LEAGUE_MATCHDAYS}:</label><br /><span>{L_LEAGUE_MATCHDAYS_EXPLAIN}</span></dt>
-		<dd><input name="league_matchdays" type="text" id="league_matchdays" size="2" maxlength="2" value="{LEAGUE_MATCHDAYS}" /></dd>
+		<dd><input name="league_matchdays" type="text" id="league_matchdays" size="2" maxlength="2" value="{LEAGUE_MATCHDAYS}" /></dd>
-	</dl>
+	</dl>
-	<dl>
+	<dl>
-		<dt><label for="league_matches">{L_LEAGUE_MATCHES}:</label><br /><span>{L_LEAGUE_MATCHES_EXPLAIN}</span></dt>
+		<dt><label for="league_matches">{L_LEAGUE_MATCHES}:</label><br /><span>{L_LEAGUE_MATCHES_EXPLAIN}</span></dt>
-		<dd>
+		<dd>
-			<!-- IF S_EDIT_MATCHES -->
+			<!-- IF S_EDIT_MATCHES -->
-			<input name="league_matches" type="text" id="league_matches" size="2" maxlength="2" value="{LEAGUE_MATCHES}" />
+			<input name="league_matches" type="text" id="league_matches" size="2" maxlength="2" value="{LEAGUE_MATCHES}" />
-			<!-- ELSE -->
+			<!-- ELSE -->
-			{LEAGUE_MATCHES}
+			{LEAGUE_MATCHES}
-			<!-- ENDIF -->
+			<!-- ENDIF -->
-		</dd>
+		</dd>
-	</dl>
+	</dl>
-	<dl>
+	<dl>
-		<dt><label for="league_rules_post_id">{L_LEAGUE_RULES_POST_ID}:</label><br /><span>{L_LEAGUE_RULES_POST_ID_EXPLAIN}</span></dt>
+		<dt><label for="league_rules_post_id">{L_LEAGUE_RULES_POST_ID}:</label><br /><span>{L_LEAGUE_RULES_POST_ID_EXPLAIN}</span></dt>
-		<dd><input name="league_rules_post_id" type="text" id="league_rules_post_id" size="8" maxlength="8" value="{LEAGUE_RULES_POST_ID}" /></dd>
+		<dd><input name="league_rules_post_id" type="text" id="league_rules_post_id" size="8" maxlength="8" value="{LEAGUE_RULES_POST_ID}" /></dd>
-	</dl>
+	</dl>
-	<dl>
+	<dl>
-		<dt><label for="league_join_by_user">{L_LEAGUE_JOIN_BY_USER}:</label><br /><span>{L_LEAGUE_JOIN_BY_USER_EXPLAIN}</span></dt>
+		<dt><label for="league_join_by_user">{L_LEAGUE_JOIN_BY_USER}:</label><br /><span>{L_LEAGUE_JOIN_BY_USER_EXPLAIN}</span></dt>
-		<dd>
+		<dd>
-			<label><input name="league_join_by_user" type="radio" class="radio" id="league_join_by_user" value="1"{JOIN_BY_USER_YES} /> {L_YES}</label>
+			<label><input name="league_join_by_user" type="radio" class="radio" id="league_join_by_user" value="1"{JOIN_BY_USER_YES} /> {L_YES}</label>
-			<label><input name="league_join_by_user" type="radio" class="radio" value="0"{JOIN_BY_USER_NO} 
+			<label><input name="league_join_by_user" type="radio" class="radio" value="0"{JOIN_BY_USER_NO} 
-						onchange="document.getElementById('no_league_join_in_season').checked=true;"/> {L_NO}</label>
+						onchange="document.getElementById('no_league_join_in_season').checked=true;"/> {L_NO}</label>
-
+
-		</dd>
+		</dd>
-	</dl>
+	</dl>
-	<dl>
+	<dl>
-		<dt><label for="league_join_in_season">{L_LEAGUE_JOIN_IN_SEASON}:</label><br /><span>{L_LEAGUE_JOIN_IN_SEASON_EXPLAIN}</span></dt>
+		<dt><label for="league_join_in_season">{L_LEAGUE_JOIN_IN_SEASON}:</label><br /><span>{L_LEAGUE_JOIN_IN_SEASON_EXPLAIN}</span></dt>
-		<dd>
+		<dd>
-			<label><input name="league_join_in_season" type="radio" class="radio" id="league_join_in_season" value="1"{JOIN_IN_SEASON_YES} 
+			<label><input name="league_join_in_season" type="radio" class="radio" id="league_join_in_season" value="1"{JOIN_IN_SEASON_YES} 
-						onchange="document.getElementById('league_join_by_user').checked=true;"/> {L_YES}</label>
+						onchange="document.getElementById('league_join_by_user').checked=true;"/> {L_YES}</label>
-			<label><input name="league_join_in_season" type="radio" class="radio" id="no_league_join_in_season" value="0"{JOIN_IN_SEASON_NO} /> {L_NO}</label>
+			<label><input name="league_join_in_season" type="radio" class="radio" id="no_league_join_in_season" value="0"{JOIN_IN_SEASON_NO} /> {L_NO}</label>
-
+
-		</dd>
+		</dd>
-	</dl>
+	</dl>
-	<!-- IF ! S_EDIT_MATCHES -->
+	<!-- IF ! S_EDIT_MATCHES -->
-	<dl>
+	<dl>
-		<dt><label for="league_bet_in_time">{L_LEAGUE_BET_IN_TIME}:</label><br /><span>{L_LEAGUE_BET_IN_TIME_EXPLAIN}</span></dt>
+		<dt><label for="league_bet_in_time">{L_LEAGUE_BET_IN_TIME}:</label><br /><span>{L_LEAGUE_BET_IN_TIME_EXPLAIN}</span></dt>
-		<dd>
+		<dd>
-			<label><input name="league_bet_in_time" type="radio" class="radio" id="league_bet_in_time" value="1"{BET_IN_TIME_YES} /> {L_YES}</label>
+			<label><input name="league_bet_in_time" type="radio" class="radio" id="league_bet_in_time" value="1"{BET_IN_TIME_YES} /> {L_YES}</label>
-			<label><input name="league_bet_in_time" type="radio" class="radio" id="no_league_bet_in_time" value="0"{BET_IN_TIME_NO} /> {L_NO}</label>
+			<label><input name="league_bet_in_time" type="radio" class="radio" id="no_league_bet_in_time" value="0"{BET_IN_TIME_NO} /> {L_NO}</label>
-
+
-		</dd>
+		</dd>
-	</dl>
+	</dl>
-	<!-- ENDIF -->	
+	<!-- ENDIF -->	
-	</fieldset>
+	</fieldset>
-
+
-	<fieldset>
+	<fieldset>
-		<legend>{L_LEAGUE_POINTS}</legend>
+		<legend>{L_LEAGUE_POINTS}</legend>
-	<dl>
+	<dl>
-		<dt><label for="league_points_mode">{L_LEAGUE_POINTS_MODE}:</label><br /><span>{L_LEAGUE_POINTS_MODE_EXPLAIN}</span></dt>
+		<dt><label for="league_points_mode">{L_LEAGUE_POINTS_MODE}:</label><br /><span>{L_LEAGUE_POINTS_MODE_EXPLAIN}</span></dt>
-		<dd><span><select style="vertical-align:top;" name="league_points_mode" id="league_points_mode">{LEAGUE_POINTS_MODE_OPTIONS}</select></span></dd>
+		<dd><span><select style="vertical-align:top;" name="league_points_mode" id="league_points_mode">{LEAGUE_POINTS_MODE_OPTIONS}</select></span></dd>
-	</dl>
+	</dl>
-	<dl>
+	<dl>
-		<dt><label for="league_points_hit">{L_LEAGUE_POINTS_HIT}:</label><br /><span>{L_LEAGUE_POINTS_HIT_EXPLAIN}</span></dt>
+		<dt><label for="league_points_hit">{L_LEAGUE_POINTS_HIT}:</label><br /><span>{L_LEAGUE_POINTS_HIT_EXPLAIN}</span></dt>
-		<dd><input name="league_points_hit" type="text" id="league_points_hit" size="2" maxlength="2" value="{LEAGUE_POINTS_HIT}" /></dd>
+		<dd><input name="league_points_hit" type="text" id="league_points_hit" size="2" maxlength="2" value="{LEAGUE_POINTS_HIT}" /></dd>
-	</dl>
+	</dl>
-	<dl>
+	<dl>
-		<dt><label for="league_points_tendency">{L_LEAGUE_POINTS_TENDENCY}:</label><br /><span>{L_LEAGUE_POINTS_TENDENCY_EXPLAIN}</span></dt>
+		<dt><label for="league_points_tendency">{L_LEAGUE_POINTS_TENDENCY}:</label><br /><span>{L_LEAGUE_POINTS_TENDENCY_EXPLAIN}</span></dt>
-		<dd><input name="league_points_tendency" type="text" id="league_points_tendency" size="2" maxlength="2" value="{LEAGUE_POINTS_TENDENCY}" /></dd>
+		<dd><input name="league_points_tendency" type="text" id="league_points_tendency" size="2" maxlength="2" value="{LEAGUE_POINTS_TENDENCY}" /></dd>
-	</dl>
+	</dl>
-	<dl>
+	<dl>
-		<dt><label for="league_points_diff">{L_LEAGUE_POINTS_DIFF}:</label><br /><span>{L_LEAGUE_POINTS_DIFF_EXPLAIN}</span></dt>
+		<dt><label for="league_points_diff">{L_LEAGUE_POINTS_DIFF}:</label><br /><span>{L_LEAGUE_POINTS_DIFF_EXPLAIN}</span></dt>
-		<dd><input name="league_points_diff" type="text" id="league_points_diff" size="2" maxlength="2" value="{LEAGUE_POINTS_DIFF}" /></dd>
+		<dd><input name="league_points_diff" type="text" id="league_points_diff" size="2" maxlength="2" value="{LEAGUE_POINTS_DIFF}" /></dd>
-	</dl>
+	</dl>
-	<dl>
+	<dl>
-		<dt><label for="league_points_last">{L_LEAGUE_POINTS_LAST}:</label><br /><span>{L_LEAGUE_POINTS_LAST_EXPLAIN}</span></dt>
+		<dt><label for="league_points_last">{L_LEAGUE_POINTS_LAST}:</label><br /><span>{L_LEAGUE_POINTS_LAST_EXPLAIN}</span></dt>
-		<dd>
+		<dd>
-			<label><input name="league_points_last" type="radio" class="radio" id="league_points_last" value="1"{POINTS_LAST_YES} /> {L_YES}</label>
+			<label><input name="league_points_last" type="radio" class="radio" id="league_points_last" value="1"{POINTS_LAST_YES} /> {L_YES}</label>
-			<label><input name="league_points_last" type="radio" class="radio" value="0"{POINTS_LAST_NO} /> {L_NO}</label>
+			<label><input name="league_points_last" type="radio" class="radio" value="0"{POINTS_LAST_NO} /> {L_NO}</label>
-
+
-		</dd>
+		</dd>
-	</dl>
+	</dl>
-	</fieldset>
+	</fieldset>
-
+
-	<fieldset>
+	<fieldset>
-		<legend>{L_LEAGUE_WINS}</legend>
+		<legend>{L_LEAGUE_WINS}</legend>
-	<dl>
+	<dl>
-		<dt><label for="bet_points">{L_BET_POINTS}:</label><br /><span>{L_BET_POINTS_EXPLAIN}</span></dt>
+		<dt><label for="bet_points">{L_BET_POINTS}:</label><br /><span>{L_BET_POINTS_EXPLAIN}</span></dt>
-		<dd><input name="bet_points" type="text" id="bet_points" size="10" maxlength="10" value="{BET_POINTS}" /></dd>
+		<dd><input name="bet_points" type="text" id="bet_points" size="10" maxlength="10" value="{BET_POINTS}" /></dd>
-	</dl>
+	</dl>
-	<dl>
+	<dl>
-		<dt><label for="league_win_hits">{L_LEAGUE_WIN_HITS}:</label><br /><span>{L_LEAGUE_WIN_HITS_EXPLAIN}</span></dt>
+		<dt><label for="league_win_hits">{L_LEAGUE_WIN_HITS}:</label><br /><span>{L_LEAGUE_WIN_HITS_EXPLAIN}</span></dt>
-		<dd><input name="league_win_hits" type="text" id="league_win_hits" size="10" maxlength="10" value="{LEAGUE_WIN_HITS}" /></dd>
+		<dd><input name="league_win_hits" type="text" id="league_win_hits" size="10" maxlength="10" value="{LEAGUE_WIN_HITS}" /></dd>
-	</dl>
+	</dl>
-	<dl>
+	<dl>
-		<dt><label for="league_win_hits_away">{L_LEAGUE_WIN_HITS_AWAY}:</label><br /><span>{L_LEAGUE_WIN_HITS_AWAY_EXPLAIN}</span></dt>
+		<dt><label for="league_win_hits_away">{L_LEAGUE_WIN_HITS_AWAY}:</label><br /><span>{L_LEAGUE_WIN_HITS_AWAY_EXPLAIN}</span></dt>
-		<dd><input name="league_win_hits_away" type="text" id="league_win_hits_away" size="10" maxlength="10" value="{LEAGUE_WIN_HITS_AWAY}" /></dd>
+		<dd><input name="league_win_hits_away" type="text" id="league_win_hits_away" size="10" maxlength="10" value="{LEAGUE_WIN_HITS_AWAY}" /></dd>
-	</dl>
+	</dl>
-	<dl>
+	<dl>
-		<dt><br /><span>{L_LEAGUE_WIN_EXPLAIN}</span></dt>
+		<dt><br /><span>{L_LEAGUE_WIN_EXPLAIN}</span></dt>
-		<dd></dd>
+		<dd></dd>
-	</dl>
+	</dl>
-	<dl>
+	<dl>
-		<dt><label for="league_win_matchdays">{L_LEAGUE_WIN_MATCHDAYS}:</label><br /><span>{L_LEAGUE_WIN_MATCHDAYS_EXPLAIN}</span></dt>
+		<dt><label for="league_win_matchdays">{L_LEAGUE_WIN_MATCHDAYS}:</label><br /><span>{L_LEAGUE_WIN_MATCHDAYS_EXPLAIN}</span></dt>
-		<dd><input name="league_win_matchdays" type="text" id="league_win_matchdays" value="{LEAGUE_WIN_MATCHDAYS}" /></dd>
+		<dd><input name="league_win_matchdays" type="text" id="league_win_matchdays" value="{LEAGUE_WIN_MATCHDAYS}" /></dd>
-	</dl>
+	</dl>
-	<dl>
+	<dl>
-		<dt><label for="league_win_season">{L_LEAGUE_WIN_SEASON}:</label><br /><span>{L_LEAGUE_WIN_SEASON_EXPLAIN}</span></dt>
+		<dt><label for="league_win_season">{L_LEAGUE_WIN_SEASON}:</label><br /><span>{L_LEAGUE_WIN_SEASON_EXPLAIN}</span></dt>
-		<dd><input name="league_win_season" type="text" id="league_win_season" value="{LEAGUE_WIN_SEASON}" /></dd>
+		<dd><input name="league_win_season" type="text" id="league_win_season" value="{LEAGUE_WIN_SEASON}" /></dd>
-	</dl>
+	</dl>
-	</fieldset>
+	</fieldset>
-
+
-	<fieldset class="submit-buttons">
+	<fieldset class="submit-buttons">
-		<legend>{L_SUBMIT}</legend>
+		<legend>{L_SUBMIT}</legend>
-		<input class="button1" type="submit" id="submit" name="update" value="{L_SUBMIT}" />&nbsp;
+		<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}" />
+		<input class="button2" type="reset" id="reset" name="reset" value="{L_RESET}" />
-	<!-- IF S_ADD_LEAGUE -->
+	<!-- IF S_ADD_LEAGUE -->
-		<input type="hidden" name="add" value="1" />
+		<input type="hidden" name="add" value="1" />
-	<!-- ENDIF -->
+	<!-- ENDIF -->
-		<input type="hidden" name="edit" value="1" />
+		<input type="hidden" name="edit" value="1" />
-		{S_FORM_TOKEN}
+		{S_FORM_TOKEN}
-	</fieldset>
+	</fieldset>
-	</form>
+	</form>
-<!-- ELSEIF S_LIST -->
+<!-- ELSEIF S_LIST -->
-	<a href="{U_BACK}" style="float: {S_CONTENT_FLOW_END};">&laquo; {L_BACK}</a>
+	<a href="{U_BACK}" style="float: {S_CONTENT_FLOW_END};">&laquo; {L_BACK}</a>
-	<h1>{L_LEAGUE_MEMBERS} :: {LEAGUE_NAME}</h1>
+	<h1>{L_LEAGUE_MEMBERS} :: {LEAGUE_NAME}</h1>
-	<p>{L_MEMBER_EXPLAIN}</p>
+	<p>{L_MEMBER_EXPLAIN}</p>
-
+
-	<form id="list" method="post" action="{U_ACTION}">
+	<form id="list" method="post" action="{U_ACTION}">
-
+
-	<fieldset class="quick">
+	<fieldset class="quick">
-		<a href="{U_DEFAULT_ALL}">&raquo; {L_MEMBER_ALL}</a>
+		<a href="{U_DEFAULT_ALL}">&raquo; {L_MEMBER_ALL}</a>
-	</fieldset>
+	</fieldset>
-
+
-	<!-- IF .pagination -->
+	<!-- IF .pagination -->
-	<div class="pagination top-pagination">
+	<div class="pagination top-pagination">
-		<!-- INCLUDE pagination.html -->
+		<!-- INCLUDE pagination.html -->
-	</div>
+	</div>
-	<!-- ENDIF -->	
+	<!-- ENDIF -->	
-	<table class="type_f">
+	<table class="type_f">
-	<thead>
+	<thead>
-	<tr>
+	<tr>
-		<th>{L_USERNAME}</th>
+		<th>{L_USERNAME}</th>
-		<th>{L_JOINED}</th>
+		<th>{L_JOINED}</th>
-		<th>{L_MARK}</th>
+		<th>{L_MARK}</th>
-	</tr>
+	</tr>
-	</thead>
+	</thead>
-	<tbody>
+	<tbody>
-	<!-- BEGIN member -->
+	<!-- BEGIN member -->
-			<!-- IF member.S_ROW_COUNT is even --><tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF -->
+			<!-- IF member.S_ROW_COUNT is even --><tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF -->
-			<td><a href="{member.U_USER_EDIT}">{member.USERNAME}</a></td>
+			<td><a href="{member.U_USER_EDIT}">{member.USERNAME}</a></td>
-			<td style="text-align: center;">{member.JOINED}</td>
+			<td style="text-align: center;">{member.JOINED}</td>
-			<td style="text-align: center;"><input type="checkbox" class="radio" name="mark[]" value="{member.USER_ID}" /></td>
+			<td style="text-align: center;"><input type="checkbox" class="radio" name="mark[]" value="{member.USER_ID}" /></td>
-		</tr>
+		</tr>
-	<!-- BEGINELSE -->
+	<!-- BEGINELSE -->
-		<tr>
+		<tr>
-			<td class="row1" colspan="3" style="text-align: center;">{L_LEAGUE_NO_MEMBER}</td>
+			<td class="row1" colspan="3" style="text-align: center;">{L_LEAGUE_NO_MEMBER}</td>
-		</tr>
+		</tr>
-	<!-- END member -->
+	<!-- END member -->
-	</tbody>
+	</tbody>
-	</table>
+	</table>
-	<!-- IF .pagination or TOTAL_MEMBERS -->
+	<!-- IF .pagination or TOTAL_MEMBERS -->
-	<div class="pagination">
+	<div class="pagination">
-		{TOTAL_MEMBERS}
+		{TOTAL_MEMBERS}
-		<!-- IF .pagination -->
+		<!-- IF .pagination -->
-			<!-- INCLUDE pagination.html -->
+			<!-- INCLUDE pagination.html -->
-		<!-- ELSE -->
+		<!-- ELSE -->
-			&bull; {PAGE_NUMBER}
+			&bull; {PAGE_NUMBER}
-		<!-- ENDIF -->
+		<!-- ENDIF -->
-	</div>
+	</div>
-	<!-- ENDIF -->	
+	<!-- ENDIF -->	
-
+
-	<fieldset class="quick">
+	<fieldset class="quick">
-		<select name="action"><option class="sep" value="">{L_SELECT_OPTION}</option>{S_ACTION_OPTIONS}</select>
+		<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}" />
+		<input class="button2" type="submit" name="update" value="{L_SUBMIT}" />
-		<p class="small"><a href="#" onclick="marklist('list', 'mark', true); return false;">{L_MARK_ALL}</a> &bull; 
+		<p class="small"><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>		
+						<a href="#" onclick="marklist('list', 'mark', false); return false;">{L_UNMARK_ALL}</a></p>		
-	</fieldset>
+	</fieldset>
-
+
-	<h1>{L_ADD_USERS}</h1>
+	<h1>{L_ADD_USERS}</h1>
-
+
-	<p>{L_ADD_USERS_EXPLAIN}</p>
+	<p>{L_ADD_USERS_EXPLAIN}</p>
-
+
-	<fieldset>
+	<fieldset>
-		<legend>{L_ADD_USERS}</legend>
+		<legend>{L_ADD_USERS}</legend>
-	<dl>
+	<dl>
-		<dt><label for="group">{L_ADD_GROUP}:</label></dt>
+		<dt><label for="group">{L_ADD_GROUP}:</label></dt>
-		<dd><select id="group" name="g">{S_GROUP_OPTIONS}</select></dd>
+		<dd><select id="group" name="g">{S_GROUP_OPTIONS}</select></dd>
-	</dl>
+	</dl>
-	<dl>
+	<dl>
-		<dt><label for="usernames">{L_USERNAME}:</label><br /><span>{L_USERNAMES_EXPLAIN}</span></dt>
+		<dt><label for="usernames">{L_USERNAME}:</label><br /><span>{L_USERNAMES_EXPLAIN}</span></dt>
-		<dd><textarea id="usernames" name="usernames" cols="40" rows="5"></textarea></dd>
+		<dd><textarea id="usernames" name="usernames" cols="40" rows="5"></textarea></dd>
-		<dd>[ <a href="{U_FIND_USERNAME}" onclick="find_username(this.href); return false;">{L_FIND_USERNAME}</a> ]</dd>
+		<dd>[ <a href="{U_FIND_USERNAME}" onclick="find_username(this.href); return false;">{L_FIND_USERNAME}</a> ]</dd>
-	</dl>
+	</dl>
-
+
-	<p class="quick">
+	<p class="quick">
-		<input class="button2" type="submit" name="addmembers" value="{L_SUBMIT}" />
+		<input class="button2" type="submit" name="addmembers" value="{L_SUBMIT}" />
-	</p>
+	</p>
-	{S_FORM_TOKEN}
+	{S_FORM_TOKEN}
-	</fieldset>
+	</fieldset>
-	</form>
+	</form>
-
+
-<!-- ELSE -->
+<!-- ELSE -->
-	<!-- IF U_FOOTBALL --><a href="{U_FOOTBALL}" style="float: {S_CONTENT_FLOW_END};">&laquo; {L_PREDICTION_LEAGUE}</a><!-- ENDIF -->
+	<!-- IF U_FOOTBALL --><a href="{U_FOOTBALL}" style="float: {S_CONTENT_FLOW_END};">&laquo; {L_PREDICTION_LEAGUE}</a><!-- ENDIF -->
-	<h1>{L_ACP_FOOTBALL_LEAGUES_MANAGE}</h1>
+	<h1>{L_ACP_FOOTBALL_LEAGUES_MANAGE}</h1>
-	<p>{L_ACP_FOOTBALL_LEAGUES_MANAGE_EXPLAIN}</p>
+	<p>{L_ACP_FOOTBALL_LEAGUES_MANAGE_EXPLAIN}</p>
-
+
-	<!-- IF S_ERROR -->
+	<!-- IF S_ERROR -->
-		<div class="errorbox">
+		<div class="errorbox">
-			<h3>{L_WARNING}</h3>
+			<h3>{L_WARNING}</h3>
-			<p>{ERROR_MSG}</p>
+			<p>{ERROR_MSG}</p>
-		</div>
+		</div>
-	<!-- ENDIF -->
+	<!-- ENDIF -->
-
+
-	<form style="display:inline;" method="post" action="{U_ACTION}">
+	<form style="display:inline;" method="post" action="{U_ACTION}">
-	<div style="display:inline; margin:0; padding:0;">
+	<div style="display:inline; margin:0; padding:0;">
-		<h1 style="display:inline;">{L_SELECT_SEASON}:</h1>
+		<h1 style="display:inline;">{L_SELECT_SEASON}:</h1>
-		<select name="s" id="league_season" onchange="this.form.submit();">{S_SEASON_OPTIONS}</select>
+		<select name="s" id="league_season" onchange="this.form.submit();">{S_SEASON_OPTIONS}</select>
-		{S_FORM_TOKEN}
+		{S_FORM_TOKEN}
-	</div>
+	</div>
-	</form>
+	</form>
-
+
-	<form id="acp_leagues" method="post" action="{U_ACTION}">
+	<form id="acp_leagues" method="post" action="{U_ACTION}">
-	
+	
-	<fieldset class="quick">
+	<fieldset class="quick">
-			<input type="hidden" name="s" value="{S_SEASON}" />
+			<input type="hidden" name="s" value="{S_SEASON}" />
-		<!-- IF S_LEAGUE_ADD -->
+		<!-- IF S_LEAGUE_ADD -->
-			{L_CREATE_LEAGUE}: <input type="text" name="l" value="" /> <input class="button2" type="submit" name="submit" value="{L_SUBMIT}" />
+			{L_CREATE_LEAGUE}: <input type="text" name="l" value="" /> <input class="button2" type="submit" name="submit" value="{L_SUBMIT}" />
-			<input type="hidden" name="add" value="1" />
+			<input type="hidden" name="add" value="1" />
-		<!-- ENDIF -->
+		<!-- ENDIF -->
-		{S_FORM_TOKEN}
+		{S_FORM_TOKEN}
-	</fieldset>
+	</fieldset>
-	</form>
+	</form>
-	<h1>{L_LEAGUE_DEF}</h1>
+	<h1>{L_LEAGUE_DEF}</h1>
-
+
-	<p>{L_LEAGUE_DEF_EXPLAIN}</p>
+	<p>{L_LEAGUE_DEF_EXPLAIN}</p>
-	<table class="type_f">
+	<table class="type_f">
-	<thead>
+	<thead>
-	<tr>
+	<tr>
-		<th>{L_SEASON}</th>
+		<th>{L_SEASON}</th>
-		<th>{L_LEAGUE}</th>
+		<th>{L_LEAGUE}</th>
-		<th style="width: 25%">{L_LEAGUE_NAME}</th>
+		<th style="width: 25%">{L_LEAGUE_NAME}</th>
-		<th></th>
+		<th></th>
-		<th>{L_MEMBER}</th>
+		<th>{L_MEMBER}</th>
-		<th colspan="2">{L_OPTIONS}</th>
+		<th colspan="2">{L_OPTIONS}</th>
-		<th>{L_ACTION}</th>
+		<th>{L_ACTION}</th>
-	</tr>
+	</tr>
-	</thead>
+	</thead>
-	<tbody>
+	<tbody>
-	<!-- IF .leagues -->
+	<!-- IF .leagues -->
-		<!-- BEGIN leagues -->
+		<!-- BEGIN leagues -->
-			<tr class="{leagues.ROW_CLASS}">
+			<tr class="{leagues.ROW_CLASS}">
-				<td style="text-align: center;"><strong>{leagues.SEASON}</strong></td>
+				<td style="text-align: center;"><strong>{leagues.SEASON}</strong></td>
-				<td style="text-align: center;"><strong>{leagues.LEAGUE}</strong></td>
+				<td style="text-align: center;"><strong>{leagues.LEAGUE}</strong></td>
-				<td>{leagues.LEAGUE_NAME}</td>
+				<td>{leagues.LEAGUE_NAME}</td>
-				<td>{leagues.LEAGUE_SHORT}</td>
+				<td>{leagues.LEAGUE_SHORT}</td>
-				<td style="text-align: center;">{leagues.MEMBERS}</td>
+				<td style="text-align: center;">{leagues.MEMBERS}</td>
-				<td style="text-align: center;"><a href="{leagues.U_EDIT}">{L_SETTINGS}</a></td>
+				<td style="text-align: center;"><a href="{leagues.U_EDIT}">{L_SETTINGS}</a></td>
-				<td style="text-align: center;"><!-- IF leagues.S_MEMBER --><a href="{leagues.U_LIST}">{L_MEMBER}</a><!-- ELSE -->{L_MEMBER}<!-- ENDIF --></td>
+				<td style="text-align: center;"><!-- IF leagues.S_MEMBER --><a href="{leagues.U_LIST}">{L_MEMBER}</a><!-- ELSE -->{L_MEMBER}<!-- ENDIF --></td>
-				<td style="text-align: center;"><!-- IF leagues.U_DELETE --><a href="{leagues.U_DELETE}">{L_DELETE}</a><!-- ELSE -->{L_DELETE}<!-- ENDIF --></td>
+				<td style="text-align: center;"><!-- IF leagues.U_DELETE --><a href="{leagues.U_DELETE}">{L_DELETE}</a><!-- ELSE -->{L_DELETE}<!-- ENDIF --></td>
-			</tr>
+			</tr>
-		<!-- END leagues -->
+		<!-- END leagues -->
-	<!-- ELSE -->
+	<!-- ELSE -->
-			<tr>
+			<tr>
-				<td colspan="3" class="row3">{L_NO_LEAGUES_CREATED}</td>
+				<td colspan="3" class="row3">{L_NO_LEAGUES_CREATED}</td>
-			</tr>
+			</tr>
-	<!-- ENDIF -->
+	<!-- ENDIF -->
-	</tbody>
+	</tbody>
-	</table>
+	</table>
-<!-- ENDIF -->
+<!-- ENDIF -->
-<br />
+<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>
+<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_matchdays.html

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

@@ -1,205 +1,205 @@
-<!-- INCLUDECSS css/football_acp.css -->
+<!-- INCLUDECSS css/football_acp.css -->
-<!-- INCLUDE overall_header.html -->
+<!-- INCLUDE overall_header.html -->
-
+
-<a id="maincontent"></a>
+<a id="maincontent"></a>
-<!-- IF S_EDIT -->
+<!-- IF S_EDIT -->
-	<a href="{U_BACK}" style="float: {S_CONTENT_FLOW_END};">&laquo; {L_BACK}</a>
+	<a href="{U_BACK}" style="float: {S_CONTENT_FLOW_END};">&laquo; {L_BACK}</a>
-	<h1>{L_ACP_FOOTBALL_MATCHES_MANAGE}</h1>
+	<h1>{L_ACP_FOOTBALL_MATCHES_MANAGE}</h1>
-	<p>{L_MATCH_EDIT_EXPLAIN}</p>
+	<p>{L_MATCH_EDIT_EXPLAIN}</p>
-
+
-	<!-- IF S_ERROR -->
+	<!-- IF S_ERROR -->
-		<div class="errorbox">
+		<div class="errorbox">
-			<h3>{L_WARNING}</h3>
+			<h3>{L_WARNING}</h3>
-			<p>{ERROR_MSG}</p>
+			<p>{ERROR_MSG}</p>
-		</div>
+		</div>
-	<!-- ENDIF -->
+	<!-- ENDIF -->
-
+
-	<form id="settings" method="post" action="{U_ACTION}">
+	<form id="settings" method="post" action="{U_ACTION}">
-
+
-	<fieldset>
+	<fieldset>
-		<legend>{L_MATCH_DETAILS}</legend>
+		<legend>{L_MATCH_DETAILS}</legend>
-	<dl>
+	<dl>
-		<dt><label for="season">{L_SEASON}:</label></dt>
+		<dt><label for="season">{L_SEASON}:</label></dt>
-		<dd><strong>{SEASON_NAME}</strong><input name="s" type="hidden" id="season" value="{SEASON}" /></dd>
+		<dd><strong>{SEASON_NAME}</strong><input name="s" type="hidden" id="season" value="{SEASON}" /></dd>
-	</dl>
+	</dl>
-	<dl>
+	<dl>
-		<dt><label for="league">{L_LEAGUE}:</label></dt>
+		<dt><label for="league">{L_LEAGUE}:</label></dt>
-		<dd><strong>{LEAGUE_NAME}</strong><input name="l" type="hidden" id="league" value="{LEAGUE}" /></dd>
+		<dd><strong>{LEAGUE_NAME}</strong><input name="l" type="hidden" id="league" value="{LEAGUE}" /></dd>
-	</dl>
+	</dl>
-	<dl>
+	<dl>
-		<dt><label for="matchday">{L_MATCHDAY}:</label></dt>
+		<dt><label for="matchday">{L_MATCHDAY}:</label></dt>
-		<dd><strong>{MATCHDAY_NAME}</strong><input name="m" type="hidden" id="matchday" value="{MATCHDAY}" /></dd>
+		<dd><strong>{MATCHDAY_NAME}</strong><input name="m" type="hidden" id="matchday" value="{MATCHDAY}" /></dd>
-	</dl>
+	</dl>
-	<dl>
+	<dl>
-		<dt><label for="match_number">{L_MATCH_NUMBER}:</label></dt>
+		<dt><label for="match_number">{L_MATCH_NUMBER}:</label></dt>
-		<dd><strong>{MATCH_NUMBER}</strong><input name="g" type="hidden" id="match_number" value="{MATCH_NUMBER}" /></dd>
+		<dd><strong>{MATCH_NUMBER}</strong><input name="g" type="hidden" id="match_number" value="{MATCH_NUMBER}" /></dd>
-	</dl>
+	</dl>
-	<dl> 
+	<dl> 
-		<dt><label for="match_begin">{L_MATCH_BEGIN}:</label></dt>
+		<dt><label for="match_begin">{L_MATCH_BEGIN}:</label></dt>
-		<dd>{L_DAY}: <select id="match_begin" name="mday_day">{S_MATCHDAY_DAY_OPTIONS}</select> 
+		<dd>{L_DAY}: <select id="match_begin" name="mday_day">{S_MATCHDAY_DAY_OPTIONS}</select> 
-			{L_MONTH}: <select name="mday_month">{S_MATCHDAY_MONTH_OPTIONS}</select> 
+			{L_MONTH}: <select name="mday_month">{S_MATCHDAY_MONTH_OPTIONS}</select> 
-			{L_YEAR}: <select name="mday_year">{S_MATCHDAY_YEAR_OPTIONS}</select>&nbsp;&nbsp;&nbsp;
+			{L_YEAR}: <select name="mday_year">{S_MATCHDAY_YEAR_OPTIONS}</select>&nbsp;&nbsp;&nbsp;
-			{L_TIME}: <select name="mday_hour">{S_MATCHDAY_HOUR_OPTIONS}</select>:
+			{L_TIME}: <select name="mday_hour">{S_MATCHDAY_HOUR_OPTIONS}</select>:
-			<select name="mday_min">{S_MATCHDAY_MIN_OPTIONS}</select>
+			<select name="mday_min">{S_MATCHDAY_MIN_OPTIONS}</select>
-		</dd>
+		</dd>
-	</dl>
+	</dl>
-	<dl>
+	<dl>
-		<dt><label for="match_status">{L_MATCH_STATUS}:</label><br /><span>{L_MATCH_STATUS_EXPLAIN}</span></dt>
+		<dt><label for="match_status">{L_MATCH_STATUS}:</label><br /><span>{L_MATCH_STATUS_EXPLAIN}</span></dt>
-		<dd><!-- IF S_EDIT_STATUS -->
+		<dd><!-- IF S_EDIT_STATUS -->
-			<select name="match_status" id="match_status">{STATUS_OPTIONS}</select>
+			<select name="match_status" id="match_status">{STATUS_OPTIONS}</select>
-			<!-- ELSE -->
+			<!-- ELSE -->
-			<strong>{MATCH_STATUS}</strong><input name="match_status" type="hidden" id="match_status" value="{MATCH_STATUS}" />
+			<strong>{MATCH_STATUS}</strong><input name="match_status" type="hidden" id="match_status" value="{MATCH_STATUS}" />
-			<!-- ENDIF -->
+			<!-- ENDIF -->
-		</dd>
+		</dd>
-	</dl>
+	</dl>
-	<dl> 
+	<dl> 
-		<dt><label for="match_odds">{L_MATCH_ODDS}:</label></dt>
+		<dt><label for="match_odds">{L_MATCH_ODDS}:</label></dt>
-		<dd>{L_ODD_1}: <input name="odd_1" type="text" id="odd_1" size="10" maxlength="6" value="{ODD_1}" />&nbsp;&nbsp;
+		<dd>{L_ODD_1}: <input name="odd_1" type="text" id="odd_1" size="10" maxlength="6" value="{ODD_1}" />&nbsp;&nbsp;
-			{L_ODD_x}:  <input name="odd_x" type="text" id="odd_x" size="10" maxlength="6" value="{ODD_x}" />&nbsp;&nbsp;
+			{L_ODD_x}:  <input name="odd_x" type="text" id="odd_x" size="10" maxlength="6" value="{ODD_x}" />&nbsp;&nbsp;
-			{L_ODD_2}:  <input name="odd_2" type="text" id="odd_2" size="10" maxlength="6" value="{ODD_2}" />
+			{L_ODD_2}:  <input name="odd_2" type="text" id="odd_2" size="10" maxlength="6" value="{ODD_2}" />
-		</dd>
+		</dd>
-	</dl>
+	</dl>
-	<dl> 
+	<dl> 
-		<dt><label for="rating">{L_MATCH_RATING}:</label></dt>
+		<dt><label for="rating">{L_MATCH_RATING}:</label></dt>
-		<dd><input name="rating" type="text" id="rating" size="10" maxlength="6" value="{RATING}" /></dd>
+		<dd><input name="rating" type="text" id="rating" size="10" maxlength="6" value="{RATING}" /></dd>
-	</dl>
+	</dl>
-	<!-- IF S_KO_LEAGUE -->
+	<!-- IF S_KO_LEAGUE -->
-	<dl>
+	<dl>
-		<dt><label for="match_group">{L_MATCH_GROUP}:</label></dt>
+		<dt><label for="match_group">{L_MATCH_GROUP}:</label></dt>
-		<dd><input name="group_match" id="group_match" type="checkbox" class="radio" 
+		<dd><input name="group_match" id="group_match" type="checkbox" class="radio" 
-				onchange="if(this.checked){document.getElementById('match_ko').checked=false;}" <!-- IF S_GROUP_CHECKED --> checked="checked"<!-- ENDIF --> />
+				onchange="if(this.checked){document.getElementById('match_ko').checked=false;}" <!-- IF S_GROUP_CHECKED --> checked="checked"<!-- ENDIF --> />
-			&nbsp;<input name="match_group" type="text" id="match_group" value="{MATCH_GROUP}" size="1" maxlength="1" readonly/></dd>
+			&nbsp;<input name="match_group" type="text" id="match_group" value="{MATCH_GROUP}" size="1" maxlength="1" readonly/></dd>
-	</dl>
+	</dl>
-	<dl>
+	<dl>
-		<dt><label for="match_ko">{L_MATCH_KO}:</label><br /><span>{L_MATCH_KO_EXPLAIN}</span></dt>
+		<dt><label for="match_ko">{L_MATCH_KO}:</label><br /><span>{L_MATCH_KO_EXPLAIN}</span></dt>
-		<dd><input name="match_ko" id="match_ko" type="checkbox" class="radio" 
+		<dd><input name="match_ko" id="match_ko" type="checkbox" class="radio" 
-				onchange="if(this.checked){document.getElementById('group_match').checked=false;}" <!-- IF S_KO_CHECKED --> checked="checked"<!-- ENDIF --> /></dd>
+				onchange="if(this.checked){document.getElementById('group_match').checked=false;}" <!-- IF S_KO_CHECKED --> checked="checked"<!-- ENDIF --> /></dd>
-	</dl>
+	</dl>
-	<!-- ENDIF -->
+	<!-- ENDIF -->
-	<dl>
+	<dl>
-		<dt><label for="team_home">{L_MATCH_HOME}:</label></dt>
+		<dt><label for="team_home">{L_MATCH_HOME}:</label></dt>
-		<dd><select name="team_home" id="team_home" onchange="document.getElementById('match_group').value = this.value.substring(0, 1);">{TEAM_HOME_OPTIONS}</select></dd>
+		<dd><select name="team_home" id="team_home" onchange="document.getElementById('match_group').value = this.value.substring(0, 1);">{TEAM_HOME_OPTIONS}</select></dd>
-	</dl>
+	</dl>
-	<!-- IF S_KO_LEAGUE -->
+	<!-- IF S_KO_LEAGUE -->
-	<dl>
+	<dl>
-		<dt><label for="formula_home">{L_FORMULA_HOME}:</label><br /><span>{L_FORMULA_HOME_EXPLAIN}</span></dt>
+		<dt><label for="formula_home">{L_FORMULA_HOME}:</label><br /><span>{L_FORMULA_HOME_EXPLAIN}</span></dt>
-		<dd><input name="formula_home" type="text" id="formula_home" size="9" maxlength="9" value="{FORMULA_HOME}" /></dd>
+		<dd><input name="formula_home" type="text" id="formula_home" size="9" maxlength="9" value="{FORMULA_HOME}" /></dd>
-	</dl>
+	</dl>
-	<!-- ENDIF -->
+	<!-- ENDIF -->
-	<dl>
+	<dl>
-		<dt><label for="team_guest">{L_MATCH_GUEST}:</label></dt>
+		<dt><label for="team_guest">{L_MATCH_GUEST}:</label></dt>
-		<dd><select name="team_guest" id="team_guest" onchange="document.getElementById('match_group').value = this.value.substring(0, 1);">{TEAM_GUEST_OPTIONS}</select></dd>
+		<dd><select name="team_guest" id="team_guest" onchange="document.getElementById('match_group').value = this.value.substring(0, 1);">{TEAM_GUEST_OPTIONS}</select></dd>
-	</dl>
+	</dl>
-	<!-- IF S_KO_LEAGUE -->
+	<!-- IF S_KO_LEAGUE -->
-	<dl>
+	<dl>
-		<dt><label for="formula_guest">{L_FORMULA_GUEST}:</label><br /><span>{L_FORMULA_GUEST_EXPLAIN}</span></dt>
+		<dt><label for="formula_guest">{L_FORMULA_GUEST}:</label><br /><span>{L_FORMULA_GUEST_EXPLAIN}</span></dt>
-		<dd><input name="formula_guest" type="text" id="formula_guest" size="9" maxlength="9" value="{FORMULA_GUEST}" /></dd>
+		<dd><input name="formula_guest" type="text" id="formula_guest" size="9" maxlength="9" value="{FORMULA_GUEST}" /></dd>
-	</dl>
+	</dl>
-	<!-- ENDIF -->
+	<!-- ENDIF -->
-	<input type="hidden" name="ko_league" value="1" />
+	<input type="hidden" name="ko_league" value="1" />
-	</fieldset>
+	</fieldset>
-
+
-	<fieldset class="submit-buttons">
+	<fieldset class="submit-buttons">
-		<legend>{L_SUBMIT}</legend>
+		<legend>{L_SUBMIT}</legend>
-		<input class="button1" type="submit" id="submit" name="update" value="{L_SUBMIT}" />&nbsp;
+		<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}" />
+		<input class="button2" type="reset" id="reset" name="reset" value="{L_RESET}" />
-		{S_FORM_TOKEN}
+		{S_FORM_TOKEN}
-	</fieldset>
+	</fieldset>
-	</form>
+	</form>
-
+
-<!-- ELSE -->
+<!-- ELSE -->
-	<!-- IF U_FOOTBALL --><a href="{U_FOOTBALL}" style="float: {S_CONTENT_FLOW_END};">&laquo; {L_PREDICTION_LEAGUE}</a><!-- ENDIF -->
+	<!-- IF U_FOOTBALL --><a href="{U_FOOTBALL}" style="float: {S_CONTENT_FLOW_END};">&laquo; {L_PREDICTION_LEAGUE}</a><!-- ENDIF -->
-	<h1>{L_ACP_FOOTBALL_MATCHES_MANAGE}</h1>
+	<h1>{L_ACP_FOOTBALL_MATCHES_MANAGE}</h1>
-	<p>{L_ACP_FOOTBALL_MATCHES_MANAGE_EXPLAIN}</p>
+	<p>{L_ACP_FOOTBALL_MATCHES_MANAGE_EXPLAIN}</p>
-
+
-	<!-- IF S_ERROR -->
+	<!-- IF S_ERROR -->
-		<div class="errorbox">
+		<div class="errorbox">
-			<h3>{L_WARNING}</h3>
+			<h3>{L_WARNING}</h3>
-			<p>{ERROR_MSG}</p>
+			<p>{ERROR_MSG}</p>
-		</div>
+		</div>
-	<!-- ENDIF -->
+	<!-- ENDIF -->
-
+
-	<h1 style="display:inline;">{L_SELECT_MATCHDAY}:</h1>
+	<h1 style="display:inline;">{L_SELECT_MATCHDAY}:</h1>
-	<form style="display:inline;" method="post" action="{U_ACTION}">
+	<form style="display:inline;" method="post" action="{U_ACTION}">
-	<div style="display:inline; margin:0; padding:0;">
+	<div style="display:inline; margin:0; padding:0;">
-		<select name="s" id="match_season" onchange="this.form.submit();">{S_SEASON_OPTIONS}</select>
+		<select name="s" id="match_season" onchange="this.form.submit();">{S_SEASON_OPTIONS}</select>
-		{S_FORM_TOKEN}
+		{S_FORM_TOKEN}
-	</div>
+	</div>
-	</form>
+	</form>
-	<form style="display:inline;" method="post" action="{U_ACTION}">
+	<form style="display:inline;" method="post" action="{U_ACTION}">
-	<div style="display:inline; margin:0; padding:0;">
+	<div style="display:inline; margin:0; padding:0;">
-		<input type="hidden" name="s" value="{S_SEASON}" />
+		<input type="hidden" name="s" value="{S_SEASON}" />
-		<select name="l" id="match_league" onchange="this.form.submit();">{S_LEAGUE_OPTIONS}</select>
+		<select name="l" id="match_league" onchange="this.form.submit();">{S_LEAGUE_OPTIONS}</select>
-		{S_FORM_TOKEN}
+		{S_FORM_TOKEN}
-	</div>
+	</div>
-	</form>
+	</form>
-	<form style="display:inline;" method="post" action="{U_ACTION}">
+	<form style="display:inline;" method="post" action="{U_ACTION}">
-	<div style="display:inline; margin:0; padding:0;">
+	<div style="display:inline; margin:0; padding:0;">
-		<input type="hidden" name="s" value="{S_SEASON}" />
+		<input type="hidden" name="s" value="{S_SEASON}" />
-		<input type="hidden" name="l" value="{S_LEAGUE}" />
+		<input type="hidden" name="l" value="{S_LEAGUE}" />
-		<select name="m" id="match_matchday" onchange="this.form.submit();">{S_MATCHDAY_OPTIONS}</select>
+		<select name="m" id="match_matchday" onchange="this.form.submit();">{S_MATCHDAY_OPTIONS}</select>
-		{S_FORM_TOKEN}
+		{S_FORM_TOKEN}
-	</div>
+	</div>
-	</form>
+	</form>
-
+
-	<form id="add_match" method="post" action="{U_ACTION}">
+	<form id="add_match" method="post" action="{U_ACTION}">
-	<fieldset class="quick">
+	<fieldset class="quick">
-			<input type="hidden" name="s" value="{S_SEASON}" />
+			<input type="hidden" name="s" value="{S_SEASON}" />
-			<input type="hidden" name="l" value="{S_LEAGUE}" />
+			<input type="hidden" name="l" value="{S_LEAGUE}" />
-			<input type="hidden" name="m" value="{S_MATCHDAY}" />
+			<input type="hidden" name="m" value="{S_MATCHDAY}" />
-			<input type="hidden" name="ko_league" value="{KO_LEAGUE}" />
+			<input type="hidden" name="ko_league" value="{KO_LEAGUE}" />
-		<!-- IF S_MATCH_ADD -->
+		<!-- IF S_MATCH_ADD -->
-			<input class="button2" type="submit" name="submit" value="{L_GENERATE_MATCHES}" />
+			<input class="button2" type="submit" name="submit" value="{L_GENERATE_MATCHES}" />
-			<input type="hidden" name="add" value="1" />
+			<input type="hidden" name="add" value="1" />
-		<!-- ENDIF -->
+		<!-- ENDIF -->
-		{S_FORM_TOKEN}
+		{S_FORM_TOKEN}
-	</fieldset>
+	</fieldset>
-	</form>
+	</form>
-	<h1>{L_MATCHES_DEF}</h1>
+	<h1>{L_MATCHES_DEF}</h1>
-
+
-	<p>{L_MATCHES_DEF_EXPLAIN}</p>
+	<p>{L_MATCHES_DEF_EXPLAIN}</p>
-	<table class="type_f">
+	<table class="type_f">
-	<thead>
+	<thead>
-	<tr>
+	<tr>
-		<th>{L_MATCH_NUMBER}</th>
+		<th>{L_MATCH_NUMBER}</th>
-		<th>{L_MATCH_BEGIN}</th>
+		<th>{L_MATCH_BEGIN}</th>
-		<th>{L_MATCH_STATUS}</th>
+		<th>{L_MATCH_STATUS}</th>
-		<!-- IF S_KO_LEAGUE -->
+		<!-- IF S_KO_LEAGUE -->
-		<th>{L_GROUP}</th>
+		<th>{L_GROUP}</th>
-		<th>{L_KO}</th>
+		<th>{L_KO}</th>
-		<!-- ENDIF -->
+		<!-- ENDIF -->
-		<th style="width: 20%">{L_MATCH_HOME}</th>
+		<th style="width: 20%">{L_MATCH_HOME}</th>
-		<th style="width: 20%">{L_MATCH_GUEST}</th>
+		<th style="width: 20%">{L_MATCH_GUEST}</th>
-		<th>{L_OPTIONS}</th>
+		<th>{L_OPTIONS}</th>
-		<th>{L_ACTION}</th>
+		<th>{L_ACTION}</th>
-	</tr>
+	</tr>
-	</thead>
+	</thead>
-	<tbody>
+	<tbody>
-	<!-- IF .match -->
+	<!-- IF .match -->
-		<!-- BEGIN match -->
+		<!-- BEGIN match -->
-			<tr class="{match.ROW_CLASS}">
+			<tr class="{match.ROW_CLASS}">
-				<td style="text-align:center;"><strong>{match.MATCH_NUMBER}</strong></td>
+				<td style="text-align:center;"><strong>{match.MATCH_NUMBER}</strong></td>
-				<td>{match.MATCH_BEGIN}</td>
+				<td>{match.MATCH_BEGIN}</td>
-				<td style="text-align:center;">{match.MATCH_STATUS}</td>
+				<td style="text-align:center;">{match.MATCH_STATUS}</td>
-				<!-- IF S_KO_LEAGUE -->
+				<!-- IF S_KO_LEAGUE -->
-				<td style="text-align:center;">{match.MATCH_GROUP}</td>
+				<td style="text-align:center;">{match.MATCH_GROUP}</td>
-				<td style="text-align:center;">{match.MATCH_KO}</td>
+				<td style="text-align:center;">{match.MATCH_KO}</td>
-				<!-- ENDIF -->
+				<!-- ENDIF -->
-				<td>{match.MATCH_HOME}</td>
+				<td>{match.MATCH_HOME}</td>
-				<td>{match.MATCH_GUEST}</td>
+				<td>{match.MATCH_GUEST}</td>
-				<td style="text-align:center;"><a href="{match.U_EDIT}">{L_SETTINGS}</a></td>
+				<td style="text-align:center;"><a href="{match.U_EDIT}">{L_SETTINGS}</a></td>
-				<td style="text-align:center;"><!-- IF match.U_DELETE --><a href="{match.U_DELETE}">{L_DELETE}</a><!-- ELSE -->{L_DELETE}<!-- ENDIF --></td>
+				<td style="text-align:center;"><!-- IF match.U_DELETE --><a href="{match.U_DELETE}">{L_DELETE}</a><!-- ELSE -->{L_DELETE}<!-- ENDIF --></td>
-			</tr>
+			</tr>
-		<!-- END match -->
+		<!-- END match -->
-	<!-- ELSE -->
+	<!-- ELSE -->
-			<tr>
+			<tr>
-				<td colspan="4" class="row3">{L_NO_MATCHES_CREATED}</td>
+				<td colspan="4" class="row3">{L_NO_MATCHES_CREATED}</td>
-			</tr>
+			</tr>
-	<!-- ENDIF -->
+	<!-- ENDIF -->
-	</tbody>
+	</tbody>
-	</table>
+	</table>
-
+
-<!-- ENDIF -->
+<!-- ENDIF -->
-<br />
+<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>
+<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_results.html

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

adm/style/acp_football_seasons.html

@@ -1,105 +1,105 @@
-<!-- INCLUDECSS css/football_acp.css -->
+<!-- INCLUDECSS css/football_acp.css -->
-<!-- INCLUDE overall_header.html -->
+<!-- INCLUDE overall_header.html -->
-
+
-<a id="maincontent"></a>
+<a id="maincontent"></a>
-<!-- IF S_EDIT -->
+<!-- IF S_EDIT -->
-	<a href="{U_BACK}" style="float: {S_CONTENT_FLOW_END};">&laquo; {L_BACK}</a>
+	<a href="{U_BACK}" style="float: {S_CONTENT_FLOW_END};">&laquo; {L_BACK}</a>
-	<h1>{L_ACP_FOOTBALL_SEASONS_MANAGE}</h1>
+	<h1>{L_ACP_FOOTBALL_SEASONS_MANAGE}</h1>
-	<p>{L_SEASON_EDIT_EXPLAIN}</p>
+	<p>{L_SEASON_EDIT_EXPLAIN}</p>
-
+
-	<!-- IF S_ERROR -->
+	<!-- IF S_ERROR -->
-		<div class="errorbox">
+		<div class="errorbox">
-			<h3>{L_WARNING}</h3>
+			<h3>{L_WARNING}</h3>
-			<p>{ERROR_MSG}</p>
+			<p>{ERROR_MSG}</p>
-		</div>
+		</div>
-	<!-- ENDIF -->
+	<!-- ENDIF -->
-
+
-	<form id="settings" method="post" action="{U_ACTION}">
+	<form id="settings" method="post" action="{U_ACTION}">
-
+
-	<fieldset>
+	<fieldset>
-		<legend>{L_SEASON_DETAILS}</legend>
+		<legend>{L_SEASON_DETAILS}</legend>
-	<dl>
+	<dl>
-		<dt><label for="season">{L_SEASON}:</label></dt>
+		<dt><label for="season">{L_SEASON}:</label></dt>
-		<dd><!-- IF not S_ADD_SEASON --><strong>{SEASON}</strong><!-- ENDIF -->
+		<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>
+			<input name="s" type="<!-- IF S_ADD_SEASON -->text<!-- ELSE -->hidden<!-- ENDIF -->" id="season" value="{SEASON}" size="4" maxlength="4"  /></dd>
-	</dl>
+	</dl>
-	<dl>
+	<dl>
-		<dt><label for="season_name">{L_SEASON_NAME}:</label><br /><span>{L_SEASON_NAME_EXPLAIN}</span></dt>
+		<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>
+		<dd><input name="season_name" type="text" id="season_name" value="{SEASON_NAME}" size="20" maxlength="20" /></dd>
-	</dl>
+	</dl>
-	<dl>
+	<dl>
-		<dt><label for="season_short">{L_SEASON_SHORT}:</label><br /><span>{L_SEASON_SHORT_EXPLAIN}</span></dt>
+		<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>
+		<dd><input name="season_short" type="text" id="season_short" value="{SEASON_SHORT}" size="10" maxlength="10" /></dd>
-	</dl>
+	</dl>
-	</fieldset>
+	</fieldset>
-
+
-	<fieldset class="submit-buttons">
+	<fieldset class="submit-buttons">
-		<legend>{L_SUBMIT}</legend>
+		<legend>{L_SUBMIT}</legend>
-		<input class="button1" type="submit" id="submit" name="update" value="{L_SUBMIT}" />&nbsp;
+		<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}" />
+		<input class="button2" type="reset" id="reset" name="reset" value="{L_RESET}" />
-	<!-- IF S_ADD_SEASON -->
+	<!-- IF S_ADD_SEASON -->
-		<input type="hidden" name="add" value="1" />
+		<input type="hidden" name="add" value="1" />
-	<!-- ENDIF -->
+	<!-- ENDIF -->
-		<input type="hidden" name="edit" value="1" />
+		<input type="hidden" name="edit" value="1" />
-		{S_FORM_TOKEN}
+		{S_FORM_TOKEN}
-	</fieldset>
+	</fieldset>
-	</form>
+	</form>
-
+
-<!-- ELSE -->
+<!-- ELSE -->
-	<!-- IF U_FOOTBALL --><a href="{U_FOOTBALL}" style="float: {S_CONTENT_FLOW_END};">&laquo; {L_PREDICTION_LEAGUE}</a><!-- ENDIF -->
+	<!-- 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>
+	<h1>{L_ACP_FOOTBALL_SEASONS_MANAGE}</h1>
-	<p>{L_ACP_FOOTBALL_SEASONS_MANAGE_EXPLAIN}</p>
+	<p>{L_ACP_FOOTBALL_SEASONS_MANAGE_EXPLAIN}</p>
-
+
-	<!-- IF S_ERROR -->
+	<!-- IF S_ERROR -->
-		<div class="errorbox">
+		<div class="errorbox">
-			<h3>{L_WARNING}</h3>
+			<h3>{L_WARNING}</h3>
-			<p>{ERROR_MSG}</p>
+			<p>{ERROR_MSG}</p>
-		</div>
+		</div>
-	<!-- ENDIF -->
+	<!-- ENDIF -->
-
+
-	<form id="acp_football_seasons" method="post" action="{U_ACTION}">
+	<form id="acp_football_seasons" method="post" action="{U_ACTION}">
-	<fieldset class="quick">
+	<fieldset class="quick">
-		<!-- IF S_SEASON_ADD -->
+		<!-- IF S_SEASON_ADD -->
-			{L_CREATE_SEASON}: <input type="text" name="s" value="" /> <input class="button2" type="submit" name="submit" value="{L_SUBMIT}" />
+			{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" />
+			<input type="hidden" name="add" value="1" />
-		<!-- ENDIF -->
+		<!-- ENDIF -->
-		{S_FORM_TOKEN}
+		{S_FORM_TOKEN}
-	</fieldset>
+	</fieldset>
-	</form>
+	</form>
-	<h1>{L_SEASON_DEF}</h1>
+	<h1>{L_SEASON_DEF}</h1>
-
+
-	<p>{L_SEASON_DEF_EXPLAIN}</p>
+	<p>{L_SEASON_DEF_EXPLAIN}</p>
-	<table class="type_f">
+	<table class="type_f">
-	<thead>
+	<thead>
-	<tr>
+	<tr>
-		<th>{L_SEASON}</th>
+		<th>{L_SEASON}</th>
-		<th style="width: 35%">{L_SEASON_NAME}</th>
+		<th style="width: 35%">{L_SEASON_NAME}</th>
-		<th>{L_SEASON_SHORT}</th>
+		<th>{L_SEASON_SHORT}</th>
-		<th>{L_LEAGUES}</th>
+		<th>{L_LEAGUES}</th>
-		<th>{L_OPTIONS}</th>
+		<th>{L_OPTIONS}</th>
-		<th>{L_ACTION}</th>
+		<th>{L_ACTION}</th>
-	</tr>
+	</tr>
-	</thead>
+	</thead>
-	<tbody>
+	<tbody>
-	<!-- IF .seasons -->
+	<!-- IF .seasons -->
-		<!-- BEGIN seasons -->
+		<!-- BEGIN seasons -->
-			<tr class="{seasons.ROW_CLASS}">
+			<tr class="{seasons.ROW_CLASS}">
-				<td style="text-align: center;"><strong>{seasons.SEASON}</strong></td>
+				<td style="text-align: center;"><strong>{seasons.SEASON}</strong></td>
-				<td>{seasons.SEASON_NAME}</td>
+				<td>{seasons.SEASON_NAME}</td>
-				<td>{seasons.SEASON_SHORT}</td>
+				<td>{seasons.SEASON_SHORT}</td>
-				<td style="text-align: center;">{seasons.LEAGUES}</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;"><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>
+				<td style="text-align: center;"><!-- IF seasons.U_DELETE --><a href="{seasons.U_DELETE}">{L_DELETE}</a><!-- ELSE -->{L_DELETE}<!-- ENDIF --></td>
-			</tr>
+			</tr>
-		<!-- END seasons -->
+		<!-- END seasons -->
-	<!-- ELSE -->
+	<!-- ELSE -->
-			<tr>
+			<tr>
-				<td colspan="4" class="row3">{L_NO_SEASONS_CREATED}</td>
+				<td colspan="4" class="row3">{L_NO_SEASONS_CREATED}</td>
-			</tr>
+			</tr>
-	<!-- ENDIF -->
+	<!-- ENDIF -->
-	</tbody>
+	</tbody>
-	</table>
+	</table>
-<!-- ENDIF -->
+<!-- ENDIF -->
-<br />
+<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>
+<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 -->
+<!-- INCLUDECSS css/football_acp.css -->
-<!-- INCLUDE overall_header.html -->
+<!-- INCLUDE overall_header.html -->
-
+
-<a id="maincontent"></a>
+<a id="maincontent"></a>
-<!-- IF S_EDIT -->
+<!-- IF S_EDIT -->
-	<a href="{U_BACK}" style="float: {S_CONTENT_FLOW_END};">&laquo; {L_BACK}</a>
+	<a href="{U_BACK}" style="float: {S_CONTENT_FLOW_END};">&laquo; {L_BACK}</a>
-	<h1>{L_ACP_FOOTBALL_TEAMS_MANAGE}</h1>
+	<h1>{L_ACP_FOOTBALL_TEAMS_MANAGE}</h1>
-	<p>{L_TEAM_EDIT_EXPLAIN}</p>
+	<p>{L_TEAM_EDIT_EXPLAIN}</p>
-
+
-	<!-- IF S_ERROR -->
+	<!-- IF S_ERROR -->
-		<div class="errorbox">
+		<div class="errorbox">
-			<h3>{L_WARNING}</h3>
+			<h3>{L_WARNING}</h3>
-			<p>{ERROR_MSG}</p>
+			<p>{ERROR_MSG}</p>
-		</div>
+		</div>
-	<!-- ENDIF -->
+	<!-- ENDIF -->
-
+
-	<form id="settings" method="post" action="{U_ACTION}">
+	<form id="settings" method="post" action="{U_ACTION}">
-
+
-	<fieldset>
+	<fieldset>
-		<legend>{L_TEAM_DETAILS}</legend>
+		<legend>{L_TEAM_DETAILS}</legend>
-	<dl>
+	<dl>
-		<dt><label for="team">{L_SEASON}:</label></dt>
+		<dt><label for="team">{L_SEASON}:</label></dt>
-		<dd><strong>{SEASON_NAME}</strong><input name="s" type="hidden" id="season" value="{SEASON}" /></dd>
+		<dd><strong>{SEASON_NAME}</strong><input name="s" type="hidden" id="season" value="{SEASON}" /></dd>
-	</dl>
+	</dl>
-	<dl>
+	<dl>
-		<dt><label for="team">{L_LEAGUE}:</label></dt>
+		<dt><label for="team">{L_LEAGUE}:</label></dt>
-		<dd><strong>{LEAGUE_NAME}</strong><input name="l" type="hidden" id="league" value="{LEAGUE}" /></dd>
+		<dd><strong>{LEAGUE_NAME}</strong><input name="l" type="hidden" id="league" value="{LEAGUE}" /></dd>
-	</dl>
+	</dl>
-	<dl>
+	<dl>
-		<dt><label for="team">{L_TEAM}:</label></dt>
+		<dt><label for="team">{L_TEAM}:</label></dt>
-		<dd><!-- IF not S_ADD_TEAM --><strong>{TEAM}</strong><!-- ENDIF -->
+		<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>
+			<input name="t" type="<!-- IF S_ADD_TEAM -->text<!-- ELSE -->hidden<!-- ENDIF -->" id="team" value="{TEAM}" /></dd>
-	</dl>
+	</dl>
-	<dl>
+	<dl>
-		<dt><label for="team_name">{L_TEAM_NAME}:</label></dt>
+		<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>
+		<dd><input name="team_name" type="text" id="team_name" size="30" maxlength="30" value="{TEAM_NAME}" /></dd>
-	</dl>
+	</dl>
-	<dl>
+	<dl>
-		<dt><label for="team_short">{L_TEAM_SHORT}:</label><br /><span>{L_TEAM_SHORT_EXPLAIN}</span></dt>
+		<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>
+		<dd><input name="team_short" type="text" id="team_short" size="10" maxlength="10" value="{TEAM_SHORT}" /></dd>
-	</dl>
+	</dl>
-	<dl>
+	<dl>
-		<dt><label for="team_symbol">{L_TEAM_SYMBOL}:</label><br /><span>{L_TEAM_SYMBOL_EXPLAIN}</span></dt>
+		<dt><label for="team_symbol">{L_TEAM_SYMBOL}:</label><br /><span>{L_TEAM_SYMBOL_EXPLAIN}</span></dt>
-		<dd><span>
+		<dd><span>
-			<select style="vertical-align:top;" name="team_symbol" id="team_symbol" 
+			<select style="vertical-align:top;" name="team_symbol" id="team_symbol" 
-					onchange="document.getElementById('teamsymbol').src = '{PHPBB_ROOT_PATH}images/flags/' + this.value;">
+					onchange="document.getElementById('teamsymbol').src = '{PHPBB_ROOT_PATH}images/flags/' + this.value;">
-				{TEAM_SYMBOL_OPTIONS}
+				{TEAM_SYMBOL_OPTIONS}
-			</select>&nbsp;&nbsp;&nbsp;<img src="{TEAM_IMAGE}" id="teamsymbol" alt="{TEAM_NAME}" title="{TEAM_NAME}" /></span></dd>
+			</select>&nbsp;&nbsp;&nbsp;<img src="{TEAM_IMAGE}" id="teamsymbol" alt="{TEAM_NAME}" title="{TEAM_NAME}" /></span></dd>
-	</dl>
+	</dl>
-	<!-- IF S_KO_LEAGUE -->
+	<!-- IF S_KO_LEAGUE -->
-	<dl>
+	<dl>
-		<dt><label for="team_group">{L_TEAM_GROUP}:</label><br /><span>{L_TEAM_GROUP_EXPLAIN}</span></dt>
+		<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>
+		<dd><input name="team_group" type="text" id="team_group" size="1" maxlength="1" value="{TEAM_GROUP}" /></dd>
-	</dl>
+	</dl>
-	<dl>
+	<dl>
-		<dt><label for="team_round">{L_TEAM_ROUND}:</label><br /><span>{L_TEAM_ROUND_EXPLAIN}</span></dt>
+		<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>
+		<dd><select name="team_round" id="team_round">{TEAM_MATCHDAY_OPTIONS}</select></dd>
-	</dl>
+	</dl>
-	<input type="hidden" name="ko_league" value="1" />
+	<input type="hidden" name="ko_league" value="1" />
-	<!-- ENDIF -->
+	<!-- ENDIF -->
-	</fieldset>
+	</fieldset>
-
+
-	<fieldset class="submit-buttons">
+	<fieldset class="submit-buttons">
-		<legend>{L_SUBMIT}</legend>
+		<legend>{L_SUBMIT}</legend>
-		<input class="button1" type="submit" id="submit" name="update" value="{L_SUBMIT}" />&nbsp;
+		<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}" />
+		<input class="button2" type="reset" id="reset" name="reset" value="{L_RESET}" />
-	<!-- IF S_ADD_TEAM -->
+	<!-- IF S_ADD_TEAM -->
-		<input type="hidden" name="add" value="1" />
+		<input type="hidden" name="add" value="1" />
-	<!-- ENDIF -->
+	<!-- ENDIF -->
-		<input type="hidden" name="edit" value="1" />
+		<input type="hidden" name="edit" value="1" />
-		{S_FORM_TOKEN}
+		{S_FORM_TOKEN}
-	</fieldset>
+	</fieldset>
-	</form>
+	</form>
-
+
-<!-- ELSE -->
+<!-- ELSE -->
-	<!-- IF U_FOOTBALL --><a href="{U_FOOTBALL}" style="float: {S_CONTENT_FLOW_END};">&laquo; {L_PREDICTION_LEAGUE}</a><!-- ENDIF -->
+	<!-- 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>
+	<h1>{L_ACP_FOOTBALL_TEAMS_MANAGE}</h1>
-	<p>{L_ACP_FOOTBALL_TEAMS_MANAGE_EXPLAIN}</p>
+	<p>{L_ACP_FOOTBALL_TEAMS_MANAGE_EXPLAIN}</p>
-
+
-	<!-- IF S_ERROR -->
+	<!-- IF S_ERROR -->
-		<div class="errorbox">
+		<div class="errorbox">
-			<h3>{L_WARNING}</h3>
+			<h3>{L_WARNING}</h3>
-			<p>{ERROR_MSG}</p>
+			<p>{ERROR_MSG}</p>
-		</div>
+		</div>
-	<!-- ENDIF -->
+	<!-- ENDIF -->
-
+
-	<h1 style="display:inline;">{L_SELECT_LEAGUE}:</h1>
+	<h1 style="display:inline;">{L_SELECT_LEAGUE}:</h1>
-	<form style="display:inline;" method="post" action="{U_ACTION}">
+	<form style="display:inline;" method="post" action="{U_ACTION}">
-	<div style="display:inline; margin:0; padding:0;">
+	<div style="display:inline; margin:0; padding:0;">
-		<select name="s" id="team_season" onchange="this.form.submit();">{S_SEASON_OPTIONS}</select>
+		<select name="s" id="team_season" onchange="this.form.submit();">{S_SEASON_OPTIONS}</select>
-		{S_FORM_TOKEN}
+		{S_FORM_TOKEN}
-	</div>
+	</div>
-	</form>
+	</form>
-
+
-	<form style="display:inline;" method="post" action="{U_ACTION}">
+	<form style="display:inline;" method="post" action="{U_ACTION}">
-	<div style="display:inline; margin:0; padding:0;">
+	<div style="display:inline; margin:0; padding:0;">
-		<input type="hidden" name="s" value="{S_SEASON}" />
+		<input type="hidden" name="s" value="{S_SEASON}" />
-		<select name="l" id="team_league" onchange="this.form.submit();">{S_LEAGUE_OPTIONS}</select>
+		<select name="l" id="team_league" onchange="this.form.submit();">{S_LEAGUE_OPTIONS}</select>
-		{S_FORM_TOKEN}
+		{S_FORM_TOKEN}
-	</div>
+	</div>
-	</form>
+	</form>
-
+
-	<form id="add_team" method="post" action="{U_ACTION}">
+	<form id="add_team" method="post" action="{U_ACTION}">
-	<fieldset class="quick">
+	<fieldset class="quick">
-			<input type="hidden" name="s" value="{S_SEASON}" />
+			<input type="hidden" name="s" value="{S_SEASON}" />
-			<input type="hidden" name="l" value="{S_LEAGUE}" />
+			<input type="hidden" name="l" value="{S_LEAGUE}" />
-			<input type="hidden" name="ko_league" value="{S_KO_LEAGUE}" />
+			<input type="hidden" name="ko_league" value="{S_KO_LEAGUE}" />
-		<!-- IF S_TEAM_ADD -->
+		<!-- 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}" />
+			{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" />
+			<input type="hidden" name="add" value="1" />
-		<!-- ENDIF -->
+		<!-- ENDIF -->
-		{S_FORM_TOKEN}
+		{S_FORM_TOKEN}
-	</fieldset>
+	</fieldset>
-	</form>
+	</form>
-	<h1>{L_TEAM_DEF} {S_TEAMS}</h1>
+	<h1>{L_TEAM_DEF} {S_TEAMS}</h1>
-
+
-	<p>{L_TEAM_DEF_EXPLAIN}</p>
+	<p>{L_TEAM_DEF_EXPLAIN}</p>
-	<table class="type_f">
+	<table class="type_f">
-	<thead>
+	<thead>
-	<tr>
+	<tr>
-		<th>{L_TEAM}</th>
+		<th>{L_TEAM}</th>
-		<th></th>
+		<th></th>
-		<th style="width: 25%">{L_TEAM_NAME}</th>
+		<th style="width: 25%">{L_TEAM_NAME}</th>
-		<th></th>
+		<th></th>
-		<th>{L_TEAM_MATCHES}</th>
+		<th>{L_TEAM_MATCHES}</th>
-		<th>{L_TEAM_AWAY}</th>
+		<th>{L_TEAM_AWAY}</th>
-		<!-- IF S_KO_LEAGUE -->
+		<!-- IF S_KO_LEAGUE -->
-		<th>{L_GROUP}</th>
+		<th>{L_GROUP}</th>
-		<th>{L_MATCHDAY}</th>
+		<th>{L_MATCHDAY}</th>
-		<!-- ENDIF -->
+		<!-- ENDIF -->
-		<th>{L_OPTIONS}</th>
+		<th>{L_OPTIONS}</th>
-		<th>{L_ACTION}</th>
+		<th>{L_ACTION}</th>
-	</tr>
+	</tr>
-	</thead>
+	</thead>
-	<tbody>
+	<tbody>
-	<!-- IF .teams -->
+	<!-- IF .teams -->
-		<!-- BEGIN teams -->
+		<!-- BEGIN teams -->
-			<tr class="{teams.ROW_CLASS}">
+			<tr class="{teams.ROW_CLASS}">
-				<td style="text-align: center;"><strong>{teams.TEAM}</strong></td>
+				<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 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_NAME}</td>
-				<td>{teams.TEAM_SHORT}</td>
+				<td>{teams.TEAM_SHORT}</td>
-				<td>{teams.TEAM_MATCHES}</td>
+				<td>{teams.TEAM_MATCHES}</td>
-				<td>{teams.TEAM_HOME}</td>
+				<td>{teams.TEAM_HOME}</td>
-				<!-- IF S_KO_LEAGUE -->
+				<!-- IF S_KO_LEAGUE -->
-				<td style="text-align: center;">{teams.TEAM_GROUP}</td>
+				<td style="text-align: center;">{teams.TEAM_GROUP}</td>
-				<td style="text-align: center;">{teams.TEAM_ROUND}</td>
+				<td style="text-align: center;">{teams.TEAM_ROUND}</td>
-				<!-- ENDIF -->
+				<!-- ENDIF -->
-				<td style="text-align: center;"><a href="{teams.U_EDIT}">{L_SETTINGS}</a></td>
+				<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>
+				<td style="text-align: center;"><!-- IF teams.U_DELETE --><a href="{teams.U_DELETE}">{L_DELETE}</a><!-- ELSE -->{L_DELETE}<!-- ENDIF --></td>
-			</tr>
+			</tr>
-		<!-- END teams -->
+		<!-- END teams -->
-	<!-- ELSE -->
+	<!-- ELSE -->
-			<tr>
+			<tr>
-				<td colspan="2" class="row3">{L_NO_TEAMS_CREATED}</td>
+				<td colspan="2" class="row3">{L_NO_TEAMS_CREATED}</td>
-			</tr>
+			</tr>
-	<!-- ENDIF -->
+	<!-- ENDIF -->
-	</tbody>
+	</tbody>
-	</table>
+	</table>
-	<!-- IF S_MATCHES --> {S_MATCHES} {L_TEAM_MATCHES} <!-- ENDIF -->
+	<!-- IF S_MATCHES --> {S_MATCHES} {L_TEAM_MATCHES} <!-- ENDIF -->
-<!-- ENDIF -->
+<!-- ENDIF -->
-<br />
+<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>
+<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 -->
+<!-- INCLUDECSS css/football_acp.css -->
-<!-- INCLUDE overall_header.html -->
+<!-- INCLUDE overall_header.html -->
-
+
-<a id="maincontent"></a>
+<a id="maincontent"></a>
-	<!-- IF U_FOOTBALL --><a href="{U_FOOTBALL}" style="float: {S_CONTENT_FLOW_END};">&laquo; {L_PREDICTION_LEAGUE}</a><!-- ENDIF -->
+	<!-- 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>
+	<h1>{L_ACP_FOOTBALL_UPDATE_MANAGE}</h1>
-	<p>{L_ACP_FOOTBALL_UPDATE_MANAGE_EXPLAIN}</p>
+	<p>{L_ACP_FOOTBALL_UPDATE_MANAGE_EXPLAIN}</p>
-
+
-	<!-- IF S_SUCCESS -->
+	<!-- IF S_SUCCESS -->
-		<div class="successbox">
+		<div class="successbox">
-			<h3>{L_ADVICE}</h3>
+			<h3>{L_ADVICE}</h3>
-			<p>{SUCCESS_MSG}</p>
+			<p>{SUCCESS_MSG}</p>
-		</div>
+		</div>
-	<!-- ENDIF -->
+	<!-- ENDIF -->
-
+
-	<form id="settings" method="post" action="{U_ACTION}">
+	<form id="settings" method="post" action="{U_ACTION}">
-	<fieldset>
+	<fieldset>
-		<legend>{L_SOURCE}</legend>
+		<legend>{L_SOURCE}</legend>
-	<dl>
+	<dl>
-		<dt><label for="xml_season_url">{L_XML_SEASON_URL}:</label><br /><span>{L_XML_SEASON_URL_EXPLAIN}</span></dt>
+		<dt><label for="xml_season_url">{L_XML_SEASON_URL}:</label><br /><span>{L_XML_SEASON_URL_EXPLAIN}</span></dt>
-		<dd>
+		<dd>
-			<input name="xml_season_url" type="text" id="xml_season_url" value="{XML_SEASON_URL}" size="60" maxlength="100" 
+			<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 -->/>
+				<!-- 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;
+			<input class="button1" type="submit" id="load_xml_season" name="load_xml_season" value="{L_LOAD}" />&nbsp;
-		<!-- IF not S_ALLOW_URL_FOPEN -->
+		<!-- IF not S_ALLOW_URL_FOPEN -->
-			<br /> <span style="color: red;">{L_ALLOW_URL_FOPEN}</span>
+			<br /> <span style="color: red;">{L_ALLOW_URL_FOPEN}</span>
-		<!-- ENDIF -->
+		<!-- ENDIF -->
-		</dd>
+		</dd>
-	</dl>
+	</dl>
-	</fieldset>
+	</fieldset>
-	</form>
+	</form>
-	
+	
-<!-- IF S_CHOOSE -->
+<!-- IF S_CHOOSE -->
-	
+	
-	<form method="post" action="{U_CHOOSE_ACTION}">
+	<form method="post" action="{U_CHOOSE_ACTION}">
-	<fieldset>
+	<fieldset>
-		<legend>{L_CHOOSE_LEAGUES}</legend>
+		<legend>{L_CHOOSE_LEAGUES}</legend>
-	<dl>
+	<dl>
-		<dt><label for="xs">{L_SOURCE}:</label></dt>
+		<dt><label for="xs">{L_SOURCE}:</label></dt>
-		<dd>
+		<dd>
-			<div style="display:inline; margin:0; padding:0;">
+			<div style="display:inline; margin:0; padding:0;">
-				<input type="hidden" name="xml_season_url" value="{XML_SEASON_URL}" />
+				<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="league_name" value="{S_LEAGUE_NAME}" />
-				<input type="hidden" name="xcode" value="{S_XCODE}" />
+				<input type="hidden" name="xcode" value="{S_XCODE}" />
-				<select name="xs" id="xs" onchange="this.form.submit();">{S_XSEASON_OPTIONS}</select>
+				<select name="xs" id="xs" onchange="this.form.submit();">{S_XSEASON_OPTIONS}</select>
-			</div>
+			</div>
-			<div style="display:inline; margin:0; padding:0;">
+			<div style="display:inline; margin:0; padding:0;">
-				<select name="xl" id="xl" onchange="this.form.submit();">{S_XLEAGUE_OPTIONS}</select>
+				<select name="xl" id="xl" onchange="this.form.submit();">{S_XLEAGUE_OPTIONS}</select>
-			</div>
+			</div>
-		</dd>
+		</dd>
-	</dl>
+	</dl>
-	<dl>
+	<dl>
-		<dt><label for="s">{L_TARGET}:</label></dt>
+		<dt><label for="s">{L_TARGET}:</label></dt>
-		<dd>
+		<dd>
-			<div style="display:inline; margin:0; padding:0;">
+			<div style="display:inline; margin:0; padding:0;">
-				<select name="s" id="season" onchange="this.form.submit();">{S_SEASON_OPTIONS}</select>
+				<select name="s" id="season" onchange="this.form.submit();">{S_SEASON_OPTIONS}</select>
-			</div>
+			</div>
-			<div style="display:inline; margin:0; padding:0;">
+			<div style="display:inline; margin:0; padding:0;">
-				<select name="l" id="league" onchange="this.form.submit();">{S_LEAGUE_OPTIONS}</select>
+				<select name="l" id="league" onchange="this.form.submit();">{S_LEAGUE_OPTIONS}</select>
-			</div>
+			</div>
-			<div title="{L_NEW_LEAGUE_EXPLAIN}" style="display:inline; margin:0; padding:0;">
+			<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" /> 
+				<input  name="new_league" type="text" id="new_league" value="{NEW_LEAGUE}" size="2" maxlength="2" /> 
-			</div>
+			</div>
-		</dd>
+		</dd>
-	</dl>
+	</dl>
-	
+	
-	</fieldset>
+	</fieldset>
-	<fieldset class="submit-buttons">
+	<fieldset class="submit-buttons">
-		<legend>{L_SUBMIT}</legend>
+		<legend>{L_SUBMIT}</legend>
-		<!-- IF S_LEAGUE -->
+		<!-- IF S_LEAGUE -->
-			<input class="button1" type="submit" id="team_mapping" name="team_mapping" value="{L_COMPARE_UPDATE}" />&nbsp;
+			<input class="button1" type="submit" id="team_mapping" name="team_mapping" value="{L_COMPARE_UPDATE}" />&nbsp;
-		<!-- ELSE -->
+		<!-- ELSE -->
-			<input class="button1" type="submit" id="load_xml_league" name="load_xml_league" value="{L_SHOW_UPDATE}" />&nbsp;
+			<input class="button1" type="submit" id="load_xml_league" name="load_xml_league" value="{L_SHOW_UPDATE}" />&nbsp;
-		<!-- ENDIF -->
+		<!-- ENDIF -->
-		{S_FORM_TOKEN}
+		{S_FORM_TOKEN}
-	</fieldset>
+	</fieldset>
-	</form>
+	</form>
-<!-- ENDIF -->
+<!-- ENDIF -->
-
+
-	<!-- IF S_ERROR -->
+	<!-- IF S_ERROR -->
-		<div class="errorbox">
+		<div class="errorbox">
-			<h3>{L_WARNING}</h3>
+			<h3>{L_WARNING}</h3>
-			<p>{ERROR_MSG}</p>
+			<p>{ERROR_MSG}</p>
-		</div>
+		</div>
-	<!-- ENDIF -->
+	<!-- ENDIF -->
-
+
-<!-- IF S_TEAMS -->
+<!-- IF S_TEAMS -->
-	<form id="teams" method="post" action="{U_ACTION}">
+	<form id="teams" method="post" action="{U_ACTION}">
-	
+	
-	<fieldset>
+	<fieldset>
-		<legend>{L_TEAM_MAPPING}</legend>
+		<legend>{L_TEAM_MAPPING}</legend>
-	<!-- IF S_MISSING_TEAMS --><span style="color: red;">{S_MISSING_TEAMS}</span><!-- ENDIF -->
+	<!-- IF S_MISSING_TEAMS --><span style="color: red;">{S_MISSING_TEAMS}</span><!-- ENDIF -->
-	<table class="type_f">
+	<table class="type_f">
-	<thead>
+	<thead>
-	<tr>
+	<tr>
-		<th>{L_TEAM}</th>
+		<th>{L_TEAM}</th>
-		<th style="width: 25%">{L_TEAM_NAME}</th>
+		<th style="width: 25%">{L_TEAM_NAME}</th>
-		<th>{L_TEAM_NAME_SHORT}</th>
+		<th>{L_TEAM_NAME_SHORT}</th>
-		<th>{L_TEAM_MAPPING}</th>
+		<th>{L_TEAM_MAPPING}</th>
-	</tr>
+	</tr>
-	</thead>
+	</thead>
-	<tbody>
+	<tbody>
-	<!-- BEGIN teams -->
+	<!-- BEGIN teams -->
-		<tr class="{teams.ROW_CLASS}">
+		<tr class="{teams.ROW_CLASS}">
-			<td>{teams.TEAM_ID_XML}</td>
+			<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;
+			<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}
+				{teams.TEAM_NAME_XML}
-			</td>
+			</td>
-			<td>{teams.TEAM_NAME_SHORT_XML}</td>
+			<td>{teams.TEAM_NAME_SHORT_XML}</td>
-			<td <!-- IF teams.DUPLICATE_TEAM -->title="{L_DUPLICATE_TEAM}" bgcolor=#ECD5D8<!-- ENDIF -->>
+			<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>
+				<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>
+			</td>
-		</tr>
+		</tr>
-	<!-- END teams -->
+	<!-- END teams -->
-	</tbody>
+	</tbody>
-	</table>
+	</table>
-	</fieldset>
+	</fieldset>
-	<fieldset class="submit-buttons">
+	<fieldset class="submit-buttons">
-		<legend>{L_SUBMIT}</legend>
+		<legend>{L_SUBMIT}</legend>
-		<input type="hidden" name="xml_season_url" value="{XML_SEASON_URL}" />
+		<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="league_name" value="{S_LEAGUE_NAME}" />
-		<input type="hidden" name="xml_ary" value="{XML_ARY}" />
+		<input type="hidden" name="xml_ary" value="{XML_ARY}" />
-		<input type="hidden" name="s" value="{S_SEASON}" />
+		<input type="hidden" name="s" value="{S_SEASON}" />
-		<input type="hidden" name="l" value="{S_LEAGUE}" />
+		<input type="hidden" name="l" value="{S_LEAGUE}" />
-		<input type="hidden" name="xs" value="{S_XSEASON}" />
+		<input type="hidden" name="xs" value="{S_XSEASON}" />
-		<input type="hidden" name="xl" value="{S_XLEAGUE}" />
+		<input type="hidden" name="xl" value="{S_XLEAGUE}" />
-		<input type="hidden" name="xcode" value="{S_XCODE}" />
+		<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="map_teams" value="{L_MAP_TEAMS}" />&nbsp;
-		<input class="button1" type="submit" id="submit" name="choose" value="{L_CHOOSE_OTHER_LEAGUE}" />&nbsp;
+		<input class="button1" type="submit" id="submit" name="choose" value="{L_CHOOSE_OTHER_LEAGUE}" />&nbsp;
-		{S_FORM_TOKEN}
+		{S_FORM_TOKEN}
-	</fieldset>
+	</fieldset>
-	</form>
+	</form>
-<!-- ENDIF -->
+<!-- ENDIF -->
-	
+	
-<!-- IF S_LIST -->
+<!-- IF S_LIST -->
-	<form id="list" method="post" action="{U_ACTION}">
+	<form id="list" method="post" action="{U_ACTION}">
-		<!-- IF S_INSERT_LEAGUE --><h1>{L_INSERT_LEAGUE}</h3><!-- ELSE --><h1>{L_UPDATE_LEAGUE}</h3><!-- ENDIF -->
+		<!-- IF S_INSERT_LEAGUE --><h1>{L_INSERT_LEAGUE}</h3><!-- ELSE --><h1>{L_UPDATE_LEAGUE}</h3><!-- ENDIF -->
-	<fieldset>
+	<fieldset>
-	<dl>
+	<dl>
-		<dt><label for="xml_season_url">{L_SEASON}:</label></dt>
+		<dt><label for="xml_season_url">{L_SEASON}:</label></dt>
-		<dd>{S_SEASON}</dd>
+		<dd>{S_SEASON}</dd>
-	</dl>
+	</dl>
-	<dl>
+	<dl>
-		<dt><label for="xml_season_url">{L_LEAGUE}:</label></dt>
+		<dt><label for="xml_season_url">{L_LEAGUE}:</label></dt>
-		<dd>{S_LEAGUE}</dd>
+		<dd>{S_LEAGUE}</dd>
-	</dl>
+	</dl>
-	<dl>
+	<dl>
-		<dt><label for="xml_season_url">{L_LEAGUE_NAME}:</label></dt>
+		<dt><label for="xml_season_url">{L_LEAGUE_NAME}:</label></dt>
-		<dd>{S_LEAGUE_NAME}</dd>
+		<dd>{S_LEAGUE_NAME}</dd>
-	</dl>
+	</dl>
-	</fieldset>
+	</fieldset>
-	<!-- IF S_INSERT_SEASON -->
+	<!-- IF S_INSERT_SEASON -->
-	<fieldset>
+	<fieldset>
-		<legend>{L_INSERT_SEASON}</legend>
+		<legend>{L_INSERT_SEASON}</legend>
-	<table class="type_f">
+	<table class="type_f">
-	<thead>
+	<thead>
-	<tr>
+	<tr>
-		<th>{L_SEASON}</th>
+		<th>{L_SEASON}</th>
-		<th>{L_SEASON_NAME}</th>
+		<th>{L_SEASON_NAME}</th>
-		<th>{L_SEASON_SHORT}</th>
+		<th>{L_SEASON_SHORT}</th>
-	</tr>
+	</tr>
-	</thead>
+	</thead>
-	<tbody>
+	<tbody>
-	<!-- BEGIN footb_seasons -->
+	<!-- BEGIN footb_seasons -->
-		{footb_seasons.TPL}
+		{footb_seasons.TPL}
-	<!-- END footb_seasons -->
+	<!-- END footb_seasons -->
-	</tbody>
+	</tbody>
-	</table>
+	</table>
-	</fieldset>
+	</fieldset>
-	<!-- ENDIF -->
+	<!-- ENDIF -->
-	
+	
-	<!-- IF S_INSERT_LEAGUE -->
+	<!-- IF S_INSERT_LEAGUE -->
-	<fieldset>
+	<fieldset>
-		<legend>{L_INSERT_LEAGUE}</legend>
+		<legend>{L_INSERT_LEAGUE}</legend>
-	<table class="type_f">
+	<table class="type_f">
-	<thead>
+	<thead>
-	<tr>
+	<tr>
-		<th style="width: 20%">{L_LEAGUE_NAME}</th>
+		<th style="width: 20%">{L_LEAGUE_NAME}</th>
-		<th>{L_LEAGUE_SHORTCUT}</th>
+		<th>{L_LEAGUE_SHORTCUT}</th>
-		<th>{L_LEAGUE_TYPE}</th>
+		<th>{L_LEAGUE_TYPE}</th>
-		<th>{L_LEAGUE_MATCHDAYS}</th>
+		<th>{L_LEAGUE_MATCHDAYS}</th>
-		<th>{L_LEAGUE_MATCHES}</th>
+		<th>{L_LEAGUE_MATCHES}</th>
-		<th>{L_LEAGUE_POINTS_MODE}</th>
+		<th>{L_LEAGUE_POINTS_MODE}</th>
-		<th>{L_LEAGUE_BET_IN_TIME}</th>
+		<th>{L_LEAGUE_BET_IN_TIME}</th>
-		<th>{L_BET_TYPE_KO}</th>
+		<th>{L_BET_TYPE_KO}</th>
-		<th>{L_OTHER_FIELDS}</th>
+		<th>{L_OTHER_FIELDS}</th>
-	</tr>
+	</tr>
-	</thead>
+	</thead>
-	<tbody>
+	<tbody>
-	<!-- BEGIN footb_leagues -->
+	<!-- BEGIN footb_leagues -->
-		{footb_leagues.TPL}
+		{footb_leagues.TPL}
-	<!-- END footb_leagues -->
+	<!-- END footb_leagues -->
-	</tbody>
+	</tbody>
-	</table>
+	</table>
-	</fieldset>
+	</fieldset>
-	<!-- ENDIF -->
+	<!-- ENDIF -->
-	
+	
-	<!-- IF .footb_matchdays -->
+	<!-- IF .footb_matchdays -->
-	<fieldset>
+	<fieldset>
-		<legend>{DO_MATCHDAYS}</legend>
+		<legend>{DO_MATCHDAYS}</legend>
-	<!-- IF not S_INSERT_LEAGUE -->
+	<!-- IF not S_INSERT_LEAGUE -->
-	<p class="small" style="text-align:right;margin-bottom:0px">
+	<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_', true); return false;">{L_MARK_ALL}</a> &bull; 
-		<a href="#" onclick="marklist('list', 'FOOTB_MATCHDAYS_', false); return false;">{L_UNMARK_ALL}</a>
+		<a href="#" onclick="marklist('list', 'FOOTB_MATCHDAYS_', false); return false;">{L_UNMARK_ALL}</a>
-	</p>		
+	</p>		
-	<!-- ENDIF -->
+	<!-- ENDIF -->
-	<table class="type_f">
+	<table class="type_f">
-	<thead>
+	<thead>
-	<tr>
+	<tr>
-		<th>{L_MATCHDAY}</th>
+		<th>{L_MATCHDAY}</th>
-		<th>{L_MATCHDAY_STATUS} 
+		<th>{L_MATCHDAY_STATUS} 
-			<!-- IF not S_INSERT_LEAGUE -->
+			<!-- IF not S_INSERT_LEAGUE -->
-				<input title="{L_UPDATE_THIS}" name="update_matchdays_status" id="update_matchdays_status" type="checkbox" class="radio" checked="checked" />
+				<input title="{L_UPDATE_THIS}" name="update_matchdays_status" id="update_matchdays_status" type="checkbox" class="radio" checked="checked" />
-			<!-- ENDIF -->
+			<!-- ENDIF -->
-		</th>
+		</th>
-		<th>{L_MATCHDAY_DELIVERY} 
+		<th>{L_MATCHDAY_DELIVERY} 
-			<!-- IF not S_INSERT_LEAGUE -->
+			<!-- IF not S_INSERT_LEAGUE -->
-				<input title="{L_UPDATE_THIS}" name="update_matchdays_delivery_date" id="update_matchdays_delivery_date" type="checkbox" class="radio" />
+				<input title="{L_UPDATE_THIS}" name="update_matchdays_delivery_date" id="update_matchdays_delivery_date" type="checkbox" class="radio" />
-			<!-- ENDIF -->
+			<!-- ENDIF -->
-		</th>
+		</th>
-		<th>{L_MATCHDAY_DELIVERY} 2 
+		<th>{L_MATCHDAY_DELIVERY} 2 
-			<!-- IF not S_INSERT_LEAGUE -->
+			<!-- 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" />
+				<input title="{L_UPDATE_THIS}" name="update_matchdays_delivery_date_2" id="update_matchdays_delivery_date_2" type="checkbox" class="radio" />
-			<!-- ENDIF -->
+			<!-- ENDIF -->
-		</th>
+		</th>
-		<th>{L_MATCHDAY_DELIVERY} 3 
+		<th>{L_MATCHDAY_DELIVERY} 3 
-			<!-- IF not S_INSERT_LEAGUE -->
+			<!-- 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" />
+				<input title="{L_UPDATE_THIS}" name="update_matchdays_delivery_date_3" id="update_matchdays_delivery_date_3" type="checkbox" class="radio" />
-			<!-- ENDIF -->
+			<!-- ENDIF -->
-		</th>
+		</th>
-		<th style="width: 25%">{L_MATCHDAY_NAME} 
+		<th style="width: 25%">{L_MATCHDAY_NAME} 
-			<!-- IF not S_INSERT_LEAGUE -->
+			<!-- 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" />
+				<input title="{L_UPDATE_THIS}" name="update_matchdays_matchday_name" id="update_matchdays_matchday_name" type="checkbox" class="radio" checked="checked" />
-			<!-- ENDIF -->
+			<!-- ENDIF -->
-		</th>
+		</th>
-		<th>{L_MATCHES} 
+		<th>{L_MATCHES} 
-			<!-- IF not S_INSERT_LEAGUE -->
+			<!-- IF not S_INSERT_LEAGUE -->
-				<input title="{L_UPDATE_THIS}" name="update_matchdays_matches" id="update_matchdays_matches" type="checkbox" class="radio" checked="checked" />
+				<input title="{L_UPDATE_THIS}" name="update_matchdays_matches" id="update_matchdays_matches" type="checkbox" class="radio" checked="checked" />
-			<!-- ENDIF -->
+			<!-- ENDIF -->
-		</th>
+		</th>
-		<!-- IF not S_INSERT_LEAGUE -->
+		<!-- IF not S_INSERT_LEAGUE -->
-		<th title="{L_SELECT_EXPLAIN}" style="text-align:center">{L_SELECT}</th>
+		<th title="{L_SELECT_EXPLAIN}" style="text-align:center">{L_SELECT}</th>
-		<!-- ENDIF -->
+		<!-- ENDIF -->
-	</tr>
+	</tr>
-	</thead>
+	</thead>
-	<tbody>
+	<tbody>
-	<!-- BEGIN footb_matchdays -->
+	<!-- BEGIN footb_matchdays -->
-		{footb_matchdays.TPL}
+		{footb_matchdays.TPL}
-	<!-- END footb_matchdays -->
+	<!-- END footb_matchdays -->
-	</tbody>
+	</tbody>
-	</table>
+	</table>
-	<!-- IF not S_INSERT_LEAGUE -->
+	<!-- IF not S_INSERT_LEAGUE -->
-	<p class="small" style="text-align:right;margin-bottom:0px">
+	<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_', true); return false;">{L_MARK_ALL}</a> &bull; 
-		<a href="#" onclick="marklist('list', 'FOOTB_MATCHDAYS_', false); return false;">{L_UNMARK_ALL}</a>
+		<a href="#" onclick="marklist('list', 'FOOTB_MATCHDAYS_', false); return false;">{L_UNMARK_ALL}</a>
-	</p>		
+	</p>		
-	<!-- ENDIF -->
+	<!-- ENDIF -->
-	</fieldset>
+	</fieldset>
-	<!-- ENDIF -->
+	<!-- ENDIF -->
-	
+	
-	<!-- IF .footb_teams -->
+	<!-- IF .footb_teams -->
-	<fieldset>
+	<fieldset>
-		<legend>{DO_TEAMS}</legend>
+		<legend>{DO_TEAMS}</legend>
-	<!-- IF not S_INSERT_LEAGUE -->
+	<!-- IF not S_INSERT_LEAGUE -->
-	<p class="small" style="text-align:right;margin-bottom:0px">
+	<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_', true); return false;">{L_MARK_ALL}</a> &bull; 
-		<a href="#" onclick="marklist('list', 'FOOTB_TEAMS_', false); return false;">{L_UNMARK_ALL}</a>
+		<a href="#" onclick="marklist('list', 'FOOTB_TEAMS_', false); return false;">{L_UNMARK_ALL}</a>
-	</p>		
+	</p>		
-	<!-- ENDIF -->
+	<!-- ENDIF -->
-	<table class="type_f">
+	<table class="type_f">
-	<thead>
+	<thead>
-	<tr>
+	<tr>
-		<th>{L_TEAM}</th>
+		<th>{L_TEAM}</th>
-		<th style="width: 25%">{L_TEAM_NAME} 
+		<th style="width: 25%">{L_TEAM_NAME} 
-			<!-- IF not S_INSERT_LEAGUE -->
+			<!-- IF not S_INSERT_LEAGUE -->
-				<input title="{L_UPDATE_THIS}" name="update_teams_team_name" id="update_teams_team_nmae" type="checkbox" class="radio" />
+				<input title="{L_UPDATE_THIS}" name="update_teams_team_name" id="update_teams_team_nmae" type="checkbox" class="radio" />
-			<!-- ENDIF -->
+			<!-- ENDIF -->
-		</th>
+		</th>
-		<th>{L_TEAM_NAME_SHORT} 
+		<th>{L_TEAM_NAME_SHORT} 
-			<!-- IF not S_INSERT_LEAGUE -->
+			<!-- 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" />
+				<input title="{L_UPDATE_THIS}" name="update_teams_team_name_short" id="update_teams_team_name_short" type="checkbox" class="radio" />
-			<!-- ENDIF -->
+			<!-- ENDIF -->
-		</th>
+		</th>
-		<th>{L_TEAM_SYMBOL} 
+		<th>{L_TEAM_SYMBOL} 
-			<!-- IF not S_INSERT_LEAGUE -->
+			<!-- IF not S_INSERT_LEAGUE -->
-				<input title="{L_UPDATE_THIS}" name="update_teams_team_symbol" id="update_teams_team_symbol" type="checkbox" class="radio" />
+				<input title="{L_UPDATE_THIS}" name="update_teams_team_symbol" id="update_teams_team_symbol" type="checkbox" class="radio" />
-			<!-- ENDIF -->
+			<!-- ENDIF -->
-		</th>
+		</th>
-		<th>{L_GROUP} 
+		<th>{L_GROUP} 
-			<!-- IF not S_INSERT_LEAGUE -->
+			<!-- 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" />
+				<input title="{L_UPDATE_THIS}" name="update_teams_group_id" id="update_teams_group_id" type="checkbox" class="radio" checked="checked" />
-			<!-- ENDIF -->
+			<!-- ENDIF -->
-		</th>
+		</th>
-		<th>{L_MATCHDAY} 
+		<th>{L_MATCHDAY} 
-			<!-- IF not S_INSERT_LEAGUE -->
+			<!-- IF not S_INSERT_LEAGUE -->
-				<input title="{L_UPDATE_THIS}" name="update_teams_matchday" id="update_teams_matchday" type="checkbox" class="radio" checked="checked" />
+				<input title="{L_UPDATE_THIS}" name="update_teams_matchday" id="update_teams_matchday" type="checkbox" class="radio" checked="checked" />
-			<!-- ENDIF -->
+			<!-- ENDIF -->
-		</th>
+		</th>
-		<!-- IF not S_INSERT_LEAGUE -->
+		<!-- IF not S_INSERT_LEAGUE -->
-		<th title="{L_SELECT_EXPLAIN}" style="text-align:center">{L_SELECT}</th>
+		<th title="{L_SELECT_EXPLAIN}" style="text-align:center">{L_SELECT}</th>
-		<!-- ENDIF -->
+		<!-- ENDIF -->
-	</tr>
+	</tr>
-	</thead>
+	</thead>
-	<tbody>
+	<tbody>
-	<!-- BEGIN footb_teams -->
+	<!-- BEGIN footb_teams -->
-		{footb_teams.TPL}
+		{footb_teams.TPL}
-	<!-- END footb_teams -->
+	<!-- END footb_teams -->
-	</tbody>
+	</tbody>
-	</table>
+	</table>
-	<!-- IF not S_INSERT_LEAGUE -->
+	<!-- IF not S_INSERT_LEAGUE -->
-	<p class="small" style="text-align:right;margin-bottom:0px">
+	<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_', true); return false;">{L_MARK_ALL}</a> &bull; 
-		<a href="#" onclick="marklist('list', 'FOOTB_TEAMS_', false); return false;">{L_UNMARK_ALL}</a>
+		<a href="#" onclick="marklist('list', 'FOOTB_TEAMS_', false); return false;">{L_UNMARK_ALL}</a>
-	</p>		
+	</p>		
-	<!-- ENDIF -->
+	<!-- ENDIF -->
-	</fieldset>
+	</fieldset>
-	<!-- ENDIF -->
+	<!-- ENDIF -->
-	
+	
-	<!-- IF .footb_matches -->
+	<!-- IF .footb_matches -->
-	<fieldset>
+	<fieldset>
-		<legend>{DO_MATCHES}</legend>
+		<legend>{DO_MATCHES}</legend>
-	<!-- IF not S_INSERT_LEAGUE -->
+	<!-- 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_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_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"><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">
+	<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_', true); return false;">{L_MARK_ALL}</a> &bull; 
-		<a href="#" onclick="marklist('list', 'FOOTB_MATCHES_', false); return false;">{L_UNMARK_ALL}</a>
+		<a href="#" onclick="marklist('list', 'FOOTB_MATCHES_', false); return false;">{L_UNMARK_ALL}</a>
-	</p>		
+	</p>		
-	<!-- ENDIF -->
+	<!-- ENDIF -->
-	<table class="type_f">
+	<table class="type_f">
-	<thead>
+	<thead>
-	<tr>
+	<tr>
-		<th>{L_MATCHDAY} 
+		<th>{L_MATCHDAY} 
-			<!-- IF not S_INSERT_LEAGUE -->
+			<!-- IF not S_INSERT_LEAGUE -->
-				<input title="{L_UPDATE_THIS}" name="update_matches_matchday" id="update_matches_matchday" type="checkbox" class="radio" checked="checked" />
+				<input title="{L_UPDATE_THIS}" name="update_matches_matchday" id="update_matches_matchday" type="checkbox" class="radio" checked="checked" />
-			<!-- ENDIF --><br />
+			<!-- ENDIF --><br />
-			{L_MATCH_NUMBER}		
+			{L_MATCH_NUMBER}		
-		</th>
+		</th>
-		<th>{L_MATCH_BEGIN} 
+		<th>{L_MATCH_BEGIN} 
-			<!-- IF not S_INSERT_LEAGUE -->
+			<!-- 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" />
+				<input title="{L_UPDATE_THIS}" name="update_matches_match_datetime" id="update_matches_match_datetime" type="checkbox" class="radio" checked="checked" />
-			<!-- ENDIF --><br />
+			<!-- ENDIF --><br />
-			{L_MATCH_OF_GROUP} 
+			{L_MATCH_OF_GROUP} 
-			<!-- IF not S_INSERT_LEAGUE -->
+			<!-- 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" />
+				<input title="{L_UPDATE_THIS}" name="update_matches_group_id" id="update_matches_group_id" type="checkbox" class="radio" checked="checked" />
-			<!-- ENDIF -->
+			<!-- ENDIF -->
-		</th>
+		</th>
-		<th>{L_MATCH_HOME} 
+		<th>{L_MATCH_HOME} 
-			<!-- IF not S_INSERT_LEAGUE -->
+			<!-- 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" />
+				<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 />
+			<!-- ENDIF --><br />
-			{L_MATCH_GUEST} 
+			{L_MATCH_GUEST} 
-			<!-- IF not S_INSERT_LEAGUE -->
+			<!-- 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" />
+				<input title="{L_UPDATE_THIS}" name="update_matches_team_id_guest" id="update_matches_team_id_guest" type="checkbox" class="radio" checked="checked" />
-			<!-- ENDIF -->
+			<!-- ENDIF -->
-		</th>
+		</th>
-		<th>{L_RESULT} 
+		<th>{L_RESULT} 
-			<!-- IF not S_INSERT_LEAGUE -->
+			<!-- IF not S_INSERT_LEAGUE -->
-				<input title="{L_UPDATE_THIS}" name="update_matches_goals" id="update_matches_goals" type="checkbox" class="radio" checked="checked" />
+				<input title="{L_UPDATE_THIS}" name="update_matches_goals" id="update_matches_goals" type="checkbox" class="radio" checked="checked" />
-			<!-- ENDIF --><br /> 
+			<!-- ENDIF --><br /> 
-			&nbsp; 
+			&nbsp; 
-		</th>
+		</th>
-		<th>{L_EXTRATIME_SHORT} 
+		<th>{L_EXTRATIME_SHORT} 
-			<!-- IF not S_INSERT_LEAGUE -->
+			<!-- 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" />
+				<input title="{L_UPDATE_THIS}" name="update_matches_goals_overtime" id="update_matches_goals_overtime" type="checkbox" class="radio" checked="checked" />
-			<!-- ENDIF --><br />
+			<!-- ENDIF --><br />
-			&nbsp;
+			&nbsp;
-		</th>
+		</th>
-		<th>{L_FORMULA} 
+		<th>{L_FORMULA} 
-			<!-- IF not S_INSERT_LEAGUE -->
+			<!-- IF not S_INSERT_LEAGUE -->
-				<input title="{L_UPDATE_THIS}" name="update_matches_formula" id="update_matches_formula" type="checkbox" class="radio" checked="checked" />
+				<input title="{L_UPDATE_THIS}" name="update_matches_formula" id="update_matches_formula" type="checkbox" class="radio" checked="checked" />
-			<!-- ENDIF --><br />
+			<!-- ENDIF --><br />
-			&nbsp;
+			&nbsp;
-		</th>
+		</th>
-		<th>{L_STATUS} 
+		<th>{L_STATUS} 
-			<!-- IF not S_INSERT_LEAGUE -->
+			<!-- IF not S_INSERT_LEAGUE -->
-				<input title="{L_UPDATE_THIS}" name="update_matches_status" id="update_matches_status" type="checkbox" class="radio" checked="checked" />
+				<input title="{L_UPDATE_THIS}" name="update_matches_status" id="update_matches_status" type="checkbox" class="radio" checked="checked" />
-			<!-- ENDIF --><br />
+			<!-- ENDIF --><br />
-			{L_KO}
+			{L_KO}
-		</th>
+		</th>
-		<!-- IF not S_INSERT_LEAGUE -->
+		<!-- IF not S_INSERT_LEAGUE -->
-		<th title="{L_SELECT_EXPLAIN}" style="text-align:center">{L_SELECT}<br />
+		<th title="{L_SELECT_EXPLAIN}" style="text-align:center">{L_SELECT}<br />
-			&nbsp;
+			&nbsp;
-		</th>
+		</th>
-		<!-- ENDIF -->
+		<!-- ENDIF -->
-	</tr>
+	</tr>
-	</thead>
+	</thead>
-	<tbody>
+	<tbody>
-	<!-- BEGIN footb_matches -->
+	<!-- BEGIN footb_matches -->
-		{footb_matches.TPL}
+		{footb_matches.TPL}
-	<!-- END footb_matches -->
+	<!-- END footb_matches -->
-	</tbody>
+	</tbody>
-	</table>
+	</table>
-	<!-- IF not S_INSERT_LEAGUE -->
+	<!-- IF not S_INSERT_LEAGUE -->
-	<p class="small" style="text-align:right;margin-bottom:0px">
+	<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_', true); return false;">{L_MARK_ALL}</a> &bull; 
-		<a href="#" onclick="marklist('list', 'FOOTB_MATCHES_', false); return false;">{L_UNMARK_ALL}</a>
+		<a href="#" onclick="marklist('list', 'FOOTB_MATCHES_', false); return false;">{L_UNMARK_ALL}</a>
-	</p>		
+	</p>		
-	<!-- ENDIF -->
+	<!-- ENDIF -->
-	</fieldset>
+	</fieldset>
-	<!-- ENDIF -->
+	<!-- ENDIF -->
-
+
-	<!-- IF .footb_matchdays or .footb_teams or .footb_matches -->
+	<!-- IF .footb_matchdays or .footb_teams or .footb_matches -->
-	<fieldset class="submit-buttons">
+	<fieldset class="submit-buttons">
-		<legend>{L_SUBMIT}</legend>
+		<legend>{L_SUBMIT}</legend>
-		<input type="hidden" name="xml_ary" value="{XML_ARY}" />
+		<input type="hidden" name="xml_ary" value="{XML_ARY}" />
-		<input type="hidden" name="s" value="{S_SEASON}" />
+		<input type="hidden" name="s" value="{S_SEASON}" />
-		<input type="hidden" name="l" value="{S_LEAGUE}" />
+		<input type="hidden" name="l" value="{S_LEAGUE}" />
-		<input type="hidden" name="league_name" value="{S_LEAGUE_NAME}" />
+		<input type="hidden" name="league_name" value="{S_LEAGUE_NAME}" />
-		<input type="hidden" name="xcode" value="{S_XCODE}" />
+		<input type="hidden" name="xcode" value="{S_XCODE}" />
-		<!-- IF S_INSERT_LEAGUE -->
+		<!-- IF S_INSERT_LEAGUE -->
-		<input class="button1" type="submit" id="submit" name="insert" value="{L_INSERT_LEAGUE}" />&nbsp;
+		<input class="button1" type="submit" id="submit" name="insert" value="{L_INSERT_LEAGUE}" />&nbsp;
-		<!-- ELSE -->
+		<!-- ELSE -->
-		<input class="button1" type="submit" id="submit" name="update" value="{L_UPDATE_LEAGUE}" />&nbsp;
+		<input class="button1" type="submit" id="submit" name="update" value="{L_UPDATE_LEAGUE}" />&nbsp;
-		<!-- ENDIF -->
+		<!-- ENDIF -->
-		{S_FORM_TOKEN}
+		{S_FORM_TOKEN}
-	</fieldset>
+	</fieldset>
-	<!-- ELSE -->
+	<!-- ELSE -->
-		<div class="successbox">
+		<div class="successbox">
-			<h3>{L_ADVICE}</h3>
+			<h3>{L_ADVICE}</h3>
-			<p>{L_NO_DIFFERENCES}</p>
+			<p>{L_NO_DIFFERENCES}</p>
-		</div>
+		</div>
-	<!-- ENDIF -->
+	<!-- ENDIF -->
-	</form>
+	</form>
-<!-- ENDIF -->
+<!-- ENDIF -->
-<br />
+<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>
+<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 -->
+<!-- INCLUDECSS css/football_acp.css -->
-<!-- INCLUDE overall_header.html -->
+<!-- INCLUDE overall_header.html -->
-
+
-<a id="maincontent"></a>
+<a id="maincontent"></a>
-<!-- IF S_IN_FOOTBALL_USERGUIDE -->
+<!-- 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 U_FOOTBALL --><a href="{U_FOOTBALL}" style="float: {S_CONTENT_FLOW_END};">&laquo; {L_PREDICTION_LEAGUE}</a><!-- ENDIF -->
-	<!-- IF S_ERROR -->
+	<!-- IF S_ERROR -->
-		<div class="errorbox">
+		<div class="errorbox">
-			<h3>{L_WARNING}</h3>
+			<h3>{L_WARNING}</h3>
-			<p>{ERROR_MSG}</p>
+			<p>{ERROR_MSG}</p>
-		</div>
+		</div>
-	<!-- ENDIF -->
+	<!-- ENDIF -->
-
+
-	<h1>{L_ACP_FOOTBALL} - {L_ACP_FOOTBALL_USERGUIDE}</h1>
+	<h1>{L_ACP_FOOTBALL} - {L_ACP_FOOTBALL_USERGUIDE}</h1>
-	<p>{L_ACP_FOOTBALL_USERGUIDE_EXPLAIN}</p>
+	<p>{L_ACP_FOOTBALL_USERGUIDE_EXPLAIN}</p>
-
+
-	<fieldset id="userguidelinks">
+	<fieldset id="userguidelinks">
-		<!-- BEGIN userguide_block -->
+		<!-- 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 />
+			<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 -->
+				<!-- 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 />
+					<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 -->
+				<!-- END userguide_row -->
-			</div>
+			</div>
-		<!-- END userguide_block -->
+		<!-- END userguide_block -->
-	</fieldset>
+	</fieldset>
-
+
-	<!-- BEGIN userguide_block -->
+	<!-- BEGIN userguide_block -->
-	<fieldset>
+	<fieldset>
-		<h2>{userguide_block.BLOCK_TITLE}</h2>
+		<h2>{userguide_block.BLOCK_TITLE}</h2>
-		<!-- BEGIN userguide_row -->
+		<!-- BEGIN userguide_row -->
-			<div style="font-size: 0.85em; padding-bottom: 5px; margin-bottom: 0.7em; line-height: 1.40em;">
+			<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}">
+				<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 />
+					<strong>{userguide_block.userguide_row.USERGUIDE_QUESTION}</strong></span><br />
-				{userguide_block.userguide_row.USERGUIDE_ANSWER}<br /><br />
+				{userguide_block.userguide_row.USERGUIDE_ANSWER}<br /><br />
-				<a href="#userguidelinks">{ICON_BACK_TO_TOP}&nbsp;{L_BACK_TO_TOP}</a>
+				<a href="#userguidelinks">{ICON_BACK_TO_TOP}&nbsp;{L_BACK_TO_TOP}</a>
-			</div>
+			</div>
-			<!-- IF not userguide_block.userguide_row.S_LAST_ROW --><hr class="dashed" /><!-- ENDIF -->
+			<!-- IF not userguide_block.userguide_row.S_LAST_ROW --><hr class="dashed" /><!-- ENDIF -->
-		<!-- END userguide_row -->
+		<!-- END userguide_row -->
-	</fieldset>
+	</fieldset>
-	<!-- END userguide_block -->
+	<!-- END userguide_block -->
-<!-- ENDIF -->
+<!-- ENDIF -->
-<br />
+<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>
+<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
+ * @package phpBB Extension - Football Football
- * @copyright (c) 2016 football (http://football.bplaced.net)
+ * @copyright (c) 2016 football (http://football.bplaced.net)
- * @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+ * @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
- * ----------------------------------------------------------------------------------------- */
+ * ----------------------------------------------------------------------------------------- */
-/* Table for football data */
+/* Table for football data */
-/* Specific column styles */
+/* 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 				{ 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 thead th span 			{ padding-left:7px; }
-table.type_f tfoot td {
+table.type_f tfoot td {
-	padding: 3px 4px;
+	padding: 3px 4px;
-	color: #FFFFFF;
+	color: #FFFFFF;
-	background: #70AED3 url("../images/gradient2b.gif") bottom left repeat-x;
+	background: #70AED3 url("../images/gradient2b.gif") bottom left repeat-x;
-	border-bottom: 1px solid #6DACD2;
+	border-bottom: 1px solid #6DACD2;
-	border-top: 1px solid #327AA5;
+	border-top: 1px solid #327AA5;
-	text-align: left;
+	text-align: left;
-	font-size: 0.75em;
+	font-size: 0.75em;
-	text-transform: uppercase;
+	text-transform: uppercase;
-}
+}
-
+
-table.type_f tbody tr:hover, 
+table.type_f tbody tr:hover, 
-table.type_f tbody tr.hover { 
+table.type_f tbody tr.hover { 
-	background-color: #FFFFFF; color: #000000; 
+	background-color: #FFFFFF; color: #000000; 
-}
+}
-table.type_f body td 				{ padding: 1px 2px; border-top: 1px solid #FAFAFA; }
+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 th 				{ padding:1px 2px; border-top: 1px solid #000000; background-color: #BFC1CF; }
-table.type_f tbody tr 				{ border: 1px solid #cfcfcf; }
+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_tendency 		{ text-align: center; padding: 4px 2px 0 2px; font-weight: bold; }
-th.td_pts_total  		{ text-align: right; padding: 4px 4px 0 2px; }
+th.td_pts_total  		{ text-align: right; padding: 4px 4px 0 2px; }
-td.td_rank 			{ text-align: right; }
+td.td_rank 			{ text-align: right; }
-td.td_group 			{ text-align: center; }
+td.td_group 			{ text-align: center; }
-td.td_hits 			{ text-align: center; }
+td.td_hits 			{ text-align: center; }
-td.td_wins 			{ text-align: right; padding: 0 2px 0 4px; }
+td.td_wins 			{ text-align: right; padding: 0 2px 0 4px; }
-td.td_match_no 		{ text-align: right; }
+td.td_match_no 		{ text-align: right; }
-td.td_logo 			{ text-align: center; }
+td.td_logo 			{ text-align: center; }
-td.td_team 			{ text-align: left; padding: 0 1em 0 2px; }
+td.td_team 			{ text-align: left; padding: 0 1em 0 2px; }
-td.td_team_home 		{ text-align: right; width: 155px; }
+td.td_team_home 		{ text-align: right; width: 155px; }
-td.td_team_guest 	{ text-align: left; width: 155px; }
+td.td_team_guest 	{ text-align: left; width: 155px; }
-td.td_vs 			{ text-align: center; max-width: 1em; padding: 0; }
+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_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_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_pts 			{ text-align: right; padding: 0 2px 0 2px; }
-td.td_button 		{ text-align: right; padding-right: 4px; }
+td.td_button 		{ text-align: right; padding-right: 4px; }
-td.td_result 		{ text-align: center; }
+td.td_result 		{ text-align: center; }
-td.td_season 		{ text-align: center; }
+td.td_season 		{ text-align: center; }
-td.td_league 		{ text-align: center; }
+td.td_league 		{ text-align: center; }
-td.td_pts_total 		{ text-align: right; padding: 0 4px 0 2px; }
+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_points	 		{ text-align: right; padding: 0 2em 0 2px; }
-td.td_fp 			{ text-align: center; }
+td.td_fp 			{ text-align: center; }
-td.td_matches 		{ text-align: center; }
+td.td_matches 		{ text-align: center; }
-td.td_diff 			{ text-align: right; }
+td.td_diff 			{ text-align: right; }
-td.td_counter 		{ text-align: right; }
+td.td_counter 		{ text-align: right; }
-td.td_name 			{ text-align: left; }
+td.td_name 			{ text-align: left; }
-
+
-table.rank td.color_finally, table.football .color_finally, .color_finally , table.football .match_win, .match_win { 
+table.rank td.color_finally, table.football .color_finally, .color_finally , table.football .match_win, .match_win { 
-	font-weight: bold; 
+	font-weight: bold; 
-	color: #00AA00; 
+	color: #00AA00; 
-}
+}
-
+
-table.rank td.color_provisionally, table.football .color_provisionally, .color_provisionally , table.football .match_lost, .match_lost  { 
+table.rank td.color_provisionally, table.football .color_provisionally, .color_provisionally , table.football .match_lost, .match_lost  { 
-	font-weight: bold; 
+	font-weight: bold; 
-	color: #AA0000; 
+	color: #AA0000; 
-}
+}
-
+
-table.football .match_draw, .match_draw  { 
+table.football .match_draw, .match_draw  { 
-	font-weight: bold; 
+	font-weight: bold; 
-	color: #6A6A6A; 
+	color: #6A6A6A; 
-}
+}
-
+
-table.rank td.color_not_rated, table.football .color_not_rated, .color_not_rated { 
+table.rank td.color_not_rated, table.football .color_not_rated, .color_not_rated { 
-	font-weight: bold; 
+	font-weight: bold; 
-	color: purple; 
+	color: purple; 
-}
+}
-
+
-/* Background colors where the tables iterate between two colors or mark user*/
+/* Background colors where the tables iterate between two colors or mark user*/
-.row_light 		{ background-color: #e1ebf2; }
+.row_light 		{ background-color: #e1ebf2; }
-.row_dark 		{ background-color: #cadceb; }
+.row_dark 		{ background-color: #cadceb; }
-.row_user 		{ background-color: #99CC99; }
+.row_user 		{ background-color: #99CC99; }
-.row_group td	{ background-color: #12A3EB; color: #FFFFFF !important; }
+.row_group td	{ background-color: #12A3EB; color: #FFFFFF !important; }
-.row_result 		{ background-color: #BFC1CF; }
+.row_result 		{ background-color: #BFC1CF; }
-.row_result  td 	{ padding: 1px 2px; }
+.row_result  td 	{ padding: 1px 2px; }
-
+
-
+
-.message {
+.message {
-	font-weight: bold;
+	font-weight: bold;
-	color: #AA0000;
+	color: #AA0000;
-}
+}

adm/style/frame_results.html

@@ -1,13 +1,13 @@
-<!-- IF 0 -->
+<!-- IF 0 -->
-Diese Datei existiert doppelt: Einmal im fooball\football\styles\prsilver\template und einmal im fooball\football\adm\style Ordner
+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,
+Mit Hilfe dieser Datei werden Fussballergebnisse zum Abgleich und schnelleren Erfassung von externen Seiten,
-wie z.B. den Weltfussball.de Torverteiler, eingebunden.
+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 
+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).
+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.
+Der Frame wird dann bei der Ergebnisseingabe in der Liga angezeigt, wenn der Spieltag editierbar ist.
-<!-- ENDIF -->
+<!-- ENDIF -->
-<!-- IF S_EDIT_MODE -->
+<!-- IF S_EDIT_MODE -->
-	<!-- IF S_LEAGUE == 999999 -->
+	<!-- 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>
+		<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 -->
-<!-- ENDIF -->
+<!-- ENDIF -->

block/all_bets.php

@@ -1,495 +1,494 @@
-<?php
+<?php
-/**
+/**
-*
+*
-* @package phpBB Extension - Football Football
+* @package phpBB Extension - Football Football
-* @copyright (c) 2016 football (http://football.bplaced.net)
+* @copyright (c) 2016 football (http://football.bplaced.net)
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
-*
+*
-*/
+*/
-
+
-if (!defined('IN_PHPBB') OR !defined('IN_FOOTBALL'))
+if (!defined('IN_PHPBB') OR !defined('IN_FOOTBALL'))
-{
+{
-	exit;
+	exit;
-}
+}
-
+
-$start = $this->request->variable('start', 0);
+$start = $this->request->variable('start', 0);
-$matches_on_matchday = false;
+$matches_on_matchday = false;
-
+
-$sql = 'SELECT COUNT(DISTINCT  user_id) AS num_users
+$sql = 'SELECT COUNT(DISTINCT  user_id) AS num_users
-		FROM  ' . FOOTB_BETS . " 
+		FROM  ' . FOOTB_BETS . " 
-		WHERE  season = $season AND league = $league";
+		WHERE  season = $season AND league = $league";
-		
+		
-$result = $db->sql_query($sql);
+$result = $db->sql_query($sql);
-$total_users = (int) $db->sql_fetchfield('num_users');
+$total_users = (int) $db->sql_fetchfield('num_users');
-$db->sql_freeresult($result);
+$db->sql_freeresult($result);
-
+
-$sql = "SELECT
+$sql = "SELECT
-		m.match_no,
+		m.match_no,
-		m.status,
+		m.status,
-		m.formula_home,
+		m.formula_home,
-		m.formula_guest,
+		m.formula_guest,
-		t1.team_name_short AS home_name,
+		t1.team_name_short AS home_name,
-		t2.team_name_short AS guest_name,
+		t2.team_name_short AS guest_name,
-		t1.team_id AS home_id,
+		t1.team_id AS home_id,
-		t2.team_id AS guest_id,
+		t2.team_id AS guest_id,
-		m.goals_home,
+		m.goals_home,
-		m.goals_guest,
+		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 + 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 = 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
-	FROM  " . FOOTB_MATCHES . ' AS m
+	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 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_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)
+	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 
+	WHERE  m.season = $season 
-		AND m.league = $league 
+		AND m.league = $league 
-		AND m.matchday = $matchday
+		AND m.matchday = $matchday
-	GROUP BY m.match_no
+	GROUP BY m.match_no
-	ORDER BY m.match_datetime ASC, m.match_no ASC";
+	ORDER BY m.match_datetime ASC, m.match_no ASC";
-
+
-$result = $db->sql_query($sql);
+$result = $db->sql_query($sql);
-$matches = $db->sql_fetchrowset($result);
+$matches = $db->sql_fetchrowset($result);
-$db->sql_freeresult($result);
+$db->sql_freeresult($result);
-$count_matches = sizeof($matches);
+$count_matches = sizeof($matches);
-
+
-if ($user->data['football_mobile'])
+if ($user->data['football_mobile'])
-{
+{
-	if ($count_matches > 3)
+	if ($count_matches > 3)
-	{
+	{
-		$split_after = 3;
+		$split_after = 3;
-		$splits = ceil($count_matches / 3);
+		$splits = ceil($count_matches / 3);
-	}
+	}
-	else
+	else
-	{
+	{
-		$split_after = $count_matches; 
+		$split_after = $count_matches; 
-		$splits = 1;
+		$splits = 1;
-	}
+	}
-}
+}
-else
+else
-{
+{
-	if ($count_matches > 11)
+	if ($count_matches > 11)
-	{
+	{
-		$split_after = 8;
+		$split_after = 8;
-		$splits = ceil($count_matches / 8);
+		$splits = ceil($count_matches / 8);
-	}
+	}
-	else
+	else
-	{
+	{
-		$split_after = $count_matches; 
+		$split_after = $count_matches; 
-		$splits = 1;
+		$splits = 1;
-	}
+	}
-}
+}
-
+
-// Make sure $start is set to the last page if it exceeds the amount
+// Make sure $start is set to the last page if it exceeds the amount
-if ($start < 0 || $start >= $total_users)
+if ($start < 0 || $start >= $total_users)
-{
+{
-	$start = ($start < 0) ? 0 : floor(($total_users - 1) / $config['football_users_per_page']) * $config['football_users_per_page'];
+	$start = ($start < 0) ? 0 : floor(($total_users - 1) / $config['football_users_per_page']) * $config['football_users_per_page'];
-}
+}
-else
+else
-{
+{
-	$start = floor($start / $config['football_users_per_page']) * $config['football_users_per_page'];
+	$start = floor($start / $config['football_users_per_page']) * $config['football_users_per_page'];
-}
+}
-
+
-$sql_start = $start * $count_matches;
+$sql_start = $start * $count_matches;
-$sql_limit = $config['football_users_per_page'] * $count_matches;
+$sql_limit = $config['football_users_per_page'] * $count_matches;
-
+
-// If we've got a hightlight set pass it on to pagination.
+// If we've got a hightlight set pass it on to pagination.
-// handle 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');
+$pagination = $phpbb_container->get('pagination');
-if ($user->data['football_mobile'])
+if ($user->data['football_mobile'])
-{
+{
-	$sql_start = 0;
+	$sql_start = 0;
-	$sql_limit = 99999;
+	$sql_limit = 99999;
-	
+	
-	$pagination->generate_template_pagination($base_url, 'pagination', 'start', $total_users, $sql_limit, $start);
+	$pagination->generate_template_pagination($base_url, 'pagination', 'start', $total_users, $sql_limit, $start);
-}
+}
-else
+else
-{
+{
-	$pagination->generate_template_pagination($base_url, 'pagination', 'start', $total_users, $this->config['football_users_per_page'], $start);
+	$pagination->generate_template_pagination($base_url, 'pagination', 'start', $total_users, $this->config['football_users_per_page'], $start);
-}	
+}	
-
+
-$bet_line = array();
+$bet_line = array();
-if ($count_matches > 0)
+if ($count_matches > 0)
-{
+{
-	$matches_on_matchday = true;
+	$matches_on_matchday = true;
-
+
-	$sql = "SELECT
+	$sql = "SELECT
-			u.user_id,
+			u.user_id,
-			u.username,
+			u.username,
-			m.status,
+			m.status,
-			b.goals_home AS bet_home,
+			b.goals_home AS bet_home,
-			b.goals_guest AS bet_guest,
+			b.goals_guest AS bet_guest,
-			" . select_points() . '
+			" . select_points() . '
-		FROM  ' . FOOTB_MATCHES . ' AS m
+		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 b ON (b.season = m.season AND b.league = m.league AND b.match_no = m.match_no)
-		LEFT JOIN ' . USERS_TABLE . " AS u ON (u.user_id = b.user_id)
+		LEFT JOIN ' . USERS_TABLE . " AS u ON (u.user_id = b.user_id)
-		WHERE m.season = $season 
+		WHERE m.season = $season 
-			AND m.league = $league 
+			AND m.league = $league 
-			AND m.matchday = $matchday
+			AND m.matchday = $matchday
-		ORDER BY LOWER(u.username) ASC, m.match_datetime ASC, m.match_no ASC";
+		ORDER BY LOWER(u.username) ASC, m.match_datetime ASC, m.match_no ASC";
-		
+		
-	$result = $db->sql_query_limit($sql, $sql_limit, $sql_start);
+	$result = $db->sql_query_limit($sql, $sql_limit, $sql_start);
-	$user_bets = $db->sql_fetchrowset($result);
+	$user_bets = $db->sql_fetchrowset($result);
-	$db->sql_freeresult($result);
+	$db->sql_freeresult($result);
-	$bet_index = 0;
+	$bet_index = 0;
-	$split_index = 0;
+	$split_index = 0;
-	foreach ($user_bets AS $user_bet)
+	foreach ($user_bets AS $user_bet)
-	{
+	{
-		if ($bet_index == $count_matches)
+		if ($bet_index == $count_matches)
-		{
+		{
-			$bet_index = 0;
+			$bet_index = 0;
-			$split_index = 0;
+			$split_index = 0;
-		}
+		}
-		if (!($bet_index % $split_after))
+		if (!($bet_index % $split_after))
-		{
+		{
-			$split_index++;
+			$split_index++;
-		}
+		}
-		$sum_total[$user_bet['username']] = 0;
+		$sum_total[$user_bet['username']] = 0;
-		$bet_line[$split_index][] = $user_bet;
+		$bet_line[$split_index][] = $user_bet;
-		$bet_index++; 
+		$bet_index++; 
-	}
+	}
-}
+}
-$match_index = 0;
+$match_index = 0;
-$last_match_index = 0;
+$last_match_index = 0;
-$split_index = 0;
+$split_index = 0;
-$matchday_sum_total = 0;
+$matchday_sum_total = 0;
-$colorstyle_total = ' color_finally';
+$colorstyle_total = ' color_finally';
-foreach ($matches AS $match)
+foreach ($matches AS $match)
-{
+{
-	if (!($match_index % $split_after))
+	if (!($match_index % $split_after))
-	{
+	{
-		if ($match_index > 0) 
+		if ($match_index > 0) 
-		{
+		{
-			$total = 0;
+			$total = 0;
-			$count_user = 0;
+			$count_user = 0;
-			$bet_index = 0;
+			$bet_index = 0;
-			$last_match_index = 0;
+			$last_match_index = 0;
-			foreach ($bet_line[$split_index] AS $user_bet)
+			foreach ($bet_line[$split_index] AS $user_bet)
-			{
+			{
-				if ($bet_index == 0)
+				if ($bet_index == 0)
-				{
+				{
-					$count_user++;
+					$count_user++;
-					$row_class = (!($count_user % 2)) ? 'bg1 row_light' : 'bg2 row_dark';
+					$row_class = (!($count_user % 2)) ? 'bg1 row_light' : 'bg2 row_dark';
-					if ($user_bet['user_id'] == $user->data['user_id'])
+					if ($user_bet['user_id'] == $user->data['user_id'])
-					{
+					{
-						$row_class = 'bg3  row_user';
+						$row_class = 'bg3  row_user';
-					}
+					}
-					$template->assign_block_vars('match_panel.user_row', array(
+					$template->assign_block_vars('match_panel.user_row', array(
-						'ROW_CLASS' => $row_class,
+						'ROW_CLASS' => $row_class,
-						'USER_NAME' => $user_bet['username'],
+						'USER_NAME' => $user_bet['username'],
-						)
+						)
-					);
+					);
-					$total = 0;
+					$total = 0;
-				}	
+				}	
-				$bet_index++;
+				$bet_index++;
-				$total += ($user_bet['points'] == '') ? 0 : $user_bet['points'];
+				$total += ($user_bet['points'] == '') ? 0 : $user_bet['points'];
-				if ($user_bet['status'] < 3)
+				if ($user_bet['status'] < 3)
-				{
+				{
-					$colorstyle_total = ' color_provisionally';
+					$colorstyle_total = ' color_provisionally';
-				}
+				}
-				if ($user_bet['status'] < 1 && !$config['football_view_bets'])
+				if ($user_bet['status'] < 1 && !$config['football_view_bets'])
-				{
+				{
-					// hide bets
+					// hide bets
-					$bet_home = ($user_bet['bet_home'] == '') ? '&nbsp;' : '?';
+					$bet_home = ($user_bet['bet_home'] == '') ? '&nbsp;' : '?';
-					$bet_guest = ($user_bet['bet_guest'] == '') ? '&nbsp;' : '?';
+					$bet_guest = ($user_bet['bet_guest'] == '') ? '&nbsp;' : '?';
-				}
+				}
-				else
+				else
-				{
+				{
-					$bet_home = $user_bet['bet_home'];
+					$bet_home = $user_bet['bet_home'];
-					$bet_guest = $user_bet['bet_guest'];
+					$bet_guest = $user_bet['bet_guest'];
-				}
+				}
-				
+				
-				$colorstyle_bet = color_style($user_bet['status']);
+				$colorstyle_bet = color_style($user_bet['status']);
-				$template->assign_block_vars('match_panel.user_row.bet', array(
+				$template->assign_block_vars('match_panel.user_row.bet', array(
-					'BET' 			=> $bet_home. ':'. $bet_guest,
+					'BET' 			=> $bet_home. ':'. $bet_guest,
-					'COLOR_STYLE' 	=> $colorstyle_bet,
+					'COLOR_STYLE' 	=> $colorstyle_bet,
-					'POINTS' 		=> ($user_bet['points'] == '') ? '&nbsp;' : $user_bet['points'],
+					'POINTS' 		=> ($user_bet['points'] == '') ? '&nbsp;' : $user_bet['points'],
-					)
+					)
-				);
+				);
-
+
-				if ($bet_index == $split_after)
+				if ($bet_index == $split_after)
-				{
+				{
-					$sum_total[$user_bet['username']] += $total;
+					$sum_total[$user_bet['username']] += $total;
-					$matchday_sum_total += $total;
+					$matchday_sum_total += $total;
-					$bet_index = 0;
+					$bet_index = 0;
-				}
+				}
-			}
+			}
-
+
-			$template->assign_block_vars('match_panel.tendency_footer', array(
+			$template->assign_block_vars('match_panel.tendency_footer', array(
-				'S_TOTAL' => false,
+				'S_TOTAL' => false,
-				)
+				)
-			);
+			);
-			foreach ($matches_tendency AS $match_tendency)
+			foreach ($matches_tendency AS $match_tendency)
-			{
+			{
-				$template->assign_block_vars('match_panel.tendency_footer.tendency', array(
+				$template->assign_block_vars('match_panel.tendency_footer.tendency', array(
-					'TENDENCY' => $match_tendency,
+					'TENDENCY' => $match_tendency,
-					)
+					)
-				);
+				);
-			}
+			}
-		}
+		}
-		$matches_tendency = array();
+		$matches_tendency = array();
-		$split_index++;
+		$split_index++;
-		if ($split_index == $splits)
+		if ($split_index == $splits)
-		{
+		{
-			$display_total = true;
+			$display_total = true;
-		}
+		}
-		else
+		else
-		{
+		{
-			$display_total = false;
+			$display_total = false;
-		}
+		}
-		$template->assign_block_vars('match_panel', array(
+		$template->assign_block_vars('match_panel', array(
-			'S_TOTAL' => $display_total,
+			'S_TOTAL' => $display_total,
-			)
+			)
-		);
+		);
-	}
+	}
-	if (0 == $match['home_id'])
+	if (0 == $match['home_id'])
-	{
+	{
-		$home_info 		= get_team($season, $league, $match['match_no'], 'team_id_home', $match['formula_home']);
+		$home_info 		= get_team($season, $league, $match['match_no'], 'team_id_home', $match['formula_home']);
-		$home_in_array 	= explode("#",$home_info);
+		$home_in_array 	= explode("#",$home_info);
-		$homename 		= $home_in_array[3];
+		$homename 		= $home_in_array[3];
-	}
+	}
-	else
+	else
-	{
+	{
-		$homename = $match['home_name'];
+		$homename = $match['home_name'];
-	}
+	}
-	if (0 == $match['guest_id'])
+	if (0 == $match['guest_id'])
-	{
+	{
-		$guest_info 	= get_team($season, $league, $match['match_no'], 'team_id_guest', $match['formula_guest']);
+		$guest_info 	= get_team($season, $league, $match['match_no'], 'team_id_guest', $match['formula_guest']);
-		$guest_in_array = explode("#",$guest_info);
+		$guest_in_array = explode("#",$guest_info);
-		$guestname 		= $guest_in_array[3];
+		$guestname 		= $guest_in_array[3];
-	}
+	}
-	else
+	else
-	{
+	{
-		$guestname = $match['guest_name'];
+		$guestname = $match['guest_name'];
-	}
+	}
-	$colorstyle_match = color_style($match['status']);
+	$colorstyle_match = color_style($match['status']);
-	$template->assign_block_vars('match_panel.match_entry', array(
+	$template->assign_block_vars('match_panel.match_entry', array(
-		'HOME_NAME' 	=> $homename,
+		'HOME_NAME' 	=> $homename,
-		'GUEST_NAME' 	=> $guestname,
+		'GUEST_NAME' 	=> $guestname,
-		'RESULT' 		=> $match['goals_home']. ':'.$match['goals_guest'],
+		'RESULT' 		=> $match['goals_home']. ':'.$match['goals_guest'],
-		'COLOR_STYLE' 	=> $colorstyle_match,
+		'COLOR_STYLE' 	=> $colorstyle_match,
-		)
+		)
-	);
+	);
-	if ($match['status'] < 1 && !$config['football_view_tendencies'])
+	if ($match['status'] < 1 && !$config['football_view_tendencies'])
-	{
+	{
-		// hide tendencies
+		// hide tendencies
-		$matches_tendency[] =  '?-?-?';
+		$matches_tendency[] =  '?-?-?';
-	}
+	}
-	else
+	else
-	{
+	{
-		$matches_tendency[] = $match['home']. '-'.$match['draw']. '-'.$match['guest'];
+		$matches_tendency[] = $match['home']. '-'.$match['draw']. '-'.$match['guest'];
-	}
+	}
-	$match_index++;
+	$match_index++;
-	$last_match_index++;
+	$last_match_index++;
-}
+}
-if ($count_matches > 0)
+if ($count_matches > 0)
-{
+{
-	$total = 0;
+	$total = 0;
-	$count_user = 0;
+	$count_user = 0;
-	$bet_index = 0;
+	$bet_index = 0;
-	foreach ($bet_line[$split_index] AS $user_bet)
+	foreach ($bet_line[$split_index] AS $user_bet)
-	{
+	{
-		if ($bet_index == 0)
+		if ($bet_index == 0)
-		{
+		{
-			$count_user++;
+			$count_user++;
-			$row_class = (!($count_user % 2)) ? 'bg1 row_light' : 'bg2 row_dark';
+			$row_class = (!($count_user % 2)) ? 'bg1 row_light' : 'bg2 row_dark';
-			if ($user_bet['user_id'] == $user->data['user_id'])
+			if ($user_bet['user_id'] == $user->data['user_id'])
-			{
+			{
-				$row_class = 'bg3  row_user';
+				$row_class = 'bg3  row_user';
-			}
+			}
-			$template->assign_block_vars('match_panel.user_row', array(
+			$template->assign_block_vars('match_panel.user_row', array(
-				'ROW_CLASS' => $row_class,
+				'ROW_CLASS' => $row_class,
-				'USER_NAME' => $user_bet['username'],
+				'USER_NAME' => $user_bet['username'],
-				)
+				)
-			);
+			);
-			$total = 0;
+			$total = 0;
-		}	
+		}	
-		$bet_index++;
+		$bet_index++;
-		$total += ($user_bet['points'] == '') ? 0 : $user_bet['points'];
+		$total += ($user_bet['points'] == '') ? 0 : $user_bet['points'];
-		if ($user_bet['status'] < 3)
+		if ($user_bet['status'] < 3)
-		{
+		{
-			$colorstyle_total = ' color_provisionally';
+			$colorstyle_total = ' color_provisionally';
-		}
+		}
-		if ($user_bet['status'] < 1 && !$config['football_view_bets'])
+		if ($user_bet['status'] < 1 && !$config['football_view_bets'])
-		{
+		{
-			// hide bets
+			// hide bets
-			$bet_home = ($user_bet['bet_home'] == '') ? '' : '?';
+			$bet_home = ($user_bet['bet_home'] == '') ? '' : '?';
-			$bet_guest = ($user_bet['bet_guest'] == '') ? '' : '?';
+			$bet_guest = ($user_bet['bet_guest'] == '') ? '' : '?';
-		}
+		}
-		else
+		else
-		{
+		{
-			$bet_home = $user_bet['bet_home'];
+			$bet_home = $user_bet['bet_home'];
-			$bet_guest = $user_bet['bet_guest'];
+			$bet_guest = $user_bet['bet_guest'];
-		}
+		}
-		
+		
-		$colorstyle_bet = color_style($user_bet['status']);
+		$colorstyle_bet = color_style($user_bet['status']);
-		$template->assign_block_vars('match_panel.user_row.bet', array(
+		$template->assign_block_vars('match_panel.user_row.bet', array(
-			'BET' 			=> $bet_home. ':'. $bet_guest,
+			'BET' 			=> $bet_home. ':'. $bet_guest,
-			'COLOR_STYLE' 	=> $colorstyle_bet,
+			'COLOR_STYLE' 	=> $colorstyle_bet,
-			'POINTS' 		=> ($user_bet['points'] == '') ? '&nbsp;' : $user_bet['points'],
+			'POINTS' 		=> ($user_bet['points'] == '') ? '&nbsp;' : $user_bet['points'],
-			)
+			)
-		);
+		);
-
+
-		if ($bet_index == $last_match_index)
+		if ($bet_index == $last_match_index)
-		{
+		{
-			$sum_total[$user_bet['username']] += $total;
+			$sum_total[$user_bet['username']] += $total;
-			$matchday_sum_total += $total;
+			$matchday_sum_total += $total;
-			$template->assign_block_vars('match_panel.user_row.points', array(
+			$template->assign_block_vars('match_panel.user_row.points', array(
-				'COLOR_STYLE' 	=> $colorstyle_total,
+				'COLOR_STYLE' 	=> $colorstyle_total,
-				'POINTS_TOTAL' 	=> $sum_total[$user_bet['username']],
+				'POINTS_TOTAL' 	=> $sum_total[$user_bet['username']],
-				)
+				)
-			);
+			);
-			$bet_index = 0;
+			$bet_index = 0;
-		}
+		}
-	}
+	}
-
+
-	$template->assign_block_vars('match_panel.tendency_footer', array(
+	$template->assign_block_vars('match_panel.tendency_footer', array(
-		'S_TOTAL' 		=> true,
+		'S_TOTAL' 		=> true,
-		'COLOR_STYLE' 	=> $colorstyle_total, //currently ignored
+		'COLOR_STYLE' 	=> $colorstyle_total, //currently ignored
-		'SUMTOTAL' 		=> $matchday_sum_total,
+		'SUMTOTAL' 		=> $matchday_sum_total,
-		)
+		)
-	);
+	);
-	foreach ($matches_tendency AS $match_tendency)
+	foreach ($matches_tendency AS $match_tendency)
-	{
+	{
-		$template->assign_block_vars('match_panel.tendency_footer.tendency', array(
+		$template->assign_block_vars('match_panel.tendency_footer.tendency', array(
-			'TENDENCY' => $match_tendency,
+			'TENDENCY' => $match_tendency,
-			)
+			)
-		);
+		);
-	}
+	}
-}
+}
-
+
-//extra bets
+//extra bets
-// Calculate extra bets of matchday
+// Calculate extra bets of matchday
-$sql_start = $start;
+$sql_start = $start;
-$sql_limit = $config['football_users_per_page'];
+$sql_limit = $config['football_users_per_page'];
-$sql = "SELECT e.*,
+$sql = "SELECT e.*,
-		t1.team_name AS result_team
+		t1.team_name AS result_team
-	FROM  " . FOOTB_EXTRA . ' AS e
+	FROM  " . FOOTB_EXTRA . ' AS e
-	LEFT JOIN ' . FOOTB_TEAMS . " AS t1 ON (t1.season = e.season AND t1.league = e.league AND t1.team_id = e.result)
+	LEFT JOIN ' . FOOTB_TEAMS . " AS t1 ON (t1.season = e.season AND t1.league = e.league AND t1.team_id = e.result)
-	WHERE e.season = $season 
+	WHERE e.season = $season 
-		AND e.league = $league 
+		AND e.league = $league 
-		AND (e.matchday = $matchday OR e.matchday_eval = $matchday)
+		AND (e.matchday = $matchday OR e.matchday_eval = $matchday)
-	ORDER BY e.extra_no ASC";
+	ORDER BY e.extra_no ASC";
-	
+	
-$result = $db->sql_query($sql);
+$result = $db->sql_query($sql);
-while ($row = $db->sql_fetchrow($result))
+while ($row = $db->sql_fetchrow($result))
-{
+{
-	$extra_no = $row['extra_no'];
+	$extra_no = $row['extra_no'];
-	switch($row['question_type'])
+	switch($row['question_type'])
-	{
+	{
-		case '1':
+		case '1':
-			{
+			{
-				$display_type = 1;
+				$display_type = 1;
-				$eval_title = sprintf($user->lang['EXTRA_HIT']);
+				$eval_title = sprintf($user->lang['EXTRA_HIT']);
-			}
+			}
-			break;
+			break;
-		case '2':
+		case '2':
-			{
+			{
-				$display_type = 1;
+				$display_type = 1;
-				$eval_title = sprintf($user->lang['EXTRA_MULTI_HIT']);
+				$eval_title = sprintf($user->lang['EXTRA_MULTI_HIT']);
-			}
+			}
-			break;
+			break;
-		case '3':
+		case '3':
-			{
+			{
-				$display_type = 2;
+				$display_type = 2;
-				$eval_title = sprintf($user->lang['EXTRA_HIT']);
+				$eval_title = sprintf($user->lang['EXTRA_HIT']);
-			}
+			}
-			break;
+			break;
-		case '4':
+		case '4':
-			{
+			{
-				$display_type = 2;
+				$display_type = 2;
-				$eval_title = sprintf($user->lang['EXTRA_MULTI_HIT']);
+				$eval_title = sprintf($user->lang['EXTRA_MULTI_HIT']);
-			}
+			}
-			break;
+			break;
-		case '5':
+		case '5':
-			{
+			{
-				$display_type = 2;
+				$display_type = 2;
-				$eval_title = sprintf($user->lang['EXTRA_DIFFERENCE']);
+				$eval_title = sprintf($user->lang['EXTRA_DIFFERENCE']);
-			}
+			}
-			break;
+			break;
-		default :
+		default :
-			{
+			{
-				$display_type = 2;
+				$display_type = 2;
-				$eval_title = '';
+				$eval_title = '';
-			}
+			}
-			break;
+			break;
-	}
+	}
-	$extra_colorstyle = color_style($row['extra_status']);
+	$extra_colorstyle = color_style($row['extra_status']);
-
+
-	$template->assign_block_vars('extra_panel', array(
+	$template->assign_block_vars('extra_panel', array(
-		'QUESTION' 			=> $row['question'],
+		'QUESTION' 			=> $row['question'],
-		'RESULT' 			=> ($display_type == 1) ? $row['result_team'] : $row['result'],
+		'RESULT' 			=> ($display_type == 1) ? $row['result_team'] : $row['result'],
-		'POINTS' 			=> $row['extra_points'],
+		'POINTS' 			=> $row['extra_points'],
-		'EVALUATION' 		=> ($row['matchday'] == $row['matchday_eval']) ? sprintf($user->lang['MATCHDAY']) : sprintf($user->lang['TOTAL']),
+		'EVALUATION' 		=> ($row['matchday'] == $row['matchday_eval']) ? sprintf($user->lang['MATCHDAY']) : sprintf($user->lang['TOTAL']),
-		'EVALUATION_TITLE' 	=> $eval_title,
+		'EVALUATION_TITLE' 	=> $eval_title,
-		'COLOR_STYLE' 		=> $extra_colorstyle,
+		'COLOR_STYLE' 		=> $extra_colorstyle,
-		)
+		)
-	);
+	);
-
+
-	// Get all extra bets of matchday
+	// Get all extra bets of matchday
-	$bet_number = 0;
+	$bet_number = 0;
-	$sql = "SELECT u.user_id,
+	$sql = "SELECT u.user_id,
-			u.username,
+			u.username,
-			e.*,
+			e.*,
-			eb.bet,
+			eb.bet,
-			eb.bet_points,
+			eb.bet_points,
-			t2.team_name AS bet_team
+			t2.team_name AS bet_team
-		FROM " . FOOTB_BETS . ' AS b 
+		FROM " . FOOTB_BETS . ' AS b 
-		LEFT JOIN ' . USERS_TABLE . ' AS u ON (u.user_id = b.user_id)
+		LEFT JOIN ' . USERS_TABLE . ' AS u ON (u.user_id = b.user_id)
-		LEFT JOIN ' . FOOTB_EXTRA . " AS e ON (e.season = b.season AND e.league = b.league AND (e.matchday = $matchday OR e.matchday_eval = $matchday) AND e.extra_no = $extra_no)
+		LEFT JOIN ' . FOOTB_EXTRA . " AS e ON (e.season = b.season AND e.league = b.league AND (e.matchday = $matchday OR e.matchday_eval = $matchday) AND e.extra_no = $extra_no)
-		LEFT JOIN " . FOOTB_EXTRA_BETS . " AS eb ON (eb.season = b.season AND eb.league = b.league AND eb.extra_no = $extra_no AND eb.user_id = b.user_id)
+		LEFT JOIN " . FOOTB_EXTRA_BETS . " AS eb ON (eb.season = b.season AND eb.league = b.league AND eb.extra_no = $extra_no AND eb.user_id = b.user_id)
-		LEFT JOIN " . FOOTB_TEAMS . " AS t2 ON (t2.season = b.season AND t2.league = b.league AND t2.team_id = eb.bet)
+		LEFT JOIN " . FOOTB_TEAMS . " AS t2 ON (t2.season = b.season AND t2.league = b.league AND t2.team_id = eb.bet)
-		WHERE b.season = $season 
+		WHERE b.season = $season 
-			AND b.league = $league 
+			AND b.league = $league 
-			AND b.match_no = 1
+			AND b.match_no = 1
-		GROUP by b.user_id
+		GROUP by b.user_id
-		ORDER BY LOWER(u.username) ASC";
+		ORDER BY LOWER(u.username) ASC";
-		
+		
-	$result_bet = $db->sql_query_limit($sql, $sql_limit, $sql_start);
+	$result_bet = $db->sql_query_limit($sql, $sql_limit, $sql_start);
-
+
-	while ($user_row = $db->sql_fetchrow($result_bet))
+	while ($user_row = $db->sql_fetchrow($result_bet))
-	{
+	{
-		$bet_number++ ;
+		$bet_number++ ;
-		$row_class = (!($bet_number % 2)) ? 'bg1 row_light' : 'bg2 row_dark';
+		$row_class = (!($bet_number % 2)) ? 'bg1 row_light' : 'bg2 row_dark';
-		if ($user_row['user_id'] == $user->data['user_id'])
+		if ($user_row['user_id'] == $user->data['user_id'])
-		{
+		{
-			$row_class = 'bg3  row_user';
+			$row_class = 'bg3  row_user';
-		}
+		}
-
+
-		if ($user_row['extra_status'] < 1 && !$config['football_view_bets'])
+		if ($user_row['extra_status'] < 1 && !$config['football_view_bets'])
-		{
+		{
-			// hide bets
+			// hide bets
-			$bet = ($user_row['bet'] == '') ? '&nbsp;' : '?';
+			$bet = ($user_row['bet'] == '') ? '&nbsp;' : '?';
-			$bet_team = ($user_row['bet_team'] == NULL) ? '&nbsp;' : '?';
+			$bet_team = ($user_row['bet_team'] == NULL) ? '&nbsp;' : '?';
-		}
+		}
-		else
+		else
-		{
+		{
-			$bet = ($user_row['bet'] == '') ? '&nbsp;' : $user_row['bet'];
+			$bet = ($user_row['bet'] == '') ? '&nbsp;' : $user_row['bet'];
-			$bet_team = ($user_row['bet_team'] == NULL) ? '&nbsp;' : $user_row['bet_team'];
+			$bet_team = ($user_row['bet_team'] == NULL) ? '&nbsp;' : $user_row['bet_team'];
-		}
+		}
-
+
-		
+		
-		$template->assign_block_vars('extra_panel.user_row', array(
+		$template->assign_block_vars('extra_panel.user_row', array(
-			'ROW_CLASS' 	=> $row_class,
+			'ROW_CLASS' 	=> $row_class,
-			'USER_NAME' 	=> $user_row['username'],
+			'USER_NAME' 	=> $user_row['username'],
-			'BET' 			=> ($display_type == 1) ? $bet_team : $bet,
+			'BET' 			=> ($display_type == 1) ? $bet_team : $bet,
-			'BET_POINTS' 	=> $user_row['bet_points'],
+			'BET_POINTS' 	=> $user_row['bet_points'],
-			'COLOR_STYLE' 	=> $extra_colorstyle,
+			'COLOR_STYLE' 	=> $extra_colorstyle,
-			)
+			)
-		);
+		);
-	}
+	}
-	$db->sql_freeresult($result_bet);
+	$db->sql_freeresult($result_bet);
-}
+}
-$db->sql_freeresult($result);
+$db->sql_freeresult($result);
-
+
-$sidename = sprintf($user->lang['ALL_BETS']);
+$sidename = sprintf($user->lang['ALL_BETS']);
-$template->assign_vars(array(
+$template->assign_vars(array(
-	'S_DISPLAY_ALL_BETS' 		=> true,
+	'S_DISPLAY_ALL_BETS' 		=> true,
-	'S_SIDENAME' 				=> $sidename,
+	'S_SIDENAME' 				=> $sidename,
-	'S_MATCHES_ON_MATCHDAY' 	=> $matches_on_matchday,
+	'S_MATCHES_ON_MATCHDAY' 	=> $matches_on_matchday,
-	'S_SPALTEN' 				=> ($count_matches * 2) + 2,
+	'S_SPALTEN' 				=> ($count_matches * 2) + 2,
-	'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),
-	'TOTAL_USERS'				=> ($total_users == 1) ? $user->lang['VIEW_BET_USER'] : sprintf($user->lang['VIEW_BET_USERS'], $total_users),
+	'TOTAL_USERS'				=> ($total_users == 1) ? $user->lang['VIEW_BET_USER'] : sprintf($user->lang['VIEW_BET_USERS'], $total_users),
-	)
+	)
-);
+);
-?>

block/bet.php

@@ -508,8 +508,8 @@ $template->assign_vars(array(
 	'S_SIDENAME' 				=> $sidename,
 	'BET_EXPLAIN' 				=> $bet_explain,
 	'JOIN_LEAGUE'	 			=> ($link_rules == '') ? '' : sprintf($user->lang['JOIN_LEAGUE'], $link_rules),
-	'S_FORM_ACTION_BET' 		=> $this->helper->route('football_main_controller', array('side' => 'bet', 's' => $season, 'l' => $league, 'm' => $matchday, 'action' => 'bet')),
+	'S_FORM_ACTION_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_main_controller', array('side' => 'bet', 's' => $season, 'l' => $league, 'm' => $matchday, 'action' => 'join')),
+	'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_GROUP'				=> $data_group,

block/delivery.php

@@ -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
+		GROUP BY m.season, m.league, m.matchday, l.league_name_short, matchday_name, delivery
-		ORDER BY delivery, m.league";
+		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',

block/dload_bank.php

@@ -20,7 +20,7 @@ $action='';
 
 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
 {

block/dload_bank_open.php

@@ -19,7 +19,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
 {

block/dload_export.php

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

block/last_results.php

@@ -1,150 +1,150 @@
-<?php
+<?php
-/**
+/**
-*
+*
-* @package phpBB Extension - Football Football
+* @package phpBB Extension - Football Football
-* @copyright (c) 2016 football (http://football.bplaced.net)
+* @copyright (c) 2016 football (http://football.bplaced.net)
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
-*
+*
-*/
+*/
-
+
-if (!defined('IN_PHPBB') OR !defined('IN_FOOTBALL'))
+if (!defined('IN_PHPBB') OR !defined('IN_FOOTBALL'))
-{
+{
-	exit;
+	exit;
-}
+}
-
+
-$user_is_member = user_is_member($user->data['user_id'], $season, $league);
+$user_is_member = user_is_member($user->data['user_id'], $season, $league);
-$edit_mode 		= false;
+$edit_mode 		= false;
-$display_group 	= false;
+$display_group 	= false;
-$display_ko 	= false;
+$display_ko 	= false;
-$data_lastresults 	= false;
+$data_lastresults 	= false;
-$curr_year 		= date("Y"); 
+$curr_year 		= date("Y"); 
-$matchnumber 	= 0;
+$matchnumber 	= 0;
-$match_date 	= "";
+$match_date 	= "";
-
+
-$local_board_time = time() + ($config['football_time_shift'] * 3600); 
+$local_board_time = time() + ($config['football_time_shift'] * 3600); 
-$sql = 'SELECT * FROM ' . FOOTB_MATCHDAYS . " WHERE status = 0 AND delivery_date < FROM_UNIXTIME('$local_board_time')";
+$sql = 'SELECT * FROM ' . FOOTB_MATCHDAYS . " WHERE status = 0 AND delivery_date < FROM_UNIXTIME('$local_board_time')";
-
+
-// Calculate matches AND results of matchday
+// Calculate matches AND results of matchday
-$sql = "SELECT
+$sql = "SELECT
-		m.season,
+		m.season,
-		m.league,
+		m.league,
-		m.matchday,
+		m.matchday,
-		m.status,
+		m.status,
-		m.match_datetime,
+		m.match_datetime,
-		LEFT(m.match_datetime, 10) AS match_date,
+		LEFT(m.match_datetime, 10) AS match_date,
-		l.league_name,
+		l.league_name,
-		t1.team_symbol AS home_symbol,
+		t1.team_symbol AS home_symbol,
-		t2.team_symbol AS guest_symbol,
+		t2.team_symbol AS guest_symbol,
-		t1.team_name AS home_name,
+		t1.team_name AS home_name,
-		t2.team_name AS guest_name,
+		t2.team_name AS guest_name,
-		t1.team_name_short AS home_short,
+		t1.team_name_short AS home_short,
-		t2.team_name_short AS guest_short,
+		t2.team_name_short AS guest_short,
-		m.goals_home, 
+		m.goals_home, 
-		m.goals_guest,
+		m.goals_guest,
-		m.ko_match AS ko_match,
+		m.ko_match AS ko_match,
-		m.goals_overtime_home AS kogoals_home,
+		m.goals_overtime_home AS kogoals_home,
-		m.goals_overtime_guest AS kogoals_guest,
+		m.goals_overtime_guest AS kogoals_guest,
-		CONCAT(
+		CONCAT(
-			CASE DATE_FORMAT(m.match_datetime,'%w')
+			CASE DATE_FORMAT(m.match_datetime,'%w')
-				WHEN 0 THEN '" . $lang_dates['Sun'] . "'
+				WHEN 0 THEN '" . $lang_dates['Sun'] . "'
-				WHEN 1 THEN '" . $lang_dates['Mon'] . "'
+				WHEN 1 THEN '" . $lang_dates['Mon'] . "'
-				WHEN 2 THEN '" . $lang_dates['Tue'] . "'
+				WHEN 2 THEN '" . $lang_dates['Tue'] . "'
-				WHEN 3 THEN '" . $lang_dates['Wed'] . "'
+				WHEN 3 THEN '" . $lang_dates['Wed'] . "'
-				WHEN 4 THEN '" . $lang_dates['Thu'] . "'
+				WHEN 4 THEN '" . $lang_dates['Thu'] . "'
-				WHEN 5 THEN '" . $lang_dates['Fri'] . "'
+				WHEN 5 THEN '" . $lang_dates['Fri'] . "'
-				WHEN 6 THEN '" . $lang_dates['Sat'] . "'
+				WHEN 6 THEN '" . $lang_dates['Sat'] . "'
-				ELSE 'Error' END,
+				ELSE 'Error' END,
-			DATE_FORMAT(m.match_datetime,' %d.%m. %H:%i')
+			DATE_FORMAT(m.match_datetime,' %d.%m. %H:%i')
-		) AS match_time
+		) AS match_time
-	FROM  " . FOOTB_MATCHES . ' AS m
+	FROM  " . FOOTB_MATCHES . ' AS m
-	LEFT JOIN ' . FOOTB_LEAGUES . ' AS l ON (l.season = m.season AND l.league = m.league)
+	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 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_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')
+	WHERE m.match_datetime < FROM_UNIXTIME('$local_board_time')
-	ORDER BY m.match_datetime DESC, m.league ASC
+	ORDER BY m.match_datetime DESC, m.league ASC
-	LIMIT 100";
+	LIMIT 100";
-	
+	
-$result = $db->sql_query($sql);
+$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));
+$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))
+while($row = $db->sql_fetchrow($result))
-{
+{
-	$data_lastresults = true;
+	$data_lastresults = true;
-	$matchnumber++ ;
+	$matchnumber++ ;
-	$row_class = (!($matchnumber % 2)) ? 'bg1 row_light' : 'bg2 row_dark';
+	$row_class = (!($matchnumber % 2)) ? 'bg1 row_light' : 'bg2 row_dark';
-	
+	
-	if ($match_date <> $row['match_date'])
+	if ($match_date <> $row['match_date'])
-	{
+	{
-		$match_date = ($match_date == "") ? $row['match_date'] : $match_date;
+		$match_date = ($match_date == "") ? $row['match_date'] : $match_date;
-		if ($matchnumber > $config['football_display_last_results'] )
+		if ($matchnumber > $config['football_display_last_results'] )
-		{
+		{
-			break;
+			break;
-		}
+		}
-	}
+	}
-	$homelogo 	= $row['home_symbol'];
+	$homelogo 	= $row['home_symbol'];
-	$homename 	= $row['home_name'];
+	$homename 	= $row['home_name'];
-	$homeshort 	= $row['home_short'];
+	$homeshort 	= $row['home_short'];
-
+
-	$guestlogo 	= $row['guest_symbol'];
+	$guestlogo 	= $row['guest_symbol'];
-	$guestname 	= $row['guest_name'];
+	$guestname 	= $row['guest_name'];
-	$guestshort	= $row['guest_short'];
+	$guestshort	= $row['guest_short'];
-
+
-	if ($homelogo <> '')
+	if ($homelogo <> '')
-	{
+	{
-		$logoH = "<img src=\"" . $ext_path . 'images/flags/' . $homelogo . "\" alt=\"" . $homelogo . "\" width=\"20\" height=\"20\"/>" ;
+		$logoH = "<img src=\"" . $ext_path . 'images/flags/' . $homelogo . "\" alt=\"" . $homelogo . "\" width=\"20\" height=\"20\"/>" ;
-	}
+	}
-	else
+	else
-	{
+	{
-		$logoH = "<img src=\"" . $ext_path . "images/flags/blank.gif\" alt=\"\" width=\"20\" height=\"20\"/>" ;
+		$logoH = "<img src=\"" . $ext_path . "images/flags/blank.gif\" alt=\"\" width=\"20\" height=\"20\"/>" ;
-	}
+	}
-	if ($guestlogo <> '')
+	if ($guestlogo <> '')
-	{
+	{
-		$logoG = "<img src=\"" . $ext_path . 'images/flags/' . $guestlogo . "\" alt=\"" . $guestlogo . "\" width=\"20\" height=\"20\"/>" ;
+		$logoG = "<img src=\"" . $ext_path . 'images/flags/' . $guestlogo . "\" alt=\"" . $guestlogo . "\" width=\"20\" height=\"20\"/>" ;
-	}
+	}
-	else
+	else
-	{
+	{
-		$logoG = "<img src=\"" . $ext_path . "images/flags/blank.gif\" alt=\"\" width=\"20\" height=\"20\"/>" ;
+		$logoG = "<img src=\"" . $ext_path . "images/flags/blank.gif\" alt=\"\" width=\"20\" height=\"20\"/>" ;
-	}
+	}
-
+
-
+
-	$goals_home		= ($row['goals_home'] == '') ? '- ' : $row['goals_home'];
+	$goals_home		= ($row['goals_home'] == '') ? '- ' : $row['goals_home'];
-	$goals_guest	= ($row['goals_guest'] == '') ? ' -' : $row['goals_guest'];
+	$goals_guest	= ($row['goals_guest'] == '') ? ' -' : $row['goals_guest'];
-	$kogoals_home	= ($row['kogoals_home'] == '') ? '- ' : $row['kogoals_home'];
+	$kogoals_home	= ($row['kogoals_home'] == '') ? '- ' : $row['kogoals_home'];
-	$kogoals_guest	= ($row['kogoals_guest'] == '') ? ' -' : $row['kogoals_guest'];
+	$kogoals_guest	= ($row['kogoals_guest'] == '') ? ' -' : $row['kogoals_guest'];
-	$colorstyle 	= color_style($row['status']);
+	$colorstyle 	= color_style($row['status']);
-	
+	
-	$template->assign_block_vars('last_results', array(
+	$template->assign_block_vars('last_results', array(
-		'ROW_CLASS' 	=> $row_class,
+		'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'])),
+		'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_DATE' 	=> $row['match_date'],
-		'MATCH_TIME' 	=> $row['match_time'],
+		'MATCH_TIME' 	=> $row['match_time'],
-		'LEAGUE_NAME' 	=> $row['league_name'],
+		'LEAGUE_NAME' 	=> $row['league_name'],
-		'LOGO_HOME' 	=> $logoH,
+		'LOGO_HOME' 	=> $logoH,
-		'LOGO_GUEST' 	=> $logoG,
+		'LOGO_GUEST' 	=> $logoG,
-		'HOME_NAME' 	=> $homename,
+		'HOME_NAME' 	=> $homename,
-		'GUEST_NAME' 	=> $guestname,
+		'GUEST_NAME' 	=> $guestname,
-		'HOME_SHORT' 	=> $homeshort,
+		'HOME_SHORT' 	=> $homeshort,
-		'GUEST_SHORT' 	=> $guestshort,
+		'GUEST_SHORT' 	=> $guestshort,
-		'GOALS_HOME' 	=> $goals_home,
+		'GOALS_HOME' 	=> $goals_home,
-		'GOALS_GUEST'	=> $goals_guest,
+		'GOALS_GUEST'	=> $goals_guest,
-		'COLOR_STYLE' 	=> color_style($row['status']),
+		'COLOR_STYLE' 	=> color_style($row['status']),
-		'KOGOALS_HOME' 	=> $kogoals_home,
+		'KOGOALS_HOME' 	=> $kogoals_home,
-		'KOGOALS_GUEST'	=> $kogoals_guest,
+		'KOGOALS_GUEST'	=> $kogoals_guest,
-		'COLOR_STYLE' 	=> $colorstyle,
+		'COLOR_STYLE' 	=> $colorstyle,
-		)
+		)
-	);
+	);
-}
+}
-$db->sql_freeresult($result);
+$db->sql_freeresult($result);
-
+
-
+
-
+
-$sidename = sprintf($user->lang['LAST_RESULTS']);
+$sidename = sprintf($user->lang['LAST_RESULTS']);
-
+
-$template->assign_vars(array(
+$template->assign_vars(array(
-	'S_DISPLAY_LAST_RESULTS' 	=> true,
+	'S_DISPLAY_LAST_RESULTS' 	=> true,
-	'S_SIDENAME' 				=> $sidename,
+	'S_SIDENAME' 				=> $sidename,
-	'S_DATA_LAST_RESULTS' 		=> $data_lastresults,
+	'S_DATA_LAST_RESULTS' 		=> $data_lastresults,
-	'S_USER_IS_MEMBER' 			=> $user_is_member,
+	'S_USER_IS_MEMBER' 			=> $user_is_member,
-	)
+	)
-);
+);
-
+
 ?>

block/my_koeff.php

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

block/odds.php

@@ -13,6 +13,8 @@ if (!defined('IN_PHPBB') OR !defined('IN_FOOTBALL'))
 }
 
 $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
+		m.trend	
-	LEFT JOIN ' . FOOTB_TEAMS . ' AS t1 ON (t1.season = m.season AND t1.league = m.league AND t1.team_id = m.team_id_home)
+		FROM " . FOOTB_MATCHES . ' AS m
-	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 AND b.user_id = $userid)
-	WHERE  m.season = $season 
+		LEFT JOIN " . FOOTB_TEAMS . ' AS t1 ON (t1.season = m.season AND t1.league = m.league AND t1.team_id = m.team_id_home)
-		AND m.league = $league
+		LEFT JOIN ' . FOOTB_TEAMS . " AS t2 ON (t2.season = m.season AND t2.league = m.league AND t2.team_id = m.team_id_guest)
-		AND m.matchday = $matchday
+		WHERE  m.season = $season 
-	ORDER BY m.match_datetime ASC, m.match_no ASC";
+			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, 

block/rank_matchday.php

@@ -1,72 +1,71 @@
-<?php
+<?php
-/**
+/**
-*
+*
-* @package phpBB Extension - Football Football
+* @package phpBB Extension - Football Football
-* @copyright (c) 2016 football (http://football.bplaced.net)
+* @copyright (c) 2016 football (http://football.bplaced.net)
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
-*
+*
-*/
+*/
-
+
-if (!defined('IN_PHPBB') OR !defined('IN_FOOTBALL'))
+if (!defined('IN_PHPBB') OR !defined('IN_FOOTBALL'))
-{
+{
-	exit;
+	exit;
-}
+}
-
+
-if ($league <> 0)
+if ($league <> 0)
-{
+{
-	$data_rank_matchday = false;
+	$data_rank_matchday = false;
-	$index = 0;
+	$index = 0;
-	$sql = "SELECT
+	$sql = "SELECT
-			r.status,
+			r.status,
-			r.rank,
+			r.rank,
-			r.user_id,
+			r.user_id,
-			u.username,
+			u.username,
-			r.points,
+			r.points,
-			IF(r.win=0, '', r.win) AS win
+			IF(r.win=0, '', r.win) AS win
-		FROM  " . FOOTB_RANKS . ' AS r
+		FROM  " . FOOTB_RANKS . ' AS r
-		LEFT Join ' . USERS_TABLE . " AS u ON (r.user_id = u.user_id)
+		LEFT Join ' . USERS_TABLE . " AS u ON (r.user_id = u.user_id)
-		WHERE r.season = $season 
+		WHERE r.season = $season 
-			AND r.league = $league 
+			AND r.league = $league 
-			AND r.matchday = $matchday 
+			AND r.matchday = $matchday 
-			AND r.status IN (2,3)
+			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);
+	$result = $db->sql_query($sql);
-	while($row = $db->sql_fetchrow($result))
+	while($row = $db->sql_fetchrow($result))
-	{
+	{
-		$index++;
+		$index++;
-		if (($index <= $config['football_display_ranks']) OR ($row['user_id'] == $user->data['user_id']))
+		if (($index <= $config['football_display_ranks']) OR ($row['user_id'] == $user->data['user_id']))
-		{
+		{
-			$data_rank_matchday = true;
+			$data_rank_matchday = true;
-			$row_class = (!($index % 2)) ? 'bg1 row_light' : 'bg2 row_dark';
+			$row_class = (!($index % 2)) ? 'bg1 row_light' : 'bg2 row_dark';
-			if ($row['user_id'] == $user->data['user_id'])
+			if ($row['user_id'] == $user->data['user_id'])
-			{
+			{
-				$row_class = 'bg3  row_user';
+				$row_class = 'bg3  row_user';
-			}
+			}
-			$colorstyle = color_style($row['status']);
+			$colorstyle = color_style($row['status']);
-				
+				
-			$template->assign_block_vars('rank', array(
+			$template->assign_block_vars('rank', array(
-				'RANK' 			=> $row['rank'],
+				'RANK' 			=> $row['rank'],
-				'ROW_CLASS' 	=> $row_class,
+				'ROW_CLASS' 	=> $row_class,
-				'USERID' 		=> $row['user_id'],
+				'USERID' 		=> $row['user_id'],
-				'USERNAME' 		=> $row['username'],
+				'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,
-																					'm' => $matchday, 'u' => $row['user_id'])),
+																					'm' => $matchday, 'u' => $row['user_id'])),
-				'POINTS' 		=> $row['points'],
+				'POINTS' 		=> $row['points'],
-				'COLOR_STYLE' 	=> $colorstyle,
+				'COLOR_STYLE' 	=> $colorstyle,
-				'WIN' 			=> $row['win'],
+				'WIN' 			=> $row['win'],
-				)
+				)
-			);
+			);
-		}
+		}
-	}
+	}
-	$db->sql_freeresult($result);
+	$db->sql_freeresult($result);
-	$league_info = league_info($season, $league);
+	$league_info = league_info($season, $league);
-
+
-	$template->assign_vars(array(
+	$template->assign_vars(array(
-		'S_DISPLAY_RANK_MATCHDAY' 	=> true,
+		'S_DISPLAY_RANK_MATCHDAY' 	=> true,
-		'S_DATA_RANK_MATCHDAY' 		=> $data_rank_matchday,
+		'S_DATA_RANK_MATCHDAY' 		=> $data_rank_matchday,
-		'S_WIN' 					=> ($league_info['win_matchday'] == '0') ? false : true,
+		'S_WIN' 					=> ($league_info['win_matchday'] == '0') ? false : true,
-		'WIN_NAME' 					=> $config['football_win_name'],
+		'WIN_NAME' 					=> $config['football_win_name'],
-	));
+	));
-}
+}
-?>

block/rank_total.php

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

block/ranks_matchday.php

@@ -53,7 +53,7 @@ $sql = "SELECT
 		AND b.league = $league 
 		AND m.status IN (2,3) 
 		AND m.matchday = $matchday
-	GROUP BY user_id";
+	GROUP BY b.user_id";
 
 $result = $db->sql_query($sql);
 $usersstats = $db->sql_fetchrowset($result);
@@ -126,7 +126,7 @@ else
 $sql_limit = $config['football_users_per_page'];
 
 // handle pagination.
-$base_url = $this->helper->route('football_main_controller', array('side' => 'ranks_matchday', 's' => $season, 'l' => $league, 'm' => $matchday));
+$base_url = $this->helper->route('football_football_controller', array('side' => 'ranks_matchday', 's' => $season, 'l' => $league, 'm' => $matchday));
 $pagination = $phpbb_container->get('pagination');
 $pagination->generate_template_pagination($base_url, 'pagination', 'start', $total_users, $this->config['football_users_per_page'], $start);
 																$data_ranks = false;
@@ -224,8 +224,8 @@ while($row = $db->sql_fetchrow($result))
 		'ROW_CLASS' 	=> $row_class,
 		'RANK' 			=> $rankof[$row['user_id']],
 		'NO_CHANGES'	=> ($change_sign == '=') ? true : false,
-		'WORSENED'		=> ($change_sign == '-') ? true : false,
+		'WORSENED'		=> ($change_sign == '+') ? true : false,
-		'IMPROVED'		=> ($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/results.php

@@ -416,7 +416,7 @@ $template->assign_vars(array(
 	'S_SIDENAME' 				=> $sidename,
 	'RESULT_EXPLAIN' 			=> $result_explain,
 	'LABEL_FINALRESULT' 		=> $label_finalresult,
-	'S_FORM_ACTION_RESULT' 		=> $this->helper->route('football_main_controller', array('side' => 'results', 's' => $season, 'l' => $league, 'm' => $matchday, 'action' => 'result')),
+	'S_FORM_ACTION_RESULT' 		=> $this->helper->route('football_football_controller', array('side' => 'results', 's' => $season, 'l' => $league, 'm' => $matchday, 'action' => 'result')),
 	'S_DATA_RESULTS' 			=> $data_results,
 	'S_USER_IS_MEMBER' 			=> $user_is_member,
 	'S_DISPLAY_GROUP'			=> $display_group,

block/rules_popup.php

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

block/table.php

@@ -151,7 +151,7 @@ foreach($points_ary as $group_id => $points)
 				)
 			);
 		}		
-	}     
+	}
 }
 
 $db->sql_freeresult($result);

block/under_construction.php

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

block/viewplan_popup.php

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

composer.json

@@ -1,29 +1,30 @@
 {
-	"name": "football/football",
+	"name" : "football/football",
-	"type": "phpbb-extension",
+	"type" : "phpbb-extension",
-	"description": "Football Prediction League",
+	"description" : "Football Prediction League",
-	"homepage": "http://football.bplaced.net",
+	"homepage" : "http://football.bplaced.net",
-	"version": "0.9.9",
+	"version" : "0.9.9",
-	"time": "2017-09-09",
+	"time" : "2021-04-04",
-	"license": "GPL-2.0",
+	"license" : "GPL-2.0",
-	"authors": [{
+	"authors" : [{
-			"name": "J. Helmke",
+			"name" : "J. Helmke",
-			"email": "phpBB3.football@gmx.de",
+			"email" : "phpBB3.football@gmx.de",
-			"homepage": "http://football.bplaced.net",
+			"homepage" : "http://football.bplaced.net",
-			"role": "Lead Developer"
+			"role" : "Lead Developer"
-		}],
+		}
-	"require": {
+	],
-		"php": ">=5.3.3"
+	"require" : {
+		"php" : ">=5.3.3"
 	},
-	"extra": {
+	"extra" : {
-		"display-name": "Football Prediction League",
+		"display-name" : "Football Prediction League",
-		"soft-require": {
+		"soft-require" : {
-			"phpbb/phpbb": ">3.1.*"
+			"phpbb/phpbb" : ">=3.2.8,<3.4"
 		},
-		"version-check": {
+		"version-check" : {
-			"host": "football.bplaced.net",
+			"host" : "football.bplaced.net",
-			"directory": "/updatecheck",
+			"directory" : "/updatecheck",
-			"filename": "football_predictionleague.json"
+			"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
+            - '@auth'
-            - @config
+            - '@config'
-            - @ext.manager
+            - '@ext.manager'
-            - @notification_manager
+            - '@notification_manager'
-            - @log
+            - '@log'
-            - @path_helper
+            - '@path_helper'
-            - @dbal.conn           
+            - '@dbal.conn'
-            - @controller.helper
+            - '@controller.helper'
-            - @template
+            - '@template'
-            - @user
+            - '@user'
-            - @pagination
+            - '@pagination'
-            - %core.root_path% 
+            - '%core.root_path%'
-            - %core.php_ext%	
+            - '%core.php_ext%'
             
     football.football.controller_popup:
         class: football\football\controller\popup
         arguments:
-            - @auth
+            - '@auth'
-            - @config
+            - '@config'
-            - @ext.manager
+            - '@ext.manager'
-            - @path_helper
+            - '@path_helper'
-            - @dbal.conn           
+            - '@dbal.conn'
-            - @controller.helper
+            - '@controller.helper'
-            - @template
+            - '@template'
-            - @user
+            - '@user'
-            - @pagination
+            - '@pagination'
-            - %core.root_path% 
+            - '%core.root_path%'
-            - %core.php_ext%	
+            - '%core.php_ext%'
 
     football.football.controller_download:
         class: football\football\controller\download
         arguments:
-            - @auth
+            - '@auth'
-            - @config
+            - '@config'
-            - @ext.manager
+            - '@ext.manager'
-            - @path_helper
+            - '@path_helper'
-            - @dbal.conn           
+            - '@dbal.conn'
-            - @controller.helper
+            - '@controller.helper'
-            - @template
+            - '@template'
-            - @user
+            - '@user'
-            - %core.root_path% 
+            - '%core.root_path%'
-            - %core.php_ext%	
+            - '%core.php_ext%'
 
     football.football.version.check:
         class: football\football\includes\version_check
         scope: prototype
         arguments:
-            - %football.version_data%
+            - '%football.version_data%'
-            - @config
+            - '@config'
-            - @version_helper
+            - '@version_helper'
-            - @template
+            - '@template'
-            - @user
+            - '@user'
 
     football.football.controller_xml:
         class: football\football\controller\xmlplan
         arguments:
-            - @config
+            - '@config'
-            - @ext.manager
+            - '@ext.manager'
-            - @path_helper
+            - '@path_helper'
-            - @dbal.conn
+            - '@dbal.conn'
-            - @user
+            - '@user'
-            - %core.root_path%
+            - '%core.root_path%'
-            - %core.php_ext%
+            - '%core.php_ext%'
 
     football.football.core.functions.points:
         class: football\football\core\functions_points
         arguments:
-            - @user
+            - '@user'
-            - @dbal.conn
+            - '@dbal.conn'
 
     football.football.listener:
         class: football\football\event\main_listener
         arguments:
-            - @auth
+            - '@auth'
-            - @config
+            - '@config'
-            - @controller.helper
+            - '@controller.helper'
-            - @template
+            - '@template'
-            - @path_helper
+            - '@path_helper'
-            - @ext.manager
+            - '@ext.manager'
-            - @user
+            - '@user'
-            - %core.root_path%
+            - '%core.root_path%'
-            - %core.php_ext%
+            - '%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.root_path%'
-            - %core.php_ext%
+            - '%core.php_ext%'
-            - @ext.manager
+            - '@ext.manager'
-            - @path_helper
+            - '@path_helper'
-            - @dbal.conn
+            - '@dbal.conn'
-            - @config
+            - '@config'
-            - @log
+            - '@log'
-            - @user
+            - '@user'
         calls:
             - [set_name, [football.football.cron.task.football_remember]]
         tags:

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 */

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

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,19 @@ 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_FOOTBALL'		=> $this->controller_helper->route('football_football_controller', array('side' => 'bet')),
-				'U_BET'				=> $this->controller_helper->route('football_main_controller', array('side' => 'bet', 's' => $season, 'l' => $league, 'm' => $matchday)),
+				'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_main_controller', array('side' => 'all_bets', '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_main_controller', array('side' => 'results', '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_TABLE'			=> $this->controller_helper->route('football_main_controller', array('side' => 'table', '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_main_controller', array('side' => 'ranks_total', '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_main_controller', array('side' => 'ranks_matchday', '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_main_controller', array('side' => 'delivery', '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_main_controller', array('side' => 'last_users', '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_main_controller', array('side' => 'bank', '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 +239,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_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_main_controller', array('side' => 'my_points', '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_main_controller', array('side' => 'my_table', '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_main_controller', array('side' => 'my_rank', '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_main_controller', array('side' => 'my_chart', '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_main_controller', array('side' => 'my_koeff', '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_main_controller', array('side' => 'stat_results', '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_main_controller', array('side' => 'stat_points', '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)),
 		));
 	}
 

images/index.htm

@@ -1,10 +1,10 @@
-<html>
+<html>
-<head>
+<head>
-<title></title>
+<title></title>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-</head>
+</head>
-
+
-<body bgcolor="#FFFFFF" text="#000000">
+<body bgcolor="#FFFFFF" text="#000000">
-
+
-</body>
+</body>
-</html>
+</html>

includes/chart_hist.php

@@ -1,66 +1,66 @@
-<?php
+<?php
-
+
-/**
+/**
-*
+*
-* @package Football
+* @package Football
-* @version $Id: chart_hist.php 1 2010-05-17 22:09:43Z football $
+* @version $Id: chart_hist.php 1 2010-05-17 22:09:43Z football $
-* @copyright (c) 2010 football (http://football.bplaced.net)
+* @copyright (c) 2010 football (http://football.bplaced.net)
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License
-*
+*
-*/
+*/
-
+
-$values1 = ( isset($_GET['v1']) ) ? $_GET['v1'] : 0;
+$values1 = ( isset($_GET['v1']) ) ? $_GET['v1'] : 0;
-$graphvalues1 = explode(",",$values1);
+$graphvalues1 = explode(",",$values1);
-$matchdays = sizeof($graphvalues1);
+$matchdays = sizeof($graphvalues1);
-
+
-// Define .PNG image
+// Define .PNG image
-header("Content-type: image/png");
+header("Content-type: image/png");
-$horz = 15;
+$horz = 15;
-$vert = 9;
+$vert = 9;
-$start = 25;
+$start = 25;
-$imgWidth= $matchdays * $vert + 20;
+$imgWidth= $matchdays * $vert + 20;
-$imgHeight=90;
+$imgHeight=90;
-
+
-// Create image and define colors
+// Create image and define colors
-$image 				= imagecreate($imgWidth, $imgHeight);
+$image 				= imagecreate($imgWidth, $imgHeight);
-$colorBackground	= imagecolorallocate($image, 236, 240, 246);
+$colorBackground	= imagecolorallocate($image, 236, 240, 246);
-$colorWhite			= imagecolorallocate($image, 255, 255, 255);
+$colorWhite			= imagecolorallocate($image, 255, 255, 255);
-$colorBlack			= imagecolorallocate($image, 0, 0, 0);
+$colorBlack			= imagecolorallocate($image, 0, 0, 0);
-$colorGrey			= imagecolorallocate($image, 106, 106, 106);
+$colorGrey			= imagecolorallocate($image, 106, 106, 106);
-$colorBlue			= imagecolorallocate($image, 0, 0, 255);
+$colorBlue			= imagecolorallocate($image, 0, 0, 255);
-$colorRed			= imagecolorallocate($image, 176, 0, 0);
+$colorRed			= imagecolorallocate($image, 176, 0, 0);
-$colorGreen			= imagecolorallocate($image, 0, 176, 0);
+$colorGreen			= imagecolorallocate($image, 0, 176, 0);
-
+
-imagefill($image, 0, 0, $colorBackground);
+imagefill($image, 0, 0, $colorBackground);
-
+
-imageline($image, 0, 45, $imgWidth, 45, $colorGrey);
+imageline($image, 0, 45, $imgWidth, 45, $colorGrey);
-imagestring($image,4, 5, 15, 'H', $colorBlack);
+imagestring($image,4, 5, 15, 'H', $colorBlack);
-imagestring($image,4, 5, 60, 'A', $colorBlack);
+imagestring($image,4, 5, 60, 'A', $colorBlack);
-
+
-imagesetthickness($image, 5);
+imagesetthickness($image, 5);
-
+
-$count_values=count($graphvalues1);
+$count_values=count($graphvalues1);
-// Create line graph
+// Create line graph
-for ($i = 0; $i < $count_values; $i++)
+for ($i = 0; $i < $count_values; $i++)
-{
+{
-	if (substr($graphvalues1[$i],0,1) == '-')
+	if (substr($graphvalues1[$i],0,1) == '-')
-	{
+	{
-		imageline($image, $start + ($i * $vert), 45, $start + ($i * $vert), substr($graphvalues1[$i], 1, strlen($graphvalues1[$i]) - 1), $colorRed);
+		imageline($image, $start + ($i * $vert), 45, $start + ($i * $vert), substr($graphvalues1[$i], 1, strlen($graphvalues1[$i]) - 1), $colorRed);
-	}
+	}
-	else
+	else
-	{
+	{
-		if (substr($graphvalues1[$i],0,1) == ' ')
+		if (substr($graphvalues1[$i],0,1) == ' ')
-		{
+		{
-			imageline($image, $start + ($i * $vert), 45, $start + ($i * $vert), substr($graphvalues1[$i], 1, strlen($graphvalues1[$i]) - 1), $colorGreen);
+			imageline($image, $start + ($i * $vert), 45, $start + ($i * $vert), substr($graphvalues1[$i], 1, strlen($graphvalues1[$i]) - 1), $colorGreen);
-		}
+		}
-		else
+		else
-		{
+		{
-			imageline($image, $start + ($i * $vert), 45, $start + ($i * $vert), substr($graphvalues1[$i], 0, strlen($graphvalues1[$i])), $colorGrey);
+			imageline($image, $start + ($i * $vert), 45, $start + ($i * $vert), substr($graphvalues1[$i], 0, strlen($graphvalues1[$i])), $colorGrey);
-		}
+		}
-	}
+	}
-}
+}
-
+
-// Output graph and clear image from memory
+// Output graph and clear image from memory
-imagepng($image);
+imagepng($image);
-imagedestroy($image);
+imagedestroy($image);
-?>
+?>

includes/chart_points.php

@@ -1,126 +1,126 @@
-<?php
+<?php
-
+
-/**
+/**
-*
+*
-* @package Football
+* @package Football
-* @version $Id: chart_points.php 1 2010-05-17 22:09:43Z football $
+* @version $Id: chart_points.php 1 2010-05-17 22:09:43Z football $
-* @copyright (c) 2010 football (http://football.bplaced.net)
+* @copyright (c) 2010 football (http://football.bplaced.net)
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License
-*
+*
-*/
+*/
-
+
-$matchdays = ( isset($_GET['m']) ) ? intval($_GET['m']) : 0;
+$matchdays = ( isset($_GET['m']) ) ? intval($_GET['m']) : 0;
-$values1 = ( isset($_GET['v1']) ) ? $_GET['v1'] : 0;
+$values1 = ( isset($_GET['v1']) ) ? $_GET['v1'] : 0;
-$values2 = ( isset($_GET['v2']) ) ? $_GET['v2'] : 0;
+$values2 = ( isset($_GET['v2']) ) ? $_GET['v2'] : 0;
-$values3 = ( isset($_GET['v3']) ) ? $_GET['v3'] : 0;
+$values3 = ( isset($_GET['v3']) ) ? $_GET['v3'] : 0;
-$values4 = ( isset($_GET['v4']) ) ? $_GET['v4'] : 0;
+$values4 = ( isset($_GET['v4']) ) ? $_GET['v4'] : 0;
-$valuesmin = ( isset($_GET['min']) ) ? $_GET['min'] : 0;
+$valuesmin = ( isset($_GET['min']) ) ? $_GET['min'] : 0;
-$valuesmax = ( isset($_GET['max']) ) ? $_GET['max'] : 0;
+$valuesmax = ( isset($_GET['max']) ) ? $_GET['max'] : 0;
-$caption = ( isset($_GET['c']) ) ? $_GET['c'] : '';
+$caption = ( isset($_GET['c']) ) ? $_GET['c'] : '';
-
+
-$graphvalues1 = explode(",", $values1);
+$graphvalues1 = explode(",", $values1);
-$graphvalues2 = explode(",", $values2);
+$graphvalues2 = explode(",", $values2);
-$graphvalues3 = explode(",", $values3);
+$graphvalues3 = explode(",", $values3);
-$graphvalues4 = explode(",", $values4);
+$graphvalues4 = explode(",", $values4);
-$graphvaluesmin = explode(",", $valuesmin);
+$graphvaluesmin = explode(",", $valuesmin);
-$graphvaluesmax = explode(",", $valuesmax);
+$graphvaluesmax = explode(",", $valuesmax);
-$caption_lang = explode(",", $caption);
+$caption_lang = explode(",", $caption);
-
+
-// Define .PNG image
+// Define .PNG image
-header("Content-type: image/png");
+header("Content-type: image/png");
-$horz = 20;
+$horz = 20;
-$vert = 24;
+$vert = 24;
-$horzp = 4;
+$horzp = 4;
-$maximum = max($graphvaluesmax);
+$maximum = max($graphvaluesmax);
-$rows = (int) ($maximum / 5) + 2;
+$rows = (int) ($maximum / 5) + 2;
-$maximum = ($rows - 1) * 5;
+$maximum = ($rows - 1) * 5;
-$imgWidth = $matchdays * $vert + 10;
+$imgWidth = $matchdays * $vert + 10;
-$imgHeight = $rows * $horz + 50;
+$imgHeight = $rows * $horz + 50;
-
+
-if ($imgWidth < 106)
+if ($imgWidth < 106)
-	$imgWidth = 106;
+	$imgWidth = 106;
-
+
-// Create image and define colors
+// Create image and define colors
-$image=imagecreate($imgWidth, $imgHeight);
+$image=imagecreate($imgWidth, $imgHeight);
-$colorWhite=imagecolorallocate($image, 255, 255, 255);
+$colorWhite=imagecolorallocate($image, 255, 255, 255);
-$colorBlack=imagecolorallocate($image, 0, 0, 0);
+$colorBlack=imagecolorallocate($image, 0, 0, 0);
-$colorGrey=imagecolorallocate($image, 192, 192, 192);
+$colorGrey=imagecolorallocate($image, 192, 192, 192);
-$colorBlue=imagecolorallocate($image, 0, 0, 255);
+$colorBlue=imagecolorallocate($image, 0, 0, 255);
-$colorRed=imagecolorallocate($image, 255, 0, 0);
+$colorRed=imagecolorallocate($image, 255, 0, 0);
-$colorGreen=imagecolorallocate($image, 0, 255, 0);
+$colorGreen=imagecolorallocate($image, 0, 255, 0);
-$colorAzur=imagecolorallocate($image, 0, 255, 255);
+$colorAzur=imagecolorallocate($image, 0, 255, 255);
-
+
-// Create grid
+// Create grid
-for ($i = 1; $i <= $rows; $i++)
+for ($i = 1; $i <= $rows; $i++)
-{
+{
-	imageline($image, $vert, $i * $horz, $imgWidth - 10, $i * $horz, $colorGrey);
+	imageline($image, $vert, $i * $horz, $imgWidth - 10, $i * $horz, $colorGrey);
-	if ($i > ($rows - 2))
+	if ($i > ($rows - 2))
-		imagestring($image, 3, 10, $i * $horz - 6, $maximum - (($i - 1) * 5), $colorBlack);
+		imagestring($image, 3, 10, $i * $horz - 6, $maximum - (($i - 1) * 5), $colorBlack);
-	else
+	else
-		imagestring($image, 3, 3,$i * $horz - 6, $maximum - (($i - 1) * 5), $colorBlack);
+		imagestring($image, 3, 3,$i * $horz - 6, $maximum - (($i - 1) * 5), $colorBlack);
-}
+}
-imagestring($image, 1, 0, 0, $caption_lang[0] , $colorBlack);
+imagestring($image, 1, 0, 0, $caption_lang[0] , $colorBlack);
-
+
-
+
-// Create grid
+// Create grid
-for ($i = 1; $i <= $matchdays; $i++)
+for ($i = 1; $i <= $matchdays; $i++)
-{
+{
-	$label = $i + 1;
+	$label = $i + 1;
-	imageline($image, $i * $vert, $horz, $i * $vert, $imgHeight - 50, $colorGrey);
+	imageline($image, $i * $vert, $horz, $i * $vert, $imgHeight - 50, $colorGrey);
-	if ($i < 10)
+	if ($i < 10)
-		imagestring($image,3,$i * $vert - 3, $imgHeight - 40, $i, $colorBlack);
+		imagestring($image,3,$i * $vert - 3, $imgHeight - 40, $i, $colorBlack);
-	else
+	else
-		imagestring($image, 3, $i * $vert - 6, $imgHeight - 40, $i, $colorBlack);
+		imagestring($image, 3, $i * $vert - 6, $imgHeight - 40, $i, $colorBlack);
-}
+}
-
+
-imageline($image, 3, $imgHeight - $horz + 6, 15, $imgHeight - $horz + 6, $colorBlack);
+imageline($image, 3, $imgHeight - $horz + 6, 15, $imgHeight - $horz + 6, $colorBlack);
-imagestring($image, 3, 20, $imgHeight - $horz, $caption_lang[1] , $colorBlack);
+imagestring($image, 3, 20, $imgHeight - $horz, $caption_lang[1] , $colorBlack);
-
+
-imagesetthickness($image, 2);
+imagesetthickness($image, 2);
-
+
-$count_values=count($graphvalues1);
+$count_values=count($graphvalues1);
-// Create line graph
+// Create line graph
-for ($i = 1; $i < $count_values; $i++)
+for ($i = 1; $i < $count_values; $i++)
-{
+{
-	imageline($image, $i * $vert, (($maximum - $graphvalues1[$i - 1]) * $horzp + $horz), ($i + 1) * $vert, (($maximum - $graphvalues1[$i]) * $horzp + $horz), $colorBlue);
+	imageline($image, $i * $vert, (($maximum - $graphvalues1[$i - 1]) * $horzp + $horz), ($i + 1) * $vert, (($maximum - $graphvalues1[$i]) * $horzp + $horz), $colorBlue);
-}
+}
-
+
-$count_values=count($graphvalues2);
+$count_values=count($graphvalues2);
-// Create line graph
+// Create line graph
-for ($i = 1; $i < $count_values; $i++)
+for ($i = 1; $i < $count_values; $i++)
-{
+{
-	imageline($image, $i * $vert, (($maximum - $graphvalues2[$i - 1]) * $horzp + $horz), ($i + 1) * $vert, (($maximum - $graphvalues2[$i]) * $horzp + $horz), $colorGreen);
+	imageline($image, $i * $vert, (($maximum - $graphvalues2[$i - 1]) * $horzp + $horz), ($i + 1) * $vert, (($maximum - $graphvalues2[$i]) * $horzp + $horz), $colorGreen);
-}
+}
-
+
-$count_values=count($graphvalues3);
+$count_values=count($graphvalues3);
-// Create line graph
+// Create line graph
-for ($i = 1; $i < $count_values; $i++)
+for ($i = 1; $i < $count_values; $i++)
-{
+{
-	imageline($image, $i * $vert, (($maximum - $graphvalues3[$i - 1]) * $horzp + $horz), ($i + 1) * $vert, (($maximum - $graphvalues3[$i]) * $horzp + $horz), $colorAzur);
+	imageline($image, $i * $vert, (($maximum - $graphvalues3[$i - 1]) * $horzp + $horz), ($i + 1) * $vert, (($maximum - $graphvalues3[$i]) * $horzp + $horz), $colorAzur);
-}
+}
-
+
-$count_values=count($graphvalues4);
+$count_values=count($graphvalues4);
-// Create line graph
+// Create line graph
-for ($i = 1; $i < $count_values; $i++)
+for ($i = 1; $i < $count_values; $i++)
-{
+{
-	imageline($image, $i * $vert, (($maximum - $graphvalues4[$i - 1]) * $horzp + $horz), ($i + 1) * $vert, (($maximum - $graphvalues4[$i]) * $horzp + $horz), $colorRed);
+	imageline($image, $i * $vert, (($maximum - $graphvalues4[$i - 1]) * $horzp + $horz), ($i + 1) * $vert, (($maximum - $graphvalues4[$i]) * $horzp + $horz), $colorRed);
-}
+}
-
+
-$count_values=count($graphvaluesmin);
+$count_values=count($graphvaluesmin);
-// Create line graph
+// Create line graph
-for ($i = 1; $i < $count_values; $i++)
+for ($i = 1; $i < $count_values; $i++)
-{
+{
-	imageline($image, $i * $vert, (($maximum - $graphvaluesmin[$i - 1]) * $horzp + $horz), ($i + 1) * $vert, (($maximum - $graphvaluesmin[$i]) * $horzp + $horz), $colorBlack);
+	imageline($image, $i * $vert, (($maximum - $graphvaluesmin[$i - 1]) * $horzp + $horz), ($i + 1) * $vert, (($maximum - $graphvaluesmin[$i]) * $horzp + $horz), $colorBlack);
-}
+}
-
+
-$count_values=count($graphvaluesmax);
+$count_values=count($graphvaluesmax);
-// Create line graph
+// Create line graph
-for ($i = 1; $i < $count_values; $i++)
+for ($i = 1; $i < $count_values; $i++)
-{
+{
-	imageline($image, $i * $vert, (($maximum - $graphvaluesmax[$i - 1]) * $horzp + $horz), ($i + 1) * $vert, (($maximum - $graphvaluesmax[$i]) * $horzp + $horz), $colorBlack);
+	imageline($image, $i * $vert, (($maximum - $graphvaluesmax[$i - 1]) * $horzp + $horz), ($i + 1) * $vert, (($maximum - $graphvaluesmax[$i]) * $horzp + $horz), $colorBlack);
-}
+}
-
+
-// Output graph and clear image from memory
+// Output graph and clear image from memory
-imagepng($image);
+imagepng($image);
-imagedestroy($image);
+imagedestroy($image);
-?>
+?>

includes/chart_rank.php

@@ -1,97 +1,97 @@
-<?php
+<?php
-
+
-/**
+/**
-*
+*
-* @package Football
+* @package Football
-* @version $Id: chart_rank.php 1 2010-05-17 22:09:43Z football $
+* @version $Id: chart_rank.php 1 2010-05-17 22:09:43Z football $
-* @copyright (c) 2010 football (http://football.bplaced.net)
+* @copyright (c) 2010 football (http://football.bplaced.net)
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License
-*
+*
-*/
+*/
-
+
-$numb_users = ( isset($_GET['t']) ) ? intval($_GET['t']) : 0;
+$numb_users = ( isset($_GET['t']) ) ? intval($_GET['t']) : 0;
-$matchdays 	= ( isset($_GET['m']) ) ? intval($_GET['m']) : 0;
+$matchdays 	= ( isset($_GET['m']) ) ? intval($_GET['m']) : 0;
-$Values1 = ( isset($_GET['v1']) ) ? $_GET['v1'] : 0;
+$Values1 = ( isset($_GET['v1']) ) ? $_GET['v1'] : 0;
-$Values2 = ( isset($_GET['v2']) ) ? $_GET['v2'] : 0;
+$Values2 = ( isset($_GET['v2']) ) ? $_GET['v2'] : 0;
-$Values3 = ( isset($_GET['v3']) ) ? $_GET['v3'] : 0;
+$Values3 = ( isset($_GET['v3']) ) ? $_GET['v3'] : 0;
-$Values4 = ( isset($_GET['v4']) ) ? $_GET['v4'] : 0;
+$Values4 = ( isset($_GET['v4']) ) ? $_GET['v4'] : 0;
-$caption = ( isset($_GET['c']) ) ? $_GET['c'] : '';
+$caption = ( isset($_GET['c']) ) ? $_GET['c'] : '';
-
+
-$graphValues1 = explode(",",$Values1);
+$graphValues1 = explode(",",$Values1);
-$graphValues2 = explode(",",$Values2);
+$graphValues2 = explode(",",$Values2);
-$graphValues3 = explode(",",$Values3);
+$graphValues3 = explode(",",$Values3);
-$graphValues4 = explode(",",$Values4);
+$graphValues4 = explode(",",$Values4);
-
+
-// Define .PNG image
+// Define .PNG image
-header("Content-type: image/png");
+header("Content-type: image/png");
-$horz = 15;
+$horz = 15;
-$vert = 24;
+$vert = 24;
-$imgWidth=$matchdays * $vert + 10;
+$imgWidth=$matchdays * $vert + 10;
-$imgHeight=$numb_users * $horz + 20;
+$imgHeight=$numb_users * $horz + 20;
-
+
-// Create image and define colors
+// Create image and define colors
-$image=imagecreate($imgWidth, $imgHeight);
+$image=imagecreate($imgWidth, $imgHeight);
-$colorWhite=imagecolorallocate($image, 255, 255, 255);
+$colorWhite=imagecolorallocate($image, 255, 255, 255);
-$colorBlack=imagecolorallocate($image, 0, 0, 0);
+$colorBlack=imagecolorallocate($image, 0, 0, 0);
-$colorGrey=imagecolorallocate($image, 192, 192, 192);
+$colorGrey=imagecolorallocate($image, 192, 192, 192);
-$colorBlue=imagecolorallocate($image, 0, 0, 255);
+$colorBlue=imagecolorallocate($image, 0, 0, 255);
-$colorRed=imagecolorallocate($image, 255, 0, 0);
+$colorRed=imagecolorallocate($image, 255, 0, 0);
-$colorGreen=imagecolorallocate($image, 0, 255, 0);
+$colorGreen=imagecolorallocate($image, 0, 255, 0);
-$colorAzur=imagecolorallocate($image, 0, 255, 255);
+$colorAzur=imagecolorallocate($image, 0, 255, 255);
-
+
-// Create grid
+// Create grid
-for ($i = 1; $i <= $numb_users; $i++)
+for ($i = 1; $i <= $numb_users; $i++)
-{
+{
-	imageline($image, $vert, $i * $horz, $imgWidth - 10, $i * $horz, $colorGrey);
+	imageline($image, $vert, $i * $horz, $imgWidth - 10, $i * $horz, $colorGrey);
-	if ($i < 10)
+	if ($i < 10)
-		imagestring($image,3,10,$i * $horz - 6,$i,$colorBlack);
+		imagestring($image,3,10,$i * $horz - 6,$i,$colorBlack);
-	else
+	else
-		imagestring($image,3,3,$i * $horz - 6,$i,$colorBlack);
+		imagestring($image,3,3,$i * $horz - 6,$i,$colorBlack);
-}
+}
-imagestring($image, 1, 0, 0, $caption, $colorBlack);
+imagestring($image, 1, 0, 0, $caption, $colorBlack);
-
+
-// Create grid
+// Create grid
-for ($i = 1; $i <= $matchdays; $i++)
+for ($i = 1; $i <= $matchdays; $i++)
-{
+{
-	$label = $i + 1;
+	$label = $i + 1;
-	imageline($image, $i * $vert, $horz, $i * $vert, $imgHeight - 20, $colorGrey);
+	imageline($image, $i * $vert, $horz, $i * $vert, $imgHeight - 20, $colorGrey);
-	if ($i < 10)
+	if ($i < 10)
-		imagestring($image, 3,$i * $vert - 3,$imgHeight - $horz, $i, $colorBlack);
+		imagestring($image, 3,$i * $vert - 3,$imgHeight - $horz, $i, $colorBlack);
-	else
+	else
-		imagestring($image, 3,$i * $vert - 6,$imgHeight - $horz, $i, $colorBlack);
+		imagestring($image, 3,$i * $vert - 6,$imgHeight - $horz, $i, $colorBlack);
-}
+}
-
+
-imagesetthickness($image, 2);
+imagesetthickness($image, 2);
-
+
-$count_values=count($graphValues1);
+$count_values=count($graphValues1);
-// Create line graph
+// Create line graph
-for ($i = 1; $i < $count_values; $i++)
+for ($i = 1; $i < $count_values; $i++)
-{
+{
-	imageline($image, $i * $vert, ($graphValues1[$i - 1] * $horz), ($i + 1) * $vert, ($graphValues1[$i] * $horz), $colorBlue);
+	imageline($image, $i * $vert, ($graphValues1[$i - 1] * $horz), ($i + 1) * $vert, ($graphValues1[$i] * $horz), $colorBlue);
-}
+}
-
+
-$count_values=count($graphValues2);
+$count_values=count($graphValues2);
-// Create line graph
+// Create line graph
-for ($i = 1; $i < $count_values; $i++)
+for ($i = 1; $i < $count_values; $i++)
-{
+{
-	imageline($image, $i * $vert, ($graphValues2[$i - 1] * $horz), ($i + 1) * $vert, ($graphValues2[$i] * $horz), $colorGreen);
+	imageline($image, $i * $vert, ($graphValues2[$i - 1] * $horz), ($i + 1) * $vert, ($graphValues2[$i] * $horz), $colorGreen);
-}
+}
-
+
-$count_values=count($graphValues3);
+$count_values=count($graphValues3);
-// Create line graph
+// Create line graph
-for ($i = 1; $i < $count_values; $i++)
+for ($i = 1; $i < $count_values; $i++)
-{
+{
-	imageline($image, $i * $vert, ($graphValues3[$i - 1] * $horz), ($i + 1) * $vert, ($graphValues3[$i] * $horz), $colorAzur);
+	imageline($image, $i * $vert, ($graphValues3[$i - 1] * $horz), ($i + 1) * $vert, ($graphValues3[$i] * $horz), $colorAzur);
-}
+}
-
+
-$count_values=count($graphValues4);
+$count_values=count($graphValues4);
-// Create line graph
+// Create line graph
-for ($i = 1; $i < $count_values; $i++)
+for ($i = 1; $i < $count_values; $i++)
-{
+{
-	imageline($image, $i * $vert, ($graphValues4[$i - 1] * $horz), ($i + 1) * $vert, ($graphValues4[$i] * $horz), $colorRed);
+	imageline($image, $i * $vert, ($graphValues4[$i - 1] * $horz), ($i + 1) * $vert, ($graphValues4[$i] * $horz), $colorRed);
-}
+}
-
+
-// Output graph and clear image from memory
+// Output graph and clear image from memory
-imagepng($image);
+imagepng($image);
-imagedestroy($image);
+imagedestroy($image);
-?>
+?>

includes/export.php

@@ -78,7 +78,7 @@ $sql_bets = "SELECT
 				FROM " . FOOTB_MATCHES . ' AS m
 				LEFT JOIN ' . FOOTB_BETS . " AS b ON (b.season = m.season AND b.league = m.league AND b.match_no = m.match_no)
 				WHERE m.season = $season AND m.league = $league
-				ORDER BY matchday ASC, match_no ASC, user_id ASC";
+				ORDER BY m.matchday ASC, m.match_no ASC, b.user_id ASC";
 
 if(!$result_users = $db->sql_query($sql_users))
 {
@@ -268,4 +268,3 @@ else
 	echo utf8_decode($export);
 	exit;
 }
-?>

includes/functions.php

@@ -170,8 +170,8 @@ function save_ranking_matchday($season, $league, $matchday, $cash = false)
 				INNER JOIN ' . FOOTB_BETS . ' AS b ON (b.season = m.season AND b.league = m.league AND b.match_no = m.match_no)
 				INNER JOIN ' . USERS_TABLE . "  AS u ON (b.user_id = u.user_id)
 				WHERE  m.season = $season AND m.league = $league AND m.matchday = $matchday AND m.status IN (2,3)
-				GROUP BY b.user_id
+				GROUP BY u.user_id
-				ORDER BY points DESC, nobet ASC, username ASC
+				ORDER BY points DESC, nobet ASC, u.username ASC
 				";
 
 			$result = $db->sql_query($sql);
@@ -586,13 +586,13 @@ function set_footb_points($points_type, $season, $league, $matchday, $wins, $cas
 
 function _sort_points($value_a, $value_b) 
 {
-    if ($value_a['points'] > $value_b['points']) 
+	if ($value_a['points'] > $value_b['points']) 
 	{
-        return -1;
+		return -1;
-    } 
+	} 
 	else 
 	{
-        if ($value_a['points'] == $value_b['points']) 
+		if ($value_a['points'] == $value_b['points']) 
 		{
 			if (isset($value_a['nobet']))
 			{
@@ -616,12 +616,12 @@ function _sort_points($value_a, $value_b)
 			{
 				return 0;
 			}
-        } 
+		} 
 		else 
 		{
-            return 1;
+			return 1;
-        }
+		}
-    }
+	}
 }
 
 
@@ -838,7 +838,8 @@ function next_delivery($season, $league)
 					WHEN 6 THEN '" . $lang_dates['Sat'] . "'
 					ELSE 'Error' END,
 				DATE_FORMAT(delivery_date,' %d.%m.%Y %H:%i')
-			) AS deliverytime
+			) AS deliverytime,
+			matchday
 			FROM " . FOOTB_MATCHDAYS . " 
 			WHERE season = $season AND league = $league AND status = 0
 			ORDER BY matchday ASC
@@ -999,7 +1000,7 @@ function first_league($season, $complete = true)
 	{
 		$join_matchday = 'INNER JOIN ' . FOOTB_MATCHDAYS . ' AS m ON (m.season = l.season AND m.league = l.league) ';
 	}
-	$sql = 'SELECT * 
+	$sql = 'SELECT l.* 
 			FROM ' . FOOTB_LEAGUES . ' AS l ' .
 			$join_matchday . "
 			WHERE l.season = $season 
@@ -1030,12 +1031,12 @@ function current_league($season)
 		$curr_user = $user->data['user_id'];
 		$user_spec = 'AND b.user_id = ' . $curr_user;
 	}
-	$sql = 'SELECT DISTINCT m.league 
+	$sql = 'SELECT DISTINCT m.league, m.match_datetime
 			FROM ' . FOOTB_MATCHES . ' AS m  
 			INNER JOIN ' . FOOTB_BETS . ' AS b ON (b.season = m.season AND b.league = m.league ' . $user_spec . ")
 			WHERE m.season = $season 
 			AND m.status in (0,1,2)
-			ORDER BY m.match_datetime ASC
+			ORDER BY m.match_datetime ASC, m.league ASC
 			LIMIT 1";
 	$result = $db->sql_query($sql);
 
@@ -1826,7 +1827,7 @@ function get_team($season, $league, $matchnumber, $field, $formula)
 									$third_group[$team]= $row['group_id'];
 								}
 							}		
-						}     
+						}
 					}
 					// Sort 3. Place on points, diff, goals
 					array_multisort($points3, SORT_DESC, $diff3, SORT_DESC, $goals3, SORT_DESC, $third_team, $third_group);
@@ -2096,7 +2097,8 @@ function get_team($season, $league, $matchnumber, $field, $formula)
 					m.goals_overtime_home,
 					m.goals_overtime_guest,
 					m.goals_home,
-					m.goals_guest
+					m.goals_guest,
+					m.match_no
 					FROM  ' . FOOTB_MATCHES . ' AS m
 					LEFT JOIN ' . FOOTB_TEAMS . ' AS t1 ON (t1.season = m.season AND t1.league = m.league AND t1.team_id = m.team_id_home)
 					LEFT JOIN ' . FOOTB_TEAMS . " AS t2 ON (t2.season = m.season AND t2.league = m.league AND t2.team_id = m.team_id_guest)
@@ -2316,7 +2318,7 @@ function ko_group_next_round($season, $league, $matchday_from, $matchday_to, $ma
 			LEFT JOIN ' . FOOTB_MATCHES . " AS m ON (m.season = t.season AND m.league = t.league AND (m.team_id_home = t.team_id OR m.team_id_guest = t.team_id) AND m.group_id = t.group_id)
 			WHERE t.season = $season AND t.league = $league AND m.matchday >= $matchday_from AND m.matchday <= $matchday_to AND m.status IN (3,6)
 			GROUP BY t.team_id
-			ORDER BY group_id ASC,points DESC, goal_diff DESC, goals DESC
+			ORDER BY t.group_id ASC, points DESC, goal_diff DESC, goals DESC
 		";
 		$result = $db->sql_query($sql);
 		
@@ -2530,4 +2532,3 @@ function select_points($creator = 'm', $sum = false)
 	}
 	return $select_part;
 }
-?>

includes/version_check.php

@@ -1,115 +1,115 @@
-<?php
+<?php
-/**
+/**
-*
+*
-* @package phpBB Extension - Football Football
+* @package phpBB Extension - Football Football
-* @copyright (c) 2016 football (http://football.bplaced.net)
+* @copyright (c) 2016 football (http://football.bplaced.net)
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
-*
+*
-*/
+*/
-
+
-namespace football\football\includes;
+namespace football\football\includes;
-
+
-class version_check
+class version_check
-{
+{
-	/**
+	/**
-	* @var array version_data
+	* @var array version_data
-	*/
+	*/
-	protected $version_data;
+	protected $version_data;
-
+
-	/**
+	/**
-	* @var \phpbb\config\config
+	* @var \phpbb\config\config
-	*/
+	*/
-	protected $config;
+	protected $config;
-
+
-	/**
+	/**
-	* @var \phpbb\version_helper $version_helper phpBB version helper
+	* @var \phpbb\version_helper $version_helper phpBB version helper
-	*/
+	*/
-	protected $version_helper;
+	protected $version_helper;
-
+
-	/**
+	/**
-	* @var \phpbb\template\twig\twig
+	* @var \phpbb\template\twig\twig
-	*/
+	*/
-	protected $template;
+	protected $template;
-
+
-	/**
+	/**
-	* @var \phpbb\user
+	* @var \phpbb\user
-	*/
+	*/
-	protected $user;
+	protected $user;
-
+
-	/**
+	/**
-	 * @var string Current version
+	 * @var string Current version
-	 */
+	 */
-	protected $current_version;
+	protected $current_version;
-
+
-	/**
+	/**
-	* Construct a version_check object
+	* Construct a version_check object
-	*
+	*
-	* @param array $version_data Version data
+	* @param array $version_data Version data
-	* @param \phpbb\config\config $config phpBB config
+	* @param \phpbb\config\config $config phpBB config
-	* @param \phpbb\version_helper $version_helper phpBB version helper
+	* @param \phpbb\version_helper $version_helper phpBB version helper
-	* @param \phpbb\template\twig\twig $template phpBB template object
+	* @param \phpbb\template\twig\twig $template phpBB template object
-	* @param \phpbb\user $user phpBB user object
+	* @param \phpbb\user $user phpBB user object
-	*/
+	*/
-	public function __construct($version_data, $config, $version_helper, $template, $user)
+	public function __construct($version_data, $config, $version_helper, $template, $user)
-	{
+	{
-		$this->version_data = $version_data;
+		$this->version_data = $version_data;
-		$this->config = $config;
+		$this->config = $config;
-		$this->version_helper = $version_helper;
+		$this->version_helper = $version_helper;
-		$this->template = $template;
+		$this->template = $template;
-		$this->user = $user;
+		$this->user = $user;
-		$this->current_version = $this->config[str_replace(' ', '', $this->version_data['version'])];
+		$this->current_version = $this->config[str_replace(' ', '', $this->version_data['version'])];
-	}
+	}
-
+
-	/**
+	/**
-	* Check Extension version and assign template variables for version info if not
+	* Check Extension version and assign template variables for version info if not
-	* returning current version
+	* returning current version
-	*
+	*
-	* @param bool $return_version Yes if current version should be returned
+	* @param bool $return_version Yes if current version should be returned
-	* @return string Current version if $return_version is set to true
+	* @return string Current version if $return_version is set to true
-	*/
+	*/
-	public function check($return_version = false)
+	public function check($return_version = false)
-	{
+	{
-		$allow_url_fopen = (int) @ini_get('allow_url_fopen');
+		$allow_url_fopen = (int) @ini_get('allow_url_fopen');
-		if ($allow_url_fopen)
+		if ($allow_url_fopen)
-		{
+		{
-			
+			
-			// Set file location
+			// Set file location
-			$this->version_helper->set_file_location($this->version_data['file'][0], $this->version_data['file'][1], $this->version_data['file'][2]);
+			$this->version_helper->set_file_location($this->version_data['file'][0], $this->version_data['file'][1], $this->version_data['file'][2]);
-			// Set current version
+			// Set current version
-			$this->version_helper->set_current_version($this->current_version);
+			$this->version_helper->set_current_version($this->current_version);
-
+
-			$this->version_helper->force_stability(($this->config['extension_force_unstable'] || !$this->version_helper->is_stable($this->current_version)) ? 'unstable' : null);
+			$this->version_helper->force_stability(($this->config['extension_force_unstable'] || !$this->version_helper->is_stable($this->current_version)) ? 'unstable' : null);
-
+
-			$updates = $this->version_helper->get_suggested_updates(true);
+			$updates = $this->version_helper->get_suggested_updates(true);
-
+
-			// Return version if $return_version is set to true
+			// Return version if $return_version is set to true
-			if ($return_version)
+			if ($return_version)
-			{
+			{
-				return $this->current_version;
+				return $this->current_version;
-			}
+			}
-
+
-			$version_up_to_date = empty($updates);
+			$version_up_to_date = empty($updates);
-
+
-			$template_data = array(
+			$template_data = array(
-				'AUTHOR'			=> $this->version_data['author'],
+				'AUTHOR'			=> $this->version_data['author'],
-				'CURRENT_VERSION'	=> $this->current_version,
+				'CURRENT_VERSION'	=> $this->current_version,
-				'UP_TO_DATE'		=> sprintf((!$version_up_to_date) ? $this->user->lang['NOT_UP_TO_DATE'] : $this->user->lang['UP_TO_DATE'], $this->version_data['title']),
+				'UP_TO_DATE'		=> sprintf((!$version_up_to_date) ? $this->user->lang['NOT_UP_TO_DATE'] : $this->user->lang['UP_TO_DATE'], $this->version_data['title']),
-				'S_UP_TO_DATE'		=> $version_up_to_date,
+				'S_UP_TO_DATE'		=> $version_up_to_date,
-				'U_AUTHOR'			=> 'http://www.phpbb.com/community/memberlist.php?mode=viewprofile&un=' . $this->version_data['author'],
+				'U_AUTHOR'			=> 'http://www.phpbb.com/community/memberlist.php?mode=viewprofile&un=' . $this->version_data['author'],
-				'TITLE'				=> (string) $this->version_data['title'],
+				'TITLE'				=> (string) $this->version_data['title'],
-				'LATEST_VERSION'	=> $this->current_version,
+				'LATEST_VERSION'	=> $this->current_version,
-			);
+			);
-
+
-			if (!$version_up_to_date)
+			if (!$version_up_to_date)
-			{
+			{
-				$updates = array_shift($updates);
+				$updates = array_shift($updates);
-				$template_data = array_merge($template_data, array(
+				$template_data = array_merge($template_data, array(
-					'ANNOUNCEMENT'		=> (string) $updates['announcement'],
+					'ANNOUNCEMENT'		=> (string) $updates['announcement'],
-					'DOWNLOAD'			=> (string) $updates['download'],
+					'DOWNLOAD'			=> (string) $updates['download'],
-					'LATEST_VERSION'	=> $updates['current'],
+					'LATEST_VERSION'	=> $updates['current'],
-				));
+				));
-			}
+			}
-			$this->template->assign_block_vars('mods', $template_data);
+			$this->template->assign_block_vars('mods', $template_data);
-		}
+		}
-	}
+	}
-}
+}

language/de/email/footb_board_remember.txt

@@ -1,10 +1,10 @@
-
+
-Hallo {SITENAME},
+Hallo {SITENAME},
-Folgende Tipper haben eine Erinnerungs-Mail erhalten:
+Folgende Tipper haben eine Erinnerungs-Mail erhalten:
-
+
-{REMEMBER_LIST}
+{REMEMBER_LIST}
-
+
-
+
-Hier geht es zur {SITENAME}: {U_BOARD}.
+Hier geht es zur {SITENAME}: {U_BOARD}.
-
+
-{EMAIL_SIG}
+{EMAIL_SIG}

language/de/email/footb_send_remember.txt

@@ -1,10 +1,10 @@
-
+
-Hallo Tipper {USERNAME},
+Hallo Tipper {USERNAME},
-Du hast bislang noch nicht den {MATCHDAY}. Spieltag getippt.
+Du hast bislang noch nicht den {MATCHDAY}. Spieltag getippt.
-Bitte tipp bis zum {LEAGUE} Abgabetermin {DELIVERY} Uhr.
+Bitte tipp bis zum {LEAGUE} Abgabetermin {DELIVERY} Uhr.
-
+
- 
+ 
-Hier geht es zur {SITENAME}: {U_BOARD}.
+Hier geht es zur {SITENAME}: {U_BOARD}.
-
+
-
+
-{EMAIL_SIG}
+{EMAIL_SIG}

language/de/info_acp_all_bets.php

@@ -1,47 +1,47 @@
-<?php
+<?php
-/**
+/**
-*
+*
-* info_acp_football_all_bets [Deutsch — Du]
+* info_acp_football_all_bets [Deutsch — Du]
-*
+*
-* @package language
+* @package language
-* @version $Id: info_acp_football_all_bets.php 6 2011-01-09 08:02:37Z football $ 
+* @version $Id: info_acp_football_all_bets.php 6 2011-01-09 08:02:37Z football $ 
-* @copyright (c) 2010 football (http://football.bplaced.net)
+* @copyright (c) 2010 football (http://football.bplaced.net)
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License
-*
+*
-*/
+*/
-
+
-/**
+/**
-* DO NOT CHANGE
+* DO NOT CHANGE
-*/
+*/
-if (!defined('IN_PHPBB'))
+if (!defined('IN_PHPBB'))
-{
+{
-	exit;
+	exit;
-}
+}
-
+
-if (empty($lang) || !is_array($lang))
+if (empty($lang) || !is_array($lang))
-{
+{
-	$lang = array();
+	$lang = array();
-}
+}
-
+
-// DEVELOPERS PLEASE NOTE
+// DEVELOPERS PLEASE NOTE
-//
+//
-// All language files should use UTF-8 as their encoding and the files must not contain a BOM.
+// All language files should use UTF-8 as their encoding and the files must not contain a BOM.
-//
+//
-// Placeholders can now contain order information, e.g. instead of
+// Placeholders can now contain order information, e.g. instead of
-// 'Page %s of %s' you can (and should) write 'Page %1$s of %2$s', this allows
+// 'Page %s of %s' you can (and should) write 'Page %1$s of %2$s', this allows
-// translators to re-order the output of data while ensuring it remains correct
+// translators to re-order the output of data while ensuring it remains correct
-//
+//
-// You do not need this where single placeholders are used, e.g. 'Message %d' is fine
+// You do not need this where single placeholders are used, e.g. 'Message %d' is fine
-// equally where a string contains only two placeholders which are used to wrap text
+// equally where a string contains only two placeholders which are used to wrap text
-// in a url you again do not need to specify an order e.g., 'Click %sHERE%s' is fine
+// in a url you again do not need to specify an order e.g., 'Click %sHERE%s' is fine
-
+
-$lang = array_merge($lang, array(
+$lang = array_merge($lang, array(
-	'ACP_FOOTBALL_ALL_BETS'					=> 'Alle Tipps',
+	'ACP_FOOTBALL_ALL_BETS'					=> 'Alle Tipps',
-	'ACP_FOOTBALL_ALL_BETS_MANAGEMENT'		=> 'Tipprunde-Alle Tipps ansehen',
+	'ACP_FOOTBALL_ALL_BETS_MANAGEMENT'		=> 'Tipprunde-Alle Tipps ansehen',
-	'ACP_FOOTBALL_ALL_BETS_VIEW'			=> 'Alle Tipps ansehen',
+	'ACP_FOOTBALL_ALL_BETS_VIEW'			=> 'Alle Tipps ansehen',
-	'ACP_FOOTBALL_ALL_BETS_VIEW_EXPLAIN'	=> 'Hier kannst du alle Tipps der Tipper einsehen.',
+	'ACP_FOOTBALL_ALL_BETS_VIEW_EXPLAIN'	=> 'Hier kannst du alle Tipps der Tipper einsehen.',
-	
+	
-	'SELECT_MATCHDAY'						=> 'Spieltag wählen',	
+	'SELECT_MATCHDAY'						=> 'Spieltag wählen',	
-));
+));
-
+
 ?>

language/de/info_acp_bank.php

@@ -1,114 +1,114 @@
-<?php
+<?php
-/**
+/**
-* 
+* 
-* info_acp_football_bank [Deutsch — Du]
+* info_acp_football_bank [Deutsch — Du]
-*
+*
-* @package language
+* @package language
-* @version $Id: info_acp_football_bank.php 6 2011-01-09 08:02:46Z football $ 
+* @version $Id: info_acp_football_bank.php 6 2011-01-09 08:02:46Z football $ 
-* @copyright (c) 2010 football (http://football.bplaced.net)
+* @copyright (c) 2010 football (http://football.bplaced.net)
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License
-*
+*
-*/
+*/
-
+
-/**
+/**
-* DO NOT CHANGE
+* DO NOT CHANGE
-*/
+*/
-if (!defined('IN_PHPBB'))
+if (!defined('IN_PHPBB'))
-{
+{
-	exit;
+	exit;
-}
+}
-
+
-if (empty($lang) || !is_array($lang))
+if (empty($lang) || !is_array($lang))
-{
+{
-	$lang = array();
+	$lang = array();
-}
+}
-
+
-// DEVELOPERS PLEASE NOTE
+// DEVELOPERS PLEASE NOTE
-//
+//
-// All language files should use UTF-8 as their encoding and the files must not contain a BOM.
+// All language files should use UTF-8 as their encoding and the files must not contain a BOM.
-//
+//
-// Placeholders can now contain order information, e.g. instead of
+// Placeholders can now contain order information, e.g. instead of
-// 'Page %s of %s' you can (and should) write 'Page %1$s of %2$s', this allows
+// 'Page %s of %s' you can (and should) write 'Page %1$s of %2$s', this allows
-// translators to re-order the output of data while ensuring it remains correct
+// translators to re-order the output of data while ensuring it remains correct
-//
+//
-// You do not need this where single placeholders are used, e.g. 'Message %d' is fine
+// You do not need this where single placeholders are used, e.g. 'Message %d' is fine
-// equally where a string contains only two placeholders which are used to wrap text
+// equally where a string contains only two placeholders which are used to wrap text
-// in a url you again do not need to specify an order e.g., 'Click %sHERE%s' is fine
+// in a url you again do not need to specify an order e.g., 'Click %sHERE%s' is fine
-
+
-$lang = array_merge($lang, array(
+$lang = array_merge($lang, array(
-	'ACP_FOOTBALL_BANK'						=> 'Konten',
+	'ACP_FOOTBALL_BANK'						=> 'Konten',
-	'ACP_FOOTBALL_BANK_MANAGE'				=> 'Konten verwalten',
+	'ACP_FOOTBALL_BANK_MANAGE'				=> 'Konten verwalten',
-	'ACP_FOOTBALL_BANK_MANAGE_EXPLAIN'		=> 'Hier kannst du alle Tipprunden Konten verwalten. Du kannst Einsätze einziehen, Ein- und Auszahlungen verwalten und kontrollieren.',
+	'ACP_FOOTBALL_BANK_MANAGE_EXPLAIN'		=> 'Hier kannst du alle Tipprunden Konten verwalten. Du kannst Einsätze einziehen, Ein- und Auszahlungen verwalten und kontrollieren.',
-	'ACP_FOOTBALL_BANK_MANAGEMENT'			=> 'Tipprunde-Konten-Verwaltung',
+	'ACP_FOOTBALL_BANK_MANAGEMENT'			=> 'Tipprunde-Konten-Verwaltung',
-
+
-	'BET_DEPOSIT'							=> 'Einsatz einzahlen',
+	'BET_DEPOSIT'							=> 'Einsatz einzahlen',
-	'BET_DEPOSIT_EXPLAIN'					=> 'Hier kannst du Einzahlungen der Teilnehmer verbuchen. Bei Verrechnung in Ultimate Points, wird der UP Saldo entsprechend erhöht bzw. ausgeglichen. Ohne Verrechnung werden nur die jeweiligen Protokollsätze zum gewählten Spieltag erfasst.',
+	'BET_DEPOSIT_EXPLAIN'					=> 'Hier kannst du Einzahlungen der Teilnehmer verbuchen. Bei Verrechnung in Ultimate Points, wird der UP Saldo entsprechend erhöht bzw. ausgeglichen. Ohne Verrechnung werden nur die jeweiligen Protokollsätze zum gewählten Spieltag erfasst.',
-	'BOOK'									=> 'buchen',
+	'BOOK'									=> 'buchen',
-	'BOOKED'								=> 'Gebucht',
+	'BOOKED'								=> 'Gebucht',
-
+
-	'CARRYOVER_NEW_SEASON'					=> 'Übertrag in die nächste Saison',
+	'CARRYOVER_NEW_SEASON'					=> 'Übertrag in die nächste Saison',
-	'CARRYOVER_OLD_SEASON'					=> 'Übertrag aus der letzten Saison',
+	'CARRYOVER_OLD_SEASON'					=> 'Übertrag aus der letzten Saison',
-	'CONFIRM_BET'							=> 'Bist du sicher, dass du bei den gewählten Tippern die Einsätze abbuchen möchtest?',
+	'CONFIRM_BET'							=> 'Bist du sicher, dass du bei den gewählten Tippern die Einsätze abbuchen möchtest?',
-	'CONFIRM_CANCEL_BET'					=> 'Bist du sicher, dass du bei den gewählten Tippern die Einsätze stornieren möchtest?',
+	'CONFIRM_CANCEL_BET'					=> 'Bist du sicher, dass du bei den gewählten Tippern die Einsätze stornieren möchtest?',
-	'CONFIRM_CANCEL_DEPOSIT'				=> 'Bist du sicher, dass du bei den gewählten Tippern die Einzahlungen stornieren möchtest?',
+	'CONFIRM_CANCEL_DEPOSIT'				=> 'Bist du sicher, dass du bei den gewählten Tippern die Einzahlungen stornieren möchtest?',
-	'CONFIRM_CANCEL_PAY'					=> 'Bist du sicher, dass du bei den gewählten Tippern die Auszahlungen stornieren möchtest?',
+	'CONFIRM_CANCEL_PAY'					=> 'Bist du sicher, dass du bei den gewählten Tippern die Auszahlungen stornieren möchtest?',
-	'CONFIRM_CARRYOVER_PAY'					=> 'Bist du sicher, dass du bei den gewählten Tippern ein Teil der Gewinne in die neue Saison einzahlen möchtest?',
+	'CONFIRM_CARRYOVER_PAY'					=> 'Bist du sicher, dass du bei den gewählten Tippern ein Teil der Gewinne in die neue Saison einzahlen möchtest?',
-	'CONFIRM_DEPOSIT'						=> 'Bist du sicher, dass du bei den gewählten Tippern die Einzahlungen buchen möchtest?',
+	'CONFIRM_DEPOSIT'						=> 'Bist du sicher, dass du bei den gewählten Tippern die Einzahlungen buchen möchtest?',
-	'CONFIRM_LEAGUE_BET'					=> 'Bist du sicher, dass du bei den gewählten Ligen die Einsätze abbuchen möchtest?',
+	'CONFIRM_LEAGUE_BET'					=> 'Bist du sicher, dass du bei den gewählten Ligen die Einsätze abbuchen möchtest?',
-	'CONFIRM_LEAGUE_DELETE_WIN'				=> 'Bist du sicher, dass du bei den gewählten Ligen alle Gewinne löschen möchtest?',
+	'CONFIRM_LEAGUE_DELETE_WIN'				=> 'Bist du sicher, dass du bei den gewählten Ligen alle Gewinne löschen möchtest?',
-	'CONFIRM_LEAGUE_DEPOSIT'				=> 'Bist du sicher, dass du bei den gewählten Ligen die Einzahlungen buchen möchtest?',
+	'CONFIRM_LEAGUE_DEPOSIT'				=> 'Bist du sicher, dass du bei den gewählten Ligen die Einzahlungen buchen möchtest?',
-	'CONFIRM_LEAGUE_PAY'					=> 'Bist du sicher, dass du bei den gewählten Ligen die Auszahlungen buchen möchtest?',
+	'CONFIRM_LEAGUE_PAY'					=> 'Bist du sicher, dass du bei den gewählten Ligen die Auszahlungen buchen möchtest?',
-	'CONFIRM_PAY'							=> 'Bist du sicher, dass du bei den gewählten Tippern die Auszahlungen buchen möchtest?',
+	'CONFIRM_PAY'							=> 'Bist du sicher, dass du bei den gewählten Tippern die Auszahlungen buchen möchtest?',
-
+
-	'DEBIT_BET'								=> 'Einsatz abbuchen',
+	'DEBIT_BET'								=> 'Einsatz abbuchen',
-	'DEBIT_BET_EXPLAIN'						=> 'Hier kannst du Einsätze der Teilnehmer einfordern oder stornieren. Bei Verrechnung in Ultimate Points, wird der UP Saldo entsprechend belastet.',
+	'DEBIT_BET_EXPLAIN'						=> 'Hier kannst du Einsätze der Teilnehmer einfordern oder stornieren. Bei Verrechnung in Ultimate Points, wird der UP Saldo entsprechend belastet.',
-	'DEPOSITED'								=> 'Eingezahlt',
+	'DEPOSITED'								=> 'Eingezahlt',
-
+
-	'FOOTBALL_BANK_OFF'						=> 'Die Tipprunden Konten-Verwaltung wurde in den Tipprunden-Funktionalitäten deaktiviert.',
+	'FOOTBALL_BANK_OFF'						=> 'Die Tipprunden Konten-Verwaltung wurde in den Tipprunden-Funktionalitäten deaktiviert.',
-
+
-	'LEAGUE_BANK'							=> 'Konten',
+	'LEAGUE_BANK'							=> 'Konten',
-	'LEAGUE_BANK_EXPLAIN'					=> 'Dies sind die aktuellen Kontenbuchungen der jeweiligen Ligen. Am Ende der Saison sollten zumindest Einsatz/Gewinn und Ein-/Auszahlungen paarweise identisch sein. Aktionen auf dieser Seite werden für alle Teilnehmer ausgeführt. Einsätze und Einzahlungen werden für den 1. Spieltag, Auszahlung für den aktuellen Spieltag gebucht. Buchungen für einzelne Teilnehmer kannst du vernehmen, indem du auf den entsprechenden Betrag klickst. Mit Klick auf den Liganamen kannst du eine Übersicht als CSV-Datei downloaden.',
+	'LEAGUE_BANK_EXPLAIN'					=> 'Dies sind die aktuellen Kontenbuchungen der jeweiligen Ligen. Am Ende der Saison sollten zumindest Einsatz/Gewinn und Ein-/Auszahlungen paarweise identisch sein. Aktionen auf dieser Seite werden für alle Teilnehmer ausgeführt. Einsätze und Einzahlungen werden für den 1. Spieltag, Auszahlung für den aktuellen Spieltag gebucht. Buchungen für einzelne Teilnehmer kannst du vernehmen, indem du auf den entsprechenden Betrag klickst. Mit Klick auf den Liganamen kannst du eine Übersicht als CSV-Datei downloaden.',
-	'LEAGUE_BET'							=> '%s Einsatz wurde abgebucht.',
+	'LEAGUE_BET'							=> '%s Einsatz wurde abgebucht.',
-	'LEAGUE_BETS'							=> '%s Einsätze wurden abgebucht.',
+	'LEAGUE_BETS'							=> '%s Einsätze wurden abgebucht.',
-	'LEAGUE_CANCEL_BET'						=> '%s Einsatzbuchung wurde storniert.',
+	'LEAGUE_CANCEL_BET'						=> '%s Einsatzbuchung wurde storniert.',
-	'LEAGUE_CANCEL_BETS'					=> '%s Einsatzbuchungen wurden storniert.',
+	'LEAGUE_CANCEL_BETS'					=> '%s Einsatzbuchungen wurden storniert.',
-	'LEAGUE_CANCEL_DEPOSIT'					=> '%s Einsatzzahlung wurde storniert.',
+	'LEAGUE_CANCEL_DEPOSIT'					=> '%s Einsatzzahlung wurde storniert.',
-	'LEAGUE_CANCEL_DEPOSITS'				=> '%s Einsatzzahlungen wurden storniert.',
+	'LEAGUE_CANCEL_DEPOSITS'				=> '%s Einsatzzahlungen wurden storniert.',
-	'LEAGUE_CANCEL_PAY'						=> '%s Gewinnauszahlung wurde storniert.',
+	'LEAGUE_CANCEL_PAY'						=> '%s Gewinnauszahlung wurde storniert.',
-	'LEAGUE_CANCEL_PAYS'					=> '%s Gewinnauszahlungen wurden storniert.',
+	'LEAGUE_CANCEL_PAYS'					=> '%s Gewinnauszahlungen wurden storniert.',
-	'LEAGUE_CARRYOVER_PAY'					=> '%s Gewinnanteil wurde als Einzahlung in die neue Saison übertragen.',
+	'LEAGUE_CARRYOVER_PAY'					=> '%s Gewinnanteil wurde als Einzahlung in die neue Saison übertragen.',
-	'LEAGUE_CARRYOVER_PAYS'					=> '%s Gewinnanteile wurden als Einzahlung in die neue Saison übertragen.',
+	'LEAGUE_CARRYOVER_PAYS'					=> '%s Gewinnanteile wurden als Einzahlung in die neue Saison übertragen.',
-	'LEAGUE_DELETE_WIN'						=> '%s Gewinn wurde gelöscht.',
+	'LEAGUE_DELETE_WIN'						=> '%s Gewinn wurde gelöscht.',
-	'LEAGUE_DELETE_WINS'					=> '%s Gewinne wurden gelöscht.',
+	'LEAGUE_DELETE_WINS'					=> '%s Gewinne wurden gelöscht.',
-	'LEAGUE_DEPOSIT'						=> '%s Einsatz wurde eingezahlt.',
+	'LEAGUE_DEPOSIT'						=> '%s Einsatz wurde eingezahlt.',
-	'LEAGUE_DEPOSITS'						=> '%s Einsätze wurden eingezahlt.',
+	'LEAGUE_DEPOSITS'						=> '%s Einsätze wurden eingezahlt.',
-	'LEAGUE_NAME'							=> 'Liganame',
+	'LEAGUE_NAME'							=> 'Liganame',
-	'LEAGUE_PAY'							=> '%s Gewinn wurde ausgezahlt.',
+	'LEAGUE_PAY'							=> '%s Gewinn wurde ausgezahlt.',
-	'LEAGUE_PAYS'							=> '%s Gewinne wurden ausgezahlt.',
+	'LEAGUE_PAYS'							=> '%s Gewinne wurden ausgezahlt.',
-
+
-	'MEMBER_BET'							=> 'Einsätze buchen',
+	'MEMBER_BET'							=> 'Einsätze buchen',
-	'MEMBER_CANCEL_BET'						=> 'Einsätze stornieren',
+	'MEMBER_CANCEL_BET'						=> 'Einsätze stornieren',
-	'MEMBER_CANCEL_DEPOSITED'				=> 'Einzahlungen stornieren',
+	'MEMBER_CANCEL_DEPOSITED'				=> 'Einzahlungen stornieren',
-	'MEMBER_CANCEL_PAID'					=> 'Auszahlungen stornieren',
+	'MEMBER_CANCEL_PAID'					=> 'Auszahlungen stornieren',
-	'MEMBER_CARRYOVER_PAID'					=> 'Einzahlung in nächste Saison',
+	'MEMBER_CARRYOVER_PAID'					=> 'Einzahlung in nächste Saison',
-	'MEMBER_DELETE_WINS'					=> 'Gewinne löschen',
+	'MEMBER_DELETE_WINS'					=> 'Gewinne löschen',
-	'MEMBER_DEPOSITED'						=> 'Einzahlungen buchen',
+	'MEMBER_DEPOSITED'						=> 'Einzahlungen buchen',
-	'MEMBER_PAID'							=> 'Auszahlungen buchen',
+	'MEMBER_PAID'							=> 'Auszahlungen buchen',
-
+
-	'NO_LEAGUE'								=> 'Keine Liga angegeben.',
+	'NO_LEAGUE'								=> 'Keine Liga angegeben.',
-	'NO_LEAGUES_SELECTED'					=> 'Es wurde keine Liga gewählt.',
+	'NO_LEAGUES_SELECTED'					=> 'Es wurde keine Liga gewählt.',
-	'NO_MEMBERS_SELECTED'					=> 'Es wurde kein Mitglied ausgewählt, bzw. das gewählte Mitglied ist nicht bekannt.',
+	'NO_MEMBERS_SELECTED'					=> 'Es wurde kein Mitglied ausgewählt, bzw. das gewählte Mitglied ist nicht bekannt.',
-	'NO_SEASON'								=> 'Es existiert keine Saison. Bitte zuerst eine Saison erstellen.',
+	'NO_SEASON'								=> 'Es existiert keine Saison. Bitte zuerst eine Saison erstellen.',
-	'NO_VALID_CALL'							=> 'Unzulässiger Aufruf! Die Aktion wird abgebrochen.',
+	'NO_VALID_CALL'							=> 'Unzulässiger Aufruf! Die Aktion wird abgebrochen.',
-
+
-	'PAID'									=> 'Ausgezahlt',
+	'PAID'									=> 'Ausgezahlt',
-	'PAY_WINS'								=> 'Gewinne auszahlen',
+	'PAY_WINS'								=> 'Gewinne auszahlen',
-	'PAY_WINS_EXPLAIN'						=> 'Hier kannst du Gewinne oder Teilgewinne auszahlen oder als Einsatz in die nächste Saison übertragen. Bei Verrechnung in Ultimate Points, wird der UP Saldo entsprechend belastet.',
+	'PAY_WINS_EXPLAIN'						=> 'Hier kannst du Gewinne oder Teilgewinne auszahlen oder als Einsatz in die nächste Saison übertragen. Bei Verrechnung in Ultimate Points, wird der UP Saldo entsprechend belastet.',
-
+
-	'SELECT_SEASON'							=> 'Saison auswählen',
+	'SELECT_SEASON'							=> 'Saison auswählen',
-	'SET_DEPOSITS'							=> 'Einzahlungen berechnen', 
+	'SET_DEPOSITS'							=> 'Einzahlungen berechnen', 
-
+
-	'WINS'									=> 'Gewinne',
+	'WINS'									=> 'Gewinne',
-));
+));
-
+
 ?>

language/de/info_acp_bets.php

@@ -1,47 +1,47 @@
-<?php
+<?php
-/**
+/**
-*
+*
-* info_acp_football_bets [Deutsch — Du]
+* info_acp_football_bets [Deutsch — Du]
-*
+*
-* @package language
+* @package language
-* @version $Id: info_acp_football_bets.php 6 2011-01-09 08:02:37Z football $ 
+* @version $Id: info_acp_football_bets.php 6 2011-01-09 08:02:37Z football $ 
-* @copyright (c) 2010 football (http://football.bplaced.net)
+* @copyright (c) 2010 football (http://football.bplaced.net)
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License
-*
+*
-*/
+*/
-
+
-/**
+/**
-* DO NOT CHANGE
+* DO NOT CHANGE
-*/
+*/
-if (!defined('IN_PHPBB'))
+if (!defined('IN_PHPBB'))
-{
+{
-	exit;
+	exit;
-}
+}
-
+
-if (empty($lang) || !is_array($lang))
+if (empty($lang) || !is_array($lang))
-{
+{
-	$lang = array();
+	$lang = array();
-}
+}
-
+
-// DEVELOPERS PLEASE NOTE
+// DEVELOPERS PLEASE NOTE
-//
+//
-// All language files should use UTF-8 as their encoding and the files must not contain a BOM.
+// All language files should use UTF-8 as their encoding and the files must not contain a BOM.
-//
+//
-// Placeholders can now contain order information, e.g. instead of
+// Placeholders can now contain order information, e.g. instead of
-// 'Page %s of %s' you can (and should) write 'Page %1$s of %2$s', this allows
+// 'Page %s of %s' you can (and should) write 'Page %1$s of %2$s', this allows
-// translators to re-order the output of data while ensuring it remains correct
+// translators to re-order the output of data while ensuring it remains correct
-//
+//
-// You do not need this where single placeholders are used, e.g. 'Message %d' is fine
+// You do not need this where single placeholders are used, e.g. 'Message %d' is fine
-// equally where a string contains only two placeholders which are used to wrap text
+// equally where a string contains only two placeholders which are used to wrap text
-// in a url you again do not need to specify an order e.g., 'Click %sHERE%s' is fine
+// in a url you again do not need to specify an order e.g., 'Click %sHERE%s' is fine
-
+
-$lang = array_merge($lang, array(
+$lang = array_merge($lang, array(
-	'ACP_FOOTBALL_BETS'						=> 'Tipps',
+	'ACP_FOOTBALL_BETS'						=> 'Tipps',
-	'ACP_FOOTBALL_BETS_MANAGE'				=> 'Tipps editieren',
+	'ACP_FOOTBALL_BETS_MANAGE'				=> 'Tipps editieren',
-	'ACP_FOOTBALL_BETS_MANAGE_EXPLAIN'		=> 'Hier kannst du alle Tipps der Tipper editieren.',
+	'ACP_FOOTBALL_BETS_MANAGE_EXPLAIN'		=> 'Hier kannst du alle Tipps der Tipper editieren.',
-	'ACP_FOOTBALL_BETS_MANAGEMENT'			=> 'Tipprunde-Tipps editieren',
+	'ACP_FOOTBALL_BETS_MANAGEMENT'			=> 'Tipprunde-Tipps editieren',
-	
+	
-	'SELECT_MATCHDAY'						=> 'Spieltag wählen',	
+	'SELECT_MATCHDAY'						=> 'Spieltag wählen',	
-));
+));
-
+
 ?>

language/de/info_acp_extra.php

@@ -1,93 +1,93 @@
-<?php
+<?php
-/**
+/**
-*
+*
-* info_acp_football_extra [Deutsch — Du]
+* info_acp_football_extra [Deutsch — Du]
-*
+*
-* @package language
+* @package language
-* @version $Id: info_acp_football_extra.php 6 2011-01-09 08:02:37Z football $ 
+* @version $Id: info_acp_football_extra.php 6 2011-01-09 08:02:37Z football $ 
-* @copyright (c) 2010 football (http://football.bplaced.net)
+* @copyright (c) 2010 football (http://football.bplaced.net)
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License
-*
+*
-*/
+*/
-
+
-/**
+/**
-* DO NOT CHANGE
+* DO NOT CHANGE
-*/
+*/
-if (!defined('IN_PHPBB'))
+if (!defined('IN_PHPBB'))
-{
+{
-	exit;
+	exit;
-}
+}
-
+
-if (empty($lang) || !is_array($lang))
+if (empty($lang) || !is_array($lang))
-{
+{
-	$lang = array();
+	$lang = array();
-}
+}
-
+
-// DEVELOPERS PLEASE NOTE
+// DEVELOPERS PLEASE NOTE
-//
+//
-// All language files should use UTF-8 as their encoding and the files must not contain a BOM.
+// All language files should use UTF-8 as their encoding and the files must not contain a BOM.
-//
+//
-// Placeholders can now contain order information, e.g. instead of
+// Placeholders can now contain order information, e.g. instead of
-// 'Page %s of %s' you can (and should) write 'Page %1$s of %2$s', this allows
+// 'Page %s of %s' you can (and should) write 'Page %1$s of %2$s', this allows
-// translators to re-order the output of data while ensuring it remains correct
+// translators to re-order the output of data while ensuring it remains correct
-//
+//
-// You do not need this where single placeholders are used, e.g. 'Message %d' is fine
+// You do not need this where single placeholders are used, e.g. 'Message %d' is fine
-// equally where a string contains only two placeholders which are used to wrap text
+// equally where a string contains only two placeholders which are used to wrap text
-// in a url you again do not need to specify an order e.g., 'Click %sHERE%s' is fine
+// in a url you again do not need to specify an order e.g., 'Click %sHERE%s' is fine
-
+
-$lang = array_merge($lang, array(
+$lang = array_merge($lang, array(
-	'ACP_FOOTBALL_EXTRA'					=> 'Sondertipps',
+	'ACP_FOOTBALL_EXTRA'					=> 'Sondertipps',
-	'ACP_FOOTBALL_EXTRA_MANAGE'				=> 'Sondertipps verwalten',
+	'ACP_FOOTBALL_EXTRA_MANAGE'				=> 'Sondertipps verwalten',
-	'ACP_FOOTBALL_EXTRA_MANAGE_EXPLAIN'		=> 'Hier kannst du Sondertipps zu Spieltagen einer Liga zuordnen. Du kannst bestehende löschen oder ändern oder einen neuen Sondertipp erstellen, sowie Typ, Wertung, Punkte und den Endzeitpunkt der Sondertipps einstellen.',
+	'ACP_FOOTBALL_EXTRA_MANAGE_EXPLAIN'		=> 'Hier kannst du Sondertipps zu Spieltagen einer Liga zuordnen. Du kannst bestehende löschen oder ändern oder einen neuen Sondertipp erstellen, sowie Typ, Wertung, Punkte und den Endzeitpunkt der Sondertipps einstellen.',
-	'ACP_FOOTBALL_EXTRA_MANAGEMENT'			=> 'Tipprunde-Sondertipp-Verwaltung',
+	'ACP_FOOTBALL_EXTRA_MANAGEMENT'			=> 'Tipprunde-Sondertipp-Verwaltung',
-
+
-	'EVAL_BEFORE_DELIVERY'					=> 'Der Auswertungs-Spieltag darf nicht vor dem Abgabe-Spieltag liegen.',
+	'EVAL_BEFORE_DELIVERY'					=> 'Der Auswertungs-Spieltag darf nicht vor dem Abgabe-Spieltag liegen.',
-	'EXTRA_ADD'								=> 'Sondertipp hinzufügen',
+	'EXTRA_ADD'								=> 'Sondertipp hinzufügen',
-	'EXTRA_ADDED'							=> 'Sondertipp erfolgreich hinzugefügt.',
+	'EXTRA_ADDED'							=> 'Sondertipp erfolgreich hinzugefügt.',
-	'EXTRA_CONFIRM_DELETE'					=> 'Bist du sicher, dass du den Sondertipp "%1$s" in der %2$s. Liga aus der Saison %3$s mit allen Tipps löschen willst?',
+	'EXTRA_CONFIRM_DELETE'					=> 'Bist du sicher, dass du den Sondertipp "%1$s" in der %2$s. Liga aus der Saison %3$s mit allen Tipps löschen willst?',
-	'EXTRA_CREATE_FAILED'					=> 'Sondertipp konnte nicht erstellt werden.',
+	'EXTRA_CREATE_FAILED'					=> 'Sondertipp konnte nicht erstellt werden.',
-	'EXTRA_DEF'								=> 'Bestehende Sondertipps',
+	'EXTRA_DEF'								=> 'Bestehende Sondertipps',
-	'EXTRA_DEF_EXPLAIN'						=> 'Dies sind Sondertipps, die von dir oder einem anderen Administrator erstellt wurden. Du kannst Sondertippeinstellungen ändern oder Sondertipps löschen.',
+	'EXTRA_DEF_EXPLAIN'						=> 'Dies sind Sondertipps, die von dir oder einem anderen Administrator erstellt wurden. Du kannst Sondertippeinstellungen ändern oder Sondertipps löschen.',
-	'EXTRA_DELETED'							=> 'Sondertipp gelöscht',
+	'EXTRA_DELETED'							=> 'Sondertipp gelöscht',
-	'EXTRA_DETAILS'							=> 'Sondertippdaten',
+	'EXTRA_DETAILS'							=> 'Sondertippdaten',
-	'EXTRA_MATCHDAY'						=> 'Abgabe',
+	'EXTRA_MATCHDAY'						=> 'Abgabe',
-	'EXTRA_MATCHDAY_EVAL'					=> 'Auswertung',
+	'EXTRA_MATCHDAY_EVAL'					=> 'Auswertung',
-	'EXTRA_MATCHDAY_EVAL_EXPLAIN'			=> 'Das Ergebnis des Sondertipps wird an diesem Spieltag eingegeben. Bei unterschiedlichen Spieltagen für Abgabe und Ergebnis werden die Punkte der Gesamtwertung zugerechnet, sonst fließen sie in die Spieltagswertung mit ein.',
+	'EXTRA_MATCHDAY_EVAL_EXPLAIN'			=> 'Das Ergebnis des Sondertipps wird an diesem Spieltag eingegeben. Bei unterschiedlichen Spieltagen für Abgabe und Ergebnis werden die Punkte der Gesamtwertung zugerechnet, sonst fließen sie in die Spieltagswertung mit ein.',
-	'EXTRA_MATCHDAY_EXPLAIN'				=> 'Die Tippabgabe des Sondertipps wird mit dem ersten Abgabetermin dieses Spieltags gesperrt.',
+	'EXTRA_MATCHDAY_EXPLAIN'				=> 'Die Tippabgabe des Sondertipps wird mit dem ersten Abgabetermin dieses Spieltags gesperrt.',
-	'EXTRA_NO'								=> 'Nummer',
+	'EXTRA_NO'								=> 'Nummer',
-	'EXTRA_NO_DELETE'						=> 'Du darfst keine Sondertipps löschen. Dies dürfen nur Gründungsmitglieder',
+	'EXTRA_NO_DELETE'						=> 'Du darfst keine Sondertipps löschen. Dies dürfen nur Gründungsmitglieder',
-	'EXTRA_POINTS'							=> 'Mögl. Punkte',
+	'EXTRA_POINTS'							=> 'Mögl. Punkte',
-	'EXTRA_POINTS_EXPLAIN'					=> 'Maximal zu erreichende Punkte in Abhängigkeit zum Punktemodus.',
+	'EXTRA_POINTS_EXPLAIN'					=> 'Maximal zu erreichende Punkte in Abhängigkeit zum Punktemodus.',
-	'EXTRA_QUESTION'						=> 'Sondertipp Frage',
+	'EXTRA_QUESTION'						=> 'Sondertipp Frage',
-	'EXTRA_QUESTION_EXPLAIN'				=> 'Freier Fragetext. Bitte eine präzise, unmissverständliche Frage zum hinterlegten Fragetyp formulieren.',
+	'EXTRA_QUESTION_EXPLAIN'				=> 'Freier Fragetext. Bitte eine präzise, unmissverständliche Frage zum hinterlegten Fragetyp formulieren.',
-	'EXTRA_QUESTION_TYPE'					=> 'Frage- bzw. Wertungs-Typ.',
+	'EXTRA_QUESTION_TYPE'					=> 'Frage- bzw. Wertungs-Typ.',
-	'EXTRA_QUESTION_TYPE_EXPLAIN'			=> '1 = Auswahl eines Teams, Punkte nur bei Übereinstimmung <br />2 = Auswahl eines Teams mehrere Ergebnisse, Punkte bei einem Treffer<br /> 3 = Texteingabe, Punkte bei Übereinstimmung<br />4 = Texteingabe aber mehrere Ergebnisse, Punkte bei einem Treffer<br />5 = Zahl, Punkte abzgl. der Differenz zwischen Tipp und Ergebnis',
+	'EXTRA_QUESTION_TYPE_EXPLAIN'			=> '1 = Auswahl eines Teams, Punkte nur bei Übereinstimmung <br />2 = Auswahl eines Teams mehrere Ergebnisse, Punkte bei einem Treffer<br /> 3 = Texteingabe, Punkte bei Übereinstimmung<br />4 = Texteingabe aber mehrere Ergebnisse, Punkte bei einem Treffer<br />5 = Zahl, Punkte abzgl. der Differenz zwischen Tipp und Ergebnis',
-	'EXTRA_STATUS'							=> 'Status',
+	'EXTRA_STATUS'							=> 'Status',
-	'EXTRA_STATUS_EXPLAIN'					=> '0 = offen (Tippabgabe möglich) <br /> 1 = keine Tippabgabe mehr möglich und noch keine Ergebnisse <br /> 2 = vorläufige Ergebnisse liegen vor <br /> 3 = abgeschlossen, endgültige Ergebnisse liegen vor.',
+	'EXTRA_STATUS_EXPLAIN'					=> '0 = offen (Tippabgabe möglich) <br /> 1 = keine Tippabgabe mehr möglich und noch keine Ergebnisse <br /> 2 = vorläufige Ergebnisse liegen vor <br /> 3 = abgeschlossen, endgültige Ergebnisse liegen vor.',
-	'EXTRA_UPDATE_FAILED'					=> 'Die Sondertippeinstellungen konnten nicht aktualisiert werden.',
+	'EXTRA_UPDATE_FAILED'					=> 'Die Sondertippeinstellungen konnten nicht aktualisiert werden.',
-	'EXTRA_UPDATED'							=> 'Sondertippeinstellungen erfolgreich aktualisiert.',
+	'EXTRA_UPDATED'							=> 'Sondertippeinstellungen erfolgreich aktualisiert.',
-
+
-	'LEAGUE'								=> 'Liga',
+	'LEAGUE'								=> 'Liga',
-
+
-	'MATCHDAY'								=> 'Spieltag',
+	'MATCHDAY'								=> 'Spieltag',
-
+
-	'NO_EXTRA'								=> 'Der gewählte Sondertipp existiert nicht. Bitte zuerst einen Sondertipp in dieser Liga der Saison erstellen.',
+	'NO_EXTRA'								=> 'Der gewählte Sondertipp existiert nicht. Bitte zuerst einen Sondertipp in dieser Liga der Saison erstellen.',
-	'NO_EXTRA_CREATED'						=> 'Es wurden bislang keine Sondertipps erstellt.',
+	'NO_EXTRA_CREATED'						=> 'Es wurden bislang keine Sondertipps erstellt.',
-	'NO_LEAGUE'								=> 'Die gewählte Liga existiert nicht in der Saison %1$s. Bitte zuerst eine Liga in der Saison %1$s erstellen.',
+	'NO_LEAGUE'								=> 'Die gewählte Liga existiert nicht in der Saison %1$s. Bitte zuerst eine Liga in der Saison %1$s erstellen.',
-	'NO_SEASON'								=> 'Die gewählte Saison existiert nicht. Bitte zuerst eine Saison erstellen.',
+	'NO_SEASON'								=> 'Die gewählte Saison existiert nicht. Bitte zuerst eine Saison erstellen.',
-
+
-	'QUESTION_TYPE'							=> 'Frage-Typ',
+	'QUESTION_TYPE'							=> 'Frage-Typ',
-
+
-	'SEASON'								=> 'Saison',
+	'SEASON'								=> 'Saison',
-	'SELECT_LEAGUE'							=> 'Liga auswählen',
+	'SELECT_LEAGUE'							=> 'Liga auswählen',
-	'SELECT_MATCHDAY'						=> 'Wähle einen Spieltag',
+	'SELECT_MATCHDAY'						=> 'Wähle einen Spieltag',
-
+
-	'TOO_LARGE_EXTRA_POINTS'				=> 'Die Punktzahl für den Sondertipp ist zu groß. Erlaubt: 0-99',
+	'TOO_LARGE_EXTRA_POINTS'				=> 'Die Punktzahl für den Sondertipp ist zu groß. Erlaubt: 0-99',
-	'TOO_LARGE_MATCHDAY'					=> 'Du musst einen Abgabe-Spieltag wählen.',
+	'TOO_LARGE_MATCHDAY'					=> 'Du musst einen Abgabe-Spieltag wählen.',
-	'TOO_LARGE_MATCHDAY_EVAL'				=> 'Du musst einen Auswertungs-Spieltag wählen.',
+	'TOO_LARGE_MATCHDAY_EVAL'				=> 'Du musst einen Auswertungs-Spieltag wählen.',
-	'TOO_SMALL_EXTRA_POINTS'				=> 'Die Punktzahl für den Sondertipp ist zu klein. Erlaubt: 0-99',
+	'TOO_SMALL_EXTRA_POINTS'				=> 'Die Punktzahl für den Sondertipp ist zu klein. Erlaubt: 0-99',
-	'TOO_SMALL_MATCHDAY'					=> 'Du musst einen Abgabe-Spieltag wählen.',
+	'TOO_SMALL_MATCHDAY'					=> 'Du musst einen Abgabe-Spieltag wählen.',
-	'TOO_SMALL_MATCHDAY_EVAL'				=> 'Du musst einen Auswertungs-Spieltag wählen.',
+	'TOO_SMALL_MATCHDAY_EVAL'				=> 'Du musst einen Auswertungs-Spieltag wählen.',
-));
+));
-
+
 ?>

language/de/info_acp_ko.php

@@ -1,70 +1,70 @@
-<?php
+<?php
-/**
+/**
-*
+*
-* info_acp_football_ko [Deutsch — Du]
+* info_acp_football_ko [Deutsch — Du]
-*
+*
-* @package language
+* @package language
-* @version $Id: info_acp_football_ko.php 6 2011-01-09 08:02:37Z football $ 
+* @version $Id: info_acp_football_ko.php 6 2011-01-09 08:02:37Z football $ 
-* @copyright (c) 2010 football (http://football.bplaced.net)
+* @copyright (c) 2010 football (http://football.bplaced.net)
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License
-*
+*
-*/
+*/
-
+
-/**
+/**
-* DO NOT CHANGE
+* DO NOT CHANGE
-*/
+*/
-if (!defined('IN_PHPBB'))
+if (!defined('IN_PHPBB'))
-{
+{
-	exit;
+	exit;
-}
+}
-
+
-if (empty($lang) || !is_array($lang))
+if (empty($lang) || !is_array($lang))
-{
+{
-	$lang = array();
+	$lang = array();
-}
+}
-
+
-// DEVELOPERS PLEASE NOTE
+// DEVELOPERS PLEASE NOTE
-//
+//
-// All language files should use UTF-8 as their encoding and the files must not contain a BOM.
+// All language files should use UTF-8 as their encoding and the files must not contain a BOM.
-//
+//
-// Placeholders can now contain order information, e.g. instead of
+// Placeholders can now contain order information, e.g. instead of
-// 'Page %s of %s' you can (and should) write 'Page %1$s of %2$s', this allows
+// 'Page %s of %s' you can (and should) write 'Page %1$s of %2$s', this allows
-// translators to re-order the output of data while ensuring it remains correct
+// translators to re-order the output of data while ensuring it remains correct
-//
+//
-// You do not need this where single placeholders are used, e.g. 'Message %d' is fine
+// You do not need this where single placeholders are used, e.g. 'Message %d' is fine
-// equally where a string contains only two placeholders which are used to wrap text
+// equally where a string contains only two placeholders which are used to wrap text
-// in a url you again do not need to specify an order e.g., 'Click %sHERE%s' is fine
+// in a url you again do not need to specify an order e.g., 'Click %sHERE%s' is fine
-
+
-$lang = array_merge($lang, array(
+$lang = array_merge($lang, array(
-	'ACP_FOOTBALL_KO'					=> 'KO-Runden Gewinner',
+	'ACP_FOOTBALL_KO'					=> 'KO-Runden Gewinner',
-	'ACP_FOOTBALL_KO_MANAGE'			=> 'KO-Runden Gewinner ermitteln',
+	'ACP_FOOTBALL_KO_MANAGE'			=> 'KO-Runden Gewinner ermitteln',
-	'ACP_FOOTBALL_KO_MANAGE_EXPLAIN'	=> 'Hier kannst du zu einer KO-Runde die Gewinner anhand der Begegnung(en) oder des Tabellenplatzes ermitteln und für kommende Spieltage freischalten. Bei der Spielplanerstellung werden nur diese Mannschaften für die Spieltage zur Auswahl angeboten. Ebenso ist es möglich Mannschaften anhand des Tabellenplatzes in eine andere KO-Liga zu überführen.',
+	'ACP_FOOTBALL_KO_MANAGE_EXPLAIN'	=> 'Hier kannst du zu einer KO-Runde die Gewinner anhand der Begegnung(en) oder des Tabellenplatzes ermitteln und für kommende Spieltage freischalten. Bei der Spielplanerstellung werden nur diese Mannschaften für die Spieltage zur Auswahl angeboten. Ebenso ist es möglich Mannschaften anhand des Tabellenplatzes in eine andere KO-Liga zu überführen.',
-	'ACP_FOOTBALL_KO_MANAGEMENT'		=> 'Tipprunde-KO-Runden abschliessen',
+	'ACP_FOOTBALL_KO_MANAGEMENT'		=> 'Tipprunde-KO-Runden abschliessen',
-
+
-	'CHOOSE_LEAGUE'						=> 'Liga wählen',
+	'CHOOSE_LEAGUE'						=> 'Liga wählen',
-
+
-	'ERROR_FROM_TO'						=> 'Fehler bei der Spieltagswahl. "Von" darf nicht nach "bis" liegen.',
+	'ERROR_FROM_TO'						=> 'Fehler bei der Spieltagswahl. "Von" darf nicht nach "bis" liegen.',
-	'ERROR_TARGET'						=> 'Fehler bei der Spieltagswahl. Der Ziel-Spieltag liegt nicht nach den Spieltagen zur Ermittlung.',
+	'ERROR_TARGET'						=> 'Fehler bei der Spieltagswahl. Der Ziel-Spieltag liegt nicht nach den Spieltagen zur Ermittlung.',
-
+
-	'GROUP_RANK'						=> 'Qualifiziert bis Tabellenplatz',
+	'GROUP_RANK'						=> 'Qualifiziert bis Tabellenplatz',
-	'GROUP_RANK_EXPLAIN'				=> 'Alle Mannschaften bis zu diesem Tabellenplatz qualifizieren sich.',
+	'GROUP_RANK_EXPLAIN'				=> 'Alle Mannschaften bis zu diesem Tabellenplatz qualifizieren sich.',
-
+
-	'KO_GROUP'							=> 'Qualifikation anhand des Tabellenplatzes',
+	'KO_GROUP'							=> 'Qualifikation anhand des Tabellenplatzes',
-	'KO_MATCHDAYS'						=> 'Spieltage zur Ermittlung wählen',
+	'KO_MATCHDAYS'						=> 'Spieltage zur Ermittlung wählen',
-	'KO_MOVED'							=> 'Folgende Teams wurden in eine andere Liga kopiert',
+	'KO_MOVED'							=> 'Folgende Teams wurden in eine andere Liga kopiert',
-	'KO_NEXT'							=> 'Folgende Teams haben die nächste Runde erreicht',
+	'KO_NEXT'							=> 'Folgende Teams haben die nächste Runde erreicht',
-	'KO_NEXT_CHECK'						=> 'Bitte die Teams prüfen, da bei Punktgleichheit der direkte Vergleich zählen kann, hier aber nicht berücksichtigt wird. ',
+	'KO_NEXT_CHECK'						=> 'Bitte die Teams prüfen, da bei Punktgleichheit der direkte Vergleich zählen kann, hier aber nicht berücksichtigt wird. ',
-
+
-	'MANAGE_GROUP'						=> 'Ermittlung anhand des Tabellenplatzes bei Gruppenpielen',
+	'MANAGE_GROUP'						=> 'Ermittlung anhand des Tabellenplatzes bei Gruppenpielen',
-	'MATCHDAY_NEW'						=> 'Die Mannschaften qualifizieren sich bis Spieltag',
+	'MATCHDAY_NEW'						=> 'Die Mannschaften qualifizieren sich bis Spieltag',
-	'MATCHDAY_TARGET'					=> 'Ziel-Spieltag wählen',
+	'MATCHDAY_TARGET'					=> 'Ziel-Spieltag wählen',
-	'MOVE_LEAGUE'						=> 'in Liga',
+	'MOVE_LEAGUE'						=> 'in Liga',
-	'MOVE_RANK'							=> 'Transfer des Tabellenplatzes',
+	'MOVE_RANK'							=> 'Transfer des Tabellenplatzes',
-	'MOVE_RANK_EXPLAIN'					=> 'Die Mannschaften auf diesem Tabellenplatz werden in die hinterlegte Liga kopiert und sind bis zum angegeben Spieltag qualifiziert.',
+	'MOVE_RANK_EXPLAIN'					=> 'Die Mannschaften auf diesem Tabellenplatz werden in die hinterlegte Liga kopiert und sind bis zum angegeben Spieltag qualifiziert.',
-
+
-	'NO_KO_NEXT'						=> 'Es wurde kein Team in die nächste Runde gesetzt, da noch nicht alle Spiele gespielt sind!',
+	'NO_KO_NEXT'						=> 'Es wurde kein Team in die nächste Runde gesetzt, da noch nicht alle Spiele gespielt sind!',
-
+
-	'PREDICTION_LEAGUE'					=> 'Tipprunde',
+	'PREDICTION_LEAGUE'					=> 'Tipprunde',
-));
+));
-
+
 ?>

language/de/info_acp_leagues.php

@@ -1,149 +1,149 @@
-<?php
+<?php
-/**
+/**
-* 
+* 
-* info_acp_football_leagues [Deutsch — Du]
+* info_acp_football_leagues [Deutsch — Du]
-*
+*
-* @package language
+* @package language
-* @version $Id: info_acp_football_leagues.php 12 2011-03-13 08:03:31Z football $ 
+* @version $Id: info_acp_football_leagues.php 12 2011-03-13 08:03:31Z football $ 
-* @copyright (c) 2010 football (http://football.bplaced.net)
+* @copyright (c) 2010 football (http://football.bplaced.net)
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License
-*
+*
-*/
+*/
-
+
-/**
+/**
-* DO NOT CHANGE
+* DO NOT CHANGE
-*/
+*/
-if (!defined('IN_PHPBB'))
+if (!defined('IN_PHPBB'))
-{
+{
-	exit;
+	exit;
-}
+}
-
+
-if (empty($lang) || !is_array($lang))
+if (empty($lang) || !is_array($lang))
-{
+{
-	$lang = array();
+	$lang = array();
-}
+}
-
+
-// DEVELOPERS PLEASE NOTE
+// DEVELOPERS PLEASE NOTE
-//
+//
-// All language files should use UTF-8 as their encoding and the files must not contain a BOM.
+// All language files should use UTF-8 as their encoding and the files must not contain a BOM.
-//
+//
-// Placeholders can now contain order information, e.g. instead of
+// Placeholders can now contain order information, e.g. instead of
-// 'Page %s of %s' you can (and should) write 'Page %1$s of %2$s', this allows
+// 'Page %s of %s' you can (and should) write 'Page %1$s of %2$s', this allows
-// translators to re-order the output of data while ensuring it remains correct
+// translators to re-order the output of data while ensuring it remains correct
-//
+//
-// You do not need this where single placeholders are used, e.g. 'Message %d' is fine
+// You do not need this where single placeholders are used, e.g. 'Message %d' is fine
-// equally where a string contains only two placeholders which are used to wrap text
+// equally where a string contains only two placeholders which are used to wrap text
-// in a url you again do not need to specify an order e.g., 'Click %sHERE%s' is fine
+// in a url you again do not need to specify an order e.g., 'Click %sHERE%s' is fine
-
+
-$lang = array_merge($lang, array(
+$lang = array_merge($lang, array(
-	'ACP_FOOTBALL_LEAGUES'					=> 'Ligen',
+	'ACP_FOOTBALL_LEAGUES'					=> 'Ligen',
-	'ACP_FOOTBALL_LEAGUES_MANAGE'			=> 'Ligen verwalten',
+	'ACP_FOOTBALL_LEAGUES_MANAGE'			=> 'Ligen verwalten',
-	'ACP_FOOTBALL_LEAGUES_MANAGE_EXPLAIN'	=> 'Hier kannst du alle Ligen verwalten. Du kannst bestehende löschen oder ändern oder eine neue Liga erstellen, sowie Typ, Anzahl der Spieltage, Gewinne, Name und Kurzbezeichnug der Liga einstellen. ',
+	'ACP_FOOTBALL_LEAGUES_MANAGE_EXPLAIN'	=> 'Hier kannst du alle Ligen verwalten. Du kannst bestehende löschen oder ändern oder eine neue Liga erstellen, sowie Typ, Anzahl der Spieltage, Gewinne, Name und Kurzbezeichnug der Liga einstellen. ',
-	'ACP_FOOTBALL_LEAGUES_MANAGEMENT'		=> 'Tipprunde-Liga-Verwaltung',
+	'ACP_FOOTBALL_LEAGUES_MANAGEMENT'		=> 'Tipprunde-Liga-Verwaltung',
-	'ADD_GROUP'								=> 'Gruppe hinzufügen',
+	'ADD_GROUP'								=> 'Gruppe hinzufügen',
-	'ADD_USERS'								=> 'Benutzer hinzufügen',
+	'ADD_USERS'								=> 'Benutzer hinzufügen',
-	'ADD_USERS_EXPLAIN'						=> 'Hier kannst du neue Tipper zur Liga-Tipprunde hinzufügen. Bitte gib je einen Benutzernamen pro Zeile ein. ',
+	'ADD_USERS_EXPLAIN'						=> 'Hier kannst du neue Tipper zur Liga-Tipprunde hinzufügen. Bitte gib je einen Benutzernamen pro Zeile ein. ',
-	'ALL_USERS'								=> 'Alle Mitglieder',
+	'ALL_USERS'								=> 'Alle Mitglieder',
-
+
-	'BET_POINTS'							=> 'Einsatz',
+	'BET_POINTS'							=> 'Einsatz',
-	'BET_POINTS_EXPLAIN'					=> 'Einsatz zur Teilnahme am Saisonanfang',
+	'BET_POINTS_EXPLAIN'					=> 'Einsatz zur Teilnahme am Saisonanfang',
-	'BET_TYPE_KO'							=> 'Tipp bei KO-Spielen',
+	'BET_TYPE_KO'							=> 'Tipp bei KO-Spielen',
-	'BET_TYPE_KO_EXPLAIN'					=> 'Auf welches Ergebnis soll bei KO-Spielen getippt werden?',
+	'BET_TYPE_KO_EXPLAIN'					=> 'Auf welches Ergebnis soll bei KO-Spielen getippt werden?',
-
+
-	'CHECK_HIT_WINS'						=> 'Gewinn Volltreffer-Wertung fehlerhaft. Bitte korrigieren. ',
+	'CHECK_HIT_WINS'						=> 'Gewinn Volltreffer-Wertung fehlerhaft. Bitte korrigieren. ',
-	'CHECK_HITS02_WINS'						=> 'Gewinn Volltreffer-Wertung mit Auswärtspunkten fehlerhaft. Bitte korrigieren. ',
+	'CHECK_HITS02_WINS'						=> 'Gewinn Volltreffer-Wertung mit Auswärtspunkten fehlerhaft. Bitte korrigieren. ',
-	'CHECK_MATCHDAY_WINS'					=> 'Gewinne je Spieltag fehlerhaft. Bitte korrigieren. ',
+	'CHECK_MATCHDAY_WINS'					=> 'Gewinne je Spieltag fehlerhaft. Bitte korrigieren. ',
-	'CHECK_RULES_POST_ID'					=> 'Bei Beitritt durch den User muss die Beitragsnummer mit den Regeln hinterlegt werden. ',
+	'CHECK_RULES_POST_ID'					=> 'Bei Beitritt durch den User muss die Beitragsnummer mit den Regeln hinterlegt werden. ',
-	'CHECK_SEASON_WINS'						=> 'Saisongewinne fehlerhaft. Bitte korrigieren. ',
+	'CHECK_SEASON_WINS'						=> 'Saisongewinne fehlerhaft. Bitte korrigieren. ',
-	'CREATE_LEAGUE'							=> 'Neue Liga erstellen',
+	'CREATE_LEAGUE'							=> 'Neue Liga erstellen',
-
+
-	'LEAGUE_BET_IN_TIME'					=> 'Tippabgabe bis zum jeweiligen Spielbeginn',
+	'LEAGUE_BET_IN_TIME'					=> 'Tippabgabe bis zum jeweiligen Spielbeginn',
-	'LEAGUE_BET_IN_TIME_EXPLAIN'			=> 'Dürfen die Tipper bis zum jeweiligen Spielbeginn tippen, oder soll die Tippabgabe der Spiele eines Spieltags nur bis zu einem (maximal drei) Termin(en) möglich sein?',
+	'LEAGUE_BET_IN_TIME_EXPLAIN'			=> 'Dürfen die Tipper bis zum jeweiligen Spielbeginn tippen, oder soll die Tippabgabe der Spiele eines Spieltags nur bis zu einem (maximal drei) Termin(en) möglich sein?',
-	'LEAGUE_CHAMP'							=> 'Meisterschaft',
+	'LEAGUE_CHAMP'							=> 'Meisterschaft',
-	'LEAGUE_CONFIRM_DELETE'					=> 'Bist du sicher, dass du die %1$s aus der Saison %2$s mit allen Daten (Spieltage, Spielplänen, Tipps und Ranglisten) löschen willst?',
+	'LEAGUE_CONFIRM_DELETE'					=> 'Bist du sicher, dass du die %1$s aus der Saison %2$s mit allen Daten (Spieltage, Spielplänen, Tipps und Ranglisten) löschen willst?',
-	'LEAGUE_CREATE_FAILED'					=> 'Liga konnte nicht erstellt werden. ',
+	'LEAGUE_CREATE_FAILED'					=> 'Liga konnte nicht erstellt werden. ',
-	'LEAGUE_CREATED'						=> 'Liga erfolgreich erstellt. ',
+	'LEAGUE_CREATED'						=> 'Liga erfolgreich erstellt. ',
-	'LEAGUE_CURRENT'						=> 'Aktuelle Liga',
+	'LEAGUE_CURRENT'						=> 'Aktuelle Liga',
-	'LEAGUE_DEF'							=> 'Bestehende Ligen',
+	'LEAGUE_DEF'							=> 'Bestehende Ligen',
-	'LEAGUE_DEF_EXPLAIN'					=> 'Dies sind Ligen, die von dir oder einem anderen Administrator erstellt wurden. Du kannst Ligaeinstellungen ändern oder Ligen löschen. ',
+	'LEAGUE_DEF_EXPLAIN'					=> 'Dies sind Ligen, die von dir oder einem anderen Administrator erstellt wurden. Du kannst Ligaeinstellungen ändern oder Ligen löschen. ',
-	'LEAGUE_DELETE'							=> 'Liga entfernen',
+	'LEAGUE_DELETE'							=> 'Liga entfernen',
-	'LEAGUE_DELETED'						=> 'Liga gelöscht',
+	'LEAGUE_DELETED'						=> 'Liga gelöscht',
-	'LEAGUE_DETAILS'						=> 'Ligadetails',
+	'LEAGUE_DETAILS'						=> 'Ligadetails',
-	'LEAGUE_EDIT_EXPLAIN'					=> 'Hier kannst du eine bestehende Liga bearbeiten. Du kannst Typ, Anzahl der Spieltage, Gewinne, Namen und die Kurzbezeichnung ändern. ',
+	'LEAGUE_EDIT_EXPLAIN'					=> 'Hier kannst du eine bestehende Liga bearbeiten. Du kannst Typ, Anzahl der Spieltage, Gewinne, Namen und die Kurzbezeichnung ändern. ',
-	'LEAGUE_JOIN_BY_USER'					=> 'Beitritt in diese Tipprunde durch User',
+	'LEAGUE_JOIN_BY_USER'					=> 'Beitritt in diese Tipprunde durch User',
-	'LEAGUE_JOIN_BY_USER_EXPLAIN'			=> 'Sollen die Forum-User selbst dieser Tipprunde beitreten können, oder soll die Aufnahme in diese Tipprunde nur durch den Admin erfolgen?',
+	'LEAGUE_JOIN_BY_USER_EXPLAIN'			=> 'Sollen die Forum-User selbst dieser Tipprunde beitreten können, oder soll die Aufnahme in diese Tipprunde nur durch den Admin erfolgen?',
-	'LEAGUE_JOIN_IN_SEASON'					=> 'Beitritt in diese Tipprunde während der Saison',
+	'LEAGUE_JOIN_IN_SEASON'					=> 'Beitritt in diese Tipprunde während der Saison',
-	'LEAGUE_JOIN_IN_SEASON_EXPLAIN'			=> 'Dürfen die Forum-User während der laufenden Saison dieser Tipprunde beitreten?',
+	'LEAGUE_JOIN_IN_SEASON_EXPLAIN'			=> 'Dürfen die Forum-User während der laufenden Saison dieser Tipprunde beitreten?',
-	'LEAGUE_KO'								=> 'KO-Runde',
+	'LEAGUE_KO'								=> 'KO-Runde',
-	'LEAGUE_MATCHDAYS'						=> 'Anzahl der Spieltage',
+	'LEAGUE_MATCHDAYS'						=> 'Anzahl der Spieltage',
-	'LEAGUE_MATCHDAYS_EMPTY'				=> 'Die Anzahl der Spieltage fehlt. ',
+	'LEAGUE_MATCHDAYS_EMPTY'				=> 'Die Anzahl der Spieltage fehlt. ',
-	'LEAGUE_MATCHDAYS_EXPLAIN'				=> 'Bei der Berechnung der Anzahl der Spieltage ist zu berücksichtigen, dass Spiele unterschiedlicher Runden zu einem Spieltag zusammengefasst werden können, damit nicht auf einzelne oder wenige Spiele getippt werden muss. ',
+	'LEAGUE_MATCHDAYS_EXPLAIN'				=> 'Bei der Berechnung der Anzahl der Spieltage ist zu berücksichtigen, dass Spiele unterschiedlicher Runden zu einem Spieltag zusammengefasst werden können, damit nicht auf einzelne oder wenige Spiele getippt werden muss. ',
-	'LEAGUE_MATCHES'						=> 'Anzahl der Spiele je Spieltag',
+	'LEAGUE_MATCHES'						=> 'Anzahl der Spiele je Spieltag',
-	'LEAGUE_MATCHES_EXPLAIN'				=> 'Bei KO-Runden mit unterschiedlicher Anzahl von Spielen an den Spieltagen, ist hier 0 einzutragen und die Anzahl der Spiele beim Spieltag zu erfassen. ',
+	'LEAGUE_MATCHES_EXPLAIN'				=> 'Bei KO-Runden mit unterschiedlicher Anzahl von Spielen an den Spieltagen, ist hier 0 einzutragen und die Anzahl der Spiele beim Spieltag zu erfassen. ',
-	'LEAGUE_MEMBERS'						=> 'Tipprunden-Teilnehmer',
+	'LEAGUE_MEMBERS'						=> 'Tipprunden-Teilnehmer',
-	'LEAGUE_NAME'							=> 'Liganame',
+	'LEAGUE_NAME'							=> 'Liganame',
-	'LEAGUE_NAME_EMPTY'						=> 'Der Liganame muss mindesten 3 Buchstaben lang sein. ',
+	'LEAGUE_NAME_EMPTY'						=> 'Der Liganame muss mindesten 3 Buchstaben lang sein. ',
-	'LEAGUE_NO_MEMBER'						=> 'Die Liga hat zur Zeit keine Tipper',
+	'LEAGUE_NO_MEMBER'						=> 'Die Liga hat zur Zeit keine Tipper',
-	'LEAGUE_NUMBER'							=> 'Die angegebene Liga muss numerisch sein. Bitte eine Liganummer von 1-99 eingeben. ',
+	'LEAGUE_NUMBER'							=> 'Die angegebene Liga muss numerisch sein. Bitte eine Liganummer von 1-99 eingeben. ',
-	'LEAGUE_POINTS'							=> 'Punkte Modus dieser Liga-Tipprunde',
+	'LEAGUE_POINTS'							=> 'Punkte Modus dieser Liga-Tipprunde',
-	'LEAGUE_POINTS_DIFF'					=> 'Punkte bei richtiger Tordifferenz',
+	'LEAGUE_POINTS_DIFF'					=> 'Punkte bei richtiger Tordifferenz',
-	'LEAGUE_POINTS_DIFF_EXPLAIN'			=> 'Punkte für richtige Tordifferenz. ',
+	'LEAGUE_POINTS_DIFF_EXPLAIN'			=> 'Punkte für richtige Tordifferenz. ',
-	'LEAGUE_POINTS_HIT'						=> 'Punkte für einen Volltreffer',
+	'LEAGUE_POINTS_HIT'						=> 'Punkte für einen Volltreffer',
-	'LEAGUE_POINTS_HIT_EXPLAIN'				=> 'Punkte, wenn der Tipp mit dem Ergebnis übereinstimmt. ',
+	'LEAGUE_POINTS_HIT_EXPLAIN'				=> 'Punkte, wenn der Tipp mit dem Ergebnis übereinstimmt. ',
-	'LEAGUE_POINTS_LAST'					=> 'Punkte des letzten für Nichttipper',
+	'LEAGUE_POINTS_LAST'					=> 'Punkte des letzten für Nichttipper',
-	'LEAGUE_POINTS_LAST_EXPLAIN'			=> 'Sollen die Nichttipper automatisch die Punkte des schlechtesten Tippers erhalten? Dies können eventuell auch 0 Punkte sein. ',
+	'LEAGUE_POINTS_LAST_EXPLAIN'			=> 'Sollen die Nichttipper automatisch die Punkte des schlechtesten Tippers erhalten? Dies können eventuell auch 0 Punkte sein. ',
-	'LEAGUE_POINTS_MODE'					=> 'Punkte Modus',
+	'LEAGUE_POINTS_MODE'					=> 'Punkte Modus',
-	'LEAGUE_POINTS_MODE_EXPLAIN'			=> '1 = Volltrefferpunkte und bei richtiger Tendenz je abweichendem Tor ein Punkt weniger aber mind. Tendenzpunkte. Bei Unentschieden nur einfacher Abzug bei abweichendem Tor. <br /> 2 = wie 1 jedoch bei Unentschieden voller Abzug je Torabweichung. <br /> 3 = Volltreffer- oder Tendenzpunkte. <br /> 4 = Volltreffer-, Differenz- oder Tendenzpunkte. <br /> 5 = wie 4 aber bei Remis keine Diffenzpunkte. <br /> 6 = Volltreffer- oder Tendenzpunkte; Differenzpunkte bei Unentschieden-Tendenz. ',
+	'LEAGUE_POINTS_MODE_EXPLAIN'			=> '1 = Volltrefferpunkte und bei richtiger Tendenz je abweichendem Tor ein Punkt weniger aber mind. Tendenzpunkte. Bei Unentschieden nur einfacher Abzug bei abweichendem Tor. <br /> 2 = wie 1 jedoch bei Unentschieden voller Abzug je Torabweichung. <br /> 3 = Volltreffer- oder Tendenzpunkte. <br /> 4 = Volltreffer-, Differenz- oder Tendenzpunkte. <br /> 5 = wie 4 aber bei Remis keine Diffenzpunkte. <br /> 6 = Volltreffer- oder Tendenzpunkte; Differenzpunkte bei Unentschieden-Tendenz. ',
-	'LEAGUE_POINTS_TENDENCY'				=> 'Punkte bei richtiger Tendenz',
+	'LEAGUE_POINTS_TENDENCY'				=> 'Punkte bei richtiger Tendenz',
-	'LEAGUE_POINTS_TENDENCY_EXPLAIN'		=> 'Punkte bzw. Mindestpunkte bei richtiger Tendenz. ',
+	'LEAGUE_POINTS_TENDENCY_EXPLAIN'		=> 'Punkte bzw. Mindestpunkte bei richtiger Tendenz. ',
-	'LEAGUE_RULES_POST_ID'					=> 'Beitragsnummer mit den Regeln',
+	'LEAGUE_RULES_POST_ID'					=> 'Beitragsnummer mit den Regeln',
-	'LEAGUE_RULES_POST_ID_EXPLAIN'			=> 'Post-ID mit den Regeln zu dieser Liga-Tipprunde. Die Post-Id wird beim Button Beitrag melden angezeigt. ',
+	'LEAGUE_RULES_POST_ID_EXPLAIN'			=> 'Post-ID mit den Regeln zu dieser Liga-Tipprunde. Die Post-Id wird beim Button Beitrag melden angezeigt. ',
-	'LEAGUE_SHORT'							=> 'Liga Kurzbezeichnung',
+	'LEAGUE_SHORT'							=> 'Liga Kurzbezeichnung',
-	'LEAGUE_SHORT_EMPTY'					=> 'Die Kurzbezeichnung fehlt. ',
+	'LEAGUE_SHORT_EMPTY'					=> 'Die Kurzbezeichnung fehlt. ',
-	'LEAGUE_SHORT_EXPLAIN'					=> 'Dreistelliges Kürzel z.B. 1BL, 2BL, DFB, CL oder EL zur Identifizierung der Liga in der Download-Datei. ',
+	'LEAGUE_SHORT_EXPLAIN'					=> 'Dreistelliges Kürzel z.B. 1BL, 2BL, DFB, CL oder EL zur Identifizierung der Liga in der Download-Datei. ',
-	'LEAGUE_TAKEN'							=> 'Diese Liga existiert bereits in dieser Saison. Bitte wähle eine andere Liganummer aus. ',
+	'LEAGUE_TAKEN'							=> 'Diese Liga existiert bereits in dieser Saison. Bitte wähle eine andere Liganummer aus. ',
-	'LEAGUE_TYPE'							=> 'Ligatyp',
+	'LEAGUE_TYPE'							=> 'Ligatyp',
-	'LEAGUE_TYPE_EXPLAIN'					=> 'Bei Spielrunden mit Spielen, die über eine Verlängerung entschieden werden können ist hier KO-Runde zu wählen, auch wenn einzelne Spiele dieser Runde nach 90 Minuten enden. ',
+	'LEAGUE_TYPE_EXPLAIN'					=> 'Bei Spielrunden mit Spielen, die über eine Verlängerung entschieden werden können ist hier KO-Runde zu wählen, auch wenn einzelne Spiele dieser Runde nach 90 Minuten enden. ',
-	'LEAGUE_UPDATE_FAILED'					=> 'Ligaeinstellungen konnten nicht aktualisiert werden. ',
+	'LEAGUE_UPDATE_FAILED'					=> 'Ligaeinstellungen konnten nicht aktualisiert werden. ',
-	'LEAGUE_UPDATED'						=> 'Ligaeinstellungen erfolgreich aktualisiert. ',
+	'LEAGUE_UPDATED'						=> 'Ligaeinstellungen erfolgreich aktualisiert. ',
-	'LEAGUE_USERS_ADD'						=> 'Tipper zur Liga hinzugefügt. ',
+	'LEAGUE_USERS_ADD'						=> 'Tipper zur Liga hinzugefügt. ',
-	'LEAGUE_USERS_REMOVE'					=> 'Tipper aus der Liga entfernt. ',
+	'LEAGUE_USERS_REMOVE'					=> 'Tipper aus der Liga entfernt. ',
-	'LEAGUE_WIN_EXPLAIN'					=> 'Bei den folgenden Gewinnfeldern sind die Gewinne je Platz durch ; getrennt einzugeben. Also 10.50;5 für Platz 1 = 10,50 Euro und Platz 2 = 5 Euro',
+	'LEAGUE_WIN_EXPLAIN'					=> 'Bei den folgenden Gewinnfeldern sind die Gewinne je Platz durch ; getrennt einzugeben. Also 10.50;5 für Platz 1 = 10,50 Euro und Platz 2 = 5 Euro',
-	'LEAGUE_WIN_HITS'						=> 'Gewinn Volltreffer-Wertung',
+	'LEAGUE_WIN_HITS'						=> 'Gewinn Volltreffer-Wertung',
-	'LEAGUE_WIN_HITS_AWAY'					=> 'Gewinn Volltreffer-Wertung mit Auswärtspunkten',
+	'LEAGUE_WIN_HITS_AWAY'					=> 'Gewinn Volltreffer-Wertung mit Auswärtspunkten',
-	'LEAGUE_WIN_HITS_AWAY_EXPLAIN'			=> 'Gewinn in Euro für den Erstplatzierten der Volltreffer-Wertung bei denen die Auswärtsmannschaft gepunktet hat. ',
+	'LEAGUE_WIN_HITS_AWAY_EXPLAIN'			=> 'Gewinn in Euro für den Erstplatzierten der Volltreffer-Wertung bei denen die Auswärtsmannschaft gepunktet hat. ',
-	'LEAGUE_WIN_HITS_EXPLAIN'				=> 'Gewinn in Euro für den Erstplatzierten der Volltreffer-Wertung. ',
+	'LEAGUE_WIN_HITS_EXPLAIN'				=> 'Gewinn in Euro für den Erstplatzierten der Volltreffer-Wertung. ',
-	'LEAGUE_WIN_MATCHDAYS'					=> 'Gewinne je Spieltag',
+	'LEAGUE_WIN_MATCHDAYS'					=> 'Gewinne je Spieltag',
-	'LEAGUE_WIN_MATCHDAYS_EXPLAIN'			=> 'Platzierungsgewinne je Spieltag. ',
+	'LEAGUE_WIN_MATCHDAYS_EXPLAIN'			=> 'Platzierungsgewinne je Spieltag. ',
-	'LEAGUE_WIN_SEASON'						=> 'Gewinne Saison',
+	'LEAGUE_WIN_SEASON'						=> 'Gewinne Saison',
-	'LEAGUE_WIN_SEASON_EXPLAIN'				=> 'Einmalige Platzierungsgewinne am Ende der Saison. ',
+	'LEAGUE_WIN_SEASON_EXPLAIN'				=> 'Einmalige Platzierungsgewinne am Ende der Saison. ',
-	'LEAGUE_WINS'							=> 'Liga Gewinne',
+	'LEAGUE_WINS'							=> 'Liga Gewinne',
-	'LEAGUES_NO_DELETE'						=> 'Du darfst keine Liga löschen. Dies dürfen nur Gründungsmitglieder',
+	'LEAGUES_NO_DELETE'						=> 'Du darfst keine Liga löschen. Dies dürfen nur Gründungsmitglieder',
-	'LEAGUES_NO_TEAM'						=> 'Diese Liga hat keine Teams',
+	'LEAGUES_NO_TEAM'						=> 'Diese Liga hat keine Teams',
-
+
-	'MEMBER'								=> 'Tipper',
+	'MEMBER'								=> 'Tipper',
-	'MEMBER_ALL'							=> 'Alle aktive Boardmitglieder aufnehmen',
+	'MEMBER_ALL'							=> 'Alle aktive Boardmitglieder aufnehmen',
-	'MEMBER_CONFIRM_DELETE'					=> 'Bist du sicher, dass du die gewählten Tipper aus der Tipprunde %1$s der Saison %2$s mit allen Daten (Tipps, Ranglistenplätze und Kontoauszug) löschen willst?',
+	'MEMBER_CONFIRM_DELETE'					=> 'Bist du sicher, dass du die gewählten Tipper aus der Tipprunde %1$s der Saison %2$s mit allen Daten (Tipps, Ranglistenplätze und Kontoauszug) löschen willst?',
-	'MEMBER_DELETE'							=> 'Tipper aus Liga entfernen',
+	'MEMBER_DELETE'							=> 'Tipper aus Liga entfernen',
-	'MEMBER_EXISTS'							=> 'Dieser Tipper ist bereits Teilnehmer dieser Liga-Tipprunde. ',
+	'MEMBER_EXISTS'							=> 'Dieser Tipper ist bereits Teilnehmer dieser Liga-Tipprunde. ',
-	'MEMBER_EXPLAIN'						=> 'Dies ist eine Liste aller Tipper dieser Liga. Von hier aus kannst du einstellen, wer Tipper dieser Liga sein soll. ',
+	'MEMBER_EXPLAIN'						=> 'Dies ist eine Liste aller Tipper dieser Liga. Von hier aus kannst du einstellen, wer Tipper dieser Liga sein soll. ',
-
+
-	'NO_LEAGUE'								=> 'Keine Liga angegeben. ',
+	'NO_LEAGUE'								=> 'Keine Liga angegeben. ',
-	'NO_LEAGUES_CREATED'					=> 'Es wurden bislang keine Ligen erstellt. ',
+	'NO_LEAGUES_CREATED'					=> 'Es wurden bislang keine Ligen erstellt. ',
-	'NO_MATCHDAYS_KO'						=> 'Bei einer KO-Runde müssen erst die Spieltage erfasst werden bevor User der Tipprunde beitreten können. ',
+	'NO_MATCHDAYS_KO'						=> 'Bei einer KO-Runde müssen erst die Spieltage erfasst werden bevor User der Tipprunde beitreten können. ',
-	'NO_MEMBERS_SELECTED'					=> 'Es wurde kein Mitglied ausgewählt, bzw. das gewählte Mitglied ist nicht bekannt. ',
+	'NO_MEMBERS_SELECTED'					=> 'Es wurde kein Mitglied ausgewählt, bzw. das gewählte Mitglied ist nicht bekannt. ',
-	'NO_SEASON'								=> 'Es existiert keine Saison. Bitte zuerst eine Saison erstellen. ',
+	'NO_SEASON'								=> 'Es existiert keine Saison. Bitte zuerst eine Saison erstellen. ',
-
+
-	'SELECT_SEASON'							=> 'Saison auswählen',
+	'SELECT_SEASON'							=> 'Saison auswählen',
-
+
-	'TOO_LARGE_LEAGUE'						=> 'Der Wert für die Liga ist zu groß. Es sind nur Ligen zwischen 1 und 99 möglich. ',
+	'TOO_LARGE_LEAGUE'						=> 'Der Wert für die Liga ist zu groß. Es sind nur Ligen zwischen 1 und 99 möglich. ',
-	'TOO_LARGE_LEAGUE_MATCHDAYS'			=> 'Die Anzahl der Spieltage ist zu groß. Sie muss zwischen 1 und 99 liegen. ',
+	'TOO_LARGE_LEAGUE_MATCHDAYS'			=> 'Die Anzahl der Spieltage ist zu groß. Sie muss zwischen 1 und 99 liegen. ',
-	'TOO_LARGE_LEAGUE_MATCHES'				=> 'Die Anzahl der Spiele je Spieltag ist zu groß. Sie muss zwischen 0 und 99 liegen. ',
+	'TOO_LARGE_LEAGUE_MATCHES'				=> 'Die Anzahl der Spiele je Spieltag ist zu groß. Sie muss zwischen 0 und 99 liegen. ',
-	'TOO_SHORT_LEAGUE_SHORT'				=> 'Die Kurzbezeichnung der Liga muss mindesten 1 Zeichen lang sein. ',
+	'TOO_SHORT_LEAGUE_SHORT'				=> 'Die Kurzbezeichnung der Liga muss mindesten 1 Zeichen lang sein. ',
-	'TOO_SHORT_SEASON'						=> 'Der Liganame muss mindesten 2 Zeichen lang sein. ',
+	'TOO_SHORT_SEASON'						=> 'Der Liganame muss mindesten 2 Zeichen lang sein. ',
-	'TOO_SMALL_LEAGUE'						=> 'Der Wert für die Liga ist zu klein. Es sind nur Ligen zwischen 1 und 99 möglich. ',
+	'TOO_SMALL_LEAGUE'						=> 'Der Wert für die Liga ist zu klein. Es sind nur Ligen zwischen 1 und 99 möglich. ',
-	'TOO_SMALL_LEAGUE_MATCHDAYS'			=> 'Die Anzahl der Spieltage ist zu klein. Sie muss zwischen 1 und 99 liegen. ',
+	'TOO_SMALL_LEAGUE_MATCHDAYS'			=> 'Die Anzahl der Spieltage ist zu klein. Sie muss zwischen 1 und 99 liegen. ',
-	'TOO_SMALL_LEAGUE_MATCHES'				=> 'Die Anzahl der Spiele je Spieltag ist zu klein. Sie muss zwischen 0 und 99 liegen. ',
+	'TOO_SMALL_LEAGUE_MATCHES'				=> 'Die Anzahl der Spiele je Spieltag ist zu klein. Sie muss zwischen 0 und 99 liegen. ',
-));
+));
-
+
 ?>

language/de/info_acp_matchdays.php

@@ -1,127 +1,127 @@
-<?php
+<?php
-/**
+/**
-*
+*
-* info_acp_football_matchdays [Deutsch — Du]
+* info_acp_football_matchdays [Deutsch — Du]
-*
+*
-* @package language
+* @package language
-* @version $Id: info_acp_football_matchdays.php 12 2011-03-13 08:03:31Z football $ 
+* @version $Id: info_acp_football_matchdays.php 12 2011-03-13 08:03:31Z football $ 
-* @copyright (c) 2010 football (http://football.bplaced.net)
+* @copyright (c) 2010 football (http://football.bplaced.net)
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License
-*
+*
-*/
+*/
-
+
-/**
+/**
-* DO NOT CHANGE
+* DO NOT CHANGE
-*/
+*/
-if (!defined('IN_PHPBB'))
+if (!defined('IN_PHPBB'))
-{
+{
-	exit;
+	exit;
-}
+}
-
+
-if (empty($lang) || !is_array($lang))
+if (empty($lang) || !is_array($lang))
-{
+{
-	$lang = array();
+	$lang = array();
-}
+}
-
+
-// DEVELOPERS PLEASE NOTE
+// DEVELOPERS PLEASE NOTE
-//
+//
-// All language files should use UTF-8 as their encoding and the files must not contain a BOM.
+// All language files should use UTF-8 as their encoding and the files must not contain a BOM.
-//
+//
-// Placeholders can now contain order information, e.g. instead of
+// Placeholders can now contain order information, e.g. instead of
-// 'Page %s of %s' you can (and should) write 'Page %1$s of %2$s', this allows
+// 'Page %s of %s' you can (and should) write 'Page %1$s of %2$s', this allows
-// translators to re-order the output of data while ensuring it remains correct
+// translators to re-order the output of data while ensuring it remains correct
-//
+//
-// You do not need this where single placeholders are used, e.g. 'Message %d' is fine
+// You do not need this where single placeholders are used, e.g. 'Message %d' is fine
-// equally where a string contains only two placeholders which are used to wrap text
+// equally where a string contains only two placeholders which are used to wrap text
-// in a url you again do not need to specify an order e.g., 'Click %sHERE%s' is fine
+// in a url you again do not need to specify an order e.g., 'Click %sHERE%s' is fine
-
+
-$lang = array_merge($lang, array(
+$lang = array_merge($lang, array(
-	'ACP_FOOTBALL_MATCHDAYS'					=> 'Spieltage',
+	'ACP_FOOTBALL_MATCHDAYS'					=> 'Spieltage',
-	'ACP_FOOTBALL_MATCHDAYS_MANAGE'				=> 'Spieltage verwalten',
+	'ACP_FOOTBALL_MATCHDAYS_MANAGE'				=> 'Spieltage verwalten',
-	'ACP_FOOTBALL_MATCHDAYS_MANAGE_EXPLAIN'		=> 'Hier kannst du je Liga Spieltage einer Saison zuordnen. Du kannst bestehende löschen oder ändern oder einen neuen Spieltag erstellen, sowie Typ, Anzahl der Spieltage, Gewinne, Name und Kurzbezeichnug der Spieltag einstellen.',
+	'ACP_FOOTBALL_MATCHDAYS_MANAGE_EXPLAIN'		=> 'Hier kannst du je Liga Spieltage einer Saison zuordnen. Du kannst bestehende löschen oder ändern oder einen neuen Spieltag erstellen, sowie Typ, Anzahl der Spieltage, Gewinne, Name und Kurzbezeichnug der Spieltag einstellen.',
-	'ACP_FOOTBALL_MATCHDAYS_MANAGEMENT'			=> 'Tipprunde-Spieltags-Verwaltung',
+	'ACP_FOOTBALL_MATCHDAYS_MANAGEMENT'			=> 'Tipprunde-Spieltags-Verwaltung',
-	'ADD_MATCHDAY'								=> 'Spieltag zur Liga hinzufügen',
+	'ADD_MATCHDAY'								=> 'Spieltag zur Liga hinzufügen',
-
+
-	'BACKWARD_DELIVERY'							=> 'Zeitspanne wählen',
+	'BACKWARD_DELIVERY'							=> 'Zeitspanne wählen',
-	'BACKWARD_DELIVERY_EXPLAIN'					=> 'Zeitspanne der Abgabe vor dem ersten Spielbeginn.',
+	'BACKWARD_DELIVERY_EXPLAIN'					=> 'Zeitspanne der Abgabe vor dem ersten Spielbeginn.',
-
+
-	'CHANGE_DELIVERY'							=> 'Abgabetermine ändern',
+	'CHANGE_DELIVERY'							=> 'Abgabetermine ändern',
-	'CHANGE_DELIVERY_EXPLAIN'					=> 'Hier kannst du einmalig die zukünftigen Abgabetermine der Spieltage in Abhängigkeit zum ersten Spielbeginn neu festlegen. Hierdurch wird jedoch kein Automatismus bei zukünftigen Spielverlegungen eingerichtet. Mit Zeitspanne 0 kannst du überprüfen, ob ein Abgabetermin nach dem ersten Spielbeginn liegt und diesen entsprechend korrigieren. Soll ein einheitlicher Abgabetermin gesetzt werden, muss diese Funktion eventuell mehrfach mit unterschiedlichen Zeitspannen passend zu den Anstoßzeiten aufgerufen werden.',
+	'CHANGE_DELIVERY_EXPLAIN'					=> 'Hier kannst du einmalig die zukünftigen Abgabetermine der Spieltage in Abhängigkeit zum ersten Spielbeginn neu festlegen. Hierdurch wird jedoch kein Automatismus bei zukünftigen Spielverlegungen eingerichtet. Mit Zeitspanne 0 kannst du überprüfen, ob ein Abgabetermin nach dem ersten Spielbeginn liegt und diesen entsprechend korrigieren. Soll ein einheitlicher Abgabetermin gesetzt werden, muss diese Funktion eventuell mehrfach mit unterschiedlichen Zeitspannen passend zu den Anstoßzeiten aufgerufen werden.',
-	
+	
-	'DELIVERY'									=> 'Abgabezeit',
+	'DELIVERY'									=> 'Abgabezeit',
-	'DELIVERY_SET_TIME'							=> 'Abgabezeit vor dem ersten Spielbeginn',
+	'DELIVERY_SET_TIME'							=> 'Abgabezeit vor dem ersten Spielbeginn',
-	'DELIVERY_NUMBER'							=> 'Abgabe Nr.',
+	'DELIVERY_NUMBER'							=> 'Abgabe Nr.',
-	
+	
-	'GENERATE_MATCHDAY'							=> 'Fehlende Spieltage generieren',
+	'GENERATE_MATCHDAY'							=> 'Fehlende Spieltage generieren',
-	
+	
-	'INVALID_DDAY1_DATE'						=> 'Kein gültiger Abgabetermin.',
+	'INVALID_DDAY1_DATE'						=> 'Kein gültiger Abgabetermin.',
-	'INVALID_DDAY2_DATE'						=> 'Kein gültiger 2. Abgabetermin.',
+	'INVALID_DDAY2_DATE'						=> 'Kein gültiger 2. Abgabetermin.',
-	'INVALID_DDAY3_DATE'						=> 'Kein gültiger 3. Abgabetermin.',
+	'INVALID_DDAY3_DATE'						=> 'Kein gültiger 3. Abgabetermin.',
-
+
-	'LEAGUE'									=> 'Liga',
+	'LEAGUE'									=> 'Liga',
-
+
-	'MATCHDAY'									=> 'Spieltag',
+	'MATCHDAY'									=> 'Spieltag',
-	'MATCHDAY_ADDED'							=> 'Spieltag erfolgreich hinzugefügt.',
+	'MATCHDAY_ADDED'							=> 'Spieltag erfolgreich hinzugefügt.',
-	'MATCHDAY_CONFIRM_DELETE'					=> 'Bist du sicher, dass du den %1$s. Spieltag aus der Saison %2$s mit allen Daten (Spielplan und Tipps) löschen willst?',
+	'MATCHDAY_CONFIRM_DELETE'					=> 'Bist du sicher, dass du den %1$s. Spieltag aus der Saison %2$s mit allen Daten (Spielplan und Tipps) löschen willst?',
-	'MATCHDAY_CONFIRM_REMOVE'					=> 'Bist du sicher, dass du alle überflüssigen Spieltage aus der Saison %1$s mit allen Daten (Spielplan und Tipps) löschen willst?',
+	'MATCHDAY_CONFIRM_REMOVE'					=> 'Bist du sicher, dass du alle überflüssigen Spieltage aus der Saison %1$s mit allen Daten (Spielplan und Tipps) löschen willst?',
-	'MATCHDAY_CREATE_FAILED'					=> 'Spieltag konnte nicht erstellt werden.',
+	'MATCHDAY_CREATE_FAILED'					=> 'Spieltag konnte nicht erstellt werden.',
-	'MATCHDAY_CREATED'							=> '%1$s Spieltag wurde erfolgreich erstellt.',
+	'MATCHDAY_CREATED'							=> '%1$s Spieltag wurde erfolgreich erstellt.',
-	'MATCHDAY_CURRENT'							=> 'Aktuelle Spieltag',
+	'MATCHDAY_CURRENT'							=> 'Aktuelle Spieltag',
-	'MATCHDAY_DEF'								=> 'Bestehende Spieltage',
+	'MATCHDAY_DEF'								=> 'Bestehende Spieltage',
-	'MATCHDAY_DEF_EXPLAIN'						=> 'Dies sind Spieltage, die von dir oder einem anderen Administrator erstellt wurden. Du kannst Spieltageinstellungen ändern oder Spieltage löschen.',
+	'MATCHDAY_DEF_EXPLAIN'						=> 'Dies sind Spieltage, die von dir oder einem anderen Administrator erstellt wurden. Du kannst Spieltageinstellungen ändern oder Spieltage löschen.',
-	'MATCHDAY_DELETE'							=> 'Spieltag entfernen',
+	'MATCHDAY_DELETE'							=> 'Spieltag entfernen',
-	'MATCHDAY_DELETED'							=> 'Spieltag gelöscht',
+	'MATCHDAY_DELETED'							=> 'Spieltag gelöscht',
-	'MATCHDAY_DELIVERY'							=> 'Abgabetermin',
+	'MATCHDAY_DELIVERY'							=> 'Abgabetermin',
-	'MATCHDAY_DELIVERY_EXPLAIN'					=> 'Termin an dem der Spieltag bzw. die nächsten Spiele geschlossen werden und somit keine Tippabgabe mehr möglich ist. Wurde der Spieltag bereits geschlossen (Status 1), kann dieser durch ein zukünftigen Abgabetermin wieder geöffnet werden. Andere Statusübergänge sind nur durch Eingabe bzw. Löschen der Spielergebnisse dieses Spieltags möglich.',
+	'MATCHDAY_DELIVERY_EXPLAIN'					=> 'Termin an dem der Spieltag bzw. die nächsten Spiele geschlossen werden und somit keine Tippabgabe mehr möglich ist. Wurde der Spieltag bereits geschlossen (Status 1), kann dieser durch ein zukünftigen Abgabetermin wieder geöffnet werden. Andere Statusübergänge sind nur durch Eingabe bzw. Löschen der Spielergebnisse dieses Spieltags möglich.',
-	'MATCHDAY_DELIVERY2'						=> '2. Abgabetermin ',
+	'MATCHDAY_DELIVERY2'						=> '2. Abgabetermin ',
-	'MATCHDAY_DELIVERY2_EXPLAIN'				=> 'Beim Erreichen des ersten Abgabetermins wird dieser Termin als nächster Abgabetermin für die nächsten Spiele gesetzt.',
+	'MATCHDAY_DELIVERY2_EXPLAIN'				=> 'Beim Erreichen des ersten Abgabetermins wird dieser Termin als nächster Abgabetermin für die nächsten Spiele gesetzt.',
-	'MATCHDAY_DELIVERY3'						=> '3. Abgabetermin',
+	'MATCHDAY_DELIVERY3'						=> '3. Abgabetermin',
-	'MATCHDAY_DELIVERY3_EXPLAIN'				=> 'Beim Erreichen des 2. Abgabetermins wird dieser Termin als nächster Abgabetermin für die nächsten Spiele gesetzt.',
+	'MATCHDAY_DELIVERY3_EXPLAIN'				=> 'Beim Erreichen des 2. Abgabetermins wird dieser Termin als nächster Abgabetermin für die nächsten Spiele gesetzt.',
-	'MATCHDAY_DETAILS'							=> 'Spieltagsdaten',
+	'MATCHDAY_DETAILS'							=> 'Spieltagsdaten',
-	'MATCHDAY_EDIT_EXPLAIN'						=> 'Hier kannst du einen bestehenden Spieltag bearbeiten. Du kannst Typ, Anzahl der Spieltage, Gewinne, Namen und die Kurzbezeichnung ändern.',
+	'MATCHDAY_EDIT_EXPLAIN'						=> 'Hier kannst du einen bestehenden Spieltag bearbeiten. Du kannst Typ, Anzahl der Spieltage, Gewinne, Namen und die Kurzbezeichnung ändern.',
-	'MATCHDAY_MATCHES'							=> 'Anzahl der Spiele an diesem Spieltag',
+	'MATCHDAY_MATCHES'							=> 'Anzahl der Spiele an diesem Spieltag',
-	'MATCHDAY_MATCHES_EXPLAIN'					=> 'Bei KO-Runden ist die Angabe der Anzahl der Spiele je Spieltag zwingend erforderlich.',
+	'MATCHDAY_MATCHES_EXPLAIN'					=> 'Bei KO-Runden ist die Angabe der Anzahl der Spiele je Spieltag zwingend erforderlich.',
-	'MATCHDAY_NAME'								=> 'Spieltagsbezeichnung',
+	'MATCHDAY_NAME'								=> 'Spieltagsbezeichnung',
-	'MATCHDAY_NAME_DOUBLE'						=> 'Die Spieltagsbezeichnung wird schon benutzt bzw. wurde doppelt vergeben.',
+	'MATCHDAY_NAME_DOUBLE'						=> 'Die Spieltagsbezeichnung wird schon benutzt bzw. wurde doppelt vergeben.',
-	'MATCHDAY_NAME_EMPTY'						=> 'Die Spieltagsbezeichnung muss mindesten 3 Buchstaben lang sein.',
+	'MATCHDAY_NAME_EMPTY'						=> 'Die Spieltagsbezeichnung muss mindesten 3 Buchstaben lang sein.',
-	'MATCHDAY_NUMBER'							=> 'Die angegebene Spieltag muss numerisch (1-99) sein. Bitte eine Spieltagnummer eingeben.',
+	'MATCHDAY_NUMBER'							=> 'Die angegebene Spieltag muss numerisch (1-99) sein. Bitte eine Spieltagnummer eingeben.',
-	'MATCHDAY_STATUS'							=> 'Status',
+	'MATCHDAY_STATUS'							=> 'Status',
-	'MATCHDAY_STATUS_EXPLAIN'					=> '0 = offen (Tippabgabe möglich) <br /> 1 = keine Tippabgabe mehr möglich und noch keine Ergebnisse <br /> 2 = vorläufige Ergebnisse liegen vor <br /> 3 = abgeschlossen, endgültige Ergebnisse liegen vor.',
+	'MATCHDAY_STATUS_EXPLAIN'					=> '0 = offen (Tippabgabe möglich) <br /> 1 = keine Tippabgabe mehr möglich und noch keine Ergebnisse <br /> 2 = vorläufige Ergebnisse liegen vor <br /> 3 = abgeschlossen, endgültige Ergebnisse liegen vor.',
-	'MATCHDAY_UPDATE_FAILED'					=> 'Spieltageinstellungen konnten nicht aktualisiert werden.',
+	'MATCHDAY_UPDATE_FAILED'					=> 'Spieltageinstellungen konnten nicht aktualisiert werden.',
-	'MATCHDAY_UPDATED'							=> 'Spieltageinstellungen erfolgreich aktualisiert.',
+	'MATCHDAY_UPDATED'							=> 'Spieltageinstellungen erfolgreich aktualisiert.',
-	'MATCHDAYS_CREATED'							=> '%1$s Spieltage wurden erfolgreich erstellt.',
+	'MATCHDAYS_CREATED'							=> '%1$s Spieltage wurden erfolgreich erstellt.',
-	'MATCHDAYS_NO_DELETE'						=> 'Du darfst keine Spieltag löschen. Dies dürfen nur Gründungsmitglieder',
+	'MATCHDAYS_NO_DELETE'						=> 'Du darfst keine Spieltag löschen. Dies dürfen nur Gründungsmitglieder',
-	'MATCHDAYS_REMOVED'							=> 'Überflüssige Spieltage gelöscht',
+	'MATCHDAYS_REMOVED'							=> 'Überflüssige Spieltage gelöscht',
-
+
-	'NEW_DELIVERY'								=> 'Neue Abgabezeit',
+	'NEW_DELIVERY'								=> 'Neue Abgabezeit',
-	'NO_DELIVERIES_UPDATED'						=> 'Es wurden keine Abgabetermine geändert.',
+	'NO_DELIVERIES_UPDATED'						=> 'Es wurden keine Abgabetermine geändert.',
-	'NO_DELIVERY'								=> 'Der Abgabetermin fehlt.',
+	'NO_DELIVERY'								=> 'Der Abgabetermin fehlt.',
-	'NO_DELIVERY2'								=> 'Der 2. Abgabetermin fehlt oder der 3. Abgabetermin muss gelöscht werden.',
+	'NO_DELIVERY2'								=> 'Der 2. Abgabetermin fehlt oder der 3. Abgabetermin muss gelöscht werden.',
-	'NO_LEAGUE'									=> 'Es existiert keine Liga in der Saison %1$s. Bitte zuerst eine Liga in der Saison %1$s erstellen.',
+	'NO_LEAGUE'									=> 'Es existiert keine Liga in der Saison %1$s. Bitte zuerst eine Liga in der Saison %1$s erstellen.',
-	'NO_MATCHDAYS_CREATED'						=> 'Es wurden bislang keine Spieltage erstellt.',
+	'NO_MATCHDAYS_CREATED'						=> 'Es wurden bislang keine Spieltage erstellt.',
-	'NO_MORE_MATCHDAYS'							=> 'Es wurde keine weiteren Spieltage hinzugefügt.',
+	'NO_MORE_MATCHDAYS'							=> 'Es wurde keine weiteren Spieltage hinzugefügt.',
-	'NO_SEASON'									=> 'Es existiert keine Saison. Bitte zuerst eine Saison erstellen.',
+	'NO_SEASON'									=> 'Es existiert keine Saison. Bitte zuerst eine Saison erstellen.',
-
+
-	'OPEN_MATCH'								=> 'Das Spiel Nr. %s liegt vor dem gewählten Abgabetermin. Der Abgabetermin ist daher nicht zulässig.',
+	'OPEN_MATCH'								=> 'Das Spiel Nr. %s liegt vor dem gewählten Abgabetermin. Der Abgabetermin ist daher nicht zulässig.',
-	'OPEN_MATCHES'								=> 'Die Spiele Nr. %s liegen vor dem gewählten Abgabetermin. Der Abgabetermin ist daher nicht zulässig.',
+	'OPEN_MATCHES'								=> 'Die Spiele Nr. %s liegen vor dem gewählten Abgabetermin. Der Abgabetermin ist daher nicht zulässig.',
-
+
-	'PREDICTION_LEAGUE'							=> 'Tipprunde',
+	'PREDICTION_LEAGUE'							=> 'Tipprunde',
-
+
-	'REMOVE_MATCHDAYS'							=> 'Überflüssige Spieltage entfernen',
+	'REMOVE_MATCHDAYS'							=> 'Überflüssige Spieltage entfernen',
-
+
-	'SEASON'									=> 'Saison',
+	'SEASON'									=> 'Saison',
-	'SELECT_LEAGUE'								=> 'Liga auswählen',
+	'SELECT_LEAGUE'								=> 'Liga auswählen',
-	'SHOW_DELIVERY'								=> 'Abgabezeiten anzeigen',
+	'SHOW_DELIVERY'								=> 'Abgabezeiten anzeigen',
-
+
-	'TOO_LARGE_MATCHES'							=> 'Die Anzahl der Spiele je Spieltag ist zu groß.',
+	'TOO_LARGE_MATCHES'							=> 'Die Anzahl der Spiele je Spieltag ist zu groß.',
-	'TOO_SMALL_DELIVERY2'						=> 'Der 2. Abgabetermin darf nicht vor dem 1. Abgabetermin liegen.',
+	'TOO_SMALL_DELIVERY2'						=> 'Der 2. Abgabetermin darf nicht vor dem 1. Abgabetermin liegen.',
-	'TOO_SMALL_DELIVERY3'						=> 'Der 3. Abgabetermin darf nicht vor dem 2. Abgabetermin liegen.',
+	'TOO_SMALL_DELIVERY3'						=> 'Der 3. Abgabetermin darf nicht vor dem 2. Abgabetermin liegen.',
-	'TOO_SMALL_MATCHES'							=> 'Die Anzahl der Spiele je Spieltag ist zu klein.',
+	'TOO_SMALL_MATCHES'							=> 'Die Anzahl der Spiele je Spieltag ist zu klein.',
-
+
-	'UPDATE_DELIVER'							=> '%s Abgabetermin geändert.',
+	'UPDATE_DELIVER'							=> '%s Abgabetermin geändert.',
-	'UPDATE_DELIVERIES'							=> '%s Abgabetermine geändert.',
+	'UPDATE_DELIVERIES'							=> '%s Abgabetermine geändert.',
-	'UPDATE_DELIVERY'							=> 'Neue Abgabezeiten',
+	'UPDATE_DELIVERY'							=> 'Neue Abgabezeiten',
-	'UPDATE_DELIVERY_EXPLAIN'					=> 'Wähle die Datensätze aus, deren Abgabezeit neu gesetzt werden soll. Rot markierte Abgabezeiten liegen nach dem neu berechneten Abgabetermin.',
+	'UPDATE_DELIVERY_EXPLAIN'					=> 'Wähle die Datensätze aus, deren Abgabezeit neu gesetzt werden soll. Rot markierte Abgabezeiten liegen nach dem neu berechneten Abgabetermin.',
-));
+));
-
+
 ?>

language/de/info_acp_matches.php

@@ -1,113 +1,113 @@
-<?php
+<?php
-/**
+/**
-*
+*
-* info_acp_football_matches [Deutsch — Du]
+* info_acp_football_matches [Deutsch — Du]
-*
+*
-* @package language
+* @package language
-* @version $Id: info_acp_football_matches.php 1 2010-05-17 22:09:43Z football $ 
+* @version $Id: info_acp_football_matches.php 1 2010-05-17 22:09:43Z football $ 
-* @copyright (c) 2010 football (http://football.bplaced.net)
+* @copyright (c) 2010 football (http://football.bplaced.net)
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License
-*
+*
-*/
+*/
-
+
-/**
+/**
-* DO NOT CHANGE
+* DO NOT CHANGE
-*/
+*/
-if (!defined('IN_PHPBB'))
+if (!defined('IN_PHPBB'))
-{
+{
-	exit;
+	exit;
-}
+}
-
+
-if (empty($lang) || !is_array($lang))
+if (empty($lang) || !is_array($lang))
-{
+{
-	$lang = array();
+	$lang = array();
-}
+}
-
+
-// DEVELOPERS PLEASE NOTE
+// DEVELOPERS PLEASE NOTE
-//
+//
-// All language files should use UTF-8 as their encoding and the files must not contain a BOM.
+// All language files should use UTF-8 as their encoding and the files must not contain a BOM.
-//
+//
-// Placeholders can now contain order information, e.g. instead of
+// Placeholders can now contain order information, e.g. instead of
-// 'Page %s of %s' you can (and should) write 'Page %1$s of %2$s', this allows
+// 'Page %s of %s' you can (and should) write 'Page %1$s of %2$s', this allows
-// translators to re-order the output of data while ensuring it remains correct
+// translators to re-order the output of data while ensuring it remains correct
-//
+//
-// You do not need this where single placeholders are used, e.g. 'Message %d' is fine
+// You do not need this where single placeholders are used, e.g. 'Message %d' is fine
-// equally where a string contains only two placeholders which are used to wrap text
+// equally where a string contains only two placeholders which are used to wrap text
-// in a url you again do not need to specify an order e.g., 'Click %sHERE%s' is fine
+// in a url you again do not need to specify an order e.g., 'Click %sHERE%s' is fine
-
+
-$lang = array_merge($lang, array(
+$lang = array_merge($lang, array(
-	'ACP_FOOTBALL_MATCHES'					=> 'Spielpläne',
+	'ACP_FOOTBALL_MATCHES'					=> 'Spielpläne',
-	'ACP_FOOTBALL_MATCHES_MANAGE'			=> 'Spielpläne verwalten',
+	'ACP_FOOTBALL_MATCHES_MANAGE'			=> 'Spielpläne verwalten',
-	'ACP_FOOTBALL_MATCHES_MANAGE_EXPLAIN'	=> 'Hier kannst du je Saison und Liga Spielpläne verwalten. Du kannst fehlende Spielpaarung zum Spielplan hinzufügen und die Spieldaten eines Spieltags verwalten.',
+	'ACP_FOOTBALL_MATCHES_MANAGE_EXPLAIN'	=> 'Hier kannst du je Saison und Liga Spielpläne verwalten. Du kannst fehlende Spielpaarung zum Spielplan hinzufügen und die Spieldaten eines Spieltags verwalten.',
-	'ACP_FOOTBALL_MATCHES_MANAGEMENT'		=> 'Tipprunde-Spielplan-Verwaltung',
+	'ACP_FOOTBALL_MATCHES_MANAGEMENT'		=> 'Tipprunde-Spielplan-Verwaltung',
-
+
-	'DAY'									=> 'Tag',
+	'DAY'									=> 'Tag',
-
+
-	'FORMULA_GUEST'							=> 'Formel Gastmannschaft',
+	'FORMULA_GUEST'							=> 'Formel Gastmannschaft',
-	'FORMULA_GUEST_EXPLAIN'					=> 'Siehe Erläuterungen Formel Heimmannschaft',
+	'FORMULA_GUEST_EXPLAIN'					=> 'Siehe Erläuterungen Formel Heimmannschaft',
-	'FORMULA_HOME'							=> 'Formel Heimmannschaft',
+	'FORMULA_HOME'							=> 'Formel Heimmannschaft',
-	'FORMULA_HOME_EXPLAIN'					=> 'D = wird noch ausgelost <br />L 100 = Verlierer Spiel 100 <br />W 100 = Sieger Spiel 100 <br /> W 100;101 = Sieger Spiele 100 und 101 <br /> G A1 = 1. Gruppe A',
+	'FORMULA_HOME_EXPLAIN'					=> 'D = wird noch ausgelost <br />L 100 = Verlierer Spiel 100 <br />W 100 = Sieger Spiel 100 <br /> W 100;101 = Sieger Spiele 100 und 101 <br /> G A1 = 1. Gruppe A',
-
+
-	'GENERATE_MATCHES'						=> 'Spielplan-Gerüst vervollständigen',
+	'GENERATE_MATCHES'						=> 'Spielplan-Gerüst vervollständigen',
-
+
-	'INVALID_MDAY_DATE'						=> 'Kein gültiges Spieldatum.',
+	'INVALID_MDAY_DATE'						=> 'Kein gültiges Spieldatum.',
-
+
-	'KO'									=> 'KO',
+	'KO'									=> 'KO',
-
+
-	'LEAGUE'								=> 'Liga',
+	'LEAGUE'								=> 'Liga',
-
+
-	'MATCH_BEFORE_DELIVERY'					=> 'Der Spielbeginn liegt vor der Tippabgabe des Spieltags. Dies ist nicht zulässig.',
+	'MATCH_BEFORE_DELIVERY'					=> 'Der Spielbeginn liegt vor der Tippabgabe des Spieltags. Dies ist nicht zulässig.',
-	'MATCH_BEGIN'							=> 'Spielbeginn',
+	'MATCH_BEGIN'							=> 'Spielbeginn',
-	'MATCH_CONFIRM_DELETE'					=> 'Bist du sicher, dass du das %1$s. Spiel aus %2$s Saison %3$s mit allen Daten (Spielplan und Tipps) löschen willst?',
+	'MATCH_CONFIRM_DELETE'					=> 'Bist du sicher, dass du das %1$s. Spiel aus %2$s Saison %3$s mit allen Daten (Spielplan und Tipps) löschen willst?',
-	'MATCH_CREATED'							=> '%1$s Spielpaarung wurde erfolgreich erstellt.',
+	'MATCH_CREATED'							=> '%1$s Spielpaarung wurde erfolgreich erstellt.',
-	'MATCH_DELETED'							=> 'Spiel wurde erfolgreich gelöscht',
+	'MATCH_DELETED'							=> 'Spiel wurde erfolgreich gelöscht',
-	'MATCH_DETAILS'							=> 'Spieldaten',
+	'MATCH_DETAILS'							=> 'Spieldaten',
-	'MATCH_EDIT_EXPLAIN'					=> 'Hier kannst du eine bestehende Spielpaarung bearbeiten. Du kannst den Termin, die Paarung und eine Formel festlegen.',
+	'MATCH_EDIT_EXPLAIN'					=> 'Hier kannst du eine bestehende Spielpaarung bearbeiten. Du kannst den Termin, die Paarung und eine Formel festlegen.',
-	'MATCH_GROUP'							=> 'Gruppenspiel der Gruppe',
+	'MATCH_GROUP'							=> 'Gruppenspiel der Gruppe',
-	'MATCH_GUEST'							=> 'Gast',
+	'MATCH_GUEST'							=> 'Gast',
-	'MATCH_HOME'							=> 'Heim',
+	'MATCH_HOME'							=> 'Heim',
-	'MATCH_KO'								=> 'KO-Spiel',
+	'MATCH_KO'								=> 'KO-Spiel',
-	'MATCH_KO_EXPLAIN'						=> 'Dieses Spiel kann zu einer Verlägerung bzw. einem Elfmeterschießen führen.',
+	'MATCH_KO_EXPLAIN'						=> 'Dieses Spiel kann zu einer Verlägerung bzw. einem Elfmeterschießen führen.',
-	'MATCH_NUMBER'							=> 'Spiel Nr',
+	'MATCH_NUMBER'							=> 'Spiel Nr',
-	'MATCH_ODDS'							=> 'Quoten',
+	'MATCH_ODDS'							=> 'Quoten',
-	'MATCH_RATING'								=> 'Gewichtung',
+	'MATCH_RATING'								=> 'Gewichtung',
-	'MATCH_STATUS'							=> 'Status',
+	'MATCH_STATUS'							=> 'Status',
-	'MATCH_STATUS_EXPLAIN'					=> '&nbsp;-2=Spiel wird am 3. Abgabetermin geschlossen<br />&nbsp;-1=Spiel wird am 2. Abgabetermin geschlossen<br />&nbsp;&nbsp;0=offen (Tippabgabe möglich), wird am Abgabetermin geschlossen<br />&nbsp;&nbsp;1=keine Tippabgabe mehr möglich und noch kein Ergebnis<br />&nbsp;&nbsp;2=vorläufiges Ergebnis liegt vor<br />&nbsp;&nbsp;3=endgültiges Ergebnis liegt vor<br />4-6= wie 1-3 jedoch ohne Wertung.',
+	'MATCH_STATUS_EXPLAIN'					=> '&nbsp;-2=Spiel wird am 3. Abgabetermin geschlossen<br />&nbsp;-1=Spiel wird am 2. Abgabetermin geschlossen<br />&nbsp;&nbsp;0=offen (Tippabgabe möglich), wird am Abgabetermin geschlossen<br />&nbsp;&nbsp;1=keine Tippabgabe mehr möglich und noch kein Ergebnis<br />&nbsp;&nbsp;2=vorläufiges Ergebnis liegt vor<br />&nbsp;&nbsp;3=endgültiges Ergebnis liegt vor<br />4-6= wie 1-3 jedoch ohne Wertung.',
-	'MATCH_UPDATE_FAILED'					=> 'Spielpaarung konnte nicht aktualisiert werden.',
+	'MATCH_UPDATE_FAILED'					=> 'Spielpaarung konnte nicht aktualisiert werden.',
-	'MATCH_UPDATED'							=> 'Spielpaarung erfolgreich aktualisiert.',
+	'MATCH_UPDATED'							=> 'Spielpaarung erfolgreich aktualisiert.',
-	'MATCHDAY'								=> 'Spieltag',
+	'MATCHDAY'								=> 'Spieltag',
-	'MATCHDAY_MISSED'						=> 'Bevor dies Aktion durchgeführt werden kann, müssen die fehlenden Spieltag erfasst werden.',
+	'MATCHDAY_MISSED'						=> 'Bevor dies Aktion durchgeführt werden kann, müssen die fehlenden Spieltag erfasst werden.',
-	'MATCHES_CREATE_FAILED'					=> 'Spielplan konnte nicht vervollständigt werden.',
+	'MATCHES_CREATE_FAILED'					=> 'Spielplan konnte nicht vervollständigt werden.',
-	'MATCHES_CREATED'						=> '%1$s Spielpaarungen wurden erfolgreich erstellt.',
+	'MATCHES_CREATED'						=> '%1$s Spielpaarungen wurden erfolgreich erstellt.',
-	'MATCHES_DEF'							=> 'Vorhandene Spielpaarungen',
+	'MATCHES_DEF'							=> 'Vorhandene Spielpaarungen',
-	'MATCHES_DEF_EXPLAIN'					=> 'Dies sind Spielpaarungen, die von dir oder einem anderen Administrator erstellt wurden. Du kannst die Spielpaarungen ändern oder löschen.',
+	'MATCHES_DEF_EXPLAIN'					=> 'Dies sind Spielpaarungen, die von dir oder einem anderen Administrator erstellt wurden. Du kannst die Spielpaarungen ändern oder löschen.',
-	'MATCHES_NO_DELETE'						=> 'Du darfst keine Spiele löschen. Dies dürfen nur Gründungsmitglieder',
+	'MATCHES_NO_DELETE'						=> 'Du darfst keine Spiele löschen. Dies dürfen nur Gründungsmitglieder',
-	'MONTH'									=> 'Monat',
+	'MONTH'									=> 'Monat',
-
+
-	'NO_LEAGUE'								=> 'Es existiert keine Liga in der Saison %1$s. Bitte zuerst eine Liga in der Saison %1$s erstellen.',
+	'NO_LEAGUE'								=> 'Es existiert keine Liga in der Saison %1$s. Bitte zuerst eine Liga in der Saison %1$s erstellen.',
-	'NO_MATCH'								=> 'Diese Spielpaarung existiert nicht.',
+	'NO_MATCH'								=> 'Diese Spielpaarung existiert nicht.',
-	'NO_MATCH_BEGIN'						=> 'Der Spielbeginn fehlt.',
+	'NO_MATCH_BEGIN'						=> 'Der Spielbeginn fehlt.',
-	'NO_MATCHDAY'							=> 'Es existiert kein Spieltag in %1$s Saison %2$s. Bitte zuerst Spieltage erstellen.',
+	'NO_MATCHDAY'							=> 'Es existiert kein Spieltag in %1$s Saison %2$s. Bitte zuerst Spieltage erstellen.',
-	'NO_MATCHES_CREATED'					=> 'Es wurden bislang keine Spielpaarungen hinterlegt.',
+	'NO_MATCHES_CREATED'					=> 'Es wurden bislang keine Spielpaarungen hinterlegt.',
-	'NO_SEASON'								=> 'Es existiert keine Saison. Bitte zuerst eine Saison erstellen.',
+	'NO_SEASON'								=> 'Es existiert keine Saison. Bitte zuerst eine Saison erstellen.',
-
+
-	'ODD_1'									=> 'Heimsieg',
+	'ODD_1'									=> 'Heimsieg',
-	'ODD_x'									=> 'Unentschieden',
+	'ODD_x'									=> 'Unentschieden',
-	'ODD_2'									=> 'Auswärtssieg',
+	'ODD_2'									=> 'Auswärtssieg',
-
+
-	'PREDICTION_LEAGUE'						=> 'Tipprunde',
+	'PREDICTION_LEAGUE'						=> 'Tipprunde',
-
+
-	'SEASON'								=> 'Saison',
+	'SEASON'								=> 'Saison',
-	'SELECT_MATCHDAY'						=> 'Spieltag wählen',
+	'SELECT_MATCHDAY'						=> 'Spieltag wählen',
-
+
-	'TOO_LARGE_MATCH_BEGIN_H'				=> 'Stundenangabe beim Spielbeginn zu groß.',
+	'TOO_LARGE_MATCH_BEGIN_H'				=> 'Stundenangabe beim Spielbeginn zu groß.',
-	'TOO_LARGE_MATCH_BEGIN_MIN'				=> 'Minutenangabe beim Spielbeginn zu groß.',
+	'TOO_LARGE_MATCH_BEGIN_MIN'				=> 'Minutenangabe beim Spielbeginn zu groß.',
-	'TOO_SMALL_MATCH_BEGIN_H'				=> 'Stundenangabe beim Spielbeginn zu klein.',
+	'TOO_SMALL_MATCH_BEGIN_H'				=> 'Stundenangabe beim Spielbeginn zu klein.',
-	'TOO_SMALL_MATCH_BEGIN_MIN'				=> 'Minutenangabe beim Spielbeginn zu klein.',
+	'TOO_SMALL_MATCH_BEGIN_MIN'				=> 'Minutenangabe beim Spielbeginn zu klein.',
-
+
-	'UNKNOWN'								=> 'noch nicht bekannt',
+	'UNKNOWN'								=> 'noch nicht bekannt',
-
+
-	'YEAR'									=> 'Jahr',
+	'YEAR'									=> 'Jahr',
-));
+));
-
+
 ?>

language/de/info_acp_results.php

@@ -1,100 +1,100 @@
-<?php
+<?php
-/**
+/**
-*
+*
-* info_acp_football_results [Deutsch — Du]
+* info_acp_football_results [Deutsch — Du]
-*
+*
-* @package language
+* @package language
-* @version $Id: info_acp_football_results.php 6 2011-01-09 08:02:37Z football $ 
+* @version $Id: info_acp_football_results.php 6 2011-01-09 08:02:37Z football $ 
-* @copyright (c) 2010 football (http://football.bplaced.net)
+* @copyright (c) 2010 football (http://football.bplaced.net)
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License
-*
+*
-*/
+*/
-
+
-/**
+/**
-* DO NOT CHANGE
+* DO NOT CHANGE
-*/
+*/
-if (!defined('IN_PHPBB'))
+if (!defined('IN_PHPBB'))
-{
+{
-	exit;
+	exit;
-}
+}
-
+
-if (empty($lang) || !is_array($lang))
+if (empty($lang) || !is_array($lang))
-{
+{
-	$lang = array();
+	$lang = array();
-}
+}
-
+
-// DEVELOPERS PLEASE NOTE
+// DEVELOPERS PLEASE NOTE
-//
+//
-// All language files should use UTF-8 as their encoding and the files must not contain a BOM.
+// All language files should use UTF-8 as their encoding and the files must not contain a BOM.
-//
+//
-// Placeholders can now contain order information, e.g. instead of
+// Placeholders can now contain order information, e.g. instead of
-// 'Page %s of %s' you can (and should) write 'Page %1$s of %2$s', this allows
+// 'Page %s of %s' you can (and should) write 'Page %1$s of %2$s', this allows
-// translators to re-order the output of data while ensuring it remains correct
+// translators to re-order the output of data while ensuring it remains correct
-//
+//
-// You do not need this where single placeholders are used, e.g. 'Message %d' is fine
+// You do not need this where single placeholders are used, e.g. 'Message %d' is fine
-// equally where a string contains only two placeholders which are used to wrap text
+// equally where a string contains only two placeholders which are used to wrap text
-// in a url you again do not need to specify an order e.g., 'Click %sHERE%s' is fine
+// in a url you again do not need to specify an order e.g., 'Click %sHERE%s' is fine
-
+
-$lang = array_merge($lang, array(
+$lang = array_merge($lang, array(
-	'ACP_FOOTBALL_RESULTS'					=> 'Spielergebnisse',
+	'ACP_FOOTBALL_RESULTS'					=> 'Spielergebnisse',
-	'ACP_FOOTBALL_RESULTS_MANAGE'			=> 'Spielergebnisse eingeben',
+	'ACP_FOOTBALL_RESULTS_MANAGE'			=> 'Spielergebnisse eingeben',
-	'ACP_FOOTBALL_RESULTS_MANAGE_EXPLAIN'	=> 'Hier kannst du Spielergebnisse bestätigen, eingeben, löschen oder aus der Wertung nehmen.',
+	'ACP_FOOTBALL_RESULTS_MANAGE_EXPLAIN'	=> 'Hier kannst du Spielergebnisse bestätigen, eingeben, löschen oder aus der Wertung nehmen.',
-	'ACP_FOOTBALL_RESULTS_MANAGEMENT'		=> 'Tipprunde-Spielergebnis-Verwaltung',
+	'ACP_FOOTBALL_RESULTS_MANAGEMENT'		=> 'Tipprunde-Spielergebnis-Verwaltung',
-	'ADVICE'								=> 'Hinweis',
+	'ADVICE'								=> 'Hinweis',
-
+
-	'BETS_AND_RANKS'						=> 'Tipps und Ranglisten der',
+	'BETS_AND_RANKS'						=> 'Tipps und Ranglisten der',
-
+
-	'DAY'									=> 'Tag',
+	'DAY'									=> 'Tag',
-	'DELETE'								=> 'Löschen',
+	'DELETE'								=> 'Löschen',
-	'DELETE_EXPLAIN'						=> 'Spielergebnis löschen und Status auf 1 setzen.',
+	'DELETE_EXPLAIN'						=> 'Spielergebnis löschen und Status auf 1 setzen.',
-
+
-	'GUEST'									=> 'Gast',
+	'GUEST'									=> 'Gast',
-
+
-	'HOME'									=> 'Heim',
+	'HOME'									=> 'Heim',
-
+
-	'LEAGUE'								=> 'Liga',
+	'LEAGUE'								=> 'Liga',
-
+
-	'MATCH_BEGIN'							=> 'Spielbeginn',
+	'MATCH_BEGIN'							=> 'Spielbeginn',
-	'MATCH_STATUS_TITLE'					=> '-2=Spiel wird am 3. Abgabetermin geschlossen  -1=Spiel wird am 2. Abgabetermin geschlossen   0=offen (Tippabgabe möglich), wird am Abgabetermin geschlossen   1=keine Tippabgabe mehr möglich und noch kein Ergebnis    2=vorläufiges Ergebnis liegt vor    3=endgültiges Ergebnis liegt vor    4-6= wie 1-3 jedoch ohne Wertung.',
+	'MATCH_STATUS_TITLE'					=> '-2=Spiel wird am 3. Abgabetermin geschlossen  -1=Spiel wird am 2. Abgabetermin geschlossen   0=offen (Tippabgabe möglich), wird am Abgabetermin geschlossen   1=keine Tippabgabe mehr möglich und noch kein Ergebnis    2=vorläufiges Ergebnis liegt vor    3=endgültiges Ergebnis liegt vor    4-6= wie 1-3 jedoch ohne Wertung.',
-	'MATCHDAY'								=> 'Spieltag',
+	'MATCHDAY'								=> 'Spieltag',
-	'MONTH'									=> 'Monat',
+	'MONTH'									=> 'Monat',
-
+
-	'NO_LEAGUE'								=> 'Es existiert keine Liga in der Saison %1$s. Bitte zuerst eine Liga in der Saison %1$s erstellen.',
+	'NO_LEAGUE'								=> 'Es existiert keine Liga in der Saison %1$s. Bitte zuerst eine Liga in der Saison %1$s erstellen.',
-	'NO_MATCHDAY'							=> 'Es existiert kein Spieltag in %1$s Saison %2$s. Bitte zuerst Spieltage erstellen.',
+	'NO_MATCHDAY'							=> 'Es existiert kein Spieltag in %1$s Saison %2$s. Bitte zuerst Spieltage erstellen.',
-	'NO_MATCHES_CREATED'					=> 'Es wurden bislang keine Spielpaarungen hinterlegt.',
+	'NO_MATCHES_CREATED'					=> 'Es wurden bislang keine Spielpaarungen hinterlegt.',
-	'NO_SEASON'								=> 'Es existiert keine Saison. Bitte zuerst eine Saison erstellen.',
+	'NO_SEASON'								=> 'Es existiert keine Saison. Bitte zuerst eine Saison erstellen.',
-	'NO_VALUATION'							=> 'o. Wertung',
+	'NO_VALUATION'							=> 'o. Wertung',
-	'NO_VALUATION_EXPLAIN'					=> 'Spiel aus der Wertung nehmen, da dieses verschoben oder manipuliert wurde.',
+	'NO_VALUATION_EXPLAIN'					=> 'Spiel aus der Wertung nehmen, da dieses verschoben oder manipuliert wurde.',
-	'NUMBER'								=> 'Nr',
+	'NUMBER'								=> 'Nr',
-
+
-	'OVERTIME'								=> 'Verlängerung',
+	'OVERTIME'								=> 'Verlängerung',
-	'OVERTIME_EXPLAIN'						=> 'Spielergebnis inkl. Verlängerung und Elfmeterschiessen.',
+	'OVERTIME_EXPLAIN'						=> 'Spielergebnis inkl. Verlängerung und Elfmeterschiessen.',
-
+
-	'PREDICTION_LEAGUE'						=> 'Tipprunde',
+	'PREDICTION_LEAGUE'						=> 'Tipprunde',
-
+
-	'RANKING'								=> 'Rangliste',
+	'RANKING'								=> 'Rangliste',
-	'RESULT'								=> 'Ergebnis',
+	'RESULT'								=> 'Ergebnis',
-	'RESULT_DELETED'						=> '%1$s Spielergebnis wurde gelöscht.',
+	'RESULT_DELETED'						=> '%1$s Spielergebnis wurde gelöscht.',
-	'RESULT_DETAILS'						=> 'Spielergebnisse',
+	'RESULT_DETAILS'						=> 'Spielergebnisse',
-	'RESULT_EXPLAIN'						=> 'Spielergebnis nach 90 Minuten oder Spielzwischenstand',
+	'RESULT_EXPLAIN'						=> 'Spielergebnis nach 90 Minuten oder Spielzwischenstand',
-	'RESULT_NO_VALUATION'					=> '%1$s Spiel wurde aus der Wertung genommen.',
+	'RESULT_NO_VALUATION'					=> '%1$s Spiel wurde aus der Wertung genommen.',
-	'RESULT_SAVED'							=> '%1$s Spielergebnis wurde gespeichert.',
+	'RESULT_SAVED'							=> '%1$s Spielergebnis wurde gespeichert.',
-	'RESULTS_DELETED'						=> '%1$s Spielergebnisse wurden gelöscht.',
+	'RESULTS_DELETED'						=> '%1$s Spielergebnisse wurden gelöscht.',
-	'RESULTS_NO_VALUATION'					=> '%1$s Spiele wurden aus der Wertung genommen.',
+	'RESULTS_NO_VALUATION'					=> '%1$s Spiele wurden aus der Wertung genommen.',
-	'RESULTS_SAVED'							=> '%1$s Spielergebnisse wurden gespeichert.',
+	'RESULTS_SAVED'							=> '%1$s Spielergebnisse wurden gespeichert.',
-
+
-	'SAVE'									=> 'Speichern',
+	'SAVE'									=> 'Speichern',
-	'SAVE_FAILED'							=> 'Die Spielergebnisse konnten nicht gespeichert werden.',
+	'SAVE_FAILED'							=> 'Die Spielergebnisse konnten nicht gespeichert werden.',
-	'SEASON'								=> 'Saison',
+	'SEASON'								=> 'Saison',
-	'SELECT'								=> 'Auswahl',
+	'SELECT'								=> 'Auswahl',
-	'SELECT_EXPLAIN'						=> 'Nur die hier markierten Spiele werden gespeichert/nicht gewertet/gelöscht.',
+	'SELECT_EXPLAIN'						=> 'Nur die hier markierten Spiele werden gespeichert/nicht gewertet/gelöscht.',
-	'SELECT_MATCHDAY'						=> 'Spieltag wählen',
+	'SELECT_MATCHDAY'						=> 'Spieltag wählen',
-	'SET_STATUS_TO'							=> 'Der Status des Spieltages wurde auf %1$s gesetzt',
+	'SET_STATUS_TO'							=> 'Der Status des Spieltages wurde auf %1$s gesetzt',
-	'STATUS'								=> 'Status',
+	'STATUS'								=> 'Status',
-
+
-	'VS'									=> 'Begegnung',
+	'VS'									=> 'Begegnung',
-
+
-	'YEAR'									=> 'Jahr',
+	'YEAR'									=> 'Jahr',
-));
+));
-
+
 ?>

language/de/info_acp_seasons.php

@@ -1,86 +1,86 @@
-<?php
+<?php
-/**
+/**
-*
+*
-* info_acp_football_seasons [Deutsch — Du]
+* info_acp_football_seasons [Deutsch — Du]
-*
+*
-* @package language
+* @package language
-* @version $Id: info_acp_football_seasons.php 6 2011-01-09 08:02:37Z football $ 
+* @version $Id: info_acp_football_seasons.php 6 2011-01-09 08:02:37Z football $ 
-* @copyright (c) 2010 football (http://football.bplaced.net)
+* @copyright (c) 2010 football (http://football.bplaced.net)
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License
-*
+*
-*/
+*/
-
+
-/**
+/**
-* DO NOT CHANGE
+* DO NOT CHANGE
-*/
+*/
-if (!defined('IN_PHPBB'))
+if (!defined('IN_PHPBB'))
-{
+{
-	exit;
+	exit;
-}
+}
-
+
-if (empty($lang) || !is_array($lang))
+if (empty($lang) || !is_array($lang))
-{
+{
-	$lang = array();
+	$lang = array();
-}
+}
-
+
-// DEVELOPERS PLEASE NOTE
+// DEVELOPERS PLEASE NOTE
-//
+//
-// All language files should use UTF-8 as their encoding and the files must not contain a BOM.
+// All language files should use UTF-8 as their encoding and the files must not contain a BOM.
-//
+//
-// Placeholders can now contain order information, e.g. instead of
+// Placeholders can now contain order information, e.g. instead of
-// 'Page %s of %s' you can (and should) write 'Page %1$s of %2$s', this allows
+// 'Page %s of %s' you can (and should) write 'Page %1$s of %2$s', this allows
-// translators to re-order the output of data while ensuring it remains correct
+// translators to re-order the output of data while ensuring it remains correct
-//
+//
-// You do not need this where single placeholders are used, e.g. 'Message %d' is fine
+// You do not need this where single placeholders are used, e.g. 'Message %d' is fine
-// equally where a string contains only two placeholders which are used to wrap text
+// equally where a string contains only two placeholders which are used to wrap text
-// in a url you again do not need to specify an order e.g., 'Click %sHERE%s' is fine
+// in a url you again do not need to specify an order e.g., 'Click %sHERE%s' is fine
-
+
-$lang = array_merge($lang, array(
+$lang = array_merge($lang, array(
-	'ACP_FOOTBALL_SEASONS'					=> 'Saisons',
+	'ACP_FOOTBALL_SEASONS'					=> 'Saisons',
-	'ACP_FOOTBALL_SEASONS_MANAGE'			=> 'Saisons verwalten',
+	'ACP_FOOTBALL_SEASONS_MANAGE'			=> 'Saisons verwalten',
-	'ACP_FOOTBALL_SEASONS_MANAGE_EXPLAIN'	=> 'Hier kannst du alle Saisons verwalten. Du kannst bestehende löschen oder ändern oder eine neue Saison erstellen, sowie Name und Kurzbezeichnug der Saison einstellen.',
+	'ACP_FOOTBALL_SEASONS_MANAGE_EXPLAIN'	=> 'Hier kannst du alle Saisons verwalten. Du kannst bestehende löschen oder ändern oder eine neue Saison erstellen, sowie Name und Kurzbezeichnug der Saison einstellen.',
-	'ACP_FOOTBALL_SEASONS_MANAGEMENT'		=> 'Tipprunde-Saison-Verwaltung',
+	'ACP_FOOTBALL_SEASONS_MANAGEMENT'		=> 'Tipprunde-Saison-Verwaltung',
-
+
-	'CREATE_SEASON'							=> 'Neue Saison erstellen',
+	'CREATE_SEASON'							=> 'Neue Saison erstellen',
-
+
-	'LEAGUES'								=> 'Ligen',
+	'LEAGUES'								=> 'Ligen',
-
+
-	'NO_SEASON'								=> 'Keine Saison angegeben.',
+	'NO_SEASON'								=> 'Keine Saison angegeben.',
-	'NO_SEASONS_CREATED'					=> 'Es wurden bislang keine Saisons erstellt.',
+	'NO_SEASONS_CREATED'					=> 'Es wurden bislang keine Saisons erstellt.',
-
+
-	'PREDICTION_LEAGUE'						=> 'Tipprunde',
+	'PREDICTION_LEAGUE'						=> 'Tipprunde',
-
+
-	'SEASON'								=> 'Saison',
+	'SEASON'								=> 'Saison',
-	'SEASON_CLOSED'							=> 'Geschlossen',
+	'SEASON_CLOSED'							=> 'Geschlossen',
-	'SEASON_CONFIRM_DELETE'					=> 'Bist du sicher, dass du die Saison %1$s mit allen Daten (Ligen, Spieltage, Spielplänen, Tipps und Ranglisten) löschen willst?',
+	'SEASON_CONFIRM_DELETE'					=> 'Bist du sicher, dass du die Saison %1$s mit allen Daten (Ligen, Spieltage, Spielplänen, Tipps und Ranglisten) löschen willst?',
-	'SEASON_CREATE_FAILED'					=> 'Saison konnte nicht erstellt werden.',
+	'SEASON_CREATE_FAILED'					=> 'Saison konnte nicht erstellt werden.',
-	'SEASON_CREATED'						=> 'Saison erfolgreich erstellt.',
+	'SEASON_CREATED'						=> 'Saison erfolgreich erstellt.',
-	'SEASON_CURRENT'						=> 'Aktuelle Saison',
+	'SEASON_CURRENT'						=> 'Aktuelle Saison',
-	'SEASON_DEF'							=> 'Bestehende Saisons',
+	'SEASON_DEF'							=> 'Bestehende Saisons',
-	'SEASON_DEF_EXPLAIN'					=> 'Dies sind Saisons, die von dir oder einem anderen Administrator erstellt wurden. Du kannst Saisoneinstellungen ändern oder Saisons löschen.',
+	'SEASON_DEF_EXPLAIN'					=> 'Dies sind Saisons, die von dir oder einem anderen Administrator erstellt wurden. Du kannst Saisoneinstellungen ändern oder Saisons löschen.',
-	'SEASON_DELETE'							=> 'Saison entfernen',
+	'SEASON_DELETE'							=> 'Saison entfernen',
-	'SEASON_DELETED'						=> 'Saison gelöscht',
+	'SEASON_DELETED'						=> 'Saison gelöscht',
-	'SEASON_DETAILS'						=> 'Saisondetails',
+	'SEASON_DETAILS'						=> 'Saisondetails',
-	'SEASON_EDIT_EXPLAIN'					=> 'Hier kannst du eine bestehende Saison bearbeiten. Du kannst ihren Namen und die Kurzbezeichnung ändern.',
+	'SEASON_EDIT_EXPLAIN'					=> 'Hier kannst du eine bestehende Saison bearbeiten. Du kannst ihren Namen und die Kurzbezeichnung ändern.',
-	'SEASON_NAME'							=> 'Saisonname',
+	'SEASON_NAME'							=> 'Saisonname',
-	'SEASON_NAME_EMPTY'						=> 'Der Saisonname fehlt. Er muss mindesten 4 Zeichen lang sein.',
+	'SEASON_NAME_EMPTY'						=> 'Der Saisonname fehlt. Er muss mindesten 4 Zeichen lang sein.',
-	'SEASON_NAME_EXPLAIN'					=> 'Langbezeichnung der Saison z.B. "Saison 2010/2011"',
+	'SEASON_NAME_EXPLAIN'					=> 'Langbezeichnung der Saison z.B. "Saison 2010/2011"',
-	'SEASON_NAME_TAKEN'						=> 'Der angegebene Saisonname wird bereits benutzt. Bitte wähle einen anderen aus.',
+	'SEASON_NAME_TAKEN'						=> 'Der angegebene Saisonname wird bereits benutzt. Bitte wähle einen anderen aus.',
-	'SEASON_NUMBER'							=> 'Die angegebene Saison muss numerisch (1963-2099) sein. Bitte die Jahreszahl, in der die Saison endet eingeben.',
+	'SEASON_NUMBER'							=> 'Die angegebene Saison muss numerisch (1963-2099) sein. Bitte die Jahreszahl, in der die Saison endet eingeben.',
-	'SEASON_SHORT'							=> 'Saison Kurzbezeichnung',
+	'SEASON_SHORT'							=> 'Saison Kurzbezeichnung',
-	'SEASON_SHORT_EMPTY'					=> 'Die Saison Kurzbezeichnung fehlt, sie muss mindesten 2 Zeichen lang sein.',
+	'SEASON_SHORT_EMPTY'					=> 'Die Saison Kurzbezeichnung fehlt, sie muss mindesten 2 Zeichen lang sein.',
-	'SEASON_SHORT_EXPLAIN'					=> 'Kurzbezeichnung der Saison, die in der Auswahlbox angezeigt wird.',
+	'SEASON_SHORT_EXPLAIN'					=> 'Kurzbezeichnung der Saison, die in der Auswahlbox angezeigt wird.',
-	'SEASON_SHORT_TAKEN'					=> 'Die angegebene Kurzbezeichnung der Saison wird bereits benutzt. Bitte wähle eine andere aus.',
+	'SEASON_SHORT_TAKEN'					=> 'Die angegebene Kurzbezeichnung der Saison wird bereits benutzt. Bitte wähle eine andere aus.',
-	'SEASON_TAKEN'							=> 'Diese Saison existiert bereits. Bitte wähle eine andere Saison aus.',
+	'SEASON_TAKEN'							=> 'Diese Saison existiert bereits. Bitte wähle eine andere Saison aus.',
-	'SEASON_UPDATE_FAILED'					=> 'Saisoneinstellungen konnten nicht aktualisiert werden.',
+	'SEASON_UPDATE_FAILED'					=> 'Saisoneinstellungen konnten nicht aktualisiert werden.',
-	'SEASON_UPDATED'						=> 'Saisoneinstellungen erfolgreich aktualisiert.',
+	'SEASON_UPDATED'						=> 'Saisoneinstellungen erfolgreich aktualisiert.',
-	'SEASONS_NO_DELETE'						=> 'Du darfst keine Saison löschen. Dies dürfen nur Gründungsmitglieder',
+	'SEASONS_NO_DELETE'						=> 'Du darfst keine Saison löschen. Dies dürfen nur Gründungsmitglieder',
-	'SEASONS_NO_LEAGUE'						=> 'Diese Saison hat keine Liga',
+	'SEASONS_NO_LEAGUE'						=> 'Diese Saison hat keine Liga',
-
+
-	'TOO_LARGE_SEASON'						=> 'Der Wert für die Saison ist zu groß. Saison von 1963 - 2099 möglich.',
+	'TOO_LARGE_SEASON'						=> 'Der Wert für die Saison ist zu groß. Saison von 1963 - 2099 möglich.',
-	'TOO_SHORT_SEASON'						=> 'Der Saisonname muss mindesten 4 Zeichen lang sein.',
+	'TOO_SHORT_SEASON'						=> 'Der Saisonname muss mindesten 4 Zeichen lang sein.',
-	'TOO_SHORT_SEASON_SHORT'				=> 'Die Saison Kurzbezeichnung muss mindesten 2 Zeichen lang sein.',
+	'TOO_SHORT_SEASON_SHORT'				=> 'Die Saison Kurzbezeichnung muss mindesten 2 Zeichen lang sein.',
-	'TOO_SMALL_SEASON'						=> 'Der Wert für die Saison ist zu klein. Saison von 1963 - 2099 möglich.',
+	'TOO_SMALL_SEASON'						=> 'Der Wert für die Saison ist zu klein. Saison von 1963 - 2099 möglich.',
-));
+));
-
+
 ?>

language/de/info_acp_teams.php

@@ -1,100 +1,100 @@
-<?php
+<?php
-/**
+/**
-* 
+* 
-* info_acp_football_teams [Deutsch — Du]
+* info_acp_football_teams [Deutsch — Du]
-*
+*
-* @package language
+* @package language
-* @version $Id: info_acp_football_teams.php 14 2011-03-15 18:03:24Z football $ 
+* @version $Id: info_acp_football_teams.php 14 2011-03-15 18:03:24Z football $ 
-* @copyright (c) 2010 football (http://football.bplaced.net)
+* @copyright (c) 2010 football (http://football.bplaced.net)
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License
-*
+*
-*/
+*/
-
+
-/**
+/**
-* DO NOT CHANGE
+* DO NOT CHANGE
-*/
+*/
-if (!defined('IN_PHPBB'))
+if (!defined('IN_PHPBB'))
-{
+{
-	exit;
+	exit;
-}
+}
-
+
-if (empty($lang) || !is_array($lang))
+if (empty($lang) || !is_array($lang))
-{
+{
-	$lang = array();
+	$lang = array();
-}
+}
-
+
-// DEVELOPERS PLEASE NOTE
+// DEVELOPERS PLEASE NOTE
-//
+//
-// All language files should use UTF-8 as their encoding and the files must not contain a BOM.
+// All language files should use UTF-8 as their encoding and the files must not contain a BOM.
-//
+//
-// Placeholders can now contain order information, e.g. instead of
+// Placeholders can now contain order information, e.g. instead of
-// 'Page %s of %s' you can (and should) write 'Page %1$s of %2$s', this allows
+// 'Page %s of %s' you can (and should) write 'Page %1$s of %2$s', this allows
-// translators to re-order the output of data while ensuring it remains correct
+// translators to re-order the output of data while ensuring it remains correct
-//
+//
-// You do not need this where single placeholders are used, e.g. 'Message %d' is fine
+// You do not need this where single placeholders are used, e.g. 'Message %d' is fine
-// equally where a string contains only two placeholders which are used to wrap text
+// equally where a string contains only two placeholders which are used to wrap text
-// in a url you again do not need to specify an order e.g., 'Click %sHERE%s' is fine
+// in a url you again do not need to specify an order e.g., 'Click %sHERE%s' is fine
-
+
-$lang = array_merge($lang, array(
+$lang = array_merge($lang, array(
-	'ACP_FOOTBALL_TEAMS'					=> 'Teams',
+	'ACP_FOOTBALL_TEAMS'					=> 'Teams',
-	'ACP_FOOTBALL_TEAMS_MANAGE'				=> 'Teams verwalten',
+	'ACP_FOOTBALL_TEAMS_MANAGE'				=> 'Teams verwalten',
-	'ACP_FOOTBALL_TEAMS_MANAGE_EXPLAIN'		=> 'Hier kannst du je Saison Teams einer Liga zuordnen. Du kannst bestehende löschen oder ändern oder eine neues Team erstellen, sowie Typ, Anzahl der Spieltage, Gewinne, Name und Kurzbezeichnug des Teams einstellen.',
+	'ACP_FOOTBALL_TEAMS_MANAGE_EXPLAIN'		=> 'Hier kannst du je Saison Teams einer Liga zuordnen. Du kannst bestehende löschen oder ändern oder eine neues Team erstellen, sowie Typ, Anzahl der Spieltage, Gewinne, Name und Kurzbezeichnug des Teams einstellen.',
-	'ACP_FOOTBALL_TEAMS_MANAGEMENT'			=> 'Tipprunde-Team-Verwaltung',
+	'ACP_FOOTBALL_TEAMS_MANAGEMENT'			=> 'Tipprunde-Team-Verwaltung',
-	'ADD_TEAM'								=> 'Team zur Liga hinzufügen',
+	'ADD_TEAM'								=> 'Team zur Liga hinzufügen',
-
+
-	'LEAGUE'								=> 'Liga',
+	'LEAGUE'								=> 'Liga',
-
+
-	'MATCHDAY'								=> 'Spieltag',
+	'MATCHDAY'								=> 'Spieltag',
-
+
-	'NEW_TEAM'								=> 'Neues Team',
+	'NEW_TEAM'								=> 'Neues Team',
-	'NO_LEAGUE'								=> 'Es existiert keine Liga in der Saison %1$s. Bitte zuerst eine Liga in der Saison %1$s erstellen.',
+	'NO_LEAGUE'								=> 'Es existiert keine Liga in der Saison %1$s. Bitte zuerst eine Liga in der Saison %1$s erstellen.',
-	'NO_MATCHDAYS'							=> 'Bitte zuerst Spieltage anlegen, da die Mannschaften bei KO-Runden einem Spieltag zugeordnet werden müssen.',
+	'NO_MATCHDAYS'							=> 'Bitte zuerst Spieltage anlegen, da die Mannschaften bei KO-Runden einem Spieltag zugeordnet werden müssen.',
-	'NO_SEASON'								=> 'Es existiert keine Saison. Bitte zuerst eine Saison erstellen.',
+	'NO_SEASON'								=> 'Es existiert keine Saison. Bitte zuerst eine Saison erstellen.',
-	'NO_TEAM'								=> 'Kein Team angegeben.',
+	'NO_TEAM'								=> 'Kein Team angegeben.',
-	'NO_TEAMS_CREATED'						=> 'Es wurden bislang keine Teams erstellt.',
+	'NO_TEAMS_CREATED'						=> 'Es wurden bislang keine Teams erstellt.',
-	'NO_TEAMSYMBOL'							=> 'Kein Logo',
+	'NO_TEAMSYMBOL'							=> 'Kein Logo',
-
+
-	'PREDICTION_LEAGUE'						=> 'Tipprunde',
+	'PREDICTION_LEAGUE'						=> 'Tipprunde',
-
+
-	'SEASON'								=> 'Saison',
+	'SEASON'								=> 'Saison',
-	'SELECT_LEAGUE'							=> 'Liga auswählen',
+	'SELECT_LEAGUE'							=> 'Liga auswählen',
-
+
-	'TEAM'									=> 'Team',
+	'TEAM'									=> 'Team',
-	'TEAM_ADDED'							=> 'Team erfolgreich hinzugefügt.',
+	'TEAM_ADDED'							=> 'Team erfolgreich hinzugefügt.',
-	'TEAM_AWAY'								=> 'Auswärts',
+	'TEAM_AWAY'								=> 'Auswärts',
-	'TEAM_CONFIRM_DELETE'					=> 'Bist du sicher, dass du %1$s aus Saison: %2$s Liga: %3$s mit allen Daten (Spieltage, Spielplänen und Tipps) löschen möchtest?',
+	'TEAM_CONFIRM_DELETE'					=> 'Bist du sicher, dass du %1$s aus Saison: %2$s Liga: %3$s mit allen Daten (Spieltage, Spielplänen und Tipps) löschen möchtest?',
-	'TEAM_CREATE_FAILED'					=> 'Team konnte nicht erstellt werden.',
+	'TEAM_CREATE_FAILED'					=> 'Team konnte nicht erstellt werden.',
-	'TEAM_CREATED'							=> 'Team erfolgreich erstellt.',
+	'TEAM_CREATED'							=> 'Team erfolgreich erstellt.',
-	'TEAM_CURRENT'							=> 'Aktuelles Team',
+	'TEAM_CURRENT'							=> 'Aktuelles Team',
-	'TEAM_DEF'								=> 'Bestehende Teams',
+	'TEAM_DEF'								=> 'Bestehende Teams',
-	'TEAM_DEF_EXPLAIN'						=> 'Dies sind Teams, die von dir oder einem anderen Administrator erstellt wurden. Du kannst Teameinstellungen ändern oder Teams löschen.',
+	'TEAM_DEF_EXPLAIN'						=> 'Dies sind Teams, die von dir oder einem anderen Administrator erstellt wurden. Du kannst Teameinstellungen ändern oder Teams löschen.',
-	'TEAM_DELETE'							=> 'Team entfernen',
+	'TEAM_DELETE'							=> 'Team entfernen',
-	'TEAM_DELETED'							=> 'Team gelöscht',
+	'TEAM_DELETED'							=> 'Team gelöscht',
-	'TEAM_DETAILS'							=> 'Teamdaten',
+	'TEAM_DETAILS'							=> 'Teamdaten',
-	'TEAM_EDIT_EXPLAIN'						=> 'Hier kannst du ein bestehendes Team bearbeiten. Du kannst den Namen, die Team-Kurzbezeichnung sowie das Team-Wappen ändern.',
+	'TEAM_EDIT_EXPLAIN'						=> 'Hier kannst du ein bestehendes Team bearbeiten. Du kannst den Namen, die Team-Kurzbezeichnung sowie das Team-Wappen ändern.',
-	'TEAM_GROUP'							=> 'Gruppenspiele in Gruppe',
+	'TEAM_GROUP'							=> 'Gruppenspiele in Gruppe',
-	'TEAM_GROUP_EXPLAIN'					=> 'Buchstabe der Gruppe, in der die Gruppenspiele bestritten werden.',
+	'TEAM_GROUP_EXPLAIN'					=> 'Buchstabe der Gruppe, in der die Gruppenspiele bestritten werden.',
-	'TEAM_MATCHES'							=> 'Spiele',
+	'TEAM_MATCHES'							=> 'Spiele',
-	'TEAM_NAME'								=> 'Teamname',
+	'TEAM_NAME'								=> 'Teamname',
-	'TEAM_NAME_DOUBLE'						=> 'Der Teamname wird schon benutzt bzw. wurde doppelt vergeben.',
+	'TEAM_NAME_DOUBLE'						=> 'Der Teamname wird schon benutzt bzw. wurde doppelt vergeben.',
-	'TEAM_NUMBER'							=> 'Dies ist keine gültige Teamnummer. Die Teamnummer muss zwischen 0 und 65535 liegen.',
+	'TEAM_NUMBER'							=> 'Dies ist keine gültige Teamnummer. Die Teamnummer muss zwischen 0 und 65535 liegen.',
-	'TEAM_ROUND'							=> 'Qualifiziert bis Spieltag',
+	'TEAM_ROUND'							=> 'Qualifiziert bis Spieltag',
-	'TEAM_ROUND_EXPLAIN'					=> 'Spieltag bis zu dem sich das Team vorerst qualifiziert hat. Über diesen Parameter werden bei der Spielplanerstellung nur Mannschaften zur Auswahl angeboten, die sich auch für die netsprechende Runde qualifiziert haben. Über den Menüpunkt Qualifikation kann dieser Wert automatisch nach Beendigung der Runde automatisch für alle qualifizierten Mannschaften gesetzt werden.',	
+	'TEAM_ROUND_EXPLAIN'					=> 'Spieltag bis zu dem sich das Team vorerst qualifiziert hat. Über diesen Parameter werden bei der Spielplanerstellung nur Mannschaften zur Auswahl angeboten, die sich auch für die netsprechende Runde qualifiziert haben. Über den Menüpunkt Qualifikation kann dieser Wert automatisch nach Beendigung der Runde automatisch für alle qualifizierten Mannschaften gesetzt werden.',	
-	'TEAM_SHORT'							=> 'Team Kurzbezeichnung',
+	'TEAM_SHORT'							=> 'Team Kurzbezeichnung',
-	'TEAM_SHORT_DOUBLE'						=> 'Die Kurzbezeichnung wird schon benutzt bzw. wurde doppelt vergeben.',
+	'TEAM_SHORT_DOUBLE'						=> 'Die Kurzbezeichnung wird schon benutzt bzw. wurde doppelt vergeben.',
-	'TEAM_SHORT_EXPLAIN'					=> 'Maximal 10 stellige Kurzbezeichnung des Teams. Diese wird z.B. beim Export und unter Alle Tipps verwendet.',
+	'TEAM_SHORT_EXPLAIN'					=> 'Maximal 10 stellige Kurzbezeichnung des Teams. Diese wird z.B. beim Export und unter Alle Tipps verwendet.',
-	'TEAM_SYMBOL'							=> 'Teamwappen',
+	'TEAM_SYMBOL'							=> 'Teamwappen',
-	'TEAM_SYMBOL_EXPLAIN'					=> 'Das optionale Teamwappen muss 28x28 Pixel groß sein.',
+	'TEAM_SYMBOL_EXPLAIN'					=> 'Das optionale Teamwappen muss 28x28 Pixel groß sein.',
-	'TEAM_TAKEN'							=> 'Dieses Team existiert bereits in dieser Liga. Bitte wähle eine andere Teamnummer aus.',
+	'TEAM_TAKEN'							=> 'Dieses Team existiert bereits in dieser Liga. Bitte wähle eine andere Teamnummer aus.',
-	'TEAM_UPDATE_FAILED'					=> 'Teameinstellungen konnten nicht aktualisiert werden.',
+	'TEAM_UPDATE_FAILED'					=> 'Teameinstellungen konnten nicht aktualisiert werden.',
-	'TEAM_UPDATED'							=> 'Teameinstellungen erfolgreich aktualisiert.',
+	'TEAM_UPDATED'							=> 'Teameinstellungen erfolgreich aktualisiert.',
-	'TEAMS_NO_DELETE'						=> 'Du darfst kein Team löschen. Dies dürfen nur Gründungsmitglieder',
+	'TEAMS_NO_DELETE'						=> 'Du darfst kein Team löschen. Dies dürfen nur Gründungsmitglieder',
-	'TOO_LARGE_TEAM'						=> 'Die angegebene Team-ID muss numerisch (1-9999) sein. Bitte eine kleinere Teamnummer eingeben.',
+	'TOO_LARGE_TEAM'						=> 'Die angegebene Team-ID muss numerisch (1-9999) sein. Bitte eine kleinere Teamnummer eingeben.',
-	'TOO_SHORT_TEAM_NAME'					=> 'Der Teamname muss mindesten 3 Zeichen lang sein.',
+	'TOO_SHORT_TEAM_NAME'					=> 'Der Teamname muss mindesten 3 Zeichen lang sein.',
-	'TOO_SHORT_TEAM_SHORT'					=> 'Die Kurzbezeichnung muss mindesten 1 Zeichen lang sein.',
+	'TOO_SHORT_TEAM_SHORT'					=> 'Die Kurzbezeichnung muss mindesten 1 Zeichen lang sein.',
-	'TOO_SMALL_TEAM'						=> 'Die angegebene Team-ID muss numerisch (1-9999) sein. Bitte eine größere Teamnummer eingeben.',
+	'TOO_SMALL_TEAM'						=> 'Die angegebene Team-ID muss numerisch (1-9999) sein. Bitte eine größere Teamnummer eingeben.',
-
+
-	'WRONG_DATA_TEAM_GROUP'					=> 'Keine gültige Gruppe für die Gruppenspiele. Gültige Gruppen sind A-Z.',
+	'WRONG_DATA_TEAM_GROUP'					=> 'Keine gültige Gruppe für die Gruppenspiele. Gültige Gruppen sind A-Z.',
-));
+));
-
+
 ?>

language/de/info_acp_update.php

@@ -1,138 +1,138 @@
-<?php
+<?php
-/**
+/**
-*
+*
-* info_acp_football_update [Deutsch — Du]
+* info_acp_football_update [Deutsch — Du]
-*
+*
-* @package language
+* @package language
-* @version $Id: info_acp_football_update.php 14 2011-03-15 18:03:24Z football $ 
+* @version $Id: info_acp_football_update.php 14 2011-03-15 18:03:24Z football $ 
-* @copyright (c) 2010 football (http://football.bplaced.net)
+* @copyright (c) 2010 football (http://football.bplaced.net)
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License
-*
+*
-*/
+*/
-
+
-/**
+/**
-* DO NOT CHANGE
+* DO NOT CHANGE
-*/
+*/
-if (!defined('IN_PHPBB'))
+if (!defined('IN_PHPBB'))
-{
+{
-	exit;
+	exit;
-}
+}
-
+
-if (empty($lang) || !is_array($lang))
+if (empty($lang) || !is_array($lang))
-{
+{
-	$lang = array();
+	$lang = array();
-}
+}
-
+
-// DEVELOPERS PLEASE NOTE
+// DEVELOPERS PLEASE NOTE
-//
+//
-// All language files should use UTF-8 as their encoding and the files must not contain a BOM.
+// All language files should use UTF-8 as their encoding and the files must not contain a BOM.
-//
+//
-// Placeholders can now contain order information, e.g. instead of
+// Placeholders can now contain order information, e.g. instead of
-// 'Page %s of %s' you can (and should) write 'Page %1$s of %2$s', this allows
+// 'Page %s of %s' you can (and should) write 'Page %1$s of %2$s', this allows
-// translators to re-order the output of data while ensuring it remains correct
+// translators to re-order the output of data while ensuring it remains correct
-//
+//
-// You do not need this where single placeholders are used, e.g. 'Message %d' is fine
+// You do not need this where single placeholders are used, e.g. 'Message %d' is fine
-// equally where a string contains only two placeholders which are used to wrap text
+// equally where a string contains only two placeholders which are used to wrap text
-// in a url you again do not need to specify an order e.g., 'Click %sHERE%s' is fine
+// in a url you again do not need to specify an order e.g., 'Click %sHERE%s' is fine
-
+
-$lang = array_merge($lang, array(
+$lang = array_merge($lang, array(
-	'ACP_FOOTBALL_UPDATE'					=> 'Spielplan aktualisieren',
+	'ACP_FOOTBALL_UPDATE'					=> 'Spielplan aktualisieren',
-	'ACP_FOOTBALL_UPDATE_MANAGE'			=> 'Spielplan aktualisieren',
+	'ACP_FOOTBALL_UPDATE_MANAGE'			=> 'Spielplan aktualisieren',
-	'ACP_FOOTBALL_UPDATE_MANAGE_EXPLAIN'	=> 'Hier kannst du deine Spielpläne, mit Daten von der Demoseite oder einer anderen Tipprunden-Seite aktualisieren oder neu erstellen. Wähle zuerst eine Tipprunden-Seite und Liga aus, von der das Update stammt. Nach Auswahl der Ziel-Liga bekommst du Abweichungen zwischen dieser Liga und dem Update angezeigt und kannst wählen welche Änderungen du übernehmen möchtest. Falls du eine neue Liga erstellen möchtest, werden alle Daten übernommen. ',
+	'ACP_FOOTBALL_UPDATE_MANAGE_EXPLAIN'	=> 'Hier kannst du deine Spielpläne, mit Daten von der Demoseite oder einer anderen Tipprunden-Seite aktualisieren oder neu erstellen. Wähle zuerst eine Tipprunden-Seite und Liga aus, von der das Update stammt. Nach Auswahl der Ziel-Liga bekommst du Abweichungen zwischen dieser Liga und dem Update angezeigt und kannst wählen welche Änderungen du übernehmen möchtest. Falls du eine neue Liga erstellen möchtest, werden alle Daten übernommen. ',
-	'ACP_FOOTBALL_UPDATE_MANAGEMENT'		=> 'Tipprunde-Spielplan aktualisieren',
+	'ACP_FOOTBALL_UPDATE_MANAGEMENT'		=> 'Tipprunde-Spielplan aktualisieren',
-
+
-	'ALLOW_URL_FOPEN'					=> 'Die PHP-Einstellung <var>allow_url_fopen</var> erlaubt keinen Zugriff auf andere Seiten. <br />Du musst die Updateidatei(en) downloaden und im Verzeichnis root/store speichern. ',
+	'ALLOW_URL_FOPEN'					=> 'Die PHP-Einstellung <var>allow_url_fopen</var> erlaubt keinen Zugriff auf andere Seiten. <br />Du musst die Updateidatei(en) downloaden und im Verzeichnis root/store speichern. ',
-	'CHOOSE_LEAGUES'					=> 'Quell- und Ziel-Spielplan wählen',
+	'CHOOSE_LEAGUES'					=> 'Quell- und Ziel-Spielplan wählen',
-	'CHOOSE_OTHER_LEAGUE'				=> 'Anderen Spielplan wählen',
+	'CHOOSE_OTHER_LEAGUE'				=> 'Anderen Spielplan wählen',
-	'COMPARE_UPDATE'					=> 'Vergleichen mit Datenbank',
+	'COMPARE_UPDATE'					=> 'Vergleichen mit Datenbank',
-	'CURRENT_VALUE'						=> 'Aktueller Wert',
+	'CURRENT_VALUE'						=> 'Aktueller Wert',
-
+
-	'DB_INSERT_SEASON'					=> '%s Saison eingefügt. ',
+	'DB_INSERT_SEASON'					=> '%s Saison eingefügt. ',
-	'DB_INSERT_LEAGUE'					=> '%s Liga eingefügt. ',
+	'DB_INSERT_LEAGUE'					=> '%s Liga eingefügt. ',
-	'DB_INSERT_MATCHDAY'				=> '%s Spieltag eingefügt. ',
+	'DB_INSERT_MATCHDAY'				=> '%s Spieltag eingefügt. ',
-	'DB_INSERT_MATCHDAYS'				=> '%s Spieltage eingefügt. ',
+	'DB_INSERT_MATCHDAYS'				=> '%s Spieltage eingefügt. ',
-	'DB_INSERT_TEAM'					=> '%s Mannschaft eingefügt. ',
+	'DB_INSERT_TEAM'					=> '%s Mannschaft eingefügt. ',
-	'DB_INSERT_TEAMS'					=> '%s Mannschaften eingefügt. ',
+	'DB_INSERT_TEAMS'					=> '%s Mannschaften eingefügt. ',
-	'DB_INSERT_MATCH'					=> '%s Spiel eingefügt. ',
+	'DB_INSERT_MATCH'					=> '%s Spiel eingefügt. ',
-	'DB_INSERT_MATCHES'					=> '%s Spiele eingefügt. ',
+	'DB_INSERT_MATCHES'					=> '%s Spiele eingefügt. ',
-	'DB_UPDATE_BIT_DELIVER'				=> '%s Spieltags-Abgabetermin mit Tippabgabe bis zum Spielbeginn korrigiert. ',
+	'DB_UPDATE_BIT_DELIVER'				=> '%s Spieltags-Abgabetermin mit Tippabgabe bis zum Spielbeginn korrigiert. ',
-	'DB_UPDATE_BIT_DELIVERIES'			=> '%s Spieltags-Abgabetermine mit Tippabgabe bis zum Spielbeginn korrigiert. ',
+	'DB_UPDATE_BIT_DELIVERIES'			=> '%s Spieltags-Abgabetermine mit Tippabgabe bis zum Spielbeginn korrigiert. ',
-	'DB_UPDATE_DELIVER'					=> 'Abgabetermin des Spieltags %s korrigiert. ',
+	'DB_UPDATE_DELIVER'					=> 'Abgabetermin des Spieltags %s korrigiert. ',
-	'DB_UPDATE_DELIVERIES'				=> 'Abgabetermine des Spieltage %s korrigiert. ',
+	'DB_UPDATE_DELIVERIES'				=> 'Abgabetermine des Spieltage %s korrigiert. ',
-	'DB_UPDATE_MATCHDAY'				=> '%s Spieltag aktualisiert. ',
+	'DB_UPDATE_MATCHDAY'				=> '%s Spieltag aktualisiert. ',
-	'DB_UPDATE_MATCHDAYS'				=> '%s Spieltage aktualisiert. ',
+	'DB_UPDATE_MATCHDAYS'				=> '%s Spieltage aktualisiert. ',
-	'DB_UPDATE_TEAM'					=> '%s Mannschaft aktualisiert. ',
+	'DB_UPDATE_TEAM'					=> '%s Mannschaft aktualisiert. ',
-	'DB_UPDATE_TEAMS'					=> '%s Mannschaften aktualisiert. ',
+	'DB_UPDATE_TEAMS'					=> '%s Mannschaften aktualisiert. ',
-	'DB_UPDATE_MATCH'					=> '%s Spiel aktualisiert. ',
+	'DB_UPDATE_MATCH'					=> '%s Spiel aktualisiert. ',
-	'DB_UPDATE_MATCHES'					=> '%s Spiele aktualisiert. ',
+	'DB_UPDATE_MATCHES'					=> '%s Spiele aktualisiert. ',
-	'DB_UPDATE_STATUS_MATCHDAY'			=> 'An %s Spieltag wurde der Status angepasst. ',
+	'DB_UPDATE_STATUS_MATCHDAY'			=> 'An %s Spieltag wurde der Status angepasst. ',
-	'DB_UPDATE_STATUS_MATCHDAYS'		=> 'An %s Spieltagen wurde der Status angepasst. ',
+	'DB_UPDATE_STATUS_MATCHDAYS'		=> 'An %s Spieltagen wurde der Status angepasst. ',
-	'DUPLICATE_TEAM'					=> 'Diese Team-ID wurde doppelt zugeordnet. ',
+	'DUPLICATE_TEAM'					=> 'Diese Team-ID wurde doppelt zugeordnet. ',
-	
+	
-	'ERROR_OPEN_LEAGUE_XML'				=> 'Fehler! Die Liga XML-Datei konnte nicht geöffnet werden. Bitte den Link überprüfen. ',
+	'ERROR_OPEN_LEAGUE_XML'				=> 'Fehler! Die Liga XML-Datei konnte nicht geöffnet werden. Bitte den Link überprüfen. ',
-	'ERROR_OPEN_SEASON_XML'				=> 'Fehler! Die Saison XML-Datei konnte nicht geöffnet werden. Bitte den Link überprüfen. ',
+	'ERROR_OPEN_SEASON_XML'				=> 'Fehler! Die Saison XML-Datei konnte nicht geöffnet werden. Bitte den Link überprüfen. ',
-	'ERROR_READ_LEAGUE_XML'				=> 'Fehler! Die Liga XML-Datei konnte nicht gelesen werden. Bitte den Code oder die XML-Datei überprüfen. ', 
+	'ERROR_READ_LEAGUE_XML'				=> 'Fehler! Die Liga XML-Datei konnte nicht gelesen werden. Bitte den Code oder die XML-Datei überprüfen. ', 
-	'ERROR_READ_SEASON_XML'				=> 'Fehler! Die Saison XML-Datei konnte nicht gelesen werden. Bitte den Code überprüfen. ',
+	'ERROR_READ_SEASON_XML'				=> 'Fehler! Die Saison XML-Datei konnte nicht gelesen werden. Bitte den Code überprüfen. ',
-	'ERROR_LOAD_LEAGUE_XML'				=> 'Fehler! Die Liga XML-Datei konnte nicht gelesen werden. Bitte die Datei %s überprüfen. ',
+	'ERROR_LOAD_LEAGUE_XML'				=> 'Fehler! Die Liga XML-Datei konnte nicht gelesen werden. Bitte die Datei %s überprüfen. ',
-	'ERROR_XML_CODE'					=> 'Fehlerhafter Code! Um die XML-Datei anzuzeigen, muss der korrekte Code beim Aufruf übergeben werden. ',
+	'ERROR_XML_CODE'					=> 'Fehlerhafter Code! Um die XML-Datei anzuzeigen, muss der korrekte Code beim Aufruf übergeben werden. ',
-	'ERROR_XML_CREATE'					=> 'Fehler! Die XML-Datei konnte nicht erzeugt werden. ',
+	'ERROR_XML_CREATE'					=> 'Fehler! Die XML-Datei konnte nicht erzeugt werden. ',
-	
+	
-	'INSERT_LEAGUE'						=> 'Neue Liga anlegen',
+	'INSERT_LEAGUE'						=> 'Neue Liga anlegen',
-	'INSERT_MATCHDAYS'					=> 'Spieltage anlegen',
+	'INSERT_MATCHDAYS'					=> 'Spieltage anlegen',
-	'INSERT_MATCHES'					=> 'Spielbegegnungen anlegen',
+	'INSERT_MATCHES'					=> 'Spielbegegnungen anlegen',
-	'INSERT_SEASON'						=> 'Neue Saison anlegen',
+	'INSERT_SEASON'						=> 'Neue Saison anlegen',
-	'INSERT_TEAMS'						=> 'Mannschaften anlegen',
+	'INSERT_TEAMS'						=> 'Mannschaften anlegen',
-
+
-	'LEAGUE_SHORTCUT'					=> 'Liga Kürzel',
+	'LEAGUE_SHORTCUT'					=> 'Liga Kürzel',
-	'LOAD'								=> 'Laden',
+	'LOAD'								=> 'Laden',
-	'LOG_FOOTB_UPDATE'					=> '<strong>Football Prediction League Spielplan-Update</strong><br />» %s',
+	'LOG_FOOTB_UPDATE'					=> '<strong>Football Prediction League Spielplan-Update</strong><br />» %s',
-
+
-	'MAP_TEAMS'							=> 'Teams zuordnen',
+	'MAP_TEAMS'							=> 'Teams zuordnen',
-	'MATCH_OF_GROUP'					=> 'Spiel in Gruppe',
+	'MATCH_OF_GROUP'					=> 'Spiel in Gruppe',
-	'MATCHES'							=> 'Spiele',
+	'MATCHES'							=> 'Spiele',
-	'MISMATCH_LEAGUE_TYPE'				=> 'Der Ligatyp (%s) des Quell-Spielplans passt nicht zur vorhandenen Liga.',
+	'MISMATCH_LEAGUE_TYPE'				=> 'Der Ligatyp (%s) des Quell-Spielplans passt nicht zur vorhandenen Liga.',
-	'MISMATCH_MATCHDAYS'				=> 'Die Anzahl der Spieltage (%s) des Quell-Spielplans passt nicht zur vorhandenen Liga.',
+	'MISMATCH_MATCHDAYS'				=> 'Die Anzahl der Spieltage (%s) des Quell-Spielplans passt nicht zur vorhandenen Liga.',
-	'MISMATCH_DB_MATCHDAYS'				=> 'Die Anzahl der Spieltage (%s) in der Datenbank passt nicht zur vorhandenen Liga.',
+	'MISMATCH_DB_MATCHDAYS'				=> 'Die Anzahl der Spieltage (%s) in der Datenbank passt nicht zur vorhandenen Liga.',
-	'MISMATCH_MATCHES'					=> 'Die Anzahl der Spiele (%s) an einem Spieltag des Quell-Spielplans passt nicht zur vorhandenen Liga.',
+	'MISMATCH_MATCHES'					=> 'Die Anzahl der Spiele (%s) an einem Spieltag des Quell-Spielplans passt nicht zur vorhandenen Liga.',
-	'MISMATCH_DB_MATCHES'				=> 'Die Anzahl der Spiele (%s) in der Datenbank passt nicht zum Quell-Spielplan.',
+	'MISMATCH_DB_MATCHES'				=> 'Die Anzahl der Spiele (%s) in der Datenbank passt nicht zum Quell-Spielplan.',
-	'MISMATCH_MOM'						=> 'Die Anzahl der Spiele je Spieltag (%s) des Quell-Spielplans passt nicht zur vorhandenen Liga.',
+	'MISMATCH_MOM'						=> 'Die Anzahl der Spiele je Spieltag (%s) des Quell-Spielplans passt nicht zur vorhandenen Liga.',
-	'MISSING_TEAMS'						=> 'Folgende Team IDs müssen noch zugeordnet werden: %s',
+	'MISSING_TEAMS'						=> 'Folgende Team IDs müssen noch zugeordnet werden: %s',
-
+
-	'NEW_LEAGUE'						=> 'Neue Liga',
+	'NEW_LEAGUE'						=> 'Neue Liga',
-	'NEW_LEAGUE_EXIST'					=> 'Die neue Liga %s existiert bereits. ',
+	'NEW_LEAGUE_EXIST'					=> 'Die neue Liga %s existiert bereits. ',
-	'NEW_LEAGUE_EXPLAIN'				=> 'Bei einer neuen Liga bitte hier die Liganummer angeben. Bei einer bestehenden Liga darf diese Liganummer nicht überschrieben werden, da sonst eine eventuell bestehende Liga aktualisiert wird. ',
+	'NEW_LEAGUE_EXPLAIN'				=> 'Bei einer neuen Liga bitte hier die Liganummer angeben. Bei einer bestehenden Liga darf diese Liganummer nicht überschrieben werden, da sonst eine eventuell bestehende Liga aktualisiert wird. ',
-	'NEW_TEAM'							=> 'Neues Team wird eingefügt',
+	'NEW_TEAM'							=> 'Neues Team wird eingefügt',
-	'NO_DB_CHANGES'						=> 'Es wurden keine Änderungen durchgeführt. ',
+	'NO_DB_CHANGES'						=> 'Es wurden keine Änderungen durchgeführt. ',
-	'NO_DIFFERENCES'					=> 'Keine Unterschiede gefunden. Die Spielpläne sind identisch. ',
+	'NO_DIFFERENCES'					=> 'Keine Unterschiede gefunden. Die Spielpläne sind identisch. ',
-	'NO_XML_LEAGUE'						=> 'Im Verzeichnis root/store konnte keine Update-Dateien gefunden werden. ',
+	'NO_XML_LEAGUE'						=> 'Im Verzeichnis root/store konnte keine Update-Dateien gefunden werden. ',
-	'NO_XML_SEASON'						=> 'Es wurde keine Quell-Daten zum aktualisieren gefunden. ',
+	'NO_XML_SEASON'						=> 'Es wurde keine Quell-Daten zum aktualisieren gefunden. ',
-	'NO_XML_ARRAY'						=> 'Fehler! Daten nicht mehr vorhanden. Bitte wiederhole die Aktion von vorne. ',
+	'NO_XML_ARRAY'						=> 'Fehler! Daten nicht mehr vorhanden. Bitte wiederhole die Aktion von vorne. ',
-
+
-	'OTHER_FIELDS'						=> 'Andere Felder',
+	'OTHER_FIELDS'						=> 'Andere Felder',
-
+
-	'PREDICTION_LEAGUE'					=> 'Tipprunde',
+	'PREDICTION_LEAGUE'					=> 'Tipprunde',
-
+
-	'SEASON'							=> 'Saison',
+	'SEASON'							=> 'Saison',
-	'SELECT_EXPLAIN'					=> 'Nur die hier markierten Datensätze werden übernommen',
+	'SELECT_EXPLAIN'					=> 'Nur die hier markierten Datensätze werden übernommen',
-	'SHOW_UPDATE'						=> 'Neue Liga anzeigen',
+	'SHOW_UPDATE'						=> 'Neue Liga anzeigen',
-	'SOURCE'							=> 'Quelle',
+	'SOURCE'							=> 'Quelle',
-
+
-	'TARGET'							=> 'Ziel',
+	'TARGET'							=> 'Ziel',
-	'TEAM_MAPPING'						=> 'Teamzuordnung',
+	'TEAM_MAPPING'						=> 'Teamzuordnung',
-	'TEAM_NAME_SHORT'					=> 'Kurzname',
+	'TEAM_NAME_SHORT'					=> 'Kurzname',
-	'TRANSFER_TEAM'						=> 'Team übernehmen',
+	'TRANSFER_TEAM'						=> 'Team übernehmen',
-
+
-	'UPDATE_LEAGUE'						=> 'Ligadaten aktualisieren',
+	'UPDATE_LEAGUE'						=> 'Ligadaten aktualisieren',
-	'UPDATE_MATCHDAYS'					=> 'Spieltagsdaten aktualisieren',
+	'UPDATE_MATCHDAYS'					=> 'Spieltagsdaten aktualisieren',
-	'UPDATE_MATCHES'					=> 'Spielbegegnungen aktualisieren',
+	'UPDATE_MATCHES'					=> 'Spielbegegnungen aktualisieren',
-	'UPDATE_ONLY_FINAL'					=> 'Nur endgültige Ergebnisse übernehmen',
+	'UPDATE_ONLY_FINAL'					=> 'Nur endgültige Ergebnisse übernehmen',
-	'UPDATE_SAME_STATUS'				=> 'Ergebnisse mit gleichem Status aktualisieren',
+	'UPDATE_SAME_STATUS'				=> 'Ergebnisse mit gleichem Status aktualisieren',
-	'UPDATE_NEG_STATUS'					=> 'Negative Status übernehmen',
+	'UPDATE_NEG_STATUS'					=> 'Negative Status übernehmen',
-	'UPDATE_TEAMS'						=> 'Mannschaftsdaten aktualisieren',
+	'UPDATE_TEAMS'						=> 'Mannschaftsdaten aktualisieren',
-	'UPDATE_THIS'						=> 'Änderungen in diesem Feld übernehmen',
+	'UPDATE_THIS'						=> 'Änderungen in diesem Feld übernehmen',
-
+
-	'XML_SEASON_URL'					=> 'URL Quelle für das Update',
+	'XML_SEASON_URL'					=> 'URL Quelle für das Update',
-	'XML_SEASON_URL_EXPLAIN'			=> 'URL zu football_xml_season.php oder localhost. Bei localhost wird nach league_* Datei in root/store gesucht. ',
+	'XML_SEASON_URL_EXPLAIN'			=> 'URL zu football_xml_season.php oder localhost. Bei localhost wird nach league_* Datei in root/store gesucht. ',
-));
+));
-
+
 ?>

language/de/permissions_football.php

@@ -1,39 +1,39 @@
-<?php
+<?php
-/**
+/**
-*
+*
-* @package language
+* @package language
-* @package phpBB Extension - Football Football
+* @package phpBB Extension - Football Football
-* @copyright (c) 2016 football (http://football.bplaced.net)
+* @copyright (c) 2016 football (http://football.bplaced.net)
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
-*
+*
-*/
+*/
-
+
-/**
+/**
-* DO NOT CHANGE
+* DO NOT CHANGE
-*/
+*/
-if (!defined('IN_PHPBB'))
+if (!defined('IN_PHPBB'))
-{
+{
-	exit;
+	exit;
-}
+}
-
+
-if (empty($lang) || !is_array($lang))
+if (empty($lang) || !is_array($lang))
-{
+{
-	$lang = array();
+	$lang = array();
-}
+}
-
+
-// Adding new football permissions
+// Adding new football permissions
-$lang = array_merge($lang, array(
+$lang = array_merge($lang, array(
-	'ACP_FOOTBALL'						=> 'Fussball',
+	'ACP_FOOTBALL'						=> 'Fussball',
-	'ACL_U_USE_FOOTBALL'				=> 'Kann Football Extension verwenden',
+	'ACL_U_USE_FOOTBALL'				=> 'Kann Football Extension verwenden',
-	'ACL_A_FOOTBALL_CONFIG'				=> 'Kann Tipprundeneinstellung ändern',
+	'ACL_A_FOOTBALL_CONFIG'				=> 'Kann Tipprundeneinstellung ändern',
-	'ACL_A_FOOTBALL_DELETE'				=> 'Kann Spielpläne löschen',
+	'ACL_A_FOOTBALL_DELETE'				=> 'Kann Spielpläne löschen',
-	'ACL_A_FOOTBALL_EDITBETS'			=> 'Kann alle Tipps ansehen, eingeben und ändern',
+	'ACL_A_FOOTBALL_EDITBETS'			=> 'Kann alle Tipps ansehen, eingeben und ändern',
-	'ACL_A_FOOTBALL_PLAN'				=> 'Kann Spielpläne erstellen und ändern',
+	'ACL_A_FOOTBALL_PLAN'				=> 'Kann Spielpläne erstellen und ändern',
-	'ACL_A_FOOTBALL_RESULTS'			=> 'Kann endgültige Spielergebnisse eingeben, ändern und löschen',
+	'ACL_A_FOOTBALL_RESULTS'			=> 'Kann endgültige Spielergebnisse eingeben, ändern und löschen',
-	'ACL_A_FOOTBALL_POINTS'				=> 'Kann Kontodaten eingeben, ändern und löschen',
+	'ACL_A_FOOTBALL_POINTS'				=> 'Kann Kontodaten eingeben, ändern und löschen',
-
+
-	'ROLE_ADMIN_FOOTBALL'				=> 'Tipprunden Administrator',
+	'ROLE_ADMIN_FOOTBALL'				=> 'Tipprunden Administrator',
-	'ROLE_DESCRIPTION_ADMIN_FOOTBALL'	=> 'Kann endgültige Spielergebnisse eingeben und ändern.',
+	'ROLE_DESCRIPTION_ADMIN_FOOTBALL'	=> 'Kann endgültige Spielergebnisse eingeben und ändern.',
-));
+));
-
+
 ?>

language/en/email/footb_board_remember.txt

@@ -1,10 +1,10 @@
-
+
-Hallo {SITENAME},
+Hallo {SITENAME},
-the following users have received a reminder e-mail:
+the following users have received a reminder e-mail:
-
+
-{REMEMBER_LIST}
+{REMEMBER_LIST}
-
+
-
+
-Link to {SITENAME}: {U_BOARD}.
+Link to {SITENAME}: {U_BOARD}.
-
+
-{EMAIL_SIG}
+{EMAIL_SIG}

language/en/email/footb_send_remember.txt

@@ -1,10 +1,10 @@
-
+
-Hallo {USERNAME},
+Hallo {USERNAME},
-you have not yet bet {MATCHDAY}. matchday.
+you have not yet bet {MATCHDAY}. matchday.
-Please bet until {LEAGUE} delivery {DELIVERY}.
+Please bet until {LEAGUE} delivery {DELIVERY}.
-
+
- 
+ 
-Link to {SITENAME}: {U_BOARD}.
+Link to {SITENAME}: {U_BOARD}.
-
+
-
+
-{EMAIL_SIG}
+{EMAIL_SIG}

language/en/football.php

@@ -43,8 +43,6 @@ $lang = array_merge($lang, array(
 	'FOOTB_REM_F_EXPLAIN'			=> 'Send reminder to your first email address, if you should not have bet?',
 	'FOOTB_REM_S'					=> 'Send Prediction League reminder to second email adress',
 	'FOOTB_REM_S_EXPLAIN'			=> 'Send reminder to your second email address, if you should not have bet?',
-	'YES'							=> 'Ja',
-	'NO'							=> 'Nein',
 
 	'ADD_NEW_TEAM'						=> 'The team was added to the WebTip. ',
 	'ALL_BETS'							=> 'All bets',
@@ -225,6 +223,7 @@ $lang = array_merge($lang, array(
 	'NO_BETS_SAVED'						=> 'No bets saved!',
 	'NO_CHANGES'						=> 'No changes',
 	'NO_DATA'							=> 'No data available!',
+	'NO_GUEST_VIEW'						=> 'Guests are not allowed to view the prediction league. ',
 	'NO_GUESTTEAM'						=> 'The guest team chosen by you does not exist. ',
 	'NO_HIST'							=> 'No previous comparisons exist for these two teams in the database. ',
 	'NO_HOMEMATCHES_TEAM'				=> 'This team has not played at home this season yet. ',
@@ -330,6 +329,8 @@ $lang = array_merge($lang, array(
 	'RULES_EXPLAIN'						=> 'Here are only the technical basic conditions of this WebTip listed. ',
 	'SAMESAVED'							=> 'Your %d Granny-bets were saved successfully! A bet was automatically modified. ',
 	'SAVE'								=> 'Save',
+	'SAVE_PREDICTION'					=> 'Save prediction',
+	'SAVE_RESULTS'						=> 'Save results',
 	'SCORED'							=> 'Scored',
 	'SEASON'							=> 'Season',
 	'SEC_LEG_ERROR'						=> 'Second leg does not exist',

language/en/info_acp_update.php

@@ -81,6 +81,7 @@ $lang = array_merge($lang, array(
 	'INSERT_TEAMS'							=> 'Insert new teams',
 	'LEAGUE_SHORTCUT'						=> 'League shortcut',
 	'LOAD'									=> 'load',
+	'LOG_FOOTB_UPDATE'						=> '<strong>Football Prediction League fixure list update</strong><br />» %s',
 	'MAP_TEAMS'								=> 'Map teams',
 	'MATCH_OF_GROUP'						=> 'Match on group',
 	'MATCHES'								=> 'Matches',

migrations/v094_beta_update.php

@@ -16,7 +16,7 @@ class v094_beta_update extends \phpbb\db\migration\migration
 	{
 		return !$this->db_tools->sql_column_exists($this->table_prefix . 'sessions', 'session_matchday');
 	}
-      
+
 	static public function depends_on()
 	{
 		return array('\phpbb\db\migration\data\v310\extensions');
@@ -26,14 +26,14 @@ class v094_beta_update extends \phpbb\db\migration\migration
 	{
 		return array(
  			'drop_columns' => array(
-				$this->table_prefix . 'sessions' 			=> array(
+				$this->table_prefix . 'sessions' 		=> array(
 					'session_season',
 					'session_league',
 					'session_matchday',
 				)
 			),
 			'add_columns' => array(
-				$this->table_prefix . 'sessions' 			=> array(
+				$this->table_prefix . 'sessions' 		=> array(
 					'football_season' 			=> array('USINT', 0),
 					'football_league' 			=> array('TINT:2', 0),
 					'football_matchday' 		=> array('TINT:2', 0),
@@ -57,7 +57,7 @@ class v094_beta_update extends \phpbb\db\migration\migration
 	public function revert_schema()
 	{
 		return array(
-			'drop_columns'        => array(
+			'drop_columns'		=> array(
 				$this->table_prefix . 'sessions' 			=> array(
 					'football_season',
 					'football_league',
@@ -113,46 +113,46 @@ class v094_beta_update extends \phpbb\db\migration\migration
 			
 			// Add the manage mode from football_results to the ACP_FOOTBALL_OPERATION category.
 			array('module.add', array('acp', 'ACP_FOOTBALL_OPERATION', array(
-					'module_basename'   => '\football\football\acp\results_module',
+					'module_basename'	=> '\football\football\acp\results_module',
-					'module_langname'   => 'ACP_FOOTBALL_RESULTS_MANAGE',
+					'module_langname'	=> 'ACP_FOOTBALL_RESULTS_MANAGE',
-					'module_mode'       => 'manage',
+					'module_mode'		=> 'manage',
-					'module_auth'       => 'acl_a_football_results',
+					'module_auth'		=> 'acl_a_football_results',
 				),
 			)),
 
 			// Add the manage mode from football_all_bets to the ACP_FOOTBALL_OPERATION category.
 			array('module.add', array('acp', 'ACP_FOOTBALL_OPERATION', array(
-					'module_basename'   => '\football\football\acp\all_bets_module',
+					'module_basename'	=> '\football\football\acp\all_bets_module',
-					'module_langname'   => 'ACP_FOOTBALL_ALL_BETS_VIEW',
+					'module_langname'	=> 'ACP_FOOTBALL_ALL_BETS_VIEW',
-					'module_mode'       => 'manage',
+					'module_mode'		=> 'manage',
-					'module_auth'       => 'acl_a_football_editbets',
+					'module_auth'		=> 'acl_a_football_editbets',
 				),
 			)),
 
 			// Add the manage mode from football_bets to the ACP_FOOTBALL_OPERATION category.
 			array('module.add', array('acp', 'ACP_FOOTBALL_OPERATION', array(
-					'module_basename'   => '\football\football\acp\bets_module',
+					'module_basename'	=> '\football\football\acp\bets_module',
-					'module_langname'   => 'ACP_FOOTBALL_BETS_MANAGE',
+					'module_langname'	=> 'ACP_FOOTBALL_BETS_MANAGE',
-					'module_mode'       => 'manage',
+					'module_mode'		=> 'manage',
-					'module_auth'       => 'acl_a_football_editbets',
+					'module_auth'		=> 'acl_a_football_editbets',
 				),
 			)),
 
 			// Add the manage mode from football_ko to the ACP_FOOTBALL_OPERATION category.
 			array('module.add', array('acp', 'ACP_FOOTBALL_OPERATION', array(
-					'module_basename'   => '\football\football\acp\ko_module',
+					'module_basename'	=> '\football\football\acp\ko_module',
-					'module_langname'   => 'ACP_FOOTBALL_KO_MANAGE',
+					'module_langname'	=> 'ACP_FOOTBALL_KO_MANAGE',
-					'module_mode'       => 'manage',
+					'module_mode'		=> 'manage',
-					'module_auth'       => 'acl_a_football_plan',
+					'module_auth'		=> 'acl_a_football_plan',
 				),
 			)),
 			
 			// Add the manage mode from football_bank to the ACP_FOOTBALL_OPERATION category.
 			array('module.add', array('acp', 'ACP_FOOTBALL_OPERATION', array(
-					'module_basename'   => '\football\football\acp\bank_module',
+					'module_basename'	=> '\football\football\acp\bank_module',
-					'module_langname'   => 'ACP_FOOTBALL_BANK_MANAGE',
+					'module_langname'	=> 'ACP_FOOTBALL_BANK_MANAGE',
-					'module_mode'       => 'manage',
+					'module_mode'		=> 'manage',
-					'module_auth'       => 'acl_a_football_points',
+					'module_auth'		=> 'acl_a_football_points',
 				),
 			)),
 			
@@ -162,64 +162,64 @@ class v094_beta_update extends \phpbb\db\migration\migration
 
 			// Add the manage mode from football_seasons to the ACP_FOOTBALL_MANAGE category.
 			array('module.add', array('acp', 'ACP_FOOTBALL_MANAGE', array(
-					'module_basename'   => '\football\football\acp\seasons_module',
+					'module_basename'	=> '\football\football\acp\seasons_module',
-					'module_langname'   => 'ACP_FOOTBALL_SEASONS_MANAGE',
+					'module_langname'	=> 'ACP_FOOTBALL_SEASONS_MANAGE',
-					'module_mode'       => 'manage',
+					'module_mode'		=> 'manage',
-					'module_auth'       => 'acl_a_football_plan',
+					'module_auth'		=> 'acl_a_football_plan',
 				),
 			)),
 			
 			// Add the manage mode from football_leagues to the ACP_FOOTBALL_MANAGE category.
 			array('module.add', array('acp', 'ACP_FOOTBALL_MANAGE', array(
-					'module_basename'   => '\football\football\acp\leagues_module',
+					'module_basename'	=> '\football\football\acp\leagues_module',
-					'module_langname'   => 'ACP_FOOTBALL_LEAGUES_MANAGE',
+					'module_langname'	=> 'ACP_FOOTBALL_LEAGUES_MANAGE',
-					'module_mode'       => 'manage',
+					'module_mode'		=> 'manage',
-					'module_auth'       => 'acl_a_football_plan',
+					'module_auth'		=> 'acl_a_football_plan',
 				),
 			)),
 			
 			// Add the manage mode from football_matchdays to the ACP_FOOTBALL_MANAGE category.
 			array('module.add', array('acp', 'ACP_FOOTBALL_MANAGE', array(
-					'module_basename'   => '\football\football\acp\matchdays_module',
+					'module_basename'	=> '\football\football\acp\matchdays_module',
-					'module_langname'   => 'ACP_FOOTBALL_MATCHDAYS_MANAGE',
+					'module_langname'	=> 'ACP_FOOTBALL_MATCHDAYS_MANAGE',
-					'module_mode'       => 'manage',
+					'module_mode'		=> 'manage',
-					'module_auth'       => 'acl_a_football_plan',
+					'module_auth'		=> 'acl_a_football_plan',
 				),
 			)),
 			
 			// Add the manage mode from football_teams to the ACP_FOOTBALL_MANAGE category.
 			array('module.add', array('acp', 'ACP_FOOTBALL_MANAGE', array(
-					'module_basename'   => '\football\football\acp\teams_module',
+					'module_basename'	=> '\football\football\acp\teams_module',
-					'module_langname'   => 'ACP_FOOTBALL_TEAMS_MANAGE',
+					'module_langname'	=> 'ACP_FOOTBALL_TEAMS_MANAGE',
-					'module_mode'       => 'manage',
+					'module_mode'		=> 'manage',
-					'module_auth'       => 'acl_a_football_plan',
+					'module_auth'		=> 'acl_a_football_plan',
 				),
 			)),
 			
 			// Add the manage mode from football_matches to the ACP_FOOTBALL_MANAGE category.
 			array('module.add', array('acp', 'ACP_FOOTBALL_MANAGE', array(
-					'module_basename'   => '\football\football\acp\matches_module',
+					'module_basename'	=> '\football\football\acp\matches_module',
-					'module_langname'   => 'ACP_FOOTBALL_MATCHES_MANAGE',
+					'module_langname'	=> 'ACP_FOOTBALL_MATCHES_MANAGE',
-					'module_mode'       => 'manage',
+					'module_mode'		=> 'manage',
-					'module_auth'       => 'acl_a_football_plan',
+					'module_auth'		=> 'acl_a_football_plan',
 				),
 			)),
 
 			// Add the manage mode from football_extra to the ACP_FOOTBALL_MANAGE category.
 			array('module.add', array('acp', 'ACP_FOOTBALL_MANAGE', array(
-					'module_basename'   => '\football\football\acp\extra_module',
+					'module_basename'	=> '\football\football\acp\extra_module',
-					'module_langname'   => 'ACP_FOOTBALL_EXTRA_MANAGE',
+					'module_langname'	=> 'ACP_FOOTBALL_EXTRA_MANAGE',
-					'module_mode'       => 'manage',
+					'module_mode'		=> 'manage',
-					'module_auth'       => 'acl_a_football_plan',
+					'module_auth'		=> 'acl_a_football_plan',
 				),
 			)),
 
 			// Add the manage mode from football_update to the ACP_FOOTBALL_MANAGE category using the "manual" method.
 			array('module.add', array('acp', 'ACP_FOOTBALL_MANAGE', array(
-					'module_basename'   => '\football\football\acp\update_module',
+					'module_basename'	=> '\football\football\acp\update_module',
-					'module_langname'   => 'ACP_FOOTBALL_UPDATE_MANAGE',
+					'module_langname'	=> 'ACP_FOOTBALL_UPDATE_MANAGE',
-					'module_mode'       => 'manage',
+					'module_mode'		=> 'manage',
-					'module_auth'       => 'acl_a_football_plan',
+					'module_auth'		=> 'acl_a_football_plan',
 				),
 			)),
 			
@@ -228,37 +228,37 @@ class v094_beta_update extends \phpbb\db\migration\migration
 
 			// Add the settings mode from football to the ACP_FOOTBALL_CONFIGURATION category.
 			array('module.add', array('acp', 'ACP_FOOTBALL_CONFIGURATION', array(
-					'module_basename'   => 'football\football\acp\football_module',
+					'module_basename'	=> 'football\football\acp\football_module',
-					'module_langname'   => 'ACP_FOOTBALL_SETTINGS',
+					'module_langname'	=> 'ACP_FOOTBALL_SETTINGS',
-					'module_mode'       => 'settings',
+					'module_mode'		=> 'settings',
-					'module_auth'       => 'acl_a_football_config',
+					'module_auth'		=> 'acl_a_football_config',
 				),
 			)),
 			
 			// Add the features mode from football to the ACP_FOOTBALL_CONFIGURATION category.
 			array('module.add', array('acp', 'ACP_FOOTBALL_CONFIGURATION', array(
-					'module_basename'   => 'football\football\acp\football_module',
+					'module_basename'	=> 'football\football\acp\football_module',
-					'module_langname'   => 'ACP_FOOTBALL_FEATURES',
+					'module_langname'	=> 'ACP_FOOTBALL_FEATURES',
-					'module_mode'       => 'features',
+					'module_mode'		=> 'features',
-					'module_auth'       => 'acl_a_football_config',
+					'module_auth'		=> 'acl_a_football_config',
 				),
 			)),
 			
 			// Add the menu mode from football to the ACP_FOOTBALL_CONFIGURATION category.
 			array('module.add', array('acp', 'ACP_FOOTBALL_CONFIGURATION', array(
-					'module_basename'   => 'football\football\acp\football_module',
+					'module_basename'	=> 'football\football\acp\football_module',
-					'module_langname'   => 'ACP_FOOTBALL_MENU',
+					'module_langname'	=> 'ACP_FOOTBALL_MENU',
-					'module_mode'       => 'menu',
+					'module_mode'		=> 'menu',
-					'module_auth'       => 'acl_a_football_config',
+					'module_auth'		=> 'acl_a_football_config',
 				),
 			)),
 			
 			// Add the userguide mode from football to the ACP_FOOTBALL_CONFIGURATION category.
 			array('module.add', array('acp', 'ACP_FOOTBALL_CONFIGURATION', array(
-					'module_basename'   => 'football\football\acp\football_module',
+					'module_basename'	=> 'football\football\acp\football_module',
-					'module_langname'   => 'ACP_FOOTBALL_USERGUIDE',
+					'module_langname'	=> 'ACP_FOOTBALL_USERGUIDE',
-					'module_mode'       => 'userguide',
+					'module_mode'		=> 'userguide',
-					'module_auth'       => 'acl_a_football_plan'
+					'module_auth'		=> 'acl_a_football_plan'
 				),
 			)),
 		);