--- loncom/auth/lonlogout.pm	2018/07/04 16:58:19	1.55
+++ loncom/auth/lonlogout.pm	2022/05/24 16:23:04	1.58
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Logout Handler
 #
-# $Id: lonlogout.pm,v 1.55 2018/07/04 16:58:19 raeburn Exp $
+# $Id: lonlogout.pm,v 1.58 2022/05/24 16:23:04 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -82,11 +82,12 @@ sub handler {
         &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 $ENV{'REMOTE_ADDR'}");
+			 "Logout $ip");
 
     &Apache::loncommon::content_type($r,'text/html');
 
@@ -185,7 +186,8 @@ sub handler {
 		    ($env{'request.sso.login'} ? 'roles': 'login?domain='.$domain);
             }
             $relogmessage.='<p>'.&mt('You have been successfully logged out.');
-            unless (($env{'request.lti.login'}) && ($env{'request.lti.target'} eq 'iframe')) {
+            unless ((($env{'request.lti.login'}) && ($env{'request.lti.target'} eq 'iframe')) ||
+                    (($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>');
             }
@@ -227,6 +229,13 @@ $start_page
 $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; 
 }