--- loncom/interface/lonsupportreq.pm	2024/07/15 17:13:06	1.79.2.12
+++ loncom/interface/lonsupportreq.pm	2022/01/01 19:53:45	1.103
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Helpdesk request form
 #
-# $Id: lonsupportreq.pm,v 1.79.2.12 2024/07/15 17:13:06 raeburn Exp $
+# $Id: lonsupportreq.pm,v 1.103 2022/01/01 19:53:45 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -29,8 +29,6 @@
 package Apache::lonsupportreq;
 
 use strict;
-use MIME::Types;
-use MIME::Lite;
 use CGI::Cookie();
 use Apache::Constants qw(:common);
 use Apache::loncommon();
@@ -393,11 +391,7 @@ ENDJS
     $i = $num%2;
     if ($knownuser) {
         if ($homeserver) {
-            my $ip = &Apache::lonnet::get_requestor_ip($r);
-            my %setters;
-            my ($startblock,$endblock,$triggerblock,$by_ip,$blockdom) =
-                &Apache::loncommon::blockcheck(\%setters,'com',$ip);
-            unless (($helpform{'cc'} eq 'no') || ($by_ip)) {
+            unless ($helpform{'cc'} eq 'no') {
                 $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();
@@ -406,7 +400,7 @@ ENDJS
             }
         }
     }
-    unless ($helpform{'user'} eq 'no') {
+    unless (($helpform{'user'} eq 'no') || ($env{'request.lti.login'})) {
         $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";
@@ -443,12 +437,14 @@ ENDJS
         }
         $output .= &Apache::lonhtmlcommon::row_closure();
         $num ++;
+        $i = $num%2;
+    }
+    unless ($env{'request.lti.login'}) {
+        $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();
     }
-    $i = $num%2;
-    $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();
     unless ($helpform{'phone'} eq 'no') {
         my $reqd;
         if ($helpform{'phone'} eq 'req') {
@@ -460,13 +456,13 @@ ENDJS
         $num ++;
         $i = $num%2;
     }
-    unless ($helpform{'course'} eq 'no') {
+    unless (($helpform{'course'} eq 'no') || ($env{'request.lti.login'})) {
         $output .= &Apache::lonhtmlcommon::row_title("$html_lt{'crsd'}$details_title",undef,$css[$i]);
         if ($totcodes > 0) {
             my $numtitles = @codetitles;
             if ($numtitles == 0) {
                 $output .= $html_lt{'enin'}.':&nbsp;
-                  <input type="text" name="coursecode" size="15" value="'.&HTML::Entities::encode($ccode,'\'"&<>').'" />'."\n";
+                  <input type="text" name="coursecode" size="15" value="" />'."\n";
             } else {
                 my @standardnames = &Apache::loncommon::get_standard_codeitems();
                 my $lasttitle = $numtitles;
@@ -535,7 +531,7 @@ ENDJS
         $num ++;
         $i = $num%2;
     }
-    unless ($helpform{'section'} eq 'no') {
+    unless (($helpform{'section'} eq 'no') || ($env{'request.lti.login'})) {
         $output .= &Apache::lonhtmlcommon::row_title($html_lt{'secn'},undef,$css[$i]);
         if ($sectionlist) {
             $output .= "<div id=\"LC_helpdesk_sectionlist\"><select name=\"sectionsel\">\n".
@@ -667,10 +663,7 @@ sub print_request_receipt {
             return;
         }
     }
-    my $ip = &Apache::lonnet::get_requestor_ip($r);
-    my %setters;
-    my ($startblock,$endblock,$triggerblock,$by_ip,$blockdom) =
-        &Apache::loncommon::blockcheck(\%setters,'com',$ip);
+    my $ip = &Apache::lonnet::get_requestor_ip();
     my @ENVvars = ('HTTP_HOST','HTTP_USER_AGENT','SERVER_ADDR','SERVER_NAME');
     my @envvars = ('browser.os','browser.type','browser.version','user.home','request.role');
     my @loncvars = ('user.name','user.domain','request.course.sec','request.course.id');
@@ -710,19 +703,19 @@ sub print_request_receipt {
     unless ($helpform{'phone'} eq 'no') {
         $formvars{'phone'} = 1;
     }
-    unless ($helpform{'section'} eq 'no') {
+    unless (($helpform{'section'} eq 'no') || ($env{'request.lti.login'})) {
         $formvars{'section'} = 1;
     }
-    unless ($helpform{'course'} eq 'no') {
+    unless (($helpform{'course'} eq 'no') || ($env{'request.lti.login'})) {
         $formvars{'course'} = 1;
     }
-    unless (($helpform{'cc'} eq 'no') || ($by_ip)) {
+    unless ($helpform{'cc'} eq 'no') {
         $formvars{'cc'} = 1;
     }
     unless ($helpform{'screenshot'} eq 'no') {
         $formvars{'screenshot'} = 1;
     }
-    my $coursecode;
+    my ($coursecode,$sourceurl);
     if ($formvars{'course'}) {
         $coursecode = $env{'form.coursecode'};
         if ($coursecode eq '') {
@@ -762,8 +755,6 @@ sub print_request_receipt {
                  secn        => 'Section',
                  warn        => 'Warning: Problem with support e-mail address',
                  your        => 'Your support request contained the following information',
-                 belo        => 'Below is your support request which could not be sent',
-                 ifyk        => 'If you know an IT support address for your institution, you could copy this information and send it to that email address.',
                  sect        => 'section',
                  info        => 'Information supplied',
                  adin        => 'Additional information recorded',
@@ -822,7 +813,15 @@ sub print_request_receipt {
             $badccmsg .= '<br />'.&mt('The following Cc e-mail addresses are invalid: '). &Apache::loncommon::cleanup_html(join(', ',@bad_ccs));
         }
     }
-    $env{'form.user'} = "'".$env{'form.uname'}.':'.$env{'form.udom'}."'";
+    if ($env{'request.lti.login'}) {
+        if (($env{'user.name'} ne '') && ($env{'user.domain'} ne '')) {
+            $env{'form.user'} = "'".$env{'user.name'}.':'.$env{'user.domain'}."'";
+        }
+        $sourceurl = &Apache::lonnet::absolute_url().$url;
+    } else {
+        $env{'form.user'} = "'".$env{'form.uname'}.':'.$env{'form.udom'}."'";
+        $sourceurl = $env{'form.sourceurl'};
+    }
     if ($formvars{'course'}) {
         $env{'form.crsi'} = $env{'form.title'};
         if ($coursecode ne '') {
@@ -861,7 +860,7 @@ sub print_request_receipt {
     }
     $supportmsg .= "$lt{'subject'}: $env{'form.subject'}
 $lt{'description'}: $env{'form.description'}
-$lt{'sourceurl'}: $env{'form.sourceurl'}
+$lt{'sourceurl'}: $sourceurl
 $lt{'date'}: $reporttime
 ";
 
@@ -895,6 +894,7 @@ $lt{'date'}: $reporttime
                     next if ($helpform{$item} eq 'no');
                 }
                 next if (($item eq 'crsi') && ($helpform{'course'} eq 'no'));
+                next if (($item eq 'user') && ($env{'request.lti.login'}));
                 my $showitem = $env{'form.'.$item};
                 $showitem = &Apache::loncommon::cleanup_html($showitem);
                 $displaymsg .= 
@@ -983,16 +983,16 @@ END
 
     my $message;
     if (!$bad_email) {
-        $message = &mt('A support request has been sent to [_1]','<tt>'.$to.'</tt>');
+        $message = &Apache::lonhtmlcommon::confirm_success(
+            &mt('A support request has been sent to [_1]','<tt>'.$to.'</tt>'));
     } else {
-        $message = $lt{'warn'}.'<br />';
-        if ($to eq '') {
-            $message .= &mt('For this LON-CAPA server no e-mail address has been configured to receive support requests, so your support request has [_1]not[_2] been sent to the LON-CAPA support staff or administrator at your institution.','<b>','</b>');
-        } else {
-            $message .= &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>');
-        }
+        $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(&Apache::lonhtmlcommon::confirm_success($message,$bad_email)));
+    $r->print(&Apache::loncommon::confirmwrapper($message));
 
     if ($reqemail ne '') {
         $from = $reqemail;
@@ -1047,6 +1047,18 @@ END
     if ($$cookie{'lonLinkID'} =~ /lonLinkID=([a-f0-9]+_linked);/) {
         $cookies{'lonLinkID'} = $1;
     }
+    my $lti_info;
+    if (($env{'request.lti.login'}) && ($env{'request.course.id'})) {
+        my $ltidom = $env{'course.'.$env{'request.course.id'}.'.domain'};
+        if ($ltidom) {
+            my %lti = &Apache::lonnet::get_domain_lti($ltidom,'provider');
+            if (ref($lti{$env{'request.lti.login'}}) eq 'HASH') {
+                if ($lti{$env{'request.lti.login'}}{'consumer'}) {
+                    $lti_info = "LTI consumer: ".$lti{$env{'request.lti.login'}}{'consumer'}."\n";
+                }
+            }
+        }
+    }
     if ($attachmentpath =~ m-/([^/]+)$-) {
         $fname = $1;
         $displaymsg .= '<br />'
@@ -1065,6 +1077,9 @@ END
         foreach my $var (@envvars) {
             $supportmsg .= "$var: $env{$var}\n";
         }
+        if ($lti_info) {
+            $supportmsg .= $lti_info;
+        }
     }
 
     my $cc_string;
@@ -1089,6 +1104,9 @@ END
         foreach my $var (@loncvars) {
             $attachment_text .= "$var: $env{$var}\n";
         }
+        if ($lti_info) {
+            $attachment_text .= $lti_info;
+        }
     }
 
     if ($addtext) {
@@ -1101,51 +1119,14 @@ END
         }
     }
 
-    unless ($bad_email) {
-        my $msg = MIME::Lite->new(
-                     From    => $from,
-                     To      => $to,
-                     Subject => $subject,
-                     Type    =>'TEXT',
-                     Data    => $supportmsg,
-                     );
-        if ($homeserver) {
-            if (@ok_ccs > 0) {
-                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 ($homeserver && $attachmentpath) {
-            my ($type, $encoding) = MIME::Types::by_suffix($attachmentpath);
-            $msg->attach(Type     => $type,
-                         Path     => $attachmentpath,
-                         Filename => $fname
-                         );
-
-        } elsif ($attachment_text ne '') {
-            $msg->attach(Type => 'TEXT',
-                         Data => $attachment_text);
-        }
-
-        ### 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);
     }
-    if ($bad_email) {
-        $r->print('<b>'.$lt{'belo'}.'</b><br />'.
-                  $lt{'ifyk'}.'<br /><br />'."\n");
-    } else {
-        $r->print('<b>'.$lt{'your'}.'</b>:<br /><br />'."\n");
-    }
+    $r->print('<b>'.$lt{'your'}.'</b>:<br /><br />'."\n");
     $r->print('<div style="width:620px;">'.
               &Apache::lonhtmlcommon::start_pick_box().
               &Apache::lonhtmlcommon::row_title($lt{'info'},undef,'LC_oddrow_value')."\n".$displaymsg."\n".