[LON-CAPA-cvs] cvs: loncom /auth lonlogout.pm

bisitz lon-capa-cvs-allow@mail.lon-capa.org
Fri, 01 Aug 2008 11:04:09 -0000


bisitz		Fri Aug  1 07:04:09 2008 EDT

  Modified files:              
    /loncom/auth	lonlogout.pm 
  Log:
  - Updated logout messages
  - Disabled link functionality of 'close this window' (see comment in code) 
  
  
Index: loncom/auth/lonlogout.pm
diff -u loncom/auth/lonlogout.pm:1.31 loncom/auth/lonlogout.pm:1.32
--- loncom/auth/lonlogout.pm:1.31	Tue May 13 11:06:34 2008
+++ loncom/auth/lonlogout.pm	Fri Aug  1 07:04:09 2008
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Logout Handler
 #
-# $Id: lonlogout.pm,v 1.31 2008/05/13 15:06:34 www Exp $
+# $Id: lonlogout.pm,v 1.32 2008/08/01 11:04:09 bisitz Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -92,7 +92,8 @@
 	$start_page=&Apache::loncommon::start_page('Logged Out',undef,
 						   {'no_inline_link' => 1,});
 	
-	$relogmessage.='<h1>'.&mt('Goodbye').'</h1>';
+        $relogmessage.='<h1>'.&mt('Goodbye').'</h1>'
+                      .'<p>'.&mt('Thank you for using LON-CAPA.').'</p>';
 
 	if (!$env{'request.sso.norelogin'}) {
 	    my $relogin_server;
@@ -102,9 +103,15 @@
 	    my $login_url = $relogin_server.'/adm/'.
 		($env{'request.sso.login'} ? 'roles': 'login');
 
-	    $relogmessage.=&mt('Please either [_1]close this window[_2] or [_3]log in again[_4].'
-                              ,'<a href="javascript:self.close();">','</a>'
-                              ,'<a href="'.$login_url.'?domain='.$env{'user.domain'}.'">','</a>');
+            $relogmessage.='<p>'.&mt('You have been successfully logged out.').' '
+                          .&mt('You can [_1]close this window[_2] now.'
+                              ,'','')
+#                              ,'<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)
+                          .'</p>'
+                          .'<p>'.&mt('[_1]Log in again[_2]'
+                              ,'<a href="'.$login_url.'?domain='.$env{'user.domain'}.'">','</a>')
+                          .'</p>';
         }
 	my $domain = $env{'user.domain'};
         if ($env{'request.sso.login'}