--- loncom/auth/lonacc.pm	2023/07/05 17:31:46	1.159.2.21.2.5
+++ loncom/auth/lonacc.pm	2023/08/28 20:40:00	1.210
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Cookie Based Access Handler
 #
-# $Id: lonacc.pm,v 1.159.2.21.2.5 2023/07/05 17:31:46 raeburn Exp $
+# $Id: lonacc.pm,v 1.210 2023/08/28 20:40:00 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]$//;
                     }
@@ -204,6 +204,14 @@ sub get_posted_cgi {
 			$fname='';
 			$fmime='';
 		    }
+                    if ($i<$#lines && $lines[$i+1]=~/^Content\-Type\:\s*([\w\-\/]+)/i) {
+                        # TODO: something with $1 !
+                        $i++;
+                    }
+                    if ($i<$#lines && $lines[$i+1]=~/^Content\-transfer\-encoding\:\s*([\w\-\/]+)/i) {
+                        # TODO: something with $1 !
+                        $i++;
+                    }
 		    $i++;
 		}
 	    } else {
@@ -578,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,
@@ -784,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;
@@ -882,6 +891,17 @@ 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;
@@ -955,18 +975,25 @@ sub handler {
                 }
             } else {
                 my $nodeeplinkcheck;
-                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;
+                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;
+                                }
                             }
                         }
                     }
                 }
                 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) {
@@ -1179,8 +1206,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]);
                         }
 		    }
 		}
@@ -1233,7 +1260,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;