--- loncom/interface/lonsupportreq.pm	2019/07/26 18:03:59	1.79.2.4
+++ loncom/interface/lonsupportreq.pm	2022/01/19 13:57:19	1.79.2.10
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Helpdesk request form
 #
-# $Id: lonsupportreq.pm,v 1.79.2.4 2019/07/26 18:03:59 raeburn Exp $
+# $Id: lonsupportreq.pm,v 1.79.2.10 2022/01/19 13:57:19 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -70,7 +70,7 @@ sub handler {
     }
     my $origurl = $env{'form.origurl'};
     if ($origurl =~ m{^https?://[^/]+(.*)$}) {
-        $origurl =~ $1;
+        $origurl = $1;
     }
     $origurl =~ s/(`)//g;
     $origurl =~ s/\$/\(\$\)/g;
@@ -322,7 +322,9 @@ $loaditems
 // ]]>
 </script>
 ENDJS
-    if ($recaptcha_version >=2) {
+    if ($knownuser) {
+        $js .="\n".'<script type="text/javascript" src="/res/adm/includes/file_upload.js"></script>';
+    } elsif ($recaptcha_version >=2) {
         $js.= "\n".'<script src="https://www.google.com/recaptcha/api.js"></script>'."\n";
     }
     my %add_entries = (
@@ -391,7 +393,11 @@ ENDJS
     $i = $num%2;
     if ($knownuser) {
         if ($homeserver) {
-            unless ($helpform{'cc'} eq 'no') {
+            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)) {
                 $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();
@@ -580,10 +586,11 @@ ENDJS
                     $showmax = $helpform{'maxsize'};
                 }
                 $showmax = ' ('.sprintf("%.2f",$showmax).' '.&mt('MB max.').')';
-                $output .= &Apache::lonhtmlcommon::row_title($html_lt{'opfi'},undef,$css[$i]).
-                       ' <input type="file" name="screenshot" size="20" /><br />'.
-                       "\n".$html_lt{'uplf'}.$showmax."\n".
-                       &Apache::lonhtmlcommon::row_closure();
+                $output .= &Apache::lonhtmlcommon::row_title($html_lt{'opfi'},undef,$css[$i])
+                    .' <input type="file" name="screenshot" class="LC_flUpload" size="20" />'
+                    .'<input type="hidden" id="LC_free_space" value="'.$max.'" />'
+                    .'<br />'."\n".$html_lt{'uplf'}.$showmax."\n"
+                    .&Apache::lonhtmlcommon::row_closure();
                 $num ++;
                 $i = $num%2;
             }
@@ -660,17 +667,23 @@ sub print_request_receipt {
             return;
         }
     }
-    my @ENVvars = ('HTTP_HOST','HTTP_USER_AGENT','REMOTE_ADDR','SERVER_ADDR','SERVER_NAME');
+    my $ip = &Apache::lonnet::get_requestor_ip($r);
+    my %setters;
+    my ($startblock,$endblock,$triggerblock,$by_ip,$blockdom) =
+        &Apache::loncommon::blockcheck(\%setters,'com',$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');
-    my @cookievars = ('lonID');
+    my @cookievars;
+    if ($ENV{'SERVER_PORT'} == 443) {
+        @cookievars = ('lonLinkID');
+    } else {
+        @cookievars = ('lonID');
+    }
 
     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 =
@@ -703,7 +716,7 @@ sub print_request_receipt {
     unless ($helpform{'course'} eq 'no') {
         $formvars{'course'} = 1;
     }
-    unless ($helpform{'cc'} eq 'no') {
+    unless (($helpform{'cc'} eq 'no') || ($by_ip)) {
         $formvars{'cc'} = 1;
     }
     unless ($helpform{'screenshot'} eq 'no') {
@@ -888,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";
 
@@ -910,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)) {
@@ -947,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'})) {
@@ -1001,7 +1042,9 @@ END
     if ($$cookie{'lonID'} =~ /lonID=($LONCAPA::handle_re);/) {
         $cookies{'lonID'} = $1;
     }
-
+    if ($$cookie{'lonLinkID'} =~ /lonLinkID=([a-f0-9]+_linked);/) {
+        $cookies{'lonLinkID'} = $1;
+    }
     if ($attachmentpath =~ m-/([^/]+)$-) {
         $fname = $1;
         $displaymsg .= '<br />'
@@ -1016,6 +1059,7 @@ END
         foreach my $var(@ENVvars) {
             $supportmsg .= "$var: $ENV{$var}\n";
         }
+        $supportmsg .= "REMOTE_ADDR: $ip\n";
         foreach my $var (@envvars) {
             $supportmsg .= "$var: $env{$var}\n";
         }
@@ -1036,6 +1080,7 @@ END
         foreach my $var (@ENVvars) {
             $attachment_text .= "$var: $ENV{$var}\n";
         }
+        $attachment_text .= "REMOTE_ADDR: $ip\n";
         foreach my $var (@envvars) {
             $attachment_text .= "$var: $env{$var}\n";
         }
@@ -1110,6 +1155,10 @@ END
                        $var.'</span>:&nbsp;'.$ENV{$var}.', ';
         }
     }
+    if ($ip ne '') {
+        $envmsg .= '<span class="LC_helpform_receipt_cat">'.
+                   'REMOTE_ADDR</span>:&nbsp;'.$ip.', ';
+    }
     foreach my $var (@envvars) {
         if ($env{$var} ne '') { 
             $envmsg .= '<span class="LC_helpform_receipt_cat">'.