--- loncom/publisher/lonpublisher.pm	2005/04/04 23:51:54	1.190
+++ loncom/publisher/lonpublisher.pm	2005/06/29 17:46:20	1.200
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Publication Handler
 #
-# $Id: lonpublisher.pm,v 1.190 2005/04/04 23:51:54 albertel Exp $
+# $Id: lonpublisher.pm,v 1.200 2005/06/29 17:46:20 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -121,7 +121,7 @@ use HTML::LCParser;
 use Apache::lonxml;
 use Apache::loncacc;
 use DBI;
-use Apache::lonnet();
+use Apache::lonnet;
 use Apache::loncommon();
 use Apache::lonmysql;
 use Apache::lonlocal;
@@ -326,7 +326,7 @@ sub textfield {
     $value=~s/\s+$//gs;
     $value=~s/\s+/ /gs;
     $title=&mt($title);
-    $ENV{'form.'.$name}=$value;
+    $env{'form.'.$name}=$value;
     return "\n<p><font color=\"#800000\" face=\"helvetica\"><b>$title:".
            "</b></font></p><br />".
            '<input type="text" name="'.$name.'" size=80 value="'.$value.'" />';
@@ -338,7 +338,7 @@ sub text_with_browse_field {
     $value=~s/\s+$//gs;
     $value=~s/\s+/ /gs;
     $title=&mt($title);
-    $ENV{'form.'.$name}=$value;
+    $env{'form.'.$name}=$value;
     return "\n<p><font color=\"#800000\" face=\"helvetica\"><b>$title:".
            "</b></font></p><br />".
            '<input type="text" name="'.$name.'" size=80 value="'.$value.'" />'.
@@ -349,18 +349,23 @@ sub text_with_browse_field {
 
 sub hiddenfield {
     my ($name,$value)=@_;
-    $ENV{'form.'.$name}=$value;
+    $env{'form.'.$name}=$value;
     return "\n".'<input type="hidden" name="'.$name.'" value="'.$value.'" />';
 }
 
+sub checkbox {
+    my ($name,$text)=@_;
+    return "\n<br /><input type='checkbox' name='$name' /> ".&mt($text);
+}
+
 sub selectbox {
     my ($title,$name,$value,$functionref,@idlist)=@_;
     $title=&mt($title);
     $value=(split(/\s*,\s*/,$value))[-1];
     if (defined($value)) {
-	$ENV{'form.'.$name}=$value;
+	$env{'form.'.$name}=$value;
     } else {
-	$ENV{'form.'.$name}=$idlist[0];
+	$env{'form.'.$name}=$idlist[0];
     }
     my $selout="\n<p><font color=\"#800000\" face=\"helvetica\"><b>$title:".
 	'</b></font></p><br /><select name="'.$name.'">';
@@ -376,8 +381,8 @@ sub selectbox {
 
 sub select_level_form {
     my ($value,$name)=@_;
-    $ENV{'form.'.$name}=$value;
-    if (!defined($value)) { $ENV{'form.'.$name}=0; }
+    $env{'form.'.$name}=$value;
+    if (!defined($value)) { $env{'form.'.$name}=0; }
     return  &Apache::loncommon::select_level_form($value,$name);
 }
 #########################################
@@ -852,7 +857,6 @@ sub checkonthis {
     my ($r,$source)=@_;
     my $uri=&Apache::lonnet::hreflocation($source);
     $uri=~s/\/$//;
-    my ($errorcount,$warningcount);
     my $result=&Apache::lonnet::ssi_body($uri,
 					 ('grade_target'=>'web',
 					  'return_only_error_and_warning_counts' => 1));
@@ -929,7 +933,7 @@ sub publish {
 	return ('<font color="red">'.&mt('No write permission to user directory, FAIL').'</font>',1);
     }
     print $logfile 
-"\n\n================= Publish ".localtime()." Phase One  ================\n".$ENV{'user.name'}.'@'.$ENV{'user.domain'}."\n";
+"\n\n================= Publish ".localtime()." Phase One  ================\n".$env{'user.name'}.'@'.$env{'user.domain'}."\n";
 
     if (($style eq 'ssi') || ($style eq 'rat') || ($style eq 'prv')) {
 # ------------------------------------------------------- This needs processing
@@ -1016,11 +1020,11 @@ sub publish {
     }
 
 # ------------------------------------------------ First, check out environment
-     unless (-e $source.'.meta') {
-        $metadatafields{'author'}=$ENV{'environment.firstname'}.' '.
-	                          $ENV{'environment.middlename'}.' '.
-		                  $ENV{'environment.lastname'}.' '.
-		                  $ENV{'environment.generation'};
+     if ((!(-e $source.'.meta')) || ($env{'form.forceoverride'})) {
+        $metadatafields{'author'}=$env{'environment.firstname'}.' '.
+	                          $env{'environment.middlename'}.' '.
+		                  $env{'environment.lastname'}.' '.
+		                  $env{'environment.generation'};
         $metadatafields{'author'}=~s/\s+/ /g;
         $metadatafields{'author'}=~s/\s+$//;
         $metadatafields{'owner'}=$cuname.'@'.$cudom;
@@ -1066,10 +1070,18 @@ sub publish {
 		delete $metadatafields{$_};
             }
         }
+# ------------------------------------------------------------- Save some stuff
+        my %savemeta=();
+        foreach ('title') {
+            $savemeta{$_}=$metadatafields{$_};
+	}
 # ------------------------------------------ See if anything new in file itself
  
 	$allmeta=&parseformeta($source,$style);
-
+# ----------------------------------------------------------- Restore the stuff
+        foreach (keys %savemeta) {
+	    $metadatafields{$_}=$savemeta{$_};
+	}
    }
 
        
@@ -1142,21 +1154,22 @@ sub publish {
 # interactive mode html goes into $intr_scrout
 # batch mode throws away this HTML
 # additionally all of the field functions have a by product of setting
-#   $ENV{'from.'..} so that it can be used by the phase two handler in
+#   $env{'from.'..} so that it can be used by the phase two handler in
 #    batch mode
 
     my $intr_scrout.=
 	'<form name="pubform" action="/adm/publish" method="post">'.
-	'<p><input type="submit" value="'.&mt('Finalize Publication').'" /></p>'.
+	'<p>'.($env{'form.makeobsolete'}?'':'<input type="submit" value="'.&mt('Finalize Publication').'" />').'</p>'.
 	&hiddenfield('phase','two').
-	&hiddenfield('filename',$ENV{'form.filename'}).
+	&hiddenfield('filename',$env{'form.filename'}).
 	&hiddenfield('allmeta',&Apache::lonnet::escape($allmeta)).
-	&hiddenfield('dependencies',join(',',keys %allow)).
+	&hiddenfield('dependencies',join(',',keys %allow));
+    unless ($env{'form.makeobsolete'}) {
+       $intr_scrout.=
 	&textfield('Title','title',$metadatafields{'title'}).
 	&textfield('Author(s)','author',$metadatafields{'author'}).
 	&textfield('Subject','subject',$metadatafields{'subject'});
-
-# --------------------------------------------------- Scan content for keywords
+ # --------------------------------------------------- Scan content for keywords
 
     my $keywords_help = Apache::loncommon::help_open_topic("Publishing_Keywords");
     my $KEYWORDS=&mt('Keywords');
@@ -1189,11 +1202,11 @@ END
 	if ($metadatafields{'keywords'}) {
 	    if ($metadatafields{'keywords'}=~/\Q$_\E/) {
 		$keywordout.=' checked="on"';
-		$ENV{'form.keywords'}.=$_.',';
+		$env{'form.keywords'}.=$_.',';
 	    }
 	} elsif (&Apache::loncommon::keyword($_)) {
 	    $keywordout.=' checked="on"';
-	    $ENV{'form.keywords'}.=$_.',';
+	    $env{'form.keywords'}.=$_.',';
 	}
 	$keywordout.=' />'.$_.'</label></td>';
 	if ($colcount>10) {
@@ -1202,7 +1215,7 @@ END
 	}
 	$colcount++;
     }
-    $ENV{'form.keywords'}=~s/\,$//;
+    $env{'form.keywords'}=~s/\,$//;
 
     $keywordout.='</tr></table>';
 
@@ -1296,7 +1309,7 @@ END
 				 $defaultsourceoption,
 				 \&Apache::loncommon::source_copyrightdescription,
 				 (&Apache::loncommon::source_copyrightids));
-	$intr_scrout.=&text_with_browse_field('Source Custom Distribution File','sourcerights',$metadatafields{'sourcerights'},'rights');
+#	$intr_scrout.=&text_with_browse_field('Source Custom Distribution File','sourcerights',$metadatafields{'sourcerights'},'rights');
 	my $uctitle=&mt('Obsolete');
 	$intr_scrout.=
 	    "\n<p><font color=\"#800000\" face=\"helvetica\"><b>$uctitle:".
@@ -1311,9 +1324,33 @@ END
     } else {
 	$intr_scrout.=&hiddenfield('copyright','private');
     }
+   } else {
+       $intr_scrout.=
+	&hiddenfield('title',$metadatafields{'title'}).
+	&hiddenfield('author',$metadatafields{'author'}).
+	&hiddenfield('subject',$metadatafields{'subject'}).
+	&hiddenfield('keywords',$metadatafields{'keywords'}).
+	&hiddenfield('abstract',$metadatafields{'abstract'}).
+	&hiddenfield('notes',$metadatafields{'notes'}).
+	&hiddenfield('mime',$metadatafields{'mime'}).
+	&hiddenfield('creationdate',$metadatafields{'creationdate'}).
+	&hiddenfield('lastrevisiondate',time).
+	&hiddenfield('owner',$metadatafields{'owner'}).
+	&hiddenfield('lowestgradelevel',$metadatafields{'lowestgradelevel'}).
+	&hiddenfield('standards',$metadatafields{'standards'}).
+	&hiddenfield('highestgradelevel',$metadatafields{'highestgradelevel'}).
+	&hiddenfield('language',$metadatafields{'language'}).
+	&hiddenfield('copyright',$metadatafields{'copyright'}).
+	&hiddenfield('sourceavail',$metadatafields{'sourceavail'}).
+	&hiddenfield('customdistributionfile',$metadatafields{'customdistributionfile'}).
+	&hiddenfield('obsolete',1).
+	&text_with_browse_field('Suggested Replacement for Obsolete File',
+				    'obsoletereplacement',
+				    $metadatafields{'obsoletereplacement'});
+   }
     if (!$batch) {
 	$scrout.=$intr_scrout.'<p><input type="submit" value="'.
-	    &mt('Finalize Publication').'" /></p></form>';
+	    &mt($env{'form.makeobsolete'}?'Make Obsolete':'Finalize Publication').'" /></p></form>';
     }
     return($scrout,0);
 }
@@ -1346,10 +1383,10 @@ Returns:
 
 =over 4
 
-=item Scalar string
+=item integer
 
-String contains status (errors and warnings) and information associated with
-the server's attempts at publication.     
+0: fail
+1: success
 
 =cut
 
@@ -1361,13 +1398,29 @@ sub phasetwo {
     my ($r,$source,$target,$style,$distarget,$batch)=@_;
     $source=~s/\/+/\//g;
     $target=~s/\/+/\//g;
-
-    if ($target=~/\_\_\_/) {
-	$r->print(
- '<font color="red">'.&mt('Unsupported character combination').
-		  ' "<tt>___</tt>" '.&mt('in filename, FAIL').'</font>');
-        return 0;
+#
+# Unless trying to get rid of something, check name validity
+#
+    unless ($env{'form.obsolete'}) {
+	if ($target=~/(\_\_\_|\&\&\&|\:\:\:)/) {
+	    $r->print(
+		      '<font color="red">'.&mt('Unsupported character combination').
+		      ' "<tt>'.$1.'</tt>" '.&mt('in filename, FAIL').'</font>');
+	    return 0;
+	}
+	unless ($target=~/\.(\w+)$/) {
+	    $r->print('<font color="red">'.&mt('No valid extension found in filename, FAIL').'</font>');
+	    return 0;
+	}
+	if ($target=~/\.(\d+)\.(\w+)$/) {
+	    $r->print('<font color="red">'.&mt('Cannot publish versioned resource, FAIL').'</font>');
+	    return 0;
+	}
     }
+
+#
+# End name check
+#
     $distarget=~s/\/+/\//g;
     my $logfile;
     unless ($logfile=Apache::File->new('>>'.$source.'.log')) {
@@ -1377,44 +1430,44 @@ sub phasetwo {
         return 0;
     }
     print $logfile 
-        "\n================= Publish ".localtime()." Phase Two  ================\n".$ENV{'user.name'}.'@'.$ENV{'user.domain'}."\n";
+        "\n================= Publish ".localtime()." Phase Two  ================\n".$env{'user.name'}.'@'.$env{'user.domain'}."\n";
     
     %metadatafields=();
     %metadatakeys=();
 
-    &metaeval(&Apache::lonnet::unescape($ENV{'form.allmeta'}));
+    &metaeval(&Apache::lonnet::unescape($env{'form.allmeta'}));
     
-    $metadatafields{'title'}=$ENV{'form.title'};
-    $metadatafields{'author'}=$ENV{'form.author'};
-    $metadatafields{'subject'}=$ENV{'form.subject'};
-    $metadatafields{'notes'}=$ENV{'form.notes'};
-    $metadatafields{'abstract'}=$ENV{'form.abstract'};
-    $metadatafields{'mime'}=$ENV{'form.mime'};
-    $metadatafields{'language'}=$ENV{'form.language'};
-    $metadatafields{'creationdate'}=$ENV{'form.creationdate'};
-    $metadatafields{'lastrevisiondate'}=$ENV{'form.lastrevisiondate'};
-    $metadatafields{'owner'}=$ENV{'form.owner'};
-    $metadatafields{'copyright'}=$ENV{'form.copyright'};
-    $metadatafields{'standards'}=$ENV{'form.standards'};
-    $metadatafields{'lowestgradelevel'}=$ENV{'form.lowestgradelevel'};
-    $metadatafields{'highestgradelevel'}=$ENV{'form.highestgradelevel'};
+    $metadatafields{'title'}=$env{'form.title'};
+    $metadatafields{'author'}=$env{'form.author'};
+    $metadatafields{'subject'}=$env{'form.subject'};
+    $metadatafields{'notes'}=$env{'form.notes'};
+    $metadatafields{'abstract'}=$env{'form.abstract'};
+    $metadatafields{'mime'}=$env{'form.mime'};
+    $metadatafields{'language'}=$env{'form.language'};
+    $metadatafields{'creationdate'}=$env{'form.creationdate'};
+    $metadatafields{'lastrevisiondate'}=$env{'form.lastrevisiondate'};
+    $metadatafields{'owner'}=$env{'form.owner'};
+    $metadatafields{'copyright'}=$env{'form.copyright'};
+    $metadatafields{'standards'}=$env{'form.standards'};
+    $metadatafields{'lowestgradelevel'}=$env{'form.lowestgradelevel'};
+    $metadatafields{'highestgradelevel'}=$env{'form.highestgradelevel'};
     $metadatafields{'customdistributionfile'}=
-                                 $ENV{'form.customdistributionfile'};
-    $metadatafields{'sourceavail'}=$ENV{'form.sourceavail'};
-    $metadatafields{'obsolete'}=$ENV{'form.obsolete'};
+                                 $env{'form.customdistributionfile'};
+    $metadatafields{'sourceavail'}=$env{'form.sourceavail'};
+    $metadatafields{'obsolete'}=$env{'form.obsolete'};
     $metadatafields{'obsoletereplacement'}=
-	                        $ENV{'form.obsoletereplacement'};
-    $metadatafields{'dependencies'}=$ENV{'form.dependencies'};
-    $metadatafields{'modifyinguser'}=$ENV{'user.name'}.'@'.
-	                                 $ENV{'user.domain'};
+	                        $env{'form.obsoletereplacement'};
+    $metadatafields{'dependencies'}=$env{'form.dependencies'};
+    $metadatafields{'modifyinguser'}=$env{'user.name'}.'@'.
+	                                 $env{'user.domain'};
     $metadatafields{'authorspace'}=$cuname.'@'.$cudom;
     
-    my $allkeywords=$ENV{'form.addkey'};
-    if (exists($ENV{'form.keywords'})) {
-        if (ref($ENV{'form.keywords'})) {
-            $allkeywords .= ','.join(',',@{$ENV{'form.keywords'}});
+    my $allkeywords=$env{'form.addkey'};
+    if (exists($env{'form.keywords'})) {
+        if (ref($env{'form.keywords'})) {
+            $allkeywords .= ','.join(',',@{$env{'form.keywords'}});
         } else {
-            $allkeywords .= ','.$ENV{'form.keywords'};
+            $allkeywords .= ','.$env{'form.keywords'};
         }
     }
     $allkeywords=~s/[\"\']//g;
@@ -1428,18 +1481,20 @@ sub phasetwo {
     if ($metadatafields{'copyright'} eq 'custom') {
 	my $file=$metadatafields{'customdistributionfile'};
 	unless ($file=~/\.rights$/) {
-            return 
+            $r->print(
                 '<font color="red">'.&mt('No valid custom distribution rights file specified, FAIL').
-		'</font>';
+		'</font>');
+	    return 0;
         }
     }
     {
         print $logfile "\nWrite metadata file for ".$source;
         my $mfh;
         unless ($mfh=Apache::File->new('>'.$source.'.meta')) {
-            return 
+            $r->print( 
                 '<font color="red">'.&mt('Could not write metadata, FAIL').
-		'</font>';
+		'</font>');
+	    return 0;
         }
         foreach (sort keys %metadatafields) {
             unless ($_=~/\./) {
@@ -1490,7 +1545,9 @@ sub phasetwo {
         my $srcd=$1;
         unless ($srcd=~/^\/home\/httpd\/html\/res/) {
             print $logfile "\nPANIC: Target dir is ".$srcd;
-            return "<font color=\"red\">Invalid target directory, FAIL</font>";
+            $r->print(
+	 "<font color=\"red\">Invalid target directory, FAIL</font>");
+	    return 0;
         }
         opendir(DIR,$srcd);
         while ($filename=readdir(DIR)) {
@@ -1515,8 +1572,9 @@ sub phasetwo {
             $r->print('<p>'.&mt('Copied old target file').'</p>');
         } else {
 	    print $logfile "Unable to write ".$copyfile.':'.$!."\n";
-            return "<font color=\"red\">".&mt('Failed to copy old target').
-		", $!, ".&mt('FAIL')."</font>";
+            $r->print("<font color=\"red\">".&mt('Failed to copy old target').
+		", $!, ".&mt('FAIL')."</font>");
+	    return 0;
         }
         
 # --------------------------------------------------------------- Copy Metadata
@@ -1529,9 +1587,10 @@ sub phasetwo {
         } else {
 	    print $logfile "Unable to write metadata ".$copyfile.':'.$!."\n";
             if (-e $target.'.meta') {
-                return 
+                $r->print( 
                     "<font color=\"red\">".
-&mt('Failed to write old metadata copy').", $!, ".&mt('FAIL')."</font>";
+&mt('Failed to write old metadata copy').", $!, ".&mt('FAIL')."</font>");
+		return 0;
 	    }
         }
         
@@ -1562,8 +1621,9 @@ sub phasetwo {
         $r->print('<p>'.&mt('Copied source file').'</p>');
     } else {
         print $logfile "\nUnable to write ".$copyfile.':'.$!."\n";
-        return "<font color=\"red\">".
-	    &mt('Failed to copy source').", $!, ".&mt('FAIL')."</font>";
+        $r->print("<font color=\"red\">".
+	    &mt('Failed to copy source').", $!, ".&mt('FAIL')."</font>");
+	return 0;
     }
     
 # --------------------------------------------------------------- Copy Metadata
@@ -1575,8 +1635,9 @@ sub phasetwo {
         $r->print('<p>'.&mt('Copied metadata').'</p>');
     } else {
         print $logfile "\nUnable to write metadata ".$copyfile.':'.$!."\n";
-        return 
-            "<font color=\"red\">".&mt('Failed to write metadata copy').", $!, ".&mt('FAIL')."</font>";
+        $r->print(
+            "<font color=\"red\">".&mt('Failed to write metadata copy').", $!, ".&mt('FAIL')."</font>");
+	return 0;
     }
     $r->rflush;
 
@@ -1586,10 +1647,16 @@ sub phasetwo {
 	$r->register_cleanup(\&notify);
 	$registered_cleanup=1;
     }
+
+# ---------------------------------------------------------- Clear local caches
+    my $thisdistarget=$target;
+    $thisdistarget=~s/^\Q$docroot\E//;
+    &Apache::lonnet::devalidate_cache_new('resversion',$target);
+    &Apache::lonnet::devalidate_cache_new('meta',
+			 &Apache::lonnet::declutter($thisdistarget));
+
 # ------------------------------------------------ Provide link to new resource
     unless ($batch) {
-        my $thisdistarget=$target;
-        $thisdistarget=~s/^\Q$docroot\E//;
         
         my $thissrc=$source;
         $thissrc=~s/^\/home\/(\w+)\/public_html/\/priv\/$1/;
@@ -1608,7 +1675,8 @@ sub phasetwo {
 		  &mt('Back to Source Directory').'</font></a></p>');
     }
     $logfile->close();
-    return '<p><font color="green">'.&mt('Done').'</font></p>';
+    $r->print('<p><font color="green">'.&mt('Done').'</font></p>');
+    return 1;
 }
 
 # =============================================================== Notifications
@@ -1652,8 +1720,8 @@ sub notify {
 
 sub batchpublish {
     my ($r,$srcfile,$targetfile)=@_;
-    #publication pollutes %ENV with form.* values
-    my %oldENV=%ENV;
+    #publication pollutes %env with form.* values
+    my %oldenv=%env;
     $srcfile=~s/\/+/\//g;
     $targetfile=~s/\/+/\//g;
     my $thisdisfn=$srcfile;
@@ -1681,13 +1749,13 @@ sub batchpublish {
     $r->print('<p>'.$outstring.'</p>');
 # phase two takes
 # my ($source,$target,$style,$distarget,batch)=@_;
-# $ENV{'form.allmeta'},$ENV{'form.title'},$ENV{'form.author'},...
+# $env{'form.allmeta'},$env{'form.title'},$env{'form.author'},...
     if (!$error) {
 	$r->print('<p>');
 	&phasetwo($r,$srcfile,$targetfile,$thisembstyle,$thisdistarget,1);
 	$r->print('</p>');
     }
-    %ENV=%oldENV;
+    %env=%oldenv;
     return '';
 }
 
@@ -1704,47 +1772,59 @@ sub publishdirectory {
 	      &mt('Target').': <tt>'.$resdir.'</tt><br />');
 
     my $dirptr=16384;		# Mask indicating a directory in stat.cmode.
-
-    opendir(DIR,$fn);
-    my @files=sort(readdir(DIR));
-    foreach my $filename (@files) {
-	my ($cdev,$cino,$cmode,$cnlink,
-            $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);
-	    }
-	} elsif ((&Apache::loncommon::fileembstyle($extension) ne 'hdn') &&
-		 ($filename!~/^[\#\.]/) && ($filename!~/\~$/)) {
+    unless ($env{'form.phase'} eq 'two') {
+# ask user what they want
+        $r->print('<form name="pubdirpref" method="post">'.
+		  &hiddenfield('phase','two').
+		  &hiddenfield('filename',$env{'form.filename'}).
+		  &checkbox('pubrec','include subdirectories').
+		  &checkbox('forcerepub','force republication of previously published files').
+                  &checkbox('forceobsolete','make file(s) obsolete').
+		  &checkbox('forceoverride','force directory level catalog information over existing').
+		  '<br /><input type="submit" value="'.&mt('Publish Directory').'" /></form>');
+    } else {
+# actually publish things
+	opendir(DIR,$fn);
+	my @files=sort(readdir(DIR));
+	foreach my $filename (@files) {
+	    my ($cdev,$cino,$cmode,$cnlink,
+		$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);
+		}
+	    } elsif ((&Apache::loncommon::fileembstyle($extension) ne 'hdn') &&
+		     ($filename!~/^[\#\.]/) && ($filename!~/\~$/)) {
 # find out publication status and/or exiting metadata
-	    my $publishthis=0;
-	    if (-e $resdir.'/'.$filename) {
-	        my ($rdev,$rino,$rmode,$rnlink,
-		    $ruid,$rgid,$rrdev,$rsize,
-		    $ratime,$rmtime,$rctime,
-		    $rblksize,$rblocks)=stat($resdir.'/'.$filename);
-	        if (($rmtime<$cmtime) || ($ENV{'form.forcerepub'} eq 'ON')) {
+		my $publishthis=0;
+		if (-e $resdir.'/'.$filename) {
+		    my ($rdev,$rino,$rmode,$rnlink,
+			$ruid,$rgid,$rrdev,$rsize,
+			$ratime,$rmtime,$rctime,
+			$rblksize,$rblocks)=stat($resdir.'/'.$filename);
+		    if (($rmtime<$cmtime) || ($env{'form.forcerepub'})) {
 # previously published, modified now
-		    $publishthis=1;
-                }
-	    } else {
+			$publishthis=1;
+		    }
+		} else {
 # never published
-		$publishthis=1;
-	    }
-	    if ($publishthis) {
-                &batchpublish($r,$fn.'/'.$filename,$resdir.'/'.$filename);
-	    } else {
-		$r->print('<br />'.&mt('Skipping').' '.$filename.'<br />');
+		    $publishthis=1;
+		}
+		if ($publishthis) {
+		    &batchpublish($r,$fn.'/'.$filename,$resdir.'/'.$filename);
+		} else {
+		    $r->print('<br />'.&mt('Skipping').' '.$filename.'<br />');
+		}
+		$r->rflush();
 	    }
-	    $r->rflush();
 	}
+	closedir(DIR);
     }
-    closedir(DIR);
 }
 
 #########################################
@@ -1862,7 +1942,7 @@ sub handler {
     @{$modified_urls}=();
 # -------------------------------------------------------------- Check filename
 
-    my $fn=&Apache::lonnet::unescape($ENV{'form.filename'});
+    my $fn=&Apache::lonnet::unescape($env{'form.filename'});
 
     ($cuname,$cudom)=
 	&Apache::loncacc::constructaccess($fn,$r->dir_config('lonDefDomain'));
@@ -1881,7 +1961,7 @@ sub handler {
 
     unless (($cuname) && ($cudom)) {
 	$r->log_reason($cuname.' at '.$cudom.
-		       ' trying to publish file '.$ENV{'form.filename'}.
+		       ' trying to publish file '.$env{'form.filename'}.
 		       ' ('.$fn.') - not authorized', 
 		       $r->filename); 
 	return HTTP_NOT_ACCEPTABLE;
@@ -1893,7 +1973,7 @@ sub handler {
     foreach my $id (@ids) { if ($id eq $home) { $allowed = 1; }  }
     unless ($allowed) {
 	$r->log_reason($cuname.' at '.$cudom.
-		       ' trying to publish file '.$ENV{'form.filename'}.
+		       ' trying to publish file '.$env{'form.filename'}.
 		       ' ('.$fn.') - not homeserver ('.$home.')', 
 		       $r->filename); 
 	return HTTP_NOT_ACCEPTABLE;
@@ -1907,7 +1987,7 @@ sub handler {
     if ($1 ne $cuname) {
 	$r->log_reason($cuname.' at '.$cudom.
 		       ' trying to publish unowned file '.
-		       $ENV{'form.filename'}.' ('.$fn.')', 
+		       $env{'form.filename'}.' ('.$fn.')', 
 		       $r->filename); 
 	return HTTP_NOT_ACCEPTABLE;
     } else {
@@ -1918,12 +1998,12 @@ sub handler {
     unless (-e $fn) { 
 	$r->log_reason($cuname.' at '.$cudom.
 		       ' trying to publish non-existing file '.
-		       $ENV{'form.filename'}.' ('.$fn.')', 
+		       $env{'form.filename'}.' ('.$fn.')', 
 		       $r->filename); 
 	return HTTP_NOT_FOUND;
     } 
 
-    unless ($ENV{'form.phase'} eq 'two') {
+    unless ($env{'form.phase'} eq 'two') {
 
 # -------------------------------- File is there and owned, init lookup tables.
 
@@ -1977,7 +2057,7 @@ sub handler {
     if ($fn=~/\/$/) {
 # -------------------------------------------------------- This is a directory
 	&publishdirectory($r,$fn,$thisdisfn);
-	$r->print('<hr><font size="+2">'.&mt('Done').'</font><br><a href="/priv/'
+	$r->print('<hr /><a href="/priv/'
 		  .$cuname.'/'.$thisdisfn
 		  .'">'.&mt('Return to Directory').'</a>');
 
@@ -1987,6 +2067,7 @@ sub handler {
 	$thisfn=~/\.(\w+)$/;
 	my $thistype=$1;
 	my $thisembstyle=&Apache::loncommon::fileembstyle($thistype);
+        if ($thistype eq 'page') {  $thisembstyle = 'rat'; }
 	$r->print('<h2>'.&mt('Publishing').' '.
 		  &Apache::loncommon::filedescription($thistype).' <tt>');
 
@@ -1997,7 +2078,7 @@ ENDCAPTION
         $r->print('</tt></h2><b>'.&mt('Target').':</b> <tt>'.
 		  $thisdistarget.'</tt><br />');
    
-	if (($cuname ne $ENV{'user.name'})||($cudom ne $ENV{'user.domain'})) {
+	if (($cuname ne $env{'user.name'})||($cudom ne $env{'user.domain'})) {
 	    $r->print('<h3><font color="red">'.&mt('Co-Author').': '.
 		      $cuname.&mt(' at ').$cudom.'</font></h3>');
 	}
@@ -2012,7 +2093,7 @@ ENDDIFF
   
 # ------------------ Publishing from $thisfn to $thistarget with $thisembstyle.
 
-	unless ($ENV{'form.phase'} eq 'two') {
+	unless ($env{'form.phase'} eq 'two') {
 # ---------------------------------------------------------- Parse for problems
 	    my ($warningcount,$errorcount);
 	    if ($thisembstyle eq 'ssi') {
@@ -2028,8 +2109,8 @@ ENDDIFF
 			  '</h3>');
 	    }
 	} else {
-	    $r->print('<hr />'.
-	    &phasetwo($r,$thisfn,$thistarget,$thisembstyle,$thisdistarget)); 
+	    &phasetwo($r,$thisfn,$thistarget,$thisembstyle,$thisdistarget); 
+	    $r->print('<hr />');
 	}
     }
     $r->print('</body></html>');