version 1.523, 2011/11/14 00:20:42
|
version 1.529, 2012/04/11 15:58:07
|
Line 113 use Apache::lonr();
|
Line 113 use Apache::lonr();
|
use Apache::lonlocal; |
use Apache::lonlocal; |
use Apache::lonhtmlcommon(); |
use Apache::lonhtmlcommon(); |
use Apache::functionplotresponse(); |
use Apache::functionplotresponse(); |
|
use Apache::lonnavmaps(); |
|
|
#==================================== Main subroutine: xmlparse |
#==================================== Main subroutine: xmlparse |
|
|
Line 210 sub xmlend {
|
Line 211 sub xmlend {
|
my $discussion; |
my $discussion; |
&Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'}, |
&Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'}, |
['LONCAPA_INTERNAL_no_discussion']); |
['LONCAPA_INTERNAL_no_discussion']); |
if (! exists($env{'form.LONCAPA_INTERNAL_no_discussion'}) || |
if ( |
$env{'form.LONCAPA_INTERNAL_no_discussion'} ne 'true') { |
( (!exists($env{'form.LONCAPA_INTERNAL_no_discussion'})) |
|
|| ($env{'form.LONCAPA_INTERNAL_no_discussion'} ne 'true') |
|
) |
|
&& ($env{'form.inhibitmenu'} ne 'yes') |
|
) { |
$discussion=&Apache::lonfeedback::list_discussion($mode,$status); |
$discussion=&Apache::lonfeedback::list_discussion($mode,$status); |
} |
} |
if ($target eq 'tex') { |
if ($target eq 'tex') { |
Line 301 sub xmlparse {
|
Line 306 sub xmlparse {
|
&clean_safespace($safeeval); |
&clean_safespace($safeeval); |
|
|
if (@script_var_displays) { |
if (@script_var_displays) { |
$finaloutput .= join('',@script_var_displays); |
my $scriptoutput = join('',@script_var_displays); |
|
$finaloutput=~s{(</body>\s*</html>)\s*$}{$scriptoutput$1}s; |
undef(@script_var_displays); |
undef(@script_var_displays); |
} |
} |
&init_state(); |
&init_state(); |
Line 792 sub init_safespace {
|
Line 798 sub init_safespace {
|
$safehole->wrap(\&Apache::functionplotresponse::fpr_f,$safeeval,'&fpr_f'); |
$safehole->wrap(\&Apache::functionplotresponse::fpr_f,$safeeval,'&fpr_f'); |
$safehole->wrap(\&Apache::functionplotresponse::fpr_dfdx,$safeeval,'&fpr_dfdx'); |
$safehole->wrap(\&Apache::functionplotresponse::fpr_dfdx,$safeeval,'&fpr_dfdx'); |
$safehole->wrap(\&Apache::functionplotresponse::fpr_d2fdx2,$safeeval,'&fpr_d2fdx2'); |
$safehole->wrap(\&Apache::functionplotresponse::fpr_d2fdx2,$safeeval,'&fpr_d2fdx2'); |
|
$safehole->wrap(\&Apache::functionplotresponse::fpr_vectorcoords,$safeeval,'&fpr_vectorcoords'); |
|
$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'); |
|
|
# use Data::Dumper; |
# use Data::Dumper; |
# $safehole->wrap(\&Data::Dumper::Dumper,$safeeval,'&LONCAPA_INTERNAL_Dumper'); |
# $safehole->wrap(\&Data::Dumper::Dumper,$safeeval,'&LONCAPA_INTERNAL_Dumper'); |
Line 1492 sub renderingoptions {
|
Line 1502 sub renderingoptions {
|
{&Apache::lonlocal::texthash |
{&Apache::lonlocal::texthash |
('' => '', |
('' => '', |
'tth' => 'tth (TeX to HTML)', |
'tth' => 'tth (TeX to HTML)', |
'jsMath' => 'jsMath', |
'MathJax' => 'MathJax', |
|
'jsMath' => 'jsMath', |
'mimetex' => 'mimetex (Convert to Images)')}). |
'mimetex' => 'mimetex (Convert to Images)')}). |
'</span>'; |
'</span>'; |
return $output; |
return $output; |
Line 1779 ENDNOTFOUND
|
Line 1790 ENDNOTFOUND
|
if ($env{'form.editmode'} && (!($env{'form.viewmode'})) && (!($env{'form.discardview'}))) |
if ($env{'form.editmode'} && (!($env{'form.viewmode'})) && (!($env{'form.discardview'}))) |
{ |
{ |
my $displayfile=$request->uri; |
my $displayfile=$request->uri; |
$displayfile=~s/^\/[^\/]*//; |
if ($displayfile =~ m{^/uploaded/}) { |
|
if ($env{'request.course.id'}) { |
|
my $symb = &Apache::lonnet::symbread(); |
|
my ($map,$id,$res)=&Apache::lonnet::decode_symb($symb); |
|
my $navmap=Apache::lonnavmaps::navmap->new; |
|
if (ref($navmap)) { |
|
my $res = $navmap->getBySymb($symb); |
|
my @pathitems = |
|
&Apache::loncommon::get_folder_hierarchy($navmap,$map,1); |
|
push(@pathitems,$res->compTitle()); |
|
$displayfile = join(' » ',@pathitems); |
|
} |
|
} |
|
} else { |
|
$displayfile=~s/^\/[^\/]*//; |
|
} |
|
|
my ($edit_info, $add_to_onload, $add_to_onresize)= |
my ($edit_info, $add_to_onload, $add_to_onresize)= |
&inserteditinfo($filecontents,$filetype,$displayfile); |
&inserteditinfo($filecontents,$filetype,$displayfile); |
Line 2045 sub register_insert_xml {
|
Line 2071 sub register_insert_xml {
|
while (my $token = $parser->get_token()) { |
while (my $token = $parser->get_token()) { |
if ($token->[0] eq 'S') { |
if ($token->[0] eq 'S') { |
my $key; |
my $key; |
if ($token->[1] eq 'tag') { |
if ($token->[1] eq 'tag') { |
$tag = $token->[2]{'name'}; |
$tag = $token->[2]{'name'}; |
$insertlist{$tagnum.'.tag'} = $tag; |
if (defined($tag)) { |
$insertlist{$tag.'.num'} = $tagnum; |
$insertlist{$tagnum.'.tag'} = $tag; |
push(@alltags,$tag); |
$insertlist{$tag.'.num'} = $tagnum; |
|
push(@alltags,$tag); |
|
} |
} elsif ($in_help && $token->[1] eq 'file') { |
} elsif ($in_help && $token->[1] eq 'file') { |
$key = $tag.'.helpfile'; |
$key = $tag.'.helpfile'; |
} elsif ($in_help && $token->[1] eq 'description') { |
} elsif ($in_help && $token->[1] eq 'description') { |