[BACK]Return to switchserver.pm CVS log [TXT] [DIR] Up to [LON-CAPA] / loncom / auth

Diff for /loncom/auth/switchserver.pm between versions 1.46 and 1.49

version 1.46, 2018/12/08 15:16:03 version 1.49, 2019/06/15 02:50:04
Line 56  sub init_env { Line 56  sub init_env {
 sub do_redirect {  sub do_redirect {
     my ($r,$url,$only_body,$extra_text) = @_;      my ($r,$url,$only_body,$extra_text) = @_;
     $r->send_http_header;      $r->send_http_header;
       my $delay = 0.5;
       if ($only_body) {
           $delay = 0;
       }
     my $start_page =       my $start_page = 
  &Apache::loncommon::start_page('Switching Server ...',undef,   &Apache::loncommon::start_page('Switching Server ...',undef,
        {'redirect'       => [0.5,$url],         {'redirect'       => [$delay,$url],
  'only_body'      => $only_body,});   'only_body'      => $only_body,});
     my $end_page   = &Apache::loncommon::end_page();      my $end_page   = &Apache::loncommon::end_page();
     $r->print($start_page.$extra_text.$end_page);      $r->print($start_page.$extra_text.$end_page);
Line 231  sub handler { Line 235  sub handler {
 # ---------------------------------------------------------------- Get handover  # ---------------------------------------------------------------- Get handover
   
     my $newcookieid;      my $newcookieid;
       my $only_body = 0;
     my ($is_balancer,$posshost,$setcookie,$offloadto,$dom_balancers) =      my ($is_balancer,$posshost,$setcookie,$offloadto,$dom_balancers) =
         &Apache::lonnet::check_loadbalancing($env{'user.name'},$env{'user.domain'});          &Apache::lonnet::check_loadbalancing($env{'user.name'},$env{'user.domain'});
     if ($is_balancer && $setcookie && $env{'form.otherserver'}) {      if ($is_balancer && $setcookie && $env{'form.otherserver'}) {
Line 239  sub handler { Line 244  sub handler {
         # cookie which points at the target server          # cookie which points at the target server
         my ($found_server,$balancer_cookie) = &Apache::lonnet::check_for_balancer_cookie($r,1);          my ($found_server,$balancer_cookie) = &Apache::lonnet::check_for_balancer_cookie($r,1);
   
         unless (($found_server eq $env{'form.otherserver'}) &&          if (($found_server eq $env{'form.otherserver'}) &&
                 ($balancer_cookie =~ /^\Q$env{'user.domain'}\E_\Q$env{'user.name'}\E_/)) {              ($balancer_cookie =~ /^\Q$env{'user.domain'}\E_\Q$env{'user.name'}\E_/)) {
               $only_body = 1;
           } else {
             $newcookieid = &balancer_cookieid($r,$env{'form.otherserver'},              $newcookieid = &balancer_cookieid($r,$env{'form.otherserver'},
                                               $env{'user.name'},$env{'user.domain'});                                                $env{'user.name'},$env{'user.domain'});
         }          }
Line 280  sub handler { Line 287  sub handler {
     if ($env{'request.sso.reloginserver'}) {      if ($env{'request.sso.reloginserver'}) {
         $info{'sso.reloginserver'} = $env{'request.sso.reloginserver'};          $info{'sso.reloginserver'} = $env{'request.sso.reloginserver'};
     }      }
       if ($env{'request.linkprot'}) {
           $info{'linkprot'} = $env{'request.linkprot'};
       }
       if ($env{'request.deeplink.login'}) {
           $info{'deeplink.login'} = $env{'request.deeplink.login'};
           if ($env{'request.linkkey'}) {
               $info{'linkkey'} = $env{'request.linkkey'};
           }
       }
     if ($env{'request.lti.login'}) {      if ($env{'request.lti.login'}) {
         $info{'lti.login'} = $env{'request.lti.login'};          $info{'lti.login'} = $env{'request.lti.login'};
     }      }
Line 319  sub handler { Line 335  sub handler {
  '&username='.$env{'user.name'}.   '&username='.$env{'user.name'}.
  '&token='.$token;   '&token='.$token;
 # --------------------------------------------------------------- Screen Output  # --------------------------------------------------------------- Screen Output
     return &do_redirect($r, $url, 0);      return &do_redirect($r, $url, $only_body);
 }  }
   
 1;  1;
Removed from v.1.46  
changed lines
  Added in v.1.49

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