diff options
Diffstat (limited to 'pages')
| -rw-r--r-- | pages/challenge.php | 17 | ||||
| -rw-r--r-- | pages/challengelist.php | 24 | ||||
| -rw-r--r-- | pages/memberlist.php | 2 |
3 files changed, 28 insertions, 15 deletions
diff --git a/pages/challenge.php b/pages/challenge.php index e5fcd45..84b401b 100644 --- a/pages/challenge.php +++ b/pages/challenge.php @@ -80,24 +80,25 @@ if (!hasCompletedTutorial($userID)) { return;
}
-if(!isset($_GET["mapID"]))
+if(!isset($_GET["challengeMapID"]) OR !is_int($_GET["challengeMapID"] + 0))
{
redirectToChallengeListing();
return;
}
-$mapCode = loadMapCode($_GET["mapID"]);
+$mapCode = loadChallengeMapCode($_GET["challengeMapID"]);
if($mapCode === NULL)
{
redirectToChallengeListing();
return;
}
-// TODO: !! Sanitize mapid
-$mapID = $_GET["mapID"];
+$challengeMapID = $_GET["challengeMapID"] + 0;
+if (!is_int($challengeMapID))
+ return;
-$mapContent = displayMap(GenerateMapByCode($mapCode), $_GET["mapID"]);
-$challengeResultset = loadChallengesForMap($mapID, $userID);
+$mapContent = displayMap(GenerateMapByCode($mapCode), $_GET["challengeMapID"]);
+$challengeResultset = loadChallengesForMap($challengeMapID, $userID);
if($challengeResultset === NULL)
{
redirectToChallengeListing();
@@ -134,13 +135,13 @@ function displayChallenges($challengeResultset) echo '<div id="challenges_listing"><ul class="challenge_ulist">';
while($challenge = mysql_fetch_array($challengeResultset))
{
- $mapID = $_GET["mapID"];
+ $challengeMapID = $_GET["challengeMapID"];
$challengeId = $challenge["challengeID"];
if($challenge["dateSolved"] !== NULL)
$cssClass = "challenge_complete";
else
$cssClass = "challenge_incomplete";
- $loadSolutionString = "<a href='javascript:requestChallengeSolution(\"$mapID\", \"$challengeId\");'> Load this solution</a>";
+ $loadSolutionString = "<a href='javascript:requestChallengeSolution(\"$challengeMapID\", \"$challengeId\");'> Load this solution</a>";
echo "<li class='$cssClass' id='challenge_id_$challengeId'>" . getChallengeDisplayString($challenge) . " $loadSolutionString </li>";
}
echo "</ul></div></div>";
diff --git a/pages/challengelist.php b/pages/challengelist.php index d6e6d2f..ade47b6 100644 --- a/pages/challengelist.php +++ b/pages/challengelist.php @@ -26,8 +26,15 @@ if (!$accepted) { htmlFooter(); return; } + $userID = $_SESSION['userID']; +if (!hasCompletedTutorial($userID)) { + echo "<center>Please <a href='tutorial'>complete the tutorial</a> to unlock Challenge mode!</div>"; + htmlFooter(); + return; +} + //TODO: Uncomment //if (!hasCompletedTutorial($userID)) { // echo "<center>Please <a href='tutorial'>complete the tutorial</a> to unlock Challenge mode!</div>"; @@ -72,13 +79,14 @@ function getChallengeListHtml($challengeListResultset) { foreach ($challengeMap as $challengeSuborder => $challenge) { //Hack to get the first element of the array: $firstChallenge = $challenge[key($challenge)]; - $mapid = $firstChallenge['mapID']; + $challengeMapID = $firstChallenge['challengeMapID']; - $mapCode = getMapCode($mapid); + //$mapCode = getMapCode($mapid); + $mapCode = $firstChallenge['mapCode']; $map = new map($mapCode); $thumbnail = DisplayMapThumbnail($map); - $r .= "<div class='challengelist_map' onclick='document.location.href=\"challenge?mapID=$mapid\"'>"; + $r .= "<div class='challengelist_map' onclick='document.location.href=\"challenge?challengeMapID=$challengeMapID\"'>"; $r .= "$map->name"; $r .= $thumbnail; @@ -107,7 +115,7 @@ function getChallengeListHtml($challengeListResultset) { function getNextChallengeTierHtml($numCompletedChallenges) { - global $tierChallengeRequirements; + global $tierChallengeRequirements, $userID; for($nextTier = 0; $nextTier < count($tierChallengeRequirements); $nextTier++) { @@ -130,20 +138,24 @@ function getNextChallengeTierHtml($numCompletedChallenges) return "<div class='challengelist_nexttier>All tiers have been unlocked!</div>"; return "<div class='challengelist_nexttier'>Next tier unlocked in <span class='challengelist_nexttier_requirement'>$numChallengesForNextTier</span>" - . "<span class='challengelist_complete'></span>!</div>"; + . "<span class='challengelist_complete'></span></div>"; } function numChallengesRemainingForTier($tier, $numCompletedChallenges) { + global $tierChallengeRequirements; + if($tier >= maxTier()) return -1; if($tierChallengeRequirements[$tier] <= $numCompletedChallenges) return 0; - return ($numCompletedChallenges - $tierChallengeRequirements[$tier]); + return ($tierChallengeRequirements[$tier] - $numCompletedChallenges); } function maxTier() { + global $tierChallengeRequirements; + return (count($tierChallengeRequirements) - 1); } diff --git a/pages/memberlist.php b/pages/memberlist.php index 99f81ca..6e71dea 100644 --- a/pages/memberlist.php +++ b/pages/memberlist.php @@ -36,7 +36,7 @@ $json = json_encode($data); ?>
<div class='wrapper'>
-
+ <h2>Members</h2>
<form class='memberListForm'>
<select id="membersPerPage" onChange="membersPageDivide=this.options[this.selectedIndex].value;membersShowPage(1,false,true);">
<option value="10">10</option>
|