--- loncom/xml/lonxml.pm 2024/03/31 02:02:32 1.531.2.24.2.3 +++ loncom/xml/lonxml.pm 2023/11/28 02:39:01 1.566 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # XML Parser Module # -# $Id: lonxml.pm,v 1.531.2.24.2.3 2024/03/31 02:02:32 raeburn Exp $ +# $Id: lonxml.pm,v 1.566 2023/11/28 02:39:01 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 (< - 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=''; - } - -
- - - - -
DocID Checkin
- - - - - - - -
Scan in Barcode
or Type in DocID - -* - -* - -
-
-
-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 - ''. - &mt('Checked out for').' '.$plainname. - '
'.&mt('User').': '.$tuname.' at '.$tudom. - '
'.&mt('ID').': '.$idhash{$tuname}. - '
'.&mt('CourseID').': '.$tcrsid. - '
'.&mt('Course').': '.$env{'course.'.$tcrsid.'.description'}. - '
'.&mt('DocID').': '.$token. - '
'.&mt('Time').': '.&Apache::lonlocal::locallocaltime().'
'; - } 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 -','"'.$id.'"')); } 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).' '.$htmlerror.''; + $htmlerror=''.$htmlerror.''; } if (&Apache::lonhtmlcommon::htmlareabrowser()) { unless ($textareaclass) { @@ -1726,8 +1630,8 @@ FULLPAGE } } } - my ($undo,$daxebutton,%onclick); - foreach my $item ('discard','undo','daxe') { + my ($undo,%onclick); + foreach my $item ('discard','undo') { $onclick{$item} = 'onclick="still_ask=true;setmode(this.form,'."'$item'".')"'; } foreach my $item ('saveedit','saveview') { @@ -1738,13 +1642,6 @@ FULLPAGE $onclick{'undo'}.' />'."\n"; } $initialize .= &setmode_javascript(); - if ($filetype eq 'html') { - my %editors = &Apache::loncommon::permitted_editors(); - if ($editors{'daxe'}) { - $daxebutton = ''."\n"; - } - } my $editfooter=(< @@ -1763,7 +1660,7 @@ $initialize
- $undo $deps_button $daxebutton $dragmath_button $htmlerror + $undo $htmlerror $deps_button $dragmath_button

$spelllink @@ -1805,11 +1702,7 @@ function seteditmode(form,editor) { var url = new URL(document.location.href); window.location = url.protocol+'//'+url.hostname+'/daxepage'+url.pathname; } else { - if (editor == 'edit') { - form.editmode.value = editor; - } else { - form.editmode.value = ''; - } + form.editmode.value = editor; form.submit(); } } @@ -1967,7 +1860,7 @@ ENDNOTFOUND &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'}, ['editmode']); } - if ((!$env{'form.editmode'}) || + if ((!$env{'form.editmode'}) || ($env{'form.problemmode'} eq 'saveview') || ($env{'form.problemmode'} eq 'discard')) { if ($filetype eq 'html' || $filetype eq 'sty') { @@ -2015,8 +1908,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 { @@ -2037,7 +1939,7 @@ ENDNOTFOUND # Edit action? Insert editing commands # unless (($env{'request.state'} eq 'published') || ($inhibit_menu)) { - if (($env{'form.editmode'}) && + if (($env{'form.editmode'}) && (!($env{'form.problemmode'} eq 'saveview')) && (!($env{'form.problemmode'} eq 'discard'))) { my ($displayfile,$url,$symb,$itemtitle,$action); @@ -2078,9 +1980,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( @@ -2307,6 +2218,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]; } @@ -2314,13 +2226,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 { @@ -2328,6 +2243,7 @@ sub get_param { } } else { if ( $args =~ /my .*\$\Q$param\E[,\)]/ ) { + return &Apache::run::run("{$args;".'return $'.$param.'}', $safeeval); #' } else {