--- loncom/publisher/lonretrieve.pm	2011/10/23 01:27:34	1.43
+++ loncom/publisher/lonretrieve.pm	2011/11/14 00:20:31	1.47
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Handler to retrieve an old version of a file
 #
-# $Id: lonretrieve.pm,v 1.43 2011/10/23 01:27:34 www Exp $
+# $Id: lonretrieve.pm,v 1.47 2011/11/14 00:20:31 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -108,20 +108,18 @@ use LONCAPA();
 # ------------------------------------ Interface for selecting previous version
 sub phaseone {
     my ($r,$fn,$uname,$udom)=@_;
-    my $docroot=$r->dir_config('lonDocRoot');
 
-    my $urldir='/res/'.$udom.'/'.$uname.$fn;
-    $urldir=~s/\/[^\/]+$/\//;
+    my $urldir = "/res/$udom/$uname".$fn;
+    my $resfn = $r->dir_config('lonDocRoot').$urldir;
 
-    my $resfn=$docroot.'/res/'.$udom.'/'.$uname.$fn;
-    my $resdir=$resfn;
-    $resdir=~s/\/[^\/]+$/\//;
+    $urldir =~ s{[^/]+$}{};
+    my $resdir = $r->dir_config('lonDocRoot').$urldir;
 
     my ($main,$suffix,$is_meta) = &get_file_info($fn);
     
     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 +160,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 +183,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>');
 	}
@@ -204,19 +202,22 @@ sub phaseone {
 	$r->print('<p class="LC_warning">'.&mt('No previous versions published.').'</p>');
     }
 
-    my $dir =  &Apache::loncommon::authorspace()
+    my $dir =  &Apache::loncommon::authorspace($fn)
               .&File::Basename::dirname($fn)
               .'/';
-    $r->print(&Apache::lonhtmlcommon::start_funclist()
-             .&Apache::lonhtmlcommon::add_item_funclist(
-                  '<a href="/priv/'.$uname.$fn.'">'
-                 .&mt('Back to Resource')
-                 .'</a>')
-             .&Apache::lonhtmlcommon::add_item_funclist(
-                  '<a href="'.$dir.'">'
-                 .&mt('Back to Directory')
-                 .'</a>')
-             .&Apache::lonhtmlcommon::end_funclist()
+    $r->print('<br />'
+             .&Apache::loncommon::head_subbox(
+                  &Apache::lonhtmlcommon::start_funclist()
+                 .&Apache::lonhtmlcommon::add_item_funclist(
+                     '<a href="/priv/'.$udom.'/'.$uname.$fn.'">'
+                    .&mt('Back to Resource')
+                    .'</a>')
+                 .&Apache::lonhtmlcommon::add_item_funclist(
+                     '<a href="'.$dir.'">'
+                    .&mt('Back to Directory')
+                    .'</a>')
+                 .&Apache::lonhtmlcommon::end_funclist()
+             )
     );
 }
 
@@ -233,13 +234,13 @@ sub phasetwo {
 	my ($main,$suffix,$is_meta) = &get_file_info($fn);
 
         my $logfile;
-        my $ctarget=$r->dir_config('lonDocRoot').'/priv/'.$udom.'/'.$uname.$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/;
         }
 
-        my $csource=$r->dir_config('lonDocRoot').'/res/'.$udom.'/'.$uname.$vfn;
+        my $csource=$r->dir_config('lonDocRoot')."/res/$udom/$uname".$vfn;
 
 	my $logname = $ctarget;
 	if ($is_meta) { $logname =~ s/\.meta$//; }
@@ -266,7 +267,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 {
@@ -302,7 +303,7 @@ sub handler {
 
   if ($env{'form.filename'}) {
       $fn=$env{'form.filename'};
-      $fn=~s/^https?\:\/\/[^\/]+//;
+      $fn =~ s{^https?\://[^/]+}{};
   } else {
      $r->log_reason($env{'user.name'}.' at '.$env{'user.domain'}.
          ' unspecified filename for retrieval', $r->filename); 
@@ -319,9 +320,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 +329,6 @@ sub handler {
      return HTTP_NOT_ACCEPTABLE;
   }
 
-  $fn=~s{/~($LONCAPA::username_re)}{};
-
   &Apache::loncommon::content_type($r,'text/html');
   $r->send_http_header;
 
@@ -338,19 +336,25 @@ sub handler {
     &Apache::lonhtmlcommon::clear_breadcrumbs();
     &Apache::lonhtmlcommon::add_breadcrumb({
         'text'  => 'Construction Space',
-        'href'  => &Apache::loncommon::authorspace(),
+        'href'  => &Apache::loncommon::authorspace($fn),
     });
     &Apache::lonhtmlcommon::add_breadcrumb({
         'text'  => 'Retrieve previous version',
         'href'  => '',
     });
 
+    my $londocroot = $r->dir_config('lonDocRoot');
+    my $trailfile = $fn;
+    $trailfile =~ s{^/(priv/)}{$londocroot/$1};
+
   $r->print(&Apache::loncommon::start_page('Retrieve Published Resources')
            .&Apache::lonhtmlcommon::breadcrumbs()
            .&Apache::loncommon::head_subbox(
-                &Apache::loncommon::CSTR_pageheader()) # FIXME crumbs broken?
+                &Apache::loncommon::CSTR_pageheader($trailfile))
     );
 
+  $fn=~s{/priv/$LONCAPA::domain_re/$LONCAPA::username_re}{};
+
   $r->print('<p>'
            .&mt('Retrieve previous versions of [_1]'
                    ,'<span class="LC_filename">'.$fn.'</span>')