From 4724745b5e250265c71b954e0dc8fd4146243bc2 Mon Sep 17 00:00:00 2001
From: larssandergreen <lars@wildsight.ca>
Date: Sun, 6 Aug 2023 23:49:20 -0600
Subject: [PATCH] Fix MailSettings add path

---
 CRM/Core/BAO/MailSettings.php                       | 2 +-
 ext/oauth-client/CRM/OAuth/MailSetup.php            | 2 +-
 templates/CRM/Admin/{Page => Form}/MailSettings.hlp | 0
 templates/CRM/Admin/Page/MailSettings.tpl           | 7 +------
 4 files changed, 3 insertions(+), 8 deletions(-)
 rename templates/CRM/Admin/{Page => Form}/MailSettings.hlp (100%)

diff --git a/CRM/Core/BAO/MailSettings.php b/CRM/Core/BAO/MailSettings.php
index 7b13eca108..1519394d03 100644
--- a/CRM/Core/BAO/MailSettings.php
+++ b/CRM/Core/BAO/MailSettings.php
@@ -36,7 +36,7 @@ class CRM_Core_BAO_MailSettings extends CRM_Core_DAO_MailSettings {
 
   public static function setupStandardAccount($setupAction) {
     return [
-      'url' => CRM_Utils_System::url('civicrm/admin/mailSettings', 'action=add&reset=1', TRUE, NULL, FALSE),
+      'url' => CRM_Utils_System::url('civicrm/admin/mailSettings/edit', 'action=add&reset=1', TRUE, NULL, FALSE),
     ];
   }
 
diff --git a/ext/oauth-client/CRM/OAuth/MailSetup.php b/ext/oauth-client/CRM/OAuth/MailSetup.php
index 42442c0a5c..d55f15ebd3 100644
--- a/ext/oauth-client/CRM/OAuth/MailSetup.php
+++ b/ext/oauth-client/CRM/OAuth/MailSetup.php
@@ -90,7 +90,7 @@ class CRM_OAuth_MailSetup {
       'info'
     );
 
-    $nextUrl = CRM_Utils_System::url('civicrm/admin/mailSettings', [
+    $nextUrl = CRM_Utils_System::url('civicrm/admin/mailSettings/edit', [
       'action' => 'update',
       'id' => $mailSettings['id'],
       'reset' => 1,
diff --git a/templates/CRM/Admin/Page/MailSettings.hlp b/templates/CRM/Admin/Form/MailSettings.hlp
similarity index 100%
rename from templates/CRM/Admin/Page/MailSettings.hlp
rename to templates/CRM/Admin/Form/MailSettings.hlp
diff --git a/templates/CRM/Admin/Page/MailSettings.tpl b/templates/CRM/Admin/Page/MailSettings.tpl
index c8a1fdf12b..35aa2cd59b 100644
--- a/templates/CRM/Admin/Page/MailSettings.tpl
+++ b/templates/CRM/Admin/Page/MailSettings.tpl
@@ -7,9 +7,6 @@
  | and copyright information, see https://civicrm.org/licensing       |
  +--------------------------------------------------------------------+
 *}
-{if $action eq 1 or $action eq 2 or $action eq 8}
-   {include file="CRM/Admin/Form/MailSettings.tpl"}
-{else}
 
 <div class="crm-block crm-content-block">
 {if $rows}
@@ -69,12 +66,10 @@
         </form>
     {else}
         <div class="action-link">
-            {crmButton q="action=add&reset=1" id="newMailSettings"  icon="plus-circle"}{ts}Add Mail Account{/ts}{/crmButton}
+            {crmButton p="civicrm/admin/mailSettings/edit" q="action=add&reset=1" id="newMailSettings"  icon="plus-circle"}{ts}Add Mail Account{/ts}{/crmButton}
             {crmButton p="civicrm/admin" q="reset=1" class="cancel" icon="times"}{ts}Done{/ts}{/crmButton}
         </div>
     {/if}
-
-{/if}
 </div>
 {literal}
     <script type="text/javascript">
-- 
2.25.1