--- loncom/auth/lonacc.pm 2024/09/04 19:44:27 1.159.2.21.2.7 +++ loncom/auth/lonacc.pm 2023/08/28 18:58:45 1.209 @@ -1,7 +1,7 @@ # The LearningOnline Network # Cookie Based Access Handler # -# $Id: lonacc.pm,v 1.159.2.21.2.7 2024/09/04 19:44:27 raeburn Exp $ +# $Id: lonacc.pm,v 1.209 2023/08/28 18:58:45 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -160,7 +160,7 @@ sub get_posted_cgi { if (length($value) == 1) { $value=~s/[\r\n]$//; } - } + } if ($fname =~ /\.(xls|doc|ppt)(x|m)$/i) { $value=~s/[\r\n]$//; } @@ -586,7 +586,7 @@ sub sso_login { } else { # need to login them in, so generate the need data that # migrate expects to do login - my $ip = &Apache::lonnet::get_requestor_ip($r); + my $ip = &Apache::lonnet::get_requestor_ip($r); my %info=('ip' => $ip, 'domain' => $domain, 'username' => $user, @@ -792,6 +792,7 @@ sub handler { my $lonhost = &Apache::lonnet::host_from_dns($hostname); if ($lonhost) { my $actual = &Apache::lonnet::absolute_url($hostname,1,1); + my $exphostname = &Apache::lonnet::hostname($lonhost); my $expected = $Apache::lonnet::protocol{$lonhost}.'://'.$hostname; unless ($actual eq $expected) { $env{'request.use_absolute'} = $expected; @@ -975,7 +976,7 @@ sub handler { } else { my $nodeeplinkcheck; if ($check_access) { - if ($requrl =~ m{^/daxeopen/priv/}) { + if ($requrl =~ m{^/daxeopen/priv/}) { $nodeeplinkcheck = 1; } elsif ($requrl =~ /\.(sequence|page)$/) { unless ($env{'form.navmap'}) { @@ -990,9 +991,6 @@ sub handler { } my $clientip = &Apache::lonnet::get_requestor_ip($r); $access=&Apache::lonnet::allowed('bre',$requrl,'','',$clientip,'','',$nodeeplinkcheck); - if (($requrl =~ m{^/daxeopen/priv/}) && ($access eq '')) { - $env{'request.editurl'}=$requrl; - } } } if ($check_block) { @@ -1205,8 +1203,8 @@ sub handler { my $mapsymb = &Apache::lonnet::symbread($map); ($map,$mid,$murl)=&Apache::lonnet::decode_symb($mapsymb); } - &Apache::lonnet::symblist($map,$murl =>[$murl,$mid], - 'last_known' =>[$murl,$mid]); + &Apache::lonnet::symblist($map,$murl =>[$murl,$mid], + 'last_known' =>[$murl,$mid]); } } } @@ -1259,7 +1257,7 @@ sub handler { # ------------------------------------ See if this is a viewable portfolio file if (&Apache::lonnet::is_portfolio_url($requrl)) { my $clientip = &Apache::lonnet::get_requestor_ip($r); - my $access=&Apache::lonnet::allowed('bre',$requrl,undef,undef,$clientip); + my $access=&Apache::lonnet::allowed('bre',$requrl,undef,undef,$clientip); if ($access eq 'A') { &Apache::restrictedaccess::setup_handler($r); return OK;