diff options
author | BlueRaja <BlueRaja.admin@gmail.com> | 2013-01-15 22:36:27 -0600 |
---|---|---|
committer | BlueRaja <BlueRaja.admin@gmail.com> | 2013-01-15 22:36:27 -0600 |
commit | 3990b65956331263b0963f695ddc88b4c3356af0 (patch) | |
tree | 5a6c3c84f201c054437f056c6b13372becea260f /includes/datas.php | |
parent | c7d671712a9d5f90752475960c3a602aeb0da8d0 (diff) | |
download | pathery-3990b65956331263b0963f695ddc88b4c3356af0.tar.xz |
Added totalMoves and totalMazes to users; and isTiedForHighScore to solutions (for convenience)
Diffstat (limited to 'includes/datas.php')
-rw-r--r-- | includes/datas.php | 34 |
1 files changed, 12 insertions, 22 deletions
diff --git a/includes/datas.php b/includes/datas.php index cdaf0c8..4415eb4 100644 --- a/includes/datas.php +++ b/includes/datas.php @@ -188,10 +188,9 @@ function getNotified($userID) { // Usage example: applyCareerAchievement($userID); // TODO: DEPRECIATED function applyCareerPathAchievements($userID) { - $sql = "SELECT - SUM(solutions.moves) as totalMoves - FROM `solutions` - WHERE userID = '$userID'"; + $sql = "SELECT totalMoves + FROM `users` + WHERE ID = '$userID'"; $result = mysql_query($sql); // --------- User hasn't played yet. @@ -558,18 +557,17 @@ function getAchievementCurrency($userID, $aType) { // 4, Champion Points! $r = 0; $sql = ''; + //TODO: These can all be combined into a single query... switch ($aType) { case 1: - $sql = "SELECT - SUM(solutions.moves) as t - FROM `solutions` - WHERE userID = '$userID'"; + $sql = "SELECT totalMoves AS t + FROM `users` + WHERE `ID` = '$userID'"; break; case 2: - $sql = "SELECT - COUNT(*) as t - FROM `solutions` - WHERE userID = '$userID'"; + $sql = "SELECT totalMazes as t + FROM `users` + WHERE `ID` = '$userID'"; break; case 3: $sql = "SELECT totalTies @@ -741,21 +739,13 @@ function getMembers($order, $pageNumber = 1, $pageDivide = 50) { SELECT users.ID as ID, users.displayName as display, - IfNull( - (SELECT SUM(moves) FROM solutions - WHERE solutions.userID = users.ID AND - solutions.dateModified < CURRENT_DATE) - , 0) AS totalMoves, + users.totalMoves, IfNull( (SELECT SUM(moves) FROM solutions WHERE solutions.userID = users.ID AND solutions.dateModified BETWEEN DATE_SUB(CURRENT_DATE, INTERVAL 7 DAY) AND CURRENT_DATE) , 0) AS totalMovesThisWeek, - IfNull( - (SELECT COUNT(*) FROM solutions - WHERE solutions.userID = users.ID AND - solutions.dateModified < CURRENT_DATE) - , 0) AS totalMazes, + users.totalMazes, users.totalWins, users.totalTies, IfNull(userData.wallColor, '#666666') as wallColor, |