version 1.448, 2013/09/30 13:44:16
|
version 1.454, 2014/08/25 00:20:19
|
Line 585 sub start_body {
|
Line 585 sub start_body {
|
# FIXME Where are we? |
# FIXME Where are we? |
} |
} |
|
|
|
my $args = {'add_entries' => $token->[2], |
|
'force_register' => 1,}; |
|
if ($target eq 'web') { |
|
$args->{'print_suppress'} = 1; |
|
if ($env{'request.use_absolute'}) { |
|
$args->{'use_absolute'} = $env{'request.use_absolute'}; |
|
} |
|
} |
$currentstring = |
$currentstring = |
&Apache::loncommon::start_page($Apache::londefdef::title, |
&Apache::loncommon::start_page($Apache::londefdef::title, |
$Apache::londefdef::head |
$Apache::londefdef::head |
.$extra_head, |
.$extra_head,$args); |
{'add_entries' => $token->[2], |
|
# 'no_title' => 1, |
|
'force_register' => 1}); |
|
|
|
my $header = ''; |
my $header = ''; |
if ($env{'request.state'} ne 'published' && |
if ($env{'request.state'} ne 'published' && |
$env{'request.state'} ne 'construct') { |
$env{'request.state'} ne 'construct') { |
Line 1731 sub start_a {
|
Line 1735 sub start_a {
|
} elsif ($env{'request.course.id'}) { |
} elsif ($env{'request.course.id'}) { |
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|supplemental)/)}) { |
my $cleanhref = &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 2749 sub start_img {
|
Line 2753 sub start_img {
|
my $inside = &Apache::lonxml::get_all_text("/img",$parser,$style); |
my $inside = &Apache::lonxml::get_all_text("/img",$parser,$style); |
return ''; |
return ''; |
} |
} |
&Apache::lonxml::extlink($src); |
unless ($src =~ m{^data\:image/gif;base64,}) { |
|
&Apache::lonxml::extlink($src); |
|
} |
my $currentstring = ''; |
my $currentstring = ''; |
my $scaling = .3; |
my $scaling = .3; |
|
|
Line 2759 sub start_img {
|
Line 2765 sub start_img {
|
my $enc = ('yes' eq |
my $enc = ('yes' eq |
lc(&Apache::lonxml::get_param('encrypturl',$parstack, |
lc(&Apache::lonxml::get_param('encrypturl',$parstack, |
$safeeval))); |
$safeeval))); |
$currentstring.=&Apache::lonenc::encrypt_ref($token,{'src'=>$src}, |
unless ($src =~ m{^data\:image/gif;base64,}) { |
$enc); |
$currentstring.=&Apache::lonenc::encrypt_ref($token,{'src'=>$src}, |
|
$enc); |
|
} |
|
|
# and render unto TeX that which is LaTeX |
# and render unto TeX that which is LaTeX |
} elsif ($target eq 'tex') { |
} elsif ($target eq 'tex') { |
Line 3615 sub start_iframe {
|
Line 3623 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]; |
} |
} |
Line 4591 sub latex_header {
|
Line 4603 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 4600 sub clean_docs_httpref {
|
Line 4612 sub clean_docs_httpref {
|
$cnum = $env{'course.'.$env{'request.course.id'}.'.num'}; |
$cnum = $env{'course.'.$env{'request.course.id'}.'.num'}; |
} |
} |
my $cleanhref; |
my $cleanhref; |
if ($docuri =~ m{^(\Q/uploaded/$cdom/$cnum/docs/\E)(.+/)[^/]+$}) { |
if ($docuri =~ m{^(\Q/uploaded/$cdom/$cnum/\E(?:docs|supplemental)/)(.+/)[^/]+$}) { |
my $prefix = $1; |
my $prefix = $1; |
my $relpath = $2; |
my $relpath = $2; |
my ($hrefpath,$fname); |
my ($hrefpath,$fname); |
Line 4753 described at http://www.lon-capa.org.
|
Line 4765 described at http://www.lon-capa.org.
|
|
|
Output: |
Output: |
returns an absolute URL constructed from the href provided, and the calling context. |
returns an absolute URL constructed from the href provided, and the calling context. |
(this will be null, if the URL does not begin: /uploaded/$cdom/$cnum/docs/). |
(this will be null, if the URL does not begin: /uploaded/$cdom/$cnum/docs/ or |
|
/uploaded/$cdom/$cnum/supplemental/). |
|
|
=back |
=back |
|
|