Diff for /loncom/publisher/lonretrieve.pm between versions 1.33 and 1.42

version 1.33, 2006/11/10 18:01:08 version 1.42, 2010/12/14 16:26:04
Line 28 Line 28
 #  #
 ###  ###
   
   =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 38  use Apache::loncacc; Line 103  use Apache::loncacc;
 use Apache::loncommon();  use Apache::loncommon();
 use Apache::lonlocal;  use Apache::lonlocal;
 use Apache::lonnet;  use Apache::lonnet;
   use LONCAPA();
   
 # ------------------------------------ Interface for selecting previous version  # ------------------------------------ Interface for selecting previous version
 sub phaseone {  sub phaseone {
Line 54  sub phaseone { Line 120  sub phaseone {
     my ($main,$suffix,$is_meta) = &get_file_info($fn);      my ($main,$suffix,$is_meta) = &get_file_info($fn);
           
     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" />'.
   &Apache::loncommon::start_data_table().    &Apache::loncommon::start_data_table().
Line 86  sub phaseone { Line 152  sub phaseone {
  my $rmtime=&Apache::lonnet::metadata($resdir.'/'.$filename,'lastrevisiondate');   my $rmtime=&Apache::lonnet::metadata($resdir.'/'.$filename,'lastrevisiondate');
  $r->print(&Apache::loncommon::start_data_table_row().   $r->print(&Apache::loncommon::start_data_table_row().
   '<td><input type="radio" name="version" value="'.    '<td><input type="radio" name="version" value="'.
   $version.'" /></td><td>'.&mt('Previously published version').' '.$version.'</td><td>'.    $version.'" /></td><td>'.&mt('Previously published version').' '.$version.'</td>'.
   localtime($rmtime).'</td>');                '<td>'.&Apache::lonlocal::locallocaltime($rmtime).'</td>');
   
  if (!$is_meta) {   if (!$is_meta) {
     $r->print('<td><a href="'.$urldir.$filename.'.meta" target=cat>'.      $r->print('<td><a href="'.$urldir.$filename.'.meta" target="cat">'.
       &mt('Metadata Version').' '.$version.'</a></td>');        &mt('Metadata Version').' '.$version.'</a></td>');
  }   }
  if ($is_meta   if ($is_meta
Line 109  sub phaseone { Line 175  sub phaseone {
  my $rmtime=&Apache::lonnet::metadata($resfn,'lastrevisiondate');   my $rmtime=&Apache::lonnet::metadata($resfn,'lastrevisiondate');
  $r->print(&Apache::loncommon::start_data_table_row().   $r->print(&Apache::loncommon::start_data_table_row().
   '<td><input type="radio" name="version" value="new" /></td>'.    '<td><input type="radio" name="version" value="new" /></td>'.
   '<td><b>'.&mt('Currently published version').'</b></td><td>'.localtime($rmtime).    '<td><b>'.&mt('Currently published version').'</b></td>'.
   '</td>');            '<td>'.&Apache::lonlocal::locallocaltime($rmtime).'</td>'
       );
  if (!$is_meta) {   if (!$is_meta) {
     $r->print('<td><a href="'.$urldir.$main.'.'.$suffix.'.meta" target=cat>'.      $r->print('<td><a href="'.$urldir.$main.'.'.$suffix.'.meta" target="cat">'.
       &mt('Metadata current version').'</a></td>');                   &mt('Metadata current version').'</a></td>');           
  }   }
  if ($is_meta    if ($is_meta 
Line 126  sub phaseone { Line 193  sub phaseone {
  $r->print(&Apache::loncommon::end_data_table_row().   $r->print(&Apache::loncommon::end_data_table_row().
   &Apache::loncommon::end_data_table().    &Apache::loncommon::end_data_table().
   '<p>'.'<span class="LC_warning">'.    '<p>'.'<span class="LC_warning">'.
   &mt('Retrieval of an old version will overwrite the file currently in construction space').'</span></p>');    &mt('Retrieval of an old version will overwrite the file currently in construction space.').'</span></p>');
  if (!$is_meta) {   if (!$is_meta) {
     $r->print('<p>'.'<span class="LC_warning">'.      $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.').        &mt('This will only retrieve the resource. If you want to retrieve the metadata, you will need to do that separately.').
       '</span></p>');        '</span></p>');
  }   }
  $r->print('<input type="submit" value="'.&mt('Retrieve version').'" /></form>');   $r->print('<input type="submit" value="'.&mt('Retrieve selected Version').'" /></form>');
     } else {      } else {
  $r->print('<h3>'.&mt('No previous versions published.').'</h3>');   $r->print('<p class="LC_warning">'.&mt('No previous versions published.').'</p>');
     }      }
     $r->print('<p><a href="/priv/'.$uname.$fn.'">'.&mt('Back to').' '.$fn.  
       '</a></p>');       my $dir =  &Apache::loncommon::authorspace()
                 .&File::Basename::dirname($fn)
                 .'/';
       $r->print(&Apache::lonhtmlcommon::start_funclist()
                .&Apache::lonhtmlcommon::add_item_funclist(
                     '<a href="/priv/'.$uname.$fn.'">'
                    .&mt('Back to Resource')
                    .'</a>')
                .&Apache::lonhtmlcommon::add_item_funclist(
                     '<a href="'.$dir.'">'
                    .&mt('Back to Directory')
                    .'</a>')
                .&Apache::lonhtmlcommon::end_funclist()
       );
 }  }
   
 # ---------------------------------- Interface for presenting specified version  # ---------------------------------- Interface for presenting specified version
Line 165  sub phasetwo { Line 245  sub phasetwo {
  if ($is_meta) { $logname =~ s/\.meta$//; }   if ($is_meta) { $logname =~ s/\.meta$//; }
  $logname = $ctarget.'.log';   $logname = $ctarget.'.log';
         unless ($logfile=Apache::File->new('>>'.$logname)) {          unless ($logfile=Apache::File->new('>>'.$logname)) {
   $r->print(            $r->print('<span class="LC_error">'
          '<font color=red>'.&mt('No write permission to user directory, FAIL').'</font>');                     .&mt('No write permission to user directory, FAIL')
                      .'</span>');
         }          }
         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>'.&mt('Copying file').': ');          $r->print('<p>'.&mt('Copying file').': ');
  if (copy($csource,$ctarget)) {   if (copy($csource,$ctarget)) {
     $r->print('ok<p>');      $r->print('<span class="LC_success">'
                        .&mt('ok')
                        .'</span>');
             print $logfile "Copied sucessfully.\n\n";              print $logfile "Copied sucessfully.\n\n";
         } else {          } else {
             my $error=$!;              my $error=$!;
     $r->print('fail, '.$error.'<p>');      $r->print('<span class="LC_error">'
                        .&mt('Copy failed: [_1]',$error)
                        .'</span>');
             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('</p>'
                   '">'.&mt('Back to').' '.$fn.'</a></font>');                    .'<p><a href="/priv/'.$uname.$fn.'">'
                    .&mt('Back to Resource')
                    .'</a></p>');
     } else {      } else {
        $r->print('<span class="LC_warning">'.&mt('Please pick a version to retrieve').'</span><p>');         $r->print('<p class="LC_info">'.&mt('Please pick a version to retrieve:').'</p>');
        &phaseone($r,$fn,$uname,$udom);         &phaseone($r,$fn,$uname,$udom);
     }      }
 }  }
Line 215  sub handler { Line 302  sub handler {
   
   if ($env{'form.filename'}) {    if ($env{'form.filename'}) {
       $fn=$env{'form.filename'};        $fn=$env{'form.filename'};
       $fn=~s/^http\:\/\/[^\/]+//;        $fn=~s/^https?\:\/\/[^\/]+//;
   } 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 242  sub handler { Line 329  sub handler {
      return HTTP_NOT_ACCEPTABLE;       return HTTP_NOT_ACCEPTABLE;
   }    }
   
   $fn=~s/\/\~(\w+)//;    $fn=~s{/~($LONCAPA::username_re)}{};
   
   &Apache::loncommon::content_type($r,'text/html');    &Apache::loncommon::content_type($r,'text/html');
   $r->send_http_header;    $r->send_http_header;
   
   $r->print(&Apache::loncommon::start_page('Retrieve Published Resources'));      # Breadcrumbs
       &Apache::lonhtmlcommon::clear_breadcrumbs();
         &Apache::lonhtmlcommon::add_breadcrumb({
   $r->print('<h1>'.&mt('Retrieve previous versions of').' <tt>'.$fn.'</tt></h1>');          'text'  => 'Construction Space',
           'href'  => &Apache::loncommon::authorspace(),
       });
       &Apache::lonhtmlcommon::add_breadcrumb({
           'text'  => 'Retrieve previous version',
           'href'  => '',
       });
   
     $r->print(&Apache::loncommon::start_page('Retrieve Published Resources')
              .&Apache::lonhtmlcommon::breadcrumbs()
              .&Apache::loncommon::head_subbox(
                   &Apache::loncommon::CSTR_pageheader()) # FIXME crumbs broken?
       );
   
     $r->print('<p>'
              .&mt('Retrieve previous versions of [_1]'
                      ,'<span class="LC_filename">'.$fn.'</span>')
              .'</p>');
       
   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><span class="LC_diff_coauthor">'.&mt('Co-Author').': '.$uname.            $r->print('<p><span class="LC_info">'
     &mt(' at ').$udom.                     .&mt('Co-Author [_1]'
                '</span></h3>');                         ,&Apache::loncommon::plainname($uname,$udom)
                          .' ('.$uname.':'.$udom.')')
                      .'</span></p>');
   }    }
   
   
Line 272  sub handler { Line 378  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.33  
changed lines
  Added in v.1.42


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