--- loncom/interface/lonsupportreq.pm	2007/09/05 05:46:19	1.44
+++ loncom/interface/lonsupportreq.pm	2008/01/13 16:53:46	1.46
@@ -1,5 +1,5 @@
 #
-# $Id: lonsupportreq.pm,v 1.44 2007/09/05 05:46:19 raeburn Exp $
+# $Id: lonsupportreq.pm,v 1.46 2008/01/13 16:53:46 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -99,7 +99,8 @@ sub print_request_form {
                   rdes => 'You must include a description',
                   name => 'Name',
                   subm => 'Submit Request',
-                  emad => 'E-mail address',
+                  emad => 'Your e-mail address',
+                  emac => 'Cc', 
                   unme => 'username',
                   doma => 'domain',
                   entu => 'Enter the username you use to log-in to LON-CAPA',
@@ -171,11 +172,8 @@ END
         my ($sec,$grp) = split(/:/,$section);
         $groupid{$sec} = $grp;
     }
-    my $codedom = $Apache::lonnet::perlvar{'lonDefDomain'};
     &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},['codedom']);
-    if (exists($env{'form.codedom'})) {
-        $codedom = $env{'form.codedom'};
-    }
+    my $codedom = &get_domain();
     my $details_title;
     if ($codedom) {
         $details_title = '<br />('.$codedom.')';
@@ -197,9 +195,6 @@ function initialize_codes() {
     return;
 }
     |;
-    if ($cdom) {
-        $codedom = $cdom;
-    }
     if ($cnum) {
         $coursecodes{$cnum} = $ccode;
         if ($ccode eq '') {
@@ -264,7 +259,10 @@ function initialize_codes() {
                 '<input type="text" size="20" name="email" value="'.
                 &HTML::Entities::encode($email,'"<>&').'" /><br />'."\n".
                 &Apache::lonhtmlcommon::row_closure().
-                &Apache::lonhtmlcommon::row_title("$lt{'unme'}/$lt{'doma'}",undef,'LC_oddrow_value');
+                &Apache::lonhtmlcommon::row_title($lt{'emac'},undef,'LC_oddrow_value').
+                '<input type="text" size="50" name="cc" value="" /><br />'."\n".
+                &Apache::lonhtmlcommon::row_closure().
+                &Apache::lonhtmlcommon::row_title("$lt{'unme'}/$lt{'doma'}",undef,'LC_evenrow_value');
     my $udom_input = '<input type="hidden" name="udom" value="'.
                      &HTML::Entities::encode($udom,'"<>&').'" />';
     my $uname_input = '<input type="hidden" name="uname" value="'.
@@ -297,15 +295,15 @@ function initialize_codes() {
         $output .= $unameform.$udomform;
     }
     $output .= &Apache::lonhtmlcommon::row_closure().
-               &Apache::lonhtmlcommon::row_title("$lt{'urlp'}",undef,'LC_evenrow_value').
+               &Apache::lonhtmlcommon::row_title("$lt{'urlp'}",undef,'LC_oddrow_value').
                $showserver.'<input type="hidden" name="sourceurl" value="'.
                &HTML::Entities::encode($server,'"<>&').'" />'.
                &Apache::lonhtmlcommon::row_closure().
-               &Apache::lonhtmlcommon::row_title("$lt{'phon'}",undef,'LC_oddrow_value').
+               &Apache::lonhtmlcommon::row_title("$lt{'phon'}",undef,'LC_evenrow_value').
                '<input type="text" size="15" name="phone" /><br />'.
                &Apache::lonhtmlcommon::row_closure().
-               &Apache::lonhtmlcommon::row_title("$lt{'crsd'}$details_title",undef,'LC_evenrow_value');
-    if ($cnum) { 
+               &Apache::lonhtmlcommon::row_title("$lt{'crsd'}$details_title",undef,'LC_oddrow_value');
+    if ($cnum) {
         if ($coursecodes{$cnum}) {
             foreach my $item (@codetitles) {
                 $output .= '<i>'.$item.'</i>:&nbsp;'.$codes{$cnum}{$item}.';&nbsp;';
@@ -383,7 +381,7 @@ function initialize_codes() {
                  <input type="text" name="title" size="25" value="" />'."\n";
     }
     $output .= &Apache::lonhtmlcommon::row_closure().
-               &Apache::lonhtmlcommon::row_title($lt{'secn'},undef,'LC_oddrow_value');
+               &Apache::lonhtmlcommon::row_title($lt{'secn'},undef,'LC_evenrow_value');
     if ($sectionlist) {
         $output .= "<select name=\"section\"\n>".
                    "  <option value=\"\" selected=\"selected\">$lt{'sele'}</option>\n";
@@ -403,15 +401,15 @@ function initialize_codes() {
         $output .= '<input type="text" name="section" size="10" />';
     }
     $output .= &Apache::lonhtmlcommon::row_closure().
-               &Apache::lonhtmlcommon::row_title($lt{'subj'},undef,'LC_evenrow_value').
+               &Apache::lonhtmlcommon::row_title($lt{'subj'},undef,'LC_oddrow_value').
                '  <input type="text" size="40" name="subject" />'."\n".
                &Apache::lonhtmlcommon::row_closure().
-               &Apache::lonhtmlcommon::row_title($lt{'detd'},undef,'LC_oddrow_value').
+               &Apache::lonhtmlcommon::row_title($lt{'detd'},undef,'LC_evenrow_value').
                '  <textarea rows="10" cols="45" name="description" wrap="virtual"></textarea>'.
                &Apache::lonhtmlcommon::row_closure();
     my $lastrow = 'LC_evenrow_value';
     if (defined($env{'user.name'})) {
-        $output .= &Apache::lonhtmlcommon::row_title($lt{'opfi'},undef,'LC_evenrow_value').
+        $output .= &Apache::lonhtmlcommon::row_title($lt{'opfi'},undef,'LC_oddrow_value').
                    ' <input type="file" name="screenshot" size="20" /><br />'.$lt{'uplf'}."\n".
         &Apache::lonhtmlcommon::row_closure();
         $lastrow = 'LC_oddrow_value';
@@ -450,7 +448,10 @@ sub print_request_receipt {
     my @cookievars = ('lonID');
 
     my $admin = $Apache::lonnet::perlvar{'lonAdminMail'};
-    my $to =  $Apache::lonnet::perlvar{'lonSupportEMail'};
+    my $origmail = $Apache::lonnet::perlvar{'lonSupportEMail'};
+    my $defdom = &get_domain();
+    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','phone','section','coursecode','title','subject','description','screenshot');
@@ -474,6 +475,7 @@ sub print_request_receipt {
     my %lt = &Apache::lonlocal::texthash (
                  username    => 'Name',
                  email       => 'Email',
+                 cc          => 'Cc',
                  user        => 'Username/domain',
                  phone       => 'Phone',
                  crsi        => 'Course Information',
@@ -489,12 +491,46 @@ sub print_request_receipt {
                  info        => 'Information supplied',
                  adin        => 'Additional information recorded',
     );
- 
+
+    my (@ok_ccs,@bad_ccs,$badccmsg,$okcclist);
+    if (defined($env{'form.cc'})) {
+        my @ccs;
+        if ($env{'form.cc'} =~ /,/) {
+            @ccs = split(/,/,$env{'form.cc'});
+        } else {
+            $env{'form.cc'} =~ s/^\s+//;
+            $env{'form.cc'} =~ s/\s+$//;
+            @ccs = $env{'form.cc'};
+        }
+        foreach my $cc (@ccs) {
+            $cc =~ s/^\s+//g;
+            $cc =~ s/\s+$//g;
+            if ($cc =~ m/^[^\@]+\@[^\@]+$/) {
+                if (!(grep(/^\Q$cc\E$/,@ok_ccs))) {
+                    push(@ok_ccs,$cc);
+                }
+            } else {
+                if (!(grep(/^\Q$cc\E$/,@bad_ccs))) {
+                    push(@bad_ccs,$cc);
+                }
+            }
+        }
+        if (@ok_ccs > 0) {
+           $okcclist = join(', ',@ok_ccs); 
+        } 
+        if (@bad_ccs == 1) {
+            $badccmsg .= '<br />'.&mt('The following Cc e-mail address is invalid: ').$bad_ccs[0];
+        } elsif (@bad_ccs > 1) {
+            my $bad_cc_string = join(', ',@bad_ccs);
+            $badccmsg .= '<br />'.&mt('The following Cc e-mail addresses are invalid: ').$bad_cc_string;
+        }
+    }
     $env{'form.user'} = "'".$env{'form.uname'}.':'.$env{'form.udom'}."'";
     $env{'form.csri'} = $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'}
@@ -505,7 +541,7 @@ $lt{'date'}: $reporttime
 
 END
     my $displaymsg;
-    foreach my $item ('username','email','user','phone','crsi','subject','description','sourceurl') {
+    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'};
@@ -519,6 +555,10 @@ END
                 $displaymsg .= 
                     '<span class="LC_helpform_receipt_cat">'.
                     "$lt{$item}</span>: $showurl<br />\n";
+            } elsif ($item eq 'cc') {
+                $displaymsg .=
+                    '<span class="LC_helpform_receipt_cat">'.
+                    "$lt{$item}</span>: $okcclist<br />\n";
             } else {
                 $displaymsg .= 
                     '<span class="LC_helpform_receipt_cat">'.
@@ -547,25 +587,52 @@ END
     if ($r->uri eq '/adm/helpdesk') {
         &print_header($r,$url,'process');
     }
-    if ($to =~ m/^[^\@]+\@[^\@]+$/) {
-        $r->print('<h3>'.$lt{'asup'}.' '.$to.'</h3>');
-    } else {
-        $to = $admin;
-        if ($to =~ m/^[^\@]+\@[^\@]+$/) {
-            $r->print('<h3>'.$lt{'asup'}.' '.$to.'</h3>');
+    my $bad_email = 0;
+    if ($to =~ /,/) {
+        my @ok_email; 
+        foreach my $email (split(/,/,$to)) {
+            if ($email =~ m/^[^\@]+\@[^\@]+$/) {
+                if (!grep(/^\Q$email\E$/,@ok_email)) {
+                    push(@ok_email,$email);
+                }
+            }
+        }
+        if (@ok_email > 0) {
+            $to = join(',',@ok_email);
+        } elsif ($admin =~ m/^[^\@]+\@[^\@]+$/) {
+            $to = $admin;
         } else {
-            $r->print('
+            $bad_email = 1;
+        }
+    } elsif ($to !~ m/^[^\@]+\@[^\@]+$/) {
+        if ($admin =~ m/^[^\@]+\@[^\@]+$/) {
+            $to = $admin;
+        } else {
+            $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';
-        }
+    } else {
+        $r->print('<h3>'.$lt{'asup'}.' '.$to.'</h3>');
     }
     if (defined($env{'form.email'})) {
+        $env{'form.email'} =~ s/^\s+//;
+        $env{'form.email'} =~ s/\s+$//;
         if ($env{'form.email'} =~ m/^[^\@]+\@[^\@]+$/) {
             $from = $env{'form.email'};
         }
     }
 
+    if (defined($env{'form.cc'})) {
+        if ($badccmsg) {
+            $displaymsg .= $badccmsg;
+        }
+    }
+
     my $subject = $env{'form.subject'};
     $subject =~ s/(`)/'/g;
     $subject =~ s/\$/\(\$\)/g;
@@ -616,6 +683,10 @@ END
                  Type    =>'TEXT',
                  Data    => $supportmsg,
                  );
+    if (@ok_ccs > 0) {
+        my $cc_string = join(', ',@ok_ccs);
+        $msg->add("Cc" => $cc_string);
+    }
 
     if ($attachmentpath) {
         my ($type, $encoding) = MIME::Types::by_suffix($attachmentpath);
@@ -730,4 +801,18 @@ Please review the information in "Log-in
     return;
 }
 
+sub get_domain {
+    my $codedom;
+    if (exists($env{'form.codedom'})) {
+        $codedom = $env{'form.codedom'};
+    } elsif ($env{'request.course.id'}) {
+        $codedom = $env{'course.'.$env{'request.course.id'}.'.domain'};
+    } elsif ($env{'request.role.domain'}) {
+        $codedom = $env{'request.role.domain'};
+    } else {
+        $codedom = $Apache::lonnet::perlvar{'lonDefDomain'};
+    }
+    return $codedom;
+}
+
 1;