--- loncom/publisher/lonretrieve.pm	2003/05/19 21:53:03	1.22
+++ loncom/publisher/lonretrieve.pm	2005/12/12 21:59:12	1.28
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Handler to retrieve an old version of a file
 #
-# $Id: lonretrieve.pm,v 1.22 2003/05/19 21:53:03 albertel Exp $
+# $Id: lonretrieve.pm,v 1.28 2005/12/12 21:59:12 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -26,20 +26,6 @@
 # http://www.lon-capa.org/
 #
 #
-# (Publication Handler
-# 
-# (TeX Content Handler
-#
-# YEAR=2000
-# 05/29/00,05/30,10/11 Gerd Kortemeyer)
-#
-# 11/28,11/29,11/30,12/01,12/02,12/04,12/23 Gerd Kortemeyer
-# YEAR=2001
-# 03/23 Guy Albertelli
-# 03/24,03/29 Gerd Kortemeyer)
-#
-# 03/31,04/03,05/02,05/09,06/23,08/20 Gerd Kortemeyer
-#
 ###
 
 package Apache::lonretrieve;
@@ -50,6 +36,8 @@ use File::Copy;
 use Apache::Constants qw(:common :http :methods);
 use Apache::loncacc;
 use Apache::loncommon();
+use Apache::lonlocal;
+use Apache::lonnet;
 
 # ------------------------------------ Interface for selecting previous version
 sub phaseone {
@@ -71,67 +59,72 @@ sub phaseone {
     $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>Select</th><th>Version</th>'.
-              '<th>Became this version on ...</th>'.
-              '<th>Metadata</th></tr>');
-    my $filename;
+              '<table border=2><tr><th>'.&mt('Select').'</th><th>'.
+	      &mt('Version').'</th>'.
+              '<th>'.&mt('Published on ...').'</th>'.
+              '<th>'.&mt('Metadata').'</th></tr>');
+
     opendir(DIR,$resdir);
-    while ($filename=readdir(DIR)) {
+    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 ($rdev,$rino,$rmode,$rnlink,
-                $ruid,$rgid,$rrdev,$rsize,
-                $ratime,$rmtime,$rctime,
-                $rblksize,$rblocks)=stat($resdir.'/'.$filename);
+           my $rmtime=&Apache::lonnet::metadata($resdir.'/'.$filename,'lastrevisiondate');
            $r->print('<tr><td><input type=radio name=version value="'.
-                     $version.'"></td><th>'.$version.'</th><td>'.
+                     $version.'"></td><td>'.&mt('Previously published version').' '.$version.'</td><td>'.
                      localtime($rmtime).'</td><td>'.
                      '<a href="'.$urldir.$filename.'.meta" target=cat>'.
-                     'Metadata Version '.$version.'</a>');
+                     &mt('Metadata Version').' '.$version.'</a>');
            if (&Apache::loncommon::fileembstyle($suffix) eq 'ssi') {
                $r->print(
                     '&nbsp;&nbsp;<a target=cat href="/adm/diff?filename=/~'.
                         $uname.$fn.
-                        '&versiontwo=priv&versiontwo='.$version.
-                        '">Diffs with Version '.$version.'</a>');
+                        '&versiontwo=priv&versionone='.$version.
+                        '">'.&mt('Diffs with Version').' '.$version.'</a>');
            }
            $r->print('</a></td></tr>');
         }
     }
     closedir(DIR);
-    my ($rdev,$rino,$rmode,$rnlink,
-        $ruid,$rgid,$rrdev,$rsize,
-        $ratime,$rmtime,$rctime,
-        $rblksize,$rblocks)=stat($resfn);
+    my $rmtime=&Apache::lonnet::metadata($resfn,'lastrevisiondate');
     $r->print('<tr><td><input type=radio name=version value="new"></td>'.
-              '<th>Current</th><td>'.localtime($rmtime).
+              '<th>'.&mt('Currently public version').'</th><td>'.localtime($rmtime).
            '</td><td><a href="'.$urldir.$main.'.'.$suffix.'.meta" target=cat>'.
-              'Metadata current version</a>');           
+              &mt('Metadata current version').'</a>');           
            if (&Apache::loncommon::fileembstyle($suffix) eq 'ssi') {
                $r->print(
                     '&nbsp;&nbsp;<a target=cat href="/adm/diff?filename=/~'.
                         $uname.$fn.
                         '&versiontwo=priv'.
-                        '">Diffs with current Version</a>');
+                        '">'.&mt('Diffs with current Version').'</a>');
            }
            $r->print('</td></tr></table><p>'.
-           '<font size=+1 color=red>Retrieval of an old version will '.
-           'overwrite the file currently in construction space</font><p>'.
-           '<input type=submit value="Retrieve version"></form>');
+           '<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>No previous versions published.</h3>');
+    $r->print('<h3>'.&mt('No previous versions published.').'</h3>');
 }
+    $r->print('<p><a href="/priv/'.$uname.$fn.'">'.&mt('Back to').' '.$fn.
+	      '</a></p>'); 
 }
 
 # ---------------------------------- Interface for presenting specified version
 sub phasetwo {
     my ($r,$fn,$uname,$udom)=@_;
-    if ($ENV{'form.version'}) {
-        my $version=$ENV{'form.version'};
+    if ($env{'form.version'}) {
+        my $version=$env{'form.version'};
 	if ($version eq 'new') {
-	    $r->print('<h3>Retrieving current (most recent) version</h3>');
+	    $r->print('<h3>'.&mt('Retrieving current (most recent) version').'</h3>');
         } else {
-            $r->print('<h3>Retrieving old version '.$version.'</h3>');
+            $r->print('<h3>'.&mt('Retrieving old version').' '.$version.'</h3>');
         }
         my $logfile;
         my $ctarget='/home/'.$uname.'/public_html'.$fn;
@@ -142,12 +135,12 @@ sub phasetwo {
         my $csource=$r->dir_config('lonDocRoot').'/res/'.$udom.'/'.$uname.$vfn;
         unless ($logfile=Apache::File->new('>>'.$ctarget.'.log')) {
 	  $r->print(
-         '<font color=red>No write permission to user directory, FAIL</font>');
+         '<font color=red>'.&mt('No write permission to user directory, FAIL').'</font>');
         }
         print $logfile 
 "\n\n================= Retrieve ".localtime()." ================\n".
 "Version: $version\nSource: $csource\nTarget: $ctarget\n";
-        $r->print('<p>Copying file: ');
+        $r->print('<p>'.&mt('Copying file').': ');
         if (copy($csource,$ctarget)) {
 	    $r->print('ok<p>');
             print $logfile "Copied sucessfully.\n\n";
@@ -157,10 +150,10 @@ sub phasetwo {
             print $logfile "Copy failed: $error\n\n";
         }
         $r->print('<font size=+2><a href="/priv/'.$uname.$fn.
-                  '">Back to '.$fn.'</a></font>'); 
+                  '">'.&mt('Back to').' '.$fn.'</a></font>'); 
     } else {
        $r->print(
-   '<font size=+1 color=red>Please pick a version to retrieve</font><p>');
+   '<font size=+1 color=red>'.&mt('Please pick a version to retrieve').'</font><p>');
        &phaseone($r,$fn,$uname,$udom);
     }
 }
@@ -178,17 +171,17 @@ sub handler {
   &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
 					  ['filename']);
 
-  if ($ENV{'form.filename'}) {
-      $fn=$ENV{'form.filename'};
+  if ($env{'form.filename'}) {
+      $fn=$env{'form.filename'};
       $fn=~s/^http\:\/\/[^\/]+//;
   } else {
-     $r->log_reason($ENV{'user.name'}.' at '.$ENV{'user.domain'}.
+     $r->log_reason($env{'user.name'}.' at '.$env{'user.domain'}.
          ' unspecified filename for retrieval', $r->filename); 
      return HTTP_NOT_FOUND;
   }
 
   unless ($fn) { 
-     $r->log_reason($ENV{'user.name'}.' at '.$ENV{'user.domain'}.
+     $r->log_reason($env{'user.name'}.' at '.$env{'user.domain'}.
          ' trying to retrieve non-existing file', $r->filename); 
      return HTTP_NOT_FOUND;
   } 
@@ -201,7 +194,7 @@ sub handler {
     &Apache::loncacc::constructaccess($fn,$r->dir_config('lonDefDomain'));
   unless (($uname) && ($udom)) {
      $r->log_reason($uname.' at '.$udom.
-         ' trying to publish file '.$ENV{'form.filename'}.
+         ' trying to publish file '.$env{'form.filename'}.
          ' ('.$fn.') - not authorized', 
          $r->filename); 
      return HTTP_NOT_ACCEPTABLE;
@@ -209,7 +202,7 @@ sub handler {
 
   $fn=~s/\/\~(\w+)//;
 
-  $r->content_type('text/html');
+  &Apache::loncommon::content_type($r,'text/html');
   $r->send_http_header;
 
   $r->print('<html><head><title>LON-CAPA Construction Space</title></head>');
@@ -217,15 +210,16 @@ sub handler {
   $r->print(&Apache::loncommon::bodytag('Retrieve Published Resources'));
 
   
-  $r->print('<h1>Retrieve previous versions of <tt>'.$fn.'</tt></h1>');
+  $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>Co-Author: '.$uname.' at '.$udom.
+  if (($uname ne $env{'user.name'}) || ($udom ne $env{'user.domain'})) {
+          $r->print('<h3><font color=red>'.&mt('Co-Author').': '.$uname.
+		    &mt(' at ').$udom.
                '</font></h3>');
   }
 
 
-  if ($ENV{'form.phase'} eq 'two') {
+  if ($env{'form.phase'} eq 'two') {
       &phasetwo($r,$fn,$uname,$udom);
   } else {
       &phaseone($r,$fn,$uname,$udom);