version 1.183, 2011/10/17 12:41:30
|
version 1.184, 2011/10/25 22:27:11
|
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/([^/]+)/public_html/(.*)|) { |
if ($subdir =~ m|^/home/httpd/html/priv/[^/]+/[^/]+/(.*)$|) { |
|
my $innerpath=$1; |
my ($user,$domain)= |
my ($user,$domain)= |
&Apache::loncacc::constructaccess($subdir, |
&Apache::loncacc::constructaccess($subdir); |
$Apache::lonnet::perlvar{'lonDefDomain'}); |
$metadir='/res/'.$domain.'/'.$user.'/'.$innerpath; |
$metadir='/res/'.$domain.'/'.$user.'/'.$2; |
|
($listref,$listerror) = |
|
&Apache::lonnet::dirlist($subdir,$domain,$user,undef,undef,'/'); |
|
} elsif ($subdir =~ m|^~([^/]+)/(.*)$|) { |
|
$subdir='/home/'.$1.'/public_html/'.$2; |
|
my ($user,$domain)= |
|
&Apache::loncacc::constructaccess($subdir, |
|
$Apache::lonnet::perlvar{'lonDefDomain'}); |
|
$metadir='/res/'.$domain.'/'.$user.'/'.$2; |
|
($listref,$listerror) = |
($listref,$listerror) = |
&Apache::lonnet::dirlist($subdir,$domain,$user,undef,undef,'/'); |
&Apache::lonnet::dirlist($subdir,$domain,$user,undef,undef,'/'); |
} else { |
} else { |
Line 3094 sub fileState {
|
Line 3086 sub fileState {
|
} |
} |
my $docroot = $Apache::lonnet::perlvar{'lonDocRoot'}; |
my $docroot = $Apache::lonnet::perlvar{'lonDocRoot'}; |
my $subdirpart = $constructionSpaceDir; |
my $subdirpart = $constructionSpaceDir; |
$subdirpart =~ s/^\/home\/$uname\/public_html//; |
$subdirpart =~ s/^\/home\/httpd\/html\/priv\/\Q$udom\E\/\Q$uname\E//; |
my $resdir = $docroot . '/res/' . $udom . '/' . $uname . |
my $resdir = $docroot . '/res/' . $udom . '/' . $uname . |
$subdirpart; |
$subdirpart; |
|
|