--- loncom/cgi/decompress.pl 2003/11/17 23:12:12 1.5 +++ loncom/cgi/decompress.pl 2005/11/03 20:36:58 1.15 @@ -1,7 +1,8 @@ #!/usr/bin/perl # -# +# # Copyright Michigan State University Board of Trustees +# $Id # # This file is part of the LearningOnline Network with CAPA (LON-CAPA). # @@ -28,74 +29,58 @@ # A CGI script that decompresses compressed files for mass uploading into # construction space #### +use strict; use lib '/home/httpd/lib/perl'; -use LONCAPA::Configuration; -use LONCAPA::loncgi(); -use Apache::lonnet; +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! + NO COOKIE! END } else { print "Content-type: text/html\n\n"; -print ""; -print "$ENV{'cgi.path'}"; -print "
$ENV{'cgi.file'}"; -print "
$ENV{'user.name'}
"; -$path = $ENV{'cgi.path'}; -$path =~ m|/{1}|; -$path = $'; #' stupid emacs -$path =~ m|/{1}|; -$path = $'; -$username = $`; #Hmm, can't use the enviroment for this, if you are a co-author.. so we work around it. -$path2 = "/home/$username/public_html/"; -$path2 .=$path; -$back_path = ""; - while($path =~ m|/|) { - $back_path .= $`; - $back_path .= "/"; - $path = $'; #' stupid emacs - } -$path = "/home/$username/public_html"; -$path .= '/'; -$path .= $back_path; -print "
path: $path
"; -print "back_path: $back_path
"; -print "path2: $path2
"; -print "$path2
"; -if ( -r $path2){ -print "Good read access is allowed"; -print "

"; -$right = $ENV{'request.role'}; -$right =~ m|\.|; -$right = $`; -$filename = $ENV{'cgi.file'}; -if($right eq "ca" || $right eq "au") { -chdir $path; -if ($filename =~ m|zip|) { - system "unzip -qq $path2 &> /dev/null"; - } elsif ($filename =~ m|tar.gz|) { - system "tar -zxpvf $path2 &> /dev/null"; - } elsif ($filename =~ m|tar.bz2|){ - system "tar -jxpvf $path2 &> /dev/null"; - } elsif ($filename =~ m|bz2|){ - system "bunzip2 $path2 &> /dev/null"; - } elsif ($filename =~ m|tgz|){ - system "tar -zxpvf $path2 &> /dev/null"; - } elsif ($filename =~ m|gz|){ - system "gunzip $path2 &> /dev/null"; - } elsif ($filename =~ m|tar|){ - system "tar -xpvf $path2 &> /dev/null"; + my $file=$Apache::lonnet::env{'cgi.file'}; + my $dir=$Apache::lonnet::env{'cgi.dir'}; + if(! $file || ! $dir) { + print(<Bad Enviroment! +END + } else { + print(<

Output of decompress:

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

Decompress complete.

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

An error occurred

$!

$@

"); + } + print(""); } -} -else {print "You don't have proper privledges";} -} -else { print "Read access not allowed!"; } -print ''; -print ''; -&Apache::lonnet::delenv(cgi.file); -&Apache::lonnet::delenv(cgi.path); + } } +