diff options
Diffstat (limited to 'pages')
| -rw-r--r-- | pages/achievements.php | 30 | ||||
| -rw-r--r-- | pages/admin.php | 4 | ||||
| -rw-r--r-- | pages/challenge.php | 8 | ||||
| -rw-r--r-- | pages/leaderboard.php | 16 | ||||
| -rw-r--r-- | pages/tutorial.php | 8 |
5 files changed, 25 insertions, 41 deletions
diff --git a/pages/achievements.php b/pages/achievements.php index e3f9e8d..f2c5aba 100644 --- a/pages/achievements.php +++ b/pages/achievements.php @@ -225,16 +225,6 @@ if ($result) { //Validate selection and then update.
if (isset($_POST['doupdate']) AND !$viewer) {
- // Ensure the user is located in userData.
- $sql = "SELECT * FROM `userData`
- WHERE `userID` = '$userID'";
- $result = mysql_query($sql);
- if (mysql_num_rows($result) == 0) {
- $sql = "INSERT INTO `userData` (`userID`, `displayColor`, `wallColor`)
- VALUES ('$userID', '#cccccc', '#666666')";
- mysql_query($sql);
- }
-
//print_R($unlocks);
$unlockIDC = $_POST['selectColorID'];
$unlockColor = $unlocks[1][$unlockIDC]['value'];
@@ -253,9 +243,9 @@ if (isset($_POST['doupdate']) AND !$viewer) { $unlockNameColor = '#cccccc';
if ($unlockColor == $_POST['selectColor']) {
- $sql = "UPDATE `userData`
+ $sql = "UPDATE `users`
SET `wallColor` = '$unlockColor'
- WHERE `userID` = '$userID'";
+ WHERE `ID` = '$userID'";
$result = mysql_query($sql);
if (!$result) {
echo "Error updating wall color";
@@ -267,9 +257,9 @@ if (isset($_POST['doupdate']) AND !$viewer) { }
}
if ($unlockEmblem == $_POST['selectEmblem']) {
- $sql = "UPDATE `userData`
+ $sql = "UPDATE `users`
SET `wallEmblem` = '$unlockEmblem'
- WHERE `userID` = '$userID'";
+ WHERE `ID` = '$userID'";
$result = mysql_query($sql);
if (!$result) {
echo "Error updating wall color";
@@ -282,9 +272,9 @@ if (isset($_POST['doupdate']) AND !$viewer) { }
if ($unlockNameColor == $_POST['selectNameColor']) {
- $sql = "UPDATE `userData`
+ $sql = "UPDATE `users`
SET `displayColor` = '$unlockNameColor'
- WHERE `userID` = '$userID'";
+ WHERE `ID` = '$userID'";
$result = mysql_query($sql);
if (!$result) {
echo "Error updating wall color";
@@ -330,14 +320,12 @@ SELECT users.isAdmin,
users.totalMoves,
users.totalMazes AS totalSolutions,
- IfNull(userData.wallColor, '#666666'),
- IfNull(userData.displayColor, '#cccccc'),
- userData.wallEmblem
+ users.wallColor,
+ users.displayColor,
+ users.wallEmblem
FROM `users`
LEFT JOIN `solutions`
ON users.ID = solutions.userID
-LEFT JOIN `userData`
- ON users.ID = userData.userID
WHERE users.ID = '$userID'
GROUP BY solutions.userID
";
diff --git a/pages/admin.php b/pages/admin.php index dddacaa..e6c0164 100644 --- a/pages/admin.php +++ b/pages/admin.php @@ -203,7 +203,7 @@ function createThumbnail($mapMatrix, $idprefix, $width, $height) { <input type='radio' name='$idprefix,speed' id='$idprefix,spdslow' checked=true />
<input type='radio' name='$idprefix,speed' id='$idprefix,spdmed' />
<input type='radio' name='$idprefix,speed' id='$idprefix,spdfast' />
- <input type='checkbox' id='$idprefix,mute' checked=true />
+ <input type='checkbox' id='$idprefix,mute' checked=true class='checkbox_mute' />
</div>
";
$output .= $mapdatadiv;
@@ -244,7 +244,7 @@ function createThumbnail($mapMatrix, $idprefix, $width, $height) { </div>
<div class='grid_dsp_mid dsp_16'>
- <label><input type='checkbox' id='$idprefix,mute' />Mute</label>
+ <label><input type='checkbox' id='$idprefix,mute' class='checkbox_mute' />Mute</label>
</div>
<div id='$idprefix,dspbr' class='grid_dsp_right dsp_33'>
diff --git a/pages/challenge.php b/pages/challenge.php index 76db642..e6dbff2 100644 --- a/pages/challenge.php +++ b/pages/challenge.php @@ -18,10 +18,10 @@ if ($accepted) { $sql = "
SELECT
- userData.wallColor,
- userData.wallEmblem
- FROM `userData`
- WHERE userID = '$userID' ";
+ users.wallColor,
+ users.wallEmblem
+ FROM `users`
+ WHERE ID = '$userID' ";
$result = mysql_query($sql);
if ($result)
list($wallColor, $wallEmblem) = mysql_fetch_row($result);
diff --git a/pages/leaderboard.php b/pages/leaderboard.php index b5e3a76..cb9a029 100644 --- a/pages/leaderboard.php +++ b/pages/leaderboard.php @@ -106,9 +106,9 @@ function getStat ($type, $daysAgo = 1) { users.displayName as Name,
SUM(solutions.moves) as Moves,
timediff(MAX(dateModified), maps.dateCreated) as Timetaken,
- userData.wallColor,
- userData.wallEmblem,
- userData.displayColor,
+ users.wallColor,
+ users.wallEmblem,
+ users.displayColor,
users.ID as userID,
SUM(CASE WHEN solutions.dateModified < CURDATE()
THEN solutions.championPointsWorth
@@ -118,8 +118,6 @@ function getStat ($type, $daysAgo = 1) { ON maps.ID = solutions.mapID
JOIN `users`
ON solutions.userID = users.ID
- LEFT JOIN `userData`
- ON users.ID = userData.userID
WHERE $where
GROUP BY solutions.userID
ORDER BY Moves DESC, MAX(dateModified) ASC
@@ -198,9 +196,9 @@ function displayPastMaze($mapType, $name, $daysAgo = 1) { users.displayName as Name,
SUM(solutions.moves) as Moves,
timediff(solutions.dateModified, maps.dateCreated) as Timetaken,
- userData.wallColor,
- userData.wallEmblem,
- userData.displayColor,
+ users.wallColor,
+ users.wallEmblem,
+ users.displayColor,
users.ID as userID,
solutions.championPointsWorth
FROM `maps`
@@ -210,8 +208,6 @@ 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
maps.ID = '$mapID'
GROUP BY solutions.userID
diff --git a/pages/tutorial.php b/pages/tutorial.php index 5208a57..88095da 100644 --- a/pages/tutorial.php +++ b/pages/tutorial.php @@ -18,10 +18,10 @@ if ($accepted) { $sql = "
SELECT
- userData.wallColor,
- userData.wallEmblem
- FROM `userData`
- WHERE userID = '$userID' ";
+ users.wallColor,
+ users.wallEmblem
+ FROM `users`
+ WHERE ID = '$userID' ";
$result = mysql_query($sql);
if ($result)
list($wallColor, $wallEmblem) = mysql_fetch_row($result);
|