Update as per abbodi1406's CAS

No KMS Client info when ADBA is shown

Author: WindowsAddict

MAS/All-In-One-Version-KL/MAS_AIO.cmd

@@ -14965,6 +14965,7 @@ function DetectSubscription {
 function DetectAdbaClient
 {
 $propADBA | foreach { set $_ (SlGetInfoSku $licID $_) }
+DetectActType
 CONOUT "`nAD Activation client information:"
 CONOUT " Object Name: $ADActivationObjectName"
 CONOUT " Domain Name: $ADActivationObjectDN"
@@ -15055,17 +15056,18 @@ function DetectKmsHost
 if ($null -NE $KeyManagementServiceNotificationRequests) {CONOUT " Notification: $KeyManagementServiceNotificationRequests"}
 }
 
-function DetectKmsClient
+function DetectActType
 {
-if ($win8)
-{
-$VLType = strGetRegistry ($SPKeyPath + '\' + $strApp + '\' + $licID) "VLActivationType"
-if ($null -EQ $VLType) {$VLType = strGetRegistry ($SPKeyPath + '\' + $strApp) "VLActivationType"}
-if ($null -EQ $VLType) {$VLType = strGetRegistry ($SPKeyPath) "VLActivationType"}
-if ($null -EQ $VLType -Or $VLType -GT 3) {$VLType = 0}
-}
+$VLType = strGetRegistry ($SPKeyPath + '\' + $strApp + '\' + $licID) "VLActivationType"
+if ($null -EQ $VLType) {$VLType = strGetRegistry ($SPKeyPath + '\' + $strApp) "VLActivationType"}
+if ($null -EQ $VLType) {$VLType = strGetRegistry ($SPKeyPath) "VLActivationType"}
+if ($null -EQ $VLType -Or $VLType -GT 3) {$VLType = 0}
 if ($null -NE $VLType) {CONOUT "Configured Activation Type: $($VLActTypes[$VLType])"}
+}
 
+function DetectKmsClient
+{
+if ($win8) {DetectActType}
 CONOUT "`r"
 if ($LicenseStatus -NE 1) {
 CONOUT "Please activate the product in order to update KMS client information values."
@@ -15313,6 +15315,7 @@ function GetResult($strSLP, $strApp, $entry)
 
 if ($win8 -And $VLActivationType -EQ 1) {
 DetectAdbaClient
+$cKmsClient = $null
 }
 
 if ($winID -And $null -NE $cAvmClient) {

MAS/Separate-Files-Version/Check_Activation_Status.cmd

@@ -518,6 +518,7 @@ function DetectSubscription {
 function DetectAdbaClient
 {
 $propADBA | foreach { set $_ (SlGetInfoSku $licID $_) }
+DetectActType
 CONOUT "`nAD Activation client information:"
 CONOUT " Object Name: $ADActivationObjectName"
 CONOUT " Domain Name: $ADActivationObjectDN"
@@ -608,17 +609,18 @@ function DetectKmsHost
 if ($null -NE $KeyManagementServiceNotificationRequests) {CONOUT " Notification: $KeyManagementServiceNotificationRequests"}
 }
 
-function DetectKmsClient
+function DetectActType
 {
-if ($win8)
-{
-$VLType = strGetRegistry ($SPKeyPath + '\' + $strApp + '\' + $licID) "VLActivationType"
-if ($null -EQ $VLType) {$VLType = strGetRegistry ($SPKeyPath + '\' + $strApp) "VLActivationType"}
-if ($null -EQ $VLType) {$VLType = strGetRegistry ($SPKeyPath) "VLActivationType"}
-if ($null -EQ $VLType -Or $VLType -GT 3) {$VLType = 0}
-}
+$VLType = strGetRegistry ($SPKeyPath + '\' + $strApp + '\' + $licID) "VLActivationType"
+if ($null -EQ $VLType) {$VLType = strGetRegistry ($SPKeyPath + '\' + $strApp) "VLActivationType"}
+if ($null -EQ $VLType) {$VLType = strGetRegistry ($SPKeyPath) "VLActivationType"}
+if ($null -EQ $VLType -Or $VLType -GT 3) {$VLType = 0}
 if ($null -NE $VLType) {CONOUT "Configured Activation Type: $($VLActTypes[$VLType])"}
+}
 
+function DetectKmsClient
+{
+if ($win8) {DetectActType}
 CONOUT "`r"
 if ($LicenseStatus -NE 1) {
 CONOUT "Please activate the product in order to update KMS client information values."
@@ -866,6 +868,7 @@ function GetResult($strSLP, $strApp, $entry)
 
 if ($win8 -And $VLActivationType -EQ 1) {
 DetectAdbaClient
+$cKmsClient = $null
 }
 
 if ($winID -And $null -NE $cAvmClient) {