--- loncom/interface/lonevaluate.pm 2003/07/05 10:07:11 1.12
+++ 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.12 2003/07/05 10:07:11 www Exp $
+# $Id: lonevaluate.pm,v 1.17 2005/04/07 06:56:23 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -25,41 +25,35 @@
#
# 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::Constants qw(:common);
-use Apache::loncommon;
+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'};
- $feedurl=~s/^http\:\/\///;
- $feedurl=~s/^$ENV{'SERVER_NAME'}//;
- $feedurl=~s/^$ENV{'HTTP_HOST'}//;
+ my $feedurl=$env{'form.postdata'};
+ $feedurl=~s/^http\:\/\///;
+ $feedurl=~s/^$ENV{'SERVER_NAME'}//;
+ $feedurl=~s/^$ENV{'HTTP_HOST'}//;
+
+ $feedurl=&Apache::lonnet::declutter($feedurl);
- $feedurl=&Apache::lonnet::declutter($feedurl);
- my $symb=&Apache::lonnet::symbread($feedurl);
+ my $title=&Apache::lonnet::gettitle($feedurl);
+ my $showurl=&Apache::lonenc::check_encrypt($feedurl);
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',
@@ -72,31 +66,33 @@ 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;
}
}
if ($complete) {
- $r->print(<<ENDHEADER);
-<html>
+ my $showurl=&Apache::lonenc::check_encrypt(&Apache::lonnet::clutter($feedurl));
+ my $html=&Apache::lonxml::xmlbegin();
+ $r->print(<<ENDHEADER);
+$html
<head>
<title>Evaluation submitted</title>
<script>
- function go() {
+ function goback() {
if ((window.name=='loncapaclient')) {
- window.location='/res/$feedurl';
+ window.location='$showurl';
} else {
self.close();
}
@@ -113,7 +109,7 @@ ENDHEADER
$r->print('<br>Logging first evaluation');
}
$r->print(
- '<script>setTimeout("go()",2000);</script></body></html>');
+ '<script>setTimeout("goback()",2000);</script></body></html>');
return OK;
} else {
$warning='Please fill out all fields below';
@@ -137,7 +133,6 @@ ENDHEADER
$oldcomments=$currenteval{$prefix.$item};
}
}
-
# ------------------------------------------------------- Print out eval screen
my $standardoptions=(<<ENDOPTIONS);
<option value=0>-</option>
@@ -147,19 +142,20 @@ ENDHEADER
<option value=4>Agree</option>
<option value=5>Strongly Agree</option>
ENDOPTIONS
-
+
+ my $html=&Apache::lonxml::xmlbegin();
$r->print(<<ENDDOCUMENT);
-<html>
+$html
<head>
<title>The LearningOnline Network with CAPA</title>
</head>
$bodytag
-<tt>$feedurl</tt><p>
+<tt>$title</tt><p>
<h3><font color="red">$warning</font></h3>
Please rank the following criteria:
<form method=post name=evaluation>
<input type=hidden name=submiteval value=true>
-<input type=hidden name=postdata value="$feedurl">
+<input type=hidden name=postdata value="$showurl">
The material appears to be correct
<br><select name=correct>
$standardoptions