diff options
| author | Patrick Davison <snapwilliam@gmail.com> | 2013-01-25 16:57:18 -0800 |
|---|---|---|
| committer | Patrick Davison <snapwilliam@gmail.com> | 2013-01-25 16:57:18 -0800 |
| commit | f83929347be13726a9e7728868c8120fdc86a188 (patch) | |
| tree | 831c95a98342f0c2ecb315898addc08419d8933c /includes/datas.php | |
| parent | fed89ebc174dda0963856f992f6f9a26bbe1b182 (diff) | |
| download | pathery-f83929347be13726a9e7728868c8120fdc86a188.tar.xz | |
`challengeMaps` table added; start of the required code changes.
Diffstat (limited to 'includes/datas.php')
| -rw-r--r-- | includes/datas.php | 39 |
1 files changed, 20 insertions, 19 deletions
diff --git a/includes/datas.php b/includes/datas.php index 62f664e..8814625 100644 --- a/includes/datas.php +++ b/includes/datas.php @@ -305,12 +305,14 @@ function getCompletedChallenges($userID, $mapID, $solution, $moves, $paths) { //mapID 5 is the tutorial, and is treated specially //$firephp = FirePHP::getInstance(true); //$firephp->log("In challenges"); - if($mapID <= 10) { - if ($mapID == 5 && $moves == 75) { - onCompletedTutorial($userID); - } - return; - } + + //TODO: !! Get rid of this + // if($mapID <= 10) { + // if ($mapID == 5 && $moves == 75) { + // onCompletedTutorial($userID); + // } + // return; + // } //$firephp->log($mapID, "mapID"); //$firephp->log($userID, "userID"); @@ -521,9 +523,9 @@ function setChallengeCompleted($challenge, $solution, $userID, $moves) { function isChallengeMap($mapID) { include_once('./includes/sqlEmbedded.php'); $sql = "SELECT ID - FROM `maps` + FROM `challengeMaps` WHERE - ID = '$mapID' AND `isChallenge` = true; + ID = '$mapID'; "; $result = mysql_query($sql) or die(mysql_error()); return (mysql_num_rows($result) != 0); @@ -1075,17 +1077,16 @@ function loadChallengeListing($userIdUnsanitized) { $userID = mysql_escape_string($userIdUnsanitized); - $sql = " SELECT maps.ID AS mapID, maps.challengeTier, maps.name AS name, + $sql = " SELECT challengeMaps.ID AS challengeMapID, challengeMaps.challengeTier, challengeMaps.name AS name, challengeSolutions.dateSolved, challengeSolutions.challengeID AS challengeID, - maps.challengeSuborder, challenges.ordering + challengeMaps.challengeSuborder, challenges.ordering, challengeMaps.code as mapCode FROM challenges - LEFT JOIN maps ON challenges.mapID = maps.ID + LEFT JOIN challengeMaps ON challenges.mapID = challengeMaps.ID LEFT JOIN challengeSolutions ON challenges.ID = challengeSolutions.challengeID AND challengeSolutions.userID = '$userID' WHERE challenges.enabled = 1 - ORDER BY maps.challengeTier, maps.challengeSuborder, challenges.ordering"; + ORDER BY challengeMaps.challengeTier, challengeMaps.challengeSuborder, challenges.ordering"; - $result = mysql_query($sql); - echo mysql_error(); + $result = mysql_query($sql) OR die(mysql_error()."SQL: $sql"); if (mysql_num_rows($result) >= 1) return $result; return NULL; @@ -1094,13 +1095,13 @@ function loadChallengeListing($userIdUnsanitized) /** * Returns the map "code" for the given mapId */ -function loadMapCode($mapIdUnsanitized) +function loadChallengeMapCode($mapIdUnsanitized) { - $mapID = mysql_escape_string($mapIdUnsanitized); + $ID = mysql_escape_string($mapIdUnsanitized); $sql = " - SELECT maps.code as code - FROM maps - WHERE ID = '$mapID' AND isChallenge = 1 + SELECT challengeMaps.code as code + FROM challengeMaps + WHERE ID = '$ID' LIMIT 1 "; |