version 1.372, 2005/04/07 06:56:27
|
version 1.381, 2005/07/10 21:43:35
|
Line 180 sub xmlend {
|
Line 180 sub xmlend {
|
$status=$Apache::inputtags::status[-1]; |
$status=$Apache::inputtags::status[-1]; |
} |
} |
my $discussion; |
my $discussion; |
&Apache::loncommon::get_unprocessed_cgi |
&Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'}, |
($env{'query_string'},['LONCAPA_INTERNAL_no_discussion']); |
['LONCAPA_INTERNAL_no_discussion']); |
if (! exists($env{'form.LONCAPA_INTERNAL_no_discussion'}) || |
if (! exists($env{'form.LONCAPA_INTERNAL_no_discussion'}) || |
$env{'form.LONCAPA_INTERNAL_no_discussion'} ne 'true') { |
$env{'form.LONCAPA_INTERNAL_no_discussion'} ne 'true') { |
$discussion=&Apache::lonfeedback::list_discussion($mode,$status); |
$discussion=&Apache::lonfeedback::list_discussion($mode,$status); |
Line 382 sub xmlparse {
|
Line 382 sub xmlparse {
|
return $finaloutput; |
return $finaloutput; |
} |
} |
|
|
sub htmlclean { |
|
my ($raw,$full)=@_; |
|
# Take care of CRLF etc |
|
|
|
$raw=~s/\r\f/\n/gs; $raw=~s/\f\r/\n/gs; |
|
$raw=~s/\r\n/\n/gs; $raw=~s/\n\r/\n/gs; |
|
$raw=~s/\f/\n/gs; $raw=~s/\r/\n/gs; |
|
$raw=~s/\&\#10\;/\n/gs; $raw=~s/\&\#13\;/\n/gs; |
|
|
|
# Generate empty tags, remove wrong end tags |
|
$raw=~s/\<(br|hr|img|meta|allow|basefont)([^\>\/]*?)\>/\<$1$2 \/\>/gis; |
|
$raw=~s/\<\/(br|hr|img|meta|allow|basefont)\>//gis; |
|
unless ($full) { |
|
$raw=~s/\<[\/]*(body|head|html)\>//gis; |
|
} |
|
# Make standard tags lowercase |
|
foreach ('html','body','head','meta','h1','h2','h3','h4','b','i','m', |
|
'table','tr','td','th','p','br','hr','img','embed','font', |
|
'a','strong','center','title','basefont','li','ol','ul', |
|
'input','select','form','option','script','pre') { |
|
$raw=~s/\<$_\s*\>/\<$_\>/gis; |
|
$raw=~s/\<\/$_\s*\>/<\/$_\>/gis; |
|
$raw=~s/\<$_\s([^\>]*)\>/<$_ $1\>/gis; |
|
} |
|
return $raw; |
|
} |
|
|
|
sub latex_special_symbols { |
sub latex_special_symbols { |
my ($string,$where)=@_; |
my ($string,$where)=@_; |
if ($where eq 'header') { |
if ($where eq 'header') { |
Line 424 sub latex_special_symbols {
|
Line 397 sub latex_special_symbols {
|
$string=~s/\\\%|\%/\\\%/g; |
$string=~s/\\\%|\%/\\\%/g; |
$string=~s/\\{|{/\\{/g; |
$string=~s/\\{|{/\\{/g; |
$string=~s/\\}|}/\\}/g; |
$string=~s/\\}|}/\\}/g; |
|
$string=~s/\\ensuremath\\{\\backslash\\}/\\ensuremath{\\backslash}/g; |
$string=~s/\\\$|\$/\\\$/g; |
$string=~s/\\\$|\$/\\\$/g; |
$string=~s/\\\_|\_/\\\_/g; |
$string=~s/\\\_|\_/\\\_/g; |
$string=~s/([^\\]|^)(\~|\^)/$1\\$2\\strut /g; |
$string=~s/([^\\]|^)(\~|\^)/$1\\$2\\strut /g; |
Line 784 sub init_safespace {
|
Line 758 sub init_safespace {
|
# $safeeval->deny(":base_orig"); |
# $safeeval->deny(":base_orig"); |
$safeeval->permit("require"); |
$safeeval->permit("require"); |
$safeinit .= ';$external::target="'.$target.'";'; |
$safeinit .= ';$external::target="'.$target.'";'; |
my $rndseed; |
|
my ($symb,$courseid,$domain,$name) = &Apache::lonxml::whichuser(); |
|
$rndseed=&Apache::lonnet::rndseed($symb,$courseid,$domain,$name); |
|
$safeinit .= ';$external::randomseed="'.$rndseed.'";'; |
|
&Apache::lonxml::debug("Setting rndseed to $rndseed"); |
|
&Apache::run::run($safeinit,$safeeval); |
&Apache::run::run($safeinit,$safeeval); |
|
&initialize_rndseed($safeeval); |
|
} |
|
|
|
sub initialize_rndseed { |
|
my ($safeeval)=@_; |
|
my $rndseed; |
|
my ($symb,$courseid,$domain,$name) = &Apache::lonxml::whichuser(); |
|
$rndseed=&Apache::lonnet::rndseed($symb,$courseid,$domain,$name); |
|
my $safeinit = '$external::randomseed="'.$rndseed.'";'; |
|
&Apache::lonxml::debug("Setting rndseed to $rndseed"); |
|
&Apache::run::run($safeinit,$safeeval); |
} |
} |
|
|
sub default_homework_load { |
sub default_homework_load { |
Line 839 sub startredirection {
|
Line 818 sub startredirection {
|
|
|
sub endredirection { |
sub endredirection { |
if (!$Apache::lonxml::redirection) { |
if (!$Apache::lonxml::redirection) { |
&Apache::lonxml::error("Endredirection was called, before a startredirection, perhaps you have unbalanced tags. Some debuging information:".join ":",caller); |
&Apache::lonxml::error("Endredirection was called before a startredirection, perhaps you have unbalanced tags. Some debugging information:".join ":",caller); |
return ''; |
return ''; |
} |
} |
$Apache::lonxml::redirection--; |
$Apache::lonxml::redirection--; |
Line 1087 sub parstring {
|
Line 1066 sub parstring {
|
|
|
sub writeallows { |
sub writeallows { |
unless ($#extlinks>=0) { return; } |
unless ($#extlinks>=0) { return; } |
my $thisurl='/res/'.&Apache::lonnet::declutter(shift); |
my $thisurl = &Apache::lonnet::clutter(shift); |
if ($env{'httpref.'.$thisurl}) { |
if ($env{'httpref.'.$thisurl}) { |
$thisurl=$env{'httpref.'.$thisurl}; |
$thisurl=$env{'httpref.'.$thisurl}; |
} |
} |
Line 1169 sub createnewhtml {
|
Line 1148 sub createnewhtml {
|
my $title=&mt('Title of document goes here'); |
my $title=&mt('Title of document goes here'); |
my $body=&mt('Body of document goes here'); |
my $body=&mt('Body of document goes here'); |
my $filecontents=(<<SIMPLECONTENT); |
my $filecontents=(<<SIMPLECONTENT); |
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml/11/DTD/xhtml11.dtd"> |
|
<html> |
<html> |
<head> |
<head> |
<title>$title</title> |
<title>$title</title> |
Line 1233 FULLPAGE
|
Line 1211 FULLPAGE
|
$xml_help=&Apache::loncommon::helpLatexCheatsheet(); |
$xml_help=&Apache::loncommon::helpLatexCheatsheet(); |
} |
} |
my $cleanbut = ''; |
my $cleanbut = ''; |
if ($filetype eq 'html') { |
|
$cleanbut='<input type="submit" name="attemptclean" value="'. |
|
&mt('Save and then attempt to clean HTML').'" />'; |
|
} |
|
my $titledisplay=&display_title(); |
my $titledisplay=&display_title(); |
my %lt=&Apache::lonlocal::texthash('st' => 'Save this', |
my %lt=&Apache::lonlocal::texthash('st' => 'Save this', |
'vi' => 'View', |
'vi' => 'View', |
Line 1324 sub handler {
|
Line 1299 sub handler {
|
# Edit action? Save file. |
# Edit action? Save file. |
# |
# |
unless ($env{'request.state'} eq 'published') { |
unless ($env{'request.state'} eq 'published') { |
if (($env{'form.savethisfile'}) || ($env{'form.attemptclean'})) { |
if ($env{'form.savethisfile'}) { |
if (&storefile($file,$env{'form.filecont'})) { |
if (&storefile($file,$env{'form.filecont'})) { |
&Apache::lonxml::info("<font COLOR=\"#0000FF\">". |
&Apache::lonxml::info("<font COLOR=\"#0000FF\">". |
&mt('Updated').": ". |
&mt('Updated').": ". |
Line 1361 ENDNOTFOUND
|
Line 1336 ENDNOTFOUND
|
} else { |
} else { |
unless ($env{'request.state'} eq 'published') { |
unless ($env{'request.state'} eq 'published') { |
if ($filecontents=~/BEGIN LON-CAPA Internal/) { |
if ($filecontents=~/BEGIN LON-CAPA Internal/) { |
&Apache::lonxml::error(&mt('This file appears to be a rendering of a Lon-CAPA resource. If this is correct, this resource will act very oddly and incorrectly.')); |
&Apache::lonxml::error(&mt('This file appears to be a rendering of a LON-CAPA resource. If this is correct, this resource will act very oddly and incorrectly.')); |
} |
|
|
|
if ($env{'form.attemptclean'}) { |
|
$filecontents=&htmlclean($filecontents,1); |
|
} |
} |
# |
# |
# we are in construction space, see if edit mode forced |
# we are in construction space, see if edit mode forced |
Line 1460 sub error {
|
Line 1431 sub error {
|
&Apache::lonmsg::author_res_msg($env{'request.filename'},join('<br />',@_)); |
&Apache::lonmsg::author_res_msg($env{'request.filename'},join('<br />',@_)); |
#notify course |
#notify course |
if ( $symb && $env{'request.course.id'} ) { |
if ( $symb && $env{'request.course.id'} ) { |
|
my $cnum=$env{'course.'.$env{'request.course.id'}.'.num'}; |
|
my $cdom=$env{'course.'.$env{'request.course.id'}.'.domain'}; |
my (undef,%users)=&Apache::lonfeedback::decide_receiver(undef,0,1,1,1); |
my (undef,%users)=&Apache::lonfeedback::decide_receiver(undef,0,1,1,1); |
my $declutter=&Apache::lonnet::declutter($env{'request.filename'}); |
my $declutter=&Apache::lonnet::declutter($env{'request.filename'}); |
my @userlist; |
my @userlist; |
foreach (keys %users) { |
foreach (keys %users) { |
my ($user,$domain) = split(/:/, $_); |
my ($user,$domain) = split(/:/, $_); |
push(@userlist,"$user\@$domain"); |
push(@userlist,"$user\@$domain"); |
&Apache::lonmsg::user_normal_msg($user,$domain, |
my $key=$declutter.'_'.$user.'_'.$domain; |
|
my %lastnotified=&Apache::lonnet::get('nohist_xmlerrornotifications', |
|
[$key], |
|
$cdom,$cnum); |
|
my $now=time; |
|
if ($now-$lastnotified{$key}>86400) { |
|
&Apache::lonmsg::user_normal_msg($user,$domain, |
"Error [$declutter]",join('<br />',@_)); |
"Error [$declutter]",join('<br />',@_)); |
|
&Apache::lonnet::put('nohist_xmlerrornotifications', |
|
{$key => $now}, |
|
$cdom,$cnum); |
|
} |
} |
} |
if ($env{'request.role.adv'}) { |
if ($env{'request.role.adv'}) { |
$errormsg=&mt("An error occured while processing this resource. The course personnel ([_1]) and the author have been notified.",join(', ',@userlist)); |
$errormsg=&mt("An error occured while processing this resource. The course personnel ([_1]) and the author have been notified.",join(', ',@userlist)); |
Line 1484 sub warning {
|
Line 1467 sub warning {
|
|
|
if ($env{'form.grade_target'} ne 'tex') { |
if ($env{'form.grade_target'} ne 'tex') { |
if ( &show_error_warn_msg() ) { |
if ( &show_error_warn_msg() ) { |
my $request=$Apache::lonxml::request; |
|
if (!$request) { $request=Apache->request; } |
|
push(@Apache::lonxml::warning_messages, |
push(@Apache::lonxml::warning_messages, |
$Apache::lonxml::warnings_error_header. |
$Apache::lonxml::warnings_error_header. |
"<b>W</b>ARNING<b>:</b>".join('<br />',@_)."<br />\n"); |
"<b>W</b>ARNING<b>:</b>".join('<br />',@_)."<br />\n"); |