--- loncom/auth/lonroles.pm	2010/01/02 18:49:20	1.231.4.6
+++ 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.231.4.6 2010/01/02 18:49:20 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
 #
@@ -158,8 +158,12 @@ sub redirect_user {
 	$navwindow.=&Apache::lonnavmaps::close();
     }
 
+    # Breadcrumbs
+    my $brcrum = [{'href' => $url,
+                   'text' => 'Switching Role'},];
     my $start_page = &Apache::loncommon::start_page('Switching Role',undef,
-                                                    {'redirect' => [1,$url]});
+                                                    {'redirect' => [1,$url],
+                                                     'bread_crumbs' => $brcrum,});
     my $end_page   = &Apache::loncommon::end_page();
 
 # Note to style police: 
@@ -185,17 +189,25 @@ sub error_page {
     &Apache::loncommon::no_cache($r);
     $r->send_http_header;
     return OK if $r->header_only;
-    $r->print(&Apache::loncommon::start_page('Problems during Course Initialization').
+    # Breadcrumbs
+    my $brcrum = [{'href' => $dest,
+                   'text' => 'Problems during Course Initialization'},];
+    $r->print(&Apache::loncommon::start_page('Problems during Course Initialization',
+                                             undef,
+                                             {'bread_crumbs' => $brcrum,})
+    );
+    $r->print(
         '<script type="text/javascript">'.
         '// <![CDATA['.
         &Apache::lonmenu::rawconfig().
         '// ]]>'.
         '</script>'.
 	      '<p class="LC_error">'.&mt('The following problems occurred:').
-              '<br />'.
+          '<br />'.
 	      $error.
-	      '</p><br /><a href="'.$dest.'">'.&mt('Continue').'</a>'.
-              &Apache::loncommon::end_page());
+	      '</p><br /><a href="'.$dest.'">'.&mt('Continue').'</a>'
+    );
+    $r->print(&Apache::loncommon::end_page());
 }
 
 sub handler {
@@ -243,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;
                 }
@@ -306,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\./);
@@ -479,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'}) {
@@ -659,7 +674,7 @@ ENDHEADER
             if ($reinit) {
                 $r->print(
  '<h3><span class="LC_error">'.
- &mt('As your session file for the course or community has expired, you will need to re-select the course.').'</span></h3>');
+ &mt('As your session file for the course or community has expired, you will need to re-select it.').'</span></h3>');
             } else {
 	        $r->print(
  '<h3><span class="LC_error">'.
@@ -692,16 +707,16 @@ ENDHEADER
     $refresh = $now;
     &Apache::lonnet::appenv({'user.refresh.time'  => $refresh});
     if ($env{'user.adv'}) {
-        $r->print(
-              '<p><label>'.&mt('Show all roles').': <input type="checkbox" name="showall"');
+        $r->print('<p><label><input type="checkbox" name="showall"');
         if ($env{'form.showall'}) { $r->print(' checked="checked" '); }
-        $r->print(' /></label><input type="submit" value="'.&mt('Display').'" /></p>');
+        $r->print(' />'.&mt('Show all roles').'</label>'
+                 .' <input type="submit" value="'.&mt('Update display').'" />'
+                 .'</p>');
     } else {
         if ($countactive > 0) {
             &queued_selfenrollment($r);
             my $domdesc = &Apache::lonnet::domain($env{'user.domain'},'description');
             my $esc_dom = &HTML::Entities::encode($env{'user.domain'},'"<>&'); 
-
             $r->print(
                 '<p>'
                .&mt('[_1]Visit the [_2]Course/Community Catalog[_3]'
@@ -726,7 +741,7 @@ ENDHEADER
 	    $r->print('<h2>'.&mt('Currently no active roles, courses or communities').'</h2>');
 	}
         &findcourse_advice($r);
-        &requestcourse_advice($r);
+        &requestcourse_advice($r); 
 	$r->print('</form>');
         if ($countfuture) {
             $r->print(&mt('The following [quant,_1,role,roles] will become active in the future:',$countfuture));
@@ -755,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)) {
@@ -1098,7 +1134,7 @@ sub roletable_headers {
 }
 
 sub roletypes {
-    my @types = ('Domain','Construction Space','Course','Unavailable','System');
+    my @types = ('Domain','Construction Space','Course','Community','Unavailable','System');
     return @types; 
 }
 
@@ -1175,12 +1211,12 @@ sub requestcourse_advice {
     &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')) {
+        if ((ref($types) eq 'ARRAY') && (ref($typename) eq 'HASH')) { 
             $r->print('<h3>'.&mt('Request creation of a course or community').'</h3>'.
                       '<p>'.&mt('You have rights to request the creation of courses and/or communities in the following domain(s):').'<ul>');
             my (@reqdoms,@reqtypes);
             foreach my $type (sort(keys(%request_doms))) {
-                push(@reqtypes,$type);
+                push(@reqtypes,$type); 
                 if (ref($request_doms{$type}) eq 'ARRAY') {
                     my $domstr = join(', ',map { &Apache::lonnet::domain($_) } sort(@{$request_doms{$type}}));
                     $r->print(
@@ -1213,7 +1249,7 @@ sub requestcourse_advice {
             }
             if (@reqdoms == 1 || @showtypes > 0) {
                 $requrl .= '&state=crstype&action=new';
-            }
+            } 
             $r->print('</ul>'.&mt('Use the [_1]request form[_2] to submit a request for creation of a new course or community.','<a href="'.$requrl.'">','</a>').'</p>');
         }
     }
@@ -1442,10 +1478,11 @@ sub check_fordc {
 
 sub adhoc_course_role {
     my ($refresh,$then) = @_;
-    my ($cdom,$cnum);
+    my ($cdom,$cnum,$crstype);
     $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
     $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
-    if (&check_forcc($cdom,$cnum,$refresh,$then)) {
+    $crstype = &Apache::loncommon::course_type();
+    if (&check_forcc($cdom,$cnum,$refresh,$then,$crstype)) {
         my $setprivs;
         if (!defined($env{'user.role.'.$env{'form.switchrole'}})) {
             $setprivs = 1;
@@ -1495,11 +1532,16 @@ sub adhoc_course_role {
 }
 
 sub check_forcc {
-    my ($cdom,$cnum,$refresh,$then) = @_;
-    my $is_cc;
+    my ($cdom,$cnum,$refresh,$then,$crstype) = @_;
+    my ($is_cc,$ccrole);
+    if ($crstype eq 'Community') {
+        $ccrole = 'co';
+    } else {
+        $ccrole = 'cc';
+    }
     if ($cdom ne '' && $cnum ne '') {
         if (&Apache::lonnet::is_course($cdom,$cnum)) {
-            my $envkey = 'user.role.cc./'.$cdom.'/'.$cnum;
+            my $envkey = 'user.role.'.$ccrole.'./'.$cdom.'/'.$cnum;
             if (defined($env{$envkey})) {
                 $is_cc = 1;
                 my ($tstart,$tend)=split(/\./,$env{$envkey});
@@ -1516,7 +1558,7 @@ sub courselink {
     my $courseform=&Apache::loncommon::selectcourse_link
                    ('rolechoice','dccourse'.$rowtype.'_'.$dcdom,
                     'dcdomain'.$rowtype.'_'.$dcdom,'coursedesc'.$rowtype.'_'.
-                    $dcdom,$dcdom,undef);
+                    $dcdom,$dcdom,undef,'Course/Community');
     my $hiddenitems = '<input type="hidden" name="dcdomain'.$rowtype.'_'.$dcdom.'" value="'.$dcdom.'" />'.
                       '<input type="hidden" name="origdom'.$rowtype.'_'.$dcdom.'" value="'.$dcdom.'" />'.
                       '<input type="hidden" name="dccourse'.$rowtype.'_'.$dcdom.'" value="" />'.
@@ -1579,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';
@@ -1596,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,'');
         }
@@ -1612,7 +1655,7 @@ sub adhoc_roles_row {
                      ,'<span class="LC_cusr_emph">','</span>',$dcdom)
                  .' ';
     my $selectcclink = &courselink($dcdom,$rowtype);
-    my $ccrole = &Apache::lonnet::plaintext('cc');
+    my $ccrole = &Apache::lonnet::plaintext('co',undef,undef,1);
     my $carole = &Apache::lonnet::plaintext('ca');
     my $selectcalink = &coauthorlink($dcdom,$rowtype);
     $output.=$ccrole.': '.$selectcclink