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

Diff for /loncom/auth/lonlogout.pm between versions 1.27 and 1.32.2.1

version 1.27, 2007/08/25 00:51:24 version 1.32.2.1, 2009/09/15 00:06:28
Line 41  sub handler { Line 41  sub handler {
   
     #Check for cookie      #Check for cookie
     my $requrl=$r->uri;      my $requrl=$r->uri;
     my %cookies=CGI::Cookie->parse($r->header_in('Cookie'));      my $handle = &Apache::lonnet::check_for_valid_session($r);
     my $lonid=$cookies{'lonID'};  
     my $cookie;  
     if (!$lonid) {  
  return FORBIDDEN;  
     }  
   
     #check if cookie still valid      #check if cookie still valid
     my $handle=&LONCAPA::clean_handle($lonid->value);      if ($handle eq '') {
     my $lonidsdir=$r->dir_config('lonIDsDir');  
     if ((!-e "$lonidsdir/$handle.id") || ($handle eq '')) {  
  $r->log_reason("Cookie $handle not valid", $r->filename);    $r->log_reason("Cookie $handle not valid", $r->filename); 
  return FORBIDDEN;   return FORBIDDEN;
     }      }
   
     #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');
     &Apache::lonnet::transfer_profile_to_env($lonidsdir,$handle);      &Apache::lonnet::transfer_profile_to_env($lonidsdir,$handle);
     unlink("$lonidsdir/$handle.id");      unlink("$lonidsdir/$handle.id");
     my %temp=('logout' => time);      my %temp=('logout' => time);
Line 94  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 112  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>');
   # 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)
                             .'</p>'
                             .'<p>'.&mt('[_1]Log in again[_2]'
                                 ,'<a href="'.$login_url.'?domain='.$env{'user.domain'}.'">','</a>').
                              ('&nbsp;'x6).&mt('[_1]Return to WebCenter front page[_2]',
                                  '<a href="/">','</a>')
                             .'</p>';
         }          }
  my $domain = $env{'user.domain'};   my $domain = $env{'user.domain'};
         if ($env{'request.sso.login'}          if ($env{'request.sso.login'}
Line 139  $windowinfo Line 136  $windowinfo
 $relogmessage  $relogmessage
 $end_page  $end_page
 ENDDOCUMENT  ENDDOCUMENT
     &Apache::lonnet::flushcourselogs();      $r->register_cleanup(\&flush_course_logs);
     return OK;       return OK; 
 }  }
   
   sub flush_course_logs {
       &Apache::lonnet::flushcourselogs();
       return OK;
   }
   
 1;  1;
 __END__  __END__
   
Removed from v.1.27  
changed lines
  Added in v.1.32.2.1

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