--- rat/lonpage.pm 2007/06/22 21:24:54 1.80
+++ rat/lonpage.pm 2007/06/25 23:10:26 1.82
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Page Handler
#
-# $Id: lonpage.pm,v 1.80 2007/06/22 21:24:54 albertel Exp $
+# $Id: lonpage.pm,v 1.82 2007/06/25 23:10:26 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -432,7 +432,10 @@ sub handler {
$symb=&Apache::lonenc::encrypted($symb);
$esrc=&Apache::lonenc::encrypted($esrc);
}
- unless ($hash{'src_'.$rid} =~ m-^/uploaded/-) {
+ if ($hash{'src_'.$rid} !~ m-^/uploaded/-
+ && !$env{'request.enc'}
+ && ($env{'request.role.adv'}
+ || !$hash{'encrypted_'.$rid})) {
$metainfo =''.
''.
''.
@@ -448,11 +451,11 @@ sub handler {
(&Apache::lonnet::allowed('mgr',$env{'request.course.id'})) &&
($hash{'src_'.$rid} !~ m-^/uploaded/-)) {
my ($mapid,$resid)=split(/\./,$rid);
- my $symb=
- &Apache::lonnet::declutter($hash{'map_id_'.$mapid}).
- '___'.$resid.'___'.
- &Apache::lonnet::declutter($hash{'src_'.$rid});
- $metainfo.=
+ my $symb= &Apache::lonnet::encode_symb($hash{'map_id_'.$mapid},$resid,$hash{'src_'.$rid});
+ if ($hash{'encrypted_'.$resid}) {
+ $symb = &Apache::lonenc::encrypt($symb);
+ }
+ $metainfo.=
''.
'&command=submission">'.