--- loncom/loncapa_apache.conf	2004/08/23 19:34:01	1.94
+++ loncom/loncapa_apache.conf	2005/11/15 23:05:05	1.120
@@ -1,7 +1,7 @@
 ##
 ## loncapa_apache.conf -- Apache HTTP LON-CAPA configuration file
 ##
-## $Id: loncapa_apache.conf,v 1.94 2004/08/23 19:34:01 albertel Exp $
+## $Id: loncapa_apache.conf,v 1.120 2005/11/15 23:05:05 raeburn Exp $
 ##
 
 #
@@ -43,9 +43,7 @@ ScriptAlias /cgi-bin/ "/home/httpd/cgi-b
 # ------------------------------------------------------------- Access Handlers
 
 PerlTransHandler	Apache::lontrans
-<IfDefine MODPERL2>
-PerlCleanupHandler	Apache::lonnet::cleanenv
-</IfDefine>
+PerlCleanupHandler	Apache::lonnet::save_cache
 
 #PerlWarn On
 <LocationMatch "^/+res.*">
@@ -58,7 +56,8 @@ ErrorDocument	  500 /adm/errorhandler
 </LocationMatch>
 
 <LocationMatch "^/+enc.*">
-PerlAccessHandler       Apache::lonenc
+SetHandler perl-script
+PerlHandler       Apache::lonenc
 ErrorDocument     403 /adm/login
 ErrorDocument     404 /adm/notfound.html
 ErrorDocument     406 /adm/roles
@@ -71,16 +70,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.*">
@@ -92,6 +85,18 @@ 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>
+
+
 <LocationMatch "^/+uploaded/.*\.page$">
 SetHandler perl-script
 PerlHandler Apache::lonpage
@@ -128,6 +133,15 @@ ErrorDocument     406 /adm/notinit.html
 ErrorDocument	  500 /adm/errorhandler
 </LocationMatch>
 
+<LocationMatch "^/adm/.*/grppg$">
+PerlAccessHandler       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
 SetHandler              perl-script
@@ -185,6 +199,7 @@ PerlAccessHandler 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
@@ -204,6 +219,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
@@ -218,6 +238,7 @@ ErrorDocument	  500 /adm/errorhandler
 SetHandler perl-script
 PerlHandler Apache::lonindexer
 PerlCleanupHandler Apache::lonindexer::cleanup
+PerlCleanupHandler	Apache::lonnet::save_cache
 </LocationMatch>
 
 <LocationMatch "^/+(res|\~).*\.tex$">
@@ -235,9 +256,10 @@ 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
 </LocationMatch>
 
 <LocationMatch "^/adm/bombs/">
@@ -259,7 +281,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>
@@ -272,7 +294,7 @@ ErrorDocument     403 /adm/login
 ErrorDocument	  500 /adm/errorhandler
 </LocationMatch>
 
-<LocationMatch "^/adm/source/">
+<LocationMatch "^/adm/source">
 PerlAccessHandler       Apache::lonacc
 SetHandler perl-script
 PerlHandler Apache::lonsource
@@ -386,11 +408,23 @@ PerlHandler Apache::lonlogout
 ErrorDocument     403 /adm/login
 </Location>
 
+<Location /adm/switchserver>
+PerlAccessHandler       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
 SetHandler perl-script
@@ -420,6 +454,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
@@ -430,6 +465,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>
@@ -442,6 +478,14 @@ ErrorDocument     403 /adm/login
 ErrorDocument	  500 /adm/errorhandler
 </Location>
 
+<Location /adm/notify>
+PerlAccessHandler       Apache::lonacc
+SetHandler perl-script
+PerlHandler Apache::lonnotify
+ErrorDocument     403 /adm/login
+ErrorDocument     500 /adm/errorhandler
+</Location>
+
 <Location /adm/parmset>
 PerlAccessHandler       Apache::lonacc
 SetHandler perl-script
@@ -451,6 +495,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
@@ -545,6 +598,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
@@ -643,6 +706,24 @@ ErrorDocument     406 /adm/roles
 ErrorDocument	  500 /adm/errorhandler
 </Location>
 
+<Location /adm/coursegroups>
+PerlAccessHandler       Apache::lonacc
+SetHandler perl-script
+PerlHandler Apache::loncoursegroups
+ErrorDocument     403 /adm/login
+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
@@ -682,7 +763,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>
@@ -734,15 +816,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
@@ -756,6 +829,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
@@ -784,6 +858,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>
@@ -811,6 +886,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>
@@ -952,9 +1032,19 @@ 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/