--- loncom/auth/lonroles.pm 2010/01/02 18:50:52 1.231.4.7
+++ loncom/auth/lonroles.pm 2009/09/23 16:42:03 1.231.6.1
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# User Roles Screen
#
-# $Id: lonroles.pm,v 1.231.4.7 2010/01/02 18:50:52 raeburn Exp $
+# $Id: lonroles.pm,v 1.231.6.1 2009/09/23 16:42:03 gci Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -226,7 +226,7 @@ sub handler {
# Check if user is CC trying to select a course role
if ($env{'form.switchrole'}) {
if (!defined($env{'user.role.'.$env{'form.switchrole'}})) {
- &adhoc_course_role($refresh,$then);
+ &adhoc_course_role($then);
}
}
my %temp=('logout_'.$env{'request.course.id'} => time);
@@ -659,12 +659,11 @@ ENDHEADER
if ($reinit) {
$r->print(
''.
- &mt('As your session file for the course or community has expired, you will need to re-select the course.').'
');
+ &mt('As your session file for the course has expired, you will need to re-select the course.').'');
} else {
$r->print(
''.
- &mt('You need to choose another user role or enter a specific course or community for this function.').
- '
');
+ &mt('You need to choose another user role or enter a specific course for this function').'');
}
}
}
@@ -701,32 +700,18 @@ ENDHEADER
&queued_selfenrollment($r);
my $domdesc = &Apache::lonnet::domain($env{'user.domain'},'description');
my $esc_dom = &HTML::Entities::encode($env{'user.domain'},'"<>&');
-
- $r->print(
- ''
- .&mt('[_1]Visit the [_2]Course/Community Catalog[_3]'
- .' to view all [_4] LON-CAPA courses and communities.'
- ,''
- ,''
- ,'',$domdesc)
- .'
'
- .&mt('If a course or community is [_1]not[_2] in your list of current courses and communities below,'
- .' you may be able to enroll if self-enrollment is permitted.'
- ,'','')
- .'
'
- );
+ $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.','','').'
');
}
}
# No active roles
if ($countactive==0) {
if ($inrole) {
- $r->print(''.&mt('Currently no additional roles, courses or communities').'
');
+ $r->print(''.&mt('Currently no additional roles or courses').'
');
} else {
- $r->print(''.&mt('Currently no active roles, courses or communities').'
');
+ $r->print(''.&mt('Currently no active roles or courses').'
');
}
&findcourse_advice($r);
- &requestcourse_advice($r);
$r->print('');
if ($countfuture) {
$r->print(&mt('The following [quant,_1,role,roles] will become active in the future:',$countfuture));
@@ -851,7 +836,7 @@ ENDHEADER
.'
'
.''.&mt('Logout').' '
.''
- .&mt('Course/Community Catalog')
+ .&mt('Course Catalog')
.'');
}
$r->print(&Apache::loncommon::end_page());
@@ -1098,7 +1083,7 @@ sub roletable_headers {
}
sub roletypes {
- my @types = ('Domain','Construction Space','Course','Community','Unavailable','System');
+ my @types = ('Domain','Construction Space','Course','Unavailable','System');
return @types;
}
@@ -1160,66 +1145,12 @@ sub findcourse_advice {
} else {
$r->print(&mt('If you were expecting to see an active role listed for a particular course, that course may not have been created yet.').'
');
}
- $r->print(''.&mt('Self-Enrollment').'
'.
- ''.&mt('The [_1]Course/Community Catalog[_2] provides information about all [_3] classes for which LON-CAPA courses have been created, as well as any communities in the domain.','','',$domdesc).'
');
- $r->print(&mt('You can search for courses and communities which permit self-enrollment, if you would like to enroll in one.').'
');
+ $r->print(''.&mt('The [_1]Course Catalog[_2] provides information about all [_3] classes for which LON-CAPA courses have been created.','','',$domdesc).'
');
+ $r->print(&mt('You can search the course catalog for courses which permit self-enrollment, if you would like to enroll in a course.').'
');
&queued_selfenrollment($r);
return;
}
-sub requestcourse_advice {
- my ($r) = @_;
- my $domdesc = &Apache::lonnet::domain($env{'user.domain'},'description');
- my $esc_dom = &HTML::Entities::encode($env{'user.domain'},'"<>&');
- my (%can_request,%request_doms);
- &Apache::lonnet::check_can_request($env{'user.domain'},\%can_request,\%request_doms);
- if (keys(%request_doms) > 0) {
- my ($types,$typename) = &Apache::loncommon::course_types();
- if ((ref($types) eq 'ARRAY') && (ref($typename) eq 'HASH')) {
- $r->print(''.&mt('Request creation of a course or community').'
'.
- ''.&mt('You have rights to request the creation of courses and/or communities in the following domain(s):').'
');
- my (@reqdoms,@reqtypes);
- foreach my $type (sort(keys(%request_doms))) {
- push(@reqtypes,$type);
- if (ref($request_doms{$type}) eq 'ARRAY') {
- my $domstr = join(', ',map { &Apache::lonnet::domain($_) } sort(@{$request_doms{$type}}));
- $r->print(
- '- '
- .&mt('[_1]'.$typename->{$type}.'[_2] in domain: [_3]',
- '',
- '',
- ''.$domstr.'')
- .'
'
- );
- foreach my $dom (@{$request_doms{$type}}) {
- unless (grep(/^\Q$dom\E/,@reqdoms)) {
- push(@reqdoms,$dom);
- }
- }
- }
- }
- my @showtypes;
- foreach my $type (@{$types}) {
- if (grep(/^\Q$type\E$/,@reqtypes)) {
- push(@showtypes,$type);
- }
- }
- my $requrl = '/adm/requestcourse';
- if (@reqdoms == 1) {
- $requrl .= '?showdom='.$reqdoms[0];
- }
- if (@showtypes > 0) {
- $requrl.=(($requrl=~/\?/)?'&':'?').'crstype='.$showtypes[0];
- }
- if (@reqdoms == 1 || @showtypes > 0) {
- $requrl .= '&state=crstype&action=new';
- }
- $r->print('
'.&mt('Use the [_1]request form[_2] to submit a request for creation of a new course or community.','','').'');
- }
- }
- return;
-}
-
sub queued_selfenrollment {
my ($r) = @_;
my %selfenrollrequests = &Apache::lonnet::dump('selfenrollrequests');
@@ -1441,21 +1372,21 @@ sub check_fordc {
}
sub adhoc_course_role {
- my ($refresh,$then) = @_;
+ my ($then) = @_;
my ($cdom,$cnum);
$cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
$cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
- if (&check_forcc($cdom,$cnum,$refresh,$then)) {
+ if (&check_forcc($cdom,$cnum,$then)) {
my $setprivs;
if (!defined($env{'user.role.'.$env{'form.switchrole'}})) {
$setprivs = 1;
} else {
my ($start,$end) = split(/\./,$env{'user.role.'.$env{'form.switchrole'}});
- if (($start && ($start>$refresh || $start == -1)) ||
+ if (($start && ($start>$then || $start == -1)) ||
($end && $end<$then)) {
$setprivs = 1;
}
- }
+ }
if ($setprivs) {
if ($env{'form.switchrole'} =~ m-^(in|ta|ep|ad|st|cr)([\w/]*)\./\Q$cdom\E/\Q$cnum\E/?(\w*)$-) {
my $role = $1;
@@ -1485,7 +1416,7 @@ sub adhoc_course_role {
}
&Apache::lonnet::standard_roleprivs(\%newrole,$role,$cdom,$spec,$cnum,$area);
&Apache::lonnet::set_userprivs(\%userroles,\%newrole,\%newgroups);
- my $adhocstart = $refresh-1;
+ my $adhocstart = $then-1;
$userroles{'user.role.'.$spec} = $adhocstart.'.';
&Apache::lonnet::appenv(\%userroles,[$role,'cm']);
}
@@ -1495,7 +1426,7 @@ sub adhoc_course_role {
}
sub check_forcc {
- my ($cdom,$cnum,$refresh,$then) = @_;
+ my ($cdom,$cnum,$then) = @_;
my $is_cc;
if ($cdom ne '' && $cnum ne '') {
if (&Apache::lonnet::is_course($cdom,$cnum)) {
@@ -1503,7 +1434,7 @@ sub check_forcc {
if (defined($env{$envkey})) {
$is_cc = 1;
my ($tstart,$tend)=split(/\./,$env{$envkey});
- if ($tstart && $tstart>$refresh) { $is_cc = 0; }
+ if ($tstart && $tstart>$then) { $is_cc = 0; }
if ($tend && $tend <$then) { $is_cc = 0; }
}
}
@@ -1526,8 +1457,8 @@ sub courselink {
sub coursepick_jscript {
my %lt = &Apache::lonlocal::texthash(
- plsu => "Please use the 'Select Course/Community' link to open a separate pick course window where you may select the course or community you wish to enter.",
- youc => 'You can only use this screen to select courses and communities in the current domain.',
+ plsu => "Please use the 'Select Course' link to open a separate pick course window where you may select the course you wish to enter.",
+ youc => 'You can only use this screen to select courses in the current domain.',
);
my $verify_script = <<"END";