loncom/lonnet/perl/lonnet.pm - diff

Return to lonnet.pm CVS log

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

version 1.224, 2002/05/17 19:52:42	version 1.226, 2002/05/18 18:54:29
Line 2763 sub hreflocation {	Line 2763 sub hreflocation {
unless (($file=~/^http:\/\//i) \|\| ($file=~/^\//)) {	unless (($file=~/^http:\/\//i) \|\| ($file=~/^\//)) {
my $finalpath=filelocation($dir,$file);	my $finalpath=filelocation($dir,$file);
$finalpath=~s/^\/home\/httpd\/html//;	$finalpath=~s/^\/home\/httpd\/html//;
	$finalpath=~s-/home/(\w+)/public_html/-/~$1/-;
return $finalpath;	return $finalpath;
} else {	} else {
return $file;	return $file;
Line 2824 BEGIN {	Line 2825 BEGIN {

while (my $configline=<$config>) {	while (my $configline=<$config>) {
if ($configline =~ /^[^\#]*PerlSetVar/) {	if ($configline =~ /^[^\#]*PerlSetVar/) {
my ($dummy,$varname,$varvalue)=split(/\s+/,$configline);
chomp($varvalue);
$perlvar{$varname}=$varvalue;
}
}
}
{
my $config=Apache::File->new("/etc/httpd/conf/loncapa_apache.conf");

while (my $configline=<$config>) {
if ($configline =~ /^[^\#]*PerlSetVar/) {
my ($dummy,$varname,$varvalue)=split(/\s+/,$configline);	my ($dummy,$varname,$varvalue)=split(/\s+/,$configline);
chomp($varvalue);	chomp($varvalue);
$perlvar{$varname}=$varvalue;	$perlvar{$varname}=$varvalue;