loncom/interface/lonhelper.pm - diff

Return to lonhelper.pm CVS log

Up to [LON-CAPA] / loncom / interface

version 1.185, 2011/10/31 01:20:05	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 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;