--- loncom/xml/lonxml.pm 2024/07/07 21:43:24 1.531.2.26
+++ loncom/xml/lonxml.pm 2023/11/28 04:48:14 1.567
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# XML Parser Module
#
-# $Id: lonxml.pm,v 1.531.2.26 2024/07/07 21:43:24 raeburn Exp $
+# $Id: lonxml.pm,v 1.567 2023/11/28 04:48:14 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; }
@@ -1633,21 +1538,6 @@ sub renderingoptions {
return $output;
}
-sub setmode_javascript {
- return <<"ENDSCRIPT";
-<script type="text/javascript">
-// <![CDATA[
-function setmode(form,probmode) {
- var initial = form.problemmode.value;
- form.problemmode.value = probmode;
- form.submit();
- form.problemmode.value = initial;
-}
-// ]]>
-</script>
-ENDSCRIPT
-}
-
sub inserteditinfo {
my ($filecontents,$filetype,$filename,$symb,$itemtitle,$folderpath,$uri,$action) = @_;
$filecontents = &HTML::Entities::encode($filecontents,'<>&"');
@@ -1701,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";
}
@@ -1723,8 +1613,9 @@ FULLPAGE
my %lt=&Apache::lonlocal::texthash('st' => 'Save and Edit',
'vi' => 'Save and View',
'dv' => 'Discard Edits and View',
- 'un' => 'undo',
- 'ed' => 'Edit');
+ 'un' => 'Undo',
+ 'ed' => 'Edit',
+ 'ew' => 'Edit with Daxe');
my $spelllink = &Apache::lonhtmlcommon::spelllink('xmledit','filecont');
my $textarea_events = &Apache::edit::element_change_detection();
my $form_events = &Apache::edit::form_change_detection();
@@ -1732,7 +1623,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) {
@@ -1740,18 +1631,25 @@ FULLPAGE
}
}
}
- my ($undo,%onclick);
- foreach my $item ('discard','undo') {
+ 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'".')"';
}
unless ($uri =~ m{^/uploaded/}) {
- $undo = '<input type="submit" name="Undo" accesskey="u" value="'.$lt{'un'}.'" '.
- $onclick{'undo'}.' />'."\n";
+ $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();
+ if ($editors{'daxe'}) {
+ $daxebutton = '<input type="button" name="editwithdaxe" accesskey="w" value="'.$lt{'ew'}.'" '.
+ $onclick{'daxe'}.' />'."\n";
+ }
+ }
my $editfooter=(<<ENDFOOTER);
$initialize
<a name="editsection" />
@@ -1770,7 +1668,7 @@ $initialize
</div>
<div>
<input type="button" name="discardview" accesskey="d" value="$lt{'dv'}" $onclick{'discard'} />
- $undo $deps_button $dragmath_button $htmlerror
+ $undo $htmlerror $deps_button $daxebutton $dragmath_button
</div>
</div>
<textarea $textarea_events style="width:100%" cols="80" rows="44" name="filecont" id="filecont" $textareaclass>$filecontents</textarea><br />$spelllink
@@ -1783,6 +1681,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') {
@@ -1980,8 +1916,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 {
@@ -2043,9 +1988,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(
@@ -2272,6 +2226,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]; }
@@ -2279,13 +2234,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 {
@@ -2293,6 +2251,7 @@ sub get_param {
}
} else {
if ( $args =~ /my .*\$\Q$param\E[,\)]/ ) {
+
return &Apache::run::run("{$args;".'return $'.$param.'}',
$safeeval); #'
} else {