--- loncom/cgi/decompress.pl 2008/11/28 20:42:20 1.17 +++ loncom/cgi/decompress.pl 2012/04/19 02:13:00 1.18 @@ -1,8 +1,8 @@ #!/usr/bin/perl # +# $Id: decompress.pl,v 1.18 2012/04/19 02:13:00 raeburn Exp $ # # Copyright Michigan State University Board of Trustees -# $Id # # This file is part of the LearningOnline Network with CAPA (LON-CAPA). # @@ -27,7 +27,7 @@ # The LearningOnline Network with CAPA # # A CGI script that decompresses compressed files for mass uploading into -# construction space +# construction space or into a course. #### use strict; use lib '/home/httpd/lib/perl'; @@ -53,51 +53,77 @@ if (!&LONCAPA::loncgi::check_cookie_and_ } else { &Apache::lonlocal::get_language_handle(); my %lt = &Apache::lonlocal::texthash ( - bade => 'Bad Environment!', + bade => 'Invalid file or directory name', outo => 'Output of decompress:', comp => 'Decompress complete.', - erro => 'An error occurred', + erro => 'An error occurred.', + extf => 'Extraction failed.', ); my $file=$Apache::lonnet::env{'cgi.file'}; - my $dir=$Apache::lonnet::env{'cgi.dir'}; - if(! $file || ! $dir) { + my $dir=$Apache::lonnet::env{'cgi.dir'}; + if (!$file || !$dir) { print(<$lt{'bade'} + $lt{'extf'} $lt{'bade'} END + } elsif (!-d $dir) { + print(''.$lt{'extf'}.' '."\n". + &Apache::lonlocal::mt('The specified directory "[_1]" is invalid.',$dir). + ''); } else { - print(<

$lt{'outo'}

+ my $londocroot = $Apache::lonnet::perlvar{'lonDocRoot'}; + my $lonuserroot = $Apache::lonnet::perlvar{'lonUsersDir'}; + if (($dir !~ /^\Qlondocroot\E/) && ($dir !~ /^\Q$lonuserroot\E/)) { + print(''.$lt{'extf'}.'
'."\n". + &Apache::lonlocal::mt('The specified directory "[_1]" is invalid',$dir). + ''); + } elsif (chdir($dir)) { + if (-e $file) { + print(<

$lt{'outo'}

END - chdir($dir); - my @cmd; - if ($file =~ m|\.zip$|) { - @cmd = ($location_of{'unzip'},"-o"); - } elsif ($file =~ m|\.tar\.gz$| - || $file =~ m|\.tgz$| ) { - @cmd = ($location_of{'tar'},"-zxpvf"); - } elsif ($file =~ m|\.tar\.bz2$|) { - @cmd = ($location_of{'tar'},"-jxpvf"); - } elsif ($file =~ m|\.bz2$|) { - @cmd = ($location_of{'bunzip2'}); - } elsif ($file =~ m|\.gz$|) { - @cmd = ($location_of{'gunzip'}); - } elsif ($file =~ m|\.tar$|) { - @cmd = ($location_of{'tar'},"-xpvf"); + my @cmd; + if ($file =~ m|\.zip$|) { + @cmd = ($location_of{'unzip'},"-o"); + } elsif ($file =~ m|\.tar\.gz$| + || $file =~ m|\.tgz$| ) { + @cmd = ($location_of{'tar'},"-zxpvf"); + } elsif ($file =~ m|\.tar\.bz2$|) { + @cmd = ($location_of{'tar'},"-jxpvf"); + } elsif ($file =~ m|\.bz2$|) { + @cmd = ($location_of{'bunzip2'}); + } elsif ($file =~ m|\.gz$|) { + @cmd = ($location_of{'gunzip'}); + } elsif ($file =~ m|\.tar$|) { + @cmd = ($location_of{'tar'},"-xpvf"); + } + if (@cmd) { + undef($!); + undef($@); + open(OUTPUT,"-|", @cmd, $file); + while (my $line = ) { print("$line
"); } + close(OUTPUT); + print("

$lt{'comp'}

"); + if ($! || $@) { + print('

'.$lt{'erro'}.'
'.$!."\n". + '
'.$@.'

'); + } else { + &Apache::lonnet::appenv({'cgi.decompressed' => 'ok'}); + } + } else { + print(''. + &Apache::lonlocal::mt('There has been an error in determining the file type of [_1], please check the name.',$file).''); + } + print(''); + } else { + print(''.$lt{'extf'}.'
'."\n". + &Apache::lonlocal::mt('The specified file "[_1]" does not exist.',$file). + ''); + } } else { - print(''.&Apache::lonlocal::mt('There has been an error in determining the file type of [_1], please check the name',$file).''); + print(''.$lt{'extf'}.'
'."\n". + &Apache::lonlocal::mt('Could not change working directory to "[_1]".',$dir). + ''); } - if (@cmd) { - undef($!); - undef($@); - open(OUTPUT,"-|", @cmd, $file); - while (my $line = ) { print("$line
"); } - close(OUTPUT); - print("

$lt{'comp'}

"); - if ($! || $@) { - print('

'.$lt{'erro'}.'
'.$!.'
'.$@.'

'); - } - } - print(''); } }