From 790d93b495ecc375ea0518a5f43f2944daa9720b Mon Sep 17 00:00:00 2001 From: Matthijs Kuiper Date: Mon, 8 Jan 2018 01:16:20 +0100 Subject: Main pages markup --- html/pages/players.php | 145 ++++++++++++++++++----------------- html/pages/rank.php | 97 +++++++++++++----------- html/pages/recent.php | 152 ++++++++++++++++++++++--------------- html/pages/watchlist.php | 191 +++++++++++++++++++++++++---------------------- 4 files changed, 322 insertions(+), 263 deletions(-) (limited to 'html/pages') diff --git a/html/pages/players.php b/html/pages/players.php index 1d9788a..d888855 100755 --- a/html/pages/players.php +++ b/html/pages/players.php @@ -1,29 +1,27 @@ '); + if ($curr_field != $filter) return; + $fname = 'images/s_'. strtolower($sort) .'.png'; + if (!file_exists($fname)) return; + return(' '); } - // Get filter and set sorting $filter = my_addslashes($_GET[filter]); $sort = my_addslashes($_GET[sort]); -IF (empty($filter) or (!in_array(strtolower($filter), array("name", "games", "gamescore", "frags", "kills", "deaths", "suicides", "eff", "accuracy", "ttl", "gametime")))) { - $filter = "name"; +if (empty($filter) or (!in_array(strtolower($filter), array("name", "games", "gamescore", "frags", "kills", "deaths", "suicides", "eff", "accuracy", "ttl", "gametime")))) { + $filter = "name"; } if (empty($sort) or ($sort != 'ASC' and $sort != 'DESC')) $sort = ($filter == "name") ? "ASC" : "DESC"; - // Work out Prev, Next, First, Last Stuff $r_pcount = small_query("SELECT COUNT(*) AS pcount FROM uts_pinfo"); @@ -32,16 +30,16 @@ $pcount = $r_pcount['pcount']; $ecount = $pcount/50; $ecount2 = number_format($ecount, 0, '.', ''); -IF($ecount > $ecount2) { - $ecount2 = $ecount2+1; +if ($ecount > $ecount2) { + $ecount2 = $ecount2+1; } $fpage = 0; -IF($ecount < 1) { $lpage = 0; } +if ($ecount < 1) { $lpage = 0; } else { $lpage = $ecount2-1; } $cpage = preg_replace('/\D/', '', $_GET["page"]); -IF ($cpage == "") { $cpage = "0"; } +if ($cpage == "") { $cpage = "0"; } $qpage = $cpage*50; $tfpage = $cpage+1; @@ -49,76 +47,89 @@ $tlpage = $lpage+1; $ppage = $cpage-1; $ppageurl = "[Previous]"; -IF ($ppage < "0") { $ppageurl = "[Previous]"; } + +if ($ppage < "0") { $ppageurl = "[Previous]"; } $npage = $cpage+1; $npageurl = "[Next]"; -IF ($npage >= "$ecount") { $npageurl = "[Next]"; } +if ($npage >= "$ecount") { $npageurl = "[Next]"; } $fpageurl = "[First]"; -IF ($cpage == "0") { $fpageurl = "[First]"; } +if ($cpage == "0") { $fpageurl = "[First]"; } $lpageurl = "[Last]"; -IF ($cpage == "$lpage") { $lpageurl = "[Last]"; } +if ($cpage == "$lpage") { $lpageurl = "[Last]"; } // Show information echo' -
-
Page ['.$tfpage.'/'.$tlpage.'] Selection: '.$fpageurl.' / '.$ppageurl.' / '.$npageurl.' / '.$lpageurl.'
-
* Click headings to change Sorting *
- - - - - - - - - - - - - - - - - - - - '; + +
Page ['.$tfpage.'/'.$tlpage.'] Selection: '.$fpageurl.' / '.$ppageurl.' / '.$npageurl.' / '.$lpageurl.'
+ +
Unreal Tournament Player List
Name Search: - -
Player Name'.SortPic('name', $filter, $sort).'Matches'.SortPic('games', $filter, $sort).'Score'.SortPic('gamescore', $filter, $sort).'Frags'.SortPic('frags', $filter, $sort).'Kills'.SortPic('kills', $filter, $sort).'Deaths'.SortPic('deaths', $filter, $sort).'Suicides'.SortPic('suicides', $filter, $sort).'Eff.'.SortPic('eff', $filter, $sort).'Acc.'.SortPic('accuracy', $filter, $sort).'TTL'.SortPic('ttl', $filter, $sort).'Hours'.SortPic('gametime', $filter, $sort).'
+ + + + + + + + + + + + + + + + + + + + + + + '; $sql_plist = "SELECT pi.name AS name, pi.country AS country, p.pid, COUNT(p.id) AS games, SUM(p.gamescore) as gamescore, SUM(p.frags) AS frags, SUM(p.kills) AS kills, SUM(p.deaths) AS deaths, SUM(p.suicides) as suicides, AVG(p.eff) AS eff, AVG(p.accuracy) AS accuracy, AVG(p.ttl) AS ttl, SUM(gametime) as gametime FROM uts_player AS p, uts_pinfo AS pi WHERE p.pid = pi.id AND pi.banned <> 'Y' GROUP BY p.pid ORDER BY $filter $sort LIMIT $qpage,50"; $q_plist = mysql_query($sql_plist) or die(mysql_error()); -while ($r_plist = mysql_fetch_array($q_plist)) { - $gametime = sec2hour($r_plist[gametime]); - $eff = get_dp($r_plist[eff]); - $acc = get_dp($r_plist[accuracy]); - $ttl = GetMinutes($r_plist[ttl]); - $r_pname = $r_plist[name]; - $myurl = urlencode($r_pname); - - echo' - - - - - - - - - - - - - '; +while ($r_plist = mysql_fetch_array($q_plist)) { + $gametime = sec2hour($r_plist[gametime]); + $eff = get_dp($r_plist[eff]); + $acc = get_dp($r_plist[accuracy]); + $ttl = GetMinutes($r_plist[ttl]); + $r_pname = $r_plist[name]; + $myurl = urlencode($r_pname); + + echo' + + + + + + + + + + + + + '; } + echo'
Unreal Tournament Player List
+
+ + + + +
+
Player Name'.SortPic('name', $filter, $sort).'Matches'.SortPic('games', $filter, $sort).'Score'.SortPic('gamescore', $filter, $sort).'Frags'.SortPic('frags', $filter, $sort).'Kills'.SortPic('kills', $filter, $sort).'Deaths'.SortPic('deaths', $filter, $sort).'Suicides'.SortPic('suicides', $filter, $sort).'Eff.'.SortPic('eff', $filter, $sort).'Acc.'.SortPic('accuracy', $filter, $sort).'TTL'.SortPic('ttl', $filter, $sort).'Hours'.SortPic('gametime', $filter, $sort).'
'.FormatPlayerName($r_plist[country], $r_plist['pid'], $r_pname).''.$r_plist[games].''.$r_plist[gamescore].''.$r_plist[frags].''.$r_plist[kills].''.$r_plist[deaths].''.$r_plist[suicides].''.$eff.''.$acc.''.$ttl.''.$gametime.'
+ '.FormatPlayerName($r_plist[country], $r_plist['pid'], $r_pname).' + '.$r_plist[games].''.$r_plist[gamescore].''.$r_plist[frags].''.$r_plist[kills].''.$r_plist[deaths].''.$r_plist[suicides].''.$eff.''.$acc.''.$ttl.''.$gametime.'
-
Page ['.$tfpage.'/'.$tlpage.'] Selection: '.$fpageurl.' / '.$ppageurl.' / '.$npageurl.' / '.$lpageurl.'
+
Page ['.$tfpage.'/'.$tlpage.'] Selection: '.$fpageurl.' / '.$ppageurl.' / '.$npageurl.' / '.$lpageurl.'
'; ?> diff --git a/html/pages/rank.php b/html/pages/rank.php index 6eacca0..4be751e 100755 --- a/html/pages/rank.php +++ b/html/pages/rank.php @@ -1,56 +1,63 @@ - - - Top 10 '.$r_rgame['name'].' Players - - - N° - Player Name - Rank - Matches - - '; + echo' + + + + + + + + + + + + '; - $ranking = 0; + $ranking = 0; - $sql_rplayer = "SELECT pi.id AS pid, pi.name, pi.country, r.rank, r.prevrank, r.matches FROM uts_rank AS r, uts_pinfo AS pi WHERE r.pid = pi.id AND r.gid = '$r_rgame[gid]' AND pi.banned <> 'Y' ORDER BY r.rank DESC LIMIT 0,10"; - $q_rplayer = mysql_query($sql_rplayer) or die(mysql_error()); - if (mysql_num_rows($q_rplayer) == 0) { - echo ' - - - - - - -
Top 10 '.$r_rgame['name'].' Players
N°Player NameRankMatches
No players entered the rankings yet.
 

'; + $sql_rplayer = "SELECT pi.id AS pid, pi.name, pi.country, r.rank, r.prevrank, r.matches FROM uts_rank AS r, uts_pinfo AS pi WHERE r.pid = pi.id AND r.gid = '$r_rgame[gid]' AND pi.banned <> 'Y' ORDER BY r.rank DESC LIMIT 0,10"; + $q_rplayer = mysql_query($sql_rplayer) or die(mysql_error()); - } - else { - while ($r_rplayer = mysql_fetch_array($q_rplayer)) { + if (mysql_num_rows($q_rplayer) == 0) { + echo ' + + No players entered the rankings yet. + + +   + + +
'; + } + else { + while ($r_rplayer = mysql_fetch_array($q_rplayer)) { - $ranking++; - $myurl = urlencode($r_rplayer[name]); + $ranking++; + $myurl = urlencode($r_rplayer[name]); - echo' - - '.$ranking.' - '.FlagImage($r_rplayer[country]).' '.htmlspecialchars($r_rplayer[name], ENT_QUOTES) .' '. RankMovement($r_rplayer['rank'] - $r_rplayer['prevrank']).' - '.get_dp($r_rplayer[rank]).' - '.$r_rplayer[matches].' - '; - } - echo' - - Click Here To See All The Rankings - -
'; - } + echo' + + '.$ranking.' + + '.FlagImage($r_rplayer[country]).' '.htmlspecialchars($r_rplayer[name], ENT_QUOTES) .' '. RankMovement($r_rplayer['rank'] - $r_rplayer['prevrank']).' + + '.get_dp($r_rplayer[rank]).' + '.$r_rplayer[matches].' + '; + } + echo' + + + Click here to see all the rankings + + + +
'; + } } -?> \ No newline at end of file +?> diff --git a/html/pages/recent.php b/html/pages/recent.php index 92fafb7..e95b195 100755 --- a/html/pages/recent.php +++ b/html/pages/recent.php @@ -1,4 +1,5 @@ $ecount2) { - $ecount2 = $ecount2+1; +if ($ecount > $ecount2) { + $ecount2 = $ecount2+1; } $fpage = 0; -IF($ecount < 1) { $lpage = 0; } +if ($ecount < 1) { $lpage = 0; } else { $lpage = $ecount2-1; } -$cpage = preg_replace('/\D/', '', $_REQUEST["page"]); -IF ($cpage == "") { $cpage = "0"; } +$cpage = mysql_real_escape_string(preg_replace('/\D/', '', $_REQUEST["page"])); +if ($cpage == "") { $cpage = "0"; } $qpage = $cpage*25; $tfpage = $cpage+1; @@ -33,105 +34,132 @@ $tlpage = $lpage+1; $ppage = $cpage-1; $ppageurl = "[Previous]"; -IF ($ppage < "0") { $ppageurl = "[Previous]"; } +if ($ppage < "0") { $ppageurl = "[Previous]"; } $npage = $cpage+1; $npageurl = "[Next]"; -IF ($npage >= "$ecount") { $npageurl = "[Next]"; } +if ($npage >= "$ecount") { $npageurl = "[Next]"; } $fpageurl = "[First]"; -IF ($cpage == "0") { $fpageurl = "[First]"; } +if ($cpage == "0") { $fpageurl = "[First]"; } $lpageurl = "[Last]"; -IF ($cpage == "$lpage") { $lpageurl = "[Last]"; } +if ($cpage == "$lpage") { $lpageurl = "[Last]"; } echo '
-
Page ['.$tfpage.'/'.$tlpage.'] Selection: '.$fpageurl.' / '.$ppageurl.' / '.$npageurl.' / '.$lpageurl.'
- - - - '; +
Page ['.$tfpage.'/'.$tlpage.'] Selection: '.$fpageurl.' / '.$ppageurl.' / '.$npageurl.' / '.$lpageurl.'
-echo ' +
Unreal Tournament Match List
+ + + - - +
Unreal Tournament Match List
'; -echo ''; -echo ''; -echo ''; + '; - echo ' - - - - - - + + + + + '; -$sql_recent = "SELECT m.id, m.time, g.name AS gamename, m.mapfile, m.gametime, (SELECT count(p.id) FROM uts_player AS p WHERE m.id = p.matchid) as players FROM uts_match AS m, uts_games AS g WHERE g.id = m.gid $where ORDER BY m.time DESC LIMIT $qpage,25"; +$sql_recent = "SELECT m.id, m.time, g.name AS gamename, m.mapfile, m.gametime, t0score, t1score, t2score, t3score, (SELECT count(p.id) FROM uts_player AS p WHERE m.id = p.matchid) as players FROM uts_match AS m, uts_games AS g WHERE g.id = m.gid $where ORDER BY m.time DESC LIMIT ".mysql_real_escape_string($qpage).",50"; $q_recent = mysql_query($sql_recent) or die(mysql_error()); -while ($r_recent = mysql_fetch_array($q_recent)) { - $r_time = mdate($r_recent[time]); - $r_mapfile = un_ut($r_recent[mapfile]); - $r_gametime = GetMinutes($r_recent[gametime]); - - echo' - - - - - - - - '; +while ($r_recent = mysql_fetch_array($q_recent)) { + $r_time = mdate($r_recent[time]); + $r_mapfile = un_ut($r_recent[mapfile]); + $r_gametime = GetMinutes($r_recent[gametime]); + $winner = max($r_recent[t0score], $r_recent[t1score], $r_recent[t2score], $r_recent[t3score]); + $moreThan2Teams = ($r_recent[t2score]!=0); + + if ($winner == $r_recent[t0score]) { + $winnercolor = "red"; + $winmsg = "Red is the winner!"; + } + elseif ($winner == $r_recent[t1score]) { + $winnercolor = "blue"; + $winmsg = "Blue is the winner!"; + } + elseif ($winner == $r_recent[t2score]) { + $winnercolor = "green"; + $winmsg = "Green is the winner!"; + } + else { + $winnercolor = "gold"; + $winmsg = "Gold is the winner!"; + }; + + echo ' + + + + + + + '; } - - echo '
Filter:'; +echo ''; +echo ''; +echo ''; //echo ''; -echo ''; -echo ''; +echo ''; + +echo ''; +echo ''; echo '
Filter:Date:'; echo ' '; echo ''; echo ' '; echo ''; -echo 'Gametype:'; +echo 'Gametype:'; -echo '
'; echo '
Match IDDate/TimeMatch TypeMapTimePlayersIDDate/TimeMatch TypeMapScores
'.$r_recent[id].''.$r_time.''.$r_recent[gamename].''.$r_mapfile.''.$r_gametime.''.$r_recent[players].'
'.$r_recent[id].''.$r_time.''.$r_recent[gamename].''.$r_mapfile.''.$r_recent[t0score].''.$r_recent[t1score].''; + + if ($moreThan2Teams) { + echo ''.$r_recent[t2score].' '.$r_recent[t3score].' '; + } + + '
-
Page ['.$tfpage.'/'.$tlpage.'] Selection: '.$fpageurl.' / '.$ppageurl.' / '.$npageurl.' / '.$lpageurl.'
+
Page ['.$tfpage.'/'.$tlpage.'] Selection: '.$fpageurl.' / '.$ppageurl.' / '.$npageurl.' / '.$lpageurl.'
'; -?> \ No newline at end of file +?> diff --git a/html/pages/watchlist.php b/html/pages/watchlist.php index bfc8512..4f4cf1b 100755 --- a/html/pages/watchlist.php +++ b/html/pages/watchlist.php @@ -1,106 +1,119 @@ -
Your Watchlist
+ + + -
Your Watchlist
'; -echo '


'; - + + +
+
+ + + + +
'; $watchlist = GetCurrentWatchlist(); + if (count($watchlist) > 25) $watchlist = array_slice($watchlist, 0, 25); + if (count($watchlist) == 0) { - echo "

Your watchlist is empty!

You can add players to your watchlist by clicking the appropriate icon on the header of their career summary page.

"; - return; + echo ' + + +

+ Your watchlist is empty! +

+ You can add players to your watchlist by clicking the appropriate icon on the header of their career summary page. +

+ + + '; + return; } echo ' - - - - - - - - - - - - - - - - '; + + + + + + + + + + + + + +'; +$i = 0; -$i = 0; -foreach($watchlist as $pid) { - $sql_players = "SELECT pi.id AS pid, - pi.name, - pi.country, - m.time, - m.id AS mid - FROM uts_pinfo pi, - uts_match m, - uts_player p - WHERE pi.id = '$pid' - AND p.matchid = m.id - AND p.pid = pi.id - ORDER BY m.time DESC - LIMIT 0,1 - "; - - $sql_pinfo = " SELECT COUNT(*) AS games, - SUM(p.gamescore) as gamescore, - SUM(p.frags) AS frags, - SUM(p.kills) AS kills, - SUM(p.deaths) AS deaths, - SUM(p.suicides) as suicides, - AVG(p.eff) AS eff, - AVG(p.accuracy) AS accuracy, - AVG(p.ttl) AS ttl, - SUM(gametime) as gametime - FROM uts_player AS p - WHERE p.pid = '$pid' - GROUP BY p.pid"; - $r_pinfo = small_query($sql_pinfo); - - $q_players = mysql_query($sql_players) or die(mysql_error()); - - - while ($r_players = mysql_fetch_array($q_players)) { - $i++; - $new = (mtimestamp($r_players['time']) > $s_lastvisit) ? true : false; - $class = ($i % 2) ? 'grey' : 'grey2'; - echo ''; - echo ''; - echo ''; - - echo ' - - - - - - - - - - '; - - echo ''; - } -} +foreach ($watchlist as $pid) { + $sql_players = "SELECT pi.id AS pid, + pi.name, + pi.country, + m.time, + m.id AS mid + FROM uts_pinfo pi, + uts_match m, + uts_player p + WHERE pi.id = '$pid' + AND p.matchid = m.id + AND p.pid = pi.id + ORDER BY m.time DESC + LIMIT 0,1"; -echo '
Player NameLast MatchMatchesScoreFragsKillsDeathsSuicidesEffAccTTLHours
Player NameLast MatchMatchesScoreFragsKillsDeathsSuicidesEffAccTTLHours
'; - echo FormatPlayerName($r_players['country'], $r_players['pid'], $r_players['name']); - echo '';; - if ($new) echo ""; - echo date("Y-m-d H:i", mtimestamp($r_players['time'])); - if ($new) echo ""; - echo ''.$r_pinfo['games'].''.$r_pinfo['gamescore'].''.$r_pinfo['frags'].''.$r_pinfo['kills'].''.$r_pinfo['deaths'].''.$r_pinfo['suicides'].''.get_dp($r_pinfo['eff']).''.get_dp($r_pinfo['accuracy']).''.GetMinutes($r_pinfo['ttl']).''.sec2hour($r_pinfo['gametime']).'
'; + $sql_pinfo = " SELECT COUNT(*) AS games, + SUM(p.gamescore) as gamescore, + SUM(p.frags) AS frags, + SUM(p.kills) AS kills, + SUM(p.deaths) AS deaths, + SUM(p.suicides) as suicides, + AVG(p.eff) AS eff, + AVG(p.accuracy) AS accuracy, + AVG(p.ttl) AS ttl, + SUM(gametime) as gametime + FROM uts_player AS p + WHERE p.pid = '$pid' + GROUP BY p.pid"; + $r_pinfo = small_query($sql_pinfo); + $q_players = mysql_query($sql_players) or die(mysql_error()); + + while ($r_players = mysql_fetch_array($q_players)) { + $i++; + $new = (mtimestamp($r_players['time']) > $s_lastvisit) ? true : false; + $class = ($i % 2) ? 'grey' : 'grey2'; + echo ''; + echo ''; + echo FormatPlayerName($r_players['country'], $r_players['pid'], $r_players['name']); + echo ''; + echo '';; + if ($new) echo ""; + echo date("Y-m-d H:i", mtimestamp($r_players['time'])); + if ($new) echo ""; + echo ' + + '.$r_pinfo['games'].' + '.$r_pinfo['gamescore'].' + '.$r_pinfo['frags'].' + '.$r_pinfo['kills'].' + '.$r_pinfo['deaths'].' + '.$r_pinfo['suicides'].' + '.get_dp($r_pinfo['eff']).' + '.get_dp($r_pinfo['accuracy']).' + '.GetMinutes($r_pinfo['ttl']).' + '.sec2hour($r_pinfo['gametime']).' + '; + } +} + +echo ''; ?> -- cgit 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 From 3a58cb2802c8be14f78015105afe759b1c7ce692 Mon Sep 17 00:00:00 2001 From: Matthijs Kuiper Date: Tue, 9 Jan 2018 00:43:43 +0100 Subject: Implement design for pages and update includes --- html/pages/admin/acelog.php | 4 +- html/pages/admin/aclog.php | 228 ++++++----- html/pages/admin/dmatch.php | 4 +- html/pages/admin/dplayer.php | 2 +- html/pages/admin/dpmatch.php | 2 +- html/pages/admin/editgames.php | 2 +- html/pages/admin/editgamestype.php | 6 +- html/pages/admin/editweapons.php | 2 +- html/pages/admin/ipsearch.php | 2 +- html/pages/admin/main.php | 51 ++- html/pages/admin/mplayers.php | 2 +- html/pages/admin/mservers.php | 2 +- html/pages/admin/pban.php | 4 +- html/pages/admin/pinfo.php | 4 +- html/pages/admin/plm.php | 34 +- html/pages/admin/recalcflags.php | 2 +- html/pages/admin/recalcranking.php | 2 +- html/pages/admin/utdclog.php | 4 +- html/pages/admin/utdcshot.php | 0 html/pages/credits.php | 661 ++++++++++++++++--------------- html/pages/dpmatch.php | 2 +- html/pages/graph_mbreakdown.php | 247 ++++++------ html/pages/graph_pbreakdown.php | 2 +- html/pages/help.php | 477 +++++++++++++--------- html/pages/home.php | 266 ++++++++++--- html/pages/maps.php | 42 +- html/pages/maps_info.php | 507 ++++++++++++------------ html/pages/match_info.php | 115 +++--- html/pages/match_info_ass.php | 8 +- html/pages/match_info_bt.php | 2 +- html/pages/match_info_ctf.php | 634 +++++++++++++++--------------- html/pages/match_info_killsmatrix.php | 58 +-- html/pages/match_info_lms.php | 27 +- html/pages/match_info_other.php | 206 +++++----- html/pages/match_info_other2.php | 40 +- html/pages/match_player.php | 165 ++++---- html/pages/match_report.php | 9 +- html/pages/players_explain_ranking.php | 66 ++-- html/pages/players_info.php | 694 ++++++++++++++++++--------------- html/pages/players_search.php | 46 ++- html/pages/rank_extended.php | 26 +- html/pages/report.php | 0 html/pages/report/bbcode.php | 0 html/pages/report/clanbase.php | 0 html/pages/report/index.htm | 0 html/pages/report_cb.php | 6 +- html/pages/servers.php | 18 +- html/pages/servers_info.php | 208 +++++----- html/pages/servers_query.php | 6 +- html/pages/totals.php | 565 +++++++++++++-------------- 50 files changed, 2920 insertions(+), 2540 deletions(-) mode change 100755 => 100644 html/pages/admin/acelog.php mode change 100755 => 100644 html/pages/admin/aclog.php mode change 100755 => 100644 html/pages/admin/dmatch.php mode change 100755 => 100644 html/pages/admin/dplayer.php mode change 100755 => 100644 html/pages/admin/dpmatch.php mode change 100755 => 100644 html/pages/admin/editgames.php mode change 100755 => 100644 html/pages/admin/editgamestype.php mode change 100755 => 100644 html/pages/admin/editweapons.php mode change 100755 => 100644 html/pages/admin/ipsearch.php mode change 100755 => 100644 html/pages/admin/main.php mode change 100755 => 100644 html/pages/admin/mplayers.php mode change 100755 => 100644 html/pages/admin/mservers.php mode change 100755 => 100644 html/pages/admin/pban.php mode change 100755 => 100644 html/pages/admin/pinfo.php mode change 100755 => 100644 html/pages/admin/plm.php mode change 100755 => 100644 html/pages/admin/recalcflags.php mode change 100755 => 100644 html/pages/admin/recalcranking.php mode change 100755 => 100644 html/pages/admin/utdclog.php mode change 100755 => 100644 html/pages/admin/utdcshot.php mode change 100755 => 100644 html/pages/dpmatch.php mode change 100755 => 100644 html/pages/graph_pbreakdown.php mode change 100755 => 100644 html/pages/maps.php mode change 100755 => 100644 html/pages/maps_info.php mode change 100755 => 100644 html/pages/match_info_ass.php mode change 100755 => 100644 html/pages/match_info_bt.php mode change 100755 => 100644 html/pages/match_info_ctf.php mode change 100755 => 100644 html/pages/match_info_killsmatrix.php mode change 100755 => 100644 html/pages/match_info_lms.php mode change 100755 => 100644 html/pages/match_info_other2.php mode change 100755 => 100644 html/pages/match_report.php mode change 100755 => 100644 html/pages/players_explain_ranking.php mode change 100755 => 100644 html/pages/players_search.php mode change 100755 => 100644 html/pages/rank_extended.php mode change 100755 => 100644 html/pages/report.php mode change 100755 => 100644 html/pages/report/bbcode.php mode change 100755 => 100644 html/pages/report/clanbase.php mode change 100755 => 100644 html/pages/report/index.htm mode change 100755 => 100644 html/pages/report_cb.php mode change 100755 => 100644 html/pages/servers.php mode change 100755 => 100644 html/pages/servers_info.php mode change 100755 => 100644 html/pages/servers_query.php (limited to 'html/pages') diff --git a/html/pages/admin/acelog.php b/html/pages/admin/acelog.php old mode 100755 new mode 100644 index 365174a..a9c80c0 --- a/html/pages/admin/acelog.php +++ b/html/pages/admin/acelog.php @@ -90,7 +90,7 @@ if (empty($filename)) { } - +
@@ -252,7 +252,7 @@ if (empty($filename)) { if (!empty($filename)) { if (!file_exists('logs/ace/'. $filename) or !is_file('logs/ace/'. $filename)) die('File not found (2)'); - echo'
Available ACE Logs:
+ echo'
'.$filename.' '; diff --git a/html/pages/admin/aclog.php b/html/pages/admin/aclog.php old mode 100755 new mode 100644 index ada35c8..2d78b77 --- a/html/pages/admin/aclog.php +++ b/html/pages/admin/aclog.php @@ -1,108 +1,120 @@ - - - - '; - $logdir = opendir('logs/ac'); - $logs = array(); - $sort = array(); - $i = 0; - while (false !== ($filename = readdir($logdir))) { - if (!is_file('logs/ac/'. $filename)) continue; - if ($filename == '.htaccess' or $filename == 'index.htm') continue; - $i++; - $logs[$i] = $filename; - $extra = 0; - if (substr($filename, -4) == '.bz2') $extra = 4; - if (substr($filename, -3) == '.gz') $extra = 3; - - $sort[$i] = substr($filename, strlen($filename) - (23 + $extra), 19); - } - closedir($logdir); - if (count($logs) == 0) { - echo ''; - } else { - arsort($sort); - $i = 0; - foreach($sort as $id => $date) { - $log = $logs[$id]; - $extra = 0; - if (substr($log, -4) == '.bz2') $extra = 4; - if (substr($log, -3) == '.gz') $extra = 3; - - $i++; - $class = ($i%2) ? 'grey' : 'grey2'; - echo ''; - } - } -} - - -if (!empty($filename)) { - if (!file_exists('logs/ac/'. $filename) or !is_file('logs/ac/'. $filename)) die('bla'); - echo'
Available AnthChecker Logs:
No logs available!
'; - $tmp = substr($log, strlen($log) - (23 + $extra), 19); - $tmp = str_replace('.', '', $tmp); - $ts = mtimestamp($tmp); - echo ' '.date('Y-m-d H:i', $ts).''; - echo ''; - echo ''.substr($log, 6, strlen($log) - 30 - $extra).''; - echo ''; - $d_size = file_size_info(filesize('logs/ac/'. $log)); - echo $d_size['size'] .' '. $d_size['type']; - echo ''; - echo 'Delete'; - echo '
- - - - '; - - $fp = my_fopen('logs/ac/'.$filename, 'rb', $compression = NULL); - if (!$fp) die("Error opening file"); - - $i = 0; - echo ''; - */ - echo wordwrap(htmlentities($line), 80, '
', 1) ."
"; - } - echo ''; - my_fclose($fp, $compression); -} - -echo ''; -if (!empty($filename)) echo''; -echo''; -echo '
'.$filename.''; - echo 'Delete'; - echo '
'; - - while (($line = my_fgets($fp, 5000, $compression)) !== FALSE) { - /* - $i++; - $class = ($i%2) ? 'grey' : 'grey2'; - echo '
'; - echo ''; - echo htmlentities($line); - echo ''; - echo '
Go Back To Logfile Overview
Go Back To Admin Page
'; - -?> + + + + '; + + $logdir = opendir('logs/ac'); + $logs = array(); + $sort = array(); + $i = 0; + + while (false !== ($filename = readdir($logdir))) { + if (!is_file('logs/ac/'. $filename)) continue; + if ($filename == '.htaccess' or $filename == 'index.htm') continue; + + $i++; + $logs[$i] = $filename; + $extra = 0; + + if (substr($filename, -4) == '.bz2') $extra = 4; + if (substr($filename, -3) == '.gz') $extra = 3; + + $sort[$i] = substr($filename, strlen($filename) - (23 + $extra), 19); + } + + closedir($logdir); + + if (count($logs) == 0) { + echo ''; + } else { + arsort($sort); + $i = 0; + + foreach($sort as $id => $date) { + $log = $logs[$id]; + $extra = 0; + + if (substr($log, -4) == '.bz2') $extra = 4; + if (substr($log, -3) == '.gz') $extra = 3; + + $i++; + $class = ($i%2) ? 'grey' : 'grey2'; + echo ''; + } + } +} + +if (!empty($filename)) { + if (!file_exists('logs/ac/'. $filename) or !is_file('logs/ac/'. $filename)) die('bla'); + + echo'
Available AnthChecker Logs:
No logs available!
'; + $tmp = substr($log, strlen($log) - (23 + $extra), 19); + $tmp = str_replace('.', '', $tmp); + $ts = mtimestamp($tmp); + + echo ''.date('Y-m-d H:i', $ts).''; + echo ''; + echo ''.substr($log, 6, strlen($log) - 30 - $extra).''; + echo ''; + + $d_size = file_size_info(filesize('logs/ac/'. $log)); + + echo $d_size['size'] .' '. $d_size['type']; + echo ''; + echo 'Delete'; + echo '
+ + + + '; + + $fp = my_fopen('logs/ac/'.$filename, 'rb', $compression = NULL); + if (!$fp) die("Error opening file"); + $i = 0; + echo ''; + */ + + echo wordwrap(htmlentities($line), 80, '
', 1) ."
"; + } + + echo ''; + my_fclose($fp, $compression); +} + +echo ''; + +if (!empty($filename)) echo''; + +echo''; +echo '
'.$filename.''; + echo 'Delete'; + echo '
'; + + while (($line = my_fgets($fp, 5000, $compression)) !== FALSE) { + /* + $i++; + $class = ($i%2) ? 'grey' : 'grey2'; + echo '
'; + echo ''; + echo htmlentities($line); + echo ''; + echo '
Go Back To Logfile Overview
Go Back To Admin Page
'; + +?> diff --git a/html/pages/admin/dmatch.php b/html/pages/admin/dmatch.php old mode 100755 new mode 100644 index 9fed97d..3c7ebc5 --- a/html/pages/admin/dmatch.php +++ b/html/pages/admin/dmatch.php @@ -20,7 +20,7 @@ $results = adminselect($options); $matchid = $results['mid']; -echo'
+echo'
@@ -47,7 +47,7 @@ while ($r_radjust = mysql_fetch_array($q_radjust)) { mysql_query("UPDATE uts_rank SET rank = $newrank, prevrank = $oldrank, matches = $matchcount WHERE id = $rid") or die(mysql_error()); mysql_query("DELETE FROM uts_rank WHERE matches = 0") or die(mysql_error()); } - echo' + echo'
Deleting Match ID '.$matchid.'
DoneDone