--- loncom/xml/londefdef.pm 2013/01/04 05:30:52 1.442
+++ loncom/xml/londefdef.pm 2016/01/14 19:40:26 1.458
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Tags Default Definition Module
#
-# $Id: londefdef.pm,v 1.442 2013/01/04 05:30:52 raeburn Exp $
+# $Id: londefdef.pm,v 1.458 2016/01/14 19:40:26 damieng Exp $
#
#
# Copyright Michigan State University Board of Trustees
@@ -92,6 +92,14 @@ sub start_m {
my $inside = &Apache::lonxml::get_all_text_unbalanced("/m",$parser);
if ($target eq 'web' || $target eq 'analyze') {
&Apache::lonxml::debug("M is starting with:$inside:");
+ if (!($inside =~ /^\s*\$.*\$\s*$/ || $inside =~ /^\s*\\[([].*\\[)\]]\s*$/)) {
+ # Non-math LaTeX will not be rendered correctly with MathJax
+ # and it should be avoided anyway.
+ # On top of that, MathJax will render math without $, but
+ # it will fail with tth. This is worth a warning.
+ # (even though some people might just use latex for printing)
+ &Apache::lonxml::warning(&mt("Missing \$ in <m>."));
+ }
my $eval=&Apache::lonxml::get_param('eval',$parstack,$safeeval);
if ($eval eq 'on') {
$inside=&Apache::run::evaluate($inside,$safeeval,$$parstack[-1]);
@@ -572,7 +580,7 @@ sub start_body {
if ($env{'request.state'} eq 'construct') {
my $url=&Apache::lonnet::hreflocation('',$env{'request.filename'});
&Apache::lonhtmlcommon::add_breadcrumb({
- 'text' => 'Construction Space',
+ 'text' => 'Authoring Space',
'href' => &Apache::loncommon::authorspace($url),
});
&Apache::lonhtmlcommon::add_breadcrumb({
@@ -585,26 +593,34 @@ sub start_body {
# 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 =
&Apache::loncommon::start_page($Apache::londefdef::title,
$Apache::londefdef::head
- .$extra_head,
- {'add_entries' => $token->[2],
-# 'no_title' => 1,
- 'force_register' => 1});
-
+ .$extra_head,$args);
my $header = '';
if ($env{'request.state'} ne 'published' &&
$env{'request.state'} ne 'construct') {
$header=&Apache::lonmenu::constspaceform();
}
if ($env{'request.state'} ne 'published') {
- $header.=&edit_controls();
+ unless ($env{'form.inhibitmenu'} eq 'yes') {
+ $header.=&edit_controls();
+ }
}
if ($env{'request.state'} eq 'construct') {
- $currentstring.=&Apache::loncommon::head_subbox(
- &Apache::loncommon::CSTR_pageheader()
- .$header);
+ unless ($env{'form.inhibitmenu'} eq 'yes') {
+ $currentstring.=&Apache::loncommon::head_subbox(
+ &Apache::loncommon::CSTR_pageheader()
+ .$header);
+ }
} elsif ($env{'request.state'} eq 'edit') {
$currentstring.=&Apache::loncommon::head_subbox($header);
}
@@ -630,28 +646,44 @@ sub edit_controls {
}
$result .= '
<div><input type="submit" name="editmode" accesskey="e" value="'.&mt('Edit').'" />';
+ if ($env{'browser.type'} ne 'explorer' || $env{'browser.version'} > 9) {
+ my $uri = $env{'request.uri'};
+ my $daxeurl = '/daxepage'.$uri;
+ $result .= '<input type="button" value="'.&mt('Edit with Daxe').'" '.
+ 'onclick="window.open(\''.$daxeurl.'\',\'_blank\');" />';
+ }
if (($env{'request.course.id'}) && ($env{'form.forceedit'})) {
my $url=&Apache::lonnet::hreflocation('',$env{'request.filename'});
if ($url =~ /\.html?$/i) {
+ my ($cdom,$cnum);
if ($env{'request.course.id'}) {
+ $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'},
- $env{'course.'.$env{'request.course.id'}.'.num'},
- $env{'course.'.$env{'request.course.id'}.'.domain'})) {
+ $cnum,$cdom)) {
&Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
['folderpath','title']);
}
}
}
- my ($symb,$itemtitle,$displayfile) =
- &Apache::lonxml::get_courseupload_hierarchy($url,
- $env{'form.folderpath'},
- $env{'form.title'});
- if (($symb ne '') || ($env{'httpref.'.$url} ne '')) {
+ 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).
&Apache::lonhtmlcommon::dependencies_button()."\n".
&Apache::lonhtmlcommon::dependencycheck_js($symb,
- $itemtitle,$url,$env{'form.folderpath'},$url)."\n";
+ $itemtitle,$url,$env{'form.folderpath'},$caller)."\n";
}
}
}
@@ -1714,6 +1746,15 @@ sub start_a {
if (!&Apache::lonnet::allowed('bre',$linkurl)) {
if (&Apache::lonnet::is_on_map($url)) {
&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);
+ }
+ }
}
}
}
@@ -2726,7 +2767,9 @@ sub start_img {
my $inside = &Apache::lonxml::get_all_text("/img",$parser,$style);
return '';
}
- &Apache::lonxml::extlink($src);
+ unless ($src =~ m{^data\:image/gif;base64,}) {
+ &Apache::lonxml::extlink($src);
+ }
my $currentstring = '';
my $scaling = .3;
@@ -2736,8 +2779,10 @@ sub start_img {
my $enc = ('yes' eq
lc(&Apache::lonxml::get_param('encrypturl',$parstack,
$safeeval)));
- $currentstring.=&Apache::lonenc::encrypt_ref($token,{'src'=>$src},
- $enc);
+ unless ($src =~ m{^data\:image/gif;base64,}) {
+ $currentstring.=&Apache::lonenc::encrypt_ref($token,{'src'=>$src},
+ $enc);
+ }
# and render unto TeX that which is LaTeX
} elsif ($target eq 'tex') {
@@ -2780,7 +2825,7 @@ sub start_img {
# &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 ($path,$file) = &get_eps_image($src);
# &Apache::lonnet::logthis("Image source: $src result: $path $file");
@@ -3419,7 +3464,7 @@ sub start_caption {
my $currentstring = '';
if ($target eq 'web' || $target eq 'webgrade') {
$currentstring = $token->[4];
- }
+ }
return $currentstring;
}
@@ -3427,7 +3472,7 @@ sub end_caption {
my ($target,$token) = @_;
my $currentstring = '';
if ($target eq 'web' || $target eq 'webgrade') {
- $currentstring = $token->[2];
+ $currentstring = $token->[2];
}
return $currentstring;
}
@@ -3560,8 +3605,68 @@ sub start_iframe {
my ($target,$token) = @_;
my $currentstring = '';
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;
}
@@ -4234,8 +4339,8 @@ sub get_eps_image {
&Apache::lonnet::repcopy($orig_src); # Failure is not completely fatal.
}
&Apache::lonxml::debug("get_eps_image: Original image: $orig_src");
- my ($spath, $sname, $sext) = &fileparse($src, qr/\.(bmp|gif|png|jpg|jpeg)/i);
- $src=~s/\.(bmp|gif|png|jpg|jpeg)$/\.eps/i;
+ my ($spath, $sname, $sext) = &fileparse($src, qr/\.(bmp|gif|png|jpg|jpeg|svg)/i);
+ $src=~s/\.(bmp|gif|png|jpg|jpeg|svg)$/\.eps/i;
$src=&Apache::lonnet::filelocation($Apache::lonxml::pwd[-1],$src);
&Apache::lonxml::debug("Filelocation gives: $src");
if (! -e $src) {
@@ -4509,6 +4614,62 @@ 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
=head1 NAME
@@ -4603,7 +4764,23 @@ described at http://www.lon-capa.org.
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