From 52b1e9134733f31f3c8a7bf1bac6a1670f7fd2e8 Mon Sep 17 00:00:00 2001
From: Seamus Lee <seamuslee001@gmail.com>
Date: Tue, 6 Sep 2022 08:59:07 +1000
Subject: [PATCH] [REF] Remove calls to settings from angularjs to php layer to
 assist with less permissioned users using civimail

---
 CRM/Core/Page/AJAX/Attachment.php | 1 +
 CRM/Mailing/Info.php              | 1 +
 ang/crmAttachment.js              | 6 +-----
 ang/crmMailing/EditRecipCtrl.js   | 4 +---
 4 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/CRM/Core/Page/AJAX/Attachment.php b/CRM/Core/Page/AJAX/Attachment.php
index 151b726de8..ec4ebd4fbf 100644
--- a/CRM/Core/Page/AJAX/Attachment.php
+++ b/CRM/Core/Page/AJAX/Attachment.php
@@ -137,6 +137,7 @@ class CRM_Core_Page_AJAX_Attachment {
   public static function angularSettings() {
     return [
       'token' => self::createToken(),
+      'maxFileSize' => Civi::settings()->get('maxFileSize'),
     ];
   }
 
diff --git a/CRM/Mailing/Info.php b/CRM/Mailing/Info.php
index 4894c74c99..e30a0dee84 100644
--- a/CRM/Mailing/Info.php
+++ b/CRM/Mailing/Info.php
@@ -110,6 +110,7 @@ class CRM_Mailing_Info extends CRM_Core_Component_Info {
       'reportIds' => $reportIds,
       'enabledLanguages' => $enabledLanguages,
       'isMultiLingual' => $isMultiLingual,
+      'autoRecipientRebuild' => Civi::settings()->get('auto_recipient_rebuild'),
     ];
     return $crmMailingSettings;
   }
diff --git a/ang/crmAttachment.js b/ang/crmAttachment.js
index 16bb212553..ef104f4154 100644
--- a/ang/crmAttachment.js
+++ b/ang/crmAttachment.js
@@ -156,11 +156,7 @@
         var model = $parse(attr.crmAttachments);
         scope.att = model(scope.$parent);
         scope.ts = CRM.ts(null);
-        CRM.api4('Setting', 'get', {
-          select: ["maxFileSize"]
-        }).then(function(settings) {
-          scope.max_size = settings[0].value;
-        });
+        scope.max_size = CRM.crmAttachment.maxFileSize;
         scope.inclUrl = '~/crmAttachment/attachments.html';
 
         // delay rendering of child tree until after model has been populated
diff --git a/ang/crmMailing/EditRecipCtrl.js b/ang/crmMailing/EditRecipCtrl.js
index 9fca637a73..304b56959e 100644
--- a/ang/crmMailing/EditRecipCtrl.js
+++ b/ang/crmMailing/EditRecipCtrl.js
@@ -73,9 +73,7 @@
     // refresh setting at a duration on 5sec
     var refreshSetting = _.debounce(function() {
       $scope.$apply(function() {
-        crmApi('Setting', 'getvalue', {"name": 'auto_recipient_rebuild', "return": "value"}).then(function(response) {
-          $scope.permitRecipientRebuild = (response.result === 0);
-        });
+        $scope.permitRecipientRebuild = !$scope.$parent.crmMailingConst.autoRecipientRebuild;
       });
     }, SETTING_DEBOUNCE_MS);
     $scope.$watchCollection("permitRecipientRebuild", refreshSetting);
-- 
2.25.1