--- loncom/auth/switchserver.pm	2006/06/02 19:38:21	1.8
+++ loncom/auth/switchserver.pm	2007/01/12 15:44:27	1.11
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Switch Servers Handler
 #
-# $Id: switchserver.pm,v 1.8 2006/06/02 19:38:21 albertel Exp $
+# $Id: switchserver.pm,v 1.11 2007/01/12 15:44:27 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -47,8 +47,7 @@ sub init_env {
     my $cookie;
     if (!$lonid) { return undef; }
 
-    my $handle=$lonid->value;
-    $handle=~s/\W//g;
+    my $handle=&LONCAPA::clean_handle($lonid->value);
     my $lonidsdir=$r->dir_config('lonIDsDir');
     if ((!-e "$lonidsdir/$handle.id") || ($handle eq '')) {
 	$r->log_reason("Cookie $handle not valid", $r->filename); 
@@ -106,10 +105,14 @@ 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 ...',
-						    $switch);
+						    $switch,
+						    {'no_inline_link' => 1,});
     my $end_page   = &Apache::loncommon::end_page();
 # --------------------------------------------------------------- Screen Output
     $r->print($start_page.$windowinfo.$end_page);