Diff for /loncom/publisher/lonretrieve.pm between versions 1.20 and 1.35

version 1.20, 2002/10/19 06:34:15 version 1.35, 2008/11/10 14:11:08
Line 26 Line 26
 # http://www.lon-capa.org/  # 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  
 # 12/16 Scott Harrison  
 #  
 ###  ###
   
   =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;  package Apache::lonretrieve;
   
 use strict;  use strict;
Line 51  use File::Copy; Line 101  use File::Copy;
 use Apache::Constants qw(:common :http :methods);  use Apache::Constants qw(:common :http :methods);
 use Apache::loncacc;  use Apache::loncacc;
 use Apache::loncommon();  use Apache::loncommon();
   use Apache::lonlocal;
   use Apache::lonnet;
   use LONCAPA();
   
 # ------------------------------------ Interface for selecting previous version  # ------------------------------------ Interface for selecting previous version
 sub phaseone {  sub phaseone {
Line 64  sub phaseone { Line 117  sub phaseone {
     my $resdir=$resfn;      my $resdir=$resfn;
     $resdir=~s/\/[^\/]+$/\//;      $resdir=~s/\/[^\/]+$/\//;
   
     $fn=~/\/([^\/]+)\.(\w+)$/;      my ($main,$suffix,$is_meta) = &get_file_info($fn);
     my $main=$1;      
     my $suffix=$2;  
   
     if (-e $resfn) {        if (-e $resfn) {  
     $r->print('<form action=/adm/retrieve method=post>'.   $r->print('<form action="/adm/retrieve" method="POST">'.
       '<input type=hidden name=filename value="/~'.$uname.$fn.'">'.    '<input type="hidden" name="filename" value="/~'.$uname.$fn.'" />'.
               '<input type=hidden name=phase value=two>'.    '<input type="hidden" name="phase" value="two" />'.
               '<table border=2><tr><th>Select</th><th>Version</th>'.    &Apache::loncommon::start_data_table().
               '<th>Became this version on ...</th>'.    &Apache::loncommon::start_data_table_header_row().
               '<th>Metadata</th></tr>');    '<th>'.&mt('Select').'</th>'.
     my $filename;    '<th>'.&mt('Version').'</th>'.
     opendir(DIR,$resdir);    '<th>'.&mt('Published on ...').'</th>');
     while ($filename=readdir(DIR)) {   if (!$is_meta) {
         if ($filename=~/^$main\.(\d+)\.$suffix$/) {      $r->print('<th>'.&mt('Metadata').'</th>');
    my $version=$1;   }
            my ($rdev,$rino,$rmode,$rnlink,   if ($is_meta
                 $ruid,$rgid,$rrdev,$rsize,      || &Apache::loncommon::fileembstyle($suffix) eq 'ssi') {
                 $ratime,$rmtime,$rctime,      $r->print('<th>'.&mt('Diffs').'</th>');
                 $rblksize,$rblocks)=stat($resdir.'/'.$filename);   }
            $r->print('<tr><td><input type=radio name=version value="'.   $r->print(&Apache::loncommon::end_data_table_header_row());
                      $version.'"></td><th>'.$version.'</th><td>'.  
                      localtime($rmtime).'</td><td>'.   opendir(DIR,$resdir);
                      '<a href="'.$urldir.$filename.'.meta" target=cat>'.   my @files = grep(/^\Q$main\E\.(\d+)\.\Q$suffix\E$/,readdir(DIR));
                      'Metadata Version '.$version.'</a>');   @files = sort {
            if (&Apache::loncommon::fileembstyle($suffix) eq 'ssi') {      my ($aver) = ($a=~/^\Q$main\E\.(\d+)\.\Q$suffix\E$/);
                $r->print(      my ($bver) = ($b=~/^\Q$main\E\.(\d+)\.\Q$suffix\E$/);
                     '&nbsp;&nbsp;<a target=cat href="/adm/diff?filename=/~'.      return $aver <=> $bver;
                         $uname.$fn.   } (@files);
                         '&versiontwo=priv&versiontwo='.$version.   closedir(DIR);
                         '">Diffs with Version '.$version.'</a>');  
            }   foreach my $filename (@files) {
            $r->print('</a></td></tr>');      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>');
     }      }
     closedir(DIR);      $r->print('<p><a href="/priv/'.$uname.$fn.'">'.&mt('Back to').' '.$fn.
     my ($rdev,$rino,$rmode,$rnlink,        '</a></p>'); 
         $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::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>');  
            }  
            $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>');  
 }  
 }  }
   
 # ---------------------------------- Interface for presenting specified version  # ---------------------------------- Interface for presenting specified version
 sub phasetwo {  sub phasetwo {
     my ($r,$fn,$uname,$udom)=@_;      my ($r,$fn,$uname,$udom)=@_;
     if ($ENV{'form.version'}) {      if ($env{'form.version'}) {
         my $version=$ENV{'form.version'};          my $version=$env{'form.version'};
  if ($version eq 'new') {   if ($version eq 'new') {
     $r->print('<h3>Retrieving current (most recent) version</h3>');      $r->print('<h3>'.&mt('Retrieving current (most recent) version').'</h3>');
         } else {          } else {
             $r->print('<h3>Retrieving old version '.$version.'</h3>');              $r->print('<h3>'.&mt('Retrieving old version').' '.$version.'</h3>');
         }          }
    my ($main,$suffix,$is_meta) = &get_file_info($fn);
   
         my $logfile;          my $logfile;
         my $ctarget='/home/'.$uname.'/public_html'.$fn;          my $ctarget='/home/'.$uname.'/public_html'.$fn;
         my $vfn=$fn;          my $vfn=$fn;
         if ($version ne 'new') {          if ($version ne 'new') {
     $vfn=~s/\.(\w+)$/\.$version\.$1/;      $vfn=~s/\.(\Q$suffix\E)$/\.$version\.$1/;
         }          }
   
         my $csource=$r->dir_config('lonDocRoot').'/res/'.$udom.'/'.$uname.$vfn;          my $csource=$r->dir_config('lonDocRoot').'/res/'.$udom.'/'.$uname.$vfn;
         unless ($logfile=Apache::File->new('>>'.$ctarget.'.log')) {  
    my $logname = $ctarget;
    if ($is_meta) { $logname =~ s/\.meta$//; }
    $logname = $ctarget.'.log';
           unless ($logfile=Apache::File->new('>>'.$logname)) {
   $r->print(    $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           print $logfile 
 "\n\n================= Retrieve ".localtime()." ================\n".  "\n\n================= Retrieve ".localtime()." ================\n".
 "Version: $version\nSource: $csource\nTarget: $ctarget\n";  "Version: $version\nSource: $csource\nTarget: $ctarget\n";
         $r->print('<p>Copying file: ');          $r->print('<p>'.&mt('Copying file').': ');
         if (copy($csource,$ctarget)) {   if (copy($csource,$ctarget)) {
     $r->print('ok<p>');      $r->print('ok<p>');
             print $logfile "Copied sucessfully.\n\n";              print $logfile "Copied sucessfully.\n\n";
         } else {          } else {
Line 158  sub phasetwo { Line 247  sub phasetwo {
             print $logfile "Copy failed: $error\n\n";              print $logfile "Copy failed: $error\n\n";
         }          }
         $r->print('<font size=+2><a href="/priv/'.$uname.$fn.          $r->print('<font size=+2><a href="/priv/'.$uname.$fn.
                   '">Back to '.$fn.'</a></font>');                     '">'.&mt('Back to').' '.$fn.'</a></font>'); 
     } else {      } else {
        $r->print(         $r->print('<span class="LC_warning">'.&mt('Please pick a version to retrieve').'</span><p>');
    '<font size=+1 color=red>Please pick a version to retrieve</font><p>');  
        &phaseone($r,$fn,$uname,$udom);         &phaseone($r,$fn,$uname,$udom);
     }      }
 }  }
   
   sub get_file_info {
       my ($fn) = @_;
       my ($main,$suffix) = ($fn=~/\/([^\/]+)\.(\w+)$/);
       my $is_meta=0;
       if ($suffix eq 'meta') {
    $is_meta = 1;
    ($main,$suffix) = ($main=~/(.+)\.(\w+)$/);    
    $suffix .= '.meta';
       }
       return ($main,$suffix,$is_meta);
   }
   
 # ---------------------------------------------------------------- Main Handler  # ---------------------------------------------------------------- Main Handler
 sub handler {  sub handler {
   
Line 179  sub handler { Line 279  sub handler {
   &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},    &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
   ['filename']);    ['filename']);
   
   if ($ENV{'form.filename'}) {    if ($env{'form.filename'}) {
       $fn=$ENV{'form.filename'};        $fn=$env{'form.filename'};
       $fn=~s/^http\:\/\/[^\/]+//;        $fn=~s/^http\:\/\/[^\/]+//;
   } else {    } 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);            ' unspecified filename for retrieval', $r->filename); 
      return HTTP_NOT_FOUND;       return HTTP_NOT_FOUND;
   }    }
   
   unless ($fn) {     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);            ' trying to retrieve non-existing file', $r->filename); 
      return HTTP_NOT_FOUND;       return HTTP_NOT_FOUND;
   }     } 
Line 202  sub handler { Line 302  sub handler {
     &Apache::loncacc::constructaccess($fn,$r->dir_config('lonDefDomain'));      &Apache::loncacc::constructaccess($fn,$r->dir_config('lonDefDomain'));
   unless (($uname) && ($udom)) {    unless (($uname) && ($udom)) {
      $r->log_reason($uname.' at '.$udom.       $r->log_reason($uname.' at '.$udom.
          ' trying to publish file '.$ENV{'form.filename'}.           ' trying to publish file '.$env{'form.filename'}.
          ' ('.$fn.') - not authorized',            ' ('.$fn.') - not authorized', 
          $r->filename);            $r->filename); 
      return HTTP_NOT_ACCEPTABLE;       return HTTP_NOT_ACCEPTABLE;
   }    }
   
   $fn=~s/\/\~(\w+)//;    $fn=~s{/~($LONCAPA::username_re)}{};
   
   $r->content_type('text/html');    &Apache::loncommon::content_type($r,'text/html');
   $r->send_http_header;    $r->send_http_header;
   
   $r->print('<html><head><title>LON-CAPA Construction Space</title></head>');    $r->print(&Apache::loncommon::start_page('Retrieve Published Resources'));
   
   $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'})) {    if (($uname ne $env{'user.name'}) || ($udom ne $env{'user.domain'})) {
           $r->print('<h3><font color=red>Co-Author: '.$uname.' at '.$udom.            $r->print('<h3><span class="LC_diff_coauthor">'.&mt('Co-Author').': '.$uname.
                '</font></h3>');      &mt(' at ').$udom.
                  '</span></h3>');
   }    }
   
   
   if ($ENV{'form.phase'} eq 'two') {    if ($env{'form.phase'} eq 'two') {
       &phasetwo($r,$fn,$uname,$udom);        &phasetwo($r,$fn,$uname,$udom);
   } else {    } else {
       &phaseone($r,$fn,$uname,$udom);        &phaseone($r,$fn,$uname,$udom);
   }    }
   
   $r->print('</body></html>');    $r->print(&Apache::loncommon::end_page());
   return OK;      return OK;  
 }  }
   
 1;  1;
 __END__  __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  

Removed from v.1.20  
changed lines
  Added in v.1.35


FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>