--- loncom/auth/lonlogout.pm	2012/02/10 19:20:29	1.42.2.2.2.3
+++ 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.42.2.2.2.3 2012/02/10 19:20:29 raeburn Exp $
+# $Id: lonlogout.pm,v 1.49 2015/03/12 00:50:10 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -70,6 +70,9 @@ sub handler {
     my $lonidsdir=$r->dir_config('lonIDsDir');
     &Apache::lonnet::transfer_profile_to_env($lonidsdir,$handle);
     unlink("$lonidsdir/$handle.id");
+    if (!$Apache::lonlocal::lh) {
+        &Apache::lonlocal::get_language_handle($r);
+    }
     my %temp=('logout' => time);
     &Apache::lonnet::put('email_status',\%temp);
     &Apache::lonnet::log($env{'user.domain'},
@@ -89,8 +92,6 @@ sub handler {
     return OK if $r->header_only;
 # -------------------------------------------------------- Menu script and info
 
-    my $windowinfo=&Apache::lonmenu::close();
-    $windowinfo.=&Apache::lonnavmaps::close();
 # ---------------------------------------------------------------- Get handover
     &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},['handover']);
     my $switch='';
@@ -102,14 +103,28 @@ sub handler {
 	$start_page=&Apache::loncommon::start_page('Switching Server ...',
 						   $switch);
     } else {
-	$start_page=&Apache::loncommon::start_page('Logged Out',undef,
-                           {'no_inline_link' => 1,
-                            'no_nav_bar'     => 1,});
+        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);
+            }
+        }
+	$start_page=&Apache::loncommon::start_page('Logged Out',$headextra,
+                           {'no_nav_bar'     => 1,});
 	
         $relogmessage.='<h1>'.&mt('Goodbye').'</h1>'
                       .'<p>'.&mt('Thank you for using LON-CAPA.').'</p>';
 
-        my $domain = $env{'user.domain'};
 	if (!$env{'request.sso.norelogin'}) {
 	    my ($relogin_server,$login_url);
 	    if ($env{'request.sso.reloginserver'}) {
@@ -127,7 +142,7 @@ sub handler {
                                       '://'.$server.$path;
                          if (($path eq '') && (!$isredirect)) {
                              my $serverhomeID =
-                                 &Apache::lonnet::get_server_homeID($lonhost);
+                                 &Apache::lonnet::get_server_homeID($server);
                              my $serverhomedom =
                                  &Apache::lonnet::host_domain($serverhomeID);
                              if ($serverhomedom ne $domain) {
@@ -155,34 +170,32 @@ sub handler {
 
 '<a href="javascript:self.close();">','</a>'
 
-Due to security reasons in new web browsers a window could only be closed with java script, if this window has also been opend with javascript. This is not done here which means that in most cases the close link will not work. Unless we find another solution, this link should not be offered. (Stefan Bisitz, 2008-08-01)
+Due to security reasons in new web browsers a window could only be closed with javascript, if this window has also been opened with javascript. This is not done here which means that in most cases the close link will not work. Unless we find another solution, this link should not be offered. (Stefan Bisitz, 2008-08-01)
 
 =cut
-
             $relogmessage.='<p>'.&mt('[_1]Log in again[_2]'
                               ,'<a href="'.$login_url.'">','</a>')
-                          .('&nbsp;'x6).&mt('[_1]Return to course information page[_2]'
-                              ,'<a href="http://relate.mit.edu/physicscourse">'
-                              ,'</a>')
                           .'</p>';
         }
         if ($env{'request.sso.login'}
 	    && defined($r->dir_config("lonSSOUserLogoutMessageFile_$domain"))) {
-	    open(my $fh,$r->dir_config("lonSSOUserLogoutMessageFile_$domain"));
-	    $relogmessage.= join('',<$fh>);
+	    if (open(my $fh,$r->dir_config("lonSSOUserLogoutMessageFile_$domain"))) {
+	        $relogmessage.= join('',<$fh>);
+                close($fh);
+            }
 	}
 	if ($env{'request.sso.login'}
 	    && defined($r->dir_config('lonSSOUserLogoutMessageFile'))) {
-	    open(my $fh,$r->dir_config('lonSSOUserLogoutMessageFile'));
-	    $relogmessage.= join('',<$fh>);
+	    if (open(my $fh,$r->dir_config('lonSSOUserLogoutMessageFile'))) {
+	        $relogmessage.= join('',<$fh>);
+                close($fh);
+            }
 	}
-
     }
     my $end_page=&Apache::loncommon::end_page();
 # --------------------------------------------------------------- Screen Output
     $r->print(<<ENDDOCUMENT);
 $start_page
-$windowinfo
 $relogmessage
 $end_page
 ENDDOCUMENT