From 84bf9bb62cd9ac68c8abe2044676b8773509656e Mon Sep 17 00:00:00 2001 From: Eileen McNaughton Date: Mon, 18 Sep 2023 17:37:31 +1200 Subject: [PATCH] php8.x Fix notices on displaying FieldSet --- CRM/Profile/Form.php | 1 + .../Event/Cart/Form/Checkout/Participant.tpl | 4 +-- .../Contribute/Form/Contribution/Confirm.tpl | 8 ++--- .../CRM/Contribute/Form/Contribution/Main.tpl | 6 ++-- .../Form/Contribution/OnBehalfOf.tpl | 2 +- .../Contribute/Form/Contribution/ThankYou.tpl | 8 ++--- .../CRM/Contribute/Form/PCP/PCPAccount.tpl | 2 +- .../Registration/AdditionalParticipant.tpl | 4 +-- .../CRM/Event/Form/Registration/Register.tpl | 4 +-- templates/CRM/PCP/Form/PCPAccount.tpl | 2 +- templates/CRM/Profile/Form/Dynamic.tpl | 1 + templates/CRM/UF/Form/Block.tpl | 34 ++++++++++++++----- templates/CRM/UF/Form/Fields.tpl | 24 ------------- 13 files changed, 47 insertions(+), 53 deletions(-) diff --git a/CRM/Profile/Form.php b/CRM/Profile/Form.php index 247f41705b..80605866ec 100644 --- 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 7f6ef84078..28cf5eb167 100644 --- 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 @@
{assign var=pre value="event[`$event_id`][participant][`$participant_id`][customPre]"}
- {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}
@@ -23,7 +23,7 @@ {assign var=post value="event[`$event_id`][participant][`$participant_id`][customPost]"}
- {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}
diff --git a/templates/CRM/Contribute/Form/Contribution/Confirm.tpl b/templates/CRM/Contribute/Form/Contribution/Confirm.tpl index a9972e56d9..5b13d71471 100644 --- a/templates/CRM/Contribute/Form/Contribution/Confirm.tpl +++ b/templates/CRM/Contribute/Form/Contribution/Confirm.tpl @@ -153,7 +153,7 @@ {if $onbehalfProfile && $onbehalfProfile|@count}
- {include file="CRM/UF/Form/Block.tpl" fields=$onbehalfProfile prefix='onbehalf'} + {include file="CRM/UF/Form/Block.tpl" fields=$onbehalfProfile prefix='onbehalf' hideFieldset=false}
{/if} @@ -165,7 +165,7 @@
{$honorName}
- {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}
@@ -173,7 +173,7 @@ {if $customPre}
- {include file="CRM/UF/Form/Block.tpl" fields=$customPre prefix=false} + {include file="CRM/UF/Form/Block.tpl" fields=$customPre prefix=false hideFieldset=false}
{/if} @@ -272,7 +272,7 @@ {if $customPost}
- {include file="CRM/UF/Form/Block.tpl" fields=$customPost prefix=false} + {include file="CRM/UF/Form/Block.tpl" fields=$customPost prefix=false hideFieldset=false}
{/if} diff --git a/templates/CRM/Contribute/Form/Contribution/Main.tpl b/templates/CRM/Contribute/Form/Contribution/Main.tpl index 3eb4ea7441..312aade9cd 100644 --- a/templates/CRM/Contribute/Form/Contribution/Main.tpl +++ b/templates/CRM/Contribute/Form/Contribution/Main.tpl @@ -208,13 +208,13 @@ {/if} {/crmRegion}
- {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}
{/if}
- {include file="CRM/UF/Form/Block.tpl" fields=$customPre prefix=false} + {include file="CRM/UF/Form/Block.tpl" fields=$customPre prefix=false hideFieldset=false}
{if array_key_exists('pcp_display_in_roll', $form)} @@ -283,7 +283,7 @@ {include file="CRM/Core/BillingBlockWrapper.tpl"}
- {include file="CRM/UF/Form/Block.tpl" fields=$customPost prefix=false} + {include file="CRM/UF/Form/Block.tpl" fields=$customPost prefix=false hideFieldset=false}
diff --git a/templates/CRM/Contribute/Form/Contribution/OnBehalfOf.tpl b/templates/CRM/Contribute/Form/Contribution/OnBehalfOf.tpl index 73e8d98b03..61bb569467 100644 --- a/templates/CRM/Contribute/Form/Contribution/OnBehalfOf.tpl +++ b/templates/CRM/Contribute/Form/Contribution/OnBehalfOf.tpl @@ -35,7 +35,7 @@
{/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} {/if} {/crmRegion} diff --git a/templates/CRM/Contribute/Form/Contribution/ThankYou.tpl b/templates/CRM/Contribute/Form/Contribution/ThankYou.tpl index 0a547a5896..7f4b6bd036 100644 --- a/templates/CRM/Contribute/Form/Contribution/ThankYou.tpl +++ b/templates/CRM/Contribute/Form/Contribution/ThankYou.tpl @@ -200,7 +200,7 @@ {if $onbehalfProfile && $onbehalfProfile|@count}
- {include file="CRM/UF/Form/Block.tpl" fields=$onbehalfProfile prefix='onbehalf'} + {include file="CRM/UF/Form/Block.tpl" fields=$onbehalfProfile prefix='onbehalf' hideFieldset=false}
{/if} @@ -212,7 +212,7 @@
{$honorName}
- {include file="CRM/UF/Form/Block.tpl" fields=$honoreeProfileFields prefix='honor'} + {include file="CRM/UF/Form/Block.tpl" fields=$honoreeProfileFields prefix='honor' hideFieldset=false}
@@ -220,7 +220,7 @@ {if $customPre}
- {include file="CRM/UF/Form/Block.tpl" fields=$customPre prefix=false} + {include file="CRM/UF/Form/Block.tpl" fields=$customPre prefix=false hideFieldset=false}
{/if} @@ -304,7 +304,7 @@ {if $customPost}
- {include file="CRM/UF/Form/Block.tpl" fields=$customPost prefix=false} + {include file="CRM/UF/Form/Block.tpl" fields=$customPost prefix=false hideFieldset=false}
{/if} diff --git a/templates/CRM/Contribute/Form/PCP/PCPAccount.tpl b/templates/CRM/Contribute/Form/PCP/PCPAccount.tpl index a9c6613524..66af240594 100644 --- a/templates/CRM/Contribute/Form/PCP/PCPAccount.tpl +++ b/templates/CRM/Contribute/Form/PCP/PCPAccount.tpl @@ -22,7 +22,7 @@ {else}
{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}
{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 afa1cc2568..b9c9ca0306 100644 --- a/templates/CRM/Event/Form/Registration/AdditionalParticipant.tpl +++ b/templates/CRM/Event/Form/Registration/AdditionalParticipant.tpl @@ -22,7 +22,7 @@ {/if}
- {include file="CRM/UF/Form/Block.tpl" fields=$additionalCustomPre prefix=false} + {include file="CRM/UF/Form/Block.tpl" fields=$additionalCustomPre prefix=false hideFieldset=false}
{if $priceSet && $allowGroupOnWaitlist} @@ -49,7 +49,7 @@ {/if}
- {include file="CRM/UF/Form/Block.tpl" fields=$additionalCustomPost prefix=false} + {include file="CRM/UF/Form/Block.tpl" fields=$additionalCustomPost prefix=false hideFieldset=false}
diff --git a/templates/CRM/Event/Form/Registration/Register.tpl b/templates/CRM/Event/Form/Registration/Register.tpl index 12688006ac..496581b3eb 100644 --- a/templates/CRM/Event/Form/Registration/Register.tpl +++ b/templates/CRM/Event/Form/Registration/Register.tpl @@ -73,7 +73,7 @@
{* 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}
{if $priceSet} @@ -135,7 +135,7 @@ {/if}
- {include file="CRM/UF/Form/Block.tpl" fields=$customPost prefix=false} + {include file="CRM/UF/Form/Block.tpl" fields=$customPost prefix=false hideFieldset=false}
diff --git a/templates/CRM/PCP/Form/PCPAccount.tpl b/templates/CRM/PCP/Form/PCPAccount.tpl index 645cb781cf..1a5ee7d9eb 100644 --- a/templates/CRM/PCP/Form/PCPAccount.tpl +++ b/templates/CRM/PCP/Form/PCPAccount.tpl @@ -26,7 +26,7 @@ {else}
{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}
{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 48b749cb2d..ee21345a4e 100644 --- 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}
{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 d180968dc9..95fb25c7b3 100644 --- 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} -
{$field.groupHelpPost}
+ {if $groupHelpPre && $action neq 4} +
{$groupHelpPre|smarty:nodefaults|purify}
{/if} - {if $mode eq 4} -
- {$form.buttons.html} -
+ {if !$hideFieldset} +
{$groupDisplayTitle} {/if} - {if $mode ne 8 && !$hideFieldset} -
+ {if ($form.formName eq 'Confirm' OR $form.formName eq 'ThankYou') AND $prefix neq 'honor'} +
{$groupDisplayTitle}
+ {/if} + {include file="CRM/UF/Form/Fields.tpl"} + + {if $groupHelpPost && $action neq 4} +
{$groupHelpPost|smarty:nodefaults|purify}
+ {/if} + {if !$hideFieldset} + {/if} {/strip} diff --git a/templates/CRM/UF/Form/Fields.tpl b/templates/CRM/UF/Form/Fields.tpl index 5937321bd4..b67e61f686 100644 --- 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} -
{$groupHelpPost|smarty:nodefaults|purify}
- {/if} - {if $mode ne 8} - - {/if} - {/if} - - {if !$hideFieldset} -
{$field.groupDisplayTitle} - {/if} - - {if ($form.formName eq 'Confirm' OR $form.formName eq 'ThankYou') AND $prefix neq 'honor'} -
{$field.groupDisplayTitle}
- {/if} - {assign var=fieldset value=`$field.groupTitle`} - {assign var=groupHelpPost value=`$field.groupHelpPost`} - {if $field.groupHelpPre && $action neq 4} -
{$field.groupHelpPre|smarty:nodefaults|purify}
- {/if} - {/if} - {if $field.field_type eq "Formatting"} {if $action neq 4} {$field.help_pre} -- 2.25.1