--- loncom/xml/lonxml.pm 2024/09/25 00:42:37 1.531.2.24.2.6
+++ loncom/xml/lonxml.pm 2018/09/12 21:10:57 1.560
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# XML Parser Module
#
-# $Id: lonxml.pm,v 1.531.2.24.2.6 2024/09/25 00:42:37 raeburn Exp $
+# $Id: lonxml.pm,v 1.560 2018/09/12 21:10:57 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -230,103 +230,8 @@ 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) {
+ foreach my $temp (sort(keys(%Apache::lonxml::alltags))) {
&Apache::lonxml::debug("$temp -- ".
join(',',@{ $Apache::lonxml::alltags{$temp} }));
}
@@ -564,7 +469,7 @@ sub inner_xmlparse {
if ($token->[0] eq 'E') {
if ($dontpop) {
- $lastdontpop = $token;
+ $lastdontpop = $token;
} else {
$lastendtag = $token->[1];
&end_tag($stack,$parstack,$token);
@@ -578,7 +483,7 @@ sub inner_xmlparse {
}
}
- if (($#$stack == 0) && ($stack->[0] eq 'physnet') && ($target eq 'web') &&
+ 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);
@@ -1091,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\s\-])/) {
+ 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; }
@@ -1686,7 +1591,7 @@ FULLPAGE
}
} elsif ($symb || $folderpath) {
$deps_button = &Apache::lonhtmlcommon::dependencies_button()."\n";
- $initialize .=
+ $initialize .=
&Apache::lonhtmlcommon::dependencycheck_js($symb,$itemtitle,
undef,$folderpath,$uri)."\n";
}
@@ -1708,9 +1613,8 @@ FULLPAGE
my %lt=&Apache::lonlocal::texthash('st' => 'Save and Edit',
'vi' => 'Save and View',
'dv' => 'Discard Edits and View',
- 'un' => 'Undo',
- 'ed' => 'Edit',
- 'ew' => 'Edit with Daxe');
+ 'un' => 'undo',
+ 'ed' => 'Edit');
my $spelllink = &Apache::lonhtmlcommon::spelllink('xmledit','filecont');
my $textarea_events = &Apache::edit::element_change_detection();
my $form_events = &Apache::edit::form_change_detection();
@@ -1718,7 +1622,7 @@ FULLPAGE
if ($filetype eq 'html') {
$htmlerror=&verify_html($filecontents);
if ($htmlerror) {
- $htmlerror=(' 'x3).' <span class="LC_error">'.$htmlerror.'</span>';
+ $htmlerror='<span class="LC_error">'.$htmlerror.'</span>';
}
if (&Apache::lonhtmlcommon::htmlareabrowser()) {
unless ($textareaclass) {
@@ -1726,30 +1630,14 @@ FULLPAGE
}
}
}
- my ($undo,$daxebutton,%onclick);
- foreach my $item ('discard','undo','daxe') {
- $onclick{$item} = 'onclick="still_ask=true;setmode(this.form,'."'$item'".')"';
- }
- foreach my $item ('saveedit','saveview') {
- $onclick{$item} = 'onclick="is_submit=true;setmode(this.form,'."'$item'".')"';
- }
+ my $undo;
unless ($uri =~ m{^/uploaded/}) {
- $undo = '<input type="button" name="undo" accesskey="u" value="'.$lt{'un'}.'" '.
- $onclick{'undo'}.' />'."\n";
- }
- $initialize .= &setmode_javascript();
- if ($filetype eq 'html') {
- my %editors = &Apache::loncommon::permitted_editors($uri);
- if ($editors{'daxe'}) {
- $daxebutton = '<input type="button" name="editwithdaxe" accesskey="w" value="'.$lt{'ew'}.'" '.
- $onclick{'daxe'}.' />'."\n";
- }
+ $undo = '<input type="submit" name="Undo" accesskey="u" value="'.$lt{'un'}.'" />'."\n";
}
my $editfooter=(<<ENDFOOTER);
$initialize
<a name="editsection" />
<form $form_events method="post" name="xmledit" action="$action">
- <input type="hidden" name="problemmode" value="edit" />
<div class="LC_edit_problem_editxml_header">
<table class="LC_edit_problem_header_title"><tr><td>
$filename
@@ -1757,13 +1645,13 @@ $initialize
$xml_help
</td></tr>
</table>
- <div style="float:right">
- <input type="button" name="savethisfile" accesskey="s" value="$lt{'st'}" $onclick{'saveedit'} />
- <input type="button" name="viewmode" accesskey="v" value="$lt{'vi'}" $onclick{'saveview'} />
- </div>
<div>
- <input type="button" name="discardview" accesskey="d" value="$lt{'dv'}" $onclick{'discard'} />
- $undo $deps_button $daxebutton $dragmath_button $htmlerror
+ <input type="submit" name="discardview" accesskey="d" value="$lt{'dv'}" />
+ $undo $htmlerror $deps_button $dragmath_button
+ </div>
+ <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>
<textarea $textarea_events style="width:100%" cols="80" rows="44" name="filecont" id="filecont" $textareaclass>$filecontents</textarea><br />$spelllink
@@ -1773,97 +1661,7 @@ $initialize
</div>
</form>
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 {
- my ($is_course_doc,$is_supp,$supp_path,$supp_title) = @_;
- my $symb;
- if ($is_course_doc) {
- if (!$is_supp) {
- ($symb) = &Apache::lonnet::whichuser();
- if ($symb) {
- $symb = &escape($symb);
- }
- }
- }
- return <<"ENDSCRIPT";
-<script type="text/javascript">
-// <![CDATA[
-function seteditmode(form,editor) {
- var querystr = '';
- var supplemental = '$is_supp';
- var coursedoc = '$is_course_doc';
- if (coursedoc) {
- if (supplemental) {
- var supppath = '$supp_path';
- var supptitle = '$supp_title';
- if (supppath) {
- querystr = 'folderpath='+supppath;
- }
- if (supptitle) {
- if (querystr) {
- querystr += '&';
- }
- querystr += 'title='+supptitle;
- }
- }
- }
- if (editor == 'daxe') {
- var url = new URL(document.location.href);
- var newloc = url.protocol+'//'+url.hostname+'/daxepage'+url.pathname;
- if (querystr) {
- if (/\\?/.test(url.pathname)) {
- newloc += '&';
- } else {
- newloc += '?';
- }
- newloc += querystr;
- }
- window.location = newloc;
- } else {
- if (coursedoc) {
- var curraction = form.action;
- var idx = curraction.indexOf('?');
- if (idx !== -1) {
- form.action = curraction.substring(0,idx);
- }
- form.action += '?forceedit=1®ister=1';
- if (querystr) {
- form.action += '&'+querystr;
- }
- }
- if (editor == 'edit') {
- form.editmode.value = editor;
- } else {
- form.editmode.value = '';
- }
- form.submit();
- }
-}
-// ]]>
-</script>
-ENDSCRIPT
+ return ($editfooter,$add_to_onload,$add_to_onresize);;
}
sub get_target {
@@ -1968,13 +1766,11 @@ sub handler {
# Edit action? Save file.
#
if (!($env{'request.state'} eq 'published')) {
- if (($env{'form.problemmode'} eq 'saveedit') ||
- ($env{'form.problemmode'} eq 'saveview') ||
- ($env{'form.problemmode'} eq 'undo')) {
+ if ($env{'form.savethisfile'} || $env{'form.viewmode'} || $env{'form.Undo'}) {
my $html_file=&Apache::lonnet::getfile($file);
my $error = &Apache::lonhomework::handle_save_or_undo($request, \$html_file, \$env{'form.filecont'});
- if ($env{'form.problemmode'} eq 'saveedit') {
- $env{'form.editmode'}='edit'; #force edit mode
+ if ($env{'form.savethisfile'}) {
+ $env{'form.editmode'}='Edit'; #force edit mode
}
}
}
@@ -2003,7 +1799,7 @@ ENDNOTFOUND
} elsif ($filetype ne 'css' && $filetype ne 'txt' && $filetype ne 'tex') {
$filecontents=&createnewhtml();
}
- $env{'form.editmode'}='edit'; #force edit mode
+ $env{'form.editmode'}='Edit'; #force edit mode
}
} else {
unless ($env{'request.state'} eq 'published') {
@@ -2015,9 +1811,7 @@ ENDNOTFOUND
&Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
['editmode']);
}
- if ((!$env{'form.editmode'}) ||
- ($env{'form.problemmode'} eq 'saveview') ||
- ($env{'form.problemmode'} eq 'discard')) {
+ if (!$env{'form.editmode'} || $env{'form.viewmode'} || $env{'form.discardview'}) {
if ($filetype eq 'html' || $filetype eq 'sty') {
&Apache::structuretags::reset_problem_globals();
$result = &Apache::lonxml::xmlparse($request,$target,
@@ -2085,22 +1879,15 @@ ENDNOTFOUND
# Edit action? Insert editing commands
#
unless (($env{'request.state'} eq 'published') || ($inhibit_menu)) {
- if (($env{'form.editmode'}) &&
- (!($env{'form.problemmode'} eq 'saveview')) &&
- (!($env{'form.problemmode'} eq 'discard'))) {
+ if ($env{'form.editmode'} && (!($env{'form.viewmode'})) && (!($env{'form.discardview'})))
+ {
my ($displayfile,$url,$symb,$itemtitle,$action);
$displayfile=$request->uri;
if ($request->uri =~ m{^/uploaded/}) {
if ($env{'request.course.id'}) {
- if ($request->uri =~ m{^\Q/uploaded/$cdom/$cnum/\E(docs|supplemental)/}) {
- if ($1 eq 'supplemental') {
- &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
- ['folderpath','title']);
- }
- if (($env{'request.state'} eq 'edit') && ($env{'form.editmode'} eq 'edit') &&
- ($filetype eq 'html')) {
- &Apache::lonhtmlcommon::clear_breadcrumbs();
- }
+ if ($request->uri =~ m{^\Q/uploaded/$cdom/$cnum/supplemental/\E}) {
+ &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
+ ['folderpath','title']);
} elsif ($request->uri =~ m{^\Q/uploaded/$cdom/$cnum/portfolio/syllabus/\E(.+)$}) {
my $filename = $1;
if ($1 eq 'loncapa.html') {
@@ -2361,6 +2148,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]; }
@@ -2368,13 +2156,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 {
@@ -2382,6 +2173,7 @@ sub get_param {
}
} else {
if ( $args =~ /my .*\$\Q$param\E[,\)]/ ) {
+
return &Apache::run::run("{$args;".'return $'.$param.'}',
$safeeval); #'
} else {