--- loncom/interface/lonevaluate.pm	2005/02/17 08:29:42	1.15
+++ loncom/interface/lonevaluate.pm	2005/04/07 06:56:23	1.17
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Evaluate
 #
-# $Id: lonevaluate.pm,v 1.15 2005/02/17 08:29:42 albertel Exp $
+# $Id: lonevaluate.pm,v 1.17 2005/04/07 06:56:23 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -25,32 +25,23 @@
 #
 # http://www.lon-capa.org/
 #
-# (Internal Server Error Handler
-#
-# (Login Screen
-# 5/21/99,5/22,5/25,5/26,5/31,6/2,6/10,7/12,7/14,
-# 1/14/00,5/29,5/30,6/1,6/29,7/1,11/9 Gerd Kortemeyer)
-#
-# 3/1/1 Gerd Kortemeyer)
-#
-# 3/1,12/6,12/12,12/21,12/22 Gerd Kortemeyer
-#
+
 package Apache::lonevaluate;
 
 use strict;
-use Apache::lonnet();
+use Apache::lonnet;
 use Apache::Constants qw(:common);
 use Apache::loncommon();
 use Apache::lonenc();
 
 sub handler {
     my $r = shift;
-    $r->content_type('text/html');
+    &Apache::loncommon::content_type($r,'text/html');
     $r->send_http_header;
     return OK if $r->header_only;
 
     &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},['postdata']);
-    my $feedurl=$ENV{'form.postdata'};
+    my $feedurl=$env{'form.postdata'};
     $feedurl=~s/^http\:\/\///;
     $feedurl=~s/^$ENV{'SERVER_NAME'}//;
     $feedurl=~s/^$ENV{'HTTP_HOST'}//;
@@ -62,7 +53,7 @@ sub handler {
 
     my ($rdomain,$rauth)=($feedurl=~/^(\w+)\/(\w+)\//);
 
-    my $prefix=$ENV{'user.name'}.'@'.$ENV{'user.domain'}.'___'.
+    my $prefix=$env{'user.name'}.'@'.$env{'user.domain'}.'___'.
 	$feedurl.'___';
 
     my @items=('correct','helpful','depth','clear','technical','comments',
@@ -75,18 +66,18 @@ sub handler {
 
     my $already=($currenteval{$prefix.'timestamp'} ne '');
 
-    $ENV{'form.timestamp'}=time;
+    $env{'form.timestamp'}=time;
 
     my $warning='';
 
     my $bodytag=&Apache::loncommon::bodytag('Evaluate Resource');
 
-    if ($ENV{'form.submiteval'} eq 'true') {
+    if ($env{'form.submiteval'} eq 'true') {
 # ------------------------------------------------ User is submitting something
         my $complete=1;
 	foreach my $item (@items) {
-	    if ($ENV{'form.'.$item}) {
-		$currenteval{$prefix.$item}=$ENV{'form.'.$item};
+	    if ($env{'form.'.$item}) {
+		$currenteval{$prefix.$item}=$env{'form.'.$item};
             } elsif ($item ne 'comments') {
                 $complete=0;
             }