[LON-CAPA-cvs] cvs: loncom /lonnet/perl lonnet.pm
albertel
lon-capa-cvs@mail.lon-capa.org
Wed, 15 Dec 2004 19:42:42 -0000
albertel Wed Dec 15 14:42:42 2004 EDT
Modified files:
/loncom/lonnet/perl lonnet.pm
Log:
- nohist_userroles, has entires with no username/domain due to past bugs, this results in the user themself being described as various roles in the system when, they really aren't, hide these entries BUG#3733
- pss usernam/edomain to set_arearole
Index: loncom/lonnet/perl/lonnet.pm
diff -u loncom/lonnet/perl/lonnet.pm:1.575 loncom/lonnet/perl/lonnet.pm:1.576
--- loncom/lonnet/perl/lonnet.pm:1.575 Tue Dec 7 11:19:37 2004
+++ loncom/lonnet/perl/lonnet.pm Wed Dec 15 14:42:42 2004
@@ -1,7 +1,7 @@
# The LearningOnline Network
# TCP networking package
#
-# $Id: lonnet.pm,v 1.575 2004/12/07 16:19:37 albertel Exp $
+# $Id: lonnet.pm,v 1.576 2004/12/15 19:42:42 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -1644,6 +1644,7 @@
if (($tend) && ($tend<$now)) { next; }
if (($tstart) && ($now<$tstart)) { next; }
my ($role,$username,$domain,$section)=split(/\:/,$_);
+ if ($username eq '' || $domain eq '') { next; }
if ((&privileged($username,$domain)) &&
(!$nothide{$username.':'.$domain})) { next; }
my $key=&plaintext($role);
@@ -2399,7 +2400,7 @@
my ($area,$role)=split(/=/,$_);
$area=~s/\_\w\w$//;
my ($trole,$tend,$tstart)=split(/_/,$role);
- $userroles.=&set_arearole($trole,$area,$tstart,$tend);
+ $userroles.=&set_arearole($trole,$area,$tstart,$tend,$domain,$username);
if (($tend!=0) && ($tend<$now)) { $trole=''; }
if (($tstart!=0) && ($tstart>$now)) { $trole=''; }
if (($area ne '') && ($trole ne '')) {