--- loncom/interface/spreadsheet/lonspreadsheet.pm 2003/06/19 16:04:06 1.13
+++ loncom/interface/spreadsheet/lonspreadsheet.pm 2004/02/24 20:52:20 1.35
@@ -1,5 +1,5 @@
#
-# $Id: lonspreadsheet.pm,v 1.13 2003/06/19 16:04:06 matthew Exp $
+# $Id: lonspreadsheet.pm,v 1.35 2004/02/24 20:52:20 matthew Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -54,12 +54,16 @@ built-in functions.
package Apache::lonspreadsheet;
use strict;
+use warnings FATAL=>'all';
+no warnings 'uninitialized';
use Apache::classcalc();
use Apache::studentcalc();
use Apache::assesscalc();
use Apache::Constants qw(:common :http);
use Apache::lonnet;
use Apache::lonhtmlcommon;
+use Apache::lonlocal;
+use Apache::loncoursedata();
use HTML::Entities();
##
@@ -68,8 +72,8 @@ use HTML::Entities();
sub textfield {
my ($title,$name,$value)=@_;
- return "\n
$title:
".
- '';
+ return "\n
$title:
".
+ '';
}
sub hiddenfield {
@@ -79,11 +83,11 @@ sub hiddenfield {
sub selectbox {
my ($title,$name,$value,%options)=@_;
- my $selout="\n
$title:
".'\n
| \n\n";
#
$result .=<
+
+ -->
+
END
return ($result,$message);
}
@@ -200,7 +211,7 @@ sub handler {
# HTML Header
#
if ($r->header_only) {
- $r->content_type('text/html');
+ &Apache::loncommon::content_type($r,'text/html');
$r->send_http_header;
return OK;
}
@@ -214,11 +225,22 @@ sub handler {
$r->uri.":opa:0:0:Cannot modify spreadsheet";
return HTTP_NOT_ACCEPTABLE;
}
+ my $courseid = $ENV{'request.course.id'};
+ #
+ # Do not allow students to continue if standard or external grading is in
+ # effect.
+ #
+ if ($ENV{'request.role'} =~ /^st\./) {
+ if ($ENV{'course.'.$courseid.'.grading'} eq 'standard' ||
+ $ENV{'course.'.$courseid.'.grading'} eq 'external' ) {
+ return HTTP_NOT_ACCEPTABLE;
+ }
+ }
#
# Get query string for limited number of parameters
#
&Apache::loncommon::get_unprocessed_cgi
- ($ENV{'QUERY_STRING'},['sname','sdomain','usymb','filename']);
+ ($ENV{'QUERY_STRING'},['sname','sdomain','usymb','filename','recalc']);
#
# Deal with restricted student permissions
#
@@ -234,17 +256,12 @@ sub handler {
$symb = $ENV{'form.usymb'} if (exists($ENV{'form.usymb'}));
my $name = $ENV{'user.name'};
my $domain = $ENV{'user.domain'};
- if (exists($ENV{'form.sname'})) {
+ if (exists($ENV{'form.sname'}) && $ENV{'form.sname'} ne '') {
$name = $ENV{'form.sname'};
$domain = $ENV{'form.sdomain'};
}
- #
- # Open page, try to prevent browser cache.
- #
- $r->content_type('text/html');
- $r->header_out('Cache-control','no-cache');
- $r->header_out('Pragma','no-cache');
- $r->send_http_header;
+ $ENV{'form.sname'} = $name;
+ $ENV{'form.sdomain'} = $domain;
##
## Check permissions
my $allowed_to_edit = &Apache::lonnet::allowed('mgr',
@@ -265,10 +282,10 @@ sub handler {
# if they are not requesting their own.
if ($sheettype eq 'classcalc') {
if (! $allowed_to_view) {
- $r->print('Access Permission Denied
'.
- '