--- loncom/auth/lonroles.pm 2010/01/16 15:06:22 1.240.2.10
+++ loncom/auth/lonroles.pm 2010/01/18 17:16:58 1.240.2.14
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# User Roles Screen
#
-# $Id: lonroles.pm,v 1.240.2.10 2010/01/16 15:06:22 raeburn Exp $
+# $Id: lonroles.pm,v 1.240.2.14 2010/01/18 17:16:58 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -723,6 +723,13 @@ ENDHEADER
$refresh = $now;
&Apache::lonnet::appenv({'user.refresh.time' => $refresh});
+ if (!$countactive && !$countfuture) {
+ if (&Apache::loncommon::new_roles_update()) {
+ ($countactive,$countfuture,$inrole,$possiblerole) =
+ &gather_roles($then,$refresh,$now,$reinit,$nochoose,\%roletext,\%sortrole,
+ \%roleclass,\%futureroles,\%timezones);
+ }
+ }
if ($custommenu) {
if ($env{'form.destinationurl'} eq '/adm/gci_info') {
$r->print(&gci_info_page()).
@@ -1072,7 +1079,7 @@ sub gather_roles {
} elsif ($trest) {
my $tcourseid=$tdom.'_'.$trest;
$ttype = &Apache::loncommon::course_type($tcourseid);
- $trole = &Apache::lonnet::plaintext($role,$ttype);
+ $trole = &Apache::lonnet::plaintext($role,$ttype,$tcourseid);
if ($env{'course.'.$tcourseid.'.description'}) {
$twhere=$env{'course.'.$tcourseid.'.description'};
$sortkey=$role."\0".$tdom."\0".$twhere."\0".$envkey;
@@ -1091,7 +1098,7 @@ sub gather_roles {
&Apache::loncommon::syllabuswrapper(&mt('Syllabus'),$trest,$tdom).
'';
$ttype = $newhash{'type'};
- $trole = &Apache::lonnet::plaintext($role,$ttype);
+ $trole = &Apache::lonnet::plaintext($role,$ttype,$tcourseid);
} else {
$twhere=&mt('Currently not available');
$env{'course.'.$tcourseid.'.description'}=$twhere;
@@ -1329,49 +1336,6 @@ sub requestcourse_advice {
return;
}
-sub queued_selfenrollment {
- my ($r) = @_;
- my %selfenrollrequests = &Apache::lonnet::dump('selfenrollrequests');
- my %reqs_by_date;
- foreach my $item (keys(%selfenrollrequests)) {
- if (ref($selfenrollrequests{$item}) eq 'HASH') {
- if ($selfenrollrequests{$item}{'status'} eq 'request') {
- if ($selfenrollrequests{$item}{'timestamp'}) {
- push(@{$reqs_by_date{$selfenrollrequests{$item}{'timestamp'}}},$item);
- }
- }
- }
- }
- if (keys(%reqs_by_date)) {
- my $rolename = &Apache::lonnet::plaintext('st');
- $r->print(''.&mt('Enrollment requests pending Course Coordinator approval').'
'.
- &Apache::loncommon::start_data_table().
- &Apache::loncommon::start_data_table_header_row().
- '