From 56a2d8107e9ea77700e05041bc2e6b5e81902f98 Mon Sep 17 00:00:00 2001
From: kheldorn <narutards+github@hotmail.com>
Date: Wed, 6 Jan 2021 11:28:02 +0100
Subject: [PATCH] Update New-ToastNotification.ps1

Found an application with the InstallState "NotUpdated" where the custom protocol "ToastRunApplicationID:" would not start the installation process.
---
 New-ToastNotification.ps1 | 57 ++++++++++++++++++++-------------------
 1 file changed, 29 insertions(+), 28 deletions(-)

diff --git a/New-ToastNotification.ps1 b/New-ToastNotification.ps1
index 5ebd36c..901ae03 100644
--- a/New-ToastNotification.ps1
+++ b/New-ToastNotification.ps1
@@ -82,18 +82,18 @@
               ** As well as added support for dynamic deadline retrieval for software updates **
               ** Stuff has been rewritten to suit my understanding and thoughts of the script **
 
-    2.0.0 -   Huge changes to how this script handles custom protocols
-              Added Support for Custom Actions/Protocols within the script under user context removing the need for that to be run under SYSTEM/ADMIN
-                - <Option Name="Action" Value="ToastRunUpdateID:" />
-                - <Option Name="Action" Value="ToastRunPackageID:" />
-                - <Option Name="Action" Value="ToastRunApplicationID:" />
-                - <Option Name="Action" Value="ToastReboot:" />
-              Added Support to dynamically create Custom Action Scripts to support Custom Protocols
-              Added Support for Software (Feature) Updates : Searches for an update and will store in variable
-              Added new XML Types for Software Updates:
-                - <Option Name="RunUpdateID" Enabled="True" Value="3012973" />
-                - <Option Name="RunUpdateTitle" Enabled="True" Value="Version 1909" />
-              Added support for getting deadline date/time dynamically for software updates
+    2.0.0 -   Huge changes to how this script handles custom protocols
+              Added Support for Custom Actions/Protocols within the script under user context removing the need for that to be run under SYSTEM/ADMIN
+                - <Option Name="Action" Value="ToastRunUpdateID:" />
+                - <Option Name="Action" Value="ToastRunPackageID:" />
+                - <Option Name="Action" Value="ToastRunApplicationID:" />
+                - <Option Name="Action" Value="ToastReboot:" />
+              Added Support to dynamically create Custom Action Scripts to support Custom Protocols
+              Added Support for Software (Feature) Updates : Searches for an update and will store in variable
+              Added new XML Types for Software Updates:
+                - <Option Name="RunUpdateID" Enabled="True" Value="3012973" />
+                - <Option Name="RunUpdateTitle" Enabled="True" Value="Version 1909" />
+              Added support for getting deadline date/time dynamically for software updates
                 - Configure DynamicDeadline with the UpdateID
 
     2.0.1 -   Updated custom action scripts!
@@ -106,7 +106,7 @@
                     - If newer version is available from the script, new custom action scripts will be created
                         - This allows me to make sure the relevant scripts are in place in case I change something along the way
                 - Modified script output of custom script for RunPackageID to pick up Program ID dynamically
-              Added support for getting deadline date/time dynamically for applications
+              Added support for getting deadline date/time dynamically for applications
                 - Configure DynamicDeadline with the Application ID
 
     2.0.2 -   Fixed an error in the custom protocols
@@ -267,21 +267,21 @@ function Get-GivenName() {
         if (Get-Service -Name ccmexec -ErrorAction SilentlyContinue) {
             Write-Log -Message "Looking for logged on user's SID in WMI with CCM client"
             $LoggedOnSID = Get-CimInstance -Namespace ROOT\CCM -Class CCM_UserLogonEvents -Filter "LogoffTime=null" | Select -ExpandProperty UserSID
-            if ($LoggedOnSID.GetType().IsArray) {
-                Write-Log -Message "Multiple SID's found logged on. Skipping"
-                $GivenName = $null
+            if ($LoggedOnSID.GetType().IsArray) {
+                Write-Log -Message "Multiple SID's found logged on. Skipping"
+                $GivenName = $null
             }
-            else {
-	            $RegKey = "HKLM:\SOFTWARE\Microsoft\Windows\CurrentVersion\Authentication\LogonUI\SessionData"
-	            $DisplayName = (Get-ChildItem -Path $RegKey | Where-Object {$_.GetValue("LoggedOnUserSID") -eq $LoggedOnSID} | Select-Object -First 1).GetValue("LoggedOnDisplayName")
-		        if ($DisplayName) {
-                    $GivenName = $DisplayName.Split()[0].Trim()
-                    Write-Log -Message "Given name found matching logged on user SID: $GivenName"
-			        $GivenName
-		        }
-		        else {
-			        $GivenName = $null
-		        }
+            else {
+	            $RegKey = "HKLM:\SOFTWARE\Microsoft\Windows\CurrentVersion\Authentication\LogonUI\SessionData"
+	            $DisplayName = (Get-ChildItem -Path $RegKey | Where-Object {$_.GetValue("LoggedOnUserSID") -eq $LoggedOnSID} | Select-Object -First 1).GetValue("LoggedOnDisplayName")
+		        if ($DisplayName) {
+                    $GivenName = $DisplayName.Split()[0].Trim()
+                    Write-Log -Message "Given name found matching logged on user SID: $GivenName"
+			        $GivenName
+		        }
+		        else {
+			        $GivenName = $null
+		        }
             }
         }
     }
@@ -1090,6 +1090,7 @@ $AppArguments = @{
 }
 if (-NOT[string]::IsNullOrEmpty($TestApplicationID)) {
     if ($TestApplicationID.InstallState -eq "NotInstalled") { Invoke-CimMethod -Namespace "ROOT\ccm\clientSDK" -ClassName CCM_Application -MethodName Install -Arguments $AppArguments }
+    elseif ($TestApplicationID.InstallState -eq "NotUpdated") { Invoke-CimMethod -Namespace "ROOT\ccm\clientSDK" -ClassName CCM_Application -MethodName Install -Arguments $AppArguments }
     elseif ($TestApplicationID.InstallState -eq "Installed") { Invoke-CimMethod -Namespace "ROOT\ccm\clientSDK" -ClassName CCM_Application -MethodName Repair -Arguments $AppArguments }
     if (Test-Path -Path "$env:windir\CCM\ClientUX\SCClient.exe") { Start-Process -FilePath "$env:windir\CCM\ClientUX\SCClient.exe" -ArgumentList "SoftwareCenter:Page=InstallationStatus" -WindowStyle Maximized }
 }
@@ -2115,4 +2116,4 @@ if (($UpgradeOS -ne "True") -AND ($PendingRebootCheck -ne "True") -AND ($Pending
 }
 else {
     Write-Log -Level Warn -Message "Conditions for displaying default toast notification are not fulfilled"
-}
\ No newline at end of file
+}