--- loncom/publisher/lonretrieve.pm	2001/04/04 03:59:15	1.5
+++ loncom/publisher/lonretrieve.pm	2001/08/20 13:18:41	1.14
@@ -11,7 +11,7 @@
 # 03/23 Guy Albertelli
 # 03/24,03/29 Gerd Kortemeyer)
 #
-# 03/31,04/03 Gerd Kortemeyer
+# 03/31,04/03,05/02,05/09,06/23,08/20 Gerd Kortemeyer
 
 package Apache::lonretrieve;
 
@@ -19,6 +19,7 @@ use strict;
 use Apache::File;
 use File::Copy;
 use Apache::Constants qw(:common :http :methods);
+use Apache::loncacc;
 
 sub phaseone {
     my ($r,$fn,$uname,$udom)=@_;
@@ -31,12 +32,13 @@ sub phaseone {
     my $resdir=$resfn;
     $resdir=~s/\/[^\/]+$/\//;
 
-    $fn=~/^\/(.+)\.(\w+)$/;
+    $fn=~/\/([^\/]+)\.(\w+)$/;
     my $main=$1;
     my $suffix=$2;
-  
+
+    if (-e $resfn) {  
     $r->print('<form action=/adm/retrieve method=post>'.
-	      '<input type=hidden name=filename value="'.$fn.'">'.
+	      '<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>'.
@@ -54,7 +56,15 @@ sub phaseone {
                      $version.'"></td><th>'.$version.'</th><td>'.
                      localtime($rmtime).'</td><td>'.
                      '<a href="'.$urldir.$filename.'.meta" target=cat>'.
-                     'Metadata Version '.$version.'</a></td></tr>');
+                     'Metadata Version '.$version.'</a>');
+           if (&Apache::lonnet::fileembstyle($suffix) eq 'ssi') {
+               $r->print(
+                    '&nbsp;&nbsp;<a target=cat href="/adm/diff?filename=/~'.
+                        $uname.$fn.
+                        '&versionone=priv&versiontwo='.$version.
+                        '">Diffs with Version '.$version.'</a>');
+           }
+           $r->print('</a></td></tr>');
         }
     }
     closedir(DIR);
@@ -65,10 +75,21 @@ sub phaseone {
     $r->print('<tr><td><input type=radio name=version value="new"></td>'.
               '<th>Current</th><td>'.localtime($rmtime).
            '</td><td><a href="'.$urldir.$main.'.'.$suffix.'.meta" target=cat>'.
-              'Metadata current version</a></td></tr></table><p>'.
+              'Metadata current version</a>');           
+           if (&Apache::lonnet::fileembstyle($suffix) eq 'ssi') {
+               $r->print(
+                    '&nbsp;&nbsp;<a target=cat href="/adm/diff?filename=/~'.
+                        $uname.$fn.
+                        '&versionone=priv'.
+                        '">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>');
+} else {
+    $r->print('<h3>No previous versions published.</h3>');
+}
 }
 
 sub phasetwo {
@@ -118,9 +139,24 @@ sub handler {
 
   my $fn;
 
+
+# Get query string for limited number of parameters
+
+    map {
+       my ($name, $value) = split(/=/,$_);
+       $value =~ tr/+/ /;
+       $value =~ s/%([a-fA-F0-9][a-fA-F0-9])/pack("C",hex($1))/eg;
+       if ($name eq 'filename') {
+           unless ($ENV{'form.'.$name}) {
+              $ENV{'form.'.$name}=$value;
+	   }
+       }
+    } (split(/&/,$ENV{'QUERY_STRING'}));
+
+
   if ($ENV{'form.filename'}) {
       $fn=$ENV{'form.filename'};
-      $fn=~s/^http\:\/\/[^\/]+\/\~(\w+)//;
+      $fn=~s/^http\:\/\/[^\/]+//;
   } else {
      $r->log_reason($ENV{'user.name'}.' at '.$ENV{'user.domain'}.
          ' unspecified filename for retrieval', $r->filename); 
@@ -134,9 +170,20 @@ sub handler {
   } 
 
 # ----------------------------------------------------------- Start page output
+  my $uname;
+  my $udom;
 
-  my $uname=$ENV{'user.name'};
-  my $udom=$ENV{'user.domain'};
+  ($uname,$udom)=
+    &Apache::loncacc::constructaccess($fn,$r->dir_config('lonDefDomain'));
+  unless (($uname) && ($udom)) {
+     $r->log_reason($uname.' at '.$udom.
+         ' trying to publish file '.$ENV{'form.filename'}.
+         ' ('.$fn.') - not authorized', 
+         $r->filename); 
+     return HTTP_NOT_ACCEPTABLE;
+  }
+
+  $fn=~s/\/\~(\w+)//;
 
   $r->content_type('text/html');
   $r->send_http_header;
@@ -148,6 +195,12 @@ sub handler {
 
   
   $r->print('<h1>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.
+               '</font></h3>');
+  }
+
 
   if ($ENV{'form.phase'} eq 'two') {
       &phasetwo($r,$fn,$uname,$udom);
@@ -158,3 +211,6 @@ sub handler {
   $r->print('</body></html>');
   return OK;  
 }
+
+1;
+__END__