--- loncom/loncapa_apache.conf	2006/05/18 20:01:22	1.138
+++ loncom/loncapa_apache.conf	2008/11/04 21:06:21	1.180
@@ -1,7 +1,7 @@
 ##
 ## loncapa_apache.conf -- Apache HTTP LON-CAPA configuration file
 ##
-## $Id: loncapa_apache.conf,v 1.138 2006/05/18 20:01:22 albertel Exp $
+## $Id: loncapa_apache.conf,v 1.180 2008/11/04 21:06:21 www Exp $
 ##
 
 #
@@ -35,7 +35,9 @@ ExtendedStatus On
 #
 # ===================================================================== Aliases
 
+Alias /zipspool/ /home/httpd/zipspool/
 Alias /prtspool/ /home/httpd/prtspool/
+Alias /captchaspool/ /home/httpd/captchaspool/
 ScriptAlias /cgi-bin/ "/home/httpd/cgi-bin/"
 
 # ================================================================= Directories
@@ -50,9 +52,8 @@ PerlSetVar lonOtherAuthen no
 
 #PerlWarn On
 <LocationMatch "^/+res.*">
-#AuthName "LON-CAPA Auth"
 
-AuthType Basic
+AuthType LONCAPA
 Require valid-user
 
 PerlAccessHandler      Apache::publiccheck
@@ -79,7 +80,7 @@ ErrorDocument	  500 /adm/errorhandler
 </LocationMatch>
 
 <Location /adm/portfolio>
-AuthType Basic
+AuthType LONCAPA
 Require valid-user
 PerlAuthzHandler Apache::lonacc
 SetHandler perl-script
@@ -87,7 +88,7 @@ PerlHandler Apache::portfolio
 </Location>
 
 <Location /adm/coursegrp_portfolio>
-AuthType Basic
+AuthType LONCAPA
 Require valid-user
 PerlAuthzHandler Apache::lonacc
 SetHandler perl-script
@@ -100,10 +101,17 @@ PerlCleanupHandler	Apache::lontokacc::re
 PerlCleanupHandler	Apache::lonacc::cleanup
 </LocationMatch>
 
+<LocationMatch "^/pdfupload.*">
+SetHandler perl-script
+PerlHandler             Apache::lonpdfupload
+</LocationMatch>
+
 <LocationMatch "^/+uploaded.*">
-AuthType Basic
+AuthType LONCAPA
 Require valid-user
 PerlAuthzHandler	Apache::lonacc
+PerlHandler 		Apache::londatecheck
+PerlHandler  		Apache::lonipcheck
 PerlHeaderParserHandler Apache::lonuploadrep
 ErrorDocument     403 /adm/login
 ErrorDocument     404 /adm/notfound.html
@@ -112,7 +120,7 @@ ErrorDocument	  500 /adm/errorhandler
 </LocationMatch>
 
 <LocationMatch "^/+editupload.*">
-AuthType Basic
+AuthType LONCAPA
 Require valid-user
 PerlAuthzHandler	Apache::lonacc
 ErrorDocument     403 /adm/login
@@ -121,9 +129,24 @@ ErrorDocument	  500 /adm/errorhandler
 </LocationMatch>
 
 <LocationMatch "^/+uploaded/.*/.*/internal/.*">
-PerlAuthzHandler	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
@@ -137,7 +160,7 @@ PerlHandler Apache::lonsequence
 
 <LocationMatch "^/+public/.*/syllabus$">
 PerlAccessHandler      Apache::publiccheck
-AuthType Basic
+AuthType LONCAPA
 Require valid-user
 PerlAuthzHandler	Apache::lonacc
 SetHandler              perl-script
@@ -148,7 +171,7 @@ ErrorDocument	  500 /adm/errorhandler
 
 <LocationMatch "^/+(public|adm)/.*(\.rss|_rss\.html)$">
 PerlAccessHandler      Apache::publiccheck
-AuthType Basic
+AuthType LONCAPA
 Require valid-user
 PerlAuthzHandler	Apache::lonacc
 SetHandler              perl-script
@@ -158,7 +181,7 @@ ErrorDocument	  500 /adm/errorhandler
 </LocationMatch>
 
 <LocationMatch "^/adm/.*/aboutme$">
-AuthType Basic
+AuthType LONCAPA
 Require valid-user
 PerlAuthzHandler	Apache::lonacc
 SetHandler              perl-script
@@ -168,34 +191,38 @@ ErrorDocument     406 /adm/notinit.html
 ErrorDocument	  500 /adm/errorhandler
 </LocationMatch>
 
-<LocationMatch "^/adm/.*/smppg$">
-AuthType Basic
+<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$">
-AuthType Basic
+<LocationMatch "^/adm/.*/smppg$">
+AuthType LONCAPA
 Require valid-user
-PerlAuthzHandler       Apache::lonacc
+PerlAuthzHandler	Apache::lonacc
 SetHandler              perl-script
+PerlHandler             Apache::londatecheck
+PerlHandler		Apache::lonipcheck
 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$">
-AuthType Basic
+AuthType LONCAPA
 Require valid-user
 PerlAuthzHandler	Apache::lonacc
 SetHandler              perl-script
 PerlHandler             Apache::londatecheck
+PerlHandler		Apache::lonipcheck
 PerlHandler             Apache::lonbulletin
 ErrorDocument     404 /adm/notfound.html
 ErrorDocument     406 /adm/notinit.html
@@ -203,7 +230,7 @@ ErrorDocument	  500 /adm/errorhandler
 </LocationMatch>
 
 <LocationMatch "\.problem/smpedit$">
-AuthType Basic
+AuthType LONCAPA
 Require valid-user
 PerlAuthzHandler	Apache::lonacc
 SetHandler              perl-script
@@ -214,7 +241,7 @@ ErrorDocument	  500 /adm/errorhandler
 </LocationMatch>
 
 <LocationMatch "^/+priv.*">
-AuthType Basic
+AuthType LONCAPA
 Require valid-user
 PerlAuthzHandler Apache::loncacc
 SetHandler        perl-script
@@ -230,20 +257,19 @@ PerlAccessHandler Apache::lonracc
 </LocationMatch>
 
 <LocationMatch "^/+\~.*">
-AuthType Basic
+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$">
-AuthType Basic
+AuthType LONCAPA
 Require valid-user
-PerlAuthzHandler Apache::lonacc
+PerlAuthzHandler  Apache::lonacc
 SetHandler        perl-script
 PerlHandler       Apache::lonhelper
 ErrorDocument     403 /adm/login
@@ -253,7 +279,18 @@ ErrorDocument     500 /adm/errorhandler
 </LocationMatch>
 
 <LocationMatch "/prtspool">
-AuthType Basic
+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
@@ -285,7 +322,7 @@ PerlHandler Apache::lonratmenu
 </LocationMatch>
 
 <Location /adm/ratparms>
-AuthType Basic
+AuthType LONCAPA
 Require valid-user
 PerlAuthzHandler       Apache::lonacc
 SetHandler perl-script
@@ -326,7 +363,7 @@ ErrorDocument     413 /adm/overloaded.tx
 </LocationMatch>
 
 <LocationMatch "^/adm/bombs/">
-AuthType Basic
+AuthType LONCAPA
 Require valid-user
 SetHandler perl-script
 PerlAuthzHandler Apache::lonacc
@@ -343,6 +380,7 @@ PerlHandler Apache::lonrights
 <LocationMatch "^/+(uploaded|res|\~).*\.(xml|html|htm|xhtml|xhtm|sty)$">
 SetHandler perl-script
 PerlHandler Apache::londatecheck
+PerlHandler Apache::lonipcheck
 PerlHandler Apache::lonxml
 </LocationMatch>
 
@@ -352,9 +390,11 @@ PerlHandler Apache::lonhomework
 </LocationMatch>
 
 <LocationMatch "^/adm/wrapper/">
-AuthType Basic
+AuthType LONCAPA
 Require valid-user
 PerlAuthzHandler       Apache::lonacc
+PerlHandler Apache::londatecheck
+PerlHandler Apache::lonipcheck
 SetHandler perl-script
 PerlHandler Apache::lonwrapper
 ErrorDocument     403 /adm/login
@@ -362,7 +402,7 @@ ErrorDocument	  500 /adm/errorhandler
 </LocationMatch>
 
 <LocationMatch "^/adm/source">
-AuthType Basic
+AuthType LONCAPA
 Require valid-user
 PerlAuthzHandler       Apache::lonacc
 SetHandler perl-script
@@ -374,7 +414,7 @@ ErrorDocument	  500 /adm/errorhandler
 
 
 <LocationMatch "^/adm/localize/">
-AuthType Basic
+AuthType LONCAPA
 Require valid-user
 PerlAuthzHandler       Apache::lonacc
 SetHandler perl-script
@@ -386,7 +426,7 @@ ErrorDocument	  500 /adm/errorhandler
 # -------------------------------------------------------------- Admin Programs
 
 <Location /adm/randomlabel.png>
-AuthType Basic
+AuthType LONCAPA
 Require valid-user
 PerlAuthzHandler       Apache::lonacc
 SetHandler perl-script
@@ -396,7 +436,7 @@ ErrorDocument	  500 /adm/errorhandler
 </Location>
 
 <Location /adm/imagechoice>
-AuthType Basic
+AuthType LONCAPA
 Require valid-user
 PerlAuthzHandler       Apache::lonacc
 SetHandler perl-script
@@ -406,7 +446,7 @@ ErrorDocument	  500 /adm/errorhandler
 </Location>
 
 <Location /adm/statistics>
-AuthType Basic
+AuthType LONCAPA
 Require valid-user
 PerlAuthzHandler       Apache::lonacc
 SetHandler perl-script
@@ -417,7 +457,7 @@ ErrorDocument	  500 /adm/errorhandler
 </Location>
 
 <Location /adm/trackstudent>
-AuthType Basic
+AuthType LONCAPA
 Require valid-user
 PerlAuthzHandler       Apache::lonacc
 SetHandler perl-script
@@ -428,17 +468,18 @@ ErrorDocument	  500 /adm/errorhandler
 </Location>
 
 <Location /adm/roles>
-AuthType Basic
+AuthType LONCAPA
 Require valid-user
 PerlAuthzHandler       Apache::lonacc
 SetHandler perl-script
 PerlHandler Apache::lonroles
 ErrorDocument     403 /adm/login
+ErrorDocument     409 /adm/preferences?action=lockwarning
 ErrorDocument	  500 /adm/errorhandler
 </Location>
 
 <Location /adm/menu>
-AuthType Basic
+AuthType LONCAPA
 Require valid-user
 PerlAuthzHandler       Apache::lonacc
 SetHandler perl-script
@@ -448,7 +489,7 @@ ErrorDocument	  500 /adm/errorhandler
 </Location>
 
 <Location /adm/remote>
-AuthType Basic
+AuthType LONCAPA
 Require valid-user
 PerlAuthzHandler       Apache::lonacc
 SetHandler perl-script
@@ -457,8 +498,18 @@ ErrorDocument     403 /adm/login
 ErrorDocument	  500 /adm/errorhandler
 </Location>
 
+<Location /adm/pickauthor>
+AuthType LONCAPA
+Require valid-user
+PerlAuthzHandler       Apache::lonacc
+SetHandler perl-script
+PerlHandler Apache::lonpickauthor
+ErrorDocument     403 /adm/login
+ErrorDocument     500 /adm/errorhandler
+</Location>
+
 <Location /adm/pickstudent>
-AuthType Basic
+AuthType LONCAPA
 Require valid-user
 PerlAuthzHandler       Apache::lonacc
 SetHandler perl-script
@@ -468,7 +519,7 @@ ErrorDocument	  500 /adm/errorhandler
 </Location>
 
 <Location /adm/pickcourse>
-AuthType Basic
+AuthType LONCAPA
 Require valid-user
 PerlAuthzHandler       Apache::lonacc
 SetHandler perl-script
@@ -478,7 +529,7 @@ ErrorDocument	  500 /adm/errorhandler
 </Location>
 
 <Location /adm/pickcode>
-AuthType Basic
+AuthType LONCAPA
 Require valid-user
 PerlAuthzHandler       Apache::lonacc
 SetHandler perl-script
@@ -492,22 +543,45 @@ 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>
-AuthType Basic
+AuthType LONCAPA
 Require valid-user
 PerlAuthzHandler       Apache::lonacc
 SetHandler perl-script
 PerlHandler Apache::lonlogout
 ErrorDocument     403 /adm/login
+ErrorDocument     409 /adm/preferences?action=lockwarning
+ErrorDocument	  500 /adm/errorhandler
 </Location>
 
 <Location /adm/switchserver>
-AuthType Basic
+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>
@@ -521,7 +595,7 @@ PerlHandler Apache::migrateuser
 </Location>
 
 <Location /adm/annotations>
-AuthType Basic
+AuthType LONCAPA
 Require valid-user
 PerlAuthzHandler       Apache::lonacc
 SetHandler perl-script
@@ -531,7 +605,7 @@ ErrorDocument	  500 /adm/errorhandler
 </Location>
 
 <Location /adm/spellcheck>
-AuthType Basic
+AuthType LONCAPA
 Require valid-user
 PerlAuthzHandler       Apache::lonacc
 SetHandler perl-script
@@ -541,7 +615,7 @@ ErrorDocument	  500 /adm/errorhandler
 </Location>
 
 <Location /adm/bookmarks>
-AuthType Basic
+AuthType LONCAPA
 Require valid-user
 PerlAuthzHandler       Apache::lonacc
 SetHandler perl-script
@@ -551,7 +625,7 @@ ErrorDocument	  500 /adm/errorhandler
 </Location>
 
 <Location /adm/flip>
-AuthType Basic
+AuthType LONCAPA
 Require valid-user
 PerlAuthzHandler       Apache::lonacc
 SetHandler perl-script
@@ -564,7 +638,7 @@ ErrorDocument	  500 /adm/errorhandler
 </Location>
 
 <Location /adm/ambiguous>
-AuthType Basic
+AuthType LONCAPA
 Require valid-user
 PerlAuthzHandler       Apache::lonacc
 SetHandler perl-script
@@ -576,7 +650,7 @@ ErrorDocument	  500 /adm/errorhandler
 </Location>
 
 <Location /adm/email>
-AuthType Basic
+AuthType LONCAPA
 Require valid-user
 PerlAuthzHandler       Apache::lonacc
 SetHandler perl-script
@@ -586,7 +660,7 @@ ErrorDocument	  500 /adm/errorhandler
 </Location>
 
 <Location /adm/notify>
-AuthType Basic
+AuthType LONCAPA
 Require valid-user
 PerlAuthzHandler       Apache::lonacc
 SetHandler perl-script
@@ -596,7 +670,7 @@ ErrorDocument     500 /adm/errorhandler
 </Location>
 
 <Location /adm/parmset>
-AuthType Basic
+AuthType LONCAPA
 Require valid-user
 PerlAuthzHandler       Apache::lonacc
 SetHandler perl-script
@@ -607,7 +681,7 @@ ErrorDocument	  500 /adm/errorhandler
 </Location>
 
 <Location /adm/slotrequest>
-AuthType Basic
+AuthType LONCAPA
 Require valid-user
 PerlAuthzHandler       Apache::lonacc
 SetHandler perl-script
@@ -618,7 +692,7 @@ ErrorDocument	  500 /adm/errorhandler
 </Location>
 
 <Location /adm/wizard>
-AuthType Basic
+AuthType LONCAPA
 Require valid-user
 PerlAuthzHandler       Apache::lonacc
 SetHandler perl-script
@@ -629,7 +703,7 @@ ErrorDocument	  500 /adm/errorhandler
 </Location>
 
 <Location /adm/grades>
-AuthType Basic
+AuthType LONCAPA
 Require valid-user
 PerlAuthzHandler       Apache::lonacc
 SetHandler perl-script
@@ -640,7 +714,7 @@ ErrorDocument	  500 /adm/errorhandler
 </Location>
 
 <Location /adm/createcourse>
-AuthType Basic
+AuthType LONCAPA
 Require valid-user
 PerlAuthzHandler       Apache::lonacc
 SetHandler perl-script
@@ -651,7 +725,7 @@ ErrorDocument	  500 /adm/errorhandler
 </Location>
 
 <Location /adm/modifycourse>
-AuthType Basic
+AuthType LONCAPA
 Require valid-user
 PerlAuthzHandler       Apache::lonacc
 SetHandler perl-script
@@ -661,8 +735,19 @@ 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>
-AuthType Basic
+AuthType LONCAPA
 Require valid-user
 PerlAuthzHandler       Apache::lonacc
 SetHandler perl-script
@@ -673,7 +758,7 @@ ErrorDocument	  500 /adm/errorhandler
 </Location>
 
 <Location /adm/publish>
-AuthType Basic
+AuthType LONCAPA
 Require valid-user
 PerlAuthzHandler       Apache::lonacc
 SetHandler perl-script
@@ -685,7 +770,7 @@ ErrorDocument	  500 /adm/errorhandler
 </Location>
 
 <LocationMatch "^/+\~.*/$">
-AuthType Basic
+AuthType LONCAPA
 Require valid-user
 PerlAuthzHandler       Apache::loncacc
 SetHandler perl-script
@@ -697,7 +782,7 @@ ErrorDocument	  500 /adm/errorhandler
 </LocationMatch>
 
 <Location /adm/pubdir>
-AuthType Basic
+AuthType LONCAPA
 Require valid-user
 PerlAuthzHandler       Apache::lonacc
 SetHandler perl-script
@@ -709,7 +794,7 @@ ErrorDocument	  500 /adm/errorhandler
 </Location>
 
 <Location /adm/unauthorized>
-AuthType Basic
+AuthType LONCAPA
 Require valid-user
 PerlAuthzHandler       Apache::lonacc
 SetHandler perl-script
@@ -720,7 +805,7 @@ ErrorDocument	  500 /adm/errorhandler
 </Location>
 
 <Location /adm/retrieve>
-AuthType Basic
+AuthType LONCAPA
 Require valid-user
 PerlAuthzHandler       Apache::lonacc
 SetHandler perl-script
@@ -732,7 +817,7 @@ ErrorDocument	  500 /adm/errorhandler
 </Location>
 
 <Location /adm/cleanup>
-AuthType Basic
+AuthType LONCAPA
 Require valid-user
 PerlAuthzHandler       Apache::lonacc
 SetHandler perl-script
@@ -744,7 +829,7 @@ ErrorDocument	  500 /adm/errorhandler
 </Location>
 
 <Location /adm/cfile>
-AuthType Basic
+AuthType LONCAPA
 Require valid-user
 PerlAuthzHandler       Apache::lonacc
 SetHandler perl-script
@@ -756,7 +841,7 @@ ErrorDocument	  500 /adm/errorhandler
 </Location>
 
 <Location /adm/diff>
-AuthType Basic
+AuthType LONCAPA
 Require valid-user
 PerlAuthzHandler       Apache::lonacc
 SetHandler perl-script
@@ -768,7 +853,7 @@ ErrorDocument	  500 /adm/errorhandler
 </Location>
 
 <Location /adm/upload>
-AuthType Basic
+AuthType LONCAPA
 Require valid-user
 PerlAuthzHandler       Apache::lonacc
 SetHandler perl-script
@@ -780,7 +865,7 @@ ErrorDocument	  500 /adm/errorhandler
 </Location>
 
 <Location /adm/imsimport>
-AuthType Basic
+AuthType LONCAPA
 Require valid-user
 PerlAuthzHandler       Apache::lonacc
 SetHandler perl-script
@@ -792,7 +877,7 @@ ErrorDocument     500 /adm/errorhandler
 </Location>
 
 <Location /adm/testbank>
-AuthType Basic
+AuthType LONCAPA
 Require valid-user
 PerlAuthzHandler       Apache::lonacc
 SetHandler perl-script
@@ -804,7 +889,7 @@ ErrorDocument     500 /adm/errorhandler
 </Location>
 
 <Location /adm/assesscalc>
-AuthType Basic
+AuthType LONCAPA
 Require valid-user
 PerlAuthzHandler       Apache::lonacc
 SetHandler perl-script
@@ -816,7 +901,7 @@ ErrorDocument	  500 /adm/errorhandler
 </Location>
 
 <Location /adm/studentcalc>
-AuthType Basic
+AuthType LONCAPA
 Require valid-user
 PerlAuthzHandler       Apache::lonacc
 SetHandler perl-script
@@ -828,7 +913,7 @@ ErrorDocument	  500 /adm/errorhandler
 </Location>
 
 <Location /adm/classcalc>
-AuthType Basic
+AuthType LONCAPA
 Require valid-user
 PerlAuthzHandler       Apache::lonacc
 SetHandler perl-script
@@ -840,7 +925,7 @@ ErrorDocument	  500 /adm/errorhandler
 </Location>
 
 <Location /adm/dropadd>
-AuthType Basic
+AuthType LONCAPA
 Require valid-user
 PerlAuthzHandler       Apache::lonacc
 SetHandler perl-script
@@ -851,7 +936,7 @@ ErrorDocument	  500 /adm/errorhandler
 </Location>
 
 <Location /adm/viewclasslist>
-AuthType Basic
+AuthType LONCAPA
 Require valid-user
 PerlAuthzHandler       Apache::lonacc
 SetHandler perl-script
@@ -862,7 +947,7 @@ ErrorDocument	  500 /adm/errorhandler
 </Location>
 
 <Location /adm/coursegroups>
-AuthType Basic
+AuthType LONCAPA
 Require valid-user
 PerlAuthzHandler       Apache::lonacc
 SetHandler perl-script
@@ -872,8 +957,30 @@ 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 Basic
+AuthType LONCAPA
 Require valid-user
 PerlAuthzHandler       Apache::lonacc
 SetHandler perl-script
@@ -884,7 +991,7 @@ ErrorDocument     500 /adm/errorhandler
 </Location>
 
 <Location /adm/populate>
-AuthType Basic
+AuthType LONCAPA
 Require valid-user
 PerlAuthzHandler       Apache::lonacc
 SetHandler perl-script
@@ -895,7 +1002,7 @@ ErrorDocument     500 /adm/errorhandler
 </Location>
 
 <Location /adm/managekeys>
-AuthType Basic
+AuthType LONCAPA
 Require valid-user
 PerlAuthzHandler       Apache::lonacc
 SetHandler perl-script
@@ -906,7 +1013,7 @@ ErrorDocument	  500 /adm/errorhandler
 </Location>
 
 <Location /adm/printout>
-AuthType Basic
+AuthType LONCAPA
 Require valid-user
 PerlAuthzHandler       Apache::lonacc
 SetHandler perl-script
@@ -917,7 +1024,7 @@ ErrorDocument	  500 /adm/errorhandler
 </Location>
 
 <Location /adm/feedback>
-AuthType Basic
+AuthType LONCAPA
 Require valid-user
 PerlAuthzHandler       Apache::lonacc
 SetHandler perl-script
@@ -927,7 +1034,7 @@ ErrorDocument	  500 /adm/errorhandler
 </Location>
 
 <Location /adm/coursedocs>
-AuthType Basic
+AuthType LONCAPA
 Require valid-user
 PerlAuthzHandler       Apache::lonacc
 SetHandler perl-script
@@ -939,7 +1046,7 @@ ErrorDocument	  500 /adm/errorhandler
 </Location>
 
 <Location /adm/imsimportdocs>
-AuthType Basic
+AuthType LONCAPA
 Require valid-user
 PerlAuthzHandler       Apache::lonacc
 SetHandler perl-script
@@ -949,7 +1056,7 @@ ErrorDocument     500 /adm/errorhandler
 </Location>
 
 <LocationMatch "^/adm/announcements">
-AuthType Basic
+AuthType LONCAPA
 Require valid-user
 PerlAuthzHandler       Apache::lonacc
 SetHandler perl-script
@@ -959,7 +1066,7 @@ ErrorDocument	  500 /adm/errorhandler
 </LocationMatch>
 
 <Location /adm/chat>
-AuthType Basic
+AuthType LONCAPA
 Require valid-user
 PerlAuthzHandler       Apache::lonacc
 SetHandler perl-script
@@ -968,7 +1075,7 @@ ErrorDocument	  500 /adm/errorhandler
 </Location>
 
 <Location /adm/chatfetch>
-AuthType Basic
+AuthType LONCAPA
 Require valid-user
 PerlAuthzHandler       Apache::lonacc
 SetHandler perl-script
@@ -978,7 +1085,7 @@ ErrorDocument	  500 /adm/errorhandler
 </Location>
 
 <Location /adm/groupchat>
-AuthType Basic
+AuthType LONCAPA
 Require valid-user
 PerlAuthzHandler       Apache::lonacc
 SetHandler perl-script
@@ -988,7 +1095,7 @@ ErrorDocument     500 /adm/errorhandler
 </Location>
 
 <Location /adm/evaluate>
-AuthType Basic
+AuthType LONCAPA
 Require valid-user
 PerlAuthzHandler       Apache::lonacc
 SetHandler perl-script
@@ -998,7 +1105,7 @@ ErrorDocument	  500 /adm/errorhandler
 </Location>
 
 <Location /adm/preferences>
-AuthType Basic
+AuthType LONCAPA
 Require valid-user
 PerlAuthzHandler       Apache::lonacc
 SetHandler perl-script
@@ -1008,7 +1115,7 @@ ErrorDocument	  500 /adm/errorhandler
 </Location>
 
 <Location /adm/communicate>
-AuthType Basic
+AuthType LONCAPA
 Require valid-user
 PerlAuthzHandler       Apache::lonacc
 SetHandler perl-script
@@ -1018,7 +1125,7 @@ ErrorDocument	  500 /adm/errorhandler
 </Location>
 
 <Location /adm/searchcat>
-AuthType Basic
+AuthType LONCAPA
 Require valid-user
 PerlAuthzHandler       Apache::lonacc
 SetHandler perl-script
@@ -1031,18 +1138,18 @@ ErrorDocument	  500 /adm/errorhandler
 </Location>
 
 <Location /adm/navmaps>
-AuthType Basic
+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>
-AuthType Basic
+AuthType LONCAPA
 Require valid-user
 PerlAuthzHandler       Apache::lonacc
 SetHandler perl-script
@@ -1053,7 +1160,7 @@ ErrorDocument     500 /adm/errorhandler
 </Location>
 
 <Location /adm/groupsort>
-AuthType Basic
+AuthType LONCAPA
 Require valid-user
 PerlAuthzHandler	Apache::lonacc
 SetHandler perl-script
@@ -1070,37 +1177,73 @@ PerlHandler Apache::lonerrorhandler
 </Location>
 
 <LocationMatch "^/adm/help/.*\.hlp$">
-AuthType Basic
+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">
-AuthType Basic
+AuthType LONCAPA
 Require valid-user
 PerlAuthzHandler       Apache::lonacc
 SetHandler perl-script
 PerlHandler Apache::lonhelpmenu
+ErrorDocument	  500 /adm/errorhandler
 </LocationMatch>
 
 <LocationMatch "^/adm/support">
-AuthType Basic
+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
@@ -1185,6 +1328,26 @@ PerlChildExitHandler Apache::lonacc::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
@@ -1200,7 +1363,36 @@ 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>
+
+# Allow serving of files in captchaspool
+
+<Directory "/home/httpd/captchaspool/">
+Options Includes FollowSymLinks
+AllowOverride None
+order allow,deny
+allow from all
 </Directory>
 
 # ============================================================= Access Handlers
@@ -1243,10 +1435,15 @@ 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
+PerlSetVar       lonCaptchaDir     /home/httpd/captchaspool
+PerlSetVar       lonCaptchaDb     /home/httpd/captchadb 
+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)
@@ -1270,12 +1467,6 @@ PerlSetVar	 FAQHost	http://help.lon-capa
 
 PerlSetVar       lonSqlAccess   localhostkey
 
-# -----------------------------------------------------------------------------
-# lonttpdPort is the port used by the lightweight graphics httpd server
-# not the main Apache server
-PerlSetVar       lonhttpdPort  8080
-
-
 #----------------------------------------------------------------------------
 #
 #   Parameters used by secure lond/lonc