--- loncom/interface/lonsupportreq.pm	2017/10/13 19:59:11	1.92
+++ loncom/interface/lonsupportreq.pm	2019/07/23 13:58:53	1.96
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Helpdesk request form
 #
-# $Id: lonsupportreq.pm,v 1.92 2017/10/13 19:59:11 raeburn Exp $
+# $Id: lonsupportreq.pm,v 1.96 2019/07/23 13:58:53 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -67,7 +67,9 @@ sub handler {
         }
     }
     my $origurl = $env{'form.origurl'};
-    $origurl =~ s{^https?://}{};
+    if ($origurl =~ m{^https?://[^/]+(.*)$}) {
+        $origurl =~ $1;
+    }
     $origurl =~ s/(`)//g;
     $origurl =~ s/\$/\(\$\)/g;
     my $command = $env{'form.command'};
@@ -149,7 +151,6 @@ sub print_request_form {
         }
     }
 
-    my %coursecodes;
     my %codes;
     my @codetitles;
     my %cat_titles;
@@ -157,9 +158,7 @@ sub print_request_form {
     my %idlist;
     my %idnums;
     my %idlist_titles;
-    my $caller = 'global';
     my $totcodes = 0;
-    my $format_reply;
     my $jscript = '';
     my $loaditems = qq|
 function initialize_codes() {
@@ -167,10 +166,17 @@ function initialize_codes() {
 }
     |;
     unless ($helpform{'course'} eq 'no') {
-        $totcodes = &Apache::courseclassifier::retrieve_instcodes(\%coursecodes,$codedom);
-        if ($totcodes > 0) {
-            $format_reply = &Apache::lonnet::auto_instcode_format($caller,$codedom,\%coursecodes,\%codes,\@codetitles,\%cat_titles,\%cat_order);
-            if ($format_reply eq 'ok') {
+        my $instcats = &Apache::lonnet::get_dom_instcats($codedom);
+        if (ref($instcats) eq 'HASH') {
+            if ((ref($instcats->{'codetitles'}) eq 'ARRAY') && (ref($instcats->{'codes'}) eq 'HASH') &&
+                (ref($instcats->{'cat_titles'}) eq 'HASH') && (ref($instcats->{'cat_order'}) eq 'HASH')) {
+                %codes = %{$instcats->{'codes'}};
+                @codetitles = @{$instcats->{'codetitles'}};
+                %cat_titles = %{$instcats->{'cat_titles'}};
+                %cat_order = %{$instcats->{'cat_order'}};
+                $totcodes = scalar(keys(%codes));
+            }
+            if ($totcodes > 0) {
                 my $numtypes = @codetitles;
                 &Apache::courseclassifier::build_code_selections(\%codes,\@codetitles,\%cat_titles,\%cat_order,\%idlist,\%idnums,\%idlist_titles);
                 my ($scripttext,$longtitles) = &Apache::courseclassifier::javascript_definitions(\@codetitles,\%idlist,\%idlist_titles,\%idnums,\%cat_titles);
@@ -393,7 +399,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";
@@ -430,12 +436,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') {
@@ -447,7 +455,7 @@ 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;
@@ -522,7 +530,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,9 +675,6 @@ sub print_request_receipt {
     my $admin = $Apache::lonnet::perlvar{'lonAdminMail'};
     my $origmail = $Apache::lonnet::perlvar{'lonSupportEMail'};
     my $defdom = &get_domain();
-    my ($to,$bcc,$addtext) =
-        &Apache::loncommon::build_recipient_list(undef,'helpdeskmail',
-                                                 $defdom,$origmail);
     my $from = $admin;
     my %helpform;
     my %domconfig =
@@ -696,10 +701,10 @@ 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') {
@@ -708,13 +713,17 @@ sub print_request_receipt {
     unless ($helpform{'screenshot'} eq 'no') {
         $formvars{'screenshot'} = 1;
     }
-    my $coursecode;
+    my ($coursecode,$sourceurl);
     if ($formvars{'course'}) {
         $coursecode = $env{'form.coursecode'};
         if ($coursecode eq '') {
             my $totcodes = 0;
-            my %coursecodes;
-            $totcodes = &Apache::courseclassifier::retrieve_instcodes(\%coursecodes,$defdom);
+            my $instcats = &Apache::lonnet::get_dom_instcats($defdom);
+            if (ref($instcats) eq 'HASH') {
+                if (ref($instcats->{'codes'}) eq 'HASH') {
+                    $totcodes = scalar(keys(%{$instcats->{'codes'}}));
+                }
+            }
             my @standardnames = &Apache::loncommon::get_standard_codeitems();
             if ($totcodes > 0) {
                 my $noregexps = 1;
@@ -802,7 +811,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 '') {
@@ -841,7 +858,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
 ";
 
@@ -875,6 +892,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 .= 
@@ -883,6 +901,33 @@ $lt{'date'}: $reporttime
             }
         }
     }
+
+    my ($requname,$requdom,$reqemail);
+    foreach my $field ('uname','udom','email') {
+        $env{'form.'.$field} =~ s/^\s+//;
+        $env{'form.'.$field} =~ s/\s+$//;
+    }
+    if ($env{'form.uname'} =~ /^$match_username$/) {
+        $requname = $env{'form.uname'};
+    }
+    if ($env{'form.udom'} =~ /^$match_domain$/) {
+        $requdom = $env{'form.udom'};
+    }
+    if ($env{'form.email'} =~ m/^[^\@]+\@[^\@]+$/) {
+        $reqemail = $env{'form.email'};
+    }
+
+    my $dom_in_effect;
+    unless ($env{'user.domain'} eq 'public') {
+        $dom_in_effect = $env{'user.domain'};
+    }
+    if ($dom_in_effect eq '') {
+        $dom_in_effect = $requdom;
+    }
+    if ($dom_in_effect eq '') {
+        $dom_in_effect = $defdom;
+    }
+
     $displaymsg .= '<span class="LC_helpform_receipt_cat">'.
                    $lt{'date'}.'</span>: '.$reporttime.'<br />'."\n";
 
@@ -905,6 +950,11 @@ END
         &print_header($r,$url,'process');
     }
     my $bad_email = 0;
+    my ($to,$bcc,$addtext) =
+        &Apache::loncommon::build_recipient_list(undef,'helpdeskmail',
+                                                 $dom_in_effect,$origmail,
+                                                 $requname,$requdom,
+                                                 $reqemail);
     if ($to =~ /,/) {
         my @ok_email; 
         foreach my $email (split(/,/,$to)) {
@@ -942,12 +992,8 @@ END
     }
     $r->print(&Apache::loncommon::confirmwrapper($message));
 
-    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 ($reqemail ne '') {
+        $from = $reqemail;
     }
 
     if (defined($env{'form.cc'})) {
@@ -999,6 +1045,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 />'
@@ -1016,6 +1074,9 @@ END
         foreach my $var (@envvars) {
             $supportmsg .= "$var: $env{$var}\n";
         }
+        if ($lti_info) {
+            $supportmsg .= $lti_info;
+        }
     }
 
     my $cc_string;
@@ -1039,6 +1100,9 @@ END
         foreach my $var (@loncvars) {
             $attachment_text .= "$var: $env{$var}\n";
         }
+        if ($lti_info) {
+            $attachment_text .= $lti_info;
+        }
     }
 
     if ($addtext) {