--- loncom/auth/lonlogout.pm	2007/03/01 23:14:12	1.25
+++ loncom/auth/lonlogout.pm	2007/10/01 20:36:37	1.28
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Logout Handler
 #
-# $Id: lonlogout.pm,v 1.25 2007/03/01 23:14:12 albertel Exp $
+# $Id: lonlogout.pm,v 1.28 2007/10/01 20:36:37 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -99,20 +99,32 @@ sub handler {
 					   'li' => 'log in again',
 					   'pe' => 'Please either',
 					   'or' => 'or');
-        my $relogin_server;
-        if ($env{'request.sso.reloginserver'}) {
-            $relogin_server = $env{'request.sso.reloginserver'};
-        }
-	my $login_url = $relogin_server.'/adm/'.
-                        ($env{'request.sso.login'} ? 'roles': 'login');
- 
-	$relogmessage=(<<ENDRELOG);
+	
+	$relogmessage.=(<<ENDRELOG);
 	<h1>$lt{'gb'}!</h1>
+ENDRELOG
+
+	if (!$env{'request.sso.norelogin'}) {
+	    my $relogin_server;
+	    if ($env{'request.sso.reloginserver'}) {
+		$relogin_server = $env{'request.sso.reloginserver'};
+	    }
+	    my $login_url = $relogin_server.'/adm/'.
+		($env{'request.sso.login'} ? 'roles': 'login');
+
+	    $relogmessage.=(<<ENDRELOG);
 	    $lt{'pe'} <a href="javascript:self.close();">$lt{'cw'}</a> $lt{'or'}
 	<a href="$login_url?domain=$env{'user.domain'}">$lt{'li'}</a>.
 ENDRELOG
 
+        }
+	my $domain = $env{'user.domain'};
         if ($env{'request.sso.login'}
+	    && defined($r->dir_config("lonSSOUserLogoutMessageFile_$domain"))) {
+	    open(my $fh,$r->dir_config("lonSSOUserLogoutMessageFile_$domain"));
+	    $relogmessage.= join('',<$fh>);
+	}
+	if ($env{'request.sso.login'}
 	    && defined($r->dir_config('lonSSOUserLogoutMessageFile'))) {
 	    open(my $fh,$r->dir_config('lonSSOUserLogoutMessageFile'));
 	    $relogmessage.= join('',<$fh>);
@@ -127,10 +139,15 @@ $windowinfo
 $relogmessage
 $end_page
 ENDDOCUMENT
-    &Apache::lonnet::flushcourselogs();
+    $r->register_cleanup(\&flush_course_logs);
     return OK; 
 }
 
+sub flush_course_logs {
+    &Apache::lonnet::flushcourselogs();
+    return OK;
+}
+
 1;
 __END__