--- loncom/auth/lonacc.pm	2001/01/06 16:12:24	1.16
+++ loncom/auth/lonacc.pm	2001/11/29 21:54:56	1.23
@@ -1,8 +1,34 @@
 # The LearningOnline Network
 # Cookie Based Access Handler
+#
+# $Id: lonacc.pm,v 1.23 2001/11/29 21:54:56 www Exp $
+#
+# Copyright Michigan State University Board of Trustees
+#
+# This file is part of the LearningOnline Network with CAPA (LON-CAPA).
+#
+# LON-CAPA is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# LON-CAPA is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with LON-CAPA; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+#
+# /home/httpd/html/adm/gpl.txt
+#
+# http://www.lon-capa.org/
+#
 # 5/21/99,5/22,5/29,5/31,6/15,16/11,22/11,
 # 01/06,01/13,05/31,06/01,09/06,09/25,09/28,10/30,11/6,
-# 12/25,12/26,06/01 Gerd Kortemeyer
+# 12/25,12/26,
+# 01/06/01,05/28,8/11,9/26,11/29 Gerd Kortemeyer
 
 package Apache::lonacc;
 
@@ -41,17 +67,12 @@ sub handler {
                 $ENV{$envname} = $envvalue;
             }
             $ENV{'user.environment'} = "$lonidsdir/$handle.id";
-            $ENV{'request.state'}    = "published";
-            $ENV{'request.filename'} = $r->filename;
-
-# --------------------- Figure out referer, first from HTTP_REFERER, then cache
-
-            my $referer='';
-            if ($referer=$r->header_in('Referer')) {
-               $ENV{'HTTP_REFERER'}=$referer;
+            if ($requrl=~/^\/res\//) {
+               $ENV{'request.state'} = "published";
 	    } else {
-	       $ENV{'HTTP_REFERER'}=$ENV{'httpref.'.$requrl};
-	    }
+	       $ENV{'request.state'} = 'unknown';
+            }
+            $ENV{'request.filename'} = $r->filename;
 
 # -------------------------------------------------------- Load POST parameters
 
@@ -134,15 +155,38 @@ sub handler {
 		   $ENV{'user.error.msg'}="$requrl:bre:1:1:Access Denied";
 	           return HTTP_NOT_ACCEPTABLE; 
                 }
-            } 
+            }
+# ------------------------------------------------------------- This is allowed
+          if ($ENV{'request.course.id'}) {
+            $requrl=~/\.(\w+)$/;
+            if (&Apache::lonnet::fileembstyle($1) eq 'ssi') {
+# ------------------------------------- This is serious stuff, get symb and log
+		my $symb=&Apache::lonnet::symbread;
+                $ENV{'request.symb'}=$symb;
+                &Apache::lonnet::courseacclog($symb);
+            } else {
+# ------------------------------------------------------- This is other content
+                &Apache::lonnet::courseacclog($requrl);    
+            }
+	  }
             return OK; 
         } else { 
             $r->log_reason("Cookie $handle not valid", $r->filename) 
         };
     }
 
+# -------------------------------------------- See if this is a public resource
+    if (&Apache::lonnet::metadata($requrl,'copyright') eq 'public') {
+        &Apache::lonnet::logthis('Granting public access: '.$requrl);
+	$ENV{'user.name'}='public';
+        $ENV{'user.domain'}='public';
+        $ENV{'request.state'} = "published";
+        $ENV{'request.publicaccess'} = 1;
+        $ENV{'request.filename'} = $r->filename;
+        return OK;
+    }
 # ----------------------------------------------- Store where they wanted to go
-
+    
     $ENV{'request.firsturl'}=$requrl;
     return FORBIDDEN;
 }