--- loncom/xml/lonxml.pm 2025/01/15 18:09:02 1.531.2.24.2.7
+++ loncom/xml/lonxml.pm 2012/11/30 11:45:57 1.535
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# XML Parser Module
#
-# $Id: lonxml.pm,v 1.531.2.24.2.7 2025/01/15 18:09:02 raeburn Exp $
+# $Id: lonxml.pm,v 1.535 2012/11/30 11:45:57 foxr Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -69,8 +69,6 @@ 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 );
@@ -146,7 +144,7 @@ $metamode = 0;
# turns on and of run::evaluate actually derefencing var refs
$evaluate = 1;
-# data structure for edit mode, determines what tags can go into what other tags
+# data structure for eidt mode, determines what tags can go into what other tags
%insertlist=();
# stores the list of active tag namespaces
@@ -230,106 +228,12 @@ 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} }));
- }
+ my $temp;
+ foreach $temp (sort keys %Apache::lonxml::alltags) {
+ &Apache::lonxml::debug("$temp -- ".
+ join(',',@{ $Apache::lonxml::alltags{$temp} }));
+ }
}
sub xmlparse {
@@ -402,12 +306,8 @@ sub xmlparse {
&clean_safespace($safeeval);
if (@script_var_displays) {
- 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);
- }
+ my $scriptoutput = join('',@script_var_displays);
+ $finaloutput=~s{(</body>\s*</html>)\s*$}{$scriptoutput$1}s;
undef(@script_var_displays);
}
&init_state();
@@ -442,9 +342,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;
@@ -465,8 +365,6 @@ 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) {
@@ -562,29 +460,17 @@ sub inner_xmlparse {
}
$result = '';
- if ($token->[0] eq 'E') {
- if ($dontpop) {
- $lastdontpop = $token;
- } else {
- $lastendtag = $token->[1];
- &end_tag($stack,$parstack,$token);
- }
+ if ($token->[0] eq 'E' && !$dontpop) {
+ &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;
# }
@@ -765,10 +651,9 @@ sub init_safespace {
my ($target,$safeeval,$safehole,$safeinit) = @_;
$safeeval->reval('use LaTeX::Table;');
$safeeval->deny_only(':dangerous');
- $safeeval->reval('use LONCAPA::LCMathComplex;');
+ $safeeval->reval('use Math::Complex;');
$safeeval->permit_only(":default");
$safeeval->permit("entereval");
- $safeeval->permit("hintseval");
$safeeval->permit(":base_math");
$safeeval->permit("sort");
$safeeval->permit("time");
@@ -917,9 +802,6 @@ 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');
@@ -928,10 +810,7 @@ sub init_safespace {
$safeeval->permit("require");
$safeinit .= ';$external::target="'.$target.'";';
&Apache::run::run($safeinit,$safeeval);
- my $rawrndseed = &initialize_rndseed($safeeval);
- if ($target eq 'grade') {
- $Apache::lonhomework::rawrndseed = $rawrndseed;
- }
+ &initialize_rndseed($safeeval);
}
sub clean_safespace {
@@ -970,7 +849,6 @@ 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 {
@@ -1092,7 +970,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\d\s[:punct:]])/) {
&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; }
@@ -1445,7 +1323,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 {
@@ -1481,9 +1359,7 @@ sub do_registered_ssi {
sub add_script_result {
my ($display) = @_;
- if ($display ne '') {
- push(@script_var_displays, $display);
- }
+ push(@script_var_displays, $display);
}
#
@@ -1575,15 +1451,13 @@ SIMPLECONTENT
sub verify_html {
my ($filecontents)=@_;
- my ($is_html,$is_xml,$is_physnet);
+ my ($is_html,$is_xml);
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 || $is_physnet) {
+ unless ($is_xml || $is_html) {
return &mt('File does not have [_1] or [_2] starting tag','<html>','<?xml ?>');
}
if ($is_html) {
@@ -1629,65 +1503,42 @@ sub renderingoptions {
('' => '',
'tth' => 'tth (TeX to HTML)',
'MathJax' => 'MathJax',
+ 'jsMath' => 'jsMath',
'mimetex' => 'mimetex (Convert to Images)')}).
'</span>';
return $output;
}
sub inserteditinfo {
- my ($filecontents,$filetype,$filename,$symb,$itemtitle,$folderpath,$uri,$action) = @_;
+ my ($filecontents,$filetype,$filename,$symb,$itemtitle,$folderpath,$uri) = @_;
$filecontents = &HTML::Entities::encode($filecontents,'<>&"');
my $xml_help = '';
my $initialize='';
my $textarea_id = 'filecont';
- my ($dragmath_button,$deps_button,$context,$cnum,$cdom,$add_to_onload,
- $add_to_onresize,$init_dragmath);
+ my ($dragmath_button,$deps_button);
+ my ($add_to_onload, $add_to_onresize);
$initialize=&Apache::lonhtmlcommon::spellheader();
- 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')";
- }
- }
+ 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);
}
$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') {
- 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) {
+ if ($symb || $folderpath) {
$deps_button = &Apache::lonhtmlcommon::dependencies_button()."\n";
- $initialize .=
+ $initialize .=
&Apache::lonhtmlcommon::dependencycheck_js($symb,$itemtitle,
undef,$folderpath,$uri)."\n";
}
@@ -1698,20 +1549,16 @@ FULLPAGE
$add_to_onresize = "resize_textarea('$textarea_id','LC_aftertextarea');";
if ($filetype eq 'html') {
- my $not_author;
- if ($uri =~ m{^/uploaded/}) {
- $not_author = 1;
- }
- $xml_help=&Apache::loncommon::helpLatexCheatsheet(undef,undef,$not_author);
+ $xml_help=&Apache::loncommon::helpLatexCheatsheet();
}
my $titledisplay=&display_title();
+ my $textareaclass;
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();
@@ -1719,38 +1566,16 @@ 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) {
- $textareaclass = 'class="LC_richDefaultOff"';
- }
- }
- }
- 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="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";
+ $textareaclass = 'class="LC_richDefaultOff"';
}
}
my $editfooter=(<<ENDFOOTER);
$initialize
<a name="editsection" />
-<form $form_events method="post" name="xmledit" action="$action">
- <input type="hidden" name="problemmode" value="edit" />
+<form $form_events method="post" name="xmledit">
<div class="LC_edit_problem_editxml_header">
<table class="LC_edit_problem_header_title"><tr><td>
$filename
@@ -1758,13 +1583,14 @@ $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 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
</div>
- <div>
- <input type="button" name="discardview" accesskey="d" value="$lt{'dv'}" $onclick{'discard'} />
- $undo $deps_button $daxebutton $dragmath_button $htmlerror
+ <div class="LC_edit_problem_saves">
+ <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,98 +1599,9 @@ $initialize
$titledisplay
</div>
</form>
+</body>
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 {
@@ -1933,24 +1670,6 @@ sub handler {
} else {
$filetype='html';
}
- unless ($env{'request.uri'}) {
- $env{'request.uri'}=$request->uri;
- &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
- ['todocs']);
- }
- my ($cdom,$cnum);
- if ($env{'request.course.id'}) {
- $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
- $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
- if ($filetype eq 'html') {
- if ($request->uri =~ m{^\Q/uploaded/$cdom/$cnum/portfolio/syllabus/\E.+$}) {
- if (&Apache::lonnet::allowed('mdc',$env{'request.course.id'})) {
- &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
- ['editmode']);
- }
- }
- }
- }
if ($filetype eq 'sty') {
$breadcrumbtext = 'Style File Editor';
} elsif ($filetype eq 'js') {
@@ -1969,17 +1688,14 @@ 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
}
}
}
- my $inhibit_menu;
my %mystyle;
my $result = '';
my $filecontents=&Apache::lonnet::getfile($file);
@@ -2004,7 +1720,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') {
@@ -2016,9 +1732,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,
@@ -2039,15 +1753,8 @@ 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'}) &&
- (!$inhibit_menu)) {
+ (!$env{'form.return_only_error_and_warning_counts'})) {
my $nochgview = 1;
my $controls = '';
if ($env{'request.state'} eq 'construct') {
@@ -2065,7 +1772,7 @@ ENDNOTFOUND
my $brcrum;
if ($env{'request.state'} eq 'construct') {
$brcrum = [{'href' => &Apache::loncommon::authorspace($request->uri),
- 'text' => 'Authoring Space'},
+ 'text' => 'Construction Space'},
{'href' => '',
'text' => $breadcrumbtext}];
} else {
@@ -2085,47 +1792,30 @@ 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'))) {
- my ($displayfile,$url,$symb,$itemtitle,$action);
+ unless ($env{'request.state'} eq 'published') {
+ if ($env{'form.editmode'} && (!($env{'form.viewmode'})) && (!($env{'form.discardview'})))
+ {
+ my ($displayfile,$url,$symb,$itemtitle);
$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();
- }
- } elsif ($request->uri =~ m{^\Q/uploaded/$cdom/$cnum/portfolio/syllabus/\E(.+)$}) {
- 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);
- }
- $itemtitle = &mt('Syllabus');
+ my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
+ my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
+ if ($request->uri =~ m{^\Q/uploaded/$cdom/$cnum/\Esupplemental/}) {
+ &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
+ ['folderpath','title']);
}
}
- unless ($itemtitle) {
- ($symb,$itemtitle,$displayfile) =
- &get_courseupload_hierarchy($request->uri,
- $env{'form.folderpath'},
- $env{'form.title'});
- }
+ ($symb,$itemtitle,$displayfile) =
+ &get_courseupload_hierarchy($request->uri,
+ $env{'form.folderpath'},$env{'form.title'});
} else {
$displayfile=~s/^\/[^\/]*//;
}
my ($edit_info, $add_to_onload, $add_to_onresize)=
&inserteditinfo($filecontents,$filetype,$displayfile,$symb,
- $itemtitle,$env{'form.folderpath'},$request->uri,$action);
+ $itemtitle,$env{'form.folderpath'},$request->uri);
my %options =
('add_entries' =>
@@ -2135,7 +1825,7 @@ ENDNOTFOUND
if ($env{'request.state'} eq 'construct') {
$options{'bread_crumbs'} = [{
'href' => &Apache::loncommon::authorspace($request->uri),
- 'text' => 'Authoring Space'},
+ 'text' => 'Construction Space'},
{'href' => '',
'text' => $breadcrumbtext}];
$header = &Apache::loncommon::head_subbox(
@@ -2170,7 +1860,7 @@ sub display_title {
$title = substr($title, rindex($title, '/') + 1);
}
$result = "<script type='text/javascript'>top.document.title = '$title - LON-CAPA "
- .&mt('Authoring Space')."';</script>";
+ .&mt('Construction Space')."';</script>";
}
return $result;
}
@@ -2185,7 +1875,6 @@ sub get_courseupload_hierarchy {
while (@folders) {
my $folder=shift(@folders);
my $foldername=shift(@folders);
- $foldername =~ s/\:(\d*)\:(\w*)\:(\w*):(\d*)\:?(\d*)$//;
push(@pathitems,&unescape($foldername));
}
if ($title) {
@@ -2291,7 +1980,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;
@@ -2362,6 +2051,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]; }
@@ -2369,13 +2059,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 {
@@ -2383,6 +2076,7 @@ sub get_param {
}
} else {
if ( $args =~ /my .*\$\Q$param\E[,\)]/ ) {
+
return &Apache::run::run("{$args;".'return $'.$param.'}',
$safeeval); #'
} else {
@@ -2486,7 +2180,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;
@@ -2544,7 +2238,7 @@ sub description {
sub helpinfo {
my ($token)=@_;
my $tag = &get_tag($token);
- return ($insertlist{$tag.'.helpfile'}, &mt($insertlist{$tag.'.helpdesc'}));
+ return ($insertlist{$tag.'.helpfile'}, $insertlist{$tag.'.helpdesc'});
}
sub get_tag {