Changeset 16405

Timestamp:

2008-07-15 12:20:55 (3 months ago)

Author:

ak19

Message:

Minor. Now tests for matches using m/something/ rather than /something/

Files:

• greenstone3/trunk/web/WEB-INF/cgi/gliserver.pl (modified) (15 diffs)
• greenstone3/trunk/web/WEB-INF/cgi/gsdlCGI.pm (modified) (4 diffs)

greenstone3/trunk/web/WEB-INF/cgi/gliserver.pl

@@ -203 +203 @@
-        my $java_classpath;
-        my $gsdlos = $ENV{'GSDLOS'};
-
+m
-            $java_classpath = $java_gsdl3_classpath . ":" . $java_derby_classpath;
-        }else{
@@ -217 +217 @@
-    my %users_db_data = ();
-    foreach my $users_db_entry (split(/-{70}/, $users_db_content)) {
-
+m
-            $users_db_data{$1} = $users_db_entry;
-        }
@@ -229 +229 @@
-
-    # Check password
-
+m
-    if ($user_password ne $valid_user_password) {
-        $gsdl_cgi->generate_error("Authentication failed: incorrect password.");
@@ -235 +235 @@
-
-    # Check group
-
+m
-
-    if ($collection eq "") {
@@ -248 +248 @@
-        }
-        # Does this user have access to personal collections, and is this one?
-
+m
-            return $user_groups;  # Authentication successful
-        }
@@ -285 +285 @@
-
-        # Pick out the owner of the lock file
-
+m
-        my $lock_file_owner = $1;
-
@@ -317 +317 @@
-#   ACTIONS
-# ----------------------------------------------------------------------------------------------------
- won't get called by GS2, so uses the variable site
+, which uses the variable site, won't get called by GS2, 
-sub user_validation{
-    my ($gsdl_cgi, $username, $timestamp, $site) = @_;
@@ -323 +323 @@
-    # Users can be in any group to perform this action
-    my $user_err = &authenticate_user($gsdl_cgi, $username, "", $site);
-
-
+m
+m
-             #$gsdl_cgi->generate_error("Authentication failed: $username is not valid");
-             $gsdl_cgi->generate_ok($user_err);
@@ -450 +450 @@
-
-    # Make sure we don't try to delete anything outside the collection
-
+m
-        $gsdl_cgi->generate_error("Illegal file specified.");
-    }
@@ -658 +658 @@
-
-    # Make sure we don't try to download anything outside the collection
-
+m
-        $gsdl_cgi->generate_error("Illegal file specified.");
-    }
@@ -714 +714 @@
-
-    # Make sure we don't try to download anything else
-
+m
-        $gsdl_cgi->generate_error("Illegal file specified.");
-    }
@@ -868 +868 @@
-
-    # Make sure we don't try to move anything outside the collection
-/\.\./ || $target_file =~ 
+m/\.\./ || $target_file =~ m
-        $gsdl_cgi->generate_error("Illegal file specified.");
-    }
@@ -912 +912 @@
-
-    # Make sure we don't try to create anything outside the collection
-
+m
-        $gsdl_cgi->generate_error("Illegal directory specified.");
-    }
@@ -997 +997 @@
-    my $import_pl = "import.pl"; # import is a reserved word, need to put it in quotes
-    
-
+m
-        my $collect_directory = $gsdl_cgi->get_collection_dir($site); 
-        $perl_args = $perl_args . " -collectdir \"$collect_directory\"";
@@ -1049 +1049 @@
-
-    # Make sure we don't try to upload anything outside the collection
-
+m
-        $gsdl_cgi->generate_error("Illegal file specified.");
-    }
-
+m
-        $gsdl_cgi->generate_error("Illegal directory specified.");
-    }

greenstone3/trunk/web/WEB-INF/cgi/gsdlCGI.pm

@@ -32 +32 @@
-        # Check if we're dealing with the upload-coll-file cmd. Because it will be a 
-        # multipart POST message and must be dealt with by the default CGI() constructor
-
+m
-            $self = new CGI(); 
-        } 
@@ -302 +302 @@
-        return "linux";
-    }
-
+m
-        return "windows";
-    }
-
+m
-        return "darwin";
-    }
@@ -333 +333 @@
-
-            my $gsdlos = (defined $ENV{'GSDLOS'}) ? $ENV{'GSDLOS'} : $self->get_gsdl_os();
-
+m
-                $library_url .= ".exe";
-            }
@@ -405 +405 @@
-    my $gsdl_bin_script = &util::filename_cat($gsdlhome,"bin","script");
-    &util::envvar_append("PATH",$gsdl_bin_script);
-
+
-    my $gsdl_bin_os = &util::filename_cat($gsdlhome,"bin",$gsdlos);
-    &util::envvar_append("PATH",$gsdl_bin_os);