--- loncom/cgi/decompress.pl 2003/11/19 15:07:25 1.8 +++ loncom/cgi/decompress.pl 2003/12/13 00:20:47 1.11 @@ -32,93 +32,65 @@ use strict; use lib '/home/httpd/lib/perl'; use LONCAPA::loncgi (); -if(! &LONCAPA::loncgi::check_cookie_and_load_env()) -{ +if(! &LONCAPA::loncgi::check_cookie_and_load_env()) { print "Content-type: text/html\n\n"; print <NO COOKIE! END -} -else -{ +} else { print "Content-type: text/html\n\n"; - if(! $ENV{'cgi.file'} || ! $ENV{'cgi.dir'}) - { + if(! $ENV{'cgi.file'} || ! $ENV{'cgi.dir'}) { print <Bad Enviroment! END - } - else - { + } else { print <Output of decompress:

END chdir $ENV{'cgi.dir'}; - if ($ENV{'cgi.file'} =~ m|zip|) - { - open(OUTPUT, "unzip $ENV{'cgi.file'} 2> /dev/null |"); - while () - { + if ($ENV{'cgi.file'} =~ m|\.zip$|i) { + open(OUTPUT, "unzip -o $ENV{'cgi.file'} 2> /dev/null |"); + while () { print "$_
"; } - close(TRACE); - } - elsif ($ENV{'cgi.file'} =~ m|tar.gz|) - { + close(OUTPUT); + } elsif ($ENV{'cgi.file'} =~ m|\.tar\.gz$|i) { open(OUTPUT, "tar -zxpvf $ENV{'cgi.file'} 2> /dev/null |"); - while () - { + while () { print "$_
"; } - close(TRACE); - } - elsif ($ENV{'cgi.file'} =~ m|tar.bz2|) - { + close(OUTPUT); + } elsif ($ENV{'cgi.file'} =~ m|\.tar\.bz2$|i) { open(OUTPUT, "tar -jxpvf $ENV{'cgi.file'} 2> /dev/null |"); - while () - { + while () { print "$_
"; } - close(TRACE); - } - elsif ($ENV{'cgi.file'} =~ m|bz2|) - { + close(OUTPUT); + } elsif ($ENV{'cgi.file'} =~ m|\.bz2$|i) { open(OUTPUT, "bunzip2 $ENV{'cgi.file'} 2> /dev/null |"); - while () - { + while () { print "$_
"; } - close(TRACE); - } - elsif ($ENV{'cgi.file'} =~ m|tgz|) - { + close(OUTPUT); + } elsif ($ENV{'cgi.file'} =~ m|\.tgz$|i) { open(OUTPUT, "tar -zxpvf $ENV{'cgi.file'} 2> /dev/null |"); - while () - { + while () { print "$_
"; } - close(TRACE); - } - elsif ($ENV{'cgi.file'} =~ m|gz|) - { + close(OUTPUT); + } elsif ($ENV{'cgi.file'} =~ m|\.gz$|i) { open(OUTPUT, "gunzip $ENV{'cgi.file'} 2> /dev/null |"); - while () - { + while () { print "$_
"; } - close(TRACE); - } - elsif ($ENV{'cgi.file'} =~ m|tar|) - { + close(OUTPUT); + } elsif ($ENV{'cgi.file'} =~ m|\.tar$|i) { open(OUTPUT, "tar -xpvf $ENV{'cgi.file'} 2> /dev/null |"); - while () - { + while () { print "$_
"; } - close(TRACE); - } - else - { + close(OUTPUT); + } else { print "There has been an error in determining the file type of $ENV{'cgi.file'}, please check name"; } print "
Decompress complete!
";