--- loncom/publisher/lonpublisher.pm	2002/10/20 18:39:36	1.105
+++ loncom/publisher/lonpublisher.pm	2008/05/19 18:43:16	1.236
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Publication Handler
 #
-# $Id: lonpublisher.pm,v 1.105 2002/10/20 18:39:36 www Exp $
+# $Id: lonpublisher.pm,v 1.236 2008/05/19 18:43:16 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -25,28 +25,6 @@
 #
 # http://www.lon-capa.org/
 #
-# 
-# (TeX Content Handler
-#
-# 05/29/00,05/30,10/11 Gerd Kortemeyer)
-#
-# 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
-#
 ###
 
 ###############################################################################
@@ -86,6 +64,26 @@ invocation by F<loncapa_apache.conf>:
   ErrorDocument     500 /adm/errorhandler
   </Location>
 
+=head1 OVERVIEW
+
+Authors can only write-access the C</~authorname/> space. They can
+copy resources into the resource area through the publication step,
+and move them back through a recover step. Authors do not have direct
+write-access to their resource space.
+
+During the publication step, several events will be
+triggered. Metadata is gathered, where a wizard manages default
+entries on a hierarchical per-directory base: The wizard imports the
+metadata (including access privileges and royalty information) from
+the most recent published resource in the current directory, and if
+that is not available, from the next directory above, etc. The Network
+keeps all previous versions of a resource and makes them available by
+an explicit version number, which is inserted between the file name
+and extension, for example C<foo.2.html>, while the most recent
+version does not carry a version number (C<foo.html>). Servers
+subscribing to a changed resource are notified that a new version is
+available.
+
 =head1 DESCRIPTION
 
 B<lonpublisher> takes the proper steps to add resources to the LON-CAPA
@@ -121,13 +119,18 @@ 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();
+use Apache::lonnet;
 use Apache::loncommon();
 use Apache::lonmysql;
+use Apache::lonlocal;
+use Apache::loncfile;
+use LONCAPA::lonmetadata;
+use Apache::lonmsg;
 use vars qw(%metadatafields %metadatakeys);
+use LONCAPA qw(:DEFAULT :match);
+ 
 
 my %addid;
 my %nokey;
@@ -137,6 +140,11 @@ my $docroot;
 my $cuname;
 my $cudom;
 
+my $registered_cleanup;
+my $modified_urls;
+
+my $lock;
+
 =pod
 
 =item B<metaeval>
@@ -164,46 +172,54 @@ nothing
 
 #########################################
 #########################################
+#
+# Modifies global %metadatafields %metadatakeys 
+#
+
 sub metaeval {
-    my $metastring=shift;
+    my ($metastring,$prefix)=@_;
    
-        my $parser=HTML::LCParser->new(\$metastring);
-        my $token;
-        while ($token=$parser->get_token) {
-           if ($token->[0] eq 'S') {
-	      my $entry=$token->[1];
-              my $unikey=$entry;
-              if (defined($token->[2]->{'package'})) { 
-                  $unikey.='_package_'.$token->[2]->{'package'};
-              } 
-              if (defined($token->[2]->{'part'})) { 
-                 $unikey.='_'.$token->[2]->{'part'}; 
-	      }
-              if (defined($token->[2]->{'id'})) { 
-                  $unikey.='_'.$token->[2]->{'id'};
-              } 
-              if (defined($token->[2]->{'name'})) { 
-                 $unikey.='_'.$token->[2]->{'name'}; 
-	      }
-              foreach (@{$token->[3]}) {
-		  $metadatafields{$unikey.'.'.$_}=$token->[2]->{$_};
-                  if ($metadatakeys{$unikey}) {
-		      $metadatakeys{$unikey}.=','.$_;
-                  } else {
-                      $metadatakeys{$unikey}=$_;
-                  }
-              }
-              if ($metadatafields{$unikey}) {
-		  my $newentry=$parser->get_text('/'.$entry);
-                  unless (($metadatafields{$unikey}=~/$newentry/) ||
-                          ($newentry eq '')) {
-                     $metadatafields{$unikey}.=', '.$newentry;
-		  }
-	      } else {
-                 $metadatafields{$unikey}=$parser->get_text('/'.$entry);
-              }
-          }
-       }
+    my $parser=HTML::LCParser->new(\$metastring);
+    my $token;
+    while ($token=$parser->get_token) {
+	if ($token->[0] eq 'S') {
+	    my $entry=$token->[1];
+	    my $unikey=$entry;
+	    next if ($entry =~ m/^(?:parameter|stores)_/);
+	    if (defined($token->[2]->{'package'})) { 
+		$unikey.="\0package\0".$token->[2]->{'package'};
+	    } 
+	    if (defined($token->[2]->{'part'})) { 
+		$unikey.="\0".$token->[2]->{'part'}; 
+	    }
+	    if (defined($token->[2]->{'id'})) { 
+		$unikey.="\0".$token->[2]->{'id'};
+	    } 
+	    if (defined($token->[2]->{'name'})) { 
+		$unikey.="\0".$token->[2]->{'name'}; 
+	    }
+	    foreach (@{$token->[3]}) {
+		$metadatafields{$unikey.'.'.$_}=$token->[2]->{$_};
+		if ($metadatakeys{$unikey}) {
+		    $metadatakeys{$unikey}.=','.$_;
+		} else {
+		    $metadatakeys{$unikey}=$_;
+		}
+	    }
+	    my $newentry=$parser->get_text('/'.$entry);
+	    if (($entry eq 'customdistributionfile') ||
+		($entry eq 'sourcerights')) {
+		$newentry=~s/^\s*//;
+		if ($newentry !~m|^/res|) { $newentry=$prefix.$newentry; }
+	    }
+# actually store
+	    if ( $entry eq 'rule' && exists($metadatafields{$unikey})) {
+		$metadatafields{$unikey}.=','.$newentry;
+	    } else {
+		$metadatafields{$unikey}=$newentry;
+	    }
+	}
+    }
 }
 
 #########################################
@@ -244,19 +260,21 @@ XHTML text that indicates successful rea
 #########################################
 #########################################
 sub metaread {
-    my ($logfile,$fn)=@_;
+    my ($logfile,$fn,$prefix)=@_;
     unless (-e $fn) {
 	print($logfile 'No file '.$fn."\n");
-        return '<br><b>No file:</b> <tt>'.$fn.'</tt>';
+        return '<br /><b>'.&mt('No file').':</b> <tt>'.
+	    &Apache::loncfile::display($fn).'</tt>';
     }
     print($logfile 'Processing '.$fn."\n");
     my $metastring;
     {
-     my $metafh=Apache::File->new($fn);
-     $metastring=join('',<$metafh>);
+	my $metafh=Apache::File->new($fn);
+	$metastring=join('',<$metafh>);
     }
-    &metaeval($metastring);
-    return '<br><b>Processed file:</b> <tt>'.$fn.'</tt>';
+    &metaeval($metastring,$prefix);
+    return '<br /><b>'.&mt('Processed file').':</b> <tt>'.
+	&Apache::loncfile::display($fn).'</tt>';
 }
 
 #########################################
@@ -265,9 +283,8 @@ sub metaread {
 sub coursedependencies {
     my $url=&Apache::lonnet::declutter(shift);
     $url=~s/\.meta$//;
-    my ($adomain,$aauthor)=($url=~/^(\w+)\/(\w+)\//);
-    my $regexp=$url;
-    $regexp=~s/(\W)/\\$1/g;
+    my ($adomain,$aauthor)=($url=~ m{^($match_domain)/($match_username)/});
+    my $regexp=quotemeta($url);
     $regexp='___'.$regexp.'___course';
     my %evaldata=&Apache::lonnet::dump('nohist_resevaldata',$adomain,
 				       $aauthor,$regexp);
@@ -309,20 +326,54 @@ string which presents the form field (fo
 #########################################
 sub textfield {
     my ($title,$name,$value)=@_;
-    return "\n<p><b>$title:</b><br>".
+    $value=~s/^\s+//gs;
+    $value=~s/\s+$//gs;
+    $value=~s/\s+/ /gs;
+    $title=&mt($title);
+    $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.'" />';
 }
 
+sub text_with_browse_field {
+    my ($title,$name,$value,$restriction)=@_;
+    $value=~s/^\s+//gs;
+    $value=~s/\s+$//gs;
+    $value=~s/\s+/ /gs;
+    $title=&mt($title);
+    $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.'" />'.
+	   '<a href="javascript:openbrowser(\'pubform\',\''.$name.'\',\''.$restriction.'\');">'.&mt('Select').'</a>&nbsp;'.
+	   '<a href="javascript:opensearcher(\'pubform\',\''.$name.'\');">'.&mt('Search').'</a>';
+	   
+}
+
 sub hiddenfield {
     my ($name,$value)=@_;
+    $env{'form.'.$name}=$value;
     return "\n".'<input type="hidden" name="'.$name.'" value="'.$value.'" />';
 }
 
+sub checkbox {
+    my ($name,$text)=@_;
+    return "\n<br /><label><input type='checkbox' name='$name' /> ".
+	&mt($text)."</label>";
+}
+
 sub selectbox {
     my ($title,$name,$value,$functionref,@idlist)=@_;
-    my $uctitle=uc($title);
-    my $selout="\n<p><font color=\"#800000\" face=\"helvetica\"><b>$uctitle:".
-	"</b></font><br />".'<select name="'.$name.'">';
+    $title=&mt($title);
+    $value=(split(/\s*,\s*/,$value))[-1];
+    if (defined($value)) {
+	$env{'form.'.$name}=$value;
+    } else {
+	$env{'form.'.$name}=$idlist[0];
+    }
+    my $selout="\n<p><font color=\"#800000\" face=\"helvetica\"><b>$title:".
+	'</b></font></p><br /><select name="'.$name.'">';
     foreach (@idlist) {
         $selout.='<option value=\''.$_.'\'';
         if ($_ eq $value) {
@@ -333,6 +384,12 @@ sub selectbox {
     return $selout.'</select>';
 }
 
+sub select_level_form {
+    my ($value,$name)=@_;
+    $env{'form.'.$name}=$value;
+    if (!defined($value)) { $env{'form.'.$name}=0; }
+    return  &Apache::loncommon::select_level_form($value,$name);
+}
 #########################################
 #########################################
 
@@ -354,15 +411,14 @@ sub urlfixup {
     if ($url =~ /^mailto:/i) { return $url; }
     #internal document links need no fixing
     if ($url =~ /^\#/) { return $url; } 
-    my ($host)=($url=~/(?:http\:\/\/)*([^\/]+)/);
-    foreach (values %Apache::lonnet::hostname) {
-	if ($_ eq $host) {
-	    $url=~s/^http\:\/\///;
-            $url=~s/^$host//;
-        }
+    my ($host)=($url=~m{(?:(?:http|https|ftp)://)*([^/]+)});
+    my @lonids = &Apache::lonnet::machine_ids($host);
+    if (@lonids) {
+	$url=~s{^(?:http|https|ftp)://}{};
+	$url=~s/^\Q$host\E//;
     }
-    if ($url=~/^http\:\/\//) { return $url; }
-    $url=~s/\~$cuname/res\/$cudom\/$cuname/;
+    if ($url=~m{^(?:http|https|ftp)://}) { return $url; }
+    $url=~s{\Q~$cuname\E}{res/$cudom/$cuname};
     return $url;
 }
 
@@ -413,11 +469,11 @@ sub set_allow {
     }
     if (($newurl !~ /^javascript:/i) &&
 	($newurl !~ /^mailto:/i) &&
-	($newurl !~ /^http:/i) &&
+	($newurl !~ /^(?:http|https|ftp):/i) &&
 	($newurl !~ /^\#/)) {
 	$$allow{&absoluteurl($newurl,$target)}=1;
     }
-    return $return_url
+    return $return_url;
 }
 
 #########################################
@@ -440,10 +496,15 @@ sub get_subscribed_hosts {
     $target=~/(.*)\/([^\/]+)$/;
     my $srcf=$2;
     opendir(DIR,$1);
+    # cycle through listed files, subscriptions used to exist
+    # as "filename.lonid"
     while ($filename=readdir(DIR)) {
-	if ($filename=~/$srcf\.(\w+)$/) {
+	if ($filename=~/\Q$srcf\E\.($match_lonid)$/) {
 	    my $subhost=$1;
-	    if (($subhost ne 'meta' && $subhost ne 'subscription') &&
+	    if (($subhost ne 'meta' 
+		 && $subhost ne 'subscription' 
+		 && $subhost ne 'meta.subscription'
+		 && $subhost ne 'tmp') &&
                 ($subhost ne $Apache::lonnet::perlvar{'lonHostID'})) {
 		push(@subscribed,$subhost);
 	    }
@@ -452,19 +513,13 @@ sub get_subscribed_hosts {
     closedir(DIR);
     my $sh;
     if ( $sh=Apache::File->new("$target.subscription") ) {
-	&Apache::lonnet::logthis("opened $target.subscription");
 	while (my $subline=<$sh>) {
-	    &Apache::lonnet::logthis("Trying $subline");
-	    if ($subline =~ /(^\w+):/) { 
+	    if ($subline =~ /^($match_lonid):/) { 
                 if ($1 ne $Apache::lonnet::perlvar{'lonHostID'}) { 
                    push(@subscribed,$1);
 	        }
-            } else {
-		&Apache::lonnet::logthis("No Match for $subline");
 	    }
 	}
-    } else {
-	&Apache::lonnet::logthis("Unable to open $target.subscription");
     }
     return @subscribed;
 }
@@ -488,21 +543,34 @@ sub get_max_ids_indices {
     my $maxindex=10;
     my $maxid=10;
     my $needsfixup=0;
+    my $duplicateids=0;
+
+    my %allids;
+    my %duplicatedids;
 
     my $parser=HTML::LCParser->new($content);
+    $parser->xml_mode(1);
     my $token;
     while ($token=$parser->get_token) {
 	if ($token->[0] eq 'S') {
 	    my $counter;
 	    if ($counter=$addid{$token->[1]}) {
 		if ($counter eq 'id') {
-		    if (defined($token->[2]->{'id'})) {
+		    if (defined($token->[2]->{'id'}) &&
+			$token->[2]->{'id'} !~ /^\s*$/) {
 			$maxid=($token->[2]->{'id'}>$maxid)?$token->[2]->{'id'}:$maxid;
+			if (exists($allids{$token->[2]->{'id'}})) {
+			    $duplicateids=1;
+			    $duplicatedids{$token->[2]->{'id'}}=1;
+			} else {
+			    $allids{$token->[2]->{'id'}}=1;
+			}
 		    } else {
 			$needsfixup=1;
 		    }
 		} else {
-		    if (defined($token->[2]->{'index'})) {
+		    if (defined($token->[2]->{'index'}) &&
+			$token->[2]->{'index'} !~ /^\s*$/) {
 			$maxindex=($token->[2]->{'index'}>$maxindex)?$token->[2]->{'index'}:$maxindex;
 		    } else {
 			$needsfixup=1;
@@ -511,7 +579,8 @@ sub get_max_ids_indices {
 	    }
 	}
     }
-    return ($needsfixup,$maxid,$maxindex);
+    return ($needsfixup,$maxid,$maxindex,$duplicateids,
+	    (keys(%duplicatedids)));
 }
 
 #########################################
@@ -543,11 +612,11 @@ sub get_all_text_unbalanced {
 	} elsif ($token->[0] eq 'E')  {
 	    $result.=$token->[2];
 	}
-	if ($result =~ /(.*)$tag(.*)/) {
+	if ($result =~ /\Q$tag\E/s) {
+	    ($result,my $redo)=$result =~ /(.*)\Q$tag\E(.*)/is;
 	    #&Apache::lonnet::logthis('Got a winner with leftovers ::'.$2);
 	    #&Apache::lonnet::logthis('Result is :'.$1);
-	    $result=$1;
-	    my $redo=$tag.$2;
+	    $redo=$tag.$redo;
 	    push (@$pars,HTML::LCParser->new(\$redo));
 	    $$pars[-1]->xml_mode('1');
 	    last;
@@ -580,14 +649,23 @@ sub fix_ids_and_indices {
 	$content=join('',<$org>);
     }
 
-    my ($needsfixup,$maxid,$maxindex)=&get_max_ids_indices(\$content);
+    my ($needsfixup,$maxid,$maxindex,$duplicateids,@duplicatedids)=
+	&get_max_ids_indices(\$content);
 
+    print $logfile ("Got $needsfixup,$maxid,$maxindex,$duplicateids--".
+			   join(', ',@duplicatedids));
+    if ($duplicateids) {
+	print $logfile "Duplicate ID(s) exist, ".join(', ',@duplicatedids)."\n";
+	my $outstring='<span class="LC_error">'.&mt('Unable to publish file, it contains duplicated ID(s), ID(s) need to be unique. The duplicated ID(s) are').': '.join(', ',@duplicatedids).'</span>';
+	return ($outstring,1);
+    }
     if ($needsfixup) {
 	print $logfile "Needs ID and/or index fixup\n".
 	    "Max ID   : $maxid (min 10)\n".
                 "Max Index: $maxindex (min 10)\n";
     }
     my $outstring='';
+    my $responsecounter=1;
     my @parser;
     $parser[0]=HTML::LCParser->new(\$content);
     $parser[-1]->xml_mode(1);
@@ -602,37 +680,52 @@ sub fix_ids_and_indices {
 		    $allow{$token->[2]->{'src'}}=1;
 		    next;
 		}
+		if ($lctag eq 'base') { next; }
+                if (($lctag eq 'part') || ($lctag eq 'problem')) {
+                    $responsecounter=0;
+                }
+                if ($lctag=~/response$/) { $responsecounter++; }
 		my %parms=%{$token->[2]};
 		$counter=$addid{$tag};
 		if (!$counter) { $counter=$addid{$lctag}; }
 		if ($counter) {
 		    if ($counter eq 'id') {
-			unless (defined($parms{'id'})) {
+			unless (defined($parms{'id'}) &&
+				$parms{'id'}!~/^\s*$/) {
 			    $maxid++;
 			    $parms{'id'}=$maxid;
-			    print $logfile 'ID: '.$tag.':'.$maxid."\n";
+			    print $logfile 'ID(new) : '.$tag.':'.$maxid."\n";
+			} else {
+			    print $logfile 'ID(kept): '.$tag.':'.$parms{'id'}."\n";
 			}
 		    } elsif ($counter eq 'index') {
-			unless (defined($parms{'index'})) {
+			unless (defined($parms{'index'}) &&
+				$parms{'index'}!~/^\s*$/) {
 			    $maxindex++;
 			    $parms{'index'}=$maxindex;
 			    print $logfile 'Index: '.$tag.':'.$maxindex."\n";
 			}
 		    }
 		}
-		foreach my $type ('src','href','background','bgimg') {
-		    foreach my $key (keys(%parms)) {
-			if ($key =~ /^$type$/i) {
-			    $parms{$key}=&set_allow(\%allow,$logfile,
-						    $target,$tag,
-						    $parms{$key});
+                unless ($parms{'type'} eq 'zombie') {
+		    foreach my $type ('src','href','background','bgimg') {
+			foreach my $key (keys(%parms)) {
+			    if ($key =~ /^$type$/i) {
+				$parms{$key}=&set_allow(\%allow,$logfile,
+							$target,$tag,
+							$parms{$key});
+			    }
 			}
 		    }
 		}
 		# probably a <randomlabel> image type <label>
-		if ($lctag eq 'label' && defined($parms{'description'})) {
+		# or a <image> tag inside <imageresponse>
+		if (($lctag eq 'label' && defined($parms{'description'}))
+		    ||
+		    ($lctag eq 'image')) {
 		    my $next_token=$parser[-1]->get_token();
 		    if ($next_token->[0] eq 'T') {
+                        $next_token->[1] =~ s/[\n\r\f]+//g;
 			$next_token->[1]=&set_allow(\%allow,$logfile,
 						    $target,$tag,
 						    $next_token->[1]);
@@ -641,8 +734,15 @@ sub fix_ids_and_indices {
 		}
 		if ($lctag eq 'applet') {
 		    my $codebase='';
-		    if (defined($parms{'codebase'})) {
-			my $oldcodebase=$parms{'codebase'};
+		    my $havecodebase=0;
+		    foreach my $key (keys(%parms)) {
+			if (lc($key) eq 'codebase') { 
+			    $codebase=$parms{$key};
+			    $havecodebase=1; 
+			}
+		    }
+		    if ($havecodebase) {
+			my $oldcodebase=$codebase;
 			unless ($oldcodebase=~/\/$/) {
 			    $oldcodebase.='/';
 			}
@@ -656,14 +756,13 @@ sub fix_ids_and_indices {
 			}
 			$allow{&absoluteurl($codebase,$target).'/*'}=1;
 		    } else {
-			foreach ('archive','code','object') {
-			    if (defined($parms{$_})) {
-				my $oldurl=$parms{$_};
+			foreach my $key (keys(%parms)) {
+			    if ($key =~ /(archive|code|object)/i) {
+				my $oldurl=$parms{$key};
 				my $newurl=&urlfixup($oldurl,$target);
 				$newurl=~s/\/[^\/]+$/\/\*/;
-				print $logfile 'Allow: applet '.$_.':'.
-				    $oldurl.' allows '.
-					$newurl."\n";
+				print $logfile 'Allow: applet '.lc($key).':'.
+				    $oldurl.' allows '.$newurl."\n";
 				$allow{&absoluteurl($newurl,$target)}=1;
 			    }
 			}
@@ -681,15 +780,21 @@ sub fix_ids_and_indices {
 		}
 		if (!$endtag) { if ($token->[4]=~m:/>$:) { $endtag=' /'; }; }
 		$outstring.='<'.$tag.$newparmstring.$endtag.'>';
-		if ($lctag eq 'm') {
-		    $outstring.=&get_all_text_unbalanced('/m',\@parser);
+		if ($lctag eq 'm' || $lctag eq 'script' || $lctag eq 'answer' 
+                    || $lctag eq 'display' || $lctag eq 'tex') {
+		    $outstring.=&get_all_text_unbalanced('/'.$lctag,\@parser);
 		}
 	    } elsif ($token->[0] eq 'E') {
 		if ($token->[2]) {
 		    unless ($token->[1] eq 'allow') {
 			$outstring.='</'.$token->[1].'>';
 		    }
-		}
+                }
+                if ((($token->[1] eq 'part') || ($token->[1] eq 'problem'))
+                    && (!$responsecounter)) {
+                    my $outstring='<span class="LC_error">'.&mt('Found [_1] without responses',$token->[1]).'</span>';
+                    return ($outstring,1);
+                }
 	    } else {
 		$outstring.=$token->[1];
 	    }
@@ -705,7 +810,7 @@ sub fix_ids_and_indices {
 	print $logfile "Does not need ID and/or index fixup\n";
     }
 
-    return ($outstring,%allow);
+    return ($outstring,0,%allow);
 }
 
 #########################################
@@ -727,41 +832,91 @@ Returns: (error,status).  error is undef
 #########################################
 #########################################
 sub store_metadata {
-    my %metadata = %{shift()};
+    my %metadata = @_;
     my $error;
     # Determine if the table exists
     my $status = &Apache::lonmysql::check_table('metadata');
     if (! defined($status)) {
-        $error='<font color="red">WARNING: Cannot connect to '.
-            'database!</font>';
+        $error='<span class="LC_error">WARNING: Cannot connect to '.
+            'database!</span>';
         &Apache::lonnet::logthis($error);
         return ($error,undef);
     }
     if ($status == 0) {
         # It would be nice to actually create the table....
-        $error ='<font color="red">WARNING: The metadata table does not '.
-            'exist in the LON-CAPA database.</font>';
+        $error ='<span class="LC_error">WARNING: The metadata table does not '.
+            'exist in the LON-CAPA database.</span>';
         &Apache::lonnet::logthis($error);
         return ($error,undef);
     }
-    # Remove old value from table
-    $status = &Apache::lonmysql::remove_from_table
-        ('metadata','url',$metadata{'url'});
-    if (! defined($status)) {
-        $error = '<font color="red">Error when removing old values from '.
-            'metadata table in LON-CAPA database.</font>';
-        &Apache::lonnet::logthis($error);
-        return ($error,undef);
+    my $dbh = &Apache::lonmysql::get_dbh();
+    if (($metadata{'obsolete'}) || ($metadata{'copyright'} eq 'priv') ||
+	($metadata{'copyright'} eq 'custom')) {
+        # remove this entry
+	my $delitem = 'url = '.$dbh->quote($metadata{'url'});
+	$status = &LONCAPA::lonmetadata::delete_metadata($dbh,undef,$delitem);
+                                                       
+    } else {
+        $status = &LONCAPA::lonmetadata::update_metadata($dbh,undef,undef,
+                                                         \%metadata);
     }
-    # Store data in table.
-    $status = &Apache::lonmysql::store_row('metadata',\%metadata);
-    if (! defined($status)) {
-        $error='<font color="red">Error occured storing new values in '.
-            'metadata table in LON-CAPA database</font>';
+    if (defined($status) && $status ne '') {
+        $error='<span class="LC_error">Error occured saving new values in '.
+            'metadata table in LON-CAPA database</span>';
         &Apache::lonnet::logthis($error);
+        &Apache::lonnet::logthis($status);
         return ($error,undef);
     }
-    return (undef,$status);
+    return (undef,'success');
+}
+
+
+# ========================================== Parse file for errors and warnings
+
+sub checkonthis {
+    my ($r,$source)=@_;
+    my $uri=&Apache::lonnet::hreflocation($source);
+    $uri=~s/\/$//;
+    my $result=&Apache::lonnet::ssi_body($uri,
+					 ('grade_target'=>'web',
+					  'return_only_error_and_warning_counts' => 1));
+    my ($errorcount,$warningcount)=split(':',$result);
+    if (($errorcount) || ($warningcount)) {
+        $r->print('<br /><tt>'.$uri.'</tt>: ');
+	if ($errorcount) {
+	    $r->print('<img src="/adm/lonMisc/bomb.gif" /><span class="LC_error"><b>'.
+		      $errorcount.' '.
+		      &mt('error(s)').'</b></span> ');
+	}
+	if ($warningcount) {
+	    $r->print('<font color="blue">'.
+		      $warningcount.' '.
+		      &mt('warning(s)').'</font>');
+	}
+    } else {
+	#$r->print('<font color="green">'.&mt('ok').'</font>');
+    }
+    $r->rflush();
+    return ($warningcount,$errorcount);
+}
+
+# ============================================== Parse file itself for metadata
+#
+# parses a file with target meta, sets global %metadatafields %metadatakeys 
+
+sub parseformeta {
+    my ($source,$style)=@_;
+    my $allmeta='';
+    if (($style eq 'ssi') || ($style eq 'prv')) {
+	my $dir=$source;
+	$dir=~s-/[^/]*$--;
+	my $file=$source;
+	$file=(split('/',$file))[-1];
+        $source=&Apache::lonnet::hreflocation($dir,$file);
+	$allmeta=&Apache::lonnet::ssi_body($source,('grade_target' => 'meta'));
+        &metaeval($allmeta);
+    }
+    return $allmeta;
 }
 
 #########################################
@@ -775,6 +930,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
@@ -791,13 +950,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 ('<span class="LC_error">'.&mt('No write permission to user directory, FAIL').'</span>',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
@@ -806,39 +964,46 @@ 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 ("<span class=\"LC_error\">Failed to write backup copy, $!,FAIL</span>",1);
         }
 # ------------------------------------------------------------- IDs and indices
 	
-	my $outstring;
-	($outstring,%allow)=&fix_ids_and_indices($logfile,$source,$target);
+	my ($outstring,$error);
+	($outstring,$error,%allow)=&fix_ids_and_indices($logfile,$source,
+							$target);
+	if ($error) { return ($outstring,$error); }
 # ------------------------------------------------------------ Construct Allows
     
-	$scrout.='<h3>Dependencies</h3>';
+	$scrout.='<h3>'.&mt('Dependencies').'</h3>';
         my $allowstr='';
-        foreach (sort(keys(%allow))) {
-	   my $thisdep=$_;
+        foreach my $thisdep (sort(keys(%allow))) {
 	   if ($thisdep !~ /[^\s]/) { next; }
+           if ($thisdep =~/\$/) {
+              $scrout.='<br /><span class="LC_warning">'
+                       .&mt('The resource depends on another resource with variable filename, i.e., [_1].','<tt>'.$thisdep.'</tt>').'<br />'
+                       .&mt('You likely need to explicitly allow access to all possible dependencies using the [_1]-tag.','<tt>&lt;allow&gt;</tt>')
+                       .'</span><br />';
+           }
            unless ($style eq 'rat') { 
               $allowstr.="\n".'<allow src="'.$thisdep.'" />';
 	   }
-           $scrout.='<br>';
-           unless ($thisdep=~/\*/) {
+           $scrout.='<br />';
+           if ($thisdep!~/[\*\$]/ && $thisdep!~m|^/adm/|) {
 	       $scrout.='<a href="'.$thisdep.'">';
            }
            $scrout.='<tt>'.$thisdep.'</tt>';
-           unless ($thisdep=~/\*/) {
+           if ($thisdep!~/[\*\$]/ && $thisdep!~m|^/adm/|) {
 	       $scrout.='</a>';
                if (
        &Apache::lonnet::getfile($Apache::lonnet::perlvar{'lonDocRoot'}.'/'.
                                             $thisdep.'.meta') eq '-1') {
-		   $scrout.= ' - <font color="red">Currently not available'.
-		       '</font>';
+		   $scrout.= ' - <span class="LC_error">'.&mt('Currently not available').
+		       '</span>';
                } else {
                    my %temphash=(&Apache::lonnet::declutter($target).'___'.
                              &Apache::lonnet::declutter($thisdep).'___usage'
                                  => time);
-                   $thisdep=~/^\/res\/(\w+)\/(\w+)\//;
+                   $thisdep=~m{^/res/($match_domain)/($match_username)/};
                    if ((defined($1)) && (defined($2))) {
                       &Apache::lonnet::put('nohist_resevaldata',\%temphash,
 					   $1,$2);
@@ -846,19 +1011,17 @@ sub publish {
 	       }
            }
         }
-        $outstring=~s/\n*(\<\/[^\>]+\>)\s*$/$allowstr\n$1\n/s;
+        $outstring=~s/\n*(\<\/[^\>]+\>[^<]*)$/$allowstr\n$1\n/s;
 
-	#Encode any High ASCII characters
-	$outstring=&HTML::Entities::encode($outstring,"\200-\377");
 # ------------------------------------------------------------- Write modified.
 
         {
           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 ('<span class="LC_error">'.&mt('No write permission to').
+		     ' '.$source.
+		     ', '.&mt('FAIL').'</span>',1);
 	  }
           print($org $outstring);
         }
@@ -868,43 +1031,51 @@ sub publish {
 # -------------------------------------------- Initial step done, now metadata.
 
 # --------------------------------------- Storage for metadata keys and fields.
-
+# these are globals
+#
      %metadatafields=();
      %metadatakeys=();
      
      my %oldparmstores=();
      
     unless ($batch) {
-     $scrout.='<h3>Metadata Information ' .
+     $scrout.='<h3>'.&mt('Metadata Information').' ' .
        Apache::loncommon::help_open_topic("Metadata_Description")
        . '</h3>';
     }
 
 # ------------------------------------------------ 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;
+        $metadatafields{'owner'}=$cuname.':'.$cudom;
 
 # ------------------------------------------------ Check out directory hierachy
 
         my $thisdisfn=$source;
-        $thisdisfn=~s/^\/home\/$cuname\///;
+        $thisdisfn=~s/^\/home\/\Q$cuname\E\///;
 
         my @urlparts=split(/\//,$thisdisfn);
         $#urlparts--;
 
         my $currentpath='/home/'.$cuname.'/';
 
+	my $prefix='../'x($#urlparts);
         foreach (@urlparts) {
 	    $currentpath.=$_.'/';
-            $scrout.=&metaread($logfile,$currentpath.'default.meta');
+            $scrout.=&metaread($logfile,$currentpath.'default.meta',$prefix);
+	    $prefix=~s|^\.\./||;
         }
 
+# ----------------------------------------------------------- Parse file itself
+# read %metadatafields from file itself
+ 
+	$allmeta=&parseformeta($source,$style);
+
 # ------------------- Clear out parameters and stores (there should not be any)
 
         foreach (keys %metadatafields) {
@@ -924,219 +1095,301 @@ sub publish {
 		delete $metadatafields{$_};
             }
         }
-        
-    }
-
-# -------------------------------------------------- Parse content for metadata
-    if ($style eq 'ssi') {
-        my $oldenv=$ENV{'request.uri'};
-
-        $ENV{'request.uri'}=$target;
-        $allmeta=Apache::lonxml::xmlparse(undef,'meta',$content);
-        $ENV{'request.uri'}=$oldenv;
+# ------------------------------------------------------------- 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{$_};
+	}
+   }
 
-        &metaeval($allmeta);
-    }
+       
 # ---------------- 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{$_}) {
+		    my $disp_key = $_;
+		    $disp_key =~ tr/\0/_/;
+		    print $logfile ('New: '.$disp_key."\n");
+		    $chparms .= $disp_key.' ';
+		}
+	    }
+	}
+    }
+    if ($chparms) {
+	$scrout.='<p><b>'.&mt('New parameters or saved 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+$/)) {
+		my $disp_key = $_;
+		$disp_key =~ tr/\0/_/;
+		print $logfile ('Obsolete: '.$disp_key."\n");
+		$chparms.=$disp_key.' ';
+	    }
+	}
+    }
+    if ($chparms) {
+	$scrout.='<p><b>'.&mt('Obsolete parameters or saved values').':</b> '.
+	    $chparms.'</p><h1><span class="LC_warning">'.&mt('Warning!').
+	    '</span></h1><p><span class="LC_warning">'.
+	    &mt('If this resource is in active use, student performance data from the previous version may become inaccessible.').'</span></p><hr />';
+    }
+    if ($metadatafields{'copyright'} eq 'priv') {
+        $scrout.='</p><h1><span class="LC_warning">'.&mt('Warning!').
+            '</span></h1><p><span class="LC_warning">'.
+            &mt('Copyright/distribution option "Private" is no longer supported. Select another option from below. Consider "Custom Rights" for maximum control over the usage of your resource.').'</span></p><hr />';
+    }
 
 # ------------------------------------------------------- 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 my $addkey (split(/[\"\'\,\;]/,$metadatafields{'keywords'})) {
+	$addkey=~s/\s+/ /g;
+	$addkey=~s/^\s//;
+	$addkey=~s/\s$//;
+	if ($addkey=~/\w/) {
+	    $keywords{$addkey}=1;
+	}
+    }
 # --------------------------------------------------- Now we also have keywords
 # =============================================================================
-# INTERACTIVE MODE
-#
-   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'});
-
-# --------------------------------------------------- Scan content for keywords
-
-        my $keywords_help = Apache::loncommon::help_open_topic("Publishing_Keywords");
-	my $keywordout=<<"END";
+# 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
+#    batch mode
+
+    my $intr_scrout.=
+	'<form name="pubform" action="/adm/publish" method="post">'.
+	'<p>'.($env{'form.makeobsolete'}?'':'<input type="submit" value="'.&mt('Finalize Publication').'" />').'</p>'.
+	&hiddenfield('phase','two').
+	&hiddenfield('filename',$env{'form.filename'}).
+	&hiddenfield('allmeta',&escape($allmeta)).
+	&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
+
+    my $keywords_help = Apache::loncommon::help_open_topic("Publishing_Keywords");
+    my $KEYWORDS=&mt('Keywords');
+    my $CheckAll=&mt('check all');
+    my $UncheckAll=&mt('uncheck all');
+    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="$CheckAll" onclick="javascript:checkAll(document.pubform.keywords)" /> 
+<input type="button" value="$UncheckAll" 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'}=~/$_/) { 
-                      $keywordout.=' checked'; 
-                   }
-	        } elsif (&Apache::loncommon::keyword($_)) {
-	            $keywordout.=' checked';
-                } 
-                $keywordout.='>'.$_.'</td>';
-                if ($colcount>10) {
-		    $keywordout.="</tr><tr>\n";
-                    $colcount=0;
-                }
-                $colcount++;
-            }
-        
-	$keywordout.='</tr></table>';
+    foreach (sort keys %keywords) {
+	$keywordout.='<td><label><input type="checkbox" name="keywords" value="'.$_.'"';
+	if ($metadatafields{'keywords'}) {
+	    if ($metadatafields{'keywords'}=~/\Q$_\E/) {
+		$keywordout.=' checked="on"';
+		$env{'form.keywords'}.=$_.',';
+	    }
+	} elsif (&Apache::loncommon::keyword($_)) {
+	    $keywordout.=' checked="on"';
+	    $env{'form.keywords'}.=$_.',';
+	}
+	$keywordout.=' />'.$_.'</label></td>';
+	if ($colcount>10) {
+	    $keywordout.="</tr><tr>\n";
+	    $colcount=0;
+	}
+	$colcount++;
+    }
+    $env{'form.keywords'}=~s/\,$//;
+
+    $keywordout.='</tr></table>';
+
+    $intr_scrout.=$keywordout;
+
+    $intr_scrout.=&textfield('Additional Keywords','addkey','');
+
+    $intr_scrout.=&textfield('Notes','notes',$metadatafields{'notes'});
+
+    $intr_scrout.=
+	"\n<p><font color=\"#800000\" face=\"helvetica\"><b>".&mt('Abstract').":".
+	"</b></font></p><br />".
+	'<textarea cols="80" rows="5" name="abstract">'.
+	$metadatafields{'abstract'}.'</textarea></p>';
+
+    $source=~/\.(\w+)$/;
 
-        $scrout.=$keywordout;
 
-        $scrout.=&textfield('Additional Keywords','addkey','');
+    $intr_scrout.=
+	"\n<p><font color=\"#800000\" face=\"helvetica\"><b>".
+	&mt('Lowest Grade Level').':'.
+	"</b></font></p><br />".
+	&select_level_form($metadatafields{'lowestgradelevel'},'lowestgradelevel').
+	"\n<p><font color=\"#800000\" face=\"helvetica\"><b>".
+	&mt('Highest Grade Level').':'.
+	"</b></font></p><br />".
+	&select_level_form($metadatafields{'highestgradelevel'},'highestgradelevel').
+	&textfield('Standards','standards',$metadatafields{'standards'});
 
-        $scrout.=&textfield('Notes','notes',$metadatafields{'notes'});
 
-        $scrout.=
-             '<p><b>Abstract:</b><br><textarea cols=80 rows=5 name=abstract>'.
-              $metadatafields{'abstract'}.'</textarea>';
 
-	$source=~/\.(\w+)$/;
 
-	$scrout.=&hiddenfield('mime',$1);
+    $intr_scrout.=&hiddenfield('mime',$1);
 
-        $scrout.=&selectbox('Language','language',
-                            $metadatafields{'language'},
-			    \&Apache::loncommon::languagedescription,
-			    (&Apache::loncommon::languageids),
+    my $defaultlanguage=$metadatafields{'language'};
+    $defaultlanguage =~ s/\s*notset\s*//g;
+    $defaultlanguage =~ s/^,\s*//g;
+    $defaultlanguage =~ s/,\s*$//g;
+
+    $intr_scrout.=&selectbox('Language','language',
+			     $defaultlanguage,
+			     \&Apache::loncommon::languagedescription,
+			     (&Apache::loncommon::languageids),
 			     );
 
-        unless ($metadatafields{'creationdate'}) {
-	    $metadatafields{'creationdate'}=time;
-        }
-        $scrout.=&hiddenfield('creationdate',
-              &Apache::loncommon::unsqltime($metadatafields{'creationdate'}));
+    unless ($metadatafields{'creationdate'}) {
+	$metadatafields{'creationdate'}=time;
+    }
+    $intr_scrout.=&hiddenfield('creationdate',
+			       &Apache::lonmysql::unsqltime($metadatafields{'creationdate'}));
+
+    $intr_scrout.=&hiddenfield('lastrevisiondate',time);
 
-        $scrout.=&hiddenfield('lastrevisiondate',time);
 
-			   
-	$scrout.=&textfield('Publisher/Owner','owner',
-                            $metadatafields{'owner'});
+    $intr_scrout.=&textfield('Publisher/Owner','owner',
+			     $metadatafields{'owner'});
 
+# ---------------------------------------------- Retrofix for unused copyright
+    if ($metadatafields{'copyright'} eq 'free') {
+	$metadatafields{'copyright'}='default';
+	$metadatafields{'sourceavail'}='open';
+    }
+    if ($metadatafields{'copyright'} eq 'priv') {
+        $metadatafields{'copyright'}='domain';
+    }
+# ------------------------------------------------ Dial in reasonable defaults
+    my $defaultoption=$metadatafields{'copyright'};
+    unless ($defaultoption) { $defaultoption='default'; }
+    my $defaultsourceoption=$metadatafields{'sourceavail'};
+    unless ($defaultsourceoption) { $defaultsourceoption='closed'; }
+    unless ($style eq 'prv') {
 # -------------------------------------------------- Correct copyright for rat.
-    if ($style eq 'rat') {
-	if ($metadatafields{'copyright'} eq 'public') { 
-	    delete $metadatafields{'copyright'};
-	}
-        $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>';
-# =============================================================================
-# BATCH MODE
-#
-  } else {
-# Transfer metadata directly to environment for stage 2
-    foreach (keys %metadatafields) {
-	$ENV{'form.'.$_}=$metadatafields{$_};
-    }
-    $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'}.=$_.',';
-        } 
+	if ($style eq 'rat') {
+# -------------------------------------- Retrofix for non-applicable copyright
+	    if ($metadatafields{'copyright'} eq 'public') { 
+		delete $metadatafields{'copyright'};
+		$defaultoption='default';
+	    }
+	    $intr_scrout.=&selectbox('Copyright/Distribution','copyright',
+				     $defaultoption,
+				     \&Apache::loncommon::copyrightdescription,
+				    (grep !/^(public|priv)$/,(&Apache::loncommon::copyrightids)));
+	} else {
+	    $intr_scrout.=&selectbox('Copyright/Distribution','copyright',
+				     $defaultoption,
+				     \&Apache::loncommon::copyrightdescription,
+				     (grep !/^priv$/,(&Apache::loncommon::copyrightids)));
+	}
+	my $copyright_help =
+	    Apache::loncommon::help_open_topic('Publishing_Copyright');
+	$intr_scrout =~ s/Distribution:/'Distribution: ' . $copyright_help/ge;
+	$intr_scrout.=&text_with_browse_field('Custom Distribution File','customdistributionfile',$metadatafields{'customdistributionfile'},'rights').$copyright_help;
+	$intr_scrout.=&selectbox('Source Distribution','sourceavail',
+				 $defaultsourceoption,
+				 \&Apache::loncommon::source_copyrightdescription,
+				 (&Apache::loncommon::source_copyrightids));
+#	$intr_scrout.=&text_with_browse_field('Source Custom Distribution File','sourcerights',$metadatafields{'sourcerights'},'rights');
+	my $uctitle=&mt('Obsolete');
+	$intr_scrout.=
+	    "\n<p><label><font color=\"#800000\" face=\"helvetica\"><b>$uctitle:".
+	    '</b></font> <input type="checkbox" name="obsolete" ';
+	if ($metadatafields{'obsolete'}) {
+	    $intr_scrout.=' checked="1" ';
+	}
+	$intr_scrout.='/ ></label></p>'.
+	    &text_with_browse_field('Suggested Replacement for Obsolete File',
+				    'obsoletereplacement',
+				    $metadatafields{'obsoletereplacement'});
+    } else {
+	$intr_scrout.=&hiddenfield('copyright','private');
     }
-    $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;
-  }
+   } 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($env{'form.makeobsolete'}?'Make Obsolete':'Finalize Publication').'" /></p></form>';
+    }
+    return($scrout,0);
 }
 
 #########################################
@@ -1167,10 +1420,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
 
@@ -1182,51 +1435,109 @@ sub phasetwo {
     my ($r,$source,$target,$style,$distarget,$batch)=@_;
     $source=~s/\/+/\//g;
     $target=~s/\/+/\//g;
+#
+# Unless trying to get rid of something, check name validity
+#
+    unless ($env{'form.obsolete'}) {
+	if ($target=~/(\_\_\_|\&\&\&|\:\:\:)/) {
+	    $r->print('<span class="LC_error">'.
+		      &mt('Unsupported character combination [_1] in filename, FAIL.',"<tt>'.$1.'</tt>").
+		      '</span>');
+	    return 0;
+	}
+	unless ($target=~/\.(\w+)$/) {
+	    $r->print('<span class="LC_error">'.&mt('No valid extension found in filename, FAIL').'</span>');
+	    return 0;
+	}
+	if ($target=~/\.(\d+)\.(\w+)$/) {
+	    $r->print('<span class="LC_error">'.&mt('Cannot publish versioned resource, FAIL').'</span>');
+	    return 0;
+	}
+    }
+
+#
+# End name check
+#
     $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(
+        '<span class="LC_error">'.
+		&mt('No write permission to user directory, FAIL').'</span>');
+        return 0;
     }
+    
+    if ($source =~ /\.rights$/) {
+	$r->print('<p><span class="LC_warning">'.&mt('Warning: It can take up to 1 hour for rights changes to fully propagate.').'</span></p>');
+    }
+
     print $logfile 
-        "\n================= Publish ".localtime()." Phase Two  ================\n";
+        "\n================= Publish ".localtime()." Phase Two  ================\n".$env{'user.name'}.':'.$env{'user.domain'}."\n";
     
     %metadatafields=();
     %metadatakeys=();
+
+    &metaeval(&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{'dependencies'}=$ENV{'form.dependencies'};
+    $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'};
+    $metadatafields{'obsoletereplacement'}=
+	                        $env{'form.obsoletereplacement'};
+    $metadatafields{'dependencies'}=$env{'form.dependencies'};
+    $metadatafields{'modifyinguser'}=$env{'user.name'}.':'.
+	                                 $env{'user.domain'};
+    $metadatafields{'authorspace'}=$cuname.':'.$cudom;
+    $metadatafields{'domain'}=$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/\W+/\,/;
-    $allkeywords=~s/^\,//;
+    $allkeywords=~s/[\"\']//g;
+    $allkeywords=~s/\s*[\;\,]\s*/\,/g;
+    $allkeywords=~s/\s+/ /g;
+    $allkeywords=~s/^[ \,]//;
+    $allkeywords=~s/[ \,]$//;
     $metadatafields{'keywords'}=$allkeywords;
     
+# check if custom distribution file is specified
+    if ($metadatafields{'copyright'} eq 'custom') {
+	my $file=$metadatafields{'customdistributionfile'};
+	unless ($file=~/\.rights$/) {
+            $r->print(
+                '<span class="LC_error">'.&mt('No valid custom distribution rights file specified, FAIL').
+		'</span>');
+	    return 0;
+        }
+    }
     {
         print $logfile "\nWrite metadata file for ".$source;
         my $mfh;
         unless ($mfh=Apache::File->new('>'.$source.'.meta')) {
-            return 
-                '<font color=red>Could not write metadata, FAIL</font>';
+            $r->print( 
+                '<span class="LC_error">'.&mt('Could not write metadata, FAIL').
+		'</span>');
+	    return 0;
         }
         foreach (sort keys %metadatafields) {
             unless ($_=~/\./) {
@@ -1241,11 +1552,11 @@ sub phasetwo {
                     print $mfh ' '.$_.'="'.$value.'"';
                 }
                 print $mfh '>'.
-                    &HTML::Entities::encode($metadatafields{$unikey})
+                    &HTML::Entities::encode($metadatafields{$unikey},'<>&"')
                         .'</'.$tag.'>';
             }
         }
-        $r->print('<p>Wrote Metadata');
+        $r->print('<p>'.&mt('Wrote Metadata').'</p>');
         print $logfile "\nWrote metadata";
     }
     
@@ -1253,20 +1564,19 @@ sub phasetwo {
 
     $metadatafields{'url'} = $distarget;
     $metadatafields{'version'} = 'current';
-    unless ($metadatafields{'copyright'} eq 'priv') {
-        my ($error,$success) = &store_metadata(\%metadatafields);
-        if ($success) {
-            $r->print('<p>Synchronized SQL metadata database');
-            print $logfile "\nSynchronized SQL metadata database";
-        } else {
-            $r->print($error);
-            print $logfile "\n".$error;
-        }
+
+    my ($error,$success) = &store_metadata(%metadatafields);
+    if ($success) {
+	$r->print('<p>'.&mt('Synchronized SQL metadata database').'</p>');
+	print $logfile "\nSynchronized SQL metadata database";
     } else {
-        $r->print('<p>Private Publication - did not synchronize database');
-        print $logfile "\nPrivate: Did not synchronize data into ".
-            "SQL metadata database";
+	$r->print($error);
+	print $logfile "\n".$error;
     }
+# --------------------------------------------- Delete author resource messages
+    my $delresult=&Apache::lonmsg::del_url_author_res_msg($target); 
+    $r->print('<p>'.&mt('Removing error messages:').' '.$delresult.'</p>');
+    print $logfile "\nRemoving error messages: $delresult";
 # ----------------------------------------------------------- Copy old versions
    
     if (-e $target) {
@@ -1278,7 +1588,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(
+	 "<span class=\"LC_error\">Invalid target directory, FAIL</span>");
+	    return 0;
         }
         opendir(DIR,$srcd);
         while ($filename=readdir(DIR)) {
@@ -1286,24 +1598,26 @@ 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>'.&mt('Copied old target file').'</p>');
         } else {
 	    print $logfile "Unable to write ".$copyfile.':'.$!."\n";
-            return "<font color=red>Failed to copy old target, $!, FAIL</font>";
+            $r->print("<span class=\"LC_error\">".&mt('Failed to copy old target').
+		", $!, ".&mt('FAIL')."</span>");
+	    return 0;
         }
         
 # --------------------------------------------------------------- Copy Metadata
@@ -1312,18 +1626,20 @@ 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>'.&mt('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>";
+                $r->print( 
+                    "<span class=\"LC_error\">".
+&mt('Failed to write old metadata copy').", $!, ".&mt('FAIL')."</span>");
+		return 0;
 	    }
         }
         
         
     } else {
-        $r->print('<p>Initial version');
+        $r->print('<p>'.&mt('Initial version').'</p>');
         print $logfile "\nInitial version";
     }
 
@@ -1338,17 +1654,19 @@ sub phasetwo {
         $path.="/$parts[$count]";
         if ((-e $path)!=1) {
             print $logfile "\nCreating directory ".$path;
-            $r->print('<p>Created directory '.$parts[$count]);
+            $r->print('<p>'.&mt('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>'.&mt('Copied source file').'</p>');
     } else {
         print $logfile "\nUnable to write ".$copyfile.':'.$!."\n";
-        return "<font color=red>Failed to copy source, $!, FAIL</font>";
+        $r->print("<span class=\"LC_error\">".
+	    &mt('Failed to copy source').", $!, ".&mt('FAIL')."</span>");
+	return 0;
     }
     
 # --------------------------------------------------------------- Copy Metadata
@@ -1357,73 +1675,97 @@ sub phasetwo {
     
     if (copy($source.'.meta',$copyfile)) {
         print $logfile "\nCopied original metadata to ".$copyfile."\n";
-        $r->print('<p>Copied metadata');
+        $r->print('<p>'.&mt('Copied metadata').'</p>');
     } else {
         print $logfile "\nUnable to write metadata ".$copyfile.':'.$!."\n";
-        return 
-            "<font color=red>Failed to write metadata copy, $!, FAIL</font>";
+        $r->print(
+            "<span class=\"LC_error\">".&mt('Failed to write metadata copy').", $!, ".&mt('FAIL')."</span>");
+	return 0;
     }
     $r->rflush;
-# --------------------------------------------------- Send update notifications
 
-    my @subscribed=&get_subscribed_hosts($target);
-    foreach my $subhost (@subscribed) {
-	$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;
-	print $logfile $reply;
+# ------------------------------------------------------------- Trigger updates
+    push(@{$modified_urls},[$target,$source]);
+    unless ($registered_cleanup) {
+	$r->register_cleanup(\&notify);
+	$registered_cleanup=1;
     }
-    
-# ---------------------------------------- Send update notifications, meta only
 
-    my @subscribedmeta=&get_subscribed_hosts("$target.meta");
-    foreach my $subhost (@subscribedmeta) {
-	$r->print('<p>Notifying host for metadata only '.$subhost.':');$r->rflush;
-	print $logfile "\nNotifying host for metadata only ".$subhost.':';
-	my $reply=&Apache::lonnet::critical('update:'.$target.'.meta',
-					    $subhost);
-	$r->print($reply.'<br />');$r->rflush;
-	print $logfile $reply;
-    }
-    
-# --------------------------------------------------- Notify subscribed courses
-    my %courses=&coursedependencies($target);
-    my $now=time;
-    foreach (keys %courses) {
-	$r->print('<p>Notifying course '.$_.':');$r->rflush;
-	print $logfile "\nNotifying host ".$_.':';
-        my ($cdom,$cname)=split(/\_/,$_);
-	my $reply=&Apache::lonnet::cput
-                  ('versionupdate',{$target => $now},$cdom,$cname);
-	$r->print($reply.'<br />');$r->rflush;
-	print $logfile $reply;
-    }
+# ---------------------------------------------------------- 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/^$docroot//;
         
         my $thissrc=$source;
-        $thissrc=~s/^\/home\/(\w+)\/public_html/\/priv\/$1/;
+        $thissrc=~s{^/home/($match_username)/public_html}{/priv/$1};
         
         my $thissrcdir=$thissrc;
         $thissrcdir=~s/\/[^\/]+$/\//;
         
         
         $r->print(
-           '<hr><a href="'.$thisdistarget.'"><font size="+2">'.
-           'View Published Version</font></a>'.
-           '<p><a href="'.$thissrc.'"><font size=+2>Back to Source</font></a>'.
+           '<hr /><a href="'.$thisdistarget.'"><font size="+2">'.
+           &mt('View Published Version').'</font></a>'.
+           '<p><a href="'.$thissrc.'"><font size=+2>'.
+		  &mt('Back to Source').'</font></a></p>'.
            '<p><a href="'.$thissrcdir.
-                   '"><font size="+2">Back to Source Directory</font></a>');
+                   '"><font size="+2">'.
+		  &mt('Back to Source Directory').'</font></a></p>');
     }
+    $logfile->close();
+    $r->print('<p><font color="green">'.&mt('Done').'</font></p>');
+    return 1;
+}
+
+# =============================================================== Notifications
+sub notify {  
+# --------------------------------------------------- Send update notifications
+    foreach my $targetsource (@{$modified_urls}){
+	my ($target,$source)=@{$targetsource};
+	my $logfile=Apache::File->new('>>'.$source.'.log');
+	print $logfile "\nCleanup phase: Notifications\n";
+	my @subscribed=&get_subscribed_hosts($target);
+	foreach my $subhost (@subscribed) {
+	    print $logfile "\nNotifying host ".$subhost.':';
+	    my $reply=&Apache::lonnet::critical('update:'.$target,$subhost);
+	    print $logfile $reply;
+	}
+# ---------------------------------------- Send update notifications, meta only
+	my @subscribedmeta=&get_subscribed_hosts("$target.meta");
+	foreach my $subhost (@subscribedmeta) {
+	    print $logfile "\nNotifying host for metadata only ".$subhost.':';
+	    my $reply=&Apache::lonnet::critical('update:'.$target.'.meta',
+						$subhost);
+	    print $logfile $reply;
+	} 
+# --------------------------------------------------- Notify subscribed courses
+	my %courses=&coursedependencies($target);
+	my $now=time;
+	foreach (keys %courses) {
+	    print $logfile "\nNotifying course ".$_.':';
+	    my ($cdom,$cname)=split(/\_/,$_);
+	    my $reply=&Apache::lonnet::cput
+		('versionupdate',{$target => $now},$cdom,$cname);
+	    print $logfile $reply;
+	}
+	print $logfile "\n============ Done ============\n";
+	$logfile->close();
+    }
+    if ($lock) { &Apache::lonnet::remove_lock($lock); }
+    return OK;
 }
 
 #########################################
 
 sub batchpublish {
     my ($r,$srcfile,$targetfile)=@_;
+    #publication pollutes %env with form.* values
+    my %oldenv=%env;
     $srcfile=~s/\/+/\//g;
     $targetfile=~s/\/+/\//g;
     my $thisdisfn=$srcfile;
@@ -1432,30 +1774,32 @@ sub batchpublish {
 
     my $docroot=$r->dir_config('lonDocRoot');
     my $thisdistarget=$targetfile;
-    $thisdistarget=~s/^$docroot//;
+    $thisdistarget=~s/^\Q$docroot\E//;
 
 
-    undef %metadatafields;
-    undef %metadatakeys;
-     %metadatafields=();
-     %metadatakeys=();
-      $srcfile=~/\.(\w+)$/;
-      my $thistype=$1;
+    %metadatafields=();
+    %metadatakeys=();
+    $srcfile=~/\.(\w+)$/;
+    my $thistype=$1;
 
 
-      my $thisembstyle=&Apache::loncommon::fileembstyle($thistype);
+    my $thisembstyle=&Apache::loncommon::fileembstyle($thistype);
      
-    $r->print('<h2>Publishing <tt>'.$thisdisfn.'</tt></h2>');
+    $r->print('<h2>'.&mt('Publishing').' <tt>'.$thisdisfn.'</tt></h2>');
 
 # 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>');
+# $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;
     return '';
 }
 
@@ -1466,53 +1810,129 @@ sub publishdirectory {
     $fn=~s/\/+/\//g;
     $thisdisfn=~s/\/+/\//g;
     my $resdir=
-    $Apache::lonnet::perlvar{'lonDocRoot'}.'/res/'.$cudom.'/'.$cuname.'/'.
-      $thisdisfn;
-      $r->print('<h1>Directory <tt>'.$thisdisfn.'</tt></h1>'.
-                '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!~/\~$/)) {
+	$Apache::lonnet::perlvar{'lonDocRoot'}.'/res/'.$cudom.'/'.$cuname.'/'.
+	$thisdisfn;
+    $r->print('<h1>'.&mt('Directory').' <tt>'.$thisdisfn.'</tt></h1>'.
+	      &mt('Target').': <tt>'.$resdir.'</tt><br />');
+
+    my $dirptr=16384;		# Mask indicating a directory in stat.cmode.
+    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('obsolete','make file(s) obsolete').
+		  &checkbox('forceoverride','force directory level catalog information over existing').
+		  '<br /><input type="submit" value="'.&mt('Publish Directory').'" /></form>');
+        $lock=0;
+    } else {
+        unless ($lock) { $lock=&Apache::lonnet::set_lock(&mt('Publishing [_1]',$fn)); }
+# 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) {
+		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;
+		    }
+		    my $meta_cmtime = (stat($fn.'/'.$filename.'.meta'))[9];
+		    my $meta_rmtime = (stat($resdir.'/'.$filename.'.meta'))[9];
+		    if ( $meta_rmtime<$meta_cmtime ) {
+			$publishthis=1;
+		    }
+		} else {
 # never published
-		 $publishthis=1;
-	     }
-             if ($publishthis) {
-                &batchpublish($r,$fn.'/'.$filename,$resdir.'/'.$filename);
-	     } else {
-                 $r->print('<br />Skipping '.$filename.'<br />');
-             }
-             $r->rflush();
-         }
-      }
-      closedir(DIR);
+		    $publishthis=1;
+		}
+		
+		if ($publishthis) {
+		    &batchpublish($r,$fn.'/'.$filename,$resdir.'/'.$filename);
+		} else {
+		    $r->print('<br />'.&mt('Skipping').' '.$filename.'<br />');
+		}
+		$r->rflush();
+	    }
+	}
+	closedir(DIR);
+    }
+}
+
+#########################################
+# publish a default.meta file
+
+sub defaultmetapublish {
+    my ($r,$fn,$cuname,$cudom)=@_;
+    $fn=~s/^\/\~$cuname\//\/home\/$cuname\/public_html\//;
+    unless (-e $fn) {
+       return HTTP_NOT_FOUND;
+    }
+    my $target=$fn;
+    $target=~s/^\/home\/$cuname\/public_html\//$Apache::lonnet::perlvar{'lonDocRoot'}\/res\/$cudom\/$cuname\//;
+
+
+    &Apache::loncommon::content_type($r,'text/html');
+    $r->send_http_header;
+
+    $r->print(&Apache::loncommon::start_page('Catalog Information Publication'));
+
+# ---------------------------------------------------------------- Write Source
+    my $copyfile=$target;
+    
+    my @parts=split(/\//,$copyfile);
+    my $path="/$parts[1]/$parts[2]/$parts[3]/$parts[4]";
+    
+    my $count;
+    for ($count=5;$count<$#parts;$count++) {
+        $path.="/$parts[$count]";
+        if ((-e $path)!=1) {
+            $r->print('<p>'.&mt('Created directory').' '.$parts[$count].'</p>');
+            mkdir($path,0777);
+        }
+    }
+    
+    if (copy($fn,$copyfile)) {
+        $r->print('<p>'.&mt('Copied source file').'</p>');
+    } else {
+        return "<span class=\"LC_error\">".
+	    &mt('Failed to copy source').", $!, ".&mt('FAIL')."</span>";
+    }
+
+# --------------------------------------------------- Send update notifications
+
+    my @subscribed=&get_subscribed_hosts($target);
+    foreach my $subhost (@subscribed) {
+	$r->print('<p>'.&mt('Notifying host').' '.$subhost.':');$r->rflush;
+	my $reply=&Apache::lonnet::critical('update:'.$target,$subhost);
+	$r->print($reply.'</p><br />');$r->rflush;
+    }
+# ------------------------------------------------------------------- Link back
+    my $link=$fn;
+    $link=~s/^\/home\/$cuname\/public_html\//\/priv\/$cuname\//;
+    $r->print("<a href='$link'>".&mt('Back to Catalog Information').'</a>');
+    $r->print(&Apache::loncommon::end_page());
+    return OK;
 }
 #########################################
 
@@ -1555,162 +1975,193 @@ Publishing from $thisfn to $thistarget w
 #########################################
 #########################################
 sub handler {
-  my $r=shift;
+    my $r=shift;
 
-  if ($r->header_only) {
-     $r->content_type('text/html');
-     $r->send_http_header;
-     return OK;
-  }
+    if ($r->header_only) {
+	&Apache::loncommon::content_type($r,'text/html');
+	$r->send_http_header;
+	return OK;
+    }
 
 # Get query string for limited number of parameters
 
     &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
                                             ['filename']);
 
+# -------------------------------------- Flag and buffer for registered cleanup
+    $registered_cleanup=0;
+    @{$modified_urls}=();
 # -------------------------------------------------------------- Check filename
 
-  my $fn=$ENV{'form.filename'};
+    my $fn=&unescape($env{'form.filename'});
+
+    ($cuname,$cudom)=
+	&Apache::loncacc::constructaccess($fn,$r->dir_config('lonDefDomain'));
 
+# special publication: default.meta file
+    if ($fn=~/\/default.meta$/) {
+	return &defaultmetapublish($r,$fn,$cuname,$cudom); 
+    }
+    $fn=~s/\.meta$//;
   
-  unless ($fn) { 
-     $r->log_reason($cuname.' at '.$cudom.
-         ' trying to publish empty filename', $r->filename); 
-     return HTTP_NOT_FOUND;
-  } 
-
-  ($cuname,$cudom)=
-    &Apache::loncacc::constructaccess($fn,$r->dir_config('lonDefDomain'));
-  unless (($cuname) && ($cudom)) {
-     $r->log_reason($cuname.' at '.$cudom.
-         ' trying to publish file '.$ENV{'form.filename'}.
-         ' ('.$fn.') - not authorized', 
-         $r->filename); 
-     return HTTP_NOT_ACCEPTABLE;
-  }
-
-  unless (&Apache::lonnet::homeserver($cuname,$cudom) 
-          eq $r->dir_config('lonHostID')) {
-     $r->log_reason($cuname.' at '.$cudom.
-         ' trying to publish file '.$ENV{'form.filename'}.
-         ' ('.$fn.') - not homeserver ('.
-         &Apache::lonnet::homeserver($cuname,$cudom).')', 
-         $r->filename); 
-     return HTTP_NOT_ACCEPTABLE;
-  }
-
-  $fn=~s/^http\:\/\/[^\/]+//;
-  $fn=~s/^\/\~(\w+)/\/home\/$1\/public_html/;
-
-  my $targetdir='';
-  $docroot=$r->dir_config('lonDocRoot'); 
-  if ($1 ne $cuname) {
-     $r->log_reason($cuname.' at '.$cudom.
-         ' trying to publish unowned file '.$ENV{'form.filename'}.
-         ' ('.$fn.')', 
-         $r->filename); 
-     return HTTP_NOT_ACCEPTABLE;
-  } else {
-      $targetdir=$docroot.'/res/'.$cudom;
-  }
+    unless ($fn) { 
+	$r->log_reason($cuname.' at '.$cudom.
+		       ' trying to publish empty filename', $r->filename); 
+	return HTTP_NOT_FOUND;
+    } 
+
+    unless (($cuname) && ($cudom)) {
+	$r->log_reason($cuname.' at '.$cudom.
+		       ' trying to publish file '.$env{'form.filename'}.
+		       ' ('.$fn.') - not authorized', 
+		       $r->filename); 
+	return HTTP_NOT_ACCEPTABLE;
+    }
+
+    my $home=&Apache::lonnet::homeserver($cuname,$cudom);
+    my $allowed=0;
+    my @ids=&Apache::lonnet::current_machine_ids();
+    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'}.
+		       ' ('.$fn.') - not homeserver ('.$home.')', 
+		       $r->filename); 
+	return HTTP_NOT_ACCEPTABLE;
+    }
+
+    $fn=~s{^http://[^/]+}{};
+    $fn=~s{^/~($match_username)}{/home/$1/public_html};
+
+    my $targetdir='';
+    $docroot=$r->dir_config('lonDocRoot'); 
+    if ($1 ne $cuname) {
+	$r->log_reason($cuname.' at '.$cudom.
+		       ' trying to publish unowned file '.
+		       $env{'form.filename'}.' ('.$fn.')', 
+		       $r->filename); 
+	return HTTP_NOT_ACCEPTABLE;
+    } else {
+	$targetdir=$docroot.'/res/'.$cudom;
+    }
                                  
   
-  unless (-e $fn) { 
-     $r->log_reason($cuname.' at '.$cudom.
-         ' trying to publish non-existing file '.$ENV{'form.filename'}.
-         ' ('.$fn.')', 
-         $r->filename); 
-     return HTTP_NOT_FOUND;
-  } 
-
-unless ($ENV{'form.phase'} eq 'two') {
+    unless (-e $fn) { 
+	$r->log_reason($cuname.' at '.$cudom.
+		       ' trying to publish non-existing file '.
+		       $env{'form.filename'}.' ('.$fn.')', 
+		       $r->filename); 
+	return HTTP_NOT_FOUND;
+    } 
 
 # -------------------------------- File is there and owned, init lookup tables.
 
-  %addid=();
+    %addid=();
+    
+    {
+	my $fh=Apache::File->new($r->dir_config('lonTabDir').'/addid.tab');
+	while (<$fh>=~/(\w+)\s+(\w+)/) {
+	    $addid{$1}=$2;
+	}
+    }
 
-  {
-      my $fh=Apache::File->new($r->dir_config('lonTabDir').'/addid.tab');
-      while (<$fh>=~/(\w+)\s+(\w+)/) {
-          $addid{$1}=$2;
-      }
-  }
-
-  %nokey=();
-
-  {
-     my $fh=Apache::File->new($r->dir_config('lonIncludes').'/un_keyword.tab');
-      while (<$fh>) {
-          my $word=$_;
-          chomp($word);
-          $nokey{$word}=1;
-      }
-  }
+    %nokey=();
 
-}
+    {
+	my $fh=Apache::File->new($r->dir_config('lonIncludes').'/un_keyword.tab');
+	while (<$fh>) {
+	    my $word=$_;
+	    chomp($word);
+	    $nokey{$word}=1;
+	}
+    }
 
 # ---------------------------------------------------------- Start page output.
 
-  $r->content_type('text/html');
-  $r->send_http_header;
-
-  $r->print('<html><head><title>LON-CAPA Publishing</title></head>');
-  $r->print(&Apache::loncommon::bodytag('Resource Publication'));
+    &Apache::loncommon::content_type($r,'text/html');
+    $r->send_http_header;
+    
+    my $js='<script type="text/javascript">'.
+	&Apache::loncommon::browser_and_searcher_javascript().
+	'</script>';
+    $r->print(&Apache::loncommon::start_page('Resource Publication',$js));
 
 
-  my $thisfn=$fn;
+    my $thisfn=$fn;
 
-  my $thistarget=$thisfn;
+    my $thistarget=$thisfn;
       
-  $thistarget=~s/^\/home/$targetdir/;
-  $thistarget=~s/\/public\_html//;
+    $thistarget=~s/^\/home/$targetdir/;
+    $thistarget=~s/\/public\_html//;
 
-  my $thisdistarget=$thistarget;
-  $thisdistarget=~s/^$docroot//;
+    my $thisdistarget=$thistarget;
+    $thisdistarget=~s/^\Q$docroot\E//;
 
-  my $thisdisfn=$thisfn;
-  $thisdisfn=~s/^\/home\/$cuname\/public_html\///;
+    my $thisdisfn=$thisfn;
+    $thisdisfn=~s/^\/home\/\Q$cuname\E\/public_html\///;
 
-  if ($fn=~/\/$/) {
+    if ($fn=~/\/$/) {
 # -------------------------------------------------------- This is a directory
-      &publishdirectory($r,$fn,$thisdisfn);
+	&publishdirectory($r,$fn,$thisdisfn);
+	$r->print('<hr /><a href="/priv/'
+		  .$cuname.'/'.$thisdisfn
+		  .'">'.&mt('Return to Directory').'</a>');
 
-  } else {
+
+    } else {
 # ---------------------- Evaluate individual file, and then output information.
-      $thisfn=~/\.(\w+)$/;
-      my $thistype=$1;
-      my $thisembstyle=&Apache::loncommon::fileembstyle($thistype);
-
-      $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>');
+	$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>');
+
+	$r->print(<<ENDCAPTION);
+<a href='javascript:void(window.open("/~$cuname/$thisdisfn","cat","height=300,width=500,scrollbars=1,resizable=1,menubar=0,location=1"))'>
+$thisdisfn</a>
+ENDCAPTION
+        $r->print('</tt></h2><b>'.&mt('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.
-		    '</font></h3>');
-      }
-
-      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>');
-      }
+	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>');
+	}
+
+	if (&Apache::loncommon::fileembstyle($thistype) eq 'ssi') {
+	    $r->print(<<ENDDIFF);
+<br />
+<a href='javascript:void(window.open("/adm/diff?filename=/~$cuname/$thisdisfn&versiontwo=priv","cat","height=300,width=500,scrollbars=1,resizable=1,menubar=0,location=1"))'>
+ENDDIFF
+            $r->print(&mt('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));
-       } else {
-           $r->print('<hr />');
-           &phasetwo($r,$thisfn,$thistarget,$thisembstyle,$thisdistarget); 
-       }  
-
-  }
-  $r->print('</body></html>');
+	unless ($env{'form.phase'} eq 'two') {
+# ---------------------------------------------------------- Parse for problems
+	    my ($warningcount,$errorcount);
+	    if ($thisembstyle eq 'ssi') {
+		($warningcount,$errorcount)=&checkonthis($r,$thisfn);
+	    }
+	    unless ($errorcount) {
+		my ($outstring,$error)=
+		    &publish($thisfn,$thistarget,$thisembstyle);
+		$r->print('<hr />'.$outstring);
+	    } else {
+		$r->print('<h3>'.
+			  &mt('The document contains errors and cannot be published.').
+			  '</h3>');
+	    }
+	} else {
+	    &phasetwo($r,$thisfn,$thistarget,$thisembstyle,$thisdistarget); 
+	    $r->print('<hr />');
+	}
+    }
+    $r->print(&Apache::loncommon::end_page());
 
-  return OK;
+    return OK;
 }
 
 1;
@@ -1720,5 +2171,7 @@ __END__
 
 =back
 
+=back
+
 =cut