--- loncom/publisher/lonpublisher.pm	2023/07/14 20:16:04	1.302
+++ loncom/publisher/lonpublisher.pm	2024/06/01 22:25:23	1.304
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Publication Handler
 #
-# $Id: lonpublisher.pm,v 1.302 2023/07/14 20:16:04 raeburn Exp $
+# $Id: lonpublisher.pm,v 1.304 2024/06/01 22:25:23 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -2129,11 +2129,7 @@ sub phasetwo {
 
 # ------------------------------------------------------------- Trigger updates
     push(@{$modified_urls},[$target,$source]);
-    unless ($registered_cleanup) {
-        my $handlers = $r->get_handlers('PerlCleanupHandler');
-        $r->set_handlers('PerlCleanupHandler' => [\&notify,@{$handlers}]);
-	$registered_cleanup=1;
-    }
+    &notify_in_cleanup($r);
 
 # ---------------------------------------------------------- Clear local caches
     my $thisdistarget=$target;
@@ -2189,6 +2185,15 @@ sub phasetwo {
     }
 }
 
+sub notify_in_cleanup {
+    my ($r) = @_;
+    unless ($registered_cleanup) {
+        my $handlers = $r->get_handlers('PerlCleanupHandler');
+        $r->set_handlers('PerlCleanupHandler' => [\&notify,@{$handlers}]);
+        $registered_cleanup=1;
+    }
+}
+
 # =============================================================== Notifications
 sub notify {  
 # --------------------------------------------------- Send update notifications
@@ -2288,7 +2293,7 @@ sub batchpublish {
 #########################################
 
 sub publishdirectory {
-    my ($r,$fn,$thisdisfn,$nokeyref)=@_;
+    my ($r,$fn,$thisdisfn,$nokeyref,$crsauthor)=@_;
     $fn=~s/\/+/\//g;
     $thisdisfn=~s/\/+/\//g;
     my $thisdisresdir=$thisdisfn;
@@ -2329,10 +2334,12 @@ sub publishdirectory {
                   &checkbox('excludemodmeta','exclude files with modified metadata').
                   '</fieldset>'.
                   '<fieldset><legend>'.&mt('Actions').'</legend>'.
-                  &checkbox('obsolete','make file(s) obsolete').'<br />'.
-                  &common_access('dist',&mt('apply common copyright/distribution'),
-                                 ['default','domain','public','custom']).'<br />'.
-                  &common_access('source',&mt('apply common source availability'),
+                  &checkbox('obsolete','make file(s) obsolete').'<br />');
+        unless ($crsauthor) {
+            $r->print(&common_access('dist',&mt('apply common copyright/distribution'),
+                                     ['default','domain','public','custom']).'<br />');
+        }
+        $r->print(&common_access('source',&mt('apply common source availability'),
                                  ['closed','open']).
                   '</fieldset>'
         );
@@ -2348,6 +2355,9 @@ sub publishdirectory {
         my %commonaccess;
         map { $commonaccess{$_} = 1; } &Apache::loncommon::get_env_multiple('form.commonaccess');
         unless ($lock) { $lock=&Apache::lonnet::set_lock(&mt('Publishing [_1]',$fn)); }
+        if ($lock) {
+            &notify_in_cleanup($r);
+        }
 # actually publish things
 	opendir(DIR,$fn);
 	my @files=sort(readdir(DIR));
@@ -2356,12 +2366,12 @@ sub publishdirectory {
 		$cuid,$cgid,$crdev,$csize,
 		$catime,$cmtime,$cctime,
 		$cblksize,$cblocks)=stat($fn.'/'.$filename);
-	    
+
 	    my $extension='';
 	    if ($filename=~/\.(\w+)$/) { $extension=$1; }
 	    if ($cmode&$dirptr) {
 		if (($filename!~/^\./) && ($env{'form.pubrec'})) {
-		    &publishdirectory($r,$fn.'/'.$filename,$thisdisfn.'/'.$filename,$nokeyref);
+		    &publishdirectory($r,$fn.'/'.$filename,$thisdisfn.'/'.$filename,$nokeyref,$crsauthor);
 		}
 	    } elsif ((&Apache::loncommon::fileembstyle($extension) ne 'hdn') &&
 		     ($filename!~/^[\#\.]/) && ($filename!~/\~$/)) {
@@ -2609,11 +2619,13 @@ sub handler {
     &Apache::lonhtmlcommon::clear_breadcrumbs();
     my $crumbtext = 'Authoring Space';
     my $crumbhref = &Apache::loncommon::authorspace($fn);
+    my $crsauthor;
     if ($env{'request.course.id'}) {
         my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
         my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
         if ($crumbhref eq "/priv/$cdom/$cnum/") {
             $crumbtext = 'Course Authoring Space';
+            $crsauthor = 1;
         }
     }
     &Apache::lonhtmlcommon::add_breadcrumb({
@@ -2688,7 +2700,7 @@ END
 
     if ($fn=~/\/$/) {
 # -------------------------------------------------------- This is a directory
-	&publishdirectory($r,$docroot.$fn,$thisdisfn,$nokeyref);
+	&publishdirectory($r,$docroot.$fn,$thisdisfn,$nokeyref,$crsauthor);
         $r->print(
             '<br /><br />'.
             &Apache::lonhtmlcommon::actionbox([