--- loncom/auth/switchserver.pm 2005/12/28 16:46:47 1.6
+++ loncom/auth/switchserver.pm 2006/11/23 01:49:41 1.10
@@ -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.10 2006/11/23 01:49:41 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);
@@ -103,20 +102,17 @@ 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'};
+ }
my $token = &Apache::lonnet::tmpput(\%info,$env{'form.otherserver'});
my $switch='';
- my $bodytag=&Apache::loncommon::bodytag('Switching Server ...');
+ my $start_page = &Apache::loncommon::start_page('Switching Server ...',
+ $switch,
+ {'no_inline_link' => 1,});
+ my $end_page = &Apache::loncommon::end_page();
# --------------------------------------------------------------- Screen Output
- $r->print(<
- The LearningOnline Network with CAPA Logout
- $switch
-
- $bodytag
- $windowinfo
-
-