Add UserComments as an option for Captcha protection. Closes VUFIND-526.

config/vufind/config.ini

@@ -1003,7 +1003,7 @@ era             = true      ; allow browsing of era subdivisions
 ; <result_limit> most popular entries -- it only affects display order.
 ;alphabetical_order = true
 
-; This section controls the availability of export methods. 
+; This section controls the availability of export methods.
 ;
 ; Each entry may be a comma-separated list of contexts in which the export
 ; option will be presented. Valid options:
@@ -1259,7 +1259,8 @@ treeSearchLimit = 100
 ;secretKey = "https://www.google.com/recaptcha/admin/create"
 ; Valid theme values: dark, light
 ;theme      = light
-; Valid forms values: changePassword, email, newAccount, passwordRecovery, sms
+; Valid forms values: changePassword, email, newAccount,
+;                     passwordRecovery, sms, UserComments
 ; Use * for all supported forms
 ;forms = changePassword, email, newAccount, passwordRecovery, sms
 

module/VuFind/src/VuFind/Controller/AbstractRecord.php

@@ -113,6 +113,12 @@ class AbstractRecord extends AbstractBase
             );
         }
 
+        $captcha = $this->recaptcha()->active('UserComments');
+        if (!$this->formWasSubmitted('comment', $captcha)) {
+            $this->flashMessenger()->addMessage('recaptcha_not_passed', 'error');
+            return $this->redirectToRecord('', 'UserComments');
+        }
+
         // Obtain the current record object:
         $driver = $this->loadRecord();
 

module/VuFind/src/VuFind/Controller/AjaxController.php

@@ -969,6 +969,13 @@ class AjaxController extends AbstractBase
 
         $id = $this->params()->fromPost('id');
         $comment = $this->params()->fromPost('comment');
+
+        $captcha = $this->recaptcha()->active('UserComments');
+        if (!$this->formWasSubmitted('comment', $captcha)) {
+            return $this->output(
+                $this->translate('recaptcha_not_passed'), self::STATUS_ERROR
+            );
+        }
         if (empty($id) || empty($comment)) {
             return $this->output(
                 $this->translate('An error has occurred'), self::STATUS_ERROR

themes/bootstrap3/templates/RecordTab/usercomments.phtml

@@ -17,9 +17,15 @@
       <? $user = $this->auth()->isLoggedIn() ?>
       <? if($user): ?>
         <textarea id="comment" name="comment" class="form-control" rows="3" required></textarea><br/>
+        <? if ($this->recaptcha()->active('UserComments')): ?>
+          <?=$this->recaptcha()->html(true) ?><br/>
+        <? endif; ?>
         <input class="btn btn-primary" data-loading-text="<?=$this->transEsc('Submitting') ?>..." type="submit" value="<?=$this->transEsc("Add your comment")?>"/>
       <? else: ?>
         <textarea id="comment" name="comment" class="form-control" rows="3" disabled></textarea><br/>
+        <? if ($this->recaptcha()->active('UserComments')): ?>
+          <?=$this->recaptcha()->html(true) ?><br/>
+        <? endif; ?>
         <input onClick="Lightbox.get('MyResearch', 'UserLogin'); return false;" class="btn btn-primary" type="submit" value="<?=$this->transEsc("You must be logged in first")?>"/>
       <? endif; ?>
     </div>