Changeset 7768

Timestamp:

2004-07-19T17:36:08+12:00 (20 years ago)

Author:

davidb

Message:

Check added to make sure collection name is defined and non-empty

Location:

trunk/gsdl/cgi-bin

Files:

• launch (modified) (1 diff)
• upload (modified) (2 diffs)

trunk/gsdl/cgi-bin/launch

@@ -135 +135 @@
 
     my $col = clean_param($cgi,"c");
-    if (defined $col) {
-    $cgi->delete("c");
-    $col = safe_val($col);
+    if ((!defined $col) || ($col =~ m/^\s*$/)) {
+    print "Content-type:text/plain\n\n";
+    print "Error: No collection name specified\n";
+    exit;
     }
+
+    $cgi->delete("c");
+    $col = safe_val($col);
 
     if ($cmd eq "mkcol") {

trunk/gsdl/cgi-bin/upload

@@ -35 +35 @@
     my $cgi = init_cgi();
 
-    print STDERR "*** started upload script\n";
-
     my ($gsdlhome) = usabcgi::get_config_info("gsdlhome");
 
@@ -43 +41 @@
     $dir = "" if (($dir eq ".") || ($dir =~ m/^\.\./));
 
+    if ((!defined $col) || ($col =~ m/^\s*$/)) {
+    print "Content-type:text/plain\n\n";
+    print "Error: No collection name specified\n";
+    exit;
+    }
+
+
     my $zip_content = clean_param($cgi,"zip");
     my $zip_fname = "$col.zip";
 
     chdir "$gsdlhome/collect/";
-    print STDERR "**** deleting $col/$dir\n";
     `rm -rf $col/$dir`;