--- loncom/loncapa_apache.conf	2006/04/07 22:28:57	1.128
+++ loncom/loncapa_apache.conf	2006/05/18 01:16:25	1.136
@@ -1,7 +1,7 @@
 ##
 ## loncapa_apache.conf -- Apache HTTP LON-CAPA configuration file
 ##
-## $Id: loncapa_apache.conf,v 1.128 2006/04/07 22:28:57 albertel Exp $
+## $Id: loncapa_apache.conf,v 1.136 2006/05/18 01:16:25 raeburn Exp $
 ##
 
 #
@@ -43,7 +43,7 @@ ScriptAlias /cgi-bin/ "/home/httpd/cgi-b
 # ------------------------------------------------------------- Access Handlers
 
 PerlTransHandler	Apache::lontrans
-PerlCleanupHandler	Apache::lonnet::save_cache
+PerlCleanupHandler	Apache::lonacc::cleanup
 
 PerlAuthenHandler Apache::checkauthen
 PerlSetVar lonOtherAuthen no
@@ -86,10 +86,18 @@ SetHandler perl-script
 PerlHandler Apache::portfolio
 </Location>
 
+<Location /adm/coursegrp_portfolio>
+AuthType Basic
+Require valid-user
+PerlAuthzHandler Apache::lonacc
+SetHandler perl-script
+PerlHandler Apache::portfolio
+</Location>
+
 <LocationMatch "^/+userfiles.*">
 PerlAccessHandler       Apache::lontokacc
 PerlCleanupHandler	Apache::lontokacc::removefile
-PerlCleanupHandler	Apache::lonnet::save_cache
+PerlCleanupHandler	Apache::lonacc::cleanup
 </LocationMatch>
 
 <LocationMatch "^/+uploaded.*">
@@ -128,6 +136,7 @@ PerlHandler Apache::lonsequence
 </LocationMatch>
 
 <LocationMatch "^/+public/.*/syllabus$">
+PerlAccessHandler      Apache::publiccheck
 AuthType Basic
 Require valid-user
 PerlAuthzHandler	Apache::lonacc
@@ -138,6 +147,7 @@ ErrorDocument	  500 /adm/errorhandler
 </LocationMatch>
 
 <LocationMatch "^/+(public|adm)/.*(\.rss|_rss\.html)$">
+PerlAccessHandler      Apache::publiccheck
 AuthType Basic
 Require valid-user
 PerlAuthzHandler	Apache::lonacc
@@ -204,6 +214,8 @@ ErrorDocument	  500 /adm/errorhandler
 </LocationMatch>
 
 <LocationMatch "^/+priv.*">
+AuthType Basic
+Require valid-user
 PerlAuthzHandler Apache::loncacc
 SetHandler        perl-script
 PerlHandler       Apache::lonconstruct
@@ -218,6 +230,8 @@ PerlAccessHandler Apache::lonracc
 </LocationMatch>
 
 <LocationMatch "^/+\~.*">
+AuthType Basic
+Require valid-user
 PerlAuthzHandler Apache::loncacc
 ErrorDocument     403 /adm/login
 ErrorDocument     404 /adm/notfound.html
@@ -286,7 +300,7 @@ ErrorDocument	  500 /adm/errorhandler
 SetHandler perl-script
 PerlHandler Apache::lonindexer
 PerlCleanupHandler Apache::lonindexer::cleanup
-PerlCleanupHandler	Apache::lonnet::save_cache
+PerlCleanupHandler	Apache::lonacc::cleanup
 </LocationMatch>
 
 <LocationMatch "^/+(res|\~).*\.tex$">
@@ -305,6 +319,7 @@ PerlHandler Apache::lonsequence
 </LocationMatch>
 
 <LocationMatch "^/+(res|\~|public|uploaded|editupload|adm).*\.meta$">
+PerlAccessHandler      Apache::publiccheck
 SetHandler perl-script
 PerlHandler Apache::lonmeta
 ErrorDocument     413 /adm/overloaded.txt
@@ -542,7 +557,7 @@ PerlAuthzHandler       Apache::lonacc
 SetHandler perl-script
 PerlHandler Apache::lonpageflip
 PerlCleanupHandler Apache::lonpageflip::cleanup
-PerlCleanupHandler	Apache::lonnet::save_cache
+PerlCleanupHandler	Apache::lonacc::cleanup
 ErrorDocument     406 /adm/roles
 ErrorDocument     403 /adm/login
 ErrorDocument	  500 /adm/errorhandler
@@ -555,7 +570,7 @@ PerlAuthzHandler       Apache::lonacc
 SetHandler perl-script
 PerlHandler Apache::lonambiguous
 PerlCleanupHandler Apache::lonambiguous::cleanup
-PerlCleanupHandler	Apache::lonnet::save_cache
+PerlCleanupHandler	Apache::lonacc::cleanup
 ErrorDocument     403 /adm/login
 ErrorDocument	  500 /adm/errorhandler
 </Location>
@@ -565,7 +580,7 @@ AuthType Basic
 Require valid-user
 PerlAuthzHandler       Apache::lonacc
 SetHandler perl-script
-PerlHandler Apache::lonmsg
+PerlHandler Apache::lonmsgdisplay
 ErrorDocument     403 /adm/login
 ErrorDocument	  500 /adm/errorhandler
 </Location>
@@ -670,6 +685,8 @@ ErrorDocument	  500 /adm/errorhandler
 </Location>
 
 <LocationMatch "^/+\~.*/$">
+AuthType Basic
+Require valid-user
 PerlAuthzHandler       Apache::loncacc
 SetHandler perl-script
 PerlHandler Apache::lonpubdir
@@ -916,7 +933,7 @@ PerlAuthzHandler       Apache::lonacc
 SetHandler perl-script
 PerlHandler Apache::londocs
 PerlCleanupHandler Apache::londocs::untiehash
-PerlCleanupHandler	Apache::lonnet::save_cache
+PerlCleanupHandler	Apache::lonacc::cleanup
 ErrorDocument     403 /adm/login
 ErrorDocument	  500 /adm/errorhandler
 </Location>
@@ -931,7 +948,7 @@ ErrorDocument     403 /adm/login
 ErrorDocument     500 /adm/errorhandler
 </Location>
 
-<Location /adm/announcements>
+<LocationMatch "^/adm/announcements">
 AuthType Basic
 Require valid-user
 PerlAuthzHandler       Apache::lonacc
@@ -939,7 +956,7 @@ SetHandler perl-script
 PerlHandler Apache::lonannounce
 ErrorDocument     403 /adm/login
 ErrorDocument	  500 /adm/errorhandler
-</Location>
+</LocationMatch>
 
 <Location /adm/chat>
 AuthType Basic
@@ -997,7 +1014,7 @@ PerlAuthzHandler       Apache::lonacc
 SetHandler perl-script
 PerlHandler Apache::lonsearchcat
 PerlCleanupHandler Apache::lonsearchcat::cleanup
-PerlCleanupHandler	Apache::lonnet::save_cache
+PerlCleanupHandler	Apache::lonacc::cleanup
 ErrorDocument     403 /adm/login
 ErrorDocument     413 /adm/overloaded.txt
 ErrorDocument	  500 /adm/errorhandler
@@ -1032,7 +1049,7 @@ PerlAuthzHandler	Apache::lonacc
 SetHandler perl-script
 PerlHandler Apache::groupsort
 PerlCleanupHandler Apache::groupsort::cleanup
-PerlCleanupHandler	Apache::lonnet::save_cache
+PerlCleanupHandler	Apache::lonacc::cleanup
 ErrorDocument     403 /adm/login
 ErrorDocument	  500 /adm/errorhandler
 </Location>
@@ -1071,6 +1088,11 @@ SetHandler perl-script
 PerlHandler Apache::lonsupportreq
 </LocationMatch>
 
+<LocationMatch "^/adm/css">
+SetHandler perl-script
+PerlHandler Apache::loncss
+</LocationMatch>
+
 # ------------------------------------------------- Backdoor Adm Tests/Programs
 
 <Location /cgi-bin/loncron.pl>
@@ -1141,7 +1163,7 @@ PerlHandler Apache::lontest
 
 # ------------------------------------------------------- Shutting down a child
 
-PerlChildExitHandler Apache::lonnet::goodbye
+PerlChildExitHandler Apache::lonacc::goodbye
 
 #
 # LON-CAPA Section (extensions to access.conf permission configuration)