--- loncom/lontrans.pm 2022/01/02 20:43:50 1.14.10.2.2.1 +++ loncom/lontrans.pm 2023/07/05 19:22:09 1.14.10.2.2.4 @@ -1,7 +1,7 @@ # The LearningOnline Network # URL translation for User Files # -# $Id: lontrans.pm,v 1.14.10.2.2.1 2022/01/02 20:43:50 raeburn Exp $ +# $Id: lontrans.pm,v 1.14.10.2.2.4 2023/07/05 19:22:09 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -30,15 +30,19 @@ package Apache::lontrans; use strict; use Apache::Constants qw(:common :remotehost); -use Apache::lonnet(); +use Apache::lonnet; use Apache::loncommon; use Apache::File(); use LONCAPA qw(:DEFAULT :match); sub handler { my $r = shift; - # FIXME line remove when mod_perl fixes BUG#4948 + # FIXME line remove when mod_perl fixes BUG#4948 $r->notes->set('error-notes' => ''); + if (($r->uri eq '/adm/service/passback') || + ($r->uri eq '/adm/service/roster')) { + return OK; + } my $alias = &Apache::lonnet::get_proxy_alias(); if ($alias) { my $hdrhost = $r->headers_in->get('Host'); @@ -214,8 +218,13 @@ sub set_token { my %link_info = &Apache::lonnet::tmpget($info{'ltoken'}); if ($link_info{'linkprot'}) { $info{'linkprot'} = $link_info{'linkprot'}; + foreach my $item ('linkprotuser','linkprotexit','linkprotpbid','linkprotpburl') { + if ($link_info{$item} ne '') { + $info{$item} = $link_info{$item}; + } + } } - &Apache::lonnet::tmpdel($info{'ltoken'});; + &Apache::lonnet::tmpdel($info{'ltoken'}); delete($info{'ltoken'}); } unless ($info{'role'}) {