--- loncom/cgi/decompress.pl 2003/11/19 14:58:14 1.7 +++ loncom/cgi/decompress.pl 2008/11/28 20:42:20 1.17 @@ -2,7 +2,7 @@ # # # Copyright Michigan State University Board of Trustees -# +# $Id # # This file is part of the LearningOnline Network with CAPA (LON-CAPA). # @@ -29,109 +29,75 @@ # A CGI script that decompresses compressed files for mass uploading into # construction space #### - -#Things still todo, -#It has been tabinated -#Now uses strict! with added feature of making everything very strict! -#about 50% through rewriting things to use split and join -#still have a lot of debugging statements that will go away after I get it to work ok(along with all the
's) -#still have to rewrite the refresh tag to work right, its broken -#the whole thing is broken right now -#will rename the variables and reorder most of the script to make it more sane -#improve the general readability of the whole thing, because unlike C everyone gets to look at it, so it has to be readable use strict; use lib '/home/httpd/lib/perl'; -use LONCAPA::loncgi (); -if(! &LONCAPA::loncgi::check_cookie_and_load_env()) -{ - print "Content-type: text/html\n\n"; - print <NO COOKIE! -END +use Apache::lonnet; +use Apache::lonlocal; +use LONCAPA::loncgi; + +my %location_of; +foreach my $program ('tar','gunzip','bunzip2','unzip') { + foreach my $dir ('/bin/','/usr/bin/','/usr/local/bin/','/sbin/', + '/usr/sbin/') { + if (-x $dir.$program) { + $location_of{$program} = $dir.$program; + } + } } -else -{ - print "Content-type: text/html\n\n"; - if(! $ENV{'cgi.file'} || ! $ENV{'cgi.dir'}) - { - print <Bad Enviroment! + +print("Content-type: text/html\n\n"); + +if (!&LONCAPA::loncgi::check_cookie_and_load_env()) { + &Apache::lonlocal::get_language_handle(); + print(&LONCAPA::loncgi::missing_cookie_msg()); +} else { + &Apache::lonlocal::get_language_handle(); + my %lt = &Apache::lonlocal::texthash ( + bade => 'Bad Environment!', + outo => 'Output of decompress:', + comp => 'Decompress complete.', + erro => 'An error occurred', + ); + my $file=$Apache::lonnet::env{'cgi.file'}; + my $dir=$Apache::lonnet::env{'cgi.dir'}; + if(! $file || ! $dir) { + print(<$lt{'bade'} END - } - else - { - print <Output of decompress:

+ } else { + print(<

$lt{'outo'}

END - chdir $ENV{'cgi.dir'}; - if ($ENV{'cgi.file'} =~ m|zip|) - { - open(OUTPUT, "unzip $ENV{'cgi.file'} 2> /dev/null |"); - while () - { - print "$_
"; - } - close(TRACE); - } - elsif ($ENV{'cgi.file'} =~ m|tar.gz|) - { - open(OUTPUT, "tar -zxpvf $ENV{'cgi.file'} 2> /dev/null |"); - while () - { - print "$_
"; - } - close(TRACE); - } - elsif ($ENV{'cgi.file'} =~ m|tar.bz2|) - { - open(OUTPUT, "tar -jxpvf $ENV{'cgi.file'} 2> /dev/null |"); - while () - { - print "$_
"; - } - close(TRACE); - } - elsif ($ENV{'cgi.file'} =~ m|bz2|) - { - open(OUTPUT, "bunzip2 $ENV{'cgi.file'} 2> /dev/null |"); - while () - { - print "$_
"; - } - close(TRACE); - } - elsif ($ENV{'cgi.file'} =~ m|tgz|) - { - open(OUTPUT, "tar -zxpvf $ENV{'cgi.file'} 2> /dev/null |"); - while () - { - print "$_
"; - } - close(TRACE); - } - elsif ($ENV{'cgi.file'} =~ m|gz|) - { - open(OUTPUT, "gunzip $ENV{'cgi.file'} 2> /dev/null |"); - while () - { - print "$_
"; - } - close(TRACE); - } - elsif ($ENV{'cgi.file'} =~ m|tar|) - { - open(OUTPUT, "tar -xpvf $ENV{'cgi.file'} 2> /dev/null |"); - while () - { - print "$_
"; - } - close(TRACE); - } - else - { - print "There has been an error in determining the file type of $ENV{'cgi.file'}, please check name"; - } - print "
Decompress complete!
"; + 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"); + } else { + print(''.&Apache::lonlocal::mt('There has been an error in determining the file type of [_1], please check the name',$file).''); + } + if (@cmd) { + undef($!); + undef($@); + open(OUTPUT,"-|", @cmd, $file); + while (my $line = ) { print("$line
"); } + close(OUTPUT); + print("

$lt{'comp'}

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

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

'); + } + } + print(''); } }