loncom/lonnet/perl/lonnet.pm - diff

Return to lonnet.pm CVS log

Up to [LON-CAPA] / loncom / lonnet / perl

Diff for /loncom/lonnet/perl/lonnet.pm between versions 1.526 and 1.527

version 1.526, 2004/08/18 17:04:48	version 1.527, 2004/08/23 15:23:53
Line 1152 sub ssi {	Line 1152 sub ssi {
$request=new HTTP::Request('POST',"http://".$ENV{'HTTP_HOST'}.$fn);	$request=new HTTP::Request('POST',"http://".$ENV{'HTTP_HOST'}.$fn);
$request->content(join('&',map { &escape($_).'='.&escape($form{$_}) } keys %form));	$request->content(join('&',map { &escape($_).'='.&escape($form{$_}) } keys %form));
} else {	} else {
	&logthis('GET'."http://".$ENV{'HTTP_HOST'}.$fn);
$request=new HTTP::Request('GET',"http://".$ENV{'HTTP_HOST'}.$fn);	$request=new HTTP::Request('GET',"http://".$ENV{'HTTP_HOST'}.$fn);
}	}

Line 5060 sub filelocation {	Line 5061 sub filelocation {
$location = $file;	$location = $file;
$location =~ s:/~(.?)/(.):/home/$1/public_html/$2:;	$location =~ s:/~(.?)/(.):/home/$1/public_html/$2:;
} elsif ($file=~/^\/*uploaded/) { # is an uploaded file	} elsif ($file=~/^\/*uploaded/) { # is an uploaded file
$location=$file;	if ($file=~/^\/uploaded\/([^\/]+)\/([^\/]+)\/(\/)?simplepage\/([^\/]+)$/) {
	$location=&Apache::loncommon::propath($1,$2).'/userfiles/simplepage/'.$4;
	if (not -e $location) {
	$file=~/^\/uploaded\/(.*)$/;
	$location=$Apache::lonnet::perlvar{'lonDocRoot'}.'/userfiles/'.$1;
	}
	} elsif ($file=~/^\/uploaded\/([^\/]+)\/([^\/]+)\/aboutme\/([^\/]+)$/) {
	$location=&Apache::loncommon::propath($1,$2).'/userfiles/aboutme/'.$3;
	if (not -e $location) {
	$file=~/^\/uploaded\/(.*)$/;
	$location=$Apache::lonnet::perlvar{'lonDocRoot'}.'/userfiles/'.$1;
	}
	} else {
	$location=$file;
	}
} else {	} else {
$file=~s/^\Q$perlvar{'lonDocRoot'}\E//;	$file=~s/^\Q$perlvar{'lonDocRoot'}\E//;
$file=~s:^/res/:/:;	$file=~s:^/res/:/:;

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

Removed from v.1.526
changed lines
	Added in v.1.527