[BACK]Return to lonhelper.pm CVS log [TXT] [DIR] Up to [LON-CAPA] / loncom / interface

Diff for /loncom/interface/lonhelper.pm between versions 1.184 and 1.187

version 1.184, 2011/10/25 22:27:11 version 1.187, 2011/11/07 18:22:03
Line 261  sub real_handler { Line 261  sub real_handler {
     my $uri = shift;      my $uri = shift;
     if (!defined($uri)) { $uri = $r->uri(); }      if (!defined($uri)) { $uri = $r->uri(); }
     $env{'request.uri'} = $uri;      $env{'request.uri'} = $uri;
     my $filename = '/home/httpd/html' . $uri;      my $filename = $r->dir_config('lonDocRoot').$uri;
     my $fh = Apache::File->new($filename);      my $fh = Apache::File->new($filename);
     my $file;      my $file;
     read $fh, $file, 100000000;      read $fh, $file, 100000000;
Line 2975  BUTTONS Line 2975  BUTTONS
   
     # If the subdirectory is in local CSTR space      # If the subdirectory is in local CSTR space
     my $metadir;      my $metadir;
     if ($subdir =~ m|^/home/httpd/html/priv/[^/]+/[^/]+/(.*)$|) {      my $londocroot = $Apache::lonnet::perlvar{'lonDocRoot'};
       if ($subdir =~ m{^(?:\Q$londocroot\E)*/priv/[^/]+/[^/]+/(.*)$}) {
         my $innerpath=$1;          my $innerpath=$1;
           unless ($subdir=~m{^\Q$londocroot\E}) {
              $subdir=$londocroot.$subdir;
           }
  my ($user,$domain)=    my ($user,$domain)= 
     &Apache::loncacc::constructaccess($subdir);      &Apache::loncacc::constructaccess($subdir);
  $metadir='/res/'.$domain.'/'.$user.'/'.$innerpath;   $metadir='/res/'.$domain.'/'.$user.'/'.$innerpath;
Line 3086  sub fileState { Line 3090  sub fileState {
     }      }
     my $docroot = $Apache::lonnet::perlvar{'lonDocRoot'};      my $docroot = $Apache::lonnet::perlvar{'lonDocRoot'};
     my $subdirpart = $constructionSpaceDir;      my $subdirpart = $constructionSpaceDir;
     $subdirpart =~ s/^\/home\/httpd\/html\/priv\/\Q$udom\E\/\Q$uname\E//;      $subdirpart =~ s{^\Q$docroot/priv/$udom/$uname\E}{};
     my $resdir = $docroot . '/res/' . $udom . '/' . $uname .      my $resdir = $docroot . '/res/' . $udom . '/' . $uname .
         $subdirpart;          $subdirpart;
   
Removed from v.1.184  
changed lines
  Added in v.1.187

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