--- loncom/publisher/lonretrieve.pm	2001/04/01 02:58:51	1.1
+++ loncom/publisher/lonretrieve.pm	2001/05/09 17:38:13	1.11
@@ -11,7 +11,7 @@
 # 03/23 Guy Albertelli
 # 03/24,03/29 Gerd Kortemeyer)
 #
-# 03/31 Gerd Kortemeyer
+# 03/31,04/03,05/02,05/09 Gerd Kortemeyer
 
 package Apache::lonretrieve;
 
@@ -19,7 +19,119 @@ 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)=@_;
+    my $docroot=$r->dir_config('lonDocRoot');
+
+    my $urldir='/res/'.$udom.'/'.$uname.$fn;
+    $urldir=~s/\/[^\/]+$/\//;
+
+    my $resfn=$docroot.'/res/'.$udom.'/'.$uname.$fn;
+    my $resdir=$resfn;
+    $resdir=~s/\/[^\/]+$/\//;
+
+    $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=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;
+    opendir(DIR,$resdir);
+    while ($filename=readdir(DIR)) {
+        if ($filename=~/^$main\.(\d+)\.$suffix$/) {
+	   my $version=$1;
+           my ($rdev,$rino,$rmode,$rnlink,
+                $ruid,$rgid,$rrdev,$rsize,
+                $ratime,$rmtime,$rctime,
+                $rblksize,$rblocks)=stat($resdir.'/'.$filename);
+           $r->print('<tr><td><input type=radio name=version value="'.
+                     $version.'"></td><th>'.$version.'</th><td>'.
+                     localtime($rmtime).'</td><td>'.
+                     '<a href="'.$urldir.$filename.'.meta" target=cat>'.
+                     '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);
+    my ($rdev,$rino,$rmode,$rnlink,
+        $ruid,$rgid,$rrdev,$rsize,
+        $ratime,$rmtime,$rctime,
+        $rblksize,$rblocks)=stat($resfn);
+    $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>');           
+           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 {
+    my ($r,$fn,$uname,$udom)=@_;
+    if ($ENV{'form.version'}) {
+        my $version=$ENV{'form.version'};
+	if ($version eq 'new') {
+	    $r->print('<h3>Retrieving current (most recent) version</h3>');
+        } else {
+            $r->print('<h3>Retrieving old version '.$version.'</h3>');
+        }
+        my $logfile;
+        my $ctarget='/home/'.$uname.'/public_html'.$fn;
+        my $vfn=$fn;
+        if ($version ne 'new') {
+	    $vfn=~s/\.(\w+)$/\.$version\.$1/;
+        }
+        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>');
+        }
+        print $logfile 
+"\n\n================= Retrieve ".localtime()." ================\n".
+"Version: $version\nSource: $csource\nTarget: $ctarget\n";
+        $r->print('<p>Copying file: ');
+        if (copy($csource,$ctarget)) {
+	    $r->print('ok<p>');
+            print $logfile "Copied sucessfully.\n\n";
+        } else {
+            my $error=$!;
+	    $r->print('fail, '.$error.'<p>');
+            print $logfile "Copy failed: $error\n\n";
+        }
+        $r->print('<font size=+2><a href="/priv/'.$uname.$fn.
+                  '">Back to '.$fn.'</a></font>'); 
+    } else {
+       $r->print(
+   '<font size=+1 color=red>Please pick a version to retrieve</font><p>');
+       &phaseone($r,$fn,$uname,$udom);
+    }
+}
 
 sub handler {
 
@@ -29,23 +141,34 @@ sub handler {
 
   if ($ENV{'form.filename'}) {
       $fn=$ENV{'form.filename'};
-      $fn=~s/^http\:\/\/[^\/]+\/\~(\w+)/\/home\/$1\/public_html/;
-      $fn=~s/\/[^\/]+$//;
+      $fn=~s/^http\:\/\/[^\/]+//;
   } else {
-      $fn=$r->filename();
+     $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'}.
-         ' trying to publish empty directory', $r->filename); 
+         ' trying to retrieve non-existing file', $r->filename); 
      return HTTP_NOT_FOUND;
   } 
 
 # ----------------------------------------------------------- Start page output
+  my $uname;
+  my $udom;
+
+  unless (($uname,$udom)=
+    &Apache::loncacc::constructaccess(
+             $fn,$r->dir_config('lonDefDomain'))) {
+     $r->log_reason($uname.' at '.$udom.
+         ' trying to publish file '.$ENV{'form.filename'}.
+         ' ('.$fn.') - not authorized', 
+         $r->filename); 
+     return HTTP_NOT_ACCEPTABLE;
+  }
 
-  my $uname=$ENV{'user.name'};
-  my $udom=$ENV{'user.domain'};
+  $fn=~s/\/\~(\w+)//;
 
   $r->content_type('text/html');
   $r->send_http_header;
@@ -55,27 +178,24 @@ sub handler {
   $r->print(
    '<body bgcolor="#FFFFFF"><img align=right src=/adm/lonIcons/lonlogos.gif>');
 
-  my $thisdisfn=$fn;
-  $thisdisfn=~s/^\/home\/$uname\/public_html//;
   
-  $r->print('<h1>Construction Space Directory <tt>'.$thisdisfn.'</tt></h1>');
-
-  my $docroot=$r->dir_config('lonDocRoot');
+  $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>');
+  }
 
-  my $resdir=$docroot.'/res/'.$udom.'/'.$uname.$thisdisfn;
-  my $linkdir='/~'.$uname.$thisdisfn;
-
-    my $filename;
-    opendir(DIR,$fn);
-       while ($filename=readdir(DIR)) {
-           $filename=~/\.(\w+)$/;
-           if (($1 ne 'meta') && ($1 ne 'save') && ($1 ne 'log')) {
-	      $r->print($resdir.' - '.$linkdir.' = '.$filename.'<br>');
-	   }
-       }
-    closedir(DIR);
 
+  if ($ENV{'form.phase'} eq 'two') {
+      &phasetwo($r,$fn,$uname,$udom);
+  } else {
+      &phaseone($r,$fn,$uname,$udom);
+  }
 
   $r->print('</body></html>');
   return OK;  
 }
+
+1;
+__END__