--- loncom/xml/lonxml.pm 2001/07/12 15:26:03 1.101
+++ loncom/xml/lonxml.pm 2001/08/15 14:03:03 1.112
@@ -12,12 +12,15 @@
# 6/2,6/3,6/8,6/9 Gerd Kortemeyer
# 6/12,6/13 H. K. Ng
# 6/16 Gerd Kortemeyer
+# 7/27 H. K. Ng
+# 8/7,8/9,8/10,8/11,8/15 Gerd Kortemeyer
package Apache::lonxml;
use vars
qw(@pwd @outputstack $redirection $import @extlinks $metamode $evaluate %insertlist @namespace);
use strict;
use HTML::TokeParser;
+use HTML::TreeBuilder;
use Safe;
use Safe::Hole;
use Math::Cephes qw(:trigs :hypers :bessels erf erfc);
@@ -92,7 +95,94 @@ sub xmlbegin {
}
sub xmlend {
- return '</html>';
+ my $discussion='';
+ if ($ENV{'request.course.id'}) {
+ my $crs='/'.$ENV{'request.course.id'};
+ if ($ENV{'request.course.sec'}) {
+ $crs.='_'.$ENV{'request.course.sec'};
+ }
+ $crs=~s/\_/\//g;
+ my $seeid=&Apache::lonnet::allowed('rin',$crs);
+ my $symb=&Apache::lonnet::symbread();
+ if ($symb) {
+ my %contrib=&Apache::lonnet::restore($symb,$ENV{'request.course.id'},
+ $ENV{'course.'.$ENV{'request.course.id'}.'.domain'},
+ $ENV{'course.'.$ENV{'request.course.id'}.'.num'});
+ if ($contrib{'version'}) {
+ $discussion.=
+ '<address><hr /><h2>Course Discussion of Resource</h2>';
+ my $idx;
+ for ($idx=1;$idx<=$contrib{'version'};$idx++) {
+ my $hidden=($contrib{'hidden'}=~/\.$idx\./);
+ unless (($hidden) && (!$seeid)) {
+ my $message=$contrib{$idx.':message'};
+ $message=~s/\n/\<br \/\>/g;
+ if ($message) {
+ if ($hidden) {
+ $message='<font color="#888888">'.$message.'</font>';
+ }
+ my $sender='Anonymous';
+ if ((!$contrib{$idx.':anonymous'}) || ($seeid)) {
+ $sender=$contrib{$idx.':sendername'}.' at '.
+ $contrib{$idx.':senderdomain'};
+ if ($contrib{$idx.':anonymous'}) {
+ $sender.=' (anonymous)';
+ }
+ if ($seeid) {
+ if ($hidden) {
+ $sender.=' <a href="/adm/feedback?unhide='.
+ $symb.':::'.$idx.'">Make Visible</a>';
+ } else {
+ $sender.=' <a href="/adm/feedback?hide='.
+ $symb.':::'.$idx.'">Hide</a>';
+ }
+ }
+ }
+ $discussion.='<p><b>'.$sender.'</b> ('.
+ localtime($contrib{$idx.':timestamp'}).
+ '):<blockquote>'.$message.
+ '</blockquote></p>';
+ }
+ }
+ }
+ $discussion.='</address>';
+ }
+ }
+ }
+ return $discussion.'</html>';
+}
+
+sub checkout {
+ my ($target,$symb,$tuname,$tudom,$tcrsid)=@_;
+ unless ($symb) {
+ $symb=&Apache::lonnet::symbread();
+ }
+ unless ($tuname) {
+ $tuname=$ENV{'user.name'};
+ $tudom=$ENV{'user.domain'};
+ $tcrsid=$ENV{'request.course.id'};
+ }
+ my $lonhost = $Apache::lonnet::perlvar{'lonHostID'};
+ my $infostr=&Apache::lonnet::escape(
+ $tuname.'&'.
+ $tudom.'&'.
+ $tcrsid.'&'.
+ $symb.'&'.
+ time.'&'.$ENV{'REMOTE_ADDR'});
+ my $token=Apache::lonnet::reply('tmpput:'.$infostr,$lonhost);
+ if ($token=~/^error\:/) { return ''; }
+ $token=~s/^(\d+)\_.*\_(\d+)$/$1\_$2\_$lonhost/;
+ if (&Apache::lonnet::log($tudom,$tuname,
+ &Apache::lonnet::homeserver($tuname,$tudom),
+ &Apache::lonnet::escape('Checkout '.$infostr.' - '.
+ $token)) ne 'ok') {
+ return '';
+ }
+ if ($target eq 'web') {
+ return '<img src="/cgi-bin/barcode.gif?encode='.$token.'" />';
+ } else {
+ return $token;
+ }
}
sub fontsettings() {
@@ -107,6 +197,7 @@ sub fontsettings() {
sub registerurl {
my $forcereg=shift;
if ($Apache::lonxml::registered) { return ''; }
+ $Apache::lonxml::registered=1;
if (($ENV{'REQUEST_URI'}!~/^\/(res\/)*adm\//) || ($forcereg)) {
my $hwkadd='';
if ($ENV{'REQUEST_URI'}=~/\.(problem|exam|quiz|assess|survey|form)$/) {
@@ -144,6 +235,8 @@ ENDPARM
menu.currentStale=0;
menu.clearbut(3,1);
menu.switchbutton
+ (6,3,'catalog.gif','catalog','info','catalog_info()');
+ menu.switchbutton
(8,1,'eval.gif','evaluate','this','gopost("/adm/evaluate",currentURL)');
menu.switchbutton
(8,2,'fdbk.gif','feedback','on this','gopost("/adm/feedback",currentURL)');
@@ -172,7 +265,7 @@ ENDPARM
menu.clearbut(7,3);
menu.menucltim=menu.setTimeout(
'clearbut(2,1);clearbut(2,3);clearbut(8,1);clearbut(8,2);clearbut(8,3);'+
- 'clearbut(9,1);clearbut(9,2);clearbut(9,3);',
+ 'clearbut(9,1);clearbut(9,2);clearbut(9,3);clearbut(6,3)',
2000);
}
@@ -255,6 +348,27 @@ sub xmlparse {
return $finaloutput;
}
+sub htmlclean {
+ my ($raw,$full)=@_;
+
+ my $tree = HTML::TreeBuilder->new;
+ $tree->ignore_unknown(0);
+
+ $tree->parse($raw);
+
+ my $output= $tree->as_HTML(undef,' ');
+
+ $output=~s/\<(br|hr|img|meta|allow)([^\>\/]*)\>/\<$1$2 \/\>/gis;
+ $output=~s/\<\/(br|hr|img|meta|allow)\>//gis;
+ unless ($full) {
+ $output=~s/\<[\/]*(body|head|html)\>//gis;
+ }
+
+ $tree = $tree->delete;
+
+ return $output;
+}
+
sub inner_xmlparse {
my ($target,$stack,$parstack,$pars,$safeeval,$style_for_target)=@_;
&Apache::lonxml::debug('Reentrant parser starting, again?');
@@ -513,6 +627,7 @@ sub init_safespace {
$safeeval->permit(":base_math");
$safeeval->permit("sort");
$safeeval->deny(":base_io");
+ $safehole->wrap(\&Apache::scripttag::xmlparse,$safeeval,'&xmlparse');
$safehole->wrap(\&Apache::lonnet::EXT,$safeeval,'&EXT');
$safehole->wrap(\&Math::Cephes::asin,$safeeval,'&asin');
@@ -695,6 +810,9 @@ sub parstring {
sub writeallows {
my $thisurl='/res/'.&Apache::lonnet::declutter(shift);
+ if ($ENV{'httpref.'.$thisurl}) {
+ $thisurl=$ENV{'httpref.'.$thisurl};
+ }
my $thisdir=$thisurl;
$thisdir=~s/\/[^\/]+$//;
my %httpref=();
@@ -782,7 +900,9 @@ SIMPLECONTENT
<form method="post">
<textarea cols="80" rows="40" name="filecont">$filecontents</textarea>
<br />
-<input type="submit" name="savethisfile" value="Save this file" />
+<input type="submit" name="attemptclean"
+ value="Save and then attempt to clean HTML" />
+<input type="submit" name="savethisfile" value="Save this" />
</form>
ENDFOOTER
$result=~s/(\<body[^\>]*\>)/$1$editheader/is;
@@ -813,7 +933,7 @@ sub handler {
# Edit action? Save file.
#
unless ($ENV{'request.state'} eq 'published') {
- if ($ENV{'form.savethisfile'}) {
+ if (($ENV{'form.savethisfile'}) || ($ENV{'form.attemptclean'})) {
&storefile($file,$ENV{'form.filecont'});
}
}
@@ -833,6 +953,11 @@ sub handler {
ENDNOTFOUND
$filecontents='';
} else {
+ unless ($ENV{'request.state'} eq 'published') {
+ if ($ENV{'form.attemptclean'}) {
+ $filecontents=&htmlclean($filecontents,1);
+ }
+ }
$result = &Apache::lonxml::xmlparse($target,$filecontents,'',%mystyle);
}