Changeset 27390 for main/trunk

Timestamp:

2013-05-22T17:01:58+12:00 (11 years ago)

Author:

ak19

Message:

Authentication hasn't been implemented for GS3 when using metadata-server.pl. Since the authentication_enabled flag is always on now (since authentication has been implemented now for GS2), need to now return immediately from baseaction::authenticate_user() for GS3.

File:

• main/trunk/greenstone2/perllib/cgiactions/baseaction.pm (modified) (2 diffs)

main/trunk/greenstone2/perllib/cgiactions/baseaction.pm

@@ -226 +226 @@
 {
     my $self = shift @_;
+
+    my $gsdl_cgi = $self->{'gsdl_cgi'};
+
+    # For now, we don't authenticate for GS3 as this still needs to be implemented for it.
+    if($gsdl_cgi->greenstone_version() == 3) { 
+    $gsdl_cgi->generate_message("**** To do: still need to authenticate for GS3.");
+    return;
+    }   
+
     my $username = shift(@_);
     my $collection = shift(@_);
@@ -231 +240 @@
     my $keydecay = 1800; # 30 mins same as in runtime-src/recpt/authentication.cpp
 
-    my $gsdl_cgi = $self->{'gsdl_cgi'};
 
     # Remove the pw argument (since this can mess up other scripts)