Version 0.9.9b1
-replace icons with font awesome icons -display icons on tabs and hide it on mobile access -new block last results -new config values for last users, last results -replace config value football_host_timezone with football_time_shift -fixed errors on php 7 -remove unnecessary sql_freeresult calls -fixed non-numeric value errors
This commit is contained in:
football
@@ -1,145 +1,145 @@
|
||||
<?php
|
||||
/**
|
||||
*
|
||||
* @package phpBB Extension - Football Football
|
||||
* @copyright (c) 2016 football (http://football.bplaced.net)
|
||||
* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
|
||||
*
|
||||
*/
|
||||
|
||||
if (!defined('IN_PHPBB') OR !defined('IN_FOOTBALL'))
|
||||
{
|
||||
exit;
|
||||
}
|
||||
|
||||
$data_table = false;
|
||||
|
||||
$ext_path = $this->phpbb_path_helper->update_web_root_path($this->phpbb_extension_manager->get_extension_path('football/football', true));
|
||||
|
||||
$sql = 'SELECT *
|
||||
FROM ' . FOOTB_RANKS . "
|
||||
WHERE season = $season
|
||||
AND league = $league
|
||||
AND matchday = $matchday";
|
||||
$result = $db->sql_query($sql);
|
||||
$row = $db->sql_fetchrow($result);
|
||||
$db->sql_freeresult($result);
|
||||
|
||||
if ($row)
|
||||
{
|
||||
include($this->football_root_path . 'block/rank_matchday.' . $this->php_ext);
|
||||
}
|
||||
else
|
||||
{
|
||||
$rank = 0;
|
||||
// Get table-information
|
||||
$sql = "SELECT
|
||||
t.*,
|
||||
SUM(1) AS matches,
|
||||
SUM(IF(m.team_id_home = t.team_id,
|
||||
IF(goals_home + 0 > goals_guest, 3, IF(goals_home = goals_guest, 1, 0)),
|
||||
IF(goals_home + 0 < goals_guest, 3, IF(goals_home = goals_guest, 1, 0))
|
||||
)
|
||||
) - IF(t.team_id = 20 AND t.season = 2011 AND $matchday > 7, 2, 0) AS points,
|
||||
SUM(IF(m.team_id_home = t.team_id, goals_home - goals_guest , goals_guest - goals_home)) AS goals_diff,
|
||||
SUM(IF(m.team_id_home = t.team_id, goals_home , goals_guest)) AS goals,
|
||||
SUM(IF(m.team_id_home = t.team_id, goals_guest , goals_home)) AS goals_against
|
||||
FROM " . FOOTB_TEAMS . ' AS t
|
||||
LEFT JOIN ' . FOOTB_MATCHES . " AS m ON (m.season = t.season AND m.league = t.league
|
||||
AND (m.team_id_home = t.team_id OR m.team_id_guest = t.team_id) AND m.group_id = t.group_id)
|
||||
WHERE t.season = $season
|
||||
AND t.league = $league
|
||||
AND m.matchday <= $matchday
|
||||
AND m.status IN (2,3,5,6)
|
||||
GROUP BY t.team_id
|
||||
ORDER BY t.group_id ASC, points DESC, goals_diff DESC, goals DESC, t.team_name ASC";
|
||||
|
||||
$result = $db->sql_query($sql);
|
||||
|
||||
$table_ary = array();
|
||||
$points_ary = array();
|
||||
$ranks_ary = array();
|
||||
while( $row = $db->sql_fetchrow($result))
|
||||
{
|
||||
$table_ary[$row['team_id']] = $row;
|
||||
$points_ary[$row['group_id']][$row['points']][]=$row['team_id'];
|
||||
$ranks_ary[] = $row['team_id'];
|
||||
}
|
||||
$last_group = '';
|
||||
$rank = 0;
|
||||
$current_rank = 0;
|
||||
$last_goals = 0;
|
||||
$last_goals_againts = 0;
|
||||
$last_points = 0;
|
||||
foreach($points_ary as $group_id => $points)
|
||||
{
|
||||
$data_table = true;
|
||||
if ($last_group != $group_id)
|
||||
{
|
||||
$last_group =$group_id;
|
||||
$rank = 0;
|
||||
$last_goals = 0;
|
||||
$last_goals_againts = 0;
|
||||
$last_points = 0;
|
||||
$template->assign_block_vars('side_total', array(
|
||||
'GROUP' => sprintf($user->lang['GROUP']) . ' ' .$group_id,
|
||||
)
|
||||
);
|
||||
}
|
||||
|
||||
foreach($points as $point => $teams)
|
||||
{
|
||||
if(count($teams) > 1 AND $group_id != '')
|
||||
{
|
||||
// Compare teams with equal points and sort
|
||||
$teams = get_order_team_compare($teams, $season, $league, $group_id, $ranks_ary, $matchday);
|
||||
}
|
||||
foreach($teams as $key => $team)
|
||||
{
|
||||
$row = $table_ary[$team];
|
||||
$rank++;
|
||||
if ($last_points <> $row['points'] OR $last_goals <> $row['goals'] OR $last_goals_againts <> $row['goals_against'])
|
||||
{
|
||||
$current_rank = $rank . '.';
|
||||
}
|
||||
else
|
||||
{
|
||||
$current_rank = '';
|
||||
}
|
||||
$last_points = $row['points'];
|
||||
$last_goals = $row['goals'];
|
||||
$last_goals_againts = $row['goals_against'];
|
||||
$row_class = (!($rank % 2)) ? 'bg1 row_light' : 'bg2 row_dark';
|
||||
if ($row['team_symbol'] <> '')
|
||||
{
|
||||
$logo = "<img src=\"" . $ext_path . 'images/flags/' . $row['team_symbol'] . "\" alt=\"" . $row['team_symbol'] . "\" width=\"28\" height=\"28\"/>" ;
|
||||
}
|
||||
else
|
||||
{
|
||||
$logo = "<img src=\"" . $ext_path . "images/flags/blank.gif\" alt=\"\" width=\"28\" height=\"28\"/>" ;
|
||||
}
|
||||
|
||||
$template->assign_block_vars('side_total', array(
|
||||
'RANK' => $current_rank,
|
||||
'ROW_CLASS' => $row_class,
|
||||
'LOGO' => $logo,
|
||||
'TEAM_ID' => $row['team_id'],
|
||||
'TEAM_SHORT' => $row['team_name_short'],
|
||||
'U_PLAN_TEAM' => $this->helper->route('football_football_popup', array('popside' => 'viewplan_popup', 's' => $season, 'l' => $row['league'],
|
||||
'tid' => $row['team_id'], 'mode' => 'played')),
|
||||
'GAMES' => $row['matches'],
|
||||
'POINTS' => $row['points'],
|
||||
)
|
||||
);
|
||||
}
|
||||
}
|
||||
}
|
||||
$db->sql_freeresult($result);
|
||||
|
||||
$template->assign_vars(array(
|
||||
'S_DISPLAY_SIDE_TABLE' => true,
|
||||
'S_DATA_SIDE_TABLE' => $data_table,
|
||||
)
|
||||
);
|
||||
}
|
||||
<?php
|
||||
/**
|
||||
*
|
||||
* @package phpBB Extension - Football Football
|
||||
* @copyright (c) 2016 football (http://football.bplaced.net)
|
||||
* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
|
||||
*
|
||||
*/
|
||||
|
||||
if (!defined('IN_PHPBB') OR !defined('IN_FOOTBALL'))
|
||||
{
|
||||
exit;
|
||||
}
|
||||
|
||||
$data_table = false;
|
||||
|
||||
$ext_path = $this->phpbb_path_helper->update_web_root_path($this->phpbb_extension_manager->get_extension_path('football/football', true));
|
||||
|
||||
$sql = 'SELECT *
|
||||
FROM ' . FOOTB_RANKS . "
|
||||
WHERE season = $season
|
||||
AND league = $league
|
||||
AND matchday = $matchday";
|
||||
$result = $db->sql_query($sql);
|
||||
$row = $db->sql_fetchrow($result);
|
||||
$db->sql_freeresult($result);
|
||||
|
||||
if ($row)
|
||||
{
|
||||
include($this->football_root_path . 'block/rank_matchday.' . $this->php_ext);
|
||||
}
|
||||
else
|
||||
{
|
||||
$rank = 0;
|
||||
// Get table-information
|
||||
$sql = "SELECT
|
||||
t.*,
|
||||
SUM(1) AS matches,
|
||||
SUM(IF(m.team_id_home = t.team_id,
|
||||
IF(goals_home + 0 > goals_guest, 3, IF(goals_home = goals_guest, 1, 0)),
|
||||
IF(goals_home + 0 < goals_guest, 3, IF(goals_home = goals_guest, 1, 0))
|
||||
)
|
||||
) - IF(t.team_id = 20 AND t.season = 2011 AND $matchday > 7, 2, 0) AS points,
|
||||
SUM(IF(m.team_id_home = t.team_id, goals_home - goals_guest , goals_guest - goals_home)) AS goals_diff,
|
||||
SUM(IF(m.team_id_home = t.team_id, goals_home , goals_guest)) AS goals,
|
||||
SUM(IF(m.team_id_home = t.team_id, goals_guest , goals_home)) AS goals_against
|
||||
FROM " . FOOTB_TEAMS . ' AS t
|
||||
LEFT JOIN ' . FOOTB_MATCHES . " AS m ON (m.season = t.season AND m.league = t.league
|
||||
AND (m.team_id_home = t.team_id OR m.team_id_guest = t.team_id) AND m.group_id = t.group_id)
|
||||
WHERE t.season = $season
|
||||
AND t.league = $league
|
||||
AND m.matchday <= $matchday
|
||||
AND m.status IN (2,3,5,6)
|
||||
GROUP BY t.team_id
|
||||
ORDER BY t.group_id ASC, points DESC, goals_diff DESC, goals DESC, t.team_name ASC";
|
||||
|
||||
$result = $db->sql_query($sql);
|
||||
|
||||
$table_ary = array();
|
||||
$points_ary = array();
|
||||
$ranks_ary = array();
|
||||
while( $row = $db->sql_fetchrow($result))
|
||||
{
|
||||
$table_ary[$row['team_id']] = $row;
|
||||
$points_ary[$row['group_id']][$row['points']][]=$row['team_id'];
|
||||
$ranks_ary[] = $row['team_id'];
|
||||
}
|
||||
$last_group = '';
|
||||
$rank = 0;
|
||||
$current_rank = 0;
|
||||
$last_goals = 0;
|
||||
$last_goals_againts = 0;
|
||||
$last_points = 0;
|
||||
foreach($points_ary as $group_id => $points)
|
||||
{
|
||||
$data_table = true;
|
||||
if ($last_group != $group_id)
|
||||
{
|
||||
$last_group =$group_id;
|
||||
$rank = 0;
|
||||
$last_goals = 0;
|
||||
$last_goals_againts = 0;
|
||||
$last_points = 0;
|
||||
$template->assign_block_vars('side_total', array(
|
||||
'GROUP' => sprintf($user->lang['GROUP']) . ' ' .$group_id,
|
||||
)
|
||||
);
|
||||
}
|
||||
|
||||
foreach($points as $point => $teams)
|
||||
{
|
||||
if(count($teams) > 1 AND $group_id != '')
|
||||
{
|
||||
// Compare teams with equal points and sort
|
||||
$teams = get_order_team_compare($teams, $season, $league, $group_id, $ranks_ary, $matchday);
|
||||
}
|
||||
foreach($teams as $key => $team)
|
||||
{
|
||||
$row = $table_ary[$team];
|
||||
$rank++;
|
||||
if ($last_points <> $row['points'] OR $last_goals <> $row['goals'] OR $last_goals_againts <> $row['goals_against'])
|
||||
{
|
||||
$current_rank = $rank . '.';
|
||||
}
|
||||
else
|
||||
{
|
||||
$current_rank = '';
|
||||
}
|
||||
$last_points = $row['points'];
|
||||
$last_goals = $row['goals'];
|
||||
$last_goals_againts = $row['goals_against'];
|
||||
$row_class = (!($rank % 2)) ? 'bg1 row_light' : 'bg2 row_dark';
|
||||
if ($row['team_symbol'] <> '')
|
||||
{
|
||||
$logo = "<img src=\"" . $ext_path . 'images/flags/' . $row['team_symbol'] . "\" alt=\"" . $row['team_symbol'] . "\" width=\"20\" height=\"20\"/>" ;
|
||||
}
|
||||
else
|
||||
{
|
||||
$logo = "<img src=\"" . $ext_path . "images/flags/blank.gif\" alt=\"\" width=\"20\" height=\"20\"/>" ;
|
||||
}
|
||||
|
||||
$template->assign_block_vars('side_total', array(
|
||||
'RANK' => $current_rank,
|
||||
'ROW_CLASS' => $row_class,
|
||||
'LOGO' => $logo,
|
||||
'TEAM_ID' => $row['team_id'],
|
||||
'TEAM_SHORT' => $row['team_name_short'],
|
||||
'U_PLAN_TEAM' => $this->helper->route('football_football_popup', array('popside' => 'viewplan_popup', 's' => $season, 'l' => $row['league'],
|
||||
'tid' => $row['team_id'], 'mode' => 'played')),
|
||||
'GAMES' => $row['matches'],
|
||||
'POINTS' => $row['points'],
|
||||
)
|
||||
);
|
||||
}
|
||||
}
|
||||
}
|
||||
$db->sql_freeresult($result);
|
||||
|
||||
$template->assign_vars(array(
|
||||
'S_DISPLAY_SIDE_TABLE' => true,
|
||||
'S_DATA_SIDE_TABLE' => $data_table,
|
||||
)
|
||||
);
|
||||
}
|
||||
?>
|
||||
Reference in New Issue
Block a user