--- loncom/auth/lonacc.pm	2006/04/07 22:42:00	1.75
+++ loncom/auth/lonacc.pm	2006/06/16 22:37:29	1.79
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Cookie Based Access Handler
 #
-# $Id: lonacc.pm,v 1.75 2006/04/07 22:42:00 albertel Exp $
+# $Id: lonacc.pm,v 1.79 2006/06/16 22:37:29 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -51,6 +51,119 @@ sub goodbye {
     return DONE;
 }
 
+###############################################
+
+sub get_posted_cgi {
+    my ($r) = @_;
+
+    my $buffer;
+    if ($r->header_in('Content-length')) {
+	$r->read($buffer,$r->header_in('Content-length'),0);
+    }
+    unless ($buffer=~/^(\-+\w+)\s+Content\-Disposition\:\s*form\-data/si) {
+	my @pairs=split(/&/,$buffer);
+	my $pair;
+	foreach $pair (@pairs) {
+	    my ($name,$value) = split(/=/,$pair);
+	    $value =~ tr/+/ /;
+	    $value =~ s/%([a-fA-F0-9][a-fA-F0-9])/pack("C",hex($1))/eg;
+	    $name  =~ tr/+/ /;
+	    $name  =~ s/%([a-fA-F0-9][a-fA-F0-9])/pack("C",hex($1))/eg;
+	    &Apache::loncommon::add_to_env("form.$name",$value);
+	}
+    } else {
+	my $contentsep=$1;
+	my @lines = split (/\n/,$buffer);
+	my $name='';
+	my $value='';
+	my $fname='';
+	my $fmime='';
+	my $i;
+	for ($i=0;$i<=$#lines;$i++) {
+	    if ($lines[$i]=~/^$contentsep/) {
+		if ($name) {
+		    chomp($value);
+		    if ($fname) {
+			$env{"form.$name.filename"}=$fname;
+			$env{"form.$name.mimetype"}=$fmime;
+		    } else {
+			$value=~s/\s+$//s;
+		    }
+		    &Apache::loncommon::add_to_env("form.$name",$value);
+		}
+		if ($i<$#lines) {
+		    $i++;
+		    $lines[$i]=~
+		/Content\-Disposition\:\s*form\-data\;\s*name\=\"([^\"]+)\"/i;
+		    $name=$1;
+		    $value='';
+		    if ($lines[$i]=~/filename\=\"([^\"]+)\"/i) {
+			$fname=$1;
+			if 
+                            ($lines[$i+1]=~/Content\-Type\:\s*([\w\-\/]+)/i) {
+				$fmime=$1;
+				$i++;
+			    } else {
+				$fmime='';
+			    }
+		    } else {
+			$fname='';
+			$fmime='';
+		    }
+		    $i++;
+		}
+	    } else {
+		$value.=$lines[$i]."\n";
+	    }
+	}
+    }
+#
+# Digested POSTed values
+#
+# Remember the way this was originally done (GET or POST)
+#
+    $env{'request.method'}=$ENV{'REQUEST_METHOD'};
+#
+# There may also be stuff in the query string
+# Tell subsequent handlers that this was GET, not POST, so they can access query string.
+# Also, unset POSTed content length to cover all tracks.
+#
+
+    $r->method_number(M_GET);
+
+    $r->method('GET');
+    $r->headers_in->unset('Content-length');
+}
+
+sub portfolio_access {
+    my ($udom,$unum,$file_name,$group) = @_;
+    my $current_perms = &Apache::lonnet::get_portfile_permissions($udom,$unum);
+    my %access_controls = &Apache::lonnet::get_access_controls(
+                                             $current_perms,$group,$file_name);
+    my ($public);
+    my $now = time;
+    my $access_hash = $access_controls{$file_name};
+    if (ref($access_hash) eq 'HASH') {
+        foreach my $key (keys(%{$access_hash})) {
+            my ($num,$scope,$end,$start) = ($key =~ /^([^:]+):([a-z]+)_(\d*)_?(\d*)$/);
+            if ($start > $now) {
+                next;
+            }
+            if ($end && $end<$now) {
+                next;
+            }
+            if ($scope eq 'public') {
+                $public = $key;
+                last;
+            }
+        }
+        if ($public) {
+            return 'ok';
+        }
+    }
+    return;
+}
+
 sub handler {
     my $r = shift;
     my $requrl=$r->uri;
@@ -65,8 +178,10 @@ sub handler {
         $handle=~s/\W//g;
     }
       
+    my ($sso_login);
     if ($r->user 
 	&& (!$lonid || !-e "$lonidsdir/$handle.id" || $handle eq '') ) {
+	$sso_login = 1;
 	my $domain = $r->dir_config('lonDefDomain');
 	my $home=&Apache::lonnet::homeserver($r->user,$domain);
 	if ($home !~ /(con_lost|no_such_host)/) {
@@ -76,6 +191,10 @@ sub handler {
 	}
     }
 
+    if ($sso_login) {
+	&Apache::lonnet::appenv('request.sso.login' => 1);
+    }
+
     if ($r->dir_config("lonBalancer") eq 'yes') {
 	$r->set_handlers('PerlResponseHandler'=>
 			 [\&Apache::switchserver::handler]);
@@ -103,10 +222,21 @@ sub handler {
             $env{'request.noversionuri'} = &Apache::lonnet::deversion($requrl);
 # -------------------------------------------------------- Load POST parameters
 
-	    &Apache::loncommon::get_posted_cgi($r);
+	    &Apache::lonacc::get_posted_cgi($r);
 
 # ---------------------------------------------------------------- Check access
-
+            my $now = time;
+            if ($requrl =~ m#/+uploaded/([^/]+)/([^/]+)/portfolio(/.+)$#) {
+                my $result = &portfolio_access($1,$2,$3);
+                if ($result eq 'ok') {
+                    return OK;
+                }
+            } elsif ($requrl =~ m#/+uploaded/([^/]+)/([^/]+)/groups/([^/]+)/portfolio/(.+)$#) {
+                my $result = &portfolio_access($1,$2,$4.'/'.$3,$3);
+                if ($result eq 'ok') {
+                    return OK;
+                }
+            }
             if ($requrl!~/^\/adm|public|prtspool\//) {
 		my $access=&Apache::lonnet::allowed('bre',$requrl);
                 if ($access eq '1') {
@@ -208,7 +338,7 @@ sub handler {
 	    &Apache::lonauth::success($r,'public','public','public');
         my $lonidsdir=$r->dir_config('lonIDsDir');
 	&Apache::lonnet::transfer_profile_to_env($lonidsdir,$cookie);
-	&Apache::loncommon::get_posted_cgi($r);
+	&Apache::lonacc::get_posted_cgi($r);
         $env{'request.state'} = "published";
         $env{'request.publicaccess'} = 1;
         $env{'request.filename'} = $r->filename;
@@ -219,6 +349,18 @@ sub handler {
     if ($requrl=~m|^/+adm/+help/+|) {
 	return OK;
     }
+# ------------------------------------- See if this is a viewable portfolio file
+    if ($requrl =~ m#/+uploaded/([^/]+)/([^/]+)/portfolio(/.+)$#) {
+        my $result = &portfolio_access($1,$2,$3);
+        if ($result eq 'ok') {
+            return OK;
+        }
+    } elsif ($requrl =~ m#/+uploaded/([^/]+)/([^/]+)/groups/([^/]+)/portfolio/(.+)$#) {
+        my $result = &portfolio_access($1,$2,$4.'/'.$3,$3);
+        if ($result eq 'ok') {
+            return OK;
+        }
+    }
 # -------------------------------------------------------------- Not authorized
     $requrl=~/\.(\w+)$/;
 #    if ((&Apache::loncommon::fileembstyle($1) eq 'ssi') ||