From b6dc90e3f658a8201424aafec8e304c74d981022 Mon Sep 17 00:00:00 2001
From: BlueRaja <BlueRaja.admin@gmail.com>
Date: Thu, 24 Jan 2013 03:04:26 -0600
Subject: Added a 'mapExpireTime' column to mapOfTheDay table, to simply a lot
 of SQL

---
 do.php | 26 ++++++--------------------
 1 file changed, 6 insertions(+), 20 deletions(-)

(limited to 'do.php')

diff --git a/do.php b/do.php
index 1009a91..a43b4ee 100644
--- a/do.php
+++ b/do.php
@@ -372,30 +372,16 @@ die(json_encode($json));
 
 
 function isCurrentMap($mapID) {
-	// TODO: change methodology
 	include_once('./includes/sqlEmbedded.php');
-	$sql = "SELECT maps.ID
+	$sql = "SELECT mapID
 	FROM `mapOfTheDay`
-	LEFT JOIN `maps` ON maps.ID = `mapID`
-	WHERE 
-		`mapID` = '$mapID' AND
-		(
-			( 
-				DATEDIFF(CURDATE(), mapOfTheDay.mapDate) < 1 AND
-				`mapType` IN (1, 2, 3, 4)
-			)
-		OR
-			(
-				DATEDIFF(CURDATE(), mapOfTheDay.mapDate) < 2 AND
-				`mapType` IN (5)
-			)
-		)
+	WHERE `mapID` = '$mapID'
+	AND mapExpireTime > NOW()
+	LIMIT 1
 	";
+	
 	$result = mysql_query($sql) or die(mysql_error());
-	if (mysql_num_rows($result) == 0)
-		return false;
-	else
-		return true;
+	return (mysql_num_rows($result) != 0);
 }
 
 //Very simple, confirm that all targets are reachable.
-- 
cgit v1.2.3