Changeset 27366 for main/trunk/greenstone2/perllib/cgiactions/baseaction.pm

Timestamp:

2013-05-17T17:43:28+12:00 (11 years ago)

Author:

ak19

Message:

1. Handling quotes and colons in user comments: since these are sent and retrieved from metadata-server.pl as JSON strings, the quotes and colons in user-added meta needs to be protected since JSON uses these characters for packaging up data. 2. Cosmetic changes to baseaction: clarified some comments.

File:

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

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

@@ -294 +294 @@
         
         my ($year,$mon,$mday,$hour,$min,$sec) = split(/[\s\/:]+/, $keycreation_time); # split by space, /, :
+                           # (also ensures whitespace surrounding keycreateion_time is trimmed)
         my $key_timestamp = timelocal($sec,$min,$hour,$mday,$mon-1,$year);
         
@@ -321 +322 @@
     # The following code which tests whether the user is in the required group 
     # seems to have been copied over from gliserver.pl.
-    # But for metadata-server.pl, when user comments are added through the set-metadata functions,
+    # But when user comments are added through the set-metadata functions for metadata-server.pl
+    # (which is the first feature for which baseaction::authenticate_user() is actually used)
     # the user doesn't need to be a specific collection's editor in order to add comments to that collection.
     # So we no longer check the user is in the group here.