--- loncom/xml/lonxml.pm 2014/06/21 20:58:12 1.531.2.15
+++ loncom/xml/lonxml.pm 2023/11/28 01:33:14 1.565
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# XML Parser Module
#
-# $Id: lonxml.pm,v 1.531.2.15 2014/06/21 20:58:12 raeburn Exp $
+# $Id: lonxml.pm,v 1.565 2023/11/28 01:33:14 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -69,6 +69,8 @@ use Safe();
use Safe::Hole();
use Math::Cephes();
use Math::Random();
+use Math::Calculus::Expression();
+use Number::FormatEng();
use Opcode();
use POSIX qw(strftime);
use Time::HiRes qw( gettimeofday tv_interval );
@@ -228,106 +230,11 @@ sub xmlend {
return $discussion;
}
-sub tokeninputfield {
- my $defhost=$Apache::lonnet::perlvar{'lonHostID'};
- $defhost=~tr/a-z/A-Z/;
- return (<<ENDINPUTFIELD)
-<script type="text/javascript">
- function updatetoken() {
- var comp=new Array;
- var barcode=unescape(document.tokeninput.barcode.value);
- comp=barcode.split('*');
- if (typeof(comp[0])!="undefined") {
- document.tokeninput.codeone.value=comp[0];
- }
- if (typeof(comp[1])!="undefined") {
- document.tokeninput.codetwo.value=comp[1];
- }
- if (typeof(comp[2])!="undefined") {
- comp[2]=comp[2].toUpperCase();
- document.tokeninput.codethree.value=comp[2];
- }
- document.tokeninput.barcode.value='';
- }
-</script>
-<form method="post" name="tokeninput" action="">
-<table border="2" bgcolor="#FFFFBB">
-<tr><th>DocID Checkin</th></tr>
-<tr><td>
-<table>
-<tr>
-<td>Scan in Barcode</td>
-<td><input type="text" size="22" name="barcode"
-onchange="updatetoken()"/></td>
-</tr>
-<tr><td><i>or</i> Type in DocID</td>
-<td>
-<input type="text" size="5" name="codeone" />
-<b><font size="+2">*</font></b>
-<input type="text" size="5" name="codetwo" />
-<b><font size="+2">*</font></b>
-<input type="text" size="10" name="codethree" value="$defhost"
-onchange="this.value=this.value.toUpperCase()" />
-</td></tr>
-</table>
-</td></tr>
-<tr><td><input type="submit" value="Check in DocID" /></td></tr>
-</table>
-</form>
-ENDINPUTFIELD
-}
-
-sub maketoken {
- my ($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'};
- }
- return &Apache::lonnet::checkout($symb,$tuname,$tudom,$tcrsid);
-}
-
-sub printtokenheader {
- my ($target,$token,$tsymb,$tcrsid,$tudom,$tuname)=@_;
- unless ($token) { return ''; }
-
- my ($symb,$courseid,$domain,$name) = &Apache::lonnet::whichuser();
- unless ($tsymb) {
- $tsymb=$symb;
- }
- unless ($tuname) {
- $tuname=$name;
- $tudom=$domain;
- $tcrsid=$courseid;
- }
-
- my $plainname=&Apache::loncommon::plainname($tuname,$tudom);
-
- if ($target eq 'web') {
- my %idhash=&Apache::lonnet::idrget($tudom,($tuname));
- return
- '<img align="right" src="/cgi-bin/barcode.png?encode='.$token.'" />'.
- &mt('Checked out for').' '.$plainname.
- '<br />'.&mt('User').': '.$tuname.' at '.$tudom.
- '<br />'.&mt('ID').': '.$idhash{$tuname}.
- '<br />'.&mt('CourseID').': '.$tcrsid.
- '<br />'.&mt('Course').': '.$env{'course.'.$tcrsid.'.description'}.
- '<br />'.&mt('DocID').': '.$token.
- '<br />'.&mt('Time').': '.&Apache::lonlocal::locallocaltime().'<hr />';
- } else {
- return $token;
- }
-}
-
sub printalltags {
- my $temp;
- foreach $temp (sort keys %Apache::lonxml::alltags) {
- &Apache::lonxml::debug("$temp -- ".
- join(',',@{ $Apache::lonxml::alltags{$temp} }));
- }
+ foreach my $temp (sort(keys(%Apache::lonxml::alltags))) {
+ &Apache::lonxml::debug("$temp -- ".
+ join(',',@{ $Apache::lonxml::alltags{$temp} }));
+ }
}
sub xmlparse {
@@ -440,9 +347,9 @@ sub latex_special_symbols {
} else {
$string=~s/\\/\\ensuremath{\\backslash}/g;
$string=~s/\\\%|\%/\\\%/g;
- $string=~s/\\{|{/\\{/g;
+ $string=~s/\\\{|\{/\\{/g;
$string=~s/\\}|}/\\}/g;
- $string=~s/\\ensuremath\\{\\backslash\\}/\\ensuremath{\\backslash}/g;
+ $string=~s/\\ensuremath\\\{\\backslash\\}/\\ensuremath{\\backslash}/g;
$string=~s/\\\$|\$/\\\$/g;
$string=~s/\\\_|\_/\\\_/g;
$string=~s/([^\\]|^)(\~|\^)/$1\\$2\\strut /g;
@@ -463,6 +370,8 @@ sub inner_xmlparse {
my $result;
my $token;
my $dontpop=0;
+ my $lastdontpop;
+ my $lastendtag;
my $startredirection = $Apache::lonxml::redirection;
while ( $#$pars > -1 ) {
while ($token = $$pars['-1']->get_token) {
@@ -558,17 +467,29 @@ sub inner_xmlparse {
}
$result = '';
- if ($token->[0] eq 'E' && !$dontpop) {
- &end_tag($stack,$parstack,$token);
+ if ($token->[0] eq 'E') {
+ if ($dontpop) {
+ $lastdontpop = $token;
+ } else {
+ $lastendtag = $token->[1];
+ &end_tag($stack,$parstack,$token);
+ }
}
$dontpop=0;
- }
+ }
if ($#$pars > -1) {
pop @$pars;
pop @Apache::lonxml::pwd;
}
}
+ if (($#$stack == 0) && ($stack->[0] eq 'physnet') && ($target eq 'web') &&
+ ($lastendtag eq 'LONCAPA_INTERNAL_TURN_STYLE_ON')) {
+ if ((ref($lastdontpop) eq 'ARRAY') && ($lastdontpop->[1] eq 'physnet')) {
+ &end_tag($stack,$parstack,$lastdontpop);
+ }
+ }
+
# if ($target eq 'meta') {
# $finaloutput.=&endredirection;
# }
@@ -900,6 +821,9 @@ sub init_safespace {
$safehole->wrap(\&Apache::functionplotresponse::fpr_objectcoords,$safeeval,'&fpr_objectcoords');
$safehole->wrap(\&Apache::functionplotresponse::fpr_vectorlength,$safeeval,'&fpr_vectorlength');
$safehole->wrap(\&Apache::functionplotresponse::fpr_vectorangle,$safeeval,'&fpr_vectorangle');
+ $safehole->wrap(\&Math::Calculus::Expression::math_calculus_expression,$safeeval,'&math_calculus_expression');
+ $safehole->wrap(\&Number::FormatEng::format_eng,$safeeval,'&number_format_eng');
+ $safehole->wrap(\&Number::FormatEng::format_pref,$safeeval,'&number_format_pref');
# use Data::Dumper;
# $safehole->wrap(\&Data::Dumper::Dumper,$safeeval,'&LONCAPA_INTERNAL_Dumper');
@@ -908,7 +832,10 @@ sub init_safespace {
$safeeval->permit("require");
$safeinit .= ';$external::target="'.$target.'";';
&Apache::run::run($safeinit,$safeeval);
- &initialize_rndseed($safeeval);
+ my $rawrndseed = &initialize_rndseed($safeeval);
+ if ($target eq 'grade') {
+ $Apache::lonhomework::rawrndseed = $rawrndseed;
+ }
}
sub clean_safespace {
@@ -947,6 +874,7 @@ sub initialize_rndseed {
my $safeinit = '$external::randomseed="'.$rndseed.'";';
&Apache::lonxml::debug("Setting rndseed to $rndseed");
&Apache::run::run($safeinit,$safeeval);
+ return $rndseed;
}
sub default_homework_load {
@@ -1068,7 +996,7 @@ sub decreasedepth {
sub get_id {
my ($parstack,$safeeval)=@_;
my $id= &Apache::lonxml::get_param('id',$parstack,$safeeval);
- if ($env{'request.state'} eq 'construct' && $id =~ /([._]|[^\w\d\s[:punct:]])/) {
+ if ($env{'request.state'} eq 'construct' && $id =~ /([._]|[^\w\s\-])/) {
&error(&mt('ID [_1] contains invalid characters. IDs are only allowed to contain letters, numbers, spaces and -','"<tt>'.$id.'</tt>"'));
}
if ($id =~ /^\s*$/) { $id = $Apache::lonxml::curdepth; }
@@ -1421,7 +1349,7 @@ sub extlink {
if (!$exact) {
$res=&Apache::lonnet::hreflocation($Apache::lonxml::pwd[-1],$res);
}
- push(@Apache::lonxml::extlinks,$res)
+ push(@Apache::lonxml::extlinks,$res);
}
sub writeallows {
@@ -1551,13 +1479,15 @@ SIMPLECONTENT
sub verify_html {
my ($filecontents)=@_;
- my ($is_html,$is_xml);
+ my ($is_html,$is_xml,$is_physnet);
if ($filecontents =~/(?:\<|\<\;)\?xml[^\<]*\?(?:\>|\>\;)/is) {
$is_xml = 1;
} elsif ($filecontents =~/(?:\<|\<\;)html(?:\s+[^\<]+|\s*)(?:\>|\>\;)/is) {
$is_html = 1;
+ } elsif ($filecontents =~/(?:\<|\<\;)physnet[^\<]*(?:\>|\>\;)/is) {
+ $is_physnet = 1;
}
- unless ($is_xml || $is_html) {
+ unless ($is_xml || $is_html || $is_physnet) {
return &mt('File does not have [_1] or [_2] starting tag','<html>','<?xml ?>');
}
if ($is_html) {
@@ -1603,7 +1533,6 @@ sub renderingoptions {
('' => '',
'tth' => 'tth (TeX to HTML)',
'MathJax' => 'MathJax',
- 'jsMath' => 'jsMath',
'mimetex' => 'mimetex (Convert to Images)')}).
'</span>';
return $output;
@@ -1615,52 +1544,56 @@ sub inserteditinfo {
my $xml_help = '';
my $initialize='';
my $textarea_id = 'filecont';
- my ($dragmath_button,$deps_button);
- my ($add_to_onload, $add_to_onresize);
+ my ($dragmath_button,$deps_button,$context,$cnum,$cdom,$add_to_onload,
+ $add_to_onresize,$init_dragmath);
$initialize=&Apache::lonhtmlcommon::spellheader();
- if (($filetype eq 'html') && (&Apache::lonhtmlcommon::htmlareabrowser())) {
- my $lang = &Apache::lonhtmlcommon::htmlarea_lang();
- my %textarea_args = (
- fullpage => 'true',
- dragmath => 'math',
- );
- $initialize .= &Apache::lonhtmlcommon::htmlareaselectactive(\%textarea_args);
+ if ($filetype eq 'html') {
+ if ($env{'request.course.id'}) {
+ $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
+ $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
+ if ($uri =~ m{^\Q/uploaded/$cdom/$cnum/portfolio/syllabus/\E}) {
+ $context = 'syllabus';
+ }
+ }
+ if (&Apache::lonhtmlcommon::htmlareabrowser()) {
+ my $lang = &Apache::lonhtmlcommon::htmlarea_lang();
+ my %textarea_args = (
+ fullpage => 'true',
+ dragmath => 'math',
+ );
+ $initialize .= &Apache::lonhtmlcommon::htmlareaselectactive(\%textarea_args);
+ if ($context eq 'syllabus') {
+ $init_dragmath = "editmath_visibility('filecont','none')";
+ }
+ }
}
$initialize .= (<<FULLPAGE);
<script type="text/javascript">
// <![CDATA[
function initDocument() {
resize_textarea('$textarea_id','LC_aftertextarea');
+ $init_dragmath
}
// ]]>
</script>
FULLPAGE
my $textareaclass;
if ($filetype eq 'html') {
- my $context;
- if ($env{'request.course.id'}) {
- my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
- my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
- if ($uri =~ m{^\Q/uploaded/$cdom/$cnum/portfolio/syllabus/\E}) {
- $context = 'syllabus';
- $deps_button = &Apache::lonhtmlcommon::dependencies_button()."\n";
- $initialize .=
- &Apache::lonhtmlcommon::dependencycheck_js(undef,&mt('Syllabus'),
- $uri,undef,
- "/public/$cdom/$cnum/syllabus").
- "\n";
- if (&Apache::lonhtmlcommon::htmlareabrowser()) {
- $textareaclass = 'class="LC_richDefaultOn"';
- }
- }
- }
- unless ($context eq 'syllabus') {
- if ($symb || $folderpath) {
- $deps_button = &Apache::lonhtmlcommon::dependencies_button()."\n";
- $initialize .=
- &Apache::lonhtmlcommon::dependencycheck_js($symb,$itemtitle,
- undef,$folderpath,$uri)."\n";
+ if ($context eq 'syllabus') {
+ $deps_button = &Apache::lonhtmlcommon::dependencies_button()."\n";
+ $initialize .=
+ &Apache::lonhtmlcommon::dependencycheck_js(undef,&mt('Syllabus'),
+ $uri,undef,
+ "/public/$cdom/$cnum/syllabus").
+ "\n";
+ if (&Apache::lonhtmlcommon::htmlareabrowser()) {
+ $textareaclass = 'class="LC_richDefaultOn"';
}
+ } elsif ($symb || $folderpath) {
+ $deps_button = &Apache::lonhtmlcommon::dependencies_button()."\n";
+ $initialize .=
+ &Apache::lonhtmlcommon::dependencycheck_js($symb,$itemtitle,
+ undef,$folderpath,$uri)."\n";
}
$dragmath_button = '<span id="math_filecont">'.&Apache::lonhtmlcommon::dragmath_button('filecont',1).'</span>';
$initialize .= "\n".&Apache::lonhtmlcommon::dragmath_js('EditMathPopup');
@@ -1712,14 +1645,14 @@ $initialize
$xml_help
</td></tr>
</table>
- <div class="LC_edit_problem_discards">
- <input type="submit" name="discardview" accesskey="d" value="$lt{'dv'}" />
- $undo $htmlerror $deps_button $dragmath_button
- </div>
- <div class="LC_edit_problem_saves">
+ <div style="float:right">
<input type="submit" name="savethisfile" accesskey="s" value="$lt{'st'}" />
<input type="submit" name="viewmode" accesskey="v" value="$lt{'vi'}" />
</div>
+ <div>
+ <input type="submit" name="discardview" accesskey="d" value="$lt{'dv'}" />
+ $undo $htmlerror $deps_button $dragmath_button
+ </div>
</div>
<textarea $textarea_events style="width:100%" cols="80" rows="44" name="filecont" id="filecont" $textareaclass>$filecontents</textarea><br />$spelllink
<div id="LC_aftertextarea">
@@ -1731,6 +1664,44 @@ ENDFOOTER
return ($editfooter,$add_to_onload,$add_to_onresize);;
}
+sub setmode_javascript {
+ return <<"ENDSCRIPT";
+<script type="text/javascript">
+// <![CDATA[
+function setmode(form,probmode) {
+ if (probmode == 'daxe') {
+ var url = new URL(document.location.href);
+ window.location = url.protocol+'//'+url.hostname+'/daxepage'+url.pathname;
+ } else {
+ var initial = form.problemmode.value;
+ form.problemmode.value = probmode;
+ form.submit();
+ form.problemmode.value = initial;
+ }
+}
+// ]]>
+</script>
+ENDSCRIPT
+}
+
+sub seteditor_javascript {
+ return <<"ENDSCRIPT";
+<script type="text/javascript">
+// <![CDATA[
+function seteditmode(form,editor) {
+ if (editor == 'daxe') {
+ var url = new URL(document.location.href);
+ window.location = url.protocol+'//'+url.hostname+'/daxepage'+url.pathname;
+ } else {
+ form.editmode.value = editor;
+ form.submit();
+ }
+}
+// ]]>
+</script>
+ENDSCRIPT
+}
+
sub get_target {
my $viewgrades=&Apache::lonnet::allowed('vgr',$env{'request.course.id'});
if ( $env{'request.state'} eq 'published') {
@@ -1841,6 +1812,7 @@ sub handler {
}
}
}
+ my $inhibit_menu;
my %mystyle;
my $result = '';
my $filecontents=&Apache::lonnet::getfile($file);
@@ -1898,8 +1870,15 @@ ENDNOTFOUND
&Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
['rawmode']);
if ($env{'form.rawmode'}) { $result = $filecontents; }
+ if (($env{'request.state'} eq 'construct') &&
+ (($filetype eq 'css') || ($filetype eq 'js')) && ($ENV{'HTTP_REFERER'})) {
+ if ($ENV{'HTTP_REFERER'} =~ m{^https?\://[^\/]+/priv/$LONCAPA::match_domain/$LONCAPA::match_username/[^\?]+\.(x?html?|swf)(|\?)[^\?]*$}) {
+ $inhibit_menu = 1;
+ }
+ }
if (($filetype ne 'html') &&
- (!$env{'form.return_only_error_and_warning_counts'})) {
+ (!$env{'form.return_only_error_and_warning_counts'}) &&
+ (!$inhibit_menu)) {
my $nochgview = 1;
my $controls = '';
if ($env{'request.state'} eq 'construct') {
@@ -1916,8 +1895,17 @@ ENDNOTFOUND
}
my $brcrum;
if ($env{'request.state'} eq 'construct') {
- $brcrum = [{'href' => &Apache::loncommon::authorspace($request->uri),
- 'text' => 'Authoring Space'},
+ my $text = 'Authoring Space';
+ my $href = &Apache::loncommon::authorspace($request->uri);
+ if ($env{'request.course.id'}) {
+ my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
+ my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
+ if ($href eq "/priv/$cdom/$cnum/") {
+ $text = 'Course Authoring Space';
+ }
+ }
+ $brcrum = [{'href' => $href,
+ 'text' => $text,},
{'href' => '',
'text' => $breadcrumbtext}];
} else {
@@ -1937,7 +1925,7 @@ ENDNOTFOUND
#
# Edit action? Insert editing commands
#
- unless ($env{'request.state'} eq 'published') {
+ unless (($env{'request.state'} eq 'published') || ($inhibit_menu)) {
if ($env{'form.editmode'} && (!($env{'form.viewmode'})) && (!($env{'form.discardview'})))
{
my ($displayfile,$url,$symb,$itemtitle,$action);
@@ -1978,9 +1966,18 @@ ENDNOTFOUND
'onload' => $add_to_onload, });
my $header;
if ($env{'request.state'} eq 'construct') {
+ my $text = 'Authoring Space';
+ my $href = &Apache::loncommon::authorspace($request->uri);
+ if ($env{'request.course.id'}) {
+ my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
+ my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
+ if ($href eq "/priv/$cdom/$cnum/") {
+ $text = 'Course Authoring Space';
+ }
+ }
$options{'bread_crumbs'} = [{
- 'href' => &Apache::loncommon::authorspace($request->uri),
- 'text' => 'Authoring Space'},
+ 'href' => $href,
+ 'text' => $text},
{'href' => '',
'text' => $breadcrumbtext}];
$header = &Apache::loncommon::head_subbox(
@@ -2136,7 +2133,7 @@ sub error {
my $declutter=&Apache::lonnet::declutter($env{'request.filename'});
my $baseurl = &Apache::lonnet::clutter($declutter);
my @userlist;
- foreach (keys %users) {
+ foreach (keys(%users)) {
my ($user,$domain) = split(/:/, $_);
push(@userlist,"$user:$domain");
my $key=$declutter.'_'.$user.'_'.$domain;
@@ -2207,6 +2204,7 @@ sub add_messages {
sub get_param {
my ($param,$parstack,$safeeval,$context,$case_insensitive, $noelide) = @_;
+
if ( ! $context ) { $context = -1; }
my $args ='';
if ( $#$parstack > (-2-$context) ) { $args=$$parstack[$context]; }
@@ -2214,13 +2212,16 @@ sub get_param {
$args=$Apache::lonxml::style_values.$args;
}
+
if ($noelide) {
- $args =~ s/'\$/'\\\$/g;
+# $args =~ s/\\'/'/g;
+ $args =~ s/'\$/'\\\$/g;
}
if ( ! $args ) { return undef; }
if ( $case_insensitive ) {
if ($args =~ s/(my (?:.*))(\$\Q$param\E[,\)])/$1.lc($2)/ei) {
+
return &Apache::run::run("{$args;".'return $'.$param.'}',
$safeeval); #'
} else {
@@ -2228,6 +2229,7 @@ sub get_param {
}
} else {
if ( $args =~ /my .*\$\Q$param\E[,\)]/ ) {
+
return &Apache::run::run("{$args;".'return $'.$param.'}',
$safeeval); #'
} else {
@@ -2331,7 +2333,7 @@ sub register_insert {
sub dump_insertlist {
my ($ext) = @_;
- open(XML,">/tmp/insertlist.xml.$ext");
+ open(XML,">","/tmp/insertlist.xml.$ext");
print XML ("<insertlist>");
my $i=0;