--- loncom/xml/lonxml.pm 2013/08/08 12:47:13 1.531.2.10
+++ loncom/xml/lonxml.pm 2014/08/25 00:20:55 1.550
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# XML Parser Module
#
-# $Id: lonxml.pm,v 1.531.2.10 2013/08/08 12:47:13 raeburn Exp $
+# $Id: lonxml.pm,v 1.550 2014/08/25 00:20:55 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -144,7 +144,7 @@ $metamode = 0;
# turns on and of run::evaluate actually derefencing var refs
$evaluate = 1;
-# data structure for eidt mode, determines what tags can go into what other tags
+# data structure for edit mode, determines what tags can go into what other tags
%insertlist=();
# stores the list of active tag namespaces
@@ -228,100 +228,6 @@ 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) {
@@ -400,8 +306,12 @@ sub xmlparse {
&clean_safespace($safeeval);
if (@script_var_displays) {
- my $scriptoutput = join('',@script_var_displays);
- $finaloutput=~s{(</body>\s*</html>)\s*$}{$scriptoutput$1}s;
+ if ($finaloutput =~ m{</body>\s*</html>\s*$}s) {
+ my $scriptoutput = join('',@script_var_displays);
+ $finaloutput=~s{(</body>\s*</html>)\s*$}{$scriptoutput$1}s;
+ } else {
+ $finaloutput .= join('',@script_var_displays);
+ }
undef(@script_var_displays);
}
&init_state();
@@ -745,7 +655,7 @@ sub init_safespace {
my ($target,$safeeval,$safehole,$safeinit) = @_;
$safeeval->reval('use LaTeX::Table;');
$safeeval->deny_only(':dangerous');
- $safeeval->reval('use Math::Complex;');
+ $safeeval->reval('use LONCAPA::LCMathComplex;');
$safeeval->permit_only(":default");
$safeeval->permit("entereval");
$safeeval->permit(":base_math");
@@ -1417,7 +1327,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 {
@@ -1453,7 +1363,9 @@ sub do_registered_ssi {
sub add_script_result {
my ($display) = @_;
- push(@script_var_displays, $display);
+ if ($display ne '') {
+ push(@script_var_displays, $display);
+ }
}
#
@@ -1604,57 +1516,61 @@ sub renderingoptions {
}
sub inserteditinfo {
- my ($filecontents,$filetype,$filename,$symb,$itemtitle,$folderpath,$uri) = @_;
+ my ($filecontents,$filetype,$filename,$symb,$itemtitle,$folderpath,$uri,$action) = @_;
$filecontents = &HTML::Entities::encode($filecontents,'<>&"');
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');
@@ -1663,7 +1579,11 @@ FULLPAGE
$add_to_onresize = "resize_textarea('$textarea_id','LC_aftertextarea');";
if ($filetype eq 'html') {
- $xml_help=&Apache::loncommon::helpLatexCheatsheet();
+ my $not_author;
+ if ($uri =~ m{^/uploaded/}) {
+ $not_author = 1;
+ }
+ $xml_help=&Apache::loncommon::helpLatexCheatsheet(undef,undef,$not_author);
}
my $titledisplay=&display_title();
@@ -1687,10 +1607,14 @@ FULLPAGE
}
}
}
+ my $undo;
+ unless ($uri =~ m{^/uploaded/}) {
+ $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="">
+<form $form_events method="post" name="xmledit" action="$action">
<div class="LC_edit_problem_editxml_header">
<table class="LC_edit_problem_header_title"><tr><td>
$filename
@@ -1700,8 +1624,7 @@ $initialize
</table>
<div class="LC_edit_problem_discards">
<input type="submit" name="discardview" accesskey="d" value="$lt{'dv'}" />
- <input type="submit" name="Undo" accesskey="u" value="$lt{'un'}" />
- $htmlerror $deps_button $dragmath_button
+ $undo $htmlerror $deps_button $dragmath_button
</div>
<div class="LC_edit_problem_saves">
<input type="submit" name="savethisfile" accesskey="s" value="$lt{'st'}" />
@@ -1714,7 +1637,6 @@ $initialize
$titledisplay
</div>
</form>
-</body>
ENDFOOTER
return ($editfooter,$add_to_onload,$add_to_onresize);;
}
@@ -1829,6 +1751,7 @@ sub handler {
}
}
}
+ my $inhibit_menu;
my %mystyle;
my $result = '';
my $filecontents=&Apache::lonnet::getfile($file);
@@ -1886,8 +1809,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') {
@@ -1925,10 +1855,10 @@ 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);
+ my ($displayfile,$url,$symb,$itemtitle,$action);
$displayfile=$request->uri;
if ($request->uri =~ m{^/uploaded/}) {
if ($env{'request.course.id'}) {
@@ -1939,6 +1869,7 @@ ENDNOTFOUND
my $filename = $1;
if ($1 eq 'loncapa.html') {
$displayfile = &mt('Syllabus (minimal template)');
+ $action = $request->uri.'?forceedit=1';
} else {
$displayfile = &mt('Syllabus file: [_1]',$1);
}
@@ -1957,7 +1888,7 @@ ENDNOTFOUND
my ($edit_info, $add_to_onload, $add_to_onresize)=
&inserteditinfo($filecontents,$filetype,$displayfile,$symb,
- $itemtitle,$env{'form.folderpath'},$request->uri);
+ $itemtitle,$env{'form.folderpath'},$request->uri,$action);
my %options =
('add_entries' =>
@@ -2194,6 +2125,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]; }
@@ -2201,13 +2133,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 {
@@ -2215,6 +2150,7 @@ sub get_param {
}
} else {
if ( $args =~ /my .*\$\Q$param\E[,\)]/ ) {
+
return &Apache::run::run("{$args;".'return $'.$param.'}',
$safeeval); #'
} else {
@@ -2376,7 +2312,7 @@ sub description {
sub helpinfo {
my ($token)=@_;
my $tag = &get_tag($token);
- return ($insertlist{$tag.'.helpfile'}, $insertlist{$tag.'.helpdesc'});
+ return ($insertlist{$tag.'.helpfile'}, &mt($insertlist{$tag.'.helpdesc'}));
}
sub get_tag {