[system] / trunk / webwork2 / lib / WeBWorK / PG.pm Repository:
ViewVC logotype

Diff of /trunk/webwork2/lib/WeBWorK/PG.pm

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

Revision 620 Revision 623
317 $envir{webworkDocsURL} = $courseEnv->{webworkURLs}->{docs}."/"; 317 $envir{webworkDocsURL} = $courseEnv->{webworkURLs}->{docs}."/";
318 $envir{dvipngTempDir} = $options->{displayMode} eq 'images' 318 $envir{dvipngTempDir} = $options->{displayMode} eq 'images'
319 ? tempdir("webwork-dvipng-XXXXXXXX", DIR => $envir{tempDirectory}) 319 ? tempdir("webwork-dvipng-XXXXXXXX", DIR => $envir{tempDirectory})
320 : undef; 320 : undef;
321 321
322 # Information for sending mail
323
324 $envir{mailSmtpServer} = $courseEnv->{mail}->{smtpServer};
325 $envir{mailSmtpSender} = $courseEnv->{mail}->{smtpSender};
326
322 # Default values for evaluating answers 327 # Default values for evaluating answers
323 328
324 my $ansEvalDefaults = $courseEnv->{pg}->{ansEvalDefaults}; 329 my $ansEvalDefaults = $courseEnv->{pg}->{ansEvalDefaults};
325 $envir{$_} = $ansEvalDefaults->{$_} foreach (keys %$ansEvalDefaults); 330 $envir{$_} = $ansEvalDefaults->{$_} foreach (keys %$ansEvalDefaults);
326 331
353 $errorno = 0; ## don't report blank answer as error 358 $errorno = 0; ## don't report blank answer as error
354 return ($answer,$errorno); 359 return ($answer,$errorno);
355 } 360 }
356 # replace ^ with ** (for exponentiation) 361 # replace ^ with ** (for exponentiation)
357 # $answer =~ s/\^/**/g; 362 # $answer =~ s/\^/**/g;
358 # Return if forbidden characters are found 363 # Return if forbidden characters are found
359 unless ($answer =~ /^[a-zA-Z0-9_\-\+ \t\/@%\*\.\n^\(\)]+$/ ) { 364 unless ($answer =~ /^[a-zA-Z0-9_\-\+ \t\/@%\*\.\n^\(\)]+$/ ) {
360 $answer =~ tr/a-zA-Z0-9_\-\+ \t\/@%\*\.\n^\(\)/#/c; 365 $answer =~ tr/a-zA-Z0-9_\-\+ \t\/@%\*\.\n^\(\)/#/c;
361 $errorno = "<BR>There are forbidden characters in your answer: $submittedAnswer<BR>"; 366 $errorno = "<BR>There are forbidden characters in your answer: $submittedAnswer<BR>";
362 return ($answer,$errorno); 367 return ($answer,$errorno);
363 } 368 }

Legend:
Removed from v.620  
changed lines
  Added in v.623

aubreyja at gmail dot com
ViewVC Help
Powered by ViewVC 1.0.9