Cleanups for bug 1117

diff --git a/user/view.php b/user/view.php
index 64bd305db6d897d308e4534b8b3de8dae063b376..7350a86b7c4189df61a79c6def046be97a8fbb9b 100644 (file)
--- a/user/view.php
+++ b/user/view.php
@@ -35,22 +35,15 @@
     $personalprofile = get_string("personalprofile");
     $participants = get_string("participants");
 
-    $groupmode = groupmode($course);
-
-    if ($groupmode and !isteacheredit($course->id)) {   // Groups must be kept separate
-        if ($groupmode == SEPARATEGROUPS) {
-            require_login();
-
-            if (!ismember($USER->groupmember[$course->id], $user->id)) {
-                print_header("$personalprofile: ", "$personalprofile: ",
-                             "<a href=\"../course/view.php?id=$course->id\">$course->shortname</a> ->
-                              <a href=\"index.php?id=$course->id\">$participants</a>",
-                              "", "", true, "&nbsp;", navmenu($course));
-                print_heading("Sorry, you can't see this user because you are not in his group");
-                print_footer();
-                die;
-            }
-
+    if (groupmode($course) == SEPARATEGROUPS and !isteacheredit($course->id)) {   // Groups must be kept separate
+        require_login();
+
+        if (!ismember(mygroupid($course->id), $user->id)) {
+            print_header("$personalprofile: ", "$personalprofile: ",
+                         "<a href=\"../course/view.php?id=$course->id\">$course->shortname</a> ->
+                          <a href=\"index.php?id=$course->id\">$participants</a>",
+                          "", "", true, "&nbsp;", navmenu($course));
+            error(get_string("groupnotamember"), "../course/view.php?id=$course->id");
         }
     }
 
@@ -64,6 +57,7 @@
                      "$fullname", "", "", true, "&nbsp;", navmenu($course));
     }
 
+
     if ($course->category and ! isguest() ) {
         if (!isstudent($course->id, $user->id) && !isteacher($course->id, $user->id)) {
             print_heading(get_string("notenrolled", "", $fullname));