--- loncom/auth/lonacc.pm	2003/04/16 15:59:15	1.44
+++ loncom/auth/lonacc.pm	2005/01/25 00:28:00	1.59
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Cookie Based Access Handler
 #
-# $Id: lonacc.pm,v 1.44 2003/04/16 15:59:15 www Exp $
+# $Id: lonacc.pm,v 1.59 2005/01/25 00:28:00 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -44,6 +44,7 @@ use Apache::Constants qw(:common :http :
 use Apache::File;
 use Apache::lonnet;
 use Apache::loncommon();
+use Apache::lonlocal;
 use CGI::Cookie();
 use Fcntl qw(:flock);
 
@@ -59,97 +60,26 @@ sub handler {
         my $lonidsdir=$r->dir_config('lonIDsDir');
         if ((-e "$lonidsdir/$handle.id") && ($handle ne '')) {
 
-# ------------------------------------------- Transfer profile into environment
+# ------------------------------------------------------ Initialize Environment
 
-            my @profile;
-	    {
-             my $idf=Apache::File->new("$lonidsdir/$handle.id");
-             flock($idf,LOCK_SH);
-             @profile=<$idf>;
-             $idf->close();
-	    }
-            my $envi;
-            for ($envi=0;$envi<=$#profile;$envi++) {
-		chomp($profile[$envi]);
-		my ($envname,$envvalue)=split(/=/,$profile[$envi]);
-                $ENV{$envname} = $envvalue;
-            }
-            $ENV{'user.environment'} = "$lonidsdir/$handle.id";
-            if ($requrl=~/^\/res\//) {
+            &Apache::lonnet::transfer_profile_to_env($lonidsdir,$handle);
+
+# --------------------------------------------------------- Initialize Language
+
+	    &Apache::lonlocal::get_language_handle($r);
+
+# -------------------------------------------------------------- Resource State
+
+            if ($requrl=~/^\/+(res|uploaded)\//) {
                $ENV{'request.state'} = "published";
 	    } else {
 	       $ENV{'request.state'} = 'unknown';
             }
             $ENV{'request.filename'} = $r->filename;
-
+            $ENV{'request.noversionuri'} = &Apache::lonnet::deversion($requrl);
 # -------------------------------------------------------- Load POST parameters
 
-
-           
-        my $buffer;
-
-        $r->read($buffer,$r->header_in('Content-length'));
-	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";
-                }
-            }
-	}
-	    $ENV{'request.method'}=$ENV{'REQUEST_METHOD'};
-            $r->method_number(M_GET);
-	    $r->method('GET');
-            $r->headers_in->unset('Content-length');
+	    &Apache::loncommon::get_posted_cgi($r);
 
 # ---------------------------------------------------------------- Check access
 
@@ -179,6 +109,7 @@ sub handler {
             if ((&Apache::loncommon::fileembstyle($1) eq 'ssi') ||
  ($requrl=~/^\/adm\/.*\/(aboutme|navmaps|smppg|bulletinboard)(\?|$)/) ||
  ($requrl=~/^\/adm\/wrapper\//) ||
+ ($requrl=~m|\.problem/smpedit$|) ||
  ($requrl=~/^\/public\/.*\/syllabus$/)) {
 # ------------------------------------- This is serious stuff, get symb and log
 		my $query=$r->args;
@@ -188,8 +119,14 @@ sub handler {
                 }
                 if ($ENV{'form.symb'}) {
 		    $symb=&Apache::lonnet::symbclean($ENV{'form.symb'});
-                    if (&Apache::lonnet::symbverify($symb,$requrl)) {
-                      my ($map,$mid,$murl)=split(/\_\_\_/,$symb);
+                    if ($requrl =~ m|^/adm/wrapper/|) {
+                        my ($map,$mid,$murl)=&Apache::lonnet::decode_symb($symb);
+                        &Apache::lonnet::symblist($map,$murl => $mid,
+                                               'last_known' => $murl);
+                    } elsif ((&Apache::lonnet::symbverify($symb,$requrl)) ||
+			     (($requrl=~m|(.*)/smpedit$|) &&
+			      &Apache::lonnet::symbverify($symb,$1))) {
+                      my ($map,$mid,$murl)=&Apache::lonnet::decode_symb($symb);
                       &Apache::lonnet::symblist($map,$murl => $mid,
                                                'last_known' => $murl);
 		    } else {
@@ -201,6 +138,13 @@ sub handler {
                     }
                 } else {
 	            $symb=&Apache::lonnet::symbread($requrl);
+		    if (&Apache::lonnet::is_on_map($requrl) && $symb &&
+			!&Apache::lonnet::symbverify($symb,$requrl)) {
+			$r->log_reason('Invalid symb for '.$requrl.': '.$symb);
+		        $ENV{'user.error.msg'}=
+                                "$requrl:bre:1:1:Invalid Access";
+  	                return HTTP_NOT_ACCEPTABLE; 
+		    }
                     my ($map,$mid,$murl)=split(/\_\_\_/,$symb);
 		    &Apache::lonnet::symblist($map,$murl => $mid,
                                               'last_known' => $murl);
@@ -223,13 +167,22 @@ sub handler {
 	|| (&Apache::lonnet::metadata($requrl,'copyright') eq 'public')) {
         &Apache::lonnet::logthis('Granting public access: '.$requrl);
 	my $buffer;
-	$r->read($buffer,$r->header_in('Content-length'));
+	$r->read($buffer,$r->header_in('Content-length'),0);
 	&Apache::loncommon::get_unprocessed_cgi($buffer);
 	$ENV{'user.name'}='public';
         $ENV{'user.domain'}='public';
         $ENV{'request.state'} = "published";
         $ENV{'request.publicaccess'} = 1;
         $ENV{'request.filename'} = $r->filename;
+	my ($httpbrowser,  $clientbrowser, $clientversion,
+	    $clientmathml, $clientunicode, $clientos) =
+		&Apache::loncommon::decode_user_agent($r);
+	$ENV{'browser.type'}=$clientbrowser;
+        $ENV{'browser.version'}=$clientversion;
+        $ENV{'browser.mathml'}=$clientmathml;
+        $ENV{'browser.unicode'}=$clientunicode;
+        $ENV{'browser.os'}=$clientos;
+
         return OK;
     }
 # -------------------------------------------------------------- Not authorized