--- loncom/homework/lonhomework.pm	2001/01/09 19:50:14	1.29
+++ loncom/homework/lonhomework.pm	2001/02/19 20:35:21	1.39
@@ -12,18 +12,19 @@ use Apache::inputtags;
 use Apache::structuretags;
 use Apache::response;
 use Apache::hint;
+use Apache::outputtags;
 use Apache::Constants qw(:common);
 
 sub get_target {
   if ( $ENV{'request.state'} eq "published") {
-    if ( defined $ENV{'form.submit'}) {
+    if ( defined $ENV{'form.submitted'}) {
       return ('grade', 'web');
     } else {
       return ('web');
     }
   } elsif ($ENV{'request.state'} eq "construct") {
     if ( defined $ENV{'form.preview'}) {
-      if ( defined $ENV{'form.submit'}) {
+      if ( defined $ENV{'form.submitted'}) {
 	return ('grade', 'web');
       } else {
 	return ('web');
@@ -50,14 +51,23 @@ sub send_header {
 #  $request->print('<form name='.$ENV{'form.request.prefix'}.'lonhomework method="POST" action="'.$request->uri.'">');
 }
 
+sub createmenu {
+  my ($which,$request)=@_;
+  if ($which eq 'grade') {
+    $request->print('<script language="JavaScript"> 
+          hwkmenu=window.open("/res/adm/pages/homeworkmenu.html","homeworkremote",
+                 "height=350,width=150,menubar=no");
+          </script>');
+  }
+}
+
 sub send_footer {
   my ($request)= @_;
 #  $request->print('</form>');
   $request->print(&Apache::lontexconvert::footer());
 }
 
-#@Apache::lonhomework::date_status=();
-#@Apache::lonhomework::date_msg=();
+$Apache::lonxml::browse='';
 sub check_date {
   my ($id) = @_;
   my $date ='';
@@ -74,6 +84,8 @@ sub check_date {
     &Apache::lonxml::debug("found :$date: for :$temp:");
     if ($date eq '') {
       $date = "an unknown date"; $passed = 0;
+    } elsif ($date eq 'con_lost') {
+      $date = "an indeterminate date"; $passed = 0;
     } else {
       if (time < $date) { $passed = 0; } else { $passed = 1; }
       $date = localtime $date;
@@ -92,7 +104,7 @@ sub check_date {
     $datemsg = "is due at $date";
   } elsif ($type eq 'answerdate') {
     $status='CLOSED';
-    $datemsg = "was due as $lastdate, and answers will be available at $date";
+    $datemsg = "was due on $lastdate, and answers will be available on $date";
   }
   if ($status eq 'CAN_ANSWER') {
     #check #tries
@@ -103,6 +115,11 @@ sub check_date {
     if ($tries >= $maxtries) { $status = 'CANNOT_ANSWER'; } 
   }
   &Apache::lonxml::debug("sending back :$status:$datemsg:");
+  if (($Apache::lonhomework::browse eq 'F') && ($status eq 'CLOSED')) {
+    &Apache::lonxml::debug("should be allowed to browse a resource when closed");
+    $status='CAN_ANSWER';
+    $datemsg='is closed but you are allowed to view it';
+  }
   if ($ENV{'request.state'} eq "construct") {
     &Apache::lonxml::debug("in construction ignoring dates");
     $status='CAN_ANSWER';
@@ -113,8 +130,8 @@ sub check_date {
 
 sub handler {
   my $request=$_[0];
-
-  if ( $ENV{'user.name'} eq 'albertel' ) { $Apache::lonxml::debug=1; }
+  
+ if ( $ENV{'user.name'} eq 'albertel' ) {$Apache::lonxml::debug=1;} else {$Apache::lonxml::debug=0;}
   
   my (@targets) = &get_target();
 
@@ -125,10 +142,22 @@ sub handler {
   }
   $request->send_http_header;
   return OK if $request->header_only;
-  
+
+  #setup permissions
+  $Apache::lonhomework::browse= &Apache::lonnet::allowed('bre',$ENV{'request.filename'});
+  $Apache::lonhomework::viewgrades=&Apache::lonnet::allowed('vgr',$ENV{'request.course.id'});
+
+  #check if we know where we are
+  if ($ENV{'request.course.fn'} && !&Apache::lonnet::symbread()) { 
+    # if we are browsing we might not be able to know where we are
+    if ($Apache::lonhomework::browse ne 'F') {
+      #should know where we are, so ask
+      $request->internal_redirect('/adm/ambiguous'); return; 
+    }
+  }
+
   &Apache::lonhomework::send_header($request);
-  
-  #check if allowed to see
+  &Apache::lonxml::debug("Permissions:$Apache::lonhomework::browse:$Apache::lonhomework::viewgrades:");
   
   foreach my $target (@targets) {
     my $file=&Apache::lonnet::filelocation("",$request->uri);
@@ -146,15 +175,22 @@ sub handler {
     #ignore error conditions
     my ($temp)=keys %Apache::lonhomework::history ;
     if ($temp =~ m/^error:.*/) { %Apache::lonhomework::history=(); } 
-    if ($target eq 'web' && &Apache::lonnet::symbread() eq '') {
-      $request->print("Vieiwing this problem as not a student, submissions will be ignored.");
+    if ($target eq 'web') {
+      if (&Apache::lonnet::symbread() eq '') {
+	if ($ENV{'request.state'} eq "construct") {
+	  $request->print("In construction space, submissions ignored<br />");
+	} else {
+	  $request->print("Browsing or <a href=\"/adm/ambiguous\">ambiguous</a> reference, submissions ignored<br />");
+	}
+      }
+      if ($Apache::lonhomework::viewgrades eq 'F') {&createmenu('grade',$request); }
     }
     if ($target eq 'grade') {
       my $resultkey;
       foreach $resultkey (sort keys %Apache::lonhomework::history) {
 	&Apache::lonxml::debug("$resultkey ---- $Apache::lonhomework::history{$resultkey}");
       }
-      &Apache::lonxml::debug("\n<br>restored values^</br>\n");
+      &Apache::lonxml::debug("\n<br />restored values^</br>\n");
     }
     my $default=&Apache::lonnet::getfile('/home/httpd/html/res/adm/includes/default_homework.lcpm');
     if ($default == -1) {
@@ -173,7 +209,7 @@ sub handler {
       foreach $resultkey (sort keys %Apache::lonhomework::results) {
 	&Apache::lonxml::debug("$resultkey ---- $Apache::lonhomework::results{$resultkey}");
       }
-      &Apache::lonxml::debug("\n<br>storing values^</br>\n");
+      &Apache::lonxml::debug("\n<br />storing values^</br>\n");
     }
     
     my ($temp) = keys %Apache::lonhomework::results;