Merge pull request #977 from KelvinTegelaar/dev

[pull] dev from KelvinTegelaar:dev

Author: pull[bot]

Modules/CIPPCore/Public/New-CIPPBackup.ps1

@@ -70,6 +70,14 @@ function New-CIPPBackup {
                         }
                         $Entities | Select-Object * -ExcludeProperty DomainAnalyser, table, Timestamp, ETag, Results | Select-Object *, @{l = 'table'; e = { $CSVTable } }
                     }
+                    # Back up excluded tenant rows (user-configured exclusion state only)
+                    $TenantsTable = Get-CippTable -tablename 'Tenants'
+                    $ExcludedTenants = Get-AzDataTableEntity @TenantsTable -Filter "PartitionKey eq 'Tenants' and Excluded eq true"
+                    if ($ExcludedTenants) {
+                        $CSVfile = @($CSVfile) + @(
+                            $ExcludedTenants | Select-Object PartitionKey, RowKey, customerId, defaultDomainName, displayName, Excluded, ExcludeDate, ExcludeUser | Select-Object *, @{l = 'table'; e = { 'Tenants' } }
+                        )
+                    }
                     $RowKey = 'CIPPBackup' + '_' + (Get-Date).ToString('yyyy-MM-dd-HHmm')
                     $BackupData = [string]($CSVfile | ConvertTo-Json -Compress -Depth 100)
                     $TableName = 'CIPPBackup'

Modules/CIPPStandards/Public/Standards/Invoke-CIPPStandardDeployCheckChromeExtension.ps1

@@ -30,7 +30,6 @@ function Invoke-CIPPStandardDeployCheckChromeExtension {
             {"type":"autoComplete","multiple":true,"creatable":true,"required":false,"freeSolo":true,"name":"standards.DeployCheckChromeExtension.urlAllowlist","label":"URL Allowlist","placeholder":"e.g. https://example.com/*","helperText":"Enter URLs to allowlist in the extension. Press enter to add each URL. Wildcards are allowed. This should be used for sites that are being blocked by the extension but are known to be safe."}
             {"type":"switch","name":"standards.DeployCheckChromeExtension.domainSquattingEnabled","label":"Enable domain squatting detection","defaultValue":true}
             {"type":"textField","name":"standards.DeployCheckChromeExtension.companyName","label":"Company Name","placeholder":"YOUR-COMPANY","required":false}
-            {"type":"textField","name":"standards.DeployCheckChromeExtension.companyURL","label":"Company URL","placeholder":"https://yourcompany.com","required":false}
             {"type":"textField","name":"standards.DeployCheckChromeExtension.productName","label":"Product Name","placeholder":"YOUR-PRODUCT-NAME","required":false}
             {"type":"textField","name":"standards.DeployCheckChromeExtension.supportEmail","label":"Support Email","placeholder":"support@yourcompany.com","required":false}
             {"type":"textField","name":"standards.DeployCheckChromeExtension.supportUrl","label":"Support URL","placeholder":"https://support.yourcompany.com","required":false}
@@ -108,7 +107,7 @@ function Invoke-CIPPStandardDeployCheckChromeExtension {
     $SupportUrl = $Settings.supportUrl ?? ''
     $PrivacyPolicyUrl = $Settings.privacyPolicyUrl ?? ''
     $AboutUrl = $Settings.aboutUrl ?? ''
-    $PrimaryColor = if ($Settings.primaryColor) { $Settings.primaryColor } else { '#F77F00' }
+    $PrimaryColor = if ($Settings.primaryColor) { '#{0}' -f ($Settings.primaryColor -replace '^#+', '') } else { '#F77F00' }
     $LogoUrl = $Settings.logoUrl ?? ''
 
     ##########################################################################