--- loncom/auth/lonlogout.pm	2015/03/12 00:50:46	1.45.2.3
+++ loncom/auth/lonlogout.pm	2018/05/01 13:47:53	1.53
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Logout Handler
 #
-# $Id: lonlogout.pm,v 1.45.2.3 2015/03/12 00:50:46 raeburn Exp $
+# $Id: lonlogout.pm,v 1.53 2018/05/01 13:47:53 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -45,9 +45,11 @@ 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;
@@ -70,6 +72,13 @@ sub handler {
     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 (!$Apache::lonlocal::lh) {
         &Apache::lonlocal::get_language_handle($r);
     }
@@ -83,16 +92,24 @@ sub handler {
     &Apache::loncommon::content_type($r,'text/html');
 
     #expire the cookie
-    my $c = new CGI::Cookie(-name    => 'lonID',
+    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->header_out('Set-cookie' => $c);
-
+    $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='';
@@ -105,24 +122,36 @@ sub handler {
 						   $switch);
     } else {
         my $domain = $env{'user.domain'};
-        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);
+        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,});
+                           {'no_nav_bar'     => 1,});
 	
         $relogmessage.='<h1>'.&mt('Goodbye').'</h1>'
                       .'<p>'.&mt('Thank you for using LON-CAPA.').'</p>';
@@ -181,14 +210,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);
             }
@@ -198,7 +227,6 @@ Due to security reasons in new web brows
 # --------------------------------------------------------------- Screen Output
     $r->print(<<ENDDOCUMENT);
 $start_page
-$windowinfo
 $relogmessage
 $end_page
 ENDDOCUMENT