version 1.99, 2018/12/27 20:11:16
|
version 1.100, 2018/12/29 23:24:58
|
Line 320 sub check_http_req {
|
Line 320 sub check_http_req {
|
} elsif (($$srcref =~ m{^\Q/adm/wrapper/ext/\E(?!https:)}) && |
} elsif (($$srcref =~ m{^\Q/adm/wrapper/ext/\E(?!https:)}) && |
($ENV{'SERVER_PORT'} == 443)) { |
($ENV{'SERVER_PORT'} == 443)) { |
unless (&Apache::lonnet::uses_sts()) { |
unless (&Apache::lonnet::uses_sts()) { |
$$srcref .= (($$srcref =~/\?/)? '&':'?') . 'usehttp=1'; |
my ($url,$anchor) = ($$srcref =~ /^([^\#]+)(?:|(\#[^\#]+))$/); |
|
$$srcref = $url . (($$srcref =~/\?/)? '&':'?') . 'usehttp=1' .$anchor; |
$usehttp = 1; |
$usehttp = 1; |
} |
} |
} |
} |
Line 483 sub handler {
|
Line 484 sub handler {
|
$usehttp = &check_http_req(\$newloc); |
$usehttp = &check_http_req(\$newloc); |
if ($hash{'encrypted_'.$id}) { |
if ($hash{'encrypted_'.$id}) { |
$newloc=&Apache::lonenc::encrypted($newloc); |
$newloc=&Apache::lonenc::encrypted($newloc); |
} elsif ($newloc =~ m{^(/adm/wrapper/ext/[^\#]+)\#([^\#]+)$}) { |
} elsif ($newloc =~ m{^(/adm/wrapper/ext/[^\#]+)(?:|\#([^\#]+))$}) { |
$newloc = $1.&escape('#').$2; |
my ($url,$anchor) = ($1,$2); |
|
if ($anchor) { |
|
$newloc = $url.(($url=~/\?/)?'&':'?').'symb='.&escape($last); |
|
} |
} |
} |
} else { |
} else { |
$newloc='/adm/navmaps'; |
$newloc='/adm/navmaps'; |