loncom/interface/loncommon.pm - diff

Return to loncommon.pm CVS log

Up to [LON-CAPA] / loncom / interface

version 1.352, 2006/04/23 18:31:44	version 1.355, 2006/04/25 21:24:06
Line 1948 sub plainname {	Line 1948 sub plainname {
$name=~s/^\s+//;	$name=~s/^\s+//;
$name=~s/\s+$//;	$name=~s/\s+$//;
$name=~s/\s+/ /g;	$name=~s/\s+/ /g;
if ($name !~ /\S/) { $name=$uname.'@'.$udom; }	if ($name !~ /\S/) { $name=$uname.':'.$udom; }
return $name;	return $name;
}	}

Line 2610 sub maketime {	Line 2610 sub maketime {
#########################################	#########################################

sub findallcourses {	sub findallcourses {
	my ($roles) = @_;
	my %roles;
	if (ref($roles)) { %roles = map { $_ => 1 } @{$roles}; }
my %courses;	my %courses;
my $now=time;	my $now=time;
foreach my $key (keys(%env)) {	foreach my $key (keys(%env)) {
if ( $key=~m{^user\.role\.(\w+)\./(\w+)/(\w+)} ) {	if ( $key=~m{^user\.role\.(\w+)\./(\w+)/(\w+)} ) {
my ($role,$domain,$id) = ($1,$2,$3);	my ($role,$domain,$id) = ($1,$2,$3);
next if ($role eq 'ca' \|\| $role eq 'aa');	next if ($role eq 'ca' \|\| $role eq 'aa');
my ($starttime,$endtime)=$env{$key};	next if (%roles && !exists($roles{$role}));
	my ($starttime,$endtime)=split(/\./,$env{$key});
my $active=1;	my $active=1;
if ($starttime) {	if ($starttime) {
if ($now<$starttime) { $active=0; }	if ($now<$starttime) { $active=0; }