--- loncom/interface/lonrequestcourse.pm	2020/07/17 20:39:55	1.95.2.2.2.1
+++ loncom/interface/lonrequestcourse.pm	2021/03/07 00:53:35	1.95.2.5.2.2
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Request a course
 #
-# $Id: lonrequestcourse.pm,v 1.95.2.2.2.1 2020/07/17 20:39:55 raeburn Exp $
+# $Id: lonrequestcourse.pm,v 1.95.2.5.2.2 2021/03/07 00:53:35 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -119,6 +119,10 @@ use Apache::loncoursequeueadmin;
 use Apache::lonuserutils;
 use LONCAPA qw(:DEFAULT :match);
 
+my $registered_flush;
+my $registered_instcats;
+my $modified_dom;
+
 sub handler {
     my ($r) = @_;
     &Apache::loncommon::content_type($r,'text/html');
@@ -127,6 +131,10 @@ sub handler {
         return OK;
     }
 
+    $registered_flush = 0;
+    $registered_instcats = 0;
+    $modified_dom = '';
+
     &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
         ['action','showdom','cnum','state','crstype','queue','tabs']);
     &Apache::lonhtmlcommon::clear_breadcrumbs();
@@ -2388,7 +2396,7 @@ sub print_cancel_request {
                       &Apache::loncommon::start_data_table_row().
                       '<td>'.$history{details}{'cdescr'}.'</td><td>'.
                       &Apache::lonlocal::locallocaltime($timestamp).'</td>'.
-                      '<td>'.$showtype.'</td>'.
+                      '<td>'.&mt($showtype).'</td>'.
                       &Apache::loncommon::end_data_table_row().
                       &Apache::loncommon::end_data_table().
                       '<br /><div class="LC_warning">';
@@ -2742,7 +2750,7 @@ sub requestlog_display_filter {
                         $typename = $typenames->{$crstype};
                     }
                 }
-                $output .= '<option value="'.$crstype.'"'.$selstr.'>'.$typename.'</option>'."\n";
+                $output .= '<option value="'.$crstype.'"'.$selstr.'>'.&mt($typename).'</option>'."\n";
             }
             $output .= '</select></td>';
         }
@@ -3257,7 +3265,7 @@ sub coursecode_form {
         }
         if (@{$codetitles} > 0) {
             my $lastitem = pop(@{$codetitles});
-            my $lastinput = '<input type="text" size="5" name="'.$sel.'_'.                                            $lastitem.'" />';
+            my $lastinput = '<input type="text" size="5" name="'.$sel.'_'.$lastitem.'" />';
             if (@{$codetitles} > 0) {
                 my $helplink;
                 if (defined($helpitem{$context})) {
@@ -3891,6 +3899,24 @@ sub process_request {
                     $output .= '</p>'."\n";
                 }
                 $creationresult = 'created';
+                # Flush the course logs so reverse user roles immediately updated
+                unless ($registered_flush) {
+                    my $handlers = $r->get_handlers('PerlCleanupHandler');
+                    $r->set_handlers('PerlCleanupHandler' => [\&Apache::lonnet::flushcourselogs,@{$handlers}]);
+                    $registered_flush=1;
+                }
+                if ($instcode ne '') {
+                    &Apache::lonnet::devalidate_cache_new('instcats',$dom);
+                    # Update cache of self-cataloging courses on institution's server(s).
+                    if (&Apache::lonnet::shared_institution($dom)) {
+                        unless ($registered_instcats) {
+                            my $handlers = $r->get_handlers('PerlCleanupHandler');
+                            $r->set_handlers('PerlCleanupHandler' => [\&devalidate_remote_instcats,@{$handlers}]);
+                            $registered_instcats=1;
+                            $modified_dom = $dom;
+                        }
+                    }
+                }
             } else {
                 $output = '<span class="LC_error">';
                 if ($crstype eq 'community') {
@@ -4026,6 +4052,22 @@ sub process_request {
     }
 }
 
+sub devalidate_remote_instcats {
+    if ($modified_dom ne '') {
+        my %servers = &Apache::lonnet::internet_dom_servers($modified_dom);
+        my %thismachine;
+        map { $thismachine{$_} = 1; } &Apache::lonnet::current_machine_ids();
+        if (keys(%servers)) {
+            foreach my $server (keys(%servers)) {
+                next if ($thismachine{$server});
+                &Apache::lonnet::remote_devalidate_cache($server,['instcats:'.$modified_dom]);
+            }
+        }
+        $modified_dom = '';
+    }
+    return;
+}
+
 sub custom_formitems {
     my ($preprocess,$customhash) = @_;
     return unless ((ref($preprocess) eq 'HASH') && (ref($customhash) eq 'HASH'));  
@@ -4334,9 +4376,10 @@ sub pending_validation_form {
                         $buttontext = &mt('Create course');
                     }
                 }
+                my $hostname = &Apache::lonnet::hostname($lonhost);
                 my $protocol = $Apache::lonnet::protocol{$lonhost};
                 $protocol = 'http' if ($protocol ne 'https');
-                my $crscreator = $protocol.'://'.&Apache::lonnet::hostname($lonhost).'/cgi-bin/createpending.pl';
+                my $crscreator = $protocol.'://'.$hostname.'/cgi-bin/createpending.pl';
                 $output .= '<input type="hidden" name="crscreator" value="'.$crscreator.'" />'."\n".
                            '<input type="hidden" name="token" value="'.$token.'" />'."\n".
                            '<input type="submit" name="validate" value="'.$buttontext.'" />'."\n".
@@ -4412,7 +4455,7 @@ sub retrieve_settings {
             }
             $env{'form.datemode'} = $reqinfo{'datemode'};
             $env{'form.dateshift'} = $reqinfo{'dateshift'};
-            $env{'form.tinyurls'} = $reqinfo{'tinyurls'};
+            $env{'form.tinyurls'} = $reqinfo{'tinyurls'}; 
             if ($reqinfo{'crstype'} eq 'official') {
                 $env{'form.autoadds'} = $reqinfo{'autoadds'};
                 $env{'form.autodrops'} = $reqinfo{'autodrops'};