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

[www]

www		Tue May 13 11:06:35 2008 EDT

  Modified files:              
    /loncom	loncapa_apache.conf 
    /loncom/auth	lonlogout.pm 
  Log:
  Lock against logout.
  
  
Index: loncom/loncapa_apache.conf
diff -u loncom/loncapa_apache.conf:1.174 loncom/loncapa_apache.conf:1.175
--- loncom/loncapa_apache.conf:1.174	Mon May 12 19:47:31 2008
+++ loncom/loncapa_apache.conf	Tue May 13 11:06:14 2008
@@ -1,7 +1,7 @@
 ##
 ## loncapa_apache.conf -- Apache HTTP LON-CAPA configuration file
 ##
-## $Id: loncapa_apache.conf,v 1.174 2008/05/12 23:47:31 www Exp $
+## $Id: loncapa_apache.conf,v 1.175 2008/05/13 15:06:14 www Exp $
 ##
 
 #
@@ -549,6 +549,7 @@
 SetHandler perl-script
 PerlHandler Apache::lonlogout
 ErrorDocument     403 /adm/login
+ErrorDocument     409 /adm/preferences?action=lockwarning
 ErrorDocument	  500 /adm/errorhandler
 </Location>
 
Index: loncom/auth/lonlogout.pm
diff -u loncom/auth/lonlogout.pm:1.30 loncom/auth/lonlogout.pm:1.31
--- loncom/auth/lonlogout.pm:1.30	Wed Apr  2 08:29:38 2008
+++ loncom/auth/lonlogout.pm	Tue May 13 11:06:34 2008
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Logout Handler
 #
-# $Id: lonlogout.pm,v 1.30 2008/04/02 12:29:38 bisitz Exp $
+# $Id: lonlogout.pm,v 1.31 2008/05/13 15:06:34 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -49,6 +49,10 @@
     }
 
     #we've got a valid user
+    #any locks in place?
+    my $locknum=&Apache::lonnet::get_locks();
+    if ($locknum) { return 409; }
+    #nope, go ahead
     my @profile;
     my $lonidsdir=$r->dir_config('lonIDsDir');
     &Apache::lonnet::transfer_profile_to_env($lonidsdir,$handle);