--- loncom/lontrans.pm 2017/11/30 15:14:58 1.17 +++ loncom/lontrans.pm 2019/01/20 02:42:35 1.25 @@ -1,7 +1,7 @@ # The LearningOnline Network # URL translation for User Files # -# $Id: lontrans.pm,v 1.17 2017/11/30 15:14:58 raeburn Exp $ +# $Id: lontrans.pm,v 1.25 2019/01/20 02:42:35 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -30,42 +30,15 @@ package Apache::lontrans; use strict; use Apache::Constants qw(:common :remotehost REDIRECT); -use Apache::lonnet(); +use Apache::lonnet; 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 =~ m{^/adm/lti/(.+)$}) { - my $realuri = $1; - my %user; - my $handle = &Apache::lonnet::check_for_valid_session($r,undef,\%user); - if (($handle ne '') && ($user{'lti'})) { - if ($realuri =~ m{^uploaded/$match_domain/$match_courseid/(default|supplemental)(|_\d+)\.(?:sequence|page)___\d+___.+$}) { - my ($map,$resid,$url) = split(/___/,$realuri); - $realuri = &Apache::lonnet::clutter($url).'?symb='.$realuri; - } elsif ($realuri =~ m{($match_domain)/($match_courseid)$}) { - $realuri = '/adm/navmaps'; - } else { - $realuri = '/'.$realuri; - if ($realuri =~ m{/default_\d+\.sequence$}) { - $realuri .= (($realuri =~/\?/)?'&':'?').'navmap=1'; - } - } - my $host = $r->headers_in->get('Host'); - if ($host) { - my $protocol = 'http'; - if ($r->get_server_port == 443) { - $protocol = 'https'; - } - my $location = $protocol.'://'.$host.$realuri; - $r->headers_out->set(Location => $location); - return REDIRECT; - } - } - } elsif ($r->uri=~m{^/raw/}) { + if ($r->uri=~m{^/raw/}) { my $host = $r->headers_in->get('Host'); if ($host) { unless ($host =~ /^internal\-/) { @@ -93,7 +66,7 @@ sub handler { '/userfiles/'.(join('/',@ufile))); } return OK; - } else { + } else { return DECLINED; } } @@ -125,16 +98,16 @@ sub redirect_raw { my $remintdom = &Apache::lonnet::internet_dom($remprimary); if (ref($replication->{'certreq'}) eq 'ARRAY') { if (grep(/^\Q$remintdom\E$/,@{$replication->{'certreq'}})) { - $redirect = 1; - } else { $redirect = 0; + } else { + $redirect = 1; } } if (ref($replication->{'nocertreq'}) eq 'ARRAY') { if (grep(/^\Q$remintdom\E$/,@{$replication->{'nocertreq'}})) { - $redirect = 0; - } else { $redirect = 1; + } else { + $redirect = 0; } } } @@ -144,15 +117,9 @@ sub redirect_raw { last; } } - return $redirect; + return $redirect; } 1; __END__ - - - - - -