Diff for /loncom/interface/lonhelper.pm between versions 1.185 and 1.186

version 1.185, 2011/10/31 01:20:05 version 1.186, 2011/11/05 22:42:14
Line 2976  BUTTONS Line 2976  BUTTONS
     # If the subdirectory is in local CSTR space      # If the subdirectory is in local CSTR space
     my $metadir;      my $metadir;
     my $londocroot = $Apache::lonnet::perlvar{'lonDocRoot'};      my $londocroot = $Apache::lonnet::perlvar{'lonDocRoot'};
     if ($subdir =~ m{^\Q$londocroot/priv/\E[^/]+/[^/]+/(.*)$}) {      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;

Removed from v.1.185  
changed lines
  Added in v.1.186


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