--- loncom/lontrans.pm	2018/07/26 19:01:25	1.24
+++ 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.24 2018/07/26 19:01:25 raeburn Exp $
+# $Id: lontrans.pm,v 1.25 2019/01/20 02:42:35 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -29,88 +29,16 @@
 package Apache::lontrans;
 
 use strict;
-use Apache::Constants qw(:common :remotehost REDIRECT :http);
+use Apache::Constants qw(:common :remotehost REDIRECT);
 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{^/+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 ($r->is_initial_req() || !$host) {
-                                        $r->internal_redirect($realuri);
-                                        return OK;
-                                    } else {
-                                        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\-/) {