--- loncom/interface/lonsupportreq.pm	2014/01/17 17:17:42	1.77
+++ loncom/interface/lonsupportreq.pm	2017/01/18 21:07:31	1.85
@@ -1,5 +1,5 @@
 #
-# $Id: lonsupportreq.pm,v 1.77 2014/01/17 17:17:42 bisitz Exp $
+# $Id: lonsupportreq.pm,v 1.85 2017/01/18 21:07:31 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -27,8 +27,6 @@
 package Apache::lonsupportreq;
 
 use strict;
-use MIME::Types;
-use MIME::Lite;
 use CGI::Cookie();
 use Apache::Constants qw(:common);
 use Apache::loncommon();
@@ -79,18 +77,18 @@ sub handler {
     }
     return OK;
 }
-    
+   
 sub print_request_form {
     my ($r,$origurl,$function) = @_;
-    my ($os,$browser,$bversion,$uhost,$uname,$udom,$uhome,$urole,$usec,$email,$cid,
+    my ($os,$browser,$bversion,$uname,$udom,$uhome,$urole,$usec,$email,$cid,
         $cdom,$cnum,$ctitle,$ccode,$sectionlist,$lastname,$firstname,$server,
-        $formname,$public,$homeserver);
+        $formname,$public,$homeserver,$knownuser,$captcha_form,$captcha_error,
+        $captcha,$recaptcha_version);
     $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'};
     if (($env{'user.name'} eq 'public') && ($env{'user.domain'} eq 'public')) {
         $public = 1;
     } else {
@@ -105,6 +103,14 @@ sub print_request_form {
             }
         }
     }
+    if (($env{'user.name'} =~ /^$match_username$/) && 
+        ($env{'user.domain'} =~ /^$match_domain$/) && (!$public)) {
+        $knownuser = 1;
+    } else {
+        my $lonhost = $r->dir_config('lonHostID');
+        ($captcha_form,$captcha_error,$captcha,$recaptcha_version) =
+            &Apache::loncommon::captcha_display('login',$lonhost);
+    }
     if ($homeserver) {
         $uhome = $env{'user.home'};
         $urole = $env{'request.role'};
@@ -116,11 +122,13 @@ sub print_request_form {
     my $sourceurl = $machine.$origurl;
     $server = $machine.&Apache::loncommon::cleanup_html($origurl);
     $server =~ s/\?.*$//;
-    my %lt = &Apache::lonlocal::texthash (
+    my %js_lt = &Apache::lonlocal::texthash (
                   email => 'The e-mail address you entered',
                   notv => 'is not a valid e-mail address',
                   rsub => 'You must include a subject',
                   rdes => 'You must include a description',
+    );
+    my %html_lt = &Apache::lonlocal::texthash (
                   name => 'Name',
                   subm => 'Submit Request',
                   emad => 'Your e-mail address',
@@ -143,22 +151,24 @@ sub print_request_form {
                   subj => 'Subject',
                   detd => 'Detailed Description',
                   opfi => 'Optional file upload',
-                  uplf => 'Upload a file (e.g., a screenshot) relevant to your help request (128 KB max.)',
+                  uplf => 'Upload a file (e.g., a screenshot) relevant to your help request (1 MB max.)',
                   fini => 'Finish',
                   clfm => 'Clear Form',
     );
+    &js_escape(\%js_lt);
+    &html_escape(\%html_lt);
     my $scripttag = (<<"END");
 function validate() {
     if (validmail(document.logproblem.email) == false) {
-        alert("$lt{'email'}: "+document.logproblem.email.value+" $lt{'notv'}.");
+        alert("$js_lt{'email'}: "+document.logproblem.email.value+" $js_lt{'notv'}.");
         return;
     }
     if (document.logproblem.subject.value == '') {
-        alert("$lt{'rsub'}.");
+        alert("$js_lt{'rsub'}.");
         return;
     }
     if (document.logproblem.description.value == '') {
-        alert("$lt{'rdes'}.");
+        alert("$js_lt{'rdes'}.");
         return;
     }
     document.logproblem.submit();
@@ -257,7 +267,7 @@ function initialize_codes() {
                 my $allidlist = $idlist{$codetitles[0]};
                 $jscript .= &Apache::courseclassifier::courseset_js_start($formname,$longtitles_str,$allidlist);
                 $jscript .= $scripttext;
-                $jscript .= &Apache::courseclassifier::javascript_code_selections($formname,@codetitles);
+                $jscript .= &Apache::courseclassifier::javascript_code_selections($formname,\@codetitles);
                 $loaditems = '';
             }
         }
@@ -271,7 +281,11 @@ $jscript
 $loaditems
 // ]]>
 </script>
+<script type="text/javascript" src="/res/adm/includes/file_upload.js"></script>
 ENDJS
+    if ($recaptcha_version >=2) {
+        $js.= "\n".'<script src="https://www.google.com/recaptcha/api.js"></script>'."\n";
+    }
     my %add_entries = (
                        style    => "margin-top:0px;margin-bottom:0px;",
                        onload   => "initialize_codes();",
@@ -294,12 +308,12 @@ ENDJS
     }
     $r->print('<form method="post" action="" name="logproblem"'.$formtype.'>'."\n");
     my $output = &Apache::lonhtmlcommon::start_pick_box().
-#                 &Apache::lonhtmlcommon::row_headline().
-#                 '<span class="LC_info">'.
-#                 &mt('(All fields marked with * are required.)').
-#                 '</span>'.
-#                 &Apache::lonhtmlcommon::row_closure().
-                 &Apache::lonhtmlcommon::row_title($lt{'name'},undef,$css[$num])."\n";
+                 &Apache::lonhtmlcommon::row_headline().
+                 '<span class="LC_info">'.
+                 &mt('(All fields marked with * are required.)').
+                 '</span>'.
+                 &Apache::lonhtmlcommon::row_closure().
+                 &Apache::lonhtmlcommon::row_title($html_lt{'name'},undef,$css[$num])."\n";
     my $fullname = '';
     if ((defined($lastname) && $lastname ne '') && (defined($firstname) && $firstname ne '')) {
         $fullname = "$firstname $lastname"; 
@@ -312,73 +326,75 @@ ENDJS
         }
         $output .= '<input type="text" size="20" name="username" value="'.&HTML::Entities::encode($fullname,'"<>&').'" />'."\n";
     }
-    $output .= '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<input type="button" value="'.$lt{'subm'}.'" onclick="validate()" />&nbsp;'.
+    $output .= '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<input type="button" value="'.$html_lt{'subm'}.'" onclick="validate()" />&nbsp;'.
                 &Apache::lonhtmlcommon::row_closure()."\n";
     $num ++;
     $i = $num%2;
-    $output .= &Apache::lonhtmlcommon::row_title($lt{'emad'},undef,$css[$i]).
+    $output .= &Apache::lonhtmlcommon::row_title(
+                   '<span title="'.&mt('required').'">'.
+                   $html_lt{'emad'}.' <span class="LC_info">*</span></span>'
+                  ,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 (($env{'user.name'} =~ /^$match_username$/) && (!$public)) {
-        if ($homeserver) { 
-            $output .= &Apache::lonhtmlcommon::row_title($lt{'emac'},undef,$css[$i]).
+    if ($knownuser) {
+        if ($homeserver) {
+            $output .= &Apache::lonhtmlcommon::row_title($html_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]);
+    $output .= &Apache::lonhtmlcommon::row_title("$html_lt{'unme'}/$html_lt{'doma'}",undef,$css[$i]);
     my $udom_input = '<input type="hidden" name="udom" value="'.
                      &HTML::Entities::encode($udom,'"<>&').'" />'."\n";
     my $uname_input = '<input type="hidden" name="uname" value="'.
                       &HTML::Entities::encode($uname,'"<>&').'" />'."\n"; 
-    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;
+    if ($knownuser) {
+        $output .= '<i>'.$html_lt{'unme'}.'</i>:&nbsp;'.$uname.'&nbsp;&nbsp;<i>'.$html_lt{'doma'}.'</i>:&nbsp;'.$udom.$udom_input.$uname_input;
     } else {
         my $udomform = '';
         my $unameform = '';
         if (($env{'user.domain'} =~ /^$match_domain$/) && (!$public)) {
-            $output .= $lt{'entu'};
+            $output .= $html_lt{'entu'};
         } elsif (($env{'user.name'} =~ /^$match_username$/) && (!$public)) { 
-            $output .= $lt{'chdo'};
+            $output .= $html_lt{'chdo'};
         } else {
-            $output .= $lt{'entr'};
+            $output .= $html_lt{'entr'};
         }
         $output .= '<br />'."\n";
         if (!$public) {
             if ($env{'user.domain'} =~ /^$match_domain$/) {
-                $udomform = '<i>'.$lt{'doma'}.'</i>:&nbsp;'.$udom.$udom_input;
+                $udomform = '<i>'.$html_lt{'doma'}.'</i>:&nbsp;'.$udom.$udom_input;
             } elsif ($env{'user.name'} =~ /^$match_username$/) {
-                $unameform = '<i>'.$lt{'unme'}.'</i>:&nbsp;'.$uname.'&nbsp;&nbsp;'.$uname_input;
+                $unameform = '<i>'.$html_lt{'unme'}.'</i>:&nbsp;'.$uname.'&nbsp;&nbsp;'.$uname_input;
             }
         }
         if ($udomform eq '') {
-            $udomform = '<i>'.$lt{'doma'}.'</i>:&nbsp;';
+            $udomform = '<i>'.$html_lt{'doma'}.'</i>:&nbsp;';
             $udomform .= &Apache::loncommon::select_dom_form($codedom,'udom')."\n";
         }
         if ($unameform eq '') {
-            $unameform= '<i>'.$lt{'unme'}.'</i>:&nbsp;<input type="text" size="20" name="uname" value="'.$uname.'" />&nbsp;&nbsp;';
+            $unameform= '<i>'.$html_lt{'unme'}.'</i>:&nbsp;<input type="text" size="20" name="uname" value="'.$uname.'" />&nbsp;&nbsp;';
         }
         $output .= $unameform.$udomform;
     }
     $output .= &Apache::lonhtmlcommon::row_closure();
     $num ++;
     $i = $num%2;
-    $output .= &Apache::lonhtmlcommon::row_title("$lt{'urlp'}",undef,$css[$i]).
+    $output .= &Apache::lonhtmlcommon::row_title("$html_lt{'urlp'}",undef,$css[$i]).
                $server."\n".'<input type="hidden" name="sourceurl" value="'.
                &HTML::Entities::encode($sourceurl,'"<>&').'" />'."\n".
                &Apache::lonhtmlcommon::row_closure().
-               &Apache::lonhtmlcommon::row_title("$lt{'phon'}",undef,'LC_evenrow_value').
+               &Apache::lonhtmlcommon::row_title("$html_lt{'phon'}",undef,'LC_evenrow_value').
                '<input type="text" size="15" name="phone" /><br />'."\n".
                &Apache::lonhtmlcommon::row_closure();
     $num ++;
     $i = $num%2; 
-    $output .= &Apache::lonhtmlcommon::row_title("$lt{'crsd'}$details_title",undef,$css[$i]);
+    $output .= &Apache::lonhtmlcommon::row_title("$html_lt{'crsd'}$details_title",undef,$css[$i]);
     if ($cnum) {
         if ($coursecodes{$cnum}) {
             foreach my $item (@codetitles) {
@@ -386,14 +402,14 @@ ENDJS
             }
             $output .= '&nbsp;<input type="hidden" name="coursecode" value="'.&HTML::Entities::encode($coursecodes{$cnum},'"<>&').'" />'."\n";
         } else {
-            $output .= $lt{'enin'}.':&nbsp;
+            $output .= $html_lt{'enin'}.':&nbsp;
                   <input type="text" name="coursecode" size="15" value="" />'."\n";
         }
     } else {
         if ($totcodes > 0) {
             my $numtitles = @codetitles;
             if ($numtitles == 0) {
-                $output .= $lt{'enin'}.':&nbsp;
+                $output .= $html_lt{'enin'}.':&nbsp;
                   <input type="text" name="coursecode" size="15" value="" />'."\n";
             } else {
                 my @standardnames = &Apache::loncommon::get_standard_codeitems();
@@ -403,7 +419,7 @@ ENDJS
                 } 
                 $output .= '<table><tr><td>'.$codetitles[0].'<br />'."\n".
                       '<select name="'.$standardnames[0].'" onchange="courseSet('."'$codetitles[0]'".')">'."\n".
-                      ' <option value="-1">'.$lt{'sele'}."</option>\n";
+                      ' <option value="-1">'.$html_lt{'sele'}."</option>\n";
                 my @items = ();
                 my @longitems = ();
                 if ($idlist{$codetitles[0]} =~ /","/) {
@@ -432,7 +448,7 @@ ENDJS
                 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".
+                     '<option value="-1">&lt;-'.$html_lt{'pick'}.' '.$codetitles[$i-1].'</option>'."\n".
                      '</select>'."\n".
                      '</td>'."\n";
                 }
@@ -440,30 +456,30 @@ ENDJS
                 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".
+                          '<option value="-1">&lt;-'.$html_lt{'pick'}.' '.$codetitles[$numtitles-1].'</option>'."\n".
                           '</select>'."\n";
                 }
             }
         } else {
-            $output .= $lt{'enin'}.':&nbsp;
+            $output .= $html_lt{'enin'}.':&nbsp;
                   <input type="text" name="coursecode" size="15" value="" />'."\n";
         }
     }
     if ($ctitle) {
-        $output .= '<br /><i>'.$lt{'titl'}.'</i>:&nbsp;'.$ctitle.
+        $output .= '<br /><i>'.$html_lt{'titl'}.'</i>:&nbsp;'.$ctitle.
                    '<input type="hidden" name="title" value="'.
                    &HTML::Entities::encode($ctitle,'"<>&').'" />'."\n";
     } else {
-        $output .= '<br />'.$lt{'enct'}.':&nbsp;
+        $output .= '<br />'.$html_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]);
+    $output .= &Apache::lonhtmlcommon::row_title($html_lt{'secn'},undef,$css[$i]);
     if ($sectionlist) {
         $output .= "<select name=\"section\"\n>".
-                   "  <option value=\"\" selected=\"selected\">$lt{'sele'}</option>\n";
+                   "  <option value=\"\" selected=\"selected\">$html_lt{'sele'}</option>\n";
         foreach my $id (sort(keys(%groupid))) {
             if ($id eq $groupid{$id} || $groupid{$id} eq '') {
                 $output .= "  <option value=".
@@ -472,7 +488,7 @@ ENDJS
             } else {
                 $output .= "  <option value=".
                            &HTML::Entities::encode($id,'"<>&').
-                           " >$id - ($lt{'lsec'}: $groupid{$id})</option>\n";
+                           " >$id - ($html_lt{'lsec'}: $groupid{$id})</option>\n";
             }
         }
         $output .= "</select>";
@@ -482,48 +498,55 @@ ENDJS
     $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".
+    $output .= &Apache::lonhtmlcommon::row_title(
+                   '<span title="'.&mt('required').'">'.
+                   $html_lt{'subj'}.' <span class="LC_info">*</span></span>'
+                  ,undef,'LC_oddrow_value').
+               '<input type="text" size="40" name="subject" />'."\n".
                &Apache::lonhtmlcommon::row_closure().
-               &Apache::lonhtmlcommon::row_title($lt{'detd'},undef,'LC_evenrow_value').
-               '  <textarea rows="10" cols="45" name="description" style="word-wrap:normal;">'.
+               &Apache::lonhtmlcommon::row_title(
+                   '<span title="'.&mt('required').'">'.
+                   $html_lt{'detd'}.' <span class="LC_info">*</span></span>'
+                  ,undef,'LC_evenrow_value').
+               '<textarea rows="10" cols="45" name="description" style="word-wrap:normal;">'.
                '</textarea>'."\n".
                &Apache::lonhtmlcommon::row_closure();
     $num ++;
     $i = $num%2; 
-    if (($env{'user.name'} =~ /^$match_username$/) && (!$public)) {
+    if ($knownuser) {
         if ($homeserver) {
-            $output .= &Apache::lonhtmlcommon::row_title($lt{'opfi'},undef,$css[$i]).
-                       ' <input type="file" name="screenshot" size="20" /><br />'.
-                       "\n".$lt{'uplf'}."\n".
-                       &Apache::lonhtmlcommon::row_closure();
+            $output .= &Apache::lonhtmlcommon::row_title($html_lt{'opfi'},undef,$css[$i])
+                .' <input type="file" name="screenshot" class="flUpload" size="20" />'
+                .'<input type="hidden" id="free_space" value="1048576" />'
+                .'<br />'."\n".$html_lt{'uplf'}."\n"
+                .&Apache::lonhtmlcommon::row_closure();
             $num ++;
             $i = $num%2;
         }
     } else {
-        my $lonhost = $r->dir_config('lonHostID');
-        my ($captchaform,$error) = 
-            &Apache::loncommon::captcha_display('login',$lonhost);
-        if ($captchaform) {
-            $output .= &Apache::lonhtmlcommon::row_title(&mt('Validation'),undef,
-                                                         $css[$i])."\n".
-                       $captchaform."\n".
+        if ($captcha_form) {
+            $output .= &Apache::lonhtmlcommon::row_title(
+                           '<span title="'.&mt('required').'">'.
+                           &mt('Validation').
+                           ' <span class="LC_info">*</span></span>'
+                      ,undef,$css[$i]).
+                       $captcha_form."\n".
                        &Apache::lonhtmlcommon::row_closure();
             $num ++;
             $i = $num%2;
         }
     }
-    $output .= &Apache::lonhtmlcommon::row_title($lt{'fini'},undef,$css[$i]);
+    $output .= &Apache::lonhtmlcommon::row_title($html_lt{'fini'},undef,$css[$i]);
     $output .= <<END;
              <table border="0" cellpadding="8" cellspacing="0">
               <tr>
                <td>
                 <input type="hidden" name="command" value="process" />
-                <input type="button" value="$lt{'subm'}" onclick="validate()" /> &nbsp;
+                <input type="button" value="$html_lt{'subm'}" onclick="validate()" /> &nbsp;
                </td>
                <td>&nbsp;</td>
                <td>
-                <input type="reset" value="$lt{'clfm'}" />
+                <input type="reset" value="$html_lt{'clfm'}" />
                </td>
               </tr>
              </table>
@@ -827,8 +850,9 @@ END
     if ((defined($env{'user.name'})) && (!$public)) {
         if ($homeserver && $env{'form.screenshot.filename'}) {
             $attachmentsize = length($env{'form.screenshot'});
-            if ($attachmentsize > 131072) {
-                $displaymsg .= '<br />'.&mt('The uploaded screenshot file ([_1] bytes) included with your request exceeded the maximum allowed size - 128 KB, and has therefore been discarded.',$attachmentsize);
+            if ($attachmentsize > 1048576) {
+                $displaymsg .= '<br /><span class="LC_warning">'.
+                               &mt('The uploaded screenshot file ([_1] bytes) included with your request exceeded the maximum allowed size - 1 MB, and has therefore been discarded.',$attachmentsize).'</span>';
             } else {
                 $attachmentpath=&Apache::lonnet::userfileupload('screenshot',undef,'helprequests');
             }
@@ -861,33 +885,15 @@ END
         }
     }
  
-    my $msg = MIME::Lite->new(
-                 From    => $from,
-                 To      => $to,
-                 Subject => $subject,
-                 Type    =>'TEXT',
-                 Data    => $supportmsg,
-                 );
+    my $cc_string;
     if ($homeserver) {
         if (@ok_ccs > 0) {
-            my $cc_string = join(', ',@ok_ccs);
-            $msg->add("Cc" => $cc_string);
+            $cc_string = join(', ',@ok_ccs);
         }
     }
-    if ($bcc ne '') {
-        $msg->add("Bcc" => $bcc);
-    }
-    $msg->attr("content-type"         => "text/plain");
-    $msg->attr("content-type.charset" => "UTF-8");
-
-    if ($homeserver && $attachmentpath) {
-        my ($type, $encoding) = MIME::Types::by_suffix($attachmentpath);
-        $msg->attach(Type     => $type,
-                     Path     => $attachmentpath,
-                     Filename => $fname
-                     );
 
-    } else {
+    my $attachment_text;
+    unless ($homeserver && $attachmentpath) {
         my $envdata = '';
         foreach my $var (@cookievars) {
             $envdata .= "$var: $cookies{$var}\n";
@@ -901,12 +907,12 @@ END
         foreach my $var (@loncvars) {
             $envdata .= "$var: $env{$var}\n";
         }
-        $msg->attach(Type => 'TEXT',
-                     Data => $envdata);
+        $attachment_text = $envdata;
     }
-
-### Send it:
-    $msg->send('sendmail');
+    
+    # Compose and send a MIME email
+    &Apache::loncommon::mime_email($from, $to, $subject, $supportmsg, $cc_string, $bcc, 
+                                    $attachmentpath, $fname, $attachment_text);
 
     if ($attachmentpath =~ m|$Apache::lonnet::perlvar{'lonDaemons'}/tmp/helprequests/(\d+)/[^/]+|) {
         unlink($attachmentpath);