--- loncom/interface/lonsupportreq.pm	2007/12/04 04:43:21	1.45
+++ loncom/interface/lonsupportreq.pm	2009/01/15 18:31:11	1.51
@@ -1,5 +1,5 @@
 #
-# $Id: lonsupportreq.pm,v 1.45 2007/12/04 04:43:21 raeburn Exp $
+# $Id: lonsupportreq.pm,v 1.51 2009/01/15 18:31:11 bisitz 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',
@@ -237,9 +238,12 @@ function initialize_codes() {
     if ($r->uri eq '/adm/helpdesk') {
         &print_header($r,$origurl);
     }
+    my @css = ('LC_evenrow_value','LC_oddrow_value');
+    my $num = 1;
+    my $i = $num%2;
     $r->print('<form method="post" name="logproblem" enctype="multipart/form-data">'."\n");
     my $output = &Apache::lonhtmlcommon::start_pick_box().
-                 &Apache::lonhtmlcommon::row_title($lt{'name'},undef,'LC_oddrow_value')."\n";
+                 &Apache::lonhtmlcommon::row_title($lt{'name'},undef,$css[$num])."\n";
     my $fullname = '';
     if ((defined($lastname) && $lastname ne '') && (defined($firstname) && $firstname ne '')) {
         $fullname = "$firstname $lastname"; 
@@ -253,12 +257,23 @@ function initialize_codes() {
         $output .= '<input type="text" size="20" name="username" value="'.&HTML::Entities::encode($fullname,'"<>&').'" />';
     }
     $output .= '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<input type="button" value="'.$lt{'subm'}.'" onclick="validate()" />&nbsp;'.
-                &Apache::lonhtmlcommon::row_closure()."\n".
-                &Apache::lonhtmlcommon::row_title($lt{'emad'},undef,'LC_evenrow_value').
-                '<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_closure()."\n";
+    $num ++;
+    $i = $num%2;
+    $output .= &Apache::lonhtmlcommon::row_title($lt{'emad'},undef,$css[$i]).
+               '<input type="text" size="20" name="email" value="'.
+               &HTML::Entities::encode($email,'"<>&').'" /><br />'."\n".
+               &Apache::lonhtmlcommon::row_closure();
+    $num ++;
+    $i = $num%2;
+    if (defined($env{'user.name'})) {
+        $output .= &Apache::lonhtmlcommon::row_title($lt{'emac'},undef,$css[$i]).
+                   '<input type="text" size="50" name="cc" value="" /><br />'."\n".
+                   &Apache::lonhtmlcommon::row_closure();
+        $num ++;
+        $i = $num%2;
+    }
+    $output .= &Apache::lonhtmlcommon::row_title("$lt{'unme'}/$lt{'doma'}",undef,$css[$i]);
     my $udom_input = '<input type="hidden" name="udom" value="'.
                      &HTML::Entities::encode($udom,'"<>&').'" />';
     my $uname_input = '<input type="hidden" name="uname" value="'.
@@ -290,16 +305,20 @@ function initialize_codes() {
         }
         $output .= $unameform.$udomform;
     }
-    $output .= &Apache::lonhtmlcommon::row_closure().
-               &Apache::lonhtmlcommon::row_title("$lt{'urlp'}",undef,'LC_evenrow_value').
+    $output .= &Apache::lonhtmlcommon::row_closure();
+    $num ++;
+    $i = $num%2;
+    $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_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_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;';
@@ -376,8 +395,10 @@ function initialize_codes() {
         $output .= '<br />'.$lt{'enct'}.':&nbsp;
                  <input type="text" name="title" size="25" value="" />'."\n";
     }
-    $output .= &Apache::lonhtmlcommon::row_closure().
-               &Apache::lonhtmlcommon::row_title($lt{'secn'},undef,'LC_oddrow_value');
+    $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";
@@ -396,21 +417,25 @@ function initialize_codes() {
     } else {
         $output .= '<input type="text" name="section" size="10" />';
     }
-    $output .= &Apache::lonhtmlcommon::row_closure().
-               &Apache::lonhtmlcommon::row_title($lt{'subj'},undef,'LC_evenrow_value').
+    $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().
-               &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';
+    $num ++;
+    $i = $num%2; 
     if (defined($env{'user.name'})) {
-        $output .= &Apache::lonhtmlcommon::row_title($lt{'opfi'},undef,'LC_evenrow_value').
+        $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();
-        $lastrow = 'LC_oddrow_value';
+        $num ++;
+        $i = $num%2; 
     }
-    $output .= &Apache::lonhtmlcommon::row_title($lt{'fini'},undef,$lastrow);
+    $output .= &Apache::lonhtmlcommon::row_title($lt{'fini'},undef,$css[$i]);
     $output .= <<END;
              <table border="0" cellpadding="8" cellspacing="0">
               <tr>
@@ -471,6 +496,7 @@ sub print_request_receipt {
     my %lt = &Apache::lonlocal::texthash (
                  username    => 'Name',
                  email       => 'Email',
+                 cc          => 'Cc',
                  user        => 'Username/domain',
                  phone       => 'Phone',
                  crsi        => 'Course Information',
@@ -486,12 +512,46 @@ sub print_request_receipt {
                  info        => 'Information supplied',
                  adin        => 'Additional information recorded',
     );
- 
+
+    my (@ok_ccs,@bad_ccs,$badccmsg,$okcclist);
+    if ((defined($env{'user.name'})) && (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'}
@@ -502,7 +562,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'};
@@ -516,6 +576,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">'.
@@ -549,7 +613,9 @@ END
         my @ok_email; 
         foreach my $email (split(/,/,$to)) {
             if ($email =~ m/^[^\@]+\@[^\@]+$/) {
-                push(@ok_email,$email);
+                if (!grep(/^\Q$email\E$/,@ok_email)) {
+                    push(@ok_email,$email);
+                }
             }
         }
         if (@ok_email > 0) {
@@ -575,11 +641,19 @@ END
         $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;
@@ -610,7 +684,12 @@ END
 
     if ($attachmentpath =~ m-/([^/]+)$-) {
         $fname = $1;
-        $displaymsg .= '<br />'.&mt('An uploaded screenshot file \'[_1]\' ([_2] bytes) was included in the request sent by [_3].',$fname,$attachmentsize,$env{'user.name'}.': '.$env{'user.domain'});
+        $displaymsg .= '<br />'
+                      .&mt('An uploaded screenshot file [_1] ([_2] bytes) was included in the request sent by [_3].'
+                          ,'<span class="LC_filename">'.$fname.'<span>'
+                          ,$attachmentsize
+                          ,$env{'user.name'}.':'.$env{'user.domain'}
+                       );
         $supportmsg .= "\n";
         foreach my $var (@cookievars) {
             $supportmsg .= "$var: $cookies{$var}\n";
@@ -630,6 +709,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);
@@ -705,20 +788,23 @@ sub print_header {
                                            login => 'Log-in help',
                                            ask   => 'Ask helpdesk',
                                            getst => 'Getting started guide',
-                                           back =>  'Back to last location'
+                                           back =>  'Back to last location',
+                                           headline => 'help/support',
                                          );
-    my ($getstartlink,$getstarttext);
+    my ($getstartlink,$reviewtext);
     if (-e $Apache::lonnet::perlvar{'lonDocRoot'}.'/adm/gettingstarted.html') {
         $getstartlink = qq|<td align="center">&nbsp;<b><a href="/adm/gettingstarted.html">$lt{'getst'}</a></td>|;
-        $getstarttext = ' '.&mt('and the "Getting started" guide').' ';
+        $reviewtext = &mt('Please review the information in "Log-in help" and the "Getting started" guide if you are unable to log-in.');
+    } else {
+        $reviewtext = &mt('Please review the information in "Log-in help" if you are unable to log-in.');
     }
     $r->print(<<END);
 <table width="620" border="0" cellspacing="0" cellpadding="0" height="55">   <tr height="50">    <td width='5'>&nbsp;</td>
    <td>
-    <fieldset><legend><img src="$location/lonIcons/minilogo.gif" height='20' width='29' valign='bottom' />&nbsp;&nbsp;<b><font size="+1">LON-CAPA help/support</font></b></legend>
+    <fieldset><legend><img src="$location/lonIcons/minilogo.gif" height='20' width='29' valign='bottom' />&nbsp;&nbsp;<b><font size="+1">LON-CAPA $lt{'headline'}</font></b></legend>
  <table id="LC_helpmenu_links">
    <tr>
-    <td align="center"><span class="LC_nobreak"><img src="$location/help/gif/smallHelp.gif" border="0" alt="($lt{'login'})" valign="middle" />&nbsp;<b><a href="/adm/loginproblems.html">$lt{'login'}</a></b>&nbsp;</span></td>
+    <td align="center"><span class="LC_nobreak"><img src="$location/help/help.png" border="0" alt="($lt{'login'})" valign="middle" />&nbsp;<b><a href="/adm/loginproblems.html">$lt{'login'}</a></b>&nbsp;</span></td>
     <td align="center"><span class="LC_nobreak">&nbsp;<b>$helpdesk_link<img src="$location/lonIcons/helpdesk.gif" border="0" alt="($lt{'ask'})" valign="middle" />&nbsp;$lt{'ask'}</a></b>&nbsp;</span></td>$getstartlink
     <td align="center"><span class="LC_nobreak">&nbsp;<b><a href="$origurl" target="_top"><img src="$location/lonIcons/move_up.gif" border="0" alt="($lt{'back'})" valign="middle" />&nbsp;$lt{'back'}</a></b>&nbsp;</span></td>
    </tr>
@@ -734,8 +820,11 @@ END
     if  ($command ne 'process') {
         $r->print('
  <tr>
-  <td colspan="3">'.&mt('
-Please review the information in "Log-in help"').$getstarttext.' '.&mt('if you are unable to log-in').'.  '.&mt('If your problem is still unresolved, the form below can be used to send a question to the LON-CAPA helpdesk').'.<br /><font size="-1"><b>'.&mt('Students').'</b>: '.&mt('Do <b>not</b> use this form to ask questions about course content.').' '.&mt('Contact your instructor instead.').'</font><br /><br />
+  <td colspan="3">'.$reviewtext.' '
+.&mt('If your problem is still unresolved, the form below can be used to send a question to the LON-CAPA helpdesk.').'<br />'
+.'<font size="-1"><b>'.&mt('Students').'</b>: '.&mt('Do <b>not</b> use this form to ask questions about course content.').' '
+.&mt('Contact your instructor instead.')
+.'</font><br /><br />
   </td>
  </tr>');
     }