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

Diff for /loncom/auth/switchserver.pm between versions 1.28.2.1 and 1.30

version 1.28.2.1, 2010/08/13 00:06:27 version 1.30, 2010/09/06 15:44:05
Line 59  sub do_redirect { Line 59  sub do_redirect {
     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'       => [0.5,$url],
                                         'no_inline_link' => 1,  
  '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);
       unless ($env{'user.name'} eq 'public' && ($env{'user.domain'} eq 'public')) {
           $r->register_cleanup(\&flush_course_logs);
       }
     return OK;      return OK;
   }
   
   sub flush_course_logs {
       &Apache::lonnet::flushcourselogs();
       return OK;
 }  }
   
 sub handler {  sub handler {
Line 121  sub handler { Line 127  sub handler {
         my $canhost = 1;          my $canhost = 1;
         my $uprimary_id = &Apache::lonnet::domain($env{'user.domain'},'primary');          my $uprimary_id = &Apache::lonnet::domain($env{'user.domain'},'primary');
         my $uint_dom = &Apache::lonnet::internet_dom($uprimary_id);          my $uint_dom = &Apache::lonnet::internet_dom($uprimary_id);
         my @intdoms = &Apache::lonnet::get_internet_names($env{'form.otherserver'});          my @intdoms;
           my $internet_names = &Apache::lonnet::get_internet_names($env{'form.otherserver'});
           if (ref($internet_names) eq 'ARRAY') {
               @intdoms = @{$internet_names};
           }
         unless ($uint_dom ne '' && grep(/^\Q$uint_dom\E$/,@intdoms)) {          unless ($uint_dom ne '' && grep(/^\Q$uint_dom\E$/,@intdoms)) {
             my $serverhomeID = &Apache::lonnet::get_server_homeID($switch_to);              my $serverhomeID = &Apache::lonnet::get_server_homeID($switch_to);
             my $serverhomedom = &Apache::lonnet::host_domain($serverhomeID);              my $serverhomedom = &Apache::lonnet::host_domain($serverhomeID);
Line 160  sub handler { Line 170  sub handler {
  return OK;   return OK;
     }      }
 # -------------------------------------------------------- Menu script and info  # -------------------------------------------------------- Menu script and info
      
     my $windowinfo=  
         &Apache::lonmenu::close().  
         &Apache::lonnavmaps::close();  
 # ---------------------------------------------------------------- Get handover  # ---------------------------------------------------------------- Get handover
   
     my %info=('ip'       => $ENV{'REMOTE_ADDR'},      my %info=('ip'       => $ENV{'REMOTE_ADDR'},
Line 189  sub handler { Line 196  sub handler {
  '&username='.$env{'user.name'}.   '&username='.$env{'user.name'}.
  '&token='.$token;   '&token='.$token;
 # --------------------------------------------------------------- Screen Output  # --------------------------------------------------------------- Screen Output
     &Apache::lonnet::flushcourselogs();      return &do_redirect($r, $url, 0);
     return &do_redirect($r,$url,0,$windowinfo);  
 }  }
   
 1;  1;
Removed from v.1.28.2.1  
changed lines
  Added in v.1.30

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