--- loncom/auth/lonacc.pm	2006/07/07 22:01:52	1.84
+++ loncom/auth/lonacc.pm	2006/07/10 03:58:45	1.85
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Cookie Based Access Handler
 #
-# $Id: lonacc.pm,v 1.84 2006/07/07 22:01:52 raeburn Exp $
+# $Id: lonacc.pm,v 1.85 2006/07/10 03:58:45 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -37,6 +37,7 @@ use Apache::loncommon();
 use Apache::lonlocal;
 use CGI::Cookie();
 use Fcntl qw(:flock);
+use LONCAPA;
 
 sub cleanup {
     my ($r)=@_;
@@ -172,7 +173,7 @@ sub portfolio_access {
         }
         if ($env{'user.name'} eq 'public' && $env{'user.domain'} eq 'public') {
             if ($guest) {
-                return 'guest:'.$guest;
+                return $guest;
             }
         } else {
             if (@domains > 0) {
@@ -247,7 +248,7 @@ sub portfolio_access {
                                             return 'ok';
                                         } else {
                                             if (grep/^$sec$/,@sections) {
-                                                return 'ok' 
+                                                return 'ok';
                                             }
                                         }
                                     }
@@ -272,13 +273,31 @@ sub portfolio_access {
                 }
             }
             if ($guest) {
-                return 'guest:'.$guest;
+                return $guest;
             }
         }
     }
     return;
 }
 
+sub passphrase_access_checker {
+    my ($r,$guestkey,$requrl) = @_;
+    my ($num,$scope,$end,$start) = ($guestkey =~ /^([^:]+):([a-z]+)_(\d*)_?(\d*)$/);
+    if ($scope eq 'guest') {
+        if (exists($env{'user.passphrase_access_'.$requrl})) {
+            if (($env{'user.passphrase_access_'.$requrl} == 0) || 
+                ($env{'user.passphrase_access_'.$requrl} > time)) {
+                $env{'request.publicaccess'} = 1;
+                return 'ok'; 
+            }
+        }
+    }
+    my $login = $r->dir_config('Login');
+    $login .= '?origurl='.&escape($requrl);
+    $r->custom_response(FORBIDDEN,$login);
+    return;
+}
+
 sub course_group_datechecker {
     my ($dates,$now,$status) = @_;
     my ($start,$end) = split(/\./,$dates);
@@ -369,18 +388,24 @@ sub handler {
                 my $result = &portfolio_access($1,$2,$3);
                 if ($result eq 'ok') {
                     return OK;
-                } elsif ($result =~ /^guest:(\w+)$/) {
-                    my $guestkey = $1;
-                    #FIXME need to cause generation of an intermediate page
+                } elsif ($result =~ /^[^:]+:guest_/) {
+                    if (&passphrase_access_checker($r,$result,$requrl) eq 'ok') {
+                        return OK;
+                    } else {
+                        return FORBIDDEN;
+                    } 
                 }
             } elsif ($requrl =~ m|/+uploaded/([^/]+)/([^/]+)/groups/([^/]+)/portfolio/(.+)$|) {
                 my $result = &portfolio_access($1,$2,$3.'/'.$4,$3);
                 if ($result eq 'ok') {
                     return OK;
-                } elsif ($result =~ /^guest:(\w+)$/) {
-                    my $guestkey = $1;
-                    #FIXME need to cause generation of an intermediate page
-}
+                } elsif ($result =~ /^[^:]+:guest_/) {
+                    if (&passphrase_access_checker($r,$result,$requrl) eq 'ok') {
+                        return OK;
+                    } else {
+                        return FORBIDDEN;
+                    }
+                }
             }
             if ($requrl!~/^\/adm|public|prtspool\//) {
 		my $access=&Apache::lonnet::allowed('bre',$requrl);
@@ -499,17 +524,23 @@ sub handler {
         my $result = &portfolio_access($1,$2,$3);
         if ($result eq 'ok') {
             return OK;
-        } elsif ($result =~ /^guest:(\w+)$/) {
-            my $guestkey = $1;
-            #FIXME need to cause generation of an intermediate page
+        } elsif ($result =~ /^[^:]+:guest_/) {
+            if (&passphrase_access_checker($r,$result,$requrl) eq 'ok') {
+                return OK;
+            } else {
+                return FORBIDDEN;
+            }
         }
     } elsif ($requrl =~ m|/+uploaded/([^/]+)/([^/]+)/groups/([^/]+)/portfolio/(.+)$|) {
         my $result = &portfolio_access($1,$2,$3.'/'.$4,$3);
         if ($result eq 'ok') {
             return OK;
-        } elsif ($result =~ /^guest:(\w+)$/) {
-            my $guestkey = $1;
-            #FIXME need to cause generation of an intermediate page
+        } elsif ($result =~ /^[^:]+:guest_/) {
+            if (&passphrase_access_checker($r,$result,$requrl) eq 'ok') {
+                return OK;
+            } else {
+                return FORBIDDEN;
+            }
         }
     }
 # -------------------------------------------------------------- Not authorized