Moved isCurrentMap function.

2 files changed, 16 insertions, 13 deletions

diff --git a/do.php b/do.php
index b999e52..48a2fb1 100644
--- a/do.php
+++ b/do.php
@@ -368,19 +368,6 @@ $json['error'][] = 'Rush-send failed';
 die(json_encode($json));

 

 

-function isCurrentMap($mapID) {

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

-	$sql = "SELECT mapID

-	FROM `mapOfTheDay`

-	WHERE `mapID` = '$mapID'

-	AND mapExpireTime > NOW()

-	LIMIT 1

-	";

-	

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

-	return (mysql_num_rows($result) != 0);

-}

-

 //Very simple, confirm that all targets are reachable.

 function ValidateMap($mygrid) {

 	$start = "0,1.";

diff --git a/includes/datas.php b/includes/datas.php
index c64edd6..b029375 100644
--- a/includes/datas.php
+++ b/includes/datas.php
@@ -978,4 +978,20 @@ function loadChallengeMapCode($mapIdUnsanitized)
 	}
 	return NULL;
 }
+
+
+function isCurrentMap($mapID) {
+	include_once('./includes/sqlEmbedded.php');
+	$sql = "SELECT mapID
+	FROM `mapOfTheDay`
+	WHERE `mapID` = '$mapID'
+	AND mapExpireTime > NOW()
+	LIMIT 1
+	";
+	
+	$result = mysql_query($sql) or die(mysql_error());
+	return (mysql_num_rows($result) != 0);
+}
+
+
 ?>