--- loncom/auth/lonroles.pm	2010/01/02 19:14:29	1.231.4.9
+++ 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.9 2010/01/02 19:14:29 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);
@@ -659,12 +659,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 the course.').'</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>');
 	    }
         }
     }
@@ -692,41 +691,27 @@ 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"');
         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) {
             &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));
@@ -755,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('<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)) {
@@ -851,7 +857,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());
@@ -1098,7 +1104,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 +1166,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.').'<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>');
+    $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 {
-    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 @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>');
-        }
-    }
-    return;
-}
-
 sub queued_selfenrollment {
     my ($r) = @_;
     my %selfenrollrequests = &Apache::lonnet::dump('selfenrollrequests');
@@ -1441,22 +1393,21 @@ sub check_fordc {
 }
 
 sub adhoc_course_role {
-    my ($refresh,$then) = @_;
-    my ($cdom,$cnum,$crstype);
+    my ($then) = @_; 
+    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,$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;
@@ -1486,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']);
             }
@@ -1496,20 +1447,15 @@ 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,$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});
-                if ($tstart && $tstart>$refresh) { $is_cc = 0; }
+                if ($tstart && $tstart>$then) { $is_cc = 0; }
                 if ($tend   && $tend  <$then) { $is_cc = 0; }
             }
         }
@@ -1522,7 +1468,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="" />'.
@@ -1532,8 +1478,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">
@@ -1618,7 +1564,7 @@ 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