--- loncom/publisher/lonpublisher.pm	2002/11/06 22:36:08	1.107
+++ loncom/publisher/lonpublisher.pm	2003/07/23 19:17:27	1.126
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Publication Handler
 #
-# $Id: lonpublisher.pm,v 1.107 2002/11/06 22:36:08 albertel Exp $
+# $Id: lonpublisher.pm,v 1.126 2003/07/23 19:17:27 bowersj2 Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -33,18 +33,14 @@
 # 11/28,11/29,11/30,12/01,12/02,12/04,12/23 Gerd Kortemeyer
 # 03/23 Guy Albertelli
 # 03/24,03/29,04/03 Gerd Kortemeyer
-# 04/16/2001 Scott Harrison
 # 05/03,05/05,05/07 Gerd Kortemeyer
-# 05/28/2001 Scott Harrison
 # 06/23,08/07,08/11,8/13,8/17,8/18,8/24,9/26,10/16 Gerd Kortemeyer
 # 12/04,12/05 Guy Albertelli
 # 12/05 Gerd Kortemeyer
 # 12/05 Guy Albertelli
 # 12/06,12/07 Gerd Kortemeyer
-# 12/15,12/16 Scott Harrison
 # 12/25 Gerd Kortemeyer
 # YEAR=2002
-# 1/16,1/17 Scott Harrison
 # 1/17 Gerd Kortemeyer
 #
 ###
@@ -121,7 +117,6 @@ use File::Copy;
 use Apache::Constants qw(:common :http :methods);
 use HTML::LCParser;
 use Apache::lonxml;
-use Apache::lonhomework;
 use Apache::loncacc;
 use DBI;
 use Apache::lonnet();
@@ -195,7 +190,7 @@ sub metaeval {
               }
               if ($metadatafields{$unikey}) {
 		  my $newentry=$parser->get_text('/'.$entry);
-                  unless (($metadatafields{$unikey}=~/$newentry/) ||
+                  unless (($metadatafields{$unikey}=~/\Q$newentry\E/) ||
                           ($newentry eq '')) {
                      $metadatafields{$unikey}.=', '.$newentry;
 		  }
@@ -247,7 +242,7 @@ sub metaread {
     my ($logfile,$fn)=@_;
     unless (-e $fn) {
 	print($logfile 'No file '.$fn."\n");
-        return '<br><b>No file:</b> <tt>'.$fn.'</tt>';
+        return '<br /><b>No file:</b> <tt>'.$fn.'</tt>';
     }
     print($logfile 'Processing '.$fn."\n");
     my $metastring;
@@ -256,7 +251,7 @@ sub metaread {
      $metastring=join('',<$metafh>);
     }
     &metaeval($metastring);
-    return '<br><b>Processed file:</b> <tt>'.$fn.'</tt>';
+    return '<br /><b>Processed file:</b> <tt>'.$fn.'</tt>';
 }
 
 #########################################
@@ -309,7 +304,9 @@ string which presents the form field (fo
 #########################################
 sub textfield {
     my ($title,$name,$value)=@_;
-    return "\n<p><b>$title:</b><br>".
+    my $uctitle=uc($title);
+    return "\n<p><font color=\"#800000\" face=\"helvetica\"><b>$uctitle:".
+           "</b></font></p><br />".
            '<input type="text" name="'.$name.'" size=80 value="'.$value.'" />';
 }
 
@@ -321,8 +318,9 @@ sub hiddenfield {
 sub selectbox {
     my ($title,$name,$value,$functionref,@idlist)=@_;
     my $uctitle=uc($title);
+    $value=(split(/\s*,\s*/,$value))[-1];
     my $selout="\n<p><font color=\"#800000\" face=\"helvetica\"><b>$uctitle:".
-	"</b></font><br />".'<select name="'.$name.'">';
+	'</b></font></p><br /><select name="'.$name.'">';
     foreach (@idlist) {
         $selout.='<option value=\''.$_.'\'';
         if ($_ eq $value) {
@@ -441,7 +439,7 @@ sub get_subscribed_hosts {
     my $srcf=$2;
     opendir(DIR,$1);
     while ($filename=readdir(DIR)) {
-	if ($filename=~/$srcf\.(\w+)$/) {
+	if ($filename=~/\Q$srcf\E\.(\w+)$/) {
 	    my $subhost=$1;
 	    if (($subhost ne 'meta' && $subhost ne 'subscription') &&
                 ($subhost ne $Apache::lonnet::perlvar{'lonHostID'})) {
@@ -794,6 +792,10 @@ This is the workhorse function of this m
 backup copies, performs any automatic processing (prior to publication,
 especially for rat and ssi files),
 
+Returns a 2 element array, the first is the string to be shown to the
+user, the second is an error code, either 1 (an error occured) or 0
+(no error occurred)
+
 I<Additional documentation needed.>
 
 =cut
@@ -810,13 +812,12 @@ sub publish {
     my %allow=();
 
     unless ($logfile=Apache::File->new('>>'.$source.'.log')) {
-	return 
-         '<font color=red>No write permission to user directory, FAIL</font>';
+	return ('<font color="red">No write permission to user directory, FAIL</font>',1);
     }
     print $logfile 
-"\n\n================= Publish ".localtime()." Phase One  ================\n";
+"\n\n================= Publish ".localtime()." Phase One  ================\n".$ENV{'user.name'}.'@'.$ENV{'user.domain'}."\n";
 
-    if (($style eq 'ssi') || ($style eq 'rat')) {
+    if (($style eq 'ssi') || ($style eq 'rat') || ($style eq 'prv')) {
 # ------------------------------------------------------- This needs processing
 
 # ----------------------------------------------------------------- Backup Copy
@@ -825,14 +826,14 @@ sub publish {
 	    print $logfile "Copied original file to ".$copyfile."\n";
         } else {
 	    print $logfile "Unable to write backup ".$copyfile.':'.$!."\n";
-          return "<font color=red>Failed to write backup copy, $!,FAIL</font>";
+	    return ("<font color=\"red\">Failed to write backup copy, $!,FAIL</font>",1);
         }
 # ------------------------------------------------------------- IDs and indices
 	
 	my ($outstring,$error);
 	($outstring,$error,%allow)=&fix_ids_and_indices($logfile,$source,
 							$target);
-	if ($error) { return $outstring; }
+	if ($error) { return ($outstring,$error); }
 # ------------------------------------------------------------ Construct Allows
     
 	$scrout.='<h3>Dependencies</h3>';
@@ -843,7 +844,7 @@ sub publish {
            unless ($style eq 'rat') { 
               $allowstr.="\n".'<allow src="'.$thisdep.'" />';
 	   }
-           $scrout.='<br>';
+           $scrout.='<br />';
            unless ($thisdep=~/\*/) {
 	       $scrout.='<a href="'.$thisdep.'">';
            }
@@ -877,9 +878,8 @@ sub publish {
           my $org;
           unless ($org=Apache::File->new('>'.$source)) {
              print $logfile "No write permit to $source\n";
-             return 
-		 '<font color="red">No write permission to '.$source.
-		 ', FAIL</font>';
+             return ('<font color="red">No write permission to '.$source.
+		     ', FAIL</font>',1);
 	  }
           print($org $outstring);
         }
@@ -910,11 +910,14 @@ sub publish {
         $metadatafields{'author'}=~s/\s+/ /g;
         $metadatafields{'author'}=~s/\s+$//;
         $metadatafields{'owner'}=$cuname.'@'.$cudom;
+	$metadatafields{'modifyinguser'}=$ENV{'user.name'}.'@'.
+	                                 $ENV{'user.domain'};
+	$metadatafields{'authorspace'}=$cuname.'@'.$cudom;
 
 # ------------------------------------------------ Check out directory hierachy
 
         my $thisdisfn=$source;
-        $thisdisfn=~s/^\/home\/$cuname\///;
+        $thisdisfn=~s/^\/home\/\Q$cuname\E\///;
 
         my @urlparts=split(/\//,$thisdisfn);
         $#urlparts--;
@@ -949,7 +952,7 @@ sub publish {
     }
 
 # -------------------------------------------------- Parse content for metadata
-    if ($style eq 'ssi') {
+    if (($style eq 'ssi') || ($style eq 'prv')) {
         my $oldenv=$ENV{'request.uri'};
 
         $ENV{'request.uri'}=$target;
@@ -960,204 +963,218 @@ sub publish {
     }
 # ---------------- Find and document discrepancies in the parameters and stores
 
-        my $chparms='';
-        foreach (sort keys %metadatafields) {
-	    if (($_=~/^parameter/) || ($_=~/^stores/)) {
-                unless ($_=~/\.\w+$/) { 
-                   unless ($oldparmstores{$_}) {
-		      print $logfile 'New: '.$_."\n";
-                      $chparms.=$_.' ';
-                   }
-	        }
-            }
-        }
-        if ($chparms) {
-	    $scrout.='<p><b>New parameters or stored values:</b> '.
-                     $chparms;
-        }
+    my $chparms='';
+    foreach (sort keys %metadatafields) {
+	if (($_=~/^parameter/) || ($_=~/^stores/)) {
+	    unless ($_=~/\.\w+$/) { 
+		unless ($oldparmstores{$_}) {
+		    print $logfile 'New: '.$_."\n";
+		    $chparms.=$_.' ';
+		}
+	    }
+	}
+    }
+    if ($chparms) {
+	$scrout.='<p><b>New parameters or stored values:</b> '.$chparms.'</p>';
+    }
 
-        $chparms='';
-        foreach (sort keys %oldparmstores) {
-	    if (($_=~/^parameter/) || ($_=~/^stores/)) {
-                unless (($metadatafields{$_.'.name'}) ||
-                        ($metadatafields{$_.'.package'}) || ($_=~/\.\w+$/)) {
-		    print $logfile 'Obsolete: '.$_."\n";
-                    $chparms.=$_.' ';
-                }
-            }
-        }
-        if ($chparms) {
-	    $scrout.='<p><b>Obsolete parameters or stored values:</b> '.
-                     $chparms;
-        }
+    $chparms='';
+    foreach (sort keys %oldparmstores) {
+	if (($_=~/^parameter/) || ($_=~/^stores/)) {
+	    unless (($metadatafields{$_.'.name'}) ||
+		    ($metadatafields{$_.'.package'}) || ($_=~/\.\w+$/)) {
+		print $logfile 'Obsolete: '.$_."\n";
+		$chparms.=$_.' ';
+	    }
+	}
+    }
+    if ($chparms) {
+	$scrout.='<p><b>Obsolete parameters or stored values:</b> '.
+	    $chparms.'</p>';
+    }
 
 # ------------------------------------------------------- Now have all metadata
 
-        my %keywords=();
+    my %keywords=();
         
-	if (length($content)<500000) {
-	    my $textonly=$content;
-            $textonly=~s/\<script[^\<]+\<\/script\>//g;
-            $textonly=~s/\<m\>[^\<]+\<\/m\>//g;
-            $textonly=~s/\<[^\>]*\>//g;
-            $textonly=~tr/A-Z/a-z/;
-            $textonly=~s/[\$\&][a-z]\w*//g;
-            $textonly=~s/[^a-z\s]//g;
-
-            foreach ($textonly=~m/(\w+)/g) {
-		unless ($nokey{$_}) {
-                   $keywords{$_}=1;
-                } 
-            }
-        }
+    if (length($content)<500000) {
+	my $textonly=$content;
+	$textonly=~s/\<script[^\<]+\<\/script\>//g;
+	$textonly=~s/\<m\>[^\<]+\<\/m\>//g;
+	$textonly=~s/\<[^\>]*\>//g;
+	$textonly=~tr/A-Z/a-z/;
+	$textonly=~s/[\$\&][a-z]\w*//g;
+	$textonly=~s/[^a-z\s]//g;
+	
+	foreach ($textonly=~m/(\w+)/g) {
+	    unless ($nokey{$_}) {
+		$keywords{$_}=1;
+	    } 
+	}
+    }
 
             
-            foreach (split(/\W+/,$metadatafields{'keywords'})) {
-		$keywords{$_}=1;
-            }
+    foreach (split(/\W+/,$metadatafields{'keywords'})) {
+	$keywords{$_}=1;
+    }
 # --------------------------------------------------- Now we also have keywords
 # =============================================================================
 # INTERACTIVE MODE
 #
-   unless ($batch) {
+    unless ($batch) {
         $scrout.=
-     '<form name="pubform" action="/adm/publish" method="post">'.
-       '<p><input type="submit" value="Finalize Publication" /></p>'.
-          &hiddenfield('phase','two').
-          &hiddenfield('filename',$ENV{'form.filename'}).
-	  &hiddenfield('allmeta',&Apache::lonnet::escape($allmeta)).
-          &hiddenfield('dependencies',join(',',keys %allow)).
-          &textfield('Title','title',$metadatafields{'title'}).
-          &textfield('Author(s)','author',$metadatafields{'author'}).
-	  &textfield('Subject','subject',$metadatafields{'subject'});
+	    '<form name="pubform" action="/adm/publish" method="post">'.
+            '<p><input type="submit" value="Finalize Publication" /></p>'.
+            &hiddenfield('phase','two').
+            &hiddenfield('filename',$ENV{'form.filename'}).
+	    &hiddenfield('allmeta',&Apache::lonnet::escape($allmeta)).
+            &hiddenfield('dependencies',join(',',keys %allow)).
+            &textfield('Title','title',$metadatafields{'title'}).
+            &textfield('Author(s)','author',$metadatafields{'author'}).
+	    &textfield('Subject','subject',$metadatafields{'subject'});
 
 # --------------------------------------------------- Scan content for keywords
 
         my $keywords_help = Apache::loncommon::help_open_topic("Publishing_Keywords");
 	my $keywordout=<<"END";
 <script>
-function checkAll(field)
-{
+function checkAll(field) {
     for (i = 0; i < field.length; i++)
         field[i].checked = true ;
 }
 
-function uncheckAll(field)
-{
+function uncheckAll(field) {
     for (i = 0; i < field.length; i++)
         field[i].checked = false ;
 }
 </script>
-<p><b>Keywords: $keywords_help</b> 
-<input type="button" value="check all" onclick="javascript:checkAll(document.pubform.keywords)"> 
-<input type="button" value="uncheck all" onclick="javascript:uncheckAll(document.pubform.keywords)"> 
+<p><font color="#800000" face="helvetica"><b>KEYWORDS:</b></font>
+ $keywords_help</b>
+<input type="button" value="check all" onclick="javascript:checkAll(document.pubform.keywords)" /> 
+<input type="button" value="uncheck all" onclick="javascript:uncheckAll(document.pubform.keywords)" /> 
+</p>
 <br />
 END
-        $keywordout.='<table border=2><tr>';
-        my $colcount=0;
+	$keywordout.='<table border="2"><tr>';
+	my $colcount=0;
+
+	foreach (sort keys %keywords) {
+	    $keywordout.='<td><input type="checkbox" name="keywords" value="'.$_.'"';
+	    if ($metadatafields{'keywords'}) {
+		if ($metadatafields{'keywords'}=~/\Q$_\E/) {
+		    $keywordout.=' checked="on"';
+		}
+	    } elsif (&Apache::loncommon::keyword($_)) {
+		$keywordout.=' checked="on"';
+	    }
+	    $keywordout.=' />'.$_.'</td>';
+	    if ($colcount>10) {
+		$keywordout.="</tr><tr>\n";
+		$colcount=0;
+	    }
+	    $colcount++;
+	}
 
-            foreach (sort keys %keywords) {
-                $keywordout.='<td><input type=checkbox name="keywords" value="'.$_.'"';
-                if ($metadatafields{'keywords'}) {
-                   if ($metadatafields{'keywords'}=~/$_/) { 
-                      $keywordout.=' checked'; 
-                   }
-	        } elsif (&Apache::loncommon::keyword($_)) {
-	            $keywordout.=' checked';
-                } 
-                $keywordout.='>'.$_.'</td>';
-                if ($colcount>10) {
-		    $keywordout.="</tr><tr>\n";
-                    $colcount=0;
-                }
-                $colcount++;
-            }
-        
 	$keywordout.='</tr></table>';
 
-        $scrout.=$keywordout;
+	$scrout.=$keywordout;
 
-        $scrout.=&textfield('Additional Keywords','addkey','');
+	$scrout.=&textfield('Additional Keywords','addkey','');
 
-        $scrout.=&textfield('Notes','notes',$metadatafields{'notes'});
+	$scrout.=&textfield('Notes','notes',$metadatafields{'notes'});
 
-        $scrout.=
-             '<p><b>Abstract:</b><br><textarea cols=80 rows=5 name=abstract>'.
-              $metadatafields{'abstract'}.'</textarea>';
+	$scrout.=
+	    "\n<p><font color=\"#800000\" face=\"helvetica\"><b>ABSTRACT:".
+	    "</b></font></p><br />".
+	    '<textarea cols="80" rows="5" name="abstract">'.
+	    $metadatafields{'abstract'}.'</textarea></p>';
 
 	$source=~/\.(\w+)$/;
 
 	$scrout.=&hiddenfield('mime',$1);
 
-        $scrout.=&selectbox('Language','language',
-                            $metadatafields{'language'},
+	my $defaultlanguage=$metadatafields{'language'};
+	$defaultlanguage =~ s/\s*notset\s*//g;
+	$defaultlanguage =~ s/^,\s*//g;
+	$defaultlanguage =~ s/,\s*$//g;
+
+	$scrout.=&selectbox('Language','language',
+			    $defaultlanguage,
 			    \&Apache::loncommon::languagedescription,
 			    (&Apache::loncommon::languageids),
-			     );
+			   );
 
-        unless ($metadatafields{'creationdate'}) {
+	unless ($metadatafields{'creationdate'}) {
 	    $metadatafields{'creationdate'}=time;
-        }
-        $scrout.=&hiddenfield('creationdate',
-              &Apache::loncommon::unsqltime($metadatafields{'creationdate'}));
+	}
+	$scrout.=&hiddenfield('creationdate',
+			      &Apache::loncommon::unsqltime($metadatafields{'creationdate'}));
+
+	$scrout.=&hiddenfield('lastrevisiondate',time);
 
-        $scrout.=&hiddenfield('lastrevisiondate',time);
 
-			   
 	$scrout.=&textfield('Publisher/Owner','owner',
-                            $metadatafields{'owner'});
+			    $metadatafields{'owner'});
 
 # -------------------------------------------------- Correct copyright for rat.
-    if ($style eq 'rat') {
-	if ($metadatafields{'copyright'} eq 'public') { 
-	    delete $metadatafields{'copyright'};
+        my $defaultoption=$metadatafields{'copyright'};
+        unless ($defaultoption) { $defaultoption='default'; }
+	unless ($style eq 'prv') {
+	    if ($style eq 'rat') {
+		if ($metadatafields{'copyright'} eq 'public') { 
+		    delete $metadatafields{'copyright'};
+                    $defaultoption='default';
+		}
+		$scrout.=&selectbox('Copyright/Distribution','copyright',
+				    $defaultoption,
+				    \&Apache::loncommon::copyrightdescription,
+				    (grep !/^public$/,(&Apache::loncommon::copyrightids)));
+	    } else {
+		$scrout.=&selectbox('Copyright/Distribution','copyright',
+				    $defaultoption,
+				    \&Apache::loncommon::copyrightdescription,
+				    (&Apache::loncommon::copyrightids));
+	    }
+    
+	    my $copyright_help =
+		Apache::loncommon::help_open_topic('Publishing_Copyright');
+	    $scrout =~ s/DISTRIBUTION:/'DISTRIBUTION: ' . $copyright_help/ge;
+	    $scrout.=&textfield('Custom Distribution File','customdistributionfile',
+				$metadatafields{'customdistributionfile'}).
+				    $copyright_help;
+	} else {
+	    $scrout.=&hiddenfield('copyright','private');
 	}
-        $scrout.=&selectbox('Copyright/Distribution','copyright',
-                            $metadatafields{'copyright'},
-			    \&Apache::loncommon::copyrightdescription,
-		     (grep !/^public$/,(&Apache::loncommon::copyrightids)));
-    }
-    else {
-        $scrout.=&selectbox('Copyright/Distribution','copyright',
-                            $metadatafields{'copyright'},
-			    \&Apache::loncommon::copyrightdescription,
-			     (&Apache::loncommon::copyrightids));
-    }
-
-    my $copyright_help =
-        Apache::loncommon::help_open_topic('Publishing_Copyright');
-    $scrout =~ s/DISTRIBUTION:/'DISTRIBUTION: ' . $copyright_help/ge;
-    return $scrout.
-        '<p><input type="submit" value="Finalize Publication" /></p></form>';
+	return ($scrout.'<p><input type="submit" value="Finalize Publication" /></p></form>',0);
 # =============================================================================
 # BATCH MODE
 #
-  } else {
+    } else {
 # Transfer metadata directly to environment for stage 2
-    foreach (keys %metadatafields) {
-	$ENV{'form.'.$_}=$metadatafields{$_};
+	foreach (keys %metadatafields) {
+	    $ENV{'form.'.$_}=$metadatafields{$_};
+	}
+	$ENV{'form.addkey'}='';
+	$ENV{'form.keywords'}='';
+	foreach (keys %keywords) {
+	    if ($metadatafields{'keywords'}) {
+		if ($metadatafields{'keywords'}=~/\Q$_\E/) { 
+		    $ENV{'form.keywords'}.=$_.','; 
+		}
+	    } elsif (&Apache::loncommon::keyword($_)) {
+		$ENV{'form.keywords'}.=$_.',';
+	    }
+	}
+	$ENV{'form.keywords'}=~s/\,$//;
+	unless ($ENV{'form.creationdate'}) { $ENV{'form.creationdate'}=time; }
+	$ENV{'form.lastrevisiondate'}=time;
+	if ((($style eq 'rat') && ($ENV{'form.copyright'} eq 'public')) ||
+	    (!$ENV{'form.copyright'})) { 
+	    $ENV{'form.copyright'}='default';
+	}
+	$ENV{'form.allmeta'}=&Apache::lonnet::escape($allmeta);
+	return ($scrout,0);
     }
-    $ENV{'form.addkey'}='';
-    $ENV{'form.keywords'}='';
-    foreach (keys %keywords) {
-        if ($metadatafields{'keywords'}) {
-           if ($metadatafields{'keywords'}=~/$_/) { 
-              $ENV{'form.keywords'}.=$_.','; 
-           }
-	} elsif (&Apache::loncommon::keyword($_)) {
-	    $ENV{'form.keywords'}.=$_.',';
-        } 
-    }
-    $ENV{'form.keywords'}=~s/\,$//;
-    unless ($ENV{'form.creationdate'}) { $ENV{'form.creationdate'}=time; }
-    $ENV{'form.lastrevisiondate'}=time;
-    if ((($style eq 'rat') && ($ENV{'form.copyright'} eq 'public')) ||
-        (!$ENV{'form.copyright'})) { 
-	$ENV{'form.copyright'}='default';
-    } 
-    $ENV{'form.allmeta'}=&Apache::lonnet::escape($allmeta);
-    return $scrout;
-  }
 }
 
 #########################################
@@ -1203,14 +1220,21 @@ sub phasetwo {
     my ($r,$source,$target,$style,$distarget,$batch)=@_;
     $source=~s/\/+/\//g;
     $target=~s/\/+/\//g;
+
+    if ($target=~/\_\_\_/) {
+	$r->print(
+ '<font color="red">Unsupported character combination "<tt>___</tt>" in filename, FAIL</font>');
+        return 0;
+    }
     $distarget=~s/\/+/\//g;
     my $logfile;
     unless ($logfile=Apache::File->new('>>'.$source.'.log')) {
-	return 
-            '<font color=red>No write permission to user directory, FAIL</font>';
+	$r->print(
+        '<font color="red">No write permission to user directory, FAIL</font>');
+        return 0;
     }
     print $logfile 
-        "\n================= Publish ".localtime()." Phase Two  ================\n";
+        "\n================= Publish ".localtime()." Phase Two  ================\n".$ENV{'user.name'}.'@'.$ENV{'user.domain'}."\n";
     
     %metadatafields=();
     %metadatakeys=();
@@ -1228,6 +1252,8 @@ sub phasetwo {
     $metadatafields{'lastrevisiondate'}=$ENV{'form.lastrevisiondate'};
     $metadatafields{'owner'}=$ENV{'form.owner'};
     $metadatafields{'copyright'}=$ENV{'form.copyright'};
+    $metadatafields{'customdistributionfile'}=
+                                 $ENV{'form.customdistributionfile'};
     $metadatafields{'dependencies'}=$ENV{'form.dependencies'};
     
     my $allkeywords=$ENV{'form.addkey'};
@@ -1247,7 +1273,7 @@ sub phasetwo {
         my $mfh;
         unless ($mfh=Apache::File->new('>'.$source.'.meta')) {
             return 
-                '<font color=red>Could not write metadata, FAIL</font>';
+                '<font color="red">Could not write metadata, FAIL</font>';
         }
         foreach (sort keys %metadatafields) {
             unless ($_=~/\./) {
@@ -1266,7 +1292,7 @@ sub phasetwo {
                         .'</'.$tag.'>';
             }
         }
-        $r->print('<p>Wrote Metadata');
+        $r->print('<p>Wrote Metadata</p>');
         print $logfile "\nWrote metadata";
     }
     
@@ -1277,14 +1303,14 @@ sub phasetwo {
     unless ($metadatafields{'copyright'} eq 'priv') {
         my ($error,$success) = &store_metadata(\%metadatafields);
         if ($success) {
-            $r->print('<p>Synchronized SQL metadata database');
+            $r->print('<p>Synchronized SQL metadata database</p>');
             print $logfile "\nSynchronized SQL metadata database";
         } else {
             $r->print($error);
             print $logfile "\n".$error;
         }
     } else {
-        $r->print('<p>Private Publication - did not synchronize database');
+        $r->print('<p>Private Publication - did not synchronize database</p>');
         print $logfile "\nPrivate: Did not synchronize data into ".
             "SQL metadata database";
     }
@@ -1299,7 +1325,7 @@ 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>";
+            return "<font color=\"red\">Invalid target directory, FAIL</font>";
         }
         opendir(DIR,$srcd);
         while ($filename=readdir(DIR)) {
@@ -1307,24 +1333,24 @@ sub phasetwo {
                 unlink($srcd.'/'.$filename);
                 unlink($srcd.'/'.$filename.'.meta');
             } else {
-                if ($filename=~/$srcf\.(\d+)\.$srct$/) {
+                if ($filename=~/\Q$srcf\E\.(\d+)\.\Q$srct\E$/) {
                     $maxversion=($1>$maxversion)?$1:$maxversion;
                 }
             }
         }
         closedir(DIR);
         $maxversion++;
-        $r->print('<p>Creating old version '.$maxversion);
-        print $logfile "\nCreating old version ".$maxversion;
+        $r->print('<p>Creating old version '.$maxversion.'</p>');
+        print $logfile "\nCreating old version ".$maxversion."\n";
         
         my $copyfile=$srcd.'/'.$srcf.'.'.$maxversion.'.'.$srct;
         
         if (copy($target,$copyfile)) {
 	    print $logfile "Copied old target to ".$copyfile."\n";
-            $r->print('<p>Copied old target file');
+            $r->print('<p>Copied old target file</p>');
         } else {
 	    print $logfile "Unable to write ".$copyfile.':'.$!."\n";
-            return "<font color=red>Failed to copy old target, $!, FAIL</font>";
+            return "<font color=\"red\">Failed to copy old target, $!, FAIL</font>";
         }
         
 # --------------------------------------------------------------- Copy Metadata
@@ -1333,18 +1359,18 @@ sub phasetwo {
         
         if (copy($target.'.meta',$copyfile)) {
 	    print $logfile "Copied old target metadata to ".$copyfile."\n";
-            $r->print('<p>Copied old metadata')
+            $r->print('<p>Copied old metadata</p>')
         } else {
 	    print $logfile "Unable to write metadata ".$copyfile.':'.$!."\n";
             if (-e $target.'.meta') {
                 return 
-                    "<font color=red>Failed to write old metadata copy, $!, FAIL</font>";
+                    "<font color=\"red\">Failed to write old metadata copy, $!, FAIL</font>";
 	    }
         }
         
         
     } else {
-        $r->print('<p>Initial version');
+        $r->print('<p>Initial version</p>');
         print $logfile "\nInitial version";
     }
 
@@ -1359,17 +1385,17 @@ sub phasetwo {
         $path.="/$parts[$count]";
         if ((-e $path)!=1) {
             print $logfile "\nCreating directory ".$path;
-            $r->print('<p>Created directory '.$parts[$count]);
+            $r->print('<p>Created directory '.$parts[$count].'</p>');
             mkdir($path,0777);
         }
     }
     
     if (copy($source,$copyfile)) {
         print $logfile "\nCopied original source to ".$copyfile."\n";
-        $r->print('<p>Copied source file');
+        $r->print('<p>Copied source file</p>');
     } else {
         print $logfile "\nUnable to write ".$copyfile.':'.$!."\n";
-        return "<font color=red>Failed to copy source, $!, FAIL</font>";
+        return "<font color=\"red\">Failed to copy source, $!, FAIL</font>";
     }
     
 # --------------------------------------------------------------- Copy Metadata
@@ -1378,11 +1404,11 @@ sub phasetwo {
     
     if (copy($source.'.meta',$copyfile)) {
         print $logfile "\nCopied original metadata to ".$copyfile."\n";
-        $r->print('<p>Copied metadata');
+        $r->print('<p>Copied metadata</p>');
     } else {
         print $logfile "\nUnable to write metadata ".$copyfile.':'.$!."\n";
         return 
-            "<font color=red>Failed to write metadata copy, $!, FAIL</font>";
+            "<font color=\"red\">Failed to write metadata copy, $!, FAIL</font>";
     }
     $r->rflush;
 # --------------------------------------------------- Send update notifications
@@ -1392,7 +1418,7 @@ sub phasetwo {
 	$r->print('<p>Notifying host '.$subhost.':');$r->rflush;
 	print $logfile "\nNotifying host ".$subhost.':';
 	my $reply=&Apache::lonnet::critical('update:'.$target,$subhost);
-	$r->print($reply.'<br />');$r->rflush;
+	$r->print($reply.'</p><br />');$r->rflush;
 	print $logfile $reply;
     }
     
@@ -1404,7 +1430,7 @@ sub phasetwo {
 	print $logfile "\nNotifying host for metadata only ".$subhost.':';
 	my $reply=&Apache::lonnet::critical('update:'.$target.'.meta',
 					    $subhost);
-	$r->print($reply.'<br />');$r->rflush;
+	$r->print($reply.'</p><br />');$r->rflush;
 	print $logfile $reply;
     }
     
@@ -1417,13 +1443,13 @@ sub phasetwo {
         my ($cdom,$cname)=split(/\_/,$_);
 	my $reply=&Apache::lonnet::cput
                   ('versionupdate',{$target => $now},$cdom,$cname);
-	$r->print($reply.'<br />');$r->rflush;
+	$r->print($reply.'</p><br />');$r->rflush;
 	print $logfile $reply;
     }
 # ------------------------------------------------ Provide link to new resource
     unless ($batch) {
         my $thisdistarget=$target;
-        $thisdistarget=~s/^$docroot//;
+        $thisdistarget=~s/^\Q$docroot\E//;
         
         my $thissrc=$source;
         $thissrc=~s/^\/home\/(\w+)\/public_html/\/priv\/$1/;
@@ -1433,11 +1459,11 @@ sub phasetwo {
         
         
         $r->print(
-           '<hr><a href="'.$thisdistarget.'"><font size="+2">'.
+           '<hr /><a href="'.$thisdistarget.'"><font size="+2">'.
            'View Published Version</font></a>'.
-           '<p><a href="'.$thissrc.'"><font size=+2>Back to Source</font></a>'.
+           '<p><a href="'.$thissrc.'"><font size=+2>Back to Source</font></a></p>'.
            '<p><a href="'.$thissrcdir.
-                   '"><font size="+2">Back to Source Directory</font></a>');
+                   '"><font size="+2">Back to Source Directory</font></a></p>');
     }
 }
 
@@ -1453,7 +1479,7 @@ sub batchpublish {
 
     my $docroot=$r->dir_config('lonDocRoot');
     my $thisdistarget=$targetfile;
-    $thisdistarget=~s/^$docroot//;
+    $thisdistarget=~s/^\Q$docroot\E//;
 
 
     undef %metadatafields;
@@ -1470,13 +1496,16 @@ sub batchpublish {
 
 # phase one takes
 #  my ($source,$target,$style,$batch)=@_;
-    $r->print('<p>'.&publish($srcfile,$targetfile,$thisembstyle,1).'</p>');
+    my ($outstring,$error)=&publish($srcfile,$targetfile,$thisembstyle,1);
+    $r->print('<p>'.$outstring.'</p>');
 # phase two takes
 # my ($source,$target,$style,$distarget,batch)=@_;
 # $ENV{'form.allmeta'},$ENV{'form.title'},$ENV{'form.author'},...
-    $r->print('<p>');
-    &phasetwo($r,$srcfile,$targetfile,$thisembstyle,$thisdistarget,1);
-    $r->print('</p>');
+    if (!$error) {
+	$r->print('<p>');
+	&phasetwo($r,$srcfile,$targetfile,$thisembstyle,$thisdistarget,1);
+	$r->print('</p>');
+    }
     return '';
 }
 
@@ -1517,7 +1546,7 @@ sub publishdirectory {
 	        $ruid,$rgid,$rrdev,$rsize,
 	        $ratime,$rmtime,$rctime,
 	        $rblksize,$rblocks)=stat($resdir.'/'.$filename);
-	        if ($rmtime<$cmtime) {
+	        if (($rmtime<$cmtime) || ($ENV{'form.forcerepub'})) {
 # previously published, modified now
 		    $publishthis=1;
                 }
@@ -1591,7 +1620,7 @@ sub handler {
 
 # -------------------------------------------------------------- Check filename
 
-  my $fn=$ENV{'form.filename'};
+  my $fn=&Apache::lonnet::unescape($ENV{'form.filename'});
 
   
   unless ($fn) { 
@@ -1687,10 +1716,10 @@ unless ($ENV{'form.phase'} eq 'two') {
   $thistarget=~s/\/public\_html//;
 
   my $thisdistarget=$thistarget;
-  $thisdistarget=~s/^$docroot//;
+  $thisdistarget=~s/^\Q$docroot\E//;
 
   my $thisdisfn=$thisfn;
-  $thisdisfn=~s/^\/home\/$cuname\/public_html\///;
+  $thisdisfn=~s/^\/home\/\Q$cuname\E\/public_html\///;
 
   if ($fn=~/\/$/) {
 # -------------------------------------------------------- This is a directory
@@ -1705,7 +1734,7 @@ unless ($ENV{'form.phase'} eq 'two') {
       $r->print('<h2>Publishing '.
         &Apache::loncommon::filedescription($thistype).' <tt>'.
         '<a href="/~'.$cuname.'/'.$thisdisfn.'" target="cat">'.$thisdisfn.
-        '</a></tt></h2><b>Target:</b> <tt>'.$thisdistarget.'</tt><p>');
+        '</a></tt></h2><b>Target:</b> <tt>'.$thisdistarget.'</tt><br />');
    
       if (($cuname ne $ENV{'user.name'}) || ($cudom ne $ENV{'user.domain'})) {
           $r->print('<h3><font color="red">Co-Author: '.$cuname.' at '.$cudom.
@@ -1715,19 +1744,18 @@ unless ($ENV{'form.phase'} eq 'two') {
       if (&Apache::loncommon::fileembstyle($thistype) eq 'ssi') {
           $r->print('<br /><a href="/adm/diff?filename=/~'.$cuname.'/'.
                     $thisdisfn.
-  	  '&versiontwo=priv" target="cat">Diffs with Current Version</a><p>');
+  	  '&versiontwo=priv" target="cat">Diffs with Current Version</a><br />');
       }
   
 # ------------------ Publishing from $thisfn to $thistarget with $thisembstyle.
 
        unless ($ENV{'form.phase'} eq 'two') {
-         $r->print(
-          '<hr />'.&publish($thisfn,$thistarget,$thisembstyle));
+	   my ($outstring,$error)=&publish($thisfn,$thistarget,$thisembstyle);
+	   $r->print('<hr />'.$outstring);
        } else {
            $r->print('<hr />');
            &phasetwo($r,$thisfn,$thistarget,$thisembstyle,$thisdistarget); 
-       }  
-
+       }
   }
   $r->print('</body></html>');
 
@@ -1741,5 +1769,7 @@ __END__
 
 =back
 
+=back
+
 =cut