From a23193b9bab536802cc8cef5c0a6f08e21aa31e3 Mon Sep 17 00:00:00 2001
From: Denis Chenu <denis@sondages.pro>
Date: Fri, 1 Jul 2022 12:36:20 +0000
Subject: [PATCH] Fixed issue #18136: Core plugin PasswordRequirement shows
 duplicate setting fields (#2452)

---
 .../PasswordRequirement.php                   | 30 ++++++++++++++++++-
 1 file changed, 29 insertions(+), 1 deletion(-)

diff --git a/application/core/plugins/PasswordRequirement/PasswordRequirement.php b/application/core/plugins/PasswordRequirement/PasswordRequirement.php
index 077b4b28f3d..464ec0cf579 100644
--- a/application/core/plugins/PasswordRequirement/PasswordRequirement.php
+++ b/application/core/plugins/PasswordRequirement/PasswordRequirement.php
@@ -16,6 +16,14 @@ class PasswordRequirement extends \LimeSurvey\PluginManager\PluginBase
     public $allowedPublicMethods = array();
 
     protected $settings = [
+        'adminPart' => array(
+            'content' => 'Password requirements for administration login',
+            'type' => 'info',
+            'class' => "h3",
+            'controlOptions' => array(
+                'class' => "col-md-offset-4 col-md-6"
+            ),
+        ),
         'needsNumber' => array(
             'label' => 'Require at least one digit',
             'type' => 'checkbox',
@@ -36,6 +44,15 @@ class PasswordRequirement extends \LimeSurvey\PluginManager\PluginBase
             'type' => 'int',
             'default' => 12,
         ),
+        'surveyPart' => array(
+            'content' => 'Password requirements for “Save and return later” feature',
+            'type' => 'info',
+            'class' => "h3",
+            'controlOptions' => array(
+                'class' => "col-md-offset-4 col-md-6"
+            ),
+            'type' => 'info',
+        ),
         'surveySaveActive' => array(
             'type' => 'boolean',
             'label' => 'Check password when saving survey',
@@ -177,7 +194,18 @@ public function createRandomPassword()
      */
     public function getPluginSettings($getValues = true)
     {
-        $settings = parent::getPluginSettings();
+        $settings = parent::getPluginSettings($getValues);
+        $settings['adminPart']['content'] = $this->gT("Password requirements for administration login");
+        $settings['needsNumber']['label'] = $this->gT("Require at least one digit");
+        $settings['needsUppercase']['label'] = $this->gT("Require at least one uppercase character");
+        $settings['needsNonAlphanumeric']['label'] = $this->gT("Require at least one special character");
+        $settings['minimumSize']['label'] = $this->gT("Minimum password length");
+        $settings['surveyPart']['content'] = $this->gT("Password requirements for “Save and return later” feature");
+        $settings['surveySaveActive']['label'] = $this->gT("Check password when use “Save and return later” feature");
+        $settings['surveySaveNeedsNumber']['label'] = $this->gT("Require at least one digit");
+        $settings['surveySaveNeedsUppercase']['label'] = $this->gT("Require at least one uppercase character");
+        $settings['surveySaveNeedsNonAlphanumeric']['label'] = $this->gT("Require at least one special character");
+        $settings['surveySaveMinimumSize']['label'] = $this->gT("Minimum password length");
         return $settings;
     }