From d0102c6fd4b188b0a1c5ffd3bf9a834a64a5c709 Mon Sep 17 00:00:00 2001 From: Matthijs Kuiper Date: Mon, 8 Jan 2018 16:30:56 +0100 Subject: Match info --- html/pages/match_info.php | 48 +++++++----- html/pages/match_info_charts.php | 65 ++++++++-------- html/pages/match_info_server.php | 162 +++++++++++++-------------------------- 3 files changed, 112 insertions(+), 163 deletions(-) (limited to 'html/pages') diff --git a/html/pages/match_info.php b/html/pages/match_info.php index 31edc2d..8d77186 100755 --- a/html/pages/match_info.php +++ b/html/pages/match_info.php @@ -3,39 +3,46 @@ $r_info = small_query("SELECT teamgame, t0, t1, t2, t3, t0score, t1score, t2scor if (!$r_info) die("Match not found"); $teamgame = ($r_info['teamgame'] == 'True') ? true : false; -echo ' - - - - -
Unreal Tournament Match
-
'; include("pages/match_info_server.php"); -include("pages/match_info_charts.php"); $GLOBALS['gid'] = $gid; $_GLOBALS['gid'] = $gid; $GLOBALS['gamename'] = $gamename; $_GLOBALS['gamename'] = $gamename; -include('includes/teamstats.php'); +include("includes/teamstats.php"); +include("pages/match_info_charts.php"); +echo "

WOOOt

"; + switch($real_gamename) { + case "Assault": case "Assault (insta)": include("pages/match_info_ass.php"); break; - + case "Capture the Flag": case "Capture the Flag (insta)": + case "5v5 iCTF": + case "1v1 iCTF": + case "2v2 iCTF": + case "3v3 iCTF": + case "5v5 teleCTF": + case "5v5 saCTF": + case "5v5 nwCTF": + case "3v3 nwCTF": include("pages/match_info_ctf.php"); teamstats($mid, 'Match Summary'); - break; - + break; + case "Domination": case "Domination (insta)": + case "4v4 iDOM": + case "4v4 sDOM": + case "4v4 nwDOM": teamstats($mid, 'Match Summary', 'dom_cp', 'Dom Pts'); break; - + case "JailBreak": case "JailBreak (insta)": teamstats($mid, 'Match Summary', 'ass_obj', 'Team Releases'); @@ -44,11 +51,13 @@ switch($real_gamename) { case "Bunny Track": include("pages/match_info_bt.php"); break; - + case "Tournament DeathMatch": case "Tournament Team Game": case "Tournament DeathMatch (insta)": case "Tournament Team Game (insta)": + case "FFA iDM": + case "2v2v2v2 iTDM": teamstats($mid, 'Match Summary'); break; @@ -66,21 +75,20 @@ switch($real_gamename) { default: if ($teamgame) { teamstats($mid, 'Match Summary'); - } else { + } else { teamstats($mid, 'Player Summary'); } } - -if ($real_gamename == "Assault" or $real_gamename== "Assault (insta)") { +if ($real_gamename == "Assault" or $real_gamename == "Assault (insta)") { include("pages/match_info_other2.php"); } else if ($real_gamename != "Bunny Track") { include("pages/match_info_other.php"); } -if ($real_gamename == "Capture the Flag" or $real_gamename== "Capture the Flag (insta)") { - include("pages/match_report.php"); +if ($real_gamename == "Capture the Flag" or $real_gamename == "Capture the Flag (insta)") { + include("pages/match_report.php"); } -?> \ No newline at end of file +?> diff --git a/html/pages/match_info_charts.php b/html/pages/match_info_charts.php index a6170e7..ed62fe5 100644 --- a/html/pages/match_info_charts.php +++ b/html/pages/match_info_charts.php @@ -11,15 +11,15 @@ $chartOutput = ""; $prevRenderedChart = ""; // get all charts for this match -$charts = mysql_query("SELECT d.* , t.charttype, t.category, t.type, t.color, t.layout,t.columns -FROM uts_chartdata d -JOIN uts_charttypes t ON d.chartid = t.id -WHERE d.mid = $mid -ORDER BY d.id ASC") or die(mysql_error()); +$charts = mysql_query("SELECT d.* , t.charttype, t.category, t.type, t.color, t.layout,t.columns + FROM uts_chartdata d + JOIN uts_charttypes t ON d.chartid = t.id + WHERE d.mid = $mid + ORDER BY d.id ASC") or die(mysql_error()); $chartCount = mysql_num_rows($charts); -if($chartCount >0) { +if ($chartCount >0) { $i = 0; // cycle over charts @@ -36,50 +36,47 @@ if($chartCount >0) { $data = unserialize(gzdecode($chart['data'])); $labels = unserialize(gzdecode($chart['labels'])); $categories = unserialize(gzdecode($chart['categories'])); - + // append previous chart - this is done to ensure proper outlining (can only know in +1 round) $chartOutput .= $prevRenderedChart; - + // print a new section if we're now in a different category - if($category != $prevCategory) { - - if(strlen($prevCategory)>0) + if ($category != $prevCategory) { + + if(strlen($prevCategory) > 0) $chartOutput .= renderFootBlock(); - + $chartOutput .= renderHeaderBlock($category); $prevCategory = $category; - + } else { - if($i>1 && $i%2 == 0) - $chartOutput .= ""; + if ($i>1 && $i%2 == 0) + $chartOutput .= ""; else - $chartOutput .= ""; - } - + $chartOutput .= ""; + } + $prevRenderedChart = renderChart($mid."-".$i,$layout,$color,$title,$data,$labels,$categories,$renderer_width*$columns,$renderer_heigth,$charttype); $i++; } - + // finishing up $chartOutput .= $prevRenderedChart; $chartOutput .= renderFootBlock(); - echo " - - "; - + echo ' + '; + echo $chartOutput; } - - -?> \ No newline at end of file +?> diff --git a/html/pages/match_info_server.php b/html/pages/match_info_server.php index b3c6f40..b2d9a57 100755 --- a/html/pages/match_info_server.php +++ b/html/pages/match_info_server.php @@ -1,71 +1,4 @@ - - Totals for This Match - - - Team Score - Player Score - Frags - Kills - Deaths - Suicides - '; - -// Get Summary Info -$teamscore = small_query("SELECT SUM(t0score + t1score + t2score + t3score) AS result FROM uts_match WHERE id = $mid"); -$playerscore = small_query("SELECT SUM(gamescore) AS result FROM uts_player WHERE matchid = $mid"); -$fragcount = small_query("SELECT SUM(frags) AS result FROM uts_match WHERE id = $mid"); -$killcount = small_query("SELECT SUM(kills) AS result FROM uts_match WHERE id = $mid"); -$deathcount = small_query("SELECT SUM(deaths) AS result FROM uts_match WHERE id = $mid"); -$suicidecount = small_query("SELECT SUM(suicides) AS result FROM uts_match WHERE id = $mid"); - -echo' - - '.$teamscore[result].' - '.$playerscore[result].' - '.$fragcount[result].' - '.$killcount[result].' - '.$deathcount[result].' - '.$suicidecount[result].' - '; - -// Teamgame? Then show score -if ($teamgame) { - echo ' - - '; - echo ' - Score:'; - if ($r_info[t0]) { - echo ' - '.$r_info[t0score]; - } - if ($r_info[t1]) { - echo ' - - '.$r_info[t1score]; - } - if ($r_info[t2]) { - echo ' - - '.$r_info[t2score]; - } - if ($r_info[t3]) { - echo ' - - '.$r_info[t3score]; - } - echo ' - - '; -} - -echo ' - -
- - - - '; $matchinfo = small_query("SELECT m.time, m.servername, g.name AS gamename, m.gamename AS real_gamename, m.gid, m.mapname, m.mapfile, m.serverinfo, m.gameinfo, m.mutators, m.serverip FROM uts_match AS m, uts_games AS g WHERE m.gid = g.id AND m.id = $mid"); $matchdate = mdate($matchinfo[time]); @@ -74,56 +7,67 @@ $real_gamename = $matchinfo[real_gamename]; $gid = $matchinfo[gid]; $mapname = un_ut($matchinfo[mapfile]); -$mappic = strtolower("images/maps/".$mapname.".jpg"); - -if (file_exists($mappic)) { -} else { - $mappic = ("images/maps/blank.jpg"); -} - +$mappic = getMapImageName($mapname); $myurl = urlencode($mapname); -$mapnameToPrint = $matchinfo['mapname']; -if($mapnameToPrint == "Untitled") - $mapnameToPrint = $mapname; +$mapnameToPrint = $matchinfo[mapname]; +if ($mapnameToPrint == "Untitled") { + $mapnameToPrint = $mapname; +} - echo' - - - - - - - - - - - - - - - - - +echo' +
Unreal Tournament Match Stats
Match Date'.$matchdate.'Server'.$matchinfo[servername].'
Match Type'.$gamename.'Map Name'.$mapnameToPrint.'
Server Info'.$matchinfo[serverinfo].''.$mapname.'
+ - - + + +
Game Info'.$matchinfo[gameinfo].'
Match Stats
+ +
+ + + +'; + +if ($r_info[t0score] > 0 || $r_info[t1score] > 0) { + echo ' - - - -
Mutators'.$matchinfo[mutators].'
-
'; + '.$r_info[t0score].' + '.$r_info[t1score].' + '; + if ($r_info[t2score] > 0 || $r_info[t3score] > 0) { + echo' + + '.$r_info[t2score].' + '.$r_info[t3score].' + '; + } +} -// Get Summary Info -$teamscore = small_query("SELECT SUM(t0score + t1score + t2score + t3score) AS result FROM uts_match WHERE id = $mid"); -$playerscore = small_query("SELECT SUM(gamescore) AS result FROM uts_player WHERE matchid = $mid"); -$fragcount = small_query("SELECT SUM(frags) AS result FROM uts_match WHERE id = $mid"); -$killcount = small_query("SELECT SUM(kills) AS result FROM uts_match WHERE id = $mid"); -$deathcount = small_query("SELECT SUM(deaths) AS result FROM uts_match WHERE id = $mid"); -$suicidecount = small_query("SELECT SUM(suicides) AS result FROM uts_match WHERE id = $mid"); +echo ' + + Match Date + '.$matchdate.' + Server + '.$matchinfo[servername].' + + + Mutators + '.$matchinfo[mutators].' + Map Name + '.$mapnameToPrint.' + + + Server Info + '.$matchinfo[serverinfo].' + Game Info + '.$matchinfo[gameinfo].' + + + +
'; ?> -- cgit