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

Diff for /loncom/publisher/lonupload.pm between versions 1.8 and 1.14

version 1.8, 2001/11/29 21:51:40 version 1.14, 2002/09/10 02:31:26
Line 1 Line 1
   
 # The LearningOnline Network with CAPA  # The LearningOnline Network with CAPA
 # Handler to upload files into construction space  # Handler to upload files into construction space
 #  #
Line 31 Line 32
 #   # 
 # (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)
 #  #
Line 41 Line 44
 #  #
 # 04/05,04/09,05/25,06/23,06/24,08/22 Gerd Kortemeyer  # 04/05,04/09,05/25,06/23,06/24,08/22 Gerd Kortemeyer
 # 11/29 Matthew Hall  # 11/29 Matthew Hall
   # 12/16 Scott Harrison
   #
   ###
   
 package Apache::lonupload;  package Apache::lonupload;
   
 use strict;  use strict;
 use Apache::File;  use Apache::File;
 use File::Copy;  use File::Copy;
   use File::Basename;
 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::Log();
 use Apache::lonnet;  use Apache::lonnet;
   use HTML::Entities();
   
   my $DEBUG=0;
   
   sub Debug {
     
     # Marshall the parameters.
     
     my $r       = shift;
     my $log     = $r->log;
     my $message = shift;
     
     # Put out the indicated message butonly if DEBUG is false.
     
     if ($DEBUG) {
       $log->debug($message);
     }
   }
   
 sub upfile_store {  sub upfile_store {
     my $r=shift;      my $r=shift;
Line 81  sub phaseone { Line 108  sub phaseone {
     $fn=~s/^\///;      $fn=~s/^\///;
     $fn=~s/(\/)+/\//g;      $fn=~s/(\/)+/\//g;
   
   #    Fn is the full path to the destination filename.
   #    
   
       &Debug($r, "Filename for upload: $fn");
     if (($fn) && ($fn!~/\/$/)) {      if (($fn) && ($fn!~/\/$/)) {
       $r->print(        $r->print(
  '<form action=/adm/upload method=post>'.   '<form action=/adm/upload method=post>'.
Line 90  sub phaseone { Line 121  sub phaseone {
  '<input type=text size=50 name=filename value="/priv/'.   '<input type=text size=50 name=filename value="/priv/'.
   $uname.'/'.$fn.'"><br>'.    $uname.'/'.$fn.'"><br>'.
  '<input type=submit value="Store"></form>');   '<input type=submit value="Store"></form>');
       # Check for bad extension        # Check for bad extension and warn user
       if ($fn=~/\.(\w+)$/ &&         if ($fn=~/\.(\w+)$/ && 
   (&Apache::lonnet::fileembstyle($1) eq 'hdn')) {    (&Apache::loncommon::fileembstyle($1) eq 'hdn')) {
   $r->print(    $r->print(
  '<font color=red>'.   '<font color=red>'.
  'The extension on this file, "'.$1.   'The extension on this file, "'.$1.
  '", is reserved internally by LON-CAPA. <br \>'.   '", is reserved internally by LON-CAPA. <br \>'.
  'Please change the extension.'.   'Please change the extension.'.
  '</font>');   '</font>');
       }          } elsif($fn=~/\.(\w+)$/ && 
         !defined(&Apache::loncommon::fileembstyle($1))) {
     $r->print(
    '<font color=red>'.
    'The extension on this file, "'.$1.
    '", is not recognized by LON-CAPA. <br \>'.
    'Please change the extension.'.
    '</font>');
         }
   } else {    } else {
       $r->print('<font color=red>Illegal filename.</font>');        $r->print('<font color=red>Illegal filename.</font>');
   }    }
Line 110  sub phaseone { Line 149  sub phaseone {
   
 sub phasetwo {  sub phasetwo {
    my ($r,$fn,$uname,$udom)=@_;     my ($r,$fn,$uname,$udom)=@_;
    if ($fn=~/^\/priv\/$uname\//) {      &Debug($r, "Filename is ".$fn);
      if ($fn=~/^\/priv\/$uname\//) {
       &Debug($r, "Filename after priv substitution: ".$fn);
     my $tfn=$fn;      my $tfn=$fn;
     $tfn=~s/^\/(\~|priv)\/(\w+)//;      $tfn=~s/^\/(\~|priv)\/(\w+)//;
       &Debug($r, "Filename for tfn = ".$tfn);
     my $target='/home/'.$uname.'/public_html'.$tfn;      my $target='/home/'.$uname.'/public_html'.$tfn;
       &Debug($r, "target -> ".$target);
   #     target is the full filesystem path of the destination file.
       my $base = &File::Basename::basename($fn);
       my $path = &File::Basename::dirname($fn);
       $base    = &HTML::Entities::encode($base);
       my $url  = $path."/".$base; 
       &Debug($r, "URL is now ".$url);
     my $datatoken=$ENV{'form.datatoken'};      my $datatoken=$ENV{'form.datatoken'};
     if (($fn) && ($datatoken)) {      if (($fn) && ($datatoken)) {
  if ((-e $target) && ($ENV{'form.override'} ne 'Yes')) {   if ((-e $target) && ($ENV{'form.override'} ne 'Yes')) {
Line 121  sub phasetwo { Line 170  sub phasetwo {
  '<form action=/adm/upload method=post>'.   '<form action=/adm/upload method=post>'.
  'File <tt>'.$fn.'</tt> exists. Overwrite? '.   'File <tt>'.$fn.'</tt> exists. Overwrite? '.
  '<input type=hidden name=phase value=two>'.   '<input type=hidden name=phase value=two>'.
  '<input type=hidden name=filename value="'.$fn.'">'.   '<input type=hidden name=filename value="'."$url".'">'.
  '<input type=hidden name=datatoken value="'.$datatoken.'">'.   '<input type=hidden name=datatoken value="'.$datatoken.'">'.
  '<input type=submit name=override value="Yes"></form>');   '<input type=submit name=override value="Yes"></form>');
        } else {         } else {
            my $source=$r->dir_config('lonDaemons').             my $source=$r->dir_config('lonDaemons').
                              '/tmp/'.$datatoken.'.tmp';                               '/tmp/'.$datatoken.'.tmp';
            # Check for bad extension             # Check for bad extension and disallow upload
    if ($fn=~/\.(\w+)$/ &&      if ($fn=~/\.(\w+)$/ && 
        (&Apache::lonnet::fileembstyle($1) eq 'hdn')) {         (&Apache::loncommon::fileembstyle($1) eq 'hdn')) {
        $r->print(         $r->print(
  'File <tt>'.$fn.'</tt> could not be copied.<br />'.   'File <tt>'.$fn.'</tt> could not be copied.<br />'.
  '<font color=red>'.   '<font color=red>'.
  'The extension on this file is reserved internally by LON-CAPA.'.   'The extension on this file is reserved internally by LON-CAPA.'.
  '</font>');   '</font>');
      } elsif ($fn=~/\.(\w+)$/ && 
       !defined(&Apache::loncommon::fileembstyle($1))) {
          $r->print(
    'File <tt>'.$fn.'</tt> could not be copied.<br />'.
    '<font color=red>'.
    'The extension on this file is not recognized by LON-CAPA.'.
    '</font>');
    } elsif (copy($source,$target)) {     } elsif (copy($source,$target)) {
          chmod(0660, $target); # Set permissions to rw-rw---.
       $r->print('File copied.');        $r->print('File copied.');
               $r->print('<p><font size=+2><a href="'.$fn.                $r->print('<p><font size=+2><a href="'.$url.
                         '">View file</a></font>');                          '">View file</a></font>');
    } else {     } else {
               $r->print('Failed to copy: '.$!);                $r->print('Failed to copy: '.$!);
Line 155  sub phasetwo { Line 212  sub phasetwo {
   }    }
 }  }
   
   # ---------------------------------------------------------------- Main Handler
 sub handler {  sub handler {
   
   my $r=shift;    my $r=shift;
Line 216  sub handler { Line 274  sub handler {
   
 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)
   
   =item *
   
   (phase one is to specify upload file; phase two is to handle conditions
   subsequent to specification--like overwriting an existing 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 *
   
   upfile_store() : Store contents of uploaded file into temporary space.  Invoked
   by phaseone subroutine.
   
   =back
   
   =cut
Removed from v.1.8  
changed lines
  Added in v.1.14

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