Diff for /loncom/auth/switchserver.pm between versions 1.9 and 1.13

version 1.9, 2006/08/30 16:13:37 version 1.13, 2007/03/02 23:17:48
Line 47  sub init_env { Line 47  sub init_env {
     my $cookie;      my $cookie;
     if (!$lonid) { return undef; }      if (!$lonid) { return undef; }
   
     my $handle=$lonid->value;      my $handle=&LONCAPA::clean_handle($lonid->value);
     $handle=~s/\W//g;  
     my $lonidsdir=$r->dir_config('lonIDsDir');      my $lonidsdir=$r->dir_config('lonIDsDir');
     if ((!-e "$lonidsdir/$handle.id") || ($handle eq '')) {      if ((!-e "$lonidsdir/$handle.id") || ($handle eq '')) {
  $r->log_reason("Cookie $handle not valid", $r->filename);    $r->log_reason("Cookie $handle not valid", $r->filename); 
Line 69  sub handler { Line 68  sub handler {
     &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},      &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
     ['otherserver','role']);      ['otherserver','role']);
   
     my $switch_to=$Apache::lonnet::hostname{$env{'form.otherserver'}};      my $switch_to=&Apache::lonnet::hostname($env{'form.otherserver'});
     if (!$env{'form.otherserver'}) {      if (!$env{'form.otherserver'}) {
  $env{'form.otherserver'}=&Apache::lonnet::spareserver(30000,undef,1);   $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; }      if (!defined($switch_to)) { return FORBIDDEN; }
Line 90  sub handler { Line 89  sub handler {
  "Switch Server to $env{'form.otherserver'} with role $env{'form.role'} $ENV{'REMOTE_ADDR'}");   "Switch Server to $env{'form.otherserver'} with role $env{'form.role'} $ENV{'REMOTE_ADDR'}");
   
     &Apache::loncommon::content_type($r,'text/html');      &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;      $r->send_http_header;
     return OK if $r->header_only;      return OK if $r->header_only;
 # -------------------------------------------------------- Menu script and info  # -------------------------------------------------------- Menu script and info
Line 106  sub handler { Line 111  sub handler {
     if ($env{'request.sso.login'}) {      if ($env{'request.sso.login'}) {
  $info{'sso.login'} = $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 $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 $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 ...',      my $start_page = &Apache::loncommon::start_page('Switching Server ...',

Removed from v.1.9  
changed lines
  Added in v.1.13


FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>