version 1.531.2.10, 2013/08/08 12:47:13
|
version 1.531.2.14, 2014/02/06 17:34:19
|
Line 144 $metamode = 0;
|
Line 144 $metamode = 0;
|
# turns on and of run::evaluate actually derefencing var refs |
# turns on and of run::evaluate actually derefencing var refs |
$evaluate = 1; |
$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=(); |
%insertlist=(); |
|
|
# stores the list of active tag namespaces |
# stores the list of active tag namespaces |
Line 400 sub xmlparse {
|
Line 400 sub xmlparse {
|
&clean_safespace($safeeval); |
&clean_safespace($safeeval); |
|
|
if (@script_var_displays) { |
if (@script_var_displays) { |
my $scriptoutput = join('',@script_var_displays); |
if ($finaloutput =~ m{</body>\s*</html>\s*$}s) { |
$finaloutput=~s{(</body>\s*</html>)\s*$}{$scriptoutput$1}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); |
undef(@script_var_displays); |
} |
} |
&init_state(); |
&init_state(); |
Line 745 sub init_safespace {
|
Line 749 sub init_safespace {
|
my ($target,$safeeval,$safehole,$safeinit) = @_; |
my ($target,$safeeval,$safehole,$safeinit) = @_; |
$safeeval->reval('use LaTeX::Table;'); |
$safeeval->reval('use LaTeX::Table;'); |
$safeeval->deny_only(':dangerous'); |
$safeeval->deny_only(':dangerous'); |
$safeeval->reval('use Math::Complex;'); |
$safeeval->reval('use LONCAPA::LCMathComplex;'); |
$safeeval->permit_only(":default"); |
$safeeval->permit_only(":default"); |
$safeeval->permit("entereval"); |
$safeeval->permit("entereval"); |
$safeeval->permit(":base_math"); |
$safeeval->permit(":base_math"); |
Line 1453 sub do_registered_ssi {
|
Line 1457 sub do_registered_ssi {
|
|
|
sub add_script_result { |
sub add_script_result { |
my ($display) = @_; |
my ($display) = @_; |
push(@script_var_displays, $display); |
if ($display ne '') { |
|
push(@script_var_displays, $display); |
|
} |
} |
} |
|
|
# |
# |
Line 1604 sub renderingoptions {
|
Line 1610 sub renderingoptions {
|
} |
} |
|
|
sub inserteditinfo { |
sub inserteditinfo { |
my ($filecontents,$filetype,$filename,$symb,$itemtitle,$folderpath,$uri) = @_; |
my ($filecontents,$filetype,$filename,$symb,$itemtitle,$folderpath,$uri,$action) = @_; |
$filecontents = &HTML::Entities::encode($filecontents,'<>&"'); |
$filecontents = &HTML::Entities::encode($filecontents,'<>&"'); |
my $xml_help = ''; |
my $xml_help = ''; |
my $initialize=''; |
my $initialize=''; |
Line 1690 FULLPAGE
|
Line 1696 FULLPAGE
|
my $editfooter=(<<ENDFOOTER); |
my $editfooter=(<<ENDFOOTER); |
$initialize |
$initialize |
<a name="editsection" /> |
<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"> |
<div class="LC_edit_problem_editxml_header"> |
<table class="LC_edit_problem_header_title"><tr><td> |
<table class="LC_edit_problem_header_title"><tr><td> |
$filename |
$filename |
Line 1714 $initialize
|
Line 1720 $initialize
|
$titledisplay |
$titledisplay |
</div> |
</div> |
</form> |
</form> |
</body> |
|
ENDFOOTER |
ENDFOOTER |
return ($editfooter,$add_to_onload,$add_to_onresize);; |
return ($editfooter,$add_to_onload,$add_to_onresize);; |
} |
} |
Line 1928 ENDNOTFOUND
|
Line 1933 ENDNOTFOUND
|
unless ($env{'request.state'} eq 'published') { |
unless ($env{'request.state'} eq 'published') { |
if ($env{'form.editmode'} && (!($env{'form.viewmode'})) && (!($env{'form.discardview'}))) |
if ($env{'form.editmode'} && (!($env{'form.viewmode'})) && (!($env{'form.discardview'}))) |
{ |
{ |
my ($displayfile,$url,$symb,$itemtitle); |
my ($displayfile,$url,$symb,$itemtitle,$action); |
$displayfile=$request->uri; |
$displayfile=$request->uri; |
if ($request->uri =~ m{^/uploaded/}) { |
if ($request->uri =~ m{^/uploaded/}) { |
if ($env{'request.course.id'}) { |
if ($env{'request.course.id'}) { |
Line 1939 ENDNOTFOUND
|
Line 1944 ENDNOTFOUND
|
my $filename = $1; |
my $filename = $1; |
if ($1 eq 'loncapa.html') { |
if ($1 eq 'loncapa.html') { |
$displayfile = &mt('Syllabus (minimal template)'); |
$displayfile = &mt('Syllabus (minimal template)'); |
|
$action = $request->uri.'?forceedit=1'; |
} else { |
} else { |
$displayfile = &mt('Syllabus file: [_1]',$1); |
$displayfile = &mt('Syllabus file: [_1]',$1); |
} |
} |
Line 1957 ENDNOTFOUND
|
Line 1963 ENDNOTFOUND
|
|
|
my ($edit_info, $add_to_onload, $add_to_onresize)= |
my ($edit_info, $add_to_onload, $add_to_onresize)= |
&inserteditinfo($filecontents,$filetype,$displayfile,$symb, |
&inserteditinfo($filecontents,$filetype,$displayfile,$symb, |
$itemtitle,$env{'form.folderpath'},$request->uri); |
$itemtitle,$env{'form.folderpath'},$request->uri,$action); |
|
|
my %options = |
my %options = |
('add_entries' => |
('add_entries' => |
Line 2376 sub description {
|
Line 2382 sub description {
|
sub helpinfo { |
sub helpinfo { |
my ($token)=@_; |
my ($token)=@_; |
my $tag = &get_tag($token); |
my $tag = &get_tag($token); |
return ($insertlist{$tag.'.helpfile'}, $insertlist{$tag.'.helpdesc'}); |
return ($insertlist{$tag.'.helpfile'}, &mt($insertlist{$tag.'.helpdesc'})); |
} |
} |
|
|
sub get_tag { |
sub get_tag { |