version 1.61, 2012/12/18 18:27:43
|
version 1.62, 2013/12/04 15:57:15
|
Line 26 package Apache::run;
|
Line 26 package Apache::run;
|
# |
# |
|
|
use HTML::Entities; |
use HTML::Entities; |
|
use Apache::lonlocal; |
|
|
$Apache::run::EVALUATE_STRING=<<'ENDEVALUATE'; |
$Apache::run::EVALUATE_STRING=<<'ENDEVALUATE'; |
my %_LONCAPA_INTERNAL_oldexpressions=(); |
my %_LONCAPA_INTERNAL_oldexpressions=(); |
Line 95 sub evaluate {
|
Line 96 sub evaluate {
|
$result = $safeeval->reval('return $_;'); |
$result = $safeeval->reval('return $_;'); |
chomp $result; |
chomp $result; |
} else { |
} else { |
if ($Apache::run::timeout) { |
if ($Apache::run::timeout) { |
$error = 'Code ran too long. It ran for more than '. |
$error = |
$Apache::lonnet::perlvar{'lonScriptTimeout'}.' seconds'; |
&mt('Code ran too long. It ran for more than [_1] seconds.', |
} |
$Apache::lonnet::perlvar{'lonScriptTimeout'}); |
&Apache::lonxml::error('substitution on <pre>'. |
} |
&HTML::Entities::encode($expression,'<>&"'). |
&Apache::lonxml::error( |
'</pre> with <pre>'. |
&mt('Substitution on [_1] with [_2] caused:', |
&HTML::Entities::encode($decls,'<>&"'). |
'<pre>'. &HTML::Entities::encode($expression,'<>&"').'</pre>', |
'</pre> caused <pre>'. |
'<pre>'.&HTML::Entities::encode($decls,'<>&"').'</pre>') |
&HTML::Entities::encode($error,'<>&"').' '. |
.'<br />' |
&HTML::Entities::encode($innererror,'<>&"'). |
.'<pre>'.&HTML::Entities::encode($error,'<>&"').' ' |
'</pre>'); |
.&HTML::Entities::encode($innererror,'<>&"').'</pre>'); |
} |
} |
return $result |
return $result; |
} |
} |
|
|
sub run { |
sub run { |
Line 129 sub run {
|
Line 130 sub run {
|
}; |
}; |
my $error=$@; |
my $error=$@; |
if (($Apache::run::timeout || $error ne '' || $innererror ne '') && !$hideerrors) { |
if (($Apache::run::timeout || $error ne '' || $innererror ne '') && !$hideerrors) { |
if ($Apache::run::timeout) { |
if ($Apache::run::timeout) { |
$error = 'Code ran too long. It ran for more than '. |
$error = &mt('Code ran too long. It ran for more than [_1] seconds.', |
$Apache::lonnet::perlvar{'lonScriptTimeout'}.' seconds'; |
$Apache::lonnet::perlvar{'lonScriptTimeout'}); |
} |
} |
my $errormsg='<pre>'.&HTML::Entities::encode($error,'<>&"').' '. |
$code=&HTML::Entities::encode($code,'<>&"'); |
&HTML::Entities::encode($innererror,'<>&"'). |
if ($innererror=~/line (\d+)/) { |
'</pre> occurred while running <pre>'; |
my $linenumber=$1; |
$code=&HTML::Entities::encode($code,'<>&"'); |
my @code=split("\n",$code); |
if ($innererror=~/line (\d+)/) { |
if ($linenumber < scalar(@code)) { |
my $linenumber=$1; |
$code[$linenumber-1]= |
my @code=split("\n",$code); |
'<span style="color:red;font-weight:bold;">'. |
if ($linenumber < scalar(@code)) { |
$code[$linenumber-1].'</span>'; |
$code[$linenumber-1]='<b><font color="red">'. |
} |
$code[$linenumber-1].'</font></b>'; |
$code=join("\n",@code); |
} |
} |
$code=join("\n",@code); |
&Apache::lonxml::error( |
} |
'<pre>'.&HTML::Entities::encode($error,'<>&"').' '. |
&Apache::lonxml::error($errormsg.$code.'</pre>'); |
&HTML::Entities::encode($innererror,'<>&"'). |
|
'</pre>' |
|
.&mt('This occurred while running: [_1]', |
|
'<pre>'.$code.'</pre>')); |
} |
} |
if ( $#result < '1') { |
if ( $#result < '1') { |
return $result[0]; |
return $result[0]; |