--- loncom/auth/switchserver.pm	2006/11/23 01:49:41	1.10
+++ loncom/auth/switchserver.pm	2007/03/02 23:17:48	1.13
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Switch Servers Handler
 #
-# $Id: switchserver.pm,v 1.10 2006/11/23 01:49:41 albertel Exp $
+# $Id: switchserver.pm,v 1.13 2007/03/02 23:17:48 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -68,10 +68,10 @@ sub handler {
     &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
 					    ['otherserver','role']);
 
-    my $switch_to=$Apache::lonnet::hostname{$env{'form.otherserver'}};
+    my $switch_to=&Apache::lonnet::hostname($env{'form.otherserver'});
     if (!$env{'form.otherserver'}) {
 	$env{'form.otherserver'}=&Apache::lonnet::spareserver(30000,undef,1);
-	$switch_to=$Apache::lonnet::hostname{$env{'form.otherserver'}};
+	$switch_to=&Apache::lonnet::hostname($env{'form.otherserver'});
     }
 
     if (!defined($switch_to)) { return FORBIDDEN; }
@@ -89,6 +89,12 @@ sub handler {
 			 "Switch Server to $env{'form.otherserver'} with role $env{'form.role'} $ENV{'REMOTE_ADDR'}");
 
     &Apache::loncommon::content_type($r,'text/html');
+
+    #expire the cookie
+    my $c = new CGI::Cookie(-name    => 'lonID',
+			    -value   => '',
+			    -expires => '-10y',);
+    $r->header_out('Set-cookie' => $c);
     $r->send_http_header;
     return OK if $r->header_only;
 # -------------------------------------------------------- Menu script and info
@@ -105,6 +111,9 @@ sub handler {
     if ($env{'request.sso.login'}) {
 	$info{'sso.login'} = $env{'request.sso.login'};
     }
+    if ($env{'request.sso.reloginserver'}) {
+        $info{'sso.reloginserver'} = $env{'request.sso.reloginserver'};
+    }
     my $token = &Apache::lonnet::tmpput(\%info,$env{'form.otherserver'});
     my $switch='<meta HTTP-EQUIV="Refresh" CONTENT="0.5; url=http://'.$switch_to.'/adm/login?domain='.$env{'user.domain'}.'&username='.$env{'user.name'}.'&token='.$token.'">';
     my $start_page = &Apache::loncommon::start_page('Switching Server ...',