--- loncom/interface/lonerrorhandler.pm	2007/12/03 22:58:46	1.13
+++ loncom/interface/lonerrorhandler.pm	2009/01/04 19:49:19	1.22
@@ -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.22 2009/01/04 19:49:19 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -26,6 +26,8 @@
 # http://www.lon-capa.org/
 #
 
+
+
 package Apache::lonerrorhandler;
 
 use strict;
@@ -43,7 +45,9 @@ sub handler {
     return OK if $r->header_only;
 
     &Apache::lonacc::get_posted_cgi($r);
-
+    if (!$Apache::lonlocal::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 +85,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
@@ -98,6 +105,18 @@ ENDMESSAGE
 	my $env='';
 	my $syllabus='';
 
+	foreach $envkey (keys(%env)) {
+            if ($envkey =~ /^form\.(.+)\.filename$/) {
+                my $item = $1;
+                if (exists($env{'form.'.$item.'.mimetype'})) {
+                    if (exists($env{'form.'.$item})) {
+                        my $size = (length($env{'form.'.$item}))/(1024.0 * 1024.0);
+                        $env{'form.'.$item} = &mt('File (contents not shown) - size was [_1] MB.',sprintf("%.4f",$size));
+                    }
+                }
+            }
+        }
+
 	foreach $envkey (sort(keys(%env))) {
 	    $env.="$envkey: $env{$envkey}\n";
 	}
@@ -113,13 +132,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>
@@ -135,16 +156,16 @@ server administrators.').'
 <input type="hidden" name="syllabus" value="'.$syllabus.'" />
 <input type="hidden" name="sendinfo" value="1" />
 <p>
-<input type="submit" value="'.&mt('Send Information').'" />
+<input type="submit" title="'.&mt('Send Information').'" value="'.&mt('Send').'" />
 </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
 
@@ -156,3 +177,23 @@ $syllabus.'
 
 1;
 __END__
+
+
+=pod
+
+=head1 NAME
+
+Apache::lonerrorhandler.pm
+
+=head1 SYNOPSIS
+
+Handles errors.
+
+This is part of the LearningOnline Network with CAPA project
+described at http://www.lon-capa.org.
+
+=head1 OVERVIEW
+
+None
+
+=cut