From 93fa87d9f6dc7d3854a71a10a8efbede0aed5328 Mon Sep 17 00:00:00 2001
From: Carsten Schmitz <carsten.schmitz@limesurvey.org>
Date: Mon, 29 Mar 2021 13:09:59 +0200
Subject: [PATCH] Fixed issue #17212: Confusing mandatory property for
 participant attribute fields

---
 .../admin/token/managetokenattributes.php     | 30 +++++++++----------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/application/views/admin/token/managetokenattributes.php b/application/views/admin/token/managetokenattributes.php
index 56c56cd6f7e..a1aedffd27c 100644
--- a/application/views/admin/token/managetokenattributes.php
+++ b/application/views/admin/token/managetokenattributes.php
@@ -35,9 +35,9 @@
                                 <thead> <tr>
                                     <th><?php eT("Attribute field"); ?></th>
                                     <th><?php eT("Field description"); ?></th>
-                                    <th><?php eT("Mandatory?"); ?></th>
-                                    <th title="<?php !$bEncrypted ? eT("Encryption is disabled because Sodium library isn't installed") : ''; ?>"><?php eT("Encrypted?"); ?></th>
                                     <th><?php eT("Show during registration?") ?></th>
+                                    <th><?php eT("Mandatory during registration?"); ?></th>
+                                    <th title="<?php !$bEncrypted ? eT("Encryption is disabled because Sodium library isn't installed") : ''; ?>"><?php eT("Encrypted?"); ?></th>
                                     <th><?php eT("Field caption"); ?></th>
                                     <th><?php eT("CPDB mapping"); ?></th>
                                     <th><?php eT("Example data"); ?></th>
@@ -79,11 +79,11 @@
                                             <?php } ?>
                                         </td>
                                         <td>
-                                            <?php
+                                            <?php 
                                                 $this->widget('yiiwheels.widgets.switch.WhSwitch', array(
-                                                    'name' => "mandatory_{$sTokenField}",
-                                                    'id'=>"mandatory_{$sTokenField}",
-                                                    'value' => $tokenvalues['mandatory']=='Y'?'1':'0',
+                                                    'name' => "show_register_{$sTokenField}",
+                                                    'id'=>"show_register_{$sTokenField}",
+                                                    'value' => $tokenvalues['show_register']=='Y'?'1':'0',
                                                     'onLabel'=>gT('On'),
                                                     'offLabel' => gT('Off'),
                                                     'htmlOptions'=>array(
@@ -95,27 +95,27 @@
                                         <td>
                                             <?php
                                                 $this->widget('yiiwheels.widgets.switch.WhSwitch', array(
-                                                    'name' => "encrypted_{$sTokenField}",
-                                                    'id'=>"encrypted_{$sTokenField}",
-                                                    'value' => $tokenvalues['encrypted']=='Y'?'1':'0',
+                                                    'name' => "mandatory_{$sTokenField}",
+                                                    'id'=>"mandatory_{$sTokenField}",
+                                                    'value' => $tokenvalues['mandatory']=='Y'?'1':'0',
                                                     'onLabel'=>gT('On'),
                                                     'offLabel' => gT('Off'),
                                                     'htmlOptions'=>array(
-                                                        'disabled' => !$bEncrypted,
+                                                        'disabled'=>empty($tokenvalues['coreattribute']) ? false : true,
                                                     )
                                                 ));
                                             ?>
                                         </td>
                                         <td>
-                                            <?php 
+                                            <?php
                                                 $this->widget('yiiwheels.widgets.switch.WhSwitch', array(
-                                                    'name' => "show_register_{$sTokenField}",
-                                                    'id'=>"show_register_{$sTokenField}",
-                                                    'value' => $tokenvalues['show_register']=='Y'?'1':'0',
+                                                    'name' => "encrypted_{$sTokenField}",
+                                                    'id'=>"encrypted_{$sTokenField}",
+                                                    'value' => $tokenvalues['encrypted']=='Y'?'1':'0',
                                                     'onLabel'=>gT('On'),
                                                     'offLabel' => gT('Off'),
                                                     'htmlOptions'=>array(
-                                                        'disabled'=>empty($tokenvalues['coreattribute']) ? false : true,
+                                                        'disabled' => !$bEncrypted,
                                                     )
                                                 ));
                                             ?>