[LON-CAPA-cvs] cvs: loncom /cgi decompress.pl
taceyjo1
lon-capa-cvs@mail.lon-capa.org
Tue, 18 Nov 2003 04:07:49 -0000
taceyjo1 Mon Nov 17 23:07:49 2003 EDT
Modified files:
/loncom/cgi decompress.pl
Log:
Tabinated, started to rewrite the reg'exps to be more sane, should be done soon
Index: loncom/cgi/decompress.pl
diff -u loncom/cgi/decompress.pl:1.5 loncom/cgi/decompress.pl:1.6
--- loncom/cgi/decompress.pl:1.5 Mon Nov 17 18:12:12 2003
+++ loncom/cgi/decompress.pl Mon Nov 17 23:07:49 2003
@@ -2,6 +2,7 @@
#
#
# Copyright Michigan State University Board of Trustees
+# $Id:
#
# This file is part of the LearningOnline Network with CAPA (LON-CAPA).
#
@@ -28,74 +29,87 @@
# 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 <br>'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
+#will get to it tommorrow night as I have a calc test to "pass" yea, or something like that :0)
use lib '/home/httpd/lib/perl';
use LONCAPA::Configuration;
use LONCAPA::loncgi();
use Apache::lonnet;
+use strict;
if(! &LONCAPA::loncgi::check_cookie_and_load_env()){
print "Content-type: text/html\n\n";
print <<END;
<html><body>NO COOKIE!</body></html>
END
-} else {
- print "Content-type: text/html\n\n";
-print "<html><head></head><body>";
-print "$ENV{'cgi.path'}";
-print "<br>$ENV{'cgi.file'}";
-print "<br>$ENV{'user.name'}<br>";
-$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 = "";
+} else {my $username;
+ print "Content-type: text/html\n\n";
+ print "<html><head></head><body>";
+ my $path = $ENV{'cgi.path'};
+ $path =~ m|/{1}|;
+ $path = $'; #' stupid emacs
+ $path =~ m|/{1}|;
+ $path = $';
+ my (@right) = split(/\./,$ENV{'request.role'});
+ my $role = shift(@right);
+ my $temp = shift(@right);
+ my (@left) = split(/\/+/,$temp);;
+ shift(@left);
+ shift(@left);
+ $temp = shift(@left);
+ print "temp: $temp";
+ my $path2 = "/home/$username/public_html/";
+ $path2 .=$path;
+ my $back_path = "";
while($path =~ m|/|) {
- $back_path .= $`;
- $back_path .= "/";
- $path = $'; #' stupid emacs
+ $back_path .= $`;
+ $back_path .= "/";
+ $path = $'; #' stupid emacs
}
-$path = "/home/$username/public_html";
-$path .= '/';
-$path .= $back_path;
-print "<br>path: $path<br>";
-print "back_path: $back_path <br>";
-print "path2: $path2 <br>";
-print "$path2<br>";
-if ( -r $path2){
-print "Good read access is allowed";
-print "<br><br>";
-$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";
+ $path .= '/';
+ $path .= $back_path;
+ print "<br>path: $path<br>";
+ print "back_path: $back_path <br>";
+ print "path2: $path2 <br>";
+ print "$path2<br>";
+ if ( -r $path2){
+ print "Good read access is allowed";
+ print "<br><br>";
+ print "<br><br>right: $role";
+ my $filename = $ENV{'cgi.file'};
+ if($role eq "ca" || $role 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";
+ }
+ }
+ else {print "You don't have proper privledges";}
}
-}
-else {print "You don't have proper privledges";}
-}
-else { print "Read access not allowed!"; }
-print '<meta http-equiv="refresh" content="0; URL=';
-print "http://$ENV{'SERVER_NAME'}/~$username'}/$back_path"; print '" />';
-print '</body></html>';
-&Apache::lonnet::delenv(cgi.file);
-&Apache::lonnet::delenv(cgi.path);
+ else { print "Read access not allowed!"; }
+ #print '<meta http-equiv="refresh" content="0; URL=';
+ #print "http://$ENV{'SERVER_NAME'}/~$username'}/$back_path"; print '" />';
+ print '</body></html>';
+ &Apache::lonnet::delenv('cgi.file');
+ &Apache::lonnet::delenv('cgi.path');
}