From a1d317c32a1f1d656ed3288a0aa5786c9871c812 Mon Sep 17 00:00:00 2001
From: Patricia Stelling <patricia.stelling@limesurvey.org>
Date: Fri, 12 Mar 2021 10:00:18 +0100
Subject: [PATCH 1/2] Added advanced settings to question overview (summary)

---
 .../views/questionAdministration/summary.php    | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/application/views/questionAdministration/summary.php b/application/views/questionAdministration/summary.php
index dd118e08341..30c7803785d 100644
--- a/application/views/questionAdministration/summary.php
+++ b/application/views/questionAdministration/summary.php
@@ -176,7 +176,11 @@
         <!-- Relevance equation -->
         <?php if (trim($question->relevance) != ''): ?>
             <tr>
-                <td><?php eT("Relevance equation:"); ?></td>
+                <td>
+                    <strong>
+                    <?php eT("Relevance equation"); ?>:
+                    </strong>
+                </td>
                 <td>
                     <?php
                     LimeExpressionManager::ProcessString("{" . $question->relevance . "}", $question->qid);    // tests Relevance equation so can pretty-print it
@@ -204,6 +208,7 @@
             <?php foreach ($settings as $setting): ?>
                 <tr>
                     <td>
+                        <?php echo $setting['caption'];?>:
                     </td>
                     <td>
                         <?php
@@ -211,11 +216,11 @@
                                 LimeExpressionManager::ProcessString('{' . $setting->value . '}', $question->qid);
                                 echo LimeExpressionManager::GetLastPrettyPrintExpression();
                             } else {
-                                //if ($setting->aFormElementOptions->i18n == false) {
-                                    //echo htmlspecialchars($setting->aFormElementOptions->value);
-                                //} else {
-                                    //echo htmlspecialchars($setting['aFormElementOptions'][$question->survey->language]['value']);
-                                //}
+                                if (($setting->aFormElementOptions->i18n ==null) || ($setting->aFormElementOptions->i18n == false)) {
+                                    echo htmlspecialchars($setting->aFormElementOptions->value);
+                                } else {
+                                    echo htmlspecialchars($setting['aFormElementOptions'][$question->survey->language]['value']);
+                                }
                             }
                         ?>
                     </td>

From 488656e24083e9b78639bb95d15d550535d28b72 Mon Sep 17 00:00:00 2001
From: Patricia Stelling <patricia.stelling@limesurvey.org>
Date: Mon, 15 Mar 2021 09:34:06 +0100
Subject: [PATCH 2/2] Fixed issue #17078: checkbox layout (ARRAY(numbers)) now
 shown in question overview

---
 .../views/questionAdministration/summary.php  | 26 ++++++++++++-------
 1 file changed, 16 insertions(+), 10 deletions(-)

diff --git a/application/views/questionAdministration/summary.php b/application/views/questionAdministration/summary.php
index 30c7803785d..66f481b0e33 100644
--- a/application/views/questionAdministration/summary.php
+++ b/application/views/questionAdministration/summary.php
@@ -204,28 +204,34 @@
         <?php endif; ?>
 
         <!-- Advanced Settings -->
-        <?php foreach ($advancedSettings as $settings): ?>
-            <?php foreach ($settings as $setting): ?>
+        <?php foreach ($advancedSettings as $settings){ ?>
+            <?php foreach ($settings as $setting){
+
+                if($setting['default'] != $setting['value']){ ?>
                 <tr>
                     <td>
-                        <?php echo $setting['caption'];?>:
+                        <strong>
+                            <?php echo $setting['caption'];?>:
+                        </strong>
                     </td>
                     <td>
                         <?php
-                            if (isset($setting->expression) && $setting->expression == 2) {
-                                LimeExpressionManager::ProcessString('{' . $setting->value . '}', $question->qid);
+                            if (isset($setting['expression']) && $setting['expression'] == 2) {
+                                LimeExpressionManager::ProcessString('{' . $setting['value'] . '}', $question->qid);
                                 echo LimeExpressionManager::GetLastPrettyPrintExpression();
                             } else {
-                                if (($setting->aFormElementOptions->i18n ==null) || ($setting->aFormElementOptions->i18n == false)) {
-                                    echo htmlspecialchars($setting->aFormElementOptions->value);
+                                if (($setting['i18n'] ==null) || ($setting['i18n'] == false)) {
+                                    echo htmlspecialchars($setting['value']);
                                 } else {
-                                    echo htmlspecialchars($setting['aFormElementOptions'][$question->survey->language]['value']);
+                                    echo htmlspecialchars($setting[$question->survey->language]['value']);
                                 }
                             }
                         ?>
                     </td>
                 </tr>
-            <?php endforeach; ?>
-        <?php endforeach; ?>
+            <?php
+                }
+            }
+        } ?>
     </table>
 </div>