Skip notifying user in hostname

FOGProject · Jul 12, 2015 · a7708ea · a7708ea
1 parent c6ff2cb
commit a7708ea
Show file tree

Hide file tree

Showing 12 changed files with 11 additions and 30 deletions.
diff --git a/Debugger/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/Debugger/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
diff --git a/FOGService.v12.suo b/FOGService.v12.suo
diff --git a/Handlers/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/Handlers/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
diff --git a/Modules/HostnameChanger/HostnameChanger.cs b/Modules/HostnameChanger/HostnameChanger.cs
@@ -33,8 +33,6 @@ namespace FOG.Modules.HostnameChanger
     /// </summary>
     public class HostnameChanger : AbstractModule
     {
-        private bool _notifiedUser;
-
         private readonly Dictionary<int, string> _returnCodes = new Dictionary<int, string>
         {
             {0, "Success"},
@@ -75,7 +73,6 @@ private static extern int NetUnjoinDomain(string lpServer, string lpAccount, str
         public HostnameChanger()
         {
             Name = "HostnameChanger";
-            _notifiedUser = false;
         }
 
         protected override void DoWork()
@@ -118,36 +115,20 @@ private void RenameComputer(Response response)
 
             Log.Entry(Name, string.Format("Renaming host to {0}", response.GetField("#hostname")));
 
-            if (!UserHandler.IsUserLoggedIn() || response.GetField("#force").Equals("1"))
-            {
-                Log.Entry(Name, "Unregistering computer");
-                //First unjoin it from active directory
-                UnRegisterComputer(response);
-
-                Log.Entry(Name, "Updating registry");
-
-                RegistryHandler.SetRegistryValue(@"SYSTEM\CurrentControlSet\Services\Tcpip\Parameters","NV Hostname",
-                    response.GetField("#hostname"));
-                RegistryHandler.SetRegistryValue(@"SYSTEM\CurrentControlSet\Control\ComputerName\ActiveComputerName", "ComputerName",
-                    response.GetField("#hostname"));
-                RegistryHandler.SetRegistryValue(@"SYSTEM\CurrentControlSet\Control\ComputerName\ComputerName", "ComputerName",
-                    response.GetField("#hostname"));
+            Log.Entry(Name, "Unregistering computer");
+            //First unjoin it from active directory
+            UnRegisterComputer(response);
 
-                Power.Restart(RegistryHandler.GetSystemSetting("Company") + " needs to rename your computer", Power.FormOption.Delay);
-            }
-            else if(!_notifiedUser)
-            {
-                Log.Entry(Name, "User is currently logged in, will try again later");
+            Log.Entry(Name, "Updating registry");
 
-                var notification = new Notification("Please log off",
-                    string.Format(
-                        "{0} is attemping to service your computer, please log off at the soonest available time",
-                        RegistryHandler.GetSystemSetting("Company")), 120);
+            RegistryHandler.SetRegistryValue(@"SYSTEM\CurrentControlSet\Services\Tcpip\Parameters","NV Hostname",
+                response.GetField("#hostname"));
+            RegistryHandler.SetRegistryValue(@"SYSTEM\CurrentControlSet\Control\ComputerName\ActiveComputerName", "ComputerName",
+                response.GetField("#hostname"));
+            RegistryHandler.SetRegistryValue(@"SYSTEM\CurrentControlSet\Control\ComputerName\ComputerName", "ComputerName",
+                response.GetField("#hostname"));
 
-                Bus.Emit(Bus.Channel.Notification, notification.GetJson(), true);
-
-                _notifiedUser = true;
-            }
+            Power.Restart(RegistryHandler.GetSystemSetting("Company") + " needs to rename your computer", Power.FormOption.Delay);
         }
 
         //Add a host to active directory

diff --git a/Modules/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/Modules/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
diff --git a/PipeClient/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/PipeClient/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
diff --git a/PipeServer/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/PipeServer/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
diff --git a/Service/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/Service/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
diff --git a/Tray/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/Tray/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
diff --git a/UpdateHelper/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/UpdateHelper/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
diff --git a/UpdateWaiter/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/UpdateWaiter/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
diff --git a/UserService/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/UserService/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache