version 1.640, 2017/09/05 00:56:42
|
version 1.642, 2017/11/30 01:52:14
|
Line 659 sub group_import {
|
Line 659 sub group_import {
|
my $marker = $2; |
my $marker = $2; |
my $info = $3; |
my $info = $3; |
my ($toolid,%toolhash,%toolsettings); |
my ($toolid,%toolhash,%toolsettings); |
my @extras = ('linktext','explanation','crslabel','crstitle'); |
my @extras = ('linktext','explanation','crslabel','crstitle','crsappend'); |
my @toolinfo = split(/:/,$info); |
my @toolinfo = split(/:/,$info); |
if ($residx) { |
if ($residx) { |
%toolsettings=&Apache::lonnet::dump('exttool_'.$marker,$coursedom,$coursenum); |
%toolsettings=&Apache::lonnet::dump('exttool_'.$marker,$coursedom,$coursenum); |
Line 670 sub group_import {
|
Line 670 sub group_import {
|
$toolid =~ s/\D//g; |
$toolid =~ s/\D//g; |
($toolhash{'target'},$toolhash{'width'},$toolhash{'height'}, |
($toolhash{'target'},$toolhash{'width'},$toolhash{'height'}, |
$toolhash{'linktext'},$toolhash{'explanation'}, |
$toolhash{'linktext'},$toolhash{'explanation'}, |
$toolhash{'crslabel'},$toolhash{'crstitle'}) = @toolinfo; |
$toolhash{'crslabel'},$toolhash{'crstitle'},$toolhash{'crsappend'}) = @toolinfo; |
foreach my $item (@extras) { |
foreach my $item (@extras) { |
$toolhash{$item} = &unescape($toolhash{$item}); |
$toolhash{$item} = &unescape($toolhash{$item}); |
} |
} |
Line 4104 END
|
Line 4104 END
|
} |
} |
} |
} |
if ($url ne '') { |
if ($url ne '') { |
$url.=(($url=~/\?/)?'&':'?').'symb='.&HTML::Entities::encode($shownsymb,'"<>&'); |
$url.=(($url=~/\?/)?'&':'?').'symb='.&escape($shownsymb); |
} |
} |
} elsif (!$env{'request.role.adv'}) { |
} elsif (!$env{'request.role.adv'}) { |
my $checkencrypt; |
my $checkencrypt; |
Line 4125 END
|
Line 4125 END
|
my $shownsymb = &Apache::lonenc::encrypted($symb); |
my $shownsymb = &Apache::lonenc::encrypted($symb); |
my $shownurl = &Apache::lonenc::encrypted($url); |
my $shownurl = &Apache::lonenc::encrypted($url); |
if (&Apache::lonnet::symbverify($shownsymb,$shownurl)) { |
if (&Apache::lonnet::symbverify($shownsymb,$shownurl)) { |
$url = $shownurl.(($shownurl=~/\?/)?'&':'?').'symb='.&HTML::Entities::encode($shownsymb,'"<>&'); |
$url = $shownurl.(($shownurl=~/\?/)?'&':'?').'symb='.&escape($shownsymb); |
if ($env{'request.enc'} ne '') { |
if ($env{'request.enc'} ne '') { |
delete($env{'request.enc'}); |
delete($env{'request.enc'}); |
} |
} |