--- loncom/auth/lonroles.pm	2009/09/23 16:45:17	1.231.6.2
+++ 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.6.2 2009/09/23 16:45:17 gci 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 {
@@ -226,7 +238,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($then);
+                    &adhoc_course_role($refresh,$then);
                 }
             }
 	    my %temp=('logout_'.$env{'request.course.id'} => time);
@@ -740,27 +752,6 @@ 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)) {
@@ -1393,21 +1384,21 @@ sub check_fordc {
 }
 
 sub adhoc_course_role {
-    my ($then) = @_; 
+    my ($refresh,$then) = @_;
     my ($cdom,$cnum);
     $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
     $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
-    if (&check_forcc($cdom,$cnum,$then)) {
+    if (&check_forcc($cdom,$cnum,$refresh,$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>$then || $start == -1)) ||
+            if (($start && ($start>$refresh || $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;
@@ -1437,7 +1428,7 @@ sub adhoc_course_role {
                 }
                 &Apache::lonnet::standard_roleprivs(\%newrole,$role,$cdom,$spec,$cnum,$area);
                 &Apache::lonnet::set_userprivs(\%userroles,\%newrole,\%newgroups);
-                my $adhocstart = $then-1;
+                my $adhocstart = $refresh-1;
                 $userroles{'user.role.'.$spec} = $adhocstart.'.';
                 &Apache::lonnet::appenv(\%userroles,[$role,'cm']);
             }
@@ -1447,7 +1438,7 @@ sub adhoc_course_role {
 }
 
 sub check_forcc {
-    my ($cdom,$cnum,$then) = @_;
+    my ($cdom,$cnum,$refresh,$then) = @_;
     my $is_cc;
     if ($cdom ne '' && $cnum ne '') {
         if (&Apache::lonnet::is_course($cdom,$cnum)) {
@@ -1455,7 +1446,7 @@ sub check_forcc {
             if (defined($env{$envkey})) {
                 $is_cc = 1;
                 my ($tstart,$tend)=split(/\./,$env{$envkey});
-                if ($tstart && $tstart>$then) { $is_cc = 0; }
+                if ($tstart && $tstart>$refresh) { $is_cc = 0; }
                 if ($tend   && $tend  <$then) { $is_cc = 0; }
             }
         }