--- loncom/publisher/lonpublisher.pm	2009/11/24 00:57:11	1.249.2.1
+++ loncom/publisher/lonpublisher.pm	2013/10/16 18:28:18	1.286
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Publication Handler
 #
-# $Id: lonpublisher.pm,v 1.249.2.1 2009/11/24 00:57:11 raeburn Exp $
+# $Id: lonpublisher.pm,v 1.286 2013/10/16 18:28:18 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -66,10 +66,10 @@ invocation by F<loncapa_apache.conf>:
 
 =head1 OVERVIEW
 
-Authors can only write-access the C</~authorname/> space. They can
-copy resources into the resource area through the publication step,
-and move them back through a recover step. Authors do not have direct
-write-access to their resource space.
+Authors can only write-access the C</priv/domain/authorname/> space. 
+They can copy resources into the resource area through the 
+publication step, and move them back through a recover step. 
+Authors do not have direct write-access to their resource space.
 
 During the publication step, several events will be
 triggered. Metadata is gathered, where a wizard manages default
@@ -121,7 +121,6 @@ use HTML::LCParser;
 use HTML::Entities;
 use Encode::Encoder;
 use Apache::lonxml;
-use Apache::loncacc;
 use DBI;
 use Apache::lonnet;
 use Apache::loncommon();
@@ -266,9 +265,9 @@ sub metaread {
     my ($logfile,$fn,$prefix)=@_;
     unless (-e $fn) {
 	print($logfile 'No file '.$fn."\n");
-        return '<div><b>'
-              .&mt('No file: [_1]'
-                  ,'</b> <tt>'.&Apache::loncfile::display($fn).'</tt></div>');
+        return '<p class="LC_warning">'
+              .&mt('No file: [_1]',&Apache::loncfile::display($fn))
+              .'</p>';
     }
     print($logfile 'Processing '.$fn."\n");
     my $metastring;
@@ -277,9 +276,9 @@ sub metaread {
 	$metastring=join('',<$metafh>);
     }
     &metaeval($metastring,$prefix);
-    return '<div><b>'
-          .&mt('Processed file: [_1]'
-              ,'</b> <tt>'.&Apache::loncfile::display($fn).'</tt></div>');
+    return '<p class="LC_info">'
+          .&mt('Processed file: [_1]',&Apache::loncfile::display($fn))
+          .'</p>';
 }
 
 #########################################
@@ -384,11 +383,11 @@ sub selectbox {
     my $selout="\n".&Apache::lonhtmlcommon::row_title($title)
               .'<select name="'.$name.'">';
     foreach (@idlist) {
-        $selout.='<option value=\''.$_.'\'';
+        $selout.='<option value="'.$_.'"';
         if ($_ eq $value) {
-	    $selout.=' selected>'.&{$functionref}($_).'</option>';
-	}
-        else {$selout.='>'.&{$functionref}($_).'</option>';}
+	    $selout.=' selected="selected"';
+        }
+        $selout.='>'.&{$functionref}($_).'</option>';
     }
     $selout.='</select>'.&Apache::lonhtmlcommon::row_closure();
     return $selout;
@@ -791,10 +790,55 @@ sub fix_ids_and_indices {
 		}
 		if (!$endtag) { if ($token->[4]=~m:/>$:) { $endtag=' /'; }; }
 		$outstring.='<'.$tag.$newparmstring.$endtag.'>';
-		if ($lctag eq 'm' || $lctag eq 'script' || $lctag eq 'answer' 
-                    || $lctag eq 'display' || $lctag eq 'tex') {
+		if ($lctag eq 'm' || $lctag eq 'answer' || $lctag eq 'display' ||
+                    $lctag eq 'tex') {
 		    $outstring.=&get_all_text_unbalanced('/'.$lctag,\@parser);
-		}
+                } elsif ($lctag eq 'script') {
+                    if ($parms{'type'} eq 'loncapa/perl') {
+                        $outstring.=&get_all_text_unbalanced('/'.$lctag,\@parser);
+                    } else {
+                        my $script = &get_all_text_unbalanced('/'.$lctag,\@parser);
+                        if ($script =~ m{\.set\w+(Src|Swf)\(["']}i) {
+                            my @srcs = split(/\.set/i,$script);
+                            if (scalar(@srcs) > 1) {
+                                foreach my $item (@srcs) {
+                                    if ($item =~ m{^(FlashPlayerSwf|MediaSrc|XMPSrc|ConfigurationSrc|PosterImageSrc)\((['"])(?:(?!\2).)+\2\)}is) {
+                                        my $srctype = $1;
+                                        my $quote = $2;
+                                        my ($url) = ($item =~ m{^\Q$srctype($quote\E([^$quote]+)\Q$quote)\E});
+                                        $url = &urlfixup($url);
+                                        unless ($url=~m{^(?:http|https|ftp)://}) {
+                                            $allow{&absoluteurl($url,$target)}=1;
+                                            if ($srctype eq 'ConfigurationSrc') {
+                                                if ($url =~ m{^(.+/)configuration_express\.xml$}) {
+#
+# Camtasia 8.1: express_show/spritesheet.png needed, and included in zip archive.
+# Not referenced directly in <main>.html or <main>_player.html files,
+# so add this file to %allow (where <main> is name user gave to file/archive).
+#
+                                                    my $spritesheet = $1.'express_show/spritesheet.png';
+                                                    $allow{&absoluteurl($spritesheet,$target)}=1;
+                                                }
+                                            } elsif ($srctype eq 'PosterImageSrc') {
+                                                if ($url =~ m{^(.+)_First_Frame\.png$}) {
+                                                    my $prefix = $1;
+#
+# Camtasia 8.1: <main>_Thumbnails.png needed, and included in zip archive.
+# Not referenced directly in <main>.html or <main>_player.html files,
+# so add this file to %allow (where <main> is name user gave to file/archive).
+#
+                                                    my $thumbnail = $prefix.'_Thumbnails.png';
+                                                    $allow{&absoluteurl($thumbnail,$target)}=1;
+                                                }
+                                            }
+                                        }
+                                    }
+                                }
+                            }
+                        }
+                        $outstring .= $script
+                    }
+                }
 	    } elsif ($token->[0] eq 'E') {
 		if ($token->[2]) {
 		    unless ($token->[1] eq 'allow') {
@@ -1017,6 +1061,11 @@ sub publish {
 		   $outdep.= ' - <span class="LC_error">'.&mt('Currently not available').
 		       '</span>';
                } else {
+#
+# Store the fact that the dependency has been used by the target file
+# Unfortunately, usage is erroneously named sequsage in lonmeta.pm
+# The translation happens in lonmetadata.pm
+#
                    my %temphash=(&Apache::lonnet::declutter($target).'___'.
                              &Apache::lonnet::declutter($thisdep).'___usage'
                                  => time);
@@ -1062,7 +1111,7 @@ sub publish {
      my %oldparmstores=();
      
     unless ($batch) {
-     $scrout.='<h3>'.&mt('Metadata Information').' ' .
+     $scrout.='<h3>'.&mt('Metadata').' ' .
        &Apache::loncommon::help_open_topic("Metadata_Description")
        . '</h3>';
     }
@@ -1080,16 +1129,16 @@ sub publish {
 # ------------------------------------------------ Check out directory hierachy
 
         my $thisdisfn=$source;
-        $thisdisfn=~s/^\/home\/\Q$cuname\E\///;
 
-        my @urlparts=split(/\//,$thisdisfn);
+        $thisdisfn=~s/^\Q$docroot\E\/priv\/\Q$cudom\E\/\Q$cuname\E\///;
+        my @urlparts=('.',split(/\//,$thisdisfn));
         $#urlparts--;
 
-        my $currentpath='/home/'.$cuname.'/';
+        my $currentpath=$docroot.'/priv/'.$cudom.'/'.$cuname.'/';
 
 	my $prefix='../'x($#urlparts);
-        foreach (@urlparts) {
-	    $currentpath.=$_.'/';
+        foreach my $subdir (@urlparts) {
+	    $currentpath.=$subdir.'/';
             $scrout.=&metaread($logfile,$currentpath.'default.meta',$prefix);
 	    $prefix=~s|^\.\./||;
         }
@@ -1121,7 +1170,7 @@ sub publish {
 # ------------------------------------------------------------- Save some stuff
         my %savemeta=();
         foreach ('title') {
-            $savemeta{$_}=$metadatafields{$_};
+            if ($metadatafields{$_}) { $savemeta{$_}=$metadatafields{$_}; }
 	}
 # ------------------------------------------ See if anything new in file itself
  
@@ -1166,15 +1215,16 @@ sub publish {
 	}
     }
     if ($chparms) {
-	$scrout.='<p><b>'.&mt('Obsolete parameters or saved values').':</b> '.
-	    $chparms.'</p><h1><span class="LC_warning">'.&mt('Warning!').
-	    '</span></h1><p><span class="LC_warning">'.
-	    &mt('If this resource is in active use, student performance data from the previous version may become inaccessible.').'</span></p><hr />';
+        $scrout.='<p><b>'.&mt('Obsolete parameters or saved values').':</b> '
+	        .$chparms.'</p>'
+                .'<p class="LC_warning"><b>'.&mt('Warning!').'</b><br />'
+                .&mt('If this resource is in active use, student performance data from the previous version may become inaccessible.')
+                .'</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 />';
+        $scrout.='<p class="LC_warning"><b>'.&mt('Warning!').'</b><br />'
+                .&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.')
+                .'</p><hr />';
     }
 
 # ------------------------------------------------------- Now have all metadata
@@ -1227,7 +1277,7 @@ sub publish {
                     .'</p>'
                     .'<p><input type="submit" value="'
                     .&mt('Finalize Publication')
-                    .'" /></p>';
+                    .'" /> <a href="'.&Apache::loncfile::url($source).'">'.&mt('Cancel').'</a></p>';
     }
     $intr_scrout.=&Apache::lonhtmlcommon::start_pick_box();
     $intr_scrout.=
@@ -1282,11 +1332,11 @@ END
         $keywordout.='<label><input type="checkbox" name="keywords" value="'.$word.'"';
         if ($metadatafields{'keywords'}) {
             if ($metadatafields{'keywords'}=~/\Q$word\E/) {
-                $keywordout.=' checked="on"';
+                $keywordout.=' checked="checked"';
                 $env{'form.keywords'}.=$word.',';
             }
         } elsif (&Apache::loncommon::keyword($word)) {
-            $keywordout.=' checked="on"';
+            $keywordout.=' checked="checked"';
             $env{'form.keywords'}.=$word.',';
         }
         $keywordout.=' />'.$word.'</label></td>';
@@ -1401,9 +1451,9 @@ END
 				 (&Apache::loncommon::source_copyrightids));
 #	$intr_scrout.=&text_with_browse_field('Source Custom Distribution File','sourcerights',$metadatafields{'sourcerights'},'rights');
 	my $uctitle=&mt('Obsolete');
-        my $obsolete_checked=($metadatafields{'obsolete'})?' checked="1" ':'';
+        my $obsolete_checked=($metadatafields{'obsolete'})?' checked="checked"':'';
         $intr_scrout.="\n".&Apache::lonhtmlcommon::row_title($uctitle)
-                     .'<input type="checkbox" name="obsolete" '.$obsolete_checked.'/ >'
+                     .'<input type="checkbox" name="obsolete"'.$obsolete_checked.' />'
                      .&Apache::lonhtmlcommon::row_closure(1);
         $intr_scrout.=&text_with_browse_field('Suggested Replacement for Obsolete File',
 				    'obsoletereplacement',
@@ -1504,7 +1554,7 @@ sub phasetwo {
 	    return 0;
 	}
 	if ($target=~/\.(\d+)\.(\w+)$/) {
-	    $r->print('<span class="LC_error">'.&mt('Cannot publish versioned resource, FAIL').'</span>');
+	    $r->print('<span class="LC_error">'.&mt('Filename of resource contains internal version number. Cannot publish such resources, FAIL').'</span>');
 	    return 0;
 	}
     }
@@ -1640,7 +1690,8 @@ sub phasetwo {
         my $srcf=$2;
         my $srct=$3;
         my $srcd=$1;
-        unless ($srcd=~/^\/home\/httpd\/html\/res/) {
+        my $docroot = $Apache::lonnet::perlvar{'lonDocRoot'};
+        unless ($srcd=~/^\Q$docroot\E\/res/) {
             print $logfile "\nPANIC: Target dir is ".$srcd;
             $r->print(
 	 "<span class=\"LC_error\">".&mt('Invalid target directory, FAIL')."</span>");
@@ -1659,18 +1710,17 @@ sub phasetwo {
         }
         closedir(DIR);
         $maxversion++;
-        $r->print('<p>Creating old version '.$maxversion.'</p>');
+        $r->print('<p>'.&mt('Creating old version [_1]',$maxversion).'</p>');
         print $logfile "\nCreating old version ".$maxversion."\n";
         
         my $copyfile=$srcd.'/'.$srcf.'.'.$maxversion.'.'.$srct;
         
         if (copy($target,$copyfile)) {
 	    print $logfile "Copied old target to ".$copyfile."\n";
-            $r->print('<p>'.&mt('Copied old target file').'</p>');
+            $r->print(&Apache::lonhtmlcommon::confirm_success(&mt('Copied old target file')));
         } else {
 	    print $logfile "Unable to write ".$copyfile.':'.$!."\n";
-            $r->print("<span class=\"LC_error\">".&mt('Failed to copy old target').
-		", $!, ".&mt('FAIL')."</span>");
+            $r->print(&Apache::lonhtmlcommon::confirm_success(&mt('Failed to copy old target').", $!",1));
 	    return 0;
         }
         
@@ -1680,13 +1730,12 @@ sub phasetwo {
         
         if (copy($target.'.meta',$copyfile)) {
 	    print $logfile "Copied old target metadata to ".$copyfile."\n";
-            $r->print('<p>'.&mt('Copied old metadata').'</p>')
+            $r->print(&Apache::lonhtmlcommon::confirm_success(&mt('Copied old metadata')));
         } else {
 	    print $logfile "Unable to write metadata ".$copyfile.':'.$!."\n";
             if (-e $target.'.meta') {
-                $r->print( 
-                    "<span class=\"LC_error\">".
-&mt('Failed to write old metadata copy').", $!, ".&mt('FAIL')."</span>");
+                $r->print(&Apache::lonhtmlcommon::confirm_success(
+                           &mt('Failed to write old metadata copy').", $!",1));
 		return 0;
 	    }
         }
@@ -1708,32 +1757,38 @@ sub phasetwo {
         $path.="/$parts[$count]";
         if ((-e $path)!=1) {
             print $logfile "\nCreating directory ".$path;
-            $r->print('<p>'.&mt('Created directory').' '.$parts[$count].'</p>');
             mkdir($path,0777);
+            $r->print('<p>'
+                     .&mt('Created directory [_1]'
+                         ,'<span class="LC_filename">'.$parts[$count].'</span>')
+                     .'</p>'
+            );
         }
     }
     
     if (copy($source,$copyfile)) {
         print $logfile "\nCopied original source to ".$copyfile."\n";
-        $r->print('<p>'.&mt('Copied source file').'</p>');
+        $r->print(&Apache::lonhtmlcommon::confirm_success(&mt('Copied source file')));
     } else {
         print $logfile "\nUnable to write ".$copyfile.':'.$!."\n";
-        $r->print("<span class=\"LC_error\">".
-	    &mt('Failed to copy source').", $!, ".&mt('FAIL')."</span>");
+        $r->print(&Apache::lonhtmlcommon::confirm_success(
+	    &mt('Failed to copy source').", $!",1));
 	return 0;
     }
     
+# ---------------------------------------------- Delete local tmp-preview files
+    unlink($copyfile.'.tmp');
 # --------------------------------------------------------------- Copy Metadata
 
     $copyfile=$copyfile.'.meta';
     
     if (copy($source.'.meta',$copyfile)) {
         print $logfile "\nCopied original metadata to ".$copyfile."\n";
-        $r->print('<p>'.&mt('Copied metadata').'</p>');
+        $r->print(&Apache::lonhtmlcommon::confirm_success(&mt('Copied metadata')));
     } else {
         print $logfile "\nUnable to write metadata ".$copyfile.':'.$!."\n";
-        $r->print(
-            "<span class=\"LC_error\">".&mt('Failed to write metadata copy').", $!, ".&mt('FAIL')."</span>");
+        $r->print(&Apache::lonhtmlcommon::confirm_success(
+                  &mt('Failed to write metadata copy').", $!",1));
 	return 0;
     }
     $r->rflush;
@@ -1741,7 +1796,8 @@ sub phasetwo {
 # ------------------------------------------------------------- Trigger updates
     push(@{$modified_urls},[$target,$source]);
     unless ($registered_cleanup) {
-	$r->register_cleanup(\&notify);
+        my $handlers = $r->get_handlers('PerlCleanupHandler');
+        $r->set_handlers('PerlCleanupHandler' => [\&notify,@{$handlers}]);
 	$registered_cleanup=1;
     }
 
@@ -1752,27 +1808,30 @@ sub phasetwo {
     &Apache::lonnet::devalidate_cache_new('meta',
 			 &Apache::lonnet::declutter($thisdistarget));
 
+# ------------------------------------------------------------- Everything done
+    $logfile->close();
+    $r->print('<p class="LC_success">'.&mt('Done').'</p>');
+
 # ------------------------------------------------ Provide link to new resource
     unless ($batch) {
         
-        my $thissrc=$source;
-        $thissrc=~s{^/home/($match_username)/public_html}{/priv/$1};
-        
+        my $thissrc=&Apache::loncfile::url($source);
         my $thissrcdir=$thissrc;
         $thissrcdir=~s/\/[^\/]+$/\//;
         
-        
         $r->print(
-           '<hr /><a href="'.$thisdistarget.'"><font size="+2">'.
-           &mt('View Published Version').'</font></a>'.
-           '<p><a href="'.$thissrc.'"><font size="+2">'.
-		  &mt('Back to Source').'</font></a></p>'.
-           '<p><a href="'.$thissrcdir.
-                   '"><font size="+2">'.
-		  &mt('Back to Source Directory').'</font></a></p>');
+            &Apache::lonhtmlcommon::actionbox([
+                '<a href="'.$thisdistarget.'">'.
+                &mt('View Published Version').
+                '</a>',
+                '<a href="'.$thissrc.'">'.
+                &mt('Back to Source').
+                '</a>',
+                '<a href="'.$thissrcdir.'">'.
+                &mt('Back to Source Directory').
+                '</a>'])
+        );
     }
-    $logfile->close();
-    $r->print('<p><font color="green">'.&mt('Done').'</font></p>');
     return 1;
 }
 
@@ -1822,8 +1881,6 @@ sub batchpublish {
     my %oldenv=%env;
     $srcfile=~s/\/+/\//g;
     $targetfile=~s/\/+/\//g;
-    my $thisdisfn=$srcfile;
-    $thisdisfn=~s/\/home\/korte\/public_html\///;
     $srcfile=~s/\/+/\//g;
 
     my $docroot=$r->dir_config('lonDocRoot');
@@ -1839,7 +1896,10 @@ sub batchpublish {
 
     my $thisembstyle=&Apache::loncommon::fileembstyle($thistype);
      
-    $r->print('<h2>'.&mt('Publishing').' <tt>'.$thisdisfn.'</tt></h2>');
+    $r->print('<h2>'
+             .&mt('Publishing [_1]',&Apache::loncfile::display($srcfile))
+             .'</h2>'
+    );
 
 # phase one takes
 #  my ($source,$target,$style,$batch)=@_;
@@ -1863,25 +1923,39 @@ sub publishdirectory {
     my ($r,$fn,$thisdisfn)=@_;
     $fn=~s/\/+/\//g;
     $thisdisfn=~s/\/+/\//g;
-    my $resdir=
-	$Apache::lonnet::perlvar{'lonDocRoot'}.'/res/'.$cudom.'/'.$cuname.'/'.
-	$thisdisfn;
-    $r->print('<h1>'.&mt('Directory').' <tt>'.$thisdisfn.'</tt></h1>'.
-	      &mt('Target').': <tt>'.$resdir.'</tt><br />');
+    my $thisdisresdir=$thisdisfn;
+    $thisdisresdir=~s/^\/priv\//\/res\//;
+    my $resdir = $r->dir_config('lonDocRoot').$thisdisresdir;
+    $r->print(&Apache::lonhtmlcommon::start_pick_box()
+             .&Apache::lonhtmlcommon::row_title(&mt('Directory'))
+            .'<span class="LC_filename">'.$thisdisfn.'</span>'
+            .&Apache::lonhtmlcommon::row_closure()
+            .&Apache::lonhtmlcommon::row_title(&mt('Target'))
+            .'<span class="LC_filename">'.$thisdisresdir.'</span>'
+    );
 
     my $dirptr=16384;		# Mask indicating a directory in stat.cmode.
     unless ($env{'form.phase'} eq 'two') {
 # ask user what they want
-        $r->print('<form name="pubdirpref" method="post">'.
+        $r->print(&Apache::lonhtmlcommon::row_closure()
+                 .&Apache::lonhtmlcommon::row_title(&mt('Options'))
+        );
+        $r->print('<form name="pubdirpref" method="post" action="">'.
 		  &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').
+		  &checkbox('forceoverride','force directory level metadata over existing').
 		  '<br /><input type="submit" value="'.&mt('Publish Directory').'" /></form>');
+        $r->print(&Apache::lonhtmlcommon::row_closure(1)
+                 .&Apache::lonhtmlcommon::end_pick_box()
+        );
         $lock=0;
     } else {
+        $r->print(&Apache::lonhtmlcommon::row_closure(1)
+                 .&Apache::lonhtmlcommon::end_pick_box()
+        );
         unless ($lock) { $lock=&Apache::lonnet::set_lock(&mt('Publishing [_1]',$fn)); }
 # actually publish things
 	opendir(DIR,$fn);
@@ -1938,18 +2012,17 @@ sub publishdirectory {
 
 sub defaultmetapublish {
     my ($r,$fn,$cuname,$cudom)=@_;
-    $fn=~s/^\/\~$cuname\//\/home\/$cuname\/public_html\//;
     unless (-e $fn) {
        return HTTP_NOT_FOUND;
     }
     my $target=$fn;
-    $target=~s/^\/home\/$cuname\/public_html\//$Apache::lonnet::perlvar{'lonDocRoot'}\/res\/$cudom\/$cuname\//;
+    $target=~s/^\Q$Apache::lonnet::perlvar{'lonDocRoot'}\E\/priv\//\Q$Apache::lonnet::perlvar{'lonDocRoot'}\E\/res\//;
 
 
     &Apache::loncommon::content_type($r,'text/html');
     $r->send_http_header;
 
-    $r->print(&Apache::loncommon::start_page('Catalog Information Publication'));
+    $r->print(&Apache::loncommon::start_page('Metadata Publication'));
 
 # ---------------------------------------------------------------- Write Source
     my $copyfile=$target;
@@ -1961,8 +2034,12 @@ sub defaultmetapublish {
     for ($count=5;$count<$#parts;$count++) {
         $path.="/$parts[$count]";
         if ((-e $path)!=1) {
-            $r->print('<p>'.&mt('Created directory').' '.$parts[$count].'</p>');
             mkdir($path,0777);
+            $r->print('<p>'
+                     .&mt('Created directory [_1]'
+                         ,'<span class="LC_filename">'.$parts[$count].'</span>')
+                     .'</p>'
+            );
         }
     }
     
@@ -1982,9 +2059,7 @@ sub defaultmetapublish {
 	$r->print($reply.'</p><br />');$r->rflush;
     }
 # ------------------------------------------------------------------- Link back
-    my $link=$fn;
-    $link=~s/^\/home\/$cuname\/public_html\//\/priv\/$cuname\//;
-    $r->print("<a href='$link'>".&mt('Back to Catalog Information').'</a>');
+    $r->print("<a href='".&Apache::loncfile::display($fn)."'>".&mt('Back to Metadata').'</a>');
     $r->print(&Apache::loncommon::end_page());
     return OK;
 }
@@ -2048,59 +2123,34 @@ sub handler {
 # -------------------------------------------------------------- Check filename
 
     my $fn=&unescape($env{'form.filename'});
+    ($cuname,$cudom)=&Apache::lonnet::constructaccess($fn);
+# ----------------------------------------------------- Do we have permissions?
+     unless (($cuname) && ($cudom)) {
+       $r->log_reason($env{'user.name'}.' at '.$env{'user.domain'}.
+                      ' trying to publish file '.$env{'form.filename'}.
+                      ' - not authorized', 
+                      $r->filename); 
+       return HTTP_NOT_ACCEPTABLE;
+     }
+# ----------------------------------------------------------------- Get docroot
+    $docroot=$r->dir_config('lonDocRoot');
 
-    ($cuname,$cudom)=
-	&Apache::loncacc::constructaccess($fn,$r->dir_config('lonDefDomain'));
 
 # special publication: default.meta file
     if ($fn=~/\/default.meta$/) {
 	return &defaultmetapublish($r,$fn,$cuname,$cudom); 
     }
     $fn=~s/\.meta$//;
-  
+
+# sanity test on the filename 
+ 
     unless ($fn) { 
 	$r->log_reason($cuname.' at '.$cudom.
 		       ' trying to publish empty filename', $r->filename); 
 	return HTTP_NOT_FOUND;
     } 
 
-    unless (($cuname) && ($cudom)) {
-	$r->log_reason($cuname.' at '.$cudom.
-		       ' trying to publish file '.$env{'form.filename'}.
-		       ' ('.$fn.') - not authorized', 
-		       $r->filename); 
-	return HTTP_NOT_ACCEPTABLE;
-    }
-
-    my $home=&Apache::lonnet::homeserver($cuname,$cudom);
-    my $allowed=0;
-    my @ids=&Apache::lonnet::current_machine_ids();
-    foreach my $id (@ids) { if ($id eq $home) { $allowed = 1; }  }
-    unless ($allowed) {
-	$r->log_reason($cuname.' at '.$cudom.
-		       ' trying to publish file '.$env{'form.filename'}.
-		       ' ('.$fn.') - not homeserver ('.$home.')', 
-		       $r->filename); 
-	return HTTP_NOT_ACCEPTABLE;
-    }
-
-    $fn=~s{^http://[^/]+}{};
-    $fn=~s{^/~($match_username)}{/home/$1/public_html};
-
-    my $targetdir='';
-    $docroot=$r->dir_config('lonDocRoot'); 
-    if ($1 ne $cuname) {
-	$r->log_reason($cuname.' at '.$cudom.
-		       ' trying to publish unowned file '.
-		       $env{'form.filename'}.' ('.$fn.')', 
-		       $r->filename); 
-	return HTTP_NOT_ACCEPTABLE;
-    } else {
-	$targetdir=$docroot.'/res/'.$cudom;
-    }
-                                 
-  
-    unless (-e $fn) { 
+    unless (-e $docroot.$fn) { 
 	$r->log_reason($cuname.' at '.$cudom.
 		       ' trying to publish non-existing file '.
 		       $env{'form.filename'}.' ('.$fn.')', 
@@ -2135,41 +2185,47 @@ sub handler {
     &Apache::loncommon::content_type($r,'text/html');
     $r->send_http_header;
     
+    # Breadcrumbs
+    &Apache::lonhtmlcommon::clear_breadcrumbs();
+    &Apache::lonhtmlcommon::add_breadcrumb({
+        'text'  => 'Authoring Space',
+        'href'  => &Apache::loncommon::authorspace($fn),
+    });
+    &Apache::lonhtmlcommon::add_breadcrumb({
+        'text'  => 'Resource Publication',
+        'href'  => '',
+    });
+
     my $js='<script type="text/javascript">'.
 	&Apache::loncommon::browser_and_searcher_javascript().
 	'</script>';
-    $r->print(&Apache::loncommon::start_page('Resource Publication',$js));
-
-
-    my $thisfn=$fn;
-
-    my $thistarget=$thisfn;
-      
-    $thistarget=~s/^\/home/$targetdir/;
-    $thistarget=~s/\/public\_html//;
-
-    my $thisdistarget=$thistarget;
-    $thisdistarget=~s/^\Q$docroot\E//;
-
-    my $thisdisfn=$thisfn;
-    $thisdisfn=~s/^\/home\/\Q$cuname\E\/public_html\///;
+    $r->print(&Apache::loncommon::start_page('Resource Publication',$js)
+             .&Apache::lonhtmlcommon::breadcrumbs()
+             .&Apache::loncommon::head_subbox(
+                  &Apache::loncommon::CSTR_pageheader($docroot.$fn))
+    );
+
+    my $thisdisfn=&HTML::Entities::encode($fn,'<>&"');
+    my $thistarget=$fn;
+    $thistarget=~s/^\/priv\//\/res\//;
+    my $thisdistarget=&HTML::Entities::encode($thistarget,'<>&"');
 
     if ($fn=~/\/$/) {
 # -------------------------------------------------------- This is a directory
-	&publishdirectory($r,$fn,$thisdisfn);
-	$r->print('<hr /><a href="/priv/'
-		  .$cuname.'/'.$thisdisfn
-		  .'">'.&mt('Return to Directory').'</a>');
-
-
+	&publishdirectory($r,$docroot.$fn,$thisdisfn);
+	$r->print('<hr /><a href="'.$thisdisfn.'">'.&mt('Return to Directory').'</a>');
     } else {
 # ---------------------- Evaluate individual file, and then output information.
-	$thisfn=~/\.(\w+)$/;
+	$fn=~/\.(\w+)$/;
 	my $thistype=$1;
 	my $thisembstyle=&Apache::loncommon::fileembstyle($thistype);
         if ($thistype eq 'page') {  $thisembstyle = 'rat'; }
 
-	$r->print('<h2>'.&mt('Publishing [_1]','<tt>'.$thisdisfn.'</tt>').'</h2>');
+        $r->print('<h2>'
+                 .&mt('Publishing [_1]'
+                     ,'<span class="LC_filename">'.$thisdisfn.'</span>')
+                 .'</h2>'
+        );
 
         $r->print('<h3>'.&mt('Resource Details').'</h3>');
 
@@ -2184,7 +2240,7 @@ sub handler {
                  .'<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"))'>
+<a href='javascript:void(window.open("$thisdisfn","cat","height=300,width=500,scrollbars=1,resizable=1,menubar=0,location=1"))'>
 $thisdisfn</a>
 ENDCAPTION
         $r->print('</tt>'
@@ -2198,7 +2254,7 @@ ENDCAPTION
             $r->print(&Apache::lonhtmlcommon::row_closure()
                      .&Apache::lonhtmlcommon::row_title(&mt('Co-Author'))
                      .'<span class="LC_warning">'
-		     .&mt('[_1] at [_2]',$cuname,$cudom)
+		     .&Apache::loncommon::plainname($cuname,$cudom) .' ('.$cuname.':'.$cudom.')'
                      .'</span>'
                      );
 	}
@@ -2207,7 +2263,7 @@ ENDCAPTION
             $r->print(&Apache::lonhtmlcommon::row_closure()
                      .&Apache::lonhtmlcommon::row_title(&mt('Diffs')));
 	    $r->print(<<ENDDIFF);
-<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"))'>
+<a href='javascript:void(window.open("/adm/diff?filename=$thisdisfn&amp;versiontwo=priv","cat","height=300,width=500,scrollbars=1,resizable=1,menubar=0,location=1"))'>
 ENDDIFF
             $r->print(&mt('Diffs with Current Version').'</a>');
 	}
@@ -2216,17 +2272,17 @@ ENDDIFF
                  .&Apache::lonhtmlcommon::end_pick_box()
                  );
   
-# ------------------ Publishing from $thisfn to $thistarget with $thisembstyle.
+# ---------------------- Publishing from $fn to $thistarget with $thisembstyle.
 
 	unless ($env{'form.phase'} eq 'two') {
 # ---------------------------------------------------------- Parse for problems
 	    my ($warningcount,$errorcount);
 	    if ($thisembstyle eq 'ssi') {
-		($warningcount,$errorcount)=&checkonthis($r,$thisfn);
+		($warningcount,$errorcount)=&checkonthis($r,$fn);
 	    }
 	    unless ($errorcount) {
 		my ($outstring,$error)=
-		    &publish($thisfn,$thistarget,$thisembstyle);
+		    &publish($docroot.$fn,$docroot.$thistarget,$thisembstyle);
 		$r->print($outstring);
 	    } else {
 		$r->print('<h3 class="LC_error">'.
@@ -2234,8 +2290,7 @@ ENDDIFF
 			  '</h3>');
 	    }
 	} else {
-	    &phasetwo($r,$thisfn,$thistarget,$thisembstyle,$thisdistarget); 
-	    $r->print('<hr />');
+	    &phasetwo($r,$docroot.$fn,$docroot.$thistarget,$thisembstyle,$thisdistarget); 
 	}
     }
     $r->print(&Apache::loncommon::end_page());