Changeset 11941

Timestamp:

2006-06-20T10:03:20+12:00 (18 years ago)

Author:

mdewsnip

Message:

Changed authenticate_user to return the groups of the authenticated user.

File:

• trunk/gsdl/cgi-bin/gliserver.pl (modified) (2 diffs)

trunk/gsdl/cgi-bin/gliserver.pl

@@ -106 +106 @@
 
     # Only authenticate if it is enabled
-    return if (!$authentication_enabled);
+    return "all-collections-editor" if (!$authentication_enabled);
 
     if ((!defined $user_password) || ($user_password =~ m/^\s*$/)) {
@@ -143 +143 @@
     }
 
-    # If we're not editing a collection then the user doesn't need to be in a particular group
-    if ($collection eq "") {
-    return;  # Authentication successful
-    }
-
     # Check group
     my ($user_groups) = ($user_data =~ /\<groups\>(.*)/);
+    if ($collection eq "") {
+    # If we're not editing a collection then the user doesn't need to be in a particular group
+    return $user_groups;  # Authentication successful
+    }
     foreach my $user_group (split(/\,/, $user_groups)) {
     # Does this user have access to all collections?
     if ($user_group eq "all-collections-editor") {
-        return;  # Authentication successful
+        return $user_groups;  # Authentication successful
     }
     # Does this user have access to personal collections, and is this one?
     if ($user_group eq "personal-collections-editor" && $collection =~ /^$username\-/) {
-        return;  # Authentication successful
+        return $user_groups;  # Authentication successful
     }
     # Does this user have access to this collection
     if ($user_group eq "$collection-collection-editor") {
-        return;  # Authentication successful
+        return $user_groups;  # Authentication successful
     }
     }