--- loncom/auth/switchserver.pm 2010/09/06 15:45:08 1.28.2.3 +++ loncom/auth/switchserver.pm 2011/08/02 14:17:13 1.31 @@ -1,7 +1,7 @@ # The LearningOnline Network # Switch Servers Handler # -# $Id: switchserver.pm,v 1.28.2.3 2010/09/06 15:45:08 raeburn Exp $ +# $Id: switchserver.pm,v 1.31 2011/08/02 14:17:13 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -59,7 +59,6 @@ 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); @@ -67,7 +66,6 @@ sub do_redirect { $r->register_cleanup(\&flush_course_logs); } return OK; - } sub flush_course_logs { @@ -117,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; } @@ -172,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'}, @@ -201,7 +196,7 @@ sub handler { '&username='.$env{'user.name'}. '&token='.$token; # --------------------------------------------------------------- Screen Output - return &do_redirect($r,$url,0,$windowinfo); + return &do_redirect($r, $url, 0); } 1;