--- loncom/lonnet/perl/lonnet.pm	2004/01/27 22:54:59	1.465
+++ loncom/lonnet/perl/lonnet.pm	2004/01/31 01:03:56	1.469
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # TCP networking package
 #
-# $Id: lonnet.pm,v 1.465 2004/01/27 22:54:59 albertel Exp $
+# $Id: lonnet.pm,v 1.469 2004/01/31 01:03:56 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -1424,7 +1424,7 @@ sub userrolelog {
     my ($trole,$username,$domain,$area,$tstart,$tend)=@_;
     if (($trole=~/^ca/) || ($trole=~/^in/) || 
         ($trole=~/^cc/) || ($trole=~/^ep/) ||
-        ($trole=~/^cr/)) {
+        ($trole=~/^cr/) || ($trole=~/^ta/)) {
        my (undef,$rudom,$runame,$rsec)=split(/\//,$area);
        $userrolehash
          {$trole.':'.$username.':'.$domain.':'.$runame.':'.$rudom.':'.$rsec}
@@ -1446,6 +1446,7 @@ sub get_course_adv_roles {
         if (($tend) && ($tend<$now)) { next; }
         if (($tstart) && ($now<$tstart)) { next; }
         my ($role,$username,$domain,$section)=split(/\:/,$_);
+	if (&privileged($username,$domain)) { next; }
         my $key=&plaintext($role);
         if ($section) { $key.=' (Sec/Grp '.$section.')'; }
         if ($returnhash{$key}) {
@@ -3821,10 +3822,11 @@ sub packages_tab_default {
     my $packages=&metadata($uri,'packages');
     foreach my $package (split(/,/,$packages)) {
 	my ($pack_type,$pack_part)=split(/_/,$package,2);
-	if ($pack_part eq $part) {
-	    if (defined($packagetab{"$pack_type&$name&default"})) {
-		return $packagetab{"$pack_type&$name&default"};
-	    }
+	if (defined($packagetab{"$pack_type&$name&default"})) {
+	    return $packagetab{"$pack_type&$name&default"};
+	}
+	if (defined($packagetab{$pack_type."_".$pack_part."&$name&default"})) {
+	    return $packagetab{$pack_type."_".$pack_part."&$name&default"};
 	}
     }
     return undef;
@@ -3855,7 +3857,7 @@ sub metadata {
     if (($uri eq '') || (($uri =~ m|^/*adm/|) && ($uri !~ m|^adm/includes|)) ||
         ($uri =~ m|/$|) || ($uri =~ m|/.meta$|) || ($uri =~ /^~/) ||
 	($uri =~ m|home/[^/]+/public_html/|)) {
-	return '';
+	return undef;
     }
     my $filename=$uri;
     $uri=~s/\.meta$//;
@@ -4490,7 +4492,7 @@ sub current_machine_domains {
     my $hostname=$hostname{$perlvar{'lonHostID'}};
     my @domains;
     while( my($id, $name) = each(%hostname)) {
-	&logthis("-$id-$name-$hostname-");
+#	&logthis("-$id-$name-$hostname-");
 	if ($hostname eq $name) {
 	    push(@domains,$hostdom{$id});
 	}
@@ -4502,7 +4504,7 @@ sub current_machine_ids {
     my $hostname=$hostname{$perlvar{'lonHostID'}};
     my @ids;
     while( my($id, $name) = each(%hostname)) {
-	&logthis("-$id-$name-$hostname-");
+#	&logthis("-$id-$name-$hostname-");
 	if ($hostname eq $name) {
 	    push(@ids,$id);
 	}