Finally fixed those annoying 'loginas' links on the main user listing

diff --git a/lib/weblib.php b/lib/weblib.php
index d605d1742eb053ec31ee2c2d8787ff6d2b9259b0..9b013a7895c3e3a56b4e0f0cbd816ddebe5c4947 100644 (file)
--- a/lib/weblib.php
+++ b/lib/weblib.php
@@ -1244,9 +1244,13 @@ function print_user($user, $course) {
     if ($isteacher) {
         $timemidnight = usergetmidnight(time());
         echo "<a href=\"$CFG->wwwroot/course/user.php?id=$course->id&user=$user->id\">$string->activity</a><br>";
-        if (isstudent($course->id, $user->id) and !iscreator($user->id)) {  // Includes admins
-            echo "<a href=\"$CFG->wwwroot/course/unenrol.php?id=$course->id&user=$user->id\">$string->unenrol</a><br />";
-            echo "<a href=\"$CFG->wwwroot/course/loginas.php?id=$course->id&user=$user->id\">$string->loginas</a><br />";
+        if (!iscreator($user->id)) {  // Includes admins
+            if (isstudent($course->id, $user->id)) {  // Includes admins
+                echo "<a href=\"$CFG->wwwroot/course/unenrol.php?id=$course->id&user=$user->id\">$string->unenrol</a><br />";
+            }
+            if ($USER->id != $user->id) {
+                echo "<a href=\"$CFG->wwwroot/course/loginas.php?id=$course->id&user=$user->id\">$string->loginas</a><br />";
+            }
         }
     } 
     echo "<a href=\"$CFG->wwwroot/user/view.php?id=$user->id&course=$course->id\">$string->fullprofile...</a>";