[LON-CAPA-cvs] cvs: loncom /auth lonroles.pm

[www]

www		Thu Oct  2 10:34:07 2008 EDT

  Modified files:              
    /loncom/auth	lonroles.pm 
  Log:
  Do not automatically select the only available role
  
  
Index: loncom/auth/lonroles.pm
diff -u loncom/auth/lonroles.pm:1.206 loncom/auth/lonroles.pm:1.207
--- loncom/auth/lonroles.pm:1.206	Wed Sep  3 00:28:22 2008
+++ loncom/auth/lonroles.pm	Thu Oct  2 10:34:03 2008
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # User Roles Screen
 #
-# $Id: lonroles.pm,v 1.206 2008/09/03 04:28:22 raeburn Exp $
+# $Id: lonroles.pm,v 1.207 2008/10/02 14:34:03 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -742,30 +742,7 @@
         }
         $r->print(&Apache::loncommon::end_page());
 	return OK;
-# Is there only one choice?
-    } elsif ($countactive==1) {
-        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 />');   
-        }
     }
-# More than one possible role
 # ----------------------------------------------------------------------- Table
     unless ((!&Apache::lonmenu::show_course()) || ($nochoose) || ($countactive==1)) {
 	$r->print("<h2>".&mt('Select a Course to Enter')."</h2>\n");