version 1.447, 2013/09/26 22:03:36
|
version 1.450, 2013/10/14 17:11:18
|
Line 1732 sub start_a {
|
Line 1732 sub start_a {
|
my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'}; |
my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'}; |
my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'}; |
my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'}; |
if ($linkurl =~ m{^([^/]|/uploaded/$cdom/$cnum/docs/)}) { |
if ($linkurl =~ m{^([^/]|/uploaded/$cdom/$cnum/docs/)}) { |
my $cleanhref = &Apache::londefdef::clean_docs_httpref($linkurl,$url,$cdom,$cnum); |
my $cleanhref = &clean_docs_httpref($linkurl,$url,$cdom,$cnum); |
if ($cleanhref) { |
if ($cleanhref) { |
&Apache::lonxml::extlink($cleanhref); |
&Apache::lonxml::extlink($cleanhref); |
} |
} |
Line 3615 sub start_iframe {
|
Line 3615 sub start_iframe {
|
} |
} |
} |
} |
$currentstring =~ s/\s+$//; |
$currentstring =~ s/\s+$//; |
$currentstring .= '>'; |
if ($token->[4] =~ m{/>$}) { |
|
$currentstring .= ' />'; |
|
} else { |
|
$currentstring .= '>'; |
|
} |
} else { |
} else { |
$currentstring = $token->[4]; |
$currentstring = $token->[4]; |
} |
} |
if (($url !~ m{^https?://}) && ($env{'request.course.id'})) { |
} |
my $docuri = &Apache::lonnet::hreflocation('',$env{'request.filename'}); |
if (($url !~ m{^https?://}) && ($env{'request.course.id'})) { |
my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'}; |
my $docuri = &Apache::lonnet::hreflocation('',$env{'request.filename'}); |
my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'}; |
my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'}; |
if ($url =~ m{^([^/]|/uploaded/)}) { |
my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'}; |
my $cleanhref = &Apache::londefdef::clean_docs_httpref($url,$docuri,$cdom,$cnum); |
if ($url =~ m{^([^/]|/uploaded/)}) { |
if ($cleanhref) { |
my $cleanhref = &clean_docs_httpref($url,$docuri,$cdom,$cnum); |
&Apache::lonxml::extlink($cleanhref); |
if ($cleanhref) { |
} |
&Apache::lonxml::extlink($cleanhref); |
} elsif (($url =~ m{/res/$LONCAPA::domain_re/}) && ($docuri =~ m{^\Q/uploaded/$cdom/$cnum/docs/\E})) { |
} |
if (!&Apache::lonnet::allowed('bre',$url)) { |
} elsif (($url =~ m{/res/$LONCAPA::domain_re/}) && ($docuri =~ m{^\Q/uploaded/$cdom/$cnum/docs/\E})) { |
if (&Apache::lonnet::is_on_map($url)) { |
if (!&Apache::lonnet::allowed('bre',$url)) { |
&Apache::lonxml::extlink($url); |
if (&Apache::lonnet::is_on_map($url)) { |
} |
&Apache::lonxml::extlink($url); |
} |
} |
} |
} |
} |
} |
Line 4591 sub latex_header {
|
Line 4595 sub latex_header {
|
sub clean_docs_httpref { |
sub clean_docs_httpref { |
my ($href,$docuri,$cdom,$cnum) = @_; |
my ($href,$docuri,$cdom,$cnum) = @_; |
if ($docuri eq '') { |
if ($docuri eq '') { |
&Apache::lonnet::hreflocation('',$env{'request.filename'}); |
$docuri = &Apache::lonnet::hreflocation('',$env{'request.filename'}); |
} |
} |
if ($cdom eq '') { |
if ($cdom eq '') { |
$cdom = $env{'course.'.$env{'request.course.id'}.'.domain'}; |
$cdom = $env{'course.'.$env{'request.course.id'}.'.domain'}; |
Line 4612 sub clean_docs_httpref {
|
Line 4616 sub clean_docs_httpref {
|
return $cleanhref; |
return $cleanhref; |
} |
} |
} else { |
} else { |
(my $path,$fname) = ($href =~ m{^(.+)/([^/]*)$}); |
if ($href =~ m{/}) { |
$hrefpath = $relpath.$path; |
(my $path,$fname) = ($href =~ m{^(.*)/([^/]*)$}); |
|
$hrefpath = $relpath.$path; |
|
if ($path eq '') { |
|
$hrefpath =~ s{/$}{}; |
|
} |
|
} else { |
|
$fname = $href; |
|
$hrefpath = $relpath; |
|
$hrefpath =~ s{/$}{}; |
|
} |
} |
} |
if ($fname ne '') { |
if ($fname ne '') { |
my $cleanrelpath; |
my $cleanrelpath; |
Line 4625 sub clean_docs_httpref {
|
Line 4638 sub clean_docs_httpref {
|
$cleanrelpath .= $dir.'/'; |
$cleanrelpath .= $dir.'/'; |
} |
} |
} |
} |
$cleanrelpath =~ s{/$}{}; |
|
if ($cleanrelpath ne '') { |
if ($cleanrelpath ne '') { |
$cleanhref = $prefix.'/'.$cleanrelpath.'/'.$fname; |
$cleanhref = $prefix.$cleanrelpath.$fname; |
} else { |
} else { |
$cleanhref = $prefix.'/'.$fname; |
$cleanhref = $prefix.$fname; |
} |
} |
} |
} |
} |
} |