--- loncom/interface/lonerrorhandler.pm	2007/12/03 22:58:46	1.13
+++ loncom/interface/lonerrorhandler.pm	2008/10/04 00:09:18	1.16
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Internal Server Error Handler
 #
-# $Id: lonerrorhandler.pm,v 1.13 2007/12/03 22:58:46 raeburn Exp $
+# $Id: lonerrorhandler.pm,v 1.16 2008/10/04 00:09:18 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -43,7 +43,9 @@ sub handler {
     return OK if $r->header_only;
 
     &Apache::lonacc::get_posted_cgi($r);
-
+    if (!$lh) {
+        &Apache::lonlocal::get_language_handle($r);
+    }
     my $title = $env{'form.sendinfo'} ? 'Sending Error Report'
                                       : 'Could Not Process Request';
     $r->print(&Apache::loncommon::start_page($title));
@@ -81,16 +83,19 @@ $env{'form.environment'}
 ENDMESSAGE
         my $sysmail = $r->dir_config('lonSysEMail');
         my $defdom = $r->dir_config('lonDefDomain');
-        my $recipients = &Apache::loncommon::build_recipient_list($r,$sysmail,
-                                                         'errormail',$defdom);
+        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('<h2>'.&mt('Report submitted').'</h2>'.&mt('Thank you!'));
         } else {
             $r->print('<h2>'.&mt('Warning: Report not submitted').'</h2>'.
-                      '<span class="LC_error">'.&mt("The administrators of
-                      the domain ($defdom) have not set any e-mail addresses
-                      for receipt of your error report.").'</span>');
+                      '<span class="LC_error">'
+                     .&mt('The administrators of the domain [_1] have not set'
+                         .' any e-mail addresses for receipt of your error report.'
+                         ,'<tt>'.$defdom.'</tt>')
+                     .'</span>');
         }
     } else {
 # ------------------------------------------------------------- Get environment
@@ -113,13 +118,15 @@ ENDMESSAGE
 	my $version=$r->dir_config('lonVersion');
 
 # ----------------------------------------------------------- Print error form
-	$r->print('<h2>'.
-&mt('Somewhere something went wrong - please help us to find out what.').'</h2>'.
-&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.').'
+	$r->print('<h2 class="LC_error">'
+.&mt('Somewhere something went wrong')
+.'</h2>'
+.'<p>'.&mt('Please help us to find out what.').'</p>'
+.'<p>'.&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.')
+.'</p>
 <form action="/adm/errorhandler" method="post">
-<input type="submit" value="'.&mt('Send Information').'" />
 <h3>'.&mt('Please describe what you did just before this screen came up').'</h3>
 <textarea name="prioraction" cols="50" rows="5">
 </textarea>
@@ -139,12 +146,12 @@ server administrators.').'
 </p>
 </form>
 <h1>'.&mt('Thank you for your help!').'</h1>
-<font size="-1">
-<pre>
+<div><font size="-1">
 '.&mt('Internal info:').
+'<pre>'.
 $syllabus.'
 </pre>
-</font>
+</font></div>
 ');
 # -------------------------- Better terminate this in case something was sticky