loncom/lonnet/perl/lonnet.pm - diff

Return to lonnet.pm CVS log

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

version 1.461, 2004/01/13 16:29:41	version 1.463, 2004/01/15 19:41:00
Line 3822 sub packages_tab_default {	Line 3822 sub packages_tab_default {
foreach my $package (split(/,/,$packages)) {	foreach my $package (split(/,/,$packages)) {
my ($pack_type,$pack_part)=split(/_/,$package,2);	my ($pack_type,$pack_part)=split(/_/,$package,2);
if ($pack_part eq $part) {	if ($pack_part eq $part) {
return $packagetab{"$pack_type&$name&default"};	if (defined($packagetab{"$pack_type&$name&default"})) {
	return $packagetab{"$pack_type&$name&default"};
	}
}	}
}	}
return undef;	return undef;
Line 4474 sub hreflocation {	Line 4476 sub hreflocation {
unless (($file=~m-^http://-i) \|\| ($file=~m-^/-)) {	unless (($file=~m-^http://-i) \|\| ($file=~m-^/-)) {
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/-;	$finalpath=~s-^/home/(\w+)/public_html/-/~$1/-;
return $finalpath;	return $finalpath;
} elsif ($file=~m-^/home-) {	} elsif ($file=~m-^/home-) {
$file=~s-^/home/httpd/html--;	$file=~s-^/home/httpd/html--;
$file=~s-/home/(\w+)/public_html/-/~$1/-;	$file=~s-^/home/(\w+)/public_html/-/~$1/-;
return $file;	return $file;
}	}
	return $file;
}	}

# ------------------------------------------------------------- Declutters URLs	# ------------------------------------------------------------- Declutters URLs