--- loncom/loncapa_apache.conf	2004/08/11 18:39:27	1.92
+++ loncom/loncapa_apache.conf	2008/05/01 14:20:50	1.173
@@ -1,7 +1,7 @@
 ##
 ## loncapa_apache.conf -- Apache HTTP LON-CAPA configuration file
 ##
-## $Id: loncapa_apache.conf,v 1.92 2004/08/11 18:39:27 matthew Exp $
+## $Id: loncapa_apache.conf,v 1.173 2008/05/01 14:20:50 raeburn Exp $
 ##
 
 #
@@ -35,6 +35,7 @@ ExtendedStatus On
 #
 # ===================================================================== Aliases
 
+Alias /zipspool/ /home/httpd/zipspool/
 Alias /prtspool/ /home/httpd/prtspool/
 ScriptAlias /cgi-bin/ "/home/httpd/cgi-bin/"
 
@@ -43,13 +44,19 @@ ScriptAlias /cgi-bin/ "/home/httpd/cgi-b
 # ------------------------------------------------------------- Access Handlers
 
 PerlTransHandler	Apache::lontrans
-<IfDefine MODPERL2>
-PerlCleanupHandler	Apache::lonnet::cleanenv
-</IfDefine>
+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
@@ -57,8 +64,14 @@ ErrorDocument     406 /adm/roles
 ErrorDocument	  500 /adm/errorhandler
 </LocationMatch>
 
+
+<LocationMatch "/.*">
+</LocationMatch>
+
+
 <LocationMatch "^/+enc.*">
-PerlAccessHandler       Apache::lonenc
+SetHandler perl-script
+PerlHandler       Apache::lonencurl
 ErrorDocument     403 /adm/login
 ErrorDocument     404 /adm/notfound.html
 ErrorDocument     406 /adm/roles
@@ -66,25 +79,32 @@ 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>
 
-<LocationMatch "\.portfolio$">
+<Location /adm/coursegrp_portfolio>
+AuthType LONCAPA
+Require valid-user
+PerlAuthzHandler Apache::lonacc
 SetHandler perl-script
 PerlHandler Apache::portfolio
-</LocationMatch>
-
-
+</Location>
 
 <LocationMatch "^/+userfiles.*">
 PerlAccessHandler       Apache::lontokacc
 PerlCleanupHandler	Apache::lontokacc::removefile
+PerlCleanupHandler	Apache::lonacc::cleanup
 </LocationMatch>
 
 <LocationMatch "^/+uploaded.*">
-PerlAccessHandler	Apache::lonacc
+AuthType LONCAPA
+Require valid-user
+PerlAuthzHandler	Apache::lonacc
+PerlHandler Apache::londatecheck
 PerlHeaderParserHandler Apache::lonuploadrep
 ErrorDocument     403 /adm/login
 ErrorDocument     404 /adm/notfound.html
@@ -92,6 +112,35 @@ ErrorDocument     406 /adm/roles
 ErrorDocument	  500 /adm/errorhandler
 </LocationMatch>
 
+<LocationMatch "^/+editupload.*">
+AuthType LONCAPA
+Require valid-user
+PerlAuthzHandler	Apache::lonacc
+ErrorDocument     403 /adm/login
+ErrorDocument     406 /adm/roles
+ErrorDocument	  500 /adm/errorhandler
+</LocationMatch>
+
+<LocationMatch "^/+uploaded/.*/.*/internal/.*">
+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
@@ -103,15 +152,43 @@ 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
 ErrorDocument	  500 /adm/errorhandler
 </LocationMatch>
 
+<LocationMatch "^/+(public|adm)/.*(\.rss|_rss\.html)$">
+PerlAccessHandler      Apache::publiccheck
+AuthType LONCAPA
+Require valid-user
+PerlAuthzHandler	Apache::lonacc
+SetHandler              perl-script
+PerlHandler             Apache::lonrss
+ErrorDocument     404 /adm/notfound.html
+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
+ErrorDocument     406 /adm/notinit.html
+ErrorDocument	  500 /adm/errorhandler
+</LocationMatch>
+
+<LocationMatch "^/adm/.*/aboutme/portfolio$">
+PerlAccessHandler       Apache::publiccheck
+AuthType LONCAPA
+Require valid-user
+PerlAuthzHandler	Apache::lonacc
 SetHandler              perl-script
 PerlHandler             Apache::lonaboutme
 ErrorDocument     404 /adm/notfound.html
@@ -120,8 +197,11 @@ ErrorDocument	  500 /adm/errorhandler
 </LocationMatch>
 
 <LocationMatch "^/adm/.*/smppg$">
-PerlAccessHandler	Apache::lonacc
+AuthType LONCAPA
+Require valid-user
+PerlAuthzHandler	Apache::lonacc
 SetHandler              perl-script
+PerlHandler             Apache::londatecheck
 PerlHandler             Apache::lonsimplepage
 ErrorDocument     404 /adm/notfound.html
 ErrorDocument     406 /adm/notinit.html
@@ -129,8 +209,11 @@ 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
 ErrorDocument     404 /adm/notfound.html
 ErrorDocument     406 /adm/notinit.html
@@ -138,7 +221,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
@@ -147,7 +232,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
@@ -161,16 +248,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
@@ -180,10 +270,24 @@ 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
+ErrorDocument     413 /adm/overloaded.txt
+ErrorDocument	  500 /adm/errorhandler
+</LocationMatch>
+
+<LocationMatch "/zipspool">
+AuthType LONCAPA
+Require valid-user
+PerlAuthzHandler Apache::lonacc
 ErrorDocument     403 /adm/login
 ErrorDocument     404 /adm/notfound.html
 ErrorDocument     406 /adm/roles
+ErrorDocument     413 /adm/overloaded.txt
 ErrorDocument	  500 /adm/errorhandler
 </LocationMatch>
 # ------------------------------------------------------------------------- RAT
@@ -203,8 +307,15 @@ SetHandler perl-script
 PerlHandler Apache::lonratsrv
 </LocationMatch>
 
+<LocationMatch "^/\~.*\/adveditmenu$">
+SetHandler perl-script
+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
@@ -217,6 +328,7 @@ ErrorDocument	  500 /adm/errorhandler
 SetHandler perl-script
 PerlHandler Apache::lonindexer
 PerlCleanupHandler Apache::lonindexer::cleanup
+PerlCleanupHandler	Apache::lonacc::cleanup
 </LocationMatch>
 
 <LocationMatch "^/+(res|\~).*\.tex$">
@@ -234,14 +346,18 @@ SetHandler perl-script
 PerlHandler Apache::lonsequence
 </LocationMatch>
 
-<LocationMatch "^/+(res|\~|public|uploaded|adm).*\.meta$">
+<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>
 
@@ -258,21 +374,26 @@ PerlHandler Apache::londatecheck
 PerlHandler Apache::lonxml
 </LocationMatch>
 
-<LocationMatch "^/+(res|\~).*\.(problem|exam|quiz|assess|survey|form|library)$">
+<LocationMatch "^/+(res|\~).*\.(task|problem|exam|quiz|assess|survey|form|library)$">
 SetHandler perl-script
 PerlHandler Apache::lonhomework
 </LocationMatch>
 
 <LocationMatch "^/adm/wrapper/">
-PerlAccessHandler       Apache::lonacc
+AuthType LONCAPA
+Require valid-user
+PerlAuthzHandler       Apache::lonacc
+PerlHandler Apache::londatecheck
 SetHandler perl-script
 PerlHandler Apache::lonwrapper
 ErrorDocument     403 /adm/login
 ErrorDocument	  500 /adm/errorhandler
 </LocationMatch>
 
-<LocationMatch "^/adm/source/">
-PerlAccessHandler       Apache::lonacc
+<LocationMatch "^/adm/source">
+AuthType LONCAPA
+Require valid-user
+PerlAuthzHandler       Apache::lonacc
 SetHandler perl-script
 PerlHandler Apache::lonsource
 ErrorDocument     403 /adm/login
@@ -282,9 +403,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>
@@ -292,7 +415,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
@@ -300,7 +425,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
@@ -308,7 +435,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
@@ -317,7 +446,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
@@ -326,7 +457,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
@@ -334,15 +467,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
@@ -350,7 +487,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
@@ -358,7 +497,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
@@ -366,7 +507,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
@@ -378,11 +521,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>
+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>
@@ -390,8 +566,15 @@ SetHandler perl-script
 PerlHandler Apache::lonauth
 </Location>
 
+<Location /adm/migrateuser>
+SetHandler perl-script
+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
@@ -399,7 +582,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
@@ -407,7 +592,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
@@ -415,34 +602,54 @@ 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::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::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>
+AuthType LONCAPA
+Require valid-user
+PerlAuthzHandler       Apache::lonacc
+SetHandler perl-script
+PerlHandler Apache::lonnotify
+ErrorDocument     403 /adm/login
+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
@@ -450,8 +657,21 @@ ErrorDocument     406 /adm/roles
 ErrorDocument	  500 /adm/errorhandler
 </Location>
 
+<Location /adm/slotrequest>
+AuthType LONCAPA
+Require valid-user
+PerlAuthzHandler       Apache::lonacc
+SetHandler perl-script
+PerlHandler Apache::slotrequest
+ErrorDocument     403 /adm/login
+ErrorDocument     406 /adm/roles
+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
@@ -460,7 +680,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
@@ -469,7 +691,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
@@ -478,7 +702,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
@@ -486,8 +712,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
@@ -496,7 +735,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
@@ -506,7 +747,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
@@ -516,7 +759,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
@@ -526,7 +771,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
@@ -535,7 +782,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
@@ -544,8 +793,22 @@ ErrorDocument     406 /adm/unauthorized
 ErrorDocument	  500 /adm/errorhandler
 </Location>
 
+<Location /adm/cleanup>
+AuthType LONCAPA
+Require valid-user
+PerlAuthzHandler       Apache::lonacc
+SetHandler perl-script
+PerlHandler Apache::loncleanup
+ErrorDocument     403 /adm/login
+ErrorDocument     404 /adm/notfound.html
+ErrorDocument     406 /adm/unauthorized
+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
@@ -555,7 +818,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
@@ -565,7 +830,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
@@ -575,7 +842,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
@@ -585,7 +854,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
@@ -595,7 +866,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
@@ -605,7 +878,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
@@ -615,7 +890,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
@@ -625,7 +902,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
@@ -634,7 +913,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
@@ -642,8 +923,54 @@ ErrorDocument     406 /adm/roles
 ErrorDocument	  500 /adm/errorhandler
 </Location>
 
+<Location /adm/coursegroups>
+AuthType LONCAPA
+Require valid-user
+PerlAuthzHandler       Apache::lonacc
+SetHandler perl-script
+PerlHandler Apache::loncoursegroups
+ErrorDocument     403 /adm/login
+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>
+AuthType LONCAPA
+Require valid-user
+PerlAuthzHandler       Apache::lonacc
+SetHandler perl-script
+PerlHandler Apache::lonwhatsnew
+ErrorDocument     403 /adm/login
+ErrorDocument     406 /adm/roles
+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
@@ -652,7 +979,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
@@ -661,7 +990,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
@@ -670,7 +1001,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
@@ -678,72 +1011,90 @@ 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::londocs::untiehash
+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/evaluate>
-PerlAccessHandler       Apache::lonacc
+<Location /adm/groupchat>
+AuthType LONCAPA
+Require valid-user
+PerlAuthzHandler       Apache::lonacc
 SetHandler perl-script
-PerlHandler Apache::lonevaluate
+PerlHandler Apache::longroupchat
 ErrorDocument     403 /adm/login
-ErrorDocument	  500 /adm/errorhandler
+ErrorDocument     500 /adm/errorhandler
 </Location>
 
-<Location /adm/preferences>
-PerlAccessHandler       Apache::lonacc
+<Location /adm/evaluate>
+AuthType LONCAPA
+Require valid-user
+PerlAuthzHandler       Apache::lonacc
 SetHandler perl-script
-PerlHandler Apache::lonpreferences
+PerlHandler Apache::lonevaluate
 ErrorDocument     403 /adm/login
 ErrorDocument	  500 /adm/errorhandler
 </Location>
 
-<Location /adm/assignments>
-PerlAccessHandler       Apache::lonacc
+<Location /adm/preferences>
+AuthType LONCAPA
+Require valid-user
+PerlAuthzHandler       Apache::lonacc
 SetHandler perl-script
-PerlHandler Apache::lonassignments
+PerlHandler Apache::lonpreferences
 ErrorDocument     403 /adm/login
-ErrorDocument     406 /adm/roles
 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
@@ -751,26 +1102,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::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
@@ -779,10 +1137,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::lonacc::cleanup
 ErrorDocument     403 /adm/login
 ErrorDocument	  500 /adm/errorhandler
 </Location>
@@ -793,21 +1154,73 @@ 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/selfenroll">
+SetHandler perl-script
+PerlHandler Apache::selfenroll
+ErrorDocument     500 /adm/errorhandler
+</LocationMatch>
+
+<LocationMatch "^/adm/createaccount">
+SetHandler perl-script
+PerlHandler Apache::createaccount
+ErrorDocument     500 /adm/errorhandler
+</LocationMatch>
+
+<LocationMatch "^/adm/dns">
+SetHandler perl-script
+PerlHandler Apache::londns
+ErrorDocument     500 /adm/errorhandler
 </LocationMatch>
 
 # ------------------------------------------------- Backdoor Adm Tests/Programs
@@ -874,13 +1287,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)
@@ -892,6 +1305,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
@@ -907,7 +1340,27 @@ 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>
+
+# Allow serving of files in zipspool
+
+<Directory "/home/httpd/zipspool/">
+Options Includes FollowSymLinks
+AllowOverride None
+order allow,deny
+allow from all
 </Directory>
 
 # ============================================================= Access Handlers
@@ -950,10 +1403,23 @@ 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
-PerlSetVar       lonBrowsDet  netscape:mozilla:msie:mozilla\/(\d+\.\d+)\s:9999:9999&explorer:msie:netscape:msie\s(\d+\.\d+)\;:9999:9999&mozilla:mozilla\/[5-9]:msie:mozilla\/(\d+\.\d+)\s:9999:1&amaya:amaya:mozilla:V(\d+\.\d+)\s:1:1
-PerlSetVar       lonTextBrowsers opera:windows\s+ce:lynx
+PerlSetVar       lonZipDir    /home/httpd/zipspool
+PerlSetVar       lonFontsDir     /home/httpd/html/adm/fonts
+# & 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)
+# - regexp that will pull out the version number into $1
+# - a number that describes the minimum version that has mathml support
+# - a number that describes the minimum number version that has unicode support
+
+PerlSetVar       lonBrowsDet  explorer:msie:netscape:msie\s(\d+\.\d+)\;:9999:9999&mozilla:mozilla\/[5-9]:msie:mozilla\/(\d+\.\d+)\s:9999:1&netscape:netscape:msie:netscape\/(\d+\.\d+):9999:7&netscape:netscape\/[7-9]:shouldnotmatch:netscape\/(\d+\.\d+):9999:7&amaya:amaya:mozilla:V(\d+\.\d+)\s:1:1&safari:safari:msie:safari\/([\d\.]+):9999:84
+
+PerlSetVar       lonTextBrowsers windows\s+ce:lynx
 PerlSetVar       lonScansDir  /home/httpd/scantron
 PerlSetVar       lonScriptTimeout 10
 PerlSetVar	 BugzillaHost	http://bugs.lon-capa.org/
@@ -1038,8 +1504,7 @@ PerlSetVar SSLProgram	/usr/bin/openssl
 PerlSetVar SSLDirectory /usr/share/ssl
 PerlSetVar SSLCAConfig  loncapaca
 PerlSetVar SSLCAFile    /usr/share/ssl/loncapaca/cacert.pem
-#  !!!!!!!!!!!!!!!! CHANGE THIS NEXT LINE !!!!!!!!!!!!!!
-PerlSetVar SSLEmail     fox@nscl.msu.edu
+PerlSetVar SSLEmail     certificate@lon-capa.org
 
 #-------------------------------------------------------------------------