--- loncom/publisher/lonupload.pm 2001/04/05 19:35:15 1.1 +++ loncom/publisher/lonupload.pm 2002/08/05 02:22:56 1.11 @@ -1,21 +1,51 @@ # The LearningOnline Network with CAPA # Handler to upload files into construction space # +# $Id: lonupload.pm,v 1.11 2002/08/05 02:22:56 foxr Exp $ +# +# 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 # # (Publication Handler # # (TeX Content Handler # +# YEAR=2000 # 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 +# YEAR=2001 # 03/23 Guy Albertelli # 03/24,03/29 Gerd Kortemeyer) # # 03/31,04/03 Gerd Kortemeyer) # -# 04/05 Gerd Kortemeyer +# 04/05,04/09,05/25,06/23,06/24,08/22 Gerd Kortemeyer +# 11/29 Matthew Hall +# 12/16 Scott Harrison +# +### package Apache::lonupload; @@ -23,124 +53,161 @@ use strict; use Apache::File; use File::Copy; use Apache::Constants qw(:common :http :methods); +use Apache::loncacc; +use Apache::loncommon(); -sub phaseone { - my ($r,$fn,$uname,$udom)=@_; - my $docroot=$r->dir_config('lonDocRoot'); - - my $urldir='/res/'.$udom.'/'.$uname.$fn; - $urldir=~s/\/[^\/]+$/\//; - - my $resfn=$docroot.'/res/'.$udom.'/'.$uname.$fn; - my $resdir=$resfn; - $resdir=~s/\/[^\/]+$/\//; - - $fn=~/^\/(.+)\.(\w+)$/; - my $main=$1; - my $suffix=$2; +sub upfile_store { + my $r=shift; + + my $fname=$ENV{'form.upfile.filename'}; + $fname=~s/\W//g; + + chop($ENV{'form.upfile'}); - $r->print('
'); + return $datatoken; } -sub phasetwo { - my ($r,$fn,$uname,$udom)=@_; - if ($ENV{'form.version'}) { - my $version=$ENV{'form.version'}; - if ($version eq 'new') { - $r->print('Copying file: '); - if (copy($csource,$ctarget)) { - $r->print('ok
'); - print $logfile "Copied sucessfully.\n\n"; - } else { - my $error=$!; - $r->print('fail, '.$error.'
');
- print $logfile "Copy failed: $error\n\n";
- }
- $r->print('Back to '.$fn.'');
+ ''.
+ 'The extension on this file, "'.$1.
+ '", is not recognized by LON-CAPA.
'.
+ 'Please change the extension.'.
+ '');
+ }
+ } else {
+ $r->print('Illegal filename.');
+ }
+ } else {
+ $r->print('No upload file specified.');
+ }
+}
+
+sub phasetwo {
+ my ($r,$fn,$uname,$udom)=@_;
+ if ($fn=~/^\/priv\/$uname\//) {
+ my $tfn=$fn;
+ $tfn=~s/^\/(\~|priv)\/(\w+)//;
+ my $target='/home/'.$uname.'/public_html'.$tfn;
+ my $datatoken=$ENV{'form.datatoken'};
+ if (($fn) && ($datatoken)) {
+ if ((-e $target) && ($ENV{'form.override'} ne 'Yes')) {
+ $r->print(
+ '
View file'); + } else { + $r->print('Failed to copy: '.$!); + } + } } else { $r->print( - 'Please pick a version to retrieve
'); + 'Please pick a filename
'); &phaseone($r,$fn,$uname,$udom); } + } else { + $r->print( + 'Please pick a filename
'); + &phaseone($r,$fn,$uname,$udom); + } } +# ---------------------------------------------------------------- Main Handler sub handler { my $r=shift; + my $uname; + my $udom; + + ($uname,$udom)= + &Apache::loncacc::constructaccess( + $ENV{'form.filename'},$r->dir_config('lonDefDomain')); + unless (($uname) && ($udom)) { + $r->log_reason($uname.' at '.$udom. + ' trying to publish file '.$ENV{'form.filename'}. + ' - not authorized', + $r->filename); + return HTTP_NOT_ACCEPTABLE; + } + my $fn; if ($ENV{'form.filename'}) { $fn=$ENV{'form.filename'}; - $fn=~s/^http\:\/\/[^\/]+\/\~(\w+)//; + $fn=~s/^http\:\/\/[^\/]+\/(\~|priv\/)(\w+)//; } else { $r->log_reason($ENV{'user.name'}.' at '.$ENV{'user.domain'}. - ' unspecified filename for retrieval', $r->filename); + ' unspecified filename for upload', $r->filename); return HTTP_NOT_FOUND; } - unless ($fn) { - $r->log_reason($ENV{'user.name'}.' at '.$ENV{'user.domain'}. - ' trying to retrieve non-existing file', $r->filename); - return HTTP_NOT_FOUND; - } - # ----------------------------------------------------------- Start page output - my $uname=$ENV{'user.name'}; - my $udom=$ENV{'user.domain'}; $r->content_type('text/html'); $r->send_http_header; @@ -151,7 +218,13 @@ sub handler { '