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/assets/style.css | 20 +---- html/pages/players.php | 145 ++++++++++++++++++----------------- html/pages/rank.php | 97 +++++++++++++----------- html/pages/recent.php | 152 ++++++++++++++++++++++--------------- html/pages/watchlist.php | 191 +++++++++++++++++++++++++---------------------- 5 files changed, 326 insertions(+), 279 deletions(-) diff --git a/html/assets/style.css b/html/assets/style.css index 47433a9..d709e24 100755 --- a/html/assets/style.css +++ b/html/assets/style.css @@ -140,7 +140,6 @@ li { width: 95%; height: 50px; padding-top: 10px; - background: url("./images/dark_grey.jpg"); } .darksearch input[type="text"] { font-family: GothamLight, sans-serif; @@ -160,7 +159,7 @@ input[type="text"] { .search { padding: 6px 15px 6px 30px; margin: 3px; - background: url("./images/search.png") no-repeat 8px 6px; + background: url("../images/search.png") no-repeat 8px 6px; font-family: GothamLight, sans-serif; height: 28px; } @@ -168,7 +167,7 @@ input[type="text"] { .owshare { padding: 6px 15px 6px 30px; margin: 3px; - background: url("./images/owshare.png") no-repeat 8px 6px; + background: url("../images/owshare.png") no-repeat 8px 6px; font-family: GothamLight, sans-serif; height: 28px; } @@ -180,15 +179,6 @@ input[type="submit"] { font-family: GothamLight, sans-serif; border: 1px solid #1e1e1e; background-color: #2069a1; - /** - background: #fdd932; - background: -moz-linear-gradient(top, #fdd932 0%, #ffd305 100%); - background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#515151), color-stop(100%,#2d3035)); - background: -webkit-linear-gradient(top, #515151 0%,#383838 100%); - background: -o-linear-gradient(top, #e4f1f9 0%,#ffd305 100%); - background: -ms-linear-gradient(top, #e4f1f9 0%,#ffd305 100%); - background: linear-gradient(top, #e4f1f9 0%,#ffd305 100%); - filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#e4f1f9', endColorstr='#ffd305',GradientType=0 ); /* IE6-9 */ color: #fff; cursor: pointer; -webkit-transition: background-color 1s; @@ -1097,10 +1087,8 @@ a.pages:hover { /* For Safari 5.1 to 6.0 */ background: -o-linear-gradient(#2069a1, #194c74); /* For Opera 11.1 to 12.0 */ - background: -moz-linear-gradient( - #2069a1, - #194c74 - ); /* For Firefox 3.6 to 15 */ + background: -moz-linear-gradient(#2069a1, #194c74); + /* For Firefox 3.6 to 15 */ background: linear-gradient(#2069a1, #194c74); /* Standard syntax */ } .redteam, 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