Merge branch 'developer' into gui

MusicPlayer/MusicPlayer/Main.cs

@@ -121,6 +121,11 @@ namespace MusicPlayer
             {
                 table.Add(s);
             });
+
+            form.GenreListBox.ClearSelected();
+            form.ArtistListBox.ClearSelected();
+            form.PlaylistBox.ClearSelected();
+            form.AlbumListView.SelectedIndices.Clear();
         }
 
         public void SearchArtist(string search)

MusicPlayer/MusicPlayer/MusicPlayer.csproj

@@ -33,6 +33,14 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="AntiXssLibrary, Version=4.3.0.0, Culture=neutral, PublicKeyToken=d127efab8a9c114f, processorArchitecture=MSIL">
+      <HintPath>..\packages\AntiXSS.4.3.0\lib\net40\AntiXssLibrary.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="HtmlSanitizationLibrary, Version=4.3.0.0, Culture=neutral, PublicKeyToken=d127efab8a9c114f, processorArchitecture=MSIL">
+      <HintPath>..\packages\AntiXSS.4.3.0\lib\net40\HtmlSanitizationLibrary.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
     <Reference Include="Newtonsoft.Json, Version=7.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
       <HintPath>..\packages\Newtonsoft.Json.7.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
       <Private>True</Private>

MusicPlayer/MusicPlayer/NetworkHandler.cs

@@ -5,6 +5,7 @@ using System.Threading;
 using System.Web;
 using System.Net;
 using System.IO;
+using Microsoft.Security.Application;
 using Newtonsoft.Json.Linq;
 
 
@@ -22,7 +23,9 @@ namespace MusicPlayer
 
         public JObject SendString(string m)
         {
-            HttpWebRequest server =   (HttpWebRequest)WebRequest.Create(ip+":"+port+"/"+m);
+            string encodedstring = Microsoft.Security.Application.Encoder.HtmlEncode(m);
+            Console.WriteLine(encodedstring);
+            HttpWebRequest server =   (HttpWebRequest)WebRequest.Create(ip+":"+port+"/"+encodedstring);
             server.KeepAlive = false;
             HttpWebResponse respond = (HttpWebResponse)server.GetResponse();
             Stream streamResponse = respond.GetResponseStream();

MusicPlayer/MusicPlayer/packages.config

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
+  <package id="AntiXSS" version="4.3.0" targetFramework="net452" />
   <package id="NAudio" version="1.7.3" targetFramework="net452" />
   <package id="Newtonsoft.Json" version="7.0.1" targetFramework="net452" />
 </packages>