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

raeburn raeburn at source.lon-capa.org
Sun Jun 16 01:33:46 EDT 2019


raeburn		Sun Jun 16 05:33:46 2019 EDT

  Modified files:              
    /loncom/interface	lonsupportreq.pm 
  Log:
  - Remove protocol and hostname from origurl (where "Ask Helpdesk was called).
  - Actually set $requname (used to determine institutional status).
  
  
Index: loncom/interface/lonsupportreq.pm
diff -u loncom/interface/lonsupportreq.pm:1.93 loncom/interface/lonsupportreq.pm:1.94
--- loncom/interface/lonsupportreq.pm:1.93	Fri Oct 13 20:37:35 2017
+++ loncom/interface/lonsupportreq.pm	Sun Jun 16 05:33:45 2019
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Helpdesk request form
 #
-# $Id: lonsupportreq.pm,v 1.93 2017/10/13 20:37:35 raeburn Exp $
+# $Id: lonsupportreq.pm,v 1.94 2019/06/16 05:33:45 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -67,7 +67,9 @@
         }
     }
     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'};
@@ -887,7 +889,7 @@
         $env{'form.'.$field} =~ s/\s+$//;
     }
     if ($env{'form.uname'} =~ /^$match_username$/) {
-        $requdom = $env{'form.udom'};
+        $requname = $env{'form.uname'};
     }
     if ($env{'form.udom'} =~ /^$match_domain$/) {
         $requdom = $env{'form.udom'};




More information about the LON-CAPA-cvs mailing list