--- loncom/interface/lonsupportreq.pm	2010/04/14 07:31:21	1.55.4.3
+++ loncom/interface/lonsupportreq.pm	2010/11/10 14:44:50	1.58
@@ -1,5 +1,5 @@
 #
-# $Id: lonsupportreq.pm,v 1.55.4.3 2010/04/14 07:31:21 raeburn Exp $
+# $Id: lonsupportreq.pm,v 1.58 2010/11/10 14:44:50 bisitz Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -338,12 +338,13 @@ function initialize_codes() {
                 $output .= $lt{'enin'}.': 
                   <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="'.$codetitles[0].'" onchange="courseSet('."'$codetitles[0]'".')">'."\n".
+                      '<select name="'.$standardnames[0].'" onchange="courseSet('."'$codetitles[0]'".')">'."\n".
                       ' <option value="-1" />'.$lt{'sele'}."\n";
                 my @items = ();
                 my @longitems = ();
@@ -372,7 +373,7 @@ function initialize_codes() {
                 $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".
+                     '<select name="'.$standardnames[$i].'" onchange="courseSet('."'$codetitles[$i]'".')">'."\n".
                      '<option value="-1">&lt;-'.$lt{'pick'}.' '.$codetitles[$i-1].'</option>'."\n".
                      '</select>'."\n".
                      '</td>'."\n";
@@ -380,7 +381,7 @@ function initialize_codes() {
                 $output .= '</tr></table>';
                 if ($numtitles > 4) {
                     $output .= '<br /><br />'.$codetitles[$numtitles].'<br />'."\n".
-                          '<select name="'.$codetitles[$numtitles].'" onchange="courseSet('."'$codetitles[$numtitles]'".')">'."\n".
+                          '<select name="'.$standardnames[$numtitles].'" onchange="courseSet('."'$codetitles[$numtitles]'".')">'."\n".
                           '<option value="-1">&lt;-'.$lt{'pick'}.' '.$codetitles[$numtitles-1].'</option>'."\n".
                           '</select>'."\n";
                 }
@@ -509,17 +510,20 @@ sub print_request_receipt {
     &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},\@formvars);
     my $coursecode = $env{'form.coursecode'};
     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'};
+        my $totcodes = 0;
+        my %coursecodes;
+        $totcodes = &Apache::courseclassifier::retrieve_instcodes(\%coursecodes,$defdom,$totcodes);
+        my $coursecode;
+        my @standardnames = &Apache::loncommon::get_standard_codeitems();
+        if ($totcodes > 0) {
+            $coursecode = &Apache::courseclassifier::instcode_from_selectors($defdom); 
+        } 
+        if ($coursecode eq '') {
+            foreach my $item (@standardnames) {
+                if ((defined($env{'form.'.$item})) && ($env{'form.'.$item} ne '-1')) {
+                    $coursecode .= $env{'form.'.$item};
+                }
+            }
         }
     }
     my %lt = &Apache::lonlocal::texthash (
@@ -559,7 +563,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);
                 }
@@ -576,14 +580,14 @@ sub print_request_receipt {
         }
     }
     $env{'form.user'} = "'".$env{'form.uname'}.':'.$env{'form.udom'}."'";
-    $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'}
 $lt{'phone'}: $env{'form.phone'}
-$lt{'crsi'}: $env{'form.csri'}
+$lt{'crsi'}: $env{'form.crsi'}
 $lt{'subject'}: $env{'form.subject'}
 $lt{'description'}: $env{'form.description'}
 $lt{'sourceurl'}: $env{'form.sourceurl'}
@@ -750,6 +754,7 @@ END
     if ($bcc ne '') {
         $msg->add("Bcc" => $bcc);
     }
+    $msg->add('Content-type','text/plain; charset=UTF-8');
 
     if ($attachmentpath) {
         my ($type, $encoding) = MIME::Types::by_suffix($attachmentpath);
@@ -842,8 +847,8 @@ sub print_header {
    <td>
     <fieldset>
       <legend>
-        <img src="$location/lonIcons/minilogo.gif" height="20" width="29" valign="bottom" />&nbsp;&nbsp;
-       <b>LON-CAPA $lt{'headline'}</b>
+        <img src="$location/lonIcons/minilogo.gif" height="20" width="29" valign="bottom" />
+        LON-CAPA $lt{'headline'}
       </legend>
  <table id="LC_helpmenu_links">
    <tr>