version 1.111.2.12, 2020/03/12 07:46:14
|
version 1.111.2.13, 2020/11/11 21:52:05
|
Line 246 sub handler {
|
Line 246 sub handler {
|
my %ssilink=(); |
my %ssilink=(); |
my %ssivlink=(); |
my %ssivlink=(); |
my %ssialink=(); |
my %ssialink=(); |
|
my %cssrefs=(); |
|
my %httpref=(); |
|
|
my %cellemb=(); |
my %cellemb=(); |
my %cellexternal=(); |
my %cellexternal=(); |
Line 401 ENDEXT
|
Line 403 ENDEXT
|
my $bodydef=0; |
my $bodydef=0; |
my $thisxml=0; |
my $thisxml=0; |
my @rlinks=(); |
my @rlinks=(); |
|
my @css_hrefs=(); |
if ($output=~/\?xml/) { |
if ($output=~/\?xml/) { |
$isxml=1; |
$isxml=1; |
$thisxml=1; |
$thisxml=1; |
Line 443 ENDEXT
|
Line 446 ENDEXT
|
($bodydef==0)) { |
($bodydef==0)) { |
$allscript.="\n\n" |
$allscript.="\n\n" |
.$parser->get_text('/script'); |
.$parser->get_text('/script'); |
|
} elsif (($token->[1] eq 'link') && |
|
($bodydef==0)) { |
|
if (($token->[2]->{'href'} !~ m{^/adm/}) && |
|
($token->[2]->{'rel'} eq 'stylesheet')) { |
|
$css_hrefs[$#css_hrefs+1]= |
|
$token->[2]->{'href'}; |
|
|
|
} |
} |
} |
} |
} |
} |
} |
Line 564 ENDEXT
|
Line 575 ENDEXT
|
$output=~s/(\"|\'|\=\s*)$_(\"|\'|\s|\>)/$1$newlocation$2/; |
$output=~s/(\"|\'|\=\s*)$_(\"|\'|\s|\>)/$1$newlocation$2/; |
} |
} |
} |
} |
|
foreach my $css_href (@css_hrefs) { |
|
next if ($css_href eq ''); |
|
unless ($css_href =~ m{https?://}) { |
|
my $proburl = &Apache::lonnet::clutter($plainsrc); |
|
unless ($css_href =~ m{^/}) { |
|
my $probdir = $proburl; |
|
$probdir=~s/\/[^\/]*$//; |
|
$css_href = &Apache::lonnet::hreflocation($probdir,$css_href); |
|
} |
|
if ($css_href =~ m{^/(res|uploaded)/}) { |
|
unless (($env{'httpref.'.$css_href}) || |
|
($httpref{'httpref.'.$css_href}) || |
|
(&Apache::lonnet::is_on_map($css_href))) { |
|
if ($env{'httpref.'.$proburl}) { |
|
$proburl = $env{'httpref.'.$proburl}; |
|
} |
|
$httpref{'httpref.'.$css_href} = $proburl; |
|
} |
|
} |
|
} |
|
$cssrefs{$css_href} = 1; |
|
} |
# -------------------------------------------------- Deal with Applet codebases |
# -------------------------------------------------- Deal with Applet codebases |
$output=~s/(\<applet[^\>]+)(codebase\=[^\S\>]+)*([^\>]*)\>/$1.($2?$2:' codebase="'.$thisdir.'"').$3.'>'/gei; |
$output=~s/(\<applet[^\>]+)(codebase\=[^\S\>]+)*([^\>]*)\>/$1.($2?$2:' codebase="'.$thisdir.'"').$3.'>'/gei; |
$ssibody{$_}=$output; |
$ssibody{$_}=$output; |
Line 663 ENDEXT
|
Line 696 ENDEXT
|
} |
} |
} |
} |
} |
} |
|
if (keys(%cssrefs)) { |
|
my $links; |
|
if (keys(%cssrefs)) { |
|
foreach my $css_href (keys(%cssrefs)) { |
|
next unless ($css_href =~ m{^(/res/|/uploaded/|https?://)}); |
|
$links .= '<link rel="stylesheet" type="text/css" href="'.$css_href.'" />'."\n"; |
|
} |
|
} |
|
if ($links) { |
|
if (keys(%httpref)) { |
|
&Apache::lonnet::appenv(\%httpref); |
|
} |
|
$allscript .= "\n$links"; |
|
} |
|
} |
# ------------------------------------------------------------------ Start body |
# ------------------------------------------------------------------ Start body |
$r->print(&Apache::loncommon::start_page(undef,$allscript, |
$r->print(&Apache::loncommon::start_page(undef,$allscript, |
{'force_register' => 1, |
{'force_register' => 1, |