Refactor mailbox recipient limits script to improve efficiency and accuracy. Consolidated mailbox plan retrieval and updated filtering logic to ensure only relevant mailboxes are processed based on recipient limits.

Author: Jr7468

Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardMailboxRecipientLimits.ps1

@@ -33,31 +33,29 @@ function Invoke-CIPPStandardMailboxRecipientLimits {
         return
     }
 
-    # Get all mailboxes and their associated mailbox plans in a single batch
+    # Get mailbox plans first
+    $MailboxPlans = New-ExoRequest -tenantid $Tenant -cmdlet 'Get-MailboxPlan' -cmdParams @{ ResultSize = 'Unlimited' }
+
+    # Create a hashtable of mailbox plans for quick lookup
+    $MailboxPlanLookup = @{}
+    foreach ($Plan in $MailboxPlans) {
+        $MailboxPlanLookup[$Plan.Guid] = $Plan
+    }
+
+    # Get mailboxes that need updating (either different from target limit or have "Unlimited" set)
     $Requests = @(
         @{
             CmdletInput = @{
                 CmdletName = 'Get-Mailbox'
-                Parameters = @{ ResultSize = 'Unlimited' }
-            }
-        },
-        @{
-            CmdletInput = @{
-                CmdletName = 'Get-MailboxPlan'
-                Parameters = @{ ResultSize = 'Unlimited' }
+                Parameters = @{
+                    ResultSize = 'Unlimited'
+                    Filter     = "RecipientLimits -ne '$($Settings.RecipientLimit)' -or RecipientLimits -eq 'Unlimited'"
+                }
             }
         }
     )
 
-    $Results = New-ExoBulkRequest -tenantid $Tenant -cmdletArray $Requests
-    $Mailboxes = $Results.GetMailbox
-    $MailboxPlans = $Results.GetMailboxPlan
-
-    # Create a hashtable of mailbox plans for quick lookup
-    $MailboxPlanLookup = @{}
-    foreach ($Plan in $MailboxPlans) {
-        $MailboxPlanLookup[$Plan.Guid] = $Plan
-    }
+    $Mailboxes = New-ExoBulkRequest -tenantid $Tenant -cmdletArray $Requests
 
     # Process mailboxes and categorize them based on their plan limits
     $MailboxResults = $Mailboxes | ForEach-Object {