--- loncom/publisher/lonpublisher.pm	2005/03/10 03:50:49	1.188
+++ loncom/publisher/lonpublisher.pm	2008/06/30 18:10:24	1.239
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Publication Handler
 #
-# $Id: lonpublisher.pm,v 1.188 2005/03/10 03:50:49 www Exp $
+# $Id: lonpublisher.pm,v 1.239 2008/06/30 18:10:24 bisitz Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -121,7 +121,7 @@ use HTML::LCParser;
 use Apache::lonxml;
 use Apache::loncacc;
 use DBI;
-use Apache::lonnet();
+use Apache::lonnet;
 use Apache::loncommon();
 use Apache::lonmysql;
 use Apache::lonlocal;
@@ -129,6 +129,8 @@ use Apache::loncfile;
 use LONCAPA::lonmetadata;
 use Apache::lonmsg;
 use vars qw(%metadatafields %metadatakeys);
+use LONCAPA qw(:DEFAULT :match);
+ 
 
 my %addid;
 my %nokey;
@@ -141,6 +143,8 @@ my $cudom;
 my $registered_cleanup;
 my $modified_urls;
 
+my $lock;
+
 =pod
 
 =item B<metaeval>
@@ -181,17 +185,18 @@ sub metaeval {
 	if ($token->[0] eq 'S') {
 	    my $entry=$token->[1];
 	    my $unikey=$entry;
+	    next if ($entry =~ m/^(?:parameter|stores)_/);
 	    if (defined($token->[2]->{'package'})) { 
-		$unikey.='_package_'.$token->[2]->{'package'};
+		$unikey.="\0package\0".$token->[2]->{'package'};
 	    } 
 	    if (defined($token->[2]->{'part'})) { 
-		$unikey.='_'.$token->[2]->{'part'}; 
+		$unikey.="\0".$token->[2]->{'part'}; 
 	    }
 	    if (defined($token->[2]->{'id'})) { 
-		$unikey.='_'.$token->[2]->{'id'};
+		$unikey.="\0".$token->[2]->{'id'};
 	    } 
 	    if (defined($token->[2]->{'name'})) { 
-		$unikey.='_'.$token->[2]->{'name'}; 
+		$unikey.="\0".$token->[2]->{'name'}; 
 	    }
 	    foreach (@{$token->[3]}) {
 		$metadatafields{$unikey.'.'.$_}=$token->[2]->{$_};
@@ -269,7 +274,7 @@ sub metaread {
     }
     &metaeval($metastring,$prefix);
     return '<br /><b>'.&mt('Processed file').':</b> <tt>'.
-	&Apache::loncfile::display($fn).'</tt>';
+	&Apache::loncfile::display($fn).'</tt><br />';
 }
 
 #########################################
@@ -278,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);
@@ -326,10 +330,10 @@ sub textfield {
     $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.'" />';
+    $env{'form.'.$name}=$value;
+    return "\n".&Apache::lonhtmlcommon::row_title($title)
+           .'<input type="text" name="'.$name.'" size="80" value="'.$value.'" />'
+           .&Apache::lonhtmlcommon::row_closure();
 }
 
 sub text_with_browse_field {
@@ -338,32 +342,42 @@ sub text_with_browse_field {
     $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.'\');">Select</a>&nbsp;'.
-	   '<a href="javascript:opensearcher(\'pubform\',\''.$name.'\');">Search</a>';
-	   
+    $env{'form.'.$name}=$value;
+    return "\n".&Apache::lonhtmlcommon::row_title($title)
+          .'<input type="text" name="'.$name.'" size="80" value="'.$value.'" />'
+          .'<br />'
+	  .'<a href="javascript:openbrowser(\'pubform\',\''.$name.'\',\''.$restriction.'\');">'
+          .&mt('Select')
+          .'</a>&nbsp;'
+	  .'<a href="javascript:opensearcher(\'pubform\',\''.$name.'\');">'
+          .&mt('Search')
+          .'</a>'
+          .&Apache::lonhtmlcommon::row_closure();
 }
 
 sub hiddenfield {
     my ($name,$value)=@_;
-    $ENV{'form.'.$name}=$value;
+    $env{'form.'.$name}=$value;
     return "\n".'<input type="hidden" name="'.$name.'" value="'.$value.'" />';
 }
 
+sub checkbox {
+    my ($name,$text)=@_;
+    return "\n<br /><label><input type='checkbox' name='$name' /> ".
+	&mt($text)."</label>";
+}
+
 sub selectbox {
     my ($title,$name,$value,$functionref,@idlist)=@_;
     $title=&mt($title);
     $value=(split(/\s*,\s*/,$value))[-1];
     if (defined($value)) {
-	$ENV{'form.'.$name}=$value;
+	$env{'form.'.$name}=$value;
     } else {
-	$ENV{'form.'.$name}=$idlist[0];
+	$env{'form.'.$name}=$idlist[0];
     }
-    my $selout="\n<p><font color=\"#800000\" face=\"helvetica\"><b>$title:".
-	'</b></font></p><br /><select name="'.$name.'">';
+    my $selout="\n".&Apache::lonhtmlcommon::row_title($title)
+              .'<select name="'.$name.'">';
     foreach (@idlist) {
         $selout.='<option value=\''.$_.'\'';
         if ($_ eq $value) {
@@ -371,13 +385,14 @@ sub selectbox {
 	}
         else {$selout.='>'.&{$functionref}($_).'</option>';}
     }
-    return $selout.'</select>';
+    $selout.='</select>'.&Apache::lonhtmlcommon::row_closure();
+    return $selout;
 }
 
 sub select_level_form {
     my ($value,$name)=@_;
-    $ENV{'form.'.$name}=$value;
-    if (!defined($value)) { $ENV{'form.'.$name}=0; }
+    $env{'form.'.$name}=$value;
+    if (!defined($value)) { $env{'form.'.$name}=0; }
     return  &Apache::loncommon::select_level_form($value,$name);
 }
 #########################################
@@ -401,15 +416,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;
 }
 
@@ -460,11 +474,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;
 }
 
 #########################################
@@ -487,11 +501,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=~/\Q$srcf\E\.(\w+)$/) {
+	if ($filename=~/\Q$srcf\E\.($match_lonid)$/) {
 	    my $subhost=$1;
-	    if (($subhost ne 'meta' && $subhost ne 'subscription' &&
-		 $subhost ne 'tmp') &&
+	    if (($subhost ne 'meta' 
+		 && $subhost ne 'subscription' 
+		 && $subhost ne 'meta.subscription'
+		 && $subhost ne 'tmp') &&
                 ($subhost ne $Apache::lonnet::perlvar{'lonHostID'})) {
 		push(@subscribed,$subhost);
 	    }
@@ -500,19 +518,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;
 }
@@ -542,6 +554,7 @@ sub get_max_ids_indices {
     my %duplicatedids;
 
     my $parser=HTML::LCParser->new($content);
+    $parser->xml_mode(1);
     my $token;
     while ($token=$parser->get_token) {
 	if ($token->[0] eq 'S') {
@@ -648,7 +661,7 @@ sub fix_ids_and_indices {
 			   join(', ',@duplicatedids));
     if ($duplicateids) {
 	print $logfile "Duplicate ID(s) exist, ".join(', ',@duplicatedids)."\n";
-	my $outstring='<font color="red">'.&mt('Unable to publish file, it contains duplicated ID(s), ID(s) need to be unique. The duplicated ID(s) are').': '.join(', ',@duplicatedids).'</font>';
+	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) {
@@ -657,6 +670,7 @@ sub fix_ids_and_indices {
                 "Max Index: $maxindex (min 10)\n";
     }
     my $outstring='';
+    my $responsecounter=1;
     my @parser;
     $parser[0]=HTML::LCParser->new(\$content);
     $parser[-1]->xml_mode(1);
@@ -671,6 +685,11 @@ 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}; }
@@ -680,7 +699,9 @@ sub fix_ids_and_indices {
 				$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'}) &&
@@ -691,12 +712,14 @@ sub fix_ids_and_indices {
 			}
 		    }
 		}
-		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});
+			    }
 			}
 		    }
 		}
@@ -707,6 +730,7 @@ sub fix_ids_and_indices {
 		    ($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]);
@@ -761,7 +785,7 @@ sub fix_ids_and_indices {
 		}
 		if (!$endtag) { if ($token->[4]=~m:/>$:) { $endtag=' /'; }; }
 		$outstring.='<'.$tag.$newparmstring.$endtag.'>';
-		if ($lctag eq 'm' || $lctag eq 'script' 
+		if ($lctag eq 'm' || $lctag eq 'script' || $lctag eq 'answer' 
                     || $lctag eq 'display' || $lctag eq 'tex') {
 		    $outstring.=&get_all_text_unbalanced('/'.$lctag,\@parser);
 		}
@@ -770,7 +794,12 @@ sub fix_ids_and_indices {
 		    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. This resource cannot be published.',$token->[1]).'</span>';
+                    return ($outstring,1);
+                }
 	    } else {
 		$outstring.=$token->[1];
 	    }
@@ -813,36 +842,36 @@ sub store_metadata {
     # 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);
     }
     my $dbh = &Apache::lonmysql::get_dbh();
-    if (($metadata{'obsolete'}) || ($metadata{'copyright'} eq 'priv') ||
-	($metadata{'copyright'} eq 'custom')) {
+    if (($metadata{'obsolete'}) || ($metadata{'copyright'} eq 'priv')) {
         # remove this entry
-	$status=&LONCAPA::lonmetadata::delete_metadata($dbh,undef,
-                                                       $metadata{'url'});
+	my $delitem = 'url = '.$dbh->quote($metadata{'url'});
+	$status = &LONCAPA::lonmetadata::delete_metadata($dbh,undef,$delitem);
+                                                       
     } else {
-        $status = &LONCAPA::lonmetadata::update_metadata($dbh,undef,
+        $status = &LONCAPA::lonmetadata::update_metadata($dbh,undef,undef,
                                                          \%metadata);
     }
     if (defined($status) && $status ne '') {
-        $error='<font color="red">Error occured storing new values in '.
-            'metadata table in LON-CAPA database</font>';
+        $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');
 }
 
 
@@ -852,15 +881,16 @@ sub checkonthis {
     my ($r,$source)=@_;
     my $uri=&Apache::lonnet::hreflocation($source);
     $uri=~s/\/$//;
-    my ($errorcount,$warningcount)=split(/:/,
-	       &Apache::lonnet::ssi_body($uri,
-				('return_only_error_and_warning_counts' => 1)));
+    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" /><font color="red"><b>'.
+	    $r->print('<img src="/adm/lonMisc/bomb.gif" /><span class="LC_error"><b>'.
 		      $errorcount.' '.
-		      &mt('error(s)').'</b></font> ');
+		      &mt('error(s)').'</b></span> ');
 	}
 	if ($warningcount) {
 	    $r->print('<font color="blue">'.
@@ -868,7 +898,7 @@ sub checkonthis {
 		      &mt('warning(s)').'</font>');
 	}
     } else {
-	$r->print('<font color="green">'.&mt('ok').'</font>');
+	#$r->print('<font color="green">'.&mt('ok').'</font>');
     }
     $r->rflush();
     return ($warningcount,$errorcount);
@@ -924,10 +954,10 @@ sub publish {
     my %allow=();
 
     unless ($logfile=Apache::File->new('>>'.$source.'.log')) {
-	return ('<font color="red">'.&mt('No write permission to user directory, FAIL').'</font>',1);
+	return ('<span class="LC_error">'.&mt('No write permission to user directory, FAIL').'</span>',1);
     }
     print $logfile 
-"\n\n================= Publish ".localtime()." Phase One  ================\n".$ENV{'user.name'}.'@'.$ENV{'user.domain'}."\n";
+"\n\n================= Publish ".localtime()." Phase One  ================\n".$env{'user.name'}.':'.$env{'user.domain'}."\n";
 
     if (($style eq 'ssi') || ($style eq 'rat') || ($style eq 'prv')) {
 # ------------------------------------------------------- This needs processing
@@ -938,7 +968,7 @@ 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>",1);
+	    return ("<span class=\"LC_error\">".&mt("Failed to write backup copy, [_1], FAIL",$1)."</span>",1);
         }
 # ------------------------------------------------------------- IDs and indices
 	
@@ -950,29 +980,34 @@ sub publish {
     
 	$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 />';
-           if ($thisdep!~/\*/ && $thisdep!~m|^/adm/|) {
+           if ($thisdep!~/[\*\$]/ && $thisdep!~m|^/adm/|) {
 	       $scrout.='<a href="'.$thisdep.'">';
            }
            $scrout.='<tt>'.$thisdep.'</tt>';
-           if ($thisdep!~/\*/ && $thisdep!~m|^/adm/|) {
+           if ($thisdep!~/[\*\$]/ && $thisdep!~m|^/adm/|) {
 	       $scrout.='</a>';
                if (
        &Apache::lonnet::getfile($Apache::lonnet::perlvar{'lonDocRoot'}.'/'.
                                             $thisdep.'.meta') eq '-1') {
-		   $scrout.= ' - <font color="red">'.&mt('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);
@@ -988,9 +1023,9 @@ sub publish {
           my $org;
           unless ($org=Apache::File->new('>'.$source)) {
              print $logfile "No write permit to $source\n";
-             return ('<font color="red">'.&mt('No write permission to').
+             return ('<span class="LC_error">'.&mt('No write permission to').
 		     ' '.$source.
-		     ', '.&mt('FAIL').'</font>',1);
+		     ', '.&mt('FAIL').'</span>',1);
 	  }
           print($org $outstring);
         }
@@ -1009,19 +1044,19 @@ sub publish {
      
     unless ($batch) {
      $scrout.='<h3>'.&mt('Metadata Information').' ' .
-       Apache::loncommon::help_open_topic("Metadata_Description")
+       &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
 
@@ -1064,10 +1099,18 @@ sub publish {
 		delete $metadatafields{$_};
             }
         }
+# ------------------------------------------------------------- Save some stuff
+        my %savemeta=();
+        foreach ('title') {
+            $savemeta{$_}=$metadatafields{$_};
+	}
 # ------------------------------------------ See if anything new in file itself
  
 	$allmeta=&parseformeta($source,$style);
-
+# ----------------------------------------------------------- Restore the stuff
+        foreach (keys %savemeta) {
+	    $metadatafields{$_}=$savemeta{$_};
+	}
    }
 
        
@@ -1078,14 +1121,16 @@ sub publish {
 	if (($_=~/^parameter/) || ($_=~/^stores/)) {
 	    unless ($_=~/\.\w+$/) { 
 		unless ($oldparmstores{$_}) {
-		    print $logfile 'New: '.$_."\n";
-		    $chparms.=$_.' ';
+		    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 stored values').
+	$scrout.='<p><b>'.&mt('New parameters or saved values').
 	    ':</b> '.$chparms.'</p>';
     }
 
@@ -1094,16 +1139,23 @@ sub publish {
 	if (($_=~/^parameter/) || ($_=~/^stores/)) {
 	    unless (($metadatafields{$_.'.name'}) ||
 		    ($metadatafields{$_.'.package'}) || ($_=~/\.\w+$/)) {
-		print $logfile 'Obsolete: '.$_."\n";
-		$chparms.=$_.' ';
+		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 stored values').':</b> '.
-	    $chparms.'</p><h1><font color="red">'.&mt('Warning!').
-	    '</font></h1><p><font color="red" size="+1">'.
-	    &mt('If this resource is in active use, student performance data from the previous version may become inaccessible.').'</font></p><hr />';
+	$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
@@ -1140,26 +1192,33 @@ sub publish {
 # interactive mode html goes into $intr_scrout
 # batch mode throws away this HTML
 # additionally all of the field functions have a by product of setting
-#   $ENV{'from.'..} so that it can be used by the phase two handler in
+#   $env{'from.'..} so that it can be used by the phase two handler in
 #    batch mode
 
-    my $intr_scrout.=
-	'<form name="pubform" action="/adm/publish" method="post">'.
-	'<p><input type="submit" value="'.&mt('Finalize Publication').'" /></p>'.
+    my $intr_scrout.='<br />'
+                    .'<form name="pubform" action="/adm/publish" method="post">';
+    unless ($env{'form.makeobsolete'}) {
+       $intr_scrout.='<p>'
+                    .&mt('Searching for your resource will be based on the following metadata. Please provide as much data as possible.')
+                    .'</p>'
+                    .'<p><input type="submit" value="'
+                    .&mt('Finalize Publication')
+                    .'" /></p>';
+    }
+    $intr_scrout.=&Apache::lonhtmlcommon::start_pick_box();
+    $intr_scrout.=
 	&hiddenfield('phase','two').
-	&hiddenfield('filename',$ENV{'form.filename'}).
-	&hiddenfield('allmeta',&Apache::lonnet::escape($allmeta)).
-	&hiddenfield('dependencies',join(',',keys %allow)).
+	&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
 
-# --------------------------------------------------- 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 $keywords_help = &Apache::loncommon::help_open_topic("Publishing_Keywords");
     my $keywordout=<<"END";
 <script>
 function checkAll(field) {
@@ -1172,14 +1231,13 @@ function uncheckAll(field) {
         field[i].checked = false ;
 }
 </script>
-<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>';
+    $keywordout.="\n".&Apache::lonhtmlcommon::row_title(&mt('Keywords'))
+                .$keywords_help
+                .'<input type="button" value="'.&mt('check all').'" onclick="javascript:checkAll(document.pubform.keywords)" />'
+                .'<input type="button" value="'.&mt('uncheck all').'" onclick="javascript:uncheckAll(document.pubform.keywords)" />'
+                .'</p><br />'
+                .'<table border="2"><tr>';
     my $colcount=0;
 
     foreach (sort keys %keywords) {
@@ -1187,11 +1245,11 @@ END
 	if ($metadatafields{'keywords'}) {
 	    if ($metadatafields{'keywords'}=~/\Q$_\E/) {
 		$keywordout.=' checked="on"';
-		$ENV{'form.keywords'}.=$_.',';
+		$env{'form.keywords'}.=$_.',';
 	    }
 	} elsif (&Apache::loncommon::keyword($_)) {
 	    $keywordout.=' checked="on"';
-	    $ENV{'form.keywords'}.=$_.',';
+	    $env{'form.keywords'}.=$_.',';
 	}
 	$keywordout.=' />'.$_.'</label></td>';
 	if ($colcount>10) {
@@ -1200,9 +1258,10 @@ END
 	}
 	$colcount++;
     }
-    $ENV{'form.keywords'}=~s/\,$//;
+    $env{'form.keywords'}=~s/\,$//;
 
-    $keywordout.='</tr></table>';
+    $keywordout.='</tr></table>'
+                 .&Apache::lonhtmlcommon::row_closure();
 
     $intr_scrout.=$keywordout;
 
@@ -1210,28 +1269,24 @@ END
 
     $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>';
+    $intr_scrout.="\n".&Apache::lonhtmlcommon::row_title(&mt('Abstract'))
+                 .'<textarea cols="80" rows="5" name="abstract">'
+                 .$metadatafields{'abstract'}
+                 .'</textarea>'
+                 .&Apache::lonhtmlcommon::row_closure();
 
     $source=~/\.(\w+)$/;
 
+    $intr_scrout.="\n".&Apache::lonhtmlcommon::row_title(&mt('Grade Levels'))
+                 .&mt('Lowest Grade Level:').'&nbsp;'
+                 .&select_level_form($metadatafields{'lowestgradelevel'},'lowestgradelevel')
+#                .&Apache::lonhtmlcommon::row_closure();
+#   $intr_scrout.="\n".&Apache::lonhtmlcommon::row_title(&mt('Highest Grade Level'))
+                 .' '.&mt('Highest Grade Level:').'&nbsp;'
+                 .&select_level_form($metadatafields{'highestgradelevel'},'highestgradelevel')
+                 .&Apache::lonhtmlcommon::row_closure();
 
-    $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'});
-
-
-
+    $intr_scrout.=&textfield('Standards','standards',$metadatafields{'standards'});
 
     $intr_scrout.=&hiddenfield('mime',$1);
 
@@ -1263,6 +1318,9 @@ END
 	$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'; }
@@ -1279,39 +1337,66 @@ END
 	    $intr_scrout.=&selectbox('Copyright/Distribution','copyright',
 				     $defaultoption,
 				     \&Apache::loncommon::copyrightdescription,
-				    (grep !/^public$/,(&Apache::loncommon::copyrightids)));
+				    (grep !/^(public|priv)$/,(&Apache::loncommon::copyrightids)));
 	} else {
 	    $intr_scrout.=&selectbox('Copyright/Distribution','copyright',
 				     $defaultoption,
 				     \&Apache::loncommon::copyrightdescription,
-				     (&Apache::loncommon::copyrightids));
+				     (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;
+	    &Apache::loncommon::help_open_topic('Publishing_Copyright');
+        my $replace=&mt('Copyright/Distribution:');
+	$intr_scrout =~ s/$replace/$replace.' '.$copyright_help/ge;
+
+	$intr_scrout.=&text_with_browse_field('Custom Distribution File','customdistributionfile',$metadatafields{'customdistributionfile'},'rights');
 	$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');
+#	$intr_scrout.=&text_with_browse_field('Source Custom Distribution File','sourcerights',$metadatafields{'sourcerights'},'rights');
 	my $uctitle=&mt('Obsolete');
-	$intr_scrout.=
-	    "\n<p><font color=\"#800000\" face=\"helvetica\"><b>$uctitle:".
-	    '</b></font> <input type="checkbox" name="obsolete" ';
-	if ($metadatafields{'obsolete'}) {
-	    $intr_scrout.=' checked="1" ';
-	}
-	$intr_scrout.='/ ></p>'.
-	    &text_with_browse_field('Suggested Replacement for Obsolete File',
+        my $obsolete_checked=($metadatafields{'obsolete'})?' checked="1" ':'';
+        $intr_scrout.="\n".&Apache::lonhtmlcommon::row_title($uctitle)
+                     .'<input type="checkbox" name="obsolete" '.$obsolete_checked.'/ >'
+                     .&Apache::lonhtmlcommon::row_closure(1);
+        $intr_scrout.=&text_with_browse_field('Suggested Replacement for Obsolete File',
 				    'obsoletereplacement',
 				    $metadatafields{'obsoletereplacement'});
     } else {
 	$intr_scrout.=&hiddenfield('copyright','private');
     }
+   } else {
+       $intr_scrout.=
+	&hiddenfield('title',$metadatafields{'title'}).
+	&hiddenfield('author',$metadatafields{'author'}).
+	&hiddenfield('subject',$metadatafields{'subject'}).
+	&hiddenfield('keywords',$metadatafields{'keywords'}).
+	&hiddenfield('abstract',$metadatafields{'abstract'}).
+	&hiddenfield('notes',$metadatafields{'notes'}).
+	&hiddenfield('mime',$metadatafields{'mime'}).
+	&hiddenfield('creationdate',$metadatafields{'creationdate'}).
+	&hiddenfield('lastrevisiondate',time).
+	&hiddenfield('owner',$metadatafields{'owner'}).
+	&hiddenfield('lowestgradelevel',$metadatafields{'lowestgradelevel'}).
+	&hiddenfield('standards',$metadatafields{'standards'}).
+	&hiddenfield('highestgradelevel',$metadatafields{'highestgradelevel'}).
+	&hiddenfield('language',$metadatafields{'language'}).
+	&hiddenfield('copyright',$metadatafields{'copyright'}).
+	&hiddenfield('sourceavail',$metadatafields{'sourceavail'}).
+	&hiddenfield('customdistributionfile',$metadatafields{'customdistributionfile'}).
+	&hiddenfield('obsolete',1).
+	&text_with_browse_field('Suggested Replacement for Obsolete File',
+				    'obsoletereplacement',
+				    $metadatafields{'obsoletereplacement'});
+   }
     if (!$batch) {
-	$scrout.=$intr_scrout.'<p><input type="submit" value="'.
-	    &mt('Finalize Publication').'" /></p></form>';
+	$scrout.=$intr_scrout
+            .&Apache::lonhtmlcommon::end_pick_box()
+            .'<p><input type="submit" value="'
+	    .&mt($env{'form.makeobsolete'}?'Make Obsolete':'Finalize Publication')
+            .'" /></p>'
+            .'</form>';
     }
     return($scrout,0);
 }
@@ -1344,10 +1429,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
 
@@ -1359,60 +1444,82 @@ sub phasetwo {
     my ($r,$source,$target,$style,$distarget,$batch)=@_;
     $source=~s/\/+/\//g;
     $target=~s/\/+/\//g;
-
-    if ($target=~/\_\_\_/) {
-	$r->print(
- '<font color="red">'.&mt('Unsupported character combination').
-		  ' "<tt>___</tt>" '.&mt('in filename, FAIL').'</font>');
-        return 0;
+#
+# Unless trying to get rid of something, check name validity
+#
+    unless ($env{'form.obsolete'}) {
+	if ($target=~/(\_\_\_|\&\&\&|\:\:\:)/) {
+	    $r->print('<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')) {
 	$r->print(
-        '<font color="red">'.
-		&mt('No write permission to user directory, FAIL').'</font>');
+        '<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".$ENV{'user.name'}.'@'.$ENV{'user.domain'}."\n";
+        "\n================= Publish ".localtime()." Phase Two  ================\n".$env{'user.name'}.':'.$env{'user.domain'}."\n";
     
     %metadatafields=();
     %metadatakeys=();
 
-    &metaeval(&Apache::lonnet::unescape($ENV{'form.allmeta'}));
+    &metaeval(&unescape($env{'form.allmeta'}));
     
-    $metadatafields{'title'}=$ENV{'form.title'};
-    $metadatafields{'author'}=$ENV{'form.author'};
-    $metadatafields{'subject'}=$ENV{'form.subject'};
-    $metadatafields{'notes'}=$ENV{'form.notes'};
-    $metadatafields{'abstract'}=$ENV{'form.abstract'};
-    $metadatafields{'mime'}=$ENV{'form.mime'};
-    $metadatafields{'language'}=$ENV{'form.language'};
-    $metadatafields{'creationdate'}=$ENV{'form.creationdate'};
-    $metadatafields{'lastrevisiondate'}=$ENV{'form.lastrevisiondate'};
-    $metadatafields{'owner'}=$ENV{'form.owner'};
-    $metadatafields{'copyright'}=$ENV{'form.copyright'};
-    $metadatafields{'standards'}=$ENV{'form.standards'};
-    $metadatafields{'lowestgradelevel'}=$ENV{'form.lowestgradelevel'};
-    $metadatafields{'highestgradelevel'}=$ENV{'form.highestgradelevel'};
+    $metadatafields{'title'}=$env{'form.title'};
+    $metadatafields{'author'}=$env{'form.author'};
+    $metadatafields{'subject'}=$env{'form.subject'};
+    $metadatafields{'notes'}=$env{'form.notes'};
+    $metadatafields{'abstract'}=$env{'form.abstract'};
+    $metadatafields{'mime'}=$env{'form.mime'};
+    $metadatafields{'language'}=$env{'form.language'};
+    $metadatafields{'creationdate'}=$env{'form.creationdate'};
+    $metadatafields{'lastrevisiondate'}=$env{'form.lastrevisiondate'};
+    $metadatafields{'owner'}=$env{'form.owner'};
+    $metadatafields{'copyright'}=$env{'form.copyright'};
+    $metadatafields{'standards'}=$env{'form.standards'};
+    $metadatafields{'lowestgradelevel'}=$env{'form.lowestgradelevel'};
+    $metadatafields{'highestgradelevel'}=$env{'form.highestgradelevel'};
     $metadatafields{'customdistributionfile'}=
-                                 $ENV{'form.customdistributionfile'};
-    $metadatafields{'sourceavail'}=$ENV{'form.sourceavail'};
-    $metadatafields{'obsolete'}=$ENV{'form.obsolete'};
+                                 $env{'form.customdistributionfile'};
+    $metadatafields{'sourceavail'}=$env{'form.sourceavail'};
+    $metadatafields{'obsolete'}=$env{'form.obsolete'};
     $metadatafields{'obsoletereplacement'}=
-	                        $ENV{'form.obsoletereplacement'};
-    $metadatafields{'dependencies'}=$ENV{'form.dependencies'};
-    $metadatafields{'modifyinguser'}=$ENV{'user.name'}.'@'.
-	                                 $ENV{'user.domain'};
-    $metadatafields{'authorspace'}=$cuname.'@'.$cudom;
+	                        $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/[\"\']//g;
@@ -1426,18 +1533,20 @@ sub phasetwo {
     if ($metadatafields{'copyright'} eq 'custom') {
 	my $file=$metadatafields{'customdistributionfile'};
 	unless ($file=~/\.rights$/) {
-            return 
-                '<font color="red">'.&mt('No valid custom distribution rights file specified, FAIL').
-		'</font>';
+            $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">'.&mt('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 ($_=~/\./) {
@@ -1488,7 +1597,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\">".&mt('Invalid target directory, FAIL')."</span>");
+	    return 0;
         }
         opendir(DIR,$srcd);
         while ($filename=readdir(DIR)) {
@@ -1513,8 +1624,9 @@ sub phasetwo {
             $r->print('<p>'.&mt('Copied old target file').'</p>');
         } else {
 	    print $logfile "Unable to write ".$copyfile.':'.$!."\n";
-            return "<font color=\"red\">".&mt('Failed to copy old target').
-		", $!, ".&mt('FAIL')."</font>";
+            $r->print("<span class=\"LC_error\">".&mt('Failed to copy old target').
+		", $!, ".&mt('FAIL')."</span>");
+	    return 0;
         }
         
 # --------------------------------------------------------------- Copy Metadata
@@ -1527,9 +1639,10 @@ sub phasetwo {
         } else {
 	    print $logfile "Unable to write metadata ".$copyfile.':'.$!."\n";
             if (-e $target.'.meta') {
-                return 
-                    "<font color=\"red\">".
-&mt('Failed to write old metadata copy').", $!, ".&mt('FAIL')."</font>";
+                $r->print( 
+                    "<span class=\"LC_error\">".
+&mt('Failed to write old metadata copy').", $!, ".&mt('FAIL')."</span>");
+		return 0;
 	    }
         }
         
@@ -1560,8 +1673,9 @@ sub phasetwo {
         $r->print('<p>'.&mt('Copied source file').'</p>');
     } else {
         print $logfile "\nUnable to write ".$copyfile.':'.$!."\n";
-        return "<font color=\"red\">".
-	    &mt('Failed to copy source').", $!, ".&mt('FAIL')."</font>";
+        $r->print("<span class=\"LC_error\">".
+	    &mt('Failed to copy source').", $!, ".&mt('FAIL')."</span>");
+	return 0;
     }
     
 # --------------------------------------------------------------- Copy Metadata
@@ -1573,8 +1687,9 @@ sub phasetwo {
         $r->print('<p>'.&mt('Copied metadata').'</p>');
     } else {
         print $logfile "\nUnable to write metadata ".$copyfile.':'.$!."\n";
-        return 
-            "<font color=\"red\">".&mt('Failed to write metadata copy').", $!, ".&mt('FAIL')."</font>";
+        $r->print(
+            "<span class=\"LC_error\">".&mt('Failed to write metadata copy').", $!, ".&mt('FAIL')."</span>");
+	return 0;
     }
     $r->rflush;
 
@@ -1584,13 +1699,19 @@ sub phasetwo {
 	$r->register_cleanup(\&notify);
 	$registered_cleanup=1;
     }
+
+# ---------------------------------------------------------- Clear local caches
+    my $thisdistarget=$target;
+    $thisdistarget=~s/^\Q$docroot\E//;
+    &Apache::lonnet::devalidate_cache_new('resversion',$target);
+    &Apache::lonnet::devalidate_cache_new('meta',
+			 &Apache::lonnet::declutter($thisdistarget));
+
 # ------------------------------------------------ Provide link to new resource
     unless ($batch) {
-        my $thisdistarget=$target;
-        $thisdistarget=~s/^\Q$docroot\E//;
         
         my $thissrc=$source;
-        $thissrc=~s/^\/home\/(\w+)\/public_html/\/priv\/$1/;
+        $thissrc=~s{^/home/($match_username)/public_html}{/priv/$1};
         
         my $thissrcdir=$thissrc;
         $thissrcdir=~s/\/[^\/]+$/\//;
@@ -1599,14 +1720,15 @@ sub phasetwo {
         $r->print(
            '<hr /><a href="'.$thisdistarget.'"><font size="+2">'.
            &mt('View Published Version').'</font></a>'.
-           '<p><a href="'.$thissrc.'"><font size=+2>'.
+           '<p><a href="'.$thissrc.'"><font size="+2">'.
 		  &mt('Back to Source').'</font></a></p>'.
            '<p><a href="'.$thissrcdir.
                    '"><font size="+2">'.
 		  &mt('Back to Source Directory').'</font></a></p>');
     }
     $logfile->close();
-    return '<p><font color="green">'.&mt('Done').'</font></p>';
+    $r->print('<p><font color="green">'.&mt('Done').'</font></p>');
+    return 1;
 }
 
 # =============================================================== Notifications
@@ -1643,6 +1765,7 @@ sub notify {
 	print $logfile "\n============ Done ============\n";
 	$logfile->close();
     }
+    if ($lock) { &Apache::lonnet::remove_lock($lock); }
     return OK;
 }
 
@@ -1650,8 +1773,8 @@ sub notify {
 
 sub batchpublish {
     my ($r,$srcfile,$targetfile)=@_;
-    #publication pollutes %ENV with form.* values
-    my %oldENV=%ENV;
+    #publication pollutes %env with form.* values
+    my %oldenv=%env;
     $srcfile=~s/\/+/\//g;
     $targetfile=~s/\/+/\//g;
     my $thisdisfn=$srcfile;
@@ -1679,13 +1802,13 @@ sub batchpublish {
     $r->print('<p>'.$outstring.'</p>');
 # phase two takes
 # my ($source,$target,$style,$distarget,batch)=@_;
-# $ENV{'form.allmeta'},$ENV{'form.title'},$ENV{'form.author'},...
+# $env{'form.allmeta'},$env{'form.title'},$env{'form.author'},...
     if (!$error) {
 	$r->print('<p>');
 	&phasetwo($r,$srcfile,$targetfile,$thisembstyle,$thisdistarget,1);
 	$r->print('</p>');
     }
-    %ENV=%oldENV;
+    %env=%oldenv;
     return '';
 }
 
@@ -1702,47 +1825,67 @@ sub publishdirectory {
 	      &mt('Target').': <tt>'.$resdir.'</tt><br />');
 
     my $dirptr=16384;		# Mask indicating a directory in stat.cmode.
-
-    opendir(DIR,$fn);
-    my @files=sort(readdir(DIR));
-    foreach my $filename (@files) {
-	my ($cdev,$cino,$cmode,$cnlink,
-            $cuid,$cgid,$crdev,$csize,
-            $catime,$cmtime,$cctime,
-            $cblksize,$cblocks)=stat($fn.'/'.$filename);
-
-	my $extension='';
-	if ($filename=~/\.(\w+)$/) { $extension=$1; }
-	if ($cmode&$dirptr) {
-	    if (($filename!~/^\./) && ($ENV{'form.pubrec'})) {
-		&publishdirectory($r,$fn.'/'.$filename,$thisdisfn.'/'.$filename);
-	    }
-	} elsif ((&Apache::loncommon::fileembstyle($extension) ne 'hdn') &&
-		 ($filename!~/^[\#\.]/) && ($filename!~/\~$/)) {
+    unless ($env{'form.phase'} eq 'two') {
+# ask user what they want
+        $r->print('<form name="pubdirpref" method="post">'.
+		  &hiddenfield('phase','two').
+		  &hiddenfield('filename',$env{'form.filename'}).
+		  &checkbox('pubrec','include subdirectories').
+		  &checkbox('forcerepub','force republication of previously published files').
+                  &checkbox('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) || ($ENV{'form.forcerepub'} eq 'ON')) {
+		my $publishthis=0;
+		if (-e $resdir.'/'.$filename) {
+		    my ($rdev,$rino,$rmode,$rnlink,
+			$ruid,$rgid,$rrdev,$rsize,
+			$ratime,$rmtime,$rctime,
+			$rblksize,$rblocks)=stat($resdir.'/'.$filename);
+		    if (($rmtime<$cmtime) || ($env{'form.forcerepub'})) {
 # previously published, modified now
-		    $publishthis=1;
-                }
-	    } else {
+			$publishthis=1;
+		    }
+		    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 />'.&mt('Skipping').' '.$filename.'<br />');
+		    $publishthis=1;
+		}
+		
+		if ($publishthis) {
+		    &batchpublish($r,$fn.'/'.$filename,$resdir.'/'.$filename);
+		} else {
+		    $r->print('<br />'.&mt('Skipping').' '.$filename.'<br />');
+		}
+		$r->rflush();
 	    }
-	    $r->rflush();
 	}
+	closedir(DIR);
     }
-    closedir(DIR);
 }
 
 #########################################
@@ -1761,8 +1904,7 @@ sub defaultmetapublish {
     &Apache::loncommon::content_type($r,'text/html');
     $r->send_http_header;
 
-    $r->print('<html><head><title>LON-CAPA Publishing</title></head>');
-    $r->print(&Apache::loncommon::bodytag('Catalog Information Publication'));
+    $r->print(&Apache::loncommon::start_page('Catalog Information Publication'));
 
 # ---------------------------------------------------------------- Write Source
     my $copyfile=$target;
@@ -1782,8 +1924,8 @@ sub defaultmetapublish {
     if (copy($fn,$copyfile)) {
         $r->print('<p>'.&mt('Copied source file').'</p>');
     } else {
-        return "<font color=\"red\">".
-	    &mt('Failed to copy source').", $!, ".&mt('FAIL')."</font>";
+        return "<span class=\"LC_error\">".
+	    &mt('Failed to copy source').", $!, ".&mt('FAIL')."</span>";
     }
 
 # --------------------------------------------------- Send update notifications
@@ -1798,7 +1940,7 @@ sub defaultmetapublish {
     my $link=$fn;
     $link=~s/^\/home\/$cuname\/public_html\//\/priv\/$cuname\//;
     $r->print("<a href='$link'>".&mt('Back to Catalog Information').'</a>');
-    $r->print('</body></html>');
+    $r->print(&Apache::loncommon::end_page());
     return OK;
 }
 #########################################
@@ -1860,7 +2002,7 @@ sub handler {
     @{$modified_urls}=();
 # -------------------------------------------------------------- Check filename
 
-    my $fn=&Apache::lonnet::unescape($ENV{'form.filename'});
+    my $fn=&unescape($env{'form.filename'});
 
     ($cuname,$cudom)=
 	&Apache::loncacc::constructaccess($fn,$r->dir_config('lonDefDomain'));
@@ -1879,7 +2021,7 @@ sub handler {
 
     unless (($cuname) && ($cudom)) {
 	$r->log_reason($cuname.' at '.$cudom.
-		       ' trying to publish file '.$ENV{'form.filename'}.
+		       ' trying to publish file '.$env{'form.filename'}.
 		       ' ('.$fn.') - not authorized', 
 		       $r->filename); 
 	return HTTP_NOT_ACCEPTABLE;
@@ -1891,21 +2033,21 @@ sub handler {
     foreach my $id (@ids) { if ($id eq $home) { $allowed = 1; }  }
     unless ($allowed) {
 	$r->log_reason($cuname.' at '.$cudom.
-		       ' trying to publish file '.$ENV{'form.filename'}.
+		       ' trying to publish file '.$env{'form.filename'}.
 		       ' ('.$fn.') - not homeserver ('.$home.')', 
 		       $r->filename); 
 	return HTTP_NOT_ACCEPTABLE;
     }
 
-    $fn=~s/^http\:\/\/[^\/]+//;
-    $fn=~s/^\/\~(\w+)/\/home\/$1\/public_html/;
+    $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.')', 
+		       $env{'form.filename'}.' ('.$fn.')', 
 		       $r->filename); 
 	return HTTP_NOT_ACCEPTABLE;
     } else {
@@ -1916,35 +2058,31 @@ sub handler {
     unless (-e $fn) { 
 	$r->log_reason($cuname.' at '.$cudom.
 		       ' trying to publish non-existing file '.
-		       $ENV{'form.filename'}.' ('.$fn.')', 
+		       $env{'form.filename'}.' ('.$fn.')', 
 		       $r->filename); 
 	return HTTP_NOT_FOUND;
     } 
 
-    unless ($ENV{'form.phase'} eq 'two') {
-
 # -------------------------------- File is there and owned, init lookup tables.
 
-	%addid=();
-
-	{
-	    my $fh=Apache::File->new($r->dir_config('lonTabDir').'/addid.tab');
-	    while (<$fh>=~/(\w+)\s+(\w+)/) {
-		$addid{$1}=$2;
-	    }
+    %addid=();
+    
+    {
+	my $fh=Apache::File->new($r->dir_config('lonTabDir').'/addid.tab');
+	while (<$fh>=~/(\w+)\s+(\w+)/) {
+	    $addid{$1}=$2;
 	}
+    }
 
-	%nokey=();
+    %nokey=();
 
-	{
-	    my $fh=Apache::File->new($r->dir_config('lonIncludes').'/un_keyword.tab');
-	    while (<$fh>) {
-		my $word=$_;
-		chomp($word);
-		$nokey{$word}=1;
-	    }
+    {
+	my $fh=Apache::File->new($r->dir_config('lonIncludes').'/un_keyword.tab');
+	while (<$fh>) {
+	    my $word=$_;
+	    chomp($word);
+	    $nokey{$word}=1;
 	}
-
     }
 
 # ---------------------------------------------------------- Start page output.
@@ -1952,11 +2090,10 @@ sub handler {
     &Apache::loncommon::content_type($r,'text/html');
     $r->send_http_header;
     
-    my $js=&Apache::loncommon::browser_and_searcher_javascript();
-    $r->print('<html><head><title>LON-CAPA Publishing</title>
-              <script type="text/javascript">'.$js.'
-              </script></head>');
-    $r->print(&Apache::loncommon::bodytag('Resource Publication'));
+    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;
@@ -1975,7 +2112,7 @@ sub handler {
     if ($fn=~/\/$/) {
 # -------------------------------------------------------- This is a directory
 	&publishdirectory($r,$fn,$thisdisfn);
-	$r->print('<hr><font size="+2">'.&mt('Done').'</font><br><a href="/priv/'
+	$r->print('<hr /><a href="/priv/'
 		  .$cuname.'/'.$thisdisfn
 		  .'">'.&mt('Return to Directory').'</a>');
 
@@ -1985,49 +2122,82 @@ sub handler {
 	$thisfn=~/\.(\w+)$/;
 	my $thistype=$1;
 	my $thisembstyle=&Apache::loncommon::fileembstyle($thistype);
-	$r->print('<h2>'.&mt('Publishing').' '.
-		  &Apache::loncommon::filedescription($thistype).' <tt>');
+        if ($thistype eq 'page') {  $thisembstyle = 'rat'; }
+
+	$r->print('<h2>'.&mt('Publishing [_1]','<tt>'.$thisdisfn.'</tt>').'</h2>');
+
+        $r->print('<h3>'.&mt('Resource Details').'</h3>');
+
+        $r->print(&Apache::lonhtmlcommon::start_pick_box());
 
+        $r->print(&Apache::lonhtmlcommon::row_title(&mt('Type'))
+                 .&Apache::loncommon::filedescription($thistype)
+                 .&Apache::lonhtmlcommon::row_closure()
+                 );
+
+        $r->print(&Apache::lonhtmlcommon::row_title(&mt('Link to Resource'))
+                 .'<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">'.&mt('Co-Author').': '.
-		      $cuname.&mt(' at ').$cudom.'</font></h3>');
+        $r->print('</tt>'
+                 .&Apache::lonhtmlcommon::row_closure()
+                 );
+
+        $r->print(&Apache::lonhtmlcommon::row_title(&mt('Target'))
+                 .'<tt>'.$thisdistarget.'</tt>'
+                 .&Apache::lonhtmlcommon::row_closure()
+                 );
+
+# SB - ToDo:   
+	if (($cuname ne $env{'user.name'})||($cudom ne $env{'user.domain'})) {
+#           $r->print(&Apache::lonhtmlcommon::row_title('<span class="LC_warning">'.&mt('Co-Author').'</span>')
+            $r->print(&Apache::lonhtmlcommon::row_title(&mt('Co-Author'))
+                     .'<span class="LC_warning">'
+		     .&mt('[_1] at [_2]',$cuname,$cudom)
+                     .'</span>'
+                     .&Apache::lonhtmlcommon::row_closure()
+                     );
 	}
 
 	if (&Apache::loncommon::fileembstyle($thistype) eq 'ssi') {
+            $r->print(&Apache::lonhtmlcommon::row_title(&mt('Diffs')));
 	    $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 />');
+            $r->print(&mt('Diffs with Current Version').'</a>'
+                     .&Apache::lonhtmlcommon::row_closure()
+                     );
+
 	}
+
+        $r->print(&Apache::lonhtmlcommon::end_pick_box());
   
 # ------------------ Publishing from $thisfn to $thistarget with $thisembstyle.
 
-	unless ($ENV{'form.phase'} eq 'two') {
+	unless ($env{'form.phase'} eq 'two') {
 # ---------------------------------------------------------- Parse for problems
-	    my ($warningcount,$errorcount)=&checkonthis($r,$thisfn);
-            unless ($errorcount) {
+	    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.').
+		$r->print('<h3 class="LC_error">'.
+			  &mt('The document contains errors and cannot be published.').
 			  '</h3>');
 	    }
 	} else {
-	    $r->print('<hr />'.
-	    &phasetwo($r,$thisfn,$thistarget,$thisembstyle,$thisdistarget)); 
+	    &phasetwo($r,$thisfn,$thistarget,$thisembstyle,$thisdistarget); 
+	    $r->print('<hr />');
 	}
     }
-    $r->print('</body></html>');
+    $r->print(&Apache::loncommon::end_page());
 
     return OK;
 }