--- loncom/interface/lonsupportreq.pm	2017/01/23 18:30:30	1.88
+++ loncom/interface/lonsupportreq.pm	2017/10/13 19:59:11	1.92
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Helpdesk request form
 #
-# $Id: lonsupportreq.pm,v 1.88 2017/01/23 18:30:30 raeburn Exp $
+# $Id: lonsupportreq.pm,v 1.92 2017/10/13 19:59:11 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -79,7 +79,7 @@ sub handler {
     }
     return OK;
 }
-   
+
 sub print_request_form {
     my ($r,$origurl,$function) = @_;
     my ($os,$browser,$bversion,$uname,$udom,$uhome,$urole,$usec,$email,$cid,
@@ -105,7 +105,7 @@ sub print_request_form {
             }
         }
     }
-    if (($env{'user.name'} =~ /^$match_username$/) && 
+    if (($env{'user.name'} =~ /^$match_username$/) &&
         ($env{'user.domain'} =~ /^$match_domain$/) && (!$public)) {
         $knownuser = 1;
     } else {
@@ -350,7 +350,7 @@ ENDJS
     unless ($helpform{'username'} eq 'no') {
         my ($reqd,$namefield,$fullname);
         if ((defined($lastname) && $lastname ne '') && (defined($firstname) && $firstname ne '')) {
-            $fullname = "$firstname $lastname"; 
+            $fullname = "$firstname $lastname";
             $namefield = $fullname.'<input type="hidden" name="username" value="'.&HTML::Entities::encode($fullname,'"<>&').'" />'."\n";
         } else {
             if (defined($firstname) && $firstname ne '') {
@@ -378,7 +378,7 @@ ENDJS
                &HTML::Entities::encode($email,'"<>&').'" />'."\n";
     unless ($shownsubmit) {
         $output .= $topsubmit;
-    } 
+    }
     $output .= &Apache::lonhtmlcommon::row_closure();
     $num ++;
     $i = $num%2;
@@ -541,7 +541,7 @@ ENDJS
             $output .= '</select></div>'."\n".
                        '<div id="LC_helpdesk_section" style="display:none">'.
                        '<input type="text" name="sectiontxt" size="10" /></div>'."\n";
-        } else { 
+        } else {
             $output .= '<input type="text" name="section" size="10" />'."\n";
         }
         $output .= &Apache::lonhtmlcommon::row_closure();
@@ -569,7 +569,7 @@ ENDJS
                 my $max = 1048576;
                 my $showmax = 1.00;
                 if ($helpform{'maxsize'} =~ /^\d+\.\d*$/) {
-                    $max *= $helpform{'maxsize'}; 
+                    $max *= $helpform{'maxsize'};
                     $showmax = $helpform{'maxsize'};
                 }
                 $showmax = ' ('.sprintf("%.2f",$showmax).' '.&mt('MB max.').')';
@@ -627,7 +627,7 @@ sub print_request_receipt {
     if (($env{'user.name'} eq 'public') && ($env{'user.domain'} eq 'public')) {
         $public = 1;
     }
-    my $lonhost = $r->dir_config('lonHostID'); 
+    my $lonhost = $r->dir_config('lonHostID');
     unless (($env{'user.name'} =~ /^$match_username$/) && (!$public)) {
         my ($captcha_chk,$captcha_error) = 
             &Apache::loncommon::captcha_response('login',$lonhost);
@@ -657,7 +657,12 @@ sub print_request_receipt {
     my @ENVvars = ('HTTP_HOST','HTTP_USER_AGENT','REMOTE_ADDR','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'};
@@ -833,7 +838,7 @@ sub print_request_receipt {
     }
     if ($formvars{'course'}) {
         $supportmsg .= "$lt{'crsi'}: $env{'form.crsi'}\n";
-    } 
+    }
     $supportmsg .= "$lt{'subject'}: $env{'form.subject'}
 $lt{'description'}: $env{'form.description'}
 $lt{'sourceurl'}: $env{'form.sourceurl'}
@@ -962,7 +967,7 @@ END
 
     my $attachmentpath = '';
     my $showsize = '';
-    
+
     if ((defined($env{'user.name'})) && (!$public)) {
         if ($homeserver && $env{'form.screenshot.filename'}) {
             unless ($helpform{'screenshot'} eq 'no') {
@@ -973,7 +978,7 @@ END
                     $max *= $helpform{'maxsize'};
                     $showmax = $helpform{'maxsize'};
                 }
-                $showmax = '('.sprintf("%.2f",$showmax).' MB)'; 
+                $showmax = '('.sprintf("%.2f",$showmax).' MB)';
                 $showsize = $attachmentsize/1048576;
                 $showsize = '('.sprintf("%.2f",$showsize).' MB)';
                 if ($attachmentsize > $max) {
@@ -991,7 +996,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 />'
@@ -1010,7 +1017,7 @@ END
             $supportmsg .= "$var: $env{$var}\n";
         }
     }
- 
+
     my $cc_string;
     if ($homeserver) {
         if (@ok_ccs > 0) {
@@ -1018,22 +1025,20 @@ END
         }
     }
 
-    my $attachment_text;
+    my $attachment_text = '';
     unless ($homeserver && $attachmentpath) {
-        my $envdata = '';
         foreach my $var (@cookievars) {
-            $envdata .= "$var: $cookies{$var}\n";
+            $attachment_text .= "$var: $cookies{$var}\n";
         }
         foreach my $var (@ENVvars) {
-            $envdata .= "$var: $ENV{$var}\n";
+            $attachment_text .= "$var: $ENV{$var}\n";
         }
         foreach my $var (@envvars) {
-            $envdata .= "$var: $env{$var}\n";
+            $attachment_text .= "$var: $env{$var}\n";
         }
         foreach my $var (@loncvars) {
-            $envdata .= "$var: $env{$var}\n";
+            $attachment_text .= "$var: $env{$var}\n";
         }
-        $attachment_text = $envdata;
     }
 
     if ($addtext) {
<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML 2.0//EN">
<html><head>
<title>500 Internal Server Error</title>
</head><body>
<h1>Internal Server Error</h1>
<p>The server encountered an internal error or
misconfiguration and was unable to complete
your request.</p>
<p>Please contact the server administrator at 
 root@localhost to inform them of the time this error occurred,
 and the actions you performed just before this error.</p>
<p>More information about this error may be available
in the server error log.</p>
</body></html>