--- loncom/xml/lonxml.pm	2001/08/21 17:21:50	1.122
+++ loncom/xml/lonxml.pm	2001/08/22 19:21:36	1.123
@@ -738,12 +738,8 @@ sub init_safespace {
 # $safeeval->deny(":base_orig");
   $safeinit .= ';$external::target="'.$target.'";';
   my $rndseed;
-  if (defined(&Apache::lonhomework::whichuser)) {
-    my ($symb,$courseid,$domain,$name) = &Apache::lonhomework::whichuser();
-    $rndseed=&Apache::lonnet::rndseed($symb,$courseid,$domain,$name);
-  } else {
-    $rndseed=&Apache::lonnet::rndseed();
-  }
+  my ($symb,$courseid,$domain,$name) = &Apache::lonxml::whichuser();
+  $rndseed=&Apache::lonnet::rndseed($symb,$courseid,$domain,$name);
   $safeinit .= ';$external::randomseed='.$rndseed.';';
   &Apache::run::run($safeinit,$safeeval);
 }
@@ -1125,6 +1121,29 @@ sub description {
   my ($token)=@_;
   return $insertlist{$insertlist{"$token->[1].num"}.'.description'};
 }
+
+# ----------------------------------------------------------------- whichuser
+# returns a list of $symb, $courseid, $domain, $name that is correct for
+# calls to lonnet functions for this setup.
+# - looks for form.grade_ parameters
+sub whichuser {
+  my $symb=&Apache::lonnet::symbread();
+  my $courseid=$ENV{'request.course.id'};
+  my $domain=$ENV{'user.domain'};
+  my $name=$ENV{'user.name'};
+  if (defined($ENV{'form.grade_symb'})) {
+    my $tmp_courseid=$ENV{'form.grade_courseid'};
+    my $allowed=&Apache::lonnet::allowed('mgr',$tmp_courseid);
+    if ($allowed) {
+      $symb=$ENV{'form.grade_symb'};
+      $courseid=$ENV{'form.grade_courseid'};
+      $domain=$ENV{'form.grade_domain'};
+      $name=$ENV{'form.grade_username'};
+    }
+  }
+  return ($symb,$courseid,$domain,$name);
+}
+
 1;
 __END__