From dff5619d53fcf1570e3a2de75de218f79ab17a37 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maur=C3=ADcio=20Meneghini=20Fauth?= <mauricio@fauth.dev>
Date: Sat, 5 Oct 2019 13:48:00 -0300
Subject: [PATCH] Move radio fields HTML to the template
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

... in Server\Privileges::getChangeLoginInformationHtmlForm

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
---
 libraries/classes/Server/Privileges.php       | 19 -------------
 .../privileges/change_user_login_info.twig    | 28 ++++++++++++++++++-
 2 files changed, 27 insertions(+), 20 deletions(-)

diff --git a/libraries/classes/Server/Privileges.php b/libraries/classes/Server/Privileges.php
index ca51201ef3..1934fa098d 100644
--- a/libraries/classes/Server/Privileges.php
+++ b/libraries/classes/Server/Privileges.php
@@ -1809,33 +1809,14 @@ class Privileges
      */
     public function getChangeLoginInformationHtmlForm($username, $hostname)
     {
-        $choices = [
-            '4' => __('… keep the old one.'),
-            '1' => __('… delete the old one from the user tables.'),
-            '2' => __(
-                '… revoke all active privileges from '
-                . 'the old one and delete it afterwards.'
-            ),
-            '3' => __(
-                '… delete the old one from the user tables '
-                . 'and reload the privileges afterwards.'
-            ),
-        ];
         $userGroup = $this->getUserGroupForUser($username);
         $loginInformationFields = $this->getHtmlForLoginInformationFields('change', $username, $hostname);
-        $radioFields = Util::getRadioFields(
-            'mode',
-            $choices,
-            '4',
-            true
-        );
 
         return $this->template->render('server/privileges/change_user_login_info', [
             'username' => $username,
             'hostname' => $hostname,
             'user_group' => $userGroup,
             'login_information_fields' => $loginInformationFields,
-            'radio_fields' => $radioFields,
         ]);
     }
 
diff --git a/templates/server/privileges/change_user_login_info.twig b/templates/server/privileges/change_user_login_info.twig
index c3f174ffd8..b8d310347d 100644
--- a/templates/server/privileges/change_user_login_info.twig
+++ b/templates/server/privileges/change_user_login_info.twig
@@ -18,7 +18,33 @@
         {% trans 'Create a new user account with the same privileges and …' %}
       </legend>
 
-      {{ radio_fields|raw }}
+      <div class="form-group form-check">
+        <input class="form-check-input" type="radio" name="mode" id="mode_4" value="4" checked>
+        <label class="form-check-label" for="mode_4">
+          {% trans '… keep the old one.' %}
+        </label>
+      </div>
+
+      <div class="form-group form-check">
+        <input class="form-check-input" type="radio" name="mode" id="mode_1" value="1">
+        <label class="form-check-label" for="mode_1">
+          {% trans '… delete the old one from the user tables.' %}
+        </label>
+      </div>
+
+      <div class="form-group form-check">
+        <input class="form-check-input" type="radio" name="mode" id="mode_2" value="2">
+        <label class="form-check-label" for="mode_2">
+          {% trans '… revoke all active privileges from the old one and delete it afterwards.' %}
+        </label>
+      </div>
+
+      <div class="form-group form-check">
+        <input class="form-check-input" type="radio" name="mode" id="mode_3" value="3">
+        <label class="form-check-label" for="mode_3">
+          {% trans '… delete the old one from the user tables and reload the privileges afterwards.' %}
+        </label>
+      </div>
     </fieldset>
   </fieldset>