version 1.637, 2017/08/27 02:36:49
|
version 1.641, 2017/11/10 15:47:49
|
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'}); |
} |
} |
Line 5678 sub handler {
|
Line 5678 sub handler {
|
undef($hadchanges); |
undef($hadchanges); |
$uploadphase = &process_file_upload(\$upload_output,$coursenum,$coursedom, |
$uploadphase = &process_file_upload(\$upload_output,$coursenum,$coursedom, |
\%allfiles,\%codebase,$context,$crstype); |
\%allfiles,\%codebase,$context,$crstype); |
|
undef($navmap); |
if ($hadchanges) { |
if ($hadchanges) { |
&mark_hash_old(); |
&mark_hash_old(); |
} |
} |
Line 6477 unless ($container eq 'page') {
|
Line 6478 unless ($container eq 'page') {
|
$r->print('<p><span class="LC_error">'.$error.'</span></p>'); |
$r->print('<p><span class="LC_error">'.$error.'</span></p>'); |
} |
} |
if ($hadchanges) { |
if ($hadchanges) { |
&mark_hash_old(); |
unless (&is_hash_old()) { |
} |
&mark_hash_old(); |
|
} |
|
} |
|
|
&changewarning($r,''); |
&changewarning($r,''); |
} |
} |
Line 7100 sub editing_js {
|
Line 7103 sub editing_js {
|
} else { |
} else { |
$url = $res; |
$url = $res; |
} |
} |
$backtourl = &HTML::Entities::encode(&Apache::lonnet::clutter($url),'<>&"').'?symb='. |
$backtourl = &HTML::Entities::encode(&Apache::lonnet::clutter($url),'<>&"'); |
&HTML::Entities::encode($caller,'<>&"'); |
if ($backtourl =~ m{^\Q/uploaded/$coursedom/$coursenum/\Edefault_\d+\.sequence$}) { |
|
$backtourl .= '?navmap=1'; |
|
} else { |
|
$backtourl .= '?symb='. |
|
&HTML::Entities::encode($caller,'<>&"'); |
|
} |
if ($backtourl =~ m{^\Q/public/$coursedom/$coursenum/syllabus\E}) { |
if ($backtourl =~ m{^\Q/public/$coursedom/$coursenum/syllabus\E}) { |
if (($ENV{'SERVER_PORT'} == 443) && |
if (($ENV{'SERVER_PORT'} == 443) && |
($env{'course.'.$env{'request.course.id'}.'.externalsyllabus'} =~ m{^http://})) { |
($env{'course.'.$env{'request.course.id'}.'.externalsyllabus'} =~ m{^http://})) { |