--- loncom/lontrans.pm	2016/07/25 19:49:45	1.15
+++ loncom/lontrans.pm	2018/04/17 14:02:56	1.21
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # URL translation for User Files
 #
-# $Id: lontrans.pm,v 1.15 2016/07/25 19:49:45 raeburn Exp $
+# $Id: lontrans.pm,v 1.21 2018/04/17 14:02:56 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -29,8 +29,8 @@
 package Apache::lontrans;
 
 use strict;
-use Apache::Constants qw(:common :remotehost REDIRECT);
-use Apache::lonnet();
+use Apache::Constants qw(:common :remotehost REDIRECT :http);
+use Apache::lonnet;
 use Apache::File();
 use LONCAPA qw(:DEFAULT :match);
 
@@ -38,19 +38,141 @@ sub handler {
     my $r = shift;
     # FIXME line remove when mod_perl fixes BUG#4948 
     $r->notes->set('error-notes' => '');
-    if ($r->uri=~m{^/raw/}) {
+    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+___.+$}) {
+                if ($user{'ltiuri'} ne $realuri) {
+                    &Apache::lonnet::appenv({'request.lti.uri' => $realuri});
+                }
+                my ($map,$resid,$url) = split(/___/,$realuri);
+                $realuri = &Apache::lonnet::clutter($url).'?symb='.$realuri;
+            } elsif ($realuri =~ m{^res/$match_domain/$match_username/.+\.(?:sequence|page)___\d+___.+$}) {
+                if ($user{'ltiuri'} ne $realuri) {
+                    &Apache::lonnet::appenv({'request.lti.uri' => $realuri});
+                }
+                my ($map,$resid,$url) = split(/___/,$realuri);
+                $realuri = &Apache::lonnet::clutter($url).'?symb='.$realuri;
+            } elsif ($realuri =~ m{^tiny/$match_domain/\w+$}) {
+                $realuri = '/'.$realuri;
+                if ($user{'ltiuri'} ne $realuri) {
+                    &Apache::lonnet::appenv({'request.lti.uri' => $realuri});
+                }
+            } elsif ($realuri =~ m{($match_domain)/($match_courseid)$}) {
+                $realuri = '/adm/navmaps';
+                if ($user{'ltiuri'} ne '') {
+                    &Apache::lonnet::delenv('request.lti.uri');
+                }
+            } else {
+                $realuri = '/'.$realuri;
+                if ($realuri =~ m{/default_\d+\.sequence$}) {
+                    if ($user{'ltiuri'} ne $realuri) {
+                        &Apache::lonnet::appenv({'request.lti.uri' => $realuri});
+                    }
+                    $realuri .= (($realuri =~/\?/)?'&':'?').'navmap=1';
+                } elsif ($realuri =~ m{^/res/.+\.sequence$}) {
+                    if ($user{'ltiuri'} ne $realuri) {
+                        &Apache::lonnet::appenv({'request.lti.uri' => $realuri});
+                    }
+                    $realuri .= (($realuri =~/\?/)?'&':'?').'navmap=1';
+                } elsif ($realuri =~ m{\.page$}) {
+                    if ($user{'ltiuri'} ne $realuri) {
+                        &Apache::lonnet::appenv({'request.lti.uri' => $realuri});
+                    }
+                }
+            }
+            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{^/+tiny/+($match_domain)/+(\w+)$}) {
+        my ($cdom,$key) = ($1,$2);
+        if (&Apache::lonnet::domain($cdom) ne '') {
+            my %user;
+            my $handle = &Apache::lonnet::check_for_valid_session($r,undef,\%user);
+            if ($handle ne '') {
+                my $lonidsdir=$r->dir_config('lonIDsDir');
+                &Apache::lonnet::transfer_profile_to_env($lonidsdir,$handle);
+                if ($env{'request.course.id'}) {
+                    my $tinyurl;
+                    my ($result,$cached)=&Apache::lonnet::is_cached_new('tiny',$cdom."\0".$key);
+                    if (defined($cached)) {
+                        $tinyurl = $result;
+                    } else {
+                        my $configuname = &Apache::lonnet::get_domainconfiguser($cdom);
+                        my %currtiny = &Apache::lonnet::get('tiny',[$key],$cdom,$configuname);
+                        if ($currtiny{$key} ne '') {
+                            $tinyurl = $currtiny{$key};
+                            &Apache::lonnet::do_cache_new('tiny',$cdom."\0".$key,$currtiny{$key},600);
+                        }
+                    }
+                    if ($tinyurl ne '') {
+                        my ($cnum,$symb) = split(/\&/,$tinyurl);
+                        if (($cnum =~ /^$match_courseid$/) &&
+                            (&Apache::lonnet::homeserver($cnum,$cdom) ne 'no_host')) {
+                            if ($env{'request.course.id'} eq $cdom.'_'.$cnum) {
+                                my ($map,$resid,$url) = &Apache::lonnet::decode_symb($symb);
+                                if (&Apache::lonnet::is_on_map($url)) {
+                                    my $realuri;
+                                    if ((&Apache::lonnet::EXT('resource.0.hiddenresource',$symb) =~ /^yes$/i) &&
+                                        (!$env{'request.role.adv'})) {
+                                        $env{'user.error.msg'}=$r->uri.':bre:1:1:Access to resource denied';
+                                        return HTTP_NOT_ACCEPTABLE;
+                                    }
+                                    if ((&Apache::lonnet::EXT('resource.0.encrypturl',$symb) =~ /^yes$/i) &&
+                                        (!$env{'request.role.adv'})) {
+                                        $realuri = &Apache::lonenc::encrypted(&Apache::lonnet::clutter($url));
+                                        if (($url =~ /\.sequence$/) &&
+                                            ($env{'course.'.$env{'request.course.id'}.'.type'} ne 'Placement')) {
+                                            $realuri .= '?navmap=1';
+                                        } else {
+                                            $realuri .= '?symb='.&Apache::lonenc::encrypted($symb);
+                                        }
+                                    } else {
+                                        $realuri = &Apache::lonnet::clutter($url);
+                                        if (($url =~ /\.sequence$/) &&
+                                            ($env{'course.'.$env{'request.course.id'}.'.type'} ne 'Placement')) {
+                                            $realuri .= '?navmap=1'; 
+                                        } else {
+                                            $realuri .= '?symb='.$symb;
+                                        }
+                                    }
+                                    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/}) {
         my $host = $r->headers_in->get('Host');
         if ($host) {
             unless ($host =~ /^internal\-/) {
-                my $c = $r->connection;
-                if (ref($c)) {
-                    my $remote_ip = $c->remote_ip;
-                    my $lonhost = $r->dir_config('lonHostID');
-                    if (&redirect_raw($remote_ip,$lonhost)) {
-                        my $location = 'https://internal-'.$host.$r->uri;
-                        $r->headers_out->set(Location => $location);
-                        return REDIRECT;
-                    }
+                my $remote_ip = $r->get_remote_host();
+                my $lonhost = $r->dir_config('lonHostID');
+                if (&redirect_raw($remote_ip,$lonhost)) {
+                    my $location = 'https://internal-'.$host.$r->uri;
+                    $r->headers_out->set(Location => $location);
+                    return REDIRECT;
                 }
             }
         }
@@ -69,7 +191,7 @@ sub handler {
 			 '/userfiles/'.(join('/',@ufile)));
         }
         return OK;
-    } else { 
+    } else {
         return DECLINED;
     }
 }
@@ -126,9 +248,3 @@ sub redirect_raw {
 1;
 __END__
 
-
-
-
-
-
-