changed ChallengeList to return rather than echo.

1 files changed, 14 insertions, 12 deletions

diff --git a/pages/challengelist.php b/pages/challengelist.php
index 556c190..a6a4ade 100644
--- a/pages/challengelist.php
+++ b/pages/challengelist.php
@@ -14,8 +14,8 @@ topbar($Links);
 ?>
 
 
-<div id="challengelist_wrapper" class="wrapper" style='min-height:700px;'>
-t
+<div id="challengelist_wrapper" class="wrapper" style='overflow: auto;'>
+
 <?
 
 //Check that the user is allowed to do the challenges
@@ -43,7 +43,7 @@ $userID = $_SESSION['userID'];
 //Display the actual challenge list
 $challengeListResultset = loadChallengeListing($userID);
 //displayChallengeList($challengeListResultset);
-ChallengeList($challengeListResultset);
+echo ChallengeList($challengeListResultset);
 
 ?>
 
@@ -57,6 +57,7 @@ htmlFooter();
 
 function ChallengeList($challengeListResultset) {
 	//First gather data to a more useful form.
+	$r = '';
 	while($data = mysql_fetch_array($challengeListResultset)) {
 		$tier = $data['challengeTier'];
 		$mapid = $data['mapID'];
@@ -65,17 +66,17 @@ function ChallengeList($challengeListResultset) {
 	}
 	
 	foreach ($challenges as $tier => $map) {
-		echo "TIER $tier";
+		$r .= "<b>Section $tier</b> levels:<div class='challengelist_tier' style='border: 1px solid yellow; overflow: auto;'>";
 		foreach ($map as $mapid => $challenge) {
-			echo "MAP $mapid";
+		//	$r .= "MAP $mapid";
 			
 			$mapCode = getMapCode($mapid);
 			$map = new map($mapCode);
 			$thumbnail = DisplayMapThumbnail($map);
 			
-			echo "<div class='challengelist_map' onclick='document.location.href=\"challenge?mapID=$mapid\"'>";
-			echo "$map->name";
-			echo $thumbnail;
+			$r .= "<div class='challengelist_map' onclick='document.location.href=\"challenge?mapID=$mapid\"'>";
+			$r .= "$map->name";
+			$r .= $thumbnail;
 			
 			foreach ($challenge as $challengeID => $content) {
 				//Each challenge gets its own star
@@ -83,13 +84,14 @@ function ChallengeList($challengeListResultset) {
 					$cssClass = "challengelist_complete";
 				else
 					$cssClass = "challengelist_incomplete";
-				echo "<div class='$cssClass'></div>";
+				$r .= "<div class='$cssClass'></div>";
 			}
-			echo "</div>";
-			echo "END MAP";
+			$r .= "</div>";
+			//$r .= "END MAP";
 		}
-		echo "END TIER";
+		$r .= "</div>";
 	}
+	return $r;
 }
 
 // TODO: !! Depreciate