--- loncom/loncapa_apache.conf	2008/05/01 14:20:50	1.173
+++ loncom/loncapa_apache.conf	2008/12/23 00:06:12	1.181.2.3
@@ -1,7 +1,7 @@
 ##
 ## loncapa_apache.conf -- Apache HTTP LON-CAPA configuration file
 ##
-## $Id: loncapa_apache.conf,v 1.173 2008/05/01 14:20:50 raeburn Exp $
+## $Id: loncapa_apache.conf,v 1.181.2.3 2008/12/23 00:06:12 raeburn 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
@@ -104,7 +109,8 @@ PerlCleanupHandler	Apache::lonacc::clean
 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 +208,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 +221,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 +379,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>
 
@@ -384,6 +393,7 @@ AuthType LONCAPA
 Require valid-user
 PerlAuthzHandler       Apache::lonacc
 PerlHandler Apache::londatecheck
+PerlHandler Apache::lonipcheck
 SetHandler perl-script
 PerlHandler Apache::lonwrapper
 ErrorDocument     403 /adm/login
@@ -463,6 +473,7 @@ PerlAuthzHandler       Apache::lonacc
 SetHandler perl-script
 PerlHandler Apache::lonroles
 ErrorDocument     403 /adm/login
+ErrorDocument     409 /adm/preferences?action=lockwarning
 ErrorDocument	  500 /adm/errorhandler
 </Location>
 
@@ -486,6 +497,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
@@ -548,6 +569,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>
 
@@ -723,6 +745,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
@@ -1225,69 +1256,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>
 
@@ -1363,24 +1334,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
@@ -1408,6 +1384,8 @@ PerlSetVar       lonDocRoot   /home/http
 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, 
@@ -1433,12 +1411,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