[LON-CAPA-cvs] cvs: loncom(version_2_11_X) /interface lonsupportreq.pm

[raeburn]

raeburn		Sat Aug  3 23:40:16 2019 EDT

  Modified files:              (Branch: version_2_11_X)
    /loncom/interface	lonsupportreq.pm 
  Log:
  - For 2.11
    Backport 1.91
  
  
Index: loncom/interface/lonsupportreq.pm
diff -u loncom/interface/lonsupportreq.pm:1.79.2.4 loncom/interface/lonsupportreq.pm:1.79.2.5
--- loncom/interface/lonsupportreq.pm:1.79.2.4	Fri Jul 26 18:03:59 2019
+++ loncom/interface/lonsupportreq.pm	Sat Aug  3 23:40:16 2019
@@ -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.5 2019/08/03 23:40:16 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -663,7 +663,12 @@
     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'};
@@ -1001,7 +1006,9 @@
     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 />'