--- loncom/auth/lonroles.pm	2009/10/31 05:44:35	1.239
+++ loncom/auth/lonroles.pm	2009/12/07 04:38:22	1.240.2.2
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # User Roles Screen
 #
-# $Id: lonroles.pm,v 1.239 2009/10/31 05:44:35 raeburn Exp $
+# $Id: lonroles.pm,v 1.240.2.2 2009/12/07 04:38:22 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -255,12 +255,12 @@ sub handler {
 # Check if user is a DC trying to enter a course or author space and needs privs to be created
         if ($numdc > 0) {
             foreach my $envkey (keys %env) {
-# Is this an ad-hoc CC-role?
-                if (my ($domain,$coursenum) =
-		    ($envkey =~ m-^form\.cc\./($match_domain)/($match_courseid)$-)) {
+# Is this an ad-hoc Coordinator role?
+                if (my ($ccrole,$domain,$coursenum) =
+		    ($envkey =~ m-^form\.(cc|co)\./($match_domain)/($match_courseid)$-)) {
                     if ($dcroles{$domain}) {
                         &Apache::lonnet::check_adhoc_privs($domain,$coursenum,
-                                                           $then,$refresh,$now,'cc');
+                                                           $then,$refresh,$now,$ccrole);
                     }
                     last;
                 }
@@ -318,6 +318,9 @@ sub handler {
                 }
             }
         }
+        if (($env{'form.cm'}) && ($env{'form.orgurl'})) {
+            $r->internal_redirect($env{'form.orgurl'});
+        }
 
         foreach $envkey (keys %env) {
             next if ($envkey!~/^user\.role\./);
@@ -491,8 +494,8 @@ ENDENTERKEY
 				    $courseid = substr($courseid, 1);
 				}
 				$courseid =~ s/\//_/;
-				if ($role eq 'cc' && $env{'course.' . $courseid . 
-							      '.course.helper.not.run'}) {
+				if ((($role eq 'cc') || ($role eq 'co')) 
+                                    && ($env{'course.' . $courseid .'.course.helper.not.run'})) { 
 				    $furl = "/adm/helper/course.initialization.helper";
 				    # Send the user to the course they selected
 				} elsif ($env{'request.course.id'}) {
@@ -767,6 +770,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('<h3>'.&mt('Please stand by.').'</h3>'.
+                '<input type="hidden" name="'.$possiblerole.'" value="1" />'.
+            '<noscript><br /><input type="submit" name="submit" value="'.&mt('Continue').'" /></noscript>');
+            $r->print("</form>\n");
+            $r->rflush();
+            $r->print('<script type="text/javascript">document.forms.rolechoice.submit();</script>');
+            $r->print(&Apache::loncommon::end_page());
+            return OK;
+        }
+        if ($needs_switchserver) {
+            $r->print("<h2>".&mt('Server Switch Required')."</h2>\n".
+                      &mt('Construction Space access is only available from '.
+                          'the home server of the corresponding Author.').'<br />'.
+                      &mt("Click the 'Switch Server' link to go there.").'<br />');
+        }
     }
 # ----------------------------------------------------------------------- Table
     unless ((!&Apache::loncommon::show_course()) || ($nochoose) || ($countactive==1)) {
@@ -1597,9 +1621,10 @@ sub display_cc_role {
     my $advanced = $env{'user.adv'};
     my $tryagain = $env{'form.tryagain'};
     unless ($rolekey =~/^error\:/) {
-        if ($rolekey =~ m-^user\.role.cc\./($match_domain)/($match_courseid)$-) {
-            my $tcourseid = $1.'_'.$2;
-            my $trolecode = 'cc./'.$1.'/'.$2;
+        if ($rolekey =~ m{^user\.role\.(cc|co)\./($match_domain)/($match_courseid)$}) {
+            my $ccrole = $1;
+            my $tcourseid = $2.'_'.$3;
+            my $trolecode = $1.'./'.$2.'/'.$3;
             my $twhere;
             my $ttype;
             my $tbg='LC_roles_is';
@@ -1614,7 +1639,7 @@ sub display_cc_role {
                 $twhere=&mt('Currently not available');
                 $env{'course.'.$tcourseid.'.description'}=$twhere;
             }
-            my $trole = &Apache::lonnet::plaintext('cc',$ttype);
+            my $trole = &Apache::lonnet::plaintext($ccrole,$ttype);
             $twhere.="<br />".&mt('Domain').":".$1;
             ($roletext,$roletext_end) = &build_roletext($trolecode,$1,$2,'is',$tryagain,$advanced,'',$tbg,$trole,$twhere,'','','',1,'');
         }