--- loncom/auth/lonlogout.pm	2018/05/08 15:37:41	1.54
+++ 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.54 2018/05/08 15:37:41 raeburn Exp $
+# $Id: lonlogout.pm,v 1.58 2022/05/24 16:23:04 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -71,40 +71,34 @@ sub handler {
     my @profile;
     my $lonidsdir=$r->dir_config('lonIDsDir');
     &Apache::lonnet::transfer_profile_to_env($lonidsdir,$handle);
-    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 (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");
         }
     }
     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 $ENV{'REMOTE_ADDR'}");
+			 "Logout $ip");
 
     &Apache::loncommon::content_type($r,'text/html');
 
-    #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);
+    #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);
     }
     $r->send_http_header;
     return OK if $r->header_only;
@@ -192,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>');
             }
@@ -234,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; 
 }