--- loncom/publisher/loncfile.pm 2006/05/30 12:47:41 1.77
+++ loncom/publisher/loncfile.pm 2011/11/02 19:12:40 1.113
@@ -9,7 +9,7 @@
# and displays a page showing the results of the action.
#
#
-# $Id: loncfile.pm,v 1.77 2006/05/30 12:47:41 www Exp $
+# $Id: loncfile.pm,v 1.113 2011/11/02 19:12:40 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -72,9 +72,8 @@ use Apache::loncacc;
use Apache::lonnet;
use Apache::loncommon();
use Apache::lonlocal;
-use lib '/home/httpd/lib/perl/';
-use LONCAPA;
-
+use LONCAPA qw(:DEFAULT :match);
+
my $DEBUG=0;
my $r; # Needs to be global for some stuff RF.
@@ -110,6 +109,17 @@ sub Debug {
}
}
+sub done {
+ my ($url)=@_;
+ my $done=&mt("Done");
+ return(< '.&mt('Error: destination for operation is an existing directory.').' '.&mt('Warning: target file exists, and has been published!').' '.&mt('Warning: target file exists, and has been published!').' '.&mt("Warning: a published $published_type of this name exists.").' '.&mt("Error: a published $published_type of this name exists.").' '.&mt('Warning: target file exists!').' '.&mt('Warning: target file exists!').' '.&mt('Warning: change of MIME type!').' '.&mt('Warning: change of MIME type!').' ".&mt('You have requested to create file in directory [_1] which doesn\'t exist. The requested directory path has been removed from the requested file name.','"'.$newpath.'"')." '
+ .&mt("You have requested to create file in directory [_1] which doesn't exist. The requested directory path has been removed from the requested file name."
+ ,&display($newpath))
+ .' '
+ .&mt('Bad filename [_1]',&display($dest))
+ .' ".&mt('Invalid characters in requested name have been removed.')." '
+ .&mt('Invalid characters in requested name have been removed.')
+ .' '.
+ &mt('Cannot change MIME type of a directory.').
+ ''.
+ ' '
+ .&mt('Cannot rename or move non-obsolete published file.')
+ .' '.$action.' '.&display($fn).
- ' '
+ .&mt($action.' [_1] to [_2]?',
+ &display($fn),
+ &display($newfilename))
+ .' '.&mt('No new filename specified.').' '.&mt('No new filename specified.').' '.&mt('No such file').': '.&display($fn).' '
+ .&mt('No such file: [_1]',
+ &display($fn))
+ .' '
+ .''
+ .&mt('Only empty directories may be deleted.')
+ .' '
+ .&mt('Cannot delete non-obsolete published file.')
+ .' '.&mt('Delete').' '.&display($fn).'? '
+ .&mt('Delete [_1]?',
+ &display($fn))
+ .' '.&mt('No such file').': '.&display($fn).' '
+ .&mt('No such file: [_1]',
+ &display($fn))
+ .' '.&mt('Copy').' '.&display($fn).' '
+ .&mt('Copy [_1] to [_2]?',
+ &display($fn),
+ &display($newfilename))
+ .' '.&mt('No such file').': '.&display($fn).' '
+ .&mt('No such file: [_1]',
+ &display($fn))
+ .' '.&mt('Make new directory').' '.
- &display($newfilename).'? '
+ .&mt('Make new directory [_1]?',
+ &display($newfilename))
+ .' '.&mt('Decompress').' '.&display($fn).'? '
+ .&mt('Decompress [_1]?',
+ &display($fn))
+ .' '.&mt('No such file').': '.&display($fn).' '
+ .&mt('No such file: [_1]',
+ &display($fn))
+ .' '.
+ &mt('Invalid filename: ').&display($newfilename).' '.
+ &mt('The name of the new file needs to end with an appropriate file extension to indicate the type of file to create.').' '.
+ '
'
+ .&mt('[_1](name).(number).(extension)[_2] not allowed.','','')
+ .'
'
+ .&mt('Removing the [_1].number.[_2] from requested filename.','','')
+ .''.&mt('Done').'
');
+ $request->print(&done(&url($fn)));
}
=pod
@@ -464,10 +529,10 @@ sub Rename1 {
if (-d $fn) {
$newfilename=~/\.(\w+)$/;
if (&Apache::loncommon::fileembstyle($1) eq 'ssi') {
- $request->print('
'.
- &mt('Cannot change MIME type of a directory').
- ''.
- '
'.&mt('Cancel').'');
+ $request->print('
'.&mt('Cancel').'
'.&mt('Cancel').'');
return;
}
unless (&obsolete_unpub($user,$domain,$fn)) {
- $request->print(''.&mt('Cannot rename or move non-obsolete published file').'
'.
- '
'.&mt('Cancel').'');
+ $request->print('
'
+ .''.&mt('Cancel').'
to '.&display($newfilename).'?'.&mt('Only empty directories may be deleted.').'
'.
- 'You must delete the contents of the directory first.
'.
- '
'.&mt('Cancel').'');
+ $request->print('
'
+ .&mt('You must delete the contents of the directory first.')
+ .''.&mt('Cannot delete non-obsolete published file').'
'.
- '
'.&mt('Cancel').'');
+ $request->print('
'
+ .''.&mt('Cancel').'
'.&mt('Cancel').'');
return;
}
- $request->print('
to '.
- &display($newfilename).'?
('.&mt('name').').('.&mt('number').').('.&mt('extension').') '.
- ' '.&mt('Not Allowed').'');
- return;
- }
- if($newfilename =~ /(\:\:\:|\&\&\&|\_\_\_)/){
- $r->print(''.$newfilename.
- ' - '.&mt('Bad Filename').'
('.&mt('Must not include').' '.$1.') '.
- ' '.&mt('Not Allowed').'');
- return;
- }
if ($newfilename !~ /\Q.$extension\E$/) {
- if ($newfilename =~ m|^[^\.]*\.([^\.]+)$|) {
+ if ($newfilename =~ m|/[^/.]*\.(?:[^/.]+)$|) {
#already has an extension strip it and add in expected one
- $newfilename =~ s|.([^\.]+)$||;
+ $newfilename =~ s|(/[^./])\.(?:[^.]+)$|$1|;
}
$newfilename.=".$extension";
}
}
- my $result=&exists($user,$domain,$newfilename);
- if($result) {
- $request->print(''.$result.'');
+ my ($type, $result)=&exists($user,$domain,$newfilename);
+ $request->print($result);
+ if ($type eq 'error') {
+ $request->print('');
} else {
+ my $extension;
+
+ if ($newfilename =~ m{[^/.]+\.([^/.]+)$}) {
+ $extension = $1;
+ }
+
+ my @okexts = qw(xml html xhtml htm xhtm problem page sequence rights sty task library js css txt);
+ if (($extension eq '') || (!grep(/^\Q$extension\E/,@okexts))) {
+ my $validexts = '.'.join(', .',@okexts);
+ $request->print('
'.
+ &mt('The following are valid extensions: [_1].',$validexts).
+ '
'.&mt('Make new file').' '.&display($newfilename).'?
'); $request->print(''); + $request->print(''); + '" method="post">'); $request->print(''); + '" method="post">'); + } + return; +} + +sub filename_check { + my ($newfilename) = @_; + ##Informs User (name).(number).(extension) not allowed + if($newfilename =~ /\.(\d+)\.(\w+)$/){ + $r->print(''.$newfilename. + ' - '.&mt('Bad Filename').'' + .&mt('No new filename specified.') + .'
' + ); } } elsif ($env{'form.action'} eq 'newdir') { my $mode = ''; @@ -837,13 +1000,17 @@ sub phaseone { $env{'form.action'} eq 'newsequencefile' || $env{'form.action'} eq 'newrightsfile' || $env{'form.action'} eq 'newstyfile' || + $env{'form.action'} eq 'newtaskfile' || $env{'form.action'} eq 'newlibraryfile' || $env{'form.action'} eq 'Select Action') { my $empty=&mt('Type Name Here'); if (($newfilename!~/\/$/) && ($newfilename!~/$empty$/)) { &NewFile1($r, $uname, $udom, $fn, $newfilename); } else { - $r->print(''.&mt('No new filename specified.').'
'); + $r->print('' + .&mt('No new filename specified.') + .'
' + ); } } } @@ -895,7 +1062,7 @@ sub Rename2 { my $oRN=$oldfile; my $nRN=$newfile; unless (rename($oldfile,$newfile)) { - $request->print(''.&mt('Error').': '.$!.''); + $request->print(''.&mt('Error').': '.$!.''); return 0; } ## If old name.(extension) exits, move under new name. @@ -930,7 +1097,12 @@ sub Rename2 { unlink $tmp2; } } else { - $request->print("".&mt('No such file').": ".&display($oldfile).'
'); + $request->print( + '' + .&mt('No such file: [_1]', + &display($oldfile)) + .'
' + ); return 0; } return 1; @@ -969,27 +1141,27 @@ sub Delete2 { my ($request, $user, $filename) = @_; if (-d $filename) { unless (&empty_directory($filename,'Delete2')) { - $request->print(' '.&mt('Error: Directory Non Empty').''); + $request->print(''.&mt('Error: Directory Non Empty').''); return 0; } else { if(-e $filename) { unless(rmdir($filename)) { - $request->print(''.&mt('Error').': '.$!.''); + $request->print(''.&mt('Error').': '.$!.''); return 0; } } else { - $request->print(''.&mt('No such file').'.
'); + $request->print(''.&mt('No such file').'
'); return 0; } } } else { if(-e $filename) { unless(unlink($filename)) { - $request->print(''.&mt('Error').': '.$!.''); + $request->print(''.&mt('Error').': '.$!.''); return 0; } } else { - $request->print(''.&mt('No such file').'.
'); + $request->print(''.&mt('No such file').'
'); return 0; } } @@ -1029,26 +1201,26 @@ sub Copy2 { &Debug($request ,"Will try to copy $oldfile to $newfile"); if(-e $oldfile) { if ($oldfile eq $newfile) { - $request->print(' '.&mt('Warning').': '.&mt('Name of new file is the same as name of old file').' - '.&mt('no action taken').'.'); + $request->print(''.&mt('Warning').': '.&mt('Name of new file is the same as name of old file').' - '.&mt('no action taken').'.'); return 1; } unless (copy($oldfile, $newfile)) { - $request->print(' '.&mt('copy Error').': '.$!.''); + $request->print(''.&mt('copy Error').': '.$!.''); return 0; } elsif (!chmod(0660, $newfile)) { - $request->print(' '.&mt('chmod error').': '.$!.''); + $request->print(''.&mt('chmod error').': '.$!.''); return 0; } elsif (-e $oldfile.'.meta' && !copy($oldfile.'.meta', $newfile.'.meta') && !chmod(0660, $newfile.'.meta')) { - $request->print(' '.&mt('copy metadata error'). - ': '.$!.''); + $request->print(''.&mt('copy metadata error'). + ': '.$!.''); return 0; } else { return 1; } } else { - $request->print(''.&mt('No such file').'
'); + $request->print(''.&mt('No such file').'
'); return 0; } return 1; @@ -1080,11 +1252,11 @@ sub NewDir2 { my ($request, $user, $newdirectory) = @_; unless(mkdir($newdirectory, 02770)) { - $request->print(''.&mt('Error').': '.$!.''); + $request->print(''.&mt('Error').': '.$!.''); return 0; } unless(chmod(02770, ($newdirectory))) { - $request->print(' '.&mt('Error').': '.$!.''); + $request->print(''.&mt('Error').': '.$!.''); return 0; } return 1; @@ -1092,8 +1264,8 @@ sub NewDir2 { sub decompress2 { my ($r, $user, $dir, $file) = @_; - &Apache::lonnet::appenv('cgi.file' => $file); - &Apache::lonnet::appenv('cgi.dir' => $dir); + &Apache::lonnet::appenv({'cgi.file' => $file}); + &Apache::lonnet::appenv({'cgi.dir' => $dir}); my $result=&Apache::lonnet::ssi_body('/cgi-bin/decompress.pl'); $r->print($result); &Apache::lonnet::delenv('cgi.file'); @@ -1138,7 +1310,7 @@ sub phasetwo { &Debug($r, "loncfile - Entering phase 2 for $fn"); - # Break down the file into it's component pieces. + # Break down the file into its component pieces. my $dir; # Directory path my $main; # Filename. @@ -1151,8 +1323,10 @@ sub phasetwo { $suffix=$1; #This is the actually filename extension if it exists $main=~s/\.\w+$//; #strip the extension } - my $dest; # On success this is where we'll go. - + my $dest; # + my $dest_dir; # On success this is where we'll go. + my $disp_newname; # + my $dest_newname; # &Debug($r,"loncfile::phase2 dir = $dir main = $main suffix = $suffix"); &Debug($r," newfilename = ".$env{'form.newfilename'}); @@ -1179,7 +1353,11 @@ sub phasetwo { if(!&Rename2($r, $uname, $dir, $fn, $env{'form.newfilename'})) { return; } - $dest = $env{'form.newfilename'}; + $dest = $dir."/"; + $dest_newname = $env{'form.newfilename'}; + $env{'form.newfilename'} =~ /.+(\/.+$)/; + $disp_newname = $1; + $disp_newname =~ s/\///; } } elsif ($env{'form.action'} eq 'delete') { if(!&Delete2($r, $uname, $env{'form.newfilename'})) { @@ -1196,7 +1374,7 @@ sub phasetwo { } $dest = $env{'form.newfilename'}; } else { - $r->print(''.&mt('No New filename specified').'
'); + $r->print(''.&mt('No New filename specified').'
'); return; } @@ -1210,7 +1388,12 @@ sub phasetwo { if ( ($env{'form.action'} eq 'newdir') && ($env{'form.phase'} eq 'two') && ( ($env{'form.callingmode'} eq 'testbank') || ($env{'form.callingmode'} eq 'imsimport') ) ) { $r->print('' + .&mt('Co-Author [_1]',$uname.':'.$udom) + .'
' + ); } @@ -1325,12 +1526,16 @@ function writeDone() { $env{'form.action'} eq 'newsequencefile' || $env{'form.action'} eq 'newrightsfile' || $env{'form.action'} eq 'newstyfile' || + $env{'form.action'} eq 'newtaskfile' || $env{'form.action'} eq 'newlibraryfile' || $env{'form.action'} eq 'Select Action' ) { $r->print(''.&mt('Unknown Action').' '.$env{'form.action'}.'
'. - &Apache::loncommon::end_page()); + $r->print('' + .&mt('Unknown Action').' '.$env{'form.action'} + .'
' + .&Apache::loncommon::end_page() + ); return OK; } if ($env{'form.phase'} eq 'two') {