--- loncom/publisher/lonretrieve.pm	2006/09/13 21:43:26	1.31
+++ loncom/publisher/lonretrieve.pm	2008/11/10 14:11:08	1.35
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Handler to retrieve an old version of a file
 #
-# $Id: lonretrieve.pm,v 1.31 2006/09/13 21:43:26 albertel Exp $
+# $Id: lonretrieve.pm,v 1.35 2008/11/10 14:11:08 jms 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 {
@@ -54,78 +120,88 @@ sub phaseone {
     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=phase value=two>'.
-              '<table border=2><tr><th>'.&mt('Select').'</th><th>'.
-	      &mt('Version').'</th>'.
-              '<th>'.&mt('Published on ...').'</th>');
-    if (!$is_meta) {
-	$r->print('<th>'.&mt('Metadata').'</th>');
-    }
-    if ($is_meta
-	|| &Apache::loncommon::fileembstyle($suffix) eq 'ssi') {
-	$r->print('<th>'.&mt('Diffs').'</th>');
-    }
-    $r->print('</tr>');
-    
-    opendir(DIR,$resdir);
-    my @files = grep(/^\Q$main\E\.(\d+)\.\Q$suffix\E$/,readdir(DIR));
-    @files = sort {
-	my ($aver) = ($a=~/^\Q$main\E\.(\d+)\.\Q$suffix\E$/);
-	my ($bver) = ($b=~/^\Q$main\E\.(\d+)\.\Q$suffix\E$/);
-	return $aver <=> $bver;
-    } (@files);
-    closedir(DIR);
-
-    foreach my $filename (@files) {
-        if ($filename=~/^\Q$main\E\.(\d+)\.\Q$suffix\E$/) {
-	   my $version=$1;
-           my $rmtime=&Apache::lonnet::metadata($resdir.'/'.$filename,'lastrevisiondate');
-           $r->print('<tr><td><input type=radio name=version value="'.
-                     $version.'"></td><td>'.&mt('Previously published version').' '.$version.'</td><td>'.
-                     localtime($rmtime).'</td>');
-		     
-	   if (!$is_meta) {
-	       $r->print('<td><a href="'.$urldir.$filename.'.meta" target=cat>'.
-			 &mt('Metadata Version').' '.$version.'</a></td>');
-	   }
-           if ($is_meta
-	       || &Apache::loncommon::fileembstyle($suffix) eq 'ssi') {
-               $r->print(
-                    '<td><a target=cat href="/adm/diff?filename=/~'.
-                        $uname.$fn.
-                        '&versiontwo=priv&versionone='.$version.
-			 '">'.&mt('Diffs with Version').' '.$version.
-			 '</a></td>');
-           }
-           $r->print('</tr>');
-        }
-    }
-    closedir(DIR);
-    my $rmtime=&Apache::lonnet::metadata($resfn,'lastrevisiondate');
-    $r->print('<tr><td><input type=radio name=version value="new"></td>'.
-              '<th>'.&mt('Currently published version').'</th><td>'.localtime($rmtime).
-           '</td>');
-    if (!$is_meta) {
-	$r->print('<td><a href="'.$urldir.$main.'.'.$suffix.'.meta" target=cat>'.
-		  &mt('Metadata current version').'</a></td>');           
+	$r->print('<form action="/adm/retrieve" method="POST">'.
+		  '<input type="hidden" name="filename" value="/~'.$uname.$fn.'" />'.
+		  '<input type="hidden" name="phase" value="two" />'.
+		  &Apache::loncommon::start_data_table().
+		  &Apache::loncommon::start_data_table_header_row().
+		  '<th>'.&mt('Select').'</th>'.
+		  '<th>'.&mt('Version').'</th>'.
+		  '<th>'.&mt('Published on ...').'</th>');
+	if (!$is_meta) {
+	    $r->print('<th>'.&mt('Metadata').'</th>');
+	}
+	if ($is_meta
+	    || &Apache::loncommon::fileembstyle($suffix) eq 'ssi') {
+	    $r->print('<th>'.&mt('Diffs').'</th>');
+	}
+	$r->print(&Apache::loncommon::end_data_table_header_row());
+	
+	opendir(DIR,$resdir);
+	my @files = grep(/^\Q$main\E\.(\d+)\.\Q$suffix\E$/,readdir(DIR));
+	@files = sort {
+	    my ($aver) = ($a=~/^\Q$main\E\.(\d+)\.\Q$suffix\E$/);
+	    my ($bver) = ($b=~/^\Q$main\E\.(\d+)\.\Q$suffix\E$/);
+	    return $aver <=> $bver;
+	} (@files);
+	closedir(DIR);
+	
+	foreach my $filename (@files) {
+	    if ($filename=~/^\Q$main\E\.(\d+)\.\Q$suffix\E$/) {
+		my $version=$1;
+		my $rmtime=&Apache::lonnet::metadata($resdir.'/'.$filename,'lastrevisiondate');
+		$r->print(&Apache::loncommon::start_data_table_row().
+			  '<td><input type="radio" name="version" value="'.
+			  $version.'" /></td><td>'.&mt('Previously published version').' '.$version.'</td><td>'.
+			  localtime($rmtime).'</td>');
+		
+		if (!$is_meta) {
+		    $r->print('<td><a href="'.$urldir.$filename.'.meta" target=cat>'.
+			      &mt('Metadata Version').' '.$version.'</a></td>');
+		}
+		if ($is_meta
+		    || &Apache::loncommon::fileembstyle($suffix) eq 'ssi') {
+		    $r->print(
+			      '<td><a target="cat" href="/adm/diff?filename=/~'.
+			      $uname.$fn.
+			      '&amp;versiontwo=priv&amp;versionone='.$version.
+			      '">'.&mt('Diffs with Version').' '.$version.
+			      '</a></td>');
+		}
+		$r->print(&Apache::loncommon::end_data_table_row());
+	    }
+	}
+	closedir(DIR);
+	my $rmtime=&Apache::lonnet::metadata($resfn,'lastrevisiondate');
+	$r->print(&Apache::loncommon::start_data_table_row().
+		  '<td><input type="radio" name="version" value="new" /></td>'.
+		  '<td><b>'.&mt('Currently published version').'</b></td><td>'.localtime($rmtime).
+		  '</td>');
+	if (!$is_meta) {
+	    $r->print('<td><a href="'.$urldir.$main.'.'.$suffix.'.meta" target=cat>'.
+		      &mt('Metadata current version').'</a></td>');           
+	}
+	if ($is_meta 
+	    || &Apache::loncommon::fileembstyle($suffix) eq 'ssi') {
+	    $r->print(
+		      '<td><a target="cat" href="/adm/diff?filename=/~'.
+		      $uname.$fn.
+		      '&amp;versiontwo=priv'.
+		      '">'.&mt('Diffs with current Version').'</a></td>');
+	}
+	$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>');
+	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.').
+		      '</span></p>');
+	}
+	$r->print('<input type="submit" value="'.&mt('Retrieve version').'" /></form>');
+    } else {
+	$r->print('<h3>'.&mt('No previous versions published.').'</h3>');
     }
-           if ($is_meta 
-	       || &Apache::loncommon::fileembstyle($suffix) eq 'ssi') {
-               $r->print(
-                    '<td><a target=cat href="/adm/diff?filename=/~'.
-                        $uname.$fn.
-                        '&versiontwo=priv'.
-                        '">'.&mt('Diffs with current Version').'</a></td>');
-           }
-           $r->print('</tr></table><p>'.
-           '<font size=+1 color=red>'.
-&mt('Retrieval of an old version will overwrite the file currently in construction space').'</font><p>'.
-           '<input type=submit value="'.&mt('Retrieve version').'"></form>');
-} else {
-    $r->print('<h3>'.&mt('No previous versions published.').'</h3>');
-}
     $r->print('<p><a href="/priv/'.$uname.$fn.'">'.&mt('Back to').' '.$fn.
 	      '</a></p>'); 
 }
@@ -173,8 +249,7 @@ sub phasetwo {
         $r->print('<font size=+2><a href="/priv/'.$uname.$fn.
                   '">'.&mt('Back to').' '.$fn.'</a></font>'); 
     } else {
-       $r->print(
-   '<font size=+1 color=red>'.&mt('Please pick a version to retrieve').'</font><p>');
+       $r->print('<span class="LC_warning">'.&mt('Please pick a version to retrieve').'</span><p>');
        &phaseone($r,$fn,$uname,$udom);
     }
 }
@@ -233,7 +308,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;
@@ -244,9 +319,9 @@ sub handler {
   $r->print('<h1>'.&mt('Retrieve previous versions of').' <tt>'.$fn.'</tt></h1>');
   
   if (($uname ne $env{'user.name'}) || ($udom ne $env{'user.domain'})) {
-          $r->print('<h3><font color=red>'.&mt('Co-Author').': '.$uname.
+          $r->print('<h3><span class="LC_diff_coauthor">'.&mt('Co-Author').': '.$uname.
 		    &mt(' at ').$udom.
-               '</font></h3>');
+               '</span></h3>');
   }
 
 
@@ -263,67 +338,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