php8.x Fix notices on displaying FieldSet

diff --git a/CRM/Profile/Form.php b/CRM/Profile/Form.php
index 247f41705b738eb360d1bd435c05c292af3015f5..80605866ecbc072de78080edf25f1a66c51df704 100644 (file)
--- a/CRM/Profile/Form.php
+++ b/CRM/Profile/Form.php
@@ -795,6 +795,7 @@ class CRM_Profile_Form extends CRM_Core_Form {
 
     $this->assign('id', $this->_id);
     $this->assign('mode', $this->_mode);
+    $this->assign('isHideFieldSet', ($this->_mode === self::MODE_CREATE || $this->_mode === self::MODE_EDIT));
     $this->assign('action', $this->_action);
     $this->assign('fields', $this->_fields);
     $this->assign('fieldset', (isset($this->_fieldset)) ? $this->_fieldset : "");

diff --git a/ext/eventcart/templates/CRM/Event/Cart/Form/Checkout/Participant.tpl b/ext/eventcart/templates/CRM/Event/Cart/Form/Checkout/Participant.tpl
index 7f6ef84078f49cdb8453d97518ca62ed1488b5f3..28cf5eb1676014ee56777cc763cb5ea14c2aa266 100644 (file)
--- a/ext/eventcart/templates/CRM/Event/Cart/Form/Checkout/Participant.tpl
+++ b/ext/eventcart/templates/CRM/Event/Cart/Form/Checkout/Participant.tpl
@@ -8,7 +8,7 @@
   <div class="clearfix">
           {assign var=pre value="event[`$event_id`][participant][`$participant_id`][customPre]"}
           <div class="profile-group">
-          {include file="CRM/UF/Form/Block.tpl" fields=$custom.$pre form=$form.field.$participant_id}
+          {include file="CRM/UF/Form/Block.tpl" fields=$custom.$pre form=$form.field.$participant_id hideFieldset=false}
           </div>
 
     <div class="participant-info crm-section form-item">
@@ -23,7 +23,7 @@
           {assign var=post value="event[`$event_id`][participant][`$participant_id`][customPost]"}
           <div style="clear:left"></div>
           <div class="profile-group">
-          {include file="CRM/UF/Form/Block.tpl" fields=$custom.$post form=$form.field.$participant_id}
+          {include file="CRM/UF/Form/Block.tpl" fields=$custom.$post form=$form.field.$participant_id hideFieldset=false}
           </div>
   </div>
     <!--if $form_participant->participant_index > 0-->

diff --git a/templates/CRM/Contribute/Form/Contribution/Confirm.tpl b/templates/CRM/Contribute/Form/Contribution/Confirm.tpl
index a9972e56d9d5f1702affb6667537721d2479e9eb..5b13d71471a4c1cc881bda09337e2846023a881a 100644 (file)
--- a/templates/CRM/Contribute/Form/Contribution/Confirm.tpl
+++ b/templates/CRM/Contribute/Form/Contribution/Confirm.tpl
@@ -153,7 +153,7 @@
 
   {if $onbehalfProfile && $onbehalfProfile|@count}
     <div class="crm-group onBehalf_display-group label-left crm-profile-view">
-      {include file="CRM/UF/Form/Block.tpl" fields=$onbehalfProfile prefix='onbehalf'}
+      {include file="CRM/UF/Form/Block.tpl" fields=$onbehalfProfile prefix='onbehalf' hideFieldset=false}
     </div>
   {/if}
 
@@ -165,7 +165,7 @@
       <div class="display-block">
         <div class="label-left crm-section honoree_profile-section">
           <strong>{$honorName}</strong><br/>
-          {include file="CRM/UF/Form/Block.tpl" fields=$honoreeProfileFields mode=8 prefix='honor'}
+          {include file="CRM/UF/Form/Block.tpl" fields=$honoreeProfileFields mode=8 prefix='honor' hideFieldset=false}
         </div>
       </div>
     </div>
@@ -173,7 +173,7 @@
 
   {if $customPre}
     <fieldset class="label-left crm-profile-view">
-      {include file="CRM/UF/Form/Block.tpl" fields=$customPre prefix=false}
+      {include file="CRM/UF/Form/Block.tpl" fields=$customPre prefix=false hideFieldset=false}
     </fieldset>
   {/if}
 
@@ -272,7 +272,7 @@
 
   {if $customPost}
     <fieldset class="label-left crm-profile-view">
-      {include file="CRM/UF/Form/Block.tpl" fields=$customPost prefix=false}
+      {include file="CRM/UF/Form/Block.tpl" fields=$customPost prefix=false hideFieldset=false}
     </fieldset>
   {/if}
 

diff --git a/templates/CRM/Contribute/Form/Contribution/Main.tpl b/templates/CRM/Contribute/Form/Contribution/Main.tpl
index 3eb4ea74412ee5205fae1f3e65d0ca12dbb83c7a..312aade9cd1221edcc20e8aee5ce5cbab713b4cb 100644 (file)
--- a/templates/CRM/Contribute/Form/Contribution/Main.tpl
+++ b/templates/CRM/Contribute/Form/Contribution/Main.tpl
@@ -208,13 +208,13 @@
           {/if}
           {/crmRegion}
           <div id="honorType" class="honoree-name-email-section">
-            {include file="CRM/UF/Form/Block.tpl" fields=$honoreeProfileFields mode=8 prefix='honor'}
+            {include file="CRM/UF/Form/Block.tpl" fields=$honoreeProfileFields mode=8 prefix='honor' hideFieldset=false}
           </div>
         </fieldset>
       {/if}
 
       <div class="crm-public-form-item crm-group custom_pre_profile-group">
-        {include file="CRM/UF/Form/Block.tpl" fields=$customPre prefix=false}
+        {include file="CRM/UF/Form/Block.tpl" fields=$customPre prefix=false hideFieldset=false}
       </div>
 
       {if array_key_exists('pcp_display_in_roll', $form)}
@@ -283,7 +283,7 @@
     {include file="CRM/Core/BillingBlockWrapper.tpl"}
 
     <div class="crm-public-form-item crm-group custom_post_profile-group">
-      {include file="CRM/UF/Form/Block.tpl" fields=$customPost prefix=false}
+      {include file="CRM/UF/Form/Block.tpl" fields=$customPost prefix=false hideFieldset=false}
     </div>
 
     <div id="crm-submit-buttons" class="crm-submit-buttons">

diff --git a/templates/CRM/Contribute/Form/Contribution/OnBehalfOf.tpl b/templates/CRM/Contribute/Form/Contribution/OnBehalfOf.tpl
index 73e8d98b03ec68d928a73d6976873e3b5568e6bb..61bb569467bd8122a966f60e343857172c1eb996 100644 (file)
--- a/templates/CRM/Contribute/Form/Contribution/OnBehalfOf.tpl
+++ b/templates/CRM/Contribute/Form/Contribution/OnBehalfOf.tpl
@@ -35,7 +35,7 @@
           </div>
         </div>
       {/if}
-      {include file="CRM/UF/Form/Block.tpl" fields=$onBehalfOfFields mode=8 prefix='onbehalf'}
+      {include file="CRM/UF/Form/Block.tpl" fields=$onBehalfOfFields mode=8 prefix='onbehalf' hideFieldset=true}
     </fieldset>
   {/if}
   {/crmRegion}

diff --git a/templates/CRM/Contribute/Form/Contribution/ThankYou.tpl b/templates/CRM/Contribute/Form/Contribution/ThankYou.tpl
index 0a547a589642f01d6a94fabdb437f753ca520583..7f4b6bd0366760187cfc55323bd4ac505e8e00a7 100644 (file)
--- a/templates/CRM/Contribute/Form/Contribution/ThankYou.tpl
+++ b/templates/CRM/Contribute/Form/Contribution/ThankYou.tpl
@@ -200,7 +200,7 @@
 
   {if $onbehalfProfile && $onbehalfProfile|@count}
     <div class="crm-group onBehalf_display-group label-left crm-profile-view">
-      {include file="CRM/UF/Form/Block.tpl" fields=$onbehalfProfile prefix='onbehalf'}
+      {include file="CRM/UF/Form/Block.tpl" fields=$onbehalfProfile prefix='onbehalf' hideFieldset=false}
      </div>
   {/if}
 
@@ -212,7 +212,7 @@
       <div class="display-block">
        <div class="label-left crm-section honoree_profile-section">
           <strong>{$honorName}</strong><br/>
-          {include file="CRM/UF/Form/Block.tpl" fields=$honoreeProfileFields prefix='honor'}
+          {include file="CRM/UF/Form/Block.tpl" fields=$honoreeProfileFields prefix='honor' hideFieldset=false}
         </div>
       </div>
    </div>
@@ -220,7 +220,7 @@
 
   {if $customPre}
     <fieldset class="label-left crm-profile-view">
-      {include file="CRM/UF/Form/Block.tpl" fields=$customPre prefix=false}
+      {include file="CRM/UF/Form/Block.tpl" fields=$customPre prefix=false hideFieldset=false}
     </fieldset>
   {/if}
 
@@ -304,7 +304,7 @@
 
   {if $customPost}
     <fieldset class="label-left crm-profile-view">
-      {include file="CRM/UF/Form/Block.tpl" fields=$customPost prefix=false}
+      {include file="CRM/UF/Form/Block.tpl" fields=$customPost prefix=false hideFieldset=false}
     </fieldset>
   {/if}
 

diff --git a/templates/CRM/Contribute/Form/PCP/PCPAccount.tpl b/templates/CRM/Contribute/Form/PCP/PCPAccount.tpl
index a9c661352425d1b83c80038cea3213c9457a8de5..66af240594e41e2d12457c8a2ef82493127d06f0 100644 (file)
--- a/templates/CRM/Contribute/Form/PCP/PCPAccount.tpl
+++ b/templates/CRM/Contribute/Form/PCP/PCPAccount.tpl
@@ -22,7 +22,7 @@
 {else}
 <div class="form-item">
 {include file="CRM/common/CMSUser.tpl"}
-{include file="CRM/UF/Form/Block.tpl" fields=$fields prefix=false}
+{include file="CRM/UF/Form/Block.tpl" fields=$fields prefix=false hideFieldset=false}
 </div>
 <div class="crm-submit-buttons">
 {include file="CRM/common/formButtons.tpl" location="bottom"}

diff --git a/templates/CRM/Event/Form/Registration/AdditionalParticipant.tpl b/templates/CRM/Event/Form/Registration/AdditionalParticipant.tpl
index afa1cc2568713f7725a8b7fcfbddd4b02759569a..b9c9ca0306fd7c944bdd0ff31580907c269676f9 100644 (file)
--- a/templates/CRM/Event/Form/Registration/AdditionalParticipant.tpl
+++ b/templates/CRM/Event/Form/Registration/AdditionalParticipant.tpl
@@ -22,7 +22,7 @@
 {/if}
 
 <div class="crm-public-form-item crm-section custom_pre-section">
-  {include file="CRM/UF/Form/Block.tpl" fields=$additionalCustomPre prefix=false}
+  {include file="CRM/UF/Form/Block.tpl" fields=$additionalCustomPre prefix=false hideFieldset=false}
 </div>
 
 {if $priceSet && $allowGroupOnWaitlist}
@@ -49,7 +49,7 @@
 {/if}
 
 <div class="crm-public-form-item crm-section custom_post-section">
-  {include file="CRM/UF/Form/Block.tpl" fields=$additionalCustomPost prefix=false}
+  {include file="CRM/UF/Form/Block.tpl" fields=$additionalCustomPost prefix=false hideFieldset=false}
 </div>
 
 <div id="crm-submit-buttons" class="crm-submit-buttons">

diff --git a/templates/CRM/Event/Form/Registration/Register.tpl b/templates/CRM/Event/Form/Registration/Register.tpl
index 12688006ace9e06a2299683a3d6fba9a40578930..496581b3eb526baf36c0c68383666998c3f7e998 100644 (file)
--- a/templates/CRM/Event/Form/Registration/Register.tpl
+++ b/templates/CRM/Event/Form/Registration/Register.tpl
@@ -73,7 +73,7 @@
 
     <div class="crm-public-form-item crm-section custom_pre-section">
       {* Display "Top of page" profile immediately after the introductory text *}
-      {include file="CRM/UF/Form/Block.tpl" fields=$customPre prefix=false}
+      {include file="CRM/UF/Form/Block.tpl" fields=$customPre prefix=false hideFieldset=false}
     </div>
 
     {if $priceSet}
@@ -135,7 +135,7 @@
     {/if}
 
     <div class="crm-public-form-item crm-section custom_post-section">
-      {include file="CRM/UF/Form/Block.tpl" fields=$customPost prefix=false}
+      {include file="CRM/UF/Form/Block.tpl" fields=$customPost prefix=false hideFieldset=false}
     </div>
 
     <div id="crm-submit-buttons" class="crm-submit-buttons">

diff --git a/templates/CRM/PCP/Form/PCPAccount.tpl b/templates/CRM/PCP/Form/PCPAccount.tpl
index 645cb781cf96df09b1a2425551ac07b016f6a001..1a5ee7d9eb0aa4e719f5963ec38757a202d60998 100644 (file)
--- a/templates/CRM/PCP/Form/PCPAccount.tpl
+++ b/templates/CRM/PCP/Form/PCPAccount.tpl
@@ -26,7 +26,7 @@
 {else}
 <div class="form-item crm-block crm-form-block">
 {include file="CRM/common/CMSUser.tpl"}
-{include file="CRM/UF/Form/Block.tpl" fields=$fields prefix=false}
+{include file="CRM/UF/Form/Block.tpl" fields=$fields prefix=false hideFieldset=false}
 
 <div class="crm-submit-buttons">
 {include file="CRM/common/formButtons.tpl" location="bottom"}

diff --git a/templates/CRM/Profile/Form/Dynamic.tpl b/templates/CRM/Profile/Form/Dynamic.tpl
index 48b749cb2d21dacb831bba3518944fd135c2f0ad..ee21345a4effd047704c6ce348be89093638d0be 100644 (file)
--- a/templates/CRM/Profile/Form/Dynamic.tpl
+++ b/templates/CRM/Profile/Form/Dynamic.tpl
@@ -192,6 +192,7 @@
     {/if}
 
     {if ($action eq 1 and $mode eq 4 ) or ($action eq 2) or ($action eq 8192)}
+      {assign var=floatStyle value=''}
       {if $action eq 2 and $multiRecordFieldListing}
         <div class="crm-multi-record-custom-field-listing">
           {include file="CRM/Profile/Page/MultipleRecordFieldsListing.tpl" showListing=true}

diff --git a/templates/CRM/UF/Form/Block.tpl b/templates/CRM/UF/Form/Block.tpl
index d180968dc967b153d35445ae145808c3f40d3b4a..95fb25c7b3a27b1ffd81d4b0ed11ed824f9d97ee 100644 (file)
--- a/templates/CRM/UF/Form/Block.tpl
+++ b/templates/CRM/UF/Form/Block.tpl
@@ -12,20 +12,36 @@
   {strip}
     {assign var=zeroField value="Initial Non Existent Fieldset"}
     {assign var=fieldset  value=$zeroField}
-    {include file="CRM/UF/Form/Fields.tpl"}
+    {* Unfortunately uF group information is munged into the uf fields array. We have ot iterate throug
+    to extract it. I n future we could migrate to a version of Block.tpl that expects the UFGroup
+    to be assigned by itself & remove this *}
+    {foreach from=$fields item=field key=fieldName}
+      {assign var=groupHelpPost  value=$field.groupHelpPost}
+      {assign var=groupHelpPre  value=$field.groupHelpPre}
+      {assign var=fieldset  value=$field.groupTitle}
+      {assign var=groupDisplayTitle value=$field.groupDisplayTitle}
+      {assign var=group_id value=$field.group_id}
+      {assign var=groupName value=$field.groupName}
+    {/foreach}
 
-    {if $field.groupHelpPost && $action neq 4}
-      <div class="messages help">{$field.groupHelpPost}</div>
+    {if $groupHelpPre && $action neq 4}
+      <div class="messages help">{$groupHelpPre|smarty:nodefaults|purify}</div>
     {/if}
 
-    {if $mode eq 4}
-      <div class="crm-submit-buttons">
-        {$form.buttons.html}
-      </div>
+    {if !$hideFieldset}
+      <fieldset class="crm-profile crm-profile-id-{$group_id} crm-profile-name-{$groupName}"><legend>{$groupDisplayTitle}</legend>
     {/if}
 
-    {if $mode ne 8 && !$hideFieldset}
-    </fieldset>
+    {if ($form.formName eq 'Confirm' OR $form.formName eq 'ThankYou') AND $prefix neq 'honor'}
+      <div class="header-dark">{$groupDisplayTitle} </div>
+    {/if}
+    {include file="CRM/UF/Form/Fields.tpl"}
+
+    {if $groupHelpPost && $action neq 4}
+      <div class="messages help">{$groupHelpPost|smarty:nodefaults|purify}</div>
+    {/if}
+    {if !$hideFieldset}
+      </fieldset>
     {/if}
 
   {/strip}

diff --git a/templates/CRM/UF/Form/Fields.tpl b/templates/CRM/UF/Form/Fields.tpl
index 5937321bd4f0ca8c3d0c5a0bcdf7de220f3c8f0d..b67e61f686948c5d3078fa7e413af0f08db03672 100644 (file)
--- a/templates/CRM/UF/Form/Fields.tpl
+++ b/templates/CRM/UF/Form/Fields.tpl
@@ -12,30 +12,6 @@
     {assign var="rowIdentifier" value=$field.name}
   {/if}
 
-  {if $field.groupTitle != $fieldset}
-    {if $fieldset != $zeroField}
-      {if $groupHelpPost && $action neq 4}
-        <div class="messages help">{$groupHelpPost|smarty:nodefaults|purify}</div>
-      {/if}
-      {if $mode ne 8}
-        </fieldset>
-      {/if}
-    {/if}
-
-    {if !$hideFieldset}
-      <fieldset class="crm-profile crm-profile-id-{$field.group_id} crm-profile-name-{$field.groupName}"><legend>{$field.groupDisplayTitle}</legend>
-    {/if}
-
-    {if ($form.formName eq 'Confirm' OR $form.formName eq 'ThankYou') AND $prefix neq 'honor'}
-      <div class="header-dark">{$field.groupDisplayTitle} </div>
-    {/if}
-    {assign var=fieldset  value=`$field.groupTitle`}
-    {assign var=groupHelpPost  value=`$field.groupHelpPost`}
-    {if $field.groupHelpPre && $action neq 4}
-      <div class="messages help">{$field.groupHelpPre|smarty:nodefaults|purify}</div>
-    {/if}
-  {/if}
-
   {if $field.field_type eq "Formatting"}
     {if $action neq 4}
       {$field.help_pre}