From af40722cc5d789badef51e89fdb2b5679bdf7b22 Mon Sep 17 00:00:00 2001
From: danmarsden <danmarsden>
Date: Tue, 5 Apr 2005 00:35:05 +0000
Subject: [PATCH] Fix for Bug #2435 - Hidden teachers and site admins are shown
 in no response list.

---
 mod/choice/report.php | 12 +++++++-----
 mod/choice/view.php   | 12 +++++++-----
 2 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/mod/choice/report.php b/mod/choice/report.php
index 15fe993ae6b..617a56c887e 100644
--- a/mod/choice/report.php
+++ b/mod/choice/report.php
@@ -113,11 +113,13 @@
 
                 echo "<table width=\"100%\">";
                 foreach ($userlist as $user) {
-                    echo "<tr><td width=\"10\" nowrap=\"nowrap\">";
-                    print_user_picture($user->id, $course->id, $user->picture);
-                    echo "</td><td width=\"100%\" nowrap=\"nowrap\">";
-                    echo "<p>".fullname($user, true)."</p>";
-                    echo "</td></tr>";
+                    if (!($optionid==0 && isadmin($user->id)) && !($optionid==0 && isteacher($course->id, $user->id) && !(isteacheredit($course->id, $user->id)) )  ) { //make sure admins and hidden teachers are not shown in not answered yet column.
+                        echo "<tr><td width=\"10\" nowrap=\"nowrap\">";
+                        print_user_picture($user->id, $course->id, $user->picture);
+                        echo "</td><td width=\"100%\" nowrap=\"nowrap\">";
+                        echo "<p>".fullname($user, true)."</p>";
+                        echo "</td></tr>";
+                    }
                 }
                 echo "</table>";
 
diff --git a/mod/choice/view.php b/mod/choice/view.php
index ff8dbd462a1..84d67dd7573 100644
--- a/mod/choice/view.php
+++ b/mod/choice/view.php
@@ -245,11 +245,13 @@
 
                 echo "<table width=\"100%\">";
                 foreach ($userlist as $user) {
-                    echo "<tr><td width=\"10\" nowrap=\"nowrap\">";
-                    print_user_picture($user->id, $course->id, $user->picture);
-                    echo "</td><td width=\"100%\" nowrap=\"nowrap\">";
-                    echo "<p>".fullname($user, $isteacher)."</p>";
-                    echo "</td></tr>";
+                    if (!($optionid==0 && isadmin($user->id)) && !($optionid==0 && isteacher($course->id, $user->id) && !(isteacheredit($course->id, $user->id)) )  ) { //make sure admins and hidden teachers are not shown in not answered yet column.
+                        echo "<tr><td width=\"10\" nowrap=\"nowrap\">";
+                        print_user_picture($user->id, $course->id, $user->picture);
+                        echo "</td><td width=\"100%\" nowrap=\"nowrap\">";
+                        echo "<p>".fullname($user, $isteacher)."</p>";
+                        echo "</td></tr>";
+                    }
                 }
                 echo "</table>";