Diff for /loncom/publisher/lonretrieve.pm between versions 1.9 and 1.15

version 1.9, 2001/05/02 23:00:05 version 1.15, 2001/12/04 15:34:57
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
Line 11 Line 36
 # 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 Gerd Kortemeyer  # 03/31,04/03,05/02,05/09,06/23,08/20 Gerd Kortemeyer
   
 package Apache::lonretrieve;  package Apache::lonretrieve;
   
Line 19  use strict; Line 44  use strict;
 use Apache::File;  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;
   
 sub phaseone {  sub phaseone {
     my ($r,$fn,$uname,$udom)=@_;      my ($r,$fn,$uname,$udom)=@_;
Line 37  sub phaseone { Line 63  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>Select</th><th>Version</th>'.
               '<th>Became this version on ...</th>'.                '<th>Became this version on ...</th>'.
Line 58  sub phaseone { Line 84  sub phaseone {
                      'Metadata Version '.$version.'</a>');                       'Metadata Version '.$version.'</a>');
            if (&Apache::lonnet::fileembstyle($suffix) eq 'ssi') {             if (&Apache::lonnet::fileembstyle($suffix) eq 'ssi') {
                $r->print(                 $r->print(
                     '&nbsp;&nbsp;<a target=cat href="/adm/diff?filename='.$fn.                      '&nbsp;&nbsp;<a target=cat href="/adm/diff?filename=/~'.
                           $uname.$fn.
                         '&versionone=priv&versiontwo='.$version.                          '&versionone=priv&versiontwo='.$version.
                         '">Diffs with Version '.$version.'</a>');                          '">Diffs with Version '.$version.'</a>');
            }             }
Line 76  sub phaseone { Line 103  sub phaseone {
               'Metadata current version</a>');                           'Metadata current version</a>');           
            if (&Apache::lonnet::fileembstyle($suffix) eq 'ssi') {             if (&Apache::lonnet::fileembstyle($suffix) eq 'ssi') {
                $r->print(                 $r->print(
                     '&nbsp;&nbsp;<a target=cat href="/adm/diff?filename='.$fn.                      '&nbsp;&nbsp;<a target=cat href="/adm/diff?filename=/~'.
                           $uname.$fn.
                         '&versionone=priv'.                          '&versionone=priv'.
                         '">Diffs with current Version</a>');                          '">Diffs with current Version</a>');
            }             }
Line 136  sub handler { Line 164  sub handler {
   
   my $fn;    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'}) {    if ($ENV{'form.filename'}) {
       $fn=$ENV{'form.filename'};        $fn=$ENV{'form.filename'};
       $fn=~s/^http\:\/\/[^\/]+\/\~(\w+)//;        $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); 
Line 152  sub handler { Line 195  sub handler {
   }     } 
   
 # ----------------------------------------------------------- Start page output  # ----------------------------------------------------------- Start page output
     my $uname;
     my $udom;
   
   my $uname=$ENV{'user.name'};    ($uname,$udom)=
   my $udom=$ENV{'user.domain'};      &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->content_type('text/html');
   $r->send_http_header;    $r->send_http_header;
Line 166  sub handler { Line 220  sub handler {
   
       
   $r->print('<h1>Retrieve previous versions of <tt>'.$fn.'</tt></h1>');    $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') {    if ($ENV{'form.phase'} eq 'two') {
       &phasetwo($r,$fn,$uname,$udom);        &phasetwo($r,$fn,$uname,$udom);

Removed from v.1.9  
changed lines
  Added in v.1.15


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