loncom/publisher/lonretrieve.pm - diff

Return to lonretrieve.pm CVS log

Up to [LON-CAPA] / loncom / publisher

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

-version 1.32, 2006/09/19 21:47:29
+version 1.35, 2008/11/10 14:11:08
  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;
  use strict;
- Line 38  use Apache::loncacc;
+ Line 103  use Apache::loncacc;
  use Apache::loncommon();
  use Apache::lonlocal;
  use Apache::lonnet;
+ use LONCAPA();
  # ------------------------------------ Interface for selecting previous version
  sub phaseone {
- Line 125  sub phaseone {
+ Line 191  sub phaseone {
  	}
  	$r->print(&Apache::loncommon::end_data_table_row().
  		  &Apache::loncommon::end_data_table().
- 		  '<p>'.
+ 		  '<p>'.'<span class="LC_warning">'.
- 		  '<span class="LC_error">'.
+ 		  &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) {
- 		  '<input type="submit" value="'.&mt('Retrieve version').'" /></form>');
+ 	    $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>');
      }
- Line 238  sub handler {
+ Line 308  sub handler {
       return HTTP_NOT_ACCEPTABLE;
    }
-   $fn=~s/\/\~(\w+)//;
+   $fn=~s{/~($LONCAPA::username_re)}{};
    &Apache::loncommon::content_type($r,'text/html');
    $r->send_http_header;
- Line 268  sub handler {
+ Line 338  sub handler {
 ;
  __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

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

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