[BACK]Return to lonupload.pm CVS log [TXT] [DIR] Up to [LON-CAPA] / loncom / publisher

Diff for /loncom/publisher/lonupload.pm between versions 1.38.2.3 and 1.39

version 1.38.2.3, 2008/12/21 04:43:41 version 1.39, 2008/11/10 13:20:04
Line 28 Line 28
 #  #
 ###  ###
   
   =head1 NAME
   
   Apache::lonupload - upload files into construction space
   
   =head1 SYNOPSIS
   
   Invoked by /etc/httpd/conf/srm.conf:
   
    <Location /adm/upload>
    PerlAccessHandler       Apache::lonacc
    SetHandler perl-script
    PerlHandler Apache::lonupload
    ErrorDocument     403 /adm/login
    ErrorDocument     404 /adm/notfound.html
    ErrorDocument     406 /adm/unauthorized.html
    ErrorDocument  500 /adm/errorhandler
    </Location>
   
   =head1 INTRODUCTION
   
   This module uploads a file sitting on a client computer into 
   library server construction space.
   
   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 *
   
   Initialize variables
   
   =item *
   
   Start page output
   
   =item *
   
   output relevant interface phase (phaseone or phasetwo or phasethree)
   
   =item *
   
   (phase one is to specify upload file; phase two is to handle conditions
   subsequent to specification--like overwriting an existing file; phase three
   is to handle processing of secondary uploads - of embedded objects in an
   html file).
   
   =back
   
   =head1 OTHER SUBROUTINES
   
   =over 4
   
   =item *
   
   phaseone() : Interface for specifying file to upload.
   
   =item *
   
   phasetwo() : Interface for handling post-conditions about uploading (such
   as overwriting an existing file).
   
   =item *
   
   phasethree() : Interface for handling secondary uploads of embedded objects
   in an html file.
   
   =item *
   
   upfile_store() : Store contents of uploaded file into temporary space.  Invoked
   by phaseone subroutine.
   
   =item *
   
   check_extension() : Checks if filename extension is permitted and checks type
    of file - if html file, calls parser to check for embedded objects.
    Invoked by phasetwo subroutine.
   
   =back
   
   =cut
   
 package Apache::lonupload;  package Apache::lonupload;
   
 use strict;  use strict;
Line 98  sub phaseone { Line 184  sub phaseone {
       '<input type="hidden" name="datatoken" value="'.        '<input type="hidden" name="datatoken" value="'.
       &upfile_store.'" />'.        &upfile_store.'" />'.
       '<input type="hidden" name="uploaduname" value="'.$uname.        '<input type="hidden" name="uploaduname" value="'.$uname.
       '" />'.&mt('Save uploaded file as [_1]',        '" />'.&mt('Save uploaded file as ').
                       '<span class="LC_filename">/priv/'.$uname.'/</span>'.                        "<span class='LC_filename'>/priv/$uname/</span>".
                       '<input type="text" size="50" name="filename" value="'.$fn.                        '<input type="text" size="50" name="filename" value="'.$fn.
                       '" />').                        '" /><br />'.
                       '<br />'.  
       '<br />'.&mt('Choose file type:').'        '<br />'.&mt('Choose file type:').'
 <select name="filetype">  <select name="filetype">
  <option value="standard" selected>'.&mt('Regular file').'   <option value="standard" selected>'.&mt('Regular file').'
Line 116  sub phaseone { Line 201  sub phaseone {
     # Check for bad extension and warn user      # Check for bad extension and warn user
     if ($fn=~/\.(\w+)$/ &&       if ($fn=~/\.(\w+)$/ && 
  (&Apache::loncommon::fileembstyle($1) eq 'hdn')) {   (&Apache::loncommon::fileembstyle($1) eq 'hdn')) {
  $r->print('<p class="LC_error">'   $r->print('<span class="LC_error">'.&mt('The extension on this file,').
                           .&mt('The extension on this file, [_1], is reserved internally by LON-CAPA.','"'.$1.'"' )    ' "'.$1.'"'.&mt(', is reserved internally by LON-CAPA.').
   .' <br />'.&mt('Please change the extension.')    ' <br />'.&mt('Please change the extension.').'</span>');
                           .'</p>');  
     } elsif($fn=~/\.(\w+)$/ &&       } elsif($fn=~/\.(\w+)$/ && 
     !defined(&Apache::loncommon::fileembstyle($1))) {      !defined(&Apache::loncommon::fileembstyle($1))) {
  $r->print('<p class="LC_error">'   $r->print('<span class="LC_error">'.&mt('The extension on this file,').
                           .&mt('The extension on this file, [_1], is not recognized by LON-CAPA.','"'.$1.'"')    ' "'.$1.'"'.&mt(', is not recognized by LON-CAPA.').
   .' <br />'.&mt('Please change the extension.')    ' <br />'.&mt('Please change the extension.').
   .'</p>');    '</span>');
     }      }
  } else {   } else {
     $r->print('<span class="LC_error">'.&mt('Illegal filename.').'</span>');      $r->print('<span class="LC_error">'.&mt('Illegal filename.').'</span>');
Line 205  sub check_extension { Line 289  sub check_extension {
         (&Apache::loncommon::fileembstyle($1) eq 'hdn')) {          (&Apache::loncommon::fileembstyle($1) eq 'hdn')) {
         $result .= &mt('File [_1] could not be copied.',          $result .= &mt('File [_1] could not be copied.',
                       '<span class="LC_filename">'.$fn.'</span> ').                        '<span class="LC_filename">'.$fn.'</span> ').
                   '<p class="LC_error">'.                    '<br /><span class="LC_error">'.
                   &mt('The extension on this file is reserved internally by LON-CAPA.').                    &mt('The extension on this file is reserved internally by LON-CAPA.').
                   '</p>';                    '</span>';
     } elsif ($fn=~/\.(\w+)$/ &&      } elsif ($fn=~/\.(\w+)$/ &&
              !defined(&Apache::loncommon::fileembstyle($1))) {               !defined(&Apache::loncommon::fileembstyle($1))) {
         $result .= &mt('File [_1] could not be copied.',          $result .= &mt('File [_1] could not be copied.',
                       '<span class="LC_filename">'.$fn.'</span> ').                        '<span class="LC_filename">'.$fn.'</span> ').
                   '<p class="LC_error">'.                    '<br /><span class="LC_error">'.
                   &mt('The extension on this file is not recognized by LON-CAPA.').                    &mt('The extension on this file is not recognized by LON-CAPA.').
                   '</p>';                    '</span>';
     } elsif (-d $target) {      } elsif (-d $target) {
         $result .= &mt('File [_1] could not be copied.',          $result .= &mt('File [_1] could not be copied.',
                       '<span class="LC_filename">'.$fn.'</span>').                        '<span class="LC_filename">'.$fn.'</span>').
                   '<p class="LC_error">'.                    '<br /><span class="LC_error">'.
                   &mt('The target is an existing directory.').                    &mt('The target is an existing directory.').
                   '</p>';                    '</span>';
     } elsif (copy($source,$target)) {      } elsif (copy($source,$target)) {
         chmod(0660, $target); # Set permissions to rw-rw---.          chmod(0660, $target); # Set permissions to rw-rw---.
         if ($mode eq 'testbank' || $mode eq 'imsimport') {          if ($mode eq 'testbank' || $mode eq 'imsimport') {
Line 335  function verifyForm() { Line 419  function verifyForm() {
     my $fn;      my $fn;
     if ($env{'form.filename'}) {      if ($env{'form.filename'}) {
  $fn=$env{'form.filename'};   $fn=$env{'form.filename'};
  $fn=~s/^https?\:\/\/[^\/]+\///;   $fn=~s/^http\:\/\/[^\/]+\///;
  $fn=~s/^\///;   $fn=~s/^\///;
  $fn=~s{(~|priv/)($LONCAPA::username_re)}{};   $fn=~s{(~|priv/)($LONCAPA::username_re)}{};
  $fn=~s/\/+/\//g;   $fn=~s/\/+/\//g;
Line 379  function verifyForm() { Line 463  function verifyForm() {
 1;  1;
 __END__  __END__
   
 =head1 NAME  
   
 Apache::lonupload - upload files into construction space  
   
 =head1 SYNOPSIS  
   
 Invoked by /etc/httpd/conf/srm.conf:  
   
  <Location /adm/upload>  
  PerlAccessHandler       Apache::lonacc  
  SetHandler perl-script  
  PerlHandler Apache::lonupload  
  ErrorDocument     403 /adm/login  
  ErrorDocument     404 /adm/notfound.html  
  ErrorDocument     406 /adm/unauthorized.html  
  ErrorDocument  500 /adm/errorhandler  
  </Location>  
   
 =head1 INTRODUCTION  
   
 This module uploads a file sitting on a client computer into   
 library server construction space.  
   
 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 *  
   
 Initialize variables  
   
 =item *  
   
 Start page output  
   
 =item *  
   
 output relevant interface phase (phaseone or phasetwo or phasethree)  
   
 =item *  
   
 (phase one is to specify upload file; phase two is to handle conditions  
 subsequent to specification--like overwriting an existing file; phase three  
 is to handle processing of secondary uploads - of embedded objects in an  
 html file).  
   
 =back  
   
 =head1 OTHER SUBROUTINES  
   
 =over 4  
   
 =item *  
   
 phaseone() : Interface for specifying file to upload.  
   
 =item *  
   
 phasetwo() : Interface for handling post-conditions about uploading (such  
 as overwriting an existing file).  
   
 =item *  
   
 phasethree() : Interface for handling secondary uploads of embedded objects  
 in an html file.  
   
 =item *  
   
 upfile_store() : Store contents of uploaded file into temporary space.  Invoked  
 by phaseone subroutine.  
   
 =item *  
   
 check_extension() : Checks if filename extension is permitted and checks type  
  of file - if html file, calls parser to check for embedded objects.  
  Invoked by phasetwo subroutine.  
   
 =back  
   
 =cut  
Removed from v.1.38.2.3  
changed lines
  Added in v.1.39

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