From 09d59e739812e353616359f4ef0f388ddefb1ae7 Mon Sep 17 00:00:00 2001
From: BlueRaja <BlueRaja.admin@gmail.com>
Date: Thu, 24 Jan 2013 04:18:05 -0600
Subject: 'moves in past week' should correctly include weekly maps, even when
 offset by 12 hours

---
 pages/memberlist.php | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/pages/memberlist.php b/pages/memberlist.php
index c447f1c..cf5f3bd 100644
--- a/pages/memberlist.php
+++ b/pages/memberlist.php
@@ -65,9 +65,13 @@ $sql = "SELECT
   users.ID,
   users.displayName,
   users.totalMoves,
-  (SELECT SUM(moves) FROM solutions
-		WHERE solutions.userID = users.ID AND
-		solutions.dateModified BETWEEN DATE_SUB(CURRENT_DATE, INTERVAL 7 DAY) AND CURRENT_DATE) AS totalMovesThisWeek,
+  (
+    SELECT SUM(moves)
+	FROM solutions
+	INNER JOIN mapOfTheDay ON solutions.mapID = mapOfTheDay.mapID
+	WHERE solutions.userID = users.ID
+	AND mapOfTheDay.mapExpireTime BETWEEN DATE_SUB(NOW(), INTERVAL 7 DAY) AND NOW()
+  ) AS totalMovesThisWeek,
   users.totalMazes,
   users.totalWins,
   users.totalTies,
-- 
cgit v1.2.3