diff options
| -rw-r--r-- | ajax/chat.ajax.php | 6 | ||||
| -rw-r--r-- | includes/datas.php | 4 | ||||
| -rw-r--r-- | js/scores.js | 9 |
3 files changed, 9 insertions, 10 deletions
diff --git a/ajax/chat.ajax.php b/ajax/chat.ajax.php index 95bcacd..7f5684c 100644 --- a/ajax/chat.ajax.php +++ b/ajax/chat.ajax.php @@ -123,7 +123,6 @@ if ($_REQUEST['getChatFromID']) { }
exit;
-
function prepareChatData($data) {
if ($data) {
foreach($data as &$user) {
@@ -135,7 +134,6 @@ function prepareChatData($data) { return $data;
}
-
function chatFilter($chat) {
//cuss words
$chat = str_ireplace("fuck you", "i am moron", $chat);
@@ -172,8 +170,4 @@ function chatFilter($chat) { $chat = str_ireplace("rape", "shake hands with", $chat);
return $chat;
}
-
-
-
-
?>
\ No newline at end of file diff --git a/includes/datas.php b/includes/datas.php index 92cf5eb..f0d9067 100644 --- a/includes/datas.php +++ b/includes/datas.php @@ -809,6 +809,7 @@ function getScores($mapID, $pageNumber = 1, $pageDivide = 10) { timediff(solutions.dateModified, TIMESTAMP(CURDATE())) as diff, users.displayName as display, solutions.moves as moves, + solutions.championPointsWorth as points, users.ID as ID, users.displayColor, users.wallColor, @@ -874,7 +875,8 @@ function getScores($mapID, $pageNumber = 1, $pageDivide = 10) { $medal = 'gold'; // if is blind map. - if ($isBlindMap AND $myBestMoves < $moves) $row['moves'] = '???'; + if ($isBlindMap AND $myBestMoves < $moves) + $row['moves'] = '???'; $output['users'][$i] = $row; $output['users'][$i]['secondsSinceScored'] = $secondsSinceScored; diff --git a/js/scores.js b/js/scores.js index 1e324a4..7d91576 100644 --- a/js/scores.js +++ b/js/scores.js @@ -126,6 +126,7 @@ function scoresFormatPage(JO) { p = p+"<th>Rank</th>";
p = p+"<th style='width:125px; overflow:hidden; text-align:left; padding-left:42px;'>Name</th>";
p = p+"<th>Moves</th>";
+ p = p+"<th>Points</th>";
p = p+"</tr>";
var showedLastUser = true;
@@ -164,13 +165,13 @@ function scoresFormatPage(JO) { p += "onmouseover='showTempSolution(\""+JO.mapid+"\", \""+u.solution+"\", \""+u.moves+"\", \""+u.wallColor+"\", \""+u.wallEmblem+"\")'";
p += "onclick='useSolution(\""+JO.mapid+"\", \""+u.solution+"\", \""+u.moves+"\", \""+u.wallColor+"\", \""+u.wallEmblem+"\", \""+u.solutionID+"\");saveScoreLocation("+JO.page+", "+u.solutionID+");'";
p += "onmouseout='restoreSolution(\""+JO.mapid+"\")' ";
- p += " style='"+styleClass+" color:"+u.displayColor+";' title='Last improved "+scoredTimeStr+"'>";
+ p += " style='"+styleClass+";' title='Last improved "+scoredTimeStr+"'>";
} else {
- p = p+ "<tr class='"+rowclass+"' style='"+styleClass+" color:"+u.displayColor+";' title='Last improved "+scoredTimeStr+"'>";
+ p = p+ "<tr class='"+rowclass+"' style='"+styleClass+"' title='Last improved "+scoredTimeStr+"'>";
}
// background-color: "+u.background+";
- p = p+ "<td class='scoreMedal'>";
+ p = p+ "<td class='scoreMedal' style='color:"+u.displayColor+"'>";
if (u.medal == 'gold') {
p = p+ "<img title='Current Champion' src='../images/MedalGoldCAR.png'>";
@@ -188,8 +189,10 @@ function scoresFormatPage(JO) { p = p+ "</td>";
if (u.solution) {
p = p+ "<td style='text-align:right;'><a href='javascript: void(0);'>"+u.moves+"</a></td>";
+ p = p+ "<td style='text-align:right;'>"+u.points+"</td>";
} else {
p = p+ "<td style='text-align:right;'>"+u.moves+"</td>";
+ p = p+ "<td></td>";
}
p = p+ "</tr>";
|