Diff for /loncom/auth/lonlogout.pm between versions 1.30 and 1.35

version 1.30, 2008/04/02 12:29:38 version 1.35, 2008/11/20 15:19:22
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 88  sub handler { Line 92  sub handler {
  $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,});
   
  $relogmessage.='<h1>'.&mt('Goodbye').'</h1>';          $relogmessage.='<h1>'.&mt('Goodbye').'</h1>'
                         .'<p>'.&mt('Thank you for using LON-CAPA.').'</p>';
   
  if (!$env{'request.sso.norelogin'}) {   if (!$env{'request.sso.norelogin'}) {
     my $relogin_server;      my $relogin_server;
Line 98  sub handler { Line 103  sub handler {
     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.=&mt('Please either [_1]close this window[_2] or [_3]log in again[_4].'              $relogmessage.='<p>'.&mt('You have been successfully logged out.').' '
                               ,'<a href="javascript:self.close();">','</a>'                            .&mt('You can [_1]close this window[_2] now.'
                               ,'<a href="'.$login_url.'?domain='.$env{'user.domain'}.'">','</a>');                                ,'','') # ,'<a href="javascript:self.close();">','</a>')
                             .'</p>';
   =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
               $relogmessage.='<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'}
Line 136  sub flush_course_logs { Line 154  sub flush_course_logs {
 __END__  __END__
   
   
   =head1 NAME
   
   Apache::lonlogout
   
   =head1 SYNOPSIS
   
   
   This is part of the LearningOnline Network with CAPA project
   described at http://www.lon-capa.org.
   
   =head1 HANDLER SUBROUTINE
   
   
   =cut
   
   
   

Removed from v.1.30  
changed lines
  Added in v.1.35


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