--- loncom/auth/lonroles.pm	2022/06/26 04:03:47	1.365
+++ loncom/auth/lonroles.pm	2024/09/17 13:06:49	1.374
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # User Roles Screen
 #
-# $Id: lonroles.pm,v 1.365 2022/06/26 04:03:47 raeburn Exp $
+# $Id: lonroles.pm,v 1.374 2024/09/17 13:06:49 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -444,6 +444,12 @@ sub handler {
        $reqauthor = &Apache::loncoursequeueadmin::process_reqauthor(\$update);
     }
 
+# ------------------------------------------------- Check for approval results
+    my $approvalresult;
+    if (($env{'form.approvals'} eq 'show') && ($env{'form.state'} eq 'done')) {
+        $approvalresult = &Apache::loncoursequeueadmin::update_request_queue('othdombyuser',  
+                                                                             $env{'user.domain'});
+    }
     my $envkey;
     my %dcroles = ();
     my %helpdeskroles = ();
@@ -499,6 +505,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'}});
@@ -696,7 +703,7 @@ sub handler {
 						     $env{'user.name'},
                                                      &mt('Assigned from [_1] at [_2] for [_3]'
                                                         ,$ip
-                                                        ,&Apache::lonlocal::locallocaltime()
+                                                        ,&Apache::lonlocal::locallocaltime($now)
                                                         ,$trolecode)
                                                      );
 				 unless ($assignresult eq 'ok') {
@@ -853,7 +860,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'})) {
@@ -886,6 +892,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);
@@ -951,6 +959,7 @@ ENDCLOSE
                                               &Apache::loncommon::end_page());
                                 }
 			    } else {
+                                &set_supplemental_access($cnum,$cdom);
                                 if (($env{'request.lti.login'}) &&
                                     ($env{'request.lti.rosterid'} || $env{'request.lti.passbackid'})) {
                                     &process_lti($r,$cdom,$cnum);
@@ -1040,7 +1049,7 @@ ENDCLOSE
                                         if ($env{'form.ttoken'}) {
                                             $dest .= (($dest =~/\?/)? '&':'?').'ttoken='.$env{'form.ttoken'};
                                         }
-                                        unless ($env{'request.lti.login'}) {
+                                        unless (($env{'request.lti.login'}) || ($env{'request.deeplink.login'})) {
                                             $msg = '<p>'.&mt('Entering [_1] ...',
                                                              $env{'course.'.$cdom.'_'.$cnum.'.description'}).
                                                    '</p>';
@@ -1130,6 +1139,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;
@@ -1222,16 +1237,18 @@ ENDCLOSE
         $start_page=&Apache::loncommon::start_page($pagetitle,undef,
                                                   {bread_crumbs=>$brcrum,crstype=>'Placement'});
     } else {
-        my $crumbsright;
+        my ($crumbsright,$crumbs_style);
         unless (($norolelist) && ((split(/:/,$env{'user.error.msg'}))[2])) {
-            $funcs = &get_roles_functions($showcount,$cattype);
+            $funcs = &get_roles_functions($showcount,$cattype,$domdefs{'userapprovals'});
             if ($env{'browser.mobile'}) {
                 $crumbsright = $funcs;
                 undef($funcs);
+                $crumbs_style = 'overflow: visible;';
             }
         }
         $start_page=&Apache::loncommon::start_page($pagetitle,undef,{bread_crumbs=>$brcrum,
-                                                                     bread_crumbs_component=>$crumbsright});
+                                                                     bread_crumbs_component=>$crumbsright,
+                                                                     bread_crumbs_style=>$crumbs_style,});
     }
     &js_escape(\$standby);
     my $noscript='<br /><span class="LC_error">'.&mt('Use of LON-CAPA requires Javascript to be enabled in your web browser.').'<br />'.&mt('As this is not the case, most functionality in the system will be unavailable.').'</span><br />';
@@ -1262,7 +1279,11 @@ function enterrole (thisform,rolecode,bu
 }
 
 function rolesView (caller) {
-    if ((caller == 'showall') || (caller == 'noshowall')) {
+    if (caller == 'approvals') {
+        document.rolechoice.approvals.value = 'show';
+    } else if (caller == 'noapprovals') {
+        document.rolechoice.approvals.value = 'hide';
+    } else if ((caller == 'showall') || (caller == 'noshowall')) {
         document.rolechoice.display.value = caller;
     } else {
         if ((caller == 'doupdate') || (caller == 'requestauthor') ||
@@ -1358,22 +1379,31 @@ ENDHEADER
             }
             if ($hotlist) {
                 $showresult .= $hotlist;
-            } 
+            }
             $showresult .= '</div>';
             $r->print($showresult);
         } elsif ($env{'form.state'} eq 'queued') {
             $r->print(&get_queued());
+        } elsif ($env{'form.approvals'} eq 'show') {
+            if ($env{'form.state'} eq 'done') {
+                $r->print($approvalresult).'<br />';
+            }
+            $r->print('<div class="LC_left_float"><fieldset><legend>'.&mt('Role assignments queued pending your acceptance').'</legend>'.
+                     &get_approvals().
+                     '</fieldset></div><br clear="all" />');
         }
         if (($ENV{'REDIRECT_QUERY_STRING'}) && ($fn)) {
     	    $fn.='?'.$ENV{'REDIRECT_QUERY_STRING'};
         }
         my $display = ($env{'form.display'} =~ /^(showall)$/);
+        my $approvals = ($env{'form.approvals'} =~ /^(show)$/);
         $r->print('<form method="post" name="rolechoice" action="'.(($fn)?$fn:$r->uri).'">');
         $r->print('<input type="hidden" name="orgurl" value="'.$fn.'" />');
         $r->print('<input type="hidden" name="selectrole" value="1" />');
         $r->print('<input type="hidden" name="newrole" value="" />');
         $r->print('<input type="hidden" name="display" value="'.$display.'" />');
         $r->print('<input type="hidden" name="state" value="" />');
+        $r->print('<input type="hidden" name="approvals" value="'.$approvals.'" />');
         if ($blocked_by_ip) {
             my $blocked_role = 'student';
             if ($blocked_type eq 'Community') {
@@ -1773,9 +1803,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 '') {
@@ -2217,7 +2247,7 @@ sub build_roletext {
                         $trolecode."','".$buttonname.'\');" /></td>';
         }
     }
-    if (($trolecode !~ m/^(dc|ca|au|aa)\./)  && (!$skipcal)) {
+    if (($trolecode !~ m/^(ca|aa)\./) && ($trest ne '') && (!$skipcal)) {
 	$tremark.=&Apache::lonannounce::showday(time,1,
 			 &Apache::lonannounce::readcalendar($tdom.'_'.$trest));
     }
@@ -2676,6 +2706,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);
+                        }
                     }
                 }
             }
@@ -3357,7 +3403,7 @@ sub is_active_course {
 }
 
 sub get_roles_functions {
-    my ($rolescount,$cattype) = @_;
+    my ($rolescount,$cattype,$userapprovals) = @_;
     my @links;
     push(@links,["javascript:rolesView('doupdate');",'start-here-22x22',&mt('Check for changes')]);
     if ($env{'environment.canrequest.author'}) {
@@ -3386,6 +3432,13 @@ sub get_roles_functions {
     unless ($cattype eq 'none') {
         push(@links,['/adm/coursecatalog','ccat-22x22',&mt('Course catalog')]);
     }
+    if ($userapprovals) {
+        if ($env{'form.approvals'} eq 'show') {
+            push(@links,["javascript:rolesView('noapprovals');",'list-add-22x22',&mt('Hide pending')]);
+        } else {
+            push(@links,["javascript:rolesView('approvals');",'list-add-22x22',&mt('Show pending')]);
+        }
+    }
     my $funcs;
     if ($env{'browser.mobile'}) {
         my @functions;
@@ -3489,15 +3542,23 @@ sub get_queued {
     unless ($output) {
         if ($env{'environment.canrequest.author'} || $env{'environment.canrequest.official'} ||
             $env{'environment.canrequest.unofficial'} || $env{'environment.canrequest.community'}) {
-            $output = &mt('No requests for courses, communities or authoring currently queued');
+            $output = '<span class="LC_info">'.
+                      &mt('No requests for courses, communities or authoring currently queued').
+                      '</span>';
         } else {
-            $output = &mt('No enrollment requests currently queued awaiting approval');
+            $output = '<span class="LC_info">'.
+                      &mt('No enrollment requests currently queued awaiting approval').
+                      '</span>';
         }
     }
     return '<div class="LC_left_float"><fieldset><legend>'.&mt('Queued requests').'</legend>'.
            $output.'</fieldset></div><br clear="all" />';
 }
 
+sub get_approvals {
+    return &Apache::loncoursequeueadmin::display_queued_requests('othdomaction',$env{'user.domain'},'','user');
+}
+
 sub process_lti {
     my ($r,$cdom,$cnum) = @_;
     my %lti = &Apache::lonnet::get_domain_lti($cdom,'provider');
@@ -3604,6 +3665,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__