--- loncom/lonnet/perl/lonnet.pm 2007/10/06 04:32:40 1.921 +++ loncom/lonnet/perl/lonnet.pm 2007/11/06 13:05:00 1.922 @@ -1,7 +1,7 @@ # The LearningOnline Network # TCP networking package # -# $Id: lonnet.pm,v 1.921 2007/10/06 04:32:40 raeburn Exp $ +# $Id: lonnet.pm,v 1.922 2007/11/06 13:05:00 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -2463,7 +2463,13 @@ sub get_my_roles { } if (ref($roles) eq 'ARRAY') { if (!grep(/^\Q$role\E$/,@{$roles})) { - next; + if ($role =~ /^cr\//) { + if (!grep(/^cr$/,@{$roles})) { + next; + } + } else { + next; + } } } $returnhash{$username.':'.$domain.':'.$role}=$tstart.':'.$tend; @@ -2621,7 +2627,10 @@ sub get_domain_roles { if (undef($enddate) || $enddate eq '') { $enddate = '.'; } - my $rolelist = join(':',@{$roles}); + my $rolelist; + if (ref($roles) eq 'ARRAY') { + $rolelist = join(':',@{$roles}); + } my %personnel = (); my %servers = &get_servers($dom,'library');