From 37f927e631aa0f1b02a67d8a15a70639b5c35f45 Mon Sep 17 00:00:00 2001
From: Seamus Lee <seamuslee001@gmail.com>
Date: Mon, 7 Jun 2021 22:21:45 +0000
Subject: [PATCH] [php8-compact] Fix Dashboard Tests by adding in if guards
 into smarty templates

---
 templates/CRM/Case/Form/Search/Common.tpl                     | 4 ++--
 templates/CRM/Contact/Form/GroupContact.tpl                   | 2 +-
 templates/CRM/Contact/Page/View/RelationshipSelector.tpl      | 3 +++
 .../CRM/Contact/Page/View/UserDashBoard/GroupContact.tpl      | 2 +-
 templates/CRM/Contribute/Page/PcpUserDashboard.tpl            | 4 ++--
 templates/CRM/Core/DatePickerRangeWrapper.tpl                 | 2 +-
 templates/CRM/Form/validate.tpl                               | 2 +-
 templates/CRM/Pledge/Page/UserDashboard.tpl                   | 2 +-
 templates/CRM/common/contactFooter.tpl                        | 2 +-
 9 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/templates/CRM/Case/Form/Search/Common.tpl b/templates/CRM/Case/Form/Search/Common.tpl
index a6eb66cbc0..6b5edd73ce 100644
--- a/templates/CRM/Case/Form/Search/Common.tpl
+++ b/templates/CRM/Case/Form/Search/Common.tpl
@@ -48,7 +48,7 @@
       {/if}
     </td>
     <td class="crm-case-common-form-block-case_tags">
-      {if $form.case_tags.html}
+      {if !empty($form.case_tags.html)}
         {$form.case_tags.label}<br />
         {$form.case_tags.html}
       {/if}
@@ -59,7 +59,7 @@
     <td colspan="3">{include file="CRM/common/Tagset.tpl" tagsetType='case'}</td>
   </tr>
 
-  {if $caseGroupTree}
+  {if !empty($caseGroupTree)}
     <tr>
       <td colspan="3">
         {include file="CRM/Custom/Form/Search.tpl" groupTree=$caseGroupTree showHideLinks=false}
diff --git a/templates/CRM/Contact/Form/GroupContact.tpl b/templates/CRM/Contact/Form/GroupContact.tpl
index 8997a1875b..39b9db30f4 100644
--- a/templates/CRM/Contact/Form/GroupContact.tpl
+++ b/templates/CRM/Contact/Form/GroupContact.tpl
@@ -10,6 +10,6 @@
 {* this template is used for adding a contact to a group (from view context) *}
 
 <div class="form-item">
-    {$form.group_id.html} {$form.buttons.html}
+    {if !empty($form.group_id)}{$form.group_id.html}{/if} {if !empty($form.buttons)}{$form.buttons.html}{/if}
     {include file="CRM/Form/validate.tpl"}
 </div>
diff --git a/templates/CRM/Contact/Page/View/RelationshipSelector.tpl b/templates/CRM/Contact/Page/View/RelationshipSelector.tpl
index 04d5b11e44..663b4aa7e0 100644
--- a/templates/CRM/Contact/Page/View/RelationshipSelector.tpl
+++ b/templates/CRM/Contact/Page/View/RelationshipSelector.tpl
@@ -10,6 +10,9 @@
 {* entity selector *}
 {crmRegion name="crm-contact-relationshipselector-pre"}
 {/crmRegion}
+{if !isset($entityInClassFormat)}
+   {assign var="entityInClassFormat" value="relationship"}
+{/if}
 <div class="crm-contact-{$entityInClassFormat}-{$context}">
   <table
     class="crm-contact-{$entityInClassFormat}-selector-{$context} crm-ajax-table"
diff --git a/templates/CRM/Contact/Page/View/UserDashBoard/GroupContact.tpl b/templates/CRM/Contact/Page/View/UserDashBoard/GroupContact.tpl
index 7306c342a0..ab39980a66 100644
--- a/templates/CRM/Contact/Page/View/UserDashBoard/GroupContact.tpl
+++ b/templates/CRM/Contact/Page/View/UserDashBoard/GroupContact.tpl
@@ -7,7 +7,7 @@
  | and copyright information, see https://civicrm.org/licensing       |
  +--------------------------------------------------------------------+
 *}
-{if $userChecksum}
+{if !empty($userChecksum)}
   {assign var=edit value='0'}
 {/if}
 {crmRegion name="crm-contact-userdashboard-groupcontact-pre"}
diff --git a/templates/CRM/Contribute/Page/PcpUserDashboard.tpl b/templates/CRM/Contribute/Page/PcpUserDashboard.tpl
index 43e62b4ebf..60c4752846 100644
--- a/templates/CRM/Contribute/Page/PcpUserDashboard.tpl
+++ b/templates/CRM/Contribute/Page/PcpUserDashboard.tpl
@@ -21,7 +21,7 @@
     <th>{ts}In Support of{/ts}</th>
     <th>{ts}Campaign Ends{/ts}</th>
     <th>{ts}Status{/ts}</th>
-    {if !$userChecksum} <th></th> {/if}
+    {if empty($userChecksum)} <th></th> {/if}
   </tr>
 
   {foreach from=$pcpInfo item=row}
@@ -30,7 +30,7 @@
         <td>{$row.pageTitle}</td>
         <td>{if $row.end_date}{$row.end_date|truncate:10:''|crmDate}{else}({ts}ongoing{/ts}){/if}</td>
         <td>{$row.pcpStatus}</td>
-        {if !$userChecksum}
+        {if empty($userChecksum)}
           <td>{$row.action|replace:'xx':$row.pcpId}</td>
         {/if}
   </tr>
diff --git a/templates/CRM/Core/DatePickerRangeWrapper.tpl b/templates/CRM/Core/DatePickerRangeWrapper.tpl
index 2e6fcb54ad..f43499bd13 100644
--- a/templates/CRM/Core/DatePickerRangeWrapper.tpl
+++ b/templates/CRM/Core/DatePickerRangeWrapper.tpl
@@ -8,7 +8,7 @@
  +--------------------------------------------------------------------+
 *}
 {* Wrapper around DatePickerRange TPL file *}
-<td {if $colspan} colspan="{$colspan}" {else} colspan="2" {/if} {if $class} class="{$class}" {/if}>
+<td {if !empty($colspan)} colspan="{$colspan}" {else} colspan="2" {/if} {if !empty($class)} class="{$class}" {/if}>
   {assign var='hideRelativeLabel' value=$hideRelativeLabel|default:0}
   {assign var='from' value=$from|default:'_low'}
   {assign var='to' value=$to|default:'_high'}
diff --git a/templates/CRM/Form/validate.tpl b/templates/CRM/Form/validate.tpl
index 6212a41bd8..9134e9f761 100644
--- a/templates/CRM/Form/validate.tpl
+++ b/templates/CRM/Form/validate.tpl
@@ -9,7 +9,7 @@
 *}
 {* Initialize jQuery validate on a form *}
 {* Extra params and functions may be added to the CRM.validate object before this template is loaded *}
-{if empty($crm_form_validate_included) and !empty($smarty.get.snippet) and $smarty.get.snippet neq 'json' and !empty($form) and !empty($form.formClass)}
+{if empty($crm_form_validate_included) and isset($smarty.get.snippet) and $smarty.get.snippet neq 'json' and !empty($form) and !empty($form.formClass)}
   {assign var=crm_form_validate_included value=1}
   {literal}
   <script type="text/javascript">
diff --git a/templates/CRM/Pledge/Page/UserDashboard.tpl b/templates/CRM/Pledge/Page/UserDashboard.tpl
index 97ff8596d2..eb15421b49 100644
--- a/templates/CRM/Pledge/Page/UserDashboard.tpl
+++ b/templates/CRM/Pledge/Page/UserDashboard.tpl
@@ -30,7 +30,7 @@
     <td class="crm-pledge-pledge_next_pay_date">{$row.pledge_next_pay_date|truncate:10:''|crmDate}</td>
     <td class="crm-pledge-pledge_next_pay_amount">{$row.pledge_next_pay_amount|crmMoney:$row.pledge_currency}</td>
     <td class="crm-pledge-pledge_status crm-pledge-pledge_status_{$row.pledge_status}">{$row.pledge_status}</td>
-    {if !$userChecksum}
+    {if empty($userChecksum)}
       <td>
         {if $row.pledge_contribution_page_id and ($row.pledge_status_name neq 'Completed') and ( $row.contact_id eq $loggedUserID ) }
           <a href="{crmURL p='civicrm/contribute/transact' q="reset=1&id=`$row.pledge_contribution_page_id`&pledgeId=`$row.pledge_id`"}">{ts}Make Payment{/ts}</a><br/>
diff --git a/templates/CRM/common/contactFooter.tpl b/templates/CRM/common/contactFooter.tpl
index 76eaaae07d..76cc62b511 100644
--- a/templates/CRM/common/contactFooter.tpl
+++ b/templates/CRM/common/contactFooter.tpl
@@ -12,7 +12,7 @@
 <div class="crm-footer" id="crm-record-log">
   <span class="col1">
     {if !empty($external_identifier)}{ts}External ID{/ts}:&nbsp;{$external_identifier}{/if}
-    {if $action NEQ 2}&nbsp; &nbsp;{ts}Contact ID{/ts}:&nbsp;{$contactId}{/if}
+    {if !isset($action) || (isset($action) && $action NEQ 2)}&nbsp; &nbsp;{ts}Contact ID{/ts}:&nbsp;{$contactId}{/if}
   </span>
   {if !empty($lastModified)}
     {ts}Last Change by{/ts}: <a href="{crmURL p='civicrm/contact/view' q="action=view&reset=1&cid=`$lastModified.id`"}">{$lastModified.name}</a> ({$lastModified.date|crmDate}) &nbsp;
-- 
2.25.1