[LON-CAPA-cvs] cvs: loncom / loncapa_apache.conf /auth loncacc.pm doc/loncapafiles loncapafiles.lpml
www
lon-capa-cvs@mail.lon-capa.org
Tue, 10 Sep 2002 14:26:13 -0000
www Tue Sep 10 10:26:13 2002 EDT
Modified files:
/doc/loncapafiles loncapafiles.lpml
/loncom loncapa_apache.conf
/loncom/auth loncacc.pm
Log:
Better error message when failing to access construction space.
Index: doc/loncapafiles/loncapafiles.lpml
diff -u doc/loncapafiles/loncapafiles.lpml:1.171 doc/loncapafiles/loncapafiles.lpml:1.172
--- doc/loncapafiles/loncapafiles.lpml:1.171 Mon Sep 9 10:38:01 2002
+++ doc/loncapafiles/loncapafiles.lpml Tue Sep 10 10:26:13 2002
@@ -3,7 +3,7 @@
<!-- loncapafiles.lpml -->
<!-- Scott Harrison -->
-<!-- $Id: loncapafiles.lpml,v 1.171 2002/09/09 14:38:01 harris41 Exp $ -->
+<!-- $Id: loncapafiles.lpml,v 1.172 2002/09/10 14:26:13 www Exp $ -->
<!--
@@ -1844,6 +1844,14 @@
<categoryname>handler</categoryname>
<description>
Handler to publish directories.
+</description>
+</file>
+<file>
+<source>loncom/publisher/lonunauthorized.pm</source>
+<target dist='default'>home/httpd/lib/perl/Apache/lonunauthorized.pm</target>
+<categoryname>handler</categoryname>
+<description>
+Handler to explain failed contruction space access.
</description>
</file>
<file>
Index: loncom/loncapa_apache.conf
diff -u loncom/loncapa_apache.conf:1.17 loncom/loncapa_apache.conf:1.18
--- loncom/loncapa_apache.conf:1.17 Tue Aug 27 09:23:01 2002
+++ loncom/loncapa_apache.conf Tue Sep 10 10:26:13 2002
@@ -1,7 +1,7 @@
##
## loncapa_apache.conf -- Apache HTTP LON-CAPA configuration file
##
-## $Id: loncapa_apache.conf,v 1.17 2002/08/27 13:23:01 www Exp $
+## $Id: loncapa_apache.conf,v 1.18 2002/09/10 14:26:13 www Exp $
##
## 1/11/2002 - Scott Harrison
## 2/19/2002 - Scott Harrison
@@ -86,7 +86,7 @@
PerlHandler Apache::lonconstruct
ErrorDocument 403 /adm/login
ErrorDocument 404 /adm/notfound.html
-ErrorDocument 406 /adm/unauthorized.html
+ErrorDocument 406 /adm/unauthorized
ErrorDocument 500 /adm/errorhandler
</LocationMatch>
@@ -98,7 +98,7 @@
PerlAccessHandler Apache::loncacc
ErrorDocument 403 /adm/login
ErrorDocument 404 /adm/notfound.html
-ErrorDocument 406 /adm/unauthorized.html
+ErrorDocument 406 /adm/unauthorized
ErrorDocument 500 /adm/errorhandler
AllowOverride None
</LocationMatch>
@@ -291,7 +291,7 @@
PerlHandler Apache::lonpublisher
ErrorDocument 403 /adm/login
ErrorDocument 404 /adm/notfound.html
-ErrorDocument 406 /adm/unauthorized.html
+ErrorDocument 406 /adm/unauthorized
ErrorDocument 500 /adm/errorhandler
</Location>
@@ -301,7 +301,7 @@
PerlHandler Apache::lonpubdir
ErrorDocument 403 /adm/login
ErrorDocument 404 /adm/notfound.html
-ErrorDocument 406 /adm/unauthorized.html
+ErrorDocument 406 /adm/unauthorized
ErrorDocument 500 /adm/errorhandler
</LocationMatch>
@@ -311,7 +311,16 @@
PerlHandler Apache::lonpubdir
ErrorDocument 403 /adm/login
ErrorDocument 404 /adm/notfound.html
-ErrorDocument 406 /adm/unauthorized.html
+ErrorDocument 406 /adm/unauthorized
+ErrorDocument 500 /adm/errorhandler
+</Location>
+
+<Location /adm/unauthorized>
+PerlAccessHandler Apache::lonacc
+SetHandler perl-script
+PerlHandler Apache::lonunauthorized
+ErrorDocument 403 /adm/login
+ErrorDocument 404 /adm/notfound.html
ErrorDocument 500 /adm/errorhandler
</Location>
@@ -321,7 +330,7 @@
PerlHandler Apache::lonretrieve
ErrorDocument 403 /adm/login
ErrorDocument 404 /adm/notfound.html
-ErrorDocument 406 /adm/unauthorized.html
+ErrorDocument 406 /adm/unauthorized
ErrorDocument 500 /adm/errorhandler
</Location>
@@ -331,7 +340,7 @@
PerlHandler Apache::loncfile
ErrorDocument 403 /adm/login
ErrorDocument 404 /adm/notfound.html
-ErrorDocument 406 /adm/unauthorized.html
+ErrorDocument 406 /adm/unauthorized
ErrorDocument 500 /adm/errorhandler
</Location>
@@ -341,7 +350,7 @@
PerlHandler Apache::londiff
ErrorDocument 403 /adm/login
ErrorDocument 404 /adm/notfound.html
-ErrorDocument 406 /adm/unauthorized.html
+ErrorDocument 406 /adm/unauthorized
ErrorDocument 500 /adm/errorhandler
</Location>
@@ -351,7 +360,7 @@
PerlHandler Apache::lonupload
ErrorDocument 403 /adm/login
ErrorDocument 404 /adm/notfound.html
-ErrorDocument 406 /adm/unauthorized.html
+ErrorDocument 406 /adm/unauthorized
ErrorDocument 500 /adm/errorhandler
</Location>
Index: loncom/auth/loncacc.pm
diff -u loncom/auth/loncacc.pm:1.21 loncom/auth/loncacc.pm:1.22
--- loncom/auth/loncacc.pm:1.21 Tue Feb 26 16:01:33 2002
+++ loncom/auth/loncacc.pm Tue Sep 10 10:26:13 2002
@@ -2,7 +2,7 @@
# Cookie Based Access Handler for Construction Area
# (lonacc: 5/21/99,5/22,5/29,5/31 Gerd Kortemeyer)
#
-# $Id: loncacc.pm,v 1.21 2002/02/26 21:01:33 albertel Exp $
+# $Id: loncacc.pm,v 1.22 2002/09/10 14:26:13 www Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -69,6 +69,7 @@
sub handler {
my $r = shift;
my $requrl=$r->uri;
+ $ENV{'request.editurl'}=$requrl;
my %cookies=CGI::Cookie->parse($r->header_in('Cookie'));
my $lonid=$cookies{'lonID'};
my $cookie;