Diff for /loncom/auth/lonlogout.pm between versions 1.29 and 1.33

version 1.29, 2007/10/02 01:09:59 version 1.33, 2008/11/12 20:01:09
Line 49  sub handler { Line 49  sub handler {
     }      }
   
     #we've got a valid user      #we've got a valid user
       #any locks in place?
       my $locknum=&Apache::lonnet::get_locks();
       if ($locknum) { return 409; }
       #nope, go ahead
     my @profile;      my @profile;
     my $lonidsdir=$r->dir_config('lonIDsDir');      my $lonidsdir=$r->dir_config('lonIDsDir');
     &Apache::lonnet::transfer_profile_to_env($lonidsdir,$handle);      &Apache::lonnet::transfer_profile_to_env($lonidsdir,$handle);
Line 87  sub handler { Line 91  sub handler {
     } else {      } else {
  $start_page=&Apache::loncommon::start_page('Logged Out',undef,   $start_page=&Apache::loncommon::start_page('Logged Out',undef,
    {'no_inline_link' => 1,});     {'no_inline_link' => 1,});
  my %lt=&Apache::lonlocal::texthash('gb' => 'Goodbye',  
    'cw' => 'close this window',  
    'li' => 'log in again',  
    'pe' => 'Please either',  
    'or' => 'or');  
   
  $relogmessage.=(<<ENDRELOG);          $relogmessage.='<h1>'.&mt('Goodbye').'</h1>'
  <h1>$lt{'gb'}!</h1>                        .'<p>'.&mt('Thank you for using LON-CAPA.').'</p>';
 ENDRELOG  
   
  if (!$env{'request.sso.norelogin'}) {   if (!$env{'request.sso.norelogin'}) {
     my $relogin_server;      my $relogin_server;
Line 105  ENDRELOG Line 103  ENDRELOG
     my $login_url = $relogin_server.'/adm/'.      my $login_url = $relogin_server.'/adm/'.
  ($env{'request.sso.login'} ? 'roles': 'login');   ($env{'request.sso.login'} ? 'roles': 'login');
   
     $relogmessage.=(<<ENDRELOG);              $relogmessage.='<p>'.&mt('You have been successfully logged out.').' '
     $lt{'pe'} <a href="javascript:self.close();">$lt{'cw'}</a> $lt{'or'}                            .&mt('You can [_1]close this window[_2] now.'
  <a href="$login_url?domain=$env{'user.domain'}">$lt{'li'}</a>.                                ,'','')
 ENDRELOG  #                              ,'<a href="javascript:self.close();">','</a>');
   =pod
   
   =head1 NOTES:
   
   '<a href="javascript:self.close();">','</a>');
   
   Due to security reasons in new web browsers a window could only be closed with java script, if this window has also been opend with javascript. This is not done here which means that in most cases the close link will not work. Unless we find another solution, this link should not be offered. (Stefan Bisitz, 2008-08-01)
   
   =cut
                             .'</p>'
                             .'<p>'.&mt('[_1]Log in again[_2]'
                                 ,'<a href="'.$login_url.'?domain='.$env{'user.domain'}.'">','</a>')
                             .'</p>';
         }          }
  my $domain = $env{'user.domain'};   my $domain = $env{'user.domain'};
         if ($env{'request.sso.login'}          if ($env{'request.sso.login'}

Removed from v.1.29  
changed lines
  Added in v.1.33


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