--- loncom/auth/switchserver.pm	2011/08/02 14:20:42	1.28.2.4
+++ loncom/auth/switchserver.pm	2010/08/18 19:25:12	1.29
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Switch Servers Handler
 #
-# $Id: switchserver.pm,v 1.28.2.4 2011/08/02 14:20:42 raeburn Exp $
+# $Id: switchserver.pm,v 1.29 2010/08/18 19:25:12 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -59,22 +59,13 @@ 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 {
     my ($r) = @_;
     
@@ -117,7 +108,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; 
                 }
@@ -172,10 +163,7 @@ sub handler {
 	return OK;
     }
 # -------------------------------------------------------- Menu script and info
-
-    my $windowinfo=
-        &Apache::lonmenu::close().
-        &Apache::lonnavmaps::close();
+	   
 # ---------------------------------------------------------------- Get handover
 
     my %info=('ip'       => $ENV{'REMOTE_ADDR'},
@@ -201,7 +189,8 @@ sub handler {
 	'&username='.$env{'user.name'}.
 	'&token='.$token;
 # --------------------------------------------------------------- Screen Output
-    return &do_redirect($r,$url,0,$windowinfo);
+    &Apache::lonnet::flushcourselogs();
+    return &do_redirect($r, $url, 0);
 }
 
 1;