Challenges, massEmail functions started

1 files changed, 54 insertions, 12 deletions

diff --git a/pages/challengelist.php b/pages/challengelist.php
index eb9993d..556c190 100644
--- a/pages/challengelist.php
+++ b/pages/challengelist.php
@@ -14,8 +14,8 @@ topbar($Links);
 ?>
 
 
-<div id="challengelist_wrapper" class="wrapper">
-
+<div id="challengelist_wrapper" class="wrapper" style='min-height:700px;'>
+t
 <?
 
 //Check that the user is allowed to do the challenges
@@ -42,7 +42,8 @@ $userID = $_SESSION['userID'];
 
 //Display the actual challenge list
 $challengeListResultset = loadChallengeListing($userID);
-displayChallengeList($challengeListResultset);
+//displayChallengeList($challengeListResultset);
+ChallengeList($challengeListResultset);
 
 ?>
 
@@ -53,6 +54,45 @@ htmlFooter();
 ?>
 
 <?php
+
+function ChallengeList($challengeListResultset) {
+	//First gather data to a more useful form.
+	while($data = mysql_fetch_array($challengeListResultset)) {
+		$tier = $data['challengeTier'];
+		$mapid = $data['mapID'];
+		$challengeID = $data['challengeID'];
+		$challenges[$tier][$mapid][$challengeID] = $data;
+	}
+	
+	foreach ($challenges as $tier => $map) {
+		echo "TIER $tier";
+		foreach ($map as $mapid => $challenge) {
+			echo "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;
+			
+			foreach ($challenge as $challengeID => $content) {
+				//Each challenge gets its own star
+				if($content["dateSolved"] !== NULL)
+					$cssClass = "challengelist_complete";
+				else
+					$cssClass = "challengelist_incomplete";
+				echo "<div class='$cssClass'></div>";
+			}
+			echo "</div>";
+			echo "END MAP";
+		}
+		echo "END TIER";
+	}
+}
+
+// TODO: !! Depreciate
 /**
  * Outputs the list of all challenges to the page
  */
@@ -72,11 +112,11 @@ function displayChallengeList($challengeListResultset)
 		{
 			if($currentTier >= 0)
 			{
-				echo '</table>EndTier';
+				echo '</div>';
 			}
 			$currentTier = $challenge["challengeTier"];
 			echo "<div class='challengelist_tier'>Tier $currentTier</div>";
-			echo "<table class='challengelist_table'>\n";
+			echo "<div class='challengelist_table'>\n";
 		}
 		
 		//Each map gets it own row
@@ -84,7 +124,7 @@ function displayChallengeList($challengeListResultset)
 		{
 			if($currentMap >= 0)
 			{
-				echo '</td></tr>';
+				echo '</div>';
 			}
 			$currentMap = $challenge["mapID"];
 			
@@ -96,12 +136,14 @@ function displayChallengeList($challengeListResultset)
 			if($mapName == NULL || $mapName == "")
 				$mapName = "(unknown)";
 			
-			echo "<tr style='border:2px solid red;'>
-				<td class='challengelist_link' style='cursor:pointer' onclick='document.location.href=\"challenge?mapID=$currentMap\"'>
-					$thumbnail
+			echo "<div style='border:1px solid yellow; float:left; padding:5px; background-color: #222;'>
+				<div class='challengelist_link' style='cursor:pointer' onclick='document.location.href=\"challenge?mapID=$currentMap\"'>
+					
 					<a href='challenge?mapID=$currentMap'>$mapName</a>
-				</td>";
-			echo "<td class='challengelist_stars'>";
+					$thumbnail
+					
+				</div>";
+			echo "<div class='challengelist_stars'>";
 		}
 		
 		//Each challenge gets its own star
@@ -111,7 +153,7 @@ function displayChallengeList($challengeListResultset)
 			$cssClass = "challengelist_incomplete";
 		echo "<div class='$cssClass'></div>";
 	}
-	echo "</td></tr></table>";
+	echo "</div></div>";
 	echo "</div>";
 }
 ?>
\ No newline at end of file