--- loncom/interface/lonsupportreq.pm	2010/12/02 13:12:11	1.55.6.2
+++ loncom/interface/lonsupportreq.pm	2011/03/03 17:29:29	1.66
@@ -1,5 +1,5 @@
 #
-# $Id: lonsupportreq.pm,v 1.55.6.2 2010/12/02 13:12:11 raeburn Exp $
+# $Id: lonsupportreq.pm,v 1.66 2011/03/03 17:29:29 bisitz Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -37,7 +37,7 @@ use Apache::lonnet;
 use Apache::lonlocal;
 use Apache::lonacc();
 use Apache::courseclassifier;
-use LONCAPA;
+use LONCAPA qw(:DEFAULT :match);
  
 
 sub handler {
@@ -57,7 +57,7 @@ sub handler {
         &Apache::lonacc::get_posted_cgi($r);
     }
     my $function = $env{'form.function'};
-    my $origurl = &unescape($env{'form.origurl'});
+    my $origurl = $env{'form.origurl'};
     my $command = $env{'form.command'};
 
     if ($command eq 'process') {
@@ -70,15 +70,21 @@ sub handler {
     
 sub print_request_form {
     my ($r,$origurl,$function) = @_;
-    my ($os,$browser,$bversion,$uhost,$uname,$udom,$uhome,$urole,$usec,$email,$cid,$cdom,$cnum,$ctitle,$ccode,$sectionlist,$lastname,$firstname,$server,$formname);
+    my ($os,$browser,$bversion,$uhost,$uname,$udom,$uhome,$urole,$usec,$email,$cid,
+        $cdom,$cnum,$ctitle,$ccode,$sectionlist,$lastname,$firstname,$server,
+        $formname,$public);
     $function = &Apache::loncommon::get_users_function() if (!$function);
     $ccode = '';
     $os = $env{'browser.os'};
     $browser = $env{'browser.type'};
     $bversion = $env{'browser.version'};
     $uhost = $env{'request.host'};
-    $uname = $env{'user.name'};
-    $udom = $env{'user.domain'};
+    if (($env{'user.name'} eq 'public') && ($env{'user.domain'} eq 'public')) {
+        $public = 1;
+    } else {
+        $uname = $env{'user.name'};
+        $udom = $env{'user.domain'};
+    }
     $uhome = $env{'user.home'};
     $urole = $env{'request.role'};
     $usec = $env{'request.course.sec'};
@@ -172,7 +178,20 @@ END
         my ($sec,$grp) = split(/:/,$section);
         $groupid{$sec} = $grp;
     }
-    &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},['codedom']);
+    &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},['codedom',
+                                                 'useremail','useraccount']);
+    if ($env{'form.origurl'} eq '/adm/createaccount') {
+        if ($email eq '') {
+            if ($env{'form.useremail'} =~ /^[^\@]+\@[^\@]+$/) {
+                $email = &HTML::Entities::encode($env{'form.useremail'},'"<>&');
+            }
+        }
+        if ($uname eq '') {
+            if ($env{'form.useraccount'} =~ /^$match_username$/) {
+                $uname = &HTML::Entities::encode($env{'form.useraccount'},'"<>&');
+            }
+        }
+    }
     my $codedom = &get_domain();
     my $details_title;
     if ($codedom) {
@@ -225,7 +244,7 @@ function initialize_codes() {
     }
 	
     my $js = '<script type="text/javascript">'."\n$scripttag\n$jscript\n".
-	'</script>';
+	     $loaditems.'</script>';
     my %add_entries = (topmargin    => "0",
 		       marginheight => "0",
 		       onLoad       =>"initialize_codes()",);
@@ -266,7 +285,7 @@ function initialize_codes() {
                &Apache::lonhtmlcommon::row_closure();
     $num ++;
     $i = $num%2;
-    if (defined($env{'user.name'})) {
+    if (($env{'user.name'} =~ /^$match_username$/) && (!$public)) {
         $output .= &Apache::lonhtmlcommon::row_title($lt{'emac'},undef,$css[$i]).
                    '<input type="text" size="50" name="cc" value="" /><br />'."\n".
                    &Apache::lonhtmlcommon::row_closure();
@@ -278,30 +297,33 @@ function initialize_codes() {
                      &HTML::Entities::encode($udom,'"<>&').'" />';
     my $uname_input = '<input type="hidden" name="uname" value="'.
                       &HTML::Entities::encode($uname,'"<>&').'" />'; 
-    if (defined($uname) && defined($udom)) {
+    if (($env{'user.name'} =~ /^$match_username$/) && 
+        ($env{'user.domain'} =~ /^$match_domain$/) && (!$public)) {
         $output .= '<i>'.$lt{'unme'}.'</i>:&nbsp;'.$uname.'&nbsp;&nbsp;<i>'.$lt{'doma'}.'</i>:&nbsp;'.$udom.$udom_input.$uname_input;
     } else {
         my $udomform = '';
         my $unameform = '';
-        if (defined($udom)) {
+        if (($env{'user.domain'} =~ /^$match_domain$/) && (!$public)) {
             $output .= $lt{'entu'};
-        } elsif (defined($uname)) {
+        } elsif (($env{'user.name'} =~ /^$match_username$/) && (!$public)) { 
             $output .= $lt{'chdo'};
         } else {
             $output .= $lt{'entr'};
         }
         $output .= '<br />';
-        if (defined($udom)) {
-            $udomform = '<i>'.$lt{'doma'}.'</i>:&nbsp;'.$udom.$udom_input;
-        } elsif (defined($uname)) {
-            $unameform = '<i>'.$lt{'unme'}.'</i>:&nbsp;'.$uname.'&nbsp;&nbsp;'.$uname_input;
+        if (!$public) {
+            if ($env{'user.domain'} =~ /^$match_domain$/) {
+                $udomform = '<i>'.$lt{'doma'}.'</i>:&nbsp;'.$udom.$udom_input;
+            } elsif ($env{'user.name'} =~ /^$match_username$/) {
+                $unameform = '<i>'.$lt{'unme'}.'</i>:&nbsp;'.$uname.'&nbsp;&nbsp;'.$uname_input;
+            }
         }
         if ($udomform eq '') {
             $udomform = '<i>'.$lt{'doma'}.'</i>:&nbsp;';
             $udomform .= &Apache::loncommon::select_dom_form($codedom,'udom');
         }
         if ($unameform eq '') {
-            $unameform= '<i>'.$lt{'unme'}.'</i>:&nbsp;<input type="text" size="15" name="uname" value="'.$uname.'" />&nbsp;&nbsp;';
+            $unameform= '<i>'.$lt{'unme'}.'</i>:&nbsp;<input type="text" size="20" name="uname" value="'.$uname.'" />&nbsp;&nbsp;';
         }
         $output .= $unameform.$udomform;
     }
@@ -311,119 +333,116 @@ function initialize_codes() {
     $output .= &Apache::lonhtmlcommon::row_title("$lt{'urlp'}",undef,$css[$i]).
                $showserver.'<input type="hidden" name="sourceurl" value="'.
                &HTML::Entities::encode($server,'"<>&').'" />'.
+               &Apache::lonhtmlcommon::row_closure().
+               &Apache::lonhtmlcommon::row_title("$lt{'phon'}",undef,'LC_evenrow_value').
+               '<input type="text" size="15" name="phone" /><br />'.
                &Apache::lonhtmlcommon::row_closure();
-    if (&Apache::loncommon::check_for_gci_dc()) { 
-        $output .= &Apache::lonhtmlcommon::row_title("$lt{'phon'}",undef,
-                                                     'LC_evenrow_value').
-                   '<input type="text" size="15" name="phone" /><br />'.
-                   &Apache::lonhtmlcommon::row_closure();
-        $num ++;
-        $i = $num%2; 
-        $output .= &Apache::lonhtmlcommon::row_title("$lt{'crsd'}$details_title",undef,$css[$i]);
-        if ($cnum) {
-            if ($coursecodes{$cnum}) {
-                foreach my $item (@codetitles) {
-                    $output .= '<i>'.$item.'</i>:&nbsp;'.$codes{$cnum}{$item}.';&nbsp;';
-                }
-                $output .= '&nbsp;<input type="hidden" name="coursecode" value="'.&HTML::Entities::encode($coursecodes{$cnum},'"<>&').'" />';
-            } else {
-                $output .= $lt{'enin'}.':&nbsp;
-                      <input type="text" name="coursecode" size="15" value="" />';
+    $num ++;
+    $i = $num%2; 
+    $output .= &Apache::lonhtmlcommon::row_title("$lt{'crsd'}$details_title",undef,$css[$i]);
+    if ($cnum) {
+        if ($coursecodes{$cnum}) {
+            foreach my $item (@codetitles) {
+                $output .= '<i>'.$item.'</i>:&nbsp;'.$codes{$cnum}{$item}.';&nbsp;';
             }
+            $output .= '&nbsp;<input type="hidden" name="coursecode" value="'.&HTML::Entities::encode($coursecodes{$cnum},'"<>&').'" />';
         } else {
-            if ($totcodes > 0) {
-                my $numtitles = @codetitles;
-                if ($numtitles == 0) {
-                    $output .= $lt{'enin'}.':&nbsp;
-                      <input type="text" name="coursecode" size="15" value="" />';
+            $output .= $lt{'enin'}.':&nbsp;
+                  <input type="text" name="coursecode" size="15" value="" />';
+        }
+    } else {
+        if ($totcodes > 0) {
+            my $numtitles = @codetitles;
+            if ($numtitles == 0) {
+                $output .= $lt{'enin'}.':&nbsp;
+                  <input type="text" name="coursecode" size="15" value="" />';
+            } else {
+                my @standardnames = &Apache::loncommon::get_standard_codeitems();
+                my $lasttitle = $numtitles;
+                if ($numtitles > 4) {
+                    $lasttitle = 4;
+                } 
+                $output .= '<table><tr><td>'.$codetitles[0].'<br />'."\n".
+                      '<select name="'.$standardnames[0].'" onchange="courseSet('."'$codetitles[0]'".')">'."\n".
+                      ' <option value="-1" />'.$lt{'sele'}."\n";
+                my @items = ();
+                my @longitems = ();
+                if ($idlist{$codetitles[0]} =~ /","/) {
+                    @items = split(/","/,$idlist{$codetitles[0]});
                 } else {
-                    my $lasttitle = $numtitles;
-                    if ($numtitles > 4) {
-                        $lasttitle = 4;
-                    } 
-                    $output .= '<table><tr><td>'.$codetitles[0].'<br />'."\n".
-                          '<select name="'.$codetitles[0].'" onchange="courseSet('."'$codetitles[0]'".')">'."\n".
-                          ' <option value="-1" />'.$lt{'sele'}."\n";
-                    my @items = ();
-                    my @longitems = ();
-                    if ($idlist{$codetitles[0]} =~ /","/) {
-                        @items = split(/","/,$idlist{$codetitles[0]});
+                    $items[0] = $idlist{$codetitles[0]};
+                }
+                if (defined($idlist_titles{$codetitles[0]})) {
+                    if ($idlist_titles{$codetitles[0]} =~ /","/) {
+                        @longitems = split(/","/,$idlist_titles{$codetitles[0]});
                     } else {
-                        $items[0] = $idlist{$codetitles[0]};
+                        $longitems[0] = $idlist_titles{$codetitles[0]};
                     }
-                    if (defined($idlist_titles{$codetitles[0]})) {
-                        if ($idlist_titles{$codetitles[0]} =~ /","/) {
-                            @longitems = split(/","/,$idlist_titles{$codetitles[0]});
-                        } else {
-                            $longitems[0] = $idlist_titles{$codetitles[0]};
-                        }
-                        for (my $i=0; $i<@longitems; $i++) {
-                            if ($longitems[$i] eq '') {
-                                $longitems[$i] = $items[$i];
-                            }
+                    for (my $i=0; $i<@longitems; $i++) {
+                        if ($longitems[$i] eq '') {
+                            $longitems[$i] = $items[$i];
                         }
-                    } else {
-                        @longitems = @items;
-                    }
-                    for (my $i=0; $i<@items; $i++) {
-                        $output .= ' <option value="'.$items[$i].'">'.$longitems[$i].'</option>'."\n";
-                    }
-                    $output .= '</select></td>';
-                    for (my $i=1; $i<$numtitles; $i++) {
-                        $output .= '<td>'.$codetitles[$i].'<br />'."\n".
-                         '<select name="'.$codetitles[$i].'" onchange="courseSet('."'$codetitles[$i]'".')">'."\n".
-                         '<option value="-1">&lt;-'.$lt{'pick'}.' '.$codetitles[$i-1].'</option>'."\n".
-                         '</select>'."\n".
-                         '</td>'."\n";
                     }
-                    $output .= '</tr></table>';
-                    if ($numtitles > 4) {
-                        $output .= '<br /><br />'.$codetitles[$numtitles].'<br />'."\n".
-                              '<select name="'.$codetitles[$numtitles].'" onchange="courseSet('."'$codetitles[$numtitles]'".')">'."\n".
-                              '<option value="-1">&lt;-'.$lt{'pick'}.' '.$codetitles[$numtitles-1].'</option>'."\n".
-                              '</select>'."\n";
-                    }
-                }
-            } else {
-                $output .= $lt{'enin'}.':&nbsp;
-                      <input type="text" name="coursecode" size="15" value="" />';
-            }
-        }
-        $output .= '<br />';
-        if ($ctitle) {
-            $output .= '<i>'.$lt{'titl'}.'</i>:&nbsp;'.$ctitle.
-                       '<input type="hidden" name="title" value="'.
-                       &HTML::Entities::encode($ctitle,'"<>&').'" />'."\n";
-        } else {
-            $output .= $lt{'enct'}.':&nbsp;
-                       <input type="text" name="title" size="25" value="" />'."\n";
-        }
-        $output .= &Apache::lonhtmlcommon::row_closure();
-        $num ++;
-        $i = $num%2;
-        $output .= &Apache::lonhtmlcommon::row_title($lt{'secn'},undef,$css[$i]);
-        if ($sectionlist) {
-            $output .= "<select name=\"section\"\n>".
-                       "  <option value=\"\" selected=\"selected\">$lt{'sele'}</option>\n";
-            foreach my $id (sort(keys(%groupid))) {
-                if ($id eq $groupid{$id} || $groupid{$id} eq '') {
-                    $output .= "  <option value=".
-                               &HTML::Entities::encode($id,'"<>&').
-                               " >$id</option>\n";
                 } else {
-                    $output .= "  <option value=".
-                               &HTML::Entities::encode($id,'"<>&').
-                               " >$id - ($lt{'lsec'}: $groupid{$id})</option>\n";
+                    @longitems = @items;
+                }
+                for (my $i=0; $i<@items; $i++) {
+                    $output .= ' <option value="'.$items[$i].'">'.$longitems[$i].'</option>'."\n";
+                }
+                $output .= '</select></td>';
+                for (my $i=1; $i<$numtitles; $i++) {
+                    $output .= '<td>'.$codetitles[$i].'<br />'."\n".
+                     '<select name="'.$standardnames[$i].'" onchange="courseSet('."'$codetitles[$i]'".')">'."\n".
+                     '<option value="-1">&lt;-'.$lt{'pick'}.' '.$codetitles[$i-1].'</option>'."\n".
+                     '</select>'."\n".
+                     '</td>'."\n";
+                }
+                $output .= '</tr></table>';
+                if ($numtitles > 4) {
+                    $output .= '<br /><br />'.$codetitles[$numtitles].'<br />'."\n".
+                          '<select name="'.$standardnames[$numtitles].'" onchange="courseSet('."'$codetitles[$numtitles]'".')">'."\n".
+                          '<option value="-1">&lt;-'.$lt{'pick'}.' '.$codetitles[$numtitles-1].'</option>'."\n".
+                          '</select>'."\n";
                 }
             }
-            $output .= "</select>";
         } else {
-            $output .= '<input type="text" name="section" size="10" />';
+            $output .= $lt{'enin'}.':&nbsp;
+                  <input type="text" name="coursecode" size="15" value="" />';
         }
-        $output .= &Apache::lonhtmlcommon::row_closure();
     }
+    if ($ctitle) {
+        $output .= '<br /><i>'.$lt{'titl'}.'</i>:&nbsp;'.$ctitle.
+                   '<input type="hidden" name="title" value="'.
+                   &HTML::Entities::encode($ctitle,'"<>&').'" />'."\n";
+    } else {
+        $output .= '<br />'.$lt{'enct'}.':&nbsp;
+                 <input type="text" name="title" size="25" value="" />'."\n";
+    }
+    $output .= &Apache::lonhtmlcommon::row_closure();
     $num ++;
     $i = $num%2;
+    $output .= &Apache::lonhtmlcommon::row_title($lt{'secn'},undef,$css[$i]);
+    if ($sectionlist) {
+        $output .= "<select name=\"section\"\n>".
+                   "  <option value=\"\" selected=\"selected\">$lt{'sele'}</option>\n";
+        foreach my $id (sort(keys(%groupid))) {
+            if ($id eq $groupid{$id} || $groupid{$id} eq '') {
+                $output .= "  <option value=".
+                           &HTML::Entities::encode($id,'"<>&').
+                           " >$id</option>\n";
+            } else {
+                $output .= "  <option value=".
+                           &HTML::Entities::encode($id,'"<>&').
+                           " >$id - ($lt{'lsec'}: $groupid{$id})</option>\n";
+            }
+        }
+        $output .= "</select>";
+    } else {
+        $output .= '<input type="text" name="section" size="10" />';
+    }
+    $output .= &Apache::lonhtmlcommon::row_closure();
+    $num ++;
+    $i = $num%2; 
     $output .= &Apache::lonhtmlcommon::row_title($lt{'subj'},undef,'LC_oddrow_value').
                '  <input type="text" size="40" name="subject" />'."\n".
                &Apache::lonhtmlcommon::row_closure().
@@ -432,7 +451,7 @@ function initialize_codes() {
                &Apache::lonhtmlcommon::row_closure();
     $num ++;
     $i = $num%2; 
-    if (defined($env{'user.name'})) {
+    if (($env{'user.name'} =~ /^$match_username$/) && (!$public)) {
         $output .= &Apache::lonhtmlcommon::row_title($lt{'opfi'},undef,$css[$i]).
                    ' <input type="file" name="screenshot" size="20" /><br />'.$lt{'uplf'}."\n".
         &Apache::lonhtmlcommon::row_closure();
@@ -478,27 +497,52 @@ sub print_request_receipt {
     my $to = &Apache::loncommon::build_recipient_list(undef,'helpdeskmail',
                                                       $defdom,$origmail);
     my $from = $admin;
-    my $reporttime = &Apache::lonlocal::locallocaltime(time);
-    my @formvars = ('username','email','uname','udom','sourceurl');
-    if (&Apache::loncommon::check_for_gci_dc()) {
-        push(@formvars,('phone','section','coursecode','title'));
+    my $bcc;
+    my %domconfig =
+         &Apache::lonnet::get_dom('configuration',['contacts'],$defdom);
+    if (ref($domconfig{'contacts'}) eq 'HASH') {
+        if (exists($domconfig{'contacts'}{'helpdeskmail'})) {
+            if (ref($domconfig{'contacts'}{'helpdeskmail'}) eq 'HASH') {
+                my $bccmail = $domconfig{'contacts'}{'helpdeskmail'}{'bcc'};
+                if ($bccmail ne '') {
+                    my @bccs = split(/,/,$bccmail);
+                    my @ok_bccs;
+                    foreach my $bcc (@bccs) {
+                        $bcc =~ s/^\s+//g;
+                        $bcc =~ s/\s+$//g;
+                        if ($bcc =~ m/^[^\@]+\@[^\@]+$/) {
+                            if (!(grep(/^\Q$bcc\E$/,@ok_bccs))) {
+                                push(@ok_bccs,$bcc);
+                            }
+                        }
+                    }
+                    if (@ok_bccs > 0) {
+                        $bcc = join(', ',@ok_bccs);
+                    }
+                }
+            }
+        }
     }
-    push(@formvars,('subject','description','screenshot'));
+    my $reporttime = &Apache::lonlocal::locallocaltime(time);
+    my @formvars = ('username','email','uname','udom','sourceurl','phone','section','coursecode','title','subject','description','screenshot');
+
     &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},\@formvars);
     my $coursecode = $env{'form.coursecode'};
-    if (&Apache::loncommon::check_for_gci_dc()) {
+    if ($coursecode eq '') {
+        my $totcodes = 0;
+        my %coursecodes;
+        $totcodes = &Apache::courseclassifier::retrieve_instcodes(\%coursecodes,$defdom,$totcodes);
+        my @standardnames = &Apache::loncommon::get_standard_codeitems();
+        if ($totcodes > 0) {
+            my $noregexps = 1;
+            $coursecode = 
+                &Apache::courseclassifier::instcode_from_selectors($defdom,$noregexps);
+        } 
         if ($coursecode eq '') {
-            if (defined($env{'form.Year'})) {
-                $coursecode .= $env{'form.Year'};
-            }
-            if (defined($env{'form.Semester'})) {
-                $coursecode .= $env{'form.Semester'};
-            }
-            if (defined($env{'form.Department'})) {
-                $coursecode .= $env{'form.Department'};
-            }
-            if (defined($env{'form.Number'})) {
-                $coursecode .= $env{'form.Number'};
+            foreach my $item (@standardnames) {
+                if ((defined($env{'form.'.$item})) && ($env{'form.'.$item} ne '-1')) {
+                    $coursecode .= $env{'form.'.$item};
+                }
             }
         }
     }
@@ -514,7 +558,6 @@ sub print_request_receipt {
                  sourceurl   => 'URL',
                  date        => 'Date/Time',
                  secn        => 'Section',
-                 asup        => 'A support request has been sent to',
                  warn        => 'Warning: Problem with support e-mail address',
                  your        => 'Your support request contained the following information',
                  sect        => 'section',
@@ -539,7 +582,7 @@ sub print_request_receipt {
                 if (!(grep(/^\Q$cc\E$/,@ok_ccs))) {
                     push(@ok_ccs,$cc);
                 }
-            } else {
+            } elsif ($cc ne '') {
                 if (!(grep(/^\Q$cc\E$/,@bad_ccs))) {
                     push(@bad_ccs,$cc);
                 }
@@ -556,22 +599,14 @@ sub print_request_receipt {
         }
     }
     $env{'form.user'} = "'".$env{'form.uname'}.':'.$env{'form.udom'}."'";
-    if (&Apache::loncommon::check_for_gci_dc()) {
-        $env{'form.csri'} = $env{'form.title'}.' - '.$coursecode.' - '.$lt{'sect'}.': '.$env{'form.section'};
-    }
+    $env{'form.crsi'} = $env{'form.title'}.' - '.$coursecode.' - '.$lt{'sect'}.': '.$env{'form.section'};
     my $supportmsg = <<END;
 $lt{'username'}: $env{'form.username'}
 $lt{'email'}: $env{'form.email'}
 $lt{'cc'}: $okcclist
 $lt{'user'}: $env{'form.user'}
-END
-    if (&Apache::loncommon::check_for_gci_dc()) {
-        $supportmsg .=  <<END
 $lt{'phone'}: $env{'form.phone'}
-$lt{'crsi'}: $env{'form.csri'}
-END
-    }
-    $supportmsg = <<END;
+$lt{'crsi'}: $env{'form.crsi'}
 $lt{'subject'}: $env{'form.subject'}
 $lt{'description'}: $env{'form.description'}
 $lt{'sourceurl'}: $env{'form.sourceurl'}
@@ -579,12 +614,7 @@ $lt{'date'}: $reporttime
 
 END
     my $displaymsg;
-    my @items = ('username','email','cc','user');
-    if (&Apache::loncommon::check_for_gci_dc()) {
-        push(@items,'phone','crsi');
-    }
-    push(@items,('subject','description','sourceurl'));
-    foreach my $item (@items) {
+    foreach my $item ('username','email','cc','user','phone','crsi','subject','description','sourceurl') {
         if ($env{'form.'.$item} ne '') {
             if ($item eq 'description') {
                 my $descrip = $env{'form.description'};
@@ -658,14 +688,20 @@ END
             $bad_email = 1;
         }
     }
-    if ($bad_email) {
-        $r->print('
- <h3>'.$lt{'warn'}.'</h3>'.
-&mt('As the e-mail address provided for this LON-CAPA server ([_1]) does not appear to be a valid e-mail address, your support request has <b>not</b> been sent to the LON-CAPA support staff or administrator at your institution.',$to).' '.&mt('Instead a copy has been sent to the LON-CAPA support team at Michigan State University.')); 
-            $to = 'helpdesk@lon-capa.org';
+
+    my $message;
+    if (!$bad_email) {
+        $message = &Apache::lonhtmlcommon::confirm_success(
+            &mt('A support request has been sent to [_1]','<tt>'.$to.'</tt>'));
     } else {
-        $r->print('<h3>'.$lt{'asup'}.' '.$to.'</h3>');
+        $message = &Apache::lonhtmlcommon::confirm_success(
+            $lt{'warn'}.'<br />'
+           .&mt('As the e-mail address provided for this LON-CAPA server ([_1]) does not appear to be a valid e-mail address, your support request has [_2]not[_3] been sent to the LON-CAPA support staff or administrator at your institution.','<tt>'.$to.'</tt>','<b>','</b>')
+           .' '.&mt('Instead a copy has been sent to the LON-CAPA support team at Michigan State University.'),1); 
+        $to = 'helpdesk@lon-capa.org';
     }
+    $r->print(&Apache::loncommon::confirmwrapper($message));
+
     if (defined($env{'form.email'})) {
         $env{'form.email'} =~ s/^\s+//;
         $env{'form.email'} =~ s/\s+$//;
@@ -691,7 +727,8 @@ END
 
     my $attachmentpath = '';
     my $attachmentsize = '';
-    if (defined($env{'user.name'})) {
+    if ((defined($env{'user.name'})) && ($env{'user.name'} ne 'public')
+        && ($env{'user.domain'} ne 'public')) {
         if ($env{'form.screenshot.filename'}) {
             $attachmentsize = length($env{'form.screenshot'});
             if ($attachmentsize > 131072) {
@@ -712,7 +749,7 @@ END
         $fname = $1;
         $displaymsg .= '<br />'
                       .&mt('An uploaded screenshot file [_1] ([_2] bytes) was included in the request sent by [_3].'
-                          ,'<span class="LC_filename">'.$fname.'<span>'
+                          ,'<span class="LC_filename">'.$fname.'</span>'
                           ,$attachmentsize
                           ,$env{'user.name'}.':'.$env{'user.domain'}
                        );
@@ -739,6 +776,11 @@ END
         my $cc_string = join(', ',@ok_ccs);
         $msg->add("Cc" => $cc_string);
     }
+    if ($bcc ne '') {
+        $msg->add("Bcc" => $bcc);
+    }
+    $msg->attr("content-type"         => "text/plain");
+    $msg->attr("content-type.charset" => "UTF-8");
 
     if ($attachmentpath) {
         my ($type, $encoding) = MIME::Types::by_suffix($attachmentpath);