1 files changed, 10 insertions, 9 deletions

diff --git a/includes/playerStats.php b/includes/playerStats.php
index c429f14..f02c300 100644
--- a/includes/playerStats.php
+++ b/includes/playerStats.php
@@ -13,7 +13,7 @@ function setHighScoreFlags($mapExpireTime)
 	UPDATE solutions AS s1
 	INNER JOIN mapOfTheDay ON s1.mapID = mapOfTheDay.mapID
 	SET s1.isHighScore = 1
-	WHERE mapOfTheDay.mapExpireTime < NOW()
+	WHERE mapOfTheDay.mapExpireTime <= NOW()
 	AND mapOfTheDay.mapExpireTime >= '$mapExpireTime'
 	AND s1.ID =
 	(
@@ -37,7 +37,7 @@ function setHighScoreFlags($mapExpireTime)
 	INNER JOIN mapOfTheDay ON mapOfTheDay.mapID = solutions.mapID
 	SET solutions.isTiedForHighScore = 1
 	WHERE mapOfTheDay.mapExpireTime >= '$mapExpireTime'
-	AND mapOfTheDay.mapExpireTime < NOW()
+	AND mapOfTheDay.mapExpireTime <= NOW()
 	AND solutions.moves = maxMoves.moves
 	";
 	
@@ -79,6 +79,7 @@ function calculateMapsChampionPointWorth($mapExpireTime)
 		WHERE solutions.mapID = mapOfTheDay.mapID
 	))
 	WHERE mapExpireTime >= '$mapExpireTime'
+	AND mapExpireTime <= NOW()
 	";
 	
 	mysql_query($sql);
@@ -103,7 +104,7 @@ function addPlayerChampionPointsForMapsOfTheDay($mapExpireTime)
 	INNER JOIN mapOfTheDay ON mapOfTheDay.mapID = solutions.mapID
 	SET solutions.championPointsWorth = mapOfTheDay.championPointsWorth
 	WHERE mapOfTheDay.mapExpireTime >= '$mapExpireTime'
-	AND mapOfTheDay.mapExpireTime < NOW()
+	AND mapOfTheDay.mapExpireTime <= NOW()
 	AND mapOfTheDay.mapType <> 5
 	AND solutions.isTiedForHighScore
 	";
@@ -129,7 +130,7 @@ function addPlayerChampionPointsForMapsOfTheDay($mapExpireTime)
 		WHERE usersSolutions.ID = solutions.ID
 	)
 	WHERE mapOfTheDay.mapExpireTime >= '$mapExpireTime'
-	AND mapOfTheDay.mapExpireTime < NOW()
+	AND mapOfTheDay.mapExpireTime <= NOW()
 	AND mapOfTheDay.mapType = 5
 	";
 	
@@ -140,7 +141,7 @@ function addPlayerChampionPointsForMapsOfTheDay($mapExpireTime)
 	SET championPointsWorth = ".CP_POINTS_FOR_ATTEMPTING."
 	WHERE championPointsWorth = 0
 	AND mapOfTheDay.mapExpireTime >= '$mapExpireTime'
-	AND mapOfTheDay.mapExpireTime < NOW()
+	AND mapOfTheDay.mapExpireTime <= NOW()
 	";
 	
 	$sql4 = "
@@ -150,7 +151,7 @@ function addPlayerChampionPointsForMapsOfTheDay($mapExpireTime)
 	SET solutions.championPointsWorth = solutions.championPointsWorth * (1 + ".CP_EXTRA_PERCENT_FOR_FIRST.")
 	WHERE solutions.isHighScore = 1
 	AND mapOfTheDay.mapExpireTime >= '$mapExpireTime'
-	AND mapOfTheDay.mapExpireTime < NOW()
+	AND mapOfTheDay.mapExpireTime <= NOW()
 	";
 	
 	//TODO: Points for doing challenges too
@@ -218,7 +219,7 @@ function addOtherStats($mapExpireTime)
 		FROM solutions
 		INNER JOIN mapOfTheDay ON solutions.mapID = mapOfTheDay.mapID
 		WHERE mapOfTheDay.mapExpireTime >= '$mapExpireTime'
-		AND mapOfTheDay.mapExpireTime < NOW()
+		AND mapOfTheDay.mapExpireTime <= NOW()
 		GROUP BY solutions.userID
 	) AS newPoints ON users.ID = newPoints.userID
 	SET users.totalWins = users.totalWins + newPoints.totalWins,
@@ -236,7 +237,7 @@ function addOtherStats($mapExpireTime)
  */
 function addStatsForYesterdaysMaps()
 {
-	$today = time();
+	$today = strtotime('today');
 	addStatsForDateTimeInternal($today);
 }
 
@@ -245,7 +246,7 @@ function addStatsForYesterdaysMaps()
  */
 function addStatsForMiddayMaps()
 {
-	$noonToday = strtotime('noon', time());
+	$noonToday = strtotime('noon');
 	addStatsForDateTimeInternal($noonToday);
 }