Preperation for cacheing scores.

1 files changed, 27 insertions, 143 deletions

diff --git a/ajax/scores.ajax.php b/ajax/scores.ajax.php
index 1404a19..f2d38fc 100644
--- a/ajax/scores.ajax.php
+++ b/ajax/scores.ajax.php
@@ -10,151 +10,35 @@ require('../includes/mapclass.php');
 require('../includes/datas.php');

 include_once('../includes/sqlEmbedded.php');

 

-if ($_GET['getmap'] == 'true') {

-	$mapID = $_GET['mapID'];

-	$code = getMapCode($mapID);

-	$map = GenerateMapByCode($code);

-	echo displaymap($map, $mapID);

-}

-

-

-if ($_GET['getscores'] == 'true') {

-

-}

-

-if ($_GET['getmaplist'] == 'true') {

-	$daysAgo = $_GET['daysago'];

-	//echo "$daysAgo";

-	$todaysScoreMaps = getMapsPlayed($daysAgo);

-	echo getMapNavigation($todaysScoreMaps);

-}

-

-if (isset($_GET['getmapidsbydate'])) {

-	//TODO: SANATIZE

-	$requestDate = $_GET['getmapidsbydate'];

-	echo json_encode(getMapIDsByDate($requestDate));

-}

-

-// Here is that SQL for you

-// SELECT correctMapIds.mapType, maps.ID, maps.code

-// FROM maps

-// INNER JOIN

-// (

-       // SELECT MIN(mapOfTheDay.mapId) AS mapId, mapOfTheDay.mapType

-       // FROM `mapOfTheDay`

-       // INNER JOIN

-       // (

-               // SELECT mapType, MIN(mapExpireTime) AS mapExpireTime

-               // FROM mapOfTheDay

-               // WHERE mapExpireTime > DATE_ADD(CURDATE(), INTERVAL -1 DAY)

-               // GROUP BY mapType

-       // ) AS expireTimes ON mapOfTheDay.mapType = expireTimes.mapType

-                                       // AND mapOfTheDay.mapExpireTime = expireTimes.mapExpireTime

-       // GROUP BY mapOfTheDay.mapType

-// ) AS correctMapIds ON maps.ID = correctMapIds.mapId

-

-//TODO: SANITIZE.

-function getMapIDsByDate($date) {

-	global $mysqli;

-$sql = "SELECT MIN(mapOfTheDay.mapId) AS mapId

-FROM `mapOfTheDay`

-INNER JOIN

-(

-	SELECT mapType, MIN(mapExpireTime) AS mapExpireTime

-	FROM mapOfTheDay

-	WHERE mapExpireTime > ?

-	GROUP BY mapType

-) AS expireTimes ON mapOfTheDay.mapType = expireTimes.mapType

-						AND mapOfTheDay.mapExpireTime = expireTimes.mapExpireTime

-GROUP BY mapOfTheDay.mapType";

-

-$stmt = $mysqli->prepare($sql);

-$stmt->bind_param("s", $date);

-$stmt->execute();

-

-    $stmt->bind_result($mapID);

-    /* fetch values */

-    while ($stmt->fetch()) {

-        $ids[] = $mapID;

-    }

-

-	 return $ids;

-

-var_dump($ids);

-

-

-while ($myrow[] = $result->fetch_assoc()) {}

-

-	$result = mysql_query($sql) or die(mysql_error());

-	if (mysql_num_rows($result) == 0) return -1;

-	global $mapNamesByType;

-	$r = array();

-	while($data[] = mysql_fetch_array($result)) {

-		$mapID = $data['mapID'];

-		$mapType = $data['mapType'];

-		$map = new map($code);

-		if ($map->name == '')

-			$map->name = $mapNamesByType[$mapType];

-		$r[$mapID] = $map;

+$tmp = explode('.', $_GET['r']);

+$args = explode('_', $tmp[0]);

+$mapID = $args[0] * 1;

+$page = $args[1] * 1;

+

+if (!is_int($mapID) OR !is_int($page)) return;

+

+//Include the notification text

+$json = getScores($mapID, $page, 10);

+$json['mapid'] = $mapID;

+$json['page'] = $page;

+

+//TODO: Show notifications someplace else!

+$note = false;

+if ($_SESSION['accepted'] == 1) {

+	$userID = $_SESSION['userID'];

+	$note = getNotified($userID);

+} else {

+	if ($_SESSION['preCompletedTutorial'] == true && $_SESSION['preCompletedTutorialNotified'] == false) {

+		$_SESSION['preCompletedTutorialNotified'] = true;

+		$note = "<strong>Tutorial Completed!</strong>";

+		$note .= "<center>You've unlocked: Blue Wall Color!";

+		$note .= "<table><tr><td onclick='changeWallColor(\"#4444ff\")' style='background-color:#4444ff;' class='grid_td_rocks'></td></tr></table>";

+		$note .= '<br /><a href="javascript:showSignin();"><strong>Sign in</strong></a> to save your progress!<br />';

+		$note .= "</center>";

 	}

-	return $myrow;

 }

+if ($note !== false) $json['notificationtext'] = $note;

 

-	

-function getMapsPlayed($daysAgo) {

-	// $sql = "

-	// SELECT `mapID`, `code`, `mapType`

-	// FROM `mapOfTheDay`

-	// INNER JOIN `maps` ON `mapID` = maps.ID

-	// WHERE DATE_ADD(CURDATE(), INTERVAL -$daysAgo DAY) =    

-	// mapDate AND

-	// `mapType` IN (1, 2, 3, 4, 5)

-	// ";

-	

-	$sql = "SELECT correctMapIds.mapType, maps.ID as mapID, maps.code

-FROM maps

-INNER JOIN

-(

-       SELECT MIN(mapOfTheDay.mapId) AS mapId, mapOfTheDay.mapType

-       FROM `mapOfTheDay`

-       INNER JOIN

-       (

-               SELECT mapType, MIN(mapExpireTime) AS mapExpireTime

-               FROM mapOfTheDay

-               WHERE mapExpireTime > DATE_ADD(CURDATE(), INTERVAL -$daysAgo DAY)

-               GROUP BY mapType

-       ) AS expireTimes ON mapOfTheDay.mapType = expireTimes.mapType

-                                       AND mapOfTheDay.mapExpireTime = expireTimes.mapExpireTime

-       GROUP BY mapOfTheDay.mapType

-) AS correctMapIds ON maps.ID = correctMapIds.mapId";

-	

-	$result = mysql_query($sql) or die(mysql_error());

-	if (mysql_num_rows($result) == 0)

-		return -1;

-	global $mapNamesByType;

-	$r = array();

-	while($data = mysql_fetch_array($result)) {

-		$code = $data['code'];

-		$mapID = $data['mapID'];

-		$mapType = $data['mapType'];

-		$map = new map($code);

-		if ($map->name == '') $map->name = $mapNamesByType[$mapType];

-		$r[$mapID] = $map;

-

-	}

-	return $r;

-}

-

-function getMapNavigation(&$maps) {

-	foreach ($maps as $mapID => &$map) {

-		$r .= "<div class='mapThumbnail' onclick='displayMap($mapID)'>";

-		$r .= $map->name;

-		$r .= DisplayMapThumbnail($map);

-		$r .= "</div>";;

-	}

-	return $r;

-}

-

-

+echo json_encode($json);

 

 ?>
\ No newline at end of file