funnelweblog · andrasfuchs · Oct 13, 2013 · Oct 13, 2013 · Oct 14, 2013 · Oct 14, 2013
diff --git a/README.md b/README.md
@@ -52,4 +52,66 @@ DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
 SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER 
 CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, 
 OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+
+New features in 2.5 (2015-03-30)
+==========================
+
+* Upgraded the project file to work with Visual Studio 2013 Community Editon
+* The HTML structure of the site mirrors the default WordPress structure, so we can apply WordPress themes to FunnelWeb now
+* Theming engine now supports both WordPress and Bootstrap themes
+* Updated the MVC framework to version 5
+* Included Bootstrap 3 and it's responsive layout (so it's mobile-friendly now)
+* Redesigned the administration page
+* ShowDown and WMD is replaced by a more recent PageDown
+* The HTML is more HTML5-compliant
+* Tested with both SQL and SQL CE databases
+
+Screenshots
+==========
+
+Admin
+--------
+![admin-1](https://cloud.githubusercontent.com/assets/910321/6892236/b2069014-d6c2-11e4-87fe-b5d308f95f4d.png)
+![admin-2](https://cloud.githubusercontent.com/assets/910321/6892238/b5c2900e-d6c2-11e4-8443-54b873c623f1.png)
+
+WP-Flower theme
+-----------------------
+![wp_flower-1](https://cloud.githubusercontent.com/assets/910321/6892245/cfb7a7d8-d6c2-11e4-8db7-66aaec7a5703.png)
+![wp_flower-2](https://cloud.githubusercontent.com/assets/910321/6892251/d6a09faa-d6c2-11e4-81ab-7c9269136650.png)
+![wp_flower-post-1](https://cloud.githubusercontent.com/assets/910321/6892254/d8a4194e-d6c2-11e4-8f3c-175fcc958e31.png)
+![wp_flower-post-2](https://cloud.githubusercontent.com/assets/910321/6892255/da13f3da-d6c2-11e4-931e-3c1be425e0a1.png)
+![wp_flower-post-3](https://cloud.githubusercontent.com/assets/910321/6892256/e02ea68e-d6c2-11e4-8260-5308c756cf3b.png)
+![wp_flower-post-4](https://cloud.githubusercontent.com/assets/910321/6892257/e1b6f75e-d6c2-11e4-9b9a-867be464ecf1.png)
+
+WP-Hostmarks theme
+----------------------------
+![wp_hostmarks-1](https://cloud.githubusercontent.com/assets/910321/6892261/ed74b5f4-d6c2-11e4-93d9-2bd360e644d8.png)
+![wp_hostmarks-2](https://cloud.githubusercontent.com/assets/910321/6892262/eedd02c0-d6c2-11e4-9380-a79bbf3aa4f9.png)
+![wp_hostmarks-post-1](https://cloud.githubusercontent.com/assets/910321/6892265/f04c9486-d6c2-11e4-8443-2725c394eb0f.png)
+![wp_hostmarks-post-2](https://cloud.githubusercontent.com/assets/910321/6892267/f5221490-d6c2-11e4-8203-29cd55e64a6e.png)
+![wp_hostmarks-post-3](https://cloud.githubusercontent.com/assets/910321/6892268/f73c6a28-d6c2-11e4-8e68-126014796a4d.png)
+![wp_hostmarks-post-4](https://cloud.githubusercontent.com/assets/910321/6892272/ff8e1c26-d6c2-11e4-83c2-d7d9c6e359dc.png)
+
+WP-Quark theme
+----------------------
+![wp_quark-1](https://cloud.githubusercontent.com/assets/910321/6892290/1941fff2-d6c3-11e4-9383-44dc0045e8bc.png)
+![wp_quark-2](https://cloud.githubusercontent.com/assets/910321/6892294/1c6c6f32-d6c3-11e4-9a30-b878f9a0034e.png)
+![wp_quark-post-1](https://cloud.githubusercontent.com/assets/910321/6892295/1f6508d4-d6c3-11e4-9652-0a44c8ee66e0.png)
+![wp_quark-post-2](https://cloud.githubusercontent.com/assets/910321/6892296/218c30ba-d6c3-11e4-9a8c-946993cbd72d.png)
+![wp_quark-post-3](https://cloud.githubusercontent.com/assets/910321/6892298/25f43fda-d6c3-11e4-8695-6210116c5d25.png)
+![wp_quark-post-4](https://cloud.githubusercontent.com/assets/910321/6892299/2866b4be-d6c3-11e4-94b6-d279b02dc0b5.png)
+
+WP-Topmag theme
+-------------------------
+![wp_topmag-1](https://cloud.githubusercontent.com/assets/910321/6892305/34b42594-d6c3-11e4-8659-629ef586d6a6.png)
+![wp_topmag-2](https://cloud.githubusercontent.com/assets/910321/6892307/36a82a8a-d6c3-11e4-9913-44e7d4f26566.png)
+![wp_topmag-post-1](https://cloud.githubusercontent.com/assets/910321/6892309/3bce8f0e-d6c3-11e4-9adb-826c7aba42e4.png)
+![wp_topmag-post-2](https://cloud.githubusercontent.com/assets/910321/6892310/3da19d12-d6c3-11e4-83a8-0a7410c6a23a.png)
+![wp_topmag-post-3](https://cloud.githubusercontent.com/assets/910321/6892311/3f780a9a-d6c3-11e4-96b3-24ca8f420da0.png)
+![wp_topmag-post-4](https://cloud.githubusercontent.com/assets/910321/6892313/44a3fc54-d6c3-11e4-99c4-7c3d6370bacf.png)
+
+Further Information
+===============
+If you need some help with .NET, C#, MVC, Entity Framework, HTML5, CSS, JavaScript, jQuery or Bootstrap, you can contact me for one-on-one consultancy or live training on the [Kevin Sharp Traning website](http://www.kevinsharp.net).
diff --git a/docs/screenshots/admin-1.png b/docs/screenshots/admin-1.png
diff --git a/docs/screenshots/admin-2.png b/docs/screenshots/admin-2.png
diff --git a/docs/screenshots/wp_flower-1.png b/docs/screenshots/wp_flower-1.png
diff --git a/docs/screenshots/wp_flower-2.png b/docs/screenshots/wp_flower-2.png
diff --git a/docs/screenshots/wp_flower-post-1.png b/docs/screenshots/wp_flower-post-1.png
diff --git a/docs/screenshots/wp_flower-post-2.png b/docs/screenshots/wp_flower-post-2.png
diff --git a/docs/screenshots/wp_flower-post-3.png b/docs/screenshots/wp_flower-post-3.png
diff --git a/docs/screenshots/wp_flower-post-4.png b/docs/screenshots/wp_flower-post-4.png
diff --git a/docs/screenshots/wp_hostmarks-1.png b/docs/screenshots/wp_hostmarks-1.png
diff --git a/docs/screenshots/wp_hostmarks-2.png b/docs/screenshots/wp_hostmarks-2.png
diff --git a/docs/screenshots/wp_hostmarks-post-1.png b/docs/screenshots/wp_hostmarks-post-1.png
diff --git a/docs/screenshots/wp_hostmarks-post-2.png b/docs/screenshots/wp_hostmarks-post-2.png
diff --git a/docs/screenshots/wp_hostmarks-post-3.png b/docs/screenshots/wp_hostmarks-post-3.png
diff --git a/docs/screenshots/wp_hostmarks-post-4.png b/docs/screenshots/wp_hostmarks-post-4.png
diff --git a/docs/screenshots/wp_quark-1.png b/docs/screenshots/wp_quark-1.png
diff --git a/docs/screenshots/wp_quark-2.png b/docs/screenshots/wp_quark-2.png
diff --git a/docs/screenshots/wp_quark-post-1.png b/docs/screenshots/wp_quark-post-1.png
diff --git a/docs/screenshots/wp_quark-post-2.png b/docs/screenshots/wp_quark-post-2.png
diff --git a/docs/screenshots/wp_quark-post-3.png b/docs/screenshots/wp_quark-post-3.png
diff --git a/docs/screenshots/wp_quark-post-4.png b/docs/screenshots/wp_quark-post-4.png
diff --git a/docs/screenshots/wp_topmag-1.png b/docs/screenshots/wp_topmag-1.png
diff --git a/docs/screenshots/wp_topmag-2.png b/docs/screenshots/wp_topmag-2.png
diff --git a/docs/screenshots/wp_topmag-post-1.png b/docs/screenshots/wp_topmag-post-1.png
diff --git a/docs/screenshots/wp_topmag-post-2.png b/docs/screenshots/wp_topmag-post-2.png
diff --git a/docs/screenshots/wp_topmag-post-3.png b/docs/screenshots/wp_topmag-post-3.png
diff --git a/docs/screenshots/wp_topmag-post-4.png b/docs/screenshots/wp_topmag-post-4.png
diff --git a/src/.nuget/NuGet.exe b/src/.nuget/NuGet.exe
diff --git a/src/.nuget/packages.config b/src/.nuget/packages.config
diff --git a/src/FunnelWeb.Extensions.CommentNotification/FunnelWeb.Extensions.CommentNotification.csproj b/src/FunnelWeb.Extensions.CommentNotification/FunnelWeb.Extensions.CommentNotification.csproj
@@ -11,9 +11,10 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>FunnelWeb.Extensions.CommentNotification</RootNamespace>
     <AssemblyName>FunnelWeb.Extensions.CommentNotification</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -23,6 +24,7 @@
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
@@ -31,13 +33,12 @@
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Autofac">
-      <HintPath>..\packages\Autofac.2.6.3.862\lib\NET40\Autofac.dll</HintPath>
-    </Reference>
-    <Reference Include="Autofac.Configuration">
-      <HintPath>..\packages\Autofac.2.6.3.862\lib\NET40\Autofac.Configuration.dll</HintPath>
+    <Reference Include="Autofac, Version=3.5.0.0, Culture=neutral, PublicKeyToken=17863af14b0044da, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\packages\Autofac.3.5.2\lib\net40\Autofac.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.ComponentModel.Composition" />
@@ -66,6 +67,7 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
+    <None Include="app.config" />
     <None Include="packages.config" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />

diff --git a/src/FunnelWeb.Extensions.CommentNotification/app.config b/src/FunnelWeb.Extensions.CommentNotification/app.config
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+  <runtime>
+    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+      <dependentAssembly>
+        <assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-5.2.3.0" newVersion="5.2.3.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Web.WebPages" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-3.0.0.0" newVersion="3.0.0.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Autofac" publicKeyToken="17863af14b0044da" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-3.5.0.0" newVersion="3.5.0.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="NHibernate" publicKeyToken="aa95f207798dfdb4" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.0.0.4000" newVersion="4.0.0.4000" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Iesi.Collections" publicKeyToken="aa95f207798dfdb4" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.0.0.0" newVersion="4.0.0.0" />
+      </dependentAssembly>
+    </assemblyBinding>
+  </runtime>
+</configuration>
diff --git a/src/FunnelWeb.Extensions.CommentNotification/packages.config b/src/FunnelWeb.Extensions.CommentNotification/packages.config
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Autofac" version="2.6.3.862" targetFramework="net40" />
+  <package id="Autofac" version="3.5.2" targetFramework="net45" />
 </packages>
diff --git a/src/FunnelWeb.Tests/App.config b/src/FunnelWeb.Tests/App.config
@@ -1,30 +1,102 @@
 <?xml version="1.0" encoding="utf-8"?>
 <configuration>
-  <configSections>
-    <sectionGroup name="NUnit">
-      <section name="TestRunner" type="System.Configuration.NameValueSectionHandler" />
-    </sectionGroup>
-  </configSections>
-  <NUnit>
-    <TestRunner>
-      <add key="ApartmentState" value="STA" />
-    </TestRunner>
-  </NUnit>
-  <runtime>
-    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
-      <probing privatePath="bin/Extensions" />
-      <dependentAssembly>
-        <assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35" />
-        <bindingRedirect oldVersion="1.0.0.0-2.0.0.0" newVersion="3.0.0.0" />
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="NHibernate" publicKeyToken="aa95f207798dfdb4" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-3.3.1.4000" newVersion="3.3.1.4000" />
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="nunit.framework" publicKeyToken="96d09a1eb7f44a77" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-2.5.5.10112" newVersion="2.5.5.10112" />
-      </dependentAssembly>
-    </assemblyBinding>
-  </runtime>
+	<configSections>
+		<section name="system.identityModel" type="System.IdentityModel.Configuration.SystemIdentityModelSection, System.IdentityModel, Version=4.0.0.0, Culture=neutral, PublicKeyToken=B77A5C561934E089" />
+		<sectionGroup name="NUnit">
+			<section name="TestRunner" type="System.Configuration.NameValueSectionHandler" />
+		</sectionGroup>
+	</configSections>
+
+	<NUnit>
+		<TestRunner>
+			<add key="ApartmentState" value="STA" />
+		</TestRunner>
+	</NUnit>
+
+	<runtime>
+		<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+			<probing privatePath="bin/Extensions" />
+			<dependentAssembly>
+				<assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35" />
+				<bindingRedirect oldVersion="0.0.0.0-5.2.3.0" newVersion="5.2.3.0" />
+			</dependentAssembly>
+			<dependentAssembly>
+				<assemblyIdentity name="NHibernate" publicKeyToken="aa95f207798dfdb4" culture="neutral" />
+				<bindingRedirect oldVersion="0.0.0.0-4.0.0.4000" newVersion="4.0.0.4000" />
+			</dependentAssembly>
+			<dependentAssembly>
+				<assemblyIdentity name="nunit.framework" publicKeyToken="96d09a1eb7f44a77" culture="neutral" />
+				<bindingRedirect oldVersion="0.0.0.0-2.5.5.10112" newVersion="2.5.5.10112" />
+			</dependentAssembly>
+			<dependentAssembly>
+				<assemblyIdentity name="System.Web.WebPages" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+				<bindingRedirect oldVersion="0.0.0.0-3.0.0.0" newVersion="3.0.0.0" />
+			</dependentAssembly>
+			<dependentAssembly>
+				<assemblyIdentity name="Microsoft.WindowsAzure.StorageClient" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+				<bindingRedirect oldVersion="0.0.0.0-1.7.0.0" newVersion="1.7.0.0" />
+			</dependentAssembly>
+			<dependentAssembly>
+				<assemblyIdentity name="Autofac" publicKeyToken="17863af14b0044da" culture="neutral" />
+				<bindingRedirect oldVersion="0.0.0.0-3.5.0.0" newVersion="3.5.0.0" />
+			</dependentAssembly>
+			<dependentAssembly>
+				<assemblyIdentity name="WebGrease" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+				<bindingRedirect oldVersion="0.0.0.0-1.6.5135.21930" newVersion="1.6.5135.21930" />
+			</dependentAssembly>
+			<dependentAssembly>
+				<assemblyIdentity name="Iesi.Collections" publicKeyToken="aa95f207798dfdb4" culture="neutral" />
+				<bindingRedirect oldVersion="0.0.0.0-4.0.0.0" newVersion="4.0.0.0" />
+			</dependentAssembly>
+			<dependentAssembly>
+				<assemblyIdentity name="Antlr3.Runtime" publicKeyToken="eb42632606e9261f" culture="neutral" />
+				<bindingRedirect oldVersion="0.0.0.0-3.5.0.2" newVersion="3.5.0.2" />
+			</dependentAssembly>
+			<dependentAssembly>
+				<assemblyIdentity name="Microsoft.Data.Edm" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+				<bindingRedirect oldVersion="0.0.0.0-5.6.3.0" newVersion="5.6.3.0" />
+			</dependentAssembly>
+			<dependentAssembly>
+				<assemblyIdentity name="Microsoft.Data.Services.Client" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+				<bindingRedirect oldVersion="0.0.0.0-5.6.3.0" newVersion="5.6.3.0" />
+			</dependentAssembly>
+			<dependentAssembly>
+				<assemblyIdentity name="Microsoft.Data.OData" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+				<bindingRedirect oldVersion="0.0.0.0-5.6.3.0" newVersion="5.6.3.0" />
+			</dependentAssembly>
+			<dependentAssembly>
+				<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
+				<bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
+			</dependentAssembly>
+		</assemblyBinding>
+	</runtime>
+
+	<startup>
+		<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5" />
+	</startup>
+
+	<system.identityModel>
+		<identityConfiguration>
+			<claimsAuthenticationManager type="FunnelWeb.Authentication.Internal.CustomAuthenticationManager, FunnelWeb, Version=2.3.0.0, Culture=neutral" />
+			<claimsAuthorizationManager type="FunnelWeb.Authentication.Internal.CustomAuthorizationManager, FunnelWeb, Version=2.3.0.0, Culture=neutral" />
+			<audienceUris>
+				<add value="http://localhost:54860/" />
+			</audienceUris>
+			<certificateValidation certificateValidationMode="None" />
+			<issuerNameRegistry type="System.IdentityModel.Tokens.ValidatingIssuerNameRegistry, System.IdentityModel.Tokens.ValidatingIssuerNameRegistry">
+				<authority name="https://foosomething.accesscontrol.windows.net/">
+					<keys>
+						<add thumbprint="932CFD57B3EB39E82F9668AD83B31F2E9EC2D0FC" />
+					</keys>
+					<validIssuers>
+						<add name="https://foosomething.accesscontrol.windows.net/" />
+					</validIssuers>
+				</authority>
+			</issuerNameRegistry>
+			<securityTokenHandlers>
+				<add type="System.IdentityModel.Services.Tokens.MachineKeySessionSecurityTokenHandler, System.IdentityModel.Services, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+				<remove type="System.IdentityModel.Tokens.SessionSecurityTokenHandler, System.IdentityModel, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+			</securityTokenHandlers>
+		</identityConfiguration>
+	</system.identityModel>
 </configuration>
diff --git a/src/FunnelWeb.Tests/Authentication/Internal/SqlFunnelWebMembershipTests.cs b/src/FunnelWeb.Tests/Authentication/Internal/SqlFunnelWebMembershipTests.cs
@@ -0,0 +1,18 @@
+using System.Diagnostics;
+using FunnelWeb.Authentication.Internal;
+using NUnit.Framework;
+
+namespace FunnelWeb.Tests.Authentication.Internal
+{
+	[TestFixture]
+	public class SqlFunnelWebMembershipTests
+	{
+		[Test]
+		public void HashPassword()
+		{
+			string hashPassword = SqlFunnelWebMembership.HashPassword("ThisIsMyPassword");
+			Debug.WriteLine(hashPassword);
+			Assert.AreEqual("30B8BD5829888900D15D2BBE6270D9BC65B0702F", hashPassword);
+		}
+	}
+}