From 9019f75a25f2c4da9f44875979f56528bf1bc765 Mon Sep 17 00:00:00 2001
From: Seamus Lee <seamuslee001@gmail.com>
Date: Mon, 7 Jun 2021 04:35:52 +0000
Subject: [PATCH] [php8-compat][REF] Fix Case and Custom data tests by adding
 guards into templates

---
 templates/CRM/Activity/Form/Activity.tpl             | 12 ++++++------
 .../CRM/Campaign/Form/addCampaignToComponent.tpl     |  2 +-
 templates/CRM/Custom/Form/CustomData.tpl             |  8 ++++++--
 templates/CRM/Custom/Form/Edit/CustomField.tpl       |  8 ++++----
 .../CRM/Event/Form/ManageEvent/ConfirmRepeatMode.tpl |  2 +-
 templates/CRM/Form/attachmentjs.tpl                  |  2 +-
 templates/CRM/common/formButtons.tpl                 |  2 +-
 .../message_templates/case_activity_html.tpl         |  4 ++--
 .../message_templates/case_activity_subject.tpl      |  2 +-
 .../message_templates/case_activity_text.tpl         |  6 +++---
 10 files changed, 26 insertions(+), 22 deletions(-)

diff --git a/templates/CRM/Activity/Form/Activity.tpl b/templates/CRM/Activity/Form/Activity.tpl
index a6f20a3450..9814055fcd 100644
--- a/templates/CRM/Activity/Form/Activity.tpl
+++ b/templates/CRM/Activity/Form/Activity.tpl
@@ -63,7 +63,7 @@
     </td>
   </tr>
 
-  {if $form.separation}
+  {if !empty($form.separation)}
     <tr class="crm-activity-form-block-separation crm-is-multi-activity-wrapper">
       <td class="label">{$form.separation.label}</td>
       <td>{$form.separation.html} {help id="separation"}</td>
@@ -91,7 +91,7 @@
       </td>
   </tr>
 
-  {if $activityTypeFile}
+  {if !empty($activityTypeFile)}
   {include file="CRM/$crmDir/Form/Activity/$activityTypeFile.tpl"}
   {/if}
 
@@ -104,7 +104,7 @@
   campaignTrClass="crm-activity-form-block-campaign_id"}
 
   {* build engagement level CRM-7775 *}
-  {if $buildEngagementLevel}
+  {if !empty($buildEngagementLevel)}
   <tr class="crm-activity-form-block-engagement_level">
     <td class="label">{$form.engagement_level.label}</td>
     <td class="view-value">{$form.engagement_level.html}</td>
@@ -151,12 +151,12 @@
   <tr class="crm-activity-form-block-priority_id">
     <td class="label">{$form.priority_id.label}</td><td class="view-value">{$form.priority_id.html}</td>
   </tr>
-  {if $surveyActivity }
+  {if !empty($surveyActivity) }
   <tr class="crm-activity-form-block-result">
     <td class="label">{$form.result.label}</td><td class="view-value">{$form.result.html}</td>
   </tr>
   {/if}
-  {if $form.tag.html}
+  {if !empty($form.tag.html)}
   <tr class="crm-activity-form-block-tag">
     <td class="label">{$form.tag.label}</td>
     <td class="view-value">
@@ -165,7 +165,7 @@
   </tr>
   {/if}
 
-  {if $tagsetInfo.activity}
+  {if !empty($tagsetInfo.activity)}
     <tr class="crm-activity-form-block-tag_set">
       {include file="CRM/common/Tagset.tpl" tagsetType='activity' tableLayout=true}
     </tr>
diff --git a/templates/CRM/Campaign/Form/addCampaignToComponent.tpl b/templates/CRM/Campaign/Form/addCampaignToComponent.tpl
index 90f7b88172..791817b462 100644
--- a/templates/CRM/Campaign/Form/addCampaignToComponent.tpl
+++ b/templates/CRM/Campaign/Form/addCampaignToComponent.tpl
@@ -1,6 +1,6 @@
 {* add campaigns to various components CRM-7362 *}
 
-{if $campaignContext eq 'componentSearch'}
+{if isset($campaignContext) and $campaignContext eq 'componentSearch'}
 
   {* add campaign in component search *}
   <tr class="{$campaignTrClass}">
diff --git a/templates/CRM/Custom/Form/CustomData.tpl b/templates/CRM/Custom/Form/CustomData.tpl
index 8737f0b767..1a624a31a8 100644
--- a/templates/CRM/Custom/Form/CustomData.tpl
+++ b/templates/CRM/Custom/Form/CustomData.tpl
@@ -8,7 +8,7 @@
  +--------------------------------------------------------------------+
 *}
 {* Custom Data form*}
-{if $formEdit}
+{if !empty($formEdit)}
   {include file="CRM/Custom/Form/Edit/CustomData.tpl" customDataEntity=''}
 {else}
   {foreach from=$groupTree item=cd_edit key=group_id name=custom_sets}
@@ -34,7 +34,11 @@
       </div>
      </div>
     {/if}
-    <div id="custom_group_{$group_id}_{$cgCount}"></div>
+    {if isset($cgCount)}
+      <div id="custom_group_{$group_id}_{$cgCount}"></div>
+    {else}
+      <div id="custom_group_{$group_id}"></div>
+    {/if}
   {/foreach}
 
 {/if}
diff --git a/templates/CRM/Custom/Form/Edit/CustomField.tpl b/templates/CRM/Custom/Form/Edit/CustomField.tpl
index 7d04c4da0a..7acd1de052 100644
--- a/templates/CRM/Custom/Form/Edit/CustomField.tpl
+++ b/templates/CRM/Custom/Form/Edit/CustomField.tpl
@@ -8,16 +8,16 @@
  +--------------------------------------------------------------------+
 *}
 
-{if $element.help_pre}
+{if !empty($element.help_pre)}
   <tr class="custom_field-help-pre-row {$element.element_name}-row-help-pre">
     <td>&nbsp;</td>
     <td class="html-adjust description">{$element.help_pre}</td>
   </tr>
 {/if}
-{if $element.options_per_line != 0 }
+{if isset($element.options_per_line) and $element.options_per_line != 0 }
   <tr class="custom_field-row {$element.element_name}-row">
     <td
-      class="label">{$formElement.label}{if $element.help_post}{help id=$element.id file="CRM/Custom/Form/CustomField.hlp" title=$element.label}{/if}</td>
+      class="label">{$formElement.label}{if !empty($element.help_post)}{help id=$element.id file="CRM/Custom/Form/CustomField.hlp" title=$element.label}{/if}</td>
     <td class="html-adjust">
       {assign var="count" value="1"}
       <table class="form-layout-compressed" style="margin-top: -0.5em;">
@@ -45,7 +45,7 @@
 {else}
   <tr class="custom_field-row {$element.element_name}-row">
     <td class="label">{$formElement.label}
-      {if $element.help_post}{help id=$element.id file="CRM/Custom/Form/CustomField.hlp" title=$element.label}{/if}
+      {if !empty($element.help_post)}{help id=$element.id file="CRM/Custom/Form/CustomField.hlp" title=$element.label}{/if}
     </td>
     <td class="html-adjust">
       {$formElement.html}&nbsp;
diff --git a/templates/CRM/Event/Form/ManageEvent/ConfirmRepeatMode.tpl b/templates/CRM/Event/Form/ManageEvent/ConfirmRepeatMode.tpl
index 8d48983cc5..4c71289d8b 100644
--- a/templates/CRM/Event/Form/ManageEvent/ConfirmRepeatMode.tpl
+++ b/templates/CRM/Event/Form/ManageEvent/ConfirmRepeatMode.tpl
@@ -7,7 +7,7 @@
  | and copyright information, see https://civicrm.org/licensing       |
  +--------------------------------------------------------------------+
 *}
-{if $hasParent || $isRepeatingEntity || $scheduleReminderId}
+{if !empty($hasParent) || !empty($isRepeatingEntity) || !empty($scheduleReminderId)}
   {capture assign='entity_type'}{$recurringEntityType|lower}{/capture}
   <script type="text/template" id="recurring-dialog-tpl">
     <div class="recurring-dialog">
diff --git a/templates/CRM/Form/attachmentjs.tpl b/templates/CRM/Form/attachmentjs.tpl
index 378aaf1919..1734fff151 100644
--- a/templates/CRM/Form/attachmentjs.tpl
+++ b/templates/CRM/Form/attachmentjs.tpl
@@ -15,7 +15,7 @@
         request.done(function() {
           $el.trigger('crmPopupFormSuccess');
           $row.remove();
-          {/literal}{if $context EQ 'MessageTemplate'}{literal}
+          {/literal}{if isset($context) and $context EQ 'MessageTemplate'}{literal}
             $('#file_id').show();
           {/literal}{/if}{literal}
         });
diff --git a/templates/CRM/common/formButtons.tpl b/templates/CRM/common/formButtons.tpl
index 355abcadc6..cd1fd010d9 100644
--- a/templates/CRM/common/formButtons.tpl
+++ b/templates/CRM/common/formButtons.tpl
@@ -10,7 +10,7 @@
 
 {crmRegion name='form-buttons'}
 {* Loops through $linkButtons and assigns html "a" (link) buttons to the template. Used for additional entity functions such as "Move to Case" or "Renew Membership" *}
-{if $linkButtons}
+{if !empty($linkButtons)}
   {foreach from=$linkButtons item=linkButton}
     {if $linkButton.accessKey}
       {capture assign=accessKey}accesskey="{$linkButton.accessKey}"{/capture}
diff --git a/xml/templates/message_templates/case_activity_html.tpl b/xml/templates/message_templates/case_activity_html.tpl
index d430b2c724..c770e03878 100644
--- a/xml/templates/message_templates/case_activity_html.tpl
+++ b/xml/templates/message_templates/case_activity_html.tpl
@@ -27,7 +27,7 @@
        {ts}Activity Summary{/ts} - {$activityTypeName}
       </th>
      </tr>
-     {if $isCaseActivity}
+     {if !empty($isCaseActivity)}
       <tr>
        <td {$labelStyle}>
         {ts}Your Case Role(s){/ts}
@@ -61,7 +61,7 @@
      {foreach from=$activity.fields item=field}
       <tr>
        <td {$labelStyle}>
-        {$field.label}{if $field.category}({$field.category}){/if}
+        {$field.label}{if !empty($field.category)}({$field.category}){/if}
        </td>
        <td {$valueStyle}>
         {if $field.type eq 'Date'}
diff --git a/xml/templates/message_templates/case_activity_subject.tpl b/xml/templates/message_templates/case_activity_subject.tpl
index bad8753838..32a57304bb 100644
--- a/xml/templates/message_templates/case_activity_subject.tpl
+++ b/xml/templates/message_templates/case_activity_subject.tpl
@@ -1 +1 @@
-{if $idHash}[case #{$idHash}]{/if} {$activitySubject}
+{if !empty($idHash)}[case #{$idHash}]{/if} {$activitySubject}
diff --git a/xml/templates/message_templates/case_activity_text.tpl b/xml/templates/message_templates/case_activity_text.tpl
index 0bfa04a85b..715dbd3740 100644
--- a/xml/templates/message_templates/case_activity_text.tpl
+++ b/xml/templates/message_templates/case_activity_text.tpl
@@ -1,7 +1,7 @@
 ===========================================================
 {ts}Activity Summary{/ts} - {$activityTypeName}
 ===========================================================
-{if $isCaseActivity}
+{if !empty($isCaseActivity)}
 {ts}Your Case Role(s){/ts} : {$contact.role}
 {if $manageCaseURL}
 {ts}Manage Case{/ts} : {$manageCaseURL}
@@ -17,9 +17,9 @@
 
 {foreach from=$activity.fields item=field}
 {if $field.type eq 'Date'}
-{$field.label}{if $field.category}({$field.category}){/if} : {$field.value|crmDate:$config->dateformatDatetime}
+{$field.label}{if !empty($field.category)}({$field.category}){/if} : {$field.value|crmDate:$config->dateformatDatetime}
 {else}
-{$field.label}{if $field.category}({$field.category}){/if} : {$field.value}
+{$field.label}{if !empty($field.category)}({$field.category}){/if} : {$field.value}
 {/if}
 {/foreach}
 
-- 
2.25.1