Merge remote-tracking branch 'football/master'

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

acp/matches_module.php

@@ -594,7 +594,7 @@ class matches_module
 				}
 				else
 				{
-					$status_options = '<option value="' . $match_row['status'] . '" selected="selected">' . $match_row['status'] . '</option>';
+					$status_options = '<option value="' . $row['status'] . '" selected="selected">' . $row['status'] . '</option>';
 				}
 				// Grab for teams for selection
 				if ($ko_league) 

acp/teams_module.php

@@ -189,10 +189,7 @@ class teams_module
 
 			foreach( $files as $file ) 
 			{
-                $selected = '';
-                if (isset($team_row) && is_array($team_row)) {
 				$selected = (strtoupper($file) == strtoupper($team_row['team_symbol'])) ? ' selected="selected"' : '';
-                }
 				$teamsymbol_options .= '<option value="' . $file . '"' . $selected . '>' . $file . '</option>';
 			}
 			closedir($directory);		

block/ranks_total.php

@@ -330,7 +330,7 @@ switch ($mode)
 			'S_SIDENAME' 				=> $sidename,
 			'PAGE_NUMBER' 				=> $pagination->on_page($total_users, $this->config['football_users_per_page'], $start),
 			'TOTAL_USERS'				=> ($total_users == 1) ? $user->lang['VIEW_BET_USER'] : sprintf($user->lang['VIEW_BET_USERS'], $total_users),
-			'S_WIN' 					=> ($league_info['win_matchday'] == '0' and $league_info['win_season'] == '0') ? false : (($this->auth->acl_gets('a_')) ? true : false),
+			'S_WIN' 					=> ($league_info['win_matchday'] == '0' and $league_info['win_season'] == '0') ? false : ($this->auth->acl_gets('a_')) ? true : false,
 			'WIN_NAME' 					=> $config['football_win_name'],
 			'S_SHOW_OTHER_LINKS'		=> true,
 			'S_HEADER'					=> sprintf($user->lang['RANKING_COMPARE']),

block/results.php

@@ -401,7 +401,6 @@ switch ($league_info['bet_ko_type'])
 		break;
 	case BET_KO_PENALTY:
 		$result_explain = sprintf($user->lang['PENALTY']);
-        $label_finalresult = sprintf($user->lang['PENALTY']);
 		$display_ko = false;
 		break;
 	default:

includes/chart_hist.php

@@ -9,6 +9,11 @@
 *
 */
 
+if (!defined('IN_PHPBB'))
+{
+	exit;
+}
+
 $values1 = ( isset($_GET['v1']) ) ? $_GET['v1'] : 0;
 $graphvalues1 = explode(",",$values1);
 $matchdays = sizeof($graphvalues1);

includes/chart_points.php

@@ -8,6 +8,11 @@
 * @license http://opensource.org/licenses/gpl-license.php GNU Public License
 *
 */
+if (!defined('IN_PHPBB'))
+{
+	exit;
+}
+
 
 $matchdays = ( isset($_GET['m']) ) ? intval($_GET['m']) : 0;
 $values1 = ( isset($_GET['v1']) ) ? $_GET['v1'] : 0;

includes/chart_rank.php

@@ -8,6 +8,11 @@
 * @license http://opensource.org/licenses/gpl-license.php GNU Public License
 *
 */
+if (!defined('IN_PHPBB'))
+{
+	exit;
+}
+
 
 $numb_users = ( isset($_GET['t']) ) ? intval($_GET['t']) : 0;
 $matchdays 	= ( isset($_GET['m']) ) ? intval($_GET['m']) : 0;
@@ -91,7 +96,6 @@ for ($i = 1; $i < $count_values; $i++)
 	imageline($image, $i * $vert, ($graphValues4[$i - 1] * $horz), ($i + 1) * $vert, ($graphValues4[$i] * $horz), $colorRed);
 }
 
-
 // Output graph and clear image from memory
 imagepng($image);
 imagedestroy($image);

includes/functions.php

@@ -2612,7 +2612,7 @@ function bonuspoints($season, $league, $matchday)
             array_push ( $id, $row['team_id_home']);
         }
         $i = 0;
-        while($i < count($id))
+        while($id[$i])
         {
             $tmp = $id[$i];
             $sql = 'UPDATE ' . FOOTB_BONUS_DAY . " SET home = '1' WHERE season = '$season' AND league = '$league2' AND matchday = '$matchday' AND team_id = '$tmp'";

styles/prosilver/template/table.html

@@ -31,7 +31,7 @@
 					onclick="popup('{total.U_PLAN_TEAM}',625,625);return false;">
 					<td class="td_rank">{total.RANK}</td>
 					<td class="td_logo">{total.LOGO}</td>
-					<td class="td_team">{total.TEAM_SHORT}</td>
+					<td class="td_team">{total.TEAM}</td>
 					<td class="td_hits">{total.GAMES}</td>
 					<td class="td_hits">{total.WIN}</td>
 					<td class="td_hits">{total.DRAW}</td>
@@ -85,7 +85,7 @@
 						onclick="popup('{form.U_PLAN_TEAM}',625,625);return false;">
 					<td class="td_rank">{form.RANK}</td>
 					<td class="td_logo">{form.LOGO}</td>
-					<td class="td_team">{form.TEAM_SHORT}</td>
+					<td class="td_team">{form.TEAM}</td>
 					<td class="td_hits">{form.GAMES}</td>
 					<td class="td_hits">{form.WIN}</td>
 					<td class="td_hits">{form.DRAW}</td>
@@ -145,7 +145,7 @@
 						onclick="popup('{home.U_PLAN_TEAM}',625,625);return false;">
 					<td class="td_rank">{home.RANK}</td>
 					<td class="td_logo">{home.LOGO}</td>
-					<td class="td_team">{home.TEAM_SHORT}</td>
+					<td class="td_team">{home.TEAM}</td>
 					<td class="td_hits">{home.GAMES}</td>
 					<td class="td_hits">{home.WIN}</td>
 					<td class="td_hits">{home.DRAW}</td>
@@ -196,7 +196,7 @@
 						onclick="popup('{away.U_PLAN_TEAM}',625,625);return false;">
 					<td class="td_rank">{away.RANK}</td>
 					<td class="td_logo">{away.LOGO}</td>
-					<td class="td_team">{away.TEAM_SHORT}</td>
+					<td class="td_team">{away.TEAM}</td>
 					<td class="td_hits">{away.GAMES}</td>
 					<td class="td_hits">{away.WIN}</td>
 					<td class="td_hits">{away.DRAW}</td>

styles/prosilver/theme/football.css

@@ -274,14 +274,3 @@ a.pastlink:hover, a.futurelink:hover  {
 .row_group td	{ background-color: #73d510; color: #FFFFFF !important; }
 .row_result 	{ background-color: #ADC4A9; }
 .row_result td 	{ padding: 1px 2px; }
-
-@media screen and (max-width: 600px){
-	input[type="number"] {
-		-moz-appearance: textfield;
-	}
-}
-@media screen and (min-width: 601px){
-	input[type="number"] {
-		min-width: 32px;
-	}
-}