--- loncom/loncapa_apache.conf	2008/05/12 23:47:31	1.174
+++ loncom/loncapa_apache.conf	2009/09/25 13:51:31	1.188
@@ -1,7 +1,7 @@
 ##
 ## loncapa_apache.conf -- Apache HTTP LON-CAPA configuration file
 ##
-## $Id: loncapa_apache.conf,v 1.174 2008/05/12 23:47:31 www Exp $
+## $Id: loncapa_apache.conf,v 1.188 2009/09/25 13:51:31 droeschl Exp $
 ##
 
 #
@@ -37,6 +37,7 @@ ExtendedStatus On
 
 Alias /zipspool/ /home/httpd/zipspool/
 Alias /prtspool/ /home/httpd/prtspool/
+Alias /captchaspool/ /home/httpd/captchaspool/
 ScriptAlias /cgi-bin/ "/home/httpd/cgi-bin/"
 
 # ================================================================= Directories
@@ -50,6 +51,10 @@ PerlAuthenHandler Apache::checkauthen
 PerlSetVar lonOtherAuthen no
 
 #PerlWarn On
+<LocationMatch "^/+res/adm/pages/[^/]+\.(gif|png)$">
+PerlAuthenHandler	'sub { return OK }' 
+</LocationMatch>
+
 <LocationMatch "^/+res.*">
 
 AuthType LONCAPA
@@ -100,11 +105,17 @@ PerlCleanupHandler	Apache::lontokacc::re
 PerlCleanupHandler	Apache::lonacc::cleanup
 </LocationMatch>
 
+<LocationMatch "^/pdfupload.*">
+SetHandler perl-script
+PerlHandler             Apache::lonpdfupload
+</LocationMatch>
+
 <LocationMatch "^/+uploaded.*">
 AuthType LONCAPA
 Require valid-user
 PerlAuthzHandler	Apache::lonacc
-PerlHandler Apache::londatecheck
+PerlHandler 		Apache::londatecheck
+PerlHandler  		Apache::lonipcheck
 PerlHeaderParserHandler Apache::lonuploadrep
 ErrorDocument     403 /adm/login
 ErrorDocument     404 /adm/notfound.html
@@ -202,6 +213,7 @@ Require valid-user
 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
@@ -214,6 +226,7 @@ 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
@@ -371,6 +384,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>
 
@@ -379,11 +393,17 @@ SetHandler perl-script
 PerlHandler Apache::lonhomework
 </LocationMatch>
 
+<LocationMatch "^/+\~.*\.(js|css|txt)$">
+SetHandler perl-script
+PerlHandler Apache::lonxml
+</LocationMatch>
+
 <LocationMatch "^/adm/wrapper/">
 AuthType LONCAPA
 Require valid-user
 PerlAuthzHandler       Apache::lonacc
 PerlHandler Apache::londatecheck
+PerlHandler Apache::lonipcheck
 SetHandler perl-script
 PerlHandler Apache::lonwrapper
 ErrorDocument     403 /adm/login
@@ -487,6 +507,16 @@ 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 LONCAPA
 Require valid-user
@@ -497,6 +527,17 @@ ErrorDocument     403 /adm/login
 ErrorDocument	  500 /adm/errorhandler
 </Location>
 
+<Location /adm/pickuser>
+AuthType LONCAPA
+Require valid-user
+PerlAuthzHandler       Apache::lonacc
+SetHandler perl-script
+PerlHandler Apache::lonpickuser
+ErrorDocument     403 /adm/login
+ErrorDocument     406 /adm/roles
+ErrorDocument     500 /adm/errorhandler
+</Location>
+
 <Location /adm/pickcourse>
 AuthType LONCAPA
 Require valid-user
@@ -549,6 +590,7 @@ PerlAuthzHandler       Apache::lonacc
 SetHandler perl-script
 PerlHandler Apache::lonlogout
 ErrorDocument     403 /adm/login
+ErrorDocument     409 /adm/preferences?action=lockwarning
 ErrorDocument	  500 /adm/errorhandler
 </Location>
 
@@ -658,6 +700,17 @@ ErrorDocument     406 /adm/roles
 ErrorDocument	  500 /adm/errorhandler
 </Location>
 
+<Location /adm/courseprefs>
+AuthType LONCAPA
+Require valid-user
+PerlAuthzHandler       Apache::lonacc
+SetHandler perl-script
+PerlHandler Apache::courseprefs
+ErrorDocument     403 /adm/login
+ErrorDocument     406 /adm/roles
+ErrorDocument     500 /adm/errorhandler
+</Location>
+
 <Location /adm/slotrequest>
 AuthType LONCAPA
 Require valid-user
@@ -691,6 +744,17 @@ ErrorDocument     406 /adm/roles
 ErrorDocument	  500 /adm/errorhandler
 </Location>
 
+<Location /adm/requestcourse>
+AuthType LONCAPA
+Require valid-user
+PerlAuthzHandler       Apache::lonacc
+SetHandler perl-script
+PerlHandler Apache::lonrequestcourse
+ErrorDocument     403 /adm/login
+ErrorDocument     406 /adm/roles
+ErrorDocument     500 /adm/errorhandler
+</Location>
+
 <Location /adm/createcourse>
 AuthType LONCAPA
 Require valid-user
@@ -724,6 +788,15 @@ ErrorDocument     406 /adm/roles
 ErrorDocument     500 /adm/errorhandler
 </Location>
 
+<Location /adm/domainstatus>
+PerlAccessHandler       Apache::lonstatusacc
+SetHandler perl-script
+PerlHandler Apache::domainstatus
+ErrorDocument     403 /adm/login
+ErrorDocument     406 /adm/roles
+ErrorDocument     500 /adm/errorhandler
+</Location>
+
 <Location /adm/createuser>
 AuthType LONCAPA
 Require valid-user
@@ -1149,6 +1222,15 @@ ErrorDocument     403 /adm/login
 ErrorDocument	  500 /adm/errorhandler
 </Location>
 
+<Location /adm/blockingstatus>
+PerlAccessHandler      Apache::publiccheck
+AuthType LONCAPA
+Require valid-user
+PerlAuthzHandler       Apache::lonacc
+SetHandler             perl-script
+PerlHandler            Apache::lonblockingstatus
+</Location>
+
 <Location /adm/errorhandler>
 SetHandler perl-script
 PerlHandler Apache::lonerrorhandler
@@ -1226,69 +1308,9 @@ ErrorDocument     500 /adm/errorhandler
 
 # ------------------------------------------------- Backdoor Adm Tests/Programs
 
-<Location /cgi-bin/loncron.pl>
-AuthName "LON-CAPA Network Administration"
-AuthType Basic
-AuthUserFile /home/httpd/lonTabs/htpasswd
-require user lonadm
-</Location>
-
-<Location /cgi-bin/userstatus.pl>
-AuthName "LON-CAPA Network Administration"
-AuthType Basic
-AuthUserFile /home/httpd/lonTabs/htpasswd
-require user lonadm
-</Location>
-
-<Location /cgi-bin/lonversions.pl>
-AuthName "LON-CAPA Network Administration"
-AuthType Basic
-AuthUserFile /home/httpd/lonTabs/htpasswd
-require user lonadm
-</Location>
-
-<Location /cgi-bin/clusterstatus.pl>
-AuthName "LON-CAPA Network Administration"
-AuthType Basic
-AuthUserFile /home/httpd/lonTabs/htpasswd
-require user lonadm
-</Location>
-
-<Location /cgi-bin/metadata_keywords.pl>
-AuthName "LON-CAPA Network Administration"
-AuthType Basic
-AuthUserFile /home/httpd/lonTabs/htpasswd
-require user lonadm
-</Location>
-
-<Location /cgi-bin/metadata_harvest.pl>
-AuthName "harvest"
-AuthType Basic
-AuthUserFile /home/httpd/lonTabs/htpasswd
-require user  reaper
-</Location>
-
-<Location /cgi-bin/takeoffline.pl>
-AuthName "Offline"
-AuthType Basic
-AuthUserFile /home/httpd/lonTabs/htpasswd
-require user  offline
-</Location>
-
-<Location /cgi-bin/takeonline.pl>
-AuthName "Offline"
-AuthType Basic
-AuthUserFile /home/httpd/lonTabs/htpasswd
-require user  offline
-</Location>
-
 <Location /adm/test>
-AuthName "LON-CAPA Network Administration"
-AuthType Basic
-AuthUserFile /home/httpd/lonTabs/htpasswd
-require user lonadm
+PerlAccessHandler Apache::lonstatusacc
 SetHandler perl-script
-PerlAuthzHandler Apache::lonacc
 PerlHandler Apache::lontest
 </Location>
 
@@ -1364,24 +1386,29 @@ 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
 
 # ------------------------------------------------- Allow server-status reports
 <Location /server-status>
+PerlAccessHandler Apache::lonstatusacc
 SetHandler server-status
-AuthName "LON-CAPA Network Administration"
-AuthType Basic
-AuthUserFile /home/httpd/lonTabs/htpasswd
-require user lonadm
 </Location>
 
 # ------------------------ Allow LON-CAPA "low-level" connection status reports
-<Location /lon-status>
-AuthName "LON-CAPA Network Administration"
-AuthType Basic
-AuthUserFile /home/httpd/lonTabs/htpasswd
-require user lonadm
-</Location>
+<LocationMatch "^/+lon-status/.*">
+PerlAccessHandler Apache::lonstatusacc
+ErrorDocument     406 /adm/roles
+ErrorDocument     500 /adm/errorhandler
+</LocationMatch>
 
 # ------------------- Allow access to local system documentation from localhost
 Alias /doc /usr/doc
@@ -1403,12 +1430,15 @@ PerlSetVar       lonIconsURL  /adm/lonIc
 PerlSetVar       londPort     5663
 PerlSetVar       lonSysEMail  korte@lite.msu.edu
 PerlSetVar       lonDaemons   /home/httpd/perl
+PerlSetVar       lonLib       /home/httpd/lib
 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       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, 
@@ -1434,12 +1464,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