--- loncom/interface/loncommon.pm 2006/12/23 07:17:34 1.496 +++ loncom/interface/loncommon.pm 2007/01/15 18:04:12 1.500 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # a pile of common routines # -# $Id: loncommon.pm,v 1.496 2006/12/23 07:17:34 albertel Exp $ +# $Id: loncommon.pm,v 1.500 2007/01/15 18:04:12 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -59,6 +59,7 @@ use Apache::lonnet; use GDBM_File; use POSIX qw(strftime mktime); use Apache::lonmenu(); +use Apache::lonenc(); use Apache::lonlocal; use HTML::Entities; use Apache::lonhtmlcommon(); @@ -2690,7 +2691,9 @@ sub get_student_answers { } $moreenv{'grade_target'}='answer'; %moreenv=(%form,%moreenv); - my $userview=&Apache::lonnet::ssi('/res/'.$feedurl,%moreenv); + $feedurl = &Apache::lonnet::clutter($feedurl); + &Apache::lonenc::check_encrypt(\$feedurl); + my $userview=&Apache::lonnet::ssi($feedurl,%moreenv); return $userview; } @@ -3341,7 +3344,7 @@ sub bodytag { my ($role,$realm) = split(/\./,$env{'request.role'},2); if ($role eq 'ca') { my ($rdom,$rname) = ($realm =~ m{^/($match_domain)/($match_username)$}); - $realm = &plainname($rname,$rdom).':'.$rdom; + $realm = &plainname($rname,$rdom); } # realm if ($env{'request.course.id'}) { @@ -6122,12 +6125,11 @@ sub store_settings { } # Make sure these settings stick around in this session, too &Apache::lonnet::appenv(%AppHash); - &Apache::lonnet::logthis(join(':',%AppHash)); return; } sub restore_course_settings { - return &return_settings($env{'request.course.id'},@_); + return &restore_settings($env{'request.course.id'},@_); } sub restore_settings {