Changeset 33347 for main/trunk/greenstone3/src/java/org/greenstone/gsdl3/collection/Collection.java

Timestamp:

2019-07-23T13:45:16+12:00 (5 years ago)

Author:

kjdon

Message:

made it optional whether the user gets shown the terms and conditions (verify) every time, or just once. In collectionConfig.xml, in security element, set humanVerify=once to make it show the verify page only once (per session), otherwise set to 'true' or 'always', which will show the page everytime.

File:

• main/trunk/greenstone3/src/java/org/greenstone/gsdl3/collection/Collection.java (modified) (3 diffs)

main/trunk/greenstone3/src/java/org/greenstone/gsdl3/collection/Collection.java

@@ -81 +81 @@
     /** Stores the scope of any security rules (either collection or document) */
     protected boolean _securityScopeCollection = true;
-        protected boolean _humanVerify = false;
+        protected String _humanVerify = null;
         protected boolean _useRecaptcha = false; // for human verify
         protected String _siteKey = null; // for recaptcha
@@ -340 +340 @@
 
         String humanVerify = securityBlock.getAttribute(GSXML.VERIFY_ATT);
-        if (humanVerify.equals("true")) {
-          _humanVerify = true;
+        if (!humanVerify.equals("") && !humanVerify.equals("false")) {
+          _humanVerify = humanVerify;
         }
 
@@ -519 +519 @@
         response.setAttribute(GSXML.TYPE_ATT, GSXML.REQUEST_TYPE_SECURITY);
 
-        if (_humanVerify) {
-          response.setAttribute("humanVerify", "true");
+        if (_humanVerify != null) {
+          response.setAttribute("humanVerify", _humanVerify);
           if (_useRecaptcha) {
             response.setAttribute("siteKey", _siteKey);