--- loncom/auth/lonlogout.pm	2017/11/03 18:55:16	1.45.2.3.2.1
+++ loncom/auth/lonlogout.pm	2015/03/12 00:50:10	1.49
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Logout Handler
 #
-# $Id: lonlogout.pm,v 1.45.2.3.2.1 2017/11/03 18:55:16 raeburn Exp $
+# $Id: lonlogout.pm,v 1.49 2015/03/12 00:50:10 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;
@@ -94,7 +92,6 @@ sub handler {
     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='';
@@ -107,37 +104,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>';
@@ -213,7 +196,6 @@ Due to security reasons in new web brows
 # --------------------------------------------------------------- Screen Output
     $r->print(<<ENDDOCUMENT);
 $start_page
-$windowinfo
 $relogmessage
 $end_page
 ENDDOCUMENT