--- loncom/homework/lonhomework.pm	2004/09/18 17:29:29	1.179
+++ loncom/homework/lonhomework.pm	2004/10/18 18:08:54	1.182
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # The LON-CAPA Homework handler
 #
-# $Id: lonhomework.pm,v 1.179 2004/09/18 17:29:29 albertel Exp $
+# $Id: lonhomework.pm,v 1.182 2004/10/18 18:08:54 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -292,7 +292,7 @@ sub check_access {
 	    $status = 'CANNOT_ANSWER';
 	}
     }
-    if ($status eq 'CAN_ANSWER') {
+    if ($status eq 'CAN_ANSWER' || $status eq 'CANNOT_ANSWER') {
 	my $interval=&Apache::lonnet::EXT("resource.$id.interval");
 	&Apache::lonxml::debug("looking for interval $interval");
 	if ($interval) {
@@ -489,6 +489,7 @@ sub analyze {
     for(my $i=1;$i<$ENV{'form.numtoanalyze'}+1;$i++) {
 	&Apache::lonhtmlcommon::Increment_PrgWin($request,\%prog_state,
 						 &mt('last problem'));
+	if (&Apache::loncommon::connection_aborted($request)) { return; }
 	my $subresult=&Apache::lonnet::ssi($request->uri,
 					   ('grade_target' => 'analyze'),
 					   ('rndseed' => $i+$rndseed));
@@ -755,9 +756,7 @@ sub handler {
     if (&setupheader($request)) { return OK; }
     $ENV{'request.uri'}=$request->uri;
 
-    #setup permissions
-    $Apache::lonhomework::browse= &Apache::lonnet::allowed('bre',$ENV{'request.filename'});
-    $Apache::lonhomework::viewgrades=&Apache::lonnet::allowed('vgr',$ENV{'request.course.id'});
+    &setuppermissions();
     &Apache::lonxml::debug("Permissions:$Apache::lonhomework::browse:$Apache::lonhomework::viewgrades:");
     # some times multiple problemmodes are submitted, need to select
     # the last one