`challengeMaps` table added; start of the required code changes.

3 files changed, 14 insertions, 12 deletions

diff --git a/pages/challenge.php b/pages/challenge.php
index ceefebe..4e5c50c 100644
--- a/pages/challenge.php
+++ b/pages/challenge.php
@@ -80,24 +80,25 @@ if (!$accepted) {
 //	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 db20081..364209f 100644
--- a/pages/challengelist.php
+++ b/pages/challengelist.php
@@ -70,13 +70,14 @@ function ChallengeList($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;
 			
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>