Fixed Regex in IFRameOptions

Author: MaiklT

DNN_IFrame.dnn

@@ -1,6 +1,6 @@
 <dotnetnuke type="Package" version="5.0">
    <packages>
-      <package name="DNN_IFrame" type="Module" version="08.00.00">
+      <package name="DNN_IFrame" type="Module" version="08.00.01">
          <friendlyName>IFrame</friendlyName>
          <description>
             <![CDATA[
@@ -231,7 +231,7 @@
                   <attributes>
                      <businessControllerClass>DotNetNuke.Modules.IFrame.Components.ParametersController</businessControllerClass>
                      <desktopModuleID>[DESKTOPMODULEID]</desktopModuleID>
-                     <upgradeVersionsList>03.02.00,03.02.03,04.03.00,04.04.00,08.00.00</upgradeVersionsList>
+                     <upgradeVersionsList>03.02.00,03.02.03,04.03.00,04.04.00,08.00.00,08.00.01</upgradeVersionsList>
                   </attributes>
                </eventMessage>
             </component>
@@ -241,7 +241,7 @@
                   <assembly>
                      <path>bin</path>
                      <name>DotNetNuke.Modules.IFrame.dll</name>
-                     <version>8.0.0.0</version>
+                     <version>8.0.1.0</version>
                   </assembly>
                </assemblies>
             </component>

Documentation/ReleaseNotes.html

@@ -21,4 +21,8 @@ <h3>DNN IFrame Project 08.00.00</h3>
       <li>Modified to work in DNN 8 and .Net 4.5.1</li>
       <li>Restructured the Settings/Parameters tables</li>
    </ul>
+   <h3>DNN IFrame Project 08.00.01</h3>
+   <ul>
+      <li>Corrected Regex in IFrameOptions</li>
+   </ul>
 </div>

IFrame.csproj

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="packages\Microsoft.Net.Compilers.1.1.1\build\Microsoft.Net.Compilers.props" Condition="Exists('packages\Microsoft.Net.Compilers.1.1.1\build\Microsoft.Net.Compilers.props')" />
-  <Import Project="packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.1.0.0\build\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.props" Condition="Exists('packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.1.0.0\build\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.props')" />
+  <Import Project="..\packages\Microsoft.Net.Compilers.1.1.1\build\Microsoft.Net.Compilers.props" Condition="Exists('..\packages\Microsoft.Net.Compilers.1.1.1\build\Microsoft.Net.Compilers.props')" />
+  <Import Project="..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.1.0.0\build\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.props" Condition="Exists('..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.1.0.0\build\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.props')" />
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -112,6 +112,15 @@
   <ItemGroup>
     <Content Include="packages.config" />
   </ItemGroup>
+  <ItemGroup>
+    <Content Include="App_LocalResources\IFrame.ascx.de-AT.resx" />
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="App_LocalResources\IFrameOptions.ascx.de-AT.resx" />
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="App_LocalResources\SharedResources.de-AT.resx" />
+  </ItemGroup>
   <PropertyGroup>
     <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>
     <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
@@ -143,8 +152,8 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('packages\Microsoft.Net.Compilers.1.1.1\build\Microsoft.Net.Compilers.props')" Text="$([System.String]::Format('$(ErrorText)', 'packages\Microsoft.Net.Compilers.1.1.1\build\Microsoft.Net.Compilers.props'))" />
-    <Error Condition="!Exists('packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.1.0.1\build\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.props')" Text="$([System.String]::Format('$(ErrorText)', 'packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.1.0.1\build\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.props'))" />
+    <Error Condition="!Exists('..\packages\Microsoft.Net.Compilers.1.1.1\build\Microsoft.Net.Compilers.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.Net.Compilers.1.1.1\build\Microsoft.Net.Compilers.props'))" />
+    <Error Condition="!Exists('..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.1.0.1\build\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.1.0.1\build\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.props'))" />
   </Target>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.

IframeOptions.ascx

@@ -34,7 +34,7 @@
                CssClass="dnnFormMessage dnnFormError"
                ForeColor="White"
                ResourceKey="SourceUrlValidator.ErrorMessage"
-               ValidationExpression="http(s)?://([\w-]+\.)+[\w-]+(/[\w- ./?%&=]*)?"
+               ValidationExpression="http(s)?:\/\/([\w-]+\.)+[\w-]+(/[\w- ./?%&=]*)?"
                ValidationGroup="IFrameParametersValidation" />
             <asp:RequiredFieldValidator ID="SourceUrlRequiredValidator" runat="server"
                ControlToValidate="SourceUrl$txtUrl"

Properties/AssemblyInfo.cs

@@ -31,5 +31,5 @@
 //
 // You can specify all the values or you can default the Revision and Build Numbers 
 // by using the '*' as shown below:
-[assembly: AssemblyVersion("8.0.0.0")]
-[assembly: AssemblyFileVersion("8.0.0.0")]
+[assembly: AssemblyVersion("8.0.1.0")]
+[assembly: AssemblyFileVersion("8.0.1.0")]