--- loncom/auth/lonacc.pm 2003/02/28 18:14:44 1.39 +++ loncom/auth/lonacc.pm 2003/05/06 21:45:25 1.45 @@ -1,7 +1,7 @@ # The LearningOnline Network # Cookie Based Access Handler # -# $Id: lonacc.pm,v 1.39 2003/02/28 18:14:44 www Exp $ +# $Id: lonacc.pm,v 1.45 2003/05/06 21:45:25 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -88,7 +88,7 @@ sub handler { my $buffer; - $r->read($buffer,$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; @@ -177,7 +177,8 @@ sub handler { &Apache::lonnet::countacc($requrl); $requrl=~/\.(\w+)$/; if ((&Apache::loncommon::fileembstyle($1) eq 'ssi') || - ($requrl=~/^\/adm\/(aboutme|navmaps|smppg|bulletinboard|wrapper)/) || + ($requrl=~/^\/adm\/.*\/(aboutme|navmaps|smppg|bulletinboard)(\?|$)/) || + ($requrl=~/^\/adm\/wrapper\//) || ($requrl=~/^\/public\/.*\/syllabus$/)) { # ------------------------------------- This is serious stuff, get symb and log my $query=$r->args; @@ -199,7 +200,10 @@ sub handler { return HTTP_NOT_ACCEPTABLE; } } else { - $symb=&Apache::lonnet::symbread; + $symb=&Apache::lonnet::symbread($requrl); + my ($map,$mid,$murl)=split(/\_\_\_/,$symb); + &Apache::lonnet::symblist($map,$murl => $mid, + 'last_known' => $murl); } $ENV{'request.symb'}=$symb; &Apache::lonnet::courseacclog($symb); @@ -218,6 +222,9 @@ sub handler { if ($requrl=~m|^/public/| || (&Apache::lonnet::metadata($requrl,'copyright') eq 'public')) { &Apache::lonnet::logthis('Granting public access: '.$requrl); + my $buffer; + $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"; @@ -228,10 +235,11 @@ sub handler { # -------------------------------------------------------------- Not authorized $requrl=~/\.(\w+)$/; if ((&Apache::loncommon::fileembstyle($1) eq 'ssi') || - ($requrl=~/^\/adm\/(roles|logout)/) || + ($requrl=~/^\/adm\/(roles|logout|email|menu|remote)/) || ($requrl=~m|^/prtspool/|)) { # -------------------------- Store where they wanted to go and get login screen - $ENV{'request.firsturl'}=$requrl; + $ENV{'request.querystring'}=$r->args; + $ENV{'request.firsturl'}=$requrl; return FORBIDDEN; } else { # --------------------------------------------------------------------- Goodbye