--- loncom/auth/lonroles.pm 2008/05/19 17:55:38 1.193
+++ loncom/auth/lonroles.pm 2008/07/04 19:26:35 1.197
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# User Roles Screen
#
-# $Id: lonroles.pm,v 1.193 2008/05/19 17:55:38 raeburn Exp $
+# $Id: lonroles.pm,v 1.197 2008/07/04 19:26:35 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -137,18 +137,6 @@ sub handler {
# Is this an ad-hoc CC-role?
if (my ($domain,$coursenum) =
($envkey =~ m-^form\.cc\./($match_domain)/($match_courseid)$-)) {
- # See if that is even allowed
- my %crsenv=&Apache::lonnet::get('environment',['internal.courseowner'],$domain,$coursenum);
- # First find course owner
- my ($owneruser,$ownerdomain)=split(/\:/,$crsenv{'internal.courseowner'});
- # Check if course owner blocked cc-access
- if (($owneruser) && ($ownerdomain)) {
- my %blocked=&Apache::lonnet::get('environment',['domcoord.cc'],$ownerdomain,$owneruser);
- if ($blocked{'domcoord.cc'} eq 'blocked') {
- $env{'user.error.msg'}=':::1:Course owner '.$owneruser.' in domain '.$ownerdomain.' blocked domain coordinator access';
- last;
- }
- }
if ($dcroles{$domain}) {
&check_privs($domain,$coursenum,$then,$now,'cc');
}
@@ -513,13 +501,6 @@ ENDHEADER
$r->print('');
$r->print('');
}
- if ($env{'user.adv'}) {
- $r->print(
- '
');
- }
-
my (%roletext,%sortrole,%roleclass);
my $countactive=0;
my $countfuture=0;
@@ -686,6 +667,18 @@ ENDHEADER
}
}
}
+ if ($env{'user.adv'}) {
+ $r->print(
+ '
');
+ } else {
+ if ($countactive > 0) {
+ my $domdesc = &Apache::lonnet::domain($env{'user.domain'},'description');
+ $r->print('
'.&mt('[_1]Visit the [_2]Course Catalog[_3] to view all [_4] LON-CAPA courses.','','','',$domdesc).'
'.&mt('If a course is [_1]not[_2] in your list of current courses below, you may be able to enroll if self-enrollment is permitted.','','').'
This is LON-CAPA '.
- $r->dir_config('lonVersion').'
'.
- ''.&mt('Logout').'
'
+ .&mt('This is LON-CAPA [_1]',$r->dir_config('lonVersion'))
+ .'
'
+ .''.&mt('Logout').' '
+ .''.&mt('Course Catalog')
+ .'