--- loncom/publisher/loncfile.pm 2001/06/24 18:21:09 1.6 +++ loncom/publisher/loncfile.pm 2002/01/21 17:13:49 1.8 @@ -1,6 +1,31 @@ # The LearningOnline Network with CAPA # Handler to rename files, etc, in construction space # +# $Id: loncfile.pm,v 1.8 2002/01/21 17:13:49 albertel 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 @@ -25,10 +50,38 @@ use File::Copy; use Apache::Constants qw(:common :http :methods); use Apache::loncacc; +sub exists { + my ($uname,$udom,$dir,$newfile)=@_; + my $published='/home/httpd/html/res/'.$udom.'/'.$uname.'/'.$dir.'/'. + $ENV{'form.newfilename'}; + my $construct='/home/'.$uname.'/public_html/'.$dir.'/'. + $ENV{'form.newfilename'}; + my $result; + if (-e $published) { + $result.='
Warning: target file exists, and has been published!
'; + } elsif ( -e $construct ) { + $result.='Warning: target file exists!
'; + } + return $result; +} + +sub checksuffix { + my ($old,$new) = @_; + my $result; + my $oldsuffix; + my $newsuffix; + if ($new=~m:(.*/*)([^/]+)\.(\w+)$:) { $newsuffix=$3; } + if ($old=~m:(.*)/+([^/]+)\.(\w+)$:) { $oldsuffix=$3; } + if ($oldsuffix ne $newsuffix) { + $result.='Warning: change of MIME type!
'; + } + return $result; +} + sub phaseone { my ($r,$fn,$uname,$udom)=@_; - $fn=~/(.*)\/([^\/]+)\.(\w+)$/; + $fn=~m:(.*)/([^/]+)\.(\w+)$:; my $dir=$1; my $main=$2; my $suffix=$3; @@ -39,77 +92,65 @@ sub phaseone { ''. ''. ''); + if ($ENV{'form.action'} eq 'rename') { if (-e $conspace) { if ($ENV{'form.newfilename'}) { - $ENV{'form.newfilename'}=~/(.*)\/([^\/]+)\.(\w+)$/; - if ($3 ne $suffix) { - $r->print( - 'Warning: change of MIME type!'); - } - if (-e - '/home/httpd/'.$uname.'/'.$dir.'/'.$ENV{'form.newfilename'}) { - $r->print( - '
Warning: target file exists!'); - } + $r->print(&checksuffix($fn,$ENV{'form.newfilename'})); + $r->print(&exists($uname,$udom,$dir,$ENV{'form.newfilename'})); $r->print('
Rename '.$fn.' to '. - $dir.'/'.$ENV{'form.newfilename'}.'?'); + $dir.'/'.$ENV{'form.newfilename'}.'?
'); } else { - $r->print('No new filename specified.'); + $r->print('
No new filename specified.
'); return; } } else { - $r->print('No such file.'); + $r->print('
No such file.
'); return; } } elsif ($ENV{'form.action'} eq 'delete') { if (-e $conspace) { - $r->print('Delete '.$fn.'?'); + $r->print('
Delete '.$fn.'?
'); } else { - $r->print('No such file.'); + $r->print('
No such file.
'); return; } } elsif ($ENV{'form.action'} eq 'copy') { if (-e $conspace) { if ($ENV{'form.newfilename'}) { - $ENV{'form.newfilename'}=~/(.*)\/([^\/]+)\.(\w+)$/; - if ($3 ne $suffix) { - $r->print( - 'Warning: change of MIME type!'); - } - if (-e - '/home/httpd/'.$uname.'/'.$dir.'/'.$ENV{'form.newfilename'}) { - $r->print( - '
Warning: target file exists!'); - } + $r->print(&checksuffix($fn,$ENV{'form.newfilename'})); + $r->print(&exists($uname,$udom,$dir,$ENV{'form.newfilename'})); $r->print('
Copy '.$fn.' to '. - $dir.'/'.$ENV{'form.newfilename'}.'?'); + $dir.'/'.$ENV{'form.newfilename'}.'?
'); } else { - $r->print('No new filename specified.'); + $r->print('
No new filename specified.
'); return; } } else { - $r->print('No such file.'); + $r->print('
No such file.
'); return; } } elsif ($ENV{'form.action'} eq 'newdir') { my $newdir='/home/'.$uname.'/public_html/'. $fn.$ENV{'form.newfilename'}; if (-e $newdir) { - $r->print('Directory exists.'); + $r->print('
Directory exists.
'); return; } $r->print('Make new directory '. - $fn.$ENV{'form.newfilename'}.'?'); + $fn.$ENV{'form.newfilename'}.'?
'); } - $r->print(''); + $r->print('
'); + $r->print(''); + } sub phasetwo {