--- loncom/loncapa_apache.conf	2004/01/14 22:59:18	1.69
+++ loncom/loncapa_apache.conf	2006/04/21 20:28:36	1.132
@@ -1,7 +1,7 @@
 ##
 ## loncapa_apache.conf -- Apache HTTP LON-CAPA configuration file
 ##
-## $Id: loncapa_apache.conf,v 1.69 2004/01/14 22:59:18 albertel Exp $
+## $Id: loncapa_apache.conf,v 1.132 2006/04/21 20:28:36 albertel Exp $
 ##
 
 #
@@ -43,13 +43,20 @@ 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
+#AuthName "LON-CAPA Auth"
+
+AuthType Basic
+Require valid-user
+
+PerlAccessHandler      Apache::publiccheck
+PerlAuthzHandler       Apache::lonacc
 PerlHeaderParserHandler Apache::lonrep
 ErrorDocument     403 /adm/login
 ErrorDocument     404 /adm/notfound.html
@@ -57,27 +64,95 @@ ErrorDocument     406 /adm/roles
 ErrorDocument	  500 /adm/errorhandler
 </LocationMatch>
 
+
+<LocationMatch "/.*">
+</LocationMatch>
+
+
+<LocationMatch "^/+enc.*">
+SetHandler perl-script
+PerlHandler       Apache::lonencurl
+ErrorDocument     403 /adm/login
+ErrorDocument     404 /adm/notfound.html
+ErrorDocument     406 /adm/roles
+ErrorDocument	  500 /adm/errorhandler
+</LocationMatch>
+
+<Location /adm/portfolio>
+AuthType Basic
+Require valid-user
+PerlAuthzHandler Apache::lonacc
+SetHandler perl-script
+PerlHandler Apache::portfolio
+</Location>
+
 <LocationMatch "^/+userfiles.*">
 PerlAccessHandler       Apache::lontokacc
 PerlCleanupHandler	Apache::lontokacc::removefile
+PerlCleanupHandler	Apache::lonacc::cleanup
 </LocationMatch>
 
 <LocationMatch "^/+uploaded.*">
-PerlAccessHandler	Apache::lonuploadedacc
+AuthType Basic
+Require valid-user
+PerlAuthzHandler	Apache::lonacc
+PerlHeaderParserHandler Apache::lonuploadrep
+ErrorDocument     403 /adm/login
 ErrorDocument     404 /adm/notfound.html
+ErrorDocument     406 /adm/roles
 ErrorDocument	  500 /adm/errorhandler
 </LocationMatch>
 
+<LocationMatch "^/+editupload.*">
+AuthType Basic
+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
+</LocationMatch>
+
+
+<LocationMatch "^/+uploaded/.*\.page$">
+SetHandler perl-script
+PerlHandler Apache::lonpage
+</LocationMatch>
+
+<LocationMatch "^/+uploaded/.*\.sequence$">
+SetHandler perl-script
+PerlHandler Apache::lonsequence
+</LocationMatch>
+
 <LocationMatch "^/+public/.*/syllabus$">
-PerlAccessHandler	Apache::lonacc
+PerlAccessHandler      Apache::publiccheck
+AuthType Basic
+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 Basic
+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 Basic
+Require valid-user
+PerlAuthzHandler	Apache::lonacc
 SetHandler              perl-script
 PerlHandler             Apache::lonaboutme
 ErrorDocument     404 /adm/notfound.html
@@ -86,7 +161,9 @@ ErrorDocument	  500 /adm/errorhandler
 </LocationMatch>
 
 <LocationMatch "^/adm/.*/smppg$">
-PerlAccessHandler	Apache::lonacc
+AuthType Basic
+Require valid-user
+PerlAuthzHandler	Apache::lonacc
 SetHandler              perl-script
 PerlHandler             Apache::lonsimplepage
 ErrorDocument     404 /adm/notfound.html
@@ -94,9 +171,23 @@ ErrorDocument     406 /adm/notinit.html
 ErrorDocument	  500 /adm/errorhandler
 </LocationMatch>
 
+<LocationMatch "^/adm/.*/grppg$">
+AuthType Basic
+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
+</LocationMatch>
+
 <LocationMatch "^/adm/.*/bulletinboard$">
-PerlAccessHandler	Apache::lonacc
+AuthType Basic
+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
@@ -104,7 +195,9 @@ ErrorDocument	  500 /adm/errorhandler
 </LocationMatch>
 
 <LocationMatch "\.problem/smpedit$">
-PerlAccessHandler	Apache::lonacc
+AuthType Basic
+Require valid-user
+PerlAuthzHandler	Apache::lonacc
 SetHandler              perl-script
 PerlHandler             Apache::lonsimpleproblemedit
 ErrorDocument     404 /adm/notfound.html
@@ -113,7 +206,9 @@ ErrorDocument	  500 /adm/errorhandler
 </LocationMatch>
 
 <LocationMatch "^/+priv.*">
-PerlAccessHandler Apache::loncacc
+AuthType Basic
+Require valid-user
+PerlAuthzHandler Apache::loncacc
 SetHandler        perl-script
 PerlHandler       Apache::lonconstruct
 ErrorDocument     403 /adm/login
@@ -127,7 +222,9 @@ PerlAccessHandler Apache::lonracc
 </LocationMatch>
 
 <LocationMatch "^/+\~.*">
-PerlAccessHandler Apache::loncacc
+AuthType Basic
+Require valid-user
+PerlAuthzHandler Apache::loncacc
 ErrorDocument     403 /adm/login
 ErrorDocument     404 /adm/notfound.html
 ErrorDocument     406 /adm/unauthorized
@@ -136,7 +233,9 @@ AllowOverride None
 </LocationMatch>
 
 <LocationMatch "^/adm/helper/.*\.helper$">
-PerlAccessHandler Apache::lonacc
+AuthType Basic
+Require valid-user
+PerlAuthzHandler Apache::lonacc
 SetHandler        perl-script
 PerlHandler       Apache::lonhelper
 ErrorDocument     403 /adm/login
@@ -146,10 +245,13 @@ ErrorDocument     500 /adm/errorhandler
 </LocationMatch>
 
 <LocationMatch "/prtspool">
-PerlAccessHandler Apache::lonacc
+AuthType Basic
+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
@@ -169,8 +271,15 @@ SetHandler perl-script
 PerlHandler Apache::lonratsrv
 </LocationMatch>
 
+<LocationMatch "^/\~.*\/adveditmenu$">
+SetHandler perl-script
+PerlHandler Apache::lonratmenu
+</LocationMatch>
+
 <Location /adm/ratparms>
-PerlAccessHandler       Apache::lonacc
+AuthType Basic
+Require valid-user
+PerlAuthzHandler       Apache::lonacc
 SetHandler perl-script
 PerlHandler Apache::lonratparms
 ErrorDocument     403 /adm/login
@@ -183,6 +292,7 @@ ErrorDocument	  500 /adm/errorhandler
 SetHandler perl-script
 PerlHandler Apache::lonindexer
 PerlCleanupHandler Apache::lonindexer::cleanup
+PerlCleanupHandler	Apache::lonacc::cleanup
 </LocationMatch>
 
 <LocationMatch "^/+(res|\~).*\.tex$">
@@ -190,48 +300,77 @@ SetHandler perl-script
 PerlHandler Apache::lontex
 </LocationMatch>
 
-<LocationMatch "^/+res/.*\.page$>
+<LocationMatch "^/+res/.*\.page$">
 SetHandler perl-script
 PerlHandler Apache::lonpage
 </LocationMatch>
 
-<LocationMatch "^/+res/.*\.sequence$>
+<LocationMatch "^/+res/.*\.sequence$">
 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 "^/+(res|\~).*\.rights$>
+<LocationMatch "^/adm/bombs/">
+AuthType Basic
+Require valid-user
+SetHandler perl-script
+PerlAuthzHandler Apache::lonacc
+PerlHandler Apache::lonmeta
+</LocationMatch>
+
+
+
+<LocationMatch "^/+(res|\~).*\.rights$">
 SetHandler perl-script
 PerlHandler Apache::lonrights
 </LocationMatch>
 
-<LocationMatch "^/+(res|\~).*\.(xml|html|htm|xhtml|xhtm|sty)$">
+<LocationMatch "^/+(uploaded|res|\~).*\.(xml|html|htm|xhtml|xhtm|sty)$">
 SetHandler perl-script
+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 Basic
+Require valid-user
+PerlAuthzHandler       Apache::lonacc
 SetHandler perl-script
 PerlHandler Apache::lonwrapper
 ErrorDocument     403 /adm/login
 ErrorDocument	  500 /adm/errorhandler
 </LocationMatch>
 
+<LocationMatch "^/adm/source">
+AuthType Basic
+Require valid-user
+PerlAuthzHandler       Apache::lonacc
+SetHandler perl-script
+PerlHandler Apache::lonsource
+ErrorDocument     403 /adm/login
+ErrorDocument     406 /adm/roles
+ErrorDocument	  500 /adm/errorhandler
+</LocationMatch>
+
+
 <LocationMatch "^/adm/localize/">
-PerlAccessHandler       Apache::lonacc
+AuthType Basic
+Require valid-user
+PerlAuthzHandler       Apache::lonacc
 SetHandler perl-script
-PerlHandler Apache::lonlocal
+PerlHandler Apache::lonlocalize
 ErrorDocument     403 /adm/login
 ErrorDocument	  500 /adm/errorhandler
 </LocationMatch>
@@ -239,7 +378,9 @@ ErrorDocument	  500 /adm/errorhandler
 # -------------------------------------------------------------- Admin Programs
 
 <Location /adm/randomlabel.png>
-PerlAccessHandler       Apache::lonacc
+AuthType Basic
+Require valid-user
+PerlAuthzHandler       Apache::lonacc
 SetHandler perl-script
 PerlHandler Apache::randomlylabel
 ErrorDocument     403 /adm/login
@@ -247,7 +388,9 @@ ErrorDocument	  500 /adm/errorhandler
 </Location>
 
 <Location /adm/imagechoice>
-PerlAccessHandler       Apache::lonacc
+AuthType Basic
+Require valid-user
+PerlAuthzHandler       Apache::lonacc
 SetHandler perl-script
 PerlHandler Apache::imagechoice
 ErrorDocument     403 /adm/login
@@ -255,7 +398,9 @@ ErrorDocument	  500 /adm/errorhandler
 </Location>
 
 <Location /adm/statistics>
-PerlAccessHandler       Apache::lonacc
+AuthType Basic
+Require valid-user
+PerlAuthzHandler       Apache::lonacc
 SetHandler perl-script
 PerlHandler Apache::lonstatistics
 ErrorDocument     403 /adm/login
@@ -263,8 +408,21 @@ ErrorDocument     413 /adm/overloaded.tx
 ErrorDocument	  500 /adm/errorhandler
 </Location>
 
+<Location /adm/trackstudent>
+AuthType Basic
+Require valid-user
+PerlAuthzHandler       Apache::lonacc
+SetHandler perl-script
+PerlHandler Apache::lontrackstudent
+ErrorDocument     403 /adm/login
+ErrorDocument     413 /adm/overloaded.txt
+ErrorDocument	  500 /adm/errorhandler
+</Location>
+
 <Location /adm/roles>
-PerlAccessHandler       Apache::lonacc
+AuthType Basic
+Require valid-user
+PerlAuthzHandler       Apache::lonacc
 SetHandler perl-script
 PerlHandler Apache::lonroles
 ErrorDocument     403 /adm/login
@@ -272,15 +430,19 @@ ErrorDocument	  500 /adm/errorhandler
 </Location>
 
 <Location /adm/menu>
-PerlAccessHandler       Apache::lonacc
+AuthType Basic
+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 Basic
+Require valid-user
+PerlAuthzHandler       Apache::lonacc
 SetHandler perl-script
 PerlHandler Apache::lonremote
 ErrorDocument     403 /adm/login
@@ -288,7 +450,9 @@ ErrorDocument	  500 /adm/errorhandler
 </Location>
 
 <Location /adm/pickstudent>
-PerlAccessHandler       Apache::lonacc
+AuthType Basic
+Require valid-user
+PerlAuthzHandler       Apache::lonacc
 SetHandler perl-script
 PerlHandler Apache::lonpickstudent
 ErrorDocument     403 /adm/login
@@ -296,40 +460,82 @@ ErrorDocument	  500 /adm/errorhandler
 </Location>
 
 <Location /adm/pickcourse>
-PerlAccessHandler       Apache::lonacc
+AuthType Basic
+Require valid-user
+PerlAuthzHandler       Apache::lonacc
 SetHandler perl-script
 PerlHandler Apache::lonpickcourse
 ErrorDocument     403 /adm/login
 ErrorDocument	  500 /adm/errorhandler
 </Location>
 
+<Location /adm/pickcode>
+AuthType Basic
+Require valid-user
+PerlAuthzHandler       Apache::lonacc
+SetHandler perl-script
+PerlHandler Apache::lonpickcode
+ErrorDocument     403 /adm/login
+ErrorDocument	  500 /adm/errorhandler
+</Location>
+
 <Location /adm/login>
 SetHandler perl-script
 PerlHandler Apache::lonlogin
 </Location>
 
 <Location /adm/logout>
-PerlAccessHandler       Apache::lonacc
+AuthType Basic
+Require valid-user
+PerlAuthzHandler       Apache::lonacc
 SetHandler perl-script
 PerlHandler Apache::lonlogout
 ErrorDocument     403 /adm/login
 </Location>
 
+<Location /adm/switchserver>
+AuthType Basic
+Require valid-user
+PerlAuthzHandler       Apache::lonacc
+SetHandler perl-script
+PerlHandler Apache::switchserver
+ErrorDocument     403 /adm/login
+</Location>
+
 <Location /adm/authenticate>
 SetHandler perl-script
 PerlHandler Apache::lonauth
 </Location>
 
+<Location /adm/migrateuser>
+SetHandler perl-script
+PerlHandler Apache::migrateuser
+</Location>
+
 <Location /adm/annotations>
-PerlAccessHandler       Apache::lonacc
+AuthType Basic
+Require valid-user
+PerlAuthzHandler       Apache::lonacc
 SetHandler perl-script
 PerlHandler Apache::admannotations
 ErrorDocument     403 /adm/login
 ErrorDocument	  500 /adm/errorhandler
 </Location>
 
+<Location /adm/spellcheck>
+AuthType Basic
+Require valid-user
+PerlAuthzHandler       Apache::lonacc
+SetHandler perl-script
+PerlHandler Apache::lonspeller
+ErrorDocument     403 /adm/login
+ErrorDocument	  500 /adm/errorhandler
+</Location>
+
 <Location /adm/bookmarks>
-PerlAccessHandler       Apache::lonacc
+AuthType Basic
+Require valid-user
+PerlAuthzHandler       Apache::lonacc
 SetHandler perl-script
 PerlHandler Apache::admbookmarks
 ErrorDocument     403 /adm/login
@@ -337,34 +543,54 @@ ErrorDocument	  500 /adm/errorhandler
 </Location>
 
 <Location /adm/flip>
-PerlAccessHandler       Apache::lonacc
+AuthType Basic
+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 Basic
+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 Basic
+Require valid-user
+PerlAuthzHandler       Apache::lonacc
 SetHandler perl-script
-PerlHandler Apache::lonmsg
+PerlHandler Apache::lonmsgdisplay
 ErrorDocument     403 /adm/login
 ErrorDocument	  500 /adm/errorhandler
 </Location>
 
+<Location /adm/notify>
+AuthType Basic
+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 Basic
+Require valid-user
+PerlAuthzHandler       Apache::lonacc
 SetHandler perl-script
 PerlHandler Apache::lonparmset
 ErrorDocument     403 /adm/login
@@ -372,8 +598,21 @@ ErrorDocument     406 /adm/roles
 ErrorDocument	  500 /adm/errorhandler
 </Location>
 
+<Location /adm/slotrequest>
+AuthType Basic
+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 Basic
+Require valid-user
+PerlAuthzHandler       Apache::lonacc
 SetHandler perl-script
 PerlHandler Apache::lonwizard
 ErrorDocument     403 /adm/login
@@ -382,7 +621,9 @@ ErrorDocument	  500 /adm/errorhandler
 </Location>
 
 <Location /adm/grades>
-PerlAccessHandler       Apache::lonacc
+AuthType Basic
+Require valid-user
+PerlAuthzHandler       Apache::lonacc
 SetHandler perl-script
 PerlHandler Apache::grades
 ErrorDocument     403 /adm/login
@@ -391,7 +632,9 @@ ErrorDocument	  500 /adm/errorhandler
 </Location>
 
 <Location /adm/createcourse>
-PerlAccessHandler       Apache::lonacc
+AuthType Basic
+Require valid-user
+PerlAuthzHandler       Apache::lonacc
 SetHandler perl-script
 PerlHandler Apache::loncreatecourse
 ErrorDocument     403 /adm/login
@@ -400,7 +643,9 @@ ErrorDocument	  500 /adm/errorhandler
 </Location>
 
 <Location /adm/modifycourse>
-PerlAccessHandler       Apache::lonacc
+AuthType Basic
+Require valid-user
+PerlAuthzHandler       Apache::lonacc
 SetHandler perl-script
 PerlHandler Apache::lonmodifycourse
 ErrorDocument     403 /adm/login
@@ -409,7 +654,9 @@ ErrorDocument     500 /adm/errorhandler
 </Location>
 
 <Location /adm/createuser>
-PerlAccessHandler       Apache::lonacc
+AuthType Basic
+Require valid-user
+PerlAuthzHandler       Apache::lonacc
 SetHandler perl-script
 PerlHandler Apache::loncreateuser
 ErrorDocument     403 /adm/login
@@ -418,7 +665,9 @@ ErrorDocument	  500 /adm/errorhandler
 </Location>
 
 <Location /adm/publish>
-PerlAccessHandler       Apache::lonacc
+AuthType Basic
+Require valid-user
+PerlAuthzHandler       Apache::lonacc
 SetHandler perl-script
 PerlHandler Apache::lonpublisher
 ErrorDocument     403 /adm/login
@@ -428,7 +677,9 @@ ErrorDocument	  500 /adm/errorhandler
 </Location>
 
 <LocationMatch "^/+\~.*/$">
-PerlAccessHandler       Apache::loncacc
+AuthType Basic
+Require valid-user
+PerlAuthzHandler       Apache::loncacc
 SetHandler perl-script
 PerlHandler Apache::lonpubdir
 ErrorDocument     403 /adm/login
@@ -438,7 +689,9 @@ ErrorDocument	  500 /adm/errorhandler
 </LocationMatch>
 
 <Location /adm/pubdir>
-PerlAccessHandler       Apache::lonacc
+AuthType Basic
+Require valid-user
+PerlAuthzHandler       Apache::lonacc
 SetHandler perl-script
 PerlHandler Apache::lonpubdir
 ErrorDocument     403 /adm/login
@@ -448,7 +701,9 @@ ErrorDocument	  500 /adm/errorhandler
 </Location>
 
 <Location /adm/unauthorized>
-PerlAccessHandler       Apache::lonacc
+AuthType Basic
+Require valid-user
+PerlAuthzHandler       Apache::lonacc
 SetHandler perl-script
 PerlHandler Apache::lonunauthorized
 ErrorDocument     403 /adm/login
@@ -457,7 +712,9 @@ ErrorDocument	  500 /adm/errorhandler
 </Location>
 
 <Location /adm/retrieve>
-PerlAccessHandler       Apache::lonacc
+AuthType Basic
+Require valid-user
+PerlAuthzHandler       Apache::lonacc
 SetHandler perl-script
 PerlHandler Apache::lonretrieve
 ErrorDocument     403 /adm/login
@@ -466,8 +723,22 @@ ErrorDocument     406 /adm/unauthorized
 ErrorDocument	  500 /adm/errorhandler
 </Location>
 
+<Location /adm/cleanup>
+AuthType Basic
+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 Basic
+Require valid-user
+PerlAuthzHandler       Apache::lonacc
 SetHandler perl-script
 PerlHandler Apache::loncfile
 ErrorDocument     403 /adm/login
@@ -477,7 +748,9 @@ ErrorDocument	  500 /adm/errorhandler
 </Location>
 
 <Location /adm/diff>
-PerlAccessHandler       Apache::lonacc
+AuthType Basic
+Require valid-user
+PerlAuthzHandler       Apache::lonacc
 SetHandler perl-script
 PerlHandler Apache::londiff
 ErrorDocument     403 /adm/login
@@ -487,7 +760,9 @@ ErrorDocument	  500 /adm/errorhandler
 </Location>
 
 <Location /adm/upload>
-PerlAccessHandler       Apache::lonacc
+AuthType Basic
+Require valid-user
+PerlAuthzHandler       Apache::lonacc
 SetHandler perl-script
 PerlHandler Apache::lonupload
 ErrorDocument     403 /adm/login
@@ -496,8 +771,34 @@ ErrorDocument     406 /adm/unauthorized
 ErrorDocument	  500 /adm/errorhandler
 </Location>
 
+<Location /adm/imsimport>
+AuthType Basic
+Require valid-user
+PerlAuthzHandler       Apache::lonacc
+SetHandler perl-script
+PerlHandler Apache::imsimport
+ErrorDocument     403 /adm/login
+ErrorDocument     404 /adm/notfound.html
+ErrorDocument     406 /adm/unauthorized
+ErrorDocument     500 /adm/errorhandler
+</Location>
+
+<Location /adm/testbank>
+AuthType Basic
+Require valid-user
+PerlAuthzHandler       Apache::lonacc
+SetHandler perl-script
+PerlHandler Apache::testbankimport
+ErrorDocument     403 /adm/login
+ErrorDocument     404 /adm/notfound.html
+ErrorDocument     406 /adm/unauthorized
+ErrorDocument     500 /adm/errorhandler
+</Location>
+
 <Location /adm/assesscalc>
-PerlAccessHandler       Apache::lonacc
+AuthType Basic
+Require valid-user
+PerlAuthzHandler       Apache::lonacc
 SetHandler perl-script
 PerlHandler Apache::lonspreadsheet
 ErrorDocument     403 /adm/login
@@ -507,7 +808,9 @@ ErrorDocument	  500 /adm/errorhandler
 </Location>
 
 <Location /adm/studentcalc>
-PerlAccessHandler       Apache::lonacc
+AuthType Basic
+Require valid-user
+PerlAuthzHandler       Apache::lonacc
 SetHandler perl-script
 PerlHandler Apache::lonspreadsheet
 ErrorDocument     403 /adm/login
@@ -517,7 +820,9 @@ ErrorDocument	  500 /adm/errorhandler
 </Location>
 
 <Location /adm/classcalc>
-PerlAccessHandler       Apache::lonacc
+AuthType Basic
+Require valid-user
+PerlAuthzHandler       Apache::lonacc
 SetHandler perl-script
 PerlHandler Apache::lonspreadsheet
 ErrorDocument     403 /adm/login
@@ -527,7 +832,9 @@ ErrorDocument	  500 /adm/errorhandler
 </Location>
 
 <Location /adm/dropadd>
-PerlAccessHandler       Apache::lonacc
+AuthType Basic
+Require valid-user
+PerlAuthzHandler       Apache::lonacc
 SetHandler perl-script
 PerlHandler Apache::londropadd
 ErrorDocument     403 /adm/login
@@ -535,8 +842,43 @@ ErrorDocument     406 /adm/roles
 ErrorDocument	  500 /adm/errorhandler
 </Location>
 
+<Location /adm/viewclasslist>
+AuthType Basic
+Require valid-user
+PerlAuthzHandler       Apache::lonacc
+SetHandler perl-script
+PerlHandler Apache::lonviewclasslist
+ErrorDocument     403 /adm/login
+ErrorDocument     406 /adm/roles
+ErrorDocument	  500 /adm/errorhandler
+</Location>
+
+<Location /adm/coursegroups>
+AuthType Basic
+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/whatsnew>
+AuthType Basic
+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 Basic
+Require valid-user
+PerlAuthzHandler       Apache::lonacc
 SetHandler perl-script
 PerlHandler Apache::lonpopulate
 ErrorDocument     403 /adm/login
@@ -545,7 +887,9 @@ ErrorDocument     500 /adm/errorhandler
 </Location>
 
 <Location /adm/managekeys>
-PerlAccessHandler       Apache::lonacc
+AuthType Basic
+Require valid-user
+PerlAuthzHandler       Apache::lonacc
 SetHandler perl-script
 PerlHandler Apache::lonmanagekeys
 ErrorDocument     403 /adm/login
@@ -554,7 +898,9 @@ ErrorDocument	  500 /adm/errorhandler
 </Location>
 
 <Location /adm/printout>
-PerlAccessHandler       Apache::lonacc
+AuthType Basic
+Require valid-user
+PerlAuthzHandler       Apache::lonacc
 SetHandler perl-script
 PerlHandler Apache::lonprintout
 ErrorDocument     403 /adm/login
@@ -563,7 +909,9 @@ ErrorDocument	  500 /adm/errorhandler
 </Location>
 
 <Location /adm/feedback>
-PerlAccessHandler       Apache::lonacc
+AuthType Basic
+Require valid-user
+PerlAuthzHandler       Apache::lonacc
 SetHandler perl-script
 PerlHandler Apache::lonfeedback
 ErrorDocument     403 /adm/login
@@ -571,16 +919,31 @@ ErrorDocument	  500 /adm/errorhandler
 </Location>
 
 <Location /adm/coursedocs>
-PerlAccessHandler       Apache::lonacc
+AuthType Basic
+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>
+AuthType Basic
+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
+AuthType Basic
+Require valid-user
+PerlAuthzHandler       Apache::lonacc
 SetHandler perl-script
 PerlHandler Apache::lonannounce
 ErrorDocument     403 /adm/login
@@ -588,14 +951,18 @@ ErrorDocument	  500 /adm/errorhandler
 </Location>
 
 <Location /adm/chat>
-PerlAccessHandler       Apache::lonacc
+AuthType Basic
+Require valid-user
+PerlAuthzHandler       Apache::lonacc
 SetHandler perl-script
 PerlHandler Apache::lonchat
 ErrorDocument	  500 /adm/errorhandler
 </Location>
 
 <Location /adm/chatfetch>
-PerlAccessHandler       Apache::lonacc
+AuthType Basic
+Require valid-user
+PerlAuthzHandler       Apache::lonacc
 SetHandler perl-script
 PerlHandler Apache::lonchatfetch
 ErrorDocument     413 /adm/overloaded.txt
@@ -603,7 +970,9 @@ ErrorDocument	  500 /adm/errorhandler
 </Location>
 
 <Location /adm/evaluate>
-PerlAccessHandler       Apache::lonacc
+AuthType Basic
+Require valid-user
+PerlAuthzHandler       Apache::lonacc
 SetHandler perl-script
 PerlHandler Apache::lonevaluate
 ErrorDocument     403 /adm/login
@@ -611,24 +980,19 @@ ErrorDocument	  500 /adm/errorhandler
 </Location>
 
 <Location /adm/preferences>
-PerlAccessHandler       Apache::lonacc
+AuthType Basic
+Require valid-user
+PerlAuthzHandler       Apache::lonacc
 SetHandler perl-script
 PerlHandler Apache::lonpreferences
 ErrorDocument     403 /adm/login
 ErrorDocument	  500 /adm/errorhandler
 </Location>
 
-<Location /adm/assignments>
-PerlAccessHandler       Apache::lonacc
-SetHandler perl-script
-PerlHandler Apache::lonassignments
-ErrorDocument     403 /adm/login
-ErrorDocument     406 /adm/roles
-ErrorDocument	  500 /adm/errorhandler
-</Location>
-
 <Location /adm/communicate>
-PerlAccessHandler       Apache::lonacc
+AuthType Basic
+Require valid-user
+PerlAuthzHandler       Apache::lonacc
 SetHandler perl-script
 PerlHandler Apache::loncommunicate
 ErrorDocument     403 /adm/login
@@ -636,17 +1000,22 @@ ErrorDocument	  500 /adm/errorhandler
 </Location>
 
 <Location /adm/searchcat>
-PerlAccessHandler       Apache::lonacc
+AuthType Basic
+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 Basic
+Require valid-user
+PerlAuthzHandler       Apache::lonacc
 SetHandler perl-script
 PerlHandler Apache::lonnavmaps
 ErrorDocument     403 /adm/login
@@ -655,7 +1024,9 @@ ErrorDocument	  500 /adm/errorhandler
 </Location>
 
 <Location /adm/quickgrades>
-PerlAccessHandler       Apache::lonacc
+AuthType Basic
+Require valid-user
+PerlAuthzHandler       Apache::lonacc
 SetHandler perl-script
 PerlHandler Apache::lonquickgrades
 ErrorDocument     403 /adm/login
@@ -664,10 +1035,13 @@ ErrorDocument     500 /adm/errorhandler
 </Location>
 
 <Location /adm/groupsort>
-PerlAccessHandler	Apache::lonacc
+AuthType Basic
+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>
@@ -678,11 +1052,34 @@ PerlHandler Apache::lonerrorhandler
 </Location>
 
 <LocationMatch "^/adm/help/.*\.hlp$">
-PerlAccessHandler	Apache::lonacc
+AuthType Basic
+Require valid-user
+PerlAuthzHandler	Apache::lonacc
 SetHandler perl-script
 PerlHandler Apache::lonhelp
 </LocationMatch>
 
+<LocationMatch "^/adm/helpmenu">
+AuthType Basic
+Require valid-user
+PerlAuthzHandler       Apache::lonacc
+SetHandler perl-script
+PerlHandler Apache::lonhelpmenu
+</LocationMatch>
+
+<LocationMatch "^/adm/support">
+AuthType Basic
+Require valid-user
+PerlAuthzHandler       Apache::lonacc
+SetHandler perl-script
+PerlHandler Apache::lonsupportreq
+</LocationMatch>
+
+<LocationMatch "^/adm/helpdesk">
+SetHandler perl-script
+PerlHandler Apache::lonsupportreq
+</LocationMatch>
+
 # ------------------------------------------------- Backdoor Adm Tests/Programs
 
 <Location /cgi-bin/loncron.pl>
@@ -747,13 +1144,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)
@@ -824,11 +1221,23 @@ PerlSetVar       lonSysEMail  korte@lite
 PerlSetVar       lonDaemons   /home/httpd/perl
 PerlSetVar       lonSockDir   /home/httpd/sockets
 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
+# & sepeareted list of : seperated fileds inorder 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/
+PerlSetVar	 FAQHost	http://help.lon-capa.org/
 # -----------------------------------------------------------------------------
 # NOTE: lonSqlAccess key is the password for the MySQL user
 # www@localhost.  This value must always be "localhostkey".
@@ -844,6 +1253,77 @@ PerlSetVar       lonSqlAccess   localhos
 PerlSetVar       lonhttpdPort  8080
 
 
+#----------------------------------------------------------------------------
+#
+#   Parameters used by secure lond/lonc
+
+#
+#   Secure lond/lonc require ssl certificate and private
+#   key files to function correctly.  The certificate
+#   files need not be terribly secure, but the private key files
+#   should be set up so that only www (the lonc/lond effective user)
+#   can read them.
+# 
+#   The definition below is the full path to the directory that
+#   contains the certificate and key files:
+
+PerlSetVar lonCertificateDirectory /home/httpd/lonCerts
+
+#
+#  Secure lond/lonc require two certificates and a private host key.
+#  The certificates required are that of the lonCAPA certificate authority
+#  and the certificate that authority issued to this host.
+#  lonnetCertificateAuthority is the name of the file that contains the
+#                            lonCAPA certificate authority's certificate.
+#  lonnetCertificate is the name of the file that contains the certificate
+#                    issued to the host by the certificate authority.
+#  Both of these variables are names of files assumed to be in 
+#  lonCertificateDirectory:
+
+PerlSetVar lonnetCertificateAuthority loncapaCA.pem
+PerlSetVar lonnetCertificate          lonhostcert.pem
+
+#
+#  To generate the request for a certificate, and to negotiate the
+#  initial ssl connection, the host requires a private key.  This key
+#  is created at lonCAPA install time.  Did we mention above that it
+#  should be set so that only www can read it?  The variale below
+#  is the name of the file relative to lonnetCertificateDirectory
+#  that has the host's private key.  Did we remember to tell you to
+#  keep the permissions on that file set to rw-------  (0600)?
+#  
+
+PerlSetVar lonnetPrivateKey         lonKey.pem
+
+# Did we mention that the file described above must have
+# permissions really locked down so that it can't be stolen?
+
+#-------------------------------------------------------------------------
+
+#   Parameters that define where all the ssl stuff is that's needed
+#   to generate certificate requests and, on a system that's a CA
+#   the certificate authority.
+#    
+#    SSLProgram    -> Path to the openssl command
+#    SSLDirectory  -> Directory containing ssl configuration files etc.
+#    SSLCAConfig   -> Name of the SSL config file for the certificate 
+#                     Authority.
+#    SSLCAFile     -> Full path to the Certificate authority file 
+#                    (on the cert manager system).
+#    SSLEmail      -> E-mail address of loncapa certificate manager.
+#    The following are good for the loncapa redhat installs and
+#    the loncapa certificate authority system:
+#
+PerlSetVar SSLProgram	/usr/bin/openssl
+PerlSetVar SSLDirectory /usr/share/ssl
+PerlSetVar SSLCAConfig  loncapaca
+PerlSetVar SSLCAFile    /usr/share/ssl/loncapaca/cacert.pem
+PerlSetVar SSLEmail     certificate@lon-capa.org
+
+#-------------------------------------------------------------------------
+
+
+
 
 # ====================================== Include machine-specific configuration