--- loncom/auth/lonlogout.pm	2019/08/03 22:52:25	1.45.2.7
+++ loncom/auth/lonlogout.pm	2017/02/25 20:00:36	1.50
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Logout Handler
 #
-# $Id: lonlogout.pm,v 1.45.2.7 2019/08/03 22:52:25 raeburn Exp $
+# $Id: lonlogout.pm,v 1.50 2017/02/25 20:00:36 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,11 +69,12 @@ 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) {
@@ -90,20 +89,25 @@ sub handler {
 
     &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.linkeenv'})) {
+        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='';
@@ -116,37 +120,23 @@ sub handler {
 						   $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);
-                        }
-                    }
-                }
+        my $headextra;
+        if ($env{'request.sso.login'}
+            && defined($r->dir_config("lonSSOUserLogoutHeadFile_$domain"))) {
+            if (open(my $fh,$r->dir_config("lonSSOUserLogoutHeadFile_$domain"))) {
+                $headextra = join('',<$fh>);
+                close($fh);
+            }
+        }
+        if ($env{'request.sso.login'}
+            && defined($r->dir_config('lonSSOUserLogoutHeadFile'))) {
+            if (open(my $fh,$r->dir_config('lonSSOUserLogoutHeadFile'))) {
+                $headextra.= join('',<$fh>);
+                close($fh);
             }
         }
 	$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>';
@@ -205,14 +195,14 @@ Due to security reasons in new web brows
         }
         if ($env{'request.sso.login'}
 	    && defined($r->dir_config("lonSSOUserLogoutMessageFile_$domain"))) {
-	    if (open(my $fh,'<',$r->dir_config("lonSSOUserLogoutMessageFile_$domain"))) {
+	    if (open(my $fh,$r->dir_config("lonSSOUserLogoutMessageFile_$domain"))) {
 	        $relogmessage.= join('',<$fh>);
                 close($fh);
             }
 	}
 	if ($env{'request.sso.login'}
 	    && defined($r->dir_config('lonSSOUserLogoutMessageFile'))) {
-	    if (open(my $fh,'<',$r->dir_config('lonSSOUserLogoutMessageFile'))) {
+	    if (open(my $fh,$r->dir_config('lonSSOUserLogoutMessageFile'))) {
 	        $relogmessage.= join('',<$fh>);
                 close($fh);
             }
@@ -222,17 +212,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; 
 }