[LON-CAPA-cvs] cvs: loncom /lonnet/perl lonnet.pm
albertel
lon-capa-cvs@mail.lon-capa.org
Tue, 13 Sep 2005 19:43:03 -0000
albertel Tue Sep 13 15:43:03 2005 EDT
Modified files:
/loncom/lonnet/perl lonnet.pm
Log:
- remove some debug code,
- Custom roles where showing up oddly in course personnel listings BUG#4348
Index: loncom/lonnet/perl/lonnet.pm
diff -u loncom/lonnet/perl/lonnet.pm:1.655 loncom/lonnet/perl/lonnet.pm:1.656
--- loncom/lonnet/perl/lonnet.pm:1.655 Tue Sep 13 15:33:58 2005
+++ loncom/lonnet/perl/lonnet.pm Tue Sep 13 15:43:01 2005
@@ -1,7 +1,7 @@
# The LearningOnline Network
# TCP networking package
#
-# $Id: lonnet.pm,v 1.655 2005/09/13 19:33:58 albertel Exp $
+# $Id: lonnet.pm,v 1.656 2005/09/13 19:43:01 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -1716,7 +1716,11 @@
if ($username eq '' || $domain eq '') { next; }
if ((&privileged($username,$domain)) &&
(!$nothide{$username.':'.$domain})) { next; }
+ if ($role eq 'cr') { next; }
my $key=&plaintext($role);
+ if ($role =~ /^cr/) {
+ $key=(split('/',$role))[3];
+ }
if ($section) { $key.=' (Sec/Grp '.$section.')'; }
if ($returnhash{$key}) {
$returnhash{$key}.=','.$username.':'.$domain;
@@ -2485,7 +2489,6 @@
my ($trole,$tend,$tstart);
if ($role=~/^cr/) {
- &logthis(" $role $area ");
if ($role=~m|^(cr/\w+/\w+/[a-zA-Z0-9]+)_(.*)$|) {
($trole,my $trest)=($role=~m|^(cr/\w+/\w+/[a-zA-Z0-9]+)_(.*)$|);
($tend,$tstart)=split('_',$trest);