--- loncom/auth/lonlogout.pm	2022/05/29 13:07:03	1.45.2.8.2.1
+++ loncom/auth/lonlogout.pm	2018/05/08 15:37:41	1.54
@@ -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.54 2018/05/08 15:37:41 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -71,40 +71,45 @@ 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 ($env{'user.linkedenv'} ne '') {
+        my $lonhost = $r->dir_config('lonHostID');
+        if ((-l $env{'user.linkedenv'}) && 
+            (readlink($env{'user.linkedenv'}) eq "$lonidsdir/$handle.id")) {
+            unlink($env{'user.linkedenv'});
         }
     }
     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 $name = 'lonID';
+    if (($env{'user.name'} eq 'public') && ($env{'user.domain'} eq 'public')) {
+        $name = 'lonPubID';
+    }
+    my $c = new CGI::Cookie(-name    => $name,
+			    -value   => '',
+			    -expires => '-10y',);
+    $r->headers_out->add('Set-cookie' => $c);
+    if (($name eq 'lonID') && ($env{'user.linkedenv'})) {
+        my $other = new CGI::Cookie(-name    => 'lonLinkID',
+                                    -value   => '',
+                                    -expires => '-10y',);
+        $r->headers_out->add('Set-cookie' => $other);
     }
     $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='';
@@ -146,8 +151,7 @@ sub handler {
             }
         }
 	$start_page=&Apache::loncommon::start_page('Logged Out',$headextra,
-                           {'no_inline_link' => 1,
-                            'no_nav_bar'     => 1,});
+                           {'no_nav_bar'     => 1,});
 	
         $relogmessage.='<h1>'.&mt('Goodbye').'</h1>'
                       .'<p>'.&mt('Thank you for using LON-CAPA.').'</p>';
@@ -188,12 +192,11 @@ sub handler {
 		    ($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')) {
+            unless (($env{'request.lti.login'}) && ($env{'request.lti.target'} eq 'iframe')) {
                 $relogmessage.=' '.&mt('You can [_1]close this window[_2] now.',
-                                       '','') # ,'<a href="javascript:self.close();">','</a>');
+                                       '',''); # ,'<a href="javascript:self.close();">','</a>');
             }
             $relogmessage.='</p>';
-
 =pod
 
 =head1 NOTES:
@@ -203,7 +206,7 @@ sub handler {
 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)
 
 =cut
-            unless ($env{'request.deeplink.login'}) {
+            unless ($env{'request.lti.login'}) {
                 $relogmessage.='<p>'.&mt('[_1]Log in again[_2]'
                                   ,'<a href="'.$login_url.'">','</a>')
                               .'</p>';
@@ -228,17 +231,9 @@ Due to security reasons in new web brows
 # --------------------------------------------------------------- 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; 
 }