--- loncom/loncapa_apache.conf	2004/10/26 17:20:08	1.99
+++ loncom/loncapa_apache.conf	2005/06/03 19:50:07	1.112
@@ -1,7 +1,7 @@
 ##
 ## loncapa_apache.conf -- Apache HTTP LON-CAPA configuration file
 ##
-## $Id: loncapa_apache.conf,v 1.99 2004/10/26 17:20:08 www Exp $
+## $Id: loncapa_apache.conf,v 1.112 2005/06/03 19:50:07 raeburn Exp $
 ##
 
 #
@@ -69,16 +69,10 @@ SetHandler perl-script
 PerlHandler Apache::portfolio
 </Location>
 
-<LocationMatch "\.portfolio$">
-SetHandler perl-script
-PerlHandler Apache::portfolio
-</LocationMatch>
-
-
-
 <LocationMatch "^/+userfiles.*">
 PerlAccessHandler       Apache::lontokacc
 PerlCleanupHandler	Apache::lontokacc::removefile
+PerlCleanupHandler	Apache::lonnet::save_cache
 </LocationMatch>
 
 <LocationMatch "^/+uploaded.*">
@@ -90,6 +84,13 @@ ErrorDocument     406 /adm/roles
 ErrorDocument	  500 /adm/errorhandler
 </LocationMatch>
 
+<LocationMatch "^/+editupload.*">
+PerlAccessHandler	Apache::lonacc
+ErrorDocument     403 /adm/login
+ErrorDocument     406 /adm/roles
+ErrorDocument	  500 /adm/errorhandler
+</LocationMatch>
+
 <LocationMatch "^/+uploaded/.*/.*/internal/.*">
 PerlAccessHandler	Apache::lonuploadedacc
 </LocationMatch>
@@ -208,6 +209,11 @@ SetHandler perl-script
 PerlHandler Apache::lonratsrv
 </LocationMatch>
 
+<LocationMatch "^/\~.*\/adveditmenu$">
+SetHandler perl-script
+PerlHandler Apache::lonratmenu
+</LocationMatch>
+
 <Location /adm/ratparms>
 PerlAccessHandler       Apache::lonacc
 SetHandler perl-script
@@ -222,6 +228,7 @@ ErrorDocument	  500 /adm/errorhandler
 SetHandler perl-script
 PerlHandler Apache::lonindexer
 PerlCleanupHandler Apache::lonindexer::cleanup
+PerlCleanupHandler	Apache::lonnet::save_cache
 </LocationMatch>
 
 <LocationMatch "^/+(res|\~).*\.tex$">
@@ -239,7 +246,7 @@ SetHandler perl-script
 PerlHandler Apache::lonsequence
 </LocationMatch>
 
-<LocationMatch "^/+(res|\~|public|uploaded|adm).*\.meta$">
+<LocationMatch "^/+(res|\~|public|uploaded|editupload|adm).*\.meta$">
 SetHandler perl-script
 PerlHandler Apache::lonmeta
 ErrorDocument     413 /adm/overloaded.txt
@@ -264,7 +271,7 @@ 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>
@@ -425,6 +432,7 @@ PerlAccessHandler       Apache::lonacc
 SetHandler perl-script
 PerlHandler Apache::lonpageflip
 PerlCleanupHandler Apache::lonpageflip::cleanup
+PerlCleanupHandler	Apache::lonnet::save_cache
 ErrorDocument     406 /adm/roles
 ErrorDocument     403 /adm/login
 ErrorDocument	  500 /adm/errorhandler
@@ -435,6 +443,7 @@ PerlAccessHandler       Apache::lonacc
 SetHandler perl-script
 PerlHandler Apache::lonambiguous
 PerlCleanupHandler Apache::lonambiguous::cleanup
+PerlCleanupHandler	Apache::lonnet::save_cache
 ErrorDocument     403 /adm/login
 ErrorDocument	  500 /adm/errorhandler
 </Location>
@@ -456,6 +465,15 @@ ErrorDocument     406 /adm/roles
 ErrorDocument	  500 /adm/errorhandler
 </Location>
 
+<Location /adm/slotrequest>
+PerlAccessHandler       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
 SetHandler perl-script
@@ -550,6 +568,16 @@ ErrorDocument     406 /adm/unauthorized
 ErrorDocument	  500 /adm/errorhandler
 </Location>
 
+<Location /adm/cleanup>
+PerlAccessHandler       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
 SetHandler perl-script
@@ -648,6 +676,15 @@ ErrorDocument     406 /adm/roles
 ErrorDocument	  500 /adm/errorhandler
 </Location>
 
+<Location /adm/whatsnew>
+PerlAccessHandler       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
 SetHandler perl-script
@@ -687,7 +724,8 @@ ErrorDocument	  500 /adm/errorhandler
 PerlAccessHandler       Apache::lonacc
 SetHandler perl-script
 PerlHandler Apache::londocs
- PerlCleanupHandler Apache::londocs::untiehash
+PerlCleanupHandler Apache::londocs::untiehash
+PerlCleanupHandler	Apache::lonnet::save_cache
 ErrorDocument     403 /adm/login
 ErrorDocument	  500 /adm/errorhandler
 </Location>
@@ -739,15 +777,6 @@ 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
 SetHandler perl-script
@@ -761,6 +790,7 @@ PerlAccessHandler       Apache::lonacc
 SetHandler perl-script
 PerlHandler Apache::lonsearchcat
 PerlCleanupHandler Apache::lonsearchcat::cleanup
+PerlCleanupHandler	Apache::lonnet::save_cache
 ErrorDocument     403 /adm/login
 ErrorDocument     413 /adm/overloaded.txt
 ErrorDocument	  500 /adm/errorhandler
@@ -789,6 +819,7 @@ PerlAccessHandler	Apache::lonacc
 SetHandler perl-script
 PerlHandler Apache::groupsort
 PerlCleanupHandler Apache::groupsort::cleanup
+PerlCleanupHandler	Apache::lonnet::save_cache
 ErrorDocument     403 /adm/login
 ErrorDocument	  500 /adm/errorhandler
 </Location>
@@ -799,7 +830,7 @@ PerlHandler Apache::lonerrorhandler
 </Location>
 
 <LocationMatch "^/adm/help/.*\.hlp$">
-PerlAccessHandler	Apache::lonacc
+#PerlAccessHandler	Apache::lonacc
 SetHandler perl-script
 PerlHandler Apache::lonhelp
 </LocationMatch>
@@ -816,6 +847,11 @@ 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>
@@ -959,8 +995,8 @@ PerlSetVar       lonSockDir   /home/http
 PerlSetVar       lonDocRoot   /home/httpd/html
 PerlSetVar       lonPrtDir    /home/httpd/prtspool
 PerlSetVar       lonIncludes  /home/httpd/html/res/adm/includes
-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&amaya:amaya:mozilla:V(\d+\.\d+)\s:1:1&safari:safari:msie:safari\/(\d+\.\d+):9999:9999
-PerlSetVar       lonTextBrowsers opera:windows\s+ce:lynx
+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&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/