version 1.611, 2016/11/22 00:43:12
|
version 1.612, 2016/11/23 01:28:50
|
Line 3287 sub editor {
|
Line 3287 sub editor {
|
$output .= &entryline($idx,$name,$url,$folder,$allowed,$res, |
$output .= &entryline($idx,$name,$url,$folder,$allowed,$res, |
$coursenum,$coursedom,$crstype, |
$coursenum,$coursedom,$crstype, |
$pathitem,$supplementalflag,$container, |
$pathitem,$supplementalflag,$container, |
\%filters,\%curr_groups,$ltitoolsref,$canedit); |
\%filters,\%curr_groups,$ltitoolsref,$canedit,$isencrypted); |
$idx++; |
$idx++; |
$shown++; |
$shown++; |
} |
} |
Line 3662 sub is_supplemental_title {
|
Line 3662 sub is_supplemental_title {
|
sub entryline { |
sub entryline { |
my ($index,$title,$url,$folder,$allowed,$residx,$coursenum,$coursedom, |
my ($index,$title,$url,$folder,$allowed,$residx,$coursenum,$coursedom, |
$crstype,$pathitem,$supplementalflag,$container,$filtersref,$currgroups, |
$crstype,$pathitem,$supplementalflag,$container,$filtersref,$currgroups, |
$ltitoolsref,$canedit)=@_; |
$ltitoolsref,$canedit,$isencrypted)=@_; |
my ($foldertitle,$renametitle,$oldtitle); |
my ($foldertitle,$renametitle,$oldtitle); |
if (&is_supplemental_title($title)) { |
if (&is_supplemental_title($title)) { |
($title,$foldertitle,$renametitle) = &Apache::loncommon::parse_supplemental_title($title); |
($title,$foldertitle,$renametitle) = &Apache::loncommon::parse_supplemental_title($title); |
Line 3944 END
|
Line 3944 END
|
} |
} |
} |
} |
$url.=(($url=~/\?/)?'&':'?').'symb='.&HTML::Entities::encode($shownsymb,'"<>&'); |
$url.=(($url=~/\?/)?'&':'?').'symb='.&HTML::Entities::encode($shownsymb,'"<>&'); |
|
} elsif ((!$env{'request.role.adv'}) && |
|
(((&LONCAPA::map::getparameter($orderidx,'parameter_encrypturl'))[0]=~/^yes$/i) || |
|
$isencrypted)) { |
|
my $shownsymb = &Apache::lonenc::encrypted($symb); |
|
my $shownurl = &Apache::lonenc::encrypted($url); |
|
if (&Apache::lonnet::symbverify($shownsymb,$shownurl)) { |
|
$url = $shownurl.(($shownurl=~/\?/)?'&':'?').'symb='.&HTML::Entities::encode($shownsymb,'"<>&'); |
|
} else { |
|
$url=''; |
|
} |
} else { |
} else { |
$url=''; |
$url=''; |
} |
} |
Line 3977 END
|
Line 3987 END
|
.':'.((&LONCAPA::map::getparameter($orderidx, |
.':'.((&LONCAPA::map::getparameter($orderidx, |
'parameter_randomorder'))[0]=~/^yes$/i) |
'parameter_randomorder'))[0]=~/^yes$/i) |
.':'.$ispage; |
.':'.$ispage; |
$url.='folderpath='.&escape($folderpath); |
if ($env{'request.role.adv'} || |
|
(&LONCAPA::map::getparameter($orderidx,'parameter_hiddenresource'))[0]!~/^yes$/i) { |
|
$url.='folderpath='.&escape($folderpath); |
|
} else { |
|
$url = ''; |
|
} |
my $rpicknum = (&LONCAPA::map::getparameter($orderidx, |
my $rpicknum = (&LONCAPA::map::getparameter($orderidx, |
'parameter_randompick'))[0]; |
'parameter_randompick'))[0]; |
my $rpckchk; |
my $rpckchk; |