--- loncom/auth/lonacc.pm	2024/09/04 19:44:27	1.159.2.21.2.7
+++ loncom/auth/lonacc.pm	2022/09/17 23:38:50	1.207
@@ -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.207 2022/09/17 23:38:50 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]$//;
                     }
@@ -333,8 +333,7 @@ sub sso_login {
         }
     }
 
-    my ($linkprot,$linkprotuser,$linkprotexit,$linkkey,$deeplinkurl,
-        $linkprotpbid,$linkprotpburl);
+    my ($linkprot,$linkprotuser,$linkprotexit,$linkkey,$deeplinkurl);
 
 #
 # If Shibboleth auth is in use, and a dual SSO and non-SSO login page
@@ -374,8 +373,6 @@ sub sso_login {
             $linkprot = $info{'linkprot'};
             $linkprotuser = $info{'linkprotuser'};
             $linkprotexit = $info{'linkprotexit'};
-            $linkprotpbid = $info{'linkprotpbid'};
-            $linkprotpburl = $info{'linkprotpburl'};
         } elsif ($info{'linkkey'} ne '') {
             $linkkey = $info{'linkkey'};
         }
@@ -404,8 +401,6 @@ sub sso_login {
                 $linkprot = $form{'linkprot'};
                 $linkprotuser = $form{'linkprotuser'};
                 $linkprotexit = $form{'linkprotexit'};
-                $linkprotpbid = $form{'linkprotpbid'};
-                $linkprotpburl = $form{'linkprotpburl'};
             } elsif ($form{'linkkey'} ne '') {
                 $linkkey = $form{'linkkey'};
             }
@@ -435,8 +430,6 @@ sub sso_login {
                 $linkprot = $form{'linkprot'};
                 $linkprotuser = $form{'linkprotuser'};
                 $linkprotexit = $form{'linkprotexit'};
-                $linkprotpbid = $form{'linkprotpbid'};
-                $linkprotpburl = $form{'linkprotpburl'};
             } elsif ($form{'linkkey'} ne '') {
                 $linkkey = $form{'linkkey'};
             }
@@ -451,12 +444,6 @@ sub sso_login {
             if ($link_info{'linkprotexit'} ne '') {
                 $linkprotexit = $link_info{'linkprotexit'};
             }
-            if ($link_info{'linkprotpbid'} ne '') {
-                $linkprotpbid = $link_info{'linkprotpbid'};
-            }
-            if ($link_info{'linkprotpburl'} ne '') {
-                $linkprotpburl = $link_info{'linkprotpburl'};
-            }
         }
         my $delete = &Apache::lonnet::tmpdel($form{'ltoken'});
         delete($form{'ltoken'});
@@ -479,8 +466,6 @@ sub sso_login {
                            linkprot => $linkprot,
                            linkprotuser => $linkprotuser,
                            linkprotexit => $linkprotexit,
-                           linkprotpbid => $linkprotpbid,
-                           linkprotpburl => $linkprotpburl,
                        );
             if ($env{'form.lcssowin'}) {
                 $data{'lcssowin'} = $env{'form.lcssowin'};
@@ -553,12 +538,6 @@ sub sso_login {
                     if ($linkprotexit ne '') {
                         $env{'request.linkprotexit'} = $linkprotexit;
                     }
-                    if ($linkprotpbid ne '') {
-                        $env{'request.linkprotpbid'} = $linkprotpbid;
-                    }
-                    if ($linkprotpburl ne '') {
-                        $env{'request.linkprotpburl'} = $linkprotpburl;
-                    }
                 } elsif ($linkkey ne '') {
                     $env{'request.linkkey'} = $linkkey;
                 }
@@ -586,7 +565,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,
@@ -619,12 +598,6 @@ sub sso_login {
                     if ($linkprotexit ne '') {
                         $info{'linkprotexit'} = $linkprotexit;
                     }
-                    if ($linkprotpbid ne '') {
-                        $info{'linkprotpbid'} = $linkprotpbid;
-                    }
-                    if ($linkprotpburl ne '') {
-                        $info{'linkprotpburl'} = $linkprotpburl;
-                    }
                 } elsif ($linkkey ne '') {
                     $info{'linkkey'} = $linkkey;
                 }
@@ -792,6 +765,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;
@@ -850,8 +824,6 @@ sub handler {
                                 linkprot => $info{'linkprot'},
                                 linkprotuser => $info{'linkprotuser'},
                                 linkprotexit => $info{'linkprotexit'},
-                                linkprotpbid => $info{'linkprotpbid'},
-                                linkprotpburl => $info{'linkprotpburl'},
                             );
                         } elsif ($info{'ltoken'} ne '') {
                             my %ltoken_info = &Apache::lonnet::tmpget($info{'ltoken'});
@@ -862,8 +834,6 @@ sub handler {
                                     linkprot => $ltoken_info{'linkprot'},
                                     linkprotuser => $ltoken_info{'linkprotuser'},
                                     linkprotexit => $ltoken_info{'linkprotexit'},
-                                    linkprotpbid => $ltoken_info{'linkprotpbid'},
-                                    linkprotpburl => $ltoken_info{'linkprotpburl'},
                                 );
                             }
                         }
@@ -890,17 +860,6 @@ sub handler {
                 return FORBIDDEN;
             }
             return OK;
-        } elsif (($env{'request.course.id'}) &&
-                 (&Apache::lonnet::allowed('mdc',$env{'request.course.id'})) &&
-                 ($requrl=~m{^(/daxeopen|)(/uploaded/$cdom/$cnum/(?:docs|supplemental)/(?:default|\d+)/\d+/)([^/]+|)$})) {
-            my ($daxe,$path,$file) = ($1,$2,$3);
-            my $referrer;
-            unless ($daxe) {
-                $referrer = $r->headers_in->{'Referer'};
-            }
-            if (($daxe) || ($referrer =~ m{\Qfile=/daxeopen$path\E})) {
-                return OK;
-            }
         }
 # ---------------------------------------------------------------- Check access
 	my $now = time;
@@ -974,25 +933,18 @@ sub handler {
                 }
             } else {
                 my $nodeeplinkcheck;
-                if ($check_access) {
-                    if ($requrl =~ m{^/daxeopen/priv/}) {
-                        $nodeeplinkcheck = 1;
-                    } elsif ($requrl =~ /\.(sequence|page)$/) {
-                        unless ($env{'form.navmap'}) {
-                            if ($r->args ne '') {
-                                &Apache::loncommon::get_unprocessed_cgi($r->args,['navmap']);
-                                unless ($env{'form.navmap'}) {
-                                    $nodeeplinkcheck = 1;
-                                }
+                if (($check_access) && ($requrl =~ /\.(sequence|page)$/)) {
+                    unless ($env{'form.navmap'}) {
+                        if ($r->args ne '') {
+                            &Apache::loncommon::get_unprocessed_cgi($r->args,['navmap']);
+                            unless ($env{'form.navmap'}) {
+                                $nodeeplinkcheck = 1;
                             }
                         }
                     }
                 }
                 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 +1157,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 +1211,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;