--- loncom/publisher/lonpublisher.pm	2003/09/24 19:38:18	1.135
+++ loncom/publisher/lonpublisher.pm	2003/12/22 22:09:06	1.149
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Publication Handler
 #
-# $Id: lonpublisher.pm,v 1.135 2003/09/24 19:38:18 albertel Exp $
+# $Id: lonpublisher.pm,v 1.149 2003/12/22 22:09:06 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -25,24 +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
-# 05/03,05/05,05/07 Gerd Kortemeyer
-# 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/25 Gerd Kortemeyer
-# YEAR=2002
-# 1/17 Gerd Kortemeyer
-#
 ###
 
 ###############################################################################
@@ -143,6 +125,7 @@ use Apache::lonnet();
 use Apache::loncommon();
 use Apache::lonmysql;
 use Apache::lonlocal;
+use Apache::loncfile;
 use vars qw(%metadatafields %metadatakeys);
 
 my %addid;
@@ -180,46 +163,48 @@ 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}=~/\Q$newentry\E/) ||
-                          ($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;
+	    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}=$_;
+		}
+	    }
+	    my $newentry=$parser->get_text('/'.$entry);
+	    if ($entry eq 'customdistributionfile') {
+		$newentry=~s/^\s*//;
+		if ($newentry !~m|^/res|) { $newentry=$prefix.$newentry; }
+	    }
+# actually store
+	    $metadatafields{$unikey}=$newentry;
+	}
+    }
 }
 
 #########################################
@@ -260,19 +245,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>';
 }
 
 #########################################
@@ -325,6 +312,9 @@ string which presents the form field (fo
 #########################################
 sub textfield {
     my ($title,$name,$value)=@_;
+    $value=~s/^\s+//gs;
+    $value=~s/\s+$//gs;
+    $value=~s/\s+/ /gs;
     $title=&mt($title);
     my $uctitle=uc($title);
     return "\n<p><font color=\"#800000\" face=\"helvetica\"><b>$uctitle:".
@@ -619,7 +609,7 @@ sub fix_ids_and_indices {
 			   join(', ',@duplicatedids));
     if ($duplicateids) {
 	print $logfile "Duplicate ID(s) exist, ".join(', ',@duplicatedids)."\n";
-	my $outstring='<font color="red">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='<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>';
 	return ($outstring,1);
     }
     if ($needsfixup) {
@@ -684,8 +674,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.='/';
 			}
@@ -699,14 +696,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;
 			    }
 			}
@@ -808,6 +804,26 @@ sub store_metadata {
     return (undef,$status);
 }
 
+
+# ============================================== 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;
+}
+
 #########################################
 #########################################
 
@@ -839,7 +855,7 @@ sub publish {
     my %allow=();
 
     unless ($logfile=Apache::File->new('>>'.$source.'.log')) {
-	return ('<font color="red">No write permission to user directory, FAIL</font>',1);
+	return ('<font color="red">'.&mt('No write permission to user directory, FAIL').'</font>',1);
     }
     print $logfile 
 "\n\n================= Publish ".localtime()." Phase One  ================\n".$ENV{'user.name'}.'@'.$ENV{'user.domain'}."\n";
@@ -863,7 +879,7 @@ sub publish {
 	if ($error) { return ($outstring,$error); }
 # ------------------------------------------------------------ Construct Allows
     
-	$scrout.='<h3>Dependencies</h3>';
+	$scrout.='<h3>'.&mt('Dependencies').'</h3>';
         my $allowstr='';
         foreach (sort(keys(%allow))) {
 	   my $thisdep=$_;
@@ -881,7 +897,7 @@ sub publish {
                if (
        &Apache::lonnet::getfile($Apache::lonnet::perlvar{'lonDocRoot'}.'/'.
                                             $thisdep.'.meta') eq '-1') {
-		   $scrout.= ' - <font color="red">Currently not available'.
+		   $scrout.= ' - <font color="red">'.&mt('Currently not available').
 		       '</font>';
                } else {
                    my %temphash=(&Apache::lonnet::declutter($target).'___'.
@@ -897,16 +913,20 @@ sub publish {
         }
         $outstring=~s/\n*(\<\/[^\>]+\>)\s*$/$allowstr\n$1\n/s;
 
+### FIXME: is this really what we want?
+# I dont' think so, to will corrupt any UTF-8 resources at least, 
+# and any encoding other than ISO-8859-1 will probably break
 	#Encode any High ASCII characters
-	$outstring=&HTML::Entities::encode($outstring,"\200-\377");
+	#$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>',1);
+             return ('<font color="red">'.&mt('No write permission to').
+		     ' '.$source.
+		     ', '.&mt('FAIL').'</font>',1);
 	  }
           print($org $outstring);
         }
@@ -916,14 +936,15 @@ 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>';
     }
@@ -951,10 +972,16 @@ sub publish {
 
         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)
 
@@ -975,20 +1002,12 @@ sub publish {
 		delete $metadatafields{$_};
             }
         }
-        
-    }
-
-# -------------------------------------------------- Parse content for metadata
-    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'));
+# ------------------------------------------ See if anything new in file itself
+ 
+	$allmeta=&parseformeta($source,$style);
+   }
 
-        &metaeval($allmeta);
-    }
+       
 # ---------------- Find and document discrepancies in the parameters and stores
 
     my $chparms='';
@@ -1003,7 +1022,8 @@ sub publish {
 	}
     }
     if ($chparms) {
-	$scrout.='<p><b>New parameters or stored values:</b> '.$chparms.'</p>';
+	$scrout.='<p><b>'.&mt('New parameters or stored values').
+	    ':</b> '.$chparms.'</p>';
     }
 
     $chparms='';
@@ -1017,8 +1037,10 @@ sub publish {
 	}
     }
     if ($chparms) {
-	$scrout.='<p><b>Obsolete parameters or stored values:</b> '.
-	    $chparms.'</p>';
+	$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 />';
     }
 
 # ------------------------------------------------------- Now have all metadata
@@ -1052,7 +1074,7 @@ sub publish {
     unless ($batch) {
         $scrout.=
 	    '<form name="pubform" action="/adm/publish" method="post">'.
-            '<p><input type="submit" value="Finalize Publication" /></p>'.
+            '<p><input type="submit" value="'.&mt('Finalize Publication').'" /></p>'.
             &hiddenfield('phase','two').
             &hiddenfield('filename',$ENV{'form.filename'}).
 	    &hiddenfield('allmeta',&Apache::lonnet::escape($allmeta)).
@@ -1064,6 +1086,9 @@ sub publish {
 # --------------------------------------------------- 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) {
@@ -1076,10 +1101,10 @@ function uncheckAll(field) {
         field[i].checked = false ;
 }
 </script>
-<p><font color="#800000" face="helvetica"><b>KEYWORDS:</b></font>
+<p><font color="#800000" face="helvetica"><b>$KEYWORDS:</b></font>
  $keywords_help</b>
-<input type="button" value="check all" onclick="javascript:checkAll(document.pubform.keywords)" /> 
-<input type="button" value="uncheck all" onclick="javascript:uncheckAll(document.pubform.keywords)" /> 
+<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
@@ -1112,7 +1137,7 @@ END
 	$scrout.=&textfield('Notes','notes',$metadatafields{'notes'});
 
 	$scrout.=
-	    "\n<p><font color=\"#800000\" face=\"helvetica\"><b>ABSTRACT:".
+	    "\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>';
@@ -1170,10 +1195,22 @@ END
 	    $scrout.=&textfield('Custom Distribution File','customdistributionfile',
 				$metadatafields{'customdistributionfile'}).
 				    $copyright_help;
+	    my $uctitle=uc(&mt('Obsolete'));
+            $scrout.=
+		"\n<p><font color=\"#800000\" face=\"helvetica\"><b>$uctitle:".
+		'</b></font> <input type="checkbox" name="obsolete" ';
+	    if ($metadatafields{'obsolete'}) {
+		$scrout.=' checked="1" ';
+	    }
+	    $scrout.='/ ></p>'.
+		&textfield('Suggested Replacement for Obsolete File',
+				    'obsoletereplacement',
+				    $metadatafields{'obsoletereplacement'});
 	} else {
 	    $scrout.=&hiddenfield('copyright','private');
 	}
-	return ($scrout.'<p><input type="submit" value="Finalize Publication" /></p></form>',0);
+	return ($scrout.'<p><input type="submit" value="'.
+		&mt('Finalize Publication').'" /></p></form>',0);
 # =============================================================================
 # BATCH MODE
 #
@@ -1251,14 +1288,16 @@ sub phasetwo {
 
     if ($target=~/\_\_\_/) {
 	$r->print(
- '<font color="red">Unsupported character combination "<tt>___</tt>" in filename, FAIL</font>');
+ '<font color="red">'.&mt('Unsupported character combination').
+		  ' "<tt>___</tt>" '.&mt('in filename, FAIL').'</font>');
         return 0;
     }
     $distarget=~s/\/+/\//g;
     my $logfile;
     unless ($logfile=Apache::File->new('>>'.$source.'.log')) {
 	$r->print(
-        '<font color="red">No write permission to user directory, FAIL</font>');
+        '<font color="red">'.
+		&mt('No write permission to user directory, FAIL').'</font>');
         return 0;
     }
     print $logfile 
@@ -1282,6 +1321,9 @@ sub phasetwo {
     $metadatafields{'copyright'}=$ENV{'form.copyright'};
     $metadatafields{'customdistributionfile'}=
                                  $ENV{'form.customdistributionfile'};
+    $metadatafields{'obsolete'}=$ENV{'form.obsolete'};
+    $metadatafields{'obsoletereplacement'}=
+	                        $ENV{'form.obsoletereplacement'};
     $metadatafields{'dependencies'}=$ENV{'form.dependencies'};
     
     my $allkeywords=$ENV{'form.addkey'};
@@ -1296,12 +1338,22 @@ sub phasetwo {
     $allkeywords=~s/^\,//;
     $metadatafields{'keywords'}=$allkeywords;
     
+# check if custom distribution file is specified
+    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>';
+        }
+    }
     {
         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>';
+                '<font color="red">'.&mt('Could not write metadata, FAIL').
+		'</font>';
         }
         foreach (sort keys %metadatafields) {
             unless ($_=~/\./) {
@@ -1320,7 +1372,7 @@ sub phasetwo {
                         .'</'.$tag.'>';
             }
         }
-        $r->print('<p>Wrote Metadata</p>');
+        $r->print('<p>'.&mt('Wrote Metadata').'</p>');
         print $logfile "\nWrote metadata";
     }
     
@@ -1331,14 +1383,15 @@ sub phasetwo {
     unless ($metadatafields{'copyright'} eq 'priv') {
         my ($error,$success) = &store_metadata(\%metadatafields);
         if ($success) {
-            $r->print('<p>Synchronized SQL metadata database</p>');
+            $r->print('<p>'.&mt('Synchronized SQL metadata database').'</p>');
             print $logfile "\nSynchronized SQL metadata database";
         } else {
             $r->print($error);
             print $logfile "\n".$error;
         }
     } else {
-        $r->print('<p>Private Publication - did not synchronize database</p>');
+        $r->print('<p>'.
+	     &mt('Private Publication - did not synchronize database').'</p>');
         print $logfile "\nPrivate: Did not synchronize data into ".
             "SQL metadata database";
     }
@@ -1375,10 +1428,11 @@ sub phasetwo {
         
         if (copy($target,$copyfile)) {
 	    print $logfile "Copied old target to ".$copyfile."\n";
-            $r->print('<p>Copied old target file</p>');
+            $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>";
+            return "<font color=\"red\">".&mt('Failed to copy old target').
+		", $!, ".&mt('FAIL')."</font>";
         }
         
 # --------------------------------------------------------------- Copy Metadata
@@ -1387,18 +1441,19 @@ sub phasetwo {
         
         if (copy($target.'.meta',$copyfile)) {
 	    print $logfile "Copied old target metadata to ".$copyfile."\n";
-            $r->print('<p>Copied old metadata</p>')
+            $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>";
+                    "<font color=\"red\">".
+&mt('Failed to write old metadata copy').", $!, ".&mt('FAIL')."</font>";
 	    }
         }
         
         
     } else {
-        $r->print('<p>Initial version</p>');
+        $r->print('<p>'.&mt('Initial version').'</p>');
         print $logfile "\nInitial version";
     }
 
@@ -1413,17 +1468,18 @@ sub phasetwo {
         $path.="/$parts[$count]";
         if ((-e $path)!=1) {
             print $logfile "\nCreating directory ".$path;
-            $r->print('<p>Created directory '.$parts[$count].'</p>');
+            $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</p>');
+        $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>";
+        return "<font color=\"red\">".
+	    &mt('Failed to copy source').", $!, ".&mt('FAIL')."</font>";
     }
     
 # --------------------------------------------------------------- Copy Metadata
@@ -1432,18 +1488,18 @@ sub phasetwo {
     
     if (copy($source.'.meta',$copyfile)) {
         print $logfile "\nCopied original metadata to ".$copyfile."\n";
-        $r->print('<p>Copied metadata</p>');
+        $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>";
+            "<font color=\"red\">".&mt('Failed to write metadata copy').", $!, ".&mt('FAIL')."</font>";
     }
     $r->rflush;
 # --------------------------------------------------- Send update notifications
 
     my @subscribed=&get_subscribed_hosts($target);
     foreach my $subhost (@subscribed) {
-	$r->print('<p>Notifying host '.$subhost.':');$r->rflush;
+	$r->print('<p>'.&mt('Notifying host').' '.$subhost.':');$r->rflush;
 	print $logfile "\nNotifying host ".$subhost.':';
 	my $reply=&Apache::lonnet::critical('update:'.$target,$subhost);
 	$r->print($reply.'</p><br />');$r->rflush;
@@ -1454,7 +1510,8 @@ sub phasetwo {
 
     my @subscribedmeta=&get_subscribed_hosts("$target.meta");
     foreach my $subhost (@subscribedmeta) {
-	$r->print('<p>Notifying host for metadata only '.$subhost.':');$r->rflush;
+	$r->print('<p>'.
+&mt('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);
@@ -1466,7 +1523,7 @@ sub phasetwo {
     my %courses=&coursedependencies($target);
     my $now=time;
     foreach (keys %courses) {
-	$r->print('<p>Notifying course '.$_.':');$r->rflush;
+	$r->print('<p>'.&mt('Notifying course').' '.$_.':');$r->rflush;
 	print $logfile "\nNotifying host ".$_.':';
         my ($cdom,$cname)=split(/\_/,$_);
 	my $reply=&Apache::lonnet::cput
@@ -1488,11 +1545,14 @@ sub phasetwo {
         
         $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></p>'.
+           &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></p>');
+                   '"><font size="+2">'.
+		  &mt('Back to Source Directory').'</font></a></p>');
     }
+    return '<p><font color="green">'.&mt('Done').'</font></p>';
 }
 
 #########################################
@@ -1512,17 +1572,15 @@ sub batchpublish {
     $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)=@_;
@@ -1547,53 +1605,53 @@ 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,
+	$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!~/\~$/)) {
+	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 $publishthis=0;
+	    if (-e $resdir.'/'.$filename) {
 	        my ($rdev,$rino,$rmode,$rnlink,
-	        $ruid,$rgid,$rrdev,$rsize,
-	        $ratime,$rmtime,$rctime,
-	        $rblksize,$rblocks)=stat($resdir.'/'.$filename);
+		    $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 {
+	    } else {
 # never published
-		 $publishthis=1;
-	     }
-             if ($publishthis) {
+		$publishthis=1;
+	    }
+	    if ($publishthis) {
                 &batchpublish($r,$fn.'/'.$filename,$resdir.'/'.$filename);
-	     } else {
-                 $r->print('<br />Skipping '.$filename.'<br />');
-             }
-             $r->rflush();
-         }
-      }
-      closedir(DIR);
+	    } else {
+		$r->print('<br />Skipping '.$filename.'<br />');
+	    }
+	    $r->rflush();
+	}
+    }
+    closedir(DIR);
 }
 #########################################
 
@@ -1636,13 +1694,13 @@ 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
 
@@ -1651,155 +1709,156 @@ sub handler {
 
 # -------------------------------------------------------------- Check filename
 
-  my $fn=&Apache::lonnet::unescape($ENV{'form.filename'});
+    my $fn=&Apache::lonnet::unescape($ENV{'form.filename'});
 
   
-  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;
+    } 
+
+    ($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 (-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 (-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 ($ENV{'form.phase'} eq 'two') {
 
 # -------------------------------- 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;
-      }
-  }
-
-  %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('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;
+	    }
+	}
+
+    }
 
 # ---------------------------------------------------------- Start page output.
 
-  $r->content_type('text/html');
-  $r->send_http_header;
+    &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('Resource Publication'));
+    $r->print('<html><head><title>LON-CAPA Publishing</title></head>');
+    $r->print(&Apache::loncommon::bodytag('Resource Publication'));
 
 
-  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/^\Q$docroot\E//;
+    my $thisdistarget=$thistarget;
+    $thisdistarget=~s/^\Q$docroot\E//;
 
-  my $thisdisfn=$thisfn;
-  $thisdisfn=~s/^\/home\/\Q$cuname\E\/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);
-      $r->print('<hr><font size="+2">Done</font><br><a href="/priv/'
-		.$cuname.'/'.$thisdisfn
-		.'">Return to Directory</a>');
+	&publishdirectory($r,$fn,$thisdisfn);
+	$r->print('<hr><font size="+2">'.&mt('Done').'</font><br><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>');
+	$thisfn=~/\.(\w+)$/;
+	my $thistype=$1;
+	my $thisembstyle=&Apache::loncommon::fileembstyle($thistype);
+	$r->print('<h2>'.&mt('Publishing').' '.
+		  &Apache::loncommon::filedescription($thistype).' <tt>');
 
-      $r->print(<<ENDCAPTION);
+	$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>Target:</b> <tt>'.$thisdistarget.'</tt><br />');
+        $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 (($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);
+	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"))'>Diffs with Current Version</a><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') {
-	   my ($outstring,$error)=&publish($thisfn,$thistarget,$thisembstyle);
-	   $r->print('<hr />'.$outstring);
-       } else {
-           $r->print('<hr />');
-           &phasetwo($r,$thisfn,$thistarget,$thisembstyle,$thisdistarget); 
-       }
-  }
-  $r->print('</body></html>');
+	unless ($ENV{'form.phase'} eq 'two') {
+	    my ($outstring,$error)=&publish($thisfn,$thistarget,$thisembstyle);
+	    $r->print('<hr />'.$outstring);
+	} else {
+	    $r->print('<hr />'.
+	    &phasetwo($r,$thisfn,$thistarget,$thisembstyle,$thisdistarget)); 
+	}
+    }
+    $r->print('</body></html>');
 
-  return OK;
+    return OK;
 }
 
 1;