--- loncom/publisher/lonretrieve.pm	2011/11/07 13:38:45	1.42.2.1
+++ loncom/publisher/lonretrieve.pm	2011/10/31 01:30:38	1.45
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Handler to retrieve an old version of a file
 #
-# $Id: lonretrieve.pm,v 1.42.2.1 2011/11/07 13:38:45 raeburn Exp $
+# $Id: lonretrieve.pm,v 1.45 2011/10/31 01:30:38 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -121,7 +121,7 @@ sub phaseone {
     
     if (-e $resfn) {  
 	$r->print('<form action="/adm/retrieve" method="post">'.
-		  '<input type="hidden" name="filename" value="/~'.$uname.$fn.'" />'.
+		  '<input type="hidden" name="filename" value="/priv/'.$udom.'/'.$uname.$fn.'" />'.
 		  '<input type="hidden" name="phase" value="two" />'.
 		  &Apache::loncommon::start_data_table().
 		  &Apache::loncommon::start_data_table_header_row().
@@ -162,8 +162,8 @@ sub phaseone {
 		if ($is_meta
 		    || &Apache::loncommon::fileembstyle($suffix) eq 'ssi') {
 		    $r->print(
-			      '<td><a target="cat" href="/adm/diff?filename=/~'.
-			      $uname.$fn.
+			      '<td><a target="cat" href="/adm/diff?filename=/priv/'.
+			      $udom,'/'.$uname.$fn.
 			      '&amp;versiontwo=priv&amp;versionone='.$version.
 			      '">'.&mt('Diffs with Version').' '.$version.
 			      '</a></td>');
@@ -185,8 +185,8 @@ sub phaseone {
 	if ($is_meta 
 	    || &Apache::loncommon::fileembstyle($suffix) eq 'ssi') {
 	    $r->print(
-		      '<td><a target="cat" href="/adm/diff?filename=/~'.
-		      $uname.$fn.
+		      '<td><a target="cat" href="/adm/diff?filename=/priv/'.
+		      $udom.'/'.$uname.$fn.
 		      '&amp;versiontwo=priv'.
 		      '">'.&mt('Diffs with current Version').'</a></td>');
 	}
@@ -209,7 +209,7 @@ sub phaseone {
               .'/';
     $r->print(&Apache::lonhtmlcommon::start_funclist()
              .&Apache::lonhtmlcommon::add_item_funclist(
-                  '<a href="/priv/'.$uname.$fn.'">'
+                  '<a href="/priv/'.$udom.'/'.$uname.$fn.'">'
                  .&mt('Back to Resource')
                  .'</a>')
              .&Apache::lonhtmlcommon::add_item_funclist(
@@ -233,7 +233,7 @@ sub phasetwo {
 	my ($main,$suffix,$is_meta) = &get_file_info($fn);
 
         my $logfile;
-        my $ctarget='/home/'.$uname.'/public_html'.$fn;
+        my $ctarget=$r->dir_config('lonDocRoot').'/priv/'.$udom.'/'.$uname.$fn;
         my $vfn=$fn;
         if ($version ne 'new') {
 	    $vfn=~s/\.(\Q$suffix\E)$/\.$version\.$1/;
@@ -266,7 +266,7 @@ sub phasetwo {
             print $logfile "Copy failed: $error\n\n";
         }
         $r->print('</p>'
-                 .'<p><a href="/priv/'.$uname.$fn.'">'
+                 .'<p><a href="/priv/'.$udom.'/'.$uname.$fn.'">'
                  .&mt('Back to Resource')
                  .'</a></p>');
     } else {
@@ -292,7 +292,7 @@ sub handler {
 
   my $r=shift;
 
-  my ($fn,$trailfile);
+  my $fn;
 
 
 # Get query string for limited number of parameters
@@ -319,9 +319,8 @@ sub handler {
   my $uname;
   my $udom;
 
-  ($uname,$udom)=
-    &Apache::loncacc::constructaccess($fn,$r->dir_config('lonDefDomain'));
-  unless (($uname) && ($udom)) {
+  ($uname,$udom) = &Apache::loncacc::constructaccess($fn);
+  unless (($uname ne '') && ($udom ne '')) {
      $r->log_reason($uname.' at '.$udom.
          ' trying to publish file '.$env{'form.filename'}.
          ' ('.$fn.') - not authorized', 
@@ -329,8 +328,7 @@ sub handler {
      return HTTP_NOT_ACCEPTABLE;
   }
 
-  $fn=~s{/~($LONCAPA::username_re)}{};
-  $trailfile = "/home/$uname/public_html".$fn;
+  $fn=~s{/priv/$LONCAPA::domain_re/$LONCAPA::username_re}{};
 
   &Apache::loncommon::content_type($r,'text/html');
   $r->send_http_header;
@@ -349,7 +347,7 @@ sub handler {
   $r->print(&Apache::loncommon::start_page('Retrieve Published Resources')
            .&Apache::lonhtmlcommon::breadcrumbs()
            .&Apache::loncommon::head_subbox(
-                &Apache::loncommon::CSTR_pageheader($trailfile))
+                &Apache::loncommon::CSTR_pageheader()) # FIXME crumbs broken?
     );
 
   $r->print('<p>'