--- loncom/publisher/lonretrieve.pm	2006/11/10 18:01:08	1.33
+++ loncom/publisher/lonretrieve.pm	2008/11/20 18:03:55	1.36
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Handler to retrieve an old version of a file
 #
-# $Id: lonretrieve.pm,v 1.33 2006/11/10 18:01:08 albertel Exp $
+# $Id: lonretrieve.pm,v 1.36 2008/11/20 18:03:55 bisitz Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -28,6 +28,71 @@
 #
 ###
 
+=head1 NAME
+
+Apache::lonretrieve - retrieves an old version of a file
+
+=head1 SYNOPSIS
+
+Invoked by /etc/httpd/conf/srm.conf:
+
+ <Location /adm/retrieve>
+ PerlAccessHandler       Apache::lonacc
+ SetHandler perl-script
+ PerlHandler Apache::lonretrieve
+ ErrorDocument     403 /adm/login
+ ErrorDocument     404 /adm/notfound.html
+ ErrorDocument     406 /adm/unauthorized.html
+ ErrorDocument	  500 /adm/errorhandler
+ </Location>
+
+=head1 INTRODUCTION
+
+This module retrieves an old published version of a file.
+
+This is part of the LearningOnline Network with CAPA project
+described at http://www.lon-capa.org.
+
+=head1 HANDLER SUBROUTINE
+
+This routine is called by Apache and mod_perl.
+
+=over 4
+
+=item *
+
+Get query string for limited number of parameters
+
+=item *
+
+Start page output
+
+=item *
+
+print phase relevant output
+
+=item *
+
+(phase one is to select version; phase two retrieves version)
+
+=back
+
+=head1 OTHER SUBROUTINES
+
+=over 4
+
+=item *
+
+phaseone() : Interface for selecting previous version.
+
+=item *
+
+phasetwo() : Interface for presenting specified version.
+
+=back
+
+=cut
+
 package Apache::lonretrieve;
 
 use strict;
@@ -38,6 +103,7 @@ use Apache::loncacc;
 use Apache::loncommon();
 use Apache::lonlocal;
 use Apache::lonnet;
+use LONCAPA();
 
 # ------------------------------------ Interface for selecting previous version
 sub phaseone {
@@ -126,18 +192,19 @@ sub phaseone {
 	$r->print(&Apache::loncommon::end_data_table_row().
 		  &Apache::loncommon::end_data_table().
 		  '<p>'.'<span class="LC_warning">'.
-		  &mt('Retrieval of an old version will overwrite the file currently in construction space').'</span></p>');
+		  &mt('Retrieval of an old version will overwrite the file currently in construction space.').'</span></p>');
 	if (!$is_meta) {
 	    $r->print('<p>'.'<span class="LC_warning">'.
-		      &mt('This will only retrieve the resource, if you want to retrieve the metadata you will need to do that separately.').
+		      &mt('This will only retrieve the resource. If you want to retrieve the metadata, you will need to do that separately.').
 		      '</span></p>');
 	}
 	$r->print('<input type="submit" value="'.&mt('Retrieve version').'" /></form>');
     } else {
-	$r->print('<h3>'.&mt('No previous versions published.').'</h3>');
+	$r->print('<p class="LC_warning">'.&mt('No previous versions published.').'</p>');
     }
-    $r->print('<p><a href="/priv/'.$uname.$fn.'">'.&mt('Back to').' '.$fn.
-	      '</a></p>'); 
+    $r->print('<p><a href="/priv/'.$uname.$fn.'">'
+             .&mt('Back to [_1]','<span class="LC_filename">'.$fn.'</span>')
+             .'</a></p>'); 
 }
 
 # ---------------------------------- Interface for presenting specified version
@@ -165,25 +232,32 @@ sub phasetwo {
 	if ($is_meta) { $logname =~ s/\.meta$//; }
 	$logname = $ctarget.'.log';
         unless ($logfile=Apache::File->new('>>'.$logname)) {
-	  $r->print(
-         '<font color=red>'.&mt('No write permission to user directory, FAIL').'</font>');
+          $r->print('<span class="LC_error">'
+                   .&mt('No write permission to user directory, FAIL')
+                   .'</span>');
         }
         print $logfile 
 "\n\n================= Retrieve ".localtime()." ================\n".
 "Version: $version\nSource: $csource\nTarget: $ctarget\n";
         $r->print('<p>'.&mt('Copying file').': ');
 	if (copy($csource,$ctarget)) {
-	    $r->print('ok<p>');
+	    $r->print('<span class="LC_success">'
+                     .&mt('ok')
+                     .'</span>');
             print $logfile "Copied sucessfully.\n\n";
         } else {
             my $error=$!;
-	    $r->print('fail, '.$error.'<p>');
+	    $r->print('<span class="LC_error">'
+                     .&mt('Copy failed: [_1]',$error)
+                     .'</span>');
             print $logfile "Copy failed: $error\n\n";
         }
-        $r->print('<font size=+2><a href="/priv/'.$uname.$fn.
-                  '">'.&mt('Back to').' '.$fn.'</a></font>'); 
+        $r->print('</p>'
+                 .'<p><a href="/priv/'.$uname.$fn.'">'
+                 .&mt('Back to [_1]',$fn)
+                 .'</a></p>');
     } else {
-       $r->print('<span class="LC_warning">'.&mt('Please pick a version to retrieve').'</span><p>');
+       $r->print('<p class="LC_info">'.&mt('Please pick a version to retrieve:').'</p>');
        &phaseone($r,$fn,$uname,$udom);
     }
 }
@@ -242,7 +316,7 @@ sub handler {
      return HTTP_NOT_ACCEPTABLE;
   }
 
-  $fn=~s/\/\~(\w+)//;
+  $fn=~s{/~($LONCAPA::username_re)}{};
 
   &Apache::loncommon::content_type($r,'text/html');
   $r->send_http_header;
@@ -250,7 +324,10 @@ sub handler {
   $r->print(&Apache::loncommon::start_page('Retrieve Published Resources'));
 
   
-  $r->print('<h1>'.&mt('Retrieve previous versions of').' <tt>'.$fn.'</tt></h1>');
+  $r->print('<h1>'
+           .&mt('Retrieve previous versions of [_1]'
+                   ,'<span class="LC_filename">'.$fn.'</span>')
+           .'</h1>');
   
   if (($uname ne $env{'user.name'}) || ($udom ne $env{'user.domain'})) {
           $r->print('<h3><span class="LC_diff_coauthor">'.&mt('Co-Author').': '.$uname.
@@ -272,67 +349,4 @@ sub handler {
 1;
 __END__
 
-=head1 NAME
-
-Apache::lonretrieve - retrieves an old version of a file
-
-=head1 SYNOPSIS
-
-Invoked by /etc/httpd/conf/srm.conf:
-
- <Location /adm/retrieve>
- PerlAccessHandler       Apache::lonacc
- SetHandler perl-script
- PerlHandler Apache::lonretrieve
- ErrorDocument     403 /adm/login
- ErrorDocument     404 /adm/notfound.html
- ErrorDocument     406 /adm/unauthorized.html
- ErrorDocument	  500 /adm/errorhandler
- </Location>
-
-=head1 INTRODUCTION
-
-This module retrieves an old published version of a file.
-
-This is part of the LearningOnline Network with CAPA project
-described at http://www.lon-capa.org.
-
-=head1 HANDLER SUBROUTINE
-
-This routine is called by Apache and mod_perl.
-
-=over 4
-
-=item *
-
-Get query string for limited number of parameters
-
-=item *
-
-Start page output
-
-=item *
-
-print phase relevant output
-
-=item *
-
-(phase one is to select version; phase two retrieves version)
-
-=back
-
-=head1 OTHER SUBROUTINES
-
-=over 4
-
-=item *
-
-phaseone() : Interface for selecting previous version.
-
-=item *
-
-phasetwo() : Interface for presenting specified version.
-
-=back
 
-=cut