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

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

version 1.4, 2001/05/25 17:03:58 version 1.8, 2001/11/29 21:51:40
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
 #  #
   # $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/
   #
 # (Handler to retrieve an old version of a file  # (Handler to retrieve an old version of a file
 #  #
 # (Publication Handler  # (Publication Handler
Line 15 Line 39
 #  #
 # 03/31,04/03 Gerd Kortemeyer)  # 03/31,04/03 Gerd Kortemeyer)
 #  #
 # 04/05,04/09,05/25 Gerd Kortemeyer  # 04/05,04/09,05/25,06/23,06/24,08/22 Gerd Kortemeyer
   # 11/29 Matthew Hall
   
 package Apache::lonupload;  package Apache::lonupload;
   
Line 24  use Apache::File; Line 49  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;  use Apache::loncacc;
   use Apache::lonnet;
   
 sub upfile_store {  sub upfile_store {
     my $r=shift;      my $r=shift;
Line 45  sub upfile_store { Line 71  sub upfile_store {
   
   
 sub phaseone {  sub phaseone {
     my ($r,$fn,$uname,$udom)=@_;     my ($r,$fn,$uname,$udom)=@_;
      $ENV{'form.upfile.filename'}=~s/\\/\//g;
      $ENV{'form.upfile.filename'}=~s/^.*\/([^\/]+)$/$1/;
      if ($ENV{'form.upfile.filename'}) {
     $fn=~s/\/[^\/]+$//;      $fn=~s/\/[^\/]+$//;
     $fn=~s/([^\/])$/$1\//;      $fn=~s/([^\/])$/$1\//;
     $fn.=$ENV{'form.upfile.filename'};      $fn.=$ENV{'form.upfile.filename'};
Line 61  sub phaseone { Line 90  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
         if ($fn=~/\.(\w+)$/ && 
     (&Apache::lonnet::fileembstyle($1) eq 'hdn')) {
     $r->print(
    '<font color=red>'.
    'The extension on this file, "'.$1.
    '", is reserved internally 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>');
   }    }
    } else {
        $r->print('<font color=red>No upload file specified.</font>');
    }
 }  }
   
 sub phasetwo {  sub phasetwo {
Line 85  sub phasetwo { Line 127  sub phasetwo {
        } else {         } else {
            my $source=$r->dir_config('lonDaemons').             my $source=$r->dir_config('lonDaemons').
                              '/tmp/'.$datatoken.'.tmp';                               '/tmp/'.$datatoken.'.tmp';
            if (copy($source,$target)) {             # Check for bad extension
      if ($fn=~/\.(\w+)$/ && 
          (&Apache::lonnet::fileembstyle($1) eq 'hdn')) {
          $r->print(
    'File <tt>'.$fn.'</tt> could not be copied.<br />'.
    '<font color=red>'.
    'The extension on this file is reserved internally by LON-CAPA.'.
    '</font>');
      } elsif (copy($source,$target)) {
       $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="'.$fn.
                         '">View file</a></font>');                          '">View file</a></font>');
Line 112  sub handler { Line 162  sub handler {
   my $uname;    my $uname;
   my $udom;    my $udom;
   
   unless (($uname,$udom)=    ($uname,$udom)=
     &Apache::loncacc::constructaccess(      &Apache::loncacc::constructaccess(
              $ENV{'form.filename'},$r->dir_config('lonDefDomain'))) {   $ENV{'form.filename'},$r->dir_config('lonDefDomain'));
     unless (($uname) && ($udom)) {
      $r->log_reason($uname.' at '.$udom.       $r->log_reason($uname.' at '.$udom.
          ' trying to publish file '.$ENV{'form.filename'}.           ' trying to publish file '.$ENV{'form.filename'}.
          ' - not authorized',            ' - not authorized', 
Line 162  sub handler { Line 213  sub handler {
   $r->print('</body></html>');    $r->print('</body></html>');
   return OK;      return OK;  
 }  }
   
   1;
   __END__
Removed from v.1.4  
changed lines
  Added in v.1.8

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