From 5cb65f8fc1328e903acd4d65ec458784a1a77ec1 Mon Sep 17 00:00:00 2001
From: Sami Mokaddem <sami.mokaddem@circl.lu>
Date: Thu, 30 Mar 2023 16:14:15 +0200
Subject: [PATCH] fix: [genericElements:formInfo] Removed unused portion of
 code

---
 templates/Broods/add.php                            |  1 -
 templates/element/genericElements/Form/formInfo.php | 13 ++-----------
 2 files changed, 2 insertions(+), 12 deletions(-)

diff --git a/templates/Broods/add.php b/templates/Broods/add.php
index 6069870..f5666d2 100644
--- a/templates/Broods/add.php
+++ b/templates/Broods/add.php
@@ -1,5 +1,4 @@
 <?php
-    $modelForForm = 'Individuals';
     echo $this->element('genericElements/Form/genericForm', array(
         'data' => array(
             'description' => __('Individuals are natural persons. They are meant to describe the basic information about an individual that may or may not be a user of this community. Users in genral require an individual object to identify the person behind them - however, no user account is required to store information about an individual. Individuals can have affiliations to organisations and broods as well as cryptographic keys, using which their messages can be verified and which can be used to securely contact them.'),
diff --git a/templates/element/genericElements/Form/formInfo.php b/templates/element/genericElements/Form/formInfo.php
index d569142..39b60fe 100644
--- a/templates/element/genericElements/Form/formInfo.php
+++ b/templates/element/genericElements/Form/formInfo.php
@@ -2,19 +2,10 @@
     $seed = mt_rand();
     if (!is_array($fieldDesc)) {
         $fieldDesc = array('info' => $fieldDesc);
-        $default = 'info';
     } else {
-        if (!empty($field['options'])) {
-            if (isset($this->request->data[$modelForForm][$field['field']])) {
-                $default = $this->request->data[$modelForForm][$field['field']];
-            } else {
-                reset($field['options']);
-                $default = key($field['options']);
-            }
-        } else {
+        if (empty($field['options'])) {
             reset($fieldDesc);
             $fieldDesc = array('info' => key($fieldDesc));
-            $default = 'info';
         }
     }
     $popoverID = sprintf("%sInfoPopover%s", h($field['field']), $seed);
@@ -39,7 +30,7 @@
                             .text('<?php echo h(\Cake\Utility\Inflector::humanize($field['field'])); ?>')
                     )
                     .append(
-                        $('<span>').text(": <?= h($fieldDesc["info"]) ?>")
+                        $('<span>').text(": <?= h($fieldDesc["info"] ?? '') ?>")
                     );
                 // var tempSelector = '#<?php echo h($modelForForm . \Cake\Utility\Inflector::camelize($field['field'])); ?>';
                 // if ($(tempSelector)[0].nodeName === "SELECT" && Object.keys(fieldDesc).length > 1) {