--- loncom/auth/switchserver.pm	2010/08/18 19:40:23	1.28.2.2
+++ loncom/auth/switchserver.pm	2013/09/29 00:49:24	1.32
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Switch Servers Handler
 #
-# $Id: switchserver.pm,v 1.28.2.2 2010/08/18 19:40:23 raeburn Exp $
+# $Id: switchserver.pm,v 1.32 2013/09/29 00:49:24 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -59,12 +59,18 @@ sub do_redirect {
     my $start_page = 
 	&Apache::loncommon::start_page('Switching Server ...',undef,
 				       {'redirect'       => [0.5,$url],
-                                        'no_inline_link' => 1,
 					'only_body'      => $only_body,});
     my $end_page   = &Apache::loncommon::end_page();
     $r->print($start_page.$extra_text.$end_page);
+    unless ($env{'user.name'} eq 'public' && ($env{'user.domain'} eq 'public')) {
+        $r->register_cleanup(\&flush_course_logs);
+    }
     return OK;
+}
 
+sub flush_course_logs {
+    &Apache::lonnet::flushcourselogs();
+    return OK;
 }
 
 sub handler {
@@ -109,7 +115,7 @@ sub handler {
                 if (&Apache::lonnet::homeserver($env{'user.name'},$env{'user.domain'}) eq $env{'form.otherserver'}) {
                     $skip_canhost_check = 1;
                 }
-            } elsif ($env{'form.role'} =~ m{^[ac]a\./($match_domain)/($match_username)/$}) {
+            } elsif ($env{'form.role'} =~ m{^[ac]a\./($match_domain)/($match_username)$}) {
                 if (&Apache::lonnet::homeserver($2,$1) eq $env{'form.otherserver'}) {
                     $skip_canhost_check = 1; 
                 }
@@ -164,17 +170,16 @@ sub handler {
 	return OK;
     }
 # -------------------------------------------------------- Menu script and info
-
-    my $windowinfo=
-        &Apache::lonmenu::close().
-        &Apache::lonnavmaps::close();
+	   
 # ---------------------------------------------------------------- Get handover
 
+    my ($is_balancer) = &Apache::lonnet::check_loadbalancing($env{'user.name'},$env{'user.domain'});
     my %info=('ip'       => $ENV{'REMOTE_ADDR'},
 	      'domain'   => $env{'user.domain'},
 	      'username' => $env{'user.name'},
 	      'role'     => $env{'form.role'},
-	      'server'   => $r->dir_config('lonHostID'));
+	      'server'   => $r->dir_config('lonHostID'),
+	      'balancer' => $is_balancer);
     if ($env{'form.origurl'}) {
         $info{'origurl'} = $env{'form.origurl'};
     }
@@ -193,8 +198,7 @@ sub handler {
 	'&username='.$env{'user.name'}.
 	'&token='.$token;
 # --------------------------------------------------------------- Screen Output
-    &Apache::lonnet::flushcourselogs();
-    return &do_redirect($r,$url,0,$windowinfo);
+    return &do_redirect($r, $url, 0);
 }
 
 1;