Fix IP parsing bug introduced with IW4Parser

Additional fix for Webfront Index OoB on _ClientActivity
RaidMax · Jan 29, 2019 · 271769c · 271769c
1 parent a16df61
commit 271769c
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/Application/Application.csproj b/Application/Application.csproj
@@ -6,7 +6,7 @@
     <RuntimeFrameworkVersion>2.1.5</RuntimeFrameworkVersion>
     <MvcRazorExcludeRefAssembliesFromPublish>false</MvcRazorExcludeRefAssembliesFromPublish>
     <PackageId>RaidMax.IW4MAdmin.Application</PackageId>
-    <Version>2.2.4.0</Version>
+    <Version>2.2.4.1</Version>
     <Authors>RaidMax</Authors>
     <Company>Forever None</Company>
     <Product>IW4MAdmin</Product>
@@ -31,8 +31,8 @@
   <PropertyGroup>
     <ServerGarbageCollection>true</ServerGarbageCollection>
     <TieredCompilation>true</TieredCompilation>
-    <AssemblyVersion>2.2.4.0</AssemblyVersion>
-    <FileVersion>2.2.4.0</FileVersion>
+    <AssemblyVersion>2.2.4.1</AssemblyVersion>
+    <FileVersion>2.2.4.1</FileVersion>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/Application/RconParsers/IW4RConParser.cs b/Application/RconParsers/IW4RConParser.cs
@@ -34,7 +34,7 @@ public IW4RConParser()
             Configuration.Status.GroupMapping.Add(ParserRegex.GroupType.RConPing, 3);
             Configuration.Status.GroupMapping.Add(ParserRegex.GroupType.RConNetworkId, 4);
             Configuration.Status.GroupMapping.Add(ParserRegex.GroupType.RConName, 5);
-            Configuration.Status.GroupMapping.Add(ParserRegex.GroupType.RConIpAddress, 6);
+            Configuration.Status.GroupMapping.Add(ParserRegex.GroupType.RConIpAddress, 7);
         }
 
         public IRConParserConfiguration Configuration { get; set; }

diff --git a/SharedLibraryCore/Utilities.cs b/SharedLibraryCore/Utilities.cs
@@ -482,7 +482,7 @@ public static bool IsPrivileged(this EFClient p)
         /// <returns></returns>
         public static bool PromptBool(string question, string description = null, bool defaultValue = true)
         {
-            Console.Write($"{question}?{(string.IsNullOrEmpty(description) ? "" : $" ({description}) ")}[y/n]: ");
+            Console.Write($"{question}?{(string.IsNullOrEmpty(description) ? " " : $" ({description}) ")}[y/n]: ");
             char response = Console.ReadLine().ToLower().FirstOrDefault();
             return response != 0 ? response == 'y' : defaultValue;
         }

diff --git a/WebfrontCore/ViewComponents/ServerListViewComponent.cs b/WebfrontCore/ViewComponents/ServerListViewComponent.cs
@@ -28,7 +28,7 @@ public IViewComponentResult Invoke()
                     Level = p.Level.ToLocalizedLevelName(),
                     LevelInt = (int)p.Level
                 }).ToList(),
-                ChatHistory = s.ChatHistory,
+                ChatHistory = s.ChatHistory.ToList(),
                 Online = !s.Throttled
             }).ToList();
             return View("_List", serverInfo);