--- loncom/interface/lonerrorhandler.pm 2005/07/08 21:21:56 1.8 +++ loncom/interface/lonerrorhandler.pm 2007/12/04 04:43:21 1.14 @@ -1,7 +1,7 @@ # The LearningOnline Network # Internal Server Error Handler # -# $Id: lonerrorhandler.pm,v 1.8 2005/07/08 21:21:56 www Exp $ +# $Id: lonerrorhandler.pm,v 1.14 2007/12/04 04:43:21 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -30,9 +30,11 @@ package Apache::lonerrorhandler; use strict; use Apache::Constants qw(:common); -use Apache::loncommon; +use Apache::loncommon(); use Apache::lonnet; -use Apache::lonmsg; +use Apache::lonmsg(); +use Apache::lonacc(); +use Apache::lonlocal; sub handler { my $r = shift; @@ -40,17 +42,11 @@ sub handler { $r->send_http_header; return OK if $r->header_only; - &Apache::loncommon::get_posted_cgi($r); + &Apache::lonacc::get_posted_cgi($r); - my $html=&Apache::lonxml::xmlbegin(); - my $bodytag=&Apache::loncommon::bodytag($env{'form.sendinfo'}?'Sending Error Report':'Could Not Process Request'); - $r->print(< -The LearningOnline Network with CAPA - -$bodytag -ENDHEADER + my $title = $env{'form.sendinfo'} ? 'Sending Error Report' + : 'Could Not Process Request'; + $r->print(&Apache::loncommon::start_page($title)); if ($env{'form.sendinfo'}) { my $repro='no'; @@ -58,27 +54,45 @@ ENDHEADER if ($env{'form.reproducible'}) { $repro='yes'; } + my %lt = &Apache::lonlocal::texthash ( + msg => 'LON-CAPA Error Message', + rep => 'Reproducible', + ver => 'Version', + syl => 'Syllabus', + pri => 'Prior Action', + gue => 'Guesses', + env => 'Environment', + ); my $message=(<dir_config('lonAdmEMail').','. - $r->dir_config('lonSysEMail'); - - &Apache::lonmsg::sendemail($recipients,'ERROR REPORT',$message); - $r->print('

Report submitted

Thank you!'); + my $sysmail = $r->dir_config('lonSysEMail'); + my $defdom = $r->dir_config('lonDefDomain'); + my $origmail = $r->dir_config('lonAdmEMail'); + my $recipients = &Apache::loncommon::build_recipient_list($sysmail, + 'errormail',$defdom,$origmail); + if ($recipients ne '') { + &Apache::lonmsg::sendemail($recipients,'ERROR REPORT',$message); + $r->print('

'.&mt('Report submitted').'

'.&mt('Thank you!')); + } else { + $r->print('

'.&mt('Warning: Report not submitted').'

'. + ''.&mt("The administrators of + the domain ($defdom) have not set any e-mail addresses + for receipt of your error report.").''); + } } else { # ------------------------------------------------------------- Get environment my $envkey; @@ -100,46 +114,46 @@ ENDMESSAGE my $version=$r->dir_config('lonVersion'); # ----------------------------------------------------------- Print error form - $r->print(<Somewhere something went wrong - please help us to find out what. -Please take a moment to fill out the form below. Your information, together -with internal debugging information, will be emailed to the system and server -administrators. + $r->print('

'. +&mt('Somewhere something went wrong - please help us to find out what.').'

'. +&mt('Please take a moment to fill out the form below.').' '.&mt('Your information, + together with internal debugging information, will be emailed to the system and +server administrators.').'
- -

Please describe what you did just before this screen came up

+ +

'.&mt('Please describe what you did just before this screen came up').'

-

Is this problem reproducible?

+

'.&mt('Is this problem reproducible?').'

-

Do you have any guesses why this might have happened?

+

'.&mt('Do you have any guesses why this might have happened?').'

- - - + + +

- +

-

Thank you for your help!

+

'.&mt('Thank you for your help!').'

-Internal info:
-$syllabus
+'.&mt('Internal info:').
+$syllabus.'
- - -ENDDOCUMENT +'); # -------------------------- Better terminate this in case something was sticky + $r->child_terminate(); } + $r->print(&Apache::loncommon::end_page()); return OK; -} +} 1; __END__