version 1.387, 2005/11/10 21:28:21
|
version 1.392, 2005/12/08 02:15:36
|
Line 272 sub printtokenheader {
|
Line 272 sub printtokenheader {
|
$tcrsid=$courseid; |
$tcrsid=$courseid; |
} |
} |
|
|
my %reply=&Apache::lonnet::get('environment', |
my $plainname=&Apache::loncommon::plainname($tuname,$tudom); |
['firstname','middlename','lastname','generation'], |
|
$tudom,$tuname); |
|
my $plainname=$reply{'firstname'}.' '. |
|
$reply{'middlename'}.' '. |
|
$reply{'lastname'}.' '. |
|
$reply{'generation'}; |
|
|
|
if ($target eq 'web') { |
if ($target eq 'web') { |
my %idhash=&Apache::lonnet::idrget($tudom,($tuname)); |
my %idhash=&Apache::lonnet::idrget($tudom,($tuname)); |
Line 418 sub inner_xmlparse {
|
Line 412 sub inner_xmlparse {
|
my $result; |
my $result; |
my $token; |
my $token; |
my $dontpop=0; |
my $dontpop=0; |
|
my $startredirection = $Apache::lonxml::redirection; |
while ( $#$pars > -1 ) { |
while ( $#$pars > -1 ) { |
while ($token = $$pars['-1']->get_token) { |
while ($token = $$pars['-1']->get_token) { |
if (($token->[0] eq 'T') || ($token->[0] eq 'C') ) { |
if (($token->[0] eq 'T') || ($token->[0] eq 'C') ) { |
Line 528 sub inner_xmlparse {
|
Line 523 sub inner_xmlparse {
|
# } |
# } |
|
|
if ($target eq 'grade') { &endredirection(); } |
if ($target eq 'grade') { &endredirection(); } |
if ( $Apache::lonxml::redirection ) { |
if ( $Apache::lonxml::redirection > $startredirection) { |
&error("Unclean exit of parser, text still being redirected. This is likely due to there being missing end tags."); |
while ($Apache::lonxml::redirection > $startredirection) { |
while ($Apache::lonxml::redirection) { |
$finaloutput .= &endredirection(); |
$finaloutput.=&endredirection(); |
|
} |
} |
} |
} |
if (($ENV{'QUERY_STRING'}) && ($target eq 'web')) { |
if (($ENV{'QUERY_STRING'}) && ($target eq 'web')) { |
Line 671 sub setup_globals {
|
Line 665 sub setup_globals {
|
|
|
sub init_safespace { |
sub init_safespace { |
my ($target,$safeeval,$safehole,$safeinit) = @_; |
my ($target,$safeeval,$safehole,$safeinit) = @_; |
$safeeval->deny_only(':dangerous'); |
|
$safeeval->reval('use Math::Complex;'); |
|
$safeeval->permit_only(":default"); |
$safeeval->permit_only(":default"); |
$safeeval->permit("entereval"); |
$safeeval->permit("entereval"); |
$safeeval->permit(":base_math"); |
$safeeval->permit(":base_math"); |
Line 967 sub increment_counter {
|
Line 959 sub increment_counter {
|
} |
} |
|
|
sub init_counter { |
sub init_counter { |
if (defined($env{'form.counter'})) { |
if ($env{'request.state'} eq 'construct') { |
|
$Apache::lonxml::counter=1; |
|
$Apache::lonxml::counter_changed=1; |
|
} elsif (defined($env{'form.counter'})) { |
$Apache::lonxml::counter=$env{'form.counter'}; |
$Apache::lonxml::counter=$env{'form.counter'}; |
$Apache::lonxml::counter_changed=0; |
$Apache::lonxml::counter_changed=0; |
} else { |
} else { |
Line 1456 sub debug {
|
Line 1451 sub debug {
|
if ($Apache::lonxml::debug eq "1") { |
if ($Apache::lonxml::debug eq "1") { |
$|=1; |
$|=1; |
my $request=$Apache::lonxml::request; |
my $request=$Apache::lonxml::request; |
if (!$request) { $request=Apache->request; } |
if (!$request) { |
|
eval { $request=Apache->request; }; |
|
} |
|
if (!$request) { |
|
eval { $request=Apache2::RequestUtil->request; }; |
|
} |
$request->print('<font size="-2"><pre>DEBUG:'.&HTML::Entities::encode($_[0],'<>&"')."</pre></font>\n"); |
$request->print('<font size="-2"><pre>DEBUG:'.&HTML::Entities::encode($_[0],'<>&"')."</pre></font>\n"); |
#&Apache::lonnet::logthis($_[0]); |
#&Apache::lonnet::logthis($_[0]); |
} |
} |