diff --git a/.gitignore b/.gitignore index d75c90d..df39a55 100644 --- a/.gitignore +++ b/.gitignore @@ -216,3 +216,6 @@ Thumbs.db # Folder config file Desktop.ini Website/Install/Temp/ +/App_LocalResources/IFrame.ascx.de-AT.resx +/App_LocalResources/IFrameOptions.ascx.de-AT.resx +/App_LocalResources/SharedResources.de-AT.resx diff --git a/App_LocalResources/EditIFrame.ascx.resx b/App_LocalResources/EditIFrame.ascx.resx deleted file mode 100644 index f6192da..0000000 --- a/App_LocalResources/EditIFrame.ascx.resx +++ /dev/null @@ -1,372 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - Edit IFrame - - - - <h1>Edit IFrame</h1> - <p> - The <b>iframe</b> element creates an inline frame that contains another document. - This screen provides access to edit <b>iframe</b> settings. These settings include - the source URL of the document; querystring parameter to dynamically pull the - source URL from; name of the <b>iframe</b> (for use with scripts and/or as a target - for links); display size (height and width); tool tip to be displayed when the user - hovers over the <b>iframe</b>; whether scrolling will be used, not used, or - determined automatically; and, whether a border will or will not be displayed. - Click <b>Save</b> to save settings. - </p> - - - - Options - - - Source - - - The URL of the document to show in the iframe - - - URL Parameter - - - The querystring parameter used to dynamically set the iframe source - - - Name - - - Specifies a unique name of the iframe (to use in scripts or as targets for links/iframes) - - - Width - - - Defines the width of the iframe - - - Height - - - Defines the height of the iframe - - - Auto height - - - Auto stretch the height according to the content of the frame. Works only if the document inside the iframe belongs to the same domain. - - - Other Options - - - onload (Javascript) - - - Javascript to execute onload, often used for resizing. Only setable for Administrator. - - - Css Style - - - For example:<br\>height:expression(contentWindow.document.body.scrollHeight+50); - - - Tool tip - - - A text to display in a tool tip when the user hovers the mouse over the iframe - - - Scrolling - - - Define scroll bar style - displayed (yes), not displayed (no), or automatic (auto) - - - Border - - - Specifies whether or not to display a frame border - - - <br />Width must be a number greater than zero - - - <br />Height must be a number greater than zero - - - <br />You Must Enter a Valid URL - - - QueryString Parameters - - - Name - - - Value - - - Type - - - Argument - - - Invalid Parameter - - - The specified parameter options are invalid. Ensure the <b>Name</b> and, if required, type argument are both specified. - - - Are you sure you want to remove this item from the data store? Once removed it cannot be retrieved. - - - Add QueryString Parameter - - - Static Value - - - Pass-Through QueryString - - - Pass-Through Form Post - - - Custom User Property - - - Portal ID - - - Portal Name - - - Tab ID - - - Module ID - - - User ID - - - Current Locale - - - User's Username - - - User's First Name - - - User's Last Name - - - User's Display Name - - - User's Email - - - User's Website - - - User's IM - - - User's Street - - - User's Unit - - - User's City - - - User's Country - - - User's Region - - - User's Postal Code - - - User's Phone - - - User's Cell - - - User's Fax - - - User's Locale - - - User's TimeZone - - - User's Authorized Flag - - - User's Lock Out Flag - - - User's SuperUser Flag - - - Auto - - - Cancel - - - Delete - - - Edit - - - No - - - Save - - - Yes - - - Allow Transparency - - - Sets the attribute allowtransparancy=true to the iframe. The inner doc need also a corresponding css setting. IE only, setting it to true will break XHTML compliance. - - - If selected, this parameter will not be used in a query string, but instead be added at the end of query string as a hash parameter. (i.e. yoursite.com/page.aspx#myhash) - - - Use as Hash - - \ No newline at end of file diff --git a/App_LocalResources/IFrameOptions.ascx.resx b/App_LocalResources/IFrameOptions.ascx.resx index c373cc4..ebe6133 100644 --- a/App_LocalResources/IFrameOptions.ascx.resx +++ b/App_LocalResources/IFrameOptions.ascx.resx @@ -258,4 +258,10 @@ A valid Url is required. + + Check this option when you are sure that your Url is valid, but the validation fails. This is because the Url is validated against a regular expression that may not include every case. Anyway, if you find a problem like this please post it to the issues part of the project page (<a href="https://github.com/DNNCommunity/DNN.IFrame/issues" target="_blank">https://github.com/DNNCommunity/DNN.IFrame/issues</a>). + + + Ignore source validation + \ No newline at end of file diff --git a/DNN_IFrame.dnn b/DNN_IFrame.dnn index d9092f4..fa42da0 100644 --- a/DNN_IFrame.dnn +++ b/DNN_IFrame.dnn @@ -1,6 +1,6 @@  - + IFrame Michael Tobisch DNN Connect - http://dnn-connect.org + https://dnn-connect.org/ noreply@dnn-connect.org @@ -181,7 +181,7 @@ @@ -231,7 +231,7 @@ DotNetNuke.Modules.IFrame.Components.ParametersController [DESKTOPMODULEID] - 03.02.00,03.02.03,04.03.00,04.04.00,08.00.00,08.00.01,08.00.02 + 03.02.00,03.02.03,04.03.00,04.04.00,08.00.00,08.00.01,08.00.02,08.01.00 @@ -241,7 +241,7 @@ bin DotNetNuke.Modules.IFrame.dll - 8.0.2.0 + 8.1.0.0 diff --git a/Documentation/ReleaseNotes.html b/Documentation/ReleaseNotes.html index abedb0b..f3c9341 100644 --- a/Documentation/ReleaseNotes.html +++ b/Documentation/ReleaseNotes.html @@ -29,4 +29,9 @@

DNN IFrame Project 08.00.02

  • Another Regex correction in IFrameOptions - thanks to nvisionative
+

DNN IFrame Project 08.01.00

+
    +
  • Another Regex correction in IFrameOptions - thanks to nvisionative
    • +
  • Added a setting to disable the Url validation if the regex does not match
    • +
\ No newline at end of file diff --git a/IFrame.csproj b/IFrame.csproj index 860fcbe..1369441 100644 --- a/IFrame.csproj +++ b/IFrame.csproj @@ -1,7 +1,7 @@  - - + + Debug @@ -15,7 +15,7 @@ Properties DotNetNuke.Modules.IFrame DotNetNuke.Modules.IFrame - v4.5.2 + v4.6.1 false @@ -24,6 +24,8 @@ + + true @@ -87,39 +89,32 @@ - - ..\..\..\bin\DotNetNuke.dll - - - False - ..\..\..\bin\DotNetNuke.WebUtility.dll - - - ..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.1.0.1\lib\net45\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.dll - True - - - C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.5.2\System.dll - - - C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.5.2\System.Web.dll - - - - C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.5.2\System.XML.dll - + - + - + - + - + + ..\..\..\bin\DotNetNuke.dll + + + ..\..\..\bin\DotNetNuke.Web.dll + + + False + ..\..\..\bin\DotNetNuke.WebUtility.dll + + + + + 10.0 @@ -136,9 +131,9 @@ True 50970 / - http://dnn.local/DesktopModules/IFrame + http://nine.local/DesktopModules/Dnn.IFrame True - http://dnn.local/ + http://nine.local/ False False @@ -152,8 +147,8 @@ 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}. - - + + + + + + + + + + + + + + $(NoWarn);1701;1702 + + + + + $(NoWarn);2008 + + + + + + + + + + + $(AppConfig) + + + $(IntermediateOutputPath)$(TargetName).compile.pdb + + + + + false + + + + + + + + + + true + + + + + + + + + <_CoreCompileResourceInputs Remove="@(_CoreCompileResourceInputs)" /> + + + + + \ No newline at end of file diff --git a/bin/roslyn/Microsoft.CodeAnalysis.CSharp.Scripting.dll b/bin/roslyn/Microsoft.CodeAnalysis.CSharp.Scripting.dll new file mode 100644 index 0000000..b005dbe Binary files /dev/null and b/bin/roslyn/Microsoft.CodeAnalysis.CSharp.Scripting.dll differ diff --git a/bin/roslyn/Microsoft.CodeAnalysis.CSharp.dll b/bin/roslyn/Microsoft.CodeAnalysis.CSharp.dll new file mode 100644 index 0000000..96e0fe7 Binary files /dev/null and b/bin/roslyn/Microsoft.CodeAnalysis.CSharp.dll differ diff --git a/bin/roslyn/Microsoft.CodeAnalysis.Scripting.dll b/bin/roslyn/Microsoft.CodeAnalysis.Scripting.dll new file mode 100644 index 0000000..6ea348f Binary files /dev/null and b/bin/roslyn/Microsoft.CodeAnalysis.Scripting.dll differ diff --git a/bin/roslyn/Microsoft.CodeAnalysis.VisualBasic.dll b/bin/roslyn/Microsoft.CodeAnalysis.VisualBasic.dll new file mode 100644 index 0000000..f7b6c99 Binary files /dev/null and b/bin/roslyn/Microsoft.CodeAnalysis.VisualBasic.dll differ diff --git a/bin/roslyn/Microsoft.CodeAnalysis.dll b/bin/roslyn/Microsoft.CodeAnalysis.dll new file mode 100644 index 0000000..537d8a2 Binary files /dev/null and b/bin/roslyn/Microsoft.CodeAnalysis.dll differ diff --git a/bin/roslyn/Microsoft.DiaSymReader.Native.amd64.dll b/bin/roslyn/Microsoft.DiaSymReader.Native.amd64.dll new file mode 100644 index 0000000..8a0ea55 Binary files /dev/null and b/bin/roslyn/Microsoft.DiaSymReader.Native.amd64.dll differ diff --git a/bin/roslyn/Microsoft.DiaSymReader.Native.x86.dll b/bin/roslyn/Microsoft.DiaSymReader.Native.x86.dll new file mode 100644 index 0000000..3205139 Binary files /dev/null and b/bin/roslyn/Microsoft.DiaSymReader.Native.x86.dll differ diff --git a/bin/roslyn/Microsoft.VisualBasic.Core.targets b/bin/roslyn/Microsoft.VisualBasic.Core.targets new file mode 100644 index 0000000..0be5bb7 --- /dev/null +++ b/bin/roslyn/Microsoft.VisualBasic.Core.targets @@ -0,0 +1,163 @@ + + + + + + + + + + + + + <_NoWarnings Condition="'$(WarningLevel)' == '0'">true + <_NoWarnings Condition="'$(WarningLevel)' == '1'">false + + + + + $(IntermediateOutputPath)$(TargetName).compile.pdb + + + + + + + + + + + false + + + + + + + + + + true + + + + + + + + <_CoreCompileResourceInputs Remove="@(_CoreCompileResourceInputs)" /> + + + + + \ No newline at end of file diff --git a/bin/roslyn/Microsoft.Win32.Primitives.dll b/bin/roslyn/Microsoft.Win32.Primitives.dll new file mode 100644 index 0000000..d7b2a2c Binary files /dev/null and b/bin/roslyn/Microsoft.Win32.Primitives.dll differ diff --git a/bin/roslyn/System.AppContext.dll b/bin/roslyn/System.AppContext.dll new file mode 100644 index 0000000..5cb9dfb Binary files /dev/null and b/bin/roslyn/System.AppContext.dll differ diff --git a/bin/roslyn/System.Collections.Immutable.dll b/bin/roslyn/System.Collections.Immutable.dll new file mode 100644 index 0000000..ce6fc0e Binary files /dev/null and b/bin/roslyn/System.Collections.Immutable.dll differ diff --git a/bin/roslyn/System.Console.dll b/bin/roslyn/System.Console.dll new file mode 100644 index 0000000..f47e609 Binary files /dev/null and b/bin/roslyn/System.Console.dll differ diff --git a/bin/roslyn/System.Diagnostics.FileVersionInfo.dll b/bin/roslyn/System.Diagnostics.FileVersionInfo.dll new file mode 100644 index 0000000..77248bf Binary files /dev/null and b/bin/roslyn/System.Diagnostics.FileVersionInfo.dll differ diff --git a/bin/roslyn/System.Diagnostics.Process.dll b/bin/roslyn/System.Diagnostics.Process.dll new file mode 100644 index 0000000..e03db64 Binary files /dev/null and b/bin/roslyn/System.Diagnostics.Process.dll differ diff --git a/bin/roslyn/System.Diagnostics.StackTrace.dll b/bin/roslyn/System.Diagnostics.StackTrace.dll new file mode 100644 index 0000000..5ec85f3 Binary files /dev/null and b/bin/roslyn/System.Diagnostics.StackTrace.dll differ diff --git a/bin/roslyn/System.IO.Compression.dll b/bin/roslyn/System.IO.Compression.dll new file mode 100644 index 0000000..f8468a6 Binary files /dev/null and b/bin/roslyn/System.IO.Compression.dll differ diff --git a/bin/roslyn/System.IO.FileSystem.DriveInfo.dll b/bin/roslyn/System.IO.FileSystem.DriveInfo.dll new file mode 100644 index 0000000..754677f Binary files /dev/null and b/bin/roslyn/System.IO.FileSystem.DriveInfo.dll differ diff --git a/bin/roslyn/System.IO.FileSystem.Primitives.dll b/bin/roslyn/System.IO.FileSystem.Primitives.dll new file mode 100644 index 0000000..ad9c238 Binary files /dev/null and b/bin/roslyn/System.IO.FileSystem.Primitives.dll differ diff --git a/bin/roslyn/System.IO.FileSystem.dll b/bin/roslyn/System.IO.FileSystem.dll new file mode 100644 index 0000000..7c43977 Binary files /dev/null and b/bin/roslyn/System.IO.FileSystem.dll differ diff --git a/bin/roslyn/System.IO.Pipes.dll b/bin/roslyn/System.IO.Pipes.dll new file mode 100644 index 0000000..f0b233a Binary files /dev/null and b/bin/roslyn/System.IO.Pipes.dll differ diff --git a/bin/roslyn/System.Reflection.Metadata.dll b/bin/roslyn/System.Reflection.Metadata.dll new file mode 100644 index 0000000..ee68731 Binary files /dev/null and b/bin/roslyn/System.Reflection.Metadata.dll differ diff --git a/bin/roslyn/System.Security.AccessControl.dll b/bin/roslyn/System.Security.AccessControl.dll new file mode 100644 index 0000000..ea65f02 Binary files /dev/null and b/bin/roslyn/System.Security.AccessControl.dll differ diff --git a/bin/roslyn/System.Security.Claims.dll b/bin/roslyn/System.Security.Claims.dll new file mode 100644 index 0000000..4e28e4c Binary files /dev/null and b/bin/roslyn/System.Security.Claims.dll differ diff --git a/bin/roslyn/System.Security.Cryptography.Algorithms.dll b/bin/roslyn/System.Security.Cryptography.Algorithms.dll new file mode 100644 index 0000000..fa8ad65 Binary files /dev/null and b/bin/roslyn/System.Security.Cryptography.Algorithms.dll differ diff --git a/bin/roslyn/System.Security.Cryptography.Encoding.dll b/bin/roslyn/System.Security.Cryptography.Encoding.dll new file mode 100644 index 0000000..de1ec5e Binary files /dev/null and b/bin/roslyn/System.Security.Cryptography.Encoding.dll differ diff --git a/bin/roslyn/System.Security.Cryptography.Primitives.dll b/bin/roslyn/System.Security.Cryptography.Primitives.dll new file mode 100644 index 0000000..16b2446 Binary files /dev/null and b/bin/roslyn/System.Security.Cryptography.Primitives.dll differ diff --git a/bin/roslyn/System.Security.Cryptography.X509Certificates.dll b/bin/roslyn/System.Security.Cryptography.X509Certificates.dll new file mode 100644 index 0000000..e6af960 Binary files /dev/null and b/bin/roslyn/System.Security.Cryptography.X509Certificates.dll differ diff --git a/bin/roslyn/System.Security.Principal.Windows.dll b/bin/roslyn/System.Security.Principal.Windows.dll new file mode 100644 index 0000000..06601a1 Binary files /dev/null and b/bin/roslyn/System.Security.Principal.Windows.dll differ diff --git a/bin/roslyn/System.Text.Encoding.CodePages.dll b/bin/roslyn/System.Text.Encoding.CodePages.dll new file mode 100644 index 0000000..0f2f447 Binary files /dev/null and b/bin/roslyn/System.Text.Encoding.CodePages.dll differ diff --git a/bin/roslyn/System.Threading.Thread.dll b/bin/roslyn/System.Threading.Thread.dll new file mode 100644 index 0000000..c0271b0 Binary files /dev/null and b/bin/roslyn/System.Threading.Thread.dll differ diff --git a/bin/roslyn/System.ValueTuple.dll b/bin/roslyn/System.ValueTuple.dll new file mode 100644 index 0000000..78a1851 Binary files /dev/null and b/bin/roslyn/System.ValueTuple.dll differ diff --git a/bin/roslyn/System.Xml.ReaderWriter.dll b/bin/roslyn/System.Xml.ReaderWriter.dll new file mode 100644 index 0000000..3d5103b Binary files /dev/null and b/bin/roslyn/System.Xml.ReaderWriter.dll differ diff --git a/bin/roslyn/System.Xml.XPath.XDocument.dll b/bin/roslyn/System.Xml.XPath.XDocument.dll new file mode 100644 index 0000000..ada40e0 Binary files /dev/null and b/bin/roslyn/System.Xml.XPath.XDocument.dll differ diff --git a/bin/roslyn/System.Xml.XPath.dll b/bin/roslyn/System.Xml.XPath.dll new file mode 100644 index 0000000..86a25a3 Binary files /dev/null and b/bin/roslyn/System.Xml.XPath.dll differ diff --git a/bin/roslyn/System.Xml.XmlDocument.dll b/bin/roslyn/System.Xml.XmlDocument.dll new file mode 100644 index 0000000..cf138d3 Binary files /dev/null and b/bin/roslyn/System.Xml.XmlDocument.dll differ diff --git a/bin/roslyn/VBCSCompiler.exe b/bin/roslyn/VBCSCompiler.exe new file mode 100644 index 0000000..1769112 Binary files /dev/null and b/bin/roslyn/VBCSCompiler.exe differ diff --git a/bin/roslyn/VBCSCompiler.exe.config b/bin/roslyn/VBCSCompiler.exe.config new file mode 100644 index 0000000..d796d0a --- /dev/null +++ b/bin/roslyn/VBCSCompiler.exe.config @@ -0,0 +1,154 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/bin/roslyn/csc.exe b/bin/roslyn/csc.exe new file mode 100644 index 0000000..aa262d0 Binary files /dev/null and b/bin/roslyn/csc.exe differ diff --git a/bin/roslyn/csc.exe.config b/bin/roslyn/csc.exe.config new file mode 100644 index 0000000..96f8159 --- /dev/null +++ b/bin/roslyn/csc.exe.config @@ -0,0 +1,149 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/bin/roslyn/csi.exe b/bin/roslyn/csi.exe new file mode 100644 index 0000000..7c67d5f Binary files /dev/null and b/bin/roslyn/csi.exe differ diff --git a/bin/roslyn/csi.exe.config b/bin/roslyn/csi.exe.config new file mode 100644 index 0000000..92357ab --- /dev/null +++ b/bin/roslyn/csi.exe.config @@ -0,0 +1,159 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/bin/roslyn/vbc.exe b/bin/roslyn/vbc.exe new file mode 100644 index 0000000..2c8d5ba Binary files /dev/null and b/bin/roslyn/vbc.exe differ diff --git a/bin/roslyn/vbc.exe.config b/bin/roslyn/vbc.exe.config new file mode 100644 index 0000000..fcf1032 --- /dev/null +++ b/bin/roslyn/vbc.exe.config @@ -0,0 +1,149 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/packages.config b/packages.config index 9efea9f..640d87e 100644 --- a/packages.config +++ b/packages.config @@ -1,5 +1,5 @@  - - + + \ No newline at end of file