version 1.440, 2012/07/06 22:46:12
|
version 1.455, 2014/09/01 19:01:08
|
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 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') { |
$header=&Apache::lonmenu::constspaceform(); |
$header=&Apache::lonmenu::constspaceform(); |
} |
} |
if ($env{'request.state'} ne 'published') { |
if ($env{'request.state'} ne 'published') { |
$header.=&Apache::londefdef::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 633 sub edit_controls {
|
Line 641 sub edit_controls {
|
if (($env{'request.course.id'}) && ($env{'form.forceedit'})) { |
if (($env{'request.course.id'}) && ($env{'form.forceedit'})) { |
my $url=&Apache::lonnet::hreflocation('',$env{'request.filename'}); |
my $url=&Apache::lonnet::hreflocation('',$env{'request.filename'}); |
if ($url =~ /\.html?$/i) { |
if ($url =~ /\.html?$/i) { |
my ($symb,$itemtitle,$displayfile) = |
my ($cdom,$cnum); |
&Apache::lonxml::get_courseupload_hierarchy($url); |
if ($env{'request.course.id'}) { |
if (($symb ne '') || ($env{'httpref.'.$url} ne '')) { |
$cdom = $env{'course.'.$env{'request.course.id'}.'.domain'}; |
|
$cnum = $env{'course.'.$env{'request.course.id'}.'.num'}; |
|
if ($env{'request.filename'} =~ m{/userfiles/supplemental/default|\d+/}) { |
|
if (&Apache::lonnet::is_course_upload($env{'request.filename'}, |
|
$cnum,$cdom)) { |
|
&Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'}, |
|
['folderpath','title']); |
|
} |
|
} |
|
} |
|
my ($symb,$itemtitle,$displayfile,$caller); |
|
if ($url =~ m{^/uploaded/$cdom/$cnum/portfolio/syllabus/}) { |
|
$itemtitle = &mt('Syllabus'); |
|
$caller = "/public/$cdom/$cnum/syllabus"; |
|
} else { |
|
$caller = $url; |
|
($symb,$itemtitle,$displayfile) = |
|
&Apache::lonxml::get_courseupload_hierarchy($url, |
|
$env{'form.folderpath'}, |
|
$env{'form.title'}); |
|
} |
|
if (($symb ne '') || ($env{'httpref.'.$url} ne '') || |
|
($url =~ m{^/uploaded/$cdom/$cnum/portfolio/syllabus/})) { |
$result .= (' ' x 3). |
$result .= (' ' x 3). |
&Apache::lonhtmlcommon::dependencies_button()."\n". |
&Apache::lonhtmlcommon::dependencies_button()."\n". |
&Apache::lonhtmlcommon::dependencycheck_js($symb,$itemtitle,$url)."\n"; |
&Apache::lonhtmlcommon::dependencycheck_js($symb, |
|
$itemtitle,$url,$env{'form.folderpath'},$caller)."\n"; |
} |
} |
} |
} |
my $viewtext = &mt('Course View'); |
|
if (&Apache::loncommon::course_type() eq 'Community') { |
|
$viewtext = &mt('Community View'); |
|
} |
|
$result .= (' ' x 3).'<input type="button" value="'. |
|
$viewtext.'" onclick="javascript:location.href=currentURL" />'; |
|
} |
} |
$result .= '</div> |
$result .= '</div> |
</div> |
</div> |
Line 1707 sub start_a {
|
Line 1732 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|supplemental)/)}) { |
|
my $cleanhref = &clean_docs_httpref($linkurl,$url,$cdom,$cnum); |
|
if ($cleanhref) { |
|
&Apache::lonxml::extlink($cleanhref); |
|
} |
|
} |
} |
} |
} |
} |
} |
} |
Line 2719 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 2729 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 2773 sub start_img {
|
Line 2811 sub start_img {
|
|
|
# &Apache::lonxml::debug("LaTeX rendering = $latex_rendering image file: $src"); |
# &Apache::lonxml::debug("LaTeX rendering = $latex_rendering image file: $src"); |
|
|
#if original bmp/gif/jpg/png file exist do following: |
#if original bmp/gif/jpg/png/svg file exist do following: |
my $origsrc=$src; |
my $origsrc=$src; |
my ($path,$file) = &get_eps_image($src); |
my ($path,$file) = &get_eps_image($src); |
# &Apache::lonnet::logthis("Image source: $src result: $path $file"); |
# &Apache::lonnet::logthis("Image source: $src result: $path $file"); |
Line 3553 sub start_iframe {
|
Line 3591 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 4227 sub get_eps_image {
|
Line 4325 sub get_eps_image {
|
&Apache::lonnet::repcopy($orig_src); # Failure is not completely fatal. |
&Apache::lonnet::repcopy($orig_src); # Failure is not completely fatal. |
} |
} |
&Apache::lonxml::debug("get_eps_image: Original image: $orig_src"); |
&Apache::lonxml::debug("get_eps_image: Original image: $orig_src"); |
my ($spath, $sname, $sext) = &fileparse($src, qr/\.(bmp|gif|png|jpg|jpeg)/i); |
my ($spath, $sname, $sext) = &fileparse($src, qr/\.(bmp|gif|png|jpg|jpeg|svg)/i); |
$src=~s/\.(bmp|gif|png|jpg|jpeg)$/\.eps/i; |
$src=~s/\.(bmp|gif|png|jpg|jpeg|svg)$/\.eps/i; |
$src=&Apache::lonnet::filelocation($Apache::lonxml::pwd[-1],$src); |
$src=&Apache::lonnet::filelocation($Apache::lonxml::pwd[-1],$src); |
&Apache::lonxml::debug("Filelocation gives: $src"); |
&Apache::lonxml::debug("Filelocation gives: $src"); |
if (! -e $src) { |
if (! -e $src) { |
Line 4476 sub latex_header {
|
Line 4574 sub latex_header {
|
"\\usepackage{xcolor}\n". |
"\\usepackage{xcolor}\n". |
'\usepackage{calc}'. |
'\usepackage{calc}'. |
'\usepackage{amsmath}'. |
'\usepackage{amsmath}'. |
'\usepackage{soul}', |
'\usepackage{soul}'. |
'\usepackage{amssymb}'. |
'\usepackage{amssymb}'. |
'\usepackage{amsfonts}'. |
'\usepackage{amsfonts}'. |
'\usepackage{amsthm}'. |
'\usepackage{amsthm}'. |
Line 4502 sub latex_header {
|
Line 4600 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/\E(?:docs|supplemental)/)(.+/)[^/]+$}) { |
|
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 4596 described at http://www.lon-capa.org.
|
Line 4750 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/ or |
|
/uploaded/$cdom/$cnum/supplemental/). |
|
|
=back |
=back |
|
|