--- loncom/cgi/decompress.pl 2005/11/03 20:36:58 1.15 +++ loncom/cgi/decompress.pl 2008/11/28 20:42:20 1.17 @@ -31,56 +31,73 @@ #### use strict; use lib '/home/httpd/lib/perl'; +use Apache::lonnet; +use Apache::lonlocal; use LONCAPA::loncgi; -if(! &LONCAPA::loncgi::check_cookie_and_load_env()) { - print "Content-type: text/html\n\n"; - print <NO COOKIE! -END +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; + } + } +} + +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 { - print "Content-type: text/html\n\n"; + &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(<Bad Enviroment! + $lt{'bade'} END } else { print(<

Output of decompress:

+

$lt{'outo'}

END chdir($dir); my @cmd; if ($file =~ m|\.zip$|) { - @cmd = ("/usr/bin/unzip","-o"); - } elsif ($file =~ m|\.tar\.gz$|) { - @cmd = ("/usr/bin/tar","-zxpvf"); + @cmd = ($location_of{'unzip'},"-o"); + } elsif ($file =~ m|\.tar\.gz$| + || $file =~ m|\.tgz$| ) { + @cmd = ($location_of{'tar'},"-zxpvf"); } elsif ($file =~ m|\.tar\.bz2$|) { - @cmd = ("/usr/bin/tar","-jxpvf"); + @cmd = ($location_of{'tar'},"-jxpvf"); } elsif ($file =~ m|\.bz2$|) { - @cmd = ("/usr/bin/bunzip2"); - } elsif ($file =~ m|\.tgz$|) { - @cmd = ("/usr/bin/tar","-zxpvf"); + @cmd = ($location_of{'bunzip2'}); } elsif ($file =~ m|\.gz$|) { - @cmd = ("/usr/bin/gunzip"); + @cmd = ($location_of{'gunzip'}); } elsif ($file =~ m|\.tar$|) { - @cmd = ("/usr/bin/tar","-xpvf"); + @cmd = ($location_of{'tar'},"-xpvf"); } else { - print("There has been an error in determining the file type of $file, please check name"); + 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 () { print "$_
"; } + while (my $line = ) { print("$line
"); } close(OUTPUT); - print("

Decompress complete.

"); + print("

$lt{'comp'}

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

An error occurred

$!

$@

"); + print('

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

'); } - print(""); } + print(''); } }