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

Diff for /loncom/auth/lonlogout.pm between versions 1.18 and 1.25

version 1.18, 2006/04/05 22:40:29 version 1.25, 2007/03/01 23:14:12
Line 49  sub handler { Line 49  sub handler {
     }      }
   
     #check if cookie still valid      #check if cookie still valid
     my $handle=$lonid->value;      my $handle=&LONCAPA::clean_handle($lonid->value);
     $handle=~s/\W//g;  
     my $lonidsdir=$r->dir_config('lonIDsDir');      my $lonidsdir=$r->dir_config('lonIDsDir');
     if ((!-e "$lonidsdir/$handle.id") || ($handle eq '')) {      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); 
Line 59  sub handler { Line 58  sub handler {
   
     #we've got a valid user      #we've got a valid user
     my @profile;      my @profile;
     my %sessionhash;      &Apache::lonnet::transfer_profile_to_env($lonidsdir,$handle);
     {  
  my $idf=Apache::File->new("$lonidsdir/$handle.id");  
  @profile=<$idf>;  
     }  
     my $envi;  
     for ($envi=0;$envi<=$#profile;$envi++) {  
  chomp($profile[$envi]);  
  my ($envname,$envvalue)=split(/=/,$profile[$envi]);  
  $sessionhash{$envname}=$envvalue;  
     }  
     unlink("$lonidsdir/$handle.id");      unlink("$lonidsdir/$handle.id");
     my %temp=('logout' => time);      my %temp=('logout' => time);
     &Apache::lonnet::put('email_status',\%temp);      &Apache::lonnet::put('email_status',\%temp);
     &Apache::lonnet::log($sessionhash{'user.domain'},      &Apache::lonnet::log($env{'user.domain'},
  $sessionhash{'user.name'},   $env{'user.name'},
  $sessionhash{'user.home'},   $env{'user.home'},
  "Logout $ENV{'REMOTE_ADDR'}");   "Logout $ENV{'REMOTE_ADDR'}");
   
     &Apache::loncommon::content_type($r,'text/html');      &Apache::loncommon::content_type($r,'text/html');
   
       #expire the cookie
       my $c = new CGI::Cookie(-name    => 'lonID',
       -value   => '',
       -expires => '-10y',);
       $r->header_out('Set-cookie' => $c);
   
     $r->send_http_header;      $r->send_http_header;
     return OK if $r->header_only;      return OK if $r->header_only;
 # -------------------------------------------------------- Menu script and info  # -------------------------------------------------------- Menu script and info
Line 95  sub handler { Line 92  sub handler {
  $start_page=&Apache::loncommon::start_page('Switching Server ...',   $start_page=&Apache::loncommon::start_page('Switching Server ...',
    $switch);     $switch);
     } else {      } else {
  $start_page=&Apache::loncommon::start_page('Logged Out');   $start_page=&Apache::loncommon::start_page('Logged Out',undef,
      {'no_inline_link' => 1,});
  my %lt=&Apache::lonlocal::texthash('gb' => 'Goodbye',   my %lt=&Apache::lonlocal::texthash('gb' => 'Goodbye',
    'cw' => 'close this window',     'cw' => 'close this window',
    'li' => 'log in again',     'li' => 'log in again',
    'pe' => 'Please either',     'pe' => 'Please either',
    'or' => 'or');     'or' => 'or');
           my $relogin_server;
           if ($env{'request.sso.reloginserver'}) {
               $relogin_server = $env{'request.sso.reloginserver'};
           }
    my $login_url = $relogin_server.'/adm/'.
                           ($env{'request.sso.login'} ? 'roles': 'login');
    
  $relogmessage=(<<ENDRELOG);   $relogmessage=(<<ENDRELOG);
  <h1>$lt{'gb'}!</h1>   <h1>$lt{'gb'}!</h1>
     $lt{'pe'} <a href="javascript:self.close();">$lt{'cw'}</a> $lt{'or'}      $lt{'pe'} <a href="javascript:self.close();">$lt{'cw'}</a> $lt{'or'}
  <a href="/adm/login?domain=$sessionhash{'user.domain'}">$lt{'li'}</a>.   <a href="$login_url?domain=$env{'user.domain'}">$lt{'li'}</a>.
 ENDRELOG  ENDRELOG
   
           if ($env{'request.sso.login'}
       && defined($r->dir_config('lonSSOUserLogoutMessageFile'))) {
       open(my $fh,$r->dir_config('lonSSOUserLogoutMessageFile'));
       $relogmessage.= join('',<$fh>);
    }
   
     }      }
     my $end_page=&Apache::loncommon::end_page();      my $end_page=&Apache::loncommon::end_page();
 # --------------------------------------------------------------- Screen Output  # --------------------------------------------------------------- Screen Output
Removed from v.1.18  
changed lines
  Added in v.1.25

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