--- loncom/auth/switchserver.pm	2010/08/13 00:06:27	1.28.2.1
+++ loncom/auth/switchserver.pm	2010/09/06 15:44:05	1.30
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Switch Servers Handler
 #
-# $Id: switchserver.pm,v 1.28.2.1 2010/08/13 00:06:27 raeburn Exp $
+# $Id: switchserver.pm,v 1.30 2010/09/06 15:44:05 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 {
@@ -121,7 +127,11 @@ sub handler {
         my $canhost = 1;
         my $uprimary_id = &Apache::lonnet::domain($env{'user.domain'},'primary');
         my $uint_dom = &Apache::lonnet::internet_dom($uprimary_id);
-        my @intdoms = &Apache::lonnet::get_internet_names($env{'form.otherserver'});
+        my @intdoms;
+        my $internet_names = &Apache::lonnet::get_internet_names($env{'form.otherserver'});
+        if (ref($internet_names) eq 'ARRAY') {
+            @intdoms = @{$internet_names};
+        }
         unless ($uint_dom ne '' && grep(/^\Q$uint_dom\E$/,@intdoms)) {
             my $serverhomeID = &Apache::lonnet::get_server_homeID($switch_to);
             my $serverhomedom = &Apache::lonnet::host_domain($serverhomeID);
@@ -160,10 +170,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'},
@@ -189,8 +196,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;