--- loncom/loncapa_apache.conf	2006/03/29 18:08:40	1.123
+++ loncom/loncapa_apache.conf	2007/04/20 21:11:03	1.166
@@ -1,7 +1,7 @@
 ##
 ## loncapa_apache.conf -- Apache HTTP LON-CAPA configuration file
 ##
-## $Id: loncapa_apache.conf,v 1.123 2006/03/29 18:08:40 raeburn Exp $
+## $Id: loncapa_apache.conf,v 1.166 2007/04/20 21:11:03 banghart Exp $
 ##
 
 #
@@ -43,11 +43,19 @@ 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
 
 #PerlWarn On
 <LocationMatch "^/+res.*">
-PerlAccessHandler       Apache::lonacc
+
+AuthType LONCAPA
+Require valid-user
+
+PerlAccessHandler      Apache::publiccheck
+PerlAuthzHandler       Apache::lonacc
 PerlHeaderParserHandler Apache::lonrep
 ErrorDocument     403 /adm/login
 ErrorDocument     404 /adm/notfound.html
@@ -55,9 +63,14 @@ ErrorDocument     406 /adm/roles
 ErrorDocument	  500 /adm/errorhandler
 </LocationMatch>
 
+
+<LocationMatch "/.*">
+</LocationMatch>
+
+
 <LocationMatch "^/+enc.*">
 SetHandler perl-script
-PerlHandler       Apache::lonenc
+PerlHandler       Apache::lonencurl
 ErrorDocument     403 /adm/login
 ErrorDocument     404 /adm/notfound.html
 ErrorDocument     406 /adm/roles
@@ -65,13 +78,17 @@ ErrorDocument	  500 /adm/errorhandler
 </LocationMatch>
 
 <Location /adm/portfolio>
-PerlAccessHandler Apache::lonacc
+AuthType LONCAPA
+Require valid-user
+PerlAuthzHandler Apache::lonacc
 SetHandler perl-script
 PerlHandler Apache::portfolio
 </Location>
 
 <Location /adm/coursegrp_portfolio>
-PerlAccessHandler Apache::lonacc
+AuthType LONCAPA
+Require valid-user
+PerlAuthzHandler Apache::lonacc
 SetHandler perl-script
 PerlHandler Apache::portfolio
 </Location>
@@ -79,11 +96,13 @@ PerlHandler Apache::portfolio
 <LocationMatch "^/+userfiles.*">
 PerlAccessHandler       Apache::lontokacc
 PerlCleanupHandler	Apache::lontokacc::removefile
-PerlCleanupHandler	Apache::lonnet::save_cache
+PerlCleanupHandler	Apache::lonacc::cleanup
 </LocationMatch>
 
 <LocationMatch "^/+uploaded.*">
-PerlAccessHandler	Apache::lonacc
+AuthType LONCAPA
+Require valid-user
+PerlAuthzHandler	Apache::lonacc
 PerlHeaderParserHandler Apache::lonuploadrep
 ErrorDocument     403 /adm/login
 ErrorDocument     404 /adm/notfound.html
@@ -92,17 +111,34 @@ ErrorDocument	  500 /adm/errorhandler
 </LocationMatch>
 
 <LocationMatch "^/+editupload.*">
-PerlAccessHandler	Apache::lonacc
+AuthType LONCAPA
+Require valid-user
+PerlAuthzHandler	Apache::lonacc
 ErrorDocument     403 /adm/login
 ErrorDocument     406 /adm/roles
 ErrorDocument	  500 /adm/errorhandler
 </LocationMatch>
 
 <LocationMatch "^/+uploaded/.*/.*/internal/.*">
-PerlAccessHandler	Apache::lonuploadedacc
+PerlAuthenHandler	Apache::lonuploadedacc
+PerlAuthzHandler	Apache::lonuploadedacc::skip_phase
+PerlAccessHandler	Apache::lonuploadedacc::skip_phase
+</LocationMatch>
+
+<LocationMatch "^/+uploaded/.*/.*/portfolio/.*">
+PerlAccessHandler      Apache::publiccheck
+AuthType LONCAPA
+Require valid-user
+PerlAuthzHandler       Apache::lonacc
+</LocationMatch>
+
+<LocationMatch "^/+uploaded/.*/.*/groups/.*/portfolio/.*">
+PerlAccessHandler      Apache::publiccheck
+AuthType LONCAPA
+Require valid-user
+PerlAuthzHandler       Apache::lonacc
 </LocationMatch>
 
-
 <LocationMatch "^/+uploaded/.*\.page$">
 SetHandler perl-script
 PerlHandler Apache::lonpage
@@ -114,7 +150,10 @@ PerlHandler Apache::lonsequence
 </LocationMatch>
 
 <LocationMatch "^/+public/.*/syllabus$">
-PerlAccessHandler	Apache::lonacc
+PerlAccessHandler      Apache::publiccheck
+AuthType LONCAPA
+Require valid-user
+PerlAuthzHandler	Apache::lonacc
 SetHandler              perl-script
 PerlHandler             Apache::lonsyllabus
 ErrorDocument     404 /adm/notfound.html
@@ -122,7 +161,10 @@ ErrorDocument	  500 /adm/errorhandler
 </LocationMatch>
 
 <LocationMatch "^/+(public|adm)/.*(\.rss|_rss\.html)$">
-PerlAccessHandler	Apache::lonacc
+PerlAccessHandler      Apache::publiccheck
+AuthType LONCAPA
+Require valid-user
+PerlAuthzHandler	Apache::lonacc
 SetHandler              perl-script
 PerlHandler             Apache::lonrss
 ErrorDocument     404 /adm/notfound.html
@@ -130,7 +172,9 @@ ErrorDocument	  500 /adm/errorhandler
 </LocationMatch>
 
 <LocationMatch "^/adm/.*/aboutme$">
-PerlAccessHandler	Apache::lonacc
+AuthType LONCAPA
+Require valid-user
+PerlAuthzHandler	Apache::lonacc
 SetHandler              perl-script
 PerlHandler             Apache::lonaboutme
 ErrorDocument     404 /adm/notfound.html
@@ -138,26 +182,33 @@ ErrorDocument     406 /adm/notinit.html
 ErrorDocument	  500 /adm/errorhandler
 </LocationMatch>
 
-<LocationMatch "^/adm/.*/smppg$">
-PerlAccessHandler	Apache::lonacc
+<LocationMatch "^/adm/.*/aboutme/portfolio$">
+PerlAccessHandler       Apache::publiccheck
+AuthType LONCAPA
+Require valid-user
+PerlAuthzHandler	Apache::lonacc
 SetHandler              perl-script
-PerlHandler             Apache::lonsimplepage
+PerlHandler             Apache::lonaboutme
 ErrorDocument     404 /adm/notfound.html
 ErrorDocument     406 /adm/notinit.html
 ErrorDocument	  500 /adm/errorhandler
 </LocationMatch>
 
-<LocationMatch "^/adm/.*/grppg$">
-PerlAccessHandler       Apache::lonacc
+<LocationMatch "^/adm/.*/smppg$">
+AuthType LONCAPA
+Require valid-user
+PerlAuthzHandler	Apache::lonacc
 SetHandler              perl-script
 PerlHandler             Apache::lonsimplepage
 ErrorDocument     404 /adm/notfound.html
 ErrorDocument     406 /adm/notinit.html
-ErrorDocument     500 /adm/errorhandler
+ErrorDocument	  500 /adm/errorhandler
 </LocationMatch>
 
 <LocationMatch "^/adm/.*/bulletinboard$">
-PerlAccessHandler	Apache::lonacc
+AuthType LONCAPA
+Require valid-user
+PerlAuthzHandler	Apache::lonacc
 SetHandler              perl-script
 PerlHandler             Apache::londatecheck
 PerlHandler             Apache::lonbulletin
@@ -167,7 +218,9 @@ ErrorDocument	  500 /adm/errorhandler
 </LocationMatch>
 
 <LocationMatch "\.problem/smpedit$">
-PerlAccessHandler	Apache::lonacc
+AuthType LONCAPA
+Require valid-user
+PerlAuthzHandler	Apache::lonacc
 SetHandler              perl-script
 PerlHandler             Apache::lonsimpleproblemedit
 ErrorDocument     404 /adm/notfound.html
@@ -176,7 +229,9 @@ ErrorDocument	  500 /adm/errorhandler
 </LocationMatch>
 
 <LocationMatch "^/+priv.*">
-PerlAccessHandler Apache::loncacc
+AuthType LONCAPA
+Require valid-user
+PerlAuthzHandler Apache::loncacc
 SetHandler        perl-script
 PerlHandler       Apache::lonconstruct
 ErrorDocument     403 /adm/login
@@ -190,16 +245,19 @@ PerlAccessHandler Apache::lonracc
 </LocationMatch>
 
 <LocationMatch "^/+\~.*">
-PerlAccessHandler Apache::loncacc
+AuthType LONCAPA
+Require valid-user
+PerlAuthzHandler Apache::loncacc
 ErrorDocument     403 /adm/login
 ErrorDocument     404 /adm/notfound.html
 ErrorDocument     406 /adm/unauthorized
 ErrorDocument	  500 /adm/errorhandler
-AllowOverride None
 </LocationMatch>
 
 <LocationMatch "^/adm/helper/.*\.helper$">
-PerlAccessHandler Apache::lonacc
+AuthType LONCAPA
+Require valid-user
+PerlAuthzHandler  Apache::lonacc
 SetHandler        perl-script
 PerlHandler       Apache::lonhelper
 ErrorDocument     403 /adm/login
@@ -209,7 +267,9 @@ ErrorDocument     500 /adm/errorhandler
 </LocationMatch>
 
 <LocationMatch "/prtspool">
-PerlAccessHandler Apache::lonacc
+AuthType LONCAPA
+Require valid-user
+PerlAuthzHandler Apache::lonacc
 ErrorDocument     403 /adm/login
 ErrorDocument     404 /adm/notfound.html
 ErrorDocument     406 /adm/roles
@@ -239,7 +299,9 @@ PerlHandler Apache::lonratmenu
 </LocationMatch>
 
 <Location /adm/ratparms>
-PerlAccessHandler       Apache::lonacc
+AuthType LONCAPA
+Require valid-user
+PerlAuthzHandler       Apache::lonacc
 SetHandler perl-script
 PerlHandler Apache::lonratparms
 ErrorDocument     403 /adm/login
@@ -252,7 +314,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$">
@@ -271,14 +333,17 @@ 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
 </LocationMatch>
 
 <LocationMatch "^/adm/bombs/">
+AuthType LONCAPA
+Require valid-user
 SetHandler perl-script
-PerlAccessHandler Apache::lonacc
+PerlAuthzHandler Apache::lonacc
 PerlHandler Apache::lonmeta
 </LocationMatch>
 
@@ -301,7 +366,9 @@ PerlHandler Apache::lonhomework
 </LocationMatch>
 
 <LocationMatch "^/adm/wrapper/">
-PerlAccessHandler       Apache::lonacc
+AuthType LONCAPA
+Require valid-user
+PerlAuthzHandler       Apache::lonacc
 SetHandler perl-script
 PerlHandler Apache::lonwrapper
 ErrorDocument     403 /adm/login
@@ -309,7 +376,9 @@ ErrorDocument	  500 /adm/errorhandler
 </LocationMatch>
 
 <LocationMatch "^/adm/source">
-PerlAccessHandler       Apache::lonacc
+AuthType LONCAPA
+Require valid-user
+PerlAuthzHandler       Apache::lonacc
 SetHandler perl-script
 PerlHandler Apache::lonsource
 ErrorDocument     403 /adm/login
@@ -319,9 +388,11 @@ ErrorDocument	  500 /adm/errorhandler
 
 
 <LocationMatch "^/adm/localize/">
-PerlAccessHandler       Apache::lonacc
+AuthType LONCAPA
+Require valid-user
+PerlAuthzHandler       Apache::lonacc
 SetHandler perl-script
-PerlHandler Apache::lonlocal
+PerlHandler Apache::lonlocalize
 ErrorDocument     403 /adm/login
 ErrorDocument	  500 /adm/errorhandler
 </LocationMatch>
@@ -329,7 +400,9 @@ ErrorDocument	  500 /adm/errorhandler
 # -------------------------------------------------------------- Admin Programs
 
 <Location /adm/randomlabel.png>
-PerlAccessHandler       Apache::lonacc
+AuthType LONCAPA
+Require valid-user
+PerlAuthzHandler       Apache::lonacc
 SetHandler perl-script
 PerlHandler Apache::randomlylabel
 ErrorDocument     403 /adm/login
@@ -337,7 +410,9 @@ ErrorDocument	  500 /adm/errorhandler
 </Location>
 
 <Location /adm/imagechoice>
-PerlAccessHandler       Apache::lonacc
+AuthType LONCAPA
+Require valid-user
+PerlAuthzHandler       Apache::lonacc
 SetHandler perl-script
 PerlHandler Apache::imagechoice
 ErrorDocument     403 /adm/login
@@ -345,7 +420,9 @@ ErrorDocument	  500 /adm/errorhandler
 </Location>
 
 <Location /adm/statistics>
-PerlAccessHandler       Apache::lonacc
+AuthType LONCAPA
+Require valid-user
+PerlAuthzHandler       Apache::lonacc
 SetHandler perl-script
 PerlHandler Apache::lonstatistics
 ErrorDocument     403 /adm/login
@@ -354,7 +431,9 @@ ErrorDocument	  500 /adm/errorhandler
 </Location>
 
 <Location /adm/trackstudent>
-PerlAccessHandler       Apache::lonacc
+AuthType LONCAPA
+Require valid-user
+PerlAuthzHandler       Apache::lonacc
 SetHandler perl-script
 PerlHandler Apache::lontrackstudent
 ErrorDocument     403 /adm/login
@@ -363,7 +442,9 @@ ErrorDocument	  500 /adm/errorhandler
 </Location>
 
 <Location /adm/roles>
-PerlAccessHandler       Apache::lonacc
+AuthType LONCAPA
+Require valid-user
+PerlAuthzHandler       Apache::lonacc
 SetHandler perl-script
 PerlHandler Apache::lonroles
 ErrorDocument     403 /adm/login
@@ -371,15 +452,19 @@ ErrorDocument	  500 /adm/errorhandler
 </Location>
 
 <Location /adm/menu>
-PerlAccessHandler       Apache::lonacc
+AuthType LONCAPA
+Require valid-user
+PerlAuthzHandler       Apache::lonacc
 SetHandler perl-script
-PerlHandler Apache::lonmenu
+PerlHandler Apache::lonmainmenu
 ErrorDocument     403 /adm/login
 ErrorDocument	  500 /adm/errorhandler
 </Location>
 
 <Location /adm/remote>
-PerlAccessHandler       Apache::lonacc
+AuthType LONCAPA
+Require valid-user
+PerlAuthzHandler       Apache::lonacc
 SetHandler perl-script
 PerlHandler Apache::lonremote
 ErrorDocument     403 /adm/login
@@ -387,7 +472,9 @@ ErrorDocument	  500 /adm/errorhandler
 </Location>
 
 <Location /adm/pickstudent>
-PerlAccessHandler       Apache::lonacc
+AuthType LONCAPA
+Require valid-user
+PerlAuthzHandler       Apache::lonacc
 SetHandler perl-script
 PerlHandler Apache::lonpickstudent
 ErrorDocument     403 /adm/login
@@ -395,7 +482,9 @@ ErrorDocument	  500 /adm/errorhandler
 </Location>
 
 <Location /adm/pickcourse>
-PerlAccessHandler       Apache::lonacc
+AuthType LONCAPA
+Require valid-user
+PerlAuthzHandler       Apache::lonacc
 SetHandler perl-script
 PerlHandler Apache::lonpickcourse
 ErrorDocument     403 /adm/login
@@ -403,7 +492,9 @@ ErrorDocument	  500 /adm/errorhandler
 </Location>
 
 <Location /adm/pickcode>
-PerlAccessHandler       Apache::lonacc
+AuthType LONCAPA
+Require valid-user
+PerlAuthzHandler       Apache::lonacc
 SetHandler perl-script
 PerlHandler Apache::lonpickcode
 ErrorDocument     403 /adm/login
@@ -415,18 +506,44 @@ SetHandler perl-script
 PerlHandler Apache::lonlogin
 </Location>
 
+<Location /adm/restrictedaccess>
+PerlAccessHandler      Apache::publiccheck
+AuthType LONCAPA
+Require valid-user
+SetHandler perl-script
+PerlAuthzHandler       Apache::lonacc
+PerlHandler Apache::restrictedaccess
+ErrorDocument	  500 /adm/errorhandler
+</Location>
+
+<Location /adm/blockedaccess>
+PerlAccessHandler      Apache::publiccheck
+AuthType LONCAPA
+Require valid-user
+SetHandler perl-script
+PerlAuthzHandler       Apache::lonacc
+PerlHandler Apache::blockedaccess
+ErrorDocument     500 /adm/errorhandler
+</Location>
+
 <Location /adm/logout>
-PerlAccessHandler       Apache::lonacc
+AuthType LONCAPA
+Require valid-user
+PerlAuthzHandler       Apache::lonacc
 SetHandler perl-script
 PerlHandler Apache::lonlogout
 ErrorDocument     403 /adm/login
+ErrorDocument	  500 /adm/errorhandler
 </Location>
 
 <Location /adm/switchserver>
-PerlAccessHandler       Apache::lonacc
+AuthType LONCAPA
+Require valid-user
+PerlAuthzHandler       Apache::lonacc
 SetHandler perl-script
 PerlHandler Apache::switchserver
 ErrorDocument     403 /adm/login
+ErrorDocument	  500 /adm/errorhandler
 </Location>
 
 <Location /adm/authenticate>
@@ -440,7 +557,9 @@ PerlHandler Apache::migrateuser
 </Location>
 
 <Location /adm/annotations>
-PerlAccessHandler       Apache::lonacc
+AuthType LONCAPA
+Require valid-user
+PerlAuthzHandler       Apache::lonacc
 SetHandler perl-script
 PerlHandler Apache::admannotations
 ErrorDocument     403 /adm/login
@@ -448,7 +567,9 @@ ErrorDocument	  500 /adm/errorhandler
 </Location>
 
 <Location /adm/spellcheck>
-PerlAccessHandler       Apache::lonacc
+AuthType LONCAPA
+Require valid-user
+PerlAuthzHandler       Apache::lonacc
 SetHandler perl-script
 PerlHandler Apache::lonspeller
 ErrorDocument     403 /adm/login
@@ -456,7 +577,9 @@ ErrorDocument	  500 /adm/errorhandler
 </Location>
 
 <Location /adm/bookmarks>
-PerlAccessHandler       Apache::lonacc
+AuthType LONCAPA
+Require valid-user
+PerlAuthzHandler       Apache::lonacc
 SetHandler perl-script
 PerlHandler Apache::admbookmarks
 ErrorDocument     403 /adm/login
@@ -464,36 +587,44 @@ ErrorDocument	  500 /adm/errorhandler
 </Location>
 
 <Location /adm/flip>
-PerlAccessHandler       Apache::lonacc
+AuthType LONCAPA
+Require valid-user
+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
 </Location>
 
 <Location /adm/ambiguous>
-PerlAccessHandler       Apache::lonacc
+AuthType LONCAPA
+Require valid-user
+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>
 
 <Location /adm/email>
-PerlAccessHandler       Apache::lonacc
+AuthType LONCAPA
+Require valid-user
+PerlAuthzHandler       Apache::lonacc
 SetHandler perl-script
-PerlHandler Apache::lonmsg
+PerlHandler Apache::lonmsgdisplay
 ErrorDocument     403 /adm/login
 ErrorDocument	  500 /adm/errorhandler
 </Location>
 
 <Location /adm/notify>
-PerlAccessHandler       Apache::lonacc
+AuthType LONCAPA
+Require valid-user
+PerlAuthzHandler       Apache::lonacc
 SetHandler perl-script
 PerlHandler Apache::lonnotify
 ErrorDocument     403 /adm/login
@@ -501,7 +632,9 @@ ErrorDocument     500 /adm/errorhandler
 </Location>
 
 <Location /adm/parmset>
-PerlAccessHandler       Apache::lonacc
+AuthType LONCAPA
+Require valid-user
+PerlAuthzHandler       Apache::lonacc
 SetHandler perl-script
 PerlHandler Apache::lonparmset
 ErrorDocument     403 /adm/login
@@ -510,7 +643,9 @@ ErrorDocument	  500 /adm/errorhandler
 </Location>
 
 <Location /adm/slotrequest>
-PerlAccessHandler       Apache::lonacc
+AuthType LONCAPA
+Require valid-user
+PerlAuthzHandler       Apache::lonacc
 SetHandler perl-script
 PerlHandler Apache::slotrequest
 ErrorDocument     403 /adm/login
@@ -519,7 +654,9 @@ ErrorDocument	  500 /adm/errorhandler
 </Location>
 
 <Location /adm/wizard>
-PerlAccessHandler       Apache::lonacc
+AuthType LONCAPA
+Require valid-user
+PerlAuthzHandler       Apache::lonacc
 SetHandler perl-script
 PerlHandler Apache::lonwizard
 ErrorDocument     403 /adm/login
@@ -528,7 +665,9 @@ ErrorDocument	  500 /adm/errorhandler
 </Location>
 
 <Location /adm/grades>
-PerlAccessHandler       Apache::lonacc
+AuthType LONCAPA
+Require valid-user
+PerlAuthzHandler       Apache::lonacc
 SetHandler perl-script
 PerlHandler Apache::grades
 ErrorDocument     403 /adm/login
@@ -537,7 +676,9 @@ ErrorDocument	  500 /adm/errorhandler
 </Location>
 
 <Location /adm/createcourse>
-PerlAccessHandler       Apache::lonacc
+AuthType LONCAPA
+Require valid-user
+PerlAuthzHandler       Apache::lonacc
 SetHandler perl-script
 PerlHandler Apache::loncreatecourse
 ErrorDocument     403 /adm/login
@@ -546,7 +687,9 @@ ErrorDocument	  500 /adm/errorhandler
 </Location>
 
 <Location /adm/modifycourse>
-PerlAccessHandler       Apache::lonacc
+AuthType LONCAPA
+Require valid-user
+PerlAuthzHandler       Apache::lonacc
 SetHandler perl-script
 PerlHandler Apache::lonmodifycourse
 ErrorDocument     403 /adm/login
@@ -554,8 +697,21 @@ ErrorDocument     406 /adm/roles
 ErrorDocument     500 /adm/errorhandler
 </Location>
 
+<Location /adm/domainprefs>
+AuthType LONCAPA
+Require valid-user
+PerlAuthzHandler       Apache::lonacc
+SetHandler perl-script
+PerlHandler Apache::domainprefs
+ErrorDocument     403 /adm/login
+ErrorDocument     406 /adm/roles
+ErrorDocument     500 /adm/errorhandler
+</Location>
+
 <Location /adm/createuser>
-PerlAccessHandler       Apache::lonacc
+AuthType LONCAPA
+Require valid-user
+PerlAuthzHandler       Apache::lonacc
 SetHandler perl-script
 PerlHandler Apache::loncreateuser
 ErrorDocument     403 /adm/login
@@ -564,7 +720,9 @@ ErrorDocument	  500 /adm/errorhandler
 </Location>
 
 <Location /adm/publish>
-PerlAccessHandler       Apache::lonacc
+AuthType LONCAPA
+Require valid-user
+PerlAuthzHandler       Apache::lonacc
 SetHandler perl-script
 PerlHandler Apache::lonpublisher
 ErrorDocument     403 /adm/login
@@ -574,7 +732,9 @@ ErrorDocument	  500 /adm/errorhandler
 </Location>
 
 <LocationMatch "^/+\~.*/$">
-PerlAccessHandler       Apache::loncacc
+AuthType LONCAPA
+Require valid-user
+PerlAuthzHandler       Apache::loncacc
 SetHandler perl-script
 PerlHandler Apache::lonpubdir
 ErrorDocument     403 /adm/login
@@ -584,7 +744,9 @@ ErrorDocument	  500 /adm/errorhandler
 </LocationMatch>
 
 <Location /adm/pubdir>
-PerlAccessHandler       Apache::lonacc
+AuthType LONCAPA
+Require valid-user
+PerlAuthzHandler       Apache::lonacc
 SetHandler perl-script
 PerlHandler Apache::lonpubdir
 ErrorDocument     403 /adm/login
@@ -594,7 +756,9 @@ ErrorDocument	  500 /adm/errorhandler
 </Location>
 
 <Location /adm/unauthorized>
-PerlAccessHandler       Apache::lonacc
+AuthType LONCAPA
+Require valid-user
+PerlAuthzHandler       Apache::lonacc
 SetHandler perl-script
 PerlHandler Apache::lonunauthorized
 ErrorDocument     403 /adm/login
@@ -603,7 +767,9 @@ ErrorDocument	  500 /adm/errorhandler
 </Location>
 
 <Location /adm/retrieve>
-PerlAccessHandler       Apache::lonacc
+AuthType LONCAPA
+Require valid-user
+PerlAuthzHandler       Apache::lonacc
 SetHandler perl-script
 PerlHandler Apache::lonretrieve
 ErrorDocument     403 /adm/login
@@ -613,7 +779,9 @@ ErrorDocument	  500 /adm/errorhandler
 </Location>
 
 <Location /adm/cleanup>
-PerlAccessHandler       Apache::lonacc
+AuthType LONCAPA
+Require valid-user
+PerlAuthzHandler       Apache::lonacc
 SetHandler perl-script
 PerlHandler Apache::loncleanup
 ErrorDocument     403 /adm/login
@@ -623,7 +791,9 @@ ErrorDocument	  500 /adm/errorhandler
 </Location>
 
 <Location /adm/cfile>
-PerlAccessHandler       Apache::lonacc
+AuthType LONCAPA
+Require valid-user
+PerlAuthzHandler       Apache::lonacc
 SetHandler perl-script
 PerlHandler Apache::loncfile
 ErrorDocument     403 /adm/login
@@ -633,7 +803,9 @@ ErrorDocument	  500 /adm/errorhandler
 </Location>
 
 <Location /adm/diff>
-PerlAccessHandler       Apache::lonacc
+AuthType LONCAPA
+Require valid-user
+PerlAuthzHandler       Apache::lonacc
 SetHandler perl-script
 PerlHandler Apache::londiff
 ErrorDocument     403 /adm/login
@@ -643,7 +815,9 @@ ErrorDocument	  500 /adm/errorhandler
 </Location>
 
 <Location /adm/upload>
-PerlAccessHandler       Apache::lonacc
+AuthType LONCAPA
+Require valid-user
+PerlAuthzHandler       Apache::lonacc
 SetHandler perl-script
 PerlHandler Apache::lonupload
 ErrorDocument     403 /adm/login
@@ -653,7 +827,9 @@ ErrorDocument	  500 /adm/errorhandler
 </Location>
 
 <Location /adm/imsimport>
-PerlAccessHandler       Apache::lonacc
+AuthType LONCAPA
+Require valid-user
+PerlAuthzHandler       Apache::lonacc
 SetHandler perl-script
 PerlHandler Apache::imsimport
 ErrorDocument     403 /adm/login
@@ -663,7 +839,9 @@ ErrorDocument     500 /adm/errorhandler
 </Location>
 
 <Location /adm/testbank>
-PerlAccessHandler       Apache::lonacc
+AuthType LONCAPA
+Require valid-user
+PerlAuthzHandler       Apache::lonacc
 SetHandler perl-script
 PerlHandler Apache::testbankimport
 ErrorDocument     403 /adm/login
@@ -673,7 +851,9 @@ ErrorDocument     500 /adm/errorhandler
 </Location>
 
 <Location /adm/assesscalc>
-PerlAccessHandler       Apache::lonacc
+AuthType LONCAPA
+Require valid-user
+PerlAuthzHandler       Apache::lonacc
 SetHandler perl-script
 PerlHandler Apache::lonspreadsheet
 ErrorDocument     403 /adm/login
@@ -683,7 +863,9 @@ ErrorDocument	  500 /adm/errorhandler
 </Location>
 
 <Location /adm/studentcalc>
-PerlAccessHandler       Apache::lonacc
+AuthType LONCAPA
+Require valid-user
+PerlAuthzHandler       Apache::lonacc
 SetHandler perl-script
 PerlHandler Apache::lonspreadsheet
 ErrorDocument     403 /adm/login
@@ -693,7 +875,9 @@ ErrorDocument	  500 /adm/errorhandler
 </Location>
 
 <Location /adm/classcalc>
-PerlAccessHandler       Apache::lonacc
+AuthType LONCAPA
+Require valid-user
+PerlAuthzHandler       Apache::lonacc
 SetHandler perl-script
 PerlHandler Apache::lonspreadsheet
 ErrorDocument     403 /adm/login
@@ -703,7 +887,9 @@ ErrorDocument	  500 /adm/errorhandler
 </Location>
 
 <Location /adm/dropadd>
-PerlAccessHandler       Apache::lonacc
+AuthType LONCAPA
+Require valid-user
+PerlAuthzHandler       Apache::lonacc
 SetHandler perl-script
 PerlHandler Apache::londropadd
 ErrorDocument     403 /adm/login
@@ -712,7 +898,9 @@ ErrorDocument	  500 /adm/errorhandler
 </Location>
 
 <Location /adm/viewclasslist>
-PerlAccessHandler       Apache::lonacc
+AuthType LONCAPA
+Require valid-user
+PerlAuthzHandler       Apache::lonacc
 SetHandler perl-script
 PerlHandler Apache::lonviewclasslist
 ErrorDocument     403 /adm/login
@@ -721,7 +909,9 @@ ErrorDocument	  500 /adm/errorhandler
 </Location>
 
 <Location /adm/coursegroups>
-PerlAccessHandler       Apache::lonacc
+AuthType LONCAPA
+Require valid-user
+PerlAuthzHandler       Apache::lonacc
 SetHandler perl-script
 PerlHandler Apache::loncoursegroups
 ErrorDocument     403 /adm/login
@@ -729,8 +919,32 @@ ErrorDocument     406 /adm/roles
 ErrorDocument     500 /adm/errorhandler
 </Location>
 
+<Location /adm/groupboards>
+AuthType LONCAPA
+Require valid-user
+PerlAuthzHandler       Apache::lonacc
+SetHandler perl-script
+PerlHandler Apache::groupboards
+ErrorDocument     403 /adm/login
+ErrorDocument     406 /adm/roles
+ErrorDocument     500 /adm/errorhandler
+</Location>
+
+<Location /adm/grouproster>
+AuthType LONCAPA
+Require valid-user
+PerlAuthzHandler       Apache::lonacc
+SetHandler perl-script
+PerlHandler Apache::grouproster
+ErrorDocument     403 /adm/login
+ErrorDocument     406 /adm/roles
+ErrorDocument     500 /adm/errorhandler
+</Location>
+
 <Location /adm/whatsnew>
-PerlAccessHandler       Apache::lonacc
+AuthType LONCAPA
+Require valid-user
+PerlAuthzHandler       Apache::lonacc
 SetHandler perl-script
 PerlHandler Apache::lonwhatsnew
 ErrorDocument     403 /adm/login
@@ -739,7 +953,9 @@ ErrorDocument     500 /adm/errorhandler
 </Location>
 
 <Location /adm/populate>
-PerlAccessHandler       Apache::lonacc
+AuthType LONCAPA
+Require valid-user
+PerlAuthzHandler       Apache::lonacc
 SetHandler perl-script
 PerlHandler Apache::lonpopulate
 ErrorDocument     403 /adm/login
@@ -748,7 +964,9 @@ ErrorDocument     500 /adm/errorhandler
 </Location>
 
 <Location /adm/managekeys>
-PerlAccessHandler       Apache::lonacc
+AuthType LONCAPA
+Require valid-user
+PerlAuthzHandler       Apache::lonacc
 SetHandler perl-script
 PerlHandler Apache::lonmanagekeys
 ErrorDocument     403 /adm/login
@@ -757,7 +975,9 @@ ErrorDocument	  500 /adm/errorhandler
 </Location>
 
 <Location /adm/printout>
-PerlAccessHandler       Apache::lonacc
+AuthType LONCAPA
+Require valid-user
+PerlAuthzHandler       Apache::lonacc
 SetHandler perl-script
 PerlHandler Apache::lonprintout
 ErrorDocument     403 /adm/login
@@ -766,7 +986,9 @@ ErrorDocument	  500 /adm/errorhandler
 </Location>
 
 <Location /adm/feedback>
-PerlAccessHandler       Apache::lonacc
+AuthType LONCAPA
+Require valid-user
+PerlAuthzHandler       Apache::lonacc
 SetHandler perl-script
 PerlHandler Apache::lonfeedback
 ErrorDocument     403 /adm/login
@@ -774,48 +996,70 @@ ErrorDocument	  500 /adm/errorhandler
 </Location>
 
 <Location /adm/coursedocs>
-PerlAccessHandler       Apache::lonacc
+AuthType LONCAPA
+Require valid-user
+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>
 
 <Location /adm/imsimportdocs>
-PerlAccessHandler       Apache::lonacc
+AuthType LONCAPA
+Require valid-user
+PerlAuthzHandler       Apache::lonacc
 SetHandler perl-script
 PerlHandler Apache::imsimportdocs
 ErrorDocument     403 /adm/login
 ErrorDocument     500 /adm/errorhandler
 </Location>
 
-<Location /adm/announcements>
-PerlAccessHandler       Apache::lonacc
+<LocationMatch "^/adm/announcements">
+AuthType LONCAPA
+Require valid-user
+PerlAuthzHandler       Apache::lonacc
 SetHandler perl-script
 PerlHandler Apache::lonannounce
 ErrorDocument     403 /adm/login
 ErrorDocument	  500 /adm/errorhandler
-</Location>
+</LocationMatch>
 
 <Location /adm/chat>
-PerlAccessHandler       Apache::lonacc
+AuthType LONCAPA
+Require valid-user
+PerlAuthzHandler       Apache::lonacc
 SetHandler perl-script
 PerlHandler Apache::lonchat
 ErrorDocument	  500 /adm/errorhandler
 </Location>
 
 <Location /adm/chatfetch>
-PerlAccessHandler       Apache::lonacc
+AuthType LONCAPA
+Require valid-user
+PerlAuthzHandler       Apache::lonacc
 SetHandler perl-script
 PerlHandler Apache::lonchatfetch
 ErrorDocument     413 /adm/overloaded.txt
 ErrorDocument	  500 /adm/errorhandler
 </Location>
 
+<Location /adm/groupchat>
+AuthType LONCAPA
+Require valid-user
+PerlAuthzHandler       Apache::lonacc
+SetHandler perl-script
+PerlHandler Apache::longroupchat
+ErrorDocument     403 /adm/login
+ErrorDocument     500 /adm/errorhandler
+</Location>
+
 <Location /adm/evaluate>
-PerlAccessHandler       Apache::lonacc
+AuthType LONCAPA
+Require valid-user
+PerlAuthzHandler       Apache::lonacc
 SetHandler perl-script
 PerlHandler Apache::lonevaluate
 ErrorDocument     403 /adm/login
@@ -823,7 +1067,9 @@ ErrorDocument	  500 /adm/errorhandler
 </Location>
 
 <Location /adm/preferences>
-PerlAccessHandler       Apache::lonacc
+AuthType LONCAPA
+Require valid-user
+PerlAuthzHandler       Apache::lonacc
 SetHandler perl-script
 PerlHandler Apache::lonpreferences
 ErrorDocument     403 /adm/login
@@ -831,7 +1077,9 @@ ErrorDocument	  500 /adm/errorhandler
 </Location>
 
 <Location /adm/communicate>
-PerlAccessHandler       Apache::lonacc
+AuthType LONCAPA
+Require valid-user
+PerlAuthzHandler       Apache::lonacc
 SetHandler perl-script
 PerlHandler Apache::loncommunicate
 ErrorDocument     403 /adm/login
@@ -839,27 +1087,33 @@ ErrorDocument	  500 /adm/errorhandler
 </Location>
 
 <Location /adm/searchcat>
-PerlAccessHandler       Apache::lonacc
+AuthType LONCAPA
+Require valid-user
+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
 </Location>
 
 <Location /adm/navmaps>
-PerlAccessHandler       Apache::lonacc
+AuthType LONCAPA
+Require valid-user
+PerlAuthzHandler       Apache::lonacc
 SetHandler perl-script
-PerlHandler Apache::lonnavmaps
+PerlHandler Apache::lonnavdisplay
 ErrorDocument     403 /adm/login
 ErrorDocument     406 /adm/roles
 ErrorDocument	  500 /adm/errorhandler
 </Location>
 
 <Location /adm/quickgrades>
-PerlAccessHandler       Apache::lonacc
+AuthType LONCAPA
+Require valid-user
+PerlAuthzHandler       Apache::lonacc
 SetHandler perl-script
 PerlHandler Apache::lonquickgrades
 ErrorDocument     403 /adm/login
@@ -868,11 +1122,13 @@ ErrorDocument     500 /adm/errorhandler
 </Location>
 
 <Location /adm/groupsort>
-PerlAccessHandler	Apache::lonacc
+AuthType LONCAPA
+Require valid-user
+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>
@@ -883,26 +1139,61 @@ PerlHandler Apache::lonerrorhandler
 </Location>
 
 <LocationMatch "^/adm/help/.*\.hlp$">
-PerlAccessHandler	Apache::lonacc
+AuthType LONCAPA
+Require valid-user
+PerlAccessHandler      Apache::publiccheck
+PerlAuthzHandler	Apache::lonacc
 SetHandler perl-script
 PerlHandler Apache::lonhelp
+ErrorDocument	  500 /adm/errorhandler
 </LocationMatch>
 
 <LocationMatch "^/adm/helpmenu">
-PerlAccessHandler       Apache::lonacc
+AuthType LONCAPA
+Require valid-user
+PerlAuthzHandler       Apache::lonacc
 SetHandler perl-script
 PerlHandler Apache::lonhelpmenu
+ErrorDocument	  500 /adm/errorhandler
 </LocationMatch>
 
 <LocationMatch "^/adm/support">
-PerlAccessHandler       Apache::lonacc
+AuthType LONCAPA
+Require valid-user
+PerlAuthzHandler       Apache::lonacc
 SetHandler perl-script
 PerlHandler Apache::lonsupportreq
+ErrorDocument	  500 /adm/errorhandler
 </LocationMatch>
 
 <LocationMatch "^/adm/helpdesk">
 SetHandler perl-script
 PerlHandler Apache::lonsupportreq
+ErrorDocument	  500 /adm/errorhandler
+</LocationMatch>
+
+<LocationMatch "^/adm/css">
+SetHandler perl-script
+PerlHandler Apache::loncss
+ErrorDocument	  500 /adm/errorhandler
+</LocationMatch>
+
+<LocationMatch "^/adm/coursecatalog">
+SetHandler perl-script
+PerlHandler Apache::coursecatalog
+ErrorDocument	  500 /adm/errorhandler
+</LocationMatch>
+
+<LocationMatch "^/adm/resetpw">
+SetHandler perl-script
+PerlHandler Apache::resetpw
+ErrorDocument     500 /adm/errorhandler
+</LocationMatch>
+
+<LocationMatch "^/adm/dns">
+SetHandler perl-script
+PerlHandler Apache::londns
+ErrorDocument     500 /adm/errorhandler
 </LocationMatch>
 
 # ------------------------------------------------- Backdoor Adm Tests/Programs
@@ -969,13 +1260,13 @@ AuthType Basic
 AuthUserFile /home/httpd/lonTabs/htpasswd
 require user lonadm
 SetHandler perl-script
-PerlAccessHandler Apache::lonacc
+PerlAuthzHandler Apache::lonacc
 PerlHandler Apache::lontest
 </Location>
 
 # ------------------------------------------------------- Shutting down a child
 
-PerlChildExitHandler Apache::lonnet::goodbye
+PerlChildExitHandler Apache::lonacc::goodbye
 
 #
 # LON-CAPA Section (extensions to access.conf permission configuration)
@@ -987,6 +1278,26 @@ PerlChildExitHandler Apache::lonnet::goo
 <Directory />
 Options None
 AllowOverride None
+order deny,allow
+deny from all
+</Directory>
+
+# Allow uploaded files to be served
+
+<Directory "/home/httpd/lonUsers">
+Options Includes FollowSymLinks
+AllowOverride None
+order allow,deny
+allow from all
+</Directory>
+ 
+# Allow construction space files to be served
+
+<Directory "/home/*/public_html/" >
+Options Includes FollowSymLinks
+AllowOverride
+order allow,deny
+allow from all
 </Directory>
 
 # Yes to symbolic links and server-side includes
@@ -1002,7 +1313,18 @@ allow from all
 
 <Directory /home/httpd/cgi-bin>
 AllowOverride None
-Options ExecCGI
+Options ExecCGI FollowSymLinks
+order allow,deny
+allow from all
+</Directory>
+
+# Allow serving of files in prtspool
+
+<Directory "/home/httpd/prtspool/">
+Options Includes FollowSymLinks
+AllowOverride None
+order allow,deny
+allow from all
 </Directory>
 
 # ============================================================= Access Handlers
@@ -1045,10 +1367,13 @@ PerlSetVar       londPort     5663
 PerlSetVar       lonSysEMail  korte@lite.msu.edu
 PerlSetVar       lonDaemons   /home/httpd/perl
 PerlSetVar       lonSockDir   /home/httpd/sockets
+PerlSetVar       lonSockCreate   /home/httpd/sockets/common
 PerlSetVar       lonDocRoot   /home/httpd/html
 PerlSetVar       lonPrtDir    /home/httpd/prtspool
 PerlSetVar       lonIncludes  /home/httpd/html/res/adm/includes
-# & sepeareted list of : seperated fileds inorder of
+PerlSetVar       lonZipDir    /home/httpd/zipspool
+
+# & separated list of : separated fields in order of
 # - internal name to call it, 
 # - regexp that it should match (done case-insensitively)
 # - regexp that is should not match (done case-insensitively)