Diff for /loncom/homework/lonhomework.pm between versions 1.57 and 1.61

version 1.57, 2001/08/20 23:31:07 version 1.61, 2001/10/31 17:44:42
Line 10  use Apache::lonxml; Line 10  use Apache::lonxml;
 use Apache::lonnet;  use Apache::lonnet;
 use Apache::inputtags;  use Apache::inputtags;
 use Apache::structuretags;  use Apache::structuretags;
   use Apache::randomlabel;
 use Apache::response;  use Apache::response;
 use Apache::hint;  use Apache::hint;
 use Apache::outputtags;  use Apache::outputtags;
Line 37  sub get_target { Line 38  sub get_target {
     } else {      } else {
       if ( $ENV{'form.problemmode'} eq 'View' ) {        if ( $ENV{'form.problemmode'} eq 'View' ) {
  if ( defined $ENV{'form.submitted'}) {   if ( defined $ENV{'form.submitted'}) {
   return ('grade', 'web');    return ('grade', 'web','answer');
  } else {   } else {
   return ('web');    return ('web','answer');
  }   }
       } elsif ( $ENV{'form.problemmode'} eq 'Edit' ) {        } elsif ( $ENV{'form.problemmode'} eq 'Edit' ) {
  if ( $ENV{'form.submitted'} eq 'edit' ) {   if ( $ENV{'form.submitted'} eq 'edit' ) {
Line 152  sub check_access { Line 153  sub check_access {
   return ($status,$datemsg);    return ($status,$datemsg);
 }  }
   
 # ----------------------------------------------------------------- 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);  
 }  
   
 sub showhash {  sub showhash {
   my (%hash) = @_;    my (%hash) = @_;
   my $resultkey;    my $resultkey;
Line 197  sub setupheader { Line 176  sub setupheader {
   } else {    } else {
     $request->content_type('text/html');      $request->content_type('text/html');
   }    }
     &Apache::loncommon::no_cache($request);
   $request->send_http_header;    $request->send_http_header;
   return OK if $request->header_only;    return OK if $request->header_only;
   return ''    return ''
Line 250  sub renderpage { Line 230  sub renderpage {
     if ($target eq 'web') {      if ($target eq 'web') {
       if (&Apache::lonnet::symbread() eq '') {        if (&Apache::lonnet::symbread() eq '') {
  if ($ENV{'request.state'} eq "construct") {   if ($ENV{'request.state'} eq "construct") {
   $request->print("In construction space, submissions ignored<br />");  
  } else {   } else {
   $request->print("Browsing or <a href=\"/adm/ambiguous\">ambiguous</a> reference, submissions ignored<br />");    $request->print("Browsing or <a href=\"/adm/ambiguous\">ambiguous</a> reference, submissions ignored<br />");
  }   }

Removed from v.1.57  
changed lines
  Added in v.1.61


FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>