--- loncom/auth/switchserver.pm	2005/12/28 16:46:47	1.6
+++ loncom/auth/switchserver.pm	2007/09/29 04:03:46	1.17
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Switch Servers Handler
 #
-# $Id: switchserver.pm,v 1.6 2005/12/28 16:46:47 albertel Exp $
+# $Id: switchserver.pm,v 1.17 2007/09/29 04:03:46 albertel 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); 
@@ -60,6 +59,20 @@ sub init_env {
     return $r->dir_config('lonIDsDir')."/$handle.id";
 }
 
+sub do_redirect {
+    my ($r,$url,$only_body,$extra_text) = @_;
+    $r->send_http_header;
+    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);
+    return OK;
+
+}
+
 sub handler {
     my ($r) = @_;
     
@@ -69,14 +82,27 @@ sub handler {
     &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
 					    ['otherserver','role']);
 
-    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'}};
+    my $switch_to=&Apache::lonnet::hostname($env{'form.otherserver'});
+    if (! $env{'form.otherserver'}) {
+	$env{'form.otherserver'} =	
+	    &Apache::lonnet::find_existing_session($env{'user.domain'},
+						   $env{'user.name'});
+	if (! $env{'form.otherserver'}) {
+	    $env{'form.otherserver'} = 
+		&Apache::lonnet::spareserver(30000,undef,1);
+	}
+
+	$switch_to=&Apache::lonnet::hostname($env{'form.otherserver'});
     }
 
     if (!defined($switch_to)) { return FORBIDDEN; }
 
+    if ($env{'user.name'} eq 'public'
+	&& $env{'user.domain'} eq 'public') {
+	my $url = 'http://'.$switch_to.'/'.$r->uri;
+	return &do_redirect($r,$url,1)
+    }
+
     if ($env{'form.role'} && 
 	!exists($env{'user.role.'.$env{'form.role'}})) { return FORBIDDEN; }
 
@@ -90,12 +116,19 @@ 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
 	   
-    my $windowinfo=&Apache::lonmenu::close();
-    $windowinfo.=&Apache::lonnavmaps::close();
+    my $windowinfo=
+	&Apache::lonmenu::close().
+	&Apache::lonnavmaps::close();
 # ---------------------------------------------------------------- Get handover
 
     my %info=('ip'       => $ENV{'REMOTE_ADDR'},
@@ -103,23 +136,20 @@ sub handler {
 	      'username' => $env{'user.name'},
 	      'role'     => $env{'form.role'},
 	      'server'   => $r->dir_config('lonHostID'));
+    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 $bodytag=&Apache::loncommon::bodytag('Switching Server ...');
+    my $url ='http://'.$switch_to.'/adm/login?'.
+	'domain='.$env{'user.domain'}.
+	'&username='.$env{'user.name'}.
+	'&token='.$token;
 # --------------------------------------------------------------- Screen Output
-    $r->print(<<ENDDOCUMENT);
-	   <html>
-	       <head><title>The LearningOnline Network with CAPA Logout</title>
-	       $switch
-	       </head>
-	       $bodytag
-	       $windowinfo
-	       </body>
-	       </html>
-ENDDOCUMENT
-
     &Apache::lonnet::flushcourselogs();
-    return OK;
+    return &do_redirect($r,$url,0,$windowinfo);
 }
 
 1;