--- loncom/auth/lonroles.pm	2022/07/08 15:45:20	1.269.2.39.2.5
+++ loncom/auth/lonroles.pm	2024/02/27 16:52:46	1.269.2.39.2.9
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # User Roles Screen
 #
-# $Id: lonroles.pm,v 1.269.2.39.2.5 2022/07/08 15:45:20 raeburn Exp $
+# $Id: lonroles.pm,v 1.269.2.39.2.9 2024/02/27 16:52:46 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -508,6 +508,7 @@ sub handler {
 				 "request.course.sec"          => '',
                                  "request.course.tied"         => '',
                                  "request.course.timechecked"  => '',
+                                 "request.course.suppupdated"  => '',
 				 "request.role"                => 'cm',
                                  "request.role.adv"            => $env{'user.adv'},
 				 "request.role.domain"         => $env{'user.domain'}});
@@ -863,7 +864,6 @@ ENDCLOSE
                             my ($feeds,$syllabus_time);
                             &Apache::lonrss::advertisefeeds($cnum,$cdom,undef,\$feeds);
                             &Apache::lonnet::appenv({'request.course.feeds' => $feeds});
-                            &Apache::lonnet::get_numsuppfiles($cnum,$cdom,1);
                             unless ($env{'course.'.$cdom.'_'.$cnum.'.updatedsyllabus'}) {
                                 unless (($env{'course.'.$cdom.'_'.$cnum.'.externalsyllabus'}) ||
                                         ($env{'course.'.$cdom.'_'.$cnum.'.uploadedsyllabus'})) {
@@ -896,6 +896,8 @@ ENDCLOSE
                                 if ($env{'form.symb'}) {
                                     $furl .= '&symb='.&HTML::Entities::encode($env{'form.symb'},'<>&"');
                                 }
+                            } else {
+                                &set_supplemental_access($cnum,$cdom);
                             }
                             if (($ferr) && ($tadv)) {
                                 &error_page($r,$ferr,$furl);
@@ -957,6 +959,7 @@ ENDCLOSE
                                               &Apache::loncommon::end_page());
                                 }
 			    } else {
+                                &set_supplemental_access($cnum,$cdom);
                                 if ($env{'request.deeplink.login'}) {
                                     &set_deeplink_target($cnum,$cdom);
                                 }
@@ -1114,6 +1117,12 @@ ENDCLOSE
                             $redirect_url .= $where;
                         }
                         $redirect_url .= '/';
+                        if ($env{'form.orgurl'} =~ /^\Q$redirect_url\E/) {
+                            my ($path) = ($env{'form.orgurl'} =~ m{^(.+)/[^/]+$});
+                            if (($path ne '') && (-e $Apache::lonnet::perlvar{'lonDocRoot'}.$path)) {
+                                $redirect_url = $env{'form.orgurl'};
+                            }
+                        }
                         &redirect_user($r,&mt('Entering Authoring Space'),
                                        $redirect_url);
                         return OK;
@@ -1691,9 +1700,9 @@ sub gather_roles {
                                 foreach my $rolename (sort(keys(%{$domdef{'adhocroles'}}))) {
                                     if (ref($domdef{'adhocroles'}{$rolename}) eq 'HASH') {
                                         $adhocdesc{$tdom}{$rolename} = $domdef{'adhocroles'}{$rolename}{'desc'};
-                                        $desc = $adhocdesc{$tdom}{$rolename};
                                     }
                                 }
+                                $desc = $adhocdesc{$tdom}{$rolename};
                             }
                         }
                         if ($desc ne '') {
@@ -2591,6 +2600,22 @@ sub update_session_roles {
                         }
                     } else {
                         $newrole{$rolekey} = $status_in_db;
+                        if ($role eq 'au') {
+                            my %userenv =
+                                &Apache::lonnet::userenvironment($env{'user.domain'},
+                                                                 $env{'user.name'},'authoreditors');
+                            if ($userenv{'authoreditors'}) {
+                                $userenv{'editors'} = $userenv{'authoreditors'};
+                            } else {
+                                my %domdef = &Apache::lonnet::get_domain_defaults($env{'user.domain'});
+                                if ($domdef{'editors'} ne '') {
+                                    $userenv{'editors'} = $domdef{'editors'};
+                                } else {
+                                    $userenv{'editors'} = 'edit,xml';
+                                }
+                            }
+                            &Apache::lonnet::appenv(\%userenv);
+                        }
                     }
                 }
             }
@@ -3441,6 +3466,14 @@ sub set_deeplink_target {
     return;
 }
 
+sub set_supplemental_access {
+    my ($cnum,$cdom) = @_;
+    my ($supplemental,$refs_updated) = &Apache::loncommon::get_supplemental($cnum,$cdom);
+    unless ($refs_updated) {
+        &Apache::loncommon::set_supp_httprefs($cnum,$cdom,$supplemental);
+    }
+}
+
 1;
 __END__