version 1.443, 2013/05/05 00:10:16
|
version 1.450, 2013/10/14 17:11:18
|
Line 572 sub start_body {
|
Line 572 sub start_body {
|
if ($env{'request.state'} eq 'construct') { |
if ($env{'request.state'} eq 'construct') { |
my $url=&Apache::lonnet::hreflocation('',$env{'request.filename'}); |
my $url=&Apache::lonnet::hreflocation('',$env{'request.filename'}); |
&Apache::lonhtmlcommon::add_breadcrumb({ |
&Apache::lonhtmlcommon::add_breadcrumb({ |
'text' => 'Construction Space', |
'text' => 'Authoring Space', |
'href' => &Apache::loncommon::authorspace($url), |
'href' => &Apache::loncommon::authorspace($url), |
}); |
}); |
&Apache::lonhtmlcommon::add_breadcrumb({ |
&Apache::lonhtmlcommon::add_breadcrumb({ |
Line 599 sub start_body {
|
Line 599 sub start_body {
|
$header=&Apache::lonmenu::constspaceform(); |
$header=&Apache::lonmenu::constspaceform(); |
} |
} |
if ($env{'request.state'} ne 'published') { |
if ($env{'request.state'} ne 'published') { |
$header.=&edit_controls(); |
unless ($env{'form.inhibitmenu'} eq 'yes') { |
|
$header.=&edit_controls(); |
|
} |
} |
} |
if ($env{'request.state'} eq 'construct') { |
if ($env{'request.state'} eq 'construct') { |
$currentstring.=&Apache::loncommon::head_subbox( |
unless ($env{'form.inhibitmenu'} eq 'yes') { |
&Apache::loncommon::CSTR_pageheader() |
$currentstring.=&Apache::loncommon::head_subbox( |
.$header); |
&Apache::loncommon::CSTR_pageheader() |
|
.$header); |
|
} |
} elsif ($env{'request.state'} eq 'edit') { |
} elsif ($env{'request.state'} eq 'edit') { |
$currentstring.=&Apache::loncommon::head_subbox($header); |
$currentstring.=&Apache::loncommon::head_subbox($header); |
} |
} |
Line 1724 sub start_a {
|
Line 1728 sub start_a {
|
if (!&Apache::lonnet::allowed('bre',$linkurl)) { |
if (!&Apache::lonnet::allowed('bre',$linkurl)) { |
if (&Apache::lonnet::is_on_map($url)) { |
if (&Apache::lonnet::is_on_map($url)) { |
&Apache::lonxml::extlink($linkurl); |
&Apache::lonxml::extlink($linkurl); |
|
} elsif ($env{'request.course.id'}) { |
|
my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'}; |
|
my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'}; |
|
if ($linkurl =~ m{^([^/]|/uploaded/$cdom/$cnum/docs/)}) { |
|
my $cleanhref = &clean_docs_httpref($linkurl,$url,$cdom,$cnum); |
|
if ($cleanhref) { |
|
&Apache::lonxml::extlink($cleanhref); |
|
} |
|
} |
} |
} |
} |
} |
} |
} |
Line 3570 sub start_iframe {
|
Line 3583 sub start_iframe {
|
my ($target,$token) = @_; |
my ($target,$token) = @_; |
my $currentstring = ''; |
my $currentstring = ''; |
if ($target eq 'web' || $target eq 'webgrade') { |
if ($target eq 'web' || $target eq 'webgrade') { |
$currentstring = $token->[4]; |
my ($src,$url,$query); |
} |
if ($token->[2]->{'src'}) { |
|
$src = $token->[2]->{'src'}; |
|
} elsif ($token->[2]->{'SRC'}) { |
|
$src = $token->[2]->{'SRC'}; |
|
} |
|
if ($src) { |
|
($url,$query) = ($src =~ /^([^?]+)\??([^?]*)$/); |
|
if ($query =~ /inhibitmenu=yes/) { |
|
$currentstring = $token->[4]; |
|
} else { |
|
my $inhibit; |
|
if ($url =~ m{^[^/.].*\.x?html?$}) { |
|
$inhibit = 1; |
|
} elsif ($url =~ m{^/(uploaded|res)/.*\.x?html?$}) { |
|
$inhibit = 1; |
|
} |
|
if ($inhibit) { |
|
$currentstring = '<iframe '; |
|
foreach my $attrib (@{$token->[3]}) { |
|
if (lc($attrib) eq 'src') { |
|
if ($query) { |
|
$query.='&inhibitmenu=yes'; |
|
} else { |
|
$query = 'inhibitmenu=yes'; |
|
} |
|
$currentstring .= 'src="'.$url.'?'.$query.'" '; |
|
} else { |
|
$currentstring .= lc($attrib).'="'.$token->[2]->{$attrib}.'" '; |
|
} |
|
} |
|
$currentstring =~ s/\s+$//; |
|
if ($token->[4] =~ m{/>$}) { |
|
$currentstring .= ' />'; |
|
} else { |
|
$currentstring .= '>'; |
|
} |
|
} else { |
|
$currentstring = $token->[4]; |
|
} |
|
} |
|
if (($url !~ m{^https?://}) && ($env{'request.course.id'})) { |
|
my $docuri = &Apache::lonnet::hreflocation('',$env{'request.filename'}); |
|
my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'}; |
|
my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'}; |
|
if ($url =~ m{^([^/]|/uploaded/)}) { |
|
my $cleanhref = &clean_docs_httpref($url,$docuri,$cdom,$cnum); |
|
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)) { |
|
if (&Apache::lonnet::is_on_map($url)) { |
|
&Apache::lonxml::extlink($url); |
|
} |
|
} |
|
} |
|
} |
|
} else { |
|
$currentstring = $token->[4]; |
|
} |
|
} |
return $currentstring; |
return $currentstring; |
} |
} |
|
|
Line 4519 sub latex_header {
|
Line 4592 sub latex_header {
|
|
|
} |
} |
|
|
|
sub clean_docs_httpref { |
|
my ($href,$docuri,$cdom,$cnum) = @_; |
|
if ($docuri eq '') { |
|
$docuri = &Apache::lonnet::hreflocation('',$env{'request.filename'}); |
|
} |
|
if ($cdom eq '') { |
|
$cdom = $env{'course.'.$env{'request.course.id'}.'.domain'}; |
|
} |
|
if ($cnum eq '') { |
|
$cnum = $env{'course.'.$env{'request.course.id'}.'.num'}; |
|
} |
|
my $cleanhref; |
|
if ($docuri =~ m{^(\Q/uploaded/$cdom/$cnum/docs/\E)(.+/)[^/]+$}) { |
|
my $prefix = $1; |
|
my $relpath = $2; |
|
my ($hrefpath,$fname); |
|
if ($href =~ m{^/}) { |
|
if ($href =~ m{^\Q$prefix\E(.+/)([^/]+)$}) { |
|
$hrefpath = $1; |
|
$fname = $2; |
|
} else { |
|
return $cleanhref; |
|
} |
|
} else { |
|
if ($href =~ m{/}) { |
|
(my $path,$fname) = ($href =~ m{^(.*)/([^/]*)$}); |
|
$hrefpath = $relpath.$path; |
|
if ($path eq '') { |
|
$hrefpath =~ s{/$}{}; |
|
} |
|
} else { |
|
$fname = $href; |
|
$hrefpath = $relpath; |
|
$hrefpath =~ s{/$}{}; |
|
} |
|
} |
|
if ($fname ne '') { |
|
my $cleanrelpath; |
|
foreach my $dir (split(/\//,$hrefpath)) { |
|
next if ($dir eq '.'); |
|
if ($dir eq '..') { |
|
$cleanrelpath =~ s{([^/]+/)$}{}; |
|
} else { |
|
$cleanrelpath .= $dir.'/'; |
|
} |
|
} |
|
if ($cleanrelpath ne '') { |
|
$cleanhref = $prefix.$cleanrelpath.$fname; |
|
} else { |
|
$cleanhref = $prefix.$fname; |
|
} |
|
} |
|
} |
|
return $cleanhref; |
|
} |
|
|
=pod |
=pod |
|
|
=head1 NAME |
=head1 NAME |
Line 4613 described at http://www.lon-capa.org.
|
Line 4742 described at http://www.lon-capa.org.
|
I'm in a table.... |
I'm in a table.... |
} |
} |
|
|
|
=item clean_docs_httpref($href,$docuri,$cdom,$cnum) |
|
HTML pages uploaded to a course which contain dependencies either from iframes, |
|
javascript files or objects (FlashPlayerSwf, MediaSrc, XMPSrc, ConfigurationSrc, |
|
and PosterImageSrc) for which dependency is another file uploaded to the same |
|
course. |
|
|
|
Required input: |
|
href - dependency (either a relative URL, or an absolute URL) |
|
Optional inputs: |
|
docuri - URL of HTML page containing the dependency |
|
cdom - Course domain |
|
cnum - CourseID |
|
|
|
Output: |
|
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/). |
|
|
=back |
=back |
|
|