--- loncom/auth/lonlogout.pm	2022/05/29 13:07:03	1.45.2.8.2.1
+++ loncom/auth/lonlogout.pm	2013/02/08 17:03:41	1.46
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Logout Handler
 #
-# $Id: lonlogout.pm,v 1.45.2.8.2.1 2022/05/29 13:07:03 raeburn Exp $
+# $Id: lonlogout.pm,v 1.46 2013/02/08 17:03:41 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -45,11 +45,9 @@ use strict;
 use Apache::Constants qw(:common);
 use Apache::File;
 use Apache::lonnet;
-use Apache::loncommon;
 use Apache::lonmenu;
 use CGI::Cookie();
 use Apache::lonlocal;
-use LONCAPA qw(:DEFAULT :match);
 
 sub handler {
     my $r = shift;
@@ -71,40 +69,29 @@ sub handler {
     my @profile;
     my $lonidsdir=$r->dir_config('lonIDsDir');
     &Apache::lonnet::transfer_profile_to_env($lonidsdir,$handle);
-    if (unlink("$lonidsdir/$handle.id")) {
-        if (($env{'user.linkedenv'} =~ /^[a-f0-9]+_linked$/) &&
-            (-l "$lonidsdir/$env{'user.linkedenv'}.id") &&
-            (readlink("$lonidsdir/$env{'user.linkedenv'}.id") eq "$lonidsdir/$handle.id")) {
-            unlink("$lonidsdir/$env{'user.linkedenv'}.id");
-        }
-    }
+    unlink("$lonidsdir/$handle.id");
     if (!$Apache::lonlocal::lh) {
         &Apache::lonlocal::get_language_handle($r);
     }
     my %temp=('logout' => time);
-    my $ip = &Apache::lonnet::get_requestor_ip();
     &Apache::lonnet::put('email_status',\%temp);
     &Apache::lonnet::log($env{'user.domain'},
 			 $env{'user.name'},
 			 $env{'user.home'},
-			 "Logout $ip");
+			 "Logout $ENV{'REMOTE_ADDR'}");
 
     &Apache::loncommon::content_type($r,'text/html');
 
-    #expire the cookies
-    my %cookies=CGI::Cookie->parse($r->header_in('Cookie'));
-    foreach my $name (keys(%cookies)) {
-        next unless ($name =~ /^lon(|S|Link|Pub)ID$/);
-        my $c = new CGI::Cookie(-name    => $name,
-                                -value   => '',
-                                -expires => '-10y',);
-        $r->headers_out->add('Set-cookie' => $c);
-    }
+    #expire the cookie
+    my $c = new CGI::Cookie(-name    => 'lonID',
+			    -value   => '',
+			    -expires => '-10y',);
+    $r->header_out('Set-cookie' => $c);
+
     $r->send_http_header;
     return OK if $r->header_only;
 # -------------------------------------------------------- Menu script and info
 
-    my $windowinfo=&Apache::lonmenu::close();
 # ---------------------------------------------------------------- Get handover
     &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},['handover']);
     my $switch='';
@@ -116,42 +103,13 @@ sub handler {
 	$start_page=&Apache::loncommon::start_page('Switching Server ...',
 						   $switch);
     } else {
-        my $domain = $env{'user.domain'};
-        my ($headextra,$ssofile);
-        if ($env{'request.sso.login'}) {
-            my $londocroot = $r->dir_config('lonDocRoot');
-            if ($domain =~ /^$match_domain$/) {
-                if (defined($r->dir_config("lonSSOUserLogoutHeadFile_$domain"))) {
-                    $ssofile = '/'.&Apache::loncommon::clean_path($r->dir_config("lonSSOUserLogoutHeadFile_$domain"));
-                    if ($ssofile eq $r->dir_config("lonSSOUserLogoutHeadFile_$domain")) {
-                        if ($ssofile =~ /^\Q$londocroot\E/) {
-                            if (open(my $fh,'<',$ssofile)) {
-                                $headextra = join('',<$fh>);
-                                close($fh);
-                            }
-                        }
-                    }
-                }
-            }
-            if (defined($r->dir_config('lonSSOUserLogoutHeadFile'))) {
-                $ssofile = '/'.&Apache::loncommon::clean_path($r->dir_config('lonSSOUserLogoutHeadFile'));
-                if ($ssofile eq $r->dir_config('lonSSOUserLogoutHeadFile')) {
-                    if ($ssofile =~ /^\Q$londocroot\E/) {
-                        if (open(my $fh,'<',$ssofile)) {
-                            $headextra.= join('',<$fh>);
-                            close($fh);
-                        }
-                    }
-                }
-            }
-        }
-	$start_page=&Apache::loncommon::start_page('Logged Out',$headextra,
-                           {'no_inline_link' => 1,
-                            'no_nav_bar'     => 1,});
+	$start_page=&Apache::loncommon::start_page('Logged Out',undef,
+                           {'no_nav_bar'     => 1,});
 	
         $relogmessage.='<h1>'.&mt('Goodbye').'</h1>'
                       .'<p>'.&mt('Thank you for using LON-CAPA.').'</p>';
 
+        my $domain = $env{'user.domain'};
 	if (!$env{'request.sso.norelogin'}) {
 	    my ($relogin_server,$login_url);
 	    if ($env{'request.sso.reloginserver'}) {
@@ -187,58 +145,42 @@ sub handler {
 	        $login_url = $relogin_server.'/adm/'.
 		    ($env{'request.sso.login'} ? 'roles': 'login?domain='.$domain);
             }
-            $relogmessage.='<p>'.&mt('You have been successfully logged out.');
-            unless (($env{'request.deeplink.login'}) && ($env{'request.deeplink.target'} eq '_self')) {
-                $relogmessage.=' '.&mt('You can [_1]close this window[_2] now.',
-                                       '','') # ,'<a href="javascript:self.close();">','</a>');
-            }
-            $relogmessage.='</p>';
-
+            $relogmessage.='<p>'.&mt('You have been successfully logged out.').' '
+                          .&mt('You can [_1]close this window[_2] now.'
+                              ,'','') # ,'<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 javascript, if this window has also been opened 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)
+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
-            unless ($env{'request.deeplink.login'}) {
-                $relogmessage.='<p>'.&mt('[_1]Log in again[_2]'
-                                  ,'<a href="'.$login_url.'">','</a>')
-                              .'</p>';
-            }
+            $relogmessage.='<p>'.&mt('[_1]Log in again[_2]'
+                              ,'<a href="'.$login_url.'">','</a>')
+                          .'</p>';
         }
         if ($env{'request.sso.login'}
 	    && defined($r->dir_config("lonSSOUserLogoutMessageFile_$domain"))) {
-	    if (open(my $fh,'<',$r->dir_config("lonSSOUserLogoutMessageFile_$domain"))) {
-	        $relogmessage.= join('',<$fh>);
-                close($fh);
-            }
+	    open(my $fh,$r->dir_config("lonSSOUserLogoutMessageFile_$domain"));
+	    $relogmessage.= join('',<$fh>);
 	}
 	if ($env{'request.sso.login'}
 	    && defined($r->dir_config('lonSSOUserLogoutMessageFile'))) {
-	    if (open(my $fh,'<',$r->dir_config('lonSSOUserLogoutMessageFile'))) {
-	        $relogmessage.= join('',<$fh>);
-                close($fh);
-            }
+	    open(my $fh,$r->dir_config('lonSSOUserLogoutMessageFile'));
+	    $relogmessage.= join('',<$fh>);
 	}
+
     }
     my $end_page=&Apache::loncommon::end_page();
 # --------------------------------------------------------------- Screen Output
     $r->print(<<ENDDOCUMENT);
 $start_page
-$windowinfo
 $relogmessage
 $end_page
 ENDDOCUMENT
-    if ($env{'request.balancercookie'}) {
-        my ($balancer,$cookie) = split(/:/,$env{'request.balancercookie'});
-        if ((&Apache::lonnet::hostname($balancer)) && ($cookie =~ /^[a-f0-9]{32}$/)) {
-            $cookie = $env{'user.domain'}.'_'.$env{'user.name'}.'_'.$cookie;
-            &Apache::lonnet::delbalcookie($cookie,$balancer);
-        }
-    }
     $r->register_cleanup(\&flush_course_logs);
     return OK; 
 }