Diff for /loncom/publisher/lonretrieve.pm between versions 1.11 and 1.25

version 1.11, 2001/05/09 17:38:13 version 1.25, 2004/07/02 09:41:07
Line 1 Line 1
 # The LearningOnline Network with CAPA  # The LearningOnline Network with CAPA
 # Handler to retrieve an old version of a file  # Handler to retrieve an old version of a file
 #  #
   # $Id$
   #
   # Copyright Michigan State University Board of Trustees
   #
   # This file is part of the LearningOnline Network with CAPA (LON-CAPA).
   #
   # LON-CAPA is free software; you can redistribute it and/or modify
   # it under the terms of the GNU General Public License as published by
   # the Free Software Foundation; either version 2 of the License, or
   # (at your option) any later version.
   #
   # LON-CAPA is distributed in the hope that it will be useful,
   # but WITHOUT ANY WARRANTY; without even the implied warranty of
   # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   # GNU General Public License for more details.
   #
   # You should have received a copy of the GNU General Public License
   # along with LON-CAPA; if not, write to the Free Software
   # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
   #
   # /home/httpd/html/adm/gpl.txt
   #
   # http://www.lon-capa.org/
   #
   #
 # (Publication Handler  # (Publication Handler
 #   # 
 # (TeX Content Handler  # (TeX Content Handler
 #  #
   # YEAR=2000
 # 05/29/00,05/30,10/11 Gerd Kortemeyer)  # 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  # 11/28,11/29,11/30,12/01,12/02,12/04,12/23 Gerd Kortemeyer
   # YEAR=2001
 # 03/23 Guy Albertelli  # 03/23 Guy Albertelli
 # 03/24,03/29 Gerd Kortemeyer)  # 03/24,03/29 Gerd Kortemeyer)
 #  #
 # 03/31,04/03,05/02,05/09 Gerd Kortemeyer  # 03/31,04/03,05/02,05/09,06/23,08/20 Gerd Kortemeyer
   #
   ###
   
 package Apache::lonretrieve;  package Apache::lonretrieve;
   
Line 20  use Apache::File; Line 49  use Apache::File;
 use File::Copy;  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::lonlocal;
   
   # ------------------------------------ Interface for selecting previous version
 sub phaseone {  sub phaseone {
     my ($r,$fn,$uname,$udom)=@_;      my ($r,$fn,$uname,$udom)=@_;
     my $docroot=$r->dir_config('lonDocRoot');      my $docroot=$r->dir_config('lonDocRoot');
Line 38  sub phaseone { Line 70  sub phaseone {
   
     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="'.$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>'.                '<table border=2><tr><th>'.&mt('Select').'</th><th>'.
               '<th>Became this version on ...</th>'.        &mt('Version').'</th>'.
               '<th>Metadata</th></tr>');                '<th>'.&mt('Became this version on ...').'</th>'.
                 '<th>'.&mt('Metadata').'</th></tr>');
     my $filename;      my $filename;
     opendir(DIR,$resdir);      opendir(DIR,$resdir);
     while ($filename=readdir(DIR)) {      while ($filename=readdir(DIR)) {
         if ($filename=~/^$main\.(\d+)\.$suffix$/) {          if ($filename=~/^\Q$main\E\.(\d+)\.\Q$suffix\E$/) {
    my $version=$1;     my $version=$1;
            my ($rdev,$rino,$rmode,$rnlink,             my ($rdev,$rino,$rmode,$rnlink,
                 $ruid,$rgid,$rrdev,$rsize,                  $ruid,$rgid,$rrdev,$rsize,
Line 56  sub phaseone { Line 89  sub phaseone {
                      $version.'"></td><th>'.$version.'</th><td>'.                       $version.'"></td><th>'.$version.'</th><td>'.
                      localtime($rmtime).'</td><td>'.                       localtime($rmtime).'</td><td>'.
                      '<a href="'.$urldir.$filename.'.meta" target=cat>'.                       '<a href="'.$urldir.$filename.'.meta" target=cat>'.
                      'Metadata Version '.$version.'</a>');                       &mt('Metadata Version').' '.$version.'</a>');
            if (&Apache::lonnet::fileembstyle($suffix) eq 'ssi') {             if (&Apache::loncommon::fileembstyle($suffix) eq 'ssi') {
                $r->print(                 $r->print(
                     '&nbsp;&nbsp;<a target=cat href="/adm/diff?filename=/~'.                      '&nbsp;&nbsp;<a target=cat href="/adm/diff?filename=/~'.
                         $uname.$fn.                          $uname.$fn.
                         '&versionone=priv&versiontwo='.$version.                          '&versiontwo=priv&versionone='.$version.
                         '">Diffs with Version '.$version.'</a>');                          '">'.&mt('Diffs with Version').' '.$version.'</a>');
            }             }
            $r->print('</a></td></tr>');             $r->print('</a></td></tr>');
         }          }
Line 73  sub phaseone { Line 106  sub phaseone {
         $ratime,$rmtime,$rctime,          $ratime,$rmtime,$rctime,
         $rblksize,$rblocks)=stat($resfn);          $rblksize,$rblocks)=stat($resfn);
     $r->print('<tr><td><input type=radio name=version value="new"></td>'.      $r->print('<tr><td><input type=radio name=version value="new"></td>'.
               '<th>Current</th><td>'.localtime($rmtime).                '<th>'.&mt('Current').'</th><td>'.localtime($rmtime).
            '</td><td><a href="'.$urldir.$main.'.'.$suffix.'.meta" target=cat>'.             '</td><td><a href="'.$urldir.$main.'.'.$suffix.'.meta" target=cat>'.
               'Metadata current version</a>');                           &mt('Metadata current version').'</a>');           
            if (&Apache::lonnet::fileembstyle($suffix) eq 'ssi') {             if (&Apache::loncommon::fileembstyle($suffix) eq 'ssi') {
                $r->print(                 $r->print(
                     '&nbsp;&nbsp;<a target=cat href="/adm/diff?filename=/~'.                      '&nbsp;&nbsp;<a target=cat href="/adm/diff?filename=/~'.
                         $uname.$fn.                          $uname.$fn.
                         '&versionone=priv'.                          '&versiontwo=priv'.
                         '">Diffs with current Version</a>');                          '">'.&mt('Diffs with current Version').'</a>');
            }             }
            $r->print('</td></tr></table><p>'.             $r->print('</td></tr></table><p>'.
            '<font size=+1 color=red>Retrieval of an old version will '.             '<font size=+1 color=red>'.
            'overwrite the file currently in construction space</font><p>'.  &mt('Retrieval of an old version will overwrite the file currently in construction space').'</font><p>'.
            '<input type=submit value="Retrieve version"></form>');             '<input type=submit value="'.&mt('Retrieve version').'"></form>');
 } else {  } 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 {  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 $logfile;          my $logfile;
         my $ctarget='/home/'.$uname.'/public_html'.$fn;          my $ctarget='/home/'.$uname.'/public_html'.$fn;
Line 110  sub phasetwo { Line 146  sub phasetwo {
         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')) {          unless ($logfile=Apache::File->new('>>'.$ctarget.'.log')) {
   $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";
Line 125  sub phasetwo { Line 161  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(
    '<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);         &phaseone($r,$fn,$uname,$udom);
     }      }
 }  }
   
   # ---------------------------------------------------------------- Main Handler
 sub handler {  sub handler {
   
   my $r=shift;    my $r=shift;
   
   my $fn;    my $fn;
   
   
   # Get query string for limited number of parameters
   
     &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
     ['filename']);
   
   if ($ENV{'form.filename'}) {    if ($ENV{'form.filename'}) {
       $fn=$ENV{'form.filename'};        $fn=$ENV{'form.filename'};
       $fn=~s/^http\:\/\/[^\/]+//;        $fn=~s/^http\:\/\/[^\/]+//;
Line 158  sub handler { Line 201  sub handler {
   my $uname;    my $uname;
   my $udom;    my $udom;
   
   unless (($uname,$udom)=    ($uname,$udom)=
     &Apache::loncacc::constructaccess(      &Apache::loncacc::constructaccess($fn,$r->dir_config('lonDefDomain'));
              $fn,$r->dir_config('lonDefDomain'))) {    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', 
Line 170  sub handler { Line 213  sub handler {
   
   $fn=~s/\/\~(\w+)//;    $fn=~s/\/\~(\w+)//;
   
   $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('<html><head><title>LON-CAPA Construction Space</title></head>');
   
   $r->print(    $r->print(&Apache::loncommon::bodytag('Retrieve Published Resources'));
    '<body bgcolor="#FFFFFF"><img align=right src=/adm/lonIcons/lonlogos.gif>');  
   
       
   $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><font color=red>'.&mt('Co-Author').': '.$uname.
       &mt(' at ').$udom.
                '</font></h3>');                 '</font></h3>');
   }    }
   
Line 199  sub handler { Line 242  sub handler {
   
 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.11  
changed lines
  Added in v.1.25


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