Changeset 1117

Timestamp:

03/21/10 19:31:48 (2 years ago)

Author:

bogdan2412

Message:

Fix Rankings macro crash when user doesn't have permissions to view.

Location:

trunk

Files:

• common/db/score.php (modified) (3 diffs)
• www/macros/macro_rankings.php (modified) (1 diff)

trunk/common/db/score.php

@@ -97 +97 @@
 function score_get_count($user, $task, $round) {
     $where = score_build_where_clauses($user, $task, $round);
+    if (count($where) == 0) {
+        return 0;
+    }
     $query = sprintf("SELECT COUNT(DISTINCT user_id) AS `cnt`
             FROM ia_score_user_round
@@ -362 +365 @@
 function score_get_rankings($rounds, $tasks, $start = 0, $count = 999999,
                             $detail_task = false, $detail_round = false) {
-    if (count($rounds) == 0) {
+    $where = score_build_where_clauses(null, null, $rounds);
+    if (count($where) == 0) {
         return array();
     }
-    $where = score_build_where_clauses(null, null, $rounds);
 
     // Get the total score for all rounds
@@ -442 +445 @@
         //task columns
         if ($detail_task == true) {
-            foreach ($tasks as $task) {
-                $task_id = $task['id'];
+            foreach ($tasks as $task_id) {
                 if (isset($task_scores[$user_id][$task_id])) {
                     $score = $task_scores[$user_id][$task_id];

trunk/www/macros/macro_rankings.php

@@ -92 +92 @@
                         'title' => $task['title']
                     ));
-                    array_push($tasks, $task);
+                    array_push($tasks, $task['id']);
                 }
             }