--- loncom/auth/lonroles.pm 2010/01/02 18:28:11 1.231.4.3
+++ loncom/auth/lonroles.pm 2009/09/23 16:45:17 1.231.6.2
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# User Roles Screen
#
-# $Id: lonroles.pm,v 1.231.4.3 2010/01/02 18:28:11 raeburn Exp $
+# $Id: lonroles.pm,v 1.231.6.2 2009/09/23 16:45:17 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);
@@ -740,6 +740,27 @@ ENDHEADER
}
$r->print(&Apache::loncommon::end_page());
return OK;
+ } elsif ($countactive==1) { # Is there only one choice?
+ my $needs_switchserver;
+ if ($env{'user.author'}) {
+ $needs_switchserver = &check_needs_switchserver($possiblerole);
+ }
+ if ((!$needs_switchserver) && ($env{'request.role'} eq 'cm')) {
+ $r->print('
'.&mt('Please stand by.').'
'.
+ ''.
+ '');
+ $r->print("\n");
+ $r->rflush();
+ $r->print('');
+ $r->print(&Apache::loncommon::end_page());
+ return OK;
+ }
+ if ($needs_switchserver) {
+ $r->print("".&mt('Server Switch Required')."
\n".
+ &mt('Construction Space access is only available from '.
+ 'the home server of the corresponding Author.').'
'.
+ &mt("Click the 'Switch Server' link to go there.").'
');
+ }
}
# ----------------------------------------------------------------------- Table
unless ((!&Apache::loncommon::show_course()) || ($nochoose) || ($countactive==1)) {
@@ -1372,21 +1393,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;
@@ -1416,7 +1437,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']);
}
@@ -1426,7 +1447,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)) {
@@ -1434,7 +1455,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; }
}
}