Merge pull request #26 from VeeamHub/dev

2.0.0.528
VeeamHub · Oct 18, 2024 · d13caf2 · d13caf2
2 parents 50cb6b7 + e5283a6
commit d13caf2
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 68 deletions.
diff --git a/vHC/HC_Reporting/Functions/Collection/CImpersonation.cs b/vHC/HC_Reporting/Functions/Collection/CImpersonation.cs
@@ -51,10 +51,10 @@ private SafeAccessTokenHandle SafeAccessTokenHandle()
             string domainName = CGlobals.REMOTEHOST;
 
             VBRSERVER = domainName;
-            _logger.Info(String.Format("Enter the login of a user on {0} that you wish to impersonate: ", domainName),false);
+            Console.WriteLine(String.Format("Enter the login of a user on {0} that you wish to impersonate: ", domainName),false);
             string userName = Console.ReadLine();
 
-            _logger.Info(String.Format("Enter the password for {0}: ", userName), false);
+            Console.WriteLine(String.Format("Enter the password for {0}: ", userName), false);
 
             const int LOGON32_PROVIDER_DEFAULT = 0;
             //This parameter causes LogonUser to create a primary token.   

diff --git a/vHC/HC_Reporting/Functions/Reporting/Html/Shared/CHtmlFormatting.cs b/vHC/HC_Reporting/Functions/Reporting/Html/Shared/CHtmlFormatting.cs
@@ -30,26 +30,6 @@ public CHtmlFormatting()
         {
 
         }
-        public string DivId(string id)
-        {
-            return string.Format("<div id={0}>", id);
-        }
-        public string h2UnderLine(string text)
-        {
-            return string.Format("<h2><u>{0}</u></h2>", text);
-        }
-
-        public string Button(string displayText)
-        {
-            return string.Format("<button type=\"button\" class=\"collapsible\">{0}</button>", displayText);
-        }
-
-
-        public string HyperLink(string link, string displayText)
-        {
-            string s = string.Format("<a href=\"{0}\" target=\"_blank\">{1}</a>", link, displayText);
-            return s;
-        }
 
         public string LineBreak()
         {
@@ -68,12 +48,7 @@ public string AddA(string classInfo, string displaytext)
             return string.Format("<div class=\"{0}\">{1}</div>", classInfo, displaytext);
         }
 
-        public string BackToTop()
-        {
-            //return string.Format("<button onclick=\"topFunction()\" id=\"myBtn\" title=\"Go to top\">Top</button>");
-            //return string.Format("<a href=\"#top\">Back To Top</a>");
-            return "";
-        }
+
         public string CollapsibleButton(string buttonText)
         {
             return SectionButton(_collapsible, buttonText);

diff --git a/vHC/HC_Reporting/Functions/Reporting/Html/VBR/CVbrSummaries.cs b/vHC/HC_Reporting/Functions/Reporting/Html/VBR/CVbrSummaries.cs
@@ -77,8 +77,7 @@ public string SetVbrSummary()
                 _form.AddA("i2", VbrLocalizationHelper.BkpSrvNotes5) +
                 _form.AddA("i2", VbrLocalizationHelper.BkpSrvNotes6)
                 ;
-            s += _form.LineBreak() +
-               _form.BackToTop();
+            s += _form.LineBreak();
             s += "</div>";
             s += "</div>";
 
@@ -107,7 +106,6 @@ public string SecSum()
                 _form.AddA("i2", VbrLocalizationHelper.SSNote4) +
                _form.LineBreak();
             ;
-            s += _form.BackToTop();
             s += "</div>";
             s += "</div>";
 
@@ -120,9 +118,7 @@ public string SrvSum()
             s += "<div class=\"content\" style=\"display: none\">";
             s += _form.AddA("hdr", VbrLocalizationHelper.GeneralSummaryHeader) + _form.LineBreak() +
                 _form.AddA("i2", VbrLocalizationHelper.MssSum1) +
-                _form.LineBreak() +
-                _form.BackToTop();
-
+                _form.LineBreak();
             s += "</div>";
             s += "</div>";
 
@@ -139,9 +135,7 @@ public string JobSummary()
                 _form.AddA("hdr", VbrLocalizationHelper.GeneralNotesHeader) + _form.LineBreak() +
                 _form.AddA("i2", VbrLocalizationHelper.JobSumNote0) +
                 _form.AddA("i2", VbrLocalizationHelper.JobSumNote1) +
-                _form.LineBreak() +
-                _form.BackToTop()
-                ;
+                _form.LineBreak();
             s += "</div>";
             s += "</div>";
 
@@ -151,8 +145,7 @@ public string MissingJobsSUmmary()
         {
             string s = _form.AddA("hdr", VbrLocalizationHelper.GeneralSummaryHeader) + _form.LineBreak() +
                 _form.AddA("i2", VbrLocalizationHelper.NpSum1) +
-                  _form.LineBreak() +
-                _form.BackToTop();
+                  _form.LineBreak() 
             ;
             s += "</div>";
             s += "</div>";
@@ -168,8 +161,7 @@ public string ProtectedWorkloads()
                 _form.AddA("hdr", VbrLocalizationHelper.GeneralNotesHeader) + _form.LineBreak() +
                 _form.AddA("i2", VbrLocalizationHelper.PlNote1) +
                      _form.LineBreak();
-            _form.BackToTop();
-            ;
+
             s += "</div>";
             s += "</div>";
 
@@ -183,8 +175,7 @@ public string ManagedServers()
                 _form.AddA("hdr", VbrLocalizationHelper.GeneralNotesHeader) + _form.LineBreak() +
                 _form.AddA("i2", VbrLocalizationHelper.ManSrvNote0) +
                 _form.AddA("i2", VbrLocalizationHelper.ManSrvNote1) +
-                  _form.LineBreak() +
-                _form.BackToTop()
+                  _form.LineBreak() 
                 ;
             s += "</div>";
             s += "</div>";
@@ -199,8 +190,7 @@ public string RegKeys()
                 _form.AddA("hdr", VbrLocalizationHelper.GeneralNotesHeader) + _form.LineBreak() +
                 _form.AddA("i2", VbrLocalizationHelper.RegNote0) +
                 _form.AddA("i2", VbrLocalizationHelper.RegNote1) +
-                    _form.LineBreak() +
-                _form.BackToTop()
+                    _form.LineBreak()
                 ;
             s += "</div>";
             s += "</div>";
@@ -232,8 +222,7 @@ public string Proxies()
                 _form.AddA("i2", VbrLocalizationHelper.PrxNote10) +
                 _form.AddA("i2", VbrLocalizationHelper.PrxNote11) +
                 _form.AddA("i2", VbrLocalizationHelper.PrxNote12) +
-                _form.LineBreak() +
-                _form.BackToTop()
+                _form.LineBreak()
                 ;
             s += "</div>";
             s += "</div>";
@@ -254,8 +243,7 @@ public string Sobr()
                 _form.AddA("i2", VbrLocalizationHelper.SbrNote4) +
                 _form.AddA("i2", VbrLocalizationHelper.SbrNote5) +
                 _form.AddA("i2", VbrLocalizationHelper.SbrNote6) +
-                  _form.LineBreak() +
-                _form.BackToTop()
+                  _form.LineBreak() 
                 ;
             s += "</div>";
             s += "</div>";
@@ -286,8 +274,7 @@ public string Extents()
                 _form.AddA("i2", VbrLocalizationHelper.SbrExtNote14) +
                 _form.AddA("i2", VbrLocalizationHelper.SbrExtNote15) +
                 _form.AddA("i2", VbrLocalizationHelper.SbrExtNote16) +
-                  _form.LineBreak() +
-                _form.BackToTop()
+                  _form.LineBreak() 
                 ;
             s += "</div>";
             s += "</div>";
@@ -318,8 +305,7 @@ public string Repos()
                 _form.AddA("i2", VbrLocalizationHelper.SbrExtNote14) +
                 _form.AddA("i2", VbrLocalizationHelper.SbrExtNote15) +
                 _form.AddA("i2", VbrLocalizationHelper.SbrExtNote16) +
-                _form.LineBreak() +
-                _form.BackToTop()
+                _form.LineBreak()
                 ;
             s += "</div>";
             s += "</div>";
@@ -363,8 +349,7 @@ public string JobCon()
                 _form.AddA("i3", VbrLocalizationHelper.JobConNoteSqlTableNote2) +
                 _form.AddA("i3", VbrLocalizationHelper.JobConNoteSqlTableNote3) +
                 _form.AddA("i3", VbrLocalizationHelper.JobConNoteSqlTableNote4) +
-                  _form.LineBreak() +
-                _form.BackToTop()
+                  _form.LineBreak()
                 ;
             s += "</div>";
             s += "</div>";
@@ -378,8 +363,7 @@ public string TaskCon()
                 //  _form.DoubleLineBreak() +
                 _form.AddA("hdr", VbrLocalizationHelper.GeneralNotesHeader) + _form.LineBreak() +
                 _form.AddA("i2", VbrLocalizationHelper.TaskConNote0) +
-                _form.LineBreak() +
-              _form.BackToTop()
+                _form.LineBreak() 
                 ;
             s += "</div>";
             s += "</div>";
@@ -403,8 +387,7 @@ public string JobSessSummary()
                 _form.AddA("i2", VbrLocalizationHelper.JssNote8) +
                 _form.AddA("i2", VbrLocalizationHelper.JssNote9) +
                 _form.AddA("i2", VbrLocalizationHelper.JssNote10) +
-                _form.LineBreak() +
-                _form.BackToTop()
+                _form.LineBreak() 
                 ;
             s += "</div>";
             s += "</div>";
@@ -418,8 +401,7 @@ public string JobInfo()
                 //  _form.DoubleLineBreak() +
                 _form.AddA("hdr", VbrLocalizationHelper.GeneralNotesHeader) + _form.LineBreak() +
                 _form.AddA("i2", VbrLocalizationHelper.JobInfoNote0) +
-                _form.LineBreak() +
-                _form.BackToTop()
+                _form.LineBreak()
                 ;
             s += "</div>";
             s += "</div>";

diff --git a/...C_Reporting/Functions/Reporting/Html/VBR/VbrTables/Job Session Summary/CJobSessSummary.cs b/...C_Reporting/Functions/Reporting/Html/VBR/VbrTables/Job Session Summary/CJobSessSummary.cs
@@ -16,11 +16,8 @@ class CJobSessSummary
     {
         private Dictionary<string, List<TimeSpan>> _waits = new();
         private CLogger log = CGlobals.Logger;
-        private bool _checkLogs;
 
-        private string _xmlFile;
         private CLogger _log;
-        private bool _scrub;
         private Scrubber.CScrubHandler _scrubber;
         private CDataTypesParser _parsers;
 

diff --git a/vHC/HC_Reporting/VeeamHealthCheck.csproj b/vHC/HC_Reporting/VeeamHealthCheck.csproj
@@ -11,10 +11,10 @@
     <Company>Veeam</Company>
     <Authors>AdamC</Authors>
     <ApplicationIcon>Health_Check_Icon.ico</ApplicationIcon>
-    <AssemblyVersion>2.0.0.526</AssemblyVersion>
+    <AssemblyVersion>2.0.0.528</AssemblyVersion>
     <SignAssembly>False</SignAssembly>
     <DelaySign>false</DelaySign>
-    <FileVersion>2.0.0.526</FileVersion>
+    <FileVersion>2.0.0.528</FileVersion>
     <DebugType>full</DebugType>
 	  <SelfContained>true</SelfContained>
 	  <!--These 2 lines are what produce the single file utility. Possibly doesn't work...-->

diff --git a/vHC/VhcXTests/VhcXTests.csproj b/vHC/VhcXTests/VhcXTests.csproj
@@ -7,8 +7,8 @@
 
     <IsPackable>false</IsPackable>
     <IsTestProject>true</IsTestProject>
-    <AssemblyVersion>1.0.0.265</AssemblyVersion>
-    <FileVersion>1.0.0.265</FileVersion>
+    <AssemblyVersion>1.0.0.266</AssemblyVersion>
+    <FileVersion>1.0.0.266</FileVersion>
   </PropertyGroup>
 
   <ItemGroup>