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

Diff for /loncom/auth/switchserver.pm between versions 1.35.2.6.2.6 and 1.35.2.6.2.8

version 1.35.2.6.2.6, 2023/07/05 21:13:07 version 1.35.2.6.2.8, 2024/10/09 15:49:17
Line 31  package Apache::switchserver; Line 31  package Apache::switchserver;
 use strict;  use strict;
 use Apache::Constants qw(:common :remotehost);  use Apache::Constants qw(:common :remotehost);
 use Apache::lonnet;  use Apache::lonnet;
   use Apache::loncommon;
   use Apache::lonmenu;
 use Digest::MD5 qw(md5_hex);  use Digest::MD5 qw(md5_hex);
 use CGI::Cookie();  use CGI::Cookie();
 use Apache::lonlocal;  use Apache::lonlocal;
Line 63  sub do_redirect { Line 65  sub do_redirect {
     my $start_page =       my $start_page = 
  &Apache::loncommon::start_page('Switching Server ...',undef,   &Apache::loncommon::start_page('Switching Server ...',undef,
        {'redirect'       => [$delay,$url,'',$write_to_opener,1],         {'redirect'       => [$delay,$url,'',$write_to_opener,1],
  'only_body'      => $only_body,});   'only_body'      => $only_body,
                                           'switchserver'   => 1,
                                           'links_disabled' => 1,
                                           'no_inline_link' => 1,});
     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);
     unless ($env{'user.name'} eq 'public' && ($env{'user.domain'} eq 'public')) {      unless ($env{'user.name'} eq 'public' && ($env{'user.domain'} eq 'public')) {
Line 271  sub handler { Line 276  sub handler {
     }      }
 # -------------------------------------------------------- Menu script and info  # -------------------------------------------------------- Menu script and info
   
       my $windowinfo = &Apache::lonmenu::close();
   
 # ---------------------------------------------------------------- Get handover  # ---------------------------------------------------------------- Get handover
   
     my ($is_balancer,$setcookie,$newcookieid,$otherbalcookie);      my ($is_balancer,$setcookie,$newcookieid,$otherbalcookie);
Line 396  sub handler { Line 403  sub handler {
         $url .= join('&',@args);          $url .= join('&',@args);
     }      }
 # --------------------------------------------------------------- Screen Output  # --------------------------------------------------------------- Screen Output
     return &do_redirect($r, $url, $only_body, $ssologoutscript, $env{'form.lcssowin'});      return &do_redirect($r, $url, $only_body, $windowinfo.$ssologoutscript,
                           $env{'form.lcssowin'});
 }  }
   
 1;  1;
Removed from v.1.35.2.6.2.6  
changed lines
  Added in v.1.35.2.6.2.8

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