--- loncom/xml/londefdef.pm 2011/11/14 00:20:42 1.436
+++ loncom/xml/londefdef.pm 2013/10/12 01:26:31 1.449
@@ -1,8 +1,7 @@
-
# The LearningOnline Network with CAPA
# Tags Default Definition Module
#
-# $Id: londefdef.pm,v 1.436 2011/11/14 00:20:42 raeburn Exp $
+# $Id: londefdef.pm,v 1.449 2013/10/12 01:26:31 raeburn Exp $
#
#
# Copyright Michigan State University Board of Trustees
@@ -56,7 +55,7 @@ use LONCAPA();
BEGIN {
- &Apache::lonxml::register('Apache::londefdef',('a','abbr','acronym','accessrule','address','allow','applet','area','b','base','basefont','bgo','bgsound','big','blink','blockquote','blankspace','body','br','button','caption','center','cite','code','col','colgroup','dd','del','dfn','dir','div','dl','dt','em','embed','externallink','fieldset','font','form','frame','frameset','h1','h2','h3','h4','h5','h6','head','hr','html','i','iframe','img','input','ins','insert','isindex','kbd','keygen','label','layer','legend','li','link','m','map','marquee','menu','meta','multicol','nobr','noembed','noframes','nolayer','noscript','object','ol','optgroup','option','output','p','param','pre','q','s','samp','select','server','small','spacer','span','strike','strong','sub','sup','table','tbody','td','textarea','tfoot','th','thead','title','tr','tt','tthoption','u','ul','var','wbr','hideweboutput'));
+ &Apache::lonxml::register('Apache::londefdef',('a','abbr','acronym','accessrule','address','allow','applet','area','b','base','basefont','bgo','bgsound','big','blink','blockquote','blankspace','body','br','button','caption','center','cite','code','col','colgroup','dd','del','dfn','dir','div','dl','dt','em','embed','externallink','fieldset','font','form','frame','frameset','h1','h2','h3','h4','h5','h6','head','hr','html','i','iframe','img','input','ins','insert','isindex','kbd','keygen','label','layer','legend','li','link','m','map','marquee','menu','meta','multicol','nobr','noembed','noframes','nolayer','noscript','object','ol','optgroup','option','output','p','param','pre','q','s','samp','select','server','small','spacer','span','strike','strong','style','sub','sup','table','tbody','td','textarea','tfoot','th','thead','title','tr','tt','tthoption','u','ul','var','wbr','hideweboutput'));
}
@@ -459,6 +458,32 @@ sub insert_meta {
<meta />';
}
+#-- <start> tag
+sub start_style {
+ my ($target, $token, $tagstack, $parstack, $parser, $safeeval, $style) = @_;
+ my $currentstring = '';
+
+ if ($target eq 'tex') {
+ Apache::lonxml::startredirection();
+ } else {
+ $currentstring = $token->[4];
+ }
+
+ return $currentstring;
+}
+
+sub end_style {
+ my ($target, $token, $tagstack, $parstack, $parser, $safeeval) = @_;
+ my $currentstring = '';
+
+ if ($target eq 'tex') {
+ Apache::lonxml::endredirection();
+ } else {
+ $currentstring = $token->[2];
+ }
+ return $currentstring;
+}
+
# accessrule
sub start_accessrule {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style) = @_;
@@ -547,7 +572,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({
@@ -574,12 +599,16 @@ sub start_body {
$header=&Apache::lonmenu::constspaceform();
}
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') {
- $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);
}
@@ -606,12 +635,39 @@ sub edit_controls {
$result .= '
<div><input type="submit" name="editmode" accesskey="e" value="'.&mt('Edit').'" />';
if (($env{'request.course.id'}) && ($env{'form.forceedit'})) {
- my $viewtext = &mt('Course View');
- if (&Apache::loncommon::course_type() eq 'Community') {
- $viewtext = &mt('Community View');
+ 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'},
+ $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).
+ &Apache::lonhtmlcommon::dependencies_button()."\n".
+ &Apache::lonhtmlcommon::dependencycheck_js($symb,
+ $itemtitle,$url,$env{'form.folderpath'},$caller)."\n";
+ }
}
- $result .= (' ' x 3).'<input type="button" value="'.
- $viewtext.'" onclick="javascript:location.href=currentURL" />';
}
$result .= '</div>
</div>
@@ -1672,6 +1728,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/)}) {
+ my $cleanhref = &clean_docs_httpref($linkurl,$url,$cdom,$cnum);
+ if ($cleanhref) {
+ &Apache::lonxml::extlink($cleanhref);
+ }
+ }
}
}
}
@@ -2972,22 +3037,47 @@ sub end_embed {
#-- <param> tag (end tag forbidden)
sub start_param {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval) = @_;
- if (&Apache::lonxml::get_param('name',$parstack,
- $safeeval,undef,1)=~/^cabbase$/i) {
+ my $name = &Apache::lonxml::get_param('name',$parstack,$safeeval,
+ undef,1);
+ if ($name =~/^cabbase$/i) {
my $value=&Apache::lonxml::get_param('value',$parstack,
$safeeval,undef,1);
&Apache::lonxml::extlink($value);
- }
-
+ } elsif ($name eq 'flashvars') {
+ if (lc(&Apache::lonxml::get_param('type',$parstack,$safeeval,-2,1))
+ eq 'application/x-shockwave-flash') {
+ my $launcher =
+ &Apache::lonxml::get_param('data',$parstack,$safeeval,-2,1);
+ if ($launcher) {
+ &Apache::lonxml::extlink($launcher);
+ }
+ my $flashvars=&Apache::lonxml::get_param('value',$parstack,
+ $safeeval,undef,1);
+ if ($flashvars ne '') {
+ foreach my $item (split(/\&/,$flashvars)) {
+ my ($key,$value)=split(/=/,$item,2);
+ if ($key eq 'content') {
+ if ($value ne '') {
+ my ($dir) = ($launcher =~ m{(.+/)[^/]+$});
+ &Apache::lonxml::extlink($dir.$value);
+ }
+ } elsif ($key eq 'thumb') {
+ if ($value ne '') {
+ &Apache::lonxml::extlink($value);
+ }
+ }
+ }
+ }
+ }
+ }
my $src = &Apache::lonxml::get_param('src',$parstack,$safeeval,undef,1);
- &Apache::lonxml::extlink($src);
+ if ($src ne '') {
+ &Apache::lonxml::extlink($src);
+ }
my $currentstring = '';
if ($target eq 'web' || $target eq 'webgrade') {
my %toconvert;
- my $src=&Apache::lonxml::get_param('src',$parstack,$safeeval,undef,1);
if ($src) { $toconvert{'src'}= $src; }
- my $name=&Apache::lonxml::get_param('name',$parstack,$safeeval,
- undef,1);
if ($name=~/^cabbase$/i) {
$toconvert{'value'}=&Apache::lonxml::get_param('value',$parstack,
$safeeval,undef,1);
@@ -3493,8 +3583,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;
}
@@ -4416,7 +4566,7 @@ sub latex_header {
"\\usepackage{xcolor}\n".
'\usepackage{calc}'.
'\usepackage{amsmath}'.
- '\usepackage{soul}',
+ '\usepackage{soul}'.
'\usepackage{amssymb}'.
'\usepackage{amsfonts}'.
'\usepackage{amsthm}'.
@@ -4442,6 +4592,62 @@ sub latex_header {
}
+sub clean_docs_httpref {
+ my ($href,$docuri,$cdom,$cnum) = @_;
+ if ($docuri eq '') {
+ &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
=head1 NAME
@@ -4536,7 +4742,22 @@ 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/).
=back