From c93e11aa3c9255468d2a5250b11cae0023850e69 Mon Sep 17 00:00:00 2001 From: Patrick Davison Date: Thu, 2 Feb 2012 23:02:32 -0800 Subject: WallColor & wallEmblems in scoreboard --- pages/leaderboard.php | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/pages/leaderboard.php b/pages/leaderboard.php index 2c057a6..248f334 100644 --- a/pages/leaderboard.php +++ b/pages/leaderboard.php @@ -1,5 +1,5 @@ @@ -122,7 +122,10 @@ function displayPastMaze($mapType, $name, $daysago = 1) { solution, users.displayName as Name, SUM(solutions.moves) as Moves, - timediff(solutions.dateModified, maps.dateCreated) as Timetaken + timediff(solutions.dateModified, maps.dateCreated) as Timetaken, + userData.wallColor, + userData.wallEmblem, + userData.displayColor FROM `maps` JOIN `solutions` ON maps.ID = solutions.mapID @@ -130,6 +133,8 @@ function displayPastMaze($mapType, $name, $daysago = 1) { ON solutions.userID = users.ID JOIN `mapOfTheDay` ON maps.ID = mapOfTheDay.mapID + LEFT JOIN `userData` + ON users.ID = userData.userID WHERE DATE_ADD(CURDATE(), INTERVAL -$daysago DAY) = DATE_FORMAT(solutions.dateModified,'%Y-%m-%d') AND DATE_ADD(CURDATE(), INTERVAL -$daysago DAY) = @@ -196,10 +201,17 @@ function displaystats($result, $caption = NULL) { $rowcontent = ''; $mapid = $row['mapID']; $solution = $row['solution']; + $wallColor = $row['wallColor']; + $wallEmblem = $row['wallEmblem']; + $displayColor = $row['displayColor']; - $r .= ""; + //Default + if ($wallColor == '') + $wallColor = '#666666'; + + $r .= "\n"; $r .= "$i"; - $r .= '' . $row['Name'] . ''; + $r .= "" . $row['Name'] . ''; $r .= '' . $row['Moves'] . ''; $r .= '' . $row['Timetaken'] . ''; $r .= ""; -- cgit v1.2.3