--- loncom/auth/lonroles.pm	2010/08/20 03:40:01	1.231.4.15
+++ loncom/auth/lonroles.pm	2009/10/23 00:20:36	1.232
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # User Roles Screen
 #
-# $Id: lonroles.pm,v 1.231.4.15 2010/08/20 03:40:01 raeburn Exp $
+# $Id: lonroles.pm,v 1.232 2009/10/23 00:20:36 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 {
@@ -225,16 +237,7 @@ sub handler {
 	if ($env{'request.course.id'}) {
             # Check if user is CC trying to select a course role
             if ($env{'form.switchrole'}) {
-                my $switch_is_active;
-                if (defined($env{'user.role.'.$env{'form.switchrole'}})) {
-                    my ($start,$end) = split(/\./,$env{'user.role.'.$env{'form.switchrole'}});
-                    if (!$end || $end > $now) {
-                        if (!$start || $start < $refresh) {
-                            $switch_is_active = 1;
-                        }
-                    }
-                }
-                unless ($switch_is_active) {
+                if (!defined($env{'user.role.'.$env{'form.switchrole'}})) {
                     &adhoc_course_role($refresh,$then);
                 }
             }
@@ -252,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 Coordinator role?
-                if (my ($ccrole,$domain,$coursenum) =
-		    ($envkey =~ m-^form\.(cc|co)\./($match_domain)/($match_courseid)$-)) {
+# Is this an ad-hoc CC-role?
+                if (my ($domain,$coursenum) =
+		    ($envkey =~ m-^form\.cc\./($match_domain)/($match_courseid)$-)) {
                     if ($dcroles{$domain}) {
                         &Apache::lonnet::check_adhoc_privs($domain,$coursenum,
-                                                           $then,$refresh,$now,$ccrole);
+                                                           $then,$refresh,$now,'cc');
                     }
                     last;
                 }
@@ -270,7 +273,7 @@ sub handler {
                         my ($server_status,$home) = &check_author_homeserver($user,$domain);
                         if ($server_status eq 'switchserver') {
                             my $trolecode = 'au./'.$domain.'/';
-                            my $switchserver = '/adm/switchserver?otherserver='.$home.'&amp;role='.$trolecode;
+                            my $switchserver = '/adm/switchserver?otherserver='.$home.'&role='.$trolecode;
                             $r->internal_redirect($switchserver);
                         }
                         last;
@@ -281,7 +284,7 @@ sub handler {
                             my ($server_status,$home) = &check_author_homeserver($user,$domain);
                             if ($server_status eq 'switchserver') {
                                 my $trolecode = 'ca./'.$domain.'/'.$user;
-                                my $switchserver = '/adm/switchserver?otherserver='.$home.'&amp;role='.$trolecode;
+                                my $switchserver = '/adm/switchserver?otherserver='.$home.'&role='.$trolecode;
                                 $r->internal_redirect($switchserver);
                             }
                             last;
@@ -302,7 +305,7 @@ sub handler {
                             if ($server_status eq 'switchserver') {
                                 my $trolecode = 'ca./'.$domain.'/'.$user; 
                                 my $switchserver = '/adm/switchserver?'
-                                                  .'otherserver='.$home.'&amp;role='.$trolecode;
+                                                  .'otherserver='.$home.'&role='.$trolecode;
                                 $r->internal_redirect($switchserver);
                             }
                         } else {
@@ -488,8 +491,8 @@ ENDENTERKEY
 				    $courseid = substr($courseid, 1);
 				}
 				$courseid =~ s/\//_/;
-				if ((($role eq 'cc') || ($role eq 'co')) 
-                                      && ($env{'course.' . $courseid .'.course.helper.not.run'})) { 
+				if ($role eq 'cc' && $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'}) {
@@ -668,12 +671,11 @@ 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 it.').'</span></h3>');
+ &mt('As your session file for the course has expired, you will need to re-select the course.').'</span></h3>');
             } else {
 	        $r->print(
  '<h3><span class="LC_error">'.
- &mt('You need to choose another user role or enter a specific course or community for this function.').
- '</span></h3>');
+ &mt('You need to choose another user role or enter a specific course for this function').'</span></h3>');
 	    }
         }
     }
@@ -701,42 +703,27 @@ ENDHEADER
     $refresh = $now;
     &Apache::lonnet::appenv({'user.refresh.time'  => $refresh});
     if ($env{'user.adv'}) {
-        $r->print('<p><label><input type="checkbox" name="showall"');
+        $r->print(
+              '<p><label>'.&mt('Show all roles').': <input type="checkbox" name="showall"');
         if ($env{'form.showall'}) { $r->print(' checked="checked" '); }
-        $r->print(' />'.&mt('Show all roles').'</label>'
-                 .' <input type="submit" value="'.&mt('Update display').'" />'
-                 .'</p>');
+        $r->print(' /></label><input type="submit" value="'.&mt('Display').'" /></p>');
     } else {
         if ($countactive > 0) {
-            $r->print(&Apache::loncoursequeueadmin::queued_selfenrollment());
+            &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]'
-                   .' to view all [_4] LON-CAPA courses and communities.'
-                   ,'<b>'
-                   ,'<a href="/adm/coursecatalog?showdom='.$esc_dom.'">'
-                   ,'</a></b>',$domdesc)
-               .'<br />'
-               .&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.'
-                   ,'<b>','</b>')
-               .'</p>'
-            );
+            $r->print('<p>'.&mt('[_1]Visit the [_2]Course Catalog[_3] to view all [_4] LON-CAPA courses.','<b>','<a href="/adm/coursecatalog?showdom='.$esc_dom.'">','</a></b>',$domdesc).'<br />'.&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.','<b>','</b>').'</p>');
         }
     }
 
 # No active roles
     if ($countactive==0) {
 	if ($inrole) {
-	    $r->print('<h2>'.&mt('Currently no additional roles, courses or communities').'</h2>');
+	    $r->print('<h2>'.&mt('Currently no additional roles or courses').'</h2>');
 	} else {
-	    $r->print('<h2>'.&mt('Currently no active roles, courses or communities').'</h2>');
+	    $r->print('<h2>'.&mt('Currently no active roles or courses').'</h2>');
 	}
         &findcourse_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));
@@ -767,12 +754,6 @@ ENDHEADER
 	return OK;
     }
 # ----------------------------------------------------------------------- Table
-    if ($numdc > 0) {
-        $r->print(&coursepick_jscript());
-        $r->print(&Apache::loncommon::coursebrowser_javascript().
-                  &Apache::loncommon::authorbrowser_javascript());
-    }
-
     unless ((!&Apache::loncommon::show_course()) || ($nochoose) || ($countactive==1)) {
 	$r->print("<h2>".&mt('Select a Course to Enter')."</h2>\n");
     }
@@ -789,31 +770,23 @@ ENDHEADER
         my %recent_roles =
                &Apache::lonhtmlcommon::get_recent('roles',$env{'environment.recentrolesn'});
 	my $output='';
-	foreach my $role (sort(keys(%recent_roles))) {
-	    if (ref($roletext{'user.role.'.$role}) eq 'ARRAY') {
+	foreach (sort(keys(%recent_roles))) {
+	    if (ref($roletext{'user.role.'.$_}) eq 'ARRAY') {
 		$output.= &Apache::loncommon::start_data_table_row().
-                          $roletext{'user.role.'.$role}->[0].
+                          $roletext{'user.role.'.$_}->[0].
+                          &Apache::loncommon::end_data_table_row().
+                          &Apache::loncommon::continue_data_table_row().
+                          $roletext{'user.role.'.$_}->[1].
                           &Apache::loncommon::end_data_table_row();
-                if ($roletext{'user.role.'.$role}->[1] ne '') {
-                    $output .= &Apache::loncommon::continue_data_table_row().
-                               $roletext{'user.role.'.$role}->[1].
-                               &Apache::loncommon::end_data_table_row();
-                }
-                if ($role =~ m{dc\./($match_domain)/} 
+                if ($_ =~ m-dc\./($match_domain)/- 
 		    && $dcroles{$1}) {
 		    $output .= &adhoc_roles_row($1,'recent');
                 }
 	    } elsif ($numdc > 0) {
-                unless ($role =~/^error\:/) {
-                    my ($roletext,$role_text_end) = &display_cc_role('user.role.'.$role);
-                    $output.= &Apache::loncommon::start_data_table_row().
-                              $roletext.
-                              &Apache::loncommon::end_data_table_row().
-                              &Apache::loncommon::continue_data_table_row().
-                              $role_text_end.
-                              &Apache::loncommon::end_data_table_row();
+                unless ($_ =~/^error\:/) {
+                    $output.=&display_cc_role('user.role.'.$_);
                 }
-            }
+            } 
 	}
 	if ($output) {
 	    $r->print(&Apache::loncommon::start_data_table_empty_row()
@@ -826,6 +799,12 @@ ENDHEADER
             $doheaders ++;
 	}
     }
+
+    if ($numdc > 0) {
+        $r->print(&coursepick_jscript());
+        $r->print(&Apache::loncommon::coursebrowser_javascript().
+                  &Apache::loncommon::authorbrowser_javascript());
+    }
     &print_rolerows($r,$doheaders,\%roleclass,\%sortrole,\%dcroles,\%roletext);
     if ($countactive > 1) {
         my $tremark='';
@@ -869,7 +848,7 @@ ENDHEADER
                  .'</i><br />'
                  .'<a href="/adm/logout">'.&mt('Logout').'</a>&nbsp;&nbsp;'
                  .'<a href="/adm/coursecatalog?showdom='.$esc_dom.'">'
-                 .&mt('Course/Community Catalog')
+                 .&mt('Course Catalog')
                  .'</a></small></p>');
     }
     $r->print(&Apache::loncommon::end_page());
@@ -933,7 +912,7 @@ sub gather_roles {
                 if ($role =~ /^cr\//) {
                     my ($rdummy,$rdomain,$rauthor,$rrole)=split(/\//,$role);
                     if ($tremark) { $tremark.='<br />'; }
-                    $tremark.=&mt('Customrole defined by [_1].',$rauthor.':'.$rdomain);
+                    $tremark.=&mt('Defined by [_1] at [_2].',$rauthor,$rdomain);
                 }
                 $trole=Apache::lonnet::plaintext($role);
                 my $ttype;
@@ -948,7 +927,7 @@ sub gather_roles {
                     foreach my $id (@ids) { if ($id eq $home) { $allowed=1; } }
                     if (!$allowed) {
                         $button=0;
-                        $switchserver='otherserver='.$home.'&amp;role='.$trolecode;
+                        $switchserver='otherserver='.$home.'&role='.$trolecode;
                     }
                     #next if ($home eq 'no_host');
                     $home = &Apache::lonnet::hostname($home);
@@ -968,7 +947,7 @@ sub gather_roles {
                     foreach my $id (@ids) { if ($id eq $home) { $allowed=1; } }
                     if (!$allowed) {
                         $button=0;
-                        $switchserver='otherserver='.$home.'&amp;role='.$trolecode;
+                        $switchserver='otherserver='.$home.'&role='.$trolecode;
                     }
                     #next if ($home eq 'no_host');
                     $home = &Apache::lonnet::hostname($home);
@@ -981,11 +960,10 @@ sub gather_roles {
                 } elsif ($trest) {
                     my $tcourseid=$tdom.'_'.$trest;
                     $ttype = &Apache::loncommon::course_type($tcourseid);
-                    $trole = &Apache::lonnet::plaintext($role,$ttype,$tcourseid);
+                    $trole = &Apache::lonnet::plaintext($role,$ttype);
                     if ($env{'course.'.$tcourseid.'.description'}) {
                         $twhere=$env{'course.'.$tcourseid.'.description'};
                         $sortkey=$role."\0".$tdom."\0".$twhere."\0".$envkey;
-                        $twhere = &HTML::Entities::encode($twhere,'"<>&');
                         unless ($twhere eq &mt('Currently not available')) {
                             $twhere.=' <span class="LC_fontsize_small">'.
         &Apache::loncommon::syllabuswrapper(&mt('Syllabus'),$trest,$tdom).
@@ -996,12 +974,12 @@ sub gather_roles {
                         if (%newhash) {
                             $sortkey=$role."\0".$tdom."\0".$newhash{'description'}.
                                 "\0".$envkey;
-                            $twhere=&HTML::Entities::encode($newhash{'description'},'"<>&').
+                            $twhere=$newhash{'description'}.
                               ' <span class="LC_fontsize_small">'.
         &Apache::loncommon::syllabuswrapper(&mt('Syllabus'),$trest,$tdom).
                               '</span>';
                             $ttype = $newhash{'type'};
-                            $trole = &Apache::lonnet::plaintext($role,$ttype,$tcourseid);
+                            $trole = &Apache::lonnet::plaintext($role,$ttype);
                         } else {
                             $twhere=&mt('Currently not available');
                             $env{'course.'.$tcourseid.'.description'}=$twhere;
@@ -1117,7 +1095,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; 
 }
 
@@ -1133,12 +1111,10 @@ sub print_rolerows {
                         if (ref($roletext->{$sortrole->{$which}}) eq 'ARRAY') {
                             $output.= &Apache::loncommon::start_data_table_row().
                                       $roletext->{$sortrole->{$which}}->[0].
+                                      &Apache::loncommon::end_data_table_row().
+                                      &Apache::loncommon::continue_data_table_row().
+                                      $roletext->{$sortrole->{$which}}->[1].
                                       &Apache::loncommon::end_data_table_row();
-                            if ($roletext->{$sortrole->{$which}}->[1] ne '') {
-                                $output .= &Apache::loncommon::continue_data_table_row().
-                                           $roletext->{$sortrole->{$which}}->[1].
-                                           &Apache::loncommon::end_data_table_row();
-                            }
                         }
                         if ($sortrole->{$which} =~ m-dc\./($match_domain)/-) {
                             if (ref($dcroles) eq 'HASH') {
@@ -1181,62 +1157,51 @@ 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.').'<br />');
     }
-    $r->print('<h3>'.&mt('Self-Enrollment').'</h3>'.
-              '<p>'.&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.','<a href="/adm/coursecatalog?showdom='.$esc_dom.'">','</a>',$domdesc).'<br />');
-    $r->print(&mt('You can search for courses and communities which permit self-enrollment, if you would like to enroll in one.').'</p>'.
-              &Apache::loncoursequeueadmin::queued_selfenrollment());
+    $r->print('<p>'.&mt('The [_1]Course Catalog[_2] provides information about all [_3] classes for which LON-CAPA courses have been created.','<a href="/adm/coursecatalog?showdom='.$esc_dom.'">','</a>',$domdesc).'<br />');
+    $r->print(&mt('You can search the course catalog for courses which permit self-enrollment, if you would like to enroll in a course.').'</p>');
+    &queued_selfenrollment($r);
     return;
 }
 
-sub requestcourse_advice {
+sub queued_selfenrollment {
     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('<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);
-                if (ref($request_doms{$type}) eq 'ARRAY') {
-                    my $domstr = join(', ',map { &Apache::lonnet::domain($_) } sort(@{$request_doms{$type}}));
-                    $r->print(
-                        '<li>'
-                       .&mt('[_1]'.$typename->{$type}.'[_2] in domain: [_3]',
-                            '<i>',
-                            '</i>',
-                            '<b>'.$domstr.'</b>')
-                       .'</li>'
-                    );
-                    foreach my $dom (@{$request_doms{$type}}) {
-                        unless (grep(/^\Q$dom\E/,@reqdoms)) {
-                            push(@reqdoms,$dom);
-                        }
+    my %selfenrollrequests = &Apache::lonnet::dump('selfenrollrequests');
+    my %reqs_by_date;
+    foreach my $item (keys(%selfenrollrequests)) {
+        if (ref($selfenrollrequests{$item}) eq 'HASH') {
+            if ($selfenrollrequests{$item}{'status'} eq 'request') {
+                if ($selfenrollrequests{$item}{'timestamp'}) {
+                    push(@{$reqs_by_date{$selfenrollrequests{$item}{'timestamp'}}},$item);
+                }
+            } 
+        }
+    }
+    if (keys(%reqs_by_date)) {
+        my $rolename = &Apache::lonnet::plaintext('st');
+        $r->print('<b>'.&mt('Enrollment requests pending Course Coordinator approval').'</b><br />'.
+                  &Apache::loncommon::start_data_table().
+                  &Apache::loncommon::start_data_table_header_row().
+                  '<th>'.&mt('Date requested').'</th><th>'.&mt('Course title').'</th>'.
+                  '<th>'.&mt('User role').'</th><th>'.&mt('Section').'</th>'.
+                 &Apache::loncommon::end_data_table_header_row());
+        my @sorted = sort { $a <=> $b } (keys(%reqs_by_date));
+        foreach my $item (@sorted) {
+            if (ref($reqs_by_date{$item}) eq 'ARRAY') {
+                foreach my $crs (@{$reqs_by_date{$item}}) {
+                    my %courseinfo = &Apache::lonnet::coursedescription($crs);
+                    my $usec = $selfenrollrequests{$crs}{'section'};
+                    if ($usec eq '') {
+                        $usec = &mt('No section'); 
                     }
+                    $r->print(&Apache::loncommon::start_data_table_row().
+                             '<td>'.&Apache::lonlocal::locallocaltime($item).'</td>'.
+                             '<td>'.$courseinfo{'description'}.'</td>'.
+                             '<td>'.$rolename.'</td><td>'.$usec.'</td>'.
+                             &Apache::loncommon::end_data_table_row());
                 }
             }
-            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('</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>');
         }
+        $r->print(&Apache::loncommon::end_data_table());
     }
     return;
 }
@@ -1420,11 +1385,10 @@ sub check_fordc {
 
 sub adhoc_course_role {
     my ($refresh,$then) = @_;
-    my ($cdom,$cnum,$crstype);
+    my ($cdom,$cnum);
     $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
     $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
-    $crstype = &Apache::loncommon::course_type();
-    if (&check_forcc($cdom,$cnum,$refresh,$then,$crstype)) {
+    if (&check_forcc($cdom,$cnum,$refresh,$then)) {
         my $setprivs;
         if (!defined($env{'user.role.'.$env{'form.switchrole'}})) {
             $setprivs = 1;
@@ -1474,16 +1438,11 @@ sub adhoc_course_role {
 }
 
 sub check_forcc {
-    my ($cdom,$cnum,$refresh,$then,$crstype) = @_;
-    my ($is_cc,$ccrole);
-    if ($crstype eq 'Community') {
-        $ccrole = 'co';
-    } else {
-        $ccrole = 'cc';
-    }
+    my ($cdom,$cnum,$refresh,$then) = @_;
+    my $is_cc;
     if ($cdom ne '' && $cnum ne '') {
         if (&Apache::lonnet::is_course($cdom,$cnum)) {
-            my $envkey = 'user.role.'.$ccrole.'./'.$cdom.'/'.$cnum;
+            my $envkey = 'user.role.cc./'.$cdom.'/'.$cnum;
             if (defined($env{$envkey})) {
                 $is_cc = 1;
                 my ($tstart,$tend)=split(/\./,$env{$envkey});
@@ -1500,7 +1459,7 @@ sub courselink {
     my $courseform=&Apache::loncommon::selectcourse_link
                    ('rolechoice','dccourse'.$rowtype.'_'.$dcdom,
                     'dcdomain'.$rowtype.'_'.$dcdom,'coursedesc'.$rowtype.'_'.
-                    $dcdom,$dcdom,undef,'Course/Community');
+                    $dcdom,$dcdom,undef);
     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="" />'.
@@ -1510,8 +1469,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";
 <script type="text/javascript">
@@ -1563,12 +1522,9 @@ sub display_cc_role {
     my $advanced = $env{'user.adv'};
     my $tryagain = $env{'form.tryagain'};
     unless ($rolekey =~/^error\:/) {
-        if ($rolekey =~ m{^user\.role\.(cc|co)\./($match_domain)/($match_courseid)$}) {
-            my $ccrole = $1;
-            my $tdom = $2;
-            my $trest = $3;
-            my $tcourseid = $tdom.'_'.$trest;
-            my $trolecode = $ccrole.'./'.$tdom.'/'.$trest;
+        if ($rolekey =~ m-^user\.role.cc\./($match_domain)/($match_courseid)$-) {
+            my $tcourseid = $1.'_'.$2;
+            my $trolecode = 'cc./'.$1.'/'.$2;
             my $twhere;
             my $ttype;
             my $tbg='LC_roles_is';
@@ -1576,16 +1532,16 @@ sub display_cc_role {
             if (%newhash) {
                 $twhere=$newhash{'description'}.
                         ' <span style="LC_fontsize_small">'.
-                        &Apache::loncommon::syllabuswrapper(&mt('Syllabus'),$trest,$tdom).
+                        &Apache::loncommon::syllabuswrapper(&mt('Syllabus'),$2,$1).
                         '</span>';
                 $ttype = $newhash{'type'};
             } else {
                 $twhere=&mt('Currently not available');
                 $env{'course.'.$tcourseid.'.description'}=$twhere;
             }
-            my $trole = &Apache::lonnet::plaintext($ccrole,$ttype,$tcourseid);
-            $twhere.="<br />".&mt('Domain').":".$tdom;
-            ($roletext,$roletext_end) = &build_roletext($trolecode,$tdom,$trest,'is',$tryagain,$advanced,'',$tbg,$trole,$twhere,'','','',1,'');
+            my $trole = &Apache::lonnet::plaintext('cc',$ttype);
+            $twhere.="<br />".&mt('Domain').":".$1;
+            ($roletext,$roletext_end) = &build_roletext($trolecode,$1,$2,'is',$tryagain,$advanced,'',$tbg,$trole,$twhere,'','','',1,'');
         }
     }
     return ($roletext,$roletext_end);
@@ -1599,11 +1555,11 @@ sub adhoc_roles_row {
                      ,'<span class="LC_cusr_emph">','</span>',$dcdom)
                  .' ';
     my $selectcclink = &courselink($dcdom,$rowtype);
-    my $ccrole = &Apache::lonnet::plaintext('co',undef,undef,1);
+    my $ccrole = &Apache::lonnet::plaintext('cc');
     my $carole = &Apache::lonnet::plaintext('ca');
     my $selectcalink = &coauthorlink($dcdom,$rowtype);
     $output.=$ccrole.': '.$selectcclink
-            .' | '.$carole.': '.$selectcalink.'</td>'
+            .' | '.$carole.': '.$selectcalink
             .&Apache::loncommon::end_data_table_row();
     return $output;
 }