chore: naming things

CHANGELOG.md

@@ -2,7 +2,7 @@
 
 ## 2.1.1 (not yet released)
 * ADDED: Translation for Korean (#2071)
-* ADDED: Comments authenticate the IDs of their document and parent comment by default. Older comments without these IDs are still accepted and shown, unless the new `discussionrequireids` option is enabled (#2101)
+* ADDED: Comments authenticate the IDs of their document and parent comment by default. Older comments without these IDs are still accepted and shown, unless the new `discussionrequireauthenticatedids` option is enabled (#2101)
 * CHANGED: Check `sizelimit` over full request, before attempting decoding
 * CHANGED: Database backend now logs errors when reading comments, like it already did for comment existence checks (#2100)
 * FIXED: Creating a document failed with a JavaScript error when the `discussion`, `password`, e-mail or QR code option is disabled, as the top navigation accessed the omitted elements

cfg/conf.sample.php

@@ -26,7 +26,7 @@ opendiscussion = false
 ; require new comments to authenticate the IDs of their document and parent
 ; comment, defaults to false. Comments sent by clients that don't, are rejected.
 ; This prevents copies of comments from getting moved elsewhere in the discussion.
-; discussionrequireids = true
+; discussionrequireauthenticatedids = true
 
 ; enable or disable the password feature, defaults to true
 password = true

lib/Configuration.php

@@ -40,7 +40,7 @@ class Configuration
             'discussion'               => true,
             'opendiscussion'           => false,
             'discussiondatedisplay'    => true,
-            'discussionrequireids'     => false,
+            'discussionrequireauthenticatedids'     => false,
             'password'                 => true,
             'fileupload'               => false,
             'burnafterreadingselected' => false,

lib/Model/Comment.php

@@ -168,7 +168,7 @@ class Comment extends AbstractModel
     protected function _validate(array &$data)
     {
         // reject comments without authenticated IDs, if required
-        if ($this->_conf->getKey('discussionrequireids') && count($data['adata']) !== 10) {
+        if ($this->_conf->getKey('discussionrequireauthenticatedids') && count($data['adata']) !== 10) {
             throw new TranslatedException(self::INVALID_DATA_ERROR, 77);
         }
     }

tst/ModelTest.php

@@ -224,7 +224,7 @@ class ModelTest extends TestCase
     public function testCommentRequireIds()
     {
         $options = parse_ini_file(CONF, true);
-        $options['main']['discussionrequireids'] = 'true';
+        $options['main']['discussionrequireauthenticatedids'] = 'true';
         Helper::createIniFile(CONF, $options);
         $model = new Model(new Configuration);