From: Eileen McNaughton <emcnaughton@wikimedia.org>
Date: Tue, 30 Nov 2021 22:13:56 +0000 (+1300)
Subject: [Smarty variables] remove isset from Mail accounts
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=bd3b004dfba6faf2ce64cbd5d5654fa9a80fbab2;p=civicrm-core.git

[Smarty variables] remove isset from Mail accounts

civicrm/admin/mailSettings?reset=1
---

diff --git a/CRM/Admin/Page/MailSettings.php b/CRM/Admin/Page/MailSettings.php
index c3dca8c853..28844d6078 100644
--- a/CRM/Admin/Page/MailSettings.php
+++ b/CRM/Admin/Page/MailSettings.php
@@ -105,7 +105,11 @@ class CRM_Admin_Page_MailSettings extends CRM_Core_Page_Basic {
         $mailSetting->id
       );
     }
-
+    $expectedKeys = ['server', 'username', 'localpart', 'domain', 'return_path', 'protocol', 'source', 'port', 'is_ssl'];
+    foreach ($allMailSettings as $key => $allMailSetting) {
+      // make sure they are there to prevent smarty notices.
+      $allMailSettings[$key] = array_merge(array_fill_keys($expectedKeys, NULL), $allMailSetting);
+    }
     $this->assign('rows', $allMailSettings);
 
     $setupActions = CRM_Core_BAO_MailSettings::getSetupActions();
diff --git a/templates/CRM/Admin/Page/MailSettings.tpl b/templates/CRM/Admin/Page/MailSettings.tpl
index c2ef4b9983..fa655f7636 100644
--- a/templates/CRM/Admin/Page/MailSettings.tpl
+++ b/templates/CRM/Admin/Page/MailSettings.tpl
@@ -34,15 +34,15 @@
         {foreach from=$rows item=row}
           <tr id='rowid{$row.id}' class="crm-mailSettings {cycle values="odd-row,even-row"}">
               <td class="crm-mailSettings-name">{$row.name}</td>
-              <td class="crm-mailSettings-server">{if !empty($row.server)}{$row.server}{/if}</td>
-              <td class="crm-mailSettings-username">{if !empty($row.username)}{$row.username}{/if}</td>
-              <td class="crm-mailSettings-localpart">{if !empty($row.localpart)}{$row.localpart}{/if}</td>
-              <td class="crm-mailSettings-domain">{if !empty($row.domain)}{$row.domain}{/if}</td>
-              <td class="crm-mailSettings-return_path">{if !empty($row.return_path)}{$row.return_path}{/if}</td>
-              <td class="crm-mailSettings-protocol">{if !empty($row.protocol)}{$row.protocol}{/if}</td>
-              <td class="crm-mailSettings-source">{if !empty($row.source)}{$row.source}{/if}</td>
-              <!--<td>{if !empty($row.port)}{$row.port}{/if}</td>-->
-              <td class="crm-mailSettings-is_ssl">{if isset($row.is_ssl) and $row.is_ssl eq 1} {ts}Yes{/ts} {else} {ts}No{/ts} {/if}</td>
+              <td class="crm-mailSettings-server">{$row.server}</td>
+              <td class="crm-mailSettings-username">{$row.username}</td>
+              <td class="crm-mailSettings-localpart">{$row.localpart}</td>
+              <td class="crm-mailSettings-domain">{$row.domain}</td>
+              <td class="crm-mailSettings-return_path">{$row.return_path}</td>
+              <td class="crm-mailSettings-protocol">{$row.protocol}</td>
+              <td class="crm-mailSettings-source">{$row.source}</td>
+              <!--<td>{$row.port}</td>-->
+              <td class="crm-mailSettings-is_ssl">{if $row.is_ssl eq 1} {ts}Yes{/ts} {else} {ts}No{/ts} {/if}</td>
               <td class="crm-mailSettings-is_default">{if $row.is_default eq 1}{ts}Bounce Processing <strong>(Default)</strong>{/ts}{else}{ts}Email-to-Activity{/ts}{/if}&nbsp;</td>
               <td>{$row.action|replace:'xx':$row.id}</td>
           </tr>