Merge branch 'HEAD' of ssh://git@git.raylu.net/pathery

1 files changed, 18 insertions, 6 deletions

diff --git a/pages/challenge.php b/pages/challenge.php
index 6990644..2ab279d 100644
--- a/pages/challenge.php
+++ b/pages/challenge.php
@@ -53,6 +53,11 @@ if (getCookie('pref_mute') != 'true') {
 var isChallenge = true;

 playerWallColor = '<?PHP echo isset($wallColor) ? $wallColor : ''; ?>';

 playerWallEmblem = '<?PHP echo isset($wallEmblem) ? $wallEmblem : ''; ?>';

+

+//Legacy functions

+function challengeLoad() {}

+function challengeWall() {}

+function challengeGo() {}

 </script>

 

 <?php

@@ -78,22 +83,22 @@ if (!$accepted) {
 

 if(!isset($_GET["mapID"]))

 {

-	//TODO: Redirect to challenge listing

+	redirectToChallengeListing();

 	return;

 }

 

 $mapCode = loadMapCode($_GET["mapID"]);

 if($mapCode === NULL)

 {

-	//TODO: Redirect to challenge listing also

+	redirectToChallengeListing();

 	return;

 }

 

-$mapContent = displayMap(GenerateMapByCode($mapCode), 1);

+$mapContent = displayMap(GenerateMapByCode($mapCode), $_GET["mapID"]);

 $challengeResultset = loadChallengesForMap($_GET["mapID"], $userID);

 if($challengeResultset === NULL)

 {

-	//TODO: Redirect to challenge listing also

+	redirectToChallengeListing();

 	return;

 }

 

@@ -130,12 +135,13 @@ function displayChallenges($challengeResultset)
 	echo '<div id="challenges_listing"><ol>';

 	while($challenge = mysql_fetch_array($challengeResultset))

 	{

+		$challengeId = $challenge["challengeID"];

 		echo "<li>";

-		if($challenge["dateCompleted"] !== NULL)

+		if($challenge["dateSolved"] !== NULL)

 			$cssClass = "challenge_complete";

 		else

 			$cssClass = "challenge_incomplete";

-		echo "<span class='$cssClass'>" . getChallengeDisplayString($challenge) . "</span>";

+		echo "<span class='$cssClass' id='challenge_id_$challengeId'>" . getChallengeDisplayString($challenge) . "</span>";

 		echo "</li>";

 	}

 	echo "</ol></div></div>";

@@ -228,4 +234,10 @@ function getChallengeDisplayString($challenge)
 	$returnMe .= ".";

 	return $returnMe;

 }

+

+function redirectToChallengeListing()

+{

+	header("Location: /challengelist");

+	die();

+}

 ?>
\ No newline at end of file