--- loncom/auth/lonacc.pm	2008/11/18 19:14:34	1.119
+++ loncom/auth/lonacc.pm	2009/07/23 18:45:39	1.127
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Cookie Based Access Handler
 #
-# $Id: lonacc.pm,v 1.119 2008/11/18 19:14:34 jms Exp $
+# $Id: lonacc.pm,v 1.127 2009/07/23 18:45:39 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -87,6 +87,10 @@ store attempted access
 
 =back
 
+=head1 NOTABLE SUBROUTINES
+
+=over
+
 =cut
 
 
@@ -218,22 +222,27 @@ sub get_posted_cgi {
     $r->headers_in->unset('Content-length');
 }
 
-#
-# Perform size checks for file uploads to essayresponse items in course context.
-#
-# Add form.HWFILESIZE.$part_$id to %env with file size (MB)
-# If file exceeds maximum allowed size, add form.HWFILETOOBIG.$part_$id to %env.
-#
+=pod
+
+=item upload_size_allowed()
+
+	Perform size checks for file uploads to essayresponse items in course context.
+	
+	Add form.HWFILESIZE.$part_$id to %env with file size (MB)
+	If file exceeds maximum allowed size, add form.HWFILETOOBIG.$part_$id to %env.
+
+=cut
  
 sub upload_size_allowed {
     my ($name,$size,$fname) = @_;
     if ($name =~ /^HWFILE(\w+)$/) {
         my $ident = $1;
         my $item = 'HWFILESIZE'.$ident;
-        &Apache::loncommon::add_to_env("form.$item",$size);
+        my $savesize = sprintf("%.6f",$size);
+        &Apache::loncommon::add_to_env("form.$item",$savesize);
         my $maxsize= &Apache::lonnet::EXT("resource.$ident.maxfilesize");
         if (!$maxsize) {
-            $maxsize = 100.0;
+            $maxsize = 10.0; # FIXME This should become a domain configuration.
         }
         if ($size > $maxsize) {
             my $warn = 'HWFILETOOBIG'.$ident;
@@ -244,11 +253,17 @@ sub upload_size_allowed {
     return 'ok';
 }
 
-# handle the case of the single sign on user, at this point $r->user 
-# will be set and valid now need to find the loncapa user info and possibly
-# balance them
-# returns OK if it was a SSO and user was handled
-#         undef if not SSO or no means to hanle the user
+=pod
+
+=item sso_login()
+
+	handle the case of the single sign on user, at this point $r->user 
+	will be set and valid now need to find the loncapa user info and possibly
+	balance them
+	returns OK if it was a SSO and user was handled
+        undef if not SSO or no means to hanle the user
+        
+=cut
 
 sub sso_login {
     my ($r,$handle) = @_;
@@ -263,6 +278,18 @@ sub sso_login {
 
     my ($user) = ($r->user =~ m/([a-zA-Z0-9_\-@.]*)/);
 
+    my $query = $r->args;
+    my %form;
+    if ($query) {
+        my @items = ('role','symb');
+        &Apache::loncommon::get_unprocessed_cgi($query,\@items);
+        foreach my $item (@items) {
+            if (defined($env{'form.'.$item})) {
+                $form{$item} = $env{'form.'.$item};
+            }
+        }
+    }
+
     my $domain = $r->dir_config('lonDefDomain');
     my $home=&Apache::lonnet::homeserver($user,$domain);
     if ($home !~ /(con_lost|no_host|no_such_host)/) {
@@ -287,6 +314,11 @@ sub sso_login {
 		      'server'    => $r->dir_config('lonHostID'),
 		      'sso.login' => 1
 		      );
+            foreach my $item ('role','symb') {
+                if (exists($form{$item})) {
+                    $info{$item} = $form{$item};
+                }
+            }
             if ($r->dir_config("ssodirecturl") == 1) {
                 $info{'origurl'} = $r->uri;
             }
@@ -337,7 +369,10 @@ sub handler {
         return OK;
     }
 
-    
+    if ($requrl =~ m{^/res/adm/pages/[^/]+\.(gif|png)$}) {
+        return OK;
+    }
+
     my $handle = &Apache::lonnet::check_for_valid_session($r);
 
     my $result = &sso_login($r,$handle);
@@ -431,6 +466,7 @@ sub handler {
 	if ($env{'request.course.id'}) {
 	    &Apache::lonnet::countacc($requrl);
 	    $requrl=~/\.(\w+)$/;
+            my $query=$r->args;
 	    if ((&Apache::loncommon::fileembstyle($1) eq 'ssi') ||
 		($requrl=~/^\/adm\/.*\/(aboutme|navmaps|smppg|bulletinboard)(\?|$ )/x) ||
 		($requrl=~/^\/adm\/wrapper\//) ||
@@ -438,7 +474,6 @@ sub handler {
 		($requrl=~m|\.problem/smpedit$|) ||
 		($requrl=~/^\/public\/.*\/syllabus$/)) {
 # ------------------------------------- This is serious stuff, get symb and log
-		my $query=$r->args;
 		my $symb;
 		if ($query) {
 		    &Apache::loncommon::get_unprocessed_cgi($query,['symb']);
@@ -485,6 +520,18 @@ sub handler {
 # ------------------------------------------------------- This is other content
 		&Apache::lonnet::courseacclog($requrl);    
 	    }
+            my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};;
+            my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};;
+            if ($requrl =~ m{^/+uploaded/\Q$cdom\E/\Q$cnum\E/docs/.+\.html?$}) {
+                if (&Apache::lonnet::allowed('mdc',$env{'request.course.id'})) {
+                    if ($query) {
+                        &Apache::loncommon::get_unprocessed_cgi($query,['forceedit']);
+                        if ($env{'form.forceedit'}) {
+                            $env{'request.state'} = 'edit';
+                        }
+                    }
+                }
+            }
 	}
 	return OK;
     }
@@ -522,3 +569,10 @@ sub handler {
 
 1;
 __END__
+
+=pod
+
+=back
+
+=cut
+