Diff for /loncom/lontrans.pm between versions 1.6 and 1.14.10.1

version 1.6, 2003/11/12 21:37:07 version 1.14.10.1, 2020/03/05 22:02:32
Line 32  use strict; Line 32  use strict;
 use Apache::Constants qw(:common :remotehost);  use Apache::Constants qw(:common :remotehost);
 use Apache::lonnet();  use Apache::lonnet();
 use Apache::File();  use Apache::File();
 use Apache::loncommon;  use LONCAPA;
   
   
 sub handler {  sub handler {
     my $r = shift;      my $r = shift;
     if ($r->uri=~m|^/uploaded/|) {      # FIXME line remove when mod_perl fixes BUG#4948 
  my (undef,undef,$udom,$uname,$ufile)=split(/\//,$r->uri);      $r->notes->set('error-notes' => '');
  $ufile=~s/^[\~\.]+//;      if ($r->uri=~m|^(/raw)?/uploaded/|) {
  $r->filename(&Apache::loncommon::propath($udom,$uname).          my $fn = $r->uri();
      '/userfiles/'.$ufile);          $fn=~s/^\/raw//;
     } elsif ($r->uri=~m|^/~|) {          my (undef,undef,$udom,$uname,@ufile)=split(/\//,$fn);
  #internal authentication, needs fixup.   if (@ufile) { $ufile[-1]=~s/^[\~\.]+//; }
  my $fn = $r->uri(); # non users do not get the full path request          my $chome=&Apache::lonnet::homeserver($uname,$udom);
                  # through SCRIPT_FILENAME   my $allowed=0;
  $fn=~s|^/~(\w+)|/home/$1/public_html|;   my @ids=&Apache::lonnet::current_machine_ids();
  $r->filename($fn);   foreach my $id (@ids) { if ($id eq $chome) { $allowed=1; } }
     } else { return DECLINED; }   if ($allowed) {
     return OK;      $r->filename(&propath($udom,$uname).
    '/userfiles/'.(join('/',@ufile)));
           }
           return OK;
       } elsif ($r->uri =~ m{^\Q/adm/wrapper/ext/https:/\E[^/]}) {
           my $uri = $r->uri;
           $uri =~ s{^(\Q/adm/wrapper/ext/https:/\E)}{$1/};
           $r->uri($uri);
       }
       return DECLINED;
 }  }
   
 1;  1;

Removed from v.1.6  
changed lines
  Added in v.1.14.10.1


FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>