--- loncom/auth/lonacc.pm 2008/12/31 20:22:47 1.116.2.2 +++ loncom/auth/lonacc.pm 2008/11/20 14:37:52 1.120 @@ -1,7 +1,7 @@ # The LearningOnline Network # Cookie Based Access Handler # -# $Id: lonacc.pm,v 1.116.2.2 2008/12/31 20:22:47 raeburn Exp $ +# $Id: lonacc.pm,v 1.120 2008/11/20 14:37:52 jms Exp $ # # Copyright Michigan State University Board of Trustees # @@ -27,6 +27,7 @@ # ### + package Apache::lonacc; use strict; @@ -93,7 +94,7 @@ sub get_posted_cgi { if (ref($fields) eq 'ARRAY') { next if (!grep(/^\Q$name\E$/,@{$fields})); } - if ($fname) { + if ($fname) { if ($env{'form.symb'} ne '') { my $size = (length($value))/(1024.0 * 1024.0); if (&upload_size_allowed($name,$size,$fname) eq 'ok') { @@ -102,14 +103,14 @@ sub get_posted_cgi { &Apache::loncommon::add_to_env("form.$name",$value); } } else { - $env{"form.$name.filename"}=$fname; - $env{"form.$name.mimetype"}=$fmime; + $env{"form.$name.filename"}=$fname; + $env{"form.$name.mimetype"}=$fmime; &Apache::loncommon::add_to_env("form.$name",$value); } - } else { - $value=~s/\s+$//s; + } else { + $value=~s/\s+$//s; &Apache::loncommon::add_to_env("form.$name",$value); - } + } } if ($i<$#lines) { $i++; @@ -161,17 +162,16 @@ sub get_posted_cgi { # Add form.HWFILESIZE.$part_$id to %env with file size (MB) # If file exceeds maximum allowed size, add form.HWFILETOOBIG.$part_$id to %env. # - + sub upload_size_allowed { my ($name,$size,$fname) = @_; if ($name =~ /^HWFILE(\w+)$/) { my $ident = $1; my $item = 'HWFILESIZE'.$ident; - my $savesize = sprintf("%.6f",$size); - &Apache::loncommon::add_to_env("form.$item",$savesize); + &Apache::loncommon::add_to_env("form.$item",$size); my $maxsize= &Apache::lonnet::EXT("resource.$ident.maxfilesize"); if (!$maxsize) { - $maxsize = 10.0; # FIXME This should become a domain configuration. + $maxsize = 100.0; } if ($size > $maxsize) { my $warn = 'HWFILETOOBIG'.$ident; @@ -182,12 +182,12 @@ 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 + sub sso_login { my ($r,$handle) = @_; @@ -275,10 +275,7 @@ 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); @@ -464,6 +461,7 @@ sub handler { 1; __END__ + =head1 NAME Apache::lonacc - Cookie Based Access Handler @@ -524,4 +522,4 @@ store attempted access =back -=cut +=cut \ No newline at end of file