--- rat/lonsequence.pm 2008/12/19 13:49:26 1.36
+++ rat/lonsequence.pm 2010/02/23 05:00:16 1.40
@@ -2,7 +2,7 @@
#
# Sequence Handler
#
-# $Id: lonsequence.pm,v 1.36 2008/12/19 13:49:26 raeburn Exp $
+# $Id: lonsequence.pm,v 1.40 2010/02/23 05:00:16 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -102,10 +102,10 @@ ENDSCRIPT
'
'.$url.' ');
# ------------------ This is trying to select. Provide buttons and tie %selhash
if ($env{'form.forceselect'}) { $r->print(<
-
-
+
ENDSELECT
my $diropendb =
@@ -126,7 +126,9 @@ ENDSELECT
# ----------------------------- successtied is now '1' if in working selectmode
my ($errtext,$fatal)=&mapread(&Apache::lonnet::filelocation('',$url),'');
if ($fatal==1) {
- $r->print(''.&mt('Map contents are not shown in order.').'
');
+ $r->print(''
+ .&mt('Map contents are not shown in order.')
+ .'
');
}
my $idx=0;
foreach (&attemptread(&Apache::lonnet::filelocation('',$url))) {
@@ -149,7 +151,7 @@ ENDSELECT
if ($successtied) {
my $checked='';
if ($selhash{'store_'.$url}) {
- $checked=" checked";
+ $checked=' checked="checked"';
}
$selhash{"pre_${idx}_link"}=$url;
$selhash{"pre_${idx}_title"}=$title;
@@ -168,7 +170,7 @@ ENDCHECKBOX
if ($successtied) {
$r->print('');
} else {
- $r->print(' ');
+ $r->print(' ');
}
}
}
@@ -215,6 +217,7 @@ sub handler {
my $dismapid='';
my $exitdisid = '';
my $arrow_dir = '';
+ my $is_encrypted = '';
if (($env{'request.course.fn'}) && (!$env{'form.forceselect'})) {
my $last;
@@ -245,6 +248,9 @@ sub handler {
if (!$env{'request.role.adv'}) {
$randomout = $bighash{'randomout_'.$disid};
}
+ if (!$env{'request.role.adv'}) {
+ $is_encrypted = $bighash{'encrypted_'.$disid};
+ }
} elsif (tie(%hash,'GDBM_File',$env{'request.course.fn'}.'_symb.db',
&GDBM_READER(),0640)) {
$last=$hash{'last_known'};
@@ -264,6 +270,9 @@ sub handler {
if (!$env{'request.role.adv'}) {
$randomout = $bighash{'randomout_'.$disid};
}
+ if (!$env{'request.role.adv'}) {
+ $is_encrypted = $bighash{'encrypted_'.$disid};
+ }
}
}
$exitdisid = $disid;
@@ -277,11 +286,15 @@ sub handler {
# now either disurl is set (going to first page), or we need another display
if ($disurl) {
# -------------------------------------------------- Has first or last resource
+ my $showdisurl = $disurl;
+ if ($is_encrypted) {
+ $showdisurl = &Apache::lonenc::encrypted($disurl);
+ }
&Apache::lonnet::symblist($requrl,$disurl => [$disurl,$dismapid],
'last_known' => [$disurl,$dismapid]);
&Apache::loncommon::content_type($r,'text/html');
$r->header_out(Location => &Apache::lonnet::absolute_url($ENV{'SERVER_NAME'}).
- $disurl);
+ $showdisurl);
return REDIRECT;
} else {
&Apache::loncommon::content_type($r,'text/html');